Merge back from master

author: Sjoerd Simons <sjoerd.simons@collabora.co.uk> 2009-08-22 00:37:48 +0800
committer: Sjoerd Simons <sjoerd.simons@collabora.co.uk> 2009-08-22 00:37:48 +0800
commit: 84e30dab1428affe335ef904377d07f8b5fdeb66 (patch)
tree: fee9c8ec124a2b5804f6bb4ee31772db56a6e374
parent: fd8e9c5dc2584055177c7a79021cdd53ca431c22 (diff)
parent: 3803736b4326d4bc00d58ccd25f910907f0b4521 (diff)
download: gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar
gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.gz
gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.bz2
gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.lz
gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.xz
gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.zst
gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.zip
128 files changed, 34658 insertions, 15690 deletions
diff --git a/configure.ac b/configure.ac
index 0e11a66d8..7576c8e9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,14 +29,14 @@ GLIB_REQUIRED=2.16.0
 GTK_REQUIRED=2.16.0
 GCONF_REQUIRED=1.2.0
 LIBPANELAPPLET_REQUIRED=2.10.0
-TELEPATHY_GLIB_REQUIRED=0.7.31
+TELEPATHY_GLIB_REQUIRED=0.7.34
 ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4
 LIBCANBERRA_GTK_REQUIRED=0.4
-LIBCHAMPLAIN_REQUIRED=0.3.3
-LIBCHAMPLAIN_GTK_REQUIRED=0.3.3
-CLUTTER_GTK_REQUIRED=0.8.2
+LIBCHAMPLAIN_REQUIRED=0.3.6
+LIBCHAMPLAIN_GTK_REQUIRED=0.3.6
+CLUTTER_GTK_REQUIRED=0.10
 GEOCLUE_REQUIRED=0.11
 WEBKIT_REQUIRED=1.1.7
 NETWORK_MANAGER_REQUIRED=0.7.0
@@ -154,14 +154,31 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
 AM_GLIB_GNU_GETTEXT
 
 # -----------------------------------------------------------
-# NM integration
+# Connectivity integration
 # -----------------------------------------------------------
-AC_ARG_ENABLE(network-manager,
-              AS_HELP_STRING([--enable-network-manager=@<:@no/yes/auto@:>@],
-                             [build with network-manager support]), ,
-                             enable_network_manager=auto)
+AC_ARG_WITH(connectivity,
+              AS_HELP_STRING([--with-connectivity=@<:@nm/connman/auto/no@:>@],
+                             [build with connectivity support]), ,
+                             with_connectivity=auto)
+
+if test "x$with_connectivity" = "xno"; then
+   have_nm=no
+   have_connman=no
+
+elif test "x$with_connectivity" = "xconnman"; then
+
+   PKG_CHECK_MODULES(CONNMAN,
+   [
+      dbus-glib-1
+   ], have_connman="yes", have_connman="no")
+
+   if test "x$have_connman" = "xyes"; then
+      AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies])
+      have_nm=no
+   fi
+
+else
 
-if test "x$enable_network_manager" != "xno"; then
    PKG_CHECK_MODULES(NETWORK_MANAGER,
    [
       libnm_glib >= $NETWORK_MANAGER_REQUIRED
@@ -169,15 +186,20 @@ if test "x$enable_network_manager" != "xno"; then
 
    if test "x$have_nm" = "xyes"; then
       AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
+      have_connman=no
    fi
-else
-   have_nm=no
 fi
 
-if test "x$enable_network_manager" = "xyes" -a "x$have_nm" != "xyes"; then
+if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find connman dependencies.])
+fi
+
+if test "x$with_connectivity" = "xnm" -a "x$have_nm" != "xyes"; then
    AC_MSG_ERROR([Couldn't find libnm-glib dependencies.])
 fi
-AM_CONDITIONAL(HAVE_NM, test "x$have_NM" = "xyes")
+
+AM_CONDITIONAL(HAVE_NM, test "x$have_nm" = "xyes")
+AM_CONDITIONAL(HAVE_CONNMAN, test "x$have_connman" = "xyes")
 
 # -----------------------------------------------------------
 # Webkit
@@ -256,7 +278,7 @@ if test "x$enable_map" != "xno"; then
    [
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then
@@ -475,7 +497,10 @@ Configure summary:
 	Display maps (libchamplain).:  ${have_libchamplain}
 	Location awareness (Geoclue):  ${have_geoclue}
 	Adium themes (Webkit).......:  ${have_webkit}
+
+    Connectivity:
 	NetworkManager integration..:  ${have_nm}
+	ConnMan integration.........:  ${have_connman}
 
     Extras:
 	Documentation...............:  ${enable_gtk_doc}
diff --git a/data/Makefile.am b/data/Makefile.am
index 2182ed0f5..43c3bb66c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,6 +10,11 @@ schemas_in_files = empathy.schemas.in
 schemas_DATA 	 = $(schemas_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
+streamingprefsdir =  $(datadir)/empathy
+streamingprefs_DATA =		\
+	codec-preferences	\
+	element-properties
+
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	if test -z "$(DESTDIR)" ; then \
@@ -29,6 +34,7 @@ EXTRA_DIST = 				\
 	$(desktop_DATA)			\
 	$(schemas_in_files)		\
 	$(schemas_DATA)			\
+	$(streamingprefs_DATA)		\
 	$(html_DATA)
 
 DISTCLEANFILES = 			\
diff --git a/data/codec-preferences b/data/codec-preferences
new file mode 100644
index 000000000..0cb0910bc
--- /dev/null
+++ b/data/codec-preferences
@@ -0,0 +1,36 @@
+# Favorite audio codecs
+
+[audio/SPEEX:8000]
+clock-rate=8000
+
+[audio/SPEEX:16000]
+clock-rate=16000
+
+[audio/AMR]
+
+[audio/G729]
+
+[audio/ILBC]
+
+# Disabled audio codecs
+
+[audio/DV]
+id=-1
+
+[audio/MPA]
+id=-1
+
+[audio/VORBIS]
+id=-1
+
+[audio/MP3]
+id=-1
+
+
+# Favorite video codecs
+
+[video/H264]
+
+[video/H263]
+
+[video/THEORA]
diff --git a/data/element-properties b/data/element-properties
new file mode 100644
index 000000000..17a283ada
--- /dev/null
+++ b/data/element-properties
@@ -0,0 +1,32 @@
+# Put the desired properties in the style of
+#
+# [element name]
+# prop1=val1
+
+[gstrtpbin]
+latency=100
+
+[x264enc]
+byte-stream=1
+bframes=0
+b-adapt=0
+cabac=0
+dct8x8=0
+
+[ffenc_h263]
+rtp-payload-size=1
+
+# Work around bug in the re-timestamp slaving method in
+# GStreamer (2 is skew)
+[alsasrc]
+slave-method=2
+
+[osssrc]
+slave-method=2
+
+[oss4src]
+slave-method=2
+
+[sunaudiosrc]
+slave-method=2
+
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index f85c616b0..bb9068725 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -479,15 +479,15 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/empathy/use_nm</key>
-      <applyto>/apps/empathy/use_nm</applyto>
+      <key>/schemas/apps/empathy/use_conn</key>
+      <applyto>/apps/empathy/use_conn</applyto>
       <owner>empathy</owner>
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-        <short>NetworkManager should be used</short>
+        <short>Connection managers should be used</short>
         <long>
-        Whether or not the network manager should be used to automatically
+        Whether or not connectivity managers should be used to automatically
         disconnect/reconnect.
         </long>
       </locale>
@@ -596,7 +596,7 @@
       <applyto>/apps/empathy/location/reduce_accuracy</applyto>
       <owner>empathy</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
         <short>Empathy should reduce the location's accuracy</short>
         <long>
diff --git a/data/icons/hicolor_apps_16x16_im-msn.png b/data/icons/hicolor_apps_16x16_im-msn.png
index ebd6e2cd2..943ba35f6 100644
--- a/data/icons/hicolor_apps_16x16_im-msn.png
+++ b/data/icons/hicolor_apps_16x16_im-msn.png
diff --git a/data/icons/hicolor_apps_22x22_im-msn.png b/data/icons/hicolor_apps_22x22_im-msn.png
index c1baa2160..97977f2ed 100644
--- a/data/icons/hicolor_apps_22x22_im-msn.png
+++ b/data/icons/hicolor_apps_22x22_im-msn.png
diff --git a/data/icons/hicolor_apps_24x24_im-msn.png b/data/icons/hicolor_apps_24x24_im-msn.png
index 11bb9d4cc..3c2adcd1b 100644
--- a/data/icons/hicolor_apps_24x24_im-msn.png
+++ b/data/icons/hicolor_apps_24x24_im-msn.png
diff --git a/data/icons/hicolor_apps_32x32_im-msn.png b/data/icons/hicolor_apps_32x32_im-msn.png
index 09613e8d5..c06eed2aa 100644
--- a/data/icons/hicolor_apps_32x32_im-msn.png
+++ b/data/icons/hicolor_apps_32x32_im-msn.png
diff --git a/data/icons/hicolor_apps_48x48_im-msn.png b/data/icons/hicolor_apps_48x48_im-msn.png
index 124b27b98..1b960dd32 100644
--- a/data/icons/hicolor_apps_48x48_im-msn.png
+++ b/data/icons/hicolor_apps_48x48_im-msn.png
diff --git a/data/icons/hicolor_apps_scalable_im-msn.svg b/data/icons/hicolor_apps_scalable_im-msn.svg
index eb6511638..561969416 100644
--- a/data/icons/hicolor_apps_scalable_im-msn.svg
+++ b/data/icons/hicolor_apps_scalable_im-msn.svg
@@ -2,301 +2,173 @@
 <!-- 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="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
    width="48"
    height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
    version="1.0"
-   inkscape:export-filename="/home/vinicius/tango-icon-theme-code/protocols/msn-48.png"
+   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/protocols/48"
+   sodipodi:docname="msn.svg"
+   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/protocols/48/msn.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/vinicius/tango-icon-theme-code/protocols/scalable"
-   sodipodi:docname="msn.svg">
-  <metadata
-     id="metadata7">
-    <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>MSN Protocol</dc:title>
-        <dc:date>2006-11-29</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Vinicius Scopel Depizzol</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>vdepizzol@gmail.com</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>MSN</rdf:li>
-            <rdf:li>Protocol</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/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:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
-     id="defs5">
+     id="defs4">
     <linearGradient
-       id="linearGradient3286">
-      <stop
-         id="stop3288"
-         offset="0"
-         style="stop-color:#c7d9ec;stop-opacity:1;" />
-      <stop
-         id="stop3290"
-         offset="1"
-         style="stop-color:#dfe9f4;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7013">
-      <stop
-         style="stop-color:#c7d9ec;stop-opacity:1;"
-         offset="0"
-         id="stop7015" />
-      <stop
-         style="stop-color:#dfe9f4;stop-opacity:1;"
-         offset="1"
-         id="stop7017" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4380">
+       inkscape:collect="always"
+       id="linearGradient3816">
       <stop
-         style="stop-color:#000000;stop-opacity:0.60344827;"
+         style="stop-color:#000000;stop-opacity:1;"
          offset="0"
-         id="stop4382" />
+         id="stop3818" />
       <stop
          style="stop-color:#000000;stop-opacity:0;"
          offset="1"
-         id="stop4384" />
+         id="stop3820" />
     </linearGradient>
     <linearGradient
-       id="linearGradient16408">
+       inkscape:collect="always"
+       id="linearGradient2228">
       <stop
-         style="stop-color:#87b2e0;stop-opacity:1;"
+         style="stop-color:#f56600;stop-opacity:1;"
          offset="0"
-         id="stop16410" />
+         id="stop2230" />
       <stop
-         style="stop-color:#3f7ab9;stop-opacity:1;"
+         style="stop-color:#f56600;stop-opacity:0;"
          offset="1"
-         id="stop16412" />
+         id="stop2232" />
     </linearGradient>
     <linearGradient
-       id="linearGradient14652">
+       inkscape:collect="always"
+       id="linearGradient2219">
       <stop
-         style="stop-color:#badcff;stop-opacity:1;"
+         style="stop-color:#3465a4;stop-opacity:1;"
          offset="0"
-         id="stop14654" />
+         id="stop2221" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         style="stop-color:#3465a4;stop-opacity:0;"
          offset="1"
-         id="stop14656" />
+         id="stop2223" />
     </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient14652"
-       id="radialGradient14658"
-       cx="24.80966"
-       cy="3.1118734"
-       fx="24.80966"
-       fy="3.1118734"
-       r="4.045774"
+       xlink:href="#linearGradient3816"
+       id="radialGradient1358"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143376,-1.546375e-15,1.755727e-15,1.33519,-3.557111,-1.043069)" />
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientTransform="matrix(1.904859,0,0,0.57723,-32.76529,27.09015)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient16408"
-       id="linearGradient2630"
+       xlink:href="#linearGradient2219"
+       id="linearGradient1360"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.56247,0,0,2.753017,3.471512,0.653917)"
-       x1="7.3585782"
-       y1="10.033006"
-       x2="7.4242849"
-       y2="15.283006" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4380"
-       id="radialGradient4386"
-       cx="11.403918"
-       cy="11.820429"
-       fx="11.403918"
-       fy="11.820429"
-       r="3.9179103"
-       gradientTransform="matrix(1,0,0,0.4375,-9.43595e-18,6.648991)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4380"
-       id="radialGradient4390"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.4375,4.14469e-15,6.648991)"
-       cx="11.403918"
-       cy="11.820429"
-       fx="11.403918"
-       fy="11.820429"
-       r="3.9179103" />
+       gradientTransform="matrix(1.427299,0,0,1.408267,0.332861,3.39912)"
+       x1="10.329217"
+       y1="14.96656"
+       x2="16.580788"
+       y2="20.092552" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient7013"
-       id="linearGradient7019"
-       x1="27.18845"
-       y1="8.5750885"
-       x2="23.755941"
-       y2="1.5480845"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3286"
-       id="linearGradient7027"
-       x1="14.197828"
-       y1="20.762081"
-       x2="5.7143059"
-       y2="8.1650333"
+       xlink:href="#linearGradient2228"
+       id="linearGradient1362"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.045145,0,0,2.025318,0.739154,0.465862)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16408"
-       id="linearGradient7946"
-       x1="7.0555573"
-       y1="33.672562"
-       x2="11.832954"
-       y2="35.06567"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.927935,0,0,1,1.147813,0)" />
+       gradientTransform="matrix(1.489007,0,0,1.428565,1.731241,3.002037)"
+       x1="20.998175"
+       y1="11.741063"
+       x2="18.544895"
+       y2="23.366545" />
   </defs>
   <sodipodi:namedview
-     inkscape:window-height="714"
-     inkscape:window-width="1014"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
      id="base"
-     showgrid="false"
-     fill="#729fcf"
-     showborder="false"
-     inkscape:zoom="1"
-     inkscape:cx="37.5"
-     inkscape:cy="19"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg2"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.778489"
+     inkscape:cx="32.469518"
+     inkscape:cy="22.977647"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fill="#edd400"
      showguides="true"
-     inkscape:guide-bbox="true" />
-  <path
-     transform="matrix(4.526985,0,0,3.006648,-28.23745,5.709214)"
-     sodipodi:open="true"
-     sodipodi:end="6.2799944"
-     sodipodi:start="0"
-     d="M 15.321829,11.820429 A 3.9179103,1.7140858 0 1 1 15.321809,11.814959"
-     sodipodi:ry="1.7140858"
-     sodipodi:rx="3.9179103"
-     sodipodi:cy="11.820429"
-     sodipodi:cx="11.403918"
-     id="path4388"
-     style="opacity:1;fill:url(#radialGradient4390);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.48917751"
-     sodipodi:type="arc" />
-  <path
-     style="fill:url(#linearGradient7946);fill-opacity:1;fill-rule:evenodd;stroke:#3465a4;stroke-width:1.00000048px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-     d="M 15.46346,24.414244 C 10.785493,28.476792 1.6101807,34.975993 7.2307622,38.679967 C 12.779079,42.336318 14.894624,28.872343 14.894624,28.872343"
-     id="path8525"
-     sodipodi:nodetypes="czc" />
-  <path
-     sodipodi:nodetypes="czc"
-     id="path7071"
-     d="M 15.353246,25.591713 C 11.734612,29.238525 3.2531464,35.09652 7.7417982,37.899128 C 12.001173,40.558581 14.043096,28.138937 14.043096,28.138937"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#c7d9ec;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-  <path
-     style="fill:url(#linearGradient2630);fill-opacity:1;fill-rule:evenodd;stroke:#3465a4;stroke-width:1.00000048px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 24.292455,17.301321 C 16.935857,17.428878 -2.1890432,43.377295 23.394922,43.377293 C 28.775671,43.377293 32.295389,42.22196 34.344814,40.402607 C 34.359882,40.38923 34.389733,40.416057 34.404649,40.402607 C 35.545703,40.890781 38.571551,39.598037 39.909512,38.693744 C 45.082133,35.19771 36.500579,26.909532 31.532546,22.301325 C 31.401541,22.179808 26.294466,17.48873 24.531797,17.364612 C 24.447957,17.358794 24.379687,17.299808 24.292455,17.301321 z "
-     id="path5023"
-     sodipodi:nodetypes="cssssssc" />
-  <path
-     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:url(#linearGradient7027);stroke-width:1.00000083px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 23.624857,42.414249 C -0.59814104,42.64502 18.255106,18.509032 24.039065,18.512059 C 26.410046,18.588582 38.20781,29.175081 40.119099,34.372181 C 41.916319,37.111847 36.635193,40.539824 34.716977,38.456356 C 33.320614,40.39141 29.993406,42.401612 23.624857,42.414249 z "
-     id="path5900"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     style="fill:#000000;fill-opacity:0.12987013;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 30.401802,32.658992 C 30.401802,32.658992 29.835279,40.428683 33.786549,40.24678 C 36.824985,40.104721 30.583172,32.660882 30.401802,32.658992 z "
-     id="path5265"
-     sodipodi:nodetypes="csc" />
-  <path
-     sodipodi:type="arc"
-     style="opacity:1;fill:url(#radialGradient4386);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.48917751"
-     id="path3505"
-     sodipodi:cx="11.403918"
-     sodipodi:cy="11.820429"
-     sodipodi:rx="3.9179103"
-     sodipodi:ry="1.7140858"
-     d="M 15.321829,11.820429 A 3.9179103,1.7140858 0 1 1 15.321809,11.814959"
-     sodipodi:start="0"
-     sodipodi:end="6.2799944"
-     sodipodi:open="true"
-     transform="matrix(2.166658,0,0,3.055838,-1.154206,-14.5643)" />
-  <path
-     sodipodi:type="arc"
-     style="opacity:1;fill:url(#radialGradient14658);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:0.34177133;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path2396"
-     sodipodi:cx="26.385618"
-     sodipodi:cy="4.5758967"
-     sodipodi:rx="3.595403"
-     sodipodi:ry="3.595403"
-     d="M 29.981021,4.5758967 A 3.595403,3.595403 0 1 1 29.981003,4.5644242"
-     sodipodi:start="0"
-     sodipodi:end="6.2799944"
-     sodipodi:open="true"
-     transform="matrix(2.924455,0,0,2.927415,-53.17815,-0.370312)" />
-  <path
-     transform="matrix(2.645712,0,0,2.622481,-45.82115,0.928673)"
-     sodipodi:open="true"
-     sodipodi:end="6.2799944"
-     sodipodi:start="0"
-     d="M 29.981021,4.5758967 A 3.595403,3.595403 0 1 1 29.981003,4.5644242"
-     sodipodi:ry="3.595403"
-     sodipodi:rx="3.595403"
-     sodipodi:cy="4.5758967"
-     sodipodi:cx="26.385618"
-     id="path2398"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7019);stroke-width:0.37964022;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     sodipodi:type="arc" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path14660"
-     d="M 34.763497,38.506802 C 32.960413,37.064271 31.152443,33.19781 31.176374,32.550651"
-     style="fill:none;fill-opacity:0.92941176;fill-rule:evenodd;stroke:#c7d9ec;stroke-width:1.00000036px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-opacity:0.92941176;fill-rule:evenodd;stroke:#3465a4;stroke-width:1.00000036px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-     d="M 36.615639,40.197689 C 31.377707,39.46 30.570319,32.555681 30.570319,32.555681"
-     id="path10279"
-     sodipodi:nodetypes="cc" />
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1268"
+     inkscape:window-height="971"
+     inkscape:window-x="6"
+     inkscape:window-y="21" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="opacity:0.4;color:#000000;fill:url(#radialGradient1358);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 43.00001,38.062496 C 43.00001,40.822496 35.608012,43.062496 26.500013,43.062496 C 17.392013,43.062496 10.000014,40.822496 10.000014,38.062496 C 10.000014,35.302496 17.392013,33.062496 26.500013,33.062496 C 35.608012,33.062496 43.00001,35.302496 43.00001,38.062496 z "
+       id="path4318" />
+    <path
+       style="fill:#edd400;fill-opacity:1;stroke:#c4a000;stroke-width:1.00000083;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 34.662639,20.335823 C 39.495137,21.781376 40.098879,38.560591 34.609432,38.560591 C 29.18649,38.560591 17.111515,15.085731 34.662639,20.335823 z "
+       id="rect2194" />
+    <path
+       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.00000024;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 29.5,20.59375 C 28.488762,20.699063 27.850577,20.9863 27.40625,21.40625 C 26.961923,21.8262 26.695785,22.399576 26.5625,23.15625 C 26.295929,24.669599 26.724448,26.888006 27.625,29.09375 C 28.525552,31.299494 29.853318,33.518217 31.21875,35.125 C 32.584182,36.731783 34.047656,37.59375 34.625,37.59375 C 35.065414,37.59375 35.396266,37.452251 35.75,37.125 C 36.103734,36.797749 36.436723,36.267837 36.71875,35.5625 C 37.282805,34.151825 37.566795,32.092358 37.53125,30 C 37.495705,27.907642 37.16426,25.762788 36.5625,24.125 C 35.96074,22.487212 35.097603,21.497403 34.375,21.28125 C 32.261511,20.64904 30.658881,20.473061 29.5,20.59375 z "
+       id="path2259" />
+    <path
+       style="fill:#73d216;fill-opacity:1;stroke:#4e9a06;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 24.98559,40.707419 C 20.31754,40.707419 7.959768,29.343494 17.418553,22.824249 C 26.869109,16.310672 29.725145,40.707419 24.98559,40.707419 z "
+       id="rect2201" />
+    <path
+       style="opacity:0.25;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999911;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 20.429472,22.564494 C 19.813992,22.53919 18.946491,22.754031 17.792299,23.48193 C 15.396153,24.993077 14.598274,26.486625 14.509287,28.117394 C 14.420299,29.74816 15.197952,31.630592 16.500622,33.380577 C 17.803294,35.130559 19.637587,36.743254 21.398232,37.871181 C 23.158877,38.999109 24.734359,39.505165 25.355011,39.505165 C 25.714095,39.505165 25.973542,38.578409 26.134382,37.774606 C 26.456061,36.166999 26.487926,33.806821 26.080561,31.449134 C 25.673198,29.091442 24.821426,26.682961 23.766308,25.027083 C 22.711189,23.371206 21.583796,22.611947 20.429472,22.564494 z "
+       id="path2254" />
+    <path
+       style="opacity:0.25;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 38.290982,9.1309894 C 35.842841,9.5672523 32.283411,12.929344 29.603482,16.28724 C 27.08796,19.439138 25.478582,22.11333 25.259732,22.47474 L 28.572232,30.03724 C 34.665525,29.832673 38.559865,27.128092 38.853482,26.91224 C 39.014293,26.551466 40.549044,23.055678 41.478482,19.03724 C 41.967713,16.922043 42.260097,14.730906 42.072232,12.97474 C 41.884367,11.218574 41.30548,10.015388 40.103482,9.3809894 C 39.532517,9.0796416 38.992058,9.0060564 38.290982,9.1309894 z "
+       id="path2245" />
+    <path
+       style="fill:url(#linearGradient1360);fill-opacity:1;stroke:#204a87;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 2.9244668,13.205506 C 5.4909473,8.9616426 31.868508,26.916697 20.798169,29.292473 C 9.7422309,31.665159 0.38413836,17.406122 2.9244668,13.205506 z "
+       id="rect2197" />
+    <path
+       style="opacity:0.2;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999905;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 4.0077208,17.150417 C 4.6613048,18.933996 5.9435775,21.021975 7.6235197,22.895457 C 10.983405,26.64242 15.833733,29.401717 20.89796,28.310863 C 21.928379,28.088904 22.232928,27.802155 22.334374,27.651594 C 22.435813,27.501039 22.52111,27.289844 22.334374,26.709786 C 21.960899,25.54967 20.384396,23.482994 18.173725,21.529832 C 15.963059,19.576669 13.153701,17.6285 10.545878,16.161517 C 7.9380537,14.694536 5.1976761,13.680027 3.975949,13.563989 C 3.3254548,13.502207 3.3541371,15.366838 4.0077208,17.150417 z "
+       id="path2249" />
+    <path
+       style="fill:url(#linearGradient1362);fill-opacity:1;stroke:#ce5d00;stroke-width:1.00000048;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 23.497613,20.84222 C 23.497613,20.84222 33.747199,3.7130144 39.940221,6.9816102 C 46.183621,10.276795 39.032218,26.044415 39.032218,26.044415 C 39.032218,26.044415 34.34592,29.558038 27.298467,29.558038 L 23.497613,20.84222 z "
+       id="rect1317" />
+    <path
+       style="opacity:0.25;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 37.65625,7.5937494 C 35.207156,8.0301823 31.648755,11.392008 28.96875,14.75 C 26.453156,17.901987 24.843855,20.576081 24.625,20.9375 L 27.9375,28.5 C 34.029365,28.295478 37.922857,25.592475 38.21875,25.375 C 38.379566,25.014217 39.91427,21.518622 40.84375,17.5 C 41.333003,15.384706 41.625396,13.193957 41.4375,11.4375 C 41.249604,9.6810425 40.671312,8.4784456 39.46875,7.8437494 C 38.897466,7.5422332 38.357596,7.4687683 37.65625,7.5937494 z "
+       id="path1328" />
+    <path
+       style="fill:#75507b;fill-opacity:1;stroke:#5c3566;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 25.75715,25.780775 C 27.420525,29.605605 28.313593,33.06003 27.750608,33.491546 C 27.187623,33.923061 25.380722,31.169067 23.717348,27.344236 C 22.053974,23.519407 21.160905,20.064982 21.72389,19.633467 C 22.286875,19.201951 24.093776,21.955945 25.75715,25.780775 z "
+       id="path2192" />
+  </g>
 </svg>
diff --git a/extensions/Connection_Interface_Location.xml b/extensions/Connection_Interface_Location.xml
deleted file mode 100644
index 1e7bee4e0..000000000
--- a/extensions/Connection_Interface_Location.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Connection_Interface_Location"
-  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <tp:copyright>Copyright (C) 2008 Collabora Ltd.</tp:copyright>
-  <tp:copyright>Copyright (C) 2008 Nokia Corporation</tp:copyright>
-  <tp:license xmlns="http://www.w3.org/1999/xhtml">
-    <p>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.</p>
-
-<p>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.</p>
-
-<p>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 Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
-  </tp:license>
-  <interface name="org.freedesktop.Telepathy.Connection.Interface.Location.DRAFT"
-    tp:causes-havoc='experimental'>
-    <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
-
-    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>An interface on connections to support protocols which allow users to
-        publish their current geographical location, and subscribe to the
-        current location of their contacts.</p>
-
-      <p>This interface is geared strongly towards automatic propagation and
-        use of this information, so focuses on latitude, longitude and
-        altitude which can be determined by GPS, although provision is also
-        included for an optional human-readable description of locations. All
-        co-ordinate information is required to be relative to the WGS84
-        datum.</p>
-
-      <p>The information published through this interface is intended to have
-        the same scope as presence information, so will normally be made
-        available to those individuals on the user's "publish" contact list.
-        Even so, user interfaces should not automatically publish location
-        information without the consent of the user, and it is recommended
-        that an option is made available to reduce the accuracy of the
-        reported information to allow the user to maintain their privacy.</p>
-
-      <p>Location information is represented using the terminology of XMPP's
-        <a href="http://www.xmpp.org/extensions/xep-0080.html">XEP-0080</a>
-        or the XEP-0080-derived
-        <a href="http://geoclue.freedesktop.org/">Geoclue</a> API where
-        possible.</p>
-    </tp:docstring>
-
-    <tp:enum name="Location_Accuracy_Level" type="i">
-      <tp:docstring>
-        A location accuracy level. This should be kept in sync with
-        GeoclueAccuracyLevel in the Geoclue project.
-      </tp:docstring>
-
-      <tp:enumvalue suffix="None" value="0">
-        <tp:docstring>
-          The accuracy is unspecified.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Country" value="1">
-        <tp:docstring>
-          The location indicates the contact's country.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Region" value="2">
-        <tp:docstring>
-          The location indicates the contact's region within a country.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Locality" value="3">
-        <tp:docstring>
-          The location indicates the contact's locality within a region
-          (e.g. the correct city).
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Postal_Code" value="4">
-        <tp:docstring>
-          The location indicates the correct postal code.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Street" value="5">
-        <tp:docstring>
-          The location indicates the correct street.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Detailed" value="6">
-        <tp:docstring>
-          The location's accuracy is given by the error, horizontal-error-m
-          and/or vertical-error-m keys.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-    <tp:mapping name="Location">
-      <tp:docstring>
-        A user's location, represented as an extensible mapping.
-      </tp:docstring>
-
-      <tp:member name="Key" type="s">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-
-          <p>Civic addresses are represented by the following well-known
-            keys (all of which have string values), which should be kept in
-            sync with those used in XEP-0080 and in the Geoclue project:</p>
-
-          <ul>
-            <li>countrycode - s: an ISO-3166-1 alpha-2 (two-letter) country
-              code, e.g. "us", "gb", "fr"</li>
-            <li>country - s: a country name in unspecified locale, e.g.
-              "USA"</li>
-            <li>region - s: an administrative region of the nation, such as a
-              state or province</li>
-            <li>locality - s: a locality within the administrative region, such
-              as a town or city</li>
-            <li>area - s: a named area such as a campus or neighborhood</li>
-            <li>postalcode - s: a code used for postal delivery</li>
-            <li>street - s: a thoroughfare within the locality, or a crossing of
-              two thoroughfares</li>
-          </ul>
-
-          <p>The following address keys are defined in XEP-0080 but not by
-            Geoclue, and are also allowed:</p>
-
-          <ul>
-            <li>building - s: a specific building on a street or in an area</li>
-            <li>floor - s: a particular floor in a building</li>
-            <li>room - s: a particular room in a building</li>
-            <li>text - s: any more specific information, e.g.
-              "Northwest corner of the lobby"</li>
-            <li>description - s: A natural-language name for or description of
-              the location, e.g. "Bill's house"</li>
-            <li>uri - s: a URI representing the location or pointing to more
-              information about it</li>
-          </ul>
-
-          <p>Positions are represented by the following well-known keys:</p>
-
-          <ul>
-            <li>lat - d: latitude in decimal degrees north, -90 to +90,
-              relative to the WGS-84 datum
-              <tp:rationale>
-                This is from XEP-0080; the XEP allows use of a different
-                datum, but recommends this one. We enforce sanity by requiring
-                a consistent datum: a minimal compliant implementation of this
-                specification in terms of XEP-0080 would simply ignore the
-                &lt;lat&gt; and &lt;lon&gt; elements if &lt;datum&gt; exists
-                and has a value other than WGS-84, while an advanced
-                implementation might correct for the different datum.
-              </tp:rationale>
-            </li>
-            <li>lon - d: Longitude in decimal degrees east, -180 to +180,
-              relative to the WGS-84 datum
-              <tp:rationale>
-                Same rationale as 'lat'
-              </tp:rationale>
-            </li>
-            <li>alt - d: altitude in metres above sea level (negative
-              if below sea level)
-              <tp:rationale>
-                This is from XEP-0080
-              </tp:rationale>
-            </li>
-            <li>accuracy-level - i (<tp:type>Location_Accuracy_Level</tp:type>):
-              an indication of accuracy, which SHOULD be omitted if it would be
-              Location_Accuracy_Level_None or
-              Location_Accuracy_Level_Detailed
-              <tp:rationale>
-                This is a struct field in GeoClue; the name is new in this
-                specification, and was chosen in an attempt to avoid clashing
-                with any future XEP-0080 terminology.
-              </tp:rationale>
-            </li>
-            <li>error - d: horizontal position error in arc-minutes (1/60
-              degree) if known
-              <tp:rationale>
-                This is from XEP-0080
-              </tp:rationale>
-            </li>
-            <li>vertical-error-m - d: vertical position error in metres if
-              known
-              <tp:rationale>
-                This exists as a struct field in GeoClue; the name is new
-                in this specification.
-              </tp:rationale>
-            </li>
-            <li>horizontal-error-m - d: horizontal position error in metres if
-              known
-              <tp:rationale>
-                This exists as a struct field in GeoClue; the name is new
-                in this specification.
-              </tp:rationale>
-            </li>
-          </ul>
-
-          <p>Velocities are represented by the following well-known keys:</p>
-
-          <ul>
-            <li>speed - d: speed in metres per second
-              <tp:rationale>
-                This is from XEP-0080
-              </tp:rationale>
-            </li>
-            <li>bearing - d: direction of movement in decimal degrees,
-              where North is 0 and East is 90
-              <tp:rationale>
-                This is from XEP-0080, and is equivalent to the struct field
-                called "direction" in GeoClue
-              </tp:rationale>
-            </li>
-            <li>climb - d: rate of change of 'alt' in metres per second
-              <tp:rationale>
-                This is a struct field in GeoClue; the name is new to this
-                specification, but seems uncontroversial
-              </tp:rationale>
-            </li>
-          </ul>
-
-          <p>Other well-known keys:</p>
-
-          <ul>
-            <li>timestamp - t (<tp:type>Unix_Timestamp64</tp:type>): the time
-              that the contact was at this location, in seconds since
-              1970-01-01T00:00:00Z (i.e. the beginning of 1970 in UTC)
-              <tp:rationale>
-                XEP-0080 uses an ISO 8601 string for this, but a number of
-                seconds since the epoch is probably easier to work with.
-              </tp:rationale>
-            </li>
-          </ul>
-        </tp:docstring>
-      </tp:member>
-
-      <tp:member name="Value" type="v">
-        <tp:docstring>
-          The value corresponding to the well-known key.
-        </tp:docstring>
-      </tp:member>
-    </tp:mapping>
-
-    <tp:mapping name="Contact_Locations" type="a{ua{sv}}">
-      <tp:member name="Contact" type="u" tp:type="Contact_Handle">
-      </tp:member>
-      <tp:member name="Location" type="a{sv}" tp:type="Location">
-      </tp:member>
-    </tp:mapping>
-
-    <method name="GetLocations" tp:name-for-bindings="Get_Locations">
-      <tp:docstring>
-        Return the current locations of the given contacts, if they are
-        already known. If any of the given contacts' locations are not known,
-        request their current locations, and later emit
-        <tp:member-ref>LocationUpdated</tp:member-ref> for them; the
-        <tp:member-ref>LocationUpdated</tp:member-ref> signal for contacts
-        whose location could not be determined will have an empty Location.
-      </tp:docstring>
-
-      <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]">
-        <tp:docstring>
-          The contacts whose locations should be returned or signalled.
-        </tp:docstring>
-      </arg>
-
-      <arg direction="out" name="Locations" type="a{ua{sv}}"
-        tp:type="Contact_Locations">
-        <tp:docstring>
-          The contacts' locations, if already known. Contacts whose locations
-          are not already known are omitted from the mapping; contacts known
-          to have no location information appear in the mapping with an empty
-          Location dictionary.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="LocationUpdated" tp:name-for-bindings="Location_Updated">
-      <tp:docstring>
-        Emitted when a contact's location changes or becomes known.
-      </tp:docstring>
-
-      <arg name="Contact" type="u" tp:type="Contact_Handle">
-        <tp:docstring>
-          The contact
-        </tp:docstring>
-      </arg>
-      <arg name="Location" type="a{sv}" tp:type="Location">
-        <tp:docstring>
-          The contact's location, or empty to indicate that nothing is known
-          about the contact's location.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <method name="SetLocation" tp:name-for-bindings="SetLocation">
-      <tp:docstring>
-        Set the local user's own location.
-      </tp:docstring>
-
-      <arg direction="in" name="Location" type="a{sv}">
-        <tp:docstring>
-          The location to advertise. If the user wants to obscure their
-          exact location by reducing the precision or accuracy, clients
-          MUST do this themselves, rather than relying on the connection
-          manager to do so. Clients that interact with more than one
-          connection SHOULD advertise the same reduced-accuracy location
-          to all of them, so that contacts cannot obtain an undesirably
-          accurate location by assuming that random errors have been added
-          and averaging the locations advertised on multiple connections.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <property name="LocationAccessControlTypes" type="au" access="read"
-      tp:type="Rich_Presence_Access_Control_Type[]" tp:name-for-bindings="Location_Access_Control_Types">
-      <tp:docstring>The types of access control that are supported by this
-        connection.</tp:docstring>
-    </property>
-
-    <property name="LocationAccessControl" type="(uv)" access="readwrite"
-      tp:type="Rich_Presence_Access_Control" tp:name-for-bindings="Location_Access_Control">
-      <tp:docstring>The current access control mechanism and settings
-        for this connection. Before publishing location for the first time,
-        if this has not been set by a client, implementations SHOULD
-        set it to be as restrictive as possible (an empty whitelist, if
-        supported).</tp:docstring>
-    </property>
-  </interface>
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/Debug.xml b/extensions/Debug.xml
index a21d9db60..70a82e903 100644
--- a/extensions/Debug.xml
+++ b/extensions/Debug.xml
@@ -17,9 +17,8 @@ Lesser General Public License for more details.</p>
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
   </tp:license>
-  <interface name="org.freedesktop.Telepathy.Debug.DRAFT"
-    tp:causes-havoc="experimental">
-    <tp:added version="0.17.24"/>
+  <interface name="org.freedesktop.Telepathy.Debug">
+    <tp:added version="0.17.27">(as stable API)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>An interface for providing debug messages.</p>
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 0ed6fc522..933136212 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -15,7 +15,6 @@ EXTRA_DIST = \
     generic-types.xml \
     misc.xml \
     Channel_Handler.xml \
-    Connection_Interface_Location.xml \
     Tube_Handler.xml \
     Debug.xml
 
diff --git a/extensions/misc.xml b/extensions/misc.xml
index dd3125fb2..746cd9074 100644
--- a/extensions/misc.xml
+++ b/extensions/misc.xml
@@ -6,7 +6,6 @@
 
 <xi:include href="Channel_Handler.xml"/>
 <xi:include href="Tube_Handler.xml"/>
-<xi:include href="Connection_Interface_Location.xml"/>
 <xi:include href="Debug.xml" />
 
 </tp:spec>
diff --git a/help/.gitignore b/help/.gitignore
index 2f8d8eb55..597bd8fcf 100644
--- a/help/.gitignore
+++ b/help/.gitignore
@@ -13,3 +13,14 @@ it/*.xml
 ru/*.xml
 sv/*.xml
 
+ca/*.page
+cs/*.page
+de/*.page
+el/*.page
+en_GB/*.page
+es/*.page
+fi/*.page
+fr/*.page
+it/*.page
+ru/*.page
+sv/*.page
diff --git a/help/C/add-account.page b/help/C/add-account.page
new file mode 100644
index 000000000..5821a856c
--- /dev/null
+++ b/help/C/add-account.page
@@ -0,0 +1,96 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="add-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="remove-account"/>
+    <desc>Add a new account to <app>Empathy</app>.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-24" status="draft"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Add a new account</title>
+
+  <steps>
+    <item>
+      <p>
+	      From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          Press <key>F4</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+	      If it is the first time you launch <app>Empathy</app>:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          From the <gui>Type</gui> drop-down list choose
+	          the service you wish to add an account for, then click
+	          on the <gui>Create</gui> button.
+	       </p>
+        </item>
+      </list>
+      <p>
+        Otherwise:
+      </p>
+      <steps>
+        <item>
+          <p>
+            Click on the <gui>Add</gui> button.
+          </p>
+        </item>
+        <item>
+          <p>
+            From the <gui>Type</gui> drop-down list choose
+             the service you wish to add an account for, then click
+             on the <gui>Create</gui> button.
+	        </p>
+	      </item>
+      </steps>
+    </item>
+    <item>
+      <p>
+        Fill the required fields with your <em>user
+         name</em> and	<em>password</em>.
+      </p>
+    </item>
+    <item>
+      <p>
+        To enable the new account, select the
+         <gui>Enabled</gui> check-box next to
+         the name of the account in the box on the left of the dialog.
+      </p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>
+      If you want to change the name that identifies the account in the <gui>Accounts</gui>
+      dialog, double-click on the name of the account in the box on the left of the dialog
+      and type the new name.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/add-contact.page b/help/C/add-contact.page
new file mode 100644
index 000000000..14d49a57a
--- /dev/null
+++ b/help/C/add-contact.page
@@ -0,0 +1,63 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="add-contact">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="offline-contacts"/>
+    <desc>Add someone to the contact list.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-15" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Add someone to your list of contacts</title>
+
+  <steps>
+    <item>
+      <p>
+        Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the type of
+        service the person you want to add to your contacts is using.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Identifier</gui> text box, type the email address
+        or the username of the person you want to add to your
+        contacts list.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Alias</gui> text box, type their name.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click <gui>Add</gui> to add the person to your list of
+        contacts.
+      </p>
+    </item>
+  </steps>
+
+  <note>
+    <p>
+      To add a new person to your list of contacts, you need to be
+      connected to the Internet and to your account.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/audio-call.page b/help/C/audio-call.page
new file mode 100644
index 000000000..8c18b9453
--- /dev/null
+++ b/help/C/audio-call.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="audio-call">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <link type="seealso" xref="audio-video"/>
+    <desc>
+      Start an audio conversation with one of 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-07" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Start an audio conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Select the contact you want to have a conversation with, and click
+            on the audio call icon next to their name.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with, and
+            select <gui>Audio Call</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        A new window will open. When the connection is established, you will
+        see written, at the bottom of the window, <gui>Connected</gui> and the total
+        conversation time.
+      </p>
+    </item>
+    <item>
+      <p>
+        To close the conversation, click on <gui>Hang up</gui>.
+      </p>
+    </item>
+  </steps>
+  <note style="tip">
+    <p>
+      To turn an audio conversation into a video one, from the call window select
+      <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>,
+      or click on the video call icon.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/audio-video.page b/help/C/audio-video.page
new file mode 100644
index 000000000..cef06e126
--- /dev/null
+++ b/help/C/audio-video.page
@@ -0,0 +1,148 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="audio-video">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <desc>
+      When it is possible to have an audio or video conversation.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="draft"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Audio and video conversations</title>
+
+  <p>
+    When your contacts support audio or video conversations, you will see, next to
+    the contacts name in the <gui>Contact List</gui> window, one or two small icons that
+    represent the different conversations you can have.
+  </p>
+
+  <table frame="all" rules="cols" shade="rows">
+    <thead>
+      <tr>
+        <td>
+          <p>
+            Icon
+          </p>
+        </td>
+        <td>
+          <p>
+            Description
+          </p>
+        </td>
+      </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>
+        <p>
+          <media type="image" mime="image/png" src="figures/audio-input-microphone.png">
+            Icon for audio conversation
+          </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the icon that represents the possibility to have an audio conversation.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p>
+          <media type="image" mime="image/png" src="figures/camera-web.png">
+            Icon for video conversation
+          </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the icon that represents the possibility to have a video conversation.
+        </p>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+  
+  <note>
+    <p>
+      In order to have a video conversation, you need to have a web-cam that is
+      supported by your operating system, and a working microphone.
+    </p>
+    <p>
+      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. 
+    </p>
+  </note>
+  
+  <section id="supported-services">
+  
+  <title>Supported services</title>
+  
+  <table frame="all" rules="cols" shade="rows">
+    <thead>
+      <tr>
+        <td><p>
+          Protocol / Service
+        </p></td>
+        <td><p>
+          Video conversations
+        </p></td>
+        <td><p>
+          Audio conversations
+        </p></td>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td><p>AIM</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>Google Talk</p></td>
+        <td><p>Yes</p></td>
+        <td><p>Yes</p></td>
+      </tr>
+      <tr>
+        <td><p>ICQ</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>Jabber</p></td>
+        <td><p>Yes</p></td>
+        <td><p>Yes</p></td>
+      </tr>
+      <tr>
+        <td><p>MSN</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>Salut</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>Yahoo!</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+    </tbody>
+  </table>
+  
+  </section>
+
+</page>
diff --git a/help/C/change-status.page b/help/C/change-status.page
new file mode 100644
index 000000000..a2e687ffc
--- /dev/null
+++ b/help/C/change-status.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="change-status">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="status-icons"/>
+    <desc>
+      Change your status, if you are going away from your computer for example.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Change your status</title>
+
+  <steps>
+    <item>
+      <p>
+        Click on the drop-down list at the top of the <gui>Contact List</gui> window.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select a status from the list.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    For example, if you are busy and do not want to
+    be disturbed, select <gui>Busy</gui>.
+  </p>
+
+  <note>
+    <p>
+      If you do not use your computer for a while, or if the screen saver is turned on,
+       the status will be automatically set to <gui>Away</gui>.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/create-account.page b/help/C/create-account.page
new file mode 100644
index 000000000..46f58395e
--- /dev/null
+++ b/help/C/create-account.page
@@ -0,0 +1,137 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="create-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="add-account"/>
+    <link type="seealso" xref="irc-account"/>
+    <desc>
+      Register an account with one of the supported messaging services.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-21" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Register for a new account</title>
+
+  <p>
+    You can freely create an account on any of the services listed below.
+    Follow the instructions reported on each website on
+    how to register your new account.
+  </p>
+  <p>
+    At the end of the registration process you should have a <em>user
+      name</em> (or an <em>account ID</em>) and a <em>password</em>
+      that you will use to add the account to <app>Empathy</app>.
+  </p>
+  <p>
+    Click on the name of the service to visit its website.
+  </p>
+
+  <section id="im-services">
+    <title>Instant Messaging Services</title>
+
+    <list>
+      <item>
+        <p>
+          <link href="http://dashboard.aim.com/aim">AIM</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="http://www.google.com/talk/">Google Talk</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="https://www.icq.com/register/">ICQ</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="http://register.jabber.org/">Jabber</link>
+        </p>
+        <note style="tip">
+          <p>
+            It is possible to use the automatic creation of accounts
+            with this service. Not all the service providers support it.
+             One service provider known to work is <em>jabber.org</em>,
+             the default one of the application.
+          </p>
+        </note>
+      </item>
+      <item>
+        <p>
+          <link href="https://accountservices.passport.net">MSN</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="https://login.yahoo.com/config/login">Yahoo!</link>
+        </p>
+      </item>
+    </list>
+  </section>
+
+  <section id="local-service">
+    <title>Local Instant Messaging Services</title>
+    <p>
+      This service works when you are connected to a local network,
+      you do not need an Internet connection in order to use it.
+    </p>
+    <list>
+      <item>
+        <p>
+          <em>Salut</em>
+        </p>
+      </item>
+    </list>
+
+    <p>
+      For more information, see <link xref="salut-protocol" />.
+    </p>
+
+  </section>
+
+  <section id ="sip-services">
+    <title>Telephony Services</title>
+
+    <p>
+      These services will let you do voice call over the Internet with
+      other people using the same service or even to normal phones.
+    </p>
+
+    <list>
+      <item>
+        <p>
+          <link href="https://www.ekiga.net/index.php?page=register">Ekiga</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">Sipphone</link>
+        </p>
+      </item>
+    </list>
+
+    <note>
+      <p>
+        In order to call normal phones over the Internet, you may need
+        to subscribe to a paid service. For more information, please
+        refer to the instructions provided on the website of the
+        service you will use.
+      </p>
+    </note>
+
+  </section>
+</page>
diff --git a/help/C/disable-account.page b/help/C/disable-account.page
new file mode 100644
index 000000000..2ded8067a
--- /dev/null
+++ b/help/C/disable-account.page
@@ -0,0 +1,66 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="disable-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="remove-account"/>
+    <desc>
+      Prevent an account from logging-in automatically when you start
+      <app>Empathy</app>.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Disable an account</title>
+
+  <p>
+    Disabling an account means to deactivate it, temporarily or
+     permanently. All the conversations you had will be kept in your computer.
+  </p>
+  <p>
+    After disabling an account, it is possible to enable it again.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          Press <key>F4</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the account you wish to disable from the box on the
+         left of the dialog.
+      </p>
+    </item>
+    <item>
+      <p>
+        Deselect the <gui>Enabled</gui> check-box.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/empathy.xml b/help/C/empathy.xml
deleted file mode 100644
index e6a1a7282..000000000
--- a/help/C/empathy.xml
+++ /dev/null
@@ -1,1395 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" 
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-<!ENTITY legal SYSTEM "legal.xml">
-<!ENTITY appversion "2.28">
-<!ENTITY manrevision "2.2">
-<!ENTITY date "May 2009">
-<!ENTITY app "<application>Empathy</application>">
-<!ENTITY appname "Empathy">
-<!ENTITY gtalk "http://www.google.com/talk/">
-<!ENTITY icq "https://www.icq.com/register/">
-<!ENTITY aim "http://dashboard.aim.com/aim">
-<!ENTITY msn "https://accountservices.passport.net">
-<!ENTITY yahoo "https://login.yahoo.com/config/login">
-<!ENTITY fwd
-"http://account2.freeworlddialup.com/index.php?section_id=94">
-<!ENTITY ekiga "https://www.ekiga.net/index.php?page=register">
-<!ENTITY sipphone
-"https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">
-<!ENTITY jabber "http://www.jabber.org/web/Jabber.org">
-]>
-<?db.chunk.max_depth 2?>
-<article id="index" lang="en">
-  <!-- please do not change the id; for translations, change lang to -->
-  <!-- appropriate code -->
-  <articleinfo>
-    <title>&app; Manual V&manrevision;</title>
-
-    <copyright>
-      <year>2008, 2009</year>
-      <holder>Ubuntu Documentation Project</holder>
-    </copyright>
-    <copyright>
-      <year>2009</year>
-      <holder>GNOME Documentation Project</holder>
-    </copyright>
-
-    <!-- An address can be added to the publisher information.  If a role is 
-    not specified, the publisher/author is the same for all versions of the 
-    document.  -->
-    <publisher>
-      <publishername>GNOME Documentation Project</publishername>
-    </publisher>
-
-    <!-- licence stuff -->
-    &legal;
-    
-    <authorgroup>
-      <author role="maintainer">
-	<firstname>Milo</firstname>
-	<surname>Casagrande</surname>
-	<affiliation>
-	  <orgname>GNOME Documentation Project</orgname>
-	  <address><email>milo@ubuntu.com</email></address>
-	</affiliation>
-	<affiliation>
-	  <orgname>Ubuntu Documentation Project</orgname>
-	  <address><email>milo@ubuntu.com</email></address>
-	</affiliation>
-      </author>
-      <author>
-	<firstname>Seth</firstname>
-	<surname>Dudenhofer</surname>
-	<affiliation>
-	  <orgname>Ubuntu Documentation Project</orgname>
-	  <address><email>sdudenhofer@gmail.com</email></address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <releaseinfo revision="2.28" role="incomplete">
-      <ulink type="bug" url="http://bugzilla.gnome.org/show_bug.cgi?id=561033" />
-      <ulink type="planning" url="http://live.gnome.org/Empathy/Documentation" />
-    </releaseinfo>
-
-<!-- According to GNU FDL, revision history is mandatory if you are -->
-<!-- modifying/reusing someone else's document.  If not, you can omit it. -->
-<!-- Remember to remove the &manrevision; entity from the revision -->
-<!-- entries other than the current revision. -->
-<!-- The revision numbering system for GNOME manuals is as follows: -->
-<!-- * the revision number consists of two components -->
-<!-- * the first component of the revision number reflects the release version of the GNOME desktop. -->
-<!-- * the second component of the revision number is a decimal unit that is incremented with each revision of the manual. -->
-<!-- For example, if the GNOME desktop release is V2.x, the first version of the manual that -->
-<!-- is written in that desktop timeframe is V2.0, the second version of the manual is V2.1, etc. -->
-<!-- When the desktop release version changes to V3.x, the revision number of the manual changes -->
-<!-- to V3.0, and so on. -->
-    <revhistory>
-      <revision>
-	<revnumber>Empathy Manual V&manrevision;</revnumber>
-	<date>&date;</date>
-	<revdescription>
-	  <para role="author">Milo Casagrande
-	    <email>milo@ubuntu.com</email>
-	  </para>
-	  <para role="publisher">GNOME Documentation Project</para>
-	</revdescription>
-      </revision>
-
-      <revision>
-	<revnumber>Empathy Manual V2.1</revnumber>
-	<date>January 2009</date>
-	<revdescription>
-	  <para role="author">Milo Casagrande
-	    <email>milo@ubuntu.com</email>
-	  </para>
-	  <para role="publisher">Ubuntu Documentation Project</para>
-	</revdescription>
-      </revision>
-
-      <revision> 
-	<revnumber>Empathy Manual V2.0</revnumber>
-	<date>April 2008</date>
-	<revdescription>
-	  <para role="author">Milo Casagrande
-	    <email>milo@ubuntu.com</email>
-	  </para>
-	  <para role="author">Seth Dudenhofer
-	    <email>sdudenhofer@gmail.com</email>
-	  </para>
-	  <para role="publisher">Ubuntu Documentation Project</para>
-	</revdescription>
-      </revision>
-    </revhistory> 
-    
-    <releaseinfo>
-      This manual describes version &appversion; of &appname;.
-    </releaseinfo> 
-    <legalnotice> 
-      <title>Feedback</title> 
-      <para>
-	To report a bug or make a suggestion regarding the &app; application or
-	this manual, follow the directions in the <ulink url="ghelp:user-guide?feedback" type="help">GNOME Feedback Page</ulink>. 
-      </para>
-    </legalnotice>
-
-    <abstract role="description">
-      <para>
-	&appname; is an application for instant messaging.
-      </para>
-    </abstract>
-
-  </articleinfo>
-
-  <indexterm zone="index"> 
-    <primary>Empathy</primary>
-  </indexterm>
-  <indexterm zone="index">
-    <primary>empathy</primary>
-    <secondary>istant messaging</secondary>
-  </indexterm>
-
-  <sect1 id="empathy-intro">
-    <title>Introduction</title>
-    <para>
-      &app; is a multi-protocol instant messaging program for the
-      GNOME Desktop. With &app; you can keep in touch with all of your
-      friends through lots of supported instant messaging services.
-    </para>
-    <para>
-      &app; supports the following services:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    <acronym>AIM</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Google Talk
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    ICQ
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <acronym>IRC</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Jabber (or <acronym>XMPP</acronym>)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <acronym>MSN</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Salut
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <acronym>SIP</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Yahoo
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    And many others...
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-  </sect1>
-
-  <sect1 id="empathy-getting-started">
-    <title>Getting Started</title>
-
-    <sect2 id="empathy-starting">
-      <title>Starting &appname;</title>
-      <para>You can start &app; in the following ways:
-      </para> 
-      <variablelist>
-    	<varlistentry>
-	  <term><guimenu>Applications</guimenu> menu</term>
-	  <listitem>
-	    <para>Choose 
-	      <menuchoice>
-		<guisubmenu>Internet</guisubmenu>
-		<guimenuitem>Empathy IM Client</guimenuitem>
-	      </menuchoice>.
-	    </para>
-	  </listitem>
-    	</varlistentry>
-    	<varlistentry>
-	  <term>Command line</term>
-	  <listitem>
-	    <para>Type <command>empathy</command> and then press
-	      <keycap>Enter</keycap>.
-	    </para>
-	  </listitem>
-    	</varlistentry>
-      </variablelist>
-    </sect2>
-
-    <sect2 id="emphaty-when-start">
-      <title>When You Start &appname;</title>
-      <para>
-	When you start &app; the following window is shown.
-	<!-- Figure 1 -->
-	<figure id="empathy-FIG-mainwindow"> 
-	  <title>&app; Main Window</title> 
-	  <screenshot> 
-	    <mediaobject> 
-	      <imageobject>
-		<imagedata fileref="figures/empathy-main-window.png" format="PNG"/> 
-	      </imageobject>
-	      <textobject> 
-		<phrase>
-		  Shows &app; main window. Contains the	titlebar, the
-		  menubar, contact list, status icon and status arrow
-		  button list.
-		</phrase> 
-	      </textobject> 
-	    </mediaobject> 
-	  </screenshot> 
-	</figure>
-	<!-- End of Figure -->
-      </para>
-      <para>
-	<xref linkend="empathy-TBL-1"/> describes the components of
-	&app;'s main window.
-	<table frame="topbot" id="empathy-TBL-1">
-	  <title>&app; Main Components</title>
-	  <tgroup cols="2" colsep="0" rowsep="0">
-	    <colspec colname="colspec0" colwidth="29.39*"/>
-	    <colspec colname="colspec1" colwidth="70.61*"/>
-	    <thead>
-	      <row rowsep="1">
-		<entry valign="top">
-		  <para>Component</para>
-		</entry>
-		<entry valign="top">
-		  <para>Description</para>
-		</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry valign="top">
-		  <para>Menubar</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Contains menus used to perform actions in &app;.
-		  </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry valign="top">
-		  <para>Status Drop-Down List</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Allows to update the status.
-		  </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry valign="top">
-		  <para>Account Button</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Opens the <guilabel>Accounts</guilabel> dialog.
-		  </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry valign="top">
-		  <para>Contact List</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Shows all the available contacts and their
-		    associated status.
-		  </para>
-		</entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</table>
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="empathy-accounts">
-    <title>Accounts</title>
-    <para>
-      To use &app; you need at least one account of the supported services.
-    </para>
-    <para>
-      If you don't already have an account and you don't have your <emphasis>user
-	name</emphasis> and <emphasis>password</emphasis>, you need to
-	register a new account (see <xref linkend="empathy-register-account" />).
-    </para>
-    <para>
-      In order to talk with other users, also called
-      <emphasis>contacts</emphasis>, you need to use the same service
-      they are using. If, for example, one contact is using the <emphasis
-      role="strong">Jabber</emphasis> service, you need to have an
-      account registered with that service.
-    </para>
-    <para>
-      &app; can handle as many accounts on any supported services as you want and
-      you can have them all open at the same time.
-    </para>
-
-    <sect2 id="empathy-register-account">
-      <title>Registering an Account</title>
-      <para>
-	You can freely register an account on any of the following
-	services. Follow the instructions reported on each website on
-	how to register your new account. At the end of the
-	registration process you should have a <emphasis>user
-	  name</emphasis> (or an <emphasis>account ID</emphasis>) and
-	a <emphasis>password</emphasis> that you will use to
-	create the account in &app;.
-      </para>
-      <para>
-	Click on the name of the service to visit its website:
-	<!-- Need to do like that, if using only
-	<ulink>SERVICE</ulink> it wouldn't be possibile to
-	localize the links -->
-	<itemizedlist>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&aim;">AIM</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&gtalk;">Google
-	      Talk</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	   <para>
-	      The <ulink type="http" url="&icq;">ICQ</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&msn;">MSN</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&yahoo;">Yahoo</ulink> service.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-	For registering a <acronym>SIP</acronym> account, you can use one of the
-	following service:
-      </para>
-      <para>
-	<itemizedlist>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&ekiga;">Ekiga</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&fwd;"><acronym>FWD</acronym></ulink> (Free
-	      World Dialup) service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&sipphone;">Sipphone</ulink> service.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-	For registering a <emphasis role="strong">Jabber</emphasis>
-	account, you can use the automatic
-	account creation of &app;. Not all Jabber service
-	providers support the automatic creation of accounts, one
-	service provider known to work with &app; is <ulink
-	type="http" url="&jabber;">jabber.org</ulink>.
-      </para>
-      <para>
-	If you already have a <emphasis
-	role="strong">Jabber</emphasis> account, you can use one of
-	the following services:
-      </para>
-      <para>
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Salut
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="empathy-create-account">
-      <title>Adding your Account to &app;</title>
-      <para>
-	To add your account to &app;, proceed as follows:
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main window
-	      </link> (<guilabel>Contact List</guilabel>)
-	      click on the account button or press <keycap>F4</keycap> to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      If it is the first time you launch &app;:
-	      <orderedlist>
-		<listitem>
-		  <para>
-		    From the <guilabel>Type</guilabel> drop-down list choose
-		    the service you wish to add an account for, then click
-		    on the <guibutton>Create</guibutton> button.
-		  </para>
-		</listitem>
-	      </orderedlist>
-	    </para>
-	    <para>
-	      Otherwise:
-	      <orderedlist>
-		<listitem>
-		  <para>
-		    Click on the <guilabel>Add</guilabel> button.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    From the <guilabel>Type</guilabel> drop-down list choose
-		    the service you wish to add an account for, then click
-		    on the <guibutton>Create</guibutton> button.
-		  </para>
-		</listitem>
-	      </orderedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Fill the required fields with your <emphasis>user
-		name</emphasis> and
-		<emphasis>password</emphasis>. Optionally, you can
-		modify some advanced options. For more information,
-	      see <xref linkend="empathy-advanced-options"/>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      To enable the new account, select the
-	      <guilabel>Enabled</guilabel> check-box next to
-	      the name of the account in the box on the left.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      
-      <sect3 id="empathy-importing-accounts">
-	<title>Importing Accounts</title>
-	<para>
-	  If you use another instant messaging program, you can import
-	  the accounts from that program into &app;
-	</para>
-	<para>
-	  <note>
-	    <para>
-	      At the moment &app; can import the accounts only from
-	      the instant messaging program
-	      <application>Pidgin</application>. For more information
-	      about <application>Pidgin</application>, see the <ulink
-	      type="http" url="http://www.pidgin.im/">Pidgin website</ulink>.
-	    </para>
-	  </note>
-	</para>
-	<para>
-	  To import the accounts into &app;, proceed as follows:
-	  <orderedlist>
-	    <listitem>
-	      <para>
-		From the <link linkend="empathy-FIG-mainwindow">main window
-		</link> (<guilabel>Contact List</guilabel>)
-		click on the account button or press <keycap>F4</keycap> to open the
-		<guilabel>Accounts</guilabel> dialog.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click on the <guibutton>Import Accounts...</guibutton>
-		button to open the <guilabel>Import
-		Accounts</guilabel> dialog.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Select the accounts you would like to import by
-		clicking on the <guilabel>Import</guilabel> check-box.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		When you have selected all the desired accounts, click
-		<guibutton>OK</guibutton> to import them. If you don't
-		want to import the accounts, click
-		<guibutton>Cancel</guibutton>.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		When you import a new account into &app;, it will not be
-		enabled by default.
-	      </para>
-	      <para>
-		To enable the new account, select the
-		<guilabel>Enabled</guilabel> check-box next to
-		the name of the account in the box on the left.
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="empathy-edit-account">
-      <title>Editing an Account</title>
-      <para>
-	To edit one of your accounts, i.e. to change the
-	<emphasis>password</emphasis> or your <emphasis>user
-	name</emphasis>, proceed as follows:
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main window
-	      </link> (<guilabel>Contact List</guilabel>)
-	      click on the account button or press <keycap>F4</keycap> to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the account you wish to edit in the box on the
-	      left.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Modify the desired data.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	<note>
-	  <para>
-	    Based on the type of the account, it is possibile to edit
-	    different settings.
-	  </para>
-	</note>
-      </para>
-      <para>
-	To modify the identifier of an account, how &app; identifies
-	an account, proceed as follows:
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main window
-	      </link> (<guilabel>Contact List</guilabel>)
-	      click on the account button or press <keycap>F4</keycap> to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the account you wish to edit in the box on the
-	      left and double-click on its name.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Change the name of the account as you desire.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="empathy-disabling-removing-account">
-      <title>Disabling and Removing an Account</title>
-      <para>
-	To disable an account, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main window
-	      </link> (<guilabel>Contact List</guilabel>)
-	      click on the account button or press <keycap>F4</keycap>
-	      to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the account you wish to disable in the box on the
-	      left of the dialog and deselect the
-	      <guilabel>Enabled</guilabel> check-box.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	To remove an account, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main window
-	      </link> (<guilabel>Contact List</guilabel>)
-	      click on the account button or press <keycap>F4</keycap>
-	      to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the account you wish to disable in the box on the
-	      left of the dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click on the <guibutton>Remove</guibutton> button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      A dialog will be shown asking for confirmation. Click on
-	      the <guibutton>Remove</guibutton> button to remove the account.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    
-    <sect2 id="empathy-edit-personal-information">
-      <title>Editing Personal Information</title>
-      <para>
-	To change your personal information, your alias and your
-	icon (the image that other contacts will see of you), for each
-	of your accounts, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link>, select <menuchoice>
-		<guimenu>Edit</guimenu>
-		<guimenuitem>Personal Information</guimenuitem>
-	      </menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      From the <guilabel>Account</guilabel> drop-down list, choose
-	      the account you want to edit.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the <guilabel>Alias</guilabel> text box, write your new
-	      alias.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      To change your icon, click on the person-looking button and
-	      choose an image file.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      When done, click <guibutton>Close</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	<note>
-	  <para>
-	    An <emphasis>alias</emphasis> is an alternative way you
-	    can identify yourself. You can use your real
-	    name or a nickname.
-	  </para>
-	</note>
-      </para>
-    </sect2>
-    
-    <sect2 id="empathy-advanced-options">
-      <title>Advanced Options</title> 
-      <para>
-	Based on the service you are using, it is possible to
-	configure more advanced options to modify the normal behavior of
-	&app;.
-      </para>
-      <para>
-	To configure these options, when you are <link
-	linkend="empathy-create-account">adding a new
-	account</link>, click on the drop-down section
-	<guilabel>Advanced</guilabel>.
-      </para>
-
-      <sect3 id="empathy-xmpp-advanced">
-	<title>
-	  Jabber (or <acronym>XMPP</acronym>) and Google Talk
-	</title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Encryption required (TLS/SSL)</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Select this option in order to use some sort of
-		  encryption during your conversations.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Ignore SSL certificate errors</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Select this option in order to ignore the errors
-		  that can be generated by some types of security
-		  certificates. Usually these certificates are called
-		  auto-signed.
-		</para>
-		<para>
-		  <note>
-		    <para>
-		      Select this option only if you are sure the
-		      certificate is secure and you can trust it.
-		    </para>
-		  </note>
- 		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Resource</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to set a name with which you can
-		  identify the running program based on where you are
-		  running it. With this option, and the
-		  <guilabel>Priority</guilabel> one, you can
-		  use your account simultaneously in two different
-		  devices. For example, if you set one device to
-		  <replaceable>desktop</replaceable> and the other
-		  one to <replaceable>mobile</replaceable>, you can
-		  connect with both of them and based on the
-		  <guilabel>Priority</guilabel> value you will receive
-		  messages on one of the two devices or both.
-		</para>
-		<para>
-		  This can be useful if you have two devices, a main
-		  one and a portable one, and you move away from the
-		  main one bringing with you the other: you can still
-		  receive messages from your account with the portable
-		  device even if you do not disconnet from the main one.
-		</para>
-		<para>
-		  <note>
-		    <para>
-		      If you set the same value for this text box on
-		      both the devices, when you connect with one of
-		      them, the other one will be disconnected, even
-		      if you set a different value with the
-		      <guilabel>Priority</guilabel> spin box.
-		    </para>
-		  </note>
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Priority</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this spin box to indicate wich device, set in
-		  the <guilabel>Resource</guilabel> text box, will
-		  receive the new messages. The higher the number, the
-		  higher the priority: you will receive the new
-		  messages on the device with the highest number.
-		</para>
-		<para>
-		  You can set values in the range from
-		  <literal>-128</literal> to <literal>127</literal>.
-		</para>
-		<para>
-		  <note>
-		    <para>
-		      If you set the same value of this spin box in
-		      both the devices, you will receive messages on
-		      both of them.
-		    </para>
-		  </note>
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-	<para>
-	  In the <guilabel>Override server settings</guilabel> section
-	  you can set options that take precedence over the default settings.
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Server</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write the name of the
-		  server you want to use for this service.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Port</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this spin box to set the number of the port of
-		  the server to use.
-		</para>
-		<para>
-		  You can set values in the range from
-		  <literal>0</literal> to <literal>65,555</literal>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Use old SSL</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Select this option to use the old version of the
-		  secure protocol for encrypting your connection.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-      </sect3>
-
-      <sect3 id="empathy-yahoo-advanced">
-	<title>Yahoo</title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Ignore conference and chatrooms
-		invitations</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Select this option to ignore the invitations that
-		  other people may send you.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Room List locale</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  The value of this text box identifies the language
-		  used to retrieve the room list when connecting to
-		  the Yahoo service.
-		</para>
-		<para>
-		  If you need to change this value, use the two letter
-		  code of your language.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Charset</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  The value of this text box identifies the set of the
-		  characters used by &app;.
-		</para>
-		<para>
-		  <note>
-		    <para>
-		      It is advise to leave this value to
-		      <literal>UTF-8</literal>. Change it only
-		      if that charset does not cover your language.
-		    </para>
-		  </note>
-		</para>
-	      </listitem>
-	    </varlistentry>		  
-	    <varlistentry>
-	      <term>
-		<guilabel>Server</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write the name of the
-		  server you want to use for this service.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Port</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this spin box to set the number of the port of
-		  the server to use.
-		</para>
-		<para>
-		  You can set values in the range from
-		  <literal>0</literal> to <literal>65,555</literal>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Use Yahoo Japan</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Select this option only if you have a Yahoo! Japan
-		  account. With the Yahoo! Japan service you can only
-		  use a Yahoo! Japan account: if you have registered
-		  an account with the English version of the service,
-		  that account will not work. 
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-      </sect3>
-
-      <sect3 id="empathy-msn-advanced">
-	<title><acronym>AIM</acronym>, GroupWise and <acronym>MSN</acronym></title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Server</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write the name of the
-		  server you want to use for this service.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Port</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this spin box to set the number of the port of
-		  the server to use.
-		</para>
-		<para>
-		  You can set values in the range from
-		  <literal>0</literal> to <literal>65,555</literal>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>	    
-	</para>
-      </sect3>
-
-      <sect3 id="empathy-salut-advanced">
-	<title>Salut</title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Published Name</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write the name that will be
-		  visible to the other users of the network. 
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Email</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write your email.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Jabber ID</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write your Jabber ID, if you
-		  have one.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-      </sect3>
-
-      <sect3 id="empathy-icq-advanced">
-	<title>ICQ</title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Charset</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  The value of this text box identifies the set of the
-		  characters used by &app;.
-		</para>
-		<para>
-		  <note>
-		    <para>
-		      It is advise to leave this value to
-		      <literal>UTF-8</literal>. Change it only
-		      if that charset does not cover your language.
-		    </para>
-		  </note>
-		</para>
-	      </listitem>
-	    </varlistentry>		  
-	    <varlistentry>
-	      <term>
-		<guilabel>Server</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write the name of the
-		  server you want to use for this service.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Port</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this spin box to set the number of the port of
-		  the server to use.
-		</para>
-		<para>
-		  You can set values in the range from
-		  <literal>0</literal> to <literal>65,555</literal>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-      </sect3>
-
-      <sect3 id="empathy-gadugadu-advanced">
-	<title>Gadu Gadu</title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term><guilabel>Nick</guilabel></term>
-	      <listitem>
-		<para>
-		  Use this text box to write an alternative name to
-		  use with this service.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-      </sect3>
-
-    </sect2>
-    
-  </sect1>
-
-  <sect1 id="empathy-contacts-groups">
-    <title>Contacts and Groups</title>
-    <para>
-      All the contacts are handled within &app;'s <link
-      linkend="empathy-FIG-mainwindow">main window</link>.
-    </para>
-    <para>
-      You can add or remove a contact or you can edit the information
-      of a particular contact. It is also possibile to arrange
-      contacts in groups. You can have a group for your work contacts,
-      one for you family contacts, and so on.
-    </para>
-     <sect2 id="empathy-add-contact">
-      <title>Adding and Removing a Contact</title>
-      <para>
-	To add a new contact, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link> choose <menuchoice>
-		<guimenu>Chat</guimenu>
-		<guimenuitem>Add Contact...</guimenuitem>
-	      </menuchoice>. The <guilabel>New Contact</guilabel>
-		dialog will be shown.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      From the <guilabel>Account</guilabel> drop-down list,
-	      choose the service used by the contact you are adding.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the <guilabel>Identifier</guilabel> text box type the
-	      <emphasis>address</emphasis> of the contact in the form
-	      of
-	      <userinput><replaceable>user name</replaceable>@<replaceable>service
-	      domain</replaceable></userinput>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the <guilabel>Alias</guilabel> text box type the name
-	      you want to give at the the new contact.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click on <guibutton>Add</guibutton> to add the new contact.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	To remove a contact, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-	      window</link>, select the contact you would like
-	      to remove and right-click on it.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      From the popup menu, choose <guilabel>Remove</guilabel> to
-	      remove the contact.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	<note>
-	  <para>
-	    An <emphasis>alias</emphasis> is an alternative way you
-	    can identify that particular contact. You can use the real
-	    name or the nickname of that person.
-	  </para>
-	</note>
-      </para>
-    </sect2>
-    <sect2 id="empathy-edit-contact">
-      <title>Editing a Contact</title>
-      <para>
-	To edit a contact, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link>, select the contact you would like
-	      to modify and choose <menuchoice>
-		<guimenu>Edit</guimenu>
-		<guisubmenu>Contact</guisubmenu>
-		<guimenuitem>Edit</guimenuitem>
-	      </menuchoice>, or right-click on it
-	      and choose <guilabel>Edit</guilabel>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	From the <guilabel>Edit Contact Information</guilabel> dialog,
-	you can modify the <emphasis>alias</emphasis>
-	and the <emphasis>group</emphasis> of the contact.
-      </para>
-      <para>
-	<note>
-	  <para>
-	    An <emphasis>alias</emphasis> is an alternative way you
-	    can identify that particular contact. You can use the real
-	    name or the nickname of that person.
-	  </para>
-	</note>
-      </para>
-      <para>
-	For more information about groups, see <xref
-	  linkend="empathy-add-contact-group"/> and <xref
-	  linkend="empathy-add-group"/>.
-      </para>
-    </sect2>
-    
-    <sect2 id="empathy-add-contact-group">
-      <title>Adding a Contact to a Group</title>
-      <para>
-	To add a contact to one or more groups, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link>, select the contact you would like
-	      to modify and choose <menuchoice>
-		<guimenu>Edit</guimenu>
-		<guisubmenu>Contact</guisubmenu>
-		<guimenuitem>Edit</guimenuitem>
-	      </menuchoice>, or right-click on it
-	      and choose <guilabel>Edit</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      From the <guilabel>Groups</guilabel> section, select the
-	      group, or groups, you want to add the contact to.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      When done, click <guibutton>Close</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="empathy-add-group">
-      <title>Adding a New Group</title>
-      <para>
-	To add a new group, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link>, select one contact and choose <menuchoice>
-		<guimenu>Edit</guimenu>
-		<guisubmenu>Contact</guisubmenu>
-		<guimenuitem>Edit</guimenuitem>
-	      </menuchoice>, or right-click on it
-	      and choose <guilabel>Edit</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the <guilabel>Groups</guilabel> section, write the
-	      name of the group you want to add and then click on
-	      <guibutton>Add Group</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      When done, click <guibutton>Close</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>	
-    </sect2>
-  </sect1>
-
-<!--
-  <sect1 id="empathy-send-receive-message">
-    <title>Sending and Receiving Messages</title>
-    <para>
-    </para>
-  </sect1>
-
-  <sect1 id="empathy-preferences">
-    <title>Preferences</title>
-    <para>
-    </para>
-  </sect1>
--->
-  
-</article>
diff --git a/help/C/favorite-rooms.page b/help/C/favorite-rooms.page
new file mode 100644
index 000000000..747c09d66
--- /dev/null
+++ b/help/C/favorite-rooms.page
@@ -0,0 +1,135 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="favorite-rooms">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <link type="guide" xref="irc-manage#manage"/>
+    <link type="seealso" xref="irc-join-room"/>
+    <link type="seealso" xref="group-conversations"/>
+    <desc>Set, join and manage favorite rooms.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-21" status="draft"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Favorite rooms</title>
+
+  <section id="set-favorite">
+  <title>Set a room as a favorite</title>
+  <steps>
+    <item>
+      <p>
+        Join a room.
+      </p>
+      <list>
+        <item>
+          <p>
+             See <link xref="irc-join-room"/> for more information on how to join
+             an IRC room.
+          </p>
+        </item>
+        <item>
+          <p>
+            See <link xref="group-conversations"/> for more information on how to
+            start or join a group conversation.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        From the conversation window, choose 
+        <guiseq><gui>Conversation</gui><gui>Favorite Chatroom</gui></guiseq>.
+      </p>
+    </item>
+  </steps>
+  </section>
+
+  <section id="join-favorite">
+  <title>Join favorite rooms</title>
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Press <key>F5</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to
+            join all your favorite rooms.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <gui>Room</gui>, and select the favorite room you want to join.
+          </p>
+        </item>
+      </list>
+    </item>
+  </steps>
+  <note>
+    <p>
+      To join a favorite room, you need to be connected to the Internet and to
+      your account.
+    </p>
+  </note>
+  </section>
+
+  <section id="manage-favorite">
+  <title>Manage favorite rooms</title>
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, choose
+        <guiseq><gui>Room</gui><gui>Manage Favorites</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the account you want to
+        manage the favorite rooms of.
+      </p>
+      <p>
+        Select <gui>All</gui> to see all you favorite rooms.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select the favorite room you want to manage:
+      </p>
+      <list>
+        <item>
+          <p>
+            Select the <gui>Auto-Connect</gui> check-box in order to automatically
+            join that room when you connect to your account.
+          </p>
+        </item>
+        <item>
+          <p>
+            Click on <gui>Remove</gui> to remove the room from your favorites.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        When done, click <gui>Close</gui>.
+      </p>
+    </item>
+  </steps>
+  </section>
+
+</page>
diff --git a/help/C/figures/audio-input-microphone.png b/help/C/figures/audio-input-microphone.png
new file mode 100644
index 000000000..f45d15d56
--- /dev/null
+++ b/help/C/figures/audio-input-microphone.png
diff --git a/help/C/figures/available.png b/help/C/figures/available.png
new file mode 100644
index 000000000..66b24967a
--- /dev/null
+++ b/help/C/figures/available.png
diff --git a/help/C/figures/away.png b/help/C/figures/away.png
new file mode 100644
index 000000000..ff59e309d
--- /dev/null
+++ b/help/C/figures/away.png
diff --git a/help/C/figures/busy.png b/help/C/figures/busy.png
new file mode 100644
index 000000000..fec554d89
--- /dev/null
+++ b/help/C/figures/busy.png
diff --git a/help/C/figures/camera-web.png b/help/C/figures/camera-web.png
new file mode 100644
index 000000000..e5406c5b9
--- /dev/null
+++ b/help/C/figures/camera-web.png
diff --git a/help/C/figures/empathy-main-window.png b/help/C/figures/empathy-main-window.png
index 12a6a33fc..bb803442f 100644
--- a/help/C/figures/empathy-main-window.png
+++ b/help/C/figures/empathy-main-window.png
diff --git a/help/C/geolocation-not-showing.page b/help/C/geolocation-not-showing.page
new file mode 100644
index 000000000..845f7e74b
--- /dev/null
+++ b/help/C/geolocation-not-showing.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-not-showing">
+
+  <info>
+    <link type="guide" xref="geolocation#problems"/>
+    <desc>
+      <app>Empathy</app> does not publish my geographical position.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Geographical position not published</title>
+
+  <p>
+    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.
+  </p>
+  <p>
+    In this case, your position will not be published, but you are still able to
+    see the location of your contacts.
+  </p>
+  <p>
+    If you want to publish your geographical position, you can try to use an
+    external device such as a GPS.
+  </p>
+
+</page>
diff --git a/help/C/geolocation-privacy.page b/help/C/geolocation-privacy.page
new file mode 100644
index 000000000..23694e2b7
--- /dev/null
+++ b/help/C/geolocation-privacy.page
@@ -0,0 +1,89 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-privacy">
+
+  <info>
+    <link type="guide" xref="geolocation#geoloc"/>
+    <desc>
+      What information are sent and to who.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Geolocation privacy</title>
+
+  <section id="info-sent">
+  <title>What are the information sent</title>
+  <p>
+    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.
+  </p>
+  <p>
+    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.
+  </p>
+  <p>
+    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.
+  </p>
+  <p>
+    When the privacy mode is enabled, nothing more precise than your city will be
+    sent, even if you are using an external device.
+  </p>
+  </section>
+  
+  <section id="see-info">
+  <title>Who can see the information sent</title>
+  <p>
+    Only your contacts can see your geographical position.
+  </p>
+  </section>
+  
+  <section id="privacy-mode">
+  <title>What is the privacy mode</title>
+  <p>
+    The privacy mode, enabled by default, is a reduced accuracy mode that will
+    decrease the accuracy of the geographical position sent to your contacts.
+  </p>
+  </section>
+  
+  <section id="privacy-overview">
+  <title>Privacy overview</title>
+  <p>
+    Overview of the various geolocation privacy settings in <app>Empathy</app>.
+  </p>
+  <list>
+    <item>
+      <p>
+        Geolocation is not enabled by default.
+      </p>
+    </item>
+    <item>
+      <p>
+        Privacy mode is enabled by default.
+      </p>
+    </item>
+    <item>
+      <p>
+        Privacy mode prevails even when using external and more precise devices.
+      </p>
+    </item>
+    <item>
+      <p>
+        Only your contacts can see your position.
+      </p>
+    </item>
+  </list>
+  </section>
+
+</page>
diff --git a/help/C/geolocation-supported.page b/help/C/geolocation-supported.page
new file mode 100644
index 000000000..f67b43755
--- /dev/null
+++ b/help/C/geolocation-supported.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-supported">
+
+  <info>
+    <desc>
+      Services that supports geolocation and compatibility.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="draft"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Supported services</title>
+
+  <p>
+    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.
+  </p>
+  
+  <note>
+    <p>
+      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.
+    </p>
+  </note>
+  
+  <section id="compatibility">
+  <title>Compatibility</title>
+  
+  <p>
+    <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>.
+  </p>
+  
+  </section>
+  
+</page>
diff --git a/help/C/geolocation-turn.page b/help/C/geolocation-turn.page
new file mode 100644
index 000000000..6c01be90b
--- /dev/null
+++ b/help/C/geolocation-turn.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-turn">
+
+  <info>
+    <link type="guide" xref="geolocation#geoloc"/>
+    <link type="seealso" xref="geolocation-privacy"/>
+    <desc>
+      How to activate and deactivate geolocation in <app>Empathy</app>.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Activate/Deactivate geolocation</title>
+
+  <steps>
+    <item>
+      <p>
+        Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select the <gui>Location</gui> tab.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select <gui>Publish location to my contacts</gui> to activate geolocation.
+      </p>
+      <p>
+        To deactivate geolocation, deselect it.
+      </p>
+    </item>
+    <item>
+      <p>
+        To increase the accuracy of your position, deselect
+        <gui>Reduce location accuracy</gui>.
+      </p>
+    </item>
+    <item>
+      <p>
+        If you have an external device like a GPS or want to send a more accurate
+        position, select the appropriate option in the <gui>Geoclue Settings</gui>
+        section. 
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/geolocation-what-is.page b/help/C/geolocation-what-is.page
new file mode 100644
index 000000000..77fcff8dd
--- /dev/null
+++ b/help/C/geolocation-what-is.page
@@ -0,0 +1,58 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-what-is">
+
+  <info>
+    <link type="guide" xref="geolocation#geoloc"/>
+    <link type="seealso" xref="geolocation-supported"/>
+    <desc>
+      Understanding geolocation.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>What is geolocation</title>
+
+  <p>
+    With <em>geolocation</em> it is intended the possibility to identify the real
+    geographical position of a computer or a device connected to the Internet.
+  </p>
+  <p>
+    With geolocation in <app>Empathy</app> you can:
+  </p>
+  <list>
+    <item>
+      <p>
+        Publish your geographical position to your contacts.
+      </p>
+    </item>
+    <item>
+      <p>
+        See your contacts geographical position and quickly contact them.
+      </p>
+    </item>
+    <item>
+      <p>
+        Set the accuracy of your position and the device used to discover your
+        position.
+      </p>
+    </item>
+  </list>
+
+  <note style="tip">
+    <p>
+      In order to see your contacts geographical position, they need to use a
+      service and an application that support geolocation.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/geolocation.page b/help/C/geolocation.page
new file mode 100644
index 000000000..409d22f49
--- /dev/null
+++ b/help/C/geolocation.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="guide"
+  id="geolocation"
+  style="2colum">
+
+  <info>
+    <link type="guide" xref="index#advanced"/>
+    <desc>
+      Use and understand geolocation in <app>Empathy</app>.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+  
+  <title>Geographical position</title>
+
+  <section id="geoloc" style="2column">
+    <title>Geolocation</title>
+  </section>
+
+  <section id="problems" style="2column">
+    <title>Fix common problems</title>
+  </section>
+
+</page>
diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page
new file mode 100644
index 000000000..fcc0b4365
--- /dev/null
+++ b/help/C/group-conversations.page
@@ -0,0 +1,140 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="group-conversations">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <desc>
+      Start or join a group conversation with 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-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-17" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Group conversations</title>
+  
+  <p>
+    Group conversations permits you to have text conversations with more than one
+    contact at the same time.
+  </p>
+  <p>
+    To have a group conversation you need to have a registered account with either
+    Jabber or Google Talk, or a Salut account.
+  </p>
+
+  <note>
+    <p>
+      You can have a group conversation only with the contacts that are using the
+      same service as yours.
+    </p>
+  </note>
+
+  <section id="start-group-conv">
+
+  <title>Start a group conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</gui><gui>Join</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the account you want to use
+        for the group conversation.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Server</gui> text box, type the name of server in which the conversation
+        will be hosted.
+      </p>
+      <p>
+        Leave it empty if it will be on the current server.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Room</gui> text box, type the name you want to give to the conversation.
+      </p>
+      <note>
+        <p>
+          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.
+        </p>
+      </note>
+    </item>
+    <item>
+      <p>
+        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:
+      </p>
+      <list>
+        <item>
+          <p>
+            Right-click on the contact, and select <gui>Invite to chatroom</gui>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</gui></guiseq>.
+          </p>
+        </item>
+      </list> 
+      <p>
+        If you have more than one group conversation open, select the one you want to invite
+        your contacts.
+      </p>
+    </item>
+  </steps>
+  
+  </section>
+
+  <section id="join-group-conv">
+
+  <title>Join a group conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, choose
+        <guiseq><gui>Room</gui><gui>Join</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        Expand the <gui>Room List</gui> section to see all the existing rooms.
+      </p>
+    </item>
+    <item>
+      <p>
+        Double-click on the name of a room to join it.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    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.
+  </p>
+
+  <!-- TODO: find out where the password protected or invitation only icons are
+  and create a table. -->
+
+  </section>
+
+</page>
diff --git a/help/C/index.page b/help/C/index.page
new file mode 100644
index 000000000..a57596560
--- /dev/null
+++ b/help/C/index.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      style="2column"
+      id="index">
+
+  <info>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="incomplete"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Empathy Instant Messenger</title>
+
+  <section id="audio-video" style="2column">
+    <title>Audio and video conversations</title>
+  </section>
+
+  <section id="text-conv" style="2column">
+    <title>Text conversations</title>
+  </section>
+
+  <section id="accounts" style="2column">
+    <title>Manage accounts</title>
+  </section>
+
+  <section id="advanced" style="2column">
+    <title>Advanced actions</title>
+  </section>
+
+  <section id="problems" style="2column">
+    <title>Fix common problems</title>
+  </section>
+
+</page>
diff --git a/help/C/introduction.page b/help/C/introduction.page
new file mode 100644
index 000000000..23255b7b1
--- /dev/null
+++ b/help/C/introduction.page
@@ -0,0 +1,46 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="introduction">
+
+  <info>
+    <link type="guide" xref="index"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-16" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-17" status="review"/>
+    <desc>
+      Introduction to the <app>Empathy</app> instant messenger.
+    </desc>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Introduction</title>
+
+  <p>
+    <app>Empathy</app> is an instant messaging application for the GNOME Desktop.
+    It supports text messaging, voice &amp; video call, file transfers and all the
+    most used messaging systems such as MSN and Google Talk.
+  </p>
+  <p>
+    <app>Empathy</app> includes features that help you better collaborate while at work,
+    and that let you easily keep in touch with your friends.  
+  </p>
+  <p>
+    You can group all the conversations in a single window, or have multiple windows for
+    different kind of conversations; easily search through your previous conversations, and
+    share your desktop in just two clicks.
+  </p>
+
+  <p>
+    <media type="image" src="figures/empathy-main-window.png" mime="image/png" style="right">
+      <app>Empathy</app> main window.
+    </media>
+  </p>
+
+</page>
diff --git a/help/C/irc-account.page b/help/C/irc-account.page
new file mode 100644
index 000000000..dd43fbb97
--- /dev/null
+++ b/help/C/irc-account.page
@@ -0,0 +1,128 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="prob-conn-neterror"/>
+    <link type="seealso" xref="prob-conn-name"/>
+    <desc>Create an IRC account.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Create an IRC account</title>
+
+  <steps>
+    <item>
+      <p>
+	      From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+	        <p>
+	          Press <key>F4</key>.
+	        </p>
+	      </item>
+	      <item>
+	        <p>
+	          Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+	        </p>
+      	</item>
+      </list>
+    </item>
+    <item>
+      <p>
+	      If it is the first time you launch <app>Empathy</app>:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          From the <gui>Type</gui> drop-down list choose
+	          <gui>IRC</gui>, then click on the <gui>Create</gui> button.
+	        </p>
+	      </item>
+      </list>
+      <p>
+	      Otherwise:
+      </p>
+      <steps>
+	      <item>
+	        <p>
+	          Click on the <gui>Add</gui> button.
+	        </p>
+	      </item>
+	      <item>
+	        <p>
+	          From the <gui>Type</gui> drop-down list choose
+	          <gui>IRC</gui>, then click on the <gui>Create</gui> button.
+	        </p>
+	      </item>
+	     </steps>
+	   </item>
+	   <item>
+	    <p>
+	      From the <gui>Network</gui> drop-down list, select the name of the network
+	      you are creating the account for.
+	    </p>
+	   </item>
+	   <item>
+	   <!-- TODO: rethink the description of the nickname -->
+	    <p>
+	      In the <gui>Nickname</gui> text box, type the name that will identify yourself
+	      in the network you are creating the account.
+	    </p>
+	   </item>
+	   <item>
+	    <p>
+	      In the <gui>Password</gui> text box, type the password you used to register
+	      your nikcname. If you do not have one, leave this field blank.
+	    </p>
+	   </item>
+	   <item>
+	    <p>
+	      In the <gui>Real name</gui> text box, type your real name.
+	    </p>
+	    <note>
+	      <p>
+	        It is not necessary to insert your real name.
+	      </p>
+	    </note>
+	   </item>
+	   <item>
+	    <p>
+	      In the <gui>Quit message</gui> text box, type a text message that will be
+	      sent when you close your session.
+	    </p>
+	   </item>
+	   <item>
+	    <p>
+	      To enable the new account, select the <gui>Enabled</gui> check-box
+	      next to the name of the account in the box on the left of the dialog.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    If you want to change the name that identifies the account in the <gui>Accounts</gui>
+    dialog, double-click on the name of the account in the box on the left of the dialog
+    and type the new name.
+  </p>
+
+  <note style="tip">
+    <p>
+      If you want to use different networks at the same time, you need to create an
+      account with each one of the networks you want to use.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page
new file mode 100644
index 000000000..67de473bd
--- /dev/null
+++ b/help/C/irc-join-pwd.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-join-pwd">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <link type="seealso" xref="irc-join-room"/>
+    <desc>Join a password protected room.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-07" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Join a protected room</title>
+
+  <p>
+    At the moment it is not possible to join a password protected room.
+  </p>
+
+</page>
diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page
new file mode 100644
index 000000000..8461b1de1
--- /dev/null
+++ b/help/C/irc-join-room.page
@@ -0,0 +1,54 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-join-room">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <desc>Join an IRC channel.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Join a room</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, choose
+        <guiseq><gui>Room</gui><gui>Join</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the IRC account that
+        corresponds to the network you want to use.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Room</gui> text box, type the name of the channel you want to
+        join. Prefix the name with the hash character (<sys>#</sys>).
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on <gui>Join</gui> to enter the room.
+      </p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>
+      To join multiple rooms, you need to repeat the steps above for each room.
+    </p>
+  </note>
+</page>
diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
new file mode 100644
index 000000000..07b6163f0
--- /dev/null
+++ b/help/C/irc-manage.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="guide"
+  id="irc-manage">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <link type="seealso" xref="irc-account"/>
+    <desc>How to use IRC with <app>Empathy</app>.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Use IRC</title>
+
+  <section id="manage" style="2column">
+    <title>IRC rooms and conversations</title>
+  </section>
+
+  <section id="problems" style="2column">
+    <title>Fix common problems</title>
+  </section>
+
+
+</page>
diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page
new file mode 100644
index 000000000..63cdd0965
--- /dev/null
+++ b/help/C/irc-nick-password.page
@@ -0,0 +1,96 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-nick-password">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <link type="seealso" xref="prob-conn-name"/>
+    <desc>How to set the password of a nickname.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Set the nickname password</title>
+
+  <p>
+    Registering a nickname is useful to preserve your identity on IRC, and to be able
+    to use always the same nickname. In some cirtumstances, some IRC channels may be
+    configured to accept only registered nickname.
+  </p>
+
+  <p>
+    If you have registered your nickname with a password on a network that supports nickname
+    registration, you can use that password with <app>Empathy</app> to identify yourself as
+    the owner of that nickname.
+  </p>
+  
+  <note>
+    <p>
+      Not all the IRC servers support nickname registration.
+    </p>
+  </note>
+
+  <steps>
+    <item>
+      <p>
+	      From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+	        <p>
+	          Press <key>F4</key>.
+	        </p>
+	      </item>
+	      <item>
+	        <p>
+	          Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+	        </p>
+      	</item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the IRC account from the box on the left of the dialog.
+      </p>
+    </item>
+    <item>
+      <p>
+        If the account is enabled, disable it by deselecting the <gui>Enable</gui>
+        check-box next to the name of the account.
+      </p>
+    </item>
+    <item>
+      <p>
+	      In the <gui>Password</gui> text box, type the password you used to register
+	      your nikcname.
+      </p>
+    </item>
+    <item>
+      <p>
+	      Enable the account by selecting the <gui>Enabled</gui> check-box
+	      next to the name of the account.
+      </p>
+      <p>
+        Once connected, you will receive a message from the nickname server that will
+        tell you of the established identification.
+      </p>
+    </item>
+  </steps>
+
+  <note>
+    <p>
+      At the moment it is not possible to register an IRC nickname with <app>Empathy</app>, it is
+      only possible to use the password of an already registered nickname.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/irc-sending-file.page b/help/C/irc-sending-file.page
new file mode 100644
index 000000000..804efa9fa
--- /dev/null
+++ b/help/C/irc-sending-file.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-send-file">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <link type="seealso" xref="send-file"/>
+    <desc>Send a file from your computer to one of the IRC contacts.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Send files</title>
+
+  <p>
+    At the moment it is not possible to send files using IRC.
+  </p>
+
+</page>
diff --git a/help/C/irc-start-conversation.page b/help/C/irc-start-conversation.page
new file mode 100644
index 000000000..0f73bdad6
--- /dev/null
+++ b/help/C/irc-start-conversation.page
@@ -0,0 +1,62 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-start-conversation">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <desc>Start a conversation witn an IRC contact.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Start a conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        To start a private conversation with one of the IRC contacts that
+         are in a room, after you joined a room, from the IRC room contact list perform
+         one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Double-click the name of contact you want to have a conversation with.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with,
+             and select <gui>Chat</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+  </steps>
+
+  <list>
+    <item>
+      <p>
+        The IRC room contact list is not the same as <app>Empathy</app> <gui>Contact List</gui>,
+         and is relative only to the IRC room you joined. Different rooms can have different
+         contacts listed.
+      </p>
+    </item>
+    <item>
+      <p>
+        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>.
+      </p>
+    </item>
+  </list>
+
+</page>
diff --git a/help/C/legal.xml b/help/C/legal.xml
index ac97e1de4..86d6173ad 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -1,76 +1,9 @@
-  <legalnotice id="legalnotice">
-	<para>
-	  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.
-         </para>
-         <para> 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.
-	</para>
-
-	<para>
-	  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.
-	</para>
-
-	<para>
-	  DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
-	  UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
-	  WITH THE FURTHER UNDERSTANDING THAT:
-
-	  <orderedlist>
-		<listitem>
-		  <para>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
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>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.
-		  </para>
-		</listitem>
-	  </orderedlist>
-	</para>
-  </legalnotice>
-
+<license xmlns="http://projectmallard.org/1.0/"
+         href="http://creativecommons.org/licenses/by-sa/3.0/">
+<p>This work is licensed under a
+<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
+Attribution-Share Alike 3.0 Unported License</link>.</p>
+<p>As a special exception, the copyright holders give you permission to copy,
+modify, and distribute the example code contained in this document under the
+terms of your choosing, without restriction.</p>
+</license>
diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page
new file mode 100644
index 000000000..b3f30f6cd
--- /dev/null
+++ b/help/C/offline-contacts.page
@@ -0,0 +1,50 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="offline-contacts">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <desc>
+      How to see the contacts that are not online.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-24" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+    	<year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Display offline contacts</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Choose <guiseq><gui>View</gui><gui>Offline Contacts</gui></guiseq>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Press <keyseq><key>Ctrl</key><key>H</key></keyseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        To hide the offline contacts again, repeat the same procedure above.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page
new file mode 100644
index 000000000..b521ada59
--- /dev/null
+++ b/help/C/prev-conv.page
@@ -0,0 +1,153 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prev-conv">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <desc>
+      Search your previous conversations.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-17" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Previous conversations</title>
+
+  <p>
+    <app>Empathy</app> automatically saves all your text conversations you have
+    with your contacts, and lets you perform two different kinds of search: a
+    normal text search, or a per-conversation search.
+  </p>
+  <p>
+    The normal search is a <em>full text</em> search: it will search the exact text in
+    all your previous conversations.
+  </p>
+  <p>
+    The per-conversation search permits you to limit the text search to a particular
+    contact and conversation, and permits you to look at all the previous
+    conversations you had with your contacts.
+  </p>
+
+  <note>
+    <p>
+      You do not need to be connected to the Internet to search your previous
+      conversations.
+    </p>
+  </note>
+
+  <steps>
+    <item>
+      <p>
+        To start searching your previous conversations, from the <gui>Contact List</gui>
+        window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Press <key>F3</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>View</gui><gui>Previous Conversations</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Based on the kind of search you want to perform, see
+        <link xref="prev-conv#normal-search"/> or <link xref="prev-conv#contact-search"/>
+        for more information.
+      </p>
+    </item>
+  </steps>
+
+  <section id="normal-search">
+  <title>Normal search</title>
+  <steps>
+    <item>
+      <p>
+        Select the <gui>Search</gui> tab.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>For</gui> text box, type the text you want to search, and click on
+        <gui>Find</gui>.
+      </p>
+    </item>
+    <item>
+      <p>
+        If there are results, they will be shown in the first pane, ordered by date.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on the result to see the exact text you were searching for on the
+        bottom pane.
+      </p>
+      <p>  
+        The search results will be highlighted.
+      </p>
+    </item>
+  </steps>
+  </section>
+
+  <section id="contact-search">
+  <title>Conversation search</title>
+  <steps>
+    <item>
+      <p>
+        Select the <gui>Conversations</gui> tab.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the drop-down list at the top of the window, select your account.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the left top pane, select the contact you want to look the previous
+        conversations of. The previous conversations will be shown on the right pane.
+      </p>
+      <p>
+        By default, the last conversation you had will be shown.
+      </p>
+      <note>
+        <p>
+          Based on your account selected and the service of that account, it will
+          be possible to select contacts, IRC rooms or group conversations. 
+        </p>
+      </note>
+    </item>
+    <item>
+      <p>
+        From the left bottom pane, you can browse your conversations by date. Based
+        on the contact selected, the date in which you had a conversation will
+        be highlighted in bold text.
+      </p>
+    </item>
+    <item>
+      <p>
+        To perform a text search, type the text you want to search in the text box
+        at the top of the window.
+      </p>
+      <p>
+        The search results will be highlighted.
+      </p>
+    </item>
+  </steps>
+  </section>
+
+</page>
diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page
new file mode 100644
index 000000000..1daf61406
--- /dev/null
+++ b/help/C/prob-conn-acctdisabled.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-acctdisabled">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <desc>
+        The instant messaging account that you want to use is not enabled in
+        the list of accounts.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>My account is not enabled</title>
+
+  <p>
+    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.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        Make sure that you are connected to the Internet, or to a local area network. 
+      </p>
+    </item>
+    <item>
+      <p>
+        Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the account
+        that is not working.
+      </p>
+    </item>
+    <item>
+      <p>
+        Type your username and password again to make sure that they are correct.
+      </p>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+    <item>
+      <p>
+        Check that the <gui>Enabled</gui> check-box next to the name of your account is selected.
+        If it is not, select the check-box to enalbe the account.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page
new file mode 100644
index 000000000..a0d5c187d
--- /dev/null
+++ b/help/C/prob-conn-auth.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-auth">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <link type="seealso" xref="create-account"/>
+    <desc>
+        An error message which says "<gui>Authentication failed</gui>" appears
+        in the main window.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-23" status="draft"/>
+    <revision pkgversion="2.28" version="0.3" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>I get a message that says "Authentication failed"</title>
+
+  <p>
+    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.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        Make sure that you are connected to the Internet, or to a local area network. 
+      </p>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on the <gui>Edit Account</gui> button in the error message.
+      </p>
+    </item>
+    <item>
+      <p>
+        Type your username and password again to make sure that they are correct.
+      </p>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+  </steps>
+</page>
diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page
new file mode 100644
index 000000000..3e4edd40c
--- /dev/null
+++ b/help/C/prob-conn-name.page
@@ -0,0 +1,62 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-name">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <link type="guide" xref="irc-manage#problems"/>
+    <desc>
+      An error message which says "<gui>Name in use</gui>" appears in the main window.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>I get a message that says "Name in use"</title>
+
+  <p>
+    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.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        Click on the <gui>Edit Account</gui> button in the error message.
+      </p>
+    </item>
+    <item>
+      <list>
+        <item>
+          <p>
+            In the <gui>Nickname</gui> text box, type a new nickname.
+          </p>
+        </item>
+        <item>
+          <p>
+            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"/>.            
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
new file mode 100644
index 000000000..8001ed49b
--- /dev/null
+++ b/help/C/prob-conn-neterror.page
@@ -0,0 +1,74 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-neterror">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <link type="guide" xref="irc-manage#problems" />
+    <desc>
+        An error message which says "<gui>Network error</gui>" appears in the main window.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>I get a message that says "Network error"</title>
+
+  <p>
+    This kind of error happens when <app>Empathy</app> cannot communicate
+    with the instant messaging service for some reason.
+  </p>
+  <p>
+    Also, this kind of error happens when you try to use an IRC account without
+    setting a nickname.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        Make sure that you are connected to the Internet, or to a local area network. 
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on the <gui>Edit Account</gui> button in the error message.
+      </p>
+    </item>
+    <item>
+      <list>
+        <item>
+          <p>
+            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.
+          </p>
+        </item>
+        <item>
+          <p>
+            In the case of an IRC account, type your nickname in the <gui>Nickname</gui>
+            text box.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page
new file mode 100644
index 000000000..400793a7b
--- /dev/null
+++ b/help/C/prob-conn.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="guide"
+  id="prob-conn">
+
+  <info>
+    <link type="guide" xref="index#problems"/>
+    <desc>
+      Diagnose common problems connecting to an instant messaging service.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-26" status="draft"/>
+    <revision pkgversion="2.28" version="0.3" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Problems connecting to an instant messaging service</title>
+
+</page>
diff --git a/help/C/remove-account.page b/help/C/remove-account.page
new file mode 100644
index 000000000..5728b40d0
--- /dev/null
+++ b/help/C/remove-account.page
@@ -0,0 +1,70 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="remove-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <desc>Completely remove an account from <app>Empathy</app>.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Remove an account</title>
+
+  <p>
+    Removing an account means to delete it from your computer with all
+    the conversations you had with other people.
+  </p>
+  <p>
+    After removing an account you will not be able to recover it or to recover
+     the conversations you had.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Press <key>F4</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the account you wish to remove from the box on the
+         left of the dialog.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on the <gui>Remove</gui> button.
+      </p>
+    </item>
+    <item>
+      <p>
+        A dialog will be shown asking for confirmation. Click on
+         the <gui>Remove</gui> button to permanently remove the
+         account.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page
new file mode 100644
index 000000000..176921e4c
--- /dev/null
+++ b/help/C/salut-protocol.page
@@ -0,0 +1,43 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="salut-protocol">
+
+  <info>
+    <link type="seealso" xref="create-account"/>
+    <desc>
+      Undesrtanding the <em>Salut</em> protocol.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-12" status="draft"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>What is the <em>Salut</em> service?</title>
+
+  <p>
+    The <em>Salut</em> service is a serverless communication service:
+    you do not need to connect and authenticate to a central server in
+    order to use it.
+  </p>
+  <p>
+    This kind of serverless messaging system is restricted to a local area
+    network and an active Internet connection is not necessary.
+  </p>
+  <p>
+    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.
+  </p>
+  <p>
+    All the modern local area networks should be able to support this kind
+    of service.
+  </p>
+</page>
diff --git a/help/C/send-file.page b/help/C/send-file.page
new file mode 100644
index 000000000..960d0cc46
--- /dev/null
+++ b/help/C/send-file.page
@@ -0,0 +1,89 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="send-file">
+
+  <info>
+    <link type="guide" xref="index#advanced"/>
+    <desc>Send a file from your computer to one of your contacts.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Send files</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Right-click on the contact you want to send a file, and select <gui>Send file</gui>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Click on the contact you want to send a file, and choose <guiseq><gui>Edit</gui>
+            <gui>Contact</gui><gui>Send file</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the file to send, and click on <gui>Send</gui>.
+      </p>
+    </item>
+    <item>
+      <p>
+        The <gui>File Transfers</gui> window will appear.
+      </p>
+      <p>
+        Wait for your contact to accept the file transfer, or click 
+        <gui>Stop</gui> to halt the transfer.
+      </p>
+    </item>
+    <item>
+      <p>
+        Once the transfer is finished, it is possible to close the <gui>File Transfers</gui>
+        window.
+      </p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>
+      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.
+    </p>
+  </note>
+  <note>
+    <p>
+      It is possible to send files only using the following services: <em>Jabber</em>,
+       <em>Google Talk</em> and <em>Salut</em>.
+    </p>
+  </note>
+  <note>
+    <p>
+      In order to send a file to someone, you need to be connected to the Internet, or to
+      a local area network.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/send-message.page b/help/C/send-message.page
new file mode 100644
index 000000000..997236ccb
--- /dev/null
+++ b/help/C/send-message.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="send-message">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <desc>Send a message to one of your contacts.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Send a message to someone</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Double-click the name of the contact that you want to have a conversation
+            with.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with, and
+            select <gui>Chat</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page
new file mode 100644
index 000000000..6b9dabe50
--- /dev/null
+++ b/help/C/set-custom-status.page
@@ -0,0 +1,166 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="set-custom-status">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="change-status"/>
+	  <link type="seealso" xref="status-icons"/>
+    <desc>
+      Add, edit or delete personal messages for your status.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-30" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Jim Campbell</name>
+      <email>jwcampbell@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Set a custom message</title>
+
+  <p>
+    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.
+  </p>
+  <p>
+    It is possible to set a custom message based on the different statuses available.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, click on the drop-down list at
+        the top.
+      </p>
+    </item>
+    <item>
+      <p>
+        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>.
+      </p>
+    </item>
+    <item>
+      <p>
+        Enter your custom message in the text box at the top of the window, and
+        press <key>Enter</key> to set the message.
+      </p>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+      <p>
+        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.
+      </p>
+    </item>
+  </steps>
+
+  <section id="edit-custom">
+
+  <title>Edit, remove and add a custom message</title>
+
+  <steps>
+    <item>
+     <p>
+        From the <gui>Contact List</gui> window, click on the drop-down list at
+        the top.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select <gui>Edit Custom Message</gui>.
+      </p>
+    </item>
+	  <item>
+	    <list>
+	      <item>
+	        <p>
+	          To edit a custom message:
+	        </p>
+	        <steps>
+	          <item>
+	            <p>
+	              From the <gui>Saved Presets</gui> box, select the status message
+	              you want to edit and double-click on it.
+              </p>
+            </item>
+            <item>
+              <p>
+                Type the new custom message and press <key>Enter</key> to modify it.
+              </p>
+            </item>
+          </steps>
+        </item>
+        <item>
+          <p>
+            To remove a custom message:
+          </p>
+          <steps>
+            <item>
+              <p>
+                From the <gui>Saved Presets</gui> box, select the status message you want
+                to remove.
+              </p>
+            </item>
+            <item>
+              <p>
+                Click on the <gui>Remove</gui> button.
+              </p>
+            </item>
+          </steps>
+        </item>
+        <item>
+          <p>
+            To add a new custom message, from the <gui>Add New Preset</gui> section:
+          </p>
+          <steps>
+            <item>
+              <p>
+                Click on the drop-down list to select the status you want to set a custom
+                message to.
+              </p>
+            </item>
+            <item>
+              <p>
+                Click on the text box, and type the new custom message.
+              </p>
+            </item>
+            <item>
+              <p>
+                Click on <gui>Add</gui> to add the new message to the presets ones.
+              </p>
+            </item>
+          </steps>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        When finished, click on <gui>Close</gui>.
+      </p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>
+      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.
+    </p>
+  </note>
+
+  </section>
+
+</page>
diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page
new file mode 100644
index 000000000..06a3d7c40
--- /dev/null
+++ b/help/C/share-desktop.page
@@ -0,0 +1,85 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="share-desktop">
+
+  <info>
+    <link type="guide" xref="index#advanced"/>
+    <desc>
+      Share the desktop with 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"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <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.
+  </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.
+    </p>
+  </note>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform 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>.
+          </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>.
+          </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.
+      </p>
+      <p>
+        For more information about how to use the remote desktop viewer application,
+         refer to its help.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    When you share your desktop with someone else, it is possible to experience
+     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.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/start-conversation.page b/help/C/start-conversation.page
new file mode 100644
index 000000000..d7123c4e4
--- /dev/null
+++ b/help/C/start-conversation.page
@@ -0,0 +1,71 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="start-conversation">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <link type="guide" xref="index#text-conv"/>
+    <link type="seealso" xref="add-contact"/>
+    <desc>General method to start a conversation.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Start a conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Choose <guiseq><gui>Chat</gui><gui>New conversation</gui></guiseq>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Press <keyseq><key>Ctrl</key><key>N</key></keyseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the account you want to
+         use for the conversation.
+      </p>
+      <p>
+        This one is one of your accounts.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Contact ID</gui> text box, type the identifier of the contact you want to
+         have a conversation with.
+      </p>
+      <p>
+        You have to enter the identifier as it has been inserted when adding a new contact to
+         your contact list. If you are trying to start a conversation using one of your IRC
+         accounts or a SIP account, you have to enter the exact nickname or the
+         exact SIP address of the contact.
+      </p>
+    </item>
+    <item>
+      <p>
+        To start a text conversation, click on <gui>Chat</gui>; to start
+         an audio conversation, click on <gui>Call</gui>.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/status-icons.page b/help/C/status-icons.page
new file mode 100644
index 000000000..35c91e543
--- /dev/null
+++ b/help/C/status-icons.page
@@ -0,0 +1,97 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="status-icons">
+
+  <info>
+    <desc>
+      Understanding the various status icons.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-18" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Status icons</title>
+
+  <table frame="all" rules="cols" shade="rows">
+    <thead>
+      <tr>
+        <td>
+          <p>
+            Icon
+          </p>
+        </td>
+        <td>
+          <p>
+            Description
+          </p>
+        </td>
+      </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>
+        <p>
+        <media type="image" mime="image/png" src="figures/available.png">
+          Available icon
+        </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the default icon for the <em>Available</em> status.
+        </p>
+        <p>
+          Use this icon when you are availble to have conversations with other
+          people.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p>
+        <media type="image" mime="image/png" src="figures/busy.png">
+          Busy icon
+        </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the default icon for the <em>Busy</em> status.
+        </p>
+        <p>
+          Use this icon when you do not want to be disturbed.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p>
+        <media type="image" mime="image/png" src="figures/away.png">
+          Away icon
+        </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the default icon for the <em>Away</em> status.
+        </p>
+        <p>
+          Use this icon when you are going away from the computer. This icon
+          is used also when you leave the computer and the screensaver turns on.
+        </p>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+
+</page>
diff --git a/help/C/video-call.page b/help/C/video-call.page
new file mode 100644
index 000000000..6f918ee6e
--- /dev/null
+++ b/help/C/video-call.page
@@ -0,0 +1,68 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="video-call">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <link type="seealso" xref="audio-video"/>
+    <desc>
+      Start a video conversation with one of 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-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+  <title>Start a video conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Select the contact you want to have a conversation with, and click
+            on the video call icon next to their name.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with, and
+            select <gui>Video Call</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        A new window will open. When the connection is established, you will
+        see written, at the bottom of the window, <gui>Connected</gui> and the total
+        conversation time.
+      </p>
+    </item>
+    <item>
+      <p>
+        To close the conversation, click on <gui>Hang up</gui>.
+      </p>
+    </item>
+  </steps>
+  <note style="tip">
+    <p>
+      To turn a video conversation into an audio one, from the call window deselect
+      <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>,
+      or click on the video call icon.
+    </p>
+  </note>
+
+
+
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index f51965b59..4041f9ad9 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,8 +1,57 @@
 include $(top_srcdir)/gnome-doc-utils.make
 
-DOC_MODULE = empathy
-DOC_ENTITIES = legal.xml
+DOC_ID = empathy
+DOC_INCLUDES = legal.xml
 DOC_FIGURES = \
+	figures/audio-input-microphone.png \
+	figures/available.png \
+	figures/away.png \
+	figures/busy.png \
+	figures/camera-web.png \
 	figures/empathy-main-window.png
+
+DOC_PAGES = \
+	add-account.page \
+	add-contact.page \
+	audio-call.page \
+	audio-video.page \
+	change-status.page \
+	create-account.page \
+	disable-account.page \
+	favorite-rooms.page \
+	geolocation.page \
+	geolocation-not-showing.page \
+	geolocation-privacy.page \
+	geolocation-supported.page \
+	geolocation-turn.page \
+	geolocation-what-is.page \
+	group-conversations.page \
+	index.page \
+	introduction.page \
+	irc-account.page \
+	irc-join-pwd.page \
+	irc-join-room.page \
+	irc-manage.page \
+	irc-nick-password.page \
+	irc-sending-file.page \
+	irc-start-conversation.page \
+	offline-contacts.page \
+	prev-conv.page \
+	prob-conn-acctdisabled.page \
+	prob-conn-auth.page \
+	prob-conn-name.page \
+	prob-conn-neterror.page \
+	prob-conn.page \
+	remove-account.page \
+	salut-protocol.page \
+	send-file.page \
+	send-message.page \
+	set-custom-status.page \
+	share-desktop.page \
+	start-conversation.page \
+	status-icons.page \
+	video-call.page
+
+
 DOC_LINGUAS = ca cs de el en_GB es fi fr it ru sv
 dist-hook: doc-dist-hook
diff --git a/help/de/de.po b/help/de/de.po
index a77763d82..3932dc304 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"POT-Creation-Date: 2009-07-26 09:48+0000\n"
-"PO-Revision-Date: 2009-07-26 17:56+0100\n"
+"POT-Creation-Date: 2009-07-30 18:05+0000\n"
+"PO-Revision-Date: 2009-08-04 21:48+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -331,9 +331,12 @@ msgid "<guimenu>Applications</guimenu> menu"
 msgstr "Menü <guimenu>Anwendungen</guimenu>"
 
 #: C/empathy.xml:228(para)
+#| msgid ""
+#| "Choose <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy "
+#| "Instant Messenger</guimenuitem></menuchoice>."
 msgid ""
-"Choose <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy "
-"Instant Messenger</guimenuitem></menuchoice>."
+"Choose <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy IM "
+"Client</guimenuitem></menuchoice>."
 msgstr ""
 "Wählen Sie <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy "
 "Sofortnachrichtendienst</guimenuitem></menuchoice>."
@@ -1417,4 +1420,4 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 "Mario Blättermann <mariobl@gnome.org>, 2008, 2009\n"
-"Philipp Kerling <k.philipp@gmail.com>, 2008"
-\ No newline at end of file
+"Philipp Kerling <k.philipp@gmail.com>, 2008"
diff --git a/help/es/es.po b/help/es/es.po
index 753288b03..8a1a1a79d 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -1,10 +1,10 @@
-# translation of empathy.help.HEAD.po to Español
-# Jorge González <jorgegonz@svn.gnome.org>, 200, 2009.
+# translation of empathy-help.po to Español
+# Jorge González <jorgegonz@svn.gnome.org>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy.help.HEAD\n"
-"POT-Creation-Date: 2009-05-05 20:43+0000\n"
-"PO-Revision-Date: 2009-05-09 10:54+0200\n"
+"Project-Id-Version: empathy-help\n"
+"POT-Creation-Date: 2009-08-14 21:29+0200\n"
+"PO-Revision-Date: 2009-08-15 14:20+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,1488 +13,1675 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\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.
-#: C/empathy.xml:262(None)
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:8(desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Iniciar una conversación de vídeo con uno de sus contactos."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:14(title)
+msgid "Start a video conversation"
+msgstr "Comenzar una conversación de vídeo"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:18(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:42(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:26(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:31(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:34(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:36(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:39(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:27(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:37(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:20(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:26(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:"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:23(p)
 msgid ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=38259a866f38ff1f754828e46d2b0e5c"
+"Select the contact you want to have a conversation with, and click on the "
+"video call icon next to their name."
 msgstr ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=38259a866f38ff1f754828e46d2b0e5c"
+"Seleccione el contacto con el que quiera tener una conversación y pulse en "
+"el icono de vídeo llamada junto a su nombre."
 
-#: C/empathy.xml:27(title)
-#| msgid "<application>Empathy</application> Manual V2.1"
-msgid "<application>Empathy</application> Manual V2.2"
-msgstr "Manual de <application>Empathy</application> V2.2"
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:29(p)
+msgid ""
+"Right-click on the name of the contact you want to have a conversation with, "
+"and select <gui>Video Call</gui>."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre el nombre del contacto con el que "
+"quiera tener una conversación y seleccione <gui>Llamada de vídeo</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:37(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:39(p)
+msgid ""
+"A new window will open. When the connection is established, you will see "
+"written, at the bottom of the window, <gui>Connected</gui> and the total "
+"conversation time."
+msgstr ""
+"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá escrito, "
+"en la parte inferior de la ventana, <gui>Connectado</gui> y el tiempo total "
+"de conversación."
 
-#: C/empathy.xml:30(year) C/empathy.xml:46(year)
-msgid "2008, 2009"
-msgstr "2008, 2009"
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:44(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:46(p)
+msgid "To close the conversation, click on <gui>Hang up</gui>."
+msgstr "Para cerrar la conversación pulse <gui>Colgar</gui>."
 
-#: C/empathy.xml:31(holder) C/empathy.xml:47(publishername)
-#: C/empathy.xml:62(orgname) C/empathy.xml:70(orgname) C/empathy.xml:112(para)
-#: C/empathy.xml:126(para)
-msgid "Ubuntu Documentation Project"
-msgstr "Proyecto de documentación de Ubuntu"
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:50(p)
+msgid ""
+"To turn a video conversation into an audio one, from the call window "
+"deselect <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>, or click on "
+"the video call icon."
+msgstr ""
+"Para convertir una conversación de vídeo en una de sonido, desde la ventana "
+"de llamada deseleccione <guiseq><gui>Llamar</gui><gui>Enviar vídeo</gui></"
+"guiseq> o pulse el icono de vídeo llamada."
 
-#: C/empathy.xml:34(year) C/empathy.xml:42(year)
-#| msgid "2008"
+#. 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.
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:55(None)
+msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+
+#. 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.
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:73(None)
+msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+
+#. 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.
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:90(None)
+msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:6(desc)
+msgid "Understanding the various status icons."
+msgstr "Entender los diversos iconos de estado."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:27(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:16(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:27(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:11(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:36(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:14(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:32(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:14(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:28(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:12(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:11(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:25(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:11(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:12(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:10(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:15(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:15(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:12(name)
+msgid "Milo Casagrande"
+msgstr "Milo Casagrande"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:17(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:12(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:15(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:15(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:13(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:12(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:12(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:13(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:11(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:16(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:16(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:13(email)
+msgid "milo@ubuntu.com"
+msgstr "milo@ubuntu.com"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:19(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:15(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:20(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:15(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:18(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:18(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:22(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:18(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:16(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:15(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:15(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:16(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:14(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:19(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:19(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:18(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:16(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:16(year)
 msgid "2009"
 msgstr "2009"
 
-#: C/empathy.xml:35(holder) C/empathy.xml:43(publishername)
-#: C/empathy.xml:58(orgname) C/empathy.xml:101(para)
-#| msgid "Ubuntu Documentation Project"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:20(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:16(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:21(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:16(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:19(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:19(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:23(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:19(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:17(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:16(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:16(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:17(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:15(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:20(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:20(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:19(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:17(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:17(name)
 msgid "GNOME Documentation Project"
 msgstr "Proyecto de documentación de GNOME"
 
-#: C/empathy.xml:2(para)
-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."
-msgstr ""
-"Se concede permiso para copiar, distribuir o modificar este documento según "
-"las condiciones de la GNU Free Documentation License (GFDL), Versión 1.1 o "
-"cualquier versión posterior publicada por la Free Software Foundation sin "
-"Secciones invariantes, Textos de portada y Textos de contraportada. "
-"Encontrará una copia de la GFDL en este <ulink type=\"help\" url=\"ghelp:fdl"
-"\">enlace</ulink> o en el archivo COPYING-DOCS distribuido con este manual."
-
-#: C/empathy.xml:12(para)
-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."
-msgstr ""
-"Este manual forma parte de una colección de documentos de GNOME distribuidos "
-"según la GFDL. Si desea distribuir este manual de forma independiente de la "
-"colección, puede hacerlo agregando una copia de la licencia al documento, "
-"según se describe en la sección 6 de la misma."
-
-#: C/empathy.xml:19(para)
-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."
-msgstr ""
-"Muchos de los nombres utilizados por las empresas para distinguir sus "
-"productos y servicios se consideran marcas comerciales. Cuando estos nombres "
-"aparezcan en la documentación de GNOME, y siempre que se haya informado a "
-"los miembros del Proyecto de documentación de GNOME de dichas marcas "
-"comerciales, los nombres aparecerán en mayúsculas o con las iniciales en "
-"mayúsculas."
-
-#: C/empathy.xml:35(para)
-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"
-msgstr ""
-"EL DOCUMENTO SE PROPORCIONA \"TAL CUAL\", SIN GARANTÍA DE NINGÚN TIPO, NI "
-"EXPLÍCITA NI IMPLÍCITA INCLUYENDO, SIN LIMITACIÓN, GARANTÍA DE QUE EL "
-"DOCUMENTO O VERSIÓN MODIFICADA DE ÉSTE CAREZCA DE DEFECTOS COMERCIALES, SEA "
-"ADECUADO A UN FIN CONCRETO O INCUMPLA ALGUNA NORMATIVA. TODO EL RIESGO "
-"RELATIVO A LA CALIDAD, PRECISIÓN Y UTILIDAD DEL DOCUMENTO O SU VERSIÓN "
-"MODIFICADA RECAE EN USTED. SI CUALQUIER DOCUMENTO O VERSIÓN MODIFICADA DE "
-"AQUÉL RESULTARA DEFECTUOSO EN CUALQUIER ASPECTO, USTED (Y NO EL REDACTOR "
-"INICIAL, AUTOR O CONTRIBUYENTE) ASUMIRÁ LOS COSTES DE TODA REPARACIÓN, "
-"MANTENIMIENTO O CORRECCIÓN NECESARIOS. ESTA RENUNCIA DE GARANTÍA ES UNA "
-"PARTE ESENCIAL DE ESTA LICENCIA. NO SE AUTORIZA EL USO DE NINGÚN DOCUMENTO "
-"NI VERSIÓN MODIFICADA DE ÉSTE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO "
-"DE LA RENUNCIA;Y"
-
-#: C/empathy.xml:55(para)
-msgid ""
-"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."
-msgstr ""
-"EN NINGUNA CIRCUNSTANCIA NI BAJO NINGUNA TEORÍA LEGAL, SEA POR ERROR "
-"(INCLUYENDO NEGLIGENCIA) CONTRATO O DOCUMENTO DE OTRO TIPO, EL AUTOR, EL "
-"ESCRITOR INICIAL, EL AUTOR DE APORTACIONES NI NINGÚN DISTRIBUIDOR DEL "
-"DOCUMENTO O VERSIÓN MODIFICADA DEL DOCUMENTO, NI NINGÚN PROVEEDOR DE NINGUNA "
-"DE ESAS PARTES, SERÁ RESPONSABLE ANTE NINGUNA PERSONA POR NINGÚN DAÑO "
-"DIRECTO, INDIRECTO, ESPECIAL, INCIDENTAL O DERIVADO DE NINGÚN TIPO, "
-"INCLUYENDO, SIN LIMITACIÓN DAÑOS POR PÉRDIDA DE FONDO DE COMERCIO, PARO "
-"TÉCNICO, FALLO INFORMÁTICO O AVERÍA O CUALQUIER OTRO POSIBLE DAÑO O AVERÍA "
-"DERIVADO O RELACIONADO CON EL USO DEL DOCUMENTO O SUS VERSIONES MODIFICADAS, "
-"AUNQUE DICHA PARTE HAYA SIDO INFORMADA DE LA POSIBILIDAD DE QUE SE "
-"PRODUJESEN ESOS DAÑOS."
-
-#: C/empathy.xml:28(para)
-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/>"
-msgstr ""
-"ESTE DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO SE PROPORCIONAN SEGÚN "
-"LAS CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÓN LIBRE DE GNU "
-"(GFDL) Y TENIENDO EN CUENTA QUE: <placeholder-1/>"
-
-#: C/empathy.xml:55(firstname)
-msgid "Milo"
-msgstr "Milo"
-
-#: C/empathy.xml:56(surname)
-msgid "Casagrande"
-msgstr "Casagrande"
-
-#: C/empathy.xml:59(email) C/empathy.xml:63(email)
-msgid "milo@ubuntu.com"
-msgstr "milo@ubuntu.com"
-
-#: C/empathy.xml:67(firstname)
-msgid "Seth"
-msgstr "Seth"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:24(title)
+msgid "Status icons"
+msgstr "Iconos de estado"
 
-#: C/empathy.xml:68(surname)
-msgid "Dudenhofer"
-msgstr "Dudenhofer"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:28(p)
+msgid ""
+"Need to understand when the extended away icon is used: how many minuts/"
+"hours should pass?"
+msgstr ""
+"Necesita entender cuándo se usa el icono de ausencia extendida: ¿cuántos "
+"minutos/horas deben pasar?"
 
-#: C/empathy.xml:71(email)
-msgid "sdudenhofer@gmail.com"
-msgstr "sdudenhofer@gmail.com"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:31(p)
+msgid "Need also to check for images to work!"
+msgstr "Necesita también comprobar que funcionen las imágenes."
 
-#: C/empathy.xml:95(revnumber)
-#| msgid "Empathy Manual V2.1"
-msgid "Empathy Manual V2.2"
-msgstr "Manual de Empathy V2.2"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:40(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:26(p)
+msgid "Icon"
+msgstr "Icono"
 
-#: C/empathy.xml:96(date)
-#| msgid "January 2009"
-msgid "May 2009"
-msgstr "Mayo de 2009"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:45(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:31(p)
+msgid "Description"
+msgstr "Descripción"
 
-#: C/empathy.xml:98(para) C/empathy.xml:109(para) C/empathy.xml:120(para)
-msgid "Milo Casagrande <email>milo@ubuntu.com</email>"
-msgstr "Milo Casagrande <email>milo@ubuntu.com</email>"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:55(media)
+msgid "Available icon"
+msgstr "Icono de disponible"
 
-#: C/empathy.xml:106(revnumber)
-msgid "Empathy Manual V2.1"
-msgstr "Manual de Empathy V2.1"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:61(p)
+msgid "This is the default icon for the <em>Available</em> status."
+msgstr "Éste es el icono predeterminado para el estado <em>Disponible</em>."
 
-#: C/empathy.xml:107(date)
-msgid "January 2009"
-msgstr "Enero de 2009"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:64(p)
+msgid ""
+"Use this icon when you are availble to have conversations with other people."
+msgstr ""
+"Use este icono cuando esté disponible para tener conversaciones con otras "
+"personas."
 
-#: C/empathy.xml:117(revnumber)
-msgid "Empathy Manual V2.0"
-msgstr "Manual de Empathy V2.0"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:73(media)
+msgid "Busy icon"
+msgstr "Icono de ocupado"
 
-#: C/empathy.xml:118(date)
-msgid "April 2008"
-msgstr "Abril de 2008"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:79(p)
+msgid "This is the default icon for the <em>Busy</em> status."
+msgstr "Éste es el icono predeterminado para el estado <em>Ocupado</em>."
 
-#: C/empathy.xml:123(para)
-msgid "Seth Dudenhofer <email>sdudenhofer@gmail.com</email>"
-msgstr "Seth Dudenhofer <email>sdudenhofer@gmail.com</email>"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:82(p)
+msgid "Use this icon when you do not want to be disturbed."
+msgstr "Use este icono cuando no quiera que le molesten."
 
-#: C/empathy.xml:131(releaseinfo)
-#| msgid "This manual describes version 2.26 of Empathy."
-msgid "This manual describes version 2.28 of Empathy."
-msgstr "Este manual describe la versión 2.28 de Empathy."
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:90(media)
+msgid "Away icon"
+msgstr "Icono de ausente"
 
-#: C/empathy.xml:135(title)
-msgid "Feedback"
-msgstr "Comentarios"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:96(p)
+msgid "This is the default icon for the <em>Away</em> status."
+msgstr "Éste es el icono predeterminado para el estado <em>Ausente</em>."
 
-#: C/empathy.xml:136(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:99(p)
 msgid ""
-"To report a bug or make a suggestion regarding the <application>Empathy</"
-"application> application or this manual, follow the directions in the <ulink "
-"url=\"ghelp:user-guide?feedback\" type=\"help\">GNOME Feedback Page</ulink>."
+"Use this icon when you are going away from the computer. This icon is used "
+"also when you leave the computer and the screensaver turns on."
 msgstr ""
-"Para informar de un fallo, o hacer alguna sugerencia concerniente a la "
-"aplicación <application>Empathy</application> o este manual, siga las "
-"indicaciones en la <ulink url=\"ghelp:user-guide?feedback\" type=\"help"
-"\">Página de comentarios de GNOME</ulink>."
-
-#: C/empathy.xml:143(para)
-msgid "Empathy is an application for instant messaging."
-msgstr "Empathy es una aplicación para mensajería instantánea."
-
-#: C/empathy.xml:151(primary) C/empathy.xml:0(application)
-msgid "Empathy"
-msgstr "Empathy"
+"Use este icono cuando vaya a estar ausente del equipo. Este icono se usa "
+"cuando deja el equipo y se activa el salvapantallas."
 
-#: C/empathy.xml:154(primary)
-msgid "empathy"
-msgstr "empathy"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:7(desc)
+msgid "Share the desktop with your contacts."
+msgstr "Compartir el escritorio con sus contactos."
 
-#: C/empathy.xml:155(secondary)
-msgid "istant messaging"
-msgstr "mensajería instantánea"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:24(title)
+msgid "Share your desktop"
+msgstr "Compartir su escritorio"
 
-#: C/empathy.xml:159(title)
-msgid "Introduction"
-msgstr "Introducción"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:26(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."
+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."
 
-#: C/empathy.xml:160(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:34(p)
 msgid ""
-"<application>Empathy</application> is a multi-protocol instant messaging "
-"program for the GNOME Desktop. With <application>Empathy</application> you "
-"can keep in touch with all of your friends through lots of supported instant "
-"messaging services."
+"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 ""
-"<application>Empathy</application> es un programa multiprotocolo de "
-"mensajería instantánea para el Escritorio GNOME. Con <application>Empathy</"
-"application> puede mantenerse en contacto con sus amigos a través de muchos "
-"de los servicios de mensajería instantánea soportados."
+"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."
 
-#: C/empathy.xml:170(acronym)
-msgid "AIM"
-msgstr "AIM"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:47(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>."
+msgstr ""
+"Seleccione el contacto con el que quiera compartir su escritorio y pulse "
+"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Compartir mi escritorio</"
+"gui></guiseq>."
 
-#: C/empathy.xml:174(para)
-msgid "Google Talk"
-msgstr "Google Talk"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:53(p)
+msgid ""
+"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/empathy.xml:179(para) C/empathy.xml:1114(title)
-msgid "ICQ"
-msgstr "ICQ"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:61(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."
+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."
 
-#: C/empathy.xml:185(acronym)
-msgid "IRC"
-msgstr "IRC"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:66(p)
+msgid ""
+"For more information about how to use the remote desktop viewer application, "
+"refer to its help."
+msgstr ""
+"Para obtener más información acerca de cómo usar la aplicación de visión de "
+"escritorios remotos, consulte su ayuda."
 
-#: C/empathy.xml:189(para)
-msgid "Jabber (or <acronym>XMPP</acronym>)"
-msgstr "Jabber (o <acronym>XMPP</acronym>)"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:73(p)
+msgid ""
+"When you share your desktop with someone else, it is possible to experience "
+"system performance slowdown and low Internet speed."
+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/empathy.xml:195(acronym)
-msgid "MSN"
-msgstr "MSN"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:79(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."
+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."
 
-#: C/empathy.xml:199(para) C/empathy.xml:466(para) C/empathy.xml:1074(title)
-msgid "Salut"
-msgstr "Salut"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:9(desc)
+msgid "Set a personal message for your status."
+msgstr "Establecer un mensaje personal para su estado."
 
-#: C/empathy.xml:205(acronym)
-msgid "SIP"
-msgstr "SIP"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:15(name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
 
-#: C/empathy.xml:209(para) C/empathy.xml:944(title)
-msgid "Yahoo"
-msgstr "Yahoo"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:16(email)
+msgid "jwcampbell@gmail.com"
+msgstr "jwcampbell@gmail.com"
 
-#: C/empathy.xml:214(para)
-msgid "And many others..."
-msgstr "Y muchos otros…"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:26(title)
+msgid "Set a custom message"
+msgstr "Establecer un mensaje personalizado"
 
-#: C/empathy.xml:165(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:28(p)
 msgid ""
-"<application>Empathy</application> supports the following services: "
-"<placeholder-1/>"
+"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 ""
-"<application>Empathy</application> soporta los siguientes servicios: "
-"<placeholder-1/>"
+"A veces puede querer usar un mensaje personal para su estado, por ejemplo, "
+"para hacer saber a sus contactos que no estará disponible por un periodo de "
+"tiempo."
 
-#: C/empathy.xml:223(title)
-msgid "Getting Started"
-msgstr "Inicio"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:32(p)
+msgid ""
+"It is possible to set a custom message based on the different statuses "
+"available."
+msgstr ""
+"Es posible establecer un mensaje personalizado basado en los diferentes "
+"estados disponibles."
 
-#: C/empathy.xml:226(title)
-msgid "Starting Empathy"
-msgstr "Iniciar Empathy"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:38(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:74(p)
+msgid ""
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
+msgstr ""
+"Desde la ventana de la <gui>Lista de contactos</gui>, pulse en la lista "
+"desplegable en la parte superior."
 
-#: C/empathy.xml:227(para)
-msgid "You can start <application>Empathy</application> in the following ways:"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:44(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>."
 msgstr ""
-"Puede iniciar <application>Empathy</application> de las siguientes formas:"
+"Seleccione el estado al que quiere añadir el mensaje personalizado. Tiene "
+"que seleccionar el identificado con la etiqueta <gui>Mensaje personalizado</"
+"gui>."
 
-#: C/empathy.xml:231(term)
-msgid "<guimenu>Applications</guimenu> menu"
-msgstr "Menú <guimenu>Aplicaciones</guimenu>"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:50(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."
+msgstr ""
+"Introduzca su mensaje personalizado en la caja de texto en la parte superior "
+"de la ventana y pulse <key>Intro</key> para establecer el mensaje."
 
-#: C/empathy.xml:233(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:56(p)
 msgid ""
-"Choose <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy "
-"Instant Messenger</guimenuitem></menuchoice>."
+"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 ""
-"Elija <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Mensajería "
-"instantánea Empathy</guimenuitem></menuchoice>."
+"Si quiere establecer el mensaje personalizado como un favorito, guardándolo "
+"para usarlo de nuevo, pulse en la pequeña estrella a la derecha de la caja "
+"de texto donde escribió su mensaje personalizado."
 
-#: C/empathy.xml:242(term)
-msgid "Command line"
-msgstr "Línea de comandos"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:61(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 ""
+"Si no lo hace el mensaje personalizado no estará disponible la próxima vez "
+"que use <app>Empathy</app>. Sólo se guardará durante la sesión actual."
 
-#: C/empathy.xml:244(para)
-msgid "Type <command>empathy</command> and then press <keycap>Enter</keycap>."
-msgstr "Escriba <command>empathy</command> y pulse <keycap>intro</keycap>."
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:70(title)
+msgid "Edit, remove and add a custom message"
+msgstr "Editar, quitar y añadir un mensaje personalizado"
 
-#: C/empathy.xml:253(title)
-msgid "When You Start Empathy"
-msgstr "Al iniciar Empathy"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:80(p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Seleccione <gui>Editar mensaje personalizado</gui>."
 
-#: C/empathy.xml:258(title)
-msgid "<application>Empathy</application> Main Window"
-msgstr "Ventana principal de <application>Empathy</application>"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:87(p)
+msgid "To edit a custom message:"
+msgstr "Para editar un mensaje personalizado:"
 
-#: C/empathy.xml:265(phrase)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:92(p)
 msgid ""
-"Shows <placeholder-1/> main window. Contains the titlebar, the menubar, "
-"contact list, status icon and status arrow button list."
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
 msgstr ""
-"Muestra la ventana principal de <placeholder-1/>. Contiene la barra de "
-"título, la barra de menú, la lista de contactos, el icono de estado y la "
-"lista de estados."
+"Desde la caja <gui>Estados guardados</gui>, seleccione el mensaje de estado "
+"que quiere editar y pulse dos veces sobre él."
 
-#: C/empathy.xml:254(para)
-msgid ""
-"When you start <application>Empathy</application> the following window is "
-"shown. <placeholder-1/>"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:98(p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
 msgstr ""
-"Se mostrará la siguiente ventana al iniciar <application>Empathy</"
-"application>. <placeholder-1/>"
+"Escriba el mensaje personalizado nuevo y pulse <key>Intro</key> para "
+"modificarlo."
 
-#: C/empathy.xml:280(title)
-msgid "<application>Empathy</application> Main Components"
-msgstr "Componentes principales de <application>Empathy</application>"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:105(p)
+msgid "To remove a custom message:"
+msgstr "Para quitar un mensaje personalizado:"
 
-#: C/empathy.xml:287(para)
-msgid "Component"
-msgstr "Componente"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:110(p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
+msgstr ""
+"Desde la caja <gui>Estados guardados</gui>, seleccione el mensaje de estado "
+"que quiere quitar."
 
-#: C/empathy.xml:290(para)
-msgid "Description"
-msgstr "Descripción"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:116(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:57(p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Pulse el botón <gui>Quitar</gui>."
 
-#: C/empathy.xml:297(para)
-msgid "Menubar"
-msgstr "Barra de menú"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:123(p)
+msgid ""
+"To add a new custom message, from the <gui>Add New Preset</gui> section:"
+msgstr ""
+"Para añadir un mensaje personalizado nuevo, desde la sección <gui>Añadir "
+"estado guardado</gui> "
 
-#: C/empathy.xml:300(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:128(p)
 msgid ""
-"Contains menus used to perform actions in <application>Empathy</application>."
+"Click on the drop-down list to select the status you want to set a custom "
+"message to."
 msgstr ""
-"Contiene los menús usados para realizar acciones en <application>Empathy</"
-"application>."
+"Pulse en la lista desplegable para seleccionar el estado en el que quiere "
+"establecer un mensaje personalizado."
 
-#: C/empathy.xml:307(para)
-msgid "Status Drop-Down List"
-msgstr "Lista desplegable de estados"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:134(p)
+msgid "Click on the text box, and type the new custom message."
+msgstr "Pulse en la caja de texto y escriba el mensaje personalizado nuevo."
 
-#: C/empathy.xml:310(para)
-msgid "Allows to update the status."
-msgstr "Permite actualizar el estado."
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:139(p)
+msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+msgstr "Pulse <gui>Añadir</gui> para añadir un mensaje nuevo a los guardados."
 
-#: C/empathy.xml:317(para)
-msgid "Account Button"
-msgstr "Botón Cuentas"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:148(p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Cuando haya terminado pulse <gui>Cerrar</gui>."
 
-#: C/empathy.xml:320(para)
-msgid "Opens the <guilabel>Accounts</guilabel> dialog."
-msgstr "Abre el diálogo <guilabel>Cuentas</guilabel>."
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:155(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 ""
+"Cuando edita o añade un mensaje personalizado nuevo no se establece como el "
+"mensaje de estado actual. Tiene que seleccionarlo en la ventana de "
+"<gui>Lista de contactos</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:7(desc)
+msgid "Send a message to one of your contacts."
+msgstr "Enviar un mensaje a uno de sus contactos."
 
-#: C/empathy.xml:327(para)
-msgid "Contact List"
-msgstr "Lista de contactos"
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:11(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:12(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:27(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:33(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:14(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:17(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:14(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:12(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:25(cite)
+msgid "Phil Bull"
+msgstr "Phil Bull"
 
-#: C/empathy.xml:330(para)
-msgid "Shows all the available contacts and their associated status."
-msgstr "Muestra todos los contactos disponibles y su estado asociado."
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:12(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:13(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:15(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:18(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:15(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:13(email)
+msgid "philbull@gmail.com"
+msgstr "philbull@gmail.com"
 
-#: C/empathy.xml:276(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:22(title)
+msgid "Send a message to someone"
+msgstr "Enviar un mensaje a alguien"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:31(p)
 msgid ""
-"<xref linkend=\"empathy-TBL-1\"/> describes the components of "
-"<application>Empathy</application>'s main window. <table frame=\"topbot\" id="
-"\"empathy-TBL-1\"><placeholder-1/><tgroup cols=\"2\" colsep=\"0\" rowsep=\"0"
-"\"><colspec colname=\"colspec0\" colwidth=\"29.39*\"/><colspec colname="
-"\"colspec1\" colwidth=\"70.61*\"/><placeholder-2/><placeholder-3/></tgroup></"
-"table>"
+"Double-click the name of the contact that you want to have a conversation "
+"with."
 msgstr ""
-"La <xref linkend=\"empathy-TBL-1\"/> describe los componentes de la ventana "
-"principal de <application>Empathy</application>. <table frame=\"topbot\" id="
-"\"empathy-TBL-1\"><placeholder-1/><tgroup cols=\"2\" colsep=\"0\" rowsep=\"0"
-"\"><colspec colname=\"colspec0\" colwidth=\"29.39*\"/><colspec colname="
-"\"colspec1\" colwidth=\"70.61*\"/><placeholder-2/><placeholder-3/></tgroup></"
-"table>"
-
-#: C/empathy.xml:344(title)
-msgid "Accounts"
-msgstr "Cuentas"
+"Pulse dos veces sobre el nombre del contacto con el que quiere conversar."
 
-#: C/empathy.xml:345(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:37(p)
 msgid ""
-"To use <application>Empathy</application> you need at least one account of "
-"the supported services."
+"Right-click on the name of the contact you want to have a conversation with, "
+"and select <gui>Chat</gui>."
 msgstr ""
-"Para usar <application>Empathy</application> debe tener al menos una cuenta "
-"de los servicios soportados."
+"Pulse con el botón derecho del ratón sobre el nombre del contacto con el que "
+"quiera tener una conversación y seleccione <gui>Chat</gui>."
 
-#: C/empathy.xml:348(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:45(p)
 msgid ""
-"If you don't already have an account and you don't have your <emphasis>user "
-"name</emphasis> and <emphasis>password</emphasis>, you need to register a "
-"new account (see <xref linkend=\"empathy-register-account\"/>)."
+"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 ""
-"Si aún no tiene una cuenta y no tiene su <emphasis>usuario</emphasis> y "
-"<emphasis>contraseña</emphasis>, debe registrar una cuenta nueva (consulte "
-"<xref linkend=\"empathy-register-account\"/>)."
+"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá la "
+"ventana de charla en la parte inferior de la ventana, <key>Intro</key> y el "
+"tiempo total de conversación."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:7(desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Enviar un archivo desde su equipo a uno de sus contactos."
 
-#: C/empathy.xml:353(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:27(title)
+msgid "Send files"
+msgstr "Enviar archivos"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:36(p)
 msgid ""
-"In order to talk with other users, also called <emphasis>contacts</"
-"emphasis>, you need to use the same service they are using. If, for example, "
-"one contact is using the <emphasis role=\"strong\">Jabber</emphasis> "
-"service, you need to have an account registered with that service."
+"Right-click on the contact you want to send a file, and select <gui>Send "
+"file</gui>."
 msgstr ""
-"Para poder hablar con otros usuarios (llamados <emphasis>contactos</"
-"emphasis>), debe usar el mismo servicio que ellos usan. Si, por ejemplo, uno "
-"de sus contactos está usando el servicio <emphasis role=\"strong\">Jabber</"
-"emphasis>, necesita tener una cuenta registrada en ese servicio."
+"Pulse con el botón derecho sobre el contacto al que quiere enviar un archivo "
+"y seleccione <gui>Enviar archivo</gui>.."
 
-#: C/empathy.xml:360(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:41(p)
 msgid ""
-"<application>Empathy</application> can handle as many accounts on any "
-"supported services as you want and you can have them all open at the same "
-"time."
+"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 ""
-"<application>Empathy</application> puede gestionar muchas cuentas en "
-"cualquiera de los servicios soportados que quiera añadir y puede tener todas "
-"ellas abiertas al mismo tiempo."
+"Pulse sobre el contacto al que quiere enviar un archivo y elija "
+"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Enviar archivo</gui></"
+"guiseq>."
 
-#: C/empathy.xml:366(title)
-msgid "Registering an Account"
-msgstr "Registrar una cuenta"
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:49(p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "Seleccione el archivo para enviar y pulse <gui>Enviar</gui>."
 
-#: C/empathy.xml:367(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:54(p)
 msgid ""
-"You can freely register an account on any of the following services. Follow "
-"the instructions reported on each website on how to register your new "
-"account. At the end of the registration process you should have a "
-"<emphasis>user name</emphasis> (or an <emphasis>account ID</emphasis>) and a "
-"<emphasis>password</emphasis> that you will use to create the account in "
-"<application>Empathy</application>."
-msgstr ""
-"Puede registrar libremente una cuenta en cualquiera de los siguientes "
-"servicios. Siga las instrucciones proporcionadas en cada página web acerca "
-"de cómo registrar su nueva cuenta. Al final del proceso de registro debería "
-"tener un <emphasis>nombre de usuario</emphasis> (o un <emphasis>ID de "
-"cuenta</emphasis>) y una <emphasis>contraseña</emphasis> que usará para "
-"crear la cuenta en <application>Empathy</application>."
-
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:385(para)
-msgid ""
-"The <ulink type=\"http\" url=\"http://dashboard.aim.com/aim\">AIM</ulink> "
-"service."
+"The <gui>File Transfers</gui> window will appear. Wait for your contact to "
+"accept the file transfer, or click <gui>Stop</gui> to halt the transfer."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"http://dashboard.aim.com/aim\">AIM</"
-"ulink>."
+"Aparecerá la ventana de <gui>Transferencias de archivos</gui>. Espere a que "
+"su contacto acepte la transferencia de archivo o pulse <gui>Detener</gui> "
+"para detener la transferencia."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:392(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:62(p)
 msgid ""
-"The <ulink type=\"http\" url=\"http://www.google.com/talk/\">Google Talk</"
-"ulink> service."
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>Salut</em>."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"http://www.google.com/talk/\">Google "
-"Talk</ulink>."
+"Sólo es posible enviar archivos usando los siguientes servicios: <em>Jabber</"
+"em>, <em>Google Talk</em> y <em>Salut</em>."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:400(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:68(p)
 msgid ""
-"The <ulink type=\"http\" url=\"https://www.icq.com/register/\">ICQ</ulink> "
-"service."
+"If your contact accepts the file transfer, you can watch the progress of the "
+"transfer and see the estimated amount of time remaining before it is "
+"complete."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"https://www.icq.com/register/\">ICQ</"
-"ulink>."
+"Si su contacto acepta la transferencia del archivo puede ver el progreso de "
+"la transferencia y el tiempo restante estimado antes de que se complete."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:407(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:72(p)
 msgid ""
-"The <ulink type=\"http\" url=\"https://accountservices.passport.net\">MSN</"
-"ulink> service."
+"If they do not accept it, the status of the transfer will change to "
+"<gui>File transfer cancelled</gui>, and the file will not be sent."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"https://accountservices.passport.net"
-"\">MSN</ulink>."
+"Si no la aceptan, el estado de la transferencia del archivo cambiará a "
+"<gui>Transferencia de archivo cancelada</gui> y no se enviará el archivo."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:414(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:76(p)
 msgid ""
-"The <ulink type=\"http\" url=\"https://login.yahoo.com/config/login\">Yahoo</"
-"ulink> service."
+"Once a transfer is finished, you can close the <gui>File Transfers</gui> "
+"window. 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 ""
-"El servicio <ulink type=\"http\" url=\"https://login.yahoo.com/config/login"
-"\">Yahoo</ulink>."
+"Una vez que la transferencia ha finalizado puede cerrar la ventana de "
+"<gui>Transferencias de archivos</gui>. Si tiene múltiples transferencias "
+"finalizadas listas en la ventana pulse <gui>Limpiar</gui> para vaciar la "
+"lista. Esto sólo quitará los archivos de la lista y no los borrará de su "
+"equipo."
 
-#: C/empathy.xml:376(para)
-msgid "Click on the name of the service to visit its website: <placeholder-1/>"
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:84(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 ""
-"Pulse en el nombre del servicio para visitar su página web: <placeholder-1/>"
+"Para poder enviar un archivo a alguien necesita estar conectado a Internet o "
+"a una red de área local."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:7(desc)
+msgid "Undesrtanding the <em>Salut</em> protocol."
+msgstr "Entender el protocolo <em>Salut</em>."
 
-#: C/empathy.xml:420(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:24(title)
+msgid "What is the <em>Salut</em> service?"
+msgstr "¿Qué es el servicio <em>Salut</em>?"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:28(p)
 msgid ""
-"For registering a <acronym>SIP</acronym> account, you can use one of the "
-"following service:"
+"Need to work on this section, explaining people in clear words what the hell "
+"is this service!"
 msgstr ""
-"Para registrar una cuenta <acronym>SIP</acronym>, puede usar uno de los "
-"siguientes servicios:"
+"Se necesita trabajo en esta sección, explicando en palabras clara qué "
+"demonios es este servicio."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:429(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:34(p)
 msgid ""
-"The <ulink type=\"http\" url=\"https://www.ekiga.net/index.php?page=register"
-"\">Ekiga</ulink> service."
+"The <em>Salut</em> service is a serverless communication service: you do not "
+"need to connect and authenticate to a central server in order to use it."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"https://www.ekiga.net/index.php?"
-"page=register\">Ekiga</ulink>."
+"El servicio <em>Salut</em> es un servicio de comunicación sin servidores: no "
+"necesita conectarse y autenticarse contra un servidor central para poder "
+"usarlo."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:436(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:39(p)
 msgid ""
-"The <ulink type=\"http\" url=\"http://account2.freeworlddialup.com/index.php?"
-"section_id=94\"><acronym>FWD</acronym></ulink> (Free World Dialup) service."
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"http://account2.freeworlddialup.com/"
-"index.php?section_id=94\">FWD<acronym> (Free World Dialup)."
+"Este tipo de sistemas de mensajería sin servidores está restringido a redes "
+"de área local y no se necesita una conexión activa con Internet."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:444(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:43(p)
 msgid ""
-"The <ulink type=\"http\" url=\"https://signup.sipphone.com/new-users/app?"
-"class=NewUser;proc=start\">Sipphone</ulink> service."
+"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 ""
-"El servicio <ulink type=\"http\" url=\"https://signup.sipphone.com/new-users/"
-"app?class=NewUser;proc=start\">Sipphone</ulink>."
+"La gente que usa este servicio dentro de la misma red de área local se "
+"autodescubrirá y será posible enviarles mensajes y archivos al igual que con "
+"otros servicios."
 
-#: C/empathy.xml:450(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:48(p)
 msgid ""
-"For registering a <emphasis role=\"strong\">Jabber</emphasis> account, you "
-"can use the automatic account creation of <application>Empathy</"
-"application>. Not all Jabber service providers support the automatic "
-"creation of accounts, one service provider known to work with "
-"<application>Empathy</application> is <ulink type=\"http\" url=\"http://www."
-"jabber.org/web/Jabber.org\">jabber.org</ulink>."
+"All the modern local area networks should be able to support this kind of "
+"service."
 msgstr ""
-"Para registrar una cuenta <emphasis role=\"strong\">Jabber</emphasis> puede "
-"usar la creación automática de cuentas de <application>Empathy</"
-"application>. No todos los proveedores de servicio Jabber soportan la "
-"creación automática de cuentas, uno de los proveedores de servicios que se "
-"sabe que funcionan con <application>Empathy</application> es <ulink type="
-"\"http\" url=\"http://www.jabber.org/web/Jabber.org\">jabber.org</ulink>."
+"Todas las redes modernas de área local deberían poder soportar este tipo de "
+"servicio."
 
-#: C/empathy.xml:458(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:7(desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Quitar completamente una cuenta en <app>Empathy</app>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:21(title)
+msgid "Remove an account"
+msgstr "Quitar una cuenta"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:23(p)
 msgid ""
-"If you already have a <emphasis role=\"strong\">Jabber</emphasis> account, "
-"you can use one of the following services:"
+"Removing an account means to delete it from your computer with all the "
+"conversations you had with other people."
 msgstr ""
-"Si ya tiene una cuenta <emphasis role=\"strong\">Jabber</emphasis> puede "
-"usar uno de los siguientes servicios:"
-
-#: C/empathy.xml:475(title)
-msgid "Adding your Account to <application>Empathy</application>"
-msgstr "Añadir su cuenta a <application>Empathy</application>"
+"Quitar una cuenta significa borrarla de su equipo junto con todas las "
+"conversaciones que haya tenido con otras personas."
 
-#: C/empathy.xml:480(para) C/empathy.xml:558(para) C/empathy.xml:610(para)
-#: C/empathy.xml:643(para) C/empathy.xml:673(para) C/empathy.xml:696(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:27(p)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window </link> "
-"(<guilabel>Contact List</guilabel>) click on the account button or press "
-"<keycap>F4</keycap> to open the <guilabel>Accounts</guilabel> dialog."
+"After removing an account you will not be able to recover it or to recover "
+"the conversations you had."
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link> "
-"(<guilabel>Lista de contactos</guilabel>) pulse en el botón de cuentas o "
-"<keycap>F4</keycap> para abrir el diálogo <guilabel>Cuentas</guilabel>."
+"Después de quitar una cuenta no podrá recuperarla o recuperar las "
+"conversaciones que tuvo con ella."
 
-#: C/empathy.xml:492(para) C/empathy.xml:509(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:39(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:44(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:32(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:42(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:31(p)
+msgid "Press <key>F4</key>."
+msgstr "Pulse <key>F4</key>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:44(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:49(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:37(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:47(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:36(p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>."
+msgstr "Elija <guiseq><gui>Editar</gui><gui>Cuentas</gui></guiseq>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:51(p)
 msgid ""
-"From the <guilabel>Type</guilabel> drop-down list choose the service you "
-"wish to add an account for, then click on the <guibutton>Create</guibutton> "
-"button."
+"Select the account you wish to remove from the box on the left of the dialog."
 msgstr ""
-"Desde la lista desplegable <guilabel>Tipo</guilabel> elija el servicio para "
-"el que quiere crear la cuenta, después pulse en el botón <guibutton>Crear</"
-"guibutton>."
+"Seleccione la cuenta que quiere quitar en la caja a la izquierda del diálogo."
 
-#: C/empathy.xml:488(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:62(p)
 msgid ""
-"If it is the first time you launch <application>Empathy</application>: "
-"<placeholder-1/>"
+"A dialog will be shown asking for confirmation. Click on the <gui>Remove</"
+"gui> button to permanently remove the account."
 msgstr ""
-"Si ésta es la primera vez que lanza <application>Empathy</application>: "
-"<placeholder-1/>"
+"Se mostrará un diálogo preguntando por una confirmación. Pulse el botón "
+"<gui>Quitar</gui> para quitar la cuenta permanentemente."
 
-#: C/empathy.xml:504(para)
-msgid "Click on the <guilabel>Add</guilabel> button."
-msgstr "Pulse el botón <guibutton>Añadir</guibutton>."
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:7(desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Diagnosticar problemas comunes al conectarse a un servicio de mensajería "
+"instantánea."
 
-#: C/empathy.xml:500(para)
-msgid "Otherwise: <placeholder-1/>"
-msgstr "De otra forma: <placeholder-1/>"
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:24(title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Problemas al conectarse a un servicio de mensajería instantánea"
 
-#: C/empathy.xml:519(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:28(p)
 msgid ""
-"Fill the required fields with your <emphasis>user name</emphasis> and "
-"<emphasis>password</emphasis>. Optionally, you can modify some advanced "
-"options. For more information, see <xref linkend=\"empathy-advanced-options"
-"\"/>."
+"This is a stub. We should identify the most common causes for a user not "
+"being able to connect and document those."
 msgstr ""
-"Rellene los campos necesarios con su <emphasis>usuario</emphasis> y "
-"<emphasis>contraseña</emphasis>. Opcionalmente puede modificar algunas "
-"opciones avanzadas. Para obtener más información consulte <xref linkend="
-"\"empathy-advanced-options\"/>."
+"Esto es un esbozo. Deberíamos identificar las causas más comunes para que un "
+"usuario no se pueda conectar y documentarlas."
 
-#: C/empathy.xml:528(para) C/empathy.xml:591(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:34(p)
+msgid "Check whether gui tags are allowed in section titles and descs."
+msgstr ""
+"Comprobar si las etiquetas del IGU están permitidas en los títulos de "
+"sección y descripciones."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:37(p)
 msgid ""
-"To enable the new account, select the <guilabel>Enabled</guilabel> check-box "
-"next to the name of the account in the box on the left."
+"You can... but the end result is not very good: the title is in blue and the "
+"gui element in grey."
 msgstr ""
-"Para activar la cuenta nueva seleccione la caja de verificación "
-"<guilabel>Activada</guilabel> junto al nombre de la cuenta, en la caja de la "
-"izquierda."
+"Puede... pero el resultado no es muy bueno: el título está en azul y el "
+"elemento del IGU en gris."
 
-#: C/empathy.xml:476(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:8(desc)
 msgid ""
-"To add your account to <application>Empathy</application>, proceed as "
-"follows: <placeholder-1/>"
+"An error message appears in the main <app>Empathy</app> window which says "
+"\"Network error\"."
 msgstr ""
-"Para añadir su cuenta a <application>Empathy</application>, proceda como "
-"sigue: <placeholder-1/>"
+"Aparece un mensaje de error en la ventana principal de <app>Empathy</app> "
+"que muestra «Error de red»."
 
-#: C/empathy.xml:538(title)
-msgid "Importing Accounts"
-msgstr "Importar cuentas"
+#. TODO: rework this page in order to talk about the IRC problem: if you
+#.   don't set your nickname, this is the kind of error that will be shown.
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:29(title)
+msgid "I get a message that says \"Network error\""
+msgstr "Obtengo un mensaje que muestra «Error de red»"
 
-#: C/empathy.xml:539(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:31(p)
 msgid ""
-"If you use another instant messaging program, you can import the accounts "
-"from that program into <application>Empathy</application>"
+"If you try to connect and an error message appears in the main Empathy "
+"window which says \"Network error\", Empathy cannot communicate with the "
+"instant messaging service for some reason."
 msgstr ""
-"Si usa otro programa de mensajería instantánea puede importar las cuentas de "
-"ese programa en <application>Empathy</application>"
+"Si intenta conectarse y aparece un mensaje de error en la ventana principal "
+"de Empathy que muestra «Error de red», Empathy no se puede comunicar con el "
+"servicio de mensajería instantánea por alguna razón."
 
-#: C/empathy.xml:545(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:39(p)
+msgid "Check that you are connected to the Internet or network."
+msgstr "Compruebe que está conectado a Internet o a una red."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:46(p)
+msgid "Click the <gui>Edit Account</gui> button in the error message."
+msgstr "Pulse el botón <gui>Editar cuenta</gui> en el mensaje de error."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:51(p)
 msgid ""
-"At the moment <application>Empathy</application> can import the accounts "
-"only from the instant messaging program <application>Pidgin</application>. "
-"For more information about <application>Pidgin</application>, see the <ulink "
-"type=\"http\" url=\"http://www.pidgin.im/\">Pidgin website</ulink>."
+"Expand the <gui>Advanced</gui> section and make sure that the details such "
+"as server address and port are correct. You should be able to find these "
+"details from the website of the messaging service."
 msgstr ""
-"Por el momento <application>Empathy</application> puede importar cuentas "
-"sólo del programa <application>Pidgin</application>. Para obtener más "
-"información acerca de <application>Pidgin</application> consulte la <ulink "
-"type=\"http\" url=\"http://www.pidgin.im/\">página web de Pidgin</ulink>."
+"Expanda la sección <gui>Avanzadas</gui> y asegúrese de que los detalles "
+"tales como la dirección y el puerto del servidor son correctos. Debería "
+"poder encontrar estos detalles en la página web del servicio de mensajería."
 
-#: C/empathy.xml:566(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:58(p)
 msgid ""
-"Click on the <guibutton>Import Accounts...</guibutton> button to open the "
-"<guilabel>Import Accounts</guilabel> dialog."
+"Uncheck the <gui>Enabled</gui> box next to the name of your account and then "
+"check it again to try to connect to the service again."
 msgstr ""
-"Pulse en el botón <guibutton>Importar cuentas...</guibutton> para abrir el "
-"diálogo <guilabel>Importar cuentas</guilabel>."
+"Desmarque la caja <gui>Activada</gui> junto al nombre de su cuenta y después "
+"márquela de nuevo para intentar conectar con el servicio de nuevo."
 
-#: C/empathy.xml:573(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:8(desc)
 msgid ""
-"Select the accounts you would like to import by clicking on the "
-"<guilabel>Import</guilabel> check-box."
+"An error message appears in the main <app>Empathy</app> window which says "
+"\"Name in use\"."
 msgstr ""
-"Seleccione la cuenta que quiere importar pulsando en la casilla de selección "
-"<guilabel>Importar</guilabel>."
+"Aparece un mensaje de error en la ventana principal de <app>Empathy</app> y "
+"muestra «Nombre en uso»."
 
-#: C/empathy.xml:579(para)
+#. TODO: work on this page. This error appears with the IRC account
+#.     when you set a nickname that is already in use on that network. We need
+#.     to write topics for changing your nickname and to set the password of your
+#.     nickname.
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:31(title)
+msgid "I get a message that says \"Name in use\""
+msgstr "Obtengo un mensaje de error que muestra «Nombre en uso»"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:33(p)
 msgid ""
-"When you have selected all the desired accounts, click <guibutton>OK</"
-"guibutton> to import them. If you don't want to import the accounts, click "
-"<guibutton>Cancel</guibutton>."
+"This kind of error happens when you try to connect to your IRC account and "
+"you are using a nickname that is being used by someone else on that "
+"particular network."
 msgstr ""
-"Cuando haya seleccionado todas las cuentas deseadas pulse "
-"<guibutton>Aceptar</guibutton> para importarlas. Si no quiere importar las "
-"cuentas, pulse el botón <guibutton>Cancelar</guibutton>."
+"Este tipo de error sucede cuando intenta conectarse a su cuenta de IRC y "
+"está usando un apodo que ya está usando otra persona en esa red en "
+"particular."
 
-#: C/empathy.xml:587(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:39(p)
 msgid ""
-"When you import a new account into <application>Empathy</application>, it "
-"will not be enabled by default."
+"To resolve this problem, click on the <gui>Edit Account</gui> button and "
+"perform one of the following:"
 msgstr ""
-"Al importar una cuenta nueva en <application>Empathy</application> no se "
-"activará de forma predeterminada."
+"Para resolver este problema pulse el botón <gui>Editar cuenta</gui> y "
+"realice una de las siguientes acciones:"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:46(p)
+msgid "Change your nickname."
+msgstr "Cambie su apodo."
 
-#: C/empathy.xml:554(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:51(p)
 msgid ""
-"To import the accounts into <application>Empathy</application>, proceed as "
-"follows: <placeholder-1/>"
+"Set the password for that nickname, if you have registered that nickname "
+"within the network you are using. For more information, see <link xref=\"irc-"
+"nick-password\"/>."
 msgstr ""
-"Para importar cuentas en <application>Empathy</application> proceda como "
-"sigue: <placeholder-1/>"
+"Establezca la contraseña para ese apodo, si ha registrado ese apodo en la "
+"red que está usando. Para obtener más información consulte la <link xref="
+"\"irc-nick-password\"/>."
 
-#: C/empathy.xml:603(title)
-msgid "Editing an Account"
-msgstr "Editar una cuenta"
-
-#: C/empathy.xml:618(para)
-msgid "Select the account you wish to edit in the box on the left."
-msgstr "Seleccione la cuenta que quiere editar en la caja a la izquierda."
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:8(desc)
+msgid ""
+"An error message appears in the main window saying that "
+"\"<gui>Authentication failed</gui>\"."
+msgstr ""
+"Aparece un mensaje de error en la ventana principal y muestra «<gui>Falló la "
+"autenticación</gui>»."
 
-#: C/empathy.xml:624(para)
-msgid "Modify the desired data."
-msgstr "Modifique los datos deseados."
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:29(title)
+msgid "I get a message that says \"Authentication failed\""
+msgstr "Obtengo un mensaje que dice «Falló la autenticación»"
 
-#: C/empathy.xml:604(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:33(p)
 msgid ""
-"To edit one of your accounts, i.e. to change the <emphasis>password</"
-"emphasis> or your <emphasis>user name</emphasis>, proceed as follows: "
-"<placeholder-1/>"
+"Could be useful to link here how to change your password or how to recover "
+"it. Need to write that section."
 msgstr ""
-"Para editar una de sus cuentas, por ejemplo, para cambiar la "
-"<emphasis>contraseña</emphasis> o su <emphasis>usuario</emphasis>, proceda "
-"como sigue: <placeholder-1/>"
+"Podría ser útil enlazar aquí cómo cambiar su contraseña o cómo recuperarla. "
+"Se debe escribir esa sección."
 
-#: C/empathy.xml:632(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:39(p)
 msgid ""
-"Based on the type of the account, it is possibile to edit different settings."
-msgstr "Basado en el tipo de cuenta, es posible editar diferentes ajustes."
+"If you try to connect and you get a message saying <gui>Authentication "
+"failed</gui>, your instant messaging service is not allowing you to connect "
+"because it does not recognize your username or password for some reason."
+msgstr ""
+"Si intenta conectarse y obtiene un mensaje diciendo <gui>Falló la "
+"autenticación</gui> su servicio de mensajería instantánea no le está "
+"permitiendo conectarse porque por algún motivo no reconoce su nombre de "
+"usuario o su contraseña."
 
-#: C/empathy.xml:651(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:47(p)
 msgid ""
-"Select the account you wish to edit in the box on the left and double-click "
-"on its name."
+"Make sure that you have registered for 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 ""
-"Seleccione la cuenta que quiere editar en la caja de la izquierda y pulse "
-"dos veces en su nombre."
+"Asegúrese de que ha registrado una cuenta con el servicio al que está "
+"intentando conectarse. Si no tiene una cuenta la mayoría de los servicios no "
+"le permitirán que se conecte."
 
-#: C/empathy.xml:657(para)
-msgid "Change the name of the account as you desire."
-msgstr "Cambie el nombre de la cuenta como desee."
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:54(p)
+msgid ""
+"Click the <gui>Edit Account</gui> button in the error message. Type your "
+"username and password again to make sure that they are correct. Deselect the "
+"<gui>Enabled</gui> box next to the name of your account and then select it "
+"to try to connect to the service again."
+msgstr ""
+"Pulse el botón <gui>Editar cuenta</gui> en el mensaje de error. Escriba de "
+"nuevo su nombre de usuario y contraseña para asegurarse de que son "
+"correctos. Desmarque la caja <gui>Activada</gui> junto al nombre de la "
+"cuenta y después márquela para intentar conectarse de nuevo con el servicio."
 
-#: C/empathy.xml:638(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:7(desc)
 msgid ""
-"To modify the identifier of an account, how <application>Empathy</"
-"application> identifies an account, proceed as follows: <placeholder-1/>"
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
 msgstr ""
-"Para modificar el identificador de una cuenta, la forma en la que "
-"<application>Empathy</application> identifica a la cuente, proceda como "
-"sigue: <placeholder-1/>"
+"La cuenta de mensajería instantánea que quiere usar no está activada en la "
+"lista de cuentas."
 
-#: C/empathy.xml:666(title)
-msgid "Disabling and Removing an Account"
-msgstr "Desactivar y quitaruna cuenta"
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:23(title)
+msgid "My account is not enabled"
+msgstr "Mi cuenta no está activada"
 
-#: C/empathy.xml:667(para)
-msgid "To disable an account, proceed as follows:"
-msgstr "Para desactivar una cuenta, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:25(p)
+msgid ""
+"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 "
+"chat, your account details may not be correct."
+msgstr ""
+"Si la cuenta de mensajería instantánea que quiere usar no está activada en "
+"la lista desplegable de cuentas cuando intenta iniciar una conversación "
+"nueva o unirse a una charla, puede que los detalles de su cuenta no sean "
+"correctos."
 
-#: C/empathy.xml:682(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:33(p)
 msgid ""
-"Select the account you wish to disable in the box on the left of the dialog "
-"and deselect the <guilabel>Enabled</guilabel> check-box."
+"Click <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and make sure that "
+"the <gui>Enabled</gui> checkbox is checked."
 msgstr ""
-"Seleccione la cuenta que quiere desactivar en la caja a la izquierda del "
-"diálogo y deselecicone la casilla de verificación <guilabel>Activada</"
-"guilabel>."
+"Pulse <guiseq><gui>Editar</gui><gui>Cuentas</gui></guiseq> y asegúrese de "
+"que la caja de verificación <gui>Activada</gui> está marcada."
 
-#: C/empathy.xml:690(para)
-msgid "To remove an account, proceed as follows:"
-msgstr "Para quitar una cuenta, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:39(p)
+msgid "Make sure that your username and password are correct."
+msgstr "Asegúrese de que su nombre de usuario y contraseña son correctos."
 
-#: C/empathy.xml:705(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:44(p)
 msgid ""
-"Select the account you wish to disable in the box on the left of the dialog."
+"Expand the <gui>Advanced</gui> section of the <app>Accounts</app> window and "
+"make sure that all of the server settings are correct."
 msgstr ""
-"Seleccione la cuenta que desea desactivar en la caja a la izquierda del "
-"diálogo."
+"Expanda la sección <gui>Avanzadas</gui> de la ventana de <app>Cuentas</app> "
+"y asegúrese de que todos los ajustes del servidor son correctos."
 
-#: C/empathy.xml:711(para)
-msgid "Click on the <guibutton>Remove</guibutton> button."
-msgstr "Pulse en el botón <guibutton>Quitar</guibutton>."
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:7(desc)
+msgid "How to see the contacts that are not online."
+msgstr "Cómo ver los contactos que no están conectados."
 
-#: C/empathy.xml:716(para)
-msgid ""
-"A dialog will be shown asking for confirmation. Click on the "
-"<guibutton>Remove</guibutton> button to remove the account."
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:25(title)
+msgid "Display offline contacts"
+msgstr "Mostrar contactos desconectados"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:29(p)
+msgid "Need to rework on the terminology used."
+msgstr "Se debe trabajar en la terminología usada."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:41(p)
+msgid "Choose <guiseq><gui>View</gui><gui>Offline Contacts</gui></guiseq>."
 msgstr ""
-"Se mostrará un diálogo preguntando por una confirmación. Pulse en el botón "
-"<guibutton>Quitar</guibutton> para quitar la cuenta."
+"Elija <guiseq><gui>Ver</gui><gui>Contactos desconectados</gui></guiseq>."
 
-#: C/empathy.xml:726(title)
-msgid "Editing Personal Information"
-msgstr "Editar información personal"
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:46(p)
+msgid "Press <keyseq><key>Ctrl</key><key>H</key></keyseq>."
+msgstr "Pulse <keyseq><key>Ctrl</key><key>H</key></keyseq>."
 
-#: C/empathy.xml:727(para)
-msgid ""
-"To change your personal information, your alias and your icon (the image "
-"that other contacts will see of you), for each of your accounts, proceed as "
-"follows:"
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:53(p)
+msgid "To hide the offline contacts again, repeat the same procedure above."
 msgstr ""
-"Para cambiar su información personal, su apodo y su icono (la imagen con la "
-"que otros contactos le ven), para cada una de las cuentas, proceda como "
-"sigue:"
+"Para ocultar los contactos desconectados de nuevo, repita el mismo "
+"procedimiento anterior."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:8(desc)
+msgid "How to set the password of a nickname."
+msgstr "Cómo establecer la contraseña de un apodo."
 
-#: C/empathy.xml:735(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:23(title)
+msgid "Set the nickname password"
+msgstr "Establecer la contraseña para un apodo."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:25(p)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select "
-"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Personal Information</"
-"guimenuitem></menuchoice>."
+"Registering a nickname is useful to preserve your identity on IRC and you "
+"will be able to use always the same nickname. In some cirtumstances, some "
+"IRC channels may be configured to accept only registered nickname."
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link>, "
-"seleccione <menuchoice><guimenu>Editar</guimenu><guimenuitem>Información "
-"personal</guimenuitem></menuchoice>."
+"Registrar un apodo es útil para preservar su identidad en el IRC y siempre "
+"podrá usar ese apodo. En algunas circunstancias, algunos canales de IRC "
+"pueden estar configurados para aceptar sólo apodos registrados."
 
-#: C/empathy.xml:744(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:31(p)
 msgid ""
-"From the <guilabel>Account</guilabel> drop-down list, choose the account you "
-"want to edit."
+"If you have registered your nickname with a password on a network that "
+"supports nickname registration, you can use that password with <app>Empathy</"
+"app> to identify yourself as the owner of the nickname."
 msgstr ""
-"Desde la lista desplegable <guilabel>Cuenta</guilabel>, elija la cuenta que "
-"quiere editar."
+"Si ha registrado su apodo con una contraseña en una red que soporta registro "
+"de apodos, puede usar esa contraseña con <app>Empathy</app> para "
+"identificarse como el propietario del apodo."
 
-#: C/empathy.xml:750(para)
-msgid "In the <guilabel>Alias</guilabel> text box, write your new alias."
-msgstr "En la caja de texto <guilabel>Apodo</guilabel> escriba su nuevo apodo."
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:56(p)
+msgid "Select the IRC account from the box on the left of the dialog."
+msgstr "Seleccione la cuenta de IRC en la caja a la izquierda del diálogo."
 
-#: C/empathy.xml:756(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:61(p)
 msgid ""
-"To change your icon, click on the person-looking button and choose an image "
-"file."
+"If the account is enabled, disable it by deselecting the <gui>Enable</gui> "
+"check-box next to the name of the account."
 msgstr ""
-"Para cambiar su icono pulse en el botón de apariencia personal y elija un "
-"archivo de imagen."
-
-#: C/empathy.xml:762(para) C/empathy.xml:1343(para) C/empathy.xml:1377(para)
-msgid "When done, click <guibutton>Close</guibutton>."
-msgstr "Cuando termine pulse <guibutton>Cerrar</guibutton>."
+"Si la cuenta está activada, desactívela deseleccionando la caja de "
+"verificación <gui>Activada</gui> junto al nombre de la cuenta."
 
-#: C/empathy.xml:770(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:67(p)
 msgid ""
-"An <emphasis>alias</emphasis> is an alternative way you can identify "
-"yourself. You can use your real name or a nickname."
+"In the <gui>Password</gui> text box, type the password you used to register "
+"your nikcname."
 msgstr ""
-"Un <emphasis>apodo</emphasis> es una forma alternativa por la que se puede "
-"identificar. Puede usar su nombre real o un apodo."
+"En la caja de texto <gui>Contraseña</gui> escriba la contraseña que quiere "
+"usar para registrar su apodo."
 
-#: C/empathy.xml:780(title)
-msgid "Advanced Options"
-msgstr "Opciones avanzadas"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:73(p)
+msgid ""
+"Enable the account by selecting the <gui>Enabled</gui> check-box next to the "
+"name of the account."
+msgstr ""
+"Active la cuenta seleccionando la caja de verificación <gui>Activada</gui> "
+"junto al nombre de la cuenta."
 
-#: C/empathy.xml:781(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:80(p)
 msgid ""
-"Based on the service you are using, it is possible to configure more "
-"advanced options to modify the normal behavior of <application>Empathy</"
-"application>."
+"Once you are connected, you will receive a message from the nickname server "
+"that will tell you of the established identification."
 msgstr ""
-"Basado en el servicio que está usando es posible configurar opciones más "
-"avanzadas para modificar el comportamiento normal de <application>Empathy</"
-"application>."
+"Una vez que está conectado recibirá un mensaje desde el servidor de apodos "
+"que le informará acerca del establecimiento de la identificación."
 
-#: C/empathy.xml:786(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:86(p)
 msgid ""
-"To configure these options, when you are <link linkend=\"empathy-create-"
-"account\">adding a new account</link>, click on the drop-down section "
-"<guilabel>Advanced</guilabel>."
+"At the moment it is not possible to register an IRC nickname with "
+"<app>Empathy</app>, it is only possible to use the password of an already "
+"registered nickname."
 msgstr ""
-"Para configurar esas opciones mientras está <link linkend=\"empathy-create-"
-"account\">añadiendo una cuenta nueva</link>, pulse la sección desplegable "
-"<guilabel>Avanzadas</guilabel>."
+"Por el momento no es posible registrar apodos en el IRC con <app>Empathy</"
+"app>, sólo es posible usar una contraseña de un apodo ya registrado."
 
-#: C/empathy.xml:794(title)
-msgid "Jabber (or <acronym>XMPP</acronym>) and Google Talk"
-msgstr "Jabber (o <acronym>XMPP</acronym>) y Google Talk"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:7(desc)
+msgid "Manage IRC accounts with <app>Empathy</app>."
+msgstr "Gestionar cuentas IRC con <app>Empathy</app>."
 
-#: C/empathy.xml:801(guilabel)
-msgid "Encryption required (TLS/SSL)"
-msgstr "Se requiere cifrado (TLS/SSL)"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:22(title)
+msgid "Use IRC"
+msgstr "Usar IRC"
 
-#: C/empathy.xml:804(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:26(p)
 msgid ""
-"Select this option in order to use some sort of encryption during your "
-"conversations."
+"Guide page for all the IRC related actions. Need to work on this page if the "
+"content starts to grow. In case we don't have a lot of contets for this "
+"page, rework the other."
 msgstr ""
-"Seleccione esta opción para usar algún tipo de cifrado durante sus "
-"conversaciones."
+"Página de guía para todas las acciones relacionadas con el IRC. Se debe "
+"trabajar en este página para que aumente su contenido. En caso de no tener "
+"mucho contenido para esta página, trabajar más en otras."
 
-#: C/empathy.xml:812(guilabel)
-msgid "Ignore SSL certificate errors"
-msgstr "Ignorar los errores de certificados SSL"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:34(title)
+msgid "Manage IRC accounts"
+msgstr "Gestionar cuentas IRC"
 
-#: C/empathy.xml:815(para)
-msgid ""
-"Select this option in order to ignore the errors that can be generated by "
-"some types of security certificates. Usually these certificates are called "
-"auto-signed."
-msgstr ""
-"Selecciones esta opción para ignorar los errores que puedan generar algunos "
-"tipos de certificados de seguridad. Generalmente esos certificados se llaman "
-"autofirmados."
+#. TODO: see prob-conn-neterror.page
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:39(title)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:40(title)
+msgid "Fix common problems"
+msgstr "Solucionar problemas comunes"
 
-#: C/empathy.xml:823(para)
-msgid ""
-"Select this option only if you are sure the certificate is secure and you "
-"can trust it."
-msgstr ""
-"Seleccione esta opción sólo si está seguro de que su certificado es seguro y "
-"puede confiar en él."
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:7(desc)
+msgid "Entering an IRC channel."
+msgstr "Entrar en un canal IRC."
 
-#: C/empathy.xml:833(guilabel)
-msgid "Resource"
-msgstr "Recurso"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:22(title)
+msgid "Join a room"
+msgstr "Unirse a una sala"
 
-#: C/empathy.xml:836(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:26(p)
 msgid ""
-"Use this text box to set a name with which you can identify the running "
-"program based on where you are running it. With this option, and the "
-"<guilabel>Priority</guilabel> one, you can use your account simultaneously "
-"in two different devices. For example, if you set one device to "
-"<replaceable>desktop</replaceable> and the other one to <replaceable>mobile</"
-"replaceable>, you can connect with both of them and based on the "
-"<guilabel>Priority</guilabel> value you will receive messages on one of the "
-"two devices or both."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Join</gui></guiseq>."
 msgstr ""
-"Use esta caja de texto para establecer un nombre con el que pueda "
-"identificar el programa en ejecución basándose en dónde lo está ejecutando. "
-"Con esta opción, y la opción de <guilabel>Prioridad</guilabel>, puede usar "
-"su cuenta simultáneamente desde dos dispositivos diferentes. Por ejemplo, si "
-"establece uno de los dispositivos como <replaceable>escritorio</replaceable> "
-"y el otro como <replaceable>móvil</replaceable>, puede conectarse con ambos "
-"dispositivos y basándose en el valor <guilabel>Prioridad</guilabel> recibirá "
-"los mensajes en uno de los dispositivos o en ambos."
+"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Sala</"
+"gui><gui>Unirse</gui></guiseq>."
 
-#: C/empathy.xml:849(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:32(p)
 msgid ""
-"This can be useful if you have two devices, a main one and a portable one, "
-"and you move away from the main one bringing with you the other: you can "
-"still receive messages from your account with the portable device even if "
-"you do not disconnet from the main one."
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
 msgstr ""
-"Esto puede ser útil si tiene dos dispositivos, uno principal y uno portable, "
-"y se desplaza del principal llevándose consigo el otro: aún podrá recibir "
-"mensajes desde su cuenta con el dispositivo portable incluso si no "
-"desconecta el principal."
+"Desde la lista desplegable <gui>Cuenta</gui> elija la cuenta IRC que "
+"corresponda con la red que quiere usar."
 
-#: C/empathy.xml:858(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:38(p)
 msgid ""
-"If you set the same value for this text box on both the devices, when you "
-"connect with one of them, the other one will be disconnected, even if you "
-"set a different value with the <guilabel>Priority</guilabel> spin box."
+"In the <gui>Room</gui> text box, type the name of the channel you want to "
+"join. Prefix the name with the hash character (<sys>#</sys>)."
 msgstr ""
-"Si establece el mismo valor para esta caja de texto en ambos dispositivos, "
-"al conectarse con uno de ellos, el otro se desconectará, incluso si "
-"establece un valor diferente en la caja incrementable <guilabel>Prioridad</"
-"guilabel>."
+"En la caja de texto <gui>Sala</gui>, escriba el nombre del canal al que "
+"quiere unirse. Preceda el nombre con el carácter almohadilla (<sys>#</sys>)."
 
-#: C/empathy.xml:871(guilabel)
-msgid "Priority"
-msgstr "Prioridad"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:44(p)
+msgid "Click on <gui>Join</gui> to enter the room."
+msgstr "Pulse <gui>Unirse</gui> para entrar en la sala."
 
-#: C/empathy.xml:874(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:51(p)
 msgid ""
-"Use this spin box to indicate wich device, set in the <guilabel>Resource</"
-"guilabel> text box, will receive the new messages. The higher the number, "
-"the higher the priority: you will receive the new messages on the device "
-"with the highest number."
+"To join multiple rooms, you need to repeat the steps above for each room."
 msgstr ""
-"Use esta caja incrementable para indicar qué dispositivo, establecido en la "
-"caja de texto <guilabel>Recurso</guilabel>, recibirá los mensajes nuevos. "
-"Cuanto mayor sea el número, mayor será la prioridad: recibirá los mensajes "
-"nuevos en el dispositivo con el número más alto."
+"Para entrar en varias salas, debe repetir los pasos anteriores para cada "
+"sala."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:8(desc)
+msgid "Join a password protected room."
+msgstr "Unirse a una sala protegida con contraseña."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:23(title)
+msgid "Join a protected room"
+msgstr "Unirse a una sala protegida"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:25(p)
+msgid "At the moment it is not possible to join a password protected room."
+msgstr "Por el momento no es posible unirse a salas protegidas por contraseña."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:9(desc)
+msgid "Create an IRC account."
+msgstr "Crear una cuenta de IRC."
 
-#: C/empathy.xml:881(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:23(title)
+msgid "Create an IRC account"
+msgstr "Crear una cuenta de IRC"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:44(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:43(p)
+msgid "If it is the first time you launch <app>Empathy</app>:"
+msgstr "Si ésta es la primera vez que lanza <app>Empathy</app>:"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:49(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:65(p)
 msgid ""
-"You can set values in the range from <literal>-128</literal> to "
-"<literal>127</literal>."
+"From the <gui>Type</gui> drop-down list choose <gui>IRC</gui>, then click on "
+"the <gui>Create</gui> button."
 msgstr ""
-"Puede establecer valores en el rango de <literal>-128</literal> a "
-"<literal>127</literal>."
+"De la lista desplegable <gui>Tipo</gui> seleccione <gui>IRC</gui>, después "
+"pulse el botón <gui>Crear</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:55(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:55(p)
+msgid "Otherwise:"
+msgstr "De otra forma:"
 
-#: C/empathy.xml:887(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:60(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:60(p)
+msgid "Click on the <gui>Add</gui> button."
+msgstr "Pulse el botón <gui>Añadir</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:73(p)
 msgid ""
-"If you set the same value of this spin box in both the devices, you will "
-"receive messages on both of them."
+"From the <gui>Network</gui> drop-down list, select the name of the network "
+"you are creating the account for."
 msgstr ""
-"Si establece el mismo valor de esta caja incrementable en ambos "
-"dispositivos, recibirá mensajes en ambos dos."
+"De la lista desplegable <gui>Red</gui> seleccione el nombre de la red para "
+"la que está creando la cuenta."
 
-#: C/empathy.xml:904(guilabel) C/empathy.xml:997(guilabel)
-#: C/empathy.xml:1045(guilabel) C/empathy.xml:1139(guilabel)
-msgid "Server"
-msgstr "Servidor"
+#. TODO: rethink the description of the nickname
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:80(p)
+msgid ""
+"In the <gui>Nickname</gui> text box, type the name that will identify "
+"yourself in the network you are creating the account."
+msgstr ""
+"En la caja de texto <gui>Apodo</gui> escriba el nombre que le identificará "
+"en la red para la que está creando la cuenta."
 
-#: C/empathy.xml:907(para) C/empathy.xml:1000(para) C/empathy.xml:1048(para)
-#: C/empathy.xml:1142(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:86(p)
 msgid ""
-"Use this text box to write the name of the server you want to use for this "
-"service."
+"In the <gui>Password</gui> text box, type the password you used to register "
+"your nikcname. If you do not have one, leave this field blank."
 msgstr ""
-"Use esta caja de texto para escribir el nombre del servidor que quiere usar "
-"para este servicio."
+"En la caja de texto <gui>Contraseña</gui> escriba la contraseña que usó para "
+"registrar su apodo. Si no tiene una, deje este campo vacío."
 
-#: C/empathy.xml:915(guilabel) C/empathy.xml:1008(guilabel)
-#: C/empathy.xml:1056(guilabel) C/empathy.xml:1150(guilabel)
-msgid "Port"
-msgstr "Puerto"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:92(p)
+msgid "In the <gui>Real name</gui> text box, type your real name."
+msgstr "Introduzca su nombre real en la caja de texto <gui>Nombre real</gui>."
 
-#: C/empathy.xml:918(para) C/empathy.xml:1011(para) C/empathy.xml:1059(para)
-#: C/empathy.xml:1153(para)
-msgid "Use this spin box to set the number of the port of the server to use."
-msgstr ""
-"Use esta caja incrementable para establecer el número del puerto del "
-"servidor que usar."
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:96(p)
+msgid "It is not necessary to insert your real name."
+msgstr "No es necesario que introduzca su nombre real."
 
-#: C/empathy.xml:922(para) C/empathy.xml:1015(para) C/empathy.xml:1063(para)
-#: C/empathy.xml:1157(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:102(p)
 msgid ""
-"You can set values in the range from <literal>0</literal> to "
-"<literal>65,555</literal>."
+"In the <gui>Quit message</gui> text box, type a text message that will be "
+"sent when you close your session."
 msgstr ""
-"Puede establecer valores en el rango de <literal>0</literal> a "
-"<literal>65.555</literal>."
+"En la caja de texto <gui>Mensaje de salida</gui> escriba un mensaje de texto "
+"que se enviará cuando cierre su sesión."
 
-#: C/empathy.xml:930(guilabel)
-msgid "Use old SSL"
-msgstr "Usar SSL antiguo"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:108(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:80(p)
+msgid ""
+"To enable the new account, select the <gui>Enabled</gui> check-box next to "
+"the name of the account in the box on the left of the dialog."
+msgstr ""
+"Para activar la cuenta nueva seleccione la caja de verificación "
+"<gui>Activada</gui> junto al nombre de la cuenta, en la caja a la izquierda "
+"del diálogo."
 
-#: C/empathy.xml:933(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:115(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:88(p)
 msgid ""
-"Select this option to use the old version of the secure protocol for "
-"encrypting your connection."
+"If you want to change the name that identifies the account in the "
+"<gui>Accounts</gui> dialog, double-click on the name of the account in the "
+"box on the left of the dialog and type the new name."
 msgstr ""
-"Seleccione esta opción para usar la versión antigua del protocolo seguro "
-"para cifrar su conexión."
+"Si quiere cambiar el nombre que identifica la cuenta en el diálogo "
+"<gui>Cuentas</gui>, pulse dos veces en el nombre de la cuenta en la caja a "
+"la izquierda del diálogo y estriba el nombre nuevo."
 
-#: C/empathy.xml:898(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:122(p)
 msgid ""
-"In the <guilabel>Override server settings</guilabel> section you can set "
-"options that take precedence over the default settings. <placeholder-1/>"
+"If you want to use different networks at the same time, you need to create "
+"an account with each one of the networks you want to use."
 msgstr ""
-"En la sección <guilabel>Sobreescribir los ajustes del servidor</guilabel> "
-"puede establecer opciones que tienen preferencia sobre los ajustes "
-"predeterminados. <placeholder-1/>"
+"Si quiere usar diferentes redes al mismo tiempo debe crear una cuenta con "
+"cada una de las redes que quiera usar."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:21(title)
+msgid "Empathy Instant Messenger"
+msgstr "Cliente de mensajería instantánea Empathy"
 
-#: C/empathy.xml:949(guilabel)
-msgid "Ignore conference and chatrooms invitations"
-msgstr "Ignorar invitaciones a conferencias y salas de chat"
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:24(title)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:14(title)
+msgid "Audio and video conversations"
+msgstr "Conversaciones de sonido y vídeo"
 
-#: C/empathy.xml:953(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:28(title)
+msgid "Text conversations"
+msgstr "Conversaciones de texto"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:32(title)
+msgid "Manage accounts"
+msgstr "Gestionar las cuentas"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:36(title)
+msgid "Advanced actions"
+msgstr "Acciones avanzadas"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/group-conversations.page:7(desc)
+msgid "Start a group conversation with your contacts."
+msgstr "Iniciar una conversación en grupo con sus contactos."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/group-conversations.page:13(title)
+msgid "Group conversations"
+msgstr "Conversaciones de grupos"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:8(desc)
 msgid ""
-"Select this option to ignore the invitations that other people may send you."
+"Prevent an account from logging-in automatically when you start "
+"<app>Empathy</app>."
 msgstr ""
-"Seleccione esta opción para ignorar las invitaciones que otras personas "
-"pueden enviarle."
+"Prevenir que una cuenta inicie sesión automáticamente al iniciar "
+"<app>Empathy</app>."
 
-#: C/empathy.xml:961(guilabel)
-msgid "Room List locale"
-msgstr "Configuración de la lista de salas"
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:25(title)
+msgid "Disable an account"
+msgstr "Desactivar una cuenta"
 
-#: C/empathy.xml:964(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:27(p)
 msgid ""
-"The value of this text box identifies the language used to retrieve the room "
-"list when connecting to the Yahoo service."
+"Disabling an account means to deactivate it, temporarily or permanently. All "
+"the conversations you had will be kept in your computer."
 msgstr ""
-"El valor de esta caja de texto identifica el idioma que usar al obtener la "
-"lista de salas al conectar con el servicio de Yahoo!"
+"Desactivar una cuenta significa desactivarla, temporal o permanentemente. "
+"Todas las conversaciones que tuvo se mantendrán en su equipo."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:31(p)
+msgid "After disabling an account, it is possible to enable it again."
+msgstr "Después de desactivar una cuenta es posible activarla de nuevo."
 
-#: C/empathy.xml:969(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:54(p)
 msgid ""
-"If you need to change this value, use the two letter code of your language."
+"Select the account you wish to disable from the box on the left of the "
+"dialog."
 msgstr ""
-"Si necesita cambiar ese valor use el código de dos letras para su idioma."
+"Seleccione la cuenta que desea desactivar en la caja a la izquierda del "
+"diálogo."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:60(p)
+msgid "Deselect the <gui>Enabled</gui> check-box."
+msgstr "Deseleccione la caja de verificación <gui>Activada</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:9(desc)
+msgid "Register an account with one of the supported messaging services."
+msgstr "Registre una cuenta con uno de los servicios de mensajería soportados."
 
-#: C/empathy.xml:977(guilabel) C/empathy.xml:1119(guilabel)
-msgid "Charset"
-msgstr "Conjunto de caracteres"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:25(title)
+msgid "Register for a new account"
+msgstr "Registrar una cuenta nueva"
 
-#: C/empathy.xml:980(para) C/empathy.xml:1122(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:27(p)
 msgid ""
-"The value of this text box identifies the set of the characters used by "
-"<application>Empathy</application>."
+"You can freely create an account on any of the services listed below. Follow "
+"the instructions reported on each website on how to register your new "
+"account."
 msgstr ""
-"El valor de esta caja de texto identifica el conjunto de caracteres que usa "
-"<application>Empathy</application>."
+"Puede crear gratuitamente una cuenta en cualquiera de los servicios listados "
+"debajo. Siga las instrucciones en cada sitio web para saber cómo registrar "
+"una cuenta nueva."
 
-#: C/empathy.xml:986(para) C/empathy.xml:1128(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:32(p)
 msgid ""
-"It is advise to leave this value to <literal>UTF-8</literal>. Change it only "
-"if that charset does not cover your language."
+"At the end of the registration process you should have a <em>user name</em> "
+"(or an <em>account ID</em>) and a <em>password</em> that you will use to add "
+"the account to <app>Empathy</app>."
 msgstr ""
-"Se recomienda dejar este valor en <literal>UTF-8</literal>. Cámbielo sólo si "
-"ese conjunto de caracteres no cubre su idioma."
+"Al final del proceso de registro debería tener un <em>nombre de usuario</em> "
+"(o un <em>ID de cuenta</em>) y una <em>contraseña</em> que usará para añadir "
+"a la cuenta de <app>Empathy</app>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:37(p)
+msgid "Click on the name of the service to visit its website."
+msgstr "Pulse en el nombre del servicio para visitar su página web."
 
-#: C/empathy.xml:1023(guilabel)
-msgid "Use Yahoo Japan"
-msgstr "Usar Yahoo Japón"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:42(title)
+msgid "Instant Messaging Services"
+msgstr "Servicios de mensajería instantánea"
 
-#: C/empathy.xml:1026(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:47(link)
+msgid "AIM"
+msgstr "AIM"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:52(link)
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:57(link)
+msgid "ICQ"
+msgstr "ICQ"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:62(link)
+msgid "Jabber"
+msgstr "Jabber"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:65(p)
 msgid ""
-"Select this option only if you have a Yahoo! Japan account. With the Yahoo! "
-"Japan service you can only use a Yahoo! Japan account: if you have "
-"registered an account with the English version of the service, that account "
-"will not work."
+"It is possible to use the automatic creation of accounts with this service. "
+"Not all the service providers support it. One service provider known to work "
+"is <em>jabber.org</em>, the default one of the application."
 msgstr ""
-"Seleccione esta opción sólo si tiene una cuenta de Yahoo! Japón. Con el "
-"servicio Yahoo! Japón sólo puede usar una cuenta de Yahoo! Japón: si ha "
-"registrado una cuenta con la versión inglesa del servicio, esa cuenta no "
-"funcionará."
+"Es posible usar creación automática de cuentas con este servicio. No todos "
+"los proveedores de servicios lo soportan. Un proveedor de servicios que se "
+"sabe que funciona es <em>jabber.org</em>, el predeterminado para la "
+"aplicación."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:75(link)
+msgid "MSN"
+msgstr "MSN"
 
-#: C/empathy.xml:1040(title)
-msgid "<acronym>AIM</acronym>, GroupWise and <acronym>MSN</acronym>"
-msgstr "<acronym>AIM</acronym>, GroupWise y <acronym>MSN</acronym>"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:80(link)
+msgid "Yahoo!"
+msgstr "Yahoo!"
 
-#: C/empathy.xml:1079(guilabel)
-msgid "Published Name"
-msgstr "Nombre publicado"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:87(title)
+msgid "Local Instant Messaging Services"
+msgstr "Servicios de mensajería instantánea locales"
 
-#: C/empathy.xml:1082(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:88(p)
 msgid ""
-"Use this text box to write the name that will be visible to the other users "
-"of the network."
+"This service works when you are connected to a local network, you do not "
+"need an Internet connection in order to use it."
 msgstr ""
-"Use esta caja de texto para escribir el nombre que será visible al resto de "
-"usuarios de la red."
+"Este servicio funciona cuando está conectado a una red local, no necesita "
+"una conexión con Internet para usarlo."
 
-#: C/empathy.xml:1090(guilabel)
-msgid "Email"
-msgstr "Correo-e"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:95(em)
+msgid "Salut"
+msgstr "Salut"
 
-#: C/empathy.xml:1093(para)
-msgid "Use this text box to write your email."
-msgstr "Use esta caja de texto para escribir su correo-e."
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:100(p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr ""
+"Para obtener más información consulte la <link xref=\"salut-protocol\"/>."
 
-#: C/empathy.xml:1100(guilabel)
-msgid "Jabber ID"
-msgstr "ID Jabber"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:107(title)
+msgid "Telephony Services"
+msgstr "Servicios de telefonía"
 
-#: C/empathy.xml:1103(para)
-msgid "Use this text box to write your Jabber ID, if you have one."
-msgstr "Use esta caja de texto para escribir su ID Jabber, si tiene uno."
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:109(p)
+msgid ""
+"These services will let you do voice call over the Internet with other "
+"people using the same service or even to normal phones."
+msgstr ""
+"Estos servicios le permiten realizar llamadas de voz en Internet con otras "
+"personas que usen el mismo servicio o incluso teléfonos normales."
 
-#: C/empathy.xml:1168(title)
-msgid "Gadu Gadu"
-msgstr "Gadu Gadu"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:117(link)
+msgid "Ekiga"
+msgstr "Ekiga"
 
-#: C/empathy.xml:1172(guilabel)
-msgid "Nick"
-msgstr "Apodo"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:122(link)
+msgid "Sipphone"
+msgstr "Sipphone"
 
-#: C/empathy.xml:1174(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:128(p)
 msgid ""
-"Use this text box to write an alternative name to use with this service."
+"In order to call normal phones over the Internet, you may need to subscribe "
+"to a paid service. For more information, please refer to the instructions "
+"provided on the website of the service you will use."
 msgstr ""
-"Use esta caja de texto para escribir un nombre alternativo que usar con este "
-"servicio."
+"Para poder realizar llamadas a teléfonos normales a través de Internet puede "
+"que deba suscribirse a un servicio de pago. Para obtener más información "
+"consulte las instrucciones proporcionadas en la página web del servicio que "
+"usará."
 
-#: C/empathy.xml:1189(title)
-msgid "Contacts and Groups"
-msgstr "Contactos y grupos"
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:8(desc)
+msgid ""
+"Change your status, if you are going away from your computer for example."
+msgstr "Cambie su estado si, por ejemplo, se ausenta del equipo."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:24(title)
+msgid "Change your status"
+msgstr "Cambiar su estado"
 
-#: C/empathy.xml:1190(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:28(p)
 msgid ""
-"All the contacts are handled within <application>Empathy</application>'s "
-"<link linkend=\"empathy-FIG-mainwindow\">main window</link>."
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
 msgstr ""
-"Todos los contactos se gestionan en la <link linkend=\"empathy-FIG-mainwindow"
-"\">ventana principal</link> de <application>Empathy</application>."
+"Pulse en la lista desplegable en la parte superior de la ventana de la "
+"<gui>Lista de contactos</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:33(p)
+msgid "Select a status from the list."
+msgstr "Seleccione un estado de la lista."
 
-#: C/empathy.xml:1194(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:39(p)
 msgid ""
-"You can add or remove a contact or you can edit the information of a "
-"particular contact. It is also possibile to arrange contacts in groups. You "
-"can have a group for your work contacts, one for you family contacts, and so "
-"on."
+"For example, if you are busy and do not want to be disturbed, select "
+"<gui>Busy</gui>."
 msgstr ""
-"Puede añadir o quitar un contacto o puede editar la información de un "
-"contacto en particular. También es posible agrupar los contactos en grupos. "
-"Puede tener un grupo para sus contactos del trabajo, uno para los contactos "
-"de su familia, y demás."
+"Por ejemplo, si está ocupado y no quiere que le molesten seleccione "
+"<gui>Ocupado</gui>."
 
-#: C/empathy.xml:1201(title)
-msgid "Adding and Removing a Contact"
-msgstr "Añadir y quitar un contacto"
-
-#: C/empathy.xml:1202(para)
-msgid "To add a new contact, proceed as follows:"
-msgstr "Para añadir un contacto nuevo, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:45(p)
+msgid ""
+"If you do not use your computer for a while, or if the screen saver is "
+"turned on, the status will be automatically set to <gui>Away</gui>."
+msgstr ""
+"Si no usa su equipo durante un rato, o si se activa el salvapantallas, el "
+"estado se cambiará automáticamente a <gui>Ausente</gui>."
 
-#: C/empathy.xml:1208(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.
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:41(None)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window</link> choose "
-"<menuchoice><guimenu>Chat</guimenu><guimenuitem>Add Contact...</"
-"guimenuitem></menuchoice>. The <guilabel>New Contact</guilabel> dialog will "
-"be shown."
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
+msgstr ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
+
+#. 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.
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:55(None)
+msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link>, "
-"elija <menuchoice><guimenu>Chat</guimenu><guimenuitem>Añadir contacto...</"
-"guimenuitem></menuchoice>. Se mostrará el diálogo <guilabel>Contacto nuevo</"
-"guilabel>."
+"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 
-#: C/empathy.xml:1218(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:7(desc)
+msgid "When it is possible to have an audio or video conversation."
+msgstr "Cuándo es posible tener conversaciones de sonido o vídeo."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:16(p)
 msgid ""
-"From the <guilabel>Account</guilabel> drop-down list, choose the service "
-"used by the contact you are adding."
+"When your contacts support audio or video conversations, you will see, next "
+"to the contacts name in the <gui>Contact List</gui> window, one or two small "
+"icons that represent the different conversations you can have."
 msgstr ""
-"Desde la lista desplegable <guilabel>Cuenta</guilabel>, elija el servicio "
-"que usa el contacto que está añadiendo."
+"Cuando sus contactos soporten conversaciones de sonido o vídeo verá, junto "
+"al nombre de sus contactos, en la ventana de la <gui>Lista de contactos</"
+"gui>, uno o dos pequeños iconos que representan las diferentes "
+"conversaciones que puede tener."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:41(media)
+msgid "Icon for audio conversation"
+msgstr "Icono para la conversación de sonido"
 
-#: C/empathy.xml:1224(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:47(p)
 msgid ""
-"In the <guilabel>Identifier</guilabel> text box type the <emphasis>address</"
-"emphasis> of the contact in the form of <userinput><replaceable>user name</"
-"replaceable>@<replaceable>service\n"
-"\t      domain</replaceable></userinput>."
+"This is the icon that represents the possibility to have an audio "
+"conversation."
 msgstr ""
-"En la caja de texto <guilabel>Identificador</guilabel> escriba la "
-"<emphasis>dirección</emphasis> del contacto de la forma "
-"<userinput><replaceable>nombre de usuario</"
-"replaceable>@<replaceable>servicio\n"
-"\t     dominio</replaceable></userinput>."
+"Este es el icono que representa la posibilidad de tener una conversación de "
+"sonido."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:55(media)
+msgid "Icon for video conversation"
+msgstr "Icono para la conversación de vídeo"
 
-#: C/empathy.xml:1233(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:61(p)
 msgid ""
-"In the <guilabel>Alias</guilabel> text box type the name you want to give at "
-"the the new contact."
+"This is the icon that represents the possibility to have a video "
+"conversation."
 msgstr ""
-"En la caja de texto <guilabel>Apodo</guilabel> escriba el nombre que quiere "
-"darle a su nuevo contacto."
+"Este es el icono que representa la posibilidad de tener una conversación de "
+"vídeo."
 
-#: C/empathy.xml:1239(para)
-msgid "Click on <guibutton>Add</guibutton> to add the new contact."
-msgstr "Pulse en <guibutton>Añadir</guibutton> para añadir el contacto nuevo."
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:8(desc)
+msgid "Start an audio conversation with one of your contacts."
+msgstr "Iniciar una conversación de sonido con uno de sus contactos."
 
-#: C/empathy.xml:1245(para)
-msgid "To remove a contact, proceed as follows:"
-msgstr "Para quitar un contacto, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:16(title)
+msgid "Start an audio conversation"
+msgstr "Iniciar una conversación de sonido"
 
-#: C/empathy.xml:1251(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:25(p)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select "
-"the contact you would like to remove and right-click on it."
+"Select the contact you want to have a conversation with, and click on the "
+"audio call icon next to their name."
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link>, "
-"seleccione el contacto que quiere quitar y pulse con el botón derecho sobre "
-"él."
+"Seleccione el contacto con el que quiera tener una conversación y pulse en "
+"el icono de llamada de sonido junto a su nombre."
 
-#: C/empathy.xml:1258(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:31(p)
 msgid ""
-"From the popup menu, choose <guilabel>Remove</guilabel> to remove the "
-"contact."
+"Right-click on the name of the contact you want to have a conversation with, "
+"and select <gui>Audio Call</gui>."
 msgstr ""
-"Desde el menú emergente, elija <guilabel>Quitar</guilabel> para quitar el "
-"contacto."
+"Pulse con el botón derecho del ratón sobre el nombre del contacto con el que "
+"quiera tener una conversación y seleccione <gui>Llamada de sonido</gui>."
 
-#: C/empathy.xml:1267(para) C/empathy.xml:1303(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:52(p)
 msgid ""
-"An <emphasis>alias</emphasis> is an alternative way you can identify that "
-"particular contact. You can use the real name or the nickname of that person."
+"To turn an audio conversation into a video one, from the call window select "
+"<guiseq><gui>Call</gui><gui>Send video</gui></guiseq>, or click on the video "
+"call icon."
 msgstr ""
-"Un <emphasis>apodo</emphasis> es una forma alternativa de identificar un "
-"contacto en particular. Puede usar el nombre real o el apodo de esa persona."
+"Para convertir una conversación de sonido en una de vídeo, desde la ventana "
+"de llamada seleccione <guiseq><gui>Llamar</gui><gui>Enviar vídeo</gui></"
+"guiseq> o pulse el icono de vídeo llamada."
 
-#: C/empathy.xml:1276(title)
-msgid "Editing a Contact"
-msgstr "Editar un contacto"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:8(desc)
+msgid "Add someone to the contact list."
+msgstr "Añadir alguien a la lista de contactos."
 
-#: C/empathy.xml:1277(para)
-msgid "To edit a contact, proceed as follows:"
-msgstr "Para editar un contacto, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:22(title)
+msgid "Add someone to your list of contacts"
+msgstr "Añadir alguien a su lista de contactos"
 
-#: C/empathy.xml:1283(para) C/empathy.xml:1325(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:26(p)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select "
-"the contact you would like to modify and choose <menuchoice><guimenu>Edit</"
-"guimenu><guisubmenu>Contact</guisubmenu><guimenuitem>Edit</guimenuitem></"
-"menuchoice>, or right-click on it and choose <guilabel>Edit</guilabel>."
+"Instructions need review, didn't test with other IM services to confirm the "
+"names of the textboxes. Also, check the name of the Add button."
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link>, "
-"seleccione el contacto que quiere modificar y elija "
-"<menuchoice><guimenu>Editar</guimenu><guisubmenu>Contacto</"
-"guisubmenu><guimenuitem>Editar</guimenuitem></menuchoice> o pulse con el "
-"botón derecho sobre él y elija <guilabel>Editar</guilabel>."
+"Las instrucciones necesitan revisión, no se confirmaron con otros servicios "
+"de MI para confirmar los nombres de las cajas de texto. También, comprobar "
+"el nombre del botón Añadir."
 
-#: C/empathy.xml:1296(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:32(p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr "Elija <guiseq><gui>Chat</gui><gui>Añadir contacto</gui></guiseq>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:37(p)
 msgid ""
-"From the <guilabel>Edit Contact Information</guilabel> dialog, you can "
-"modify the <emphasis>alias</emphasis> and the <emphasis>group</emphasis> of "
-"the contact."
+"From the <gui>Account</gui> drop-down list, select the type of service the "
+"person you want to add to your contacts is using."
 msgstr ""
-"Desde el diálogo <guilabel>Editar información del contacto</guilabel> puede "
-"modificar el <emphasis>apodp</emphasis> y el <emphasis>grupo</emphasis> del "
-"contacto."
+"Desde la lista desplegable <gui>Cuenta</gui> seleccione el tipo de servicio "
+"que está usando la persona que quiere añadir a sus contactos."
 
-#: C/empathy.xml:1310(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:43(p)
 msgid ""
-"For more information about groups, see <xref linkend=\"empathy-add-contact-"
-"group\"/> and <xref linkend=\"empathy-add-group\"/>."
+"In the <gui>Identifier</gui> text box, type the email address or the "
+"username of the person you want to add to your contacts list."
 msgstr ""
-"Para obtener más información acerca de los grupos, consulte <xref linkend="
-"\"empathy-add-contact-group\"/> y <xref linkend=\"empathy-add-group\"/>."
+"En la caja de texto <gui>Identificador</gui> escriba el correo electrónico o "
+"el nombre de usuario de la persona que quiere añadir a su lista de contactos."
 
-#: C/empathy.xml:1318(title)
-msgid "Adding a Contact to a Group"
-msgstr "Añadir un contacto a un grupo"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:50(p)
+msgid "In the <gui>Alias</gui> text box, type their name."
+msgstr "En la caja de texto <gui>Apodo</gui> escriba su nombre."
 
-#: C/empathy.xml:1319(para)
-msgid "To add a contact to one or more groups, proceed as follows:"
-msgstr "Para añadir un contacto a uno o más grupos, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:55(p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+msgstr ""
+"Pulse <gui>Añadir</gui> para añadir la persona a su lista de contactos."
 
-#: C/empathy.xml:1337(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:63(p)
 msgid ""
-"From the <guilabel>Groups</guilabel> section, select the group, or groups, "
-"you want to add the contact to."
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
 msgstr ""
-"En la sección <guilabel>Grupos</guilabel>, seleccione el grupo o grupos a "
-"los que quiera añadir el contacto."
+"Para añadir una persona nueva a su lista de contactos necesita estar "
+"conectado a Internet y a su cuenta."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:8(desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Añadir una cuenta nueva en <app>Empathy</app>."
 
-#: C/empathy.xml:1352(title)
-msgid "Adding a New Group"
-msgstr "Añadir un grupo nuevo"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:22(title)
+msgid "Add a new account"
+msgstr "Añadir una cuenta nueva"
 
-#: C/empathy.xml:1353(para)
-msgid "To add a new group, proceed as follows:"
-msgstr "Para añadir un grupo nuevo, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:48(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:65(p)
+msgid ""
+"From the <gui>Type</gui> drop-down list choose the service you wish to add "
+"an account for, then click on the <gui>Create</gui> button."
+msgstr ""
+"Desde la lista desplegable <gui>Tipo</gui> elija el servicio para el que "
+"quiere crear la cuenta, después pulse en el botón <gui>Crear</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:74(p)
+msgid ""
+"Fill the required fields with your <em>user name</em> and <em>password</em>."
+msgstr ""
+"Rellene los campos necesarios con su <em>nombre de usuario</em> y su "
+"<em>contraseña</em>."
 
-#: C/empathy.xml:1359(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/legal.xml:3(p)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select "
-"one contact and choose <menuchoice><guimenu>Edit</"
-"guimenu><guisubmenu>Contact</guisubmenu><guimenuitem>Edit</guimenuitem></"
-"menuchoice>, or right-click on it and choose <guilabel>Edit</guilabel>."
+"This work is licensed under a <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/us/\">Creative Commons Attribution-Share Alike 3.0 United "
+"States License</link>."
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link>, "
-"seleccione un contacto y elija <menuchoice><guimenu>Editar</"
-"guimenu><guisubmenu>Contacto</guisubmenu><guimenuitem>Editar</guimenuitem></"
-"menuchoice> o pulse con el botón derecho y elija <guilabel>Editar</guilabel>."
+"Este trabajo está licenciado bajo una <link href=\"http://creativecommons."
+"org/licenses/by-sa/3.0/us/\">Licencia Creative Commons atribución - "
+"compartir igual 3.0 para los Estados Unidos</link>."
 
-#: C/empathy.xml:1370(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/legal.xml:6(p)
 msgid ""
-"In the <guilabel>Groups</guilabel> section, write the name of the group you "
-"want to add and then click on <guibutton>Add Group</guibutton>."
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
 msgstr ""
-"En la sección <guilabel>Grupos</guilabel> escriba el nombre del grupo que "
-"quiere añadir y después pulse <guibutton>Añadir grupo</guibutton>."
+"Como excepción especial, los poseedores de los derechos de autor le dan "
+"permiso para copiar, modificar y distribuir el ejemplo de código contenido "
+"en este documento bajo los términos que usted elija, sin restricción."
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/empathy.xml:0(None)
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: /media/data/jhbuild/checkout/empathy/help/C/legal.xml:0(None)
 msgid "translator-credits"
 msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2008-2009"
-
-#~ msgid "TODO"
-#~ msgstr "POR HACER"
-
-#~| msgid ""
-#~| "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, "
-#~| "select the contact you would like to remove and right-click on it."
-#~ msgid ""
-#~ "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, "
-#~ "select the contact you would like to modify and right-click on it."
-#~ msgstr ""
-#~ "Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</"
-#~ "link>, seleccione el contacto que quiere modificar y pulse con el botón "
-#~ "derecho sobre él."
-
-#~| msgid ""
-#~| "From the popup menu, choose <guilabel>Remove</guilabel> to remove the "
-#~| "contact."
-#~ msgid ""
-#~ "From the popup menu, choose <guilabel>Modify</guilabel> to modify the "
-#~ "contact."
-#~ msgstr ""
-#~ "Desde el menú emergente, elija <guilabel>Modificar</guilabel> para "
-#~ "modificar el contacto."
-
-#~ msgid "From the popup menu, choose <guilabel>Modify</guilabel>."
-#~ msgstr "Desde el menú emergente, elija <guilabel>Modificar</guilabel>."
-
-#~| msgid ""
-#~| "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, "
-#~| "select the contact you would like to remove and right-click on it."
-#~ msgid ""
-#~ "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, "
-#~ "select one contact and right-click on it."
-#~ msgstr ""
-#~ "Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</"
-#~ "link>, seleccione un contacto y pulse con el botón derecho sobre él."
-
-#~ msgid ""
-#~ "@@image: 'figures/empathy-new-account.png'; "
-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
-#~ msgstr ""
-#~ "@@image: 'figures/empathy-new-account.png'; "
-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
-
-#~ msgid "milo_casagrande@yahoo.it"
-#~ msgstr "milo_casagrande@yahoo.it"
-
-#~ msgid "When You Start Empathy for the First Time"
-#~ msgstr "Al iniciar Empathy por primera vez"
-
-#~ msgid "<application>Empathy</application> Accounts Dialog"
-#~ msgstr "Diálogo de cuentas de <application>Empathy</application>"
-
-#~ msgid "Shows <placeholder-1/> account creation dialog."
-#~ msgstr "Muestra <placeholder-1/> diálogo de creación de cuentas."
-
-#~ msgid ""
-#~ "When you start <application>Empathy</application> for the first time and "
-#~ "you don't have configured any account yet, the following dialog is shown. "
-#~ "<placeholder-1/>"
-#~ msgstr ""
-#~ "Al inicial <application>Empathy</application> la primera vez, no tendrá "
-#~ "configurada ninguna cuenta, entonces se mostrará el siguiente diálogo. "
-#~ "<placeholder-1/>"
-
-#~ msgid ""
-#~ "From here, you can configure and create your accounts. See <xref linkend="
-#~ "\"empathy-accounts\"/> for more information."
-#~ msgstr ""
-#~ "Desde aquí puede configurar y crear sus cuentas. Para obtener más "
-#~ "información consulte <xref linkend=\"empathy-accounts\"/>."
-
-#~ msgid ""
-#~ "You can use one of the following services if you already have a <emphasis "
-#~ "role=\"strong\">Jabber</emphasis> account:"
-#~ msgstr ""
-#~ "Puede usar uno de los siguientes servicios si ya dispone de una cuenta "
-#~ "<emphasis role=\"strong\">Jabber</emphasis>:"
-
-#~ msgid ""
-#~ "Fill the required fields with your <emphasis>user name</emphasis> and "
-#~ "<emphasis>password</emphasis>."
-#~ msgstr ""
-#~ "Rellene los campos requeridos con su <emphasis>nombre de usuario</"
-#~ "emphasis> y su <emphasis>contraseña</emphasis>."
-
-#~ msgid "To create an account, proceed as follow: <placeholder-1/>"
-#~ msgstr "Para crear una cuenta, proceda como sigue: <placeholder-1/>"
-
-#~ msgid "Contacts"
-#~ msgstr "Contactos"
-
-#~ msgid "Modifying a Contact"
-#~ msgstr "Modificar un contacto"
-
-#~ msgid ""
-#~ "The <ulink type=\"http\" url=\"http://www.ekiga.net/user/reg/index.php?"
-#~ "phplib_Session=c1d85267756241f8190e5fc21b029a62\">Ekiga</ulink> service."
-#~ msgstr ""
-#~ "El servicio <ulink type=\"http\" url=\"http://www.ekiga.net/user/reg/"
-#~ "index.php?phplib_Session=c1d85267756241f8190e5fc21b029a62\">Ekiga</ulink>."
diff --git a/libempathy-gtk/empathy-audio-sink.c b/libempathy-gtk/empathy-audio-sink.c
index 55f64e828..1d2169593 100644
--- a/libempathy-gtk/empathy-audio-sink.c
+++ b/libempathy-gtk/empathy-audio-sink.c
@@ -204,7 +204,15 @@ empathy_audio_sink_finalize (GObject *object)
 GstElement *
 empathy_audio_sink_new (void)
 {
-  return GST_ELEMENT (g_object_new (EMPATHY_TYPE_GST_AUDIO_SINK, NULL));
+  static gboolean registered = FALSE;
+
+  if (!registered) {
+    if (!gst_element_register (NULL, "empathyaudiosink",
+            GST_RANK_NONE, EMPATHY_TYPE_GST_AUDIO_SINK))
+      return NULL;
+    registered = TRUE;
+  }
+  return gst_element_factory_make ("empathyaudiosink", NULL);
 }
 
 void
diff --git a/libempathy-gtk/empathy-audio-src.c b/libempathy-gtk/empathy-audio-src.c
index 0497439bf..a3416f2ea 100644
--- a/libempathy-gtk/empathy-audio-src.c
+++ b/libempathy-gtk/empathy-audio-src.c
@@ -343,7 +343,15 @@ out:
 GstElement *
 empathy_audio_src_new (void)
 {
-  return GST_ELEMENT (g_object_new (EMPATHY_TYPE_GST_AUDIO_SRC, NULL));
+  static gboolean registered = FALSE;
+
+  if (!registered) {
+    if (!gst_element_register (NULL, "empathyaudiosrc",
+            GST_RANK_NONE, EMPATHY_TYPE_GST_AUDIO_SRC))
+      return NULL;
+    registered = TRUE;
+  }
+  return gst_element_factory_make ("empathyaudiosrc", NULL);
 }
 
 void
@@ -375,3 +383,5 @@ empathy_audio_src_get_volume (EmpathyGstAudioSrc *src)
 
   return volume;
 }
+
+
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index d52d7af93..9096beeae 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -401,9 +401,18 @@ chat_send (EmpathyChat  *chat,
 	if (msg[0] == '/' &&
 	    !g_str_has_prefix (msg, "/me") &&
 	    !g_str_has_prefix (msg, "/say")) {
-		empathy_chat_view_append_event (chat->view,
-			_("Unsupported command"));
-		return;
+		/* Also allow messages with two slashes before the first space,
+		 * so it is possible to send an /unix/path */
+		int slash_count = 0, i;
+		for (i = 0; msg[i] && msg[i] != ' ' && slash_count < 2; i++) {
+			if (msg[i] == '/')
+				slash_count++;
+		}
+		if (slash_count == 1) {
+			empathy_chat_view_append_event (chat->view,
+				_("Unsupported command"));
+			return;
+		}
 	}
 
 	/* We can send the message */
@@ -1183,7 +1192,10 @@ build_part_message (guint           reason,
 		break;
 	case TP_CHANNEL_GROUP_CHANGE_REASON_KICKED:
 		if (actor_name != NULL) {
-			g_string_append_printf (s, _("%s was kicked by %s"),
+			/* translators: reverse the order of these arguments
+			 * if the kicked should come before the kicker in your locale.
+			 */
+			g_string_append_printf (s, _("%1$s was kicked by %2$s"),
 				name, actor_name);
 		} else {
 			g_string_append_printf (s, _("%s was kicked"), name);
@@ -1191,7 +1203,10 @@ build_part_message (guint           reason,
 		break;
 	case TP_CHANNEL_GROUP_CHANGE_REASON_BANNED:
 		if (actor_name != NULL) {
-			g_string_append_printf (s, _("%s was banned by %s"),
+			/* translators: reverse the order of these arguments
+			 * if the banned should come before the banner in your locale.
+			 */
+			g_string_append_printf (s, _("%1$s was banned by %2$s"),
 				name, actor_name);
 		} else {
 			g_string_append_printf (s, _("%s was banned"), name);
diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h
index 2383a7edf..d8e34f6b9 100644
--- a/libempathy-gtk/empathy-conf.h
+++ b/libempathy-gtk/empathy-conf.h
@@ -78,7 +78,7 @@ struct _EmpathyConfClass {
 #define EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM      EMPATHY_PREFS_PATH "/contacts/sort_criterium"
 #define EMPATHY_PREFS_HINTS_CLOSE_MAIN_WINDOW      EMPATHY_PREFS_PATH "/hints/close_main_window"
 #define EMPATHY_PREFS_SALUT_ACCOUNT_CREATED        EMPATHY_PREFS_PATH "/accounts/salut_created"
-#define EMPATHY_PREFS_USE_NM                       EMPATHY_PREFS_PATH "/use_nm"
+#define EMPATHY_PREFS_USE_CONN                     EMPATHY_PREFS_PATH "/use_conn"
 #define EMPATHY_PREFS_AUTOCONNECT                  EMPATHY_PREFS_PATH "/autoconnect"
 #define EMPATHY_PREFS_IMPORT_ASKED                 EMPATHY_PREFS_PATH "/import_asked"
 #define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER EMPATHY_PREFS_PATH "/file_transfer/default_folder"
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 2ff27b130..dcbbb18bf 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -364,6 +364,7 @@ contact_list_view_drag_motion (GtkWidget      *widget,
 	gboolean               is_row;
 	gboolean               is_different = FALSE;
 	gboolean               cleanup = TRUE;
+	int                    action = 0;
 
 	is_row = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
 						x,
@@ -382,6 +383,13 @@ contact_list_view_drag_motion (GtkWidget      *widget,
 		cleanup &= FALSE;
 	}
 
+	if (context->actions == GDK_ACTION_COPY) {
+		action = context->suggested_action;
+	} else if (context->actions & GDK_ACTION_MOVE) {
+		action = GDK_ACTION_MOVE;
+	}
+	gdk_drag_status (context, action, time);
+
 	if (!is_different && !cleanup) {
 		return TRUE;
 	}
diff --git a/libempathy-gtk/empathy-contact-list-view.h b/libempathy-gtk/empathy-contact-list-view.h
index 6666cfbb7..17de5239b 100644
--- a/libempathy-gtk/empathy-contact-list-view.h
+++ b/libempathy-gtk/empathy-contact-list-view.h
@@ -29,6 +29,7 @@
 #include <gtk/gtk.h>
 
 #include <libempathy/empathy-contact.h>
+#include <libempathy/empathy-enum-types.h>
 
 #include "empathy-contact-list-store.h"
 #include "empathy-contact-menu.h"
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 5b2e2de91..d6f806360 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -600,6 +600,10 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
                                 PANGO_WRAP_WORD_CHAR);
   gtk_label_set_line_wrap (GTK_LABEL (information->label_status),
                            TRUE);
+
+  if (!(information->flags & EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP))
+    gtk_label_set_selectable (GTK_LABEL (information->label_status), TRUE);
+
   gtk_box_pack_start (GTK_BOX (information->hbox_presence),
         information->label_status, TRUE, TRUE, 0);
   gtk_widget_show (information->label_status);
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 278af72f2..2018b5c5a 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -21,6 +21,10 @@
 
 #include "config.h"
 
+/* Needed for trunc */
+#define _ISOC9X_SOURCE 1
+#define _ISOC99_SOURCE 1
+#include <math.h>
 #include <string.h>
 #include <time.h>
 
@@ -63,7 +67,6 @@ typedef struct {
     GeoclueAddress *gc_address;
 
     gboolean reduce_accuracy;
-    gdouble reduce_value;
     EmpathyAccountManager *account_manager;
 
     /* The idle id for publish_on_idle func */
@@ -194,13 +197,13 @@ publish_location (EmpathyLocationManager *location_manager,
   if (!conn)
     return;
 
-  if (force_publication == FALSE)
+  if (!force_publication)
     {
       if (!empathy_conf_get_bool (conf, EMPATHY_PREFS_LOCATION_PUBLISH,
             &can_publish))
         return;
 
-      if (can_publish == FALSE)
+      if (!can_publish)
         return;
     }
 
@@ -312,7 +315,8 @@ address_changed_cb (GeoclueAddress *address,
     {
       GValue *new_value;
       /* Discard street information if reduced accuracy is on */
-      if (priv->reduce_accuracy && strcmp (key, EMPATHY_LOCATION_STREET) == 0)
+      if (priv->reduce_accuracy &&
+          !tp_strdiff (key, EMPATHY_LOCATION_STREET))
         continue;
 
       new_value = tp_g_value_slice_new_string (value);
@@ -368,7 +372,11 @@ position_changed_cb (GeocluePosition *position,
 
   if (fields & GEOCLUE_POSITION_FIELDS_LONGITUDE)
     {
-      longitude += priv->reduce_value;
+
+      if (priv->reduce_accuracy)
+        /* Truncate at 1 decimal place */
+        longitude = trunc (longitude * 10.0) / 10.0;
+
       new_value = tp_g_value_slice_new_double (longitude);
       g_hash_table_insert (priv->location, g_strdup (EMPATHY_LOCATION_LON),
           new_value);
@@ -381,7 +389,10 @@ position_changed_cb (GeocluePosition *position,
 
   if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE)
     {
-      latitude += priv->reduce_value;
+      if (priv->reduce_accuracy)
+        /* Truncate at 1 decimal place */
+        latitude = trunc (latitude * 10.0) / 10.0;
+
       new_value = tp_g_value_slice_new_double (latitude);
       g_hash_table_replace (priv->location, g_strdup (EMPATHY_LOCATION_LAT),
           new_value);
@@ -535,15 +546,15 @@ publish_cb (EmpathyConf *conf,
   DEBUG ("Publish Conf changed");
 
 
-  if (empathy_conf_get_bool (conf, key, &can_publish) == FALSE)
+  if (!empathy_conf_get_bool (conf, key, &can_publish))
     return;
 
-  if (can_publish == TRUE)
+  if (can_publish)
     {
-      if (priv->geoclue_is_setup == FALSE)
+      if (!priv->geoclue_is_setup)
         setup_geoclue (manager);
       /* if still not setup than the init failed */
-      if (priv->geoclue_is_setup == FALSE)
+      if (!priv->geoclue_is_setup)
         return;
 
       geoclue_address_get_address_async (priv->gc_address,
@@ -577,11 +588,11 @@ resource_cb (EmpathyConf  *conf,
   if (!empathy_conf_get_bool (conf, key, &resource_enabled))
     return;
 
-  if (strcmp (key, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK) == 0)
+  if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK))
     resource = GEOCLUE_RESOURCE_NETWORK;
-  if (strcmp (key, EMPATHY_PREFS_LOCATION_RESOURCE_CELL) == 0)
+  if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_CELL))
     resource = GEOCLUE_RESOURCE_CELL;
-  if (strcmp (key, EMPATHY_PREFS_LOCATION_RESOURCE_GPS) == 0)
+  if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_GPS))
     resource = GEOCLUE_RESOURCE_GPS;
 
   if (resource_enabled)
@@ -609,17 +620,6 @@ accuracy_cb (EmpathyConf  *conf,
     return;
   priv->reduce_accuracy = enabled;
 
-  if (enabled)
-    {
-      GRand *rand = g_rand_new_with_seed (time (NULL));
-      priv->reduce_value = g_rand_double_range (rand, -0.25, 0.25);
-      g_rand_free (rand);
-    }
-  else
-    {
-      priv->reduce_value = 0.0;
-    }
-
   if (!priv->geoclue_is_setup)
     return;
 
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 69b031c05..ba36e091c 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -35,6 +35,7 @@
 
 #include <telepathy-glib/util.h>
 
+#include <libempathy/empathy-connectivity.h>
 #include <libempathy/empathy-idle.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-status-presets.h>
@@ -98,6 +99,9 @@ typedef enum  {
 
 typedef struct {
 	EmpathyIdle *idle;
+	EmpathyConnectivity *connectivity;
+
+	gulong state_change_signal_id;
 
 	gboolean     editing_status;
 	int          block_set_editing;
@@ -710,6 +714,14 @@ presence_chooser_entry_focus_out_cb (EmpathyPresenceChooser *chooser,
 }
 
 static void
+presence_chooser_connectivity_state_change (EmpathyConnectivity *connectivity,
+					    gboolean new_online,
+					    EmpathyPresenceChooser *chooser)
+{
+	gtk_widget_set_sensitive (GTK_WIDGET (chooser), new_online);
+}
+
+static void
 empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
 {
 	EmpathyPresenceChooserPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (chooser,
@@ -780,6 +792,14 @@ empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
 	/* FIXME: this string sucks */
 	gtk_widget_set_tooltip_text (GTK_WIDGET (chooser),
 		_("Set your presence and current status"));
+
+	priv->connectivity = empathy_connectivity_dup_singleton ();
+	priv->state_change_signal_id = g_signal_connect (priv->connectivity,
+		"state-change",
+		G_CALLBACK (presence_chooser_connectivity_state_change),
+		chooser);
+	presence_chooser_connectivity_state_change (priv->connectivity,
+		empathy_connectivity_is_online (priv->connectivity), chooser);
 }
 
 static void
@@ -802,6 +822,12 @@ presence_chooser_finalize (GObject *object)
 					      object);
 	g_object_unref (priv->idle);
 
+	g_signal_handler_disconnect (priv->connectivity,
+				     priv->state_change_signal_id);
+	priv->state_change_signal_id = 0;
+
+	g_object_unref (priv->connectivity);
+
 	G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->finalize (object);
 }
 
@@ -1049,6 +1075,7 @@ presence_chooser_menu_add_item (GtkWidget   *menu,
 	gtk_widget_show (image);
 
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
 	gtk_widget_show (item);
 
 	g_object_set_data_full (G_OBJECT (item),
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 4c60e435f..01c2e183f 100644
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -212,7 +212,7 @@ empathy_share_my_desktop_connection_ready (TpConnection *connection,
   g_hash_table_insert (request, TP_IFACE_CHANNEL ".TargetHandle", value);
 
   /* org.freedesktop.Telepathy.Channel.Type.StreamTube.Service */
-  value = tp_g_value_slice_new_static_string ("x_vnc");
+  value = tp_g_value_slice_new_static_string ("rfb");
   g_hash_table_insert (request,
       TP_IFACE_CHANNEL_TYPE_STREAM_TUBE  ".Service",
       value);
diff --git a/libempathy-gtk/empathy-status-preset-dialog.ui b/libempathy-gtk/empathy-status-preset-dialog.ui
index ead8ab85d..3e76eb6aa 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.ui
+++ b/libempathy-gtk/empathy-status-preset-dialog.ui
@@ -46,7 +46,7 @@
         <property name="layout_style">end</property>
         <child>
           <object class="GtkButton" id="remove-button">
-            <property name="label" translatable="yes">gtk-remove</property>
+            <property name="label">gtk-remove</property>
             <property name="visible">True</property>
             <property name="sensitive">False</property>
             <property name="can_focus">True</property>
@@ -95,7 +95,7 @@
         </child>
         <child>
           <object class="GtkButton" id="add-button">
-            <property name="label" translatable="yes">gtk-add</property>
+            <property name="label">gtk-add</property>
             <property name="visible">True</property>
             <property name="sensitive">False</property>
             <property name="can_focus">True</property>
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 2889aa304..e1094f1be 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -298,33 +298,6 @@ theme_adium_parse_body (EmpathyThemeAdium *theme,
 			       EMPATHY_PREFS_CHAT_SHOW_SMILEYS,
 			       &use_smileys);
 
-	if (use_smileys) {
-		/* Replace smileys by a <img/> tag */
-		string = g_string_sized_new (strlen (text));
-		smileys = empathy_smiley_manager_parse (priv->smiley_manager, text);
-		for (l = smileys; l; l = l->next) {
-			EmpathySmiley *smiley;
-
-			smiley = l->data;
-			if (smiley->path) {
-				g_string_append_printf (string,
-							"<abbr title='%s'><img src=\"%s\"/ alt=\"%s\"/></abbr>",
-							smiley->str, smiley->path, smiley->str);
-			} else {
-				gchar *str;
-
-				str = g_markup_escape_text (smiley->str, -1);
-				g_string_append (string, str);
-				g_free (str);
-			}
-			empathy_smiley_free (smiley);
-		}
-		g_slist_free (smileys);
-
-		g_free (ret);
-		text = ret = g_string_free (string, FALSE);
-	}
-
 	/* Add <a href></a> arround links */
 	uri_regex = empathy_uri_regex_dup_singleton ();
 	match = g_regex_match (uri_regex, text, 0, &match_info);
@@ -334,6 +307,8 @@ theme_adium_parse_body (EmpathyThemeAdium *theme,
 
 		string = g_string_sized_new (strlen (text));
 		do {
+			gchar *real_url;
+
 			g_match_info_fetch_pos (match_info, 0, &s, &e);
 
 			if (s > last) {
@@ -343,12 +318,15 @@ theme_adium_parse_body (EmpathyThemeAdium *theme,
 			}
 
 			/* Append the link inside <a href=""></a> tag */
+			real_url = empathy_make_absolute_url (text + s);
+
 			g_string_append (string, "<a href=\"");
-			g_string_append_len (string, text + s, e - s);
+			g_string_append (string, real_url);
 			g_string_append (string, "\">");
 			g_string_append_len (string, text + s, e - s);
 			g_string_append (string, "</a>");
 
+			g_free (real_url);
 			last = e;
 		} while (g_match_info_next (match_info, NULL));
 
@@ -359,7 +337,33 @@ theme_adium_parse_body (EmpathyThemeAdium *theme,
 
 		g_free (ret);
 		text = ret = g_string_free (string, FALSE);
+	} else if (use_smileys) {
+		/* Replace smileys by a <img/> tag */
+		string = g_string_sized_new (strlen (text));
+		smileys = empathy_smiley_manager_parse (priv->smiley_manager, text);
+		for (l = smileys; l; l = l->next) {
+			EmpathySmiley *smiley;
+
+			smiley = l->data;
+			if (smiley->path) {
+				g_string_append_printf (string,
+							"<abbr title='%s'><img src=\"%s\"/ alt=\"%s\"/></abbr>",
+							smiley->str, smiley->path, smiley->str);
+			} else {
+				gchar *str;
+
+				str = g_markup_escape_text (smiley->str, -1);
+				g_string_append (string, str);
+				g_free (str);
+			}
+			empathy_smiley_free (smiley);
+		}
+		g_slist_free (smileys);
+
+		g_free (ret);
+		text = ret = g_string_free (string, FALSE);
 	}
+
 	g_match_info_free (match_info);
 	g_regex_unref (uri_regex);
 
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 3dcefdcfb..c12cbd1c9 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1321,20 +1321,26 @@ empathy_get_toplevel_window (GtkWidget *widget)
 	return NULL;
 }
 
-/* The URL opening code can't handle schemeless strings, so we try to be
+/** empathy_make_absolute_url:
+ * @url: an url
+ *
+ * The URL opening code can't handle schemeless strings, so we try to be
  * smart and add http if there is no scheme or doesn't look like a mail
  * address. This should work in most cases, and let us click on strings
  * like "www.gnome.org".
+ *
+ * Returns: a newly allocated url with proper mailto: or http:// prefix, use
+ * g_free when your are done with it
  */
-static gchar *
-fixup_url (const gchar *url)
+gchar *
+empathy_make_absolute_url (const gchar *url)
 {
 	g_return_val_if_fail (url != NULL, NULL);
 
 	if (g_str_has_prefix (url, "ghelp:") ||
 	    g_str_has_prefix (url, "mailto:") ||
 	    strstr (url, ":/")) {
-		return NULL;
+		return g_strdup (url);
 	}
 
 	if (strstr (url, "@")) {
@@ -1354,12 +1360,9 @@ empathy_url_show (GtkWidget *parent,
 	g_return_if_fail (parent == NULL || GTK_IS_WIDGET (parent));
 	g_return_if_fail (url != NULL);
 
-	real_url = fixup_url (url);
-	if (real_url) {
-		url = real_url;
-	}
+	real_url = empathy_make_absolute_url (url);
 
-	gtk_show_uri (parent ? gtk_widget_get_screen (parent) : NULL, url,
+	gtk_show_uri (parent ? gtk_widget_get_screen (parent) : NULL, real_url,
 		      gtk_get_current_event_time (), &error);
 
 	if (error) {
@@ -1476,6 +1479,8 @@ empathy_send_file_with_file_chooser (EmpathyContact *contact)
 	gtk_dialog_set_default_response (GTK_DIALOG (widget),
 					 GTK_RESPONSE_OK);
 
+	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), FALSE);
+
 	g_signal_connect (widget, "response",
 			  G_CALLBACK (file_manager_send_file_response_cb),
 			  contact);
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 312835f0c..afb409af4 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -109,6 +109,8 @@ GtkWidget * empathy_link_button_new                     (const gchar      *url,
 void        empathy_send_file_with_file_chooser         (EmpathyContact   *contact);
 void        empathy_receive_file_with_file_chooser      (EmpathyFTHandler *handler);
 
+gchar *     empathy_make_absolute_url                   (const gchar *url);
+
 G_END_DECLS
 
 #endif /*  __EMPATHY_UI_UTILS_H__ */
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index cdaa144fc..5fe4a9df7 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -10,7 +10,8 @@ AM_CPPFLAGS =                                           \
 	-DG_LOG_DOMAIN=\"empathy\"			\
 	$(LIBEMPATHY_CFLAGS)				\
 	$(GEOCLUE_CFLAGS)				\
-	$(NETWORK_MANAGER_CFLAGS) \
+	$(NETWORK_MANAGER_CFLAGS)			\
+	$(CONNMAN_CFLAGS)				\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
@@ -31,6 +32,7 @@ libempathy_la_SOURCES =					\
 	empathy-chatroom-manager.c			\
 	empathy-call-factory.c				\
 	empathy-call-handler.c				\
+	empathy-connectivity.c				\
 	empathy-contact.c				\
 	empathy-contact-groups.c			\
 	empathy-contact-list.c				\
@@ -70,7 +72,8 @@ libempathy_la_LIBADD =		\
 	$(top_builddir)/extensions/libemp-extensions.la \
 	$(LIBEMPATHY_LIBS) \
 	$(GEOCLUE_LIBS) \
-	$(NETWORK_MANAGER_LIBS)
+	$(NETWORK_MANAGER_LIBS) \
+	$(CONNMAN_LIBS)
 
 libempathy_la_LDFLAGS =		\
        -version-info ${LIBEMPATHY_CURRENT}:${LIBEMPATHY_REVISION}:${LIBEMPATHY_AGE} \
@@ -84,6 +87,7 @@ libempathy_headers =				\
 	empathy-chatroom-manager.h		\
 	empathy-call-factory.h			\
 	empathy-call-handler.h			\
+	empathy-connectivity.h			\
 	empathy-contact.h			\
 	empathy-contact-groups.h		\
 	empathy-contact-list.h			\
diff --git a/libempathy/empathy-call-handler.c b/libempathy/empathy-call-handler.c
index 39f950f86..1c6e53c6c 100644
--- a/libempathy/empathy-call-handler.c
+++ b/libempathy/empathy-call-handler.c
@@ -28,8 +28,6 @@
 #include <telepathy-farsight/channel.h>
 #include <telepathy-farsight/stream.h>
 
-#include <gst/farsight/fs-element-added-notifier.h>
-
 #include "empathy-call-handler.h"
 #include "empathy-dispatcher.h"
 #include "empathy-marshal.h"
@@ -66,7 +64,6 @@ typedef struct {
   TfChannel *tfchannel;
   gboolean initial_audio;
   gboolean initial_video;
-  FsElementAddedNotifier *fsnotifier;
 } EmpathyCallHandlerPriv;
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCallHandler)
@@ -99,12 +96,6 @@ empathy_call_handler_dispose (GObject *object)
 
   priv->call = NULL;
 
-  if (priv->fsnotifier != NULL)
-    {
-      g_object_unref (priv->fsnotifier);
-    }
-  priv->fsnotifier = NULL;
-
   /* release any references held by the object here */
   if (G_OBJECT_CLASS (empathy_call_handler_parent_class)->dispose)
     G_OBJECT_CLASS (empathy_call_handler_parent_class)->dispose (object);
@@ -323,49 +314,10 @@ empathy_call_handler_bus_message (EmpathyCallHandler *handler,
 }
 
 static void
-conference_element_added (FsElementAddedNotifier *notifier,
-    GstBin *bin,
-    GstElement *element,
-    gpointer user_data)
-{
-  GstElementFactory *factory;
-  const gchar *name;
-
-  factory = gst_element_get_factory (element);
-  name = gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory));
-
-  if (!tp_strdiff (name, "x264enc"))
-    {
-      /* Ensure that the encoder creates the baseline profile */
-      g_object_set (element,
-          "byte-stream", TRUE,
-          "bframes", 0,
-          "b-adapt", FALSE,
-          "cabac", FALSE,
-          "dct8x8", FALSE,
-          NULL);
-    }
-  else if (!tp_strdiff (name, "gstrtpbin"))
-    {
-      /* Lower the jitterbuffer latency to make it more suitable for video
-       * conferencing */
-      g_object_set (element, "latency", 100, NULL);
-    }
-}
-
-static void
 empathy_call_handler_tf_channel_session_created_cb (TfChannel *tfchannel,
   FsConference *conference, FsParticipant *participant,
   EmpathyCallHandler *self)
 {
-  EmpathyCallHandlerPriv *priv = GET_PRIV (self);
-
-  priv->fsnotifier = fs_element_added_notifier_new ();
-  fs_element_added_notifier_add (priv->fsnotifier, GST_BIN (conference));
-
-  g_signal_connect (priv->fsnotifier, "element-added",
-    G_CALLBACK (conference_element_added), NULL);
-
   g_signal_emit (G_OBJECT (self), signals[CONFERENCE_ADDED], 0,
     GST_ELEMENT (conference));
 }
@@ -428,53 +380,24 @@ empathy_call_handler_tf_channel_closed_cb (TfChannel *tfchannel,
 }
 
 static GList *
-empathy_call_handler_tf_channel_codec_config_get_defaults (FsCodec *codecs)
-{
-  GList *l = NULL;
-  int i;
-
-  for (i = 0; codecs[i].encoding_name != NULL; i++)
-      l = g_list_append (l, fs_codec_copy (codecs + i));
-
-  return l;
-}
-
-static GList *
 empathy_call_handler_tf_channel_codec_config_cb (TfChannel *channel,
   guint stream_id, FsMediaType media_type, guint direction, gpointer user_data)
 {
-  FsCodec audio_codecs[] = {
-    { FS_CODEC_ID_ANY, "SPEEX", FS_MEDIA_TYPE_AUDIO, 16000, },
-    { FS_CODEC_ID_ANY, "SPEEX", FS_MEDIA_TYPE_AUDIO, 8000, },
-
-    { FS_CODEC_ID_DISABLE, "DV",     FS_MEDIA_TYPE_AUDIO, },
-    { FS_CODEC_ID_DISABLE, "MPA",    FS_MEDIA_TYPE_AUDIO, },
-    { FS_CODEC_ID_DISABLE, "VORBIS", FS_MEDIA_TYPE_AUDIO, },
-    { FS_CODEC_ID_DISABLE, "MP3",    FS_MEDIA_TYPE_AUDIO, },
-    { 0, NULL, 0,}
-  };
-  FsCodec video_codecs[] = {
-    { FS_CODEC_ID_ANY, "H264",   FS_MEDIA_TYPE_VIDEO, },
-    { FS_CODEC_ID_ANY, "THEORA", FS_MEDIA_TYPE_VIDEO, },
-    { FS_CODEC_ID_ANY, "H263",   FS_MEDIA_TYPE_VIDEO, },
-
-    { FS_CODEC_ID_DISABLE, "DV",   FS_MEDIA_TYPE_VIDEO, },
-    { FS_CODEC_ID_DISABLE, "JPEG", FS_MEDIA_TYPE_VIDEO, },
-    { FS_CODEC_ID_DISABLE, "MPV",  FS_MEDIA_TYPE_VIDEO, },
-    { 0, NULL, 0}
-  };
-
-  switch (media_type)
+  gchar *filename = empathy_file_lookup ("codec-preferences", "data");
+  GList *codecs;
+  GError *error = NULL;
+
+  codecs = fs_codec_list_from_keyfile (filename, &error);
+  g_free (filename);
+
+  if (!codecs)
     {
-      case FS_MEDIA_TYPE_AUDIO:
-        return empathy_call_handler_tf_channel_codec_config_get_defaults
-          (audio_codecs);
-      case FS_MEDIA_TYPE_VIDEO:
-        return empathy_call_handler_tf_channel_codec_config_get_defaults
-          (video_codecs);
+      g_warning ("No codec-preferences file: %s",
+          error ? error->message : "No error message");
     }
+  g_clear_error (&error);
 
-  return NULL;
+  return codecs;
 }
 
 static void
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
new file mode 100644
index 000000000..bbbcba467
--- /dev/null
+++ b/libempathy/empathy-connectivity.c
@@ -0,0 +1,433 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/*
+ * Copyright (C) 2009 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: Jonny Lamb <jonny.lamb@collabora.co.uk>
+ */
+
+#include "config.h"
+#include "empathy-connectivity.h"
+
+#ifdef HAVE_NM
+#include <nm-client.h>
+#endif
+
+#ifdef HAVE_CONNMAN
+#include <dbus/dbus-glib.h>
+#endif
+
+#include <telepathy-glib/util.h>
+
+#include "empathy-utils.h"
+#include "empathy-marshal.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_CONNECTIVITY
+#include "empathy-debug.h"
+
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyConnectivity)
+
+typedef struct {
+#ifdef HAVE_NM
+  NMClient *nm_client;
+  gulong state_change_signal_id;
+#endif
+
+#ifdef HAVE_CONNMAN
+  DBusGProxy *proxy;
+#endif
+
+  gboolean connected;
+  gboolean use_conn;
+} EmpathyConnectivityPriv;
+
+enum {
+  STATE_CHANGE,
+  LAST_SIGNAL
+};
+
+enum {
+  PROP_0,
+  PROP_USE_CONN,
+};
+
+static guint signals[LAST_SIGNAL];
+static EmpathyConnectivity *connectivity_singleton = NULL;
+
+G_DEFINE_TYPE (EmpathyConnectivity, empathy_connectivity, G_TYPE_OBJECT);
+
+static void
+connectivity_change_state (EmpathyConnectivity *connectivity,
+    gboolean new_state)
+{
+  EmpathyConnectivityPriv *priv;
+
+  priv = GET_PRIV (connectivity);
+
+  if (priv->connected == new_state)
+    return;
+
+  priv->connected = new_state;
+
+  g_signal_emit (connectivity, signals[STATE_CHANGE], 0,
+      priv->connected);
+}
+
+#ifdef HAVE_NM
+static void
+connectivity_nm_state_change_cb (NMClient *client,
+    const GParamSpec *pspec,
+    EmpathyConnectivity *connectivity)
+{
+  EmpathyConnectivityPriv *priv;
+  gboolean new_nm_connected;
+  NMState state;
+
+  priv = GET_PRIV (connectivity);
+
+  if (!priv->use_conn)
+    return;
+
+  state = nm_client_get_state (priv->nm_client);
+  new_nm_connected = !(state == NM_STATE_CONNECTING
+      || state == NM_STATE_DISCONNECTED);
+
+  DEBUG ("New NetworkManager network state %d", state);
+
+  connectivity_change_state (connectivity, new_nm_connected);
+}
+#endif
+
+#ifdef HAVE_CONNMAN
+static void
+connectivity_connman_state_changed_cb (DBusGProxy *proxy,
+    const gchar *new_state,
+    EmpathyConnectivity *connectivity)
+{
+  EmpathyConnectivityPriv *priv;
+  gboolean new_connected;
+
+  priv = GET_PRIV (connectivity);
+
+  if (!priv->use_conn)
+    return;
+
+  new_connected = !tp_strdiff (new_state, "online");
+
+  DEBUG ("New ConnMan network state %s", new_state);
+
+  connectivity_change_state (connectivity, new_connected);
+}
+
+static void
+connectivity_connman_check_state_cb (DBusGProxy *proxy,
+    DBusGProxyCall *call_id,
+    gpointer user_data)
+{
+  EmpathyConnectivity *connectivity = (EmpathyConnectivity *) user_data;
+  GError *error = NULL;
+  gchar *state;
+
+  if (dbus_g_proxy_end_call (proxy, call_id, &error,
+          G_TYPE_STRING, &state, G_TYPE_INVALID))
+    {
+      connectivity_connman_state_changed_cb (proxy, state,
+          connectivity);
+      g_free (state);
+    }
+  else
+    {
+      DEBUG ("Failed to call GetState: %s", error->message);
+      connectivity_connman_state_changed_cb (proxy, "offline",
+          connectivity);
+    }
+}
+
+static void
+connectivity_connman_check_state (EmpathyConnectivity *connectivity)
+{
+  EmpathyConnectivityPriv *priv;
+
+  priv = GET_PRIV (connectivity);
+
+  dbus_g_proxy_begin_call (priv->proxy, "GetState",
+      connectivity_connman_check_state_cb, connectivity, NULL,
+      G_TYPE_INVALID);
+}
+#endif
+
+static void
+empathy_connectivity_init (EmpathyConnectivity *connectivity)
+{
+  EmpathyConnectivityPriv *priv;
+#ifdef HAVE_CONNMAN
+  DBusGConnection *connection;
+  GError *error = NULL;
+#endif
+
+  priv = G_TYPE_INSTANCE_GET_PRIVATE (connectivity,
+      EMPATHY_TYPE_CONNECTIVITY, EmpathyConnectivityPriv);
+
+  connectivity->priv = priv;
+
+  priv->use_conn = TRUE;
+
+#ifdef HAVE_NM
+  priv->nm_client = nm_client_new ();
+  if (priv->nm_client != NULL)
+    {
+      priv->state_change_signal_id = g_signal_connect (priv->nm_client,
+          "notify::" NM_CLIENT_STATE,
+          G_CALLBACK (connectivity_nm_state_change_cb), connectivity);
+
+      connectivity_nm_state_change_cb (priv->nm_client, NULL, connectivity);
+    }
+  else
+    {
+      DEBUG ("Failed to get NetworkManager proxy");
+    }
+#endif
+
+#ifdef HAVE_CONNMAN
+  connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+  if (connection != NULL)
+    {
+      priv->proxy = dbus_g_proxy_new_for_name (connection,
+          "org.moblin.connman", "/",
+          "org.moblin.connman.Manager");
+
+      dbus_g_object_register_marshaller (
+          _empathy_marshal_VOID__STRING,
+          G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INVALID);
+
+      dbus_g_proxy_add_signal (priv->proxy, "StateChanged",
+          G_TYPE_STRING, G_TYPE_INVALID);
+
+      dbus_g_proxy_connect_signal (priv->proxy, "StateChanged",
+          G_CALLBACK (connectivity_connman_state_changed_cb),
+          connectivity, NULL);
+
+      connectivity_connman_check_state (connectivity);
+    }
+  else
+    {
+      DEBUG ("Failed to get system bus connection: %s", error->message);
+      g_error_free (error);
+    }
+#endif
+
+#if !defined(HAVE_NM) || !defined(HAVE_CONNMAN)
+  priv->connected = TRUE;
+#endif
+}
+
+static void
+connectivity_finalize (GObject *object)
+{
+#ifdef HAVE_NM
+  EmpathyConnectivity *connectivity = EMPATHY_CONNECTIVITY (object);
+  EmpathyConnectivityPriv *priv = GET_PRIV (connectivity);
+
+  if (priv->nm_client != NULL)
+    {
+      g_signal_handler_disconnect (priv->nm_client,
+          priv->state_change_signal_id);
+      priv->state_change_signal_id = 0;
+      g_object_unref (priv->nm_client);
+      priv->nm_client = NULL;
+    }
+#endif
+
+#ifdef HAVE_CONNMAN
+  EmpathyConnectivity *connectivity = EMPATHY_CONNECTIVITY (object);
+  EmpathyConnectivityPriv *priv = GET_PRIV (connectivity);
+
+  if (priv->proxy != NULL)
+    {
+      dbus_g_proxy_disconnect_signal (priv->proxy, "StateChanged",
+          G_CALLBACK (connectivity_connman_state_changed_cb), connectivity);
+
+      g_object_unref (priv->proxy);
+      priv->proxy = NULL;
+    }
+#endif
+
+  G_OBJECT_CLASS (empathy_connectivity_parent_class)->finalize (object);
+}
+
+static void
+connectivity_dispose (GObject *object)
+{
+  G_OBJECT_CLASS (empathy_connectivity_parent_class)->dispose (object);
+}
+
+static GObject *
+connectivity_constructor (GType type,
+    guint n_construct_params,
+    GObjectConstructParam *construct_params)
+{
+  GObject *retval;
+
+  if (!connectivity_singleton)
+    {
+      retval = G_OBJECT_CLASS (empathy_connectivity_parent_class)->constructor
+        (type, n_construct_params, construct_params);
+
+      connectivity_singleton = EMPATHY_CONNECTIVITY (retval);
+      g_object_add_weak_pointer (retval, (gpointer) &connectivity_singleton);
+    }
+  else
+    {
+      retval = g_object_ref (connectivity_singleton);
+    }
+
+  return retval;
+}
+
+static void
+connectivity_get_property (GObject *object,
+    guint param_id,
+    GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyConnectivity *connectivity = EMPATHY_CONNECTIVITY (object);
+
+  switch (param_id)
+    {
+    case PROP_USE_CONN:
+      g_value_set_boolean (value, empathy_connectivity_get_use_conn (
+              connectivity));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    };
+}
+
+static void
+connectivity_set_property (GObject *object,
+    guint param_id,
+    const GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyConnectivity *connectivity = EMPATHY_CONNECTIVITY (object);
+
+  switch (param_id)
+    {
+    case PROP_USE_CONN:
+      empathy_connectivity_set_use_conn (connectivity,
+          g_value_get_boolean (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+      break;
+    };
+}
+
+static void
+empathy_connectivity_class_init (EmpathyConnectivityClass *klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->finalize = connectivity_finalize;
+  oclass->dispose = connectivity_dispose;
+  oclass->constructor = connectivity_constructor;
+  oclass->get_property = connectivity_get_property;
+  oclass->set_property = connectivity_set_property;
+
+  signals[STATE_CHANGE] =
+    g_signal_new ("state-change",
+        G_TYPE_FROM_CLASS (klass),
+        G_SIGNAL_RUN_LAST,
+        0,
+        NULL, NULL,
+        _empathy_marshal_VOID__BOOLEAN,
+        G_TYPE_NONE,
+        1, G_TYPE_BOOLEAN, NULL);
+
+  g_object_class_install_property (oclass,
+      PROP_USE_CONN,
+      g_param_spec_boolean ("use-conn",
+          "Use connectivity managers",
+          "Set presence according to connectivity managers",
+          TRUE,
+          G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
+
+  g_type_class_add_private (oclass, sizeof (EmpathyConnectivityPriv));
+}
+
+/* public methods */
+
+EmpathyConnectivity *
+empathy_connectivity_dup_singleton (void)
+{
+  return g_object_new (EMPATHY_TYPE_CONNECTIVITY, NULL);
+}
+
+gboolean
+empathy_connectivity_is_online (EmpathyConnectivity *connectivity)
+{
+  EmpathyConnectivityPriv *priv = GET_PRIV (connectivity);
+
+  if (priv->use_conn)
+    {
+      return priv->connected;
+    }
+  else
+    {
+      return TRUE;
+    }
+}
+
+gboolean
+empathy_connectivity_get_use_conn (EmpathyConnectivity *connectivity)
+{
+  EmpathyConnectivityPriv *priv = GET_PRIV (connectivity);
+
+  return priv->use_conn;
+}
+
+void
+empathy_connectivity_set_use_conn (EmpathyConnectivity *connectivity,
+    gboolean use_conn)
+{
+  EmpathyConnectivityPriv *priv = GET_PRIV (connectivity);
+
+  if (use_conn == priv->use_conn)
+    return;
+
+  DEBUG ("use_conn gconf key changed; new value = %s",
+      use_conn ? "true" : "false");
+
+  priv->use_conn = use_conn;
+
+#if defined(HAVE_NM) || defined(HAVE_CONNMAN)
+  if (use_conn)
+    {
+#if defined(HAVE_NM)
+      connectivity_nm_state_change_cb (priv->nm_client, NULL, connectivity);
+#elif defined(HAVE_CONNMAN)
+      connectivity_connman_check_state (connectivity);
+#endif
+    }
+  else
+#endif
+    {
+      connectivity_change_state (connectivity, TRUE);
+    }
+
+  g_object_notify (G_OBJECT (connectivity), "use-conn");
+}
diff --git a/libempathy/empathy-connectivity.h b/libempathy/empathy-connectivity.h
new file mode 100644
index 000000000..ca507e910
--- /dev/null
+++ b/libempathy/empathy-connectivity.h
@@ -0,0 +1,71 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/*
+ * Copyright (C) 2009 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: Jonny Lamb <jonny.lamb@collabora.co.uk>
+ */
+
+#ifndef __EMPATHY_CONNECTIVITY_H__
+#define __EMPATHY_CONNECTIVITY_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define EMPATHY_TYPE_CONNECTIVITY (empathy_connectivity_get_type ())
+#define EMPATHY_CONNECTIVITY(o) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CONNECTIVITY, \
+      EmpathyConnectivity))
+#define EMPATHY_CONNECTIVITY_CLASS(k) \
+  (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_CONNECTIVITY, \
+      EmpathyConnectivityClass))
+#define EMPATHY_IS_CONNECTIVITY(o) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONNECTIVITY))
+#define EMPATHY_IS_CONNECTIVITY_CLASS(k) \
+  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CONNECTIVITY))
+#define EMPATHY_CONNECTIVITY_GET_CLASS(o) \
+  (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CONNECTIVITY, \
+      EmpathyConnectivityClass))
+
+typedef struct _EmpathyConnectivity EmpathyConnectivity;
+typedef struct _EmpathyConnectivityClass EmpathyConnectivityClass;
+
+struct _EmpathyConnectivity {
+  GObject parent;
+  gpointer priv;
+};
+
+struct _EmpathyConnectivityClass {
+  GObjectClass parent_class;
+};
+
+GType empathy_connectivity_get_type (void);
+
+/* public methods */
+
+EmpathyConnectivity * empathy_connectivity_dup_singleton (void);
+
+gboolean empathy_connectivity_is_online (EmpathyConnectivity *connectivity);
+
+gboolean empathy_connectivity_get_use_conn (EmpathyConnectivity *connectivity);
+void empathy_connectivity_set_use_conn (EmpathyConnectivity *connectivity,
+    gboolean use_conn);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_CONNECTIVITY_H__ */
+
diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c
index 99111deec..9d69b801c 100644
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -49,6 +49,7 @@ static GDebugKey keys[] = {
   { "Ft", EMPATHY_DEBUG_FT },
   { "Location", EMPATHY_DEBUG_LOCATION },
   { "Other", EMPATHY_DEBUG_OTHER },
+  { "Connectivity", EMPATHY_DEBUG_CONNECTIVITY },
   { 0, }
 };
 
diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h
index 0d25f22dd..edfa05d95 100644
--- a/libempathy/empathy-debug.h
+++ b/libempathy/empathy-debug.h
@@ -42,6 +42,7 @@ typedef enum
   EMPATHY_DEBUG_LOCATION = 1 << 8,
   EMPATHY_DEBUG_OTHER = 1 << 9,
   EMPATHY_DEBUG_SHARE_DESKTOP = 1 << 10,
+  EMPATHY_DEBUG_CONNECTIVITY = 1 << 11,
 } EmpathyDebugFlags;
 
 gboolean empathy_debug_flag_is_set (EmpathyDebugFlags flag);
diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index 94764f420..c86b997af 100644
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -25,9 +25,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
-#ifdef HAVE_NM
-#include <nm-client.h>
-#endif
 
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/util.h>
@@ -35,6 +32,7 @@
 #include "empathy-account-manager.h"
 #include "empathy-idle.h"
 #include "empathy-utils.h"
+#include "empathy-connectivity.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
@@ -45,22 +43,19 @@
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIdle)
 typedef struct {
 	DBusGProxy     *gs_proxy;
-#ifdef HAVE_NM
-	NMClient       *nm_client;
-#endif
+	EmpathyConnectivity *connectivity;
+	gulong state_change_signal_id;
 
 	TpConnectionPresenceType      state;
 	gchar          *status;
 	TpConnectionPresenceType      flash_state;
 	gboolean        auto_away;
-	gboolean        use_nm;
 
 	TpConnectionPresenceType      away_saved_state;
-	TpConnectionPresenceType      nm_saved_state;
-	gchar          *nm_saved_status;
+	TpConnectionPresenceType      saved_state;
+	gchar          *saved_status;
 
 	gboolean        is_idle;
-	gboolean        nm_connected;
 	guint           ext_away_timeout;
 
 	EmpathyAccountManager *manager;
@@ -79,8 +74,7 @@ enum {
 	PROP_STATE,
 	PROP_STATUS,
 	PROP_FLASH_STATE,
-	PROP_AUTO_AWAY,
-	PROP_USE_NM
+	PROP_AUTO_AWAY
 };
 
 G_DEFINE_TYPE (EmpathyIdle, empathy_idle, G_TYPE_OBJECT);
@@ -175,7 +169,7 @@ idle_session_status_changed_cb (DBusGProxy    *gs_proxy,
 		is_idle ? "yes" : "no");
 
 	if (!priv->auto_away ||
-	    (priv->nm_saved_state == TP_CONNECTION_PRESENCE_TYPE_UNSET &&
+	    (priv->saved_state == TP_CONNECTION_PRESENCE_TYPE_UNSET &&
 	     (priv->state <= TP_CONNECTION_PRESENCE_TYPE_OFFLINE ||
 	      priv->state == TP_CONNECTION_PRESENCE_TYPE_HIDDEN))) {
 		/* We don't want to go auto away OR we explicitely asked to be
@@ -190,11 +184,11 @@ idle_session_status_changed_cb (DBusGProxy    *gs_proxy,
 
 		idle_ext_away_start (idle);
 
-		if (priv->nm_saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) {
+		if (priv->saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) {
 		    	/* We are disconnected, when coming back from away
 		    	 * we want to restore the presence before the
 		    	 * disconnection. */
-			priv->away_saved_state = priv->nm_saved_state;
+			priv->away_saved_state = priv->saved_state;
 		} else {
 			priv->away_saved_state = priv->state;
 		}
@@ -234,56 +228,37 @@ idle_session_status_changed_cb (DBusGProxy    *gs_proxy,
 	priv->is_idle = is_idle;
 }
 
-#ifdef HAVE_NM
 static void
-idle_nm_state_change_cb (NMClient         *client,
-			 const GParamSpec *pspec,
-			 EmpathyIdle      *idle)
+idle_state_change_cb (EmpathyConnectivity *connectivity,
+		      gboolean new_online,
+		      EmpathyIdle *idle)
 {
 	EmpathyIdlePriv *priv;
-	gboolean         old_nm_connected;
-	gboolean         new_nm_connected;
-	NMState          state;
 
 	priv = GET_PRIV (idle);
 
-	if (!priv->use_nm) {
-		return;
-	}
-
-	state = nm_client_get_state (priv->nm_client);
-	old_nm_connected = priv->nm_connected;
-	new_nm_connected = !(state == NM_STATE_CONNECTING ||
-			     state == NM_STATE_DISCONNECTED);
-	priv->nm_connected = TRUE; /* To be sure _set_state will work */
-
-	DEBUG ("New network state %d", state);
-
-	if (old_nm_connected && !new_nm_connected) {
-		/* We are no more connected */
+	if (!new_online) {
+		/* We are no longer connected */
 		DEBUG ("Disconnected: Save state %d (%s)",
 				priv->state, priv->status);
-		priv->nm_saved_state = priv->state;
-		g_free (priv->nm_saved_status);
-		priv->nm_saved_status = g_strdup (priv->status);
+		priv->saved_state = priv->state;
+		g_free (priv->saved_status);
+		priv->saved_status = g_strdup (priv->status);
 		empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_OFFLINE);
 	}
-	else if (!old_nm_connected && new_nm_connected
-			&& priv->nm_saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) {
+	else if (new_online
+			&& priv->saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) {
 		/* We are now connected */
 		DEBUG ("Reconnected: Restore state %d (%s)",
-				priv->nm_saved_state, priv->nm_saved_status);
+				priv->saved_state, priv->saved_status);
 		empathy_idle_set_presence (idle,
-				priv->nm_saved_state,
-				priv->nm_saved_status);
-		priv->nm_saved_state = TP_CONNECTION_PRESENCE_TYPE_UNSET;
-		g_free (priv->nm_saved_status);
-		priv->nm_saved_status = NULL;
+				priv->saved_state,
+				priv->saved_status);
+		priv->saved_state = TP_CONNECTION_PRESENCE_TYPE_UNSET;
+		g_free (priv->saved_status);
+		priv->saved_status = NULL;
 	}
-
-	priv->nm_connected = new_nm_connected;
 }
-#endif
 
 static void
 idle_finalize (GObject *object)
@@ -298,14 +273,11 @@ idle_finalize (GObject *object)
 		g_object_unref (priv->gs_proxy);
 	}
 
-	if (priv->manager != NULL)
-		g_object_unref (priv->manager);
+	g_signal_handler_disconnect (priv->connectivity,
+				     priv->state_change_signal_id);
+	priv->state_change_signal_id = 0;
 
-#ifdef HAVE_NM
-	if (priv->nm_client) {
-		g_object_unref (priv->nm_client);
-	}
-#endif
+	g_object_unref (priv->connectivity);
 
 	idle_ext_away_stop (EMPATHY_IDLE (object));
 }
@@ -355,9 +327,6 @@ idle_get_property (GObject    *object,
 	case PROP_AUTO_AWAY:
 		g_value_set_boolean (value, empathy_idle_get_auto_away (idle));
 		break;
-	case PROP_USE_NM:
-		g_value_set_boolean (value, empathy_idle_get_use_nm (idle));
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
 		break;
@@ -389,9 +358,6 @@ idle_set_property (GObject      *object,
 	case PROP_AUTO_AWAY:
 		empathy_idle_set_auto_away (idle, g_value_get_boolean (value));
 		break;
-	case PROP_USE_NM:
-		empathy_idle_set_use_nm (idle, g_value_get_boolean (value));
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
 		break;
@@ -440,14 +406,6 @@ empathy_idle_class_init (EmpathyIdleClass *klass)
 								FALSE,
 								G_PARAM_READWRITE));
 
-	 g_object_class_install_property (object_class,
-					  PROP_USE_NM,
-					  g_param_spec_boolean ("use-nm",
-								"Use Network Manager",
-								"Set presence according to Network Manager",
-								TRUE,
-								G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
-
 	g_type_class_add_private (object_class, sizeof (EmpathyIdlePriv));
 }
 
@@ -482,16 +440,9 @@ empathy_idle_init (EmpathyIdle *idle)
 		DEBUG ("Failed to get gs proxy");
 	}
 
-#ifdef HAVE_NM
-	priv->nm_client = nm_client_new ();
-	if (priv->nm_client) {
-		g_signal_connect (priv->nm_client, "notify::" NM_CLIENT_STATE,
-				  G_CALLBACK (idle_nm_state_change_cb),
-				  idle);
-	} else {
-		DEBUG ("Failed to get nm proxy");
-	}
-#endif
+	priv->connectivity = empathy_connectivity_dup_singleton ();
+	priv->state_change_signal_id = g_signal_connect (priv->connectivity,
+	    "state-change", G_CALLBACK (idle_state_change_cb), idle);
 }
 
 EmpathyIdle *
@@ -619,10 +570,9 @@ empathy_idle_set_presence (EmpathyIdle *idle,
 		status = NULL;
 	}
 
-	if (!priv->nm_connected) {
-		DEBUG ("NM not connected");
+	if (!empathy_connectivity_is_online (priv->connectivity)) {
+		DEBUG ("Empathy is not online");
 
-		priv->nm_saved_state = state;
 		if (tp_strdiff (priv->status, status)) {
 			g_free (priv->status);
 			priv->status = NULL;
@@ -631,8 +581,6 @@ empathy_idle_set_presence (EmpathyIdle *idle,
 			}
 			g_object_notify (G_OBJECT (idle), "status");
 		}
-
-		return;
 	}
 
 	empathy_idle_do_set_presence (idle, state, status);
@@ -657,42 +605,3 @@ empathy_idle_set_auto_away (EmpathyIdle *idle,
 	g_object_notify (G_OBJECT (idle), "auto-away");
 }
 
-gboolean
-empathy_idle_get_use_nm (EmpathyIdle *idle)
-{
-	EmpathyIdlePriv *priv = GET_PRIV (idle);
-
-	return priv->use_nm;
-}
-
-void
-empathy_idle_set_use_nm (EmpathyIdle *idle,
-			 gboolean     use_nm)
-{
-	EmpathyIdlePriv *priv = GET_PRIV (idle);
-
-#ifdef HAVE_NM
-	if (!priv->nm_client || use_nm == priv->use_nm) {
-		return;
-	}
-#endif
-
-	priv->use_nm = use_nm;
-
-#ifdef HAVE_NM
-	if (use_nm) {
-		idle_nm_state_change_cb (priv->nm_client, NULL, idle);
-#else
-	if (0) {
-#endif
-	} else {
-		priv->nm_connected = TRUE;
-		if (priv->nm_saved_state != TP_CONNECTION_PRESENCE_TYPE_UNSET) {
-			empathy_idle_set_state (idle, priv->nm_saved_state);
-		}
-		priv->nm_saved_state = TP_CONNECTION_PRESENCE_TYPE_UNSET;
-	}
-
-	g_object_notify (G_OBJECT (idle), "use-nm");
-}
-
diff --git a/libempathy/empathy-idle.h b/libempathy/empathy-idle.h
index d2a802335..47dcfee23 100644
--- a/libempathy/empathy-idle.h
+++ b/libempathy/empathy-idle.h
@@ -64,9 +64,6 @@ void         empathy_idle_set_presence        (EmpathyIdle *idle,
 gboolean     empathy_idle_get_auto_away       (EmpathyIdle *idle);
 void         empathy_idle_set_auto_away       (EmpathyIdle *idle,
 					       gboolean     auto_away);
-gboolean     empathy_idle_get_use_nm          (EmpathyIdle *idle);
-void         empathy_idle_set_use_nm          (EmpathyIdle *idle,
-					       gboolean     use_nm);
 
 G_END_DECLS
 
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 51ce79bb6..69057a878 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1329,13 +1329,16 @@ empathy_tp_chat_set_state (EmpathyTpChat      *chat,
 	g_return_if_fail (EMPATHY_IS_TP_CHAT (chat));
 	g_return_if_fail (priv->ready);
 
-	DEBUG ("Set state: %d", state);
-	tp_cli_channel_interface_chat_state_call_set_chat_state (priv->channel, -1,
-								 state,
-								 tp_chat_async_cb,
-								 "setting chat state",
-								 NULL,
-								 G_OBJECT (chat));
+	if (tp_proxy_has_interface_by_id (priv->channel,
+					  TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE)) {
+		DEBUG ("Set state: %d", state);
+		tp_cli_channel_interface_chat_state_call_set_chat_state (priv->channel, -1,
+									 state,
+									 tp_chat_async_cb,
+									 "setting chat state",
+									 NULL,
+									 G_OBJECT (chat));
+	}
 }
 
 
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index 29148feec..6b4c20b53 100644
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -130,7 +130,7 @@ tp_contact_factory_set_aliases_cb (TpConnection *connection,
 }
 
 static void
-tp_contact_factory_set_location_cb (TpProxy *proxy,
+tp_contact_factory_set_location_cb (TpConnection *tp_conn,
 				    const GError *error,
 				    gpointer user_data,
 				    GObject *weak_object)
@@ -570,7 +570,7 @@ tp_contact_factory_update_location (EmpathyTpContactFactory *tp_factory,
 }
 
 static void
-tp_contact_factory_got_locations (TpProxy                 *tp_proxy,
+tp_contact_factory_got_locations (TpConnection                 *tp_conn,
 				  GHashTable              *locations,
 				  const GError            *error,
 				  gpointer                 user_data,
@@ -626,7 +626,7 @@ tp_contact_factory_capabilities_changed_cb (TpConnection    *connection,
 }
 
 static void
-tp_contact_factory_location_updated_cb (TpProxy      *proxy,
+tp_contact_factory_location_updated_cb (TpConnection      *tp_conn,
 					guint         handle,
 					GHashTable   *location,
 					gpointer      user_data,
@@ -797,8 +797,8 @@ tp_contact_factory_add_contact (EmpathyTpContactFactory *tp_factory,
 	g_clear_error (&error);
 
 	if (tp_proxy_has_interface_by_id (TP_PROXY (priv->connection),
-		EMP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION)) {
-		emp_cli_connection_interface_location_call_get_locations (TP_PROXY (priv->connection),
+		TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION)) {
+		tp_cli_connection_interface_location_call_get_locations (priv->connection,
 									 -1,
 									 &handles,
 									 tp_contact_factory_got_locations,
@@ -1204,7 +1204,7 @@ empathy_tp_contact_factory_set_location (EmpathyTpContactFactory *tp_factory,
 
 	DEBUG ("Setting location");
 
-	emp_cli_connection_interface_location_call_set_location (TP_PROXY (priv->connection),
+	tp_cli_connection_interface_location_call_set_location (priv->connection,
 								 -1,
 								 location,
 								 tp_contact_factory_set_location_cb,
@@ -1318,7 +1318,7 @@ tp_contact_factory_constructor (GType                  type,
 										  NULL);
 
 
-	emp_cli_connection_interface_location_connect_to_location_updated (TP_PROXY (priv->connection),
+	tp_cli_connection_interface_location_connect_to_location_updated (priv->connection,
 									   tp_contact_factory_location_updated_cb,
 									   NULL, NULL,
 									   G_OBJECT (tp_factory),
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 4bbe46b4f..2bf2ec416 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -974,10 +974,13 @@ tp_contact_list_add (EmpathyContactList *list,
 		tp_cli_channel_interface_group_call_add_members (priv->subscribe,
 			-1, &handles, message, NULL, NULL, NULL, NULL);
 	}
-	if (priv->publish &&
-	    g_hash_table_lookup (priv->pendings, GUINT_TO_POINTER (handle))) {
-		tp_cli_channel_interface_group_call_add_members (priv->publish,
-			-1, &handles, message, NULL, NULL, NULL, NULL);
+	if (priv->publish) {
+		TpChannelGroupFlags flags = tp_channel_group_get_flags (priv->subscribe);
+		if (flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD ||
+		    g_hash_table_lookup (priv->pendings, GUINT_TO_POINTER (handle))) {
+			tp_cli_channel_interface_group_call_add_members (priv->publish,
+				-1, &handles, message, NULL, NULL, NULL, NULL);
+		}
 	}
 }
 
@@ -1166,21 +1169,24 @@ tp_contact_list_get_flags (EmpathyContactList *list)
 {
 	EmpathyTpContactListPriv *priv;
 	EmpathyContactListFlags flags;
-	TpChannelGroupFlags group_flags;
 
 	g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), FALSE);
 
 	priv = GET_PRIV (list);
 	flags = priv->flags;
 
-	group_flags = tp_channel_group_get_flags (priv->subscribe);
+	if (priv->subscribe != NULL) {
+		TpChannelGroupFlags group_flags;
 
-	if (group_flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD) {
-		flags |= EMPATHY_CONTACT_LIST_CAN_ADD;
-	}
+		group_flags = tp_channel_group_get_flags (priv->subscribe);
+
+		if (group_flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD) {
+			flags |= EMPATHY_CONTACT_LIST_CAN_ADD;
+		}
 
-	if (group_flags & TP_CHANNEL_GROUP_FLAG_CAN_REMOVE) {
-		flags |= EMPATHY_CONTACT_LIST_CAN_REMOVE;
+		if (group_flags & TP_CHANNEL_GROUP_FLAG_CAN_REMOVE) {
+			flags |= EMPATHY_CONTACT_LIST_CAN_REMOVE;
+		}
 	}
 
 	return flags;
diff --git a/po/ChangeLog b/po/ChangeLog
index c9d995185..f82d41389 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-13 Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish translation
+
 2009-04-21  Ignacio Casal Quinteiro  <icq@gnome.org>
 
 	* gl.po: Updated Galician Translation by Javier Rial.
diff --git a/po/LINGUAS b/po/LINGUAS
index 27f3509dc..3a6cf04ff 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -5,7 +5,9 @@ be
 be@latin
 bg
 bn_IN
+br
 ca
+ca@valencia
 cs
 cy
 da
@@ -56,6 +58,7 @@ sr
 sr@latin
 sv
 ta
+te
 th
 tr
 uk
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 89387f58d..ec6aea64f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -67,7 +67,7 @@ src/empathy-accounts-dialog.c
 src/empathy-call-window.c
 [type: gettext/glade]src/empathy-call-window.ui
 src/empathy-chat-window.c
-src/empathy-chat-window.ui
+[type: gettext/glade]src/empathy-chat-window.ui
 src/empathy-chatrooms-window.c
 [type: gettext/glade]src/empathy-chatrooms-window.ui
 src/empathy-event-manager.c
diff --git a/po/ar.po b/po/ar.po
index c132c6d9d..1fbb6a016 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gossip.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-27 23:48+0300\n"
-"PO-Revision-Date: 2009-07-27 23:49+0300\n"
+"POT-Creation-Date: 2009-08-15 12:51+0300\n"
+"PO-Revision-Date: 2009-08-15 13:01+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@@ -22,15 +22,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.4.0-rc1\n"
+"X-Generator: Virtaal 0.4.0\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "المرسال إمباثي"
+msgid "Empathy IM Client"
+msgstr "المرسال إمبثي"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "أرسل و استقبل رسائلا فورية"
+msgid "Send and receive messages"
+msgstr "أرسل و استقبل الرسائل"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
@@ -75,36 +75,35 @@ msgstr "عطل الأصوات عندما أكون بعيدا"
 
 #: ../data/empathy.schemas.in.h:10
 msgid "Empathy can publish the user's location"
-msgstr ""
+msgstr "يستطيع إمبثي نشر مكان المستخدم"
 
 #: ../data/empathy.schemas.in.h:11
 msgid "Empathy can use the GPS to guess the location"
-msgstr ""
+msgstr "يستطيع إمبثي استخدام GPS لتخمين مكان المستخدم"
 
 #: ../data/empathy.schemas.in.h:12
 msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
+msgstr "يستطيع إمبثي استخدام شبكة الهاتف المحمول لتخمين مكان المستخدم"
 
 #: ../data/empathy.schemas.in.h:13
 msgid "Empathy can use the network to guess the location"
-msgstr ""
+msgstr "يستطيع إمبثي استخدام الشبكة لتخمين مكان المستخدم"
 
 #: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
-msgstr "مجلد التنزيل المبدئي لإمباثي"
+msgstr "مجلد التنزيل المبدئي لإمبثي"
 
 #: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
-msgstr "إمباثي يسأل عن استيراد الحسابات"
+msgstr "إمبثي يسأل عن استيراد الحسابات"
 
 #: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "الاتصال الآلي عند بدء البرنامج"
 
 #: ../data/empathy.schemas.in.h:17
-#, fuzzy
 msgid "Empathy should reduce the location's accuracy"
-msgstr "الاتصال الآلي عند بدء البرنامج"
+msgstr "على إمبثي تقليل دقة تحديد المكان"
 
 #: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
@@ -112,7 +111,7 @@ msgstr "استخدام الصور الشخصيّة للمتراسل كأيقون
 
 #: ../data/empathy.schemas.in.h:19
 msgid "Enable WebKit Developer Tools"
-msgstr ""
+msgstr "فعّل أدوات وب‌كِت للمطورين"
 
 #: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
@@ -144,12 +143,11 @@ msgstr "افتح المحادثات الجديدة في نوافذ متفرقة"
 
 #: ../data/empathy.schemas.in.h:27
 msgid "Path of the adium theme to use"
-msgstr ""
+msgstr "مسار سمة adium لتستخدم"
 
 #: ../data/empathy.schemas.in.h:28
-#, fuzzy
 msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "استخدام سمة لغرف المحادثة."
+msgstr "مسار سمة adium التي ستستخدم إذا كانت سمة الدردشة المستخدمة adium."
 
 #: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
@@ -184,14 +182,12 @@ msgid "Popup notifications if the chat isn't focused"
 msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
 
 #: ../data/empathy.schemas.in.h:37
-#, fuzzy
 msgid "Popup notifications when a contact sign in"
-msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
+msgstr "أظهر تنبيهات منبثقة عند تسجيل المتراسل"
 
 #: ../data/empathy.schemas.in.h:38
-#, fuzzy
 msgid "Popup notifications when a contact sign out"
-msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
+msgstr "أظهر تنبيهات منبثقة عند خروج المتراسل"
 
 #: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
@@ -202,9 +198,8 @@ msgid "Show avatars"
 msgstr "أعرض الصور الشخصية"
 
 #: ../data/empathy.schemas.in.h:41
-#, fuzzy
 msgid "Show contact list in rooms"
-msgstr "أظهر _قائمة المتراسلين"
+msgstr "أظهر قائمة المتراسلين في الغرف"
 
 #: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
@@ -246,75 +241,70 @@ msgstr "استخدم سمة لغرف الدردشة"
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be "
 "enabled."
-msgstr ""
+msgstr "فيما إذاكانت أدوات وٍب‌كِت للمطور -مثل فاحص الوب- ستفعّل أم لا."
 
 #: ../data/empathy.schemas.in.h:52
-#, fuzzy
 msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr "عرض المرسلين غير المتصلين في لائحة المتراسلين."
+msgstr "فيما إن كان إمبثي سيطلع المتراسلين على مكان المستخدم."
 
 #: ../data/empathy.schemas.in.h:53
-#, fuzzy
 msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "استخدام الصور الشخصية للمتراسل كأيقونة لنافذة المحادثة"
+msgstr "فيما إذا كان إمبثي سيستخدم GPS لتخمين المكان."
 
 #: ../data/empathy.schemas.in.h:54
-#, fuzzy
 msgid ""
 "Whether or not Empathy can use the cellular network to guess the location."
-msgstr "استخدام الصور الشخصية للمتراسل كأيقونة لنافذة المحادثة"
+msgstr "فيما إذا كان إمبثي سيستخدم شبكة الهاتف المحمول لتخمين المكان."
 
 #: ../data/empathy.schemas.in.h:55
-#, fuzzy
 msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "استخدام الصور الشخصية للمتراسل كأيقونة لنافذة المحادثة"
+msgstr "فيما إذا كان إمبثي سيستخدم الشبكة المحمول لتخمين المكان."
 
 #: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
-msgstr ""
+msgstr "فيما إذا كان إمبثي قد سأل عن استيراد الحسابات من البرامج الأخرى."
 
 #: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
-msgstr "الولوج آليا إلى حساباتك عند بدء التشغيل."
+msgstr "فيما إذا كان على إمبثي الولوج آليا إلى حساباتك عند بدء التشغيل."
 
 #: ../data/empathy.schemas.in.h:58
-#, fuzzy
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
-msgstr "استخدام الصور الشخصية للمتراسل كأيقونة لنافذة المحادثة"
+msgstr "فيما إذا كان على إمبثي خفض دقة تحديد المكان للحفاظ على الخصوصية."
 
 #: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
-msgstr "استخدام الصور الشخصية للمتراسل كأيقونة لنافذة المحادثة"
+msgstr "فيما إذا كان على إمبثي استخدام أفاتر المتراسل كأيقونة لنافذة المحادثة."
 
 #: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
-msgstr "إنشاء حساب الترحيب عند أول تشغيل لمرسال جنوم."
+msgstr "فيما إذا كان قد أنشئ حساب Salut عند أول تشغيل لإمبثي."
 
 #: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
-msgstr "استخدام مدير الشبكة لقطع الاتصال أو استرجاعه."
+msgstr "فيما إذا يستخدم مدير الشبكة لقطع الاتصال أو استرجاعه."
 
 #: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
-msgstr "التأكد من الكلمات المكتوبة باللغة التي حددتها."
+msgstr "فيما إذا كان عليه التأكد من الكلمات المكتوبة باللغة التي حددتها."
 
 #: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
-msgstr "تحويل الابتسامات إلى صور معبّرة."
+msgstr "فيما إذا يحول الابتسامات إلى صور معبّرة."
 
 #: ../data/empathy.schemas.in.h:64
 msgid ""
@@ -784,92 +774,92 @@ msgstr "انقر للتكبير"
 msgid "Failed to reconnect this chat"
 msgstr "تعذّرت إعادة الاتصال بهذه الدردشة"
 
-#: ../libempathy-gtk/empathy-chat.c:404
+#: ../libempathy-gtk/empathy-chat.c:412
 msgid "Unsupported command"
 msgstr "أمر غير مدعوم"
 
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "غير متّصل"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "متراسل غير صحيح"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "رُفض التّصريح"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "الرسالة طويلة جدا"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "غير مطبق"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "مجهول"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "خطأ في ارسال الرسالة '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "الموضوع: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "لم يحدد أي موضوع"
 
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:969
 msgid "(No Suggestions)"
 msgstr "(لا اقتراحات)"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "أدرج التعابير المرسومة"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-chat.c:1041
 #: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "أ_رسل"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "_Spelling Suggestions"
 msgstr "ا_قتراحات الإملاء"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1190
 #, c-format
 msgid "%s has disconnected"
 msgstr "‏%s قطع الاتصال"
 
-#: ../libempathy-gtk/empathy-chat.c:1185
+#: ../libempathy-gtk/empathy-chat.c:1194
 #, c-format
 msgid "%s was kicked by %s"
 msgstr "‏%s طرده %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1197
 #, c-format
 msgid "%s was kicked"
 msgstr "‏%s طُرِد"
 
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1202
 #, c-format
 msgid "%s was banned by %s"
 msgstr "‏%s حظره %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1196
+#: ../libempathy-gtk/empathy-chat.c:1205
 #, c-format
 msgid "%s was banned"
 msgstr "‏%s حُظِر"
 
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "‏%s غادر الغرفة"
@@ -879,25 +869,25 @@ msgstr "‏%s غادر الغرفة"
 #. * 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:1218
 #, c-format
 msgid " (%s)"
 msgstr "‏‏ (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:1241
 #, c-format
 msgid "%s has joined the room"
 msgstr "انضم %s إلى الغرفة"
 
-#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
 msgid "Disconnected"
 msgstr "غير متَصل"
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "متَصل"
 
-#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-chat.c:1859
 #: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "محادثة"
@@ -908,13 +898,13 @@ msgstr "الموضوع:"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:264
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "ا_نسخ عنوان الوصلة"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:272
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "ا_فتح الوصلة"
 
@@ -933,7 +923,7 @@ msgstr "عدّل معلومات المتراسل"
 msgid "Personal Information"
 msgstr "المعلومات الشخصية"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:393
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "متراسل جديد"
 
@@ -945,27 +935,27 @@ msgstr "_سأقرر لاحقًا"
 msgid "Subscription Request"
 msgstr "طلب تسجيل"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1400
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "هل ترغب حقا بإزالة المجموعة '%s'؟"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1402
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "إزالة مجموعة"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1449
-#: ../libempathy-gtk/empathy-contact-list-view.c:1526
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "أ_زل"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1479
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "هل ترغب حقا بإزالة المتراسل '%s'؟"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1481
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "حذف المتراسل"
 
@@ -1006,7 +996,7 @@ msgid "Infor_mation"
 msgstr "_معلومات"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "ت_حرير"
 
@@ -1030,120 +1020,120 @@ msgstr "احفظ الصور الشخصية"
 msgid "Unable to save avatar"
 msgstr "لا يمكن حفظ الصورة الشخصية"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:992
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "حدّد"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
 #: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "المجموعة"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1252
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "Country ISO Code:"
 msgstr "رمز البلد"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1254
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "Country:"
 msgstr "البلد:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "State:"
 msgstr "الولاية:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "City:"
 msgstr "المدينة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Area:"
 msgstr "المنطقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Postal Code:"
 msgstr "الرمز البريدي:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Street:"
 msgstr "الشارع:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Building:"
 msgstr "المبنى:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "Floor:"
 msgstr "الطابق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Room:"
 msgstr "الغرفة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "Text:"
 msgstr "النص:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Description:"
 msgstr "الوصف:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "URI:"
 msgstr "المسار:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Accuracy Level:"
 msgstr "مستوى الدقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Error:"
 msgstr "خطأ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Vertical Error (meters):"
 msgstr "خطأ رأسي (أمتار):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Horizontal Error (meters):"
 msgstr "خطأ أفقي (أمتار):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Speed:"
 msgstr "السرعة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Bearing:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Climb Speed:"
 msgstr "سرعة التسلّق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
 msgid "Last Updated on:"
 msgstr "آخر تحديث:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
 msgid "Longitude:"
 msgstr "خط الطول:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
 msgid "Latitude:"
 msgstr "دائرة العرض:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
 msgid "Altitude:"
 msgstr "الارتفاع:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
 msgid "<b>Location</b>"
 msgstr "<b>المكان:</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1358
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
 msgid "<b>Location</b>, "
 msgstr "<b>المكان:</b>، "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1408
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B، %Y في %R ت‌ع‌م"
 
@@ -1285,16 +1275,18 @@ msgstr "معرّف المتراسل:"
 msgid "New Conversation"
 msgstr "محادثة جديدة"
 
+#. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
-#. COL_STATUS_TEXT
 #. 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 "رسالة مخصّصة..."
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
 #: ../libempathy-gtk/empathy-presence-chooser.c:227
 msgid "Edit Custom Messages..."
 msgstr "حرر الرسائل المخصّصة..."
@@ -1378,11 +1370,11 @@ msgstr "الإعدادات المسبقة المحفوظة"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
 msgid "gtk-add"
-msgstr ""
+msgstr "gtk-add"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
 msgid "gtk-remove"
-msgstr ""
+msgstr "gtk-remove"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
@@ -1408,7 +1400,7 @@ msgstr "تعذّر فتح المسار"
 msgid "Select a file"
 msgstr "اختر ملفا"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
 msgid "Select a destination"
 msgstr "اختر وجهة"
 
@@ -1645,8 +1637,8 @@ msgid "Show the accounts dialog"
 msgstr "أعرض مربع حوار الحسابات"
 
 #: ../src/empathy.c:587
-msgid "- Empathy Instant Messenger"
-msgstr "- المرسال إمباثي"
+msgid "- Empathy IM Client"
+msgstr "- المرسال إمبثي"
 
 #: ../src/empathy-about-dialog.c:83
 msgid ""
@@ -1655,7 +1647,7 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"إمباثي البرنامج حر، يمكنك توزيعه و/أو تعديله حسب بنود رخصة جنو العمومية كما "
+"إمبثي البرنامج حر، يمكنك توزيعه و/أو تعديله حسب بنود رخصة جنو العمومية كما "
 "نشرتها مؤسسة البرامج الحرة، الإصدار الثاني أو أي إصدار أحدث (حسب رغبتك)."
 
 #: ../src/empathy-about-dialog.c:87
@@ -1665,7 +1657,7 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
-"يوزع إمباثي على أمل أن يكون مفيدًا، ولكن دون أية ضمانات، بما في ذلك ضمانات "
+"يوزع إمبثي على أمل أن يكون مفيدًا، ولكن دون أية ضمانات، بما في ذلك ضمانات "
 "قابلية البرنامج للتسويق أو الملاءمة لغرض معين. انظر نص رخصة جنو العمومية "
 "لمزيد من التفاصيل."
 
@@ -1777,53 +1769,53 @@ msgstr "أ_نشئ حسابا جديدا"
 msgid "_Reuse an existing account"
 msgstr "ا_ستخدم حسابا موجودا"
 
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "التباين"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "السطوع"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "جاما"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "الحجم"
 
-#: ../src/empathy-call-window.c:662
+#: ../src/empathy-call-window.c:671
 msgid "Connecting..."
 msgstr "يتّصل..."
 
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "الشريط ال_جانبي"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "لوحة الأرقام"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "مدخلات الصوت"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "مدخلات الفيديو"
 
-#: ../src/empathy-call-window.c:835
+#: ../src/empathy-call-window.c:866
 #, c-format
 msgid "Call with %s"
 msgstr "اتصل باستخدام %s"
 
-#: ../src/empathy-call-window.c:904
+#: ../src/empathy-call-window.c:935
 msgid "Call"
 msgstr "اتصل"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1335
+#: ../src/empathy-call-window.c:1387
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "متَصل — %d:%02dm"
@@ -1865,6 +1857,66 @@ msgstr "محادثات (%d)"
 msgid "Typing a message."
 msgstr "يكتب رسالة..."
 
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "ا_مسح"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "محادثة"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "أدرج تعبيرا ر_سوميا"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "انقل اللِّسان إلى اليسا_ر"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "انقل اللِّسان إلى ال_يمين"
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "_متراسل"
+
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "الم_حتويات"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "م_حادثة"
+
+#: ../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 "م_ساعدة"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr "اللسان ال_تالي"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "اللسان ال_سابق"
+
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "أظهر _قائمة المتراسلين"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "أ_لسنة"
+
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "اسم"
@@ -2099,7 +2151,7 @@ msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"لم يُعثر على أي حساب لاستيراده. إمباثي يدعم استيراد الحسابات من بدجن فقط."
+"لم يُعثر على أي حساب لاستيراده. إمبثي يدعم استيراد الحسابات من بدجن فقط."
 
 #: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
@@ -2213,10 +2265,6 @@ msgstr "ال_حسابات"
 msgid "_Compact Size"
 msgstr "حجم _مضغوط"
 
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Contents"
-msgstr "الم_حتويات"
-
 #: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
 msgstr "_نقّح"
@@ -2225,10 +2273,6 @@ msgstr "_نقّح"
 msgid "_File Transfers"
 msgstr "_نقل الملفات"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Help"
-msgstr "م_ساعدة"
-
 #: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
 msgstr "ان_ضم..."
@@ -2326,35 +2370,35 @@ msgstr "قائمة الغرف"
 msgid "_Room:"
 msgstr "ال_غُرفة:"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:148
 msgid "Message received"
 msgstr "تم إستلام الرسالة"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:149
 msgid "Message sent"
 msgstr "أرسلت الرسالة"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:150
 msgid "New conversation"
 msgstr "محادثة جديدة"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes online"
 msgstr "اتصل المتراسل"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:152
 msgid "Contact goes offline"
 msgstr "انفصل المتراسل"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:153
 msgid "Account connected"
 msgstr "الحساب متصل"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:154
 msgid "Account disconnected"
 msgstr "الحساب غير متصل"
 
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:394
 msgid "Language"
 msgstr "اللغة"
 
@@ -2439,10 +2483,11 @@ msgid "Privacy"
 msgstr "الخصوصية"
 
 #: ../src/empathy-preferences.ui.h:21
+#, fuzzy
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will have a random "
-"value added (&#xB1;0.25&#xB0;)."
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
 "دقة المكان المنخفضة تعني أن لا شيء أدق من المدينة والولاية والبلد سيُنشر.  "
 "ستُضاف قيمة عشوائية إلى إحداثيات نظام تحديد المواقع (&#xB1;0.25&#xB0;)."
@@ -2501,10 +2546,6 @@ msgstr "الحالة"
 msgid "_Quit"
 msgstr "أ_نه"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Show Contact List"
-msgstr "أظهر _قائمة المتراسلين"
-
 #: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
@@ -2519,7 +2560,7 @@ msgstr "عرضت دعوة لخدمة  %s، ولكنك لا تملك البرنا
 
 #: ../src/empathy-call-window-fullscreen.ui.h:1
 msgid "gtk-leave-fullscreen"
-msgstr ""
+msgstr "gtk-leave-fullscreen"
 
 #: ../src/empathy-map-view.ui.h:1
 msgid "Contact Map View"
@@ -2588,6 +2629,9 @@ msgid ""
 "extension."
 msgstr "مدير الاتصالات المختار لا يدعم امتداد التنقيح عن بعد."
 
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "المرسال إمباثي"
+
 #~ msgid "Avatars are user chosen images shown in the contact list"
 #~ msgstr ""
 #~ "الصور الشخصية هي الصور التي اختار المستخدم والظاهرة في لائحة المتراسل"
@@ -2658,54 +2702,18 @@ msgstr "مدير الاتصالات المختار لا يدعم امتداد ا
 #~ msgid "New message from %s"
 #~ msgstr "رسالة جديدة من %s"
 
-#~ msgid "C_lear"
-#~ msgstr "ا_مسح"
-
-#~ msgid "Chat"
-#~ msgstr "محادثة"
-
-#~ msgid "Insert _Smiley"
-#~ msgstr "أدرج تعبيرا ر_سوميا"
-
 #~ msgid "Invitation _message:"
 #~ msgstr "رسالة ال_دعوة:"
 
 #~ msgid "Invite"
 #~ msgstr "ادعُ"
 
-#~ msgid "Move Tab _Left"
-#~ msgstr "انقل اللِّسان إلى اليسا_ر"
-
-#~ msgid "Move Tab _Right"
-#~ msgstr "انقل اللِّسان إلى ال_يمين"
-
 #~ msgid "Select who would you like to invite:"
 #~ msgstr "اختر من تريد دعوته:"
 
 #~ msgid "You have been invited to join a chat conference."
 #~ msgstr "لقد دُعيت للانضمام إلى اجتماع دردشة. "
 
-#~ msgid "_Contact"
-#~ msgstr "_متراسل"
-
-#~ msgid "_Conversation"
-#~ msgstr "م_حادثة"
-
-#~ msgid "_Detach Tab"
-#~ msgstr "_فصل اللسان"
-
-#~ msgid "_Favorite Chatroom"
-#~ msgstr "الغرفة الم_فضلة"
-
-#~ msgid "_Next Tab"
-#~ msgstr "اللسان ال_تالي"
-
-#~ msgid "_Previous Tab"
-#~ msgstr "اللسان ال_سابق"
-
-#~ msgid "_Tabs"
-#~ msgstr "أ_لسنة"
-
 #~ msgid "Edit Favorite Room"
 #~ msgstr "حرّر الغرفة المفضلة"
 
diff --git a/po/br.po b/po/br.po
new file mode 100644
index 000000000..f3a620248
--- /dev/null
+++ b/po/br.po
@@ -0,0 +1,2553 @@
+# Breton translation for empathy
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the empathy package.
+# Denis <denisarnuad@yahoo.fr>, 2009.
+#
+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: 2009-08-06 04:15+0000\n"
+"PO-Revision-Date: 2009-08-09 23:04+0100\n"
+"Last-Translator: denis <denisarnuad@yahoo.fr>\n"
+"Language-Team: Brenux <brenux@free.fr>\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"
+
+#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy IM Client"
+msgstr "Arval postelerezh prim Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
+#, fuzzy
+msgid "Send and receive instant messages"
+msgstr "Kas ha resev posteloù prim"
+
+#: ../data/empathy.schemas.in.h:1
+msgid "Always open a separate chat window for new chats."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:2
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:3
+msgid "Chat window theme"
+msgstr "Neuz ar prenestr flapañ"
+
+#: ../data/empathy.schemas.in.h:4
+msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:5
+msgid "Compact contact list"
+msgstr "Roll an darempredoù"
+
+#: ../data/empathy.schemas.in.h:6
+msgid "Contact list sort criterium"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:7
+msgid "Default directory to select an avatar image from"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:8
+msgid "Disable popup notifications when away"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:9
+msgid "Disable sounds when away"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:14
+msgid "Empathy default download folder"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:15
+msgid "Empathy has asked about importing accounts"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:16
+msgid "Empathy should auto-connect on startup"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:18
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:19
+#, fuzzy
+msgid "Enable WebKit Developer Tools"
+msgstr "Gweredekaat binvioù an developer Webkit"
+
+#: ../data/empathy.schemas.in.h:20
+#, fuzzy
+msgid "Enable popup notifications for new messages"
+msgstr "Gweredekaat rebuzadurioù evit kemennadennoù nevez"
+
+#: ../data/empathy.schemas.in.h:21
+msgid "Enable spell checker"
+msgstr "Gweredekaat an difazier"
+
+#: ../data/empathy.schemas.in.h:22
+msgid "Hide main window"
+msgstr "Kuzhat ar prenestr pennañ"
+
+#: ../data/empathy.schemas.in.h:23
+msgid "Hide the main window."
+msgstr "Kuzhat ar prenestr pennañ."
+
+#: ../data/empathy.schemas.in.h:24
+msgid "NetworkManager should be used"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:25
+msgid "Nick completed character"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:26
+msgid "Open new chats in separate windows"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:27
+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."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:29
+msgid "Play a sound for incoming messages"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:30
+msgid "Play a sound for new conversations"
+msgstr "Seniñ ur son evit ur gaozadenn nevez"
+
+#: ../data/empathy.schemas.in.h:31
+msgid "Play a sound for outgoing messages"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:32
+msgid "Play a sound when a contact logs in"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:33
+msgid "Play a sound when a contact logs out"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:34
+msgid "Play a sound when we log in"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:35
+msgid "Play a sound when we log out"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:36
+msgid "Popup notifications if the chat isn't focused"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:39
+msgid "Salut account is created"
+msgstr "Krouet eo ar gont Salut"
+
+#: ../data/empathy.schemas.in.h:40
+msgid "Show avatars"
+msgstr "Diskouez an avataroù"
+
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "Diskouez roll ar darempredoù er salioù"
+
+#: ../data/empathy.schemas.in.h:42
+msgid "Show hint about closing the main window"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:43
+msgid "Show offline contacts"
+msgstr "Diskouez an darempredoù ezlinenn"
+
+#: ../data/empathy.schemas.in.h:44
+msgid "Spell checking languages"
+msgstr "Yezhoù an difazier"
+
+#: ../data/empathy.schemas.in.h:45
+msgid "The default folder to save file transfers in."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:46
+msgid "The last directory that an avatar image was chosen from."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:47
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:48
+msgid "Use graphical smileys"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:49
+msgid "Use notification sounds"
+msgstr "Arverañ sonioù rebuziñ"
+
+#: ../data/empathy.schemas.in.h:50
+msgid "Use theme for chat rooms"
+msgstr "Arverañ an neuz evit ar sal flapañ"
+
+#: ../data/empathy.schemas.in.h:51
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS 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."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:56
+msgid "Whether or not Empathy has asked about importing accounts from other programs."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:57
+msgid "Whether or not Empathy should automatically log in to your accounts on startup."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:58
+msgid "Whether or not Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:59
+msgid "Whether or not Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:60
+msgid "Whether or not the Salut account has been created on the first Empathy run."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:61
+msgid "Whether or not the network manager should be used to automatically disconnect/reconnect."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:62
+msgid "Whether or not 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."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:64
+msgid "Whether or not to play a sound to notify for contacts logging in the network."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:65
+msgid "Whether or not to play a sound to notify for contacts logging off the network."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:66
+msgid "Whether or not to play a sound to notify for events."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:67
+msgid "Whether or not to play a sound to notify for incoming messages."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:68
+msgid "Whether or not to play a sound to notify for new conversations."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:69
+msgid "Whether or not to play a sound to notify for outgoing messages."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:70
+msgid "Whether or not to play a sound when logging in a network."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:71
+msgid "Whether or not to play a sound when logging off a network."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:72
+msgid "Whether or not 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."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:75
+msgid "Whether or not 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."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:77
+msgid "Whether or not 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."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:79
+msgid "Whether or not 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."
+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."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:82
+msgid "Whether to show the contact list in compact mode or not."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:83
+msgid "Whether to use the theme for chat rooms or not."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:84
+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."
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "Goullo eo ar restr diuzet"
+
+#: ../libempathy/empathy-tp-contact-list.c:843
+#: ../src/empathy.c:289
+#, fuzzy
+msgid "People nearby"
+msgstr "Tud e-kichen"
+
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Abeg dianav"
+
+#: ../libempathy/empathy-utils.c:265
+msgid "Available"
+msgstr "Hegerz"
+
+#: ../libempathy/empathy-utils.c:267
+msgid "Busy"
+msgstr "Ac'hubet"
+
+#: ../libempathy/empathy-utils.c:270
+msgid "Away"
+msgstr "Aet kuit"
+
+#: ../libempathy/empathy-utils.c:272
+msgid "Hidden"
+msgstr "Kuzh"
+
+#: ../libempathy/empathy-utils.c:274
+msgid "Offline"
+msgstr "Ezlinenn"
+
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d eilenn zo"
+msgstr[1] "%d eilenn zo"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d a vunutenn zo"
+msgstr[1] "%d a vunutenn zo"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d a zeizioù zo"
+msgstr[1] "%d a zeizioù zo"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
+msgid "All"
+msgstr "An holl"
+
+#: ../libempathy-gtk/empathy-account-widget.c:302
+#: ../libempathy-gtk/empathy-account-widget.c:354
+#, c-format
+msgid "%s:"
+msgstr "%s :"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+msgid "Advanced"
+msgstr "Kempleshoc'h"
+
+#: ../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
+msgid "Pass_word:"
+msgstr "_Ger-tremen :"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "Screen _Name:"
+msgstr "A_nv ar skramm :"
+
+#: ../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
+msgid "_Port:"
+msgstr "_Porzh :"
+
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
+msgid "_Server:"
+msgstr "_Dafariad :"
+
+#: ../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
+msgid "Login I_D:"
+msgstr "Henna_der (ID) :"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "Hennader (ID) _ICQ :"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "_Charset:"
+msgstr "Spletad a_rouezennoù :"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+msgid "New Network"
+msgstr "Rouedad nevez"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Charset:"
+msgstr "Spletad arouezennoù :"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network"
+msgstr "Rouedad"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Network:"
+msgstr "Rouedad :"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Nickname:"
+msgstr "Lezanv :"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid "Password:"
+msgstr "Ger-tremen :"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Quit message:"
+msgstr "Kuitaat ar gemennadenn :"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+msgid "Real name:"
+msgstr "Anv wir :"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Dafariadoù"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "Tremen a ra dreist arventennoù an dafariad"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "Pri_ority:"
+msgstr "K_entañ-wellañ :"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "Reso_urce:"
+msgstr "L_oaz :"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+msgid "Use old SS_L"
+msgstr "Arverañ ar SS_L kozh"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "_Encryption required (TLS/SSL)"
+msgstr "_Enrinegañ rekis (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "_Ignore SSL certificate errors"
+msgstr "Leuskel a-gostez fazioù an testenioù SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+msgid "_Email:"
+msgstr "Post_el :"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+msgid "_First Name:"
+msgstr "Anv-b_ihan :"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+msgid "_Jabber ID:"
+msgstr "Hennader(ID) Jabber :"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+msgid "_Last Name:"
+msgstr "Anv-fami_lh :"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+msgid "_Nickname:"
+msgstr "Leza_nv :"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+msgid "_Published Name:"
+msgstr "Anv em_bannet :"
+
+#. 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:3
+msgid "Discover STUN"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "STUN Server:"
+msgstr "Dafariad STUN"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "STUN port:"
+msgstr "Porzh STUN :"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "_Username:"
+msgstr "Anv an ar_veriad :"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Use _Yahoo Japan"
+msgstr "Arverañ _Yahoo Japon"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+msgid "Yahoo I_D:"
+msgstr "Henna_der (ID) Yahoo :"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Ignore conference and chatroom invitations"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Room List locale:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+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:933
+msgid "Select Your Avatar Image"
+msgstr "Diuzañ ho skeudenn avatar"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+msgid "No Image"
+msgstr "Skeudenn ebet"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+msgid "Images"
+msgstr "Skeudennoù"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+msgid "All Files"
+msgstr "An holl restroù"
+
+#: ../libempathy-gtk/empathy-avatar-image.c:324
+msgid "Click to enlarge"
+msgstr "Klikit evit brasaat"
+
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "N'haller ket adkennaskañ ar flap-mañ"
+
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
+msgstr "Arc'had anskoret"
+
+#: ../libempathy-gtk/empathy-chat.c:539
+msgid "offline"
+msgstr "ezlinnen"
+
+#: ../libempathy-gtk/empathy-chat.c:542
+msgid "invalid contact"
+msgstr "didalvoudek eo an darempred"
+
+#: ../libempathy-gtk/empathy-chat.c:545
+msgid "permission denied"
+msgstr "aotre nac'het"
+
+#: ../libempathy-gtk/empathy-chat.c:548
+msgid "too long message"
+msgstr "Re hir eo ar gemennadenn"
+
+#: ../libempathy-gtk/empathy-chat.c:551
+msgid "not implemented"
+msgstr "ket kefloueret"
+
+#: ../libempathy-gtk/empathy-chat.c:554
+msgid "unknown"
+msgstr "dianav"
+
+#: ../libempathy-gtk/empathy-chat.c:558
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Fazi en ur gas ar gemennadenn '%s' : %s "
+
+#: ../libempathy-gtk/empathy-chat.c:588
+#, c-format
+msgid "Topic set to: %s"
+msgstr "Danvez arventennet da : %s"
+
+#: ../libempathy-gtk/empathy-chat.c:590
+msgid "No topic defined"
+msgstr "N'eo ket erspizet an danvez"
+
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
+msgstr "(Kinnig ebet)"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
+#, fuzzy
+msgid "Insert Smiley"
+msgstr "Enlakaat ur smiley"
+
+#. send button
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
+msgid "_Send"
+msgstr "Ka_s"
+
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "Kinnigoù an di_fazier"
+
+#: ../libempathy-gtk/empathy-chat.c:1181
+#, c-format
+msgid "%s has disconnected"
+msgstr "Digennasket eo %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, fuzzy, c-format
+msgid "%s was kicked by %s"
+msgstr "%s oa bet kicked gant %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, fuzzy, c-format
+msgid "%s was kicked"
+msgstr "%s oa bet kicked"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, fussy, c-format
+msgid "%s was banned by %s"
+msgstr "%s oa bet baniset gant %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, fuzzy, c-format
+msgid "%s was banned"
+msgstr "%s oa bet baniset"
+
+#: ../libempathy-gtk/empathy-chat.c:1200
+#, c-format
+msgid "%s has left the room"
+msgstr ""
+
+#. 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:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1365
+#: ../src/empathy-call-window.c:1225
+msgid "Disconnected"
+msgstr "Digennasket"
+
+#: ../libempathy-gtk/empathy-chat.c:1800
+msgid "Connected"
+msgstr "Kennasket"
+
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
+msgid "Conversation"
+msgstr "Kaozadenn"
+
+#: ../libempathy-gtk/empathy-chat.ui.h:1
+#: ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Danvez :"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
+msgid "_Copy Link Address"
+msgstr "_Eilañ chomlec'h an ere"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
+msgid "_Open Link"
+msgstr "_Digeriñ an ere"
+
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
+msgid "%A %B %d %Y"
+msgstr "%A %B %d %Y"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+msgid "Edit Contact Information"
+msgstr "Kemmañ titouroù an darempred"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Titouroù personel"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+msgid "New Contact"
+msgstr "Darempred nevez"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Decide _Later"
+msgstr "Dibab diw_ezatoc'h"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "Subscription Request"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1404
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1406
+msgid "Removing group"
+msgstr "O tilemel ar strollad"
+
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1453
+#: ../libempathy-gtk/empathy-contact-list-view.c:1530
+msgid "_Remove"
+msgstr "_Dilemel"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1483
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1485
+msgid "Removing contact"
+msgstr "O tilemel an darempred"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "Ouzhpennañ un darempred..."
+
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
+msgid "_Chat"
+msgstr "_Flapañ"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "G_alv aodio"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "Gal_v video"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
+msgid "_View Previous Conversations"
+msgstr "G_welout kaozadennoù kent"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:346
+msgid "Send file"
+msgstr "Kas ar restr"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+#, fuzzy
+msgid "Share my desktop"
+msgstr "Rannañ ma burev"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
+msgid "Infor_mation"
+msgstr "Tit_ouroù"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:16
+msgid "_Edit"
+msgstr "K_emmañ"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:501
+msgid "Inviting to this room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:532
+msgid "_Invite to chatroom"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-selector.c:129
+msgid "Select a contact"
+msgstr "Diuzañ ur darempred"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:447
+msgid "Save Avatar"
+msgstr "Enrollañ an avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:503
+msgid "Unable to save avatar"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+msgid "Select"
+msgstr "Diuzañ"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1005
+#: ../src/empathy-main-window.c:1023
+msgid "Group"
+msgstr "Strollad"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
+msgid "Country ISO Code:"
+msgstr "Kod ISO ar vro :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "Country:"
+msgstr "Bro :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "State:"
+msgstr "Stad :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "City:"
+msgstr "Kêr :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Area:"
+msgstr "Maez :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Postal Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Street:"
+msgstr "Straed :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Building:"
+msgstr "Saverezh :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Floor:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Room:"
+msgstr "Sal :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Text:"
+msgstr "Testenn :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Description:"
+msgstr "Deskrivadur :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "URI:"
+msgstr "URI :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Accuracy Level:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Error:"
+msgstr "Fazi :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Horizontal Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Speed:"
+msgstr "Tizh :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Bearing:"
+msgstr "Emzalc'h :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Climb Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Last Updated on:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Longitude:"
+msgstr "Hedred :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Latitude:"
+msgstr "Ledred :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Altitude:"
+msgstr "Uhelez :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1349
+msgid "<b>Location</b>"
+msgstr "<b>Lec'hiadur</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1362
+msgid "<b>Location</b>, "
+msgstr "<b>Lec'hiadur</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1412
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y at %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Lec'hiadur</b> d'an (deiziad)\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 "Kont :"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+msgid "Alias:"
+msgstr "Alias :"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+msgid "Birthday:"
+msgstr "Deiz-ha-bloaz :"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "Titouroù an arval"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+msgid "Client:"
+msgstr "Arval :"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Darempred"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "Munudoù an darempred"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Email:"
+msgstr "Postel :"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Fullname:"
+msgstr "Anv a-bezh :"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "Strolladoù"
+
+#. Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Identifier:"
+msgstr "Hennader :"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+msgid "Information requested..."
+msgstr "Titouroù goulennet..."
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+msgid "OS:"
+msgstr "Reizhiad korvoiñ :"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+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-contact-widget.ui.h:17
+msgid "Version:"
+msgstr "Handelv :"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+msgid "Web site:"
+msgstr "Lec'hienn :"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+msgid "_Add Group"
+msgstr "Ouzhpenn_añ ur strollad"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+msgid "new server"
+msgstr "dafariad nevez"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+msgid "Server"
+msgstr "Dafariad"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+msgid "Port"
+msgstr "Porzh"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+msgid "SSL"
+msgstr "SSL"
+
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
+msgid "Account"
+msgstr "Kont"
+
+#: ../libempathy-gtk/empathy-log-window.c:512
+msgid "Date"
+msgstr "Deiziad"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "Conversations"
+msgstr "Kaozadennoù"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+msgid "Previous Conversations"
+msgstr "Kaozadennoù kent"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Search"
+msgstr "Klask"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "_For:"
+msgstr "_Evit :"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
+msgid "C_all"
+msgstr "G_ervel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+msgid "C_hat"
+msgstr "F_lapañ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
+msgid "Contact ID:"
+msgstr "Hennader (ID) an darempred :"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+msgid "New Conversation"
+msgstr "Kaozadenn nevez"
+
+#. 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 "Personalaat ar gemennadenn..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "Kemmañ ar gemennadenn personalaet..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "Arventenniñ ar stad"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr ""
+
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "Personalaat ar c'hemennadennoù..."
+
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr "resevet eo an postel prim"
+
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr "Kaset eo ar postel prim"
+
+#: ../libempathy-gtk/empathy-sound.c:55
+#, fuzzy
+msgid "Incoming chat request"
+msgstr "Goulenn flap"
+
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr "Darempred kennasket"
+
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr "Darempred digennasket"
+
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr "Kennasket ouzh an dafariad"
+
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "Digennasket ouzh an dafariad"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+#, fuzzy
+msgid "Incoming voice call"
+msgstr "Galv mouezh"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+#, fuzzy
+msgid "Outgoing voice call"
+msgstr "Galv mouezh"
+
+#: ../libempathy-gtk/empathy-sound.c:69
+msgid "Voice call ended"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "Roit ur gemennadenn personalaet"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "Kemmañ ar gemennadenn personalaet"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "gtk-ouzpennañ"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-dilemel"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Klasel"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Eeun"
+
+# adj
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Naet"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Glas"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "Diuzañ ur restr"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a destination"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#, fuzzy
+msgid "Current Locale"
+msgstr "Lokal-red (en implij)"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr "Arabeg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr "Armenianeg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:173
+#: ../libempathy-gtk/totem-subtitle-encoding.c:175
+#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+msgid "Baltic"
+msgstr "Balteg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+msgid "Celtic"
+msgstr "Keltiek"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:183
+#: ../libempathy-gtk/totem-subtitle-encoding.c:185
+#: ../libempathy-gtk/totem-subtitle-encoding.c:187
+#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+msgid "Central European"
+msgstr "Kreiz Europa"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:192
+#: ../libempathy-gtk/totem-subtitle-encoding.c:194
+#: ../libempathy-gtk/totem-subtitle-encoding.c:196
+#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+msgid "Chinese Simplified"
+msgstr "Sinaek Aesaet"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:201
+#: ../libempathy-gtk/totem-subtitle-encoding.c:203
+#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+msgid "Chinese Traditional"
+msgstr "Sinaek Hengounel"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+msgid "Croatian"
+msgstr "Kroateg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:211
+#: ../libempathy-gtk/totem-subtitle-encoding.c:213
+#: ../libempathy-gtk/totem-subtitle-encoding.c:215
+#: ../libempathy-gtk/totem-subtitle-encoding.c:217
+#: ../libempathy-gtk/totem-subtitle-encoding.c:219
+#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+msgid "Cyrillic"
+msgstr "Kirillek"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+msgid "Cyrillic/Russian"
+msgstr "Kirillek/Rusek"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:227
+#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+msgid "Cyrillic/Ukrainian"
+msgstr "Kirillek/UkraÏnek"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+msgid "Georgian"
+msgstr "Jorjianeg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:235
+#: ../libempathy-gtk/totem-subtitle-encoding.c:237
+#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+msgid "Greek"
+msgstr "Gresianeg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:248
+#: ../libempathy-gtk/totem-subtitle-encoding.c:250
+#: ../libempathy-gtk/totem-subtitle-encoding.c:252
+#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+msgid "Hebrew"
+msgstr "Hebraeg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#, fuzzy
+msgid "Hebrew Visual"
+msgstr "Hebraek Visual"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+msgid "Icelandic"
+msgstr "Islandeg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:266
+#: ../libempathy-gtk/totem-subtitle-encoding.c:268
+#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+msgid "Japanese"
+msgstr "Japaneg"
+
+#: ../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 "Koreeg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+msgid "Nordic"
+msgstr "Norzhek"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+msgid "Persian"
+msgstr "Perseg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:288
+#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+msgid "Romanian"
+msgstr "Romaneg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+msgid "South European"
+msgstr "Su Europa"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+msgid "Thai"
+msgstr "Thai"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:299
+#: ../libempathy-gtk/totem-subtitle-encoding.c:301
+#: ../libempathy-gtk/totem-subtitle-encoding.c:303
+#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+msgid "Turkish"
+msgstr "Turkeg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:308
+#: ../libempathy-gtk/totem-subtitle-encoding.c:310
+#: ../libempathy-gtk/totem-subtitle-encoding.c:312
+#: ../libempathy-gtk/totem-subtitle-encoding.c:314
+#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:319
+#: ../libempathy-gtk/totem-subtitle-encoding.c:321
+#: ../libempathy-gtk/totem-subtitle-encoding.c:323
+#: ../libempathy-gtk/totem-subtitle-encoding.c:325
+#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+msgid "Western"
+msgstr "Kornôg"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:330
+#: ../libempathy-gtk/totem-subtitle-encoding.c:332
+#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+msgid "Vietnamese"
+msgstr "Vietnameg"
+
+#.
+#. * 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:519
+msgid "Talk!"
+msgstr "Komz !"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
+#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
+msgid "_About"
+msgstr "Diw_ar-benn"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
+msgid "_Information"
+msgstr "_Titouroù"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
+#: ../src/empathy-main-window.ui.h:23
+msgid "_Preferences"
+msgstr "_Gwellvezioù"
+
+#: ../megaphone/src/megaphone-applet.c:168
+msgid "Please configure a contact."
+msgstr "Kefluniañ ur darempred marplij."
+
+#: ../megaphone/src/megaphone-applet.c:258
+msgid "Select contact..."
+msgstr "Diuzañ an darempred..."
+
+#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
+msgid "Presence"
+msgstr "Bezañs"
+
+#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
+#: ../nothere/src/nothere-applet.c:106
+msgid "Set your own presence"
+msgstr ""
+
+#: ../src/empathy.c:567
+msgid "Don't connect on startup"
+msgstr "Na kennaskañ ket e-pad al loc'hañ"
+
+#: ../src/empathy.c:571
+msgid "Don't show the contact list on startup"
+msgstr "Na diskouez ket roll an darempredoù e-pad al loc'hañ"
+
+#: ../src/empathy.c:575
+#, fuzzy
+msgid "Show the accounts dialog"
+msgstr "Diskouez emziviz ar kontoù"
+
+#: ../src/empathy.c:587
+msgid "- Empathy IM Client"
+msgstr " - Arval postelerezh prim Empathy"
+
+#: ../src/empathy-about-dialog.c:83
+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 "Ur meziant digor eo Empathy ; dasparzhet pe/ha daskemmet e vez dindan termenoù al Lañvaz Foran Hollek GNU evel ma'z eo bet embannet gant Diazezadenn ar Meziantoù Digor ; da lâret eo handelv 2 eus al lañvaz pe (evel ma plij deoc'h) ne vern pe handelv nevesoc'h."
+
+#: ../src/empathy-about-dialog.c:87
+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 "Dasparzhet eo Empathy gant ar spi e vo talvoudus met GANT GWARANT EBET ; hep ar gwarant enpleg a-fet TALVOUDEGEZH KENWERZHEL pe VARREGEZH EVIT UR PAL PERSONEL. Taolit ur sell war Lañvaz Foran Hollek GNU evit gouzout hiroc'h."
+
+#: ../src/empathy-about-dialog.c:91
+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 "Moarvat hoc'h eus bet un eilad eus al Lañvaz Foran Hollek GNU gant Empathy ; ma n'hoc'h eus ket bet,skrivit da : Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
+
+#: ../src/empathy-about-dialog.c:119
+msgid "An Instant Messaging client for GNOME"
+msgstr "Un arval postelerezh prim evit GNOME"
+
+#: ../src/empathy-about-dialog.c:125
+msgid "translator-credits"
+msgstr "Denis <denisarnuad@yahoo.fr>"
+
+#: ../src/empathy-accounts-dialog.c:392
+msgid "Enabled"
+msgstr "Gweredekaet"
+
+#: ../src/empathy-accounts-dialog.c:402
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "Kontoù"
+
+#. To translator: %s is the protocol name
+#: ../src/empathy-accounts-dialog.c:837
+#, c-format
+msgid "New %s account"
+msgstr "Kont nevez %s"
+
+#: ../src/empathy-accounts-dialog.c:950
+#, c-format
+msgid ""
+"You are about to remove your %s account!\n"
+"Are you sure you want to proceed?"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:956
+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.ui.h:2
+msgid "Add Account"
+msgstr "Ouzhpennañ ar gont"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "Cr_eate"
+msgstr "Kr_ouiñ"
+
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
+
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "Import Accounts..."
+msgstr "Enporzhiañ kontoù..."
+
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "Arventennoù"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
+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 "Rizh :"
+
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "Ouzhpenn_añ..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "_Krouiñ ur kont nevez"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+#, fuzzy
+msgid "_Reuse an existing account"
+msgstr "A_darverañ ur gont existing"
+
+#: ../src/empathy-call-window.c:420
+msgid "Contrast"
+msgstr "Dargemm"
+
+#: ../src/empathy-call-window.c:423
+msgid "Brightness"
+msgstr "Lintr"
+
+#: ../src/empathy-call-window.c:426
+msgid "Gamma"
+msgstr "Gamma"
+
+#: ../src/empathy-call-window.c:531
+msgid "Volume"
+msgstr "Ampled"
+
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "O kennaskañ…"
+
+#: ../src/empathy-call-window.c:746
+msgid "_Sidebar"
+msgstr "_Barrenn gostez"
+
+#: ../src/empathy-call-window.c:765
+msgid "Dialpad"
+msgstr ""
+
+#: ../src/empathy-call-window.c:771
+msgid "Audio input"
+msgstr "Enankad aodio"
+
+#: ../src/empathy-call-window.c:775
+msgid "Video input"
+msgstr "Enankad Video"
+
+#: ../src/empathy-call-window.c:835
+#, c-format
+msgid "Call with %s"
+msgstr "Gervel gant %s"
+
+#: ../src/empathy-call-window.c:904
+msgid "Call"
+msgstr "Gervel"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1335
+#, c-format
+msgid "Connected — %d:%02dm"
+msgstr "Kennasket - %d:%02dm"
+
+#: ../src/empathy-call-window.ui.h:1
+msgid "Hang up"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Send Audio"
+msgstr "Kas an aodio"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Send video"
+msgstr "Kas ar Video"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Video preview"
+msgstr "Alberz Video"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Gervel"
+
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:26
+msgid "_View"
+msgstr "G_welout"
+
+#: ../src/empathy-chat-window.c:344
+#, c-format
+msgid "Conversations (%d)"
+msgstr "Kaozadennoù (%d)"
+
+#: ../src/empathy-chat-window.c:476
+msgid "Typing a message."
+msgstr "O skrivañ ur gemennadenn."
+
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "S_karzhañ"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "Flapañ"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Enlakaat ur _smiley"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "Kas a-gleiz an ivinell"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "Kas a-zehou an ivinell"
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "_Darempred"
+
+#: ../src/empathy-chat-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "Endal_c'hadoù"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "_Kaozadenn"
+
+#: ../src/empathy-chat-window.ui.h:9
+#, fuzzy
+msgid "_Detach Tab"
+msgstr "_Distagañ an ivinell"
+
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Favorite Chatroom"
+msgstr "Salflap _gwellañ"
+
+#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "_Skoazell"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr "Ivinell da-_heul"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "Ivinell _kent"
+
+#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "Di_skouez roll an darempredoù"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "Ivinelloù"
+
+#: ../src/empathy-chatrooms-window.c:258
+msgid "Name"
+msgstr "Anv"
+
+#: ../src/empathy-chatrooms-window.c:276
+msgid "Room"
+msgstr "Sal"
+
+#: ../src/empathy-chatrooms-window.c:285
+msgid "Auto-Connect"
+msgstr "Emzinoiñ"
+
+#: ../src/empathy-chatrooms-window.ui.h:2
+msgid "Manage Favorite Rooms"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:321
+msgid "Incoming call"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:324
+#, c-format
+msgid "%s is calling you, do you want to answer?"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:331
+msgid "_Reject"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:337
+msgid "_Answer"
+msgstr "_Respont"
+
+#: ../src/empathy-event-manager.c:452
+#, c-format
+msgid "Incoming call from %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:496
+#, c-format
+msgid "%s is offering you an invitation"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:502
+msgid "An external application will be started to handle it."
+msgstr ""
+
+#: ../src/empathy-event-manager.c:507
+msgid "You don't have the needed external application to handle it."
+msgstr ""
+
+#: ../src/empathy-event-manager.c:634
+msgid "Room invitation"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:637
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:645
+msgid "_Decline"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "_Join"
+msgstr "K_enstagañ"
+
+#: ../src/empathy-event-manager.c:689
+#, c-format
+msgid "%s invited you to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:715
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:895
+#, c-format
+msgid "Subscription requested by %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:899
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"Kemennadenn : %s"
+
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "Ezlinenn eo %s bremañ."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "Enlinenn eo %s bremañ."
+
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:101
+#, 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
+#, c-format
+msgid "%02u.%02u"
+msgstr "%02u.%02u"
+
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Dianav"
+
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s eus %s da %s/s"
+
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s eus %s"
+
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:307
+#, 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
+#, c-format
+msgid "Sending \"%s\" to %s"
+msgstr "O kas \"%s\" da %s"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:348
+#, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "Fazi en ur gas an \"%s\" da %s"
+
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "Fazi en ur gas ur restr"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
+#, 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
+#, c-format
+msgid "\"%s\" sent to %s"
+msgstr "\"%s\" kaset da %s"
+
+#: ../src/empathy-ft-manager.c:498
+msgid "File transfer completed"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:617
+#: ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:643
+#: ../src/empathy-ft-manager.c:681
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:646
+#: ../src/empathy-ft-manager.c:684
+#, c-format
+msgid "Hashing \"%s\""
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:1024
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1036
+msgid "File"
+msgstr "Restr"
+
+#: ../src/empathy-ft-manager.c:1058
+msgid "Remaining"
+msgstr "O chom"
+
+#: ../src/empathy-ft-manager.ui.h:1
+#, fuzzy
+msgid "File Transfers"
+msgstr "Treuzkasadoù restroù"
+
+#: ../src/empathy-ft-manager.ui.h:2
+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 "Enporzhiañ"
+
+#: ../src/empathy-import-dialog.c:272
+msgid "Protocol"
+msgstr "Komenad"
+
+#: ../src/empathy-import-dialog.c:298
+msgid "Source"
+msgstr "Tarzh"
+
+#: ../src/empathy-import-dialog.c:392
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr ""
+
+#: ../src/empathy-import-dialog.ui.h:1
+msgid "Import Accounts"
+msgstr "Enporzhiañ kontoù"
+
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "K_emmañ ar gont"
+
+#: ../src/empathy-main-window.c:505
+msgid "No error specified"
+msgstr ""
+
+#: ../src/empathy-main-window.c:508
+msgid "Network error"
+msgstr "Fazi rouedad"
+
+#: ../src/empathy-main-window.c:511
+msgid "Authentication failed"
+msgstr "C'hwitadenn war dilesa"
+
+#: ../src/empathy-main-window.c:514
+msgid "Encryption error"
+msgstr "Fazi en ur enrinegañ"
+
+#: ../src/empathy-main-window.c:517
+msgid "Name in use"
+msgstr "Anv arveret"
+
+#: ../src/empathy-main-window.c:520
+msgid "Certificate not provided"
+msgstr ""
+
+#: ../src/empathy-main-window.c:523
+msgid "Certificate untrusted"
+msgstr ""
+
+#: ../src/empathy-main-window.c:526
+msgid "Certificate expired"
+msgstr ""
+
+#: ../src/empathy-main-window.c:529
+msgid "Certificate not activated"
+msgstr ""
+
+#: ../src/empathy-main-window.c:532
+msgid "Certificate hostname mismatch"
+msgstr ""
+
+#: ../src/empathy-main-window.c:535
+msgid "Certificate fingerprint mismatch"
+msgstr ""
+
+#: ../src/empathy-main-window.c:538
+msgid "Certificate self-signed"
+msgstr ""
+
+#: ../src/empathy-main-window.c:541
+msgid "Certificate error"
+msgstr ""
+
+#: ../src/empathy-main-window.c:544
+msgid "Unknown error"
+msgstr "Fazi dianav"
+
+#: ../src/empathy-main-window.c:1293
+msgid "Show and edit accounts"
+msgstr "Diskouez hag kemmañ kontoù"
+
+#: ../src/empathy-main-window.ui.h:1
+msgid "Contact List"
+msgstr "Roll an darempredoù"
+
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "Darempredoù war un ga_rtenn"
+
+#: ../src/empathy-main-window.ui.h:3
+msgid "Context"
+msgstr "Kemperzh"
+
+#: ../src/empathy-main-window.ui.h:4
+msgid "Join _Favorites"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:5
+msgid "Manage Favorites"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Rummañ dre a_nv"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "Rummañ dre _stad"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "_Accounts"
+msgstr "_Kontoù"
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "_Diveugañ"
+
+#: ../src/empathy-main-window.ui.h:17
+#, fuzzy
+msgid "_File Transfers"
+msgstr "Treuzkasadoù restroù"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "K_enstagañ..."
+
+#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation..."
+msgstr "Kaozadenn _nevez..."
+
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "Darempredoù e_zlinenn"
+
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Personal Information"
+msgstr "Tituroù personel"
+
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "Kaozadennoù _kent"
+
+#: ../src/empathy-main-window.ui.h:25
+msgid "_Room"
+msgstr "_Sal"
+
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
+msgstr "Salflap"
+
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "Izili"
+
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"Pedadenn rekis : %s\n"
+"Ger-tremen rekis : %s\n"
+"Izili : %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "Ya"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "ket"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+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 ""
+
+#: ../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 "Join Room"
+msgstr "Kenstagañ ar sal"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "Roll ar salioù"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Sal :"
+
+#: ../src/empathy-preferences.c:147
+#, fuzzy
+msgid "Message received"
+msgstr "Kemennadenn resevet"
+
+#: ../src/empathy-preferences.c:148
+msgid "Message sent"
+msgstr "Kemennadenn kaset"
+
+#: ../src/empathy-preferences.c:149
+msgid "New conversation"
+msgstr "Kaozadenn nevez"
+
+#: ../src/empathy-preferences.c:150
+#, fuzzy
+msgid "Contact goes online"
+msgstr "Un darempred a ya enlinenn"
+
+#: ../src/empathy-preferences.c:151
+#, fuzzy
+msgid "Contact goes offline"
+msgstr "Un darempred a ya ezlinenn"
+
+#: ../src/empathy-preferences.c:152
+msgid "Account connected"
+msgstr "Kont kennasket"
+
+#: ../src/empathy-preferences.c:153
+msgid "Account disconnected"
+msgstr "Kont digennasket"
+
+#: ../src/empathy-preferences.c:393
+msgid "Language"
+msgstr "Yezh"
+
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "Aotreañ arver ar GPS"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "Neuz"
+
+#: ../src/empathy-preferences.ui.h:5
+msgid "Automatically _connect on startup "
+msgstr "Kennaskañ emgefreek e-pad al loc'hañ"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "Emzalc'h"
+
+#: ../src/empathy-preferences.ui.h:7
+msgid "Chat Th_eme:"
+msgstr "N_euz ar flap :"
+
+#: ../src/empathy-preferences.ui.h:8
+msgid "Disable notifications when _away or busy"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:9
+msgid "Disable sounds when _away or busy"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:12
+msgid "Enable notifications when the _chat is not focused"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "Gweredekaat an difazier evit ar yezhoù :"
+
+#: ../src/empathy-preferences.ui.h:14
+msgid "General"
+msgstr "Hollek"
+
+#: ../src/empathy-preferences.ui.h:15
+#, fuzzy
+msgid "Geoclue Settings"
+msgstr "Arventennoù Geoclue"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "Lec'hiadur"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Rebuzadurioù"
+
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:19
+msgid "Preferences"
+msgstr "Gwellvezioù"
+
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "Buhez prevez"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will have a random value added (&#xB1;0.25&#xB0;)."
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:22
+msgid "Show _smileys as images"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "Diskouez roll an darempredoù er salioù"
+
+#: ../src/empathy-preferences.ui.h:24
+msgid "Sounds"
+msgstr "Sonioù"
+
+#: ../src/empathy-preferences.ui.h:25
+msgid "Spell Checking"
+msgstr "Gwiriañ ar reizhskrivadur"
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:27
+msgid "Themes"
+msgstr "Neuzioù"
+
+#: ../src/empathy-preferences.ui.h:28
+msgid "_Enable bubble notifications"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Enable sound notifications"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Open new chats in separate windows"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr ""
+
+#: ../src/empathy-status-icon.ui.h:1
+msgid "Status"
+msgstr "Stad"
+
+#: ../src/empathy-status-icon.ui.h:3
+msgid "_Quit"
+msgstr "_Kuitaat"
+
+#: ../src/empathy-tube-dispatch.c:375
+#, c-format
+msgid "Unable to start application for service %s: %s"
+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"
+msgstr ""
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "Gwel kartenn an darempredoù"
+
+#: ../src/empathy-debug-dialog.c:111
+#: ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Fazi"
+
+#: ../src/empathy-debug-dialog.c:114
+#: ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "Eizik"
+
+#: ../src/empathy-debug-dialog.c:117
+#: ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "Evezh"
+
+#: ../src/empathy-debug-dialog.c:120
+#: ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "Kemennadenn"
+
+#: ../src/empathy-debug-dialog.c:123
+#: ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "Titouroù"
+
+#: ../src/empathy-debug-dialog.c:126
+#: ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "Diveugañ"
+
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "Enrollañ"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "diveugañ ar prenestr"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "Ehan"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "Live"
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "Eur"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "Domani"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "Rummad"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "Live"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid "The selected connection manager does not support the remote debugging extension."
+msgstr ""
+
+msgid "Show _Offline Contacts"
+msgstr "Diskouez an darempredoù e_zlinenn"
+
+msgid "Status:"
+msgstr "Stad :"
+
+msgid "Message:"
+msgstr "Kemennadenn :"
+
+msgid "Save message"
+msgstr "Enrollañ ar gemennadenn"
+
+msgid "Custom message"
+msgstr "Personalaat ar gemennadenn"
+
+msgid "Empathy Instant Messenger"
+msgstr "Postelerezh prim Empathy"
+
+msgid "Sort by _name"
+msgstr "Rummañ dre a_nv"
+
+msgid "Sort by s_tate"
+msgstr "Rummañ dre _stad"
+
diff --git a/po/ca.po b/po/ca.po
index d8e71fafd..5a8e3313b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-19 20:15+0100\n"
-"PO-Revision-Date: 2009-02-20 08:52+0100\n"
+"POT-Creation-Date: 2009-08-09 11:23+0200\n"
+"PO-Revision-Date: 2009-08-09 11:23+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Missatgeria instantània Empathy"
+#, fuzzy
+msgid "Empathy IM Client"
+msgstr "Trucada de l'Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+#, fuzzy
+msgid "Send and receive messages"
 msgstr "Envia i rep missatges instantanis"
 
 #: ../data/empathy.schemas.in.h:1
@@ -69,129 +71,212 @@ msgid "Disable sounds when away"
 msgstr "Inhabilita els sons quan s'estigui absent"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Carpeta predeterminada de les baixades de l'Empathy"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Si l'Empathy ha preguntat sobre la importació de comptes"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Fes que l'Empathy es connecti automàticament en iniciar-se"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+#, fuzzy
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Fes que l'Empathy es connecti automàticament en iniciar-se"
+
+#: ../data/empathy.schemas.in.h:18
 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/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Habilita les notificacions per als missatges nous"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Habilita el verificador ortogràfic"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Oculta la finestra principal"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Oculta la finestra principal."
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "S'hauria d'utilitzar el NetworkManager"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Caràcter de compleció de sobrenom"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Obre les finestres de xat noves en finestres separades"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:28
+#, fuzzy
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "Si s'ha d'utilitzar el tema per a les sales de xat."
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Reprodueix un so quan arribin missatges"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Reprodueix un so per a les converses noves"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Reprodueix un so per als missatges de sortida"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Reprodueix un so quan entri algun contacte"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Reprodueix un so si un contacte surt"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Reprodueix un so en entrar"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Reprodueix un so en sortir"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Mostra notificacions si el xat no té el focus"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+#, fuzzy
+msgid "Popup notifications when a contact sign in"
+msgstr "Mostra notificacions si el xat no té el focus"
+
+#: ../data/empathy.schemas.in.h:38
+#, fuzzy
+msgid "Popup notifications when a contact sign out"
+msgstr "Mostra notificacions si el xat no té el focus"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "S'ha creat el compte del Salut"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Mostra els avatars"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+#, fuzzy
+msgid "Show contact list in rooms"
+msgstr "_Mostra la llista de contactes"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Mostra un consell sobre tancar la finestra principal"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Mostra els contactes desconnectats"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Llengües per a la verificació ortogràfica"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "La carpeta predeterminada on es desaran els fitxers transferits."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 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/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 "El tema que s'utilitza per a mostrar la conversa a les finestres de xat."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Utilitza emoticones gràfiques"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Utilitza sons de notificació"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Usa el tema per a les sales de xat"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+#, fuzzy
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr ""
+"Si s'han de mostrar els contactes que estan desconnectats a la llista de "
+"contactes."
+
+#: ../data/empathy.schemas.in.h:53
+#, fuzzy
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr ""
+"Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
+"de xat."
+
+#: ../data/empathy.schemas.in.h:54
+#, fuzzy
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr ""
+"Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
+"de xat."
+
+#: ../data/empathy.schemas.in.h:55
+#, fuzzy
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr ""
+"Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
+"de xat."
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
@@ -199,13 +284,22 @@ msgstr ""
 "Si l'Empathy ha preguntat si es volen importar els comptes d'altres "
 "programes."
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Si l'Empathy ha d'entrar en els comptes automàticament en iniciar-se."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+#, fuzzy
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr ""
+"Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
+"de xat."
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
@@ -213,12 +307,12 @@ msgstr ""
 "Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
 "de xat."
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not 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."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -226,7 +320,7 @@ msgstr ""
 "Si s'hauria d'utilitzar el gestor de xarxa per a desconnectar/tornar a "
 "connectar automàticament."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
@@ -234,20 +328,20 @@ msgstr ""
 "Si s'han de verificar les paraules introduïdes comparant-les les llengües "
 "escollides per a la verificació ortogràfica."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr ""
 "Si s'han de convertir les emoticones a imatges gràfiques a les converses."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
 "Si s'ha de reproduir un so per a notificar que els contactes entren a la "
 "xarxa."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
@@ -255,35 +349,46 @@ msgstr ""
 "Si s'ha de reproduir un so per a notificar que els contactes surten de la "
 "xarxa."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Si s'ha de reproduir un so per a notificar esdeveniments."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Si s'ha de reproduir un so quan arriben missatges."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Si s'ha de reproduir un so quan s'inicien converses noves."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Si s'ha de reproduir un so quan s'envien missatges."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Si s'ha de reproduir un so quan s'entra a una xarxa."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Si s'ha de reproduir un so quan se surt d'una xarxa."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "Si s'han de reproduir sons quan s'estigui absent o ocupat."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+#, fuzzy
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "Si s'han de mostrar notificacions quan s'estigui absent o ocupat."
+
+#: ../data/empathy.schemas.in.h:74
+#, fuzzy
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "Si s'han de mostrar notificacions quan s'estigui absent o ocupat."
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -291,12 +396,12 @@ msgstr ""
 "Si s'han de mostrar notificacions quan es rebi un esdeveniment de missatge "
 "nou i el xat ja estigui obert però no tingui el focus."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "Si s'ha de mostrar una notificació quan es rebin missatges nous."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -304,17 +409,22 @@ msgstr ""
 "Si s'han de mostrar els avatars per als contactes a la llista de contactes i "
 "les finestres de xat."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr ""
 "Si s'han de mostrar els contactes que estan desconnectats a la llista de "
 "contactes."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "Si s'han de mostrar notificacions quan s'estigui absent o ocupat."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+#, fuzzy
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Si s'ha de mostrar la llista de contactes en mode compacte."
+
+#: ../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."
@@ -322,15 +432,15 @@ msgstr ""
 "Si s'ha de mostrar el diàleg de missatge sobre tancar la finestra principal "
 "amb el botó «x» de la barra de títol."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Si s'ha de mostrar la llista de contactes en mode compacte."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Si s'ha d'utilitzar el tema per a les sales de xat."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 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 "
@@ -341,541 +451,793 @@ msgstr ""
 "«name» (nom). Un valor «state» (estat) ordenarà la llista de contactes per "
 "estat."
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1098
+#, fuzzy
+msgid "File transfer not supported by remote contact"
+msgstr "La transferència de fitxers no està suportada pels dos usuaris."
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr ""
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Gent propera"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+#, fuzzy
+msgid "Socket type not supported"
+msgstr "Criteri d'ordenació de la llista de contactes"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "No s'ha especificat el motiu"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "S'ha demanat el canvi d'estat"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Heu cancel·lat la transferència del fitxer"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "L'interlocutor ha cancel·lat la transferència del fitxer"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "S'ha produït un error en enviar el fitxer"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "L'interlocutor no pot enviar el fitxer"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Motiu desconegut"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Absent"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Amagat"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Desconnectat"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Tots"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+#, fuzzy
+msgid "Advanced"
 msgstr "<b>Avançat</b>"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Oblida la contrasenya i neteja el camp."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../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
 msgid "Pass_word:"
 msgstr "Con_trasenya:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "_Nom en pantalla:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../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
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "I_D d'entrada:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "Joc de _caràcters:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Xarxa nova"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Xarxa</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Servidors</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Joc de caràcters:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Crea una xarxa d'IRC nova"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Edita la xarxa d'IRC nova seleccionada"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Xarxa"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Xarxa:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Sobrenom:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Missatge de desconnexió:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Nom real:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Suprimeix la xarxa IRC seleccionada"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#, fuzzy
+msgid "Servers"
+msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#, fuzzy
+msgid "Override server settings"
 msgstr "<b>Sobreescriu els paràmetres del servidor</b>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "Pri_oritat:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "Rec_urs:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Utilitza l'SS_L antic"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "_Es requereix xifratge (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ignora els errors del certificat SSL"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "Corr_eu electrònic:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "_Nom:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "Co_gnoms:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "Sobre_nom:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "Nom _públic:"
 
 #. 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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "Descobreix l'STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "Servidor STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "Port STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "N_om d'usuari:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "Utilitza el _Yahoo del Japó"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "I_D de Yahoo:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ignora les invitacions de conferència i sala de xat"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "_Localització de la llista de la sala:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "No s'ha pogut convertir la imatge"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr "El vostre sistema no sap gestionar cap dels formats d'imatge acceptats"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "Seleccioneu la vostra imatge d'avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Cap imatge"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Imatges"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Tots els fitxers"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Feu clic per a fer més gran"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+#, fuzzy
+msgid "Failed to reconnect this chat"
+msgstr "No s'ha pogut connectar a l'altra part"
+
+#: ../libempathy-gtk/empathy-chat.c:412
+msgid "Unsupported command"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "desconnectat"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "contacte no vàlid"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "s'ha denegat el permís"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "el missatge és massa llarg"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "no implementat"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "desconegut"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:567
 #, 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:556
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema establert a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "No s'ha definit cap tema"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:969
+msgid "(No Suggestions)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Insereix una emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Envia"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "_Verifica l'ortografia de la paraula..."
+#: ../libempathy-gtk/empathy-chat.c:1075
+msgid "_Spelling Suggestions"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1190
+#, fuzzy, c-format
+msgid "%s has disconnected"
+msgstr "S'ha desconnectat un contacte"
+
+#: ../libempathy-gtk/empathy-chat.c:1194
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s ha entrat a la sala"
+msgid "%s was kicked by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1197
+#, c-format
+msgid "%s was kicked"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha sortit de la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. 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:1218
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s ha entrat a la sala"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
 msgid "Disconnected"
 msgstr "Fora de línia"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "Connectat"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Tema:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Xat en grup"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "_Copia l'adreça de l'enllaç"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_Obre l'enllaç"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Informació personal"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Edita la informació del contacte"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Informació del contacte"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "Voldria afegir-te a la meva llista de contactes."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Informació personal"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Contacte nou"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "Ho _decidiré més tard"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Sol·licitud de subscripció"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, 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:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "S'està suprimint el grup"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "_Suprimeix"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, 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:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Suprimeix el contacte"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Ho sento, no et vull més a la meva llista de contactes."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_Afegeix un contacte..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Xat"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "Tru_ca"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+#, fuzzy
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Finalitza la trucada"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+#, fuzzy
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Finalitza la trucada"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Visualitza les converses anteriors"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Envia un fitxer"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Infor_mació"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "S'està convidant a aquesta sala"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_Convida a la sala de xat"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Seleccioneu un contacte"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Desa l'avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "No s'ha pogut desar l'avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Selecciona"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Grup"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Informació del client</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#, fuzzy
+msgid "Country ISO Code:"
+msgstr "Estat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Detalls del contacte</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Country:"
+msgstr "Estat:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#, fuzzy
+msgid "State:"
+msgstr "Estat:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#, fuzzy
+msgid "City:"
+msgstr "Client:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#, fuzzy
+msgid "Area:"
+msgstr "Armeni"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#, fuzzy
+msgid "Street:"
+msgstr "Selecciona"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#, fuzzy
+msgid "Floor:"
+msgstr "_Per a:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#, fuzzy
+msgid "Room:"
+msgstr "Sa_la:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#, fuzzy
+msgid "Text:"
+msgstr "Tipus:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#, fuzzy
+msgid "Description:"
+msgstr "_Descripció:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#, fuzzy
+msgid "Error:"
+msgstr "Error"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#, fuzzy
+msgid "Bearing:"
+msgstr "Bielorús"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Contacte</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Grups</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+#, fuzzy
+msgid "<b>Location</b>"
+msgstr "<b>Opcions</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#, fuzzy
+msgid "<b>Location</b>, "
+msgstr "<b>Opcions</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+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 "Compte:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Sobrenom:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Aniversari:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#, fuzzy
+msgid "Client Information"
+msgstr "<b>Informació del client</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Client:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Informació del contacte"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Contacte"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#, fuzzy
+msgid "Contact Details"
+msgstr "<b>Detalls del contacte</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "Correu electrònic:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Nom complet:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#, fuzzy
+msgid "Groups"
+msgstr "Grup"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Identificador:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "S'ha demanat la informació..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -883,179 +1245,213 @@ 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-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Versió:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "Pàgina web:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "_Afegeix un grup"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "servidor nou"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:277
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Compte"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Data"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Converses"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Converses anteriors"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Cerca"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_Per a:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "_Trucada"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "_Xat"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "ID del contacte:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "Conversa nova"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
+#. 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
+#, fuzzy
+msgid "Custom Message..."
 msgstr "Missatges personalitzats..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Missatge personalitzat"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Missatge:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Desa el missatge"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Estat:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Paraula"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Suggeriments per a la paraula"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Verificador ortogràfic"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Suggeriments per a la paraula:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "Clàssic"
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#, fuzzy
+msgid "Edit Custom Messages..."
+msgstr "Missatges personalitzats..."
 
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Simple"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "Net"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "Blau"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#, fuzzy
+msgid "Set status"
+msgstr "Estat"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "No s'ha pogut obrir l'URI"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "Seleccioneu un fitxer"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "Missatges personalitzats..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "Heu rebut un missatge instantani"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "Heu enviat un missatge instantani"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "Sol·licitud de xat"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "S'ha connectat un contacte"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "S'ha desconnectat un contacte"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "Connectat al servidor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "Desconnectat del servidor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "Trucada de veu entrant"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "Trucada de veu de sortida"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "La trucada de veu ha finalitzat"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#, fuzzy
+msgid "Enter Custom Message"
+msgstr "Missatge personalitzat"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#, fuzzy
+msgid "Edit Custom Messages"
+msgstr "Missatge personalitzat"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+#, fuzzy
+msgid "Saved Presets"
+msgstr "Desa el missatge"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+#, fuzzy
+msgid "gtk-add"
+msgstr "gtk-close"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+#, fuzzy
+msgid "gtk-remove"
+msgstr "gtk-copy"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Clàssic"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Simple"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Net"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Blau"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "No s'ha pogut obrir l'URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "Seleccioneu un fitxer"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
+#, fuzzy
+msgid "Select a destination"
+msgstr "Seleccioneu un contacte"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Localització actual"
@@ -1242,7 +1638,7 @@ msgid "Megaphone"
 msgstr "Megàfon"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Parleu!"
 
@@ -1256,15 +1652,15 @@ msgid "_Information"
 msgstr "_Informació"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Preferències"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Configureu un contacte."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Seleccioneu un contacte..."
 
@@ -1277,23 +1673,24 @@ msgstr "Presència"
 msgid "Set your own presence"
 msgstr "Establiu la vostra presència"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
-msgstr "No connecits en iniciar"
+msgstr "No connectis en iniciar"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "No mostris la llista de contactes en iniciar"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Mostra el diàleg dels comptes"
 
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
-msgstr "- Missatgeria instantània Empathy"
+#: ../src/empathy.c:587
+#, fuzzy
+msgid "- Empathy IM Client"
+msgstr "%s - Trucada de l'Empathy"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1305,7 +1702,7 @@ msgstr ""
 "per la Free Software Foundation; bé sota la versió 2 de la Llicència o bé "
 "(si ho preferiu) sota qualsevol versió posterior."
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1317,7 +1714,7 @@ msgstr ""
 "PER UN PROPÒSIT PARTICULAR.  Vegeu la Llicència Pública General GNU per "
 "obtenir-ne més detalls."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "
@@ -1327,32 +1724,31 @@ msgstr ""
 "juntament amb l'Empathy; en cas contrari, escriviu a la Free Software "
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un client de missatgeria instantània per al GNOME"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "Jordi Mallach <jordi@sindominio.net>\n"
 "Gil Forcada  <gilforcada@guifi.net>"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Comptes"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Compte de %s nou"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1361,7 +1757,7 @@ msgstr ""
 "Esteu a punt de suprimir el compte %s.\n"
 "Segur que voleu continuar?"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1375,31 +1771,35 @@ msgstr ""
 "Si decidiu tornar a afegir el compte més endavant, encara estaran "
 "disponibles."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Compte nou</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>No hi ha cap protocol instal·lat</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Paràmetres</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+#, fuzzy
+msgid "Add Account"
+msgstr "Compte"
 
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "Cr_ea"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "Ja tinc un compte i el vull utilitzar"
+#: ../src/empathy-accounts-dialog.ui.h:4
+#, fuzzy
+msgid "Gmail"
+msgstr "Correu electrònic:"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "Importació de comptes..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+#, fuzzy
+msgid "No protocol installed"
+msgstr "<b>No hi ha cap protocol instal·lat</b>"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+#, fuzzy
+msgid "Settings"
+msgstr "<b>Paràmetres</b>"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1407,272 +1807,259 @@ msgstr ""
 "Per a afegir un compte nou, primer heu d'instal·lar el rerefons de cada "
 "protocol que vulgueu utilitzar."
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "Tipus:"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-accounts-dialog.ui.h:10
+#, fuzzy
+msgid "_Add..."
+msgstr "_Afegeix"
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+#, fuzzy
+msgid "_Create a new account"
+msgstr "Crea una xarxa d'IRC nova"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+#, fuzzy
+msgid "_Reuse an existing account"
+msgstr "S'està registrant el compte"
+
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "Contrast"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "Brillantor"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "Volum"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "S'està connectant..."
+
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "Marcador"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "Entrada d'àudio"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "S'està connectant..."
-
-#: ../src/empathy-call-window.c:572
+#: ../src/empathy-call-window.c:866
 #, c-format
-msgid "Connected -- %d:%02dm"
+msgid "Call with %s"
+msgstr ""
+
+#: ../src/empathy-call-window.c:935
+#, fuzzy
+msgid "Call"
+msgstr "Tru_ca"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1387
+#, fuzzy, c-format
+msgid "Connected — %d:%02dm"
 msgstr "Connectat -- %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "Penja"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "Envia àudio"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "Envia vídeo"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "Previsualització de vídeo"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "Tru_ca"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Converses (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Tema:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "S'està teclejant un missatge."
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
-#, c-format
-msgid "New message from %s"
-msgstr "Missatge nou de %s"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "_Neteja"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
 msgid "Chat"
 msgstr "Xat"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Insereix una e_moticona"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "_Missatge d'invitació:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Convida"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
 msgstr "Mou la pestanya a l'_esquerra"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
 msgstr "Mou la pestanya a la d_reta"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Seleccioneu qui voleu convidar:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Us han convidat a unir-vos a una conferència de xat."
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
 msgid "_Contact"
 msgstr "_Contacte"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "_Continguts"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
 msgstr "_Conversa"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
 msgstr "D_esenganxa la pestanya"
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Favorite Chatroom"
 msgstr "Sala de xat _preferida"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
 msgstr "Pestanya següe_nt"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Previous Tab"
 msgstr "_Pestanya anterior"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "_Mostra la llista de contactes"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
 msgstr "Pes_tanyes"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "Sala"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "Connecta automàticament"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Edita la sala preferida"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Uneix-me a la sala en _iniciar"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr ""
-"Uniu-vos a aquesta sala de xat quan s'iniciï l'Empathy i estigueu connectat"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "Gestiona les sales preferides"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "N_om:"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "S_ervidor:"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "Sa_la:"
-
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Trucada entrant"
 
-#: ../src/empathy-event-manager.c:375
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s us està trucant, voleu contestar?"
 
-#: ../src/empathy-event-manager.c:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "_Refusa"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_Contesta"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Trucada entrant de %s"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s us ofereix una invitació"
 
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "S'iniciarà una aplicació externa per a gestionar-la."
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "No teniu l'aplicació externa necessària per a gestionar-la."
 
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Invitació a la sala"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s us convida a entrar a %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "_Declina"
 
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Uneix-m'hi"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s us ha convidat a entrar a %s"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferència de fitxers entrant de %s"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Sol·licitud de subscripció de %s"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1681,174 +2068,148 @@ msgstr ""
 "\n"
 "Missatge: %s"
 
-#: ../src/empathy-ft-manager.c:113
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, fuzzy, c-format
+msgid "%s is now offline."
+msgstr "%s s'ha desconnectat"
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, fuzzy, c-format
+msgid "%s is now online."
+msgstr "%s s'ha connectat"
+
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-msgid "No reason was specified"
-msgstr "No s'ha especificat el motiu"
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "S'ha demanat el canvi d'estat"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "Heu cancel·lat la transferència del fitxer"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "L'interlocutor ha cancel·lat la transferència del fitxer"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "Error while trying to transfer the file"
-msgstr "S'ha produït un error en enviar el fitxer"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Desconegut"
 
-#: ../src/empathy-ft-manager.c:174
-msgid "The other participant is unable to transfer the file"
-msgstr "L'interlocutor no pot enviar el fitxer"
+#: ../src/empathy-ft-manager.c:275
+#, fuzzy, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s de %s"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "Motiu desconegut"
+#: ../src/empathy-ft-manager.c:276
+#, 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:224
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "S'està rebent «%s» de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "S'està enviant «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:237
-msgctxt "file size"
-msgid "Unknown"
-msgstr "Desconegut"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, fuzzy, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "S'està rebent «%s» de %s"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:245
-#, c-format
-msgid "%s of %s"
-msgstr "%s de %s"
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:252
-msgid "Waiting the other participant's response"
-msgstr "S'està esperant que l'interlocutor respongui"
+#: ../src/empathy-ft-manager.c:348
+#, fuzzy, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "S'està enviant «%s» a %s"
+
+#: ../src/empathy-ft-manager.c:351
+#, fuzzy
+msgid "Error sending a file"
+msgstr "S'ha produït un error en enviar el missatge «%s»: %s"
 
-#: ../src/empathy-ft-manager.c:262
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "S'ha rebut «%s» de %s"
 
-#: ../src/empathy-ft-manager.c:268
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "S'ha enviat «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "S'ha completat la transferència"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "S'està rebent «%s» de %s"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#, fuzzy
+msgid "Waiting for the other participant's response"
+msgstr "S'està esperant que l'interlocutor respongui"
 
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "S'està enviant «%s» a %s"
+msgid "Checking integrity of \"%s\""
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:289
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "S'ha cancel·lat la transferència del ftixer: %s"
-
-#: ../src/empathy-ft-manager.c:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "Desconegut"
-
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Desconegut"
+msgid "Hashing \"%s\""
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "Fitxer"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "Restant"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "No es pot desar el fitxer en aquesta ubicació"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "Anomena i desa el fitxer..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "mida desconeguda"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s vol enviar-vos un fitxer"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "Voleu acceptar el fitxer? «%s» (%s)?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "_Accepta"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+#, fuzzy
+msgid "File Transfers"
 msgstr "Transferències de fitxers"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Treu de la llista les transferències de fitxers completades, cancel·lades i "
 "fallades"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Importa"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Font"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1856,138 +2217,211 @@ msgstr ""
 "No s'han trobat comptes per a importar. L'Empathy de moment només pot "
 "importar comptes del Pidgin."
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "Importa els comptes"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "_Edita el compte"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "No s'ha especificat l'error"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Error de la xarxa"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Error de xifratge"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Nom utilitzat"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "No s'ha proporcionat el certificat"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "El certificat no és de confiança"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "El certificat ha expirat"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "El certificat no està activat"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "No coincideix el nom de la màquina del certificat"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "No coincideix l'empremta digital del certificat"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Certificat signat per un mateix"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Error en el certificat"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Mostra i edita els comptes"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "Contacte"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "_Edita el compte"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Llista de contactes"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Context"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "Uneix-te als _preferits"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Uneix-me a un _nou/nova..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Gestiona els preferits"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "M_ostra els contactes desconnectats"
+#: ../src/empathy-main-window.ui.h:6
+#, fuzzy
+msgid "N_ormal Size"
+msgstr "Normal"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+msgid "Sort by _Name"
+msgstr "Ordena per _nom"
+
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+msgid "Sort by _Status"
+msgstr "Ordena per es_tat"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "_Comptes"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "_Afegeix un contacte..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr ""
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:17
+#, fuzzy
+msgid "_File Transfers"
+msgstr "Transferències de fitxers"
+
+#: ../src/empathy-main-window.ui.h:19
+#, fuzzy
+msgid "_Join..."
+msgstr "_Uneix-m'hi"
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "Conversa _nova..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+#, fuzzy
+msgid "_Offline Contacts"
+msgstr "M_ostra els contactes desconnectats"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "Informació _personal"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+#, fuzzy
+msgid "_Previous Conversations"
+msgstr "Converses anteriors"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
-msgstr "Sales de xat"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
+msgstr "Sala de xat"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Navega:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+#, fuzzy
+msgid "Members"
+msgstr "Membre"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\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
+#, fuzzy
+msgid "Yes"
+msgstr "_Sí"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+#, fuzzy
+msgid "No"
+msgstr "_No"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+#, fuzzy
+msgid "Couldn't load room list"
+msgstr "Seleccioneu de la llista:"
+
+#: ../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 ""
 "Introduïu el nom de la sala a la qual us voleu unir o feu clic en una o més "
 "sales de la llista."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../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"
@@ -1995,185 +2429,210 @@ msgstr ""
 "Introduïu el servidor que hostatja la sala, o deixeu-ho en blanc si la sala "
 "és en el servidor del compte actual"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Uneix-te"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Uneix-te a un nou"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#, fuzzy
+msgid "Join Room"
+msgstr "Sala"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "Ac_tualitza"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#, fuzzy
+msgid "Room List"
+msgstr "Sales"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr ""
-"Aquesta llista representa totes les sales de xat hostatjades al servidor que "
-"heu introduït."
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "Sa_la:"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "Missatge rebut"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "Missatge enviat"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "Conversa nova"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "El contacte s'ha connectat"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "El contacte s'ha desconnectat"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "Compte connectat"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "Compte desconnectat"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "Llengua"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Aparença</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Comportament</b>"
-
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Llista de contactes</b>"
-
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Habilita la verificació ortogràfica per a les llengües:</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Reprodueix un so pels esdeveniments</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
 msgstr ""
-"<small>La llista de llengües només reflecteix les llengües per a les quals "
-"teniu un diccionari instal·lat.</small>"
 
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:4
+#, fuzzy
+msgid "Appearance"
+msgstr "<b>Aparença</b>"
+
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "_Connecta automàticament en iniciar "
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr ""
-"Els avatar són imatges seleccionades per l'usuari que es mostren a la llista "
-"de contactes"
+#: ../src/empathy-preferences.ui.h:6
+#, fuzzy
+msgid "Behavior"
+msgstr "<b>Comportament</b>"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "T_ema de xat:"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "Inhabilita les notificacions quan s'està _absent o ocupat"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "Inhabilita els sons quan s'està _absent o ocupat"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+#, fuzzy
+msgid "Enable notifications when a contact comes online"
+msgstr "Habilita les notificacions quan el _xat no tingui el focus"
+
+#: ../src/empathy-preferences.ui.h:11
+#, fuzzy
+msgid "Enable notifications when a contact goes offline"
+msgstr "Habilita les notificacions quan el _xat no tingui el focus"
+
+#: ../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.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+#, fuzzy
+msgid "Enable spell checking for languages:"
+msgstr "<b>Habilita la verificació ortogràfica per a les llengües:</b>"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "General"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+#, fuzzy
+msgid "Location"
+msgstr "Ubicació:"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Notificacions"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+#, fuzzy
+msgid "Play sound for events"
+msgstr "<b>Reprodueix un so pels esdeveniments</b>"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "Mostra els av_atars"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:21
+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.glade.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Mo_stra les emoticones com a imatges"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "_Mostra la llista de contactes compacta"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "Ordena per _nom"
-
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "Ordena per es_tat"
+#: ../src/empathy-preferences.ui.h:23
+#, fuzzy
+msgid "Show contact _list in rooms"
+msgstr "_Mostra la llista de contactes"
 
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Verificació ortogràfica"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+#, fuzzy
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"<small>La llista de llengües només reflecteix les llengües per a les quals "
+"teniu un diccionari instal·lat.</small>"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Temes"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "_Habilita les notificacions"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "_Habilita les notificacions de so"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Obre xats nous en finestres separades"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr ""
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "Estat"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "_Surt"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Mostra la llista de contactes"
-
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
-msgstr "No s'ha pogut iniciar l'aplicació per al sevei %s: %s"
+msgstr "No s'ha pogut iniciar l'aplicació per al servei %s: %s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:446
 #, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
@@ -2182,6 +2641,260 @@ msgstr ""
 "Heu rebut una invitació del servei %s, però no teniu l'aplicació necessària "
 "per a gestionar-la"
 
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+#, fuzzy
+msgid "Contact Map View"
+msgstr "Llista de contactes"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Error"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#, fuzzy
+msgid "Critical"
+msgstr "Croat"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#, fuzzy
+msgid "Warning"
+msgstr "Treballant"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+#, fuzzy
+msgid "Message"
+msgstr "Missatge:"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#, fuzzy
+msgid "Info"
+msgstr "Obté _informació"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:845
+#, fuzzy
+msgid "Save"
+msgstr "Surt"
+
+#: ../src/empathy-debug-dialog.c:948
+#, fuzzy
+msgid "Debug Window"
+msgstr "Com _finestres"
+
+#: ../src/empathy-debug-dialog.c:1021
+#, fuzzy
+msgid "Pause"
+msgstr "_Enganxa"
+
+#: ../src/empathy-debug-dialog.c:1033
+#, fuzzy
+msgid "Level "
+msgstr "Surt"
+
+#: ../src/empathy-debug-dialog.c:1102
+#, fuzzy
+msgid "Time"
+msgstr "Simple"
+
+#: ../src/empathy-debug-dialog.c:1104
+#, fuzzy
+msgid "Domain"
+msgstr "Romanès"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1108
+#, fuzzy
+msgid "Level"
+msgstr "Surt"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Missatgeria instantània Empathy"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Oblida la contrasenya i neteja el camp."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Xarxa</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Servidors</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Edita la xarxa d'IRC nova seleccionada"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Suprimeix la xarxa IRC seleccionada"
+
+#~ 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"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informació del contacte"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Voldria afegir-te a la meva llista de contactes."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Ho sento, no et vull més a la meva llista de contactes."
+
+#~ msgid "<b>Contact</b>"
+#~ msgstr "<b>Contacte</b>"
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Grups</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "Informació del contacte"
+
+#~ msgid "Word"
+#~ msgstr "Paraula"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Suggeriments per a la paraula"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Verificador ortogràfic"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Suggeriments per a la paraula:"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Missatgeria instantània Empathy"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Compte nou</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "Ja tinc un compte i el vull utilitzar"
+
+#~ msgid "New message from %s"
+#~ msgstr "Missatge nou de %s"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "_Missatge d'invitació:"
+
+#~ msgid "Invite"
+#~ msgstr "Convida"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Seleccioneu qui voleu convidar:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Us han convidat a unir-vos a una conferència de xat."
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Edita la sala preferida"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "Uneix-me a la sala en _iniciar"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr ""
+#~ "Uniu-vos a aquesta sala de xat quan s'iniciï l'Empathy i estigueu "
+#~ "connectat"
+
+#~ msgid "N_ame:"
+#~ msgstr "N_om:"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_ervidor:"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "Desconegut"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "S'està rebent «%s» de %s"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "S'està enviant «%s» a %s"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "S'ha cancel·lat la transferència del fitxer: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "Desconegut"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "No es pot desar el fitxer en aquesta ubicació"
+
+#~ msgid "Save file as..."
+#~ msgstr "Anomena i desa el fitxer..."
+
+#~ msgid "unknown size"
+#~ msgstr "mida desconeguda"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s vol enviar-vos un fitxer"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "Voleu acceptar el fitxer? «%s» (%s)?"
+
+#~ msgid "_Accept"
+#~ msgstr "_Accepta"
+
+#~ msgid "Join _New..."
+#~ msgstr "Uneix-me a un _nou/nova..."
+
+#~ msgid "Chat Rooms"
+#~ msgstr "Sales de xat"
+
+#~ msgid "Browse:"
+#~ msgstr "Navega:"
+
+#~ msgid "Join"
+#~ msgstr "Uneix-te"
+
+#~ msgid "Join New"
+#~ msgstr "Uneix-te a un nou"
+
+#~ msgid "Re_fresh"
+#~ msgstr "Ac_tualitza"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr ""
+#~ "Aquesta llista representa totes les sales de xat hostatjades al servidor "
+#~ "que heu introduït."
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Llista de contactes</b>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr ""
+#~ "Els avatar són imatges seleccionades per l'usuari que es mostren a la "
+#~ "llista de contactes"
+
+#~ 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"
 
@@ -2202,18 +2915,9 @@ msgstr ""
 #~ msgid "Closing this window will end the call in progress."
 #~ msgstr "Si tanqueu aquesta finestra finalitzareu la trucada actual."
 
-#~ msgid "_End Call"
-#~ msgstr "_Finalitza la trucada"
-
-#~ msgid "Empathy Call"
-#~ msgstr "Trucada de l'Empathy"
-
 #~ msgid "Readying"
 #~ msgstr "S'està marcant"
 
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - Trucada de l'Empathy"
-
 #~ msgid "Ringing"
 #~ msgstr "Trucant"
 
@@ -2268,17 +2972,9 @@ msgstr ""
 #~ msgstr "<b>Volum</b>"
 
 #, fuzzy
-#~ msgid "gtk-clear"
-#~ msgstr "gtk-close"
-
-#, fuzzy
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-close"
 
-#, fuzzy
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-copy"
-
 #~ msgid "Enable sound when busy"
 #~ msgstr "Habilita els sons quan s'està ocupat"
 
@@ -2348,10 +3044,6 @@ msgstr ""
 #~ msgstr "Comptes"
 
 #, fuzzy
-#~ msgid "Contact does not support voice"
-#~ msgstr "Criteri d'ordenació de la llista de contactes"
-
-#, fuzzy
 #~ msgid "Lowmem"
 #~ msgstr "Casa"
 
@@ -2446,27 +3138,15 @@ msgstr ""
 #~ msgid "gtk-quit"
 #~ msgstr "gtk-quit"
 
-#~ msgid "<b>Options</b>"
-#~ msgstr "<b>Opcions</b>"
-
 #~ msgid "_Use for chat rooms"
 #~ msgstr "_Utilitza a les sales de xat"
 
-#~ msgid "%s went offline"
-#~ msgstr "%s s'ha desconnectat"
-
-#~ msgid "%s has come online"
-#~ msgstr "%s s'ha connectat"
-
 #~ msgid "Cu_t"
 #~ msgstr "Re_tall"
 
 #~ msgid "_Copy"
 #~ msgstr "_Copia"
 
-#~ msgid "_Paste"
-#~ msgstr "_Enganxa"
-
 #~ msgid "Use encryption (SS_L)"
 #~ msgstr "Utilitza el xifrat (SS_L)"
 
@@ -2478,9 +3158,6 @@ msgstr ""
 #~ msgstr[0] "Missatge nou"
 #~ msgstr[1] "Missatges nous"
 
-#~ msgid "Chat Room"
-#~ msgstr "Sala de xat"
-
 #~ msgid "_New Message..."
 #~ msgstr "_Nou missatge..."
 
@@ -2503,18 +3180,12 @@ msgstr ""
 #~ "les transferències de fitxers sense haver de preguntar a l'usuari cada "
 #~ "vegada."
 
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
 #~ msgid "Active"
 #~ msgstr "Actiu"
 
 #~ msgid "Inactive"
 #~ msgstr "Inactiu"
 
-#~ msgid "Error"
-#~ msgstr "Error"
-
 #~ msgid "Moderator"
 #~ msgid_plural "Moderators"
 #~ msgstr[0] "Moderador"
@@ -2543,11 +3214,6 @@ msgstr ""
 #~ msgstr[0] "Administrador"
 #~ msgstr[1] "Administradors"
 
-#~ msgid "Member"
-#~ msgid_plural "Members"
-#~ msgstr[0] "Membre"
-#~ msgstr[1] "Menbres"
-
 #~ msgid ""
 #~ "The chat room you tried to join requires a password. You either failed to "
 #~ "supply a password or the password you tried was incorrect."
@@ -2665,9 +3331,6 @@ msgstr ""
 #~ msgid "A protocol error occurred during the transfer"
 #~ msgstr "S'ha produït un error de protocol durant la transferència"
 
-#~ msgid "Unable to connect to the other party"
-#~ msgstr "No s'ha pogut connectar a l'altra part"
-
 #~ msgid "File name is too long"
 #~ msgstr "El nom del fitxer és massa llarg"
 
@@ -2835,9 +3498,6 @@ msgstr ""
 #~ msgid "The other user decided not to continue."
 #~ msgstr "L'altre usuari ha decidit no continuar."
 
-#~ msgid "File transfer is not supported by both parties."
-#~ msgstr "La transferència de fitxers no està suportada pels dos usuaris."
-
 #~ msgid "An unknown error occurred during file transfer."
 #~ msgstr ""
 #~ "S'ha produït un error desconegut durant la transferència del fitxer."
@@ -2912,9 +3572,6 @@ msgstr ""
 #~ msgid "Create"
 #~ msgstr "Crea"
 
-#~ msgid "Rooms"
-#~ msgstr "Sales"
-
 #~ msgid "Users"
 #~ msgstr "Usuaris"
 
@@ -3015,9 +3672,6 @@ msgstr ""
 #~ msgid "_Kick..."
 #~ msgstr "E_xpulsa..."
 
-#~ msgid "Location:"
-#~ msgstr "Ubicació:"
-
 #~ msgid "Name:"
 #~ msgstr "Nom:"
 
@@ -3091,9 +3745,6 @@ msgstr ""
 #~ msgid "Contact List - Gossip"
 #~ msgstr "_Mostra la llista de contactes"
 
-#~ msgid "Country:"
-#~ msgstr "Estat:"
-
 #~ msgid "Edit Contact"
 #~ msgstr "Edita el contacte"
 
@@ -3197,9 +3848,6 @@ msgstr ""
 #~ msgid "_Deny"
 #~ msgstr "_Denega"
 
-#~ msgid "_Description:"
-#~ msgstr "_Descripció:"
-
 #~ msgid "_Disconnect"
 #~ msgstr "_Desconnecta"
 
@@ -3300,9 +3948,6 @@ msgstr ""
 #~ msgid "Favourite"
 #~ msgstr "Favorit"
 
-#~ msgid "Registering account"
-#~ msgstr "S'està registrant el compte"
-
 #~ msgid "Example"
 #~ msgstr "Exemple"
 
@@ -3519,15 +4164,9 @@ msgstr ""
 #~ msgid "_Group Chat"
 #~ msgstr "Xat en _grup"
 
-#~ msgid "_No"
-#~ msgstr "_No"
-
 #~ msgid "_Search..."
 #~ msgstr "_Cerca..."
 
-#~ msgid "_Yes"
-#~ msgstr "_Sí"
-
 #~ msgid "Preset status messages."
 #~ msgstr "Missatges d'estat preestablerts."
 
@@ -3683,9 +4322,6 @@ msgstr ""
 #~ msgid "Azerbaijani"
 #~ msgstr "Àzeri"
 
-#~ msgid "Belarusian"
-#~ msgstr "Bielorús"
-
 #~ msgid "Bulgarian"
 #~ msgstr "Búlgar"
 
@@ -4117,9 +4753,6 @@ msgstr ""
 #~ msgid "Choose a Server"
 #~ msgstr "Seleccioneu un servidor"
 
-#~ msgid "Choose from list:"
-#~ msgstr "Seleccioneu de la llista:"
-
 #~ msgid "Configure Transport"
 #~ msgstr "Configura el transport"
 
@@ -4212,9 +4845,6 @@ msgstr ""
 #~ msgid "R_emove"
 #~ msgstr "_Elimina"
 
-#~ msgid "_Add"
-#~ msgstr "_Afegeix"
-
 #~ msgid "<b>Preset status messages</b>"
 #~ msgstr "<b>Missatges d'estat preestablerts</b>"
 
@@ -4298,9 +4928,6 @@ msgstr ""
 #~ msgid "Enter the new message:"
 #~ msgstr "Introduïu el nou missatge:"
 
-#~ msgid "Leave"
-#~ msgstr "Surt"
-
 #~ msgid "New Status Message"
 #~ msgstr "Nou missatge d'estat"
 
@@ -4325,9 +4952,6 @@ msgstr ""
 #~ msgid "New Away Message"
 #~ msgstr "Nou missatge d'absència"
 
-#~ msgid "Working"
-#~ msgstr "Treballant"
-
 #~ msgid "Eating"
 #~ msgstr "Menjant"
 
@@ -4344,9 +4968,6 @@ msgstr ""
 #~ "Nota: els contactes poden estar en múltiples grups o poden no estar en "
 #~ "cap grup."
 
-#~ msgid "As _Windows"
-#~ msgstr "Com _finestres"
-
 #~ msgid "As a _List"
 #~ msgstr "Com una _llista"
 
@@ -4400,9 +5021,6 @@ msgstr ""
 #~ msgid "Others"
 #~ msgstr "Altres"
 
-#~ msgid "Get _Info"
-#~ msgstr "Obté _informació"
-
 #~ msgid "I'm here"
 #~ msgstr "Estic ací"
 
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
new file mode 100644
index 000000000..55225b248
--- /dev/null
+++ b/po/ca@valencia.po
@@ -0,0 +1,2873 @@
+# translation of empathy.gnome-2-26.po to catalan
+# Catalan translation for Empathy
+# Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
+# Carles Ferrando Garcia <carles.ferrando@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: empathy.gnome-2-26\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-09 11:17+0200\n"
+"PO-Revision-Date: 2009-08-07 09:32+0200\n"
+"Last-Translator: Carles Ferrando Garcia <carles.ferrando@gmail.com>\n"
+"Language-Team: catalan <tradgnome@softcatala.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: KBabel 1.11.4\n"
+
+#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy IM Client"
+msgstr ""
+
+#: ../data/empathy.desktop.in.in.h:2
+#, fuzzy
+msgid "Send and receive messages"
+msgstr "Envia i rep missatges instantanis"
+
+#: ../data/empathy.schemas.in.h:1
+msgid "Always open a separate chat window for new chats."
+msgstr "Obri sempre una finestra de xat separada per a xats nous."
+
+#: ../data/empathy.schemas.in.h:2
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Caràcter que s'afegirà després del sobrenom quan s'utilitze la compleció de "
+"sobrenom (tabulació) en els xats de grup."
+
+#: ../data/empathy.schemas.in.h:3
+msgid "Chat window theme"
+msgstr "Tema de la finestra de xat"
+
+#: ../data/empathy.schemas.in.h:4
+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/empathy.schemas.in.h:5
+msgid "Compact contact list"
+msgstr "Llista de contactes compacta"
+
+#: ../data/empathy.schemas.in.h:6
+msgid "Contact list sort criterium"
+msgstr "Criteri d'ordenació de la llista de contactes"
+
+#: ../data/empathy.schemas.in.h:7
+msgid "Default directory to select an avatar image from"
+msgstr "El directori predeterminat des d'on seleccionar una imatge d'avatar"
+
+#: ../data/empathy.schemas.in.h:8
+msgid "Disable popup notifications when away"
+msgstr "Inhabilita les notificacions quan s'estiga absent"
+
+#: ../data/empathy.schemas.in.h:9
+msgid "Disable sounds when away"
+msgstr "Inhabilita els sons quan s'estiga absent"
+
+#: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:14
+msgid "Empathy default download folder"
+msgstr "Carpeta predeterminada de les baixades de l'Empathy"
+
+#: ../data/empathy.schemas.in.h:15
+msgid "Empathy has asked about importing accounts"
+msgstr "Si l'Empathy ha preguntat sobre la importació de comptes"
+
+#: ../data/empathy.schemas.in.h:16
+msgid "Empathy should auto-connect on startup"
+msgstr "Fes que l'Empathy es connecte automàticament en iniciar-se"
+
+#: ../data/empathy.schemas.in.h:17
+#, fuzzy
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Fes que l'Empathy es connecte automàticament en iniciar-se"
+
+#: ../data/empathy.schemas.in.h:18
+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/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
+msgid "Enable popup notifications for new messages"
+msgstr "Habilita les notificacions per als missatges nous"
+
+#: ../data/empathy.schemas.in.h:21
+msgid "Enable spell checker"
+msgstr "Habilita el verificador ortogràfic"
+
+#: ../data/empathy.schemas.in.h:22
+msgid "Hide main window"
+msgstr "Oculta la finestra principal"
+
+#: ../data/empathy.schemas.in.h:23
+msgid "Hide the main window."
+msgstr "Oculta la finestra principal."
+
+#: ../data/empathy.schemas.in.h:24
+msgid "NetworkManager should be used"
+msgstr "S'hauria d'utilitzar el NetworkManager"
+
+#: ../data/empathy.schemas.in.h:25
+msgid "Nick completed character"
+msgstr "Caràcter de compleció de sobrenom"
+
+#: ../data/empathy.schemas.in.h:26
+msgid "Open new chats in separate windows"
+msgstr "Obri les finestres de xat noves en finestres separades"
+
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:28
+#, fuzzy
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "Si s'ha d'utilitzar el tema per a les sales de xat."
+
+#: ../data/empathy.schemas.in.h:29
+msgid "Play a sound for incoming messages"
+msgstr "Reprodueix un so quan arriben missatges"
+
+#: ../data/empathy.schemas.in.h:30
+msgid "Play a sound for new conversations"
+msgstr "Reprodueix un so per a les converses noves"
+
+#: ../data/empathy.schemas.in.h:31
+msgid "Play a sound for outgoing messages"
+msgstr "Reprodueix un so per als missatges d'eixida"
+
+#: ../data/empathy.schemas.in.h:32
+msgid "Play a sound when a contact logs in"
+msgstr "Reprodueix un so quan entre algun contacte"
+
+#: ../data/empathy.schemas.in.h:33
+msgid "Play a sound when a contact logs out"
+msgstr "Reprodueix un so si un contacte ix"
+
+#: ../data/empathy.schemas.in.h:34
+msgid "Play a sound when we log in"
+msgstr "Reprodueix un so en entrar"
+
+#: ../data/empathy.schemas.in.h:35
+msgid "Play a sound when we log out"
+msgstr "Reprodueix un so en eixir"
+
+#: ../data/empathy.schemas.in.h:36
+msgid "Popup notifications if the chat isn't focused"
+msgstr "Mostra notificacions si el xat no té el focus"
+
+#: ../data/empathy.schemas.in.h:37
+#, fuzzy
+msgid "Popup notifications when a contact sign in"
+msgstr "Mostra notificacions si el xat no té el focus"
+
+#: ../data/empathy.schemas.in.h:38
+#, fuzzy
+msgid "Popup notifications when a contact sign out"
+msgstr "Mostra notificacions si el xat no té el focus"
+
+#: ../data/empathy.schemas.in.h:39
+msgid "Salut account is created"
+msgstr "S'ha creat el compte del Salut"
+
+#: ../data/empathy.schemas.in.h:40
+msgid "Show avatars"
+msgstr "Mostra els avatars"
+
+#: ../data/empathy.schemas.in.h:41
+#, fuzzy
+msgid "Show contact list in rooms"
+msgstr "_Mostra la llista de contactes"
+
+#: ../data/empathy.schemas.in.h:42
+msgid "Show hint about closing the main window"
+msgstr "Mostra un consell sobre tancar la finestra principal"
+
+#: ../data/empathy.schemas.in.h:43
+msgid "Show offline contacts"
+msgstr "Mostra els contactes desconnectats"
+
+#: ../data/empathy.schemas.in.h:44
+msgid "Spell checking languages"
+msgstr "Llengües per a la verificació ortogràfica"
+
+#: ../data/empathy.schemas.in.h:45
+msgid "The default folder to save file transfers in."
+msgstr "La carpeta predeterminada on s'alçaran els fitxers transferits."
+
+#: ../data/empathy.schemas.in.h:46
+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/empathy.schemas.in.h:47
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr ""
+"El tema que s'utilitza per a mostrar la conversa a les finestres de xat."
+
+#: ../data/empathy.schemas.in.h:48
+msgid "Use graphical smileys"
+msgstr "Utilitza emoticones gràfiques"
+
+#: ../data/empathy.schemas.in.h:49
+msgid "Use notification sounds"
+msgstr "Utilitza sons de notificació"
+
+#: ../data/empathy.schemas.in.h:50
+msgid "Use theme for chat rooms"
+msgstr "Usa el tema per a les sales de xat"
+
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+#, fuzzy
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr ""
+"Si s'han de mostrar els contactes que estan desconnectats a la llista de "
+"contactes."
+
+#: ../data/empathy.schemas.in.h:53
+#, fuzzy
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr ""
+"Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
+"de xat."
+
+#: ../data/empathy.schemas.in.h:54
+#, fuzzy
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr ""
+"Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
+"de xat."
+
+#: ../data/empathy.schemas.in.h:55
+#, fuzzy
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr ""
+"Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
+"de xat."
+
+#: ../data/empathy.schemas.in.h:56
+msgid ""
+"Whether or not Empathy has asked about importing accounts from other "
+"programs."
+msgstr ""
+"Si l'Empathy ha preguntat si es volen importar els comptes d'altres "
+"programes."
+
+#: ../data/empathy.schemas.in.h:57
+msgid ""
+"Whether or not Empathy should automatically log in to your accounts on "
+"startup."
+msgstr "Si l'Empathy ha d'entrar en els comptes automàticament en iniciar-se."
+
+#: ../data/empathy.schemas.in.h:58
+#, fuzzy
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr ""
+"Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
+"de xat."
+
+#: ../data/empathy.schemas.in.h:59
+msgid ""
+"Whether or not 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/empathy.schemas.in.h:60
+msgid ""
+"Whether or not 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."
+
+#: ../data/empathy.schemas.in.h:61
+msgid ""
+"Whether or not the network manager should be used to automatically "
+"disconnect/reconnect."
+msgstr ""
+"Si s'hauria d'utilitzar el gestor de xarxa per a desconnectar/tornar a "
+"connectar automàticament."
+
+#: ../data/empathy.schemas.in.h:62
+msgid ""
+"Whether or not to check words typed against the languages you want to check "
+"with."
+msgstr ""
+"Si s'han de verificar les paraules introduïdes comparant-les les llengües "
+"escollides per a la verificació ortogràfica."
+
+#: ../data/empathy.schemas.in.h:63
+msgid ""
+"Whether or not to convert smileys into graphical images in conversations."
+msgstr ""
+"Si s'han de convertir les emoticones a imatges gràfiques a les converses."
+
+#: ../data/empathy.schemas.in.h:64
+msgid ""
+"Whether or not to play a sound to notify for contacts logging in the network."
+msgstr ""
+"Si s'ha de reproduir un so per a notificar que els contactes entren a la "
+"xarxa."
+
+#: ../data/empathy.schemas.in.h:65
+msgid ""
+"Whether or not to play a sound to notify for contacts logging off the "
+"network."
+msgstr ""
+"Si s'ha de reproduir un so per a notificar que els contactes ixen de la "
+"xarxa."
+
+#: ../data/empathy.schemas.in.h:66
+msgid "Whether or not to play a sound to notify for events."
+msgstr "Si s'ha de reproduir un so per a notificar esdeveniments."
+
+#: ../data/empathy.schemas.in.h:67
+msgid "Whether or not to play a sound to notify for incoming messages."
+msgstr "Si s'ha de reproduir un so quan arriben missatges."
+
+#: ../data/empathy.schemas.in.h:68
+msgid "Whether or not to play a sound to notify for new conversations."
+msgstr "Si s'ha de reproduir un so quan s'inicien converses noves."
+
+#: ../data/empathy.schemas.in.h:69
+msgid "Whether or not to play a sound to notify for outgoing messages."
+msgstr "Si s'ha de reproduir un so quan s'envien missatges."
+
+#: ../data/empathy.schemas.in.h:70
+msgid "Whether or not to play a sound when logging in a network."
+msgstr "Si s'ha de reproduir un so quan s'entra a una xarxa."
+
+#: ../data/empathy.schemas.in.h:71
+msgid "Whether or not to play a sound when logging off a network."
+msgstr "Si s'ha de reproduir un so quan s'ix d'una xarxa."
+
+#: ../data/empathy.schemas.in.h:72
+msgid "Whether or not to play sound notifications when away or busy."
+msgstr "Si s'han de reproduir sons quan s'estiga absent o ocupat."
+
+#: ../data/empathy.schemas.in.h:73
+#, fuzzy
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "Si s'han de mostrar notificacions quan s'estiga absent o ocupat."
+
+#: ../data/empathy.schemas.in.h:74
+#, fuzzy
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "Si s'han de mostrar notificacions quan s'estiga absent o ocupat."
+
+#: ../data/empathy.schemas.in.h:75
+msgid ""
+"Whether or not to show a popup notification when receiving a new message "
+"even if the chat is already opened, but not focused."
+msgstr ""
+"Si s'han de mostrar notificacions quan es reba un esdeveniment de missatge "
+"nou i el xat ja estiga obert però no tinga el focus."
+
+#: ../data/empathy.schemas.in.h:76
+msgid ""
+"Whether or not to show a popup notification when receiving a new message."
+msgstr "Si s'ha de mostrar una notificació quan es reben missatges nous."
+
+#: ../data/empathy.schemas.in.h:77
+msgid ""
+"Whether or not 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/empathy.schemas.in.h:78
+msgid "Whether or not to show contacts that are offline in the contact list."
+msgstr ""
+"Si s'han de mostrar els contactes que estan desconnectats a la llista de "
+"contactes."
+
+#: ../data/empathy.schemas.in.h:79
+msgid "Whether or not to show popup notifications when away or busy."
+msgstr "Si s'han de mostrar notificacions quan s'estiga absent o ocupat."
+
+#: ../data/empathy.schemas.in.h:80
+#, fuzzy
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Si s'ha de mostrar la llista de contactes en mode compacte."
+
+#: ../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."
+msgstr ""
+"Si s'ha de mostrar el diàleg de missatge sobre tancar la finestra principal "
+"amb el botó «x» de la barra de títol."
+
+#: ../data/empathy.schemas.in.h:82
+msgid "Whether to show the contact list in compact mode or not."
+msgstr "Si s'ha de mostrar la llista de contactes en mode compacte."
+
+#: ../data/empathy.schemas.in.h:83
+msgid "Whether to use the theme for chat rooms or not."
+msgstr "Si s'ha d'utilitzar el tema per a les sales de xat."
+
+#: ../data/empathy.schemas.in.h:84
+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."
+msgstr ""
+"Quin criteri s'ha de fer servir quan s'ordena la llista de contactes. De "
+"manera predeterminada s'ordena pel nom del contacte amb el valor "
+"«name» (nom). Un valor «state» (estat) ordenarà la llista de contactes per "
+"estat."
+
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr ""
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
+msgid "People nearby"
+msgstr "Gent propera"
+
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "No s'ha especificat el motiu"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "S'ha demanat el canvi d'estat"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Heu cancel·lat la transferència del fitxer"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "L'interlocutor ha cancel·lat la transferència del fitxer"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "S'ha produït un error en enviar el fitxer"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "L'interlocutor no pot enviar el fitxer"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Motiu desconegut"
+
+#: ../libempathy/empathy-utils.c:265
+msgid "Available"
+msgstr "Disponible"
+
+#: ../libempathy/empathy-utils.c:267
+msgid "Busy"
+msgstr "Ocupat"
+
+#: ../libempathy/empathy-utils.c:270
+msgid "Away"
+msgstr "Absent"
+
+#: ../libempathy/empathy-utils.c:272
+msgid "Hidden"
+msgstr "Amagat"
+
+#: ../libempathy/empathy-utils.c:274
+msgid "Offline"
+msgstr "Desconnectat"
+
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
+msgid "All"
+msgstr "Tots"
+
+#: ../libempathy-gtk/empathy-account-widget.c:302
+#: ../libempathy-gtk/empathy-account-widget.c:354
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+#, fuzzy
+msgid "Advanced"
+msgstr "<b>Avançat</b>"
+
+#: ../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
+msgid "Pass_word:"
+msgstr "Con_trasenya:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "Screen _Name:"
+msgstr "_Nom en pantalla:"
+
+#: ../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
+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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
+msgid "_Server:"
+msgstr "_Servidor:"
+
+#: ../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
+msgid "Login I_D:"
+msgstr "I_D d'entrada:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "_Charset:"
+msgstr "Joc de _caràcters:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+msgid "New Network"
+msgstr "Xarxa nova"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Charset:"
+msgstr "Joc de caràcters:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network"
+msgstr "Xarxa"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Network:"
+msgstr "Xarxa:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Nickname:"
+msgstr "Sobrenom:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Quit message:"
+msgstr "Missatge de desconnexió:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+msgid "Real name:"
+msgstr "Nom real:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#, fuzzy
+msgid "Servers"
+msgstr "Servidor"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#, fuzzy
+msgid "Override server settings"
+msgstr "<b>Sobreescriu els paràmetres del servidor</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "Pri_ority:"
+msgstr "Pri_oritat:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "Reso_urce:"
+msgstr "Rec_urs:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+msgid "Use old SS_L"
+msgstr "Utilitza l'SS_L antic"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "_Encryption required (TLS/SSL)"
+msgstr "_Es requereix xifratge (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "_Ignore SSL certificate errors"
+msgstr "_Ignora els errors del certificat SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+msgid "_Email:"
+msgstr "Corr_eu electrònic:"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+msgid "_First Name:"
+msgstr "_Nom:"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+msgid "_Last Name:"
+msgstr "Co_gnoms:"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+msgid "_Nickname:"
+msgstr "Sobre_nom:"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+msgid "_Published Name:"
+msgstr "Nom _públic:"
+
+#. 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:3
+msgid "Discover STUN"
+msgstr "Descobreix l'STUN"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "STUN Server:"
+msgstr "Servidor STUN:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "STUN port:"
+msgstr "Port STUN:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "_Username:"
+msgstr "N_om d'usuari:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Use _Yahoo Japan"
+msgstr "Utilitza el _Yahoo del Japó"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+msgid "Yahoo I_D:"
+msgstr "I_D de Yahoo:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Ignore conference and chatroom invitations"
+msgstr "_Ignora les invitacions de conferència i sala de xat"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Room List locale:"
+msgstr "_Localització de la llista de la sala:"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+msgid "Couldn't convert image"
+msgstr "No s'ha pogut convertir la imatge"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+msgid "None of the accepted image formats is supported on your system"
+msgstr "El vostre sistema no sap gestionar cap dels formats d'imatge acceptats"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+msgid "Select Your Avatar Image"
+msgstr "Seleccioneu la vostra imatge d'avatar"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+msgid "No Image"
+msgstr "Cap imatge"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+msgid "Images"
+msgstr "Imatges"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+msgid "All Files"
+msgstr "Tots els fitxers"
+
+#: ../libempathy-gtk/empathy-avatar-image.c:324
+msgid "Click to enlarge"
+msgstr "Feu clic per a fer més gran"
+
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:412
+msgid "Unsupported command"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:548
+msgid "offline"
+msgstr "desconnectat"
+
+#: ../libempathy-gtk/empathy-chat.c:551
+msgid "invalid contact"
+msgstr "contacte no vàlid"
+
+#: ../libempathy-gtk/empathy-chat.c:554
+msgid "permission denied"
+msgstr "s'ha denegat el permís"
+
+#: ../libempathy-gtk/empathy-chat.c:557
+msgid "too long message"
+msgstr "el missatge és massa llarg"
+
+#: ../libempathy-gtk/empathy-chat.c:560
+msgid "not implemented"
+msgstr "no implementat"
+
+#: ../libempathy-gtk/empathy-chat.c:563
+msgid "unknown"
+msgstr "desconegut"
+
+#: ../libempathy-gtk/empathy-chat.c:567
+#, 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:597
+#, c-format
+msgid "Topic set to: %s"
+msgstr "Tema establit a: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:599
+msgid "No topic defined"
+msgstr "No s'ha definit cap tema"
+
+#: ../libempathy-gtk/empathy-chat.c:969
+msgid "(No Suggestions)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1023
+msgid "Insert Smiley"
+msgstr "Insereix una emoticona"
+
+#. send button
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
+msgid "_Send"
+msgstr "_Envia"
+
+#: ../libempathy-gtk/empathy-chat.c:1075
+msgid "_Spelling Suggestions"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1190
+#, fuzzy, c-format
+msgid "%s has disconnected"
+msgstr "S'ha desconnectat un contacte"
+
+#: ../libempathy-gtk/empathy-chat.c:1194
+#, c-format
+msgid "%s was kicked by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1197
+#, c-format
+msgid "%s was kicked"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid "%s has left the room"
+msgstr "%s ha eixit de 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:1218
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s ha entrat a la sala"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
+msgid "Disconnected"
+msgstr "Fora de línia"
+
+#: ../libempathy-gtk/empathy-chat.c:1809
+msgid "Connected"
+msgstr "Connectat"
+
+#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-log-window.c:502
+msgid "Conversation"
+msgstr "Conversa"
+
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Tema:"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
+msgid "_Copy Link Address"
+msgstr "_Copia l'adreça de l'enllaç"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
+msgid "_Open Link"
+msgstr "_Obri l'enllaç"
+
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
+msgid "%A %B %d %Y"
+msgstr "%A %B %d %Y"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+msgid "Edit Contact Information"
+msgstr "Edita la informació del contacte"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Informació personal"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+msgid "New Contact"
+msgstr "Contacte nou"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Decide _Later"
+msgstr "Ho _decidiré més tard"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "Subscription Request"
+msgstr "Sol·licitud de subscripció"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#, 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:1414
+msgid "Removing group"
+msgstr "S'està suprimint el grup"
+
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+msgid "_Remove"
+msgstr "_Suprimeix"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#, 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:1493
+msgid "Removing contact"
+msgstr "Suprimeix el contacte"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_Afig un contacte..."
+
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
+msgid "_Chat"
+msgstr "_Xat"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+#, fuzzy
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "Tru_ca"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+#, fuzzy
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "Tru_ca"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
+msgid "_View Previous Conversations"
+msgstr "_Visualitza les converses anteriors"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:346
+msgid "Send file"
+msgstr "Envia un fitxer"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
+msgid "Infor_mation"
+msgstr "Infor_mació"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+msgid "_Edit"
+msgstr "_Edita"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:501
+msgid "Inviting to this room"
+msgstr "S'està convidant a esta sala"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:532
+msgid "_Invite to chatroom"
+msgstr "_Convida a la sala de xat"
+
+#: ../libempathy-gtk/empathy-contact-selector.c:129
+msgid "Select a contact"
+msgstr "Seleccioneu un contacte"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:447
+msgid "Save Avatar"
+msgstr "Alça l'avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:503
+msgid "Unable to save avatar"
+msgstr "No s'ha pogut alçar l'avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+msgid "Select"
+msgstr "Selecciona"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
+msgid "Group"
+msgstr "Grup"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#, fuzzy
+msgid "Country:"
+msgstr "Compte:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#, fuzzy
+msgid "State:"
+msgstr "Estat:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#, fuzzy
+msgid "City:"
+msgstr "Client:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#, fuzzy
+msgid "Area:"
+msgstr "Armeni"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#, fuzzy
+msgid "Street:"
+msgstr "Selecciona"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#, fuzzy
+msgid "Floor:"
+msgstr "_Per a:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#, fuzzy
+msgid "Room:"
+msgstr "Sa_la:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#, fuzzy
+msgid "Text:"
+msgstr "Tipus:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#, fuzzy
+msgid "Description:"
+msgstr "Versió:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#, fuzzy
+msgid "Bearing:"
+msgstr "Versió:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+#, fuzzy
+msgid "<b>Location</b>"
+msgstr "<b>Contacte</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#, fuzzy
+msgid "<b>Location</b>, "
+msgstr "<b>Contacte</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+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 "Compte:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+msgid "Alias:"
+msgstr "Sobrenom:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+msgid "Birthday:"
+msgstr "Aniversari:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#, fuzzy
+msgid "Client Information"
+msgstr "<b>Informació del client</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+msgid "Client:"
+msgstr "Client:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Contacte"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#, fuzzy
+msgid "Contact Details"
+msgstr "<b>Detalls del contacte</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Email:"
+msgstr "Correu electrònic:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Fullname:"
+msgstr "Nom complet:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#, fuzzy
+msgid "Groups"
+msgstr "Grup"
+
+#. Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Identifier:"
+msgstr "Identificador:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+msgid "Information requested..."
+msgstr "S'ha demanat la informació..."
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+msgid "OS:"
+msgstr "SO:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+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-contact-widget.ui.h:17
+msgid "Version:"
+msgstr "Versió:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+msgid "Web site:"
+msgstr "Pàgina web:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+msgid "_Add Group"
+msgstr "_Afig un grup"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+msgid "new server"
+msgstr "servidor nou"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+msgid "Server"
+msgstr "Servidor"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+msgid "Port"
+msgstr "Port"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+msgid "SSL"
+msgstr "SSL"
+
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
+msgid "Account"
+msgstr "Compte"
+
+#: ../libempathy-gtk/empathy-log-window.c:512
+msgid "Date"
+msgstr "Data"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "Conversations"
+msgstr "Converses"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+msgid "Previous Conversations"
+msgstr "Converses anteriors"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Search"
+msgstr "Cerca"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "_For:"
+msgstr "_Per a:"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
+msgid "C_all"
+msgstr "_Trucada"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+msgid "C_hat"
+msgstr "_Xat"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
+msgid "Contact ID:"
+msgstr "ID del contacte:"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+msgid "New Conversation"
+msgstr "Conversa nova"
+
+#. 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
+#, fuzzy
+msgid "Custom Message..."
+msgstr "Missatges personalitzats..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#, fuzzy
+msgid "Edit Custom Messages..."
+msgstr "Missatges personalitzats..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#, fuzzy
+msgid "Set status"
+msgstr "Estat"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr ""
+
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "Missatges personalitzats..."
+
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr "Heu rebut un missatge instantani"
+
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr "Heu enviat un missatge instantani"
+
+#: ../libempathy-gtk/empathy-sound.c:55
+msgid "Incoming chat request"
+msgstr "Sol·licitud de xat"
+
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr "S'ha connectat un contacte"
+
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr "S'ha desconnectat un contacte"
+
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr "Connectat al servidor"
+
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "Desconnectat del servidor"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
+msgstr "Trucada de veu entrant"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "Trucada de veu d'eixida"
+
+#: ../libempathy-gtk/empathy-sound.c:69
+msgid "Voice call ended"
+msgstr "La trucada de veu ha finalitzat"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#, fuzzy
+msgid "Enter Custom Message"
+msgstr "Missatge personalitzat"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#, fuzzy
+msgid "Edit Custom Messages"
+msgstr "Missatge personalitzat"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+#, fuzzy
+msgid "Saved Presets"
+msgstr "Alça el missatge"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Clàssic"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Simple"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Net"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Blau"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "No s'ha pogut obrir l'URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "Seleccioneu un fitxer"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
+#, fuzzy
+msgid "Select a destination"
+msgstr "Seleccioneu un contacte"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr "Localització actual"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr "Àrab"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr "Armeni"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:173
+#: ../libempathy-gtk/totem-subtitle-encoding.c:175
+#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+msgid "Baltic"
+msgstr "Bàltic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+msgid "Celtic"
+msgstr "Cèltic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:183
+#: ../libempathy-gtk/totem-subtitle-encoding.c:185
+#: ../libempathy-gtk/totem-subtitle-encoding.c:187
+#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+msgid "Central European"
+msgstr "Europeu central"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:192
+#: ../libempathy-gtk/totem-subtitle-encoding.c:194
+#: ../libempathy-gtk/totem-subtitle-encoding.c:196
+#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+msgid "Chinese Simplified"
+msgstr "Xinés simplificat"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:201
+#: ../libempathy-gtk/totem-subtitle-encoding.c:203
+#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+msgid "Chinese Traditional"
+msgstr "Xinés tradicional"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+msgid "Croatian"
+msgstr "Croat"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:211
+#: ../libempathy-gtk/totem-subtitle-encoding.c:213
+#: ../libempathy-gtk/totem-subtitle-encoding.c:215
+#: ../libempathy-gtk/totem-subtitle-encoding.c:217
+#: ../libempathy-gtk/totem-subtitle-encoding.c:219
+#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+msgid "Cyrillic"
+msgstr "Ciríl·lic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+msgid "Cyrillic/Russian"
+msgstr "Ciríl·lic/Rus"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:227
+#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+msgid "Cyrillic/Ukrainian"
+msgstr "Ciríl·lic/Ucraïnés"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+msgid "Georgian"
+msgstr "Georgià"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:235
+#: ../libempathy-gtk/totem-subtitle-encoding.c:237
+#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+msgid "Greek"
+msgstr "Grec"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:248
+#: ../libempathy-gtk/totem-subtitle-encoding.c:250
+#: ../libempathy-gtk/totem-subtitle-encoding.c:252
+#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+msgid "Hebrew"
+msgstr "Hebreu"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+msgid "Hebrew Visual"
+msgstr "Hebreu visual"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+msgid "Icelandic"
+msgstr "Islandés"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:266
+#: ../libempathy-gtk/totem-subtitle-encoding.c:268
+#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+msgid "Japanese"
+msgstr "Japonés"
+
+#: ../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 "Coreà"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+msgid "Nordic"
+msgstr "Nòrdic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+msgid "Persian"
+msgstr "Persa"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:288
+#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+msgid "Romanian"
+msgstr "Romanés"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+msgid "South European"
+msgstr "Sud europeu"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+msgid "Thai"
+msgstr "Tailandés"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:299
+#: ../libempathy-gtk/totem-subtitle-encoding.c:301
+#: ../libempathy-gtk/totem-subtitle-encoding.c:303
+#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+msgid "Turkish"
+msgstr "Turc"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:308
+#: ../libempathy-gtk/totem-subtitle-encoding.c:310
+#: ../libempathy-gtk/totem-subtitle-encoding.c:312
+#: ../libempathy-gtk/totem-subtitle-encoding.c:314
+#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:319
+#: ../libempathy-gtk/totem-subtitle-encoding.c:321
+#: ../libempathy-gtk/totem-subtitle-encoding.c:323
+#: ../libempathy-gtk/totem-subtitle-encoding.c:325
+#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+msgid "Western"
+msgstr "Occidental"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:330
+#: ../libempathy-gtk/totem-subtitle-encoding.c:332
+#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#.
+#. * 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 ""
+"El contacte per mostrar en la miniaplicació. Si està buit significa que no "
+"es mostrarà cap contacte."
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
+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."
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
+msgid "Megaphone"
+msgstr "Megàfon"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
+#: ../megaphone/src/megaphone-applet.c:519
+msgid "Talk!"
+msgstr "Parleu!"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
+#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
+msgid "_About"
+msgstr "_Quant a"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
+msgid "_Information"
+msgstr "_Informació"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
+#: ../src/empathy-main-window.ui.h:23
+msgid "_Preferences"
+msgstr "_Preferències"
+
+#: ../megaphone/src/megaphone-applet.c:168
+msgid "Please configure a contact."
+msgstr "Configureu un contacte."
+
+#: ../megaphone/src/megaphone-applet.c:258
+msgid "Select contact..."
+msgstr "Seleccioneu un contacte..."
+
+#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
+msgid "Presence"
+msgstr "Presència"
+
+#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
+#: ../nothere/src/nothere-applet.c:106
+msgid "Set your own presence"
+msgstr "Establiu la vostra presència"
+
+#: ../src/empathy.c:567
+msgid "Don't connect on startup"
+msgstr "No connectes en iniciar"
+
+#: ../src/empathy.c:571
+msgid "Don't show the contact list on startup"
+msgstr "No mostres la llista de contactes en iniciar"
+
+#: ../src/empathy.c:575
+msgid "Show the accounts dialog"
+msgstr "Mostra el diàleg dels comptes"
+
+#: ../src/empathy.c:587
+#, fuzzy
+msgid "- Empathy IM Client"
+msgstr "- Missatgeria instantània Empathy"
+
+#: ../src/empathy-about-dialog.c:83
+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 ""
+"L'Empathy és programari lliure; podeu redistribuir-lo i/o modificar-lo sota "
+"els termes de la Llicència Pública General GNU tal i com ha estat publicada "
+"per la Free Software Foundation; bé sota la versió 2 de la Llicència o bé "
+"(si ho preferiu) sota qualsevol versió posterior."
+
+#: ../src/empathy-about-dialog.c:87
+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 ""
+"L'Empathy es distribueix amb l'expectativa de que serà útil, però SENSE CAP "
+"GARANTIA; fins i tot la garantia implícita de COMERCIALITZACIÓ o ADEQUACIÓ "
+"PER UN PROPÒSIT PARTICULAR.  Vegeu la Llicència Pública General GNU per "
+"obtindre'n més detalls."
+
+#: ../src/empathy-about-dialog.c:91
+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 ""
+"Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU "
+"juntament amb l'Empathy; en cas contrari, escriviu a la Free Software "
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+
+#: ../src/empathy-about-dialog.c:119
+msgid "An Instant Messaging client for GNOME"
+msgstr "Un client de missatgeria instantània per al GNOME"
+
+#: ../src/empathy-about-dialog.c:125
+msgid "translator-credits"
+msgstr ""
+"Jordi Mallach <jordi@sindominio.net>\n"
+"Gil Forcada  <gilforcada@guifi.net>"
+
+#: ../src/empathy-accounts-dialog.c:392
+msgid "Enabled"
+msgstr "Habilitat"
+
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "Comptes"
+
+#. To translator: %s is the protocol name
+#: ../src/empathy-accounts-dialog.c:837
+#, c-format
+msgid "New %s account"
+msgstr "Compte de %s nou"
+
+#: ../src/empathy-accounts-dialog.c:950
+#, c-format
+msgid ""
+"You are about to remove your %s account!\n"
+"Are you sure you want to proceed?"
+msgstr ""
+"Esteu a punt de suprimir el compte %s.\n"
+"Segur que voleu continuar?"
+
+#: ../src/empathy-accounts-dialog.c:956
+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 ""
+"No se suprimirà cap de les converses i sales de xat associades si decidiu "
+"continuar.\n"
+"\n"
+"Si decidiu tornar a afegir el compte més avant, encara estaran disponibles."
+
+#: ../src/empathy-accounts-dialog.ui.h:2
+#, fuzzy
+msgid "Add Account"
+msgstr "Compte"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "Cr_eate"
+msgstr "Cr_ea"
+
+#: ../src/empathy-accounts-dialog.ui.h:4
+#, fuzzy
+msgid "Gmail"
+msgstr "Correu electrònic:"
+
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "Import Accounts..."
+msgstr "Importació de comptes..."
+
+#: ../src/empathy-accounts-dialog.ui.h:6
+#, fuzzy
+msgid "No protocol installed"
+msgstr "<b>No hi ha cap protocol instal·lat</b>"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+#, fuzzy
+msgid "Settings"
+msgstr "<b>Paràmetres</b>"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"Per a afegir un compte nou, primer heu d'instal·lar el rerefons de cada "
+"protocol que vulgueu utilitzar."
+
+#: ../src/empathy-accounts-dialog.ui.h:9
+msgid "Type:"
+msgstr "Tipus:"
+
+#: ../src/empathy-accounts-dialog.ui.h:10
+#, fuzzy
+msgid "_Add..."
+msgstr "_Afig un contacte..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+#, fuzzy
+msgid "_Create a new account"
+msgstr "Crea una xarxa d'IRC nova"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+#, fuzzy
+msgid "_Reuse an existing account"
+msgstr "Mostra i edita els comptes"
+
+#: ../src/empathy-call-window.c:426
+msgid "Contrast"
+msgstr "Contrast"
+
+#: ../src/empathy-call-window.c:429
+msgid "Brightness"
+msgstr "Brillantor"
+
+#: ../src/empathy-call-window.c:432
+msgid "Gamma"
+msgstr "Gamma"
+
+#: ../src/empathy-call-window.c:539
+msgid "Volume"
+msgstr "Volum"
+
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "S'està connectant..."
+
+#: ../src/empathy-call-window.c:778
+msgid "_Sidebar"
+msgstr "Barra _lateral"
+
+#: ../src/empathy-call-window.c:797
+msgid "Dialpad"
+msgstr "Marcador"
+
+#: ../src/empathy-call-window.c:803
+msgid "Audio input"
+msgstr "Entrada d'àudio"
+
+#: ../src/empathy-call-window.c:807
+msgid "Video input"
+msgstr "Entrada de vídeo"
+
+#: ../src/empathy-call-window.c:866
+#, c-format
+msgid "Call with %s"
+msgstr ""
+
+#: ../src/empathy-call-window.c:935
+#, fuzzy
+msgid "Call"
+msgstr "Tru_ca"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1387
+#, fuzzy, c-format
+msgid "Connected — %d:%02dm"
+msgstr "Connectat -- %d:%02dm"
+
+#: ../src/empathy-call-window.ui.h:1
+msgid "Hang up"
+msgstr "Penja"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Send Audio"
+msgstr "Envia àudio"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Send video"
+msgstr "Envia vídeo"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Video preview"
+msgstr "Previsualització de vídeo"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "Tru_ca"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+msgid "_View"
+msgstr "_Visualitza"
+
+#: ../src/empathy-chat-window.c:344
+#, c-format
+msgid "Conversations (%d)"
+msgstr "Converses (%d)"
+
+#: ../src/empathy-chat-window.c:476
+msgid "Typing a message."
+msgstr "S'està teclejant un missatge."
+
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "_Neteja"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "Xat"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Insereix una e_moticona"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "Mou la pestanya a l'_esquerra"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "Mou la pestanya a la d_reta"
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "_Contacte"
+
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "_Continguts"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "_Conversa"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "_Detach Tab"
+msgstr "D_esenganxa la pestanya"
+
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Favorite Chatroom"
+msgstr "Sala de xat _preferida"
+
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "A_juda"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr "Pestanya següe_nt"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "_Pestanya anterior"
+
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "_Mostra la llista de contactes"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "Pes_tanyes"
+
+#: ../src/empathy-chatrooms-window.c:258
+msgid "Name"
+msgstr "Nom"
+
+#: ../src/empathy-chatrooms-window.c:276
+msgid "Room"
+msgstr "Sala"
+
+#: ../src/empathy-chatrooms-window.c:285
+msgid "Auto-Connect"
+msgstr "Connecta automàticament"
+
+#: ../src/empathy-chatrooms-window.ui.h:2
+msgid "Manage Favorite Rooms"
+msgstr "Gestiona les sales preferides"
+
+#: ../src/empathy-event-manager.c:321
+msgid "Incoming call"
+msgstr "Trucada entrant"
+
+#: ../src/empathy-event-manager.c:324
+#, c-format
+msgid "%s is calling you, do you want to answer?"
+msgstr "%s vos està trucant, voleu contestar?"
+
+#: ../src/empathy-event-manager.c:331
+msgid "_Reject"
+msgstr "_Refusa"
+
+#: ../src/empathy-event-manager.c:337
+msgid "_Answer"
+msgstr "_Contesta"
+
+#: ../src/empathy-event-manager.c:452
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Trucada entrant de %s"
+
+#: ../src/empathy-event-manager.c:496
+#, c-format
+msgid "%s is offering you an invitation"
+msgstr "%s vos ofereix una invitació"
+
+#: ../src/empathy-event-manager.c:502
+msgid "An external application will be started to handle it."
+msgstr "S'iniciarà una aplicació externa per a gestionar-la."
+
+#: ../src/empathy-event-manager.c:507
+msgid "You don't have the needed external application to handle it."
+msgstr "No teniu l'aplicació externa necessària per a gestionar-la."
+
+#: ../src/empathy-event-manager.c:634
+msgid "Room invitation"
+msgstr "Invitació a la sala"
+
+#: ../src/empathy-event-manager.c:637
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr "%s vos convida a entrar a %s"
+
+#: ../src/empathy-event-manager.c:645
+msgid "_Decline"
+msgstr "_Declina"
+
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "_Join"
+msgstr "_Uneix-m'hi"
+
+#: ../src/empathy-event-manager.c:689
+#, c-format
+msgid "%s invited you to join %s"
+msgstr "%s vos ha convidat a entrar a %s"
+
+#: ../src/empathy-event-manager.c:715
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr "Transferència de fitxers entrant de %s"
+
+#: ../src/empathy-event-manager.c:895
+#, c-format
+msgid "Subscription requested by %s"
+msgstr "Sol·licitud de subscripció de %s"
+
+#: ../src/empathy-event-manager.c:899
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"Missatge: %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
+#, 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
+#, c-format
+msgid "%02u.%02u"
+msgstr "%02u.%02u"
+
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: ../src/empathy-ft-manager.c:275
+#, fuzzy, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s de %s"
+
+#: ../src/empathy-ft-manager.c:276
+#, 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:307
+#, c-format
+msgid "Receiving \"%s\" from %s"
+msgstr "S'està rebent «%s» de %s"
+
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:310
+#, c-format
+msgid "Sending \"%s\" to %s"
+msgstr "S'està enviant «%s» a %s"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, fuzzy, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "S'està rebent «%s» de %s"
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:348
+#, fuzzy, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "S'està enviant «%s» a %s"
+
+#: ../src/empathy-ft-manager.c:351
+#, fuzzy
+msgid "Error sending a file"
+msgstr "S'ha produït un error en enviar el missatge «%s»: %s"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
+#, c-format
+msgid "\"%s\" received from %s"
+msgstr "S'ha rebut «%s» de %s"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
+#, c-format
+msgid "\"%s\" sent to %s"
+msgstr "S'ha enviat «%s» a %s"
+
+#: ../src/empathy-ft-manager.c:498
+msgid "File transfer completed"
+msgstr "S'ha completat la transferència"
+
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#, fuzzy
+msgid "Waiting for the other participant's response"
+msgstr "S'està esperant que l'interlocutor responga"
+
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#, c-format
+msgid "Hashing \"%s\""
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:1024
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1036
+msgid "File"
+msgstr "Fitxer"
+
+#: ../src/empathy-ft-manager.c:1058
+msgid "Remaining"
+msgstr "Restant"
+
+#: ../src/empathy-ft-manager.ui.h:1
+#, fuzzy
+msgid "File Transfers"
+msgstr "Transferències de fitxers"
+
+#: ../src/empathy-ft-manager.ui.h:2
+msgid "Remove completed, canceled and failed file transfers from the list"
+msgstr ""
+"Treu de la llista les transferències de fitxers completades, cancel·lades i "
+"fallades"
+
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-dialog.c:263
+msgid "Import"
+msgstr "Importa"
+
+#: ../src/empathy-import-dialog.c:272
+msgid "Protocol"
+msgstr "Protocol"
+
+#: ../src/empathy-import-dialog.c:298
+msgid "Source"
+msgstr "Font"
+
+#: ../src/empathy-import-dialog.c:392
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"No s'han trobat comptes per a importar. L'Empathy de moment només pot "
+"importar comptes del Pidgin."
+
+#: ../src/empathy-import-dialog.ui.h:1
+msgid "Import Accounts"
+msgstr "Importa els comptes"
+
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "_Edita el compte"
+
+#: ../src/empathy-main-window.c:505
+msgid "No error specified"
+msgstr "No s'ha especificat l'error"
+
+#: ../src/empathy-main-window.c:508
+msgid "Network error"
+msgstr "Error de la xarxa"
+
+#: ../src/empathy-main-window.c:511
+msgid "Authentication failed"
+msgstr "Ha fallat l'autenticació"
+
+#: ../src/empathy-main-window.c:514
+msgid "Encryption error"
+msgstr "Error de xifratge"
+
+#: ../src/empathy-main-window.c:517
+msgid "Name in use"
+msgstr "Nom utilitzat"
+
+#: ../src/empathy-main-window.c:520
+msgid "Certificate not provided"
+msgstr "No s'ha proporcionat el certificat"
+
+#: ../src/empathy-main-window.c:523
+msgid "Certificate untrusted"
+msgstr "El certificat no és de confiança"
+
+#: ../src/empathy-main-window.c:526
+msgid "Certificate expired"
+msgstr "El certificat ha expirat"
+
+#: ../src/empathy-main-window.c:529
+msgid "Certificate not activated"
+msgstr "El certificat no està activat"
+
+#: ../src/empathy-main-window.c:532
+msgid "Certificate hostname mismatch"
+msgstr "No coincideix el nom de la màquina del certificat"
+
+#: ../src/empathy-main-window.c:535
+msgid "Certificate fingerprint mismatch"
+msgstr "No coincideix l'empremta digital del certificat"
+
+#: ../src/empathy-main-window.c:538
+msgid "Certificate self-signed"
+msgstr "Certificat signat per un mateix"
+
+#: ../src/empathy-main-window.c:541
+msgid "Certificate error"
+msgstr "Error en el certificat"
+
+#: ../src/empathy-main-window.c:544
+msgid "Unknown error"
+msgstr "Error desconegut"
+
+#: ../src/empathy-main-window.c:1293
+msgid "Show and edit accounts"
+msgstr "Mostra i edita els comptes"
+
+#: ../src/empathy-main-window.ui.h:1
+msgid "Contact List"
+msgstr "Llista de contactes"
+
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:3
+msgid "Context"
+msgstr "Context"
+
+#: ../src/empathy-main-window.ui.h:4
+msgid "Join _Favorites"
+msgstr "Uneix-te als _preferits"
+
+#: ../src/empathy-main-window.ui.h:5
+msgid "Manage Favorites"
+msgstr "Gestiona els preferits"
+
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+msgid "Sort by _Name"
+msgstr "Ordena per _nom"
+
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+msgid "Sort by _Status"
+msgstr "Ordena per es_tat"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "_Accounts"
+msgstr "_Comptes"
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:17
+#, fuzzy
+msgid "_File Transfers"
+msgstr "Transferències de fitxers"
+
+#: ../src/empathy-main-window.ui.h:19
+#, fuzzy
+msgid "_Join..."
+msgstr "_Uneix-m'hi"
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation..."
+msgstr "Conversa _nova..."
+
+#: ../src/empathy-main-window.ui.h:21
+#, fuzzy
+msgid "_Offline Contacts"
+msgstr "M_ostra els contactes desconnectats"
+
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Personal Information"
+msgstr "Informació _personal"
+
+#: ../src/empathy-main-window.ui.h:24
+#, fuzzy
+msgid "_Previous Conversations"
+msgstr "Converses anteriors"
+
+#: ../src/empathy-main-window.ui.h:25
+msgid "_Room"
+msgstr "_Sala"
+
+#: ../src/empathy-new-chatroom-dialog.c:331
+#, fuzzy
+msgid "Chat Room"
+msgstr "Sales de xat"
+
+#: ../src/empathy-new-chatroom-dialog.c:347
+#, fuzzy
+msgid "Members"
+msgstr "Temes"
+
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\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 ""
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+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 ""
+"Introduïu el nom de la sala a la qual vos voleu unir o feu clic en una 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 ""
+"Introduïu el servidor que hostatja la sala, o deixeu-ho en blanc si la sala "
+"és en el servidor del compte actual"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#, fuzzy
+msgid "Join Room"
+msgstr "Sala"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#, fuzzy
+msgid "Room List"
+msgstr "_Localització de la llista de la sala:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "Sa_la:"
+
+#: ../src/empathy-preferences.c:147
+msgid "Message received"
+msgstr "Missatge rebut"
+
+#: ../src/empathy-preferences.c:148
+msgid "Message sent"
+msgstr "Missatge enviat"
+
+#: ../src/empathy-preferences.c:149
+msgid "New conversation"
+msgstr "Conversa nova"
+
+#: ../src/empathy-preferences.c:150
+msgid "Contact goes online"
+msgstr "El contacte s'ha connectat"
+
+#: ../src/empathy-preferences.c:151
+msgid "Contact goes offline"
+msgstr "El contacte s'ha desconnectat"
+
+#: ../src/empathy-preferences.c:152
+msgid "Account connected"
+msgstr "Compte connectat"
+
+#: ../src/empathy-preferences.c:153
+msgid "Account disconnected"
+msgstr "Compte desconnectat"
+
+#: ../src/empathy-preferences.c:393
+msgid "Language"
+msgstr "Llengua"
+
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:4
+#, fuzzy
+msgid "Appearance"
+msgstr "<b>Aparença</b>"
+
+#: ../src/empathy-preferences.ui.h:5
+msgid "Automatically _connect on startup "
+msgstr "_Connecta automàticament en iniciar "
+
+#: ../src/empathy-preferences.ui.h:6
+#, fuzzy
+msgid "Behavior"
+msgstr "<b>Comportament</b>"
+
+#: ../src/empathy-preferences.ui.h:7
+msgid "Chat Th_eme:"
+msgstr "T_ema de xat:"
+
+#: ../src/empathy-preferences.ui.h:8
+msgid "Disable notifications when _away or busy"
+msgstr "Inhabilita les notificacions quan s'està _absent o ocupat"
+
+#: ../src/empathy-preferences.ui.h:9
+msgid "Disable sounds when _away or busy"
+msgstr "Inhabilita els sons quan s'està _absent o ocupat"
+
+#: ../src/empathy-preferences.ui.h:10
+#, fuzzy
+msgid "Enable notifications when a contact comes online"
+msgstr "Habilita les notificacions quan el _xat no tinga el focus"
+
+#: ../src/empathy-preferences.ui.h:11
+#, fuzzy
+msgid "Enable notifications when a contact goes offline"
+msgstr "Habilita les notificacions quan el _xat no tinga el focus"
+
+#: ../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:13
+#, fuzzy
+msgid "Enable spell checking for languages:"
+msgstr "<b>Habilita la verificació ortogràfica per a les llengües:</b>"
+
+#: ../src/empathy-preferences.ui.h:14
+msgid "General"
+msgstr "General"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+#, fuzzy
+msgid "Location"
+msgstr "Notificacions"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Notificacions"
+
+#: ../src/empathy-preferences.ui.h:18
+#, fuzzy
+msgid "Play sound for events"
+msgstr "<b>Reprodueix un so pels esdeveniments</b>"
+
+#: ../src/empathy-preferences.ui.h:19
+msgid "Preferences"
+msgstr "Preferències"
+
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:21
+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
+msgid "Show _smileys as images"
+msgstr "Mo_stra les emoticones com a imatges"
+
+#: ../src/empathy-preferences.ui.h:23
+#, fuzzy
+msgid "Show contact _list in rooms"
+msgstr "_Mostra la llista de contactes"
+
+#: ../src/empathy-preferences.ui.h:24
+msgid "Sounds"
+msgstr "Sons"
+
+#: ../src/empathy-preferences.ui.h:25
+msgid "Spell Checking"
+msgstr "Verificació ortogràfica"
+
+#: ../src/empathy-preferences.ui.h:26
+#, fuzzy
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"<small>La llista de llengües només reflecteix les llengües per a les quals "
+"teniu un diccionari instal·lat.</small>"
+
+#: ../src/empathy-preferences.ui.h:27
+msgid "Themes"
+msgstr "Temes"
+
+#: ../src/empathy-preferences.ui.h:28
+msgid "_Enable bubble notifications"
+msgstr "_Habilita les notificacions"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Enable sound notifications"
+msgstr "_Habilita les notificacions de so"
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Open new chats in separate windows"
+msgstr "_Obri xats nous en finestres separades"
+
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr ""
+
+#: ../src/empathy-status-icon.ui.h:1
+msgid "Status"
+msgstr "Estat"
+
+#: ../src/empathy-status-icon.ui.h:3
+msgid "_Quit"
+msgstr "I_x"
+
+#: ../src/empathy-tube-dispatch.c:375
+#, c-format
+msgid "Unable to start application for service %s: %s"
+msgstr "No s'ha pogut iniciar l'aplicació per al servei %s: %s"
+
+#: ../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"
+msgstr ""
+"Heu rebut una invitació del servei %s, però no teniu l'aplicació necessària "
+"per a gestionar-la"
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+#, fuzzy
+msgid "Contact Map View"
+msgstr "Llista de contactes"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#, fuzzy
+msgid "Critical"
+msgstr "Croat"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#, fuzzy
+msgid "Warning"
+msgstr "Restant"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+#, fuzzy
+msgid "Message"
+msgstr "Missatge:"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:845
+#, fuzzy
+msgid "Save"
+msgstr "Servidor"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1102
+#, fuzzy
+msgid "Time"
+msgstr "Simple"
+
+#: ../src/empathy-debug-dialog.c:1104
+#, fuzzy
+msgid "Domain"
+msgstr "Romanés"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Missatgeria instantània Empathy"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Oblida la contrasenya i neteja el camp."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Xarxa</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Servidors</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Edita la xarxa d'IRC nova seleccionada"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Suprimeix la xarxa IRC seleccionada"
+
+#~ 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"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informació del contacte"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Voldria afegir-te a la meua llista de contactes."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Ho sent, no et vull més a la meua llista de contactes."
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Grups</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "Informació del contacte"
+
+#~ msgid "Word"
+#~ msgstr "Paraula"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Suggeriments per a la paraula"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Verificador ortogràfic"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Suggeriments per a la paraula:"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Compte nou</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "Ja tinc un compte i el vull utilitzar"
+
+#~ msgid "New message from %s"
+#~ msgstr "Missatge nou de %s"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "_Missatge d'invitació:"
+
+#~ msgid "Invite"
+#~ msgstr "Convida"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Seleccioneu qui voleu convidar:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Vos han convidat a unir-vos a una conferència de xat."
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Edita la sala preferida"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "Uneix-me a la sala en _iniciar"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr ""
+#~ "Uniu-vos a esta sala de xat quan s'inicie l'Empathy i estigueu connectat"
+
+#~ msgid "N_ame:"
+#~ msgstr "N_om:"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_ervidor:"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "Desconegut"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "S'està rebent «%s» de %s"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "S'està enviant «%s» a %s"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "S'ha cancel·lat la transferència del fitxer: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "Desconegut"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "No es pot alçar el fitxer en esta ubicació"
+
+#~ msgid "Save file as..."
+#~ msgstr "Anomena i alça el fitxer..."
+
+#~ msgid "unknown size"
+#~ msgstr "mida desconeguda"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s vol enviar-vos un fitxer"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "Voleu acceptar el fitxer? «%s» (%s)?"
+
+#~ msgid "_Accept"
+#~ msgstr "_Accepta"
+
+#~ msgid "Join _New..."
+#~ msgstr "Uneix-me a un _nou/nova..."
+
+#~ msgid "Browse:"
+#~ msgstr "Navega:"
+
+#~ msgid "Join"
+#~ msgstr "Uneix-te"
+
+#~ msgid "Join New"
+#~ msgstr "Uneix-te a un nou"
+
+#~ msgid "Re_fresh"
+#~ msgstr "Ac_tualitza"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr ""
+#~ "Esta llista representa totes les sales de xat hostatjades al servidor que "
+#~ "heu introduït."
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Llista de contactes</b>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr ""
+#~ "Els avatar són imatges seleccionades per l'usuari que es mostren a la "
+#~ "llista de contactes"
+
+#~ msgid "Show _avatars"
+#~ msgstr "Mostra els av_atars"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "_Mostra la llista de contactes compacta"
diff --git a/po/cs.po b/po/cs.po
index 8fd150d26..8500ee3d1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-02 16:15+0100\n"
+"POT-Creation-Date: 2009-08-17 15:30+0200\n"
 "PO-Revision-Date: 2009-03-02 16:13+0100\n"
-"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
+"Last-Translator: Andre Klapper <ak-47@gmx.net>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +23,12 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Komunikátor Empathy"
+msgid "Empathy IM Client"
+msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+#, fuzzy
+msgid "Send and receive messages"
 msgstr "Odesílat a přijímat rychlé zprávy"
 
 #: ../data/empathy.schemas.in.h:1
@@ -74,150 +75,234 @@ msgid "Disable sounds when away"
 msgstr "Zakázat zvuky, když jsem pryč"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Výchozí adresář pro stahování aplikace Empathy"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy se ptá na import účtů"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Automaticky připojovat Empathy po spuštění"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+#, fuzzy
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Automaticky připojovat Empathy po spuštění"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Používat avatar kontaktu jako ikonku okna diskuze"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Povolit vyskakující upozornění na nové zprávy"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Povolit kontrolu pravopisu"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Skrýt hlavní okno"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Skrýt hlavní okno."
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "Používat NetworkManager"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Znak doplňování přezdívek"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Otevírat nové diskuze v oddělených oknech"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:28
+#, fuzzy
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "Jestli používat motiv pro diskuzní místnosti."
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Přehrávat zvuk pro příchozí zprávy"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Při nové konverzaci přehrát zvuk"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Přehrávat zvuk pro odchozí zprávy"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Přehrávat zvuk, když se kontakt přihlásí"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Přehrát zvuk, pokud se kontakt odhlásí"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Přehrávat zvuk, když se přihlásím"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Přehrávat zvuk, když se odhlásím"
 
 # is chat different than conversation?
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Vyskakující upozornění, pokud není vybrán chat"
 
-#: ../data/empathy.schemas.in.h:29
+# is chat different than conversation?
+#: ../data/empathy.schemas.in.h:37
+#, fuzzy
+msgid "Popup notifications when a contact sign in"
+msgstr "Vyskakující upozornění, pokud není vybrán chat"
+
+# is chat different than conversation?
+#: ../data/empathy.schemas.in.h:38
+#, fuzzy
+msgid "Popup notifications when a contact sign out"
+msgstr "Vyskakující upozornění, pokud není vybrán chat"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Účet Salut je vytvořen"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Zobrazovat avatary"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+#, fuzzy
+msgid "Show contact list in rooms"
+msgstr "_Zobrazit seznam kontaktů"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Zobrazovat nápovědu, pokud se chystáte zavřít hlavní okno"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Zobrazovat odpojené kontakty"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Jazyky s kontrolovaným pravopisem"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "Výchozí adresář pro ukládání přenášených souborů."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Poslední adresář, ze kterého byl vybrán obrázek avataru."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 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í."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Používat grafické smajlíky"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Používat zvuky jako upozornění"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Používat motiv pro diskuzní místnosti"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+#, fuzzy
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "Jestli v seznamu kontaktů zobrazovat odpojené kontakty."
+
+#: ../data/empathy.schemas.in.h:53
+#, fuzzy
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Jestli má Empathy používat avatar kontaktu jako ikonu okna diskuze."
+
+#: ../data/empathy.schemas.in.h:54
+#, fuzzy
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr "Jestli má Empathy používat avatar kontaktu jako ikonu okna diskuze."
+
+#: ../data/empathy.schemas.in.h:55
+#, fuzzy
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "Jestli má Empathy používat avatar kontaktu jako ikonu okna diskuze."
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Jestli se má Empathy po dotazovat na import účtů z jiných programů."
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Jestli se má Empathy po spuštění automaticky připojovat k vašim účtům."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+#, fuzzy
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "Jestli má Empathy používat avatar kontaktu jako ikonu okna diskuze."
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "Jestli má Empathy používat avatar kontaktu jako ikonu okna diskuze."
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "Jestli byl při prvním spuštění Empathy vytvořen účet Salut."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -225,59 +310,72 @@ msgstr ""
 "Jestli má být používán NetworkManager k automatickému připojování a "
 "odpojování."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "Jestli u zadávaných slov kontrolovat pravopis."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "Jestli v konverzacích převádět smajlíky na obrázky."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
 "Jestli přehrávat zvuky jako upozornění na přihlašování kontaktu k síti."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr ""
 "Jestli přehrávat zvuky jako upozornění na odhlašování kontaktu od sítě."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Jestli přehrávat zvuky jako upozornění na události."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Jestli přehrávat zvuk jako upozornění na příchozí zprávy."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Jestli přehrávat zvuk jako upozornění na novou konverzaci."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Jestli přehrávat zvuk jako upozornění na odchozí zprávy."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Jestli přehrávat zvuk, když se přihlašuji do sítě."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Jestli přehrávat zvuk, když se odhlašuji ze sítě."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "Jestli přehrávat zvuková upozornění, když jsem pryč nebo zaneprázdněn."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+#, fuzzy
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr ""
+"Jestli zobrazovat vyskakující upozornění, když jsem pryč nebo zaneprázdněn."
+
+#: ../data/empathy.schemas.in.h:74
+#, fuzzy
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr ""
+"Jestli zobrazovat vyskakující upozornění, když jsem pryč nebo zaneprázdněn."
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -285,12 +383,12 @@ msgstr ""
 "Jestli zobrazovat vyskakující upozornění na novou zprávu i když chat byl již "
 "otevřen, ale není vybrán."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "Jestli zobrazovat vyskakující upozornění při přijetí nové zprávy."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -298,16 +396,21 @@ msgstr ""
 "Jestli zobrazovat avatary kontaktů v seznamu kontaktů a oknech s "
 "konverzacemi."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "Jestli v seznamu kontaktů zobrazovat odpojené kontakty."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
 "Jestli zobrazovat vyskakující upozornění, když jsem pryč nebo zaneprázdněn."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+#, fuzzy
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Jestli zobrazovat seznam kontaktů v kompaktním režimu."
+
+#: ../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."
@@ -315,15 +418,15 @@ msgstr ""
 "Jestli zobrazovat varování při uzavírání hlavního okna prostřednictvím "
 "tlačítka 'x' (křížek) v záhlaví okna."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Jestli zobrazovat seznam kontaktů v kompaktním režimu."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Jestli používat motiv pro diskuzní místnosti."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 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 "
@@ -333,543 +436,790 @@ msgstr ""
 "třídění dle jména s hodnotou „name“. Hodnota „state“ řadí seznam kontaktů "
 "dle stavu."
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr ""
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Místní lidé"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "Nebyl udán žádný důvod"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "Byla vyžádána změna stavu."
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Zrušili jste přenos souboru"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "Protistrana zrušila přenos souboru"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Chyba při pokusu o odeslání souboru"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "Protistrana není schopna přenosu souborů"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Neznámý důvod"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Přítomen"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Zaneprázdněn"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Pryč"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Všechny"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Pokročilé</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Zapomenout heslo a vymazat políčko."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#: ../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
 msgid "Pass_word:"
 msgstr "_Heslo:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "Zobrazené jmé_no:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../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
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "Přihlašovací I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "Čí_slo ICQ:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "_Znaková sada:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Nová síť"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Síť</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Servery</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Znaková sada:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Vytvořit novou síť IRC"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Upravit vybranou síť IRC"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Síť"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Síť:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Přezdívka:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Zpráva loučení:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Pravé jméno:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Odstranit vybranou síť IRC"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#, fuzzy
+msgid "Servers"
+msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Přepsat nastavení serveru</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "Přepsat nastavení serveru"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "Pri_orita:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "Z_droj:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Použít staré SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "Požadovat ši_frování (TLS nebo SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ignorovat chyby certifikátu SSL"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "Adresa _el. pošty:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "_Jméno:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "ID _Jabberu:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "_Příjmení:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "_Přezdívka:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "_Publikované jméno:"
 
 #. 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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "Vyhledat STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "Server STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "Port STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "_Uživatelské jméno:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "Použít _Yahoo Japan"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "I_D Yahoo:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ignorovat pozvání do konferencí a diskuzních místností"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "Ná_rodní prostředí seznamu místností:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "Nelze konvertovat obrázek"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr "Váš systém neobsahuje žádný z podporovaných formátů obrázku"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "Vyberte si obrázek avataru"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Žádný obrázek"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Klikněte pro zvětšení"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:412
+msgid "Unsupported command"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "odpojen"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "neplatný kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "oprávnění odepřeno"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "příliš dlouhá zpráva"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "neimplementováno"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "neznámý"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Chyba při odesílání zprávy „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Nastavit téma na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "Nestanoveno žádné téma"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:969
+msgid "(No Suggestions)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Vložit smajlíka"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "_Zkontrolovat pravopis…"
+#: ../libempathy-gtk/empathy-chat.c:1075
+msgid "_Spelling Suggestions"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1190
+#, fuzzy, c-format
+msgid "%s has disconnected"
+msgstr "Kontakt se odpojil"
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1194
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s se připojil do místnosti"
+msgid "%s was kicked by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1197
+#, c-format
+msgid "%s was kicked"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "%s opustil místnost"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. 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:1218
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s se připojil do místnosti"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
 msgid "Disconnected"
 msgstr "Odpojen"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "Připojen"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Konverzace"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Téma:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Skupinová diskuze"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Téma:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "_Kopírovat adresu odkazu"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_Otevřít odkaz"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:441
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A, %e. %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Osobní informace"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Upravit informace o kontaktu"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Informace o kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "Rád bych si vás přidal do svého seznamu kontaktů."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Osobní informace"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "_Rozhodnout se později"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Požadavek na přihlášení"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, 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:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "Skupina  se odstraňuje"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, 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:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Kontakt se odstraňuje"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Lituji, už vás nechci ve svém seznamu kontaktů."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_Přidat kontakt…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Diskuze"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+#, fuzzy
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Hovor"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+#, fuzzy
+msgctxt "menu item"
+msgid "_Video Call"
 msgstr "_Hovor"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Zobrazit předchozí konverzace"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Odeslat soubor"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Infor_mace"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Pozvání do místnosti"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "Pozvat do místnost_i"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Vybrat kontakt"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Uložit avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Nelze uložit avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Vybrat"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Skupina"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Informace o klientovi</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#, fuzzy
+msgid "Country:"
+msgstr "Účet:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#, fuzzy
+msgid "State:"
+msgstr "Stav:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#, fuzzy
+msgid "City:"
+msgstr "Klient:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#, fuzzy
+msgid "Area:"
+msgstr "arménské"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#, fuzzy
+msgid "Street:"
+msgstr "Vybrat"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#, fuzzy
+msgid "Floor:"
+msgstr "_Co:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Room:"
+msgstr "Místnost:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#, fuzzy
+msgid "Text:"
+msgstr "Typ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#, fuzzy
+msgid "Description:"
+msgstr "Verze:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#, fuzzy
+msgid "Bearing:"
+msgstr "Verze:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Podrobnosti o kontaktu</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+#, fuzzy
+msgid "<b>Location</b>"
+msgstr "<b>Kontakt</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#, fuzzy
+msgid "<b>Location</b>, "
 msgstr "<b>Kontakt</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Skupiny</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../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 "Účet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Narozeniny:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "Informace o klientovi"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Informace o kontaktu"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Kontakt"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "Podrobnosti o kontaktu"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "Elektronická pošta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Celé jméno:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#, fuzzy
+msgid "Groups"
+msgstr "Skupina"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Identifikátor:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "Jsou požadovány informace…"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -877,179 +1227,211 @@ msgstr ""
 "Vyberte skupiny, do kterých má kontakt patřit. Můžete vybrat více než jednu "
 "skupinu, ale také nevybrat žádnou skupinu."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Verze:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "Webová stránka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "_Přidat skupinu"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "nový server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:277
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Účet"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Datum"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Konverzace"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Předchozí konverzace"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Hledat"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_Co:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "_Hovor"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "_Diskuze"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "ID kontaktu:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "Nová konverzace"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
+#. 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
+#, fuzzy
+msgid "Custom Message..."
 msgstr "Vlastní zprávy…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Vlastní zpráva"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Zpráva:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Uložit zprávu"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Stav:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Slovo"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Návrhy pravopisu"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Kontrola pravopisu"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Návrhy pravopisu:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "Klasický"
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#, fuzzy
+msgid "Edit Custom Messages..."
+msgstr "Vlastní zprávy…"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Jednoduchý"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "Čistý"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "Modrý"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#, fuzzy
+msgid "Set status"
+msgstr "Stav"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "Nelze otevřít URI"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "Vybrat soubor"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "Vlastní zprávy…"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "Přijata rychlá zpráva"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "Odeslána rychlá zpráva"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "Příchozí žádost o chat"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "Kontakt je připojen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "Připojeno k serveru"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "Odpojeno od serveru"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "Příchozí hovor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "Odchozí hovor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "Hovor ukončen"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#, fuzzy
+msgid "Enter Custom Message"
+msgstr "Vlastní zpráva"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#, fuzzy
+msgid "Edit Custom Messages"
+msgstr "Vlastní zpráva"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+#, fuzzy
+msgid "Saved Presets"
+msgstr "Uložit zprávu"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Klasický"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Jednoduchý"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Čistý"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Modrý"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "Nelze otevřít URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "Vybrat soubor"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
+#, fuzzy
+msgid "Select a destination"
+msgstr "Vybrat kontakt"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Aktuální národní prostředí"
@@ -1238,7 +1620,7 @@ msgid "Megaphone"
 msgstr "Megafon"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Mluvte!"
 
@@ -1252,15 +1634,15 @@ msgid "_Information"
 msgstr "_Informace"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Nastavte prosím kontakt."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Vybrat kontakt…"
 
@@ -1273,23 +1655,24 @@ msgstr "Přítomnost"
 msgid "Set your own presence"
 msgstr "Nastavit vlastní přítomnost"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "Nepřipojovat se po spuštění"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "Nezobrazovat seznam kontaktů po spuštění"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Zobrazit okno s účty"
 
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:587
+#, fuzzy
+msgid "- Empathy IM Client"
 msgstr "– Komunikátor Empathy"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1300,7 +1683,7 @@ msgstr ""
 "ustanovení GNU General Public License vydané Free Software Foundation; buď "
 "verze 2 této licence nebo (dle vlastního uvážení) kterékoliv pozdější verze."
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1311,7 +1694,7 @@ msgstr ""
 "neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ "
 "ÚČEL. Další podrobnosti hledejte v GNU General Public License."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "
@@ -1321,11 +1704,11 @@ msgstr ""
 "Empathy; pokud se tak nestalo, napište si o ni Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "Klient rychlého zasílání zpráv pro pracovní prostředí GNOME"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "Miloslav Trmač <mitr@volny.cz>\n"
@@ -1333,22 +1716,21 @@ msgstr ""
 "Petr Kovář <pknbe@volny.cz>\n"
 "Martin Picek <picek.martin@gnome-cesko.cz>"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Povolen"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Účty"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Nový účet %s"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1357,7 +1739,7 @@ msgstr ""
 "Chystáte se odstranit svůj účet „%s“!\n"
 "Jste si jisti, že chcete pokračovat?"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1370,31 +1752,33 @@ msgstr ""
 "\n"
 "Pokud byste se později rozhodli přidat účet zpět, budou stále k dispozici."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Nový účet</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Nenainstalován žádný protokol</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Nastavení</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+#, fuzzy
+msgid "Add Account"
+msgstr "Účet"
 
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "_Vytvořit"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "Už mám účet, chci jej používat"
+#: ../src/empathy-accounts-dialog.ui.h:4
+#, fuzzy
+msgid "Gmail"
+msgstr "Elektronická pošta:"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "Import účtů..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Nenainstalován žádný protokol"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "Nastavení"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1402,274 +1786,258 @@ msgstr ""
 "Chcete-li přidat nový účet, musíte nejdříve nainstalovat podpůrnou vrstvu "
 "každého protokolu, který chcete používat."
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "_Přidat…"
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+#, fuzzy
+msgid "_Create a new account"
+msgstr "Vytvořit novou síť IRC"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+#, fuzzy
+msgid "_Reuse an existing account"
+msgstr "Zobrazit a upravit účty"
+
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "Jas"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "Hlasitost"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "Připojuje se..."
+
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "Po_straní lišta"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "Tlačítka vytáčení"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "Vstup zvuku"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "Vstup videa"
 
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "Připojuje se..."
+#: ../src/empathy-call-window.c:866
+#, c-format
+msgid "Call with %s"
+msgstr ""
+
+#: ../src/empathy-call-window.c:935
+#, fuzzy
+msgid "Call"
+msgstr "Hovor"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:573
+#: ../src/empathy-call-window.c:1387
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "Připojeno -- %d:%02dm"
+msgid "Connected — %d:%02dm"
+msgstr "Připojeno — %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "Zavěsit"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "Odeslat zvuk"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "Odeslat video"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "Náhled videa"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Hovor"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Konverzace (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Téma:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Píše zprávu."
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:429
-#, c-format
-msgid "New message from %s"
-msgstr "Nová zpráva od kontaktu %s"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "_Vymazat"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
 msgid "Chat"
 msgstr "Diskuze"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Vložit _smajlíka"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "_Zpráva pozvánky:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Pozvat"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
 msgstr "Přesunout kartu do_leva"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
 msgstr "Přesunout kartu do_prava"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Vyberte, koho byste chtěli pozvat:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Byli jste pozváni, abyste se připojili k diskuzní konferenci."
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
 msgstr "_Konverzace"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
 msgstr "_Odpojit kartu"
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Favorite Chatroom"
 msgstr "_Oblíbená diskuzní místnost"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
 msgstr "_Následující karta"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Previous Tab"
 msgstr "_Předchozí karta"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "_Zobrazit seznam kontaktů"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
 msgstr "_Karty"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "Místnost"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "Automaticky připojit"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Upravit oblíbenou místnost"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Připojit se do místnosti po _spuštění"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr ""
-"Připojit se do této diskuzní místnosti, pokud se Empathy spustí a zároveň "
-"budete připojeni"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "Spravovat oblíbené místnosti"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_Jméno:"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "S_erver:"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_Místnost:"
-
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:324
 #, 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:387
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "O_dmítnout"
 
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_Zvednout"
 
-#: ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Příchozí hovor od %s"
 
-#: ../src/empathy-event-manager.c:564
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s vám nabízí pozvání"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "Kvůli zpracování bude spuštěna externí aplikace."
 
-#: ../src/empathy-event-manager.c:575
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "Nemáte vyžadovanou externí aplikaci pro zpracování."
 
-#: ../src/empathy-event-manager.c:698
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Pozvání do místnosti"
 
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vás zve, abyste se připojili do %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:709 ../src/empathy-ft-manager.c:1023
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "O_dmítnout"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "Připo_jit"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vás pozval, abyste se připojili do %s"
 
-#: ../src/empathy-event-manager.c:867
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Příchozí přenos souboru od %s"
 
-#: ../src/empathy-event-manager.c:961
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Požadavek na přihlášení od %s"
 
-#: ../src/empathy-event-manager.c:965
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1678,174 +2046,146 @@ msgstr ""
 "\n"
 "Zpráva: %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:114
+#: ../src/empathy-ft-manager.c:101
 #, 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:117
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "0:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:166
-msgid "No reason was specified"
-msgstr "Nebyl udán žádný důvod"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "The change in state was requested"
-msgstr "Byla vyžádána změna stavu."
-
-#: ../src/empathy-ft-manager.c:170
-msgid "You canceled the file transfer"
-msgstr "Zrušili jste přenos souboru"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "The other participant canceled the file transfer"
-msgstr "Protistrana zrušila přenos souboru"
-
-#: ../src/empathy-ft-manager.c:174
-msgid "Error while trying to transfer the file"
-msgstr "Chyba při pokusu o odeslání souboru"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Neznámo"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "The other participant is unable to transfer the file"
-msgstr "Protistrana není schopna přenosu souborů"
+#: ../src/empathy-ft-manager.c:275
+#, fuzzy, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s z %s"
 
-#: ../src/empathy-ft-manager.c:178
-msgid "Unknown reason"
-msgstr "Neznámý důvod"
+#: ../src/empathy-ft-manager.c:276
+#, 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:226
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Stahování \"%s\" od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:229
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Odesílání \"%s\" kontaktu %s"
 
-#: ../src/empathy-ft-manager.c:239
-msgctxt "file size"
-msgid "Unknown"
-msgstr "Neznámo"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, fuzzy, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Stahování \"%s\" od %s"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:247
-#, c-format
-msgid "%s of %s"
-msgstr "%s z %s"
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:254
-msgid "Waiting the other participant's response"
-msgstr "Čeká se na odpověď protistrany"
+#: ../src/empathy-ft-manager.c:348
+#, fuzzy, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "Odesílání \"%s\" kontaktu %s"
 
-#: ../src/empathy-ft-manager.c:264
+#: ../src/empathy-ft-manager.c:351
+#, fuzzy
+msgid "Error sending a file"
+msgstr "Chyba při odesílání zprávy „%s“: %s"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" obdrženo od kontaktu %s"
 
-#: ../src/empathy-ft-manager.c:270
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" odeslán kontaktu %s"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "Přenos souboru byl dokončen"
 
-#: ../src/empathy-ft-manager.c:282
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "\"%s\" stahováno od %s"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#, fuzzy
+msgid "Waiting for the other participant's response"
+msgstr "Čeká se na odpověď protistrany"
 
-#: ../src/empathy-ft-manager.c:288
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "\"%s\" odesíláno kontaktu %s"
+msgid "Checking integrity of \"%s\""
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:291
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "Přenos souboru byl zrušen: %s"
-
-#: ../src/empathy-ft-manager.c:306
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "Neznámo"
-
-#: ../src/empathy-ft-manager.c:366
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Neznámo"
+msgid "Hashing \"%s\""
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:702
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:714
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "Soubor"
 
-#: ../src/empathy-ft-manager.c:736
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "Zbývá"
 
-#: ../src/empathy-ft-manager.c:887
-msgid "Cannot save file to this location"
-msgstr "Do tohoto umístění nelze soubor uložit"
-
-#: ../src/empathy-ft-manager.c:933
-msgid "Save file as..."
-msgstr "Uložit soubor jako..."
-
-#: ../src/empathy-ft-manager.c:1003
-msgid "unknown size"
-msgstr "neznámá velikost"
-
-#: ../src/empathy-ft-manager.c:1009
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s by vám rád zaslal soubor"
-
-#: ../src/empathy-ft-manager.c:1014
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "Chcete přijmout soubor \"%s\" (%s)?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1032
-msgid "_Accept"
-msgstr "_Přijmout"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+#, fuzzy
+msgid "File Transfers"
 msgstr "Přenosy souborů"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Odstranit ze seznamu dokončené, zrušené a nepovedené přenosy"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1853,138 +2193,204 @@ msgstr ""
 "Nenalezeny žádné účty, které by bylo možno importovat. V současnosti "
 "podporuje aplikace Empathy import účtů pouze z klienta Pidgin."
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "Import účtů"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "_Upravit účet"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Neurčena žádná chyba"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Chyba sítě"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Ověření selhalo"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Chyba šifrování"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Jméno používáno"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Certifikát neposkytnut"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Nedůvěryhodný certifikát"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Certifikát není aktivován"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "Certifikát názvu počítače nesouhlasí"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikát otisku prstu nesouhlasí"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Certifikát je podepsán sám sebou"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Chyba certifikátu"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Zobrazit a upravit účty"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "Kontakt"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "_Upravit účet"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Seznam kontaktů"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Kontext"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "Připojit se do _oblíbených"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Připojit se do _nové…"
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Spravovat oblíbené"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Zobrazovat _odpojené kontakty"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Třídit podle jmé_na"
+
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+msgid "Sort by _Status"
+msgstr "Třídit podle s_tavu"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "Úč_ty"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "_Přidat kontakt…"
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr ""
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "Přenosy _souborů"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "Připo_jit..."
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_Nová konverzace…"
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+#, fuzzy
+msgid "_Offline Contacts"
+msgstr "Zobrazovat _odpojené kontakty"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "_Osobní informace"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "_Předchozí konverzace"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Místnost"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:331
+#, fuzzy
+msgid "Chat Room"
 msgstr "Diskuzní místnosti"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Prohlížet:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+#, fuzzy
+msgid "Members"
+msgstr "Motivy"
+
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\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 ""
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../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 ""
 "Zadejte název místnosti, do které se chcete připojit zde, nebo klikněte na "
 "jednu nebo více místností v seznamu."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../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"
@@ -1992,183 +2398,205 @@ msgstr ""
 "Zadejte server, který hostuje místnost, nebo ponechte políčko prázdné, pokud "
 "se místnost nachází na serveru aktuálního účtu"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Připojit se"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Připojit se do nové"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#, fuzzy
+msgid "Join Room"
+msgstr "Místnost"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "_Obnovit"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#, fuzzy
+msgid "Room List"
+msgstr "Ná_rodní prostředí seznamu místností:"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr ""
-"Tento seznam reprezentuje všechny diskuzní místnosti hostované na serveru, "
-"který jste zadali."
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Místnost:"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:148
 msgid "Message received"
 msgstr "Zpráva přijata"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:149
 msgid "Message sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:150
 msgid "New conversation"
 msgstr "Nová konverzace"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes online"
 msgstr "Kontakt se připojuje"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:152
 msgid "Contact goes offline"
 msgstr "Kontakt se odpojuje"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:153
 msgid "Account connected"
 msgstr "Účet připojen"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:154
 msgid "Account disconnected"
 msgstr "Účet odpojen"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:394
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Vzhled</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Chování</b>"
-
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Seznam kontaktů</b>"
-
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Povolit kontrolu pravopisu pro jazyky:</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Přehrávání zvuků při událostech</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
 msgstr ""
-"<small>Seznam jazyků obsahuje pouze jazyky, pro které máte nainstalovány "
-"slovníky.</small>"
 
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "Vzhled"
+
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "Automaticky se _připojovat po spuštění "
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "Avatary jsou uživatelem vybrané obrázky zobrazené v seznamu kontaktů"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "Chování"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "Vzhl_ed diskuze:"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "Nezobrazovat upozornění, když jsem _pryč nebo zaneprázdněn"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "Zakázat zvuky, když jsem _pryč"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+#, fuzzy
+msgid "Enable notifications when a contact comes online"
+msgstr "Povolit upozornění, pokud není _chat vybrán"
+
+#: ../src/empathy-preferences.ui.h:11
+#, fuzzy
+msgid "Enable notifications when a contact goes offline"
+msgstr "Povolit upozornění, pokud není _chat vybrán"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Povolit upozornění, pokud není _chat vybrán"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "Povolit kontrolu pravopisu pro jazyky:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Všeobecné"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+#, fuzzy
+msgid "Location"
+msgstr "Upozornění"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "Přehrávání zvuků při událostech"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "Zobrazovat _avatary"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:21
+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
 msgid "Show _smileys as images"
 msgstr "Zobrazovat _smajlíky jako obrázky"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "Zobrazovat ko_mpaktní seznam kontaktů"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "Třídit podle jmé_na"
-
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "Třídit podle s_tavu"
+#: ../src/empathy-preferences.ui.h:23
+#, fuzzy
+msgid "Show contact _list in rooms"
+msgstr "_Zobrazit seznam kontaktů"
 
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+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:27
 msgid "Themes"
 msgstr "Motivy"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "P_ovolit bublinové upozorňování"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "_Povolit zvuková upozornění"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Otevírat nové diskuze v oddělených oknech"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr ""
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "Stav"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "U_končit"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Zobrazit seznam kontaktů"
-
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "Nelze spustit aplikaci pro službu %s: %s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:446
 #, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
@@ -2176,3 +2604,241 @@ msgid ""
 msgstr ""
 "Pozvání služby %s bylo nabídnuto, ale nemáte vyžadovanou externí aplikaci "
 "pro zpracování"
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+#, fuzzy
+msgid "Contact Map View"
+msgstr "Seznam kontaktů"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#, fuzzy
+msgid "Critical"
+msgstr "chorvatské"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#, fuzzy
+msgid "Warning"
+msgstr "Zbývá"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "Zpráva"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:845
+#, fuzzy
+msgid "Save"
+msgstr "Server"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1102
+#, fuzzy
+msgid "Time"
+msgstr "Jednoduchý"
+
+#: ../src/empathy-debug-dialog.c:1104
+#, fuzzy
+msgid "Domain"
+msgstr "rumunské"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Komunikátor Empathy"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Zapomenout heslo a vymazat políčko."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Síť</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Servery</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Upravit vybranou síť IRC"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Odstranit vybranou síť IRC"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "_Zkontrolovat pravopis…"
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>Téma:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "Skupinová diskuze"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informace o kontaktu"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Rád bych si vás přidal do svého seznamu kontaktů."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Lituji, už vás nechci ve svém seznamu kontaktů."
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Skupiny</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "Informace o kontaktu"
+
+#~ msgid "Word"
+#~ msgstr "Slovo"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Návrhy pravopisu"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Kontrola pravopisu"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Návrhy pravopisu:"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Nový účet</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "Už mám účet, chci jej používat"
+
+#~ msgid "New message from %s"
+#~ msgstr "Nová zpráva od kontaktu %s"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "_Zpráva pozvánky:"
+
+#~ msgid "Invite"
+#~ msgstr "Pozvat"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Vyberte, koho byste chtěli pozvat:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Byli jste pozváni, abyste se připojili k diskuzní konferenci."
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Upravit oblíbenou místnost"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "Připojit se do místnosti po _spuštění"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr ""
+#~ "Připojit se do této diskuzní místnosti, pokud se Empathy spustí a zároveň "
+#~ "budete připojeni"
+
+#~ msgid "N_ame:"
+#~ msgstr "_Jméno:"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_erver:"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "Neznámo"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "\"%s\" stahováno od %s"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "\"%s\" odesíláno kontaktu %s"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "Přenos souboru byl zrušen: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "Neznámo"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "Do tohoto umístění nelze soubor uložit"
+
+#~ msgid "Save file as..."
+#~ msgstr "Uložit soubor jako..."
+
+#~ msgid "unknown size"
+#~ msgstr "neznámá velikost"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s by vám rád zaslal soubor"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "Chcete přijmout soubor \"%s\" (%s)?"
+
+#~ msgid "_Accept"
+#~ msgstr "_Přijmout"
+
+#~ msgid "Join _New..."
+#~ msgstr "Připojit se do _nové…"
+
+#~ msgid "Browse:"
+#~ msgstr "Prohlížet:"
+
+#~ msgid "Join"
+#~ msgstr "Připojit se"
+
+#~ msgid "Join New"
+#~ msgstr "Připojit se do nové"
+
+#~ msgid "Re_fresh"
+#~ msgstr "_Obnovit"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr ""
+#~ "Tento seznam reprezentuje všechny diskuzní místnosti hostované na "
+#~ "serveru, který jste zadali."
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Seznam kontaktů</b>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr ""
+#~ "Avatary jsou uživatelem vybrané obrázky zobrazené v seznamu kontaktů"
+
+#~ msgid "Show _avatars"
+#~ msgstr "Zobrazovat _avatary"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "Zobrazovat ko_mpaktní seznam kontaktů"
diff --git a/po/de.po b/po/de.po
index 1e0aeb5e1..44076d902 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,14 +6,17 @@
 # Andre Klapper <ak-47@gmx.net>, 2007, 2008.
 # Jochen Skulj <jochen@jochenskulj.de>, 2008, 2009.
 # Mario Blättermann <mariobl@gnome.org>, 2008, 2009.
+# Michael Kanis <mkanis@gmx.de>, 2009.
+# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Gossip\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-13 20:50+0200\n"
-"PO-Revision-Date: 2009-04-13 20:54+0100\n"
-"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2009-08-18 20:22+0000\n"
+"PO-Revision-Date: 2009-08-19 00:31+0200\n"
+"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +24,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Empathy Sofortnachrichtendienst"
+msgid "Empathy IM Client"
+msgstr "Empathy Sofortnachrichtenprogramm"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+msgid "Send and receive messages"
 msgstr "Sofortnachrichten senden und empfangen"
 
 #: ../data/empathy.schemas.in.h:1
@@ -72,145 +75,228 @@ msgid "Disable sounds when away"
 msgstr "Klänge bei Abwesenheit deaktivieren"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "Empathy darf die Position des Benutzers veröffentlichen"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy darf das GPS verwenden, um die Position zu schätzen"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy darf das Mobilfunknetz verwenden, um die Position zu schätzen"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy darf das Netzwerk verwenden, um die Position zu ermitteln"
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Empathy-Vorgabeordner für das Herunterladen"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy hat nach dem Importieren von Benutzerkonten gefragt"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Automatisch beim Start verbinden"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy soll die Genauigkeit der Ortsangabe verringern"
+
+#: ../data/empathy.schemas.in.h:18
 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/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit-Entwicklerwerkzeuge aktivieren"
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Einblendende Benachrichtigungen für neue Nachrichten aktivieren"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Rechtschreibprüfung aktivieren"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Hauptfenster verstecken"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Das Hauptfenster verstecken."
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "NetworkManager verwenden"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Zeichen nach der Spitznamen-Vervollständigung"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Neue Chats in eigenen Fenstern öffnen"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "Pfad zum zu verwendenden Adium-Thema"
+
+#: ../data/empathy.schemas.in.h:28
+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 »adium« ist."
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Bei einkommender Nachricht Klang abspielen"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Bei neuen Unterhaltungen Klang abspielen"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Bei ausgehender Nachricht Klang abspielen"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Bei Anmelden eines Kontaktes Klang abspielen"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Bei Abmelden eines Kontaktes Klang abspielen"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Bei eigenem Anmelden Klang abspielen"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Bei eigenem Abmelden Klang abspielen"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Benachrichtigungen einblenden, wenn der Chat nicht fokussiert ist"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "Benachrichtigungen einblenden, wenn sich ein Kontakt anmeldet"
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "Benachrichtigungen einblenden, wenn sich ein Kontakt abmeldet"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Salut-Konto wird erzeugt"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Benutzerbilder anzeigen"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "Kontaktliste in Chaträumen anzeigen"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Hinweis über das Schließen des Hauptfensters anzeigen"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Abgemeldete Kontakte anzeigen"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Rechtschreibprüfungssprachen"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "Der vorgegebene Ordner zum Speichern der Dateiübertragungen"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Der letzte Ordner, aus welchem ein Benutzerbild gewählt wurde."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 "Das Erscheinungsbild, das für das Anzeigen von Unterhaltungen in Chat-"
 "Fenstern verwendet wird."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Grafische Emoticons verwenden"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Benachrichtigen mit Klängen"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Erscheinungsbild für Chaträume verwenden"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+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/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr ""
+"Legt fest, ob Empathy die Position des Benutzers zu seinen Kontakten "
+"übermitteln darf."
+
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr ""
+"Legt fest, ob Empathy das GPS nutzen darf, um die Position zu schätzen."
+
+#: ../data/empathy.schemas.in.h:54
 msgid ""
-"Whether or not Empathy has asked about importing accounts from other programs."
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr ""
+"Legt fest, ob Empathy das Mobilfunknetz nutzen darf, um die Position zu "
+"schätzen."
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr ""
+"Legt fest, ob Empathy das Netzwerk nutzen darf, um die Position zu schätzen."
+
+#: ../data/empathy.schemas.in.h:56
+msgid ""
+"Whether or not Empathy has asked about importing accounts from other "
+"programs."
 msgstr ""
 "Legt fest, ob Empathy danach gefragt hat, Benutzerkonten aus anderen "
 "Programmen zu importieren."
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr ""
-"Legt fest, ob Empathy sich automatisch beim Start bei allen Ihren vorhandenen "
-"Konten anmelden soll."
+"Legt fest, ob Empathy sich automatisch beim Start bei allen Ihren "
+"vorhandenen Konten anmelden soll."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not 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/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
@@ -218,99 +304,113 @@ msgstr ""
 "Legt fest, ob Empathy das Benutzerbild des Kontaktes als Symbol des Chat-"
 "Fensters verwenden soll."
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr ""
-"Stellt fest, ob ein Salut-Konto beim ersten Start von Empathy erzeugt wurde."
+"Legt fest, ob ein Salut-Konto beim ersten Start von Empathy erzeugt wurde."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
-"Whether or not the network manager should be used to automatically disconnect/"
-"reconnect."
+"Whether or not the network manager should be used to automatically "
+"disconnect/reconnect."
 msgstr ""
-"Legt fest, ob der Netzwerk-Manager für das automatische Verbinden und Trennen "
-"der Verbindung verwendet werden soll."
+"Legt fest, ob der Netzwerk-Manager für das automatische Verbinden und "
+"Trennen der Verbindung verwendet werden soll."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr ""
 "Legt fest, ob für eingegebene Wörter die Rechtschreibung geprüft werden soll."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr ""
 "Legt fest, ob bei Unterhaltungen Emoticons in grafische Bilder umgewandelt "
 "werden sollen."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
 "Legt fest, ob ein Klang abgespielt werden soll, um auf das Anmelden von "
 "Kontakten am Netzwerk hinzuweisen."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the network."
+"Whether or not to play a sound to notify for contacts logging off the "
+"network."
 msgstr ""
 "Legt fest, ob ein Klang abgespielt werden soll, um auf das Abmelden von "
 "Kontakten vom Netzwerk hinzuweisen."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Legt fest, ob bei Ereignissen Klänge abgespielt werden sollen."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr ""
 "Legt fest, ob bei eingehenden Nachrichten ein Klang abgespielt werden soll."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Legt fest, ob bei neuen Gesprächen ein Klang abgespielt werden soll."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr ""
 "Legt fest, ob bei ausgehenden Nachrichten ein Klang abgespielt werden soll."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr ""
 "Legt fest, ob beim Anmelden ans Netzwerk ein Klang abgespielt werden soll."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr ""
 "Legt fest, ob beim Abmelden vom Netzwerk ein Klang abgespielt werden soll."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr ""
 "Legt fest, ob bei Abwesenheit oder Beschäftigung Klänge abgespielt werden "
 "sollen."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
 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 or not to show a popup notification when a contact goes offline."
+msgstr ""
+"Legt fest, ob beim Abmelden eines Kontakts eingeblendete Benachrichtigungen "
+"erscheinen sollen."
+
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr ""
+"Legt fest, ob beim Anmelden eines Kontakts eingeblendete Benachrichtigungen "
+"erscheinen sollen."
+
+#: ../data/empathy.schemas.in.h:75
+msgid ""
+"Whether or not 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 eingeblendete Benachrichtigung beim Empfang einer neuen "
 "Nachricht auch dann angezeigt werden soll, wenn der Chat bereits geöffnet, "
 "aber nicht fokussiert ist."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr ""
 "Legt fest, ob beim Empfang einer neuen Nachricht eine eingeblendete "
 "Benachrichtigung erscheinen soll."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -318,17 +418,21 @@ msgstr ""
 "Legt fest, ob Benutzerbilder für Kontakte in der Kontaktliste und den Chat-"
 "Fenstern angezeigt werden sollen."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "Abgemeldete Kontakte in der Kontaktliste anzeigen."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
 "Legt fest, ob bei Abwesenheit oder Beschäftigung eingeblendete "
 "Benachrichtigungen erscheinen sollen."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Legt fest, ob die Kontaktliste in Chaträumen angezeigt werden soll."
+
+#: ../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."
@@ -336,571 +440,792 @@ msgstr ""
 "Legt fest, ob der Dialog über das Schließen des Hauptfensters durch den »x«-"
 "Knopf in der Titelleiste angezeigt werden soll."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Legt fest, ob die Kontaktliste im Kompaktmodus angezeigt werden soll."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Legt fest, ob das Thema für Chaträume verwendet werden soll."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 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."
+"by the contact's name with the value \"name\". A value of \"state\" will "
+"sort the contact list by state."
 msgstr ""
 "Legt fest, welches Kriterium für das Sortieren der Kontaktliste verwendet "
 "werden soll. Standardmäßig wird bei »name« nach den Namen der Kontakte "
 "sortiert, bei »state« wird die Kontaktliste nach dem Status der Kontakte "
 "sortiert."
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:271
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
+"Die Hash-Werte der empfangenen und der verschickten Datei stimmen nicht "
+"überein"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "Dateiübertragungen werden vom Gegenüber nicht unterstützt"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "Die ausgewählte Datei ist keine normale Datei"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "Die ausgewählte Datei ist leer"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Personen in der Nähe"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "Socket-Typ nicht unterstützt"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "Kein Grund wurde angegeben"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "Der Zustandswechsel des Zustands wurde angefordert"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Sie haben die Dateiübertragung abgebrochen"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "Der andere Teilnehmer hat die Dateiübertragung abgebrochen"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Fehler beim Versuch, die Datei zu übertragen"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "Der andere Teilnehmer kann die Datei nicht übertragen"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Unbekannter Grund"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Abwesend"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "Vor %d Sekunde"
+msgstr[1] "Vor %d Sekunden"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "Vor %d Minute"
+msgstr[1] "Vor %d Minuten"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "Vor %d Stunde"
+msgstr[1] "Vor %d Stunden"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Vor %d Tag"
+msgstr[1] "Vor %d Tagen"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "Vor %d Woche"
+msgstr[1] "Vor %d Wochen"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "Vor %d Monat"
+msgstr[1] "Vor %d Monaten"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "in der Zukunft"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Alle"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Fortgeschritten</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Passwort vergessen und den Eintrag löschen."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
+#: ../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
 msgid "Pass_word:"
 msgstr "Pass_wort:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "Anzeige_name:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../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
 msgid "_Port:"
 msgstr "P_ort:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "Anmelde-I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "_Zeichensatz:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Neues Netzwerk"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Netzwerk</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Server</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Zeichensatz:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Ein neues IRC-Netzwerk erstellen"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Gewähltes IRC-Netzwerk bearbeiten"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Netzwerk:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Spitzname:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Verlassen-Nachricht:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Realname:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Gewähltes IRC-Netzwerk entfernen"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Server-Einstellungen überschreiben</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "Server-Einstellungen überschreiben"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "P_riorität:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "_Ressource:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Alte SS_L-Verschlüsselung verwenden"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "_Verschlüsselung erforderlich (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "SSL-Zertifikat-_Fehler ignorieren"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "_E-Mail:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "_Vorname:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber-Kennung:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "_Nachname:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "Spit_zname:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "_Veröffentlichter Name:"
 
 #. 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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "STUN entdecken"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN-Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN-Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "Benutzer_name:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "_Yahoo Japan verwenden"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo-I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Konferenz- und Chatraumeinladungen ignorieren"
 
 # CHECK
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "Standorteinstellungen für _Raumliste:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "Bild konnte nicht umgewandelt werden"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr "Keines der akzeptierten Bildformate wird von Ihrem System unterstützt"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:954
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "Benutzerbild auswählen"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:957
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Kein Bild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1019
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Bilder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1023
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Alle Dateien"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Zum Vergrößern klicken"
 
-#: ../libempathy-gtk/empathy-chat.c:180
+#: ../libempathy-gtk/empathy-chat.c:186
 msgid "Failed to reconnect this chat"
-msgstr "Verbindung für diese Unterhaltung konnte nicht wiederaufgenommen werden"
+msgstr ""
+"Verbindung für diese Unterhaltung konnte nicht wiederaufgenommen werden"
 
-#: ../libempathy-gtk/empathy-chat.c:398
+#: ../libempathy-gtk/empathy-chat.c:412
 msgid "Unsupported command"
 msgstr "Nicht unterstützter Befehl"
 
-#: ../libempathy-gtk/empathy-chat.c:533
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "Abgemeldet"
 
-#: ../libempathy-gtk/empathy-chat.c:536
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "Ungültiger Kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "Zu lange Nachricht"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "Nicht implementiert"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: ../libempathy-gtk/empathy-chat.c:552
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fehler beim Senden der Nachricht »%s«: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:582
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Thema wurde gesetzt auf: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "Kein Thema gesetzt"
 
-#: ../libempathy-gtk/empathy-chat.c:977
+#: ../libempathy-gtk/empathy-chat.c:969
+msgid "(No Suggestions)"
+msgstr "(Keine Vorschläge)"
+
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Emoticon einfügen"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:995
-#: ../libempathy-gtk/empathy-ui-utils.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1483
 msgid "_Send"
 msgstr "_Senden"
 
-#: ../libempathy-gtk/empathy-chat.c:1029
-msgid "_Check Word Spelling..."
-msgstr "_Rechtschreibung prüfen …"
+#: ../libempathy-gtk/empathy-chat.c:1075
+msgid "_Spelling Suggestions"
+msgstr "Vor_schläge zur Rechtschreibung"
 
-#: ../libempathy-gtk/empathy-chat.c:1147
+#: ../libempathy-gtk/empathy-chat.c:1190
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s hat den Raum betreten"
+msgid "%s has disconnected"
+msgstr "%s hat sich abgemeldet"
+
+#: ../libempathy-gtk/empathy-chat.c:1194
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s wurde von %s rausgeworfen"
+
+#: ../libempathy-gtk/empathy-chat.c:1197
+#, c-format
+msgid "%s was kicked"
+msgstr "%s wurde rausgeworfen"
+
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s wurde von %s verbannt"
 
-#: ../libempathy-gtk/empathy-chat.c:1150
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr "%s wurde verbannt"
+
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "%s hat den Raum verlassen"
 
-#: ../libempathy-gtk/empathy-chat.c:1265 ../src/empathy-call-window.c:764
+#. 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:1218
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s hat den Raum betreten"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1277
 msgid "Disconnected"
 msgstr "Getrennt"
 
-#: ../libempathy-gtk/empathy-chat.c:1662
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../libempathy-gtk/empathy-chat.c:1712
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Thema:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Gruppen-Chat"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Thema:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "Link-Adresse _kopieren"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:339
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "Link _öffnen"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:432
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A, %d. %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Persönliche Informationen"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Kontaktinformationen bearbeiten"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Kontaktinformationen"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "Ich möchte Sie/Dich gerne zu meiner Kontaktliste hinzufügen."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Persönliche Informationen"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "_Später entscheiden"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Abonnementanfrage"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1255
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Möchten Sie wirklich die Gruppe »%s« entfernen?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1257
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "Gruppe entfernen"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1304
-#: ../libempathy-gtk/empathy-contact-list-view.c:1383
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1334
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Möchten Sie wirklich den Kontakt »%s« entfernen?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Kontakt entfernen"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1341
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Sorry, ich möchte Sie/Dich nicht mehr in meiner Kontaktliste."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "Kontakt _hinzufügen …"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Chat"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "An_rufen"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audioanruf"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videoanruf"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Vorherige Unterhaltungen anschauen"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Datei senden"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "Meine Arbeitsumgebung freigeben"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Infor_mationen"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Wird in diesen Raum einladen"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_In Chatraum einladen"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:112
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Kontakt auswählen"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:361
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Benutzerbild speichern"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:417
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Benutzerbild konnte nicht gespeichert werden"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:912
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Wählen"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Client-Informationen</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr "ISO-Länderkennung:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Country:"
+msgstr "Land:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "State:"
+msgstr "Bundesland:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "City:"
+msgstr "Stadt:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Area:"
+msgstr "Region:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr "Postleitzahl:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Street:"
+msgstr "Straße:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr "Gebäude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Floor:"
+msgstr "Etage::"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Room:"
+msgstr "Raum:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Text:"
+msgstr "Text:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr "Adresse:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr "Genauigkeitsgrad:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr "Fehler:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Kontakt-Details</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr "Vertikale Ungenauigkeit (Meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Kontakt</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr "Horizontale Ungenauigkeit (Meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Gruppen</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr "Geschwindigkeit:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Bearing:"
+msgstr "Peilung:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr "Steiggeschwindigkeit:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr "Zuletzt aktualisiert am:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr "Längengrad:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr "Breitengrad:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr "Höhe:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+msgid "<b>Location</b>"
+msgstr "<b>Ort</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+msgid "<b>Location</b>, "
+msgstr "<b>Ort</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y um %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Position</b> (Zeitpunkt)\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 "Konto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "Client-Informationen"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Client:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Kontaktinformationen"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Kontakt"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "Kontakt-Details"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Voller Name:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "Gruppen"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Bezeichner:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "Informationen angefordert …"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "Betriebssystem:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -908,201 +1233,204 @@ msgstr ""
 "Wählen Sie die Gruppen, in denen Sie diesen Kontakt anzeigen möchten. Sie "
 "können mehrere Gruppen oder auch keine Gruppe auswählen."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "Webseite:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "Gruppe _hinzufügen"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "neuer Server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:282
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Datum"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Vorherige Unterhaltungen"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Suchen"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_Nach:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "_Anrufen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "C_hat"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "Kontakt-ID:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "Neue Unterhaltung"
 
+#. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
-#. COL_STATUS_TEXT
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:163
+#: ../libempathy-gtk/empathy-presence-chooser.c:172
+#: ../libempathy-gtk/empathy-presence-chooser.c:208
 msgid "Custom Message..."
 msgstr "Benutzerdefinierte Nachricht …"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:218
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
 msgid "Edit Custom Messages..."
 msgstr "Benutzerdefinierte Nachrichten bearbeiten…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:270
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "Klicken, um den Status als Favorit zu entfernen"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "Klicken, um den Status zu einem Favoriten zu machen"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
 msgid "Set status"
 msgstr "Status setzen"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:654
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
 msgid "Set your presence and current status"
 msgstr "Ihren gegenwärtigen Anwesenheitsstatus setzen"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:874
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
 msgid "Custom messages..."
 msgstr "Benutzerdefinierte Nachrichten …"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Benutzerdefinierte Nachricht"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Nachricht:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Nachricht speichern"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Status:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Wort"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Vorschläge für das Wort"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Rechtschreibprüfung"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Vorschläge für das Wort:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "Klassisch"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Einfach"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "Sauber"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "Blau"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1406
-msgid "Unable to open URI"
-msgstr "Adresse konnte nicht geöffnet werden"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1551
-msgid "Select a file"
-msgstr "Eine Datei auswählen"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1587
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "Eine Sofortnachrichten empfangen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1589
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "Eine Sofortnachrichten gesendet"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1591
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "Eingehende Chat-Anfrage"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1593
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "Kontakt verbunden"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1595
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "Kontakt getrennt"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1597
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "Mit Server verbunden"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1599
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "Vom Server getrennt"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1601
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "Eingehender Anruf"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1603
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "Ausgehender Anruf"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1605
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "Gespräch beendet"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "Benutzerdefinierte Nachrichten eingeben"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "Benutzerdefinierte Nachrichten bearbeiten"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "_Neue Voreinstellung hinzufügen"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "Gespeicherte Voreinstellungen"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Klassisch"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Einfach"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Sauber"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Blau"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1385
+msgid "Unable to open URI"
+msgstr "Adresse konnte nicht geöffnet werden"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1475
+msgid "Select a file"
+msgstr "Eine Datei auswählen"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1535
+msgid "Select a destination"
+msgstr "Ein Ziel auswählen"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Aktuelle Locale-Einstellung"
@@ -1291,7 +1619,7 @@ msgid "Megaphone"
 msgstr "Megafon"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Sprich!"
 
@@ -1305,15 +1633,15 @@ msgid "_Information"
 msgstr "_Information"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Bitte konfigurieren Sie einen Kontakt."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Kontakt auswählen …"
 
@@ -1326,23 +1654,23 @@ msgstr "Anwesenheit"
 msgid "Set your own presence"
 msgstr "Setzen Sie Ihre Anwesenheit"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "Nicht automatisch beim Start verbinden"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "Kontaktliste nicht automatisch beim Start anzeigen"
 
-#: ../src/empathy.c:438
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Konten-Dialog anzeigen"
 
-#: ../src/empathy.c:450
-msgid "- Empathy Instant Messenger"
-msgstr "- Empathy Sofortnachrichtendienst"
+#: ../src/empathy.c:587
+msgid "- Empathy IM Client"
+msgstr "- Empathy Sofortnachrichtenprogramm"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1351,14 +1679,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:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1366,7 +1695,7 @@ msgstr ""
 "für weitere Informationen bitte in der GNU General Public License (GNU GPL) "
 "nach."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "
@@ -1377,34 +1706,34 @@ msgstr ""
 "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
 "1301, USA."
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "Ein Instant-Messaging-Programm für GNOME"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "Hendrik Richter\n"
 "Frank Arnold\n"
 "Andre Klapper\n"
-"Mario Blättermann"
+"Mario Blättermann\n"
+"Michael Kanis"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Konten"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Neues %s-Konto"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1413,45 +1742,45 @@ msgstr ""
 "Sie sind dabei, Ihr %s-Konto zu entfernen!\n"
 "Möchten Sie fortfahren?"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you decide "
-"to proceed.\n"
+"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."
+"Should you decide to add the account back at a later time, they will still "
+"be available."
 msgstr ""
-"Jegliche zugehörigen Unterhaltungen und Chaträume werden NICHT entfernt, wenn "
-"Sie fortfahren.\n"
+"Jegliche zugehörigen Unterhaltungen und Chaträume werden NICHT entfernt, "
+"wenn Sie fortfahren.\n"
 "\n"
 "Falls Sie sich dazu entschließen, das Konto später wieder hinzuzufügen, "
 "werden diese weiterhin verfügbar sein."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Neues Konto</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Kein Protokoll installiert</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "Konto hnzufügen"
 
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Einstellungen</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "Er_stellen"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "Ich besitze bereits ein Konto, das ich verwenden möchte"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "Benutzerkonten importieren …"
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Kein Protokoll installiert"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1459,275 +1788,261 @@ msgstr ""
 "Um ein neues Konto hinzuzufügen müssen Sie zunächst das für das Protokoll "
 "benötigte Backend installieren."
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/empathy-call-window.c:346
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "_Hinzufügen …"
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "Ein _neues Konto anlegen"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "Ein _existierendes Konto verwenden"
+
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-call-window.c:349
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: ../src/empathy-call-window.c:352
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "Lautstärke"
 
-#: ../src/empathy-call-window.c:547
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "Verbinden …"
+
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "_Seitenleiste"
 
-#: ../src/empathy-call-window.c:565
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "Wählfeld"
 
-#: ../src/empathy-call-window.c:571
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "Audio-Eingang"
 
-#: ../src/empathy-call-window.c:575
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "Video-Eingang"
 
-#: ../src/empathy-call-window.c:588
-msgid "Connecting..."
-msgstr "Verbinden …"
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
+#, c-format
+msgid "Call with %s"
+msgstr "Mit %s anrufen"
+
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
+msgid "Call"
+msgstr "Anrufen"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:844
+#: ../src/empathy-call-window.c:1390
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Verbunden — %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "Auflegen"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "Wahlwiederholung"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "Audio senden"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "Video senden"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "Video-Vorschau"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "An_rufen"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Ansehen"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Unterhaltungen (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Thema:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Schreibt eine Nachricht."
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:429
-#, c-format
-msgid "New message from %s"
-msgstr "Neue Nachricht von %s"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "_Leeren"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Emoticon einf_ügen"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "Einladungs_nachricht:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Einladen"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
 msgstr "Reiter nach _links verschieben"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
 msgstr "Reiter nach _rechts verschieben"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Auswählen, wen Sie einladen möchten:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Sie wurden eingeladen, einer Chat-Konferenz beizutreten."
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "I_nhalt"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
 msgstr "_Unterhaltung"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
 msgstr "Reiter ab_trennen"
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Favorite Chatroom"
 msgstr "_Favorisierter Chatraum"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
 msgstr "_Nächster Reiter"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Previous Tab"
 msgstr "_Vorheriger Reiter"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "Kontaktliste an_zeigen"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
 msgstr "_Reiter"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Name"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "Raum"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "Auto-Verbinden"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Raumfavoriten bearbeiten"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Raum beim Start betreten"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "Beim Start von Empathy und einer Verbindung diesen Chatraum betreten"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "Raumfavoriten verwalten"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_Name:"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "S_erver:"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_Raum:"
-
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s ruft Sie an, möchten Sie den Anruf annehmen?"
 
-#: ../src/empathy-event-manager.c:387
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "A_bweisen"
 
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_Annehmen"
 
-#: ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Eingehender Anruf von %s"
 
-#: ../src/empathy-event-manager.c:564
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s bietet Ihnen eine Einladung an"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr ""
 "Eine externe Anwendung wird gestartet, um dieses zu bearbeiten/anzunehmen."
 
-#: ../src/empathy-event-manager.c:575
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr ""
 "Sie besitzen die benötigte externe Anwendung nicht, um diesess zu bearbeiten/"
 "anzunehmen."
 
-#: ../src/empathy-event-manager.c:698
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Raumeinladung"
 
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s lädt Sie ein, %s beizutreten"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:709 ../src/empathy-ft-manager.c:1032
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "A_blehnen"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Beitreten"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s hat Sie eingeladen, %s beizutreten"
 
-#: ../src/empathy-event-manager.c:867
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Eingehende Dateiübertragung von %s"
 
-#: ../src/empathy-event-manager.c:961
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Abonnement angefragt von %s"
 
-#: ../src/empathy-event-manager.c:965
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1736,316 +2051,350 @@ msgstr ""
 "\n"
 "Nachricht: %s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s hat sich abgemeldet."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s hat sich angemeldet."
+
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:114
+#: ../src/empathy-ft-manager.c:101
 #, 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:117
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:166
-msgid "No reason was specified"
-msgstr "Kein Grund wurde angegeben"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "The change in state was requested"
-msgstr "Der Zustandswechsel des Zustands wurde angefordert"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "You canceled the file transfer"
-msgstr "Sie haben die Dateiübertragung abgebrochen"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "The other participant canceled the file transfer"
-msgstr "Der andere Teilnehmer hat die Dateiübertragung abgebrochen"
-
-#: ../src/empathy-ft-manager.c:174
-msgid "Error while trying to transfer the file"
-msgstr "Fehler beim Versuch, die Datei zu übertragen"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "The other participant is unable to transfer the file"
-msgstr "Der andere Teilnehmer kann die Datei nicht übertragen"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s von %s bei %s/s"
 
-#: ../src/empathy-ft-manager.c:178
-msgid "Unknown reason"
-msgstr "Unbekannter Grund"
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s von %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:226
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "»%s« wird von %s empfangen"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:229
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "»%s« wird an %s gesendet"
 
-#: ../src/empathy-ft-manager.c:239
-msgctxt "file size"
-msgid "Unknown"
-msgstr "Unbekannt"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Fehler beim Empfangen von »%s« von %s"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:247
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "Fehler beim Empfangen einer Datei"
+
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s von %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "Fehler beim Versenden von »%s« an %s"
 
-#: ../src/empathy-ft-manager.c:254
-msgid "Waiting the other participant's response"
-msgstr "Auf Antwort des anderen Teilnehmers warten"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "Fehler beim Senden einer Datei"
 
-#: ../src/empathy-ft-manager.c:264
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "»%s« von %s empfangen"
 
-#: ../src/empathy-ft-manager.c:270
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "»%s« an %s gesendet"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: ../src/empathy-ft-manager.c:282
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "»%s« wird von %s empfangen"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "Auf Antwort des anderen Teilnehmers warten"
 
-#: ../src/empathy-ft-manager.c:288
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "»%s« wird an %s gesendet"
+msgid "Checking integrity of \"%s\""
+msgstr "Unversehrtheit von »%s« wird geprüft"
 
-#: ../src/empathy-ft-manager.c:291
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "Dateiübertragung abgebrochen: %s"
-
-#: ../src/empathy-ft-manager.c:306
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: ../src/empathy-ft-manager.c:366
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Unbekannt"
+msgid "Hashing \"%s\""
+msgstr "»%s« wird überprüft"
 
-#: ../src/empathy-ft-manager.c:663
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:675
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "Datei"
 
-#: ../src/empathy-ft-manager.c:697
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "Verbleibend"
 
-#: ../src/empathy-ft-manager.c:895
-msgid "Cannot save file to this location"
-msgstr "Datei kann an diesem Ort nicht gespeichert werden"
-
-#: ../src/empathy-ft-manager.c:941
-msgid "Save file as..."
-msgstr "Datei speichern unter …"
-
-#: ../src/empathy-ft-manager.c:1011
-msgid "unknown size"
-msgstr "Unbekannte Größe"
-
-#: ../src/empathy-ft-manager.c:1017
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s möchte Ihnen eine Datei zusenden"
-
-#. Translators: the first %s is the file name, the second %s is the file size
-#: ../src/empathy-ft-manager.c:1023
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "Möchten Sie die Datei »%s« (%s) annehmen?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1041
-msgid "_Accept"
-msgstr "_Annehmen"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
 msgstr "Dateiübertragungen"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Abgeschlossene, abgebrochene und gescheiterte Dateiübertragungen aus der "
 "Liste entfernen"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:260
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-dialog.c:269
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-dialog.c:295
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Quelle"
 
-#: ../src/empathy-import-dialog.c:389
+#: ../src/empathy-import-dialog.c:392
 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.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "Benutzerkonten importieren"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "_Konto bearbeiten"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Kein Fehler angegeben"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Netzwerk-Fehler"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Verschlüsselungsfehler"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Name bereits in Benutzung"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Zertifikat wurde nicht bereitgestellt"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Zertifikat ausgelaufen"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Zertifikat nicht aktiviert"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "Zertifikat und Hostname unterschiedlich"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Zertifikat und Fingerprint unterschiedlich"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Selbstsigniertes Zertifikat"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Zertifikat-Fehler"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Konten anzeigen und bearbeiten"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "Kontakt"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "_Konto bearbeiten"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "Kontakte auf einer _Karte"
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Kontext"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Favoriten betreten"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "_Jetzt beitreten …"
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Favoriten verwalten"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Zeige _abgemeldete Kontakte"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "N_ormale Größe"
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "N_ormale Größe mit Benutzerbildern"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Nach _Name sortieren"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "Nach _Status sortieren"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "_Konten"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "Kontakt _hinzufügen …"
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "_Kompakte Größe"
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "Fehler_diagnose"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "_Dateiübertragungen"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "_Beitreten …"
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_Neue Unterhaltung …"
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "_Abgemeldete Kontakte"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "_Persönliche Informationen"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "_Vorherige Unterhaltungen"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Raum"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
-msgstr "Chaträume"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
+msgstr "Chatraum"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Durchsuchen:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "Teilnehmer"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"Einladung erforderlich: %s\n"
+"Passwort erforderlich: %s\n"
+"Teilnehmer: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "Nein"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "Raumauflistung konnte nicht begonnen werden"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "Raumauflistung konnte nicht angehalten werden"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "Raumliste konnte nicht abgerufen werden"
+
+#: ../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 ""
 "Geben Sie den Namen des Raumes hier ein oder klicken Sie auf einen oder "
 "mehrere Räume in der Liste."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../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"
@@ -2054,185 +2403,202 @@ msgstr ""
 "leer, wenn sich der Raum auf dem Server des momentan verwendeten Kontos "
 "befindet"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Beitreten"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Jetzt beitreten"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "Raum beitreten"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "Auf_frischen"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "Raumliste"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr ""
-"Diese Liste zeigt alle Chaträume an, die auf dem von Ihnen betretenen Server "
-"vorhanden sind."
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Raum:"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:148
 msgid "Message received"
 msgstr "Nachricht empfangen"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:149
 msgid "Message sent"
 msgstr "Nachricht versendet"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:150
 msgid "New conversation"
 msgstr "Neue Unterhaltung"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes online"
 msgstr "Kontakt meldet sich an"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:152
 msgid "Contact goes offline"
 msgstr "Kontakt meldet sich ab"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:153
 msgid "Account connected"
 msgstr "Benutzerkonto verbunden"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:154
 msgid "Account disconnected"
 msgstr "Benutzerkonto getrennt"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:394
 msgid "Language"
 msgstr "Sprache"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Erscheinungsbild</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "GPS-Verwendung erlauben"
 
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Verhalten</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "Nutzung des Mobiltelefons erlauben"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Kontaktliste</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "Nutzung des Netzwerks erlauben"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Rechtschreibprüfung für Sprachen aktivieren:</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "Erscheinungsbild"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Klänge für Ereignisse abspielen</b>"
-
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have a "
-"dictionary installed.</small>"
-msgstr ""
-"<small>Die Liste der Sprachen zeigt nur die Sprachen an, für die Wörterbücher "
-"installiert sind.</small>"
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "Automatisch beim Start _verbinden"
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr ""
-"Benutzerbilder sind von den Benutzern ausgesuchte Bilder, die in der "
-"Kontaktliste angezeigt werden"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "Verhalten"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "Chat-_Erscheinungsbild:"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "Klänge bei _Abwesenheit oder Beschäftigung aktivieren"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "Klänge bei _Abwesenheit oder Beschäftigung aktivieren"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../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:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "Benachrichtigungen aktivieren, wenn sich ein Kontakt abmeldet"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Benachrichtigungen anzeigen, wenn der _Chat nicht fokussiert ist"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "Rechtschreibprüfung für Sprachen aktivieren:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Geoclue-Einstellungen"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "Position"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Benachrichtigen"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "Klänge für Ereignisse abspielen"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "_Benutzerbilder anzeigen"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "Privatssphäre"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:21
+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 ""
+"Verringerte Positionsgenauigkeit bedeutet, dass keine präziseren Angaben als "
+"Ihre Stadt, Ihr Bundesland und Ihr Land übermittelt werden.  GPS-Koordinaten "
+"werden auf eine Dezimalstelle genau sein."
+
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "_Emoticons in grafische Bilder umwandeln"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "Ko_mpakte Kontaktliste anzeigen"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "Nach _Name sortieren"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "Kontaktliste in Räumen an_zeigen"
 
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "Nach _Status sortieren"
-
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Klänge"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Die Liste der Sprachen zeigt nur die Sprachen an, für die Wörterbücher "
+"installiert sind."
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Erscheinungsbilder"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "Einblendende Benachrichtigungen _aktivieren"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "Klänge bei Abwesenheit _aktivieren"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Neue Chats in eigenen Fenstern öffnen"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "_Position an meine Kontakte übermitteln"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "Positionsgenauigkeit ve_rringern"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "Kontaktliste an_zeigen"
-
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "Anwendung für Dienst %s konnte nicht gestartet werden: %s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:446
 #, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
@@ -2241,6 +2607,249 @@ msgstr ""
 "Ihnen wurde eine Einladung für den Dienst %s angeboten, aber Sie besitzen "
 "nicht die benötigte externe Anwendung, um diese zu bearbeiten/anzunehmen."
 
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "Kartenansicht mit Kontakten"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Fehler"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "Kritisch"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "Warnung"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "Nachricht"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "Info"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "Fehlerdiagnose"
+
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "Speichern"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "Fehlerdiagnosefenster"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "Pause"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "Stufe"
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "Zeit"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "Domäne"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "Kategorie"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "Stufe"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"Der ausgewählte Verbindungs-Manager unterstützt die Erweiterung zur "
+"entfernten Fehlerdiagnose nicht."
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy Sofortnachrichtendienst"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Passwort vergessen und den Eintrag löschen."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Netzwerk</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Server</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Gewähltes IRC-Netzwerk bearbeiten"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Gewähltes IRC-Netzwerk entfernen"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "_Rechtschreibung prüfen …"
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>Thema:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "Gruppen-Chat"
+
+#~ msgid "Contact Information"
+#~ msgstr "Kontaktinformationen"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Ich möchte Sie/Dich gerne zu meiner Kontaktliste hinzufügen."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Sorry, ich möchte Sie/Dich nicht mehr in meiner Kontaktliste."
+
+#~ msgid "<b>Contact</b>"
+#~ msgstr "<b>Kontakt</b>"
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Gruppen</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "Kontaktinformationen"
+
+#~ msgid "Custom message"
+#~ msgstr "Benutzerdefinierte Nachricht"
+
+#~ msgid "Word"
+#~ msgstr "Wort"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Vorschläge für das Wort"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Rechtschreibprüfung"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Vorschläge für das Wort:"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Empathy Sofortnachrichtendienst"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Neues Konto</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "Ich besitze bereits ein Konto, das ich verwenden möchte"
+
+#~ msgid "New message from %s"
+#~ msgstr "Neue Nachricht von %s"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "Einladungs_nachricht:"
+
+#~ msgid "Invite"
+#~ msgstr "Einladen"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Auswählen, wen Sie einladen möchten:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Sie wurden eingeladen, einer Chat-Konferenz beizutreten."
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Raumfavoriten bearbeiten"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "Raum beim Start betreten"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr ""
+#~ "Beim Start von Empathy und einer Verbindung diesen Chatraum betreten"
+
+#~ msgid "N_ame:"
+#~ msgstr "_Name:"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_erver:"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "Unbekannt"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "»%s« wird von %s empfangen"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "»%s« wird an %s gesendet"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "Dateiübertragung abgebrochen: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "Unbekannt"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "Datei kann an diesem Ort nicht gespeichert werden"
+
+#~ msgid "Save file as..."
+#~ msgstr "Datei speichern unter …"
+
+#~ msgid "unknown size"
+#~ msgstr "Unbekannte Größe"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s möchte Ihnen eine Datei zusenden"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "Möchten Sie die Datei »%s« (%s) annehmen?"
+
+#~ msgid "_Accept"
+#~ msgstr "_Annehmen"
+
+#~ msgid "Join _New..."
+#~ msgstr "_Jetzt beitreten …"
+
+#~ msgid "Browse:"
+#~ msgstr "Durchsuchen:"
+
+#~ msgid "Join"
+#~ msgstr "Beitreten"
+
+#~ msgid "Join New"
+#~ msgstr "Jetzt beitreten"
+
+#~ msgid "Re_fresh"
+#~ msgstr "Auf_frischen"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr ""
+#~ "Diese Liste zeigt alle Chaträume an, die auf dem von Ihnen betretenen "
+#~ "Server vorhanden sind."
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Kontaktliste</b>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr ""
+#~ "Benutzerbilder sind von den Benutzern ausgesuchte Bilder, die in der "
+#~ "Kontaktliste angezeigt werden"
+
+#~ msgid "Show _avatars"
+#~ msgstr "_Benutzerbilder anzeigen"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "Ko_mpakte Kontaktliste anzeigen"
+
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "Popup aktivieren, falls Kontakt verfügbar ist"
 
@@ -2258,18 +2867,9 @@ msgstr ""
 #~ msgid "Closing this window will end the call in progress."
 #~ msgstr "Das Schließen dieses Fensters beendet den momentanen Anruf."
 
-#~ msgid "_End Call"
-#~ msgstr "Anruf be_enden"
-
-#~ msgid "Empathy Call"
-#~ msgstr "Empathy-Anruf"
-
 #~ msgid "Readying"
 #~ msgstr "Vorbereiten"
 
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - Empathy-Anruf"
-
 #~ msgid "Ringing"
 #~ msgstr "Klingeln"
 
@@ -2376,14 +2976,15 @@ msgstr ""
 #~ "To add a new account, you can click on the 'Add' button and a new entry "
 #~ "will be created for you to start configuring."
 #~ msgstr ""
-#~ "Um ein neues Konto hinzuzufügen klicken Sie auf den »Hinzufügen«-Knopf. Ein "
-#~ "neuer Eintrag wird nun für Sie erstellt, der danach bearbeitet werden kann."
+#~ "Um ein neues Konto hinzuzufügen klicken Sie auf den »Hinzufügen«-Knopf. "
+#~ "Ein neuer Eintrag wird nun für Sie erstellt, der danach bearbeitet werden "
+#~ "kann."
 
 #~ msgid ""
 #~ "\n"
 #~ "\n"
-#~ "If you do not want to add an account, simply click on the account you want "
-#~ "to configure in the list on the left."
+#~ "If you do not want to add an account, simply click on the account you "
+#~ "want to configure in the list on the left."
 #~ msgstr ""
 #~ "\n"
 #~ "\n"
@@ -2397,11 +2998,11 @@ msgstr ""
 #~ "To add a new account, you can click on the 'Add' button and a new entry "
 #~ "will be created for you to started configuring.\n"
 #~ "\n"
-#~ "If you do not want to add an account, simply click on the account you want "
-#~ "to configure in the list on the left."
+#~ "If you do not want to add an account, simply click on the account you "
+#~ "want to configure in the list on the left."
 #~ msgstr ""
-#~ "Um ein neues Konto hinzuzufügen klicken Sie auf den »Hinzufügen«-Knopf. Ein "
-#~ "neuer Eintrag wird nun für Sie erstellt, der danach bearbeitet werden "
+#~ "Um ein neues Konto hinzuzufügen klicken Sie auf den »Hinzufügen«-Knopf. "
+#~ "Ein neuer Eintrag wird nun für Sie erstellt, der danach bearbeitet werden "
 #~ "kann.\n"
 #~ "\n"
 #~ "Falls Sie kein neues Konto erstellen möchten klicken Sie einfach in der "
@@ -2446,9 +3047,6 @@ msgstr ""
 #~ msgid "_Copy"
 #~ msgstr "_Kopieren"
 
-#~ msgid "_Paste"
-#~ msgstr "E_infügen"
-
 #~ msgid "_Show Contacts"
 #~ msgstr "Kontakte an_zeigen"
 
@@ -2480,14 +3078,5 @@ msgstr ""
 #~ msgid "_New Message..."
 #~ msgstr "_Neue Nachricht …"
 
-#~ msgid "<b>Options</b>"
-#~ msgstr "<b>Optionen</b>"
-
 #~ msgid "_Use for chat rooms"
 #~ msgstr "Für Chaträume _benutzen"
-
-#~ msgid "%s went offline"
-#~ msgstr "%s hat sich abgemeldet"
-
-#~ msgid "%s has come online"
-#~ msgstr "%s hat sich angemeldet"
diff --git a/po/es.po b/po/es.po
index 7f6874592..e34178385 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: empathy.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2009-07-20 15:33+0000\n"
-"PO-Revision-Date: 2009-07-20 20:08+0200\n"
+"POT-Creation-Date: 2009-08-14 16:13+0000\n"
+"PO-Revision-Date: 2009-08-15 13:12+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Mensajería instantánea Empathy"
+msgid "Empathy IM Client"
+msgstr "Cliente de mensajería instantánea Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+msgid "Send and receive messages"
 msgstr "Envíe y reciba mensajes instantáneos"
 
 #: ../data/empathy.schemas.in.h:1
@@ -588,7 +588,7 @@ msgstr "%s:"
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
 msgid "Advanced"
-msgstr "Avanzado"
+msgstr "Avanzadas"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
@@ -788,92 +788,92 @@ msgstr "Pulse para agrandar"
 msgid "Failed to reconnect this chat"
 msgstr "Falló al reconectar a este chat"
 
-#: ../libempathy-gtk/empathy-chat.c:404
+#: ../libempathy-gtk/empathy-chat.c:412
 msgid "Unsupported command"
 msgstr "Comando no soportado"
 
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "contacto no válido"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "mensaje demasiado largo"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "no implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error al enviar el mensaje «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "El tema se ha establecido a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "No se ha definido el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:969
 msgid "(No Suggestions)"
 msgstr "(Sin sugerencias)"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-chat.c:1041
 #: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "E_nviar"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "_Spelling Suggestions"
 msgstr "_Sugerencias ortográficas"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1190
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se ha desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1185
+#: ../libempathy-gtk/empathy-chat.c:1194
 #, c-format
 msgid "%s was kicked by %s"
 msgstr "%s fue expulsado por %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1197
 #, c-format
 msgid "%s was kicked"
 msgstr "%s fue expulsado"
 
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1202
 #, c-format
 msgid "%s was banned by %s"
 msgstr "%s fue vetado por %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1196
+#: ../libempathy-gtk/empathy-chat.c:1205
 #, c-format
 msgid "%s was banned"
 msgstr "%s fue vetado"
 
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha dejado la sala"
@@ -883,25 +883,25 @@ 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:1209
+#: ../libempathy-gtk/empathy-chat.c:1218
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:1241
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ha entrado en la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-chat.c:1859
 #: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Conversación"
@@ -912,13 +912,13 @@ msgstr "Tema:"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:264
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "_Copiar la dirección del enlace"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:272
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_Abrir enlace"
 
@@ -937,7 +937,7 @@ msgstr "Editar información del contacto"
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:393
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
@@ -949,27 +949,27 @@ msgstr "Decidir _luego"
 msgid "Subscription Request"
 msgstr "Petición de suscripción"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1400
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "¿Realmente quiere quitar el grupo «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1402
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "Quitando grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1449
-#: ../libempathy-gtk/empathy-contact-list-view.c:1526
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1479
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "¿Realmente quiere quitar el contacto «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1481
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Quitando el contacto"
 
@@ -1010,7 +1010,7 @@ msgid "Infor_mation"
 msgstr "Infor_mación"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1034,120 +1034,120 @@ msgstr "Guardar avatar"
 msgid "Unable to save avatar"
 msgstr "No se pudo guardar el avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:992
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
 #: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1252
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1254
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "State:"
 msgstr "Estado:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "City:"
 msgstr "Ciudad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Area:"
 msgstr "Área:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Street:"
 msgstr "Calle:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Building:"
 msgstr "Edificio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "Floor:"
 msgstr "Planta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Room:"
 msgstr "Habitación:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Accuracy Level:"
 msgstr "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Vertical Error (meters):"
 msgstr "Error vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Horizontal Error (meters):"
 msgstr "Error horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Bearing:"
 msgstr "Retardo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Climb Speed:"
 msgstr "Velocidad de ascenso:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
 msgid "Last Updated on:"
 msgstr "Actualizado por última vez:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
 msgid "Longitude:"
 msgstr "Longitud_"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
 msgid "Latitude:"
 msgstr "Latitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
 msgid "Altitude:"
 msgstr "Altitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
 msgid "<b>Location</b>"
 msgstr "<b>Ubicación</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1358
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
 msgid "<b>Location</b>, "
 msgstr "<b>Ubicación</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1408
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a las %R UTC"
 
@@ -1289,16 +1289,18 @@ msgstr "ID del contacto:"
 msgid "New Conversation"
 msgstr "Conversación nueva"
 
+#. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
-#. COL_STATUS_TEXT
 #. 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 "Mensaje personalizado…"
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
 #: ../libempathy-gtk/empathy-presence-chooser.c:227
 msgid "Edit Custom Messages..."
 msgstr "Editar mensajes personalizados…"
@@ -1412,7 +1414,7 @@ msgstr "No se pudo abrir el URI"
 msgid "Select a file"
 msgstr "Seleccionar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
 msgid "Select a destination"
 msgstr "Seleccionar un destino"
 
@@ -1637,21 +1639,21 @@ msgstr "Presencia"
 msgid "Set your own presence"
 msgstr "Establezca su propia presencia"
 
-#: ../src/empathy.c:506
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "No conectarse automáticamente al inicio"
 
-#: ../src/empathy.c:510
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "No mostrar la lista de contactos al inicio"
 
-#: ../src/empathy.c:514
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Mostrar el diálogo de las cuentas"
 
-#: ../src/empathy.c:526
-msgid "- Empathy Instant Messenger"
-msgstr "- Mensajería instantánea Empathy"
+#: ../src/empathy.c:587
+msgid "- Empathy IM Client"
+msgstr "- Cliente de mensajería instantánea Empathy"
 
 #: ../src/empathy-about-dialog.c:83
 msgid ""
@@ -1697,7 +1699,7 @@ msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2007-2009"
 
 #: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
-msgstr "Activado"
+msgstr "Activada"
 
 #: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
@@ -1779,53 +1781,53 @@ msgstr "_Crear una cuenta nueva"
 msgid "_Reuse an existing account"
 msgstr "_Usar una cuenta ya existente"
 
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "Volumen"
 
-#: ../src/empathy-call-window.c:662
+#: ../src/empathy-call-window.c:671
 msgid "Connecting..."
 msgstr "Conectando…"
 
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "Teclado de llamada"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "Entrada de sonido"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-call-window.c:835
+#: ../src/empathy-call-window.c:866
 #, c-format
 msgid "Call with %s"
 msgstr "Llamar con %s"
 
-#: ../src/empathy-call-window.c:904
+#: ../src/empathy-call-window.c:935
 msgid "Call"
 msgstr "Llamar"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1335
+#: ../src/empathy-call-window.c:1387
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
@@ -1867,6 +1869,66 @@ msgstr "Conversaciones (%d)"
 msgid "Typing a message."
 msgstr "Tecleando un mensaje."
 
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "_Limpiar"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "Chat"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Insertar _emoticono"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "Mover solapa a la _izquierda"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "Mover solapa a la _derecha"
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "Con_tacto"
+
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "Índ_ice"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "_Conversación"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "_Detach Tab"
+msgstr "_Desacoplar solapa"
+
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Favorite Chatroom"
+msgstr "Sala de chat _favorita"
+
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "Ay_uda"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr "Solapa _siguiente"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "Solapa _anterior"
+
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "_Mostrar lista de contactos"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "_Solapas"
+
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Nombre"
@@ -2218,10 +2280,6 @@ msgstr "_Cuentas"
 msgid "_Compact Size"
 msgstr "Tamaño _compacto"
 
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Contents"
-msgstr "Índ_ice"
-
 #: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
 msgstr "_Depurar"
@@ -2230,10 +2288,6 @@ msgstr "_Depurar"
 msgid "_File Transfers"
 msgstr "_Transferencias de archivos"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Help"
-msgstr "Ay_uda"
-
 #: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
 msgstr "_Unirse…"
@@ -2331,35 +2385,35 @@ msgstr "Lista de salas"
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:148
 msgid "Message received"
 msgstr "Mensaje recibido"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:149
 msgid "Message sent"
 msgstr "Mensaje enviado"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:150
 msgid "New conversation"
 msgstr "Conversación nueva"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes online"
 msgstr "El contacto se conecta"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:152
 msgid "Contact goes offline"
 msgstr "El contacto se desconecta"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:153
 msgid "Account connected"
 msgstr "Cuenta conectada"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:154
 msgid "Account disconnected"
 msgstr "Cuenta desconectada"
 
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:394
 msgid "Language"
 msgstr "Idioma"
 
@@ -2446,12 +2500,12 @@ msgstr "Privacidad"
 #: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will have a random "
-"value added (&#xB1;0.25&#xB0;)."
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
 "Reducir la precisión de la ubicación significa que no se publicará nada más "
 "preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
-"aleatorio añadido (&#xB1;0.25&#xB0;)."
+"aleatorio añadido 1 lugar decimal."
 
 #: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
@@ -2509,10 +2563,6 @@ msgstr "Estado"
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Show Contact List"
-msgstr "_Mostrar lista de contactos"
-
 #: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
@@ -2600,6 +2650,12 @@ msgstr ""
 "El gestor de conexiones seleccionado no soporta la extensión de depuración "
 "remota."
 
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Mensajería instantánea Empathy"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Mensajería instantánea Empathy"
+
 #~ msgid "Avatars are user chosen images shown in the contact list"
 #~ msgstr ""
 #~ "Los avatares son imágenes elegidas por el usuario que se muestran en la "
@@ -2741,54 +2797,18 @@ msgstr ""
 #~ msgid "Contact information"
 #~ msgstr "Información del contacto"
 
-#~ msgid "C_lear"
-#~ msgstr "_Limpiar"
-
-#~ msgid "Chat"
-#~ msgstr "Chat"
-
-#~ msgid "Insert _Smiley"
-#~ msgstr "Insertar _emoticono"
-
 #~ msgid "Invitation _message:"
 #~ msgstr "_Mensaje de invitación:"
 
 #~ msgid "Invite"
 #~ msgstr "Invitar"
 
-#~ msgid "Move Tab _Left"
-#~ msgstr "Mover solapa a la _izquierda"
-
-#~ msgid "Move Tab _Right"
-#~ msgstr "Mover solapa a la _derecha"
-
 #~ msgid "Select who would you like to invite:"
 #~ msgstr "Seleccione a quién quiere invitar:"
 
 #~ msgid "You have been invited to join a chat conference."
 #~ msgstr "Le han invitado a unirse a una conferencia por chat."
 
-#~ msgid "_Contact"
-#~ msgstr "Con_tacto"
-
-#~ msgid "_Conversation"
-#~ msgstr "_Conversación"
-
-#~ msgid "_Detach Tab"
-#~ msgstr "_Desacoplar solapa"
-
-#~ msgid "_Favorite Chatroom"
-#~ msgstr "Sala de chat _favorita"
-
-#~ msgid "_Next Tab"
-#~ msgstr "Solapa _siguiente"
-
-#~ msgid "_Previous Tab"
-#~ msgstr "Solapa _anterior"
-
-#~ msgid "_Tabs"
-#~ msgstr "_Solapas"
-
 #~ msgid "Edit Favorite Room"
 #~ msgstr "Editar sala de favoritos"
 
@@ -2838,15 +2858,9 @@ msgstr ""
 #~ msgid "Closing this window will end the call in progress."
 #~ msgstr "Cerrar esta ventana finalizará la llamada en progreso."
 
-#~ msgid "Empathy Call"
-#~ msgstr "Llamada de Empathy"
-
 #~ msgid "Readying"
 #~ msgstr "Preparándose"
 
-#~ msgid "%s - Empathy Call"
-#~ msgstr "Llamada de Empathy - %s"
-
 #~ msgid "Ringing"
 #~ msgstr "Llamando"
 
diff --git a/po/et.po b/po/et.po
index edff3cc18..e87a12198 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,361 +1,365 @@
 # Empathy'i eesti keele tõlge.
-# Estonian translation of Pidgin.
+# Estonian translation of Empathy.
 #
 # Copyright (C) 2005-2008 Free Software Foundation, Inc.
+#
 # Ivar Smolin <okul at linux ee>, 2005-2008.
 # Mattias Põldaru <mahfiaz gmail com>, 2009.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin 2.5.2\n"
+"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: 2009-06-30 17:22+0000\n"
-"PO-Revision-Date: 2009-07-29 11:06+0300\n"
-"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
+"POT-Creation-Date: 2009-08-20 13:44+0000\n"
+"PO-Revision-Date: 2009-08-21 15:26+0300\n"
+"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.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"
 
-#, fuzzy
-msgid "Empathy Instant Messenger"
-msgstr "Interneti sõnumivahetus"
+msgid "Empathy IM Client"
+msgstr "Empathy sõnumivahetuse klient"
 
-#, fuzzy
-msgid "Send and receive instant messages"
-msgstr "Kõiki välksõnumeid _logitakse"
+msgid "Send and receive messages"
+msgstr "Sõnumite saatmine ja vastuvõtt"
 
 msgid "Always open a separate chat window for new chats."
-msgstr ""
+msgstr "Uutele vestlustele avatakse alati eraldi aken."
 
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
+"Märk, mis lisatakse hüüdnime lõppu, kui jututoas kasutatakse nime "
+"automaatlõpetust (tab-klahv)."
 
-#, fuzzy
 msgid "Chat window theme"
-msgstr "_Jututoaakendele"
+msgstr "Jututoaakende teema"
 
 msgid ""
 "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
 msgstr ""
+"Komadega eraldatud loend õigekirjakontrolli keeltest (nt et, en, fi, ru)."
 
-#, fuzzy
 msgid "Compact contact list"
-msgstr "Pole nimekirjas"
+msgstr "Kompaktne sõbranimekiri"
+
+msgid "Connection managers should be used"
+msgstr "Kas peab ühenduste haldureid kasutama"
 
 msgid "Contact list sort criterium"
-msgstr ""
+msgstr "Kontaktide nimekirja sortimise alus"
 
 msgid "Default directory to select an avatar image from"
-msgstr ""
+msgstr "Vaikimisi kataloog, millest valida avatari pilti"
 
-#, fuzzy
 msgid "Disable popup notifications when away"
-msgstr "Tippimismärguande lubamine"
+msgstr "Eemalolekul on hüpikmärguanded keelatud"
 
-#, fuzzy
 msgid "Disable sounds when away"
-msgstr "Keelatakse minu eemaloleku korral"
+msgstr "Heliteated on minu eemaloleku korral keelatud"
 
 msgid "Empathy can publish the user's location"
-msgstr ""
+msgstr "Empathy tohib näidata kasutaja asukohta"
 
 msgid "Empathy can use the GPS to guess the location"
-msgstr ""
+msgstr "Empathy tohib kasutada GPS-i andmeid asukoha arvamiseks"
 
 msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
+msgstr "Empathy tohib kasutada mobiilivõrku asukoha arvamiseks"
 
 msgid "Empathy can use the network to guess the location"
-msgstr ""
+msgstr "Empathy tohib kasutada võrku asukoha arvamiseks"
 
 msgid "Empathy default download folder"
-msgstr ""
+msgstr "Empathy vaikimisi allalaadimiste kataloog"
 
 msgid "Empathy has asked about importing accounts"
-msgstr ""
+msgstr "Empathylt küsiti kontode importimise kohta"
 
 msgid "Empathy should auto-connect on startup"
-msgstr ""
+msgstr "Empathy peaks käivitumisel ise ühenduma"
 
 msgid "Empathy should reduce the location's accuracy"
-msgstr ""
+msgstr "Empathy peaks vähendama asukoha täpsust"
 
 msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
+msgstr "Empathy peaks kasutama avatari vestlusakna ikoonina"
+
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit Developer tööriistade lubamine"
 
-#, fuzzy
 msgid "Enable popup notifications for new messages"
-msgstr "Tippimismärguande lubamine"
+msgstr "Uute sõnumite hüpikmärguanded on lubatud"
 
 msgid "Enable spell checker"
-msgstr ""
+msgstr "Õigekirjakontrolli lubamine"
 
-#, fuzzy
 msgid "Hide main window"
-msgstr "Avatakse välksõnumi aken"
+msgstr "Peida peaaken"
 
-#, fuzzy
 msgid "Hide the main window."
-msgstr "Olemasolevasse aknasse"
-
-msgid "NetworkManager should be used"
-msgstr ""
+msgstr "Peaakna peitmine."
 
 msgid "Nick completed character"
-msgstr ""
+msgstr "Nimele lisamise märk"
 
-#, fuzzy
 msgid "Open new chats in separate windows"
-msgstr "_Välksõnumeid ja vestlusi näidatakse kaartidega aknas"
+msgstr "Uued jututoad avatakse eraldi akendes"
 
 msgid "Path of the adium theme to use"
-msgstr ""
+msgstr "Kasutatava Adiumi kujunduse asukoht"
 
 msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr ""
+msgstr "Kasutatava Adiumi kujunduse asukoht, kui vestluse kujundus on adium."
 
-#, fuzzy
 msgid "Play a sound for incoming messages"
-msgstr "Sissetulevatel sõnumitel _näidatakse vormindust"
+msgstr "Sissetulevate sõnumite puhul esitatakse heli"
 
-#, fuzzy
 msgid "Play a sound for new conversations"
-msgstr "%s lahkus vestlusest."
+msgstr "Uute vestluste puhul esitatakse heli"
 
 msgid "Play a sound for outgoing messages"
-msgstr ""
+msgstr "Väljuvate sõnumite puhul esitatakse heli"
 
 msgid "Play a sound when a contact logs in"
-msgstr ""
+msgstr "Kontakti sisenemise puhul esitatakse heli"
 
 msgid "Play a sound when a contact logs out"
-msgstr ""
+msgstr "Kontakti väljumise puhul esitatakse heli"
 
 msgid "Play a sound when we log in"
-msgstr "Sisselogimisel mängitakse heli"
+msgstr "Heli esitamine sisselogimisel"
 
 msgid "Play a sound when we log out"
-msgstr "Väljalogimisel mängitakse heli"
+msgstr "Heli esitamine väljalogimisel"
 
 msgid "Popup notifications if the chat isn't focused"
-msgstr ""
+msgstr "Kui vestlus pole aktiivne, näidatakse hüpikteateid"
 
 msgid "Popup notifications when a contact sign in"
-msgstr ""
+msgstr "Kui kontakt siseneb, näidatakse hüpikteateid"
 
 msgid "Popup notifications when a contact sign out"
-msgstr ""
+msgstr "Kui kontakt väljub, näidatakse hüpikteateid"
 
 msgid "Salut account is created"
-msgstr ""
+msgstr "Salut-i konto on loodud"
 
 msgid "Show avatars"
-msgstr ""
+msgstr "Näidatakse avatare"
 
 msgid "Show contact list in rooms"
-msgstr ""
+msgstr "Jututubades näidatakse liikmete loendit"
 
 msgid "Show hint about closing the main window"
-msgstr ""
+msgstr "Peaakna sulgemise kohta näidatakse soovitust"
 
 msgid "Show offline contacts"
 msgstr "Ühendamata sõpru näidatakse"
 
 msgid "Spell checking languages"
-msgstr ""
+msgstr "Õigekirjakontrolli keeled"
 
 msgid "The default folder to save file transfers in."
-msgstr ""
+msgstr "Vaikimisi kataloog, kuhu salvestada vastuvõetud failid."
 
 msgid "The last directory that an avatar image was chosen from."
-msgstr ""
+msgstr "Kataloog, kust viimati valiti avatari pilt."
 
 msgid "The theme that is used to display the conversation in chat windows."
-msgstr ""
+msgstr "Kujundus, mida kasutatakse jututoaakende vestluste kuvamisel."
 
 msgid "Use graphical smileys"
-msgstr ""
+msgstr "Tujunägudele kasutatakse pilte"
 
 msgid "Use notification sounds"
 msgstr "Teatehelisid esitatakse"
 
 msgid "Use theme for chat rooms"
-msgstr ""
+msgstr "Jututubadele kasutatakse teemat"
+
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Kas WebKit developer tööriistad, näiteks Web Inspector, tuleks lubada."
 
 msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr ""
+msgstr "Kas Empathy võib avaldada kontaktidele kasutaja asukoha."
 
 msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr ""
+msgstr "Kas Empathy võib kasutada GPS-i asukoha arvamiseks."
 
 msgid ""
 "Whether or not Empathy can use the cellular network to guess the location."
-msgstr ""
+msgstr "Kas Empathy võib kasutada mobiilivõrku asukoha arvamiseks."
 
 msgid "Whether or not Empathy can use the network to guess the location."
-msgstr ""
+msgstr "Kas Empathy võib kasutada võrku asukoha arvamiseks."
 
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr ""
+"Kas Empathy on küsinud kontode importimise kohta teistest rakendustest."
 
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
-msgstr ""
+msgstr "Kas Empathy peaks käivitumisel ise kontodesse sisse logima."
 
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
-msgstr ""
+msgstr "Kas Empathy peaks privaatsuse tagamiseks vähendama asukoha täpsust."
 
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
-msgstr ""
+msgstr "Kas Empathy peaks kasutama kontakti avatari vestlusakna ikoonina."
 
 msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
+"Whether or not connectivity managers should be used to automatically "
+"disconnect/reconnect."
 msgstr ""
+"Kas automaatseks lahti- või taasühendumiseks tuleks kasutada ühenduste "
+"haldurit või mitte."
 
 msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
-msgstr ""
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr "Kas Salut konto loodi Empathy esimesel käivitumisel."
 
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr ""
+"Kas sisestatud sõnade õigsust tuleks kontrollida sinu valitud keelte järgi."
 
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
-msgstr ""
+msgstr "Kas tujunäod tuleks teisendada vestlustes piltidega."
 
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
-msgstr ""
+msgstr "Kas esitada heli kontakti sisenemisest märkuandmiseks."
 
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
-msgstr ""
+msgstr "Kas esitada heli kontakti väljumisest märkuandmiseks."
 
 msgid "Whether or not to play a sound to notify for events."
-msgstr ""
+msgstr "Kas esitada heli sündmustest märkuandmiseks."
 
 msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr ""
+msgstr "Kas esitada heli saabuvatest sõnumitest märkuandmiseks."
 
 msgid "Whether or not to play a sound to notify for new conversations."
-msgstr ""
+msgstr "Kas esitada heli uutest vestlustest märkuandmiseks."
 
 msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr ""
+msgstr "Kas esitada heli väljuvatest sõnumitest märkuandmiseks."
 
 msgid "Whether or not to play a sound when logging in a network."
-msgstr ""
+msgstr "Kas esitada heli võrku sisselogimisest märkuandmiseks."
 
 msgid "Whether or not to play a sound when logging off a network."
-msgstr ""
+msgstr "Kas esitada heli võrgust väljumisest märkuandmiseks."
 
 msgid "Whether or not to play sound notifications when away or busy."
-msgstr ""
+msgstr "Kas esitada heli eemal või hõivatud oleku määramisest märkuandmiseks."
 
 msgid ""
 "Whether or not to show a popup notification when a contact goes offline."
-msgstr ""
+msgstr "Kas näidata hüpikteadet kontakti väljumisest märkuandmiseks."
 
 msgid "Whether or not to show a popup notification when a contact goes online."
-msgstr ""
+msgstr "Kas näidata hüpikteadet kontakti sisenemisest märkuandmiseks."
 
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr ""
+"Kas näidata hüpikteadet uue sõnumi saamisest märkuandmiseks isegi siis, kui "
+"vestlus on juba avatud, kuid mitte fookuses."
 
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
-msgstr ""
+msgstr "Kas näidata hüpikteadet uue teate vastuvõtmisest märkuandmiseks."
 
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
-msgstr ""
+msgstr "Kas näidata kontaktide nimekirjas ja vestlusakendes avatare."
 
 msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr ""
+msgstr "Kas näidata kontaktide nimekirjas kontakte, kes pole ühendatud."
 
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
+"Kas näidata hüpikteadet eemal või hõivatud oleku määramisest märkuandmiseks."
 
 msgid "Whether or not to show the contact list in chat rooms."
-msgstr ""
+msgstr "Kas jututubades näidatakse osalejate nimekirja või mitte."
 
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr ""
+"Kas peaakna sulgemisel tiitliriba 'x' ristist küsitakse kinnitust või mitte."
 
 msgid "Whether to show the contact list in compact mode or not."
-msgstr ""
+msgstr "Kas kontaktide nimekirja kuvatakse kompaktvaates või mitte."
 
 msgid "Whether to use the theme for chat rooms or not."
-msgstr ""
+msgstr "Kas jututubadele kasutatakse kujundust või mitte."
 
 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."
 msgstr ""
+"Millie alusel sorteeritakse kontaktide nimekiri. Vaikimisi sorteeritakse "
+"kontaktid nime järgi, selle välja väärtus on \"name\". Kui väärtus on \"state"
+"\", sorteeritakse kontaktide nimekiri oleku järgi."
 
 msgid "The hash of the received file and the sent one do not match"
-msgstr ""
+msgstr "Vastuvõetud faili ja saadetud faili räsi ei kattu"
 
 msgid "File transfer not supported by remote contact"
-msgstr ""
+msgstr "Vestluskaaslane ei saa faile vastu võtta"
 
-#, fuzzy
 msgid "The selected file is not a regular file"
-msgstr "Valitud fail pole korrektne plugin."
+msgstr "Valitud fail pole harilik fail"
 
-#, fuzzy
 msgid "The selected file is empty"
-msgstr "Kasutajaprofiil on tühi."
+msgstr "Valitud fail on tühi"
 
 msgid "People nearby"
-msgstr ""
+msgstr "Lähedalasuvad inimesed"
 
-#, fuzzy
 msgid "Socket type not supported"
-msgstr "Riik pole toetatud."
+msgstr "Sokli pole toetatud."
 
-#, fuzzy
 msgid "No reason was specified"
 msgstr "Põhjendust pole määratud."
 
 msgid "The change in state was requested"
-msgstr ""
+msgstr "Nõuti olekumuutust"
 
-#, fuzzy
 msgid "You canceled the file transfer"
-msgstr "%s katkestas failiülekande"
+msgstr "Sina katkestasid failiülekande"
 
-#, fuzzy
 msgid "The other participant canceled the file transfer"
-msgstr "%s katkestas failiülekande"
+msgstr "Vestluskaaslane katkestas failiülekande"
 
-#, fuzzy
 msgid "Error while trying to transfer the file"
 msgstr "Viga faili ülekandmisel"
 
 msgid "The other participant is unable to transfer the file"
-msgstr ""
+msgstr "Vestluse teine osapool pole võimelie faili edastama"
 
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
@@ -402,17 +406,17 @@ msgstr[1] "%d päeva tagasi"
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d nädal tagasi"
+msgstr[1] "%d nädalat tagasi"
 
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d kuu tagasi"
+msgstr[1] "%d kuud tagasi"
 
 msgid "in the future"
-msgstr ""
+msgstr "tulevikus"
 
 msgid "All"
 msgstr "Kõik"
@@ -424,13 +428,11 @@ msgstr "%s:"
 msgid "Advanced"
 msgstr "Laiendatud"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Parool:"
+msgstr "_Parool:"
 
-#, fuzzy
 msgid "Screen _Name:"
-msgstr "Eesnimi"
+msgstr "Ekraani_nimi:"
 
 msgid "_Port:"
 msgstr "_Port:"
@@ -438,23 +440,20 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Server:"
 
-#, fuzzy
 msgid "Login I_D:"
-msgstr "Logi sisse"
+msgstr "Sisselogimise I_D:"
 
 msgid "ICQ _UIN:"
-msgstr ""
+msgstr "ICQ _UIN:"
 
-#, fuzzy
 msgid "_Charset:"
-msgstr "Ka_nal:"
+msgstr "_Kooditabel:"
 
 msgid "New Network"
 msgstr "Uus võrk"
 
-#, fuzzy
 msgid "Charset:"
-msgstr "Vestlus"
+msgstr "Kooditabel:"
 
 msgid "Network"
 msgstr "Võrk"
@@ -477,9 +476,8 @@ msgstr "Pärisnimi:"
 msgid "Servers"
 msgstr "Serverid"
 
-#, fuzzy
 msgid "Override server settings"
-msgstr "Vigased proksi sätted"
+msgstr "Serveri sätete eiramine"
 
 msgid "Pri_ority:"
 msgstr "_Tähtsus:"
@@ -491,7 +489,7 @@ msgid "Use old SS_L"
 msgstr "Kasutatakse _vana SSL-i"
 
 msgid "_Encryption required (TLS/SSL)"
-msgstr ""
+msgstr "_Krüpteeringu nõudmine (TLS/SSL)"
 
 msgid "_Ignore SSL certificate errors"
 msgstr "SSL-sertifikaadi vigu _eiratakse"
@@ -503,7 +501,7 @@ msgid "_First Name:"
 msgstr "_Eesnimi:"
 
 msgid "_Jabber ID:"
-msgstr ""
+msgstr "_Jabberi ID:"
 
 msgid "_Last Name:"
 msgstr "_Perekonnanimi:"
@@ -511,13 +509,12 @@ msgstr "_Perekonnanimi:"
 msgid "_Nickname:"
 msgstr "_Hüüdnimi:"
 
-#, fuzzy
 msgid "_Published Name:"
-msgstr "Isiklik mobiiltelefon"
+msgstr "_Avaldatud nimi:"
 
 #. look up the DNS SRV record at the service's domain for the host name of a STUN server.
 msgid "Discover STUN"
-msgstr ""
+msgstr "STUN-i avastamine"
 
 msgid "STUN Server:"
 msgstr "STUN server:"
@@ -528,31 +525,26 @@ msgstr "STUN port:"
 msgid "_Username:"
 msgstr "_Kasutajanimi:"
 
-#, fuzzy
 msgid "Use _Yahoo Japan"
-msgstr "Jaapani Yahoo"
+msgstr "Jaapani _Yahoo kasutamine"
 
-#, fuzzy
 msgid "Yahoo I_D:"
-msgstr "Yahoo! ID"
+msgstr "Yahoo I_D:"
 
-#, fuzzy
 msgid "_Ignore conference and chatroom invitations"
-msgstr "Konverentside ja jututubade kutseid eiratakse"
+msgstr "Konverentside ja jututubade kutseid _eiratakse"
 
-#, fuzzy
 msgid "_Room List locale:"
-msgstr "Tubade nimekiri"
+msgstr "_Tubade nimekirja lokaat:"
 
-#, fuzzy
 msgid "Couldn't convert image"
-msgstr "Pole võimalik ühenduda"
+msgstr "Pole võimalik pilti teisendada"
 
 msgid "None of the accepted image formats is supported on your system"
-msgstr ""
+msgstr "Sinu süsteem ei toeta ühtegi sobivatest pildivormingutest"
 
 msgid "Select Your Avatar Image"
-msgstr ""
+msgstr "Vali oma avatari pilt"
 
 msgid "No Image"
 msgstr "Pilti pole"
@@ -564,22 +556,19 @@ msgid "All Files"
 msgstr "Kõik failid"
 
 msgid "Click to enlarge"
-msgstr ""
+msgstr "Klõpsa suurendamiseks"
 
-#, fuzzy
 msgid "Failed to reconnect this chat"
-msgstr "Tõrge vestlusega ühinemisel"
+msgstr "Selle vestlusega taasühendumine nurjus"
 
-#, fuzzy
 msgid "Unsupported command"
-msgstr "Toetamata kooditabel"
+msgstr "Toetamata käsk"
 
 msgid "offline"
 msgstr "ühendamata"
 
-#, fuzzy
 msgid "invalid contact"
-msgstr "Vigane nimi"
+msgstr "Vigane kontakt"
 
 msgid "permission denied"
 msgstr "ligipääs keelatud"
@@ -605,7 +594,7 @@ msgid "No topic defined"
 msgstr "Teemat pole seatud"
 
 msgid "(No Suggestions)"
-msgstr ""
+msgstr "(Soovitusi pole)"
 
 msgid "Insert Smiley"
 msgstr "Tujunäo lisamine"
@@ -615,16 +604,51 @@ msgid "_Send"
 msgstr "_Saada"
 
 msgid "_Spelling Suggestions"
-msgstr ""
+msgstr "_Õigekirja soovitused"
 
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s sisenes tuppa"
+msgid "%s has disconnected"
+msgstr "%s lahkus"
+
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#, c-format
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s visati kasutaja %2$s poolt välja"
+
+#, c-format
+msgid "%s was kicked"
+msgstr "%s visati välja"
+
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#, c-format
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s tõrjuti kasutaja %2$s poolt"
+
+#, c-format
+msgid "%s was banned"
+msgstr "%s on nüüd tõrjutud"
 
 #, c-format
 msgid "%s has left the room"
 msgstr "%s väljus toast"
 
+#. 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. :-)
+#.
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s sisenes tuppa"
+
 msgid "Disconnected"
 msgstr "Ühendus katkestatud"
 
@@ -637,21 +661,21 @@ msgstr "Vestlus"
 msgid "Topic:"
 msgstr "Teema:"
 
+#. Copy Link Address menu item
 msgid "_Copy Link Address"
 msgstr "_Kopeeri lingi aadress"
 
+#. Open Link menu item
 msgid "_Open Link"
 msgstr "_Ava link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#, fuzzy
 msgid "%A %B %d %Y"
-msgstr "%B %Y"
+msgstr "%A, %d. %B %Y"
 
-#, fuzzy
 msgid "Edit Contact Information"
-msgstr "Täiendavad andmed"
+msgstr "Kontakti andmete redigeerimine"
 
 msgid "Personal Information"
 msgstr "Isiklikud andmed"
@@ -660,11 +684,10 @@ msgid "New Contact"
 msgstr "Uus kontakt"
 
 msgid "Decide _Later"
-msgstr ""
+msgstr "Otsusta _hiljem"
 
-#, fuzzy
 msgid "Subscription Request"
-msgstr "Tellimus"
+msgstr "Tellimuse päring"
 
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
@@ -673,17 +696,20 @@ msgstr "Kas tahad tõesti eemaldada grupi '%s'?"
 msgid "Removing group"
 msgstr "Grupi eemaldamine"
 
+#. Remove
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Do you really want to remove the contact '%s'?"
-msgstr "Kas sa soovid eemaldada kontot %s?"
+msgstr "Kas sa tõesti soovid eemaldada kontakti '%s'?"
 
-#, fuzzy
 msgid "Removing contact"
 msgstr "Kontakti eemaldamine"
 
+msgid "_Add Contact..."
+msgstr "Lisa _kontakt..."
+
 msgid "_Chat"
 msgstr "_Vestlus"
 
@@ -695,38 +721,35 @@ msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videovestlus"
 
-#, fuzzy
 msgid "_View Previous Conversations"
-msgstr "_Uued vestlused:"
+msgstr "_Kuva eelmiseid vestluseid"
 
 msgid "Send file"
 msgstr "Saada fail"
 
-#, fuzzy
+msgid "Share my desktop"
+msgstr "Minu töölauda jagatakse"
+
 msgid "Infor_mation"
-msgstr "Andmed"
+msgstr "_Andmed"
 
 msgid "_Edit"
 msgstr "_Redaktor"
 
 msgid "Inviting to this room"
-msgstr ""
+msgstr "Kutse sellesse tuppa"
 
-#, fuzzy
 msgid "_Invite to chatroom"
-msgstr "Konverentsile kutsumine"
+msgstr "_Jututuppa kutsumine"
 
-#, fuzzy
 msgid "Select a contact"
-msgstr "Tegevuse valimine"
+msgstr "Vali kontakt"
 
-#, fuzzy
 msgid "Save Avatar"
-msgstr "Kasutaja avatar"
+msgstr "Avatari salvestamine"
 
-#, fuzzy
 msgid "Unable to save avatar"
-msgstr "Uut kontot pole võimalik salvestada"
+msgstr "Avatari salvestamine pole võimalik"
 
 msgid "Select"
 msgstr "Vali"
@@ -735,7 +758,7 @@ msgid "Group"
 msgstr "Grupp"
 
 msgid "Country ISO Code:"
-msgstr ""
+msgstr "Riigi ISO-kood:"
 
 msgid "Country:"
 msgstr "Riik:"
@@ -756,7 +779,7 @@ msgid "Street:"
 msgstr "Tänav:"
 
 msgid "Building:"
-msgstr ""
+msgstr "Ehitamine:"
 
 msgid "Floor:"
 msgstr "Korrus:"
@@ -774,41 +797,37 @@ msgid "URI:"
 msgstr "URI:"
 
 msgid "Accuracy Level:"
-msgstr ""
+msgstr "Täpsustase:"
 
 msgid "Error:"
 msgstr "Viga:"
 
 msgid "Vertical Error (meters):"
-msgstr ""
+msgstr "Kõrgusviga (meetrites):"
 
-#, fuzzy
 msgid "Horizontal Error (meters):"
-msgstr "Rõhtjoon"
+msgstr "Rõhtviga (meetrites):"
 
 msgid "Speed:"
 msgstr "Kiirus:"
 
-#, fuzzy
 msgid "Bearing:"
-msgstr "Hoiatused"
+msgstr ""
 
-#, fuzzy
 msgid "Climb Speed:"
 msgstr "Ronimise kiirus:"
 
 msgid "Last Updated on:"
 msgstr "Viimati uuendatud:"
 
-#, fuzzy
 msgid "Longitude:"
-msgstr "Valjem"
+msgstr "Pikkuskraad:"
 
 msgid "Latitude:"
-msgstr ""
+msgstr "Laiuskraad:"
 
 msgid "Altitude:"
-msgstr ""
+msgstr "Kõrgus:"
 
 msgid "<b>Location</b>"
 msgstr "<b>Asukoht</b>"
@@ -817,10 +836,10 @@ msgid "<b>Location</b>, "
 msgstr "<b>Asukoht</b>,"
 
 msgid "%B %e, %Y at %R UTC"
-msgstr ""
+msgstr "%e. %B %Y kell %R UTC"
 
 msgid "<b>Location</b> at (date)\t"
-msgstr ""
+msgstr "<b>Asukoht</b> kuupäeval\t"
 
 msgid "Account:"
 msgstr "Konto:"
@@ -856,17 +875,18 @@ msgstr "Grupid"
 msgid "Identifier:"
 msgstr "Kasutajanimi:"
 
-#, fuzzy
 msgid "Information requested..."
-msgstr "Andmed"
+msgstr "Andmepäring..."
 
 msgid "OS:"
-msgstr ""
+msgstr "OS:"
 
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
+"Vali grupid, milles see kontakt peaks esinema. Sa võid valida mitu või mitte "
+"ühtegi gruppi."
 
 msgid "Version:"
 msgstr "Versioon:"
@@ -904,9 +924,8 @@ msgstr "Eelmised vestlused"
 msgid "Search"
 msgstr "Otsing"
 
-#, fuzzy
 msgid "_For:"
-msgstr "_Port:"
+msgstr ""
 
 msgid "C_all"
 msgstr "_Helista"
@@ -920,29 +939,29 @@ msgstr "Kontakti ID:"
 msgid "New Conversation"
 msgstr "Uus vestlus"
 
+#. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
-#. COL_STATUS_TEXT
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
 msgid "Custom Message..."
-msgstr "Oma sõnum..."
+msgstr "Kohandatud sõnum..."
 
 msgid "Edit Custom Messages..."
-msgstr "Teadete redigeerimine..."
+msgstr "Kohandatud sõnumite muutmine..."
 
 msgid "Click to remove this status as a favorite"
-msgstr ""
+msgstr "Klõpsa selle oleku eemaldamiseks lemmikutest"
 
 msgid "Click to make this status a favorite"
-msgstr ""
+msgstr "Klõpsa selle oleku lisamiseks lemmikutesse"
 
 msgid "Set status"
 msgstr "Määra olek"
 
 msgid "Set your presence and current status"
-msgstr ""
+msgstr "Kohalolu ja praeguse oleku määramine"
 
 #. Custom messages
 msgid "Custom messages..."
@@ -970,19 +989,19 @@ msgid "Disconnected from server"
 msgstr "Ühendus serveriga katkestatud"
 
 msgid "Incoming voice call"
-msgstr ""
+msgstr "Sissetulev kõne"
 
 msgid "Outgoing voice call"
-msgstr ""
+msgstr "Väljuv kõne"
 
 msgid "Voice call ended"
-msgstr ""
+msgstr "Kõne lõpetati"
 
 msgid "Enter Custom Message"
 msgstr "Sisesta oma teade"
 
 msgid "Edit Custom Messages"
-msgstr "Teadete redigeerimine"
+msgstr "Teadete muutmine"
 
 msgid "Add _New Preset"
 msgstr "_Uue oleku lisamine"
@@ -990,12 +1009,6 @@ msgstr "_Uue oleku lisamine"
 msgid "Saved Presets"
 msgstr "Salvestatud olekud"
 
-msgid "gtk-add"
-msgstr "_Lisa"
-
-msgid "gtk-remove"
-msgstr "Eemalda"
-
 msgid "Classic"
 msgstr "Klassikaline"
 
@@ -1008,9 +1021,6 @@ msgstr "Puhas"
 msgid "Blue"
 msgstr "Sinine"
 
-msgid "Adium"
-msgstr "Adium"
-
 msgid "Unable to open URI"
 msgstr "URI-d pole võimalik avada"
 
@@ -1020,9 +1030,8 @@ msgstr "Faili valimine"
 msgid "Select a destination"
 msgstr "Vali sihtkoht"
 
-#, fuzzy
 msgid "Current Locale"
-msgstr "Praegune tõend"
+msgstr "Praegune lokaat"
 
 msgid "Arabic"
 msgstr "Araabia"
@@ -1067,20 +1076,19 @@ msgid "Gujarati"
 msgstr "Gujarati"
 
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmuki"
 
 msgid "Hebrew"
 msgstr "Heebrea"
 
-#, fuzzy
 msgid "Hebrew Visual"
-msgstr "Heebrea"
+msgstr "Heebrea visuaalne"
 
 msgid "Hindi"
 msgstr "Hindi"
 
 msgid "Icelandic"
-msgstr ""
+msgstr "Islandi"
 
 msgid "Japanese"
 msgstr "Jaapani"
@@ -1088,9 +1096,8 @@ msgstr "Jaapani"
 msgid "Korean"
 msgstr "Korea"
 
-#, fuzzy
 msgid "Nordic"
-msgstr "Sodiaagimärk"
+msgstr "Põhjamaade"
 
 msgid "Persian"
 msgstr "Pärsia"
@@ -1121,10 +1128,12 @@ msgstr "Vietnami"
 #.
 msgid ""
 "The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
+msgstr "Kontakt, keda näidatakse rakendis. Tühi tähendab, et kedagi ei kuvata."
 
 msgid "The contact's avatar token. Empty means contact has no avatar."
 msgstr ""
+"Kontakti avatarile viitav sõne. Tühi sõne tähendab, et kontaktil pole "
+"avatari."
 
 msgid "Megaphone"
 msgstr "Mögafon"
@@ -1142,32 +1151,28 @@ msgid "_Preferences"
 msgstr "_Eelistused"
 
 msgid "Please configure a contact."
-msgstr ""
+msgstr "Häälesta kontakt."
 
 msgid "Select contact..."
 msgstr "Vali kontakt..."
 
 msgid "Presence"
-msgstr ""
+msgstr "Kohalolek"
 
-#, fuzzy
 msgid "Set your own presence"
-msgstr "Oma kodutelefoni numbri määramine."
+msgstr "Määra enda kohalolek"
 
-#, fuzzy
 msgid "Don't connect on startup"
-msgstr "Hostiga pole võimalik ühenduda"
+msgstr "Käivitumisel ei ühenduta"
 
 msgid "Don't show the contact list on startup"
-msgstr ""
+msgstr "Käivitumisel ei näidata kontaktide nimekirja"
 
-#, fuzzy
 msgid "Show the accounts dialog"
-msgstr "accounts: Kontode akna näitamine."
+msgstr "Näita kontode nimekirja"
 
-#, fuzzy
-msgid "- Empathy Instant Messenger"
-msgstr "Interneti sõnumivahetus"
+msgid "- Empathy IM Client"
+msgstr "- Empathy interneti sõnumivahetus"
 
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -1175,6 +1180,10 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
+"Empathy on vaba tarkvara; te võite seda edasi levitada ja/või muuta "
+"vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need on Vaba "
+"Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number 2 või "
+"(vastavalt teie valikule) ükskõik milline hilisem versioon."
 
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
@@ -1182,16 +1191,22 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
+"Empathyt levitatakse lootuses, et see on kasulik, kuid ILMA IGASUGUSE "
+"GARANTIITA; isegi ilma KESKMISE/TAVALISE KVALITEEDI GARANTIITA või "
+"SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist "
+"Avalikku Litsentsi."
 
 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 ""
+"Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos Empathyga, "
+"kui ei, siis võtke ühendust Free Software Foundation'iga, 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
-#, fuzzy
 msgid "An Instant Messaging client for GNOME"
-msgstr "Välksõnumivahendid"
+msgstr "Välksõnumivõrkude klient GNOME jaoks"
 
 msgid "translator-credits"
 msgstr "Mattias Põldaru 2009"
@@ -1203,17 +1218,17 @@ msgid "Accounts"
 msgstr "Kontod"
 
 #. To translator: %s is the protocol name
-#, fuzzy, c-format
+#, c-format
 msgid "New %s account"
-msgstr "Uus konto"
+msgstr "Uus %s konto"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to remove your %s account!\n"
 "Are you sure you want to proceed?"
 msgstr ""
-"Sa oled eemaldamas kasutajat %s oma sõbranimekirjast. Kas sa soovid seda "
-"teha?"
+"Sa oled eemaldamas oma %s kontot.\n"
+"Kas sa soovid seda teha?"
 
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
@@ -1222,24 +1237,24 @@ msgid ""
 "Should you decide to add the account back at a later time, they will still "
 "be available."
 msgstr ""
+"Jätkamisel EI eemaldata ühtegi seotud vestlust ega jututuba.\n"
+"\n"
+"Kui sa peaksid konto hiljem uuesti lisama, on need andmed ikka alles."
 
 msgid "Add Account"
 msgstr "Konto lisamine"
 
-#, fuzzy
 msgid "Cr_eate"
-msgstr "Algata"
+msgstr "_Loo"
 
 msgid "Gmail"
 msgstr "Gmail"
 
-#, fuzzy
 msgid "Import Accounts..."
-msgstr "_Impordi..."
+msgstr "Impordi kontod..."
 
-#, fuzzy
 msgid "No protocol installed"
-msgstr "Protokollide pluginaid pole paigaldatud."
+msgstr "Ühtegi protokolli pole paigaldatud"
 
 msgid "Settings"
 msgstr "Sätted"
@@ -1248,6 +1263,8 @@ msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
+"Uue konto lisamiseks pead paigaldama tugiprogrammi iga protokolli jaoks, "
+"mida tahad kasutada."
 
 msgid "Type:"
 msgstr "Liik:"
@@ -1255,13 +1272,11 @@ msgstr "Liik:"
 msgid "_Add..."
 msgstr "_Lisa..."
 
-#, fuzzy
 msgid "_Create a new account"
-msgstr "Uut kontot pole võimalik salvestada"
+msgstr "_Luuakse uus konto"
 
-#, fuzzy
 msgid "_Reuse an existing account"
-msgstr "Viga konto registreeringu tühistamisel"
+msgstr "_Kasutatakse olemasolevat kontot"
 
 msgid "Contrast"
 msgstr "Kontrastsus"
@@ -1290,10 +1305,13 @@ msgstr "Helisisend"
 msgid "Video input"
 msgstr "Videosisend"
 
-#, fuzzy, c-format
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#, c-format
 msgid "Call with %s"
-msgstr "Vestlused - %s"
+msgstr "Kõne kasutajaga %s"
 
+#. translators: Call is a noun. This string is used in the window title
 msgid "Call"
 msgstr "Kõne"
 
@@ -1315,7 +1333,7 @@ msgid "Send video"
 msgstr "Saada video"
 
 msgid "Video preview"
-msgstr ""
+msgstr "Video eelvaade"
 
 msgid "_Call"
 msgstr "_Helista"
@@ -1327,9 +1345,53 @@ msgstr "_Vaade"
 msgid "Conversations (%d)"
 msgstr "Vestlused (%d)"
 
-#, fuzzy
 msgid "Typing a message."
-msgstr "Saadetakse sõnum"
+msgstr "Kirjutab sõnumit."
+
+msgid "C_lear"
+msgstr "_Puhasta"
+
+msgid "Chat"
+msgstr "Vestlus"
+
+msgid "Insert _Smiley"
+msgstr "Lisa _tujunägu"
+
+msgid "Move Tab _Left"
+msgstr "Tõsta kaart _vasakule"
+
+msgid "Move Tab _Right"
+msgstr "Tõsta kaart _paremale"
+
+msgid "_Contact"
+msgstr "_Kontakt"
+
+msgid "_Contents"
+msgstr "_Sisukord"
+
+msgid "_Conversation"
+msgstr "_Vestlus"
+
+msgid "_Detach Tab"
+msgstr "_Haagi kaart lahti"
+
+msgid "_Favorite Chatroom"
+msgstr "_Lemmikjututuba"
+
+msgid "_Help"
+msgstr "_Abi"
+
+msgid "_Next Tab"
+msgstr "_Järgmine kaart"
+
+msgid "_Previous Tab"
+msgstr "_Eelmine kaart"
+
+msgid "_Show Contact List"
+msgstr "_Sõbranimekirja näidatakse"
+
+msgid "_Tabs"
+msgstr "_Sakid"
 
 msgid "Name"
 msgstr "Nimi"
@@ -1337,9 +1399,8 @@ msgstr "Nimi"
 msgid "Room"
 msgstr "Tuba"
 
-#, fuzzy
 msgid "Auto-Connect"
-msgstr "Ühendu"
+msgstr "Iseühenduv"
 
 msgid "Manage Favorite Rooms"
 msgstr "Lemmiktubade haldamine"
@@ -1361,9 +1422,9 @@ msgstr "_Vasta"
 msgid "Incoming call from %s"
 msgstr "Sissetulev kõne kasutajalt %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is offering you an invitation"
-msgstr "%s pakub faili %s saatmist"
+msgstr "%s pakub sulle kutset"
 
 msgid "An external application will be started to handle it."
 msgstr "Selle käsitlemiseks käivitatakse väline rakendus."
@@ -1371,9 +1432,8 @@ msgstr "Selle käsitlemiseks käivitatakse väline rakendus."
 msgid "You don't have the needed external application to handle it."
 msgstr "Selle käsitlemiseks puudub vajalik väline rakendus."
 
-#, fuzzy
 msgid "Room invitation"
-msgstr "Voo lähtestamine"
+msgstr "Kutse tuppa"
 
 #, c-format
 msgid "%s is inviting you to join %s"
@@ -1385,17 +1445,17 @@ msgstr "Lükka _tagasi"
 msgid "_Join"
 msgstr "Ü_hine"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s invited you to join %s"
-msgstr "%s kutsub kasutajat %s jututuppa %s\n"
+msgstr "%s kutsub sind jututuppa %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Incoming file transfer from %s"
-msgstr "Kas nõustud failiülekandega kasutajalt %s?"
+msgstr "Failiülekanne kasutajalt %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Subscription requested by %s"
-msgstr "Tellimus"
+msgstr "Tellimus, mida küsis %s"
 
 #, c-format
 msgid ""
@@ -1406,14 +1466,14 @@ msgstr ""
 "Sõnum: %s"
 
 #. someone is logging off
-#, fuzzy, c-format
+#, c-format
 msgid "%s is now offline."
-msgstr "Kasutaja pole ühendatud."
+msgstr "%s pole enam ühendatud."
 
 #. someone is logging in
-#, fuzzy, c-format
+#, c-format
 msgid "%s is now online."
-msgstr "%s pole enam jõude."
+msgstr "%s on nüüd ühendatud."
 
 #. Translators: time left, when it is more than one hour
 #, c-format
@@ -1429,13 +1489,13 @@ msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s of %s at %s/s"
-msgstr "%s (%s -- %s"
+msgstr "%s %s-st kiirusega %s/s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s of %s"
-msgstr "%s (%s)"
+msgstr "%s %s-st"
 
 #. translators: first %s is filename, second %s is the contact name
 #, c-format
@@ -1443,41 +1503,38 @@ msgid "Receiving \"%s\" from %s"
 msgstr "Faili \"%s\" vastuvõtmine kasutajalt %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#, fuzzy, c-format
+#, c-format
 msgid "Sending \"%s\" to %s"
-msgstr "Pakun faili %s saatmist kasutajale %s"
+msgstr "Faili \"%s\" saatmine kasutajale %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#, fuzzy, c-format
+#, c-format
 msgid "Error receiving \"%s\" from %s"
-msgstr "Viga tubade loendi vastuvõtmisel"
+msgstr "Viga \"%s\"  vastuvõtmisel kasutajalt %s"
 
-#, fuzzy
 msgid "Error receiving a file"
-msgstr "Viga profiili vastuvõtmisel"
+msgstr "Viga faili vastuvõtmisel"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error sending \"%s\" to %s"
-msgstr "Viga \"%s\" käivitamisel: %s"
+msgstr "Viga faili \"%s\" saatmisel kasutajale %s"
 
-#, fuzzy
 msgid "Error sending a file"
-msgstr "Viga profiili vastuvõtmisel"
+msgstr "Viga faili saatmisel"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" received from %s"
-msgstr "Serverilt saadi ping-vastus"
+msgstr "\"%s\" võeti vastu kasutajalt %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" sent to %s"
-msgstr "%s saatis sulle sõnumi"
+msgstr "\"%s\" saadeti kasutajale %s"
 
-#, fuzzy
 msgid "File transfer completed"
 msgstr "Fail on täielikult üle kantud"
 
@@ -1488,9 +1545,9 @@ msgstr "Ootamine teise osalise vastuse järel"
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" tervikluse kontroll"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Hashing \"%s\""
-msgstr "Käepigistus"
+msgstr "Räsi arvutamine failile \"%s\""
 
 msgid "%"
 msgstr "%"
@@ -1505,11 +1562,11 @@ msgid "File Transfers"
 msgstr "Failiülekanded"
 
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
+msgstr "Lõpetatud, katkestatud ja nurjunud failide eemaldamine loendist"
 
 #. Translators: this is the header of a treeview column
 msgid "Import"
-msgstr "Importimine"
+msgstr "Importida"
 
 msgid "Protocol"
 msgstr "Protokoll"
@@ -1521,6 +1578,8 @@ msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
+"Importimiseks ei leitud kontosid. Praegu on toetatud kontode importimine "
+"ainult Pidginist."
 
 msgid "Import Accounts"
 msgstr "Kontode importimine"
@@ -1529,7 +1588,7 @@ msgid "_Edit account"
 msgstr "_Redigeeri kontot"
 
 msgid "No error specified"
-msgstr "Vea põhjust ei määratud"
+msgstr "Vea põhjust pole määratud"
 
 msgid "Network error"
 msgstr "Võrgu viga"
@@ -1543,91 +1602,83 @@ msgstr "Krüpteerimise viga"
 msgid "Name in use"
 msgstr "Nimi on juba kasutusel"
 
-#, fuzzy
 msgid "Certificate not provided"
-msgstr "Sertifikaadi importimise viga"
+msgstr "Sertifikaati ei antud"
 
-#, fuzzy
 msgid "Certificate untrusted"
-msgstr "Sertifitseerimiskeskused"
+msgstr "Sertifikaat pole usaldusväärne"
 
-#, fuzzy
 msgid "Certificate expired"
-msgstr "Sertifikaadi importimine"
+msgstr "Sertifikaat on aegunud"
 
-#, fuzzy
 msgid "Certificate not activated"
-msgstr "Sertifikaadi andmed"
+msgstr "Sertifikaat pole aktiveeritud"
 
-#, fuzzy
 msgid "Certificate hostname mismatch"
-msgstr "Sertifitseerimiskeskused"
+msgstr "Sertifikaadi hostinimi pole vastavuses"
 
-#, fuzzy
 msgid "Certificate fingerprint mismatch"
-msgstr "\"%s\" sertifikaat"
+msgstr "Sertifikaadi sõrmejälg ei kattu"
 
-#, fuzzy
 msgid "Certificate self-signed"
-msgstr "Sertifikaadid"
+msgstr "Isetunnustatud sertifikaat"
 
-#, fuzzy
 msgid "Certificate error"
-msgstr "SSL-sertifikaadi viga"
+msgstr "Sertifikaadi viga"
 
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
 msgid "Show and edit accounts"
-msgstr ""
+msgstr "Kontode näitamine ja redigeerimine"
 
-#, fuzzy
 msgid "Contact List"
-msgstr "Kontaktandmed"
+msgstr "Kontaktide nimekiri"
 
-#, fuzzy
 msgid "Contacts on a _Map"
-msgstr "Kontaktandmed"
+msgstr "Kontaktid _kaardil"
 
-#, fuzzy
 msgid "Context"
-msgstr "Ühendu"
+msgstr "Kontekst"
 
-#, fuzzy
 msgid "Join _Favorites"
-msgstr "Lemmikasjad"
+msgstr ""
 
 msgid "Manage Favorites"
-msgstr ""
+msgstr "Lemmiktubade haldamine"
+
+msgid "N_ormal Size"
+msgstr "N_ormaalsuurus"
+
+msgid "Normal Size With _Avatars"
+msgstr "Normaalsuurus _avataridega"
+
+msgid "Sort by _Name"
+msgstr "Sortimine _nime järgi"
+
+msgid "Sort by _Status"
+msgstr "Sortimine _oleku järgi"
 
 msgid "_Accounts"
 msgstr "_Kontod"
 
-msgid "_Add Contact..."
-msgstr "Lisa _kontakt..."
-
-#, fuzzy
-msgid "_Contents"
-msgstr "Ühendu"
+msgid "_Compact Size"
+msgstr "_Kompaktne"
 
 msgid "_Debug"
-msgstr ""
+msgstr "_Silumine"
 
 msgid "_File Transfers"
 msgstr "_Failiülekanded"
 
-msgid "_Help"
-msgstr "_Abi"
-
 msgid "_Join..."
 msgstr "_Ühine..."
 
 msgid "_New Conversation..."
 msgstr "_Uus vestlus..."
 
-#, fuzzy
 msgid "_Offline Contacts"
-msgstr "Eelistatud kontakt"
+msgstr "_Ühendamata kontaktid"
 
 msgid "_Personal Information"
 msgstr "_Isiklikud andmed"
@@ -1654,6 +1705,10 @@ msgid ""
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
+"<b>%s</b>\n"
+"Nõutakse kutset: %s\n"
+"Nõutakse parooli: %s\n"
+"Liikmeid: %s"
 
 msgid "Yes"
 msgstr "Jah"
@@ -1661,26 +1716,27 @@ msgstr "Jah"
 msgid "No"
 msgstr "Ei"
 
-#, fuzzy
 msgid "Could not start room listing"
-msgstr "Tubade nimekirja pole võimalik hankida"
+msgstr "Tubade nimekirja pole võimalik alustada"
 
-#, fuzzy
 msgid "Could not stop room listing"
-msgstr "Kuulatavat porti pole võimalik avada."
+msgstr "Tubade nimekirja pole võimalik lõpetada"
 
-#, fuzzy
 msgid "Couldn't load room list"
-msgstr "Sõbranimekirja pole võimalik laadida"
+msgstr "Tubade nimekirja pole võimalik laadida"
 
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
+"Sisesta jututoa nimi, millega tahad liituda, või klõpsa loendis oleva toa "
+"nimele."
 
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
+"Sisesta server, mis võõrustab jututuba, või jäta tühjaks, kui tuba on "
+"praeguse konto serveris"
 
 msgid "Join Room"
 msgstr "Toaga ühinemine"
@@ -1692,19 +1748,19 @@ msgid "_Room:"
 msgstr "_Tuba:"
 
 msgid "Message received"
-msgstr "Sõnum võeti vastu"
+msgstr "Sõnumi vastuvõtmine"
 
 msgid "Message sent"
-msgstr "Sõnum saadeti"
+msgstr "Sõnumi saatmine"
 
 msgid "New conversation"
 msgstr "Uus vestlus"
 
 msgid "Contact goes online"
-msgstr ""
+msgstr "Kontakti sisenemine"
 
 msgid "Contact goes offline"
-msgstr ""
+msgstr "Kontakti väljumine"
 
 msgid "Account connected"
 msgstr "Konto on ühendatud"
@@ -1715,75 +1771,59 @@ msgstr "Konto ühendus katkestatud"
 msgid "Language"
 msgstr "Keel"
 
-msgid "Adium theme to use:"
-msgstr ""
-
 msgid "Allow _GPS usage"
-msgstr ""
+msgstr "_GPS-i kasutamine lubatud"
 
 msgid "Allow _cellphone usage"
-msgstr ""
+msgstr "_Mobiili kasutamine lubatud"
 
 msgid "Allow _network usage"
-msgstr ""
+msgstr "_Võrgu kasutamine lubatud"
 
 msgid "Appearance"
-msgstr ""
+msgstr "Välimus"
 
-#, fuzzy
 msgid "Automatically _connect on startup "
-msgstr ""
-"Sõbranimekirjast puuduvate kasutajate failidest keeldutakse automaatselt"
-
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr ""
+msgstr "_Käivitumisel ühendutakse automaatselt"
 
 msgid "Behavior"
-msgstr ""
+msgstr "Käitumine"
 
-#, fuzzy
 msgid "Chat Th_eme:"
-msgstr "Vestluse _nimi:"
+msgstr "Vestluse _teema:"
 
-#, fuzzy
 msgid "Disable notifications when _away or busy"
-msgstr "Tippimismärguande lubamine"
+msgstr "Eemal- või hõivatud oleku korral on _teated keelatud"
 
-#, fuzzy
 msgid "Disable sounds when _away or busy"
-msgstr "Keelatakse minu eemaloleku korral"
+msgstr "Eemal- või hõivatud oleku korral on _helid keelatud"
 
 msgid "Enable notifications when a contact comes online"
-msgstr ""
+msgstr "Teatatakse kontakti sisenemisest"
 
 msgid "Enable notifications when a contact goes offline"
-msgstr ""
+msgstr "Teatatakse kontakti väljumisest"
 
 msgid "Enable notifications when the _chat is not focused"
-msgstr ""
+msgstr "Teated on lubatud mitteaktiivse _jututoa jaoks"
 
 msgid "Enable spell checking for languages:"
-msgstr ""
+msgstr "Õigekirjakontroll on lubatud järgmistele keeltele:"
 
 msgid "General"
 msgstr "Üldine"
 
-#, fuzzy
 msgid "Geoclue Settings"
-msgstr "Sätete redigeerimine"
+msgstr "Geoclue sätted"
 
 msgid "Location"
 msgstr "Asukoht"
 
-#, fuzzy
-msgid "Not a valid adium theme"
-msgstr "%s pole korrektne toa nimi"
-
 msgid "Notifications"
 msgstr "Teavitamisviisid"
 
 msgid "Play sound for events"
-msgstr "Sündmuste puhul mängitakse heli"
+msgstr "Sündmuste puhul esitatakse heli"
 
 msgid "Preferences"
 msgstr "Eelistused"
@@ -1793,56 +1833,48 @@ msgstr "Privaatsus"
 
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will have a random "
-"value added (&#xB1;0.25&#xB0;)."
-msgstr ""
-
-msgid "Show _avatars"
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
+"Vähendatud asukoha täpsuse korral avaldatakse ainult linn, maakond ja riik. "
+"GPS-koordinaatidele liidetakse juhuslik ühe komakoha täpsusega väärtus."
 
 msgid "Show _smileys as images"
 msgstr "_Tujunägusid näidatakse piltidena"
 
-msgid "Show co_mpact contact list"
-msgstr ""
-
 msgid "Show contact _list in rooms"
-msgstr ""
-
-msgid "Sort by _name"
-msgstr "Sortimine _nime järgi"
-
-msgid "Sort by s_tate"
-msgstr "Sortimine _oleku järgi"
+msgstr "Jututubades näidatakse kontaktide _loendit"
 
 msgid "Sounds"
 msgstr "Helid"
 
 msgid "Spell Checking"
-msgstr ""
+msgstr "Õigekirjakontroll"
 
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
+"Keelte nimekiri kajastab ainult neid keeli, mille jaoks on paigaldatud "
+"sõnastik."
 
 msgid "Themes"
 msgstr "Teemad"
 
 msgid "_Enable bubble notifications"
-msgstr "_Teatemullid lubatud"
+msgstr "_Teatemullid on lubatud"
 
 msgid "_Enable sound notifications"
-msgstr "_Heliteated lubatud"
+msgstr "_Heliteated on lubatud"
 
 msgid "_Open new chats in separate windows"
 msgstr "_Uued vestlused avanevad eraldi akendes"
 
 msgid "_Publish location to my contacts"
-msgstr ""
+msgstr "_Minu asukoht avaldatakse kontaktidele"
 
 msgid "_Reduce location accuracy"
-msgstr ""
+msgstr "_Asukoha täpsust vähendatakse"
 
 msgid "Status"
 msgstr "Olek"
@@ -1850,9 +1882,6 @@ msgstr "Olek"
 msgid "_Quit"
 msgstr "_Lõpeta"
 
-msgid "_Show Contact List"
-msgstr "_Sõbranimekirja näidatakse"
-
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "Teenuse %s rakendust pole võimalik käivitada: %s"
@@ -1862,12 +1891,11 @@ msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
 "application to handle it"
 msgstr ""
-
-msgid "gtk-leave-fullscreen"
-msgstr ""
+"Teenuse %s jaoks pakuti kutset, kuid sul pole selle kasutamiseks vajalikku "
+"rakendust"
 
 msgid "Contact Map View"
-msgstr ""
+msgstr "Kontaktide kaardivaade"
 
 msgid "Error"
 msgstr "Viga"
@@ -1885,7 +1913,7 @@ msgid "Info"
 msgstr "Andmed"
 
 msgid "Debug"
-msgstr ""
+msgstr "Silumine"
 
 msgid "Save"
 msgstr "Salvesta"
@@ -1914,4 +1942,4 @@ msgstr "Tase"
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr ""
+msgstr "Valitud ühenduse haldur ei toeta kaugsilumise laiendust."
diff --git a/po/eu.po b/po/eu.po
index 94d117a13..beb1d3dce 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,23 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-18 21:54+0100\n"
-"PO-Revision-Date: 2009-02-18 21:55+0100\n"
+"POT-Creation-Date: 2009-08-11 12:38+0200\n"
+"PO-Revision-Date: 2009-08-11 15:29+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.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 "Empathy Instant Messenger"
-msgstr "Empathy berehalako mezularitza"
+msgid "Empathy IM Client"
+msgstr "Empathy BM bezeroa"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "Bidali eta jaso berehalako mezuak"
+msgid "Send and receive messages"
+msgstr "Bidali eta jaso mezuak"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
@@ -70,126 +70,190 @@ msgid "Disable sounds when away"
 msgstr "Desgaitu soinuak aldentzean"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "Empathy-k erabitzailearen kokalekua argitara dezake"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy-k GPSa erabil dezake kokalekua asmatzeko"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy-k mugikorren sarea erabil dezake kokalekua asmatzeko"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy-k sarea erabil dezake kokalekua asmatzeko"
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Empathy-ren deskargen karpeta lehenetsia"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy-k kontaktuak inportatzeari buruz galdetu du"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy-k automatikoki konektatu behar duen abiatzean"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy-k kokalekuaren zehaztasuna gutxiagotu dezake"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa  erabiltzea"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "Gaitu WebKit garatzaileen tresnak"
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Gaitu jakinarazpen-leihoak mezu berrientzako"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Gaitu ortografia-egiaztapena"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Ezkutatu leiho nagusia"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Ezkutatu leiho nagusia."
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "NetworkManager erabili behar den"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Goitizena osatzeko karakterea"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Ireki berriketa berriak beste leihoetan"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "Bide-izena Adium gaia erabiltzeko"
+
+#: ../data/empathy.schemas.in.h:28
+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)."
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Jo soinua mezuak iristean"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Jo soinua berriketa berrietan"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Jo soinua mezuak bidaltzean"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Jo soinua kontaktu batek saioa hastean"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Jo soinua kontaktu batek saioa amaitzean"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Jo soinua zuk saioa hastean"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Jo soinua zuk saioa amaitzean"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Jakinarazpen-leihoa berriketak ez badu fokua"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "Jakinarazpen-leihoa kontaktu bat konektatzen denean"
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "Jakinarazpen-leihoa kontaktu bat deskonektatzen denean"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Salut kontua sortzen du"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Erakutsi avatar-ak"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "Erakutsi kontaktu-zerrenda geletan"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Erakutsi leiho nagusia nola ixten den buruzko argibidea"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Erakutsi konektatu gabeko kontaktuak"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Hizkuntzen zuzentzailea"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "Karpeta lehenetsia transferitutako fitxategiak gordetzeko."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Azken direktorioa, Avatar baten irudia aukeratu dena."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Gaia berriketan bistaratzeko (berriketako leihoan)."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Erabili aurpegierak"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Erabili jakinarazpen-soinuak"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Erabili gaia berriketa-gelan"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+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/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "Empathy-k erabiltzailearen kokalekua bere kontaktuei erakutsiko dien edo ez."
+
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Empathy-k kokalekua asmatzeko GPSa erabiliko duen edo ez."
+
+#: ../data/empathy.schemas.in.h:54
+msgid "Whether or not Empathy can use the cellular network to guess the location."
+msgstr "Empathy-k kokalekua asmatzeko mugikorren sarea erabiliko duen edo ez."
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "Empathy-k kokalekua asmatzeko sarea erabiliko duen edo ez."
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
@@ -197,13 +261,19 @@ msgstr ""
 "Empathy-k beste programetatik kontuak inportatzeari buruz galdetu duen ala "
 "ez."
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Empathy abiatzean zure kontuetan saioa automatikoki hasi behar den ala ez."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "Arrazoi pribatuak direla eta Empathy-k kokalekuaren zehaztasuna gutxiagotuko duen edo ez."
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
@@ -211,11 +281,11 @@ msgstr ""
 "Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa erakutsi edo "
 "ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "Salut kontua sortu den ala ez (Empathy aurreneko aldiz exekutatzean)."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -223,7 +293,7 @@ msgstr ""
 "Automatikoki konektatzeko/deskonektatzeko sare-kudeatzailea erabili behar "
 "den edo ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
@@ -231,19 +301,19 @@ msgstr ""
 "Idatzitako hitzen zuzenketa ortografikoa landu edo ez (nahi dituzun "
 "hizkuntzetan)."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid "Whether or not to convert smileys into graphical images in conversations."
 msgstr ""
 "Elkarrizketetan aurpegierak irudi grafikoetara bihurtuko diren ala ez "
 "adierazten du."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:64
 msgid "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
 "Kontaktuen sareko saio-hasierak jakinarazteko soinua joko duen ala ez "
 "adierazten du."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
@@ -251,35 +321,43 @@ msgstr ""
 "Kontaktuen sareko saio-amaierak jakinarazteko soinua joko duen ala ez "
 "adierazten du."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Gertaerak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Sarrerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Berriketa berriak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Irteerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Sarean saioa hastean soinua joko duen ala ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Sareko saioa amaitzean soinua joko duen ala ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "Kanpoan edo lanpetuta zaudenean soinua joko duen ala ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+msgid "Whether or not to show a popup notification when a contact goes offline."
+msgstr "Kontaktu bat lineaz kanpo jartzean (deskonektatzean) jakinarazpen-leihoa erakutsiko duen edo ez."
+
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "Kontaktu bat linean jartzean (konektatzean) jakinarazpen-leihoa erakutsiko duen edo ez."
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -287,13 +365,13 @@ msgstr ""
 "Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
 "adierazten du (nahiz eta berriketa jadanik irekita, baina fokurik gabe, egon)"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:76
 msgid "Whether or not to show a popup notification when receiving a new message."
 msgstr ""
 "Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
 "adierazten du."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -301,19 +379,23 @@ msgstr ""
 "Kontaktu-zerrendan eta berriketako leihoetan kontaktuen avatarrak erakutsi "
 "edo ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr ""
 "Kontaktu-zerrendan deskonektatuak dauden kontaktuak erakutsiko dituen ala ez "
 "adierazten du."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
 "Kanpoan edo lanpetuta zaudenean jakinarazpen-leihoa erakutsiko den ala ez "
 "adierazten du."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Kontaktu-zerrenda berriketa geletan erakutsi edo ez adierazten du."
+
+#: ../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."
@@ -321,15 +403,15 @@ msgstr ""
 "Leiho nagusia titulu-barrako 'x' botoiarekin ixteari buruzko elkarrizketa-"
 "koadroa erakutsi ala ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Kontaktu-zerrenda trinkotuta erakutsi edo ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Berriketa-geletan gaia erabili edo ez adierazten du."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 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 "
@@ -339,541 +421,759 @@ msgstr ""
 "kontaktuen izenen arabera ordenatzea da \"izena\" balioarekin. \"egoera\" "
 "balioak kontaktu-zerrenda egoeraren arabera ordenatuko du."
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "Jasotako fitxategiaren eta bidalitakoaren hash-ak ez datoz bat"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "Urruneko kontaktuak ez du fitxategi-transferentziarik onartzen"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "Hautatutako fitxateagia ez da fitxategi arrunta"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "Hautatutako fitxategia hutsik dago"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Inguruko jendea"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "Socket mota ez dago onartuta"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "Ez da arrazoirik zehaztu"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "Egoeraren aldaketa eskatu da"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Fitxategi-transferentzia bertan behera utzi duzu"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "Beste partaide batek fitxategi-transferentzia bertan behera utzi du"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Errorea fitxategia transferitzen saiatzean"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "Beste partaide batek ezin du fitxategia transferitu"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Arrazoi ezezaguna"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Prest"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Aldendua"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Ezkutatua"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "in the future"
+msgstr "etorkizunean"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Denak"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Aurreratua</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Ahaztu pasahitza eta garbitu sarrera."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+msgid "Advanced"
+msgstr "Aurreratua"
+
+#: ../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
 msgid "Pass_word:"
 msgstr "_Pasahitza:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "_Pantaila-izena:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../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
 msgid "_Port:"
 msgstr "_Ataka:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Zerbitzaria:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "Saioko _IDa:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "_Karaktere-jokoa:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Sare berria"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Sarea</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Zerbitzariak</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Karaktere-jokoa:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Sortu IRC sare berria"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Editatu hautatutako IRC sarea"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Sarea"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Sarea:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Goitizena:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Irteerako mezua:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Benetako izena:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Kendu hautatutako IRC sarea"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Zerbitzariak"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Gainidatzi zerbitzariaren ezarpenak</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "Gainidatzi zerbitzariaren ezarpenak"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "_Lehentasuna:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "_Baliabidea:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Erabili SS_L zaharra"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "_Enkritatzea behar da (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ez ikusi egin SSL ziurtagirien erroreei"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "_Helb. elek.:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "_Izena:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber IDa:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "_Abizenak:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "_Goitizena:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "A_rgitaratutako izena:"
 
 #. 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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "Bilatu STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN zerbitzaria:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN ataka:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "_Erabiltzaile-izena:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "Erabili japoniako _Yahoo"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo! _IDa:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ez ikusi egin konferentzi eta berriketa-gelen gonbiteei"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "_Gelen zerrenda lokala:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "Ezin izan da irudia bihurtu"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr "Sistemak ez du onartzen onartutako irudi-formatuetariko bat bera ere"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "Hautatu zure avatar irudia"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Irudirik ez"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Fitxategi denak"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Egin klik handitzeko"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "Huts egin du berriketa honekin berriro konektatzean"
+
+#: ../libempathy-gtk/empathy-chat.c:412
+msgid "Unsupported command"
+msgstr "Unartu gabeko komandoa"
+
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "lineaz kanpo"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "kontaktu baliogabea"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "baimena ukatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "mezua luzeegia"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "inplementatu gabe"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Errorea '%s' mezua bidaltzean: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Gaia honela ezarria: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "Ez da gairik definitu"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:969
+msgid "(No Suggestions)"
+msgstr "(Iradokizunik ez)"
+
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Txertatu aurpegiera"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Bidali"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "_Egiaztatu ortografia..."
+#: ../libempathy-gtk/empathy-chat.c:1075
+msgid "_Spelling Suggestions"
+msgstr "Iradokizun _ortografikoak"
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1190
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s(e)k gelara elkartzea nahi du"
+msgid "%s has disconnected"
+msgstr "%s deskonektatu egin da"
+
+#: ../libempathy-gtk/empathy-chat.c:1194
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%2$s(e)k %1$s kanporatu du"
+
+#: ../libempathy-gtk/empathy-chat.c:1197
+#, c-format
+msgid "%s was kicked"
+msgstr "%s kanporatua izan da"
+
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%2$s(e)k %1$s debekatu du"
+
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr "%s debekatua izan da"
 
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "%s(e)k gela utzi du"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. 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:1218
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s(e)k gelara elkartzea nahi du"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
 msgid "Disconnected"
 msgstr "Deskonektatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "Konektatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Berriketa"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Gaia:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Berriketa-gela"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Gaia:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "_Kopiatu estekaren helbidea"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_Ireki esteka"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A, %Y %B %d"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Informazio pertsonala"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Editatu kontaktuaren informazioa"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Kontaktuaren informazioa"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "Nire kontaktu-zerrendara gehitu nahi zaitut."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Informazio pertsonala"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Kontaktu berria"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "Erabaki _beranduago"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Harpidetza eskaera"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, 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:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "Taldea kentzen"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "_Kendu"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, 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:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Kontaktua kentzen"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Ez zaitut nahi nire kontaktu-zerrendan gehiago."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "Gehitu _kontaktua..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Berriketa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "_Deitu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Ikusi aurreko berriketak"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Bidali fitxategia"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "Partekatu nire mahaigaina"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "_Informazioa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Gela honetara gonbidatzea"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_Gonbidatu berriketa-gelara"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Hautatu kontaktua"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Gorde avatar-a"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Ezin da avatar-a gorde"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Hautatu"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Taldea"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Bezeroaren informazioa</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr "Herrialdearen ISO kodea:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Country:"
+msgstr "Herrialdea:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "State:"
+msgstr "Estatua:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "City:"
+msgstr "Herria:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Area:"
+msgstr "Area:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr "Posta-kodea:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Street:"
+msgstr "Kalea:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr "Eraikuntza:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Floor:"
+msgstr "Solairua:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Room:"
+msgstr "Gela:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Text:"
+msgstr "Testua:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Description:"
+msgstr "Azalpena:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr "URIa:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr "Zehaztasun maila:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr "Errorea:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr "Errore bertikala (metroak):"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Kontaktuaren xehetasunak</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr "Errore horizontala (metroak):"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Kontaktua</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr "Abiadura:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Taldeak</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Bearing:"
+msgstr "Atzerapena:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr "Igoerako abiadura:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr "Azken eguneraketa:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr "Longitudea:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr "Latitudea:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr "Altitudea:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+msgid "<b>Location</b>"
+msgstr "<b>Kokalekua</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+msgid "<b>Location</b>, "
+msgstr "<b>Kokalekua</b>, "
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+msgstr "%Y/%B/%e, %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Kokalekua</b> (data)\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 "Kontua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Aliasa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Urtebetetzea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "Bezeroaren informazioa"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Bezeroa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Kontaktuaren informazioa"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Kontaktua"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "Kontaktuaren xehetasunak"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "Helb. elek.:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Izen osoa:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "Taldeak"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Identifikatzailea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "Informazioa eskatuta..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "SE:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -881,179 +1181,204 @@ msgstr ""
 "Hautatu taldeak kontaktu hau talde horietan azaltzeko, talde bat baino "
 "gehiago hauta ditzakezu, edo talderik ez."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Bertsioa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "Web gunea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "_Gehitu taldea"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "zerbitzari berria"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "Ataka"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:277
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Kontua"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Data"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Berriketak"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Aurreko berriketak"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Bilatu"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_Honentzako:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "_Deitu"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "_Berriketa"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "Kontaktuaren IDa:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "Berriketa berria"
 
+#. 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 "Mezu pertsonalizatua..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "Editatu mezu pertsonalizatuak..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "Egin klik egoera hau gogokoa izatetik kentzeko"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "Egin klik egoera hau gogoko bihurtzeko"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "Ezarri egoera"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "Ezarri zure presentzia eta uneko egoera"
+
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
 msgid "Custom messages..."
 msgstr "Mezu pertsonalizatuak..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Mezu pertsonalizatua"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Mezua:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Gorde mezua"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Egoera:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Hitza"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Hitzari buruzko iradokizuna"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Zuzentzailea"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Hitzaren iradokizuna:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "Klasikoa"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Soila"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "Garbia"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "Urdina"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "Ezin da URIa ireki"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "Hautatu fitxategia"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "Jaso berehalako mezua"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "Bidali berehalako mezua"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "Sarrerako berriketa eskaera"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "Kontaktua konektatuta"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "Kontaktua deskonektatuta"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "Zerbitzarira konektatuta"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "Zerbitzaritik deskonektatuta"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "Sarrerako ahots-deia"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "Irteerako ahots-deia"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "Ahots-deia amaituta"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "Sartu mezu pertsonalizatua"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "Editatu mezu pertsonalizatuak"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "Gehitu aurrezarpen _berria"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "Gordetako aurrezarpenak"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Klasikoa"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Soila"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Garbia"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Urdina"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "Ezin da URIa ireki"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "Hautatu fitxategia"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
+msgid "Select a destination"
+msgstr "Hautatu helburua"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Uneko lokala"
@@ -1241,7 +1566,7 @@ msgid "Megaphone"
 msgstr "Megafonoa"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Hitz egin!"
 
@@ -1255,15 +1580,15 @@ msgid "_Information"
 msgstr "_Informazioa"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Hobespenak"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Konfiguratu kontaktua."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Hautatu kontaktua..."
 
@@ -1276,23 +1601,23 @@ msgstr "Presentzia"
 msgid "Set your own presence"
 msgstr "Ezarri zure presentzia"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "Ez konektatu abiatzean"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "Ez erakutsi kontaktu-zerrenda abiatzean"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Erakutsi kontuen elkarrizketa-koadroa"
 
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
-msgstr "- Empathy berehalako mezularitza"
+#: ../src/empathy.c:587
+msgid "- Empathy IM Client"
+msgstr "- Empathy BM bezeroa"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1303,7 +1628,7 @@ msgstr ""
 "Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan, "
 "edo (nahiago baduzu) beste berriago batean, jasotako baldintzak betez gero."
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1315,7 +1640,7 @@ msgstr ""
 "HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago nahi izanez gero, "
 "ikus GNU Lizentzia Publiko Orokorra."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "
@@ -1325,32 +1650,31 @@ msgstr ""
 "jasoko zenuen; hala ez bada, idatzi hona: Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "Berehalako mezularitzako bezero bat GNOMErako"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Kontuak"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "%s kontu berria"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1359,7 +1683,7 @@ msgstr ""
 "Zure %s kontua ezabatzera zoaz.\n"
 "Ziur zaude ezabatzea nahi duzula?"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1373,31 +1697,31 @@ msgstr ""
 "Beranduago kontua gehitzea erabakitzen baduzu ere, haiek oraindik "
 "erabilgarri egongo dira."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Kontu berria</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Ez da protokolorik instalatu</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Ezarpenak</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "Gehitu kontua"
 
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "_Sortu"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "Jadanik badaukat erabiltzea nahi dudan kontua"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "Inportatu kontuak..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Ez da protokolorik instalatu"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1405,271 +1729,255 @@ msgstr ""
 "Kontu berri bat gehitzeko, aurrenik erabiltzea nahi duzun protokolo "
 "bakoitzaren motorra instalatu behar duzu."
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "Mota:"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "_Gehitu..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "_Sortu kontu berria"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "_Berrerabili badagoen kontu bat"
+
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "Kontrastea"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "Distira"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "Bolumena"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "Konektatzen..."
+
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "_Albo-barra"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "Dei-teklatua"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "Audio-sarrera"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "Bideo-sarrera"
 
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "Konektatzen..."
+#: ../src/empathy-call-window.c:866
+#, c-format
+msgid "Call with %s"
+msgstr "Deitu honekin: %s"
+
+#: ../src/empathy-call-window.c:935
+msgid "Call"
+msgstr "Deitu"
 
-#: ../src/empathy-call-window.c:572
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1387
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "Konektatuta -- %d:%02dm"
+msgid "Connected — %d:%02dm"
+msgstr "Konektatuta — %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "Eseki"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "Berriro deitu"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "Bidali audioa"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "Bidali bideoa"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "Bideoaren aurrebista"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Deitu"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Berriketak (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Gaia:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Mezua idazten."
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
-#, c-format
-msgid "New message from %s"
-msgstr "%s-(r)en mezu berria"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "_Garbitu"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
 msgid "Chat"
 msgstr "Berriketa"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Txertatu _aurpegiera"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "Gonbitearen _mezua:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Gonbidatu"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
 msgstr "Eraman fitxa e_zkerrera"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
 msgstr "Eraman fitxa e_skuinera"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Hautatu gonbidatzea nahi duzuna:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Berriketako konferentzi batera gonbidatu zaituzte."
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
 msgid "_Contact"
 msgstr "_Kontaktua"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "_Edukia"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
 msgstr "_Berriketa"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
 msgstr "E_zabatu fitxa"
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Favorite Chatroom"
 msgstr "_Gogoko gela"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
 msgstr "_Hurrengo fitxa"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Previous Tab"
 msgstr "_Aurreko fitxa"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "_Erakutsi kontaktu-zerrenda"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
 msgstr "_Fitxak"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "Gela"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "Konektatu automatikoki"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Editatu gogoko gela"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Elkartu gelarekin _abiatzean"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "Elkartu berriketa-gelarekin Empathy abiatzean eta konektatzen zarenean"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "Kudeatu gogoko gelak"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_Izena:"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "_Zerbitzaria:"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_Gela:"
-
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Sarrerako deia"
 
-#: ../src/empathy-event-manager.c:375
+#: ../src/empathy-event-manager.c:324
 #, 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:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "Ez ona_rtu"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_Erantzun"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Sarrerako deia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s(e)k gonbidapena eskaintzen ari zaizu"
 
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "Kanpoko aplikazioa abiaraziko da hori kudeatzeko."
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "Ez daukazu beharrezko aplikaziorik hori kudeatzeko."
 
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Gelarako gonbitea"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s(e)k gonbidatzen zaitu '%s'(e)ra elkartzeko"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "_Ukatu"
 
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Elkartu"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s(e)k gonbidatu zaitu '%s'(e)ra elkartzeko"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Sarrerako fitxategi-transferentzia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s-(e)k harpidetzea eskatu du"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1678,174 +1986,140 @@ msgstr ""
 "\n"
 "Mezua: %s"
 
-#: ../src/empathy-ft-manager.c:113
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s lineaz kanpo dago."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s linean dago."
+
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-msgid "No reason was specified"
-msgstr "Ez da arrazoirik zehaztu"
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "Egoeraren aldaketa eskatu da"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "Fitxategi-transferentzia bertan behera utzi duzu"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "Beste partaide batek fitxategi-transferentzia bertan behera utzi du"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "Error while trying to transfer the file"
-msgstr "Errorea fitxategia transferitzen saiatzean"
-
-#: ../src/empathy-ft-manager.c:174
-msgid "The other participant is unable to transfer the file"
-msgstr "Beste partaide batek ezin du fitxategia transferitu"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s / %s (%s/s)"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "Arrazoi ezezaguna"
+#: ../src/empathy-ft-manager.c:276
+#, 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:224
+#: ../src/empathy-ft-manager.c:307
 #, 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:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" honi bidaltzen: %s"
 
-#: ../src/empathy-ft-manager.c:237
-msgctxt "file size"
-msgid "Unknown"
-msgstr "Ezezaguna"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Errorea \"%s\" hemendik jasotzean: %s"
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "Errorea fitxategi bat jasotzean"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:245
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s / %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "Errorea \"%s\" honi bidaltzean: %s"
 
-#: ../src/empathy-ft-manager.c:252
-msgid "Waiting the other participant's response"
-msgstr "Beste partaideen erantzunaren zai"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "Errorea fitxategi bat bidaltzean"
 
-#: ../src/empathy-ft-manager.c:262
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" hemendik jasota: %s"
 
-#: ../src/empathy-ft-manager.c:268
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" honi bidalita: %s"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "Fitxategi-transferentzia osatuta"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "\"%s\" hemendik jasotzen: %s"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "Beste partaideen erantzunaren zai"
 
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "\"%s\" honi bidaltzen: %s"
+msgid "Checking integrity of \"%s\""
+msgstr "\"%s\"(r)en osotasuna egiaztatzen"
 
-#: ../src/empathy-ft-manager.c:289
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "Fitxategi-transferentzia bertan behera utzita: %s"
+msgid "Hashing \"%s\""
+msgstr "\"%s\"(r)en hash-a egiten"
 
-#: ../src/empathy-ft-manager.c:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "Fitxategia"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "Falta:"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "Ezin da fitxategia kokaleku honetan gorde"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "Gorde fitxategia honela..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "tamaina ezezaguna"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s(e)k fitxategi bat bidaltzea nahi dizu"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "\"%s\" fitxategia onartzen nahi duzu (%s)?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "_Onartu"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
 msgstr "Fitxategi-transferentziak"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Kendu osatutako, bertan behera utzitako eta huts egindako fitxategi-"
 "transferentziak zerrendatik"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Inportatu"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protokoloa"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Iturburua"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1853,137 +2127,187 @@ msgstr ""
 "Ez da inportatzeko konturik aurkitu. Empathy-k oraingoz Pidgin-etik soilik "
 "inporta ditzake kontuak."
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "Inportatu kontuak"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "_Editatu kontua"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Ez da errorerik zehaztu"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Sareko errorea"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Autentifikazioak huts egin du"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Enkriptazioaren errorea"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Izena erabilita"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Ez da ziurtagiririk eman"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Ziurtagiria ez da fidagarria"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Ziurtagiria iraungituta"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Ziurtagiria aktibatu gabe"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "Ziurtagiriaren ostalari-izena ez dator bat"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Ziurtagiriaren hatz-marka ez dator bat"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Ziurtagiria bere buruarekin sinatuta"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Ziurtagiriaren errorea"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Erakutsi eta editatu kontuak"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "Kontaktua"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "_Editatu kontua"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Kontaktuen zerrenda"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "Kontaktuak _mapa batean"
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Testuingurua"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "Elkartu _gogokoetan"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Elkartu _berrian..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Kudeatu gogokoak"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Erakutsi _konektatu gabeko kontaktuak"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "Tamaina _normala"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "Tamaina normala _avatarrekin"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Ordenatu _izenarekiko"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "Ordenatu _egoerarekiko"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "_Kontuak"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "Gehitu _kontaktua..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "Tamaina _trinkoa"
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "_Araztu"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "_Fitxategi-transferentziak"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "_Elkartu..."
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_Berriketa berria..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "_Konektatu gabeko kontaktuak"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "_Informazio pertsonala"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "_Aurreko berriketak"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Gela"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
 msgstr "Berriketa-gela"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Arakatu:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "Kideak"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "Bai"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "Ez"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "Ezin izan da gelen zerrenda abiarazi"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "Ezin izan da gelen zerrenda gelditu"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+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."
 msgstr ""
 "Idatzi gelaren izena bertara elkartzeko edo egin klik gela batean edo "
 "gehiagotan zerrendan."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../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"
@@ -1991,182 +2315,200 @@ msgstr ""
 "Idatzi gela duen zerbitzaria, edo utzi hutsik gela ez badago uneko kontuen "
 "zerbitzarian."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Elkartu"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Elkartu berrian"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "Elkartu gelara"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "_Freskatu"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "Gelen zerrenda"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid "This list represents all chat rooms hosted on the server you have entered."
-msgstr ""
-"Zerrenda honek emandako zerbitzarian ostatutako berriketa-gela guztiak "
-"adierazten ditu."
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Gela:"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "Mezua jasota"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "Mezua bidalita"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "Berriketa berria"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "Kontaktua linean dago"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "Kontaktua lineaz kanpo dago"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "Kontua konektatuta"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "Kontua deskonektatuta"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Itxura</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "Baimendu _GPS erabiltzea"
 
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Portaera</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "Baimendu telefono _mugikorra erabiltzea"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Kontaktuen zerrenda</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "Baimendu _sarea erabiltzea"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Gaitu hizkuntzen zuzentzailea:</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "Itxura"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Jo soinua gertaeretan</b>"
-
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr "<small>Hizkuntzen zerrendak instalatutako hiztegiei dagokie.</small>"
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "Automatikoki _konektatu abiatzean "
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr ""
-"Avatarrak, erabiltzaileak aukeratutako irudiak kontaktuen zerrendan agertzen "
-"direnak dira"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "Portaera"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "Berriketa-_gaia:"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "Desgaitu jakinarazpenak _aldentzean edo lanpetuta egotean"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "Desgaitu soinuak _aldentzean edo lanpetuta egotean"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../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:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "Gaitu jakinarazpenak kontaktu bat deskonektatzen denean"
+
+#: ../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.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "Gaitu hizkuntzen zuzentzailea:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Orokorra"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Geoclue ezarpenak"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "Kokalekua"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Jakinarazpenak"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "Jo soinua gertaeretan"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "Erakutsi _avatarrak"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "Pribatutasuna"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:21
+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 ""
+"Kokalekuaren zehaztasun murriztuak zure herria, estatua eta herrialdea soilik "
+"argitaratuko dela adierazten du. GPS koordenatuak dezimal 1eko "
+"zehaztasuna edukiko du."
+
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Erakutsi _aurpegierak irudi gisa"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "Erakutsi kontaktu-zerrenda _trinkotua"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "Ordenatu _izenarekiko"
-
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "Ordenatu _egoerarekiko"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "Erakutsi kontaktu-_zerrenda geletan"
 
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Soinuak"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Zuzentzailea"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+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:27
 msgid "Themes"
 msgstr "Gaiak"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "_Gaitu jakinarazpen-burbuilak"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "_Gaitu soinu-jakinarazpenak"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Ireki berriketa berriak beste leihoetan"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "_Erakutsi kokalekua nire kontaktuei"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "_Murriztu kokalekuaren zehaztasuna"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "Egoera"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "I_rten"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Erakutsi kontaktu-zerrenda"
-
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "Ezin da %s zerbitzuaren aplikazioa abiarazi: %s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:446
 #, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
@@ -2175,3 +2517,74 @@ msgstr ""
 "%s(e)k gonbidapena eskaintzen ari zaizu, baina ez daukazu "
 "beharrezkoaplikaziorik gonbidapena kudeatzeko."
 
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "Kontaktuen maparen ikuspegia"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Errorea"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "Kritikoa"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "Abisua"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "Mezua"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "Informazioa"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "Arazketa"
+
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "Gorde"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "Arazketa-leihoa"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "Pausatu"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "Maila: "
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "Ordua"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "Domeinua"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "Kategoria"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "Maila"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "Hautatutako konexio-kudeatzaileak ez du urruneko arazketa-hedapenik onartzen."
+
diff --git a/po/fi.po b/po/fi.po
index 9c41107b5..45e5dcc22 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,14 +4,15 @@
 #
 # Ilkka Tuohela <hile@iki.fi>, 2006-2009.
 # Samuli Seppänen & Henna Nykänen <sjsepp@utu.fi>, 2006.
+# Tommi Vainikainen <thv@iki.fi>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gossip\n"
+"Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-18 18:16+0300\n"
-"PO-Revision-Date: 2009-02-18 18:30+0300\n"
-"Last-Translator: Ilkka Tuohela <hile@utu.fi>\n"
+"POT-Creation-Date: 2009-08-16 23:32+0300\n"
+"PO-Revision-Date: 2009-08-16 23:23+0300\n"
+"Last-Translator: Tommi Vainikainen <thv@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +21,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
+msgid "Empathy IM Client"
 msgstr "Empathy-pikaviestin"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "Lähetä ja vastaanota pikaviestejä"
+msgid "Send and receive messages"
+msgstr "Lähetä ja vastaanota viestejä"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
@@ -71,152 +72,225 @@ msgid "Disable sounds when away"
 msgstr "Älä soita ääniä poissaollessa"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "Empathy voi julkaista käyttäjän sijainnin"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy voi käyttää GPS:ää paikantamaan sijainnin"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy voi käyttää matkapuhelinverkkoa paikantamaan sijainnin"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy voi käyttää verkkoa paikantamaan sijainnin"
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Empathyn noutojen oletuskansio"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy on kysynyt tilien tuonnista"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy yrittää yhdistää automaattisesti käynnistettäessä"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathyn pitää heikentää sijainnin tarkkuutta"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy yrittää käyttää tuttavan avatarta keskusteluikkunan kuvakkeena"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "Ota käyttöön WebKit-kehittäjän työkalut"
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Näytä ponnahdusikkuna uusille viesteille"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Ota käyttöön oikeinkirjoituksen tarkistus"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Piilota pääikkuna"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Piilota pääikkuna."
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "NetworkManageria tulisi käyttää"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Lempinimen täydennysmerkki"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Avaa uusi ikkuna uusille keskusteluille"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "Käytettävän Adium-teeman polku"
+
+#: ../data/empathy.schemas.in.h:28
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr ""
+"Polku Adium-teemaan, jota käytetään jos käytössä oleva keskustelun teema on "
+"Adium."
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Soita merkkiääni saapuville viesteille"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Soita merkkiääni uusista keskusteluista"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Soita merkkiääni lähetettäville viesteille"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Soita merkkiääni tuttavan sisäänkirjautuessa"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Soita merkkiääni tuttavan uloskirjautuessa"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Soita merkkiääni sisäänkirjauduttaessa"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Soita merkkiääni uloskirjauduttaessa"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Näytä ponnahdusikkunat, jos keskustelu ei ole kohdistettu"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "Näytä ponnahdusikkunat kun tuttava kirjautuu sisään"
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "Näytä ponnahdusikkunat kun tuttava kirjautuu ulos"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Salut-tili on luotu"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Näytä avatar-kuvat"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "Näytä tuttavaluettelo huoneissa"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Näytä vihje pääikkunan sulkemisesta"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Näytä linjoilta poissa olevat tuttavat"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Kielentarkastuksessa käytetyt kielet"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "Oletuskansio, johon siirretyt tiedostot tallennetaan."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Viimeisin hakemisto, josta avatar-kuva oli valittu."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Keskusteluikkunoissa käytettävä teema."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Käytä hymiökuvakkeita"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Käytä merkkiääniä"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Käytä teemaa keskusteluhuoneille"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+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/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "Voiko Empathy julkaista käyttäjän sijainnin hänen tuttavilleen."
+
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Voiko Empathy käyttää GPS:ää paikantamaan sijainti."
+
+#: ../data/empathy.schemas.in.h:54
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr "Voiko Empathy käyttää matkapuhelinverkkoa paikantamaan sijainti."
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "Voiko Empathy käyttää verkkoa paikantamaan sijainti."
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
-msgstr ""
-"Onko empathy esittänyt kysymyksen tilien tuonnista muista ohjelmista."
+msgstr "Onko Empathy esittänyt kysymyksen tilien tuonnista muista ohjelmista."
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr ""
-"Tulisiko empathyn ottaa yhteyttä tileihisi automaattisesti käynnistettäessä."
+"Tulisiko Empathyn ottaa yhteyttä tileihisi automaattisesti käynnistettäessä."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "Tulisiko Empathy heikentää sijainnin tarkkuutta yksityisyyden vuoksi."
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr ""
-"Tulisiko empathyn käyttää tuttavan avatarta keskusteluikkunan kuvakkeena."
+"Tulisiko Empathyn käyttää tuttavan avatarta keskusteluikkunan kuvakkeena."
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
-msgstr "Onko salut-tili luotu empathyn ensimmäisellä käynnistyskerralla."
+msgstr "Onko Salut-tili luotu Empathyn ensimmäisellä käynnistyskerralla."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -224,87 +298,97 @@ msgstr ""
 "Käytetäänkö NetworkManager:ia yhdistämään ja katkaisemaan yhteys "
 "automaattisesti."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "Tarkistetaanko oikeinkirjoitus haluamiasi kieliä vasten."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "Muunnetaanko hymiöt graafisiksi?"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
-msgstr ""
-"Soitetaanko merkkiääni, kun tuttavaa kirjautuu verkkoon."
+msgstr "Soitetaanko merkkiääni, kun tuttavaa kirjautuu verkkoon."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
-msgstr ""
-"Soitetaanko merkkiääni, kun tuttavaa katkaisee yhteyden verkkoon."
+msgstr "Soitetaanko merkkiääni, kun tuttavaa katkaisee yhteyden verkkoon."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Soitetaanko merkkiääniä tapahtumille."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Soitetaanko saapuvista viesteistä merkkiääni."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Soitetaanko uusista keskusteluista merkkiääni."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Soitetaanko lähetetyistä viesteistä merkkiääni."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Soitetaanko lähetetyistä kirjauduttaessa verkkoon."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Soitetaanko lähetetyistä katkaistaessa yhteys verkkoon."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "Soitetaanko merkkiääniä oltaessa poissa tai varattu."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "Näytetäänkö ponnahdusikkunoita kun tuttava lähtee linjoilta."
+
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "Näytetäänkö ponnahdusikkunoita kun tuttava tulee linjoille."
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr ""
-"Näytetäänkö ponnahdusikkuna vastaanotettaessa uusi viesti, vaikka "
-"keskustelu olisi jo auki mutta ei kohdistettu."
+"Näytetäänkö ponnahdusikkuna vastaanotettaessa uusi viesti, vaikka keskustelu "
+"olisi jo auki mutta ei kohdistettu."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
-msgstr ""
-"Näytetäänkö ponnahdusikkuna vastaanotettaessa uusi viesti."
+msgstr "Näytetäänkö ponnahdusikkuna vastaanotettaessa uusi viesti."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "Näytetäänkö avatarit tuttavaluettelossa ja keskusteluikkunoissa."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "Näytetäänkö tuttavaluettelossa myös linjoilta poissa olevat tuttavat?"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "Näytetäänkö ponnahdusikkunoita oltaessa poissa tai varattu."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Näytetäänkö tuttavaluettelo keskusteluhuoneissa."
+
+#: ../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."
@@ -312,15 +396,15 @@ msgstr ""
 "Näytetäänkö viesti-ikkuna pääikkunan sulkemisesta suljettaessa ikkuna X-"
 "napista."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Näytetäänkö tuttavaluettelo pienikokoisena."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Käytetäänkö teemaa keskusteluhuoneille."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 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 "
@@ -330,541 +414,769 @@ msgstr ""
 "järjestää tuttavan nimen mukaan arvolla \"name\". Luettelo voidaan järjestää "
 "tuttavan tilan mukaan arvolla \"state\"."
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-ft-handler.c:838
+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:1098
+msgid "File transfer not supported by remote contact"
+msgstr "Etäyhteys ei tue tiedostonsiirtoa"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "Valittu tiedosto ei ole tavanomainen tiedosto"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "Valittu tiedosto on tyhjä"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Lähellä olevat ihmiset"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "Pistoketyyppi ei ole tuettu"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "Syytä ei annettu"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "Pyydettiin tilan muutosta"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Keskeytit tiedostonsiirron"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Virhe yritettäessä siirtää tiedostoa"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "Toinen osapuoli ei voi siirtää tiedostoa"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Tuntematon syy"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Tavoitettavissa"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Poissa"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "in the future"
+msgstr "tulevaisuudessa"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Kaikki"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Lisäasetukset</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Unohda salasana ja tyhjennä kohta."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+msgid "Advanced"
+msgstr "Lisäasetukset"
+
+#: ../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
 msgid "Pass_word:"
 msgstr "S_alasana:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "Näyttö_nimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../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
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "Pal_velin:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "_Käyttäjätunnus:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "_Merkistö:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Uusi verkko"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Verkko</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Palvelimet</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Merkistö:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Luo uusi IRC-verkko"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Muokkaa valittua IRC-verkkoa"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Verkko"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Verkko:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Nimimerkki:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Lopetusviesti:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Oikea nimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Poista valittu IRC-verkko"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Palvelimet"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Ohita palvelimen asetukset</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "Ohita palvelimen asetukset"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "_Tärkeys:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "Res_urssi:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Käytä vanhaa SS_L-porttia"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "_Vaadi salaus (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "Älä _huomioi SSL-varmenteiden virheitä"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "_Sähköposti:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "_Etunimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber-tunniste:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "_Sukunimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "_Nimimerkki:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "_Julkaistu nimi:"
 
 #. 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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "Havaitse STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN-palvelin:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN-portti:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "_Käyttäjätunnus:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "Käytä _Yahoo Japania"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo-_tunnus:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "Älä _huomioi konferenssi- ja huonekutsuja"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "_Huoneluettelon maa-asetusto:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "Kuvaa ei voitu muuntaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr "Tietokoneesi ei tue yhtäkään hyväksytyistä kuvamuodoista"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "Valitse avatar-kuvasi"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Ei kuvaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Suurenna napsauttamalla"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "Uudelleenyhdistäminen tähän keskusteluun epäonnistui"
+
+#: ../libempathy-gtk/empathy-chat.c:412
+msgid "Unsupported command"
+msgstr "Komento ei tuettu"
+
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "virheellinen yhteystieto"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "lupa evätty"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "liian pitkä viesti"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "ei toteutettu"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Virhe lähetettäessä viestiä \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Aihe asetettu: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "Aihetta ei ole annettu"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:969
+msgid "(No Suggestions)"
+msgstr "(Ei ehdotuksia)"
+
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Lisää hymiö"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "_Tarkasta oikeinkirjoitus..."
+#: ../libempathy-gtk/empathy-chat.c:1075
+msgid "_Spelling Suggestions"
+msgstr "_Kielentarkistuksen ehdotukset"
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1190
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s on saapunut huoneeseen"
+msgid "%s has disconnected"
+msgstr "%s katkaisi"
+
+#: ../libempathy-gtk/empathy-chat.c:1194
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%2$s potkaisi henkilön %1$s"
+
+#: ../libempathy-gtk/empathy-chat.c:1197
+#, c-format
+msgid "%s was kicked"
+msgstr "%s potkaistiin"
 
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%2$s esti henkilön %1$s"
+
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr "%s estettiin"
+
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "%s on poistunut huoneesta"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. 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:1218
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s on saapunut huoneeseen"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
 msgid "Disconnected"
 msgstr "Ei yhteyttä"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Aihe:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Ryhmäkeskustelu"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Aihe: "
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "_Kopioi linkin osoite"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_Avaa linkki"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %d. %Bta %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Henkilökohtaiset tiedot"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Muokkaa yhteystietoja"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Yhteystiedot"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "Haluaisin liittää sinut tuttavaluettelooni."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Henkilökohtaiset tiedot"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Uusi tuttava"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "_Päätä myöhemmin"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Liittymispyyntö"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, 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:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "Poistetaan ryhmää"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, 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:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Poistetaan tuttava"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Anteeksi mutta en halua sinua enää tuttavaluettelooni."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "Lisää _tuttava..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Keskustele"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "_Soita"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Äänipuhelu"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videopuhelu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Näytä edelliset keskustelut"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Lähetä tiedosto"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "Jaa työpöytäni"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "_Tietoja"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Kutsutaan tähän huoneeseen"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_Kutsu huoneeseen"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Valitse tuttava"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Tallenna vastaus"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Avataria ei voitu tallentaa"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Valitse"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Tietoja asiakasohjelmasta</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr "Maan ISO-tunnus:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Country:"
+msgstr "Maa:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "State:"
+msgstr "Osavaltio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Tuttavan yksityiskohdat</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "City:"
+msgstr "Kaupunki:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Tuttava</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Area:"
+msgstr "Alue:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Ryhmät</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr "Postinumero:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Street:"
+msgstr "Katu:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr "Rakennus:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Floor:"
+msgstr "Kerros:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Room:"
+msgstr "Huone:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Text:"
+msgstr "Teksti:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Description:"
+msgstr "Kuvaus:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr "Tarkkuustaso:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr "Virhe:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr "Vertikaalinen virhe (metriä):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr "Horisontaalinen virhe (metriä):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr "Nopeus:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Bearing:"
+msgstr "Suuntima:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr "Kiipeämisvauhti:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr "Viimeksi päivitetty:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr "Pituuspiiri:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr "Leveyspiiri:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr "Korkeus:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+msgid "<b>Location</b>"
+msgstr "<b>Sijainti</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+msgid "<b>Location</b>, "
+msgstr "<b>Sijainti</b>, "
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+msgstr "%e. %Bta %Y klo %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Sijainti</b> hetkellä (pvm)\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 "Käyttäjätili:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Nimimerkki:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Syntymäpäivä:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "Asiakastiedot"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Asiakasohjelma:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Yhteystiedot"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Tuttava"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "Tuttavan yksityiskohdat"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "Sähköposti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Koko nimi:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "Ryhmät"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Tunniste:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "Pyydetään tietoja..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "Käyttöjärjestelmä:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -872,179 +1184,204 @@ msgstr ""
 "Valitse ryhmät, joissa haluat tämän yhteystiedon näkyvän. Huomaa että Voit "
 "valita useita ryhmiä tai olla valitsematta yhtään ryhmää."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Versio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "WWW-sivusto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "_Lisää ryhmä"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "uusi palvelin"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Palvelin:"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "Portti:"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:277
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Käyttäjätili"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Päivämäärä"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Aikaisemmat keskustelut"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Etsi"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_Ajalta:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "_Soita"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "_Keskustele"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "Tuttavan tunniste:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "Uusi keskustelu"
 
+#. 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 "Itse määritelty viesti..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "Muokkaa itse määriteltyjä viestejä..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "Napsauta poistaaksesi tämän tilan suosikeista"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "Napsauta tehdäksesi tästä tilasta suosikin"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "Aseta tila"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "Aseta läsnäolosi ja nykyinen tilasi"
+
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
 msgid "Custom messages..."
 msgstr "Itse määritellyt viestit..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Itse määriteltyviesti"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Viesti:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Tallenna viesti"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Tila:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Sana"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Korjausehdotukset"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Kielentarkastus"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Korjausehdotuksia:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "Perinteinen"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Yksinkertainen"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "Siisti"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "Sininen"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "URI:a ei voi avata"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "Valitse tiedosto"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "Vastaanotettiin pikaviesti"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "Lähetettiin pikaviesti"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "Saapuva keskustelupyyntö"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "Tuttava yhdistetty"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "Yhteys tuttavaan katkaistu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "Yhdistetty palvelimeen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "Yhteys palvelimeen katkaistu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "Saapuva puhelu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "Lähetä puhelu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "Puhelu päättyi"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "Syötä itse määritelty viesti"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+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-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "Tallennetut esitiedot"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Perinteinen"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Yksinkertainen"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Siisti"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Sininen"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "URI:a ei voi avata"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "Valitse tiedosto"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
+msgid "Select a destination"
+msgstr "Valitse kohde"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Nykyinen maa-asetusto"
@@ -1231,7 +1568,7 @@ msgid "Megaphone"
 msgstr "Megafoni"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Puhu!"
 
@@ -1245,15 +1582,15 @@ msgid "_Information"
 msgstr "_Tietoja"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Määrittele tuttava."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Valitse tuttava..."
 
@@ -1266,23 +1603,23 @@ msgstr "Läsnäolo"
 msgid "Set your own presence"
 msgstr "Aseta läsnäolosi tila"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "Älä yhdistä käynnistettäessä"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "Älä näytä tuttavaluetteloa käynnistettäessä"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Näytä tili-ikkuna"
 
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
-msgstr "- Empathy-pikaviestiohjelma"
+#: ../src/empathy.c:587
+msgid "- Empathy IM Client"
+msgstr "- Empathy-pikaviestin"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1294,7 +1631,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:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1306,7 +1643,7 @@ msgstr ""
 "laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistä "
 "lisää yksityiskohtia."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "
@@ -1316,11 +1653,11 @@ msgstr ""
 "kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, Fifth "
 "Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomen pikaviestiohjelma"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "Samuli Seppänen ja Henna Nykänen, 2006.\n"
@@ -1328,22 +1665,21 @@ msgstr ""
 "\n"
 "http://www.gnome.fi/"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Uusi %s-tili"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1352,7 +1688,7 @@ msgstr ""
 "Olet poistamassa %s-tilisi!\n"
 "Haluatko varmasti jatkaa?"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1366,31 +1702,31 @@ msgstr ""
 "Jos päätät myöhemmin lisätä tilin takaisin, ovat vanhat keskustelut ja "
 "keskusteluhuoneet jälleen käytettävissä."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Uusi tili</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Protokollaa ei ole asennnettu</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "Lisää käyttäjätili"
 
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Asetukset</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "_Luo"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "Minulla on jo tili, jota haluan käyttää"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "Tuo tilejä..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Protokollaa ei ole asennnettu"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "Asetukset"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1398,271 +1734,255 @@ msgstr ""
 "Ennen kuin voit lisätä tilin, sinun täytyy asentaa kullekin käytettävälle "
 "protokollalle tarvittava taustajärjestelmä."
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "_Lisää..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "_Luo uusi käyttäjätili"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "_Uudelleenkäytä olemassaolevaa käyttäjätiliä"
+
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "Kontrasti"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "Kirkkaus"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "Äänenvoimakkuus"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "Yhdistetään..."
+
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "_Sivupalkki"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "Valintalevy"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "Äänisyöte"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "Videosyöte"
 
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "Yhdistetään..."
+#: ../src/empathy-call-window.c:866
+#, c-format
+msgid "Call with %s"
+msgstr "Soita tuttavalle %s"
 
-#: ../src/empathy-call-window.c:572
+#: ../src/empathy-call-window.c:935
+msgid "Call"
+msgstr "Soita"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1387
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "Yhdistetty -- %d:%02dm"
+msgid "Connected — %d:%02dm"
+msgstr "Yhdistetty -- %d:%02d min"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "Katkaise"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "Yhdistä uudelleen"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "Lähetä ääntä"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "Lähetä video"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "Videon esikatselu"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Soita"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Keskustelut (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Aihe: "
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Kirjoittaa viestiä."
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
-#, c-format
-msgid "New message from %s"
-msgstr "Uusi viesti käyttäjältä %s"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "_Tyhjennä"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Lisää _hymiö"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "Kutsu_viesti:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Kutsu"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
 msgstr "Siirrä välilehti _vasemmalle"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
 msgstr "Siirrä välilehti _oikealle"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Valitse ketkä haluat kutsua:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Olet saanut kutsun ryhmäkeskusteluun."
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
 msgid "_Contact"
 msgstr "_Tuttavat"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
 msgstr "_Keskustelu"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
 msgstr "_Irrota välilehti"
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Favorite Chatroom"
 msgstr "_Suosituin keskusteluhuone"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
 msgstr "_Seuraava välilehti"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Previous Tab"
 msgstr "_Edellinen välilehti"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "_Näytä tuttavaluettelo"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
 msgstr "V_älilehdet"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "Huone"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "Yhdistä automaattisesti"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Muokkaa suosikkihuonetta"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Yhdistä _keskusteluhuoneeseen käynnistettäessä"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "Yhdistä tähän keskusteluhuoneeseen, kun yhteys on muodostettu"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "Hallitse suosikkihuoneita"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_Nimi:"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "_Palvelin:"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_Keskusteluhuone:"
-
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Saapuva puhelu"
 
-#: ../src/empathy-event-manager.c:375
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s soitaa sinulle, haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "_Hylkää"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_Vastaa"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Puhelu käyttäjältä %s"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s tarjoaa sinulle kutsua"
 
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "Ulkoinen ohjelma käynnistetään kutsun käsittelyä varten."
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "Sinulla ei ole tarvittavaa ulkoista ohjelmaa kutsun käsittelemiseksi."
 
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Kutsu huoneeseen"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kutsui sinut liittymään %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s kutsui sinut liittymään kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Saapuva tiedostonsiirto tuttavalta %s"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Liittymispyyntö tuttavalta %s"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1671,172 +1991,143 @@ msgstr ""
 "\n"
 "Viesti: %s"
 
-#: ../src/empathy-ft-manager.c:113
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s on nyt poissa linjoilta."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, 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:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-msgid "No reason was specified"
-msgstr "Syytä ei annettu"
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "Pyydettiin tilan muutosta"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "Keskeytit tiedostonsiirron"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "Error while trying to transfer the file"
-msgstr "Virhe yritettäessä siirtää tiedostoa"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Tuntematon"
 
-#: ../src/empathy-ft-manager.c:174
-msgid "The other participant is unable to transfer the file"
-msgstr "Toinen osapuoli ei voi siirtää tiedostoa"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s / %s nopeudella %s/s"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "Tuntematon syy"
+#: ../src/empathy-ft-manager.c:276
+#, 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:224
+#: ../src/empathy-ft-manager.c:307
 #, 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:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Lähetetään \"%s\" tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:237
-msgctxt "file size"
-msgid "Unknown"
-msgstr "Tuntematon"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Virhe vastaanotettaessa \"%s\" tuttavalta %s"
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "Virhe vastaanotettaessa tiedostoa"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:245
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s / %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "Virhe lähetettäessä \"%s\" tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:252
-msgid "Waiting the other participant's response"
-msgstr "Odotetaan toisen osallistujan vastausta"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "Virhe lähetettäessä tiedostoa"
 
-#: ../src/empathy-ft-manager.c:262
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" vastaanotettu tuttavalta %s"
 
-#: ../src/empathy-ft-manager.c:268
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" lähetetty tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "Tiedostonsiirto valmistui"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "\"%s\" vastaanotetaan tuttavalta %s"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "Odotetaan toisen osallistujan vastausta"
 
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "\"%s\" lähetetään tuttavalle %s"
+msgid "Checking integrity of \"%s\""
+msgstr "Tarkistetaan tiedoston ”%s” eheyttä"
 
-#: ../src/empathy-ft-manager.c:289
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "Tiedostonsiirto keskeytetty: %s"
-
-#: ../src/empathy-ft-manager.c:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Tuntematon"
+msgid "Hashing \"%s\""
+msgstr "Lasketaan tiivistettä tiedostolle ”%s”"
 
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "Jäljellä"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "Tähän sijaintiin ei voi tallentaa"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "_Tallenna nimellä..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "tuntematon koko"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s haluaa lähettää sinulle tiedoston"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "Haluatko hyväksyä tiedoston \"%s\" (%s)?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "_Hyväksy"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
 msgstr "Tiedostosiirrot"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Poista valmiit, perutut ja epäonnistuneet tiedostonsiirrot luettelosta"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Tuo"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Lähde"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1844,138 +2135,204 @@ msgstr ""
 "Tuotavia tilejä ei löytynyt. Empathy osaa tällä hetkellä tuoda tilejä "
 "ainoastaan pidginistä."
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "Tuo tilejä"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "Muokkaa _tiliä"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Ei määriteltyjä virheitä"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Verkkovirhe"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Todennus epäonninstui"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Salausvirhe"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Nimi on käytössä"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Varmennetta ei ole annettu"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Varmenne ei ole luotettu"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Varmenne on vanhentunut"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Varmenne ei ole vielä aktivoitu"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "Varmenteen verkkonimi ei täsmää"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Varmenteen sormenjälki ei täsmää"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Itseallekirjoitettu varmenne"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Varmennevirhe"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Näytä ja muokkaa tilejä"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "Tuttava"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "Muokkaa _tiliä"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Tuttavaluettelo"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "Tuttavat _kartalla"
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Yhteys"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "Liity _suosikkeihin"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Liity _uuteen..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Hallitse suosikkeja"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Näytä _poissa linjoilta olevat tuttavat"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "_Normaali koko"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "Normaali koko _avatarien kera"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Lajittele _nimen mukaan"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "Lajittele _tilan mukaan"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "_Käyttäjätilit"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "Lisää _tuttava..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "_Tiivis koko"
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "_Vianetsintä"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "_Tiedostosiirrot"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "_Liity..."
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "Uusi _keskustelu..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "_Poissa linjoilta olevat tuttavat"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "_Henkilötiedot"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "_Aiemmat keskustelut"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Huone"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
-msgstr "Keskusteluhuoneet"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
+msgstr "Keskusteluhuone"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Selaa:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "Jäsenet"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"Tarvitaan kutsu: %s\n"
+"Tarvitaan salasana: %s\n"
+"Jäsenet: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "Kyllä"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "Ei"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "Ei voitu aloittaa huoneluettelointia"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "Ei voitu lopettaa huoneluettelointia"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "Ei voitu ladata huoneluetteloa"
+
+#: ../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 ""
 "Anna liityttävän huoneen nimi tai napsauta yhtä tai useampaa huonetta "
 "luettelosta."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../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"
@@ -1983,182 +2340,201 @@ msgstr ""
 "Anna palvelin, jolta huone löytyy, tai jätä tyhjäksi jos huone on tilin "
 "nykyisellä palvelimella"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Liity"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Liity uuteen"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "Liity huoneeseen"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "_Päivitä"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "Huoneluettelo"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr ""
-"Tässä luettelossa ovat kaikki huoneet palvelimelta, johon olet kirjautunut"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Keskusteluhuone:"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:148
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:149
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:150
 msgid "New conversation"
 msgstr "Uusi keskustelu"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes online"
 msgstr "Tuttava saapui linjoille"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:152
 msgid "Contact goes offline"
 msgstr "Tuttava poistui linjoilta"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:153
 msgid "Account connected"
 msgstr "Tili yhdistetty"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:154
 msgid "Account disconnected"
 msgstr "Tilin yhteys katkaistu"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:394
 msgid "Language"
 msgstr "Kieli"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Ulkoasu</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "Salli _GPS-käyttö"
 
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Käytös</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "Salli _matkapuhelinverkon käyttö"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Tuttavaluettelo</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "Salli _verkon käyttö"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Käytä kielentarkistusta kielille:</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "Ulkoasu"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Soita ääniä tapahtumille</b>"
-
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr ""
-"<small>Luettelo kielistä sisältää ainoastaan ne kielet, joille "
-"tietokoneessasi on asennettu sanakirja.</small>"
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "Yhdistä _käynnistettäessä "
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "Avatarit ovat käyttäjän valitsemia kuvia tuttavaluettelossa"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "Käytös"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "Keskustelun _teema:"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "Poista huomautukset käytöstä oltaessa _poissa tai kiireinen"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "Poista äänet käytöstä oltaessa _poissa tai kiireinen"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "Ota käyttöön ponnahdusikkunat kun tuttava tulee linjoille"
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "Ota käyttöön ponnahdusikkunat kun tuttava lähtee linjoilta"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Näytä huomautuksia, kun _keskustelu ei ole kohdistettu"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "Käytä kielentarkistusta kielille:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Yleinen"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Geoclue-asetukset"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "Sijainti"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Huomautukset"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "Soita ääniä tapahtumille"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "Näytä _avattaret"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "Yksityisyys"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:21
+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 ""
+"Heikennetty sijaintitiedon tarkkuus tarkoittaa, että ainoastaan kaupunkisi "
+"ja maasi julkaistaan. GPS-koordinaattien tarkkuus on yksi desimaali."
+
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Näytä _hymiöt hymiökuvakkeina"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "Näytä _pieni tuttavaluettelo"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "Järjestä _nimen mukaan"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "Näytä tuttava_luettelo huoneissa"
 
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "Järjestä _tilan mukaan"
-
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Kielentarkastus"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Luettelo kielistä sisältää ainoastaan ne kielet, joille tietokoneessasi on "
+"asennettu sanakirja."
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Teemat"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "_Käytä ponnahdusikkunahuomautuksia"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "Käytä merkkiääniä"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Avaa uusi ikkuna uusille keskusteluille"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "_Julkaise sijainti tuttavilleni"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "_Heikennä sijaintitiedon tarkkuutta"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "Tila"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Näytä tuttavaluettelo"
-
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "Ohjelmaa palvelulle %s ei voitu käynnistää: %s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:446
 #, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
@@ -2167,16 +2543,230 @@ msgstr ""
 "Palvelulle %s tarjottiin kutsua, mutta sinulla ei tarvittavaa ohjelmaa "
 "kutsun käsittelemiseksi."
 
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "Tuttavien karttanäkymä"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Virhe"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "Kriittinen"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "Varoitus"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "Viesti"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "Tieto"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "Vianetsintä"
+
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "Tallenna"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "Vianetsintäikkuna"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "Pysäytä"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "Taso "
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "Aika"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "Alue"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "Luokka"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "Taso"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "Valittu yhteyshallinta ei tue etävianetsintälaajennusta."
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy-pikaviestin"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Unohda salasana ja tyhjennä kohta."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Verkko</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Palvelimet</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Muokkaa valittua IRC-verkkoa"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Poista valittu IRC-verkko"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "_Tarkasta oikeinkirjoitus..."
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>Aihe:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "Ryhmäkeskustelu"
+
+#~ msgid "Contact Information"
+#~ msgstr "Yhteystiedot"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Haluaisin liittää sinut tuttavaluettelooni."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Anteeksi mutta en halua sinua enää tuttavaluettelooni."
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Ryhmät</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "Yhteystiedot"
+
+#~ msgid "Word"
+#~ msgstr "Sana"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Korjausehdotukset"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Kielentarkastus"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Korjausehdotuksia:"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Uusi tili</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "Minulla on jo tili, jota haluan käyttää"
+
+#~ msgid "New message from %s"
+#~ msgstr "Uusi viesti käyttäjältä %s"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "Kutsu_viesti:"
+
+#~ msgid "Invite"
+#~ msgstr "Kutsu"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Valitse ketkä haluat kutsua:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Olet saanut kutsun ryhmäkeskusteluun."
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Muokkaa suosikkihuonetta"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "Yhdistä _keskusteluhuoneeseen käynnistettäessä"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr "Yhdistä tähän keskusteluhuoneeseen, kun yhteys on muodostettu"
+
+#~ msgid "N_ame:"
+#~ msgstr "_Nimi:"
+
+#~ msgid "S_erver:"
+#~ msgstr "_Palvelin:"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "Tuntematon"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "\"%s\" vastaanotetaan tuttavalta %s"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "\"%s\" lähetetään tuttavalle %s"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "Tiedostonsiirto keskeytetty: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "Tuntematon"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "Tähän sijaintiin ei voi tallentaa"
+
+#~ msgid "Save file as..."
+#~ msgstr "_Tallenna nimellä..."
+
+#~ msgid "unknown size"
+#~ msgstr "tuntematon koko"
 
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s haluaa lähettää sinulle tiedoston"
 
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "Haluatko hyväksyä tiedoston \"%s\" (%s)?"
 
+#~ msgid "_Accept"
+#~ msgstr "_Hyväksy"
 
+#~ msgid "Join _New..."
+#~ msgstr "Liity _uuteen..."
 
+#~ msgid "Browse:"
+#~ msgstr "Selaa:"
 
+#~ msgid "Join"
+#~ msgstr "Liity"
 
+#~ msgid "Join New"
+#~ msgstr "Liity uuteen"
 
+#~ msgid "Re_fresh"
+#~ msgstr "_Päivitä"
 
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr ""
+#~ "Tässä luettelossa ovat kaikki huoneet palvelimelta, johon olet kirjautunut"
 
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Tuttavaluettelo</b>"
 
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "Avatarit ovat käyttäjän valitsemia kuvia tuttavaluettelossa"
 
+#~ msgid "Show _avatars"
+#~ msgstr "Näytä _avattaret"
 
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "Näytä _pieni tuttavaluettelo"
diff --git a/po/ga.po b/po/ga.po
index 58d4b4775..b472966cf 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,1141 +1,2560 @@
-# Irish (gaeilge) translations for gossip
-# Copyright (C) 2004 Alastair McKinstry <mckinstry@computer.org>
-# This file is distributed under the same license as the gossip  package.
-# Alastair McKinstry <mckinstry@computer.org>, 2004.
+# 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gossip HEAD\n"
+"Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-15 23:46+0200\n"
-"PO-Revision-Date: 2004-01-02 07:20+0000\n"
-"Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
+"POT-Creation-Date: 2009-08-07 01:56-0600\n"
+"PO-Revision-Date: 2009-08-07 02:38-0600\n"
+"Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=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.h:1
-#, fuzzy
-msgid "Empathy Instant Messenger"
-msgstr "Gossip - Caint"
+#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy IM Client"
+msgstr "Cliant IM Empathy"
 
-#: ../data/empathy.desktop.in.h:2
-msgid "Instant Messenger"
-msgstr ""
+#: ../data/empathy.desktop.in.in.h:2
+msgid "Send and receive messages"
+msgstr "Seol agus faigh teachtaireachtaí"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:2
-msgid "Chat window theme"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:3
-msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+msgid "Chat window theme"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:4
-#, fuzzy
-msgid "Compact contact list"
-msgstr "_Taispeán Líosta Tadhall"
+msgid ""
+"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+msgstr ""
 
 #: ../data/empathy.schemas.in.h:5
-msgid "Contact list sort criterium"
-msgstr ""
+msgid "Compact contact list"
+msgstr "Dlúthliosta teagmhálacha"
 
 #: ../data/empathy.schemas.in.h:6
-msgid "Default directory to select an avatar image from"
+msgid "Contact list sort criterium"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:7
-msgid "Enable popup when contact is available"
+msgid "Default directory to select an avatar image from"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:8
-msgid "Enable sound when away"
+msgid "Disable popup notifications when away"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:9
-msgid "Enable sound when busy"
+msgid "Disable sounds when away"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:10
-#, fuzzy
-msgid "Enable spell checker"
-msgstr "Gossip - Caint"
+msgid "Empathy can publish the user's location"
+msgstr ""
 
 #: ../data/empathy.schemas.in.h:11
-msgid "Hide main window"
+msgid "Empathy can use the GPS to guess the location"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:12
-msgid "Hide the main window."
+msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:13
-msgid "Open new chats in separate windows"
+msgid "Empathy can use the network to guess the location"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:14
-#, fuzzy
-msgid "Show avatars"
-msgstr "_Taispeán Líosta Tadhall"
+msgid "Empathy default download folder"
+msgstr ""
 
 #: ../data/empathy.schemas.in.h:15
-msgid "Show hint about closing the main window"
+msgid "Empathy has asked about importing accounts"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:16
-msgid "Show offline contacts"
+msgid "Empathy should auto-connect on startup"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:17
-msgid "Spell checking languages"
+msgid "Empathy should reduce the location's accuracy"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:18
-msgid "The last directory that an avatar image was chosen from."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:19
-msgid "The theme that is used to display the conversation in chat windows."
+msgid "Enable WebKit Developer Tools"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:20
-msgid "Use graphical smileys"
+msgid "Enable popup notifications for new messages"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:21
-msgid "Use notification sounds"
-msgstr ""
+msgid "Enable spell checker"
+msgstr "Cumasaigh litreoir"
 
 #: ../data/empathy.schemas.in.h:22
-msgid "Use theme for chat rooms"
+msgid "Hide main window"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:23
-msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+msgid "Hide the main window."
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:24
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+msgid "NetworkManager should be used"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:25
-msgid "Whether or not to play a sound when messages arrive."
+msgid "Nick completed character"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:26
-msgid "Whether or not to play sounds when away."
+msgid "Open new chats in separate windows"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:27
-msgid "Whether or not to play sounds when busy."
+msgid "Path of the adium theme to use"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:28
-msgid "Whether or not to show a popup when a contact becomes available."
+msgid "Path of the adium theme to use if the theme used for chat is adium."
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:29
-msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+msgid "Play a sound for incoming messages"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:30
-msgid "Whether or not to show contacts that are offline in the contact list."
+msgid "Play a sound for new conversations"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:31
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+msgid "Play a sound for outgoing messages"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:32
-msgid "Whether to show the contact list in compact mode or not."
+msgid "Play a sound when a contact logs in"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:33
-msgid "Whether to use the theme for chat rooms or not."
+msgid "Play a sound when a contact logs out"
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:34
-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."
+msgid "Play a sound when we log in"
 msgstr ""
 
-#: ../libempathy/gossip-contact.c:654 ../libempathy/gossip-presence.c:184
-#: ../libempathy/gossip-presence.c:283
-msgid "Offline"
+#: ../data/empathy.schemas.in.h:35
+msgid "Play a sound when we log out"
 msgstr ""
 
-#: ../libempathy/gossip-presence.c:274
-msgid "Available"
+#: ../data/empathy.schemas.in.h:36
+msgid "Popup notifications if the chat isn't focused"
 msgstr ""
 
-#: ../libempathy/gossip-presence.c:276
-msgid "Busy"
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
 msgstr ""
 
-#: ../libempathy/gossip-presence.c:279
-msgid "Away"
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.c:254
-#, fuzzy
-msgid "Show and edit accounts"
-msgstr "_Taispeán Líosta Tadhall"
-
-#: ../libempathy-gtk/empathy-main-window.c:456
-msgid "Group"
+#: ../data/empathy.schemas.in.h:39
+msgid "Salut account is created"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.c:477
-#, fuzzy
-msgid "Contact"
-msgstr "Gossip - Caint"
+#: ../data/empathy.schemas.in.h:40
+msgid "Show avatars"
+msgstr "Taispeáin abhatáranna"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:1
-#, fuzzy
-msgid "Contact List - Empathy"
-msgstr "_Taispeán Líosta Tadhall"
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "Taispeáin liosta teagmhálacha i seomraí"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:2
-#, fuzzy
-msgid "Context"
-msgstr "Ceangail"
+#: ../data/empathy.schemas.in.h:42
+msgid "Show hint about closing the main window"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:3
-msgid "Join _Favorites"
+#: ../data/empathy.schemas.in.h:43
+msgid "Show offline contacts"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:4
-#: ../libempathy-gtk/gossip-chat.glade.h:10
-msgid "Join _New..."
+#: ../data/empathy.schemas.in.h:44
+msgid "Spell checking languages"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:5
-msgid "Manage Favorites..."
+#: ../data/empathy.schemas.in.h:45
+msgid "The default folder to save file transfers in."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
+#: ../data/empathy.schemas.in.h:46
+msgid "The last directory that an avatar image was chosen from."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:7
-msgid "_About"
+#: ../data/empathy.schemas.in.h:47
+msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:8
-msgid "_Accounts"
+#: ../data/empathy.schemas.in.h:48
+msgid "Use graphical smileys"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:9
-#: ../libempathy-gtk/gossip-chat.glade.h:15
-msgid "_Add Contact..."
+#: ../data/empathy.schemas.in.h:49
+msgid "Use notification sounds"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:10
-#: ../libempathy-gtk/gossip-contact-list.c:298
-msgid "_Chat"
+#: ../data/empathy.schemas.in.h:50
+msgid "Use theme for chat rooms"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:11
-#, fuzzy
-msgid "_Contents"
-msgstr "Ceangail"
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:12
-#: ../libempathy-gtk/gossip-chat.glade.h:21
-#: ../libempathy-gtk/gossip-contact-list.c:310
-#, fuzzy
-msgid "_Edit"
-msgstr "_Ealu"
+#: ../data/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:13
-msgid "_Help"
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:14
-#: ../libempathy-gtk/empathy-status-icon.glade.h:2
-msgid "_New Message..."
+#: ../data/empathy.schemas.in.h:54
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:15
-msgid "_Personal Information"
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:16
-msgid "_Preferences"
+#: ../data/empathy.schemas.in.h:56
+msgid ""
+"Whether or not Empathy has asked about importing accounts from other "
+"programs."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:17
-#: ../libempathy-gtk/empathy-status-icon.glade.h:3
-msgid "_Quit"
-msgstr "_Ealu"
+#: ../data/empathy.schemas.in.h:57
+msgid ""
+"Whether or not Empathy should automatically log in to your accounts on "
+"startup."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:18
-#: ../libempathy-gtk/gossip-chat.glade.h:25
-#, fuzzy
-msgid "_Room"
-msgstr "_Seomra:"
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:19
-#: ../libempathy-gtk/gossip-chat.glade.h:28
-#: ../libempathy-gtk/gossip-contact-list.c:326
-msgid "_View Previous Conversations"
+#: ../data/empathy.schemas.in.h:59
+msgid ""
+"Whether or not Empathy should use the avatar of the contact as the chat "
+"window icon."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:1
-msgid "Status"
+#: ../data/empathy.schemas.in.h:60
+msgid ""
+"Whether or not the Salut account has been created on the first Empathy run."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Taispeán Líosta Tadhall"
+#: ../data/empathy.schemas.in.h:61
+msgid ""
+"Whether or not the network manager should be used to automatically "
+"disconnect/reconnect."
+msgstr ""
 
-#: ../libempathy-gtk/gossip-about-dialog.c:63
+#: ../data/empathy.schemas.in.h:62
 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."
+"Whether or not to check words typed against the languages you want to check "
+"with."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-about-dialog.c:67
+#: ../data/empathy.schemas.in.h:63
 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."
+"Whether or not to convert smileys into graphical images in conversations."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-about-dialog.c:71
+#: ../data/empathy.schemas.in.h:64
 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"
+"Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-about-dialog.c:99
-msgid "An Instant Messaging client for GNOME"
+#: ../data/empathy.schemas.in.h:65
+msgid ""
+"Whether or not to play a sound to notify for contacts logging off the "
+"network."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-about-dialog.c:105
-msgid "translator-credits"
+#: ../data/empathy.schemas.in.h:66
+msgid "Whether or not to play a sound to notify for events."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:224
-msgid "Disable"
+#: ../data/empathy.schemas.in.h:67
+msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:227
-msgid "Enable"
+#: ../data/empathy.schemas.in.h:68
+msgid "Whether or not to play a sound to notify for new conversations."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:261
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:3
-msgid "<b>No Account Selected</b>"
+#: ../data/empathy.schemas.in.h:69
+msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:263
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to start configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
+#: ../data/empathy.schemas.in.h:70
+msgid "Whether or not to play a sound when logging in a network."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:272
-msgid "<b>No Accounts Configured</b>"
+#: ../data/empathy.schemas.in.h:71
+msgid "Whether or not to play a sound when logging off a network."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:274
+#: ../data/empathy.schemas.in.h:72
+msgid "Whether or not to play sound notifications when away or busy."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:73
 msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to start configuring."
+"Whether or not to show a popup notification when a contact goes offline."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:362
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:6
-msgid "Accounts"
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:857
-#, c-format
+#: ../data/empathy.schemas.in.h:75
 msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
+"Whether or not to show a popup notification when receiving a new message "
+"even if the chat is already opened, but not focused."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:863
+#: ../data/empathy.schemas.in.h:76
 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."
+"Whether or not to show a popup notification when receiving a new message."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:1
-msgid "<b>Account</b>"
+#: ../data/empathy.schemas.in.h:77
+msgid ""
+"Whether or not to show avatars for contacts in the contact list and chat "
+"windows."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:2
-#, fuzzy
-msgid "<b>New Account</b>"
-msgstr "Gossip - Caint"
+#: ../data/empathy.schemas.in.h:78
+msgid "Whether or not to show contacts that are offline in the contact list."
+msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:4
-#, fuzzy
-msgid "<b>Settings</b>"
-msgstr "Ceangail"
+#: ../data/empathy.schemas.in.h:79
+msgid "Whether or not to show popup notifications when away or busy."
+msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:5
-msgid "A unique name for this account to identify it personally to you."
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:7
-#, fuzzy
-msgid "Cr_eate"
-msgstr "G_lan"
+#: ../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."
+msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:8
-msgid "Imendio "
+#: ../data/empathy.schemas.in.h:82
+msgid "Whether to show the contact list in compact mode or not."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:9
-msgid "Jabber"
+#: ../data/empathy.schemas.in.h:83
+msgid "Whether to use the theme for chat rooms or not."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:10
+#: ../data/empathy.schemas.in.h:84
 msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to started configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
+"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."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:13
-#, fuzzy
-msgid "_Name:"
-msgstr "Ainm:"
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:14
-msgid "_Type:"
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-generic.c:144
-#: ../libempathy-gtk/gossip-account-widget-generic.c:186
-#, c-format
-msgid "%s:"
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:1
-msgid ""
-"<small><b><span foreground=\"#555\">Example: user@jabber.org</span></b></"
-"small>"
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:2
-msgid "Forget password and clear the entry."
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
+msgid "People nearby"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:3
-msgid "Login I_D:"
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:4
-#, fuzzy
-msgid "Pass_word:"
-msgstr "_Pasfhocal:"
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:5
-msgid "Reso_urce:"
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:6
-msgid "Use encryption (SS_L)"
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:7
-#, fuzzy
-msgid "_Port:"
-msgstr "_Pasfhocal:"
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Cúis anaithnid"
+
+#: ../libempathy/empathy-utils.c:265
+msgid "Available"
+msgstr "Ar Fáil"
+
+#: ../libempathy/empathy-utils.c:267
+msgid "Busy"
+msgstr "Gnóthach"
+
+#: ../libempathy/empathy-utils.c:270
+msgid "Away"
+msgstr "Amuigh"
+
+#: ../libempathy/empathy-utils.c:272
+msgid "Hidden"
+msgstr "Folaithe"
+
+#: ../libempathy/empathy-utils.c:274
+msgid "Offline"
+msgstr "As Líne"
+
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:8
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
+msgid "All"
+msgstr "Gach"
+
+#: ../libempathy-gtk/empathy-account-widget.c:302
+#: ../libempathy-gtk/empathy-account-widget.c:354
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+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
+msgid "Pass_word:"
+msgstr "_Focal faire:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+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
+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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
-msgstr "_Freastalaí:"
+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
+msgid "Login I_D:"
+msgstr "C_A Logála Isteach:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+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-irc.c:240
+msgid "New Network"
+msgstr "Líonra Nua"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Charset:"
+msgstr "Tacar carachtar:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network"
+msgstr "Líonra"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Network:"
+msgstr "Líonra:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Nickname:"
+msgstr "Leasainm:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid "Password:"
+msgstr "Focal faire:"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:9
-msgid "jabber account settings"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Quit message:"
+msgstr "Teachtaireacht scortha:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+msgid "Real name:"
+msgstr "Fíorainm:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Freastalaithe"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+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:6
+msgid "Reso_urce:"
+msgstr "Ac_mhainn:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+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:9
+msgid "_Ignore SSL certificate errors"
+msgstr "Déan _neamhaird ar earráidí teastas SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+msgid "_Email:"
+msgstr "_Ríomhphost:"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+msgid "_First Name:"
+msgstr "_Ainm:"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+msgid "_Jabber ID:"
+msgstr "CA _Jabber:"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+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
+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:3
+msgid "Discover STUN"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.c:314
-#, fuzzy
-msgid "Disconnected"
-msgstr "Ceangail"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "STUN Server:"
+msgstr "Freastalaí STUN:"
 
-#: ../libempathy-gtk/gossip-chat.c:858
-msgid "Insert Smiley"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "STUN port:"
+msgstr "Port STUN:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+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"
+msgstr "Déan _neamhaird ar chuirí comhdhála agus seomra comhrá"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+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
+msgid "Couldn't convert image"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.c:906
-msgid "_Check Word Spelling..."
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+msgid "None of the accepted image formats is supported on your system"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.c:1244
-#, fuzzy
-msgid "Connected"
-msgstr "Ceangail"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+msgid "Select Your Avatar Image"
+msgstr "Roghnaigh d'Íomhá Abhatár"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:1
-msgid "C_lear"
-msgstr "G_lan"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+msgid "No Image"
+msgstr "Gan Íomhá"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+msgid "Images"
+msgstr "Íomhánna"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+msgid "All Files"
+msgstr "Gach Comhad"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:2
-msgid "Change _Topic..."
+#: ../libempathy-gtk/empathy-avatar-image.c:324
+msgid "Click to enlarge"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:3
-msgid "Chat"
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:4
-msgid "Contact Infor_mation"
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:5
-msgid "Cu_t"
+#: ../libempathy-gtk/empathy-chat.c:539
+msgid "offline"
+msgstr "as líne"
+
+#: ../libempathy-gtk/empathy-chat.c:542
+msgid "invalid contact"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:6
-msgid "In_vite..."
+#: ../libempathy-gtk/empathy-chat.c:545
+msgid "permission denied"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:7
-msgid "Insert _Smiley"
+#: ../libempathy-gtk/empathy-chat.c:548
+msgid "too long message"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:8
-msgid "Invitation _message:"
+#: ../libempathy-gtk/empathy-chat.c:551
+msgid "not implemented"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:9
-msgid "Invite"
+#: ../libempathy-gtk/empathy-chat.c:554
+msgid "unknown"
+msgstr "anaithnid"
+
+#: ../libempathy-gtk/empathy-chat.c:558
+#, c-format
+msgid "Error sending message '%s': %s"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:11
-msgid "Move Tab _Left"
+#: ../libempathy-gtk/empathy-chat.c:588
+#, c-format
+msgid "Topic set to: %s"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:12
-msgid "Move Tab _Right"
+#: ../libempathy-gtk/empathy-chat.c:590
+msgid "No topic defined"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:13
-msgid "Select who would you like to invite:"
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:14
-msgid "You have been invited to join a chat conference."
+#: ../libempathy-gtk/empathy-chat.c:1014
+msgid "Insert Smiley"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:16
-msgid "_Add To Favorites"
+#. send button
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
+msgid "_Send"
+msgstr "_Seol"
+
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:17
-msgid "_Close"
+#: ../libempathy-gtk/empathy-chat.c:1181
+#, c-format
+msgid "%s has disconnected"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:18
-msgid "_Conversation"
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:19
-msgid "_Copy"
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:20
-msgid "_Detach Tab"
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:22
-msgid "_Next Tab"
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:23
-msgid "_Paste"
+#: ../libempathy-gtk/empathy-chat.c:1200
+#, c-format
+msgid "%s has left the room"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:24
-msgid "_Previous Tab"
+#. 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:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:26
-#, fuzzy
-msgid "_Show Contacts"
-msgstr "_Taispeán Líosta Tadhall"
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1254
+msgid "Disconnected"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:27
-msgid "_Tabs"
+#: ../libempathy-gtk/empathy-chat.c:1800
+msgid "Connected"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat-view.c:544
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
+msgid "Conversation"
+msgstr "Comhrá"
+
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr ""
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat-view.c:552
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat-view.c:889
-msgid "%A %d %B %Y"
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
+msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/gossip-chat-window.c:685
-#: ../libempathy-gtk/gossip-chat-window.c:715
-#, fuzzy
-msgid "New Message"
-msgid_plural "New Messages"
-msgstr[0] "Gossip - Caint"
-msgstr[1] "Gossip - Caint"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+msgid "Edit Contact Information"
+msgstr "Cuir Eolas Teagmhála in Eagar"
 
-#: ../libempathy-gtk/gossip-chat-window.c:691
-#, fuzzy
-msgid "Chat Room"
-msgstr "Gossip - Caint"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Eolas Pearsanta"
 
-#: ../libempathy-gtk/gossip-chat-window.c:696
-#: ../libempathy-gtk/gossip-chat-window.c:719
-#, fuzzy, c-format
-msgid "Conversation"
-msgid_plural "Conversations (%d)"
-msgstr[0] "Ceangail"
-msgstr[1] "Ceangail"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+msgid "New Contact"
+msgstr "Teagmháil Nua"
 
-#: ../libempathy-gtk/gossip-chat-window.c:1295
-msgid "Typing a message."
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Decide _Later"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:290
-#, fuzzy
-msgid "_Contact"
-msgstr "Gossip - Caint"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "Subscription Request"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:294
-#, fuzzy
-msgid "_Group"
-msgstr "Gossip - Caint"
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:298
-msgid "Chat with contact"
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+msgid "Removing group"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:302
-msgid "Infor_mation"
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+msgid "_Remove"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:302
-msgid "View contact information"
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:306
-#, fuzzy
-msgid "Re_name"
-msgstr "Ainm:"
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+msgid "Removing contact"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:306
-#, fuzzy
-msgid "Rename"
-msgstr "_Leasainm:"
+#: ../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:222
+#: ../src/empathy-main-window.ui.h:12
+msgid "_Chat"
+msgstr "_Comhrá"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "Glaoch _Fuaime"
 
-#: ../libempathy-gtk/gossip-contact-list.c:310
-msgid "Edit the groups and name for this contact"
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+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/gossip-contact-list.c:314
-#, fuzzy
-msgid "_Remove"
-msgstr "S_críos"
+#: ../libempathy-gtk/empathy-contact-menu.c:397
+msgid "Infor_mation"
+msgstr "_Eolas"
 
-#: ../libempathy-gtk/gossip-contact-list.c:314
-#, fuzzy
-msgid "Remove contact"
-msgstr "_Scríos"
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+msgid "_Edit"
+msgstr "_Eagar"
 
-#: ../libempathy-gtk/gossip-contact-list.c:318
-#, fuzzy
-msgid "_Invite to Chat Room"
-msgstr "Gossip - Caint"
+#: ../libempathy-gtk/empathy-contact-menu.c:501
+msgid "Inviting to this room"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:318
-msgid "Invite to a currently open chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:532
+msgid "_Invite to chatroom"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:322
-msgid "_Send File..."
+#: ../libempathy-gtk/empathy-contact-selector.c:129
+msgid "Select a contact"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:322
-msgid "Send a file"
+#: ../libempathy-gtk/empathy-contact-widget.c:447
+msgid "Save Avatar"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:326
-msgid "View previous conversations with this contact"
+#: ../libempathy-gtk/empathy-contact-widget.c:503
+msgid "Unable to save avatar"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.c:250
-msgid "Language"
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+msgid "Select"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:1
-msgid "<b>Appearance</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
+msgid "Group"
+msgstr "Grúpa"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:2
-msgid "<b>Audio</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Country:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:3
-msgid "<b>Behaviour</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "State:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:4
-#, fuzzy
-msgid "<b>Contact List</b>"
-msgstr "_Taispeán Líosta Tadhall"
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "City:"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:5
-msgid "<b>Languages</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Area:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:6
-#, fuzzy
-msgid "<b>Options</b>"
-msgstr "Ceangail"
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:7
-msgid "<b>Visual</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Street:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:8
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:9
-msgid "Avatars are user chosen images shown in the contact list"
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Floor:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:10
-msgid "Chat Th_eme:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Room:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:11
-msgid "Display notifications when contacts come _online"
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Text:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:12
-msgid "Enable sounds when _away"
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Description:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:13
-msgid "Enable sounds when _busy"
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:14
-msgid "General"
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:15
-msgid "Notifications"
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:16
-msgid "Preferences"
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:17
-msgid "Show _avatars"
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:18
-msgid "Show _smileys as images"
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:19
-#, fuzzy
-msgid "Show co_mpact contact list"
-msgstr "_Taispeán Líosta Tadhall"
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Bearing:"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:20
-msgid "Sort by _name"
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:21
-msgid "Sort by s_tate"
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:22
-msgid "Spell Checking"
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:23
-msgid "Themes"
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:24
-msgid "_Enable spell checking"
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:25
-msgid "_Open new chats in separate windows"
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+msgid "<b>Location</b>"
+msgstr "<b>Suíomh</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+msgid "<b>Location</b>, "
+msgstr "<b>Suíomh</b>, "
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:26
-msgid "_Play sound when messages arrive"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:27
-#, fuzzy
-msgid "_Use for chat rooms"
-msgstr "Gossip - Caint"
+#: ../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:"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:702
-msgid "Custom message..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+msgid "Alias:"
+msgstr "Ailias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+msgid "Birthday:"
 msgstr ""
 
-#. Clear list
-#: ../libempathy-gtk/gossip-presence-chooser.c:724
-#, fuzzy
-msgid "Clear List..."
-msgstr "G_lan"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+msgid "Client:"
+msgstr "Cliant:"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:803
-msgid "Are you sure you want to clear the list?"
+#: ../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
+msgid "Contact Details"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:807
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Email:"
+msgstr "Ríomhphost:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Fullname:"
+msgstr "Ainm Iomlán:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+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-contact-widget.ui.h:14
+msgid "Information requested..."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+msgid "OS:"
+msgstr "OS:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
-"This will remove any custom messages you have added to the list of preset "
-"status messages."
+"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/gossip-presence-chooser.c:812
-#, fuzzy
-msgid "Clear List"
-msgstr "G_lan"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+msgid "Version:"
+msgstr "Leagan:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+msgid "Web site:"
+msgstr "Suíomh gréasáin:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+msgid "_Add Group"
+msgstr "Cuir Grúpa _Leis"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+msgid "new server"
+msgstr "freastalaí nua"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+msgid "Server"
+msgstr "Freastalaí"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+msgid "Port"
+msgstr "Port"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+msgid "SSL"
+msgstr "SSL"
+
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
+msgid "Account"
+msgstr "Cuntas"
+
+#: ../libempathy-gtk/empathy-log-window.c:512
+msgid "Date"
+msgstr "Dáta"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "Conversations"
+msgstr "Comhráite"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+msgid "Previous Conversations"
+msgstr "Comhráite Roimhe Seo"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Search"
+msgstr "Cuardaigh"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "_For:"
+msgstr "A_r:"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:1
-msgid "Enter status message:"
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
+msgid "C_all"
+msgstr "_Glaoch"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+msgid "C_hat"
+msgstr "C_omhrá"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
+msgid "Contact ID:"
+msgstr "CA Teagmhála:"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+msgid "New Conversation"
+msgstr "Comhrá Nua"
+
+#. 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:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "Cuir Teachtaireachtaí Saincheaptha in Eagar..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:2
-#, fuzzy
-msgid "Status Message Presets"
-msgstr "Gossip - Caint"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:3
-#, fuzzy
-msgid "_Add to status message list"
-msgstr "Gossip - Caint"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-private-chat.c:198
-#, c-format
-msgid "%s went offline"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-private-chat.c:212
-#, c-format
-msgid "%s has come online"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "Teachtaireachtaí saincheaptha..."
+
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:55
+msgid "Incoming chat request"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-theme-manager.c:87
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound.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
+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-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "Réamhshocruithe Sábháilte"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-theme-manager.c:88
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-theme-manager.c:89
-#, fuzzy
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
-msgstr "G_lan"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-theme-manager.c:90
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr ""
 
-#: ../src/empathy-main.c:145
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a destination"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr "Arabach"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:173
+#: ../libempathy-gtk/totem-subtitle-encoding.c:175
+#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+msgid "Baltic"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+msgid "Celtic"
+msgstr "Ceilteach"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:183
+#: ../libempathy-gtk/totem-subtitle-encoding.c:185
+#: ../libempathy-gtk/totem-subtitle-encoding.c:187
+#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+msgid "Central European"
+msgstr "Lár-Eorpach"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:192
+#: ../libempathy-gtk/totem-subtitle-encoding.c:194
+#: ../libempathy-gtk/totem-subtitle-encoding.c:196
+#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+msgid "Chinese Simplified"
+msgstr "Síneach Simplithe"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:201
+#: ../libempathy-gtk/totem-subtitle-encoding.c:203
+#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+msgid "Chinese Traditional"
+msgstr "Síneach Traidisiúnta"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+msgid "Croatian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:211
+#: ../libempathy-gtk/totem-subtitle-encoding.c:213
+#: ../libempathy-gtk/totem-subtitle-encoding.c:215
+#: ../libempathy-gtk/totem-subtitle-encoding.c:217
+#: ../libempathy-gtk/totem-subtitle-encoding.c:219
+#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+msgid "Cyrillic"
+msgstr "Coireallach"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+msgid "Cyrillic/Russian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:227
+#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+msgid "Cyrillic/Ukrainian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+msgid "Georgian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:235
+#: ../libempathy-gtk/totem-subtitle-encoding.c:237
+#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+msgid "Greek"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+msgid "Gujarati"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+msgid "Gurmukhi"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:248
+#: ../libempathy-gtk/totem-subtitle-encoding.c:250
+#: ../libempathy-gtk/totem-subtitle-encoding.c:252
+#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+msgid "Hebrew"
+msgstr "Eabhrach"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+msgid "Hebrew Visual"
+msgstr "Eabhrach Infheicthe"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+msgid "Hindi"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+msgid "Icelandic"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:266
+#: ../libempathy-gtk/totem-subtitle-encoding.c:268
+#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+msgid "Japanese"
+msgstr ""
+
+#: ../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 ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+msgid "Nordic"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+msgid "Persian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:288
+#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+msgid "Romanian"
+msgstr "Rómánach"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+msgid "South European"
+msgstr "Deisceart na hEorpa"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+msgid "Thai"
+msgstr "Téallanach"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:299
+#: ../libempathy-gtk/totem-subtitle-encoding.c:301
+#: ../libempathy-gtk/totem-subtitle-encoding.c:303
+#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+msgid "Turkish"
+msgstr "Turcach"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:308
+#: ../libempathy-gtk/totem-subtitle-encoding.c:310
+#: ../libempathy-gtk/totem-subtitle-encoding.c:312
+#: ../libempathy-gtk/totem-subtitle-encoding.c:314
+#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:319
+#: ../libempathy-gtk/totem-subtitle-encoding.c:321
+#: ../libempathy-gtk/totem-subtitle-encoding.c:323
+#: ../libempathy-gtk/totem-subtitle-encoding.c:325
+#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+msgid "Western"
+msgstr "Iartharach"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:330
+#: ../libempathy-gtk/totem-subtitle-encoding.c:332
+#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+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."
+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."
+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"
+msgstr ""
+
+#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
+#: ../nothere/src/nothere-applet.c:106
+msgid "Set your own presence"
+msgstr ""
+
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr ""
 
-#: ../src/empathy-main.c:155
-#, fuzzy
-msgid "- Empathy Instant Messenger"
-msgstr "Gossip - Caint"
+#: ../src/empathy.c:571
+msgid "Don't show the contact list on startup"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Unknown"
-#~ msgstr "Earraidh gan aithne"
+#: ../src/empathy.c:575
+msgid "Show the accounts dialog"
+msgstr ""
 
-#, fuzzy
-#~ msgid "An unknown error occurred, check your details are correct."
-#~ msgstr "Earraidh gan aithne"
+#: ../src/empathy.c:587
+msgid "- Empathy IM Client"
+msgstr "- Cliant IM Empathy"
 
-#, fuzzy
-#~ msgid "An unknown error occurred."
-#~ msgstr "Earraidh gan aithne"
+#: ../src/empathy-about-dialog.c:83
+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 ""
+"Is bogearraí saor é Empathy; is féidir leat é a athdháileadh nó a athrú faoi "
+"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í."
 
-#, fuzzy
-#~ msgid "new account"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-about-dialog.c:87
+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 ""
+"Dáileadh Empathy le súil go mbeidh sé úsáideach, ach GAN AON BHARÁNTA; gan "
+"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í."
 
-#~ msgid "Home"
-#~ msgstr "Baile"
+#: ../src/empathy-about-dialog.c:91
+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 ""
+"Ba chóir go bhfuair tú cóip an GNU General Public License in éineacht le "
+"Empathy; mura bhfuair tú é, scríobh chuig an Free Software Foundation, Inc., "
+"51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA."
 
-#, fuzzy
-#~ msgid "Disconnect"
-#~ msgstr "Ceangail"
+#: ../src/empathy-about-dialog.c:119
+msgid "An Instant Messaging client for GNOME"
+msgstr "Cliant Cur Teachtaireachtaí Meandaracha do GNOME"
 
-#~ msgid "Connect"
-#~ msgstr "Ceangail"
+#: ../src/empathy-about-dialog.c:125
+msgid "translator-credits"
+msgstr "Seán de Búrca <leftmostcat@gmail.com>"
 
-#, fuzzy
-#~ msgid "%d new message"
-#~ msgid_plural "%d new messages"
-#~ msgstr[0] "Gossip - Caint"
-#~ msgstr[1] "Gossip - Caint"
+#: ../src/empathy-accounts-dialog.c:392
+msgid "Enabled"
+msgstr "Cumasaithe"
 
-#, fuzzy
-#~ msgid "Name"
-#~ msgstr "Ainm:"
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "Cuntais"
 
-#, fuzzy
-#~ msgid "Room"
-#~ msgstr "_Seomra:"
+#. To translator: %s is the protocol name
+#: ../src/empathy-accounts-dialog.c:837
+#, c-format
+msgid "New %s account"
+msgstr "Cuntas %s nua"
 
-#, fuzzy
-#~ msgid "Auto Connect"
-#~ msgstr "Ceangail"
+#: ../src/empathy-accounts-dialog.c:950
+#, c-format
+msgid ""
+"You are about to remove your %s account!\n"
+"Are you sure you want to proceed?"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Unknown error occurred during file transfer."
-#~ msgstr "Earraidh gan aithne"
+#: ../src/empathy-accounts-dialog.c:956
+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 ""
 
-#, fuzzy
-#~ msgid "Connecting..."
-#~ msgstr "Ceangail"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "Cuir Cuntas Leis"
 
-#, fuzzy
-#~ msgid "Retry connection"
-#~ msgstr "Ceangail"
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "Cr_eate"
+msgstr "C_ruthaigh"
 
-#~ msgid "ACCOUNT-NAME"
-#~ msgstr "AINM-CÚNTAS"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#~ msgid "[default]"
-#~ msgstr "[gnáth]"
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "Import Accounts..."
+msgstr "Iompórtáil Cuntais..."
 
-#, fuzzy
-#~ msgid "Chat Rooms"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "[gnáth]"
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "Socruithe"
 
-#, fuzzy
-#~ msgid "File name:"
-#~ msgstr "_Leasainm:"
+#: ../src/empathy-accounts-dialog.ui.h:8
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "Ceangail"
+#: ../src/empathy-accounts-dialog.ui.h:9
+msgid "Type:"
+msgstr "Cineál:"
 
-#, fuzzy
-#~ msgid "Edit Favorite Room"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "Cuir _Leis..."
 
-#, fuzzy
-#~ msgid "Group Chat"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "Cr_uthaigh cuntas nua"
 
-#, fuzzy
-#~ msgid "N_ame:"
-#~ msgstr "Ainm:"
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "_Athúsáid cuntas atá ann"
 
-#, fuzzy
-#~ msgid "S_erver:"
-#~ msgstr "Freastalaí:"
+#: ../src/empathy-call-window.c:424
+msgid "Contrast"
+msgstr "Codarsnacht"
 
-#~ msgid "_Nickname:"
-#~ msgstr "_Leasainm:"
+#: ../src/empathy-call-window.c:427
+msgid "Brightness"
+msgstr "Gile"
 
-#~ msgid "_Room:"
-#~ msgstr "_Seomra:"
+#: ../src/empathy-call-window.c:430
+msgid "Gamma"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Subscription</b>"
-#~ msgstr "Ceangail"
+#: ../src/empathy-call-window.c:535
+msgid "Volume"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Accou_nt:"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-call-window.c:666
+msgid "Connecting..."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Add Contact"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-call-window.c:772
+msgid "_Sidebar"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Con_tact:"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-call-window.c:791
+msgid "Dialpad"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Connect on S_tartup"
-#~ msgstr "Ceangail"
+#: ../src/empathy-call-window.c:797
+msgid "Audio input"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Contacts"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-call-window.c:801
+msgid "Video input"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Edit Contact"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-call-window.c:860
+#, c-format
+msgid "Call with %s"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Edit Groups"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-call-window.c:929
+msgid "Call"
+msgstr "Glaoch"
 
-#~ msgid "Name:"
-#~ msgstr "Ainm:"
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1364
+#, c-format
+msgid "Connected — %d:%02dm"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Search"
-#~ msgstr "_Cuardaigh..."
+#: ../src/empathy-call-window.ui.h:1
+msgid "Hang up"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Spell Checker"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr ""
 
-#~ msgid "Version:"
-#~ msgstr "Leagan:"
+#: ../src/empathy-call-window.ui.h:3
+msgid "Send Audio"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Connect"
-#~ msgstr "Ceangail"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Send video"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Description:"
-#~ msgstr "Leagan:"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Video preview"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_For:"
-#~ msgstr "_Pasfhocal:"
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Glaoch"
 
-#, fuzzy
-#~ msgid "_Full Name:"
-#~ msgstr "Ainm:"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+msgid "_View"
+msgstr "_Amharc"
 
-#, fuzzy
-#~ msgid "_Group:"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-chat-window.c:344
+#, c-format
+msgid "Conversations (%d)"
+msgstr "Comhráite (%d)"
 
-#, fuzzy
-#~ msgid "_Nick Name:"
-#~ msgstr "_Leasainm:"
+#: ../src/empathy-chat-window.c:476
+msgid "Typing a message."
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Password:"
-#~ msgstr "_Pasfhocal:"
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "G_lan"
 
-#, fuzzy
-#~ msgid "_Quit Message:"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "Comhrá"
 
-#, fuzzy
-#~ msgid "Na_me:"
-#~ msgstr "Ainm:"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr ""
 
-#, fuzzy
-#~ msgid "New Chat Room"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Chat Rooms..."
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "_Teagmháil"
 
-#~ msgid "Gossip"
-#~ msgstr "Gossip"
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "_Inneachar"
 
-#, fuzzy
-#~ msgid "Nickname:"
-#~ msgstr "_Leasainm:"
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "_Comhrá"
 
-#~ msgid "Server:"
-#~ msgstr "Freastalaí:"
+#: ../src/empathy-chat-window.ui.h:9
+msgid "_Detach Tab"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_No"
-#~ msgstr "Níl"
+#: ../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"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr ""
 
-#~ msgid "_Search..."
-#~ msgstr "_Cuardaigh..."
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "_Taispeáin Liosta Teagmhálacha"
 
-#, fuzzy
-#~ msgid "_Yes"
-#~ msgstr "Tá"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "C_luaisíní"
 
-#, fuzzy
-#~ msgid "Gossip - Accounts"
-#~ msgstr "Gossip - Caint"
+#: ../src/empathy-chatrooms-window.c:258
+msgid "Name"
+msgstr "Ainm"
 
-#, fuzzy
-#~ msgid "Persian"
-#~ msgstr "Leagan:"
+#: ../src/empathy-chatrooms-window.c:276
+msgid "Room"
+msgstr "Seomra"
 
-#~ msgid "Details:"
-#~ msgstr "Sonraí:"
+#: ../src/empathy-chatrooms-window.c:285
+msgid "Auto-Connect"
+msgstr ""
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../src/empathy-chatrooms-window.ui.h:2
+msgid "Manage Favorite Rooms"
+msgstr ""
 
-#~ msgid "From:"
-#~ msgstr "Ó:"
+#: ../src/empathy-event-manager.c:321
+msgid "Incoming call"
+msgstr ""
 
-#~ msgid "To:"
-#~ msgstr "Do:"
+#: ../src/empathy-event-manager.c:324
+#, c-format
+msgid "%s is calling you, do you want to answer?"
+msgstr ""
 
-#~ msgid "C_onnect"
-#~ msgstr "C_eangail"
+#: ../src/empathy-event-manager.c:331
+msgid "_Reject"
+msgstr ""
 
-#~ msgid "        "
-#~ msgstr "        "
+#: ../src/empathy-event-manager.c:337
+msgid "_Answer"
+msgstr ""
 
-#~ msgid "_Add"
-#~ msgstr "_Suim"
+#: ../src/empathy-event-manager.c:452
+#, c-format
+msgid "Incoming call from %s"
+msgstr ""
 
-#~ msgid " "
-#~ msgstr " "
+#: ../src/empathy-event-manager.c:496
+#, c-format
+msgid "%s is offering you an invitation"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:502
+msgid "An external application will be started to handle it."
+msgstr ""
+
+#: ../src/empathy-event-manager.c:507
+msgid "You don't have the needed external application to handle it."
+msgstr ""
+
+#: ../src/empathy-event-manager.c:634
+msgid "Room invitation"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:637
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:645
+msgid "_Decline"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "_Join"
+msgstr "C_eangail"
+
+#: ../src/empathy-event-manager.c:689
+#, c-format
+msgid "%s invited you to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:715
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:895
+#, c-format
+msgid "Subscription requested by %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:899
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+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
+#, c-format
+msgid "%u:%02u.%02u"
+msgstr ""
+
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
+#, c-format
+msgid "%02u.%02u"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr ""
+
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:307
+#, 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
+#, 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
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:348
+#, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr ""
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
+#, 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
+#, c-format
+msgid "\"%s\" sent to %s"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:498
+msgid "File transfer completed"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr ""
 
-#~ msgid "Jabber.org"
-#~ msgstr "Jabber.org"
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#, c-format
+msgid "Hashing \"%s\""
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:1024
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1036
+msgid "File"
+msgstr "Comhad"
+
+#: ../src/empathy-ft-manager.c:1058
+msgid "Remaining"
+msgstr "Fágtha"
+
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "Aistrithe Comhad"
+
+#: ../src/empathy-ft-manager.ui.h:2
+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
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+
+#: ../src/empathy-import-dialog.ui.h:1
+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 ""
+
+#: ../src/empathy-main-window.c:511
+msgid "Authentication failed"
+msgstr ""
+
+#: ../src/empathy-main-window.c:514
+msgid "Encryption error"
+msgstr ""
+
+#: ../src/empathy-main-window.c:517
+msgid "Name in use"
+msgstr ""
+
+#: ../src/empathy-main-window.c:520
+msgid "Certificate not provided"
+msgstr ""
+
+#: ../src/empathy-main-window.c:523
+msgid "Certificate untrusted"
+msgstr ""
+
+#: ../src/empathy-main-window.c:526
+msgid "Certificate expired"
+msgstr ""
+
+#: ../src/empathy-main-window.c:529
+msgid "Certificate not activated"
+msgstr ""
+
+#: ../src/empathy-main-window.c:532
+msgid "Certificate hostname mismatch"
+msgstr ""
+
+#: ../src/empathy-main-window.c:535
+msgid "Certificate fingerprint mismatch"
+msgstr ""
+
+#: ../src/empathy-main-window.c:538
+msgid "Certificate self-signed"
+msgstr ""
+
+#: ../src/empathy-main-window.c:541
+msgid "Certificate error"
+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.ui.h:1
+msgid "Contact List"
+msgstr "Liosta Teagmhálacha"
+
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:3
+msgid "Context"
+msgstr "Comhthéacs"
+
+#: ../src/empathy-main-window.ui.h:4
+msgid "Join _Favorites"
+msgstr "Ceangail le C_eanáin"
+
+#: ../src/empathy-main-window.ui.h:5
+msgid "Manage Favorites"
+msgstr "Bainistigh Ceanáin"
+
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "_Gnáthmhéid"
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "Gnáthmhéid le A_bhatáir"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Sórtáil De Réir _Ainm"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "Sórtáil De Réir _Stádas"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "_Accounts"
+msgstr "_Cuntais"
+
+#: ../src/empathy-main-window.ui.h:13
+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
+msgid "_File Transfers"
+msgstr "Aistrithe _Comhad"
+
+#: ../src/empathy-main-window.ui.h:19
+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.ui.h:21
+msgid "_Offline Contacts"
+msgstr "_Teagmhálacha As Líne"
+
+#: ../src/empathy-main-window.ui.h:22
+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
+msgid "_Room"
+msgstr "_Seomra"
+
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
+msgstr "Seomra Comhrá"
+
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "Baill"
+
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\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
+msgid "No"
+msgstr "Níl"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+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 ""
+
+#: ../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"
+msgstr "Ceangail le Seomra"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "Liosta Seomraí"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Seomra:"
+
+#: ../src/empathy-preferences.c:147
+msgid "Message received"
+msgstr ""
+
+#: ../src/empathy-preferences.c:148
+msgid "Message sent"
+msgstr ""
+
+#: ../src/empathy-preferences.c:149
+msgid "New conversation"
+msgstr ""
+
+#: ../src/empathy-preferences.c:150
+msgid "Contact goes online"
+msgstr ""
+
+#: ../src/empathy-preferences.c:151
+msgid "Contact goes offline"
+msgstr ""
+
+#: ../src/empathy-preferences.c:152
+msgid "Account connected"
+msgstr ""
+
+#: ../src/empathy-preferences.c:153
+msgid "Account disconnected"
+msgstr ""
+
+#: ../src/empathy-preferences.c:393
+msgid "Language"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "Cuma"
+
+#: ../src/empathy-preferences.ui.h:5
+msgid "Automatically _connect on startup "
+msgstr "_Nasc go huathoibríoch ag am tosaithe "
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "Oibriú"
+
+#: ../src/empathy-preferences.ui.h:7
+msgid "Chat Th_eme:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:8
+msgid "Disable notifications when _away or busy"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:9
+msgid "Disable sounds when _away or busy"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:12
+msgid "Enable notifications when the _chat is not focused"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "Cumasaigh litriú do theangacha:"
+
+#: ../src/empathy-preferences.ui.h:14
+msgid "General"
+msgstr "Ginearálta"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Socruithe Geoclue"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "Suíomh"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Fógairtí"
+
+#: ../src/empathy-preferences.ui.h:18
+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
+msgid "Privacy"
+msgstr "Príobháideachas"
+
+#: ../src/empathy-preferences.ui.h:21
+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
+msgid "Show _smileys as images"
+msgstr "Taispeáin _straoiseoga mar íomhánna"
+
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "Taispeáin _liosta teagmhálacha i seomraí"
+
+#: ../src/empathy-preferences.ui.h:24
+msgid "Sounds"
+msgstr "Fuaimeanna"
+
+#: ../src/empathy-preferences.ui.h:25
+msgid "Spell Checking"
+msgstr "Litriú"
+
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:27
+msgid "Themes"
+msgstr "Téamaí"
+
+#: ../src/empathy-preferences.ui.h:28
+msgid "_Enable bubble notifications"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Enable sound notifications"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Open new chats in separate windows"
+msgstr "_Oscail comhráite nua i bhfuinneoga faoi leith"
+
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr ""
+
+#: ../src/empathy-status-icon.ui.h:1
+msgid "Status"
+msgstr "Stádas"
+
+#: ../src/empathy-status-icon.ui.h:3
+msgid "_Quit"
+msgstr "_Scoir"
+
+#: ../src/empathy-tube-dispatch.c:375
+#, c-format
+msgid "Unable to start application for service %s: %s"
+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"
+msgstr ""
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Earráid"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "Criticiúil"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "Rabhadh"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "Teachtaireacht"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "Eolas"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "Dífhabhtú"
+
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "Sábháil"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "Fuinneog Dífhabhtaithe"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "Sos"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "Leibhéal"
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "Am"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "Fearann"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "Catagóir"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "Leibhéal"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 68ef19633..fcfb96713 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,4 +1,4 @@
-# translation of empathy-master-po-gl.po to Galician
+# translation of empathy.master.po to Galician
 # This file is distributed under the same license as the EMPATHY package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -8,10 +8,10 @@
 # Antón Méixome <meixome@mancomun.org>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy-master-po-gl\n"
+"Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-21 19:17+0200\n"
-"PO-Revision-Date: 2009-07-01 14:44+0200\n"
+"POT-Creation-Date: 2009-08-20 14:42+0200\n"
+"PO-Revision-Date: 2009-08-20 12:03+0200\n"
 "Last-Translator: Antón Méixome <meixome@mancomun.org>\n"
 "Language-Team: Galician <gnome@mancomun.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,15 +21,14 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-# rever
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Mensaxeiro instantáneo Empathy"
+msgid "Empathy IM Client"
+msgstr "Cliente de mensaxaría Empathy"
 
 # rever
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "Envíe e reciba mensaxes instantáneas"
+msgid "Send and receive messages"
+msgstr "Envíe e reciba mensaxes"
 
 # rever
 #: ../data/empathy.schemas.in.h:1
@@ -128,7 +127,7 @@ msgstr ""
 
 #: ../data/empathy.schemas.in.h:19
 msgid "Enable WebKit Developer Tools"
-msgstr ""
+msgstr "Activar as ferramentas de desenvolvedor WebKit"
 
 # rever
 #: ../data/empathy.schemas.in.h:20
@@ -289,30 +288,34 @@ msgstr "Usar un tema para as salas de conversa"
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
+"Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, "
+"deberían ser activadas."
 
 # rever
 #: ../data/empathy.schemas.in.h:52
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr ""
-"Se Empathy pode ou non publicar a localización do usuario aos seus contactos."
+"Indica se o Empathy pode ou non publicar a localización do usuario aos seus "
+"contactos."
 
 # rever
 #: ../data/empathy.schemas.in.h:53
 msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Se o Empathy pode usar ou non o GPS para seguir a localización."
+msgstr "Indica se o Empathy pode usar ou non o GPS para seguir a localización."
 
 # rever
 #: ../data/empathy.schemas.in.h:54
 msgid ""
 "Whether or not Empathy can use the cellular network to guess the location."
 msgstr ""
-"Se o Empathy pode ou non usar a rede de telefonía móbil para seguir a "
+"Indica se o Empathy pode ou non usar a rede de telefonía móbil para seguir a "
 "localización."
 
 # rever
 #: ../data/empathy.schemas.in.h:55
 msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "Se o Empathy debería ou non usar a rede para seguir a localización."
+msgstr ""
+"Indica se o Empathy debería ou non usar a rede para seguir a localización."
 
 # rever
 #: ../data/empathy.schemas.in.h:56
@@ -320,8 +323,8 @@ msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr ""
-"Se o Empathy preguntou sobre a importación de contas doutros programas ou "
-"non."
+"Indica se o Empathy preguntou sobre a importación de contas doutros "
+"programas ou non."
 
 # rever
 #: ../data/empathy.schemas.in.h:57
@@ -329,8 +332,8 @@ msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr ""
-"Se o Empathy debería iniciar unha sesión nas súas contas automaticamente ao "
-"inicio ou non."
+"Indica se o Empathy debería iniciar unha sesión nas súas contas "
+"automaticamente ao inicio ou non."
 
 # rever
 #: ../data/empathy.schemas.in.h:58
@@ -338,8 +341,8 @@ msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
 msgstr ""
-"Se o Empathy debería ou non reducir a precisión de localización por motivos "
-"de privacidade."
+"Indica se o Empathy debería ou non reducir a precisión de localización por "
+"motivos de privacidade."
 
 # rever
 #: ../data/empathy.schemas.in.h:59
@@ -347,15 +350,16 @@ msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr ""
-"Se o Empathy debería usar o avatar dos contactos como a icona da xanela da "
-"conversa ou non."
+"Indica se o Empathy debería usar o avatar dos contactos como a icona da "
+"xanela da conversa ou non."
 
 # rever
 #: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr ""
-"Se a conta Salut debería ser creada na primeira execución do Empathy ou non."
+"Indica se a conta Salut debería ser creada na primeira execución do Empathy "
+"ou non."
 
 # rever
 #: ../data/empathy.schemas.in.h:61
@@ -363,7 +367,7 @@ msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
 msgstr ""
-"Se o Network Manager debería usarse para conectarse ou desconectarse "
+"Indica se o Network Manager debería usarse para conectarse ou desconectarse "
 "automaticamente ou non."
 
 # rever
@@ -372,22 +376,23 @@ msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr ""
-"Se se deberían verifica ou non as palabras escritas no idioma co que as "
-"quere verificar."
+"Indica se se deberían verificar ou non as palabras escritas no idioma co que "
+"as quere verificar."
 
 # rever
 #: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
-msgstr "Se converter ou non as emoticonas en imaxes gráficas nas conversas."
+msgstr ""
+"Indica see converter ou non as emoticonas en imaxes gráficas nas conversas."
 
 # rever
 #: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
-"Se reproducir ou non un son para notificar que os contactos inician unha "
-"sesión na rede."
+"Indica se reproducir ou non un son para notificar que os contactos inician "
+"unha sesión na rede."
 
 # rever
 #: ../data/empathy.schemas.in.h:65
@@ -395,57 +400,61 @@ msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr ""
-"Se reproducir ou non un son para notificar que os contactos terminan unha "
-"sesión na rede."
+"Indica se reproducir ou non un son para notificar que os contactos terminan "
+"unha sesión na rede."
 
 #: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
-msgstr "Se reproducir ou non un son para notificar os eventos."
+msgstr "Indica se reproducir ou non un son para notificar os eventos."
 
 # rever
 #: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "Se reproducir ou non un son para notificar as mensaxes entrantes."
+msgstr ""
+"Indica se reproducir ou non un son para notificar as mensaxes entrantes."
 
 # rever
 #: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "Se reproducir ou non un son para notificar as conversas novas."
+msgstr "Indica se reproducir ou non un son para notificar as conversas novas."
 
 # rever
 #: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "Se reproducir ou non un son para notificar as mensaxes saíntes."
+msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes."
 
 # rever
 #: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
-msgstr "Se reproducir ou non un son cando se inicia unha sesión na rede."
+msgstr ""
+"Indica se reproducir ou non un son cando se inicia unha sesión na rede."
 
 # rever
 #: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
-msgstr "Se reproducir ou non un son cando se termina unha sesión na rede."
+msgstr ""
+"Indica se reproducir ou non un son cando se termina unha sesión na rede."
 
 # rever
 #: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr ""
-"Se reproducir ou non un son para notificar cando se está ocupado ou ausente."
+"Indica se reproducir ou non un son para notificar cando se está ocupado ou "
+"ausente."
 
 # rever
 #: ../data/empathy.schemas.in.h:73
 msgid ""
 "Whether or not to show a popup notification when a contact goes offline."
 msgstr ""
-"Se mostrar ou non unha notificación emerxente cando un contacto está "
+"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "desconectado."
 
 # rever
 #: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to show a popup notification when a contact goes online."
 msgstr ""
-"Se mostrar ou non unha notificación emerxente cando un contacto está "
+"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "conectado."
 
 # rever
@@ -454,16 +463,16 @@ msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr ""
-"Se mostrar ou non unha notificación emerxente cando se reciba unha mensaxe "
-"nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
+"Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
+"mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
 
 # rever
 #: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr ""
-"Se mostrar ou non unha notificación emerxente cando se reciba unha mensaxe "
-"nova."
+"Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
+"mensaxe nova."
 
 # rever
 #: ../data/empathy.schemas.in.h:77
@@ -471,26 +480,27 @@ msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr ""
-"Se mostrar ou non os avatares dos contactos da lista de contactos e das "
-"xanelas de conversa."
+"Indica se mostrar ou non os avatares dos contactos da lista de contactos e "
+"das xanelas de conversa."
 
 # rever
 #: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr ""
-"Se mostrar ou non os contactos que están desconectados na lista de contactos."
+"Indica se mostrar ou non os contactos que están desconectados na lista de "
+"contactos."
 
 # rever
 #: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
-"Se mostrar ou non as notificacións emerxentes cando se está ausente ou "
-"ocupado."
+"Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
+"ou ocupado."
 
 # rever
 #: ../data/empathy.schemas.in.h:80
 msgid "Whether or not to show the contact list in chat rooms."
-msgstr "Se mostrar ou non a lista de contactos nas salas de chat."
+msgstr "Indica se mostrar ou non a lista de contactos nas salas de chat."
 
 # rever
 #: ../data/empathy.schemas.in.h:81
@@ -498,18 +508,18 @@ msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr ""
-"Se mostrar ou non o diálogo de mensaxe sobre pechar a xanela principal co "
-"botón 'x' da barra de título."
+"Indica se mostrar ou non o diálogo de mensaxe sobre pechar a xanela "
+"principal co botón 'x' da barra de título."
 
 # rever
 #: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
-msgstr "Se mostrar ou non a lista de contactos no modo compacto."
+msgstr "Indica se mostrar ou non a lista de contactos no modo compacto."
 
 # rever
 #: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
-msgstr "Se usar o tema para as salas de conversa ou non."
+msgstr "Indica se usar ou non o tema para as salas de conversa."
 
 # rever
 #: ../data/empathy.schemas.in.h:84
@@ -518,9 +528,9 @@ msgid ""
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
-"O criterio para usar ao ordenar a lista de contactos. O predeterminado é "
-"usar a ordenación polo nome do contacto co valor \"name\". Un valor \"state"
-"\" ordenará a lista de contactos por estado."
+"Que criterio usará ao ordenar a lista de contactos. O predeterminado é usar "
+"a ordenación polo nome do contacto co valor \"name\". Un valor de \"estado"
+"\"  ordenará a lista de contactos por estado."
 
 #: ../libempathy/empathy-ft-handler.c:838
 msgid "The hash of the received file and the sent one do not match"
@@ -545,7 +555,7 @@ msgstr "Persoas próximas"
 
 #: ../libempathy/empathy-tp-file.c:279
 msgid "Socket type not supported"
-msgstr "O tipo de socket non é compatíbel"
+msgstr "O tipo de sócket non é compatíbel"
 
 # rever
 #: ../libempathy/empathy-tp-file.c:398
@@ -886,97 +896,103 @@ msgstr "Prema para ampliar"
 msgid "Failed to reconnect this chat"
 msgstr "Ocorreu un fallo ao reconectar á conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:404
+#: ../libempathy-gtk/empathy-chat.c:412
 msgid "Unsupported command"
 msgstr "Orde non compatíbel"
 
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "contacto non válido"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "a mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "descoñecido"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erro ao enviar a mensaxe '%s': %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "Non se definiu un asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:969
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
-#: ../libempathy-gtk/empathy-ui-utils.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1483
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1181
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:1190
+#, c-format
 msgid "%s has disconnected"
-msgstr "Contacto desconectado"
+msgstr "%s desconectou"
 
-#: ../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:1197
 #, c-format
-msgid "%s was kicked by %s"
-msgstr ""
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s foi expulsado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s was kicked"
-msgstr ""
+msgstr "%s foi expulsado"
 
-#: ../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:1208
 #, c-format
-msgid "%s was banned by %s"
-msgstr ""
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s foi vetado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:1196
+#: ../libempathy-gtk/empathy-chat.c:1211
 #, c-format
 msgid "%s was banned"
-msgstr ""
+msgstr "%s foi excluído"
 
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:1215
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
@@ -986,26 +1002,26 @@ 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:1209
+#: ../libempathy-gtk/empathy-chat.c:1224
 #, c-format
 msgid " (%s)"
-msgstr ""
+msgstr " (%s)"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:1247
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1380 ../src/empathy-call-window.c:1277
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1815
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-chat.c:1865
 #: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Conversa"
@@ -1016,13 +1032,13 @@ msgstr "Asunto:"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:264
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "_Copiar o enderezo da ligazón"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:272
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_Abrir ligazón"
 
@@ -1041,7 +1057,7 @@ msgstr "Editar a información de contacto"
 msgid "Personal Information"
 msgstr "Información persoal"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:393
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Contacto novo"
 
@@ -1056,29 +1072,29 @@ msgid "Subscription Request"
 msgstr "Solicitude de subscrición"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1400
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Está seguro de que quere eliminar o grupo '%s'?"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1402
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "Eliminando o grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1449
-#: ../libempathy-gtk/empathy-contact-list-view.c:1526
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "_Eliminar"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1479
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Está seguro de quere eliminar o contacto '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1481
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Eliminando o contacto"
 
@@ -1114,14 +1130,14 @@ msgstr "Enviar ficheiro"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:369
 msgid "Share my desktop"
-msgstr ""
+msgstr "Compartir o meu escritorio"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1150,121 +1166,121 @@ msgstr "Gardar o avatar"
 msgid "Unable to save avatar"
 msgstr "Non foi posíbel gardar o avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:992
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
 #: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1252
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1254
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "State:"
 msgstr "Rexión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Area:"
 msgstr "Área:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Street:"
 msgstr "Rúa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Building:"
 msgstr "Edificio:"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "Floor:"
 msgstr "_Andar:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Accuracy Level:"
 msgstr "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Vertical Error (meters):"
 msgstr "Erro vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Horizontal Error (meters):"
 msgstr "Erro horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Bearing:"
 msgstr "Orientación:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Climb Speed:"
 msgstr "Velocidade de incremento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
 msgid "Last Updated on:"
 msgstr "Última actualización:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
 msgid "Longitude:"
 msgstr "Lonxitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
 msgid "<b>Location</b>"
 msgstr "<b>Localización</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1358
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
 msgid "<b>Location</b>, "
 msgstr "<b>Localización</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1408
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y de %R UTC"
 
@@ -1413,16 +1429,18 @@ msgstr "ID do contacto:"
 msgid "New Conversation"
 msgstr "Conversa nova"
 
+#. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
-#. COL_STATUS_TEXT
 #. 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 "Mensaxe personalizada..."
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
 #: ../libempathy-gtk/empathy-presence-chooser.c:227
 msgid "Edit Custom Messages..."
 msgstr "Editar mensaxe personalizada..."
@@ -1513,14 +1531,6 @@ msgstr "Engada _nova configuración preestablecida"
 msgid "Saved Presets"
 msgstr "Configuración personalizada gardada"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "Clásico"
@@ -1537,16 +1547,16 @@ msgstr "Limpo"
 msgid "Blue"
 msgstr "Azul"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1382
+#: ../libempathy-gtk/empathy-ui-utils.c:1385
 msgid "Unable to open URI"
 msgstr "Non foi posíbel abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#: ../libempathy-gtk/empathy-ui-utils.c:1475
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
 # rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
+#: ../libempathy-gtk/empathy-ui-utils.c:1535
 msgid "Select a destination"
 msgstr "Seleccione un destinatario"
 
@@ -1749,7 +1759,7 @@ msgstr "Fale!"
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
 #: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
 msgid "_About"
-msgstr "S_obre"
+msgstr "_Acerca de"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
 msgid "_Information"
@@ -1797,8 +1807,8 @@ msgstr "Mostra o diálogo de conta"
 
 # rever
 #: ../src/empathy.c:587
-msgid "- Empathy Instant Messenger"
-msgstr "- Mensaxeiro instantáneo Empathy"
+msgid "- Empathy IM Client"
+msgstr "- Cliente de mensaxaría instantánea Empathy"
 
 # rever
 #: ../src/empathy-about-dialog.c:83
@@ -1832,8 +1842,8 @@ msgid ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
-"Debeu recibir unha copia da Licenza pública xeral GNU xunto co Empathy; en "
-"caso contrario, escriba á Free Software Foundation, Inc., 51 Franklin "
+"Debeu de recibir unha copia da Licenza pública xeral GNU xunto co Empathy; "
+"en caso contrario, escriba á Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
 # rever
@@ -1843,7 +1853,10 @@ msgstr "Un cliente de mensaxería instantánea para o Gnome"
 
 #: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
-msgstr "Suso Baleato <suso.baleato@xunta.es>"
+msgstr ""
+"Suso Baleato <suso.baleato@xunta.es>, 2009;\n"
+"Fran Diéguez <fran.dieguez@glug.es>, 2009;\n"
+"Antón Méixome <meixome@mancomun.org>,2009. "
 
 #: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
@@ -1939,56 +1952,59 @@ msgstr "_Crear unha nova conta"
 msgid "_Reuse an existing account"
 msgstr "_Reusar unha conta existente"
 
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-call-window.c:662
+#: ../src/empathy-call-window.c:671
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "Marcador"
 
 # rever
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "Entrada de audio"
 
 # rever
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-call-window.c:835
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
 #, c-format
 msgid "Call with %s"
-msgstr "Nunha chamada con %s"
+msgstr "Chamar con %s"
 
-#: ../src/empathy-call-window.c:904
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
 msgid "Call"
-msgstr "Ch_amar"
+msgstr "Chamar"
 
 # rever
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1335
+#: ../src/empathy-call-window.c:1390
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
@@ -2034,6 +2050,69 @@ msgstr "Conversas (%d)"
 msgid "Typing a message."
 msgstr "Escribindo unha mensaxe."
 
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "_Limpo"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "Conversa"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Inse_rir unha emoticona"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "Mover o separador _Esquerda"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "Mover o separador _Dereita"
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "_Contidos"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "_Conversa"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "_Detach Tab"
+msgstr "Se_parar o separador"
+
+# rever
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Favorite Chatroom"
+msgstr "Sala de conversa _favorita"
+
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "A_xuda"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr "Separador _seguinte"
+
+# rever
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "Separador _previo"
+
+# rever
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "Mo_strar a lista de contactos"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "_Separadores"
+
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Nome"
@@ -2401,21 +2480,19 @@ msgstr "Xestionar os preferidos"
 
 #: ../src/empathy-main-window.ui.h:6
 msgid "N_ormal Size"
-msgstr ""
+msgstr "Tamañ_o normal"
 
 #: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
-msgstr ""
+msgstr "Tamaño normal con _avatares"
 
 # rever
 #: ../src/empathy-main-window.ui.h:8
-#, fuzzy
 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
 # rever
 #: ../src/empathy-main-window.ui.h:9
-#, fuzzy
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
@@ -2425,11 +2502,7 @@ msgstr "_Contas"
 
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Compact Size"
-msgstr ""
-
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Contents"
-msgstr "_Contidos"
+msgstr "Ta_maño compacto"
 
 #: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
@@ -2439,10 +2512,6 @@ msgstr "_Depuración"
 msgid "_File Transfers"
 msgstr "Trans_ferencias de ficheiros"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Help"
-msgstr "A_xuda"
-
 #: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
 msgstr "_Unirse..."
@@ -2547,39 +2616,39 @@ msgstr "Lista de _salas"
 msgid "_Room:"
 msgstr "Sa_la:"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:148
 msgid "Message received"
 msgstr "Mensaxe recibida"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:149
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:150
 msgid "New conversation"
 msgstr "Conversa nova"
 
 # rever
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes online"
 msgstr "O contacto conéctase"
 
 # rever
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:152
 msgid "Contact goes offline"
 msgstr "O contacto desconéctase"
 
 # rever
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:153
 msgid "Account connected"
 msgstr "Conta conectada"
 
 # rever
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:154
 msgid "Account disconnected"
 msgstr "Conta desconectada"
 
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:394
 msgid "Language"
 msgstr "Idioma"
 
@@ -2602,7 +2671,7 @@ msgstr "Aparencia"
 # rever
 #: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
-msgstr "_Conectar automaticamente ao iniciar"
+msgstr "_Conectar automaticamente ao iniciar "
 
 #: ../src/empathy-preferences.ui.h:6
 msgid "Behavior"
@@ -2675,12 +2744,12 @@ msgstr "Privacidade"
 #: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will have a random "
-"value added (&#xB1;0.25&#xB0;)."
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
 "Unha reducida precisión de localización significa que nada máis preciso que "
-"a súa cidade, rexión e país serán publicados. As coordenadas GPS terán un "
-"valor aleatorio engadido (&#xB1;0.25&#xB0;)."
+"a súa cidade, rexión e país serán publicados. As coordenadas GPS serán "
+"aproximadas a 1 valor decimal."
 
 # rever
 #: ../src/empathy-preferences.ui.h:22
@@ -2745,11 +2814,6 @@ msgid "_Quit"
 msgstr "_Saír"
 
 # rever
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Show Contact List"
-msgstr "Mo_strar a lista de contactos"
-
-# rever
 #: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
@@ -2764,10 +2828,6 @@ msgstr ""
 "Foille ofrecido un convite para o servizo %s, mais non ten o aplicativo "
 "necesario para manipulalo"
 
-#: ../src/empathy-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr "gtk-leave-fullscreen"
-
 #: ../src/empathy-map-view.ui.h:1
 msgid "Contact Map View"
 msgstr "Vista de mapa de contactos"
@@ -2836,26 +2896,3 @@ msgid ""
 msgstr ""
 "O xestor de conexión seleccionado non é compatíbel coa extensión de "
 "depuración remota."
-
-#~ msgid "Adium"
-#~ msgstr "Adium"
-
-#~ msgid "Adium theme to use:"
-#~ msgstr "Tema para usar Adium:"
-
-# rever
-#~ msgid "Avatars are user chosen images shown in the contact list"
-#~ msgstr ""
-#~ "Os avatares son imaxes escollidas polos usuarios que se mostran na lista "
-#~ "de contactos"
-
-#~ msgid "Not a valid adium theme"
-#~ msgstr "Non é un modelo válido de adium"
-
-# rever
-#~ msgid "Show _avatars"
-#~ msgstr "Mostrar os _avatares"
-
-# rever
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "Mostrar a lista de contactos co_mpacta"
diff --git a/po/he.po b/po/he.po
index 0e8c6c917..dc7f35da3 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ 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: 2009-06-11 18:53+0000\n"
-"PO-Revision-Date: 2009-06-11 23:07+0200\n"
+"POT-Creation-Date: 2009-08-01 08:43+0000\n"
+"PO-Revision-Date: 2009-08-05 15:37+0200\n"
 "Last-Translator: Mark Krapivner <mark125@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,13 @@ msgstr ""
 "X-Poedit-Language: Hebrew\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "‏Empathy - מסרים מיידיים"
+#| msgid "Empathy Call"
+msgid "Empathy IM Client"
+msgstr "לקוח מסרים מיידים Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+#| msgid "Send and receive instant messages"
+msgid "Send and receive messages"
 msgstr "שלח וקבל מסרים מידיים"
 
 #: ../data/empathy.schemas.in.h:1
@@ -97,235 +99,272 @@ 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/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "Enable WebKit Developer Tools"
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Enable popup notifications for new messages"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Enable spell checker"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Hide main window"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Hide the main window."
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "NetworkManager should be used"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Nick completed character"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Open new chats in separate windows"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
 msgid "Path of the adium theme to use"
-msgstr ""
+msgstr "Path of the adium theme to use"
 
-#: ../data/empathy.schemas.in.h:27
-#, fuzzy
+#: ../data/empathy.schemas.in.h:28
 msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "Whether to use the theme for chat rooms or not."
+msgstr "Path of the adium theme to use if the theme used for chat is adium."
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Play a sound for incoming messages"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Play a sound for new conversations"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Play a sound for outgoing messages"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Play a sound when a contact logs in"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Play a sound when a contact logs out"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Play a sound when we log in"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Play a sound when we log out"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Popup notifications if the chat isn't focused"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:37
+#| msgid "Popup notifications if the chat isn't focused"
+msgid "Popup notifications when a contact sign in"
+msgstr "Popup notifications when a contact sign in"
+
+#: ../data/empathy.schemas.in.h:38
+#| msgid "Popup notifications if the chat isn't focused"
+msgid "Popup notifications when a contact sign out"
+msgstr "Popup notifications when a contact sign out"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Salut account is created"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Show avatars"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:41
+#| msgid "_Show Contact List"
+msgid "Show contact list in rooms"
+msgstr "Show contact list in rooms"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Show hint about closing the main window"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Show offline contacts"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "The default folder to save file transfers in."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "The last directory that an avatar image was chosen from."
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:47
 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/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Use notification sounds"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Use theme for chat rooms"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:51
+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/empathy.schemas.in.h:52
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr "Whether or not Empathy can publish the user's location to his contacts."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:53
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr "Whether or not Empathy can use the GPS to guess the location."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:54
 msgid "Whether or not Empathy can use the cellular network to guess the location."
 msgstr "Whether or not Empathy can use the cellular network to guess the location."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr "Whether or not Empathy can use the network to guess the location."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:56
 msgid "Whether or not Empathy has asked about importing accounts from other programs."
 msgstr "Whether or not Empathy has asked about importing accounts from other programs."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:57
 msgid "Whether or not Empathy should automatically log in to your accounts on startup."
 msgstr "Whether or not Empathy should automatically log in to your accounts on startup."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:58
 msgid "Whether or not Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Whether or not Empathy should reduce the location's accuracy for privacy reasons."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:59
 msgid "Whether or not Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Whether or not Empathy should use the avatar of the contact as the chat window icon."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:60
 msgid "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "Whether or not the Salut account has been created on the first Empathy run."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:61
 msgid "Whether or not the network manager should be used to automatically disconnect/reconnect."
 msgstr "Whether or not the network manager should be used to automatically disconnect/reconnect."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:62
 msgid "Whether or not to check words typed against the languages you want to check with."
 msgstr "Whether or not to check words typed against the languages you want to check with."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:63
 msgid "Whether or not to convert smileys into graphical images in conversations."
 msgstr "Whether or not to convert smileys into graphical images in conversations."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:64
 msgid "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "Whether or not to play a sound to notify for contacts logging in the network."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:65
 msgid "Whether or not to play a sound to notify for contacts logging off the network."
 msgstr "Whether or not to play a sound to notify for contacts logging off the network."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Whether or not to play a sound to notify for events."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Whether or not to play a sound to notify for incoming messages."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Whether or not to play a sound to notify for new conversations."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Whether or not to play a sound to notify for outgoing messages."
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Whether or not to play a sound when logging in a network."
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Whether or not to play a sound when logging off a network."
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "Whether or not to play sound notifications when away or busy."
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:73
+#| msgid "Whether or not to show popup notifications when away or busy."
+msgid "Whether or not to show a popup notification when a contact goes offline."
+msgstr "Whether or not to show a popup notification when a contact goes offline."
+
+#: ../data/empathy.schemas.in.h:74
+#| msgid "Whether or not to show popup notifications when away or busy."
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "Whether or not to show a popup notification when a contact goes online."
+
+#: ../data/empathy.schemas.in.h:75
 msgid "Whether or not to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 msgstr "Whether or not to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:76
 msgid "Whether or not to show a popup notification when receiving a new message."
 msgstr "Whether or not to show a popup notification when receiving a new message."
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:77
 msgid "Whether or not to show avatars for contacts in the contact list and chat windows."
 msgstr "Whether or not to show avatars for contacts in the contact list and chat windows."
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "Whether or not to show contacts that are offline in the contact list."
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "Whether or not to show popup notifications when away or busy."
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:80
+#| msgid "Whether to show the contact list in compact mode or not."
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Whether or not to show the contact list in chat rooms."
+
+#: ../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."
 msgstr "Whether or not to show the message dialog about closing the main window with the 'x' button in the title bar."
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Whether to show the contact list in compact mode or not."
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Whether to use the theme for chat rooms or not."
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:84
 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."
 msgstr "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."
 
@@ -337,56 +376,68 @@ msgstr ""
 msgid "File transfer not supported by remote contact"
 msgstr ""
 
-#: ../libempathy/empathy-tp-contact-list.c:757
-#: ../src/empathy.c:286
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "הקובץ הנבחר אינו קובץ רגיל"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "הקובץ הנבחר ריק"
+
+#: ../libempathy/empathy-tp-contact-list.c:843
+#: ../src/empathy.c:289
 msgid "People nearby"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:300
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:398
 msgid "No reason was specified"
 msgstr "לא צויינה סיבה"
 
-#: ../libempathy/empathy-tp-file.c:303
+#: ../libempathy/empathy-tp-file.c:401
 msgid "The change in state was requested"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:306
+#: ../libempathy/empathy-tp-file.c:404
 msgid "You canceled the file transfer"
 msgstr "ביטלת את ההעברה"
 
-#: ../libempathy/empathy-tp-file.c:309
+#: ../libempathy/empathy-tp-file.c:407
 msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:312
+#: ../libempathy/empathy-tp-file.c:410
 msgid "Error while trying to transfer the file"
 msgstr "התרחשה שגיאה בזמן ניסיון העברת הקובץ"
 
-#: ../libempathy/empathy-tp-file.c:315
+#: ../libempathy/empathy-tp-file.c:413
 msgid "The other participant is unable to transfer the file"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:318
+#: ../libempathy/empathy-tp-file.c:416
 msgid "Unknown reason"
 msgstr "סיבה לא ידועה"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "זמין"
 
-#: ../libempathy/empathy-utils.c:276
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../libempathy/empathy-utils.c:279
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "מרוחק"
 
-#: ../libempathy/empathy-utils.c:281
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "מוסתר"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "לא מחובר"
 
@@ -420,16 +471,25 @@ msgstr[1] "לפני %d ימים"
 
 #: ../libempathy/empathy-time.c:157
 #, c-format
+#| msgid "%d second ago"
+#| msgid_plural "%d seconds ago"
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "לפני שבוע"
+msgstr[1] "לפני %d שבועות"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "לפני חודש"
 msgstr[1] "לפני %d חודשים"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:167
 msgid "in the future"
 msgstr "בעתיד"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:419
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "הכל"
 
@@ -448,8 +508,9 @@ msgstr "%s:"
 #: ../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
-msgid "<b>Advanced</b>"
-msgstr "<b>מתקדם</b>"
+#| msgid "<b>Advanced</b>"
+msgid "Advanced"
+msgstr "מתקדם"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
@@ -485,7 +546,7 @@ msgid "_Server:"
 msgstr "_שרת:"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "מזהה משת_מש:"
@@ -499,49 +560,47 @@ msgstr ""
 msgid "_Charset:"
 msgstr "קידוד _תווים:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:241
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "רשת חדשה"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "<b>Network</b>"
-msgstr "<b>רשת</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>שרתים</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Charset:"
 msgstr "קידוד תווים:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "רשת"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "רשת:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "כינוי:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "הודאת יציאה:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "שם אמיתי:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>עקוף הגדרת שרת</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#| msgid "Server"
+msgid "Servers"
+msgstr "שרתים"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#| msgid "<b>Override server settings</b>"
+msgid "Override server settings"
+msgstr "עקוף הגדרת שרת"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
@@ -649,109 +708,150 @@ msgstr "כל הקבצים"
 msgid "Click to enlarge"
 msgstr "לחץ כדי להגדיל"
 
-#: ../libempathy-gtk/empathy-chat.c:178
+#: ../libempathy-gtk/empathy-chat.c:186
 msgid "Failed to reconnect this chat"
 msgstr "נכשל בהתחברות לשיחה"
 
-#: ../libempathy-gtk/empathy-chat.c:396
+#: ../libempathy-gtk/empathy-chat.c:404
 msgid "Unsupported command"
 msgstr "פקודה לא נתמכת"
 
-#: ../libempathy-gtk/empathy-chat.c:531
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "לא מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:534
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "איש קשר לא תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:537
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "איש קשר לא תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:540
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "הודעה ארוכה מדי"
 
-#: ../libempathy-gtk/empathy-chat.c:543
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "לא ממומש"
 
-#: ../libempathy-gtk/empathy-chat.c:546
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "לא ידוע"
 
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "שגיאה בשליחת ההודעה '%s': ‏%s"
 
-#: ../libempathy-gtk/empathy-chat.c:580
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "הנושא נקבע ל: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:582
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "לא נקבע נושא"
 
-#: ../libempathy-gtk/empathy-chat.c:951
+#: ../libempathy-gtk/empathy-chat.c:960
 msgid "(No Suggestions)"
 msgstr "(אין הצעות)"
 
-#: ../libempathy-gtk/empathy-chat.c:1005
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "הכנס סמיילי"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1023
-#: ../libempathy-gtk/empathy-ui-utils.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_שלח"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "_Spelling Suggestions"
 msgstr "הצעות _איות"
 
-#: ../libempathy-gtk/empathy-chat.c:1171
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "‏%s הצטרף לחדר"
+#| msgid "Contact disconnected"
+msgid "%s has disconnected"
+msgstr "‏%s התנתק"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
 msgstr "‏%s עזב את החדר"
 
-#: ../libempathy-gtk/empathy-chat.c:1289
-#: ../src/empathy-call-window.c:1107
+#. 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:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "‏%s הצטרף לחדר"
+
+#: ../libempathy-gtk/empathy-chat.c:1365
+#: ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "מנותק"
 
-#: ../libempathy-gtk/empathy-chat.c:1700
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:1750
-#: ../libempathy-gtk/empathy-log-window.c:501
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "שיחה"
 
 #: ../libempathy-gtk/empathy-chat.ui.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>נושא:</b>"
+#: ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "נושא:"
 
+#. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "העתק _מיקום קישור"
 
+#. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_פתח קישור"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -764,7 +864,7 @@ msgstr "ערוך מידע איש קשר"
 msgid "Personal Information"
 msgstr "מידע אישי"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "איש קשר חדש"
 
@@ -774,68 +874,79 @@ msgstr "ה_חלט מאוחר יותר"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
-msgstr ""
+msgstr "בקשת הצטרפות"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1404
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "להסיר את הקבוצה '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1380
+#: ../libempathy-gtk/empathy-contact-list-view.c:1406
 msgid "Removing group"
 msgstr "מסיר קבוצה"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1427
-#: ../libempathy-gtk/empathy-contact-list-view.c:1505
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1453
+#: ../libempathy-gtk/empathy-contact-list-view.c:1530
 msgid "_Remove"
 msgstr "_הסר"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1457
+#: ../libempathy-gtk/empathy-contact-list-view.c:1483
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "להסיר את איש הקשר '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1459
+#: ../libempathy-gtk/empathy-contact-list-view.c:1485
 msgid "Removing contact"
 msgstr "מסיר איש קשר"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:135
-#: ../src/empathy-main-window.ui.h:8
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_הוסף איש קשר..."
+
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_שיחה"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:166
+#: ../libempathy-gtk/empathy-contact-menu.c:253
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "שיחה _קולית"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:198
+#: ../libempathy-gtk/empathy-contact-menu.c:285
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "שיחת _וידאו"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_צפייה בשיחות קודמות"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:259
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "שלח קובץ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:287
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "שתף את שולחן העבודה שלי"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "_מידע"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:314
-#: ../src/empathy-main-window.ui.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_עריכה"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:372
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "הזמן לחדר שיחה זה"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_הזמן לחדר שיחה"
 
@@ -843,179 +954,183 @@ msgstr "_הזמן לחדר שיחה"
 msgid "Select a contact"
 msgstr "בחר איש קשר"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:440
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "שמור תמונה אישית"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
-msgstr ""
+msgstr "לא ניתן לשמור תמונה אישית"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:979
+#: ../libempathy-gtk/empathy-contact-widget.c:996
 msgid "Select"
 msgstr "בחר"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:905
+#: ../libempathy-gtk/empathy-contact-widget.c:1005
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1239
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
 msgid "Country ISO Code:"
-msgstr ""
+msgstr "קוד תקן ISO של המדינה:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1241
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
 msgid "Country:"
 msgstr "ארץ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1243
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "State:"
 msgstr "מדינה:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1245
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "City:"
 msgstr "עיר:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1247
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "Area:"
 msgstr "אזור:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1249
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "Postal Code:"
-msgstr ""
+msgstr "מיקוד:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1251
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Street:"
 msgstr "רחוב:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1253
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Building:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1255
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Floor:"
 msgstr "קומה:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1257
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Room:"
 msgstr "חדר:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1259
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "Text:"
 msgstr "טקסט:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Description:"
 msgstr "תיאור:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "URI:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Accuracy Level:"
 msgstr "רמת דיוק:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "Error:"
 msgstr "שגיאה:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Vertical Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Horizontal Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Speed:"
 msgstr "מהירות:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 #, fuzzy
 msgid "Bearing:"
 msgstr "גרסה:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Climb Speed:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Last Updated on:"
 msgstr "עדכון אחרון ב:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Longitude:"
 msgstr "קו אורך:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
 msgid "Latitude:"
 msgstr "קו רוחב:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
 msgid "Altitude:"
 msgstr "גובה:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1332
+#: ../libempathy-gtk/empathy-contact-widget.c:1349
 msgid "<b>Location</b>"
 msgstr "<b>מיקום</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1362
 msgid "<b>Location</b>, "
 msgstr "<b>מיקום</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1395
+#: ../libempathy-gtk/empathy-contact-widget.c:1412
 msgid "%B %e, %Y at %R UTC"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>מידע לקוח</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>מידע איש קשר</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>איש קשר</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>קבוצות</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "<b>Location</b> at (date)\t"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../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 "חשבון:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "כינוי:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "יום הולדת:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#| msgid "<b>Client Information</b>"
+msgid "Client Information"
+msgstr "נתוני הלקוח"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "לקוח:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "איש קשר"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#| msgid "<b>Contact Details</b>"
+msgid "Contact Details"
+msgstr "פרטי איש קשר"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "דוא\"ל:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "שם מלא:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#| msgid "Group"
+msgid "Groups"
+msgstr "קבוצות"
+
 #. Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
@@ -1023,7 +1138,7 @@ msgstr "מזהה:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
-msgstr ""
+msgstr "התבקש מידע"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
@@ -1031,7 +1146,7 @@ msgstr "מערכת הפעלה:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
-msgstr ""
+msgstr "בחר את הקבוצות בהן אתה מעוניין שאיש קשר זה יופיע.  ניתן לבחור ביותר מקבוצה אחת או לא לבחור קבוצות בכלל."
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
@@ -1061,12 +1176,12 @@ msgstr "שער"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:494
-#: ../src/empathy-import-dialog.c:281
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "חשבון"
 
-#: ../libempathy-gtk/empathy-log-window.c:511
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "תאריך"
 
@@ -1102,16 +1217,18 @@ msgstr ""
 msgid "New Conversation"
 msgstr "שיחה חדשה"
 
+#. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
-#. COL_STATUS_TEXT
 #. 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 "הודעה מותאמת אישית..."
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
 #: ../libempathy-gtk/empathy-presence-chooser.c:227
 msgid "Edit Custom Messages..."
 msgstr "ערוך הודעה מותאמת אישית..."
@@ -1128,15 +1245,55 @@ msgstr ""
 msgid "Set status"
 msgstr "קבע מצב"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:778
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
 msgid "Set your presence and current status"
 msgstr ""
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1013
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
 msgid "Custom messages..."
 msgstr "הודעות מותאמות אישית..."
 
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr "התקבלה הודעה מידית."
+
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr "שלח הודעה מידית"
+
+#: ../libempathy-gtk/empathy-sound.c:55
+msgid "Incoming chat request"
+msgstr "בקשת שיחה נכנסת"
+
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr "איש קשר התחבר"
+
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr "איש קשר התנתק"
+
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr "מחובר לשרת"
+
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "מנותק מהשרת"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
+msgstr "שיחה קולית נכנסת"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "שיחה קולית פעילה"
+
+#: ../libempathy-gtk/empathy-sound.c:69
+msgid "Voice call ended"
+msgstr "שיחה קולית הסתיימה"
+
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:362
 msgid "Enter Custom Message"
 msgstr "הכנס הודעה מותאמת"
@@ -1162,78 +1319,34 @@ msgstr "gtk-add"
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:66
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "קלאסי"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr "פשוט"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
 msgstr "נקי"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "כחול"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Adium"
-msgstr "Adium"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1378
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
 msgid "Unable to open URI"
 msgstr "לא נית לפתוח את הכתובת"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1468
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
 msgid "Select a file"
 msgstr "בחר קובץ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1526
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
 msgid "Select a destination"
 msgstr "בחר יעד"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1555
-msgid "Received an instant message"
-msgstr "התקבלה הודעה מידית."
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1557
-msgid "Sent an instant message"
-msgstr "שלח הודעה מידית"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1559
-msgid "Incoming chat request"
-msgstr "בקשת שיחה נכנסת"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1561
-msgid "Contact connected"
-msgstr "איש קשר התחבר"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1563
-msgid "Contact disconnected"
-msgstr "איש קשר התנתק"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1565
-msgid "Connected to server"
-msgstr "מחובר לשרת"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1567
-msgid "Disconnected from server"
-msgstr "מנותק מהשרת"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1569
-msgid "Incoming voice call"
-msgstr "שיחה קולית נכנסת"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1571
-msgid "Outgoing voice call"
-msgstr "שיחה קולית פעילה"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1573
-msgid "Voice call ended"
-msgstr "שיחה קולית הסתיימה"
-
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "מיקום נוכחי"
@@ -1417,7 +1530,7 @@ msgid "Megaphone"
 msgstr "Megaphone"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:527
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "דבר!"
 
@@ -1431,7 +1544,7 @@ msgid "_Information"
 msgstr "_מידע"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_העדפות"
 
@@ -1452,39 +1565,40 @@ msgstr "Presence"
 msgid "Set your own presence"
 msgstr ""
 
-#: ../src/empathy.c:476
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "אל תתחבר בהפעלה"
 
-#: ../src/empathy.c:480
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "אל תציג את רשימת אנשי הקשר בהפעלה"
 
-#: ../src/empathy.c:484
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "הצג חלון החשבונות"
 
-#: ../src/empathy.c:496
-msgid "- Empathy Instant Messenger"
-msgstr "- Empathy Instant Messenger"
+#: ../src/empathy.c:587
+#| msgid "Empathy Call"
+msgid "- Empathy IM Client"
+msgstr "- Empathy IM Client"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 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."
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 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."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "לקוח מסרים מיידיים עבור GNOME"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "מארק קרפיבנר <mark125@gmail.com>\n"
@@ -1492,12 +1606,12 @@ msgstr ""
 "פרוייקט תרגום GNOME לעברית:\n"
 "‏http://gnome-il.berlios.de"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "מופעל"
 
-#: ../src/empathy-accounts-dialog.c:403
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.c:402
+#: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "חשבונות"
 
@@ -1523,93 +1637,101 @@ msgid ""
 "Should you decide to add the account back at a later time, they will still be available."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "<b>Add Account</b>"
-msgstr "<b>הוסף חשבון</b>"
-
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>אין פרוטוקולים מותקנים</b>"
+#| msgid "Account"
+msgid "Add Account"
+msgstr "הוסף חשבון"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>הגדרות</b>"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Cr_eate"
 msgstr "_צור"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:4
+#| msgid "Email:"
+msgid "Gmail"
+msgstr "Gmail"
+
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "ייבוא חשבונות..."
 
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "<b>No protocol installed</b>"
+msgid "No protocol installed"
+msgstr "אין פרוטוקולים מותקנים"
+
 #: ../src/empathy-accounts-dialog.ui.h:7
+#| msgid "<b>Settings</b>"
+msgid "Settings"
+msgstr "הגדרות"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 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:8
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "סוג:"
 
-#: ../src/empathy-accounts-dialog.ui.h:9
+#: ../src/empathy-accounts-dialog.ui.h:10
 msgid "_Add..."
 msgstr "_הוסף..."
 
-#: ../src/empathy-accounts-dialog.ui.h:10
+#: ../src/empathy-accounts-dialog.ui.h:11
 msgid "_Create a new account"
 msgstr "_צור חשבון חדש"
 
-#: ../src/empathy-accounts-dialog.ui.h:11
+#: ../src/empathy-accounts-dialog.ui.h:12
 msgid "_Reuse an existing account"
 msgstr "_שימוש חוזר בחשבון קיים"
 
-#: ../src/empathy-call-window.c:63
-msgid "Connecting..."
-msgstr "מתחבר..."
-
-#: ../src/empathy-call-window.c:405
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
 msgstr "ניגוד"
 
-#: ../src/empathy-call-window.c:408
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
-msgstr ""
+msgstr "בהירות"
 
-#: ../src/empathy-call-window.c:411
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
-msgstr ""
+msgstr "גאמה"
 
-#: ../src/empathy-call-window.c:516
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "עוצמה"
 
-#: ../src/empathy-call-window.c:697
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "מתחבר..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "_סרגל צד"
 
-#: ../src/empathy-call-window.c:716
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr ""
 
-#: ../src/empathy-call-window.c:722
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "קלט שמע"
 
-#: ../src/empathy-call-window.c:726
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "קלט וידאו"
 
-#: ../src/empathy-call-window.c:789
+#: ../src/empathy-call-window.c:835
 #, c-format
 msgid "Call with %s"
 msgstr ""
 
-#: ../src/empathy-call-window.c:860
+#: ../src/empathy-call-window.c:904
 msgid "Call"
 msgstr "שיחה"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1203
+#: ../src/empathy-call-window.c:1335
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "מחובר — %d:%02dד'"
@@ -1639,28 +1761,81 @@ msgid "_Call"
 msgstr "_שיחה"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../src/empathy-chat-window.c:342
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "שיחות (%d)"
 
-#: ../src/empathy-chat-window.c:470
-msgid "Topic:"
-msgstr "נושא:"
-
-#: ../src/empathy-chat-window.c:474
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "מקליד הודעה."
 
-#: ../src/empathy-chat-window.c:935
-#: ../src/empathy-event-manager.c:429
-#, c-format
-msgid "New message from %s"
-msgstr "הודעה חדשת מ־%s"
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "נ_קה"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "שיחה"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "הכנס _סמיילי"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "הזז לשונית _שמאלה"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "הזז לשונית _ימינה"
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "_איש קשר"
+
+#: ../src/empathy-chat-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "_תכנים"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "_שיחה"
+
+#: ../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 "_עזרה"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr "_לשונית הבאה"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "_לשונית קודמת"
+
+#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "_הצג רשימת אנשי קשר"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "_לשוניות"
 
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
@@ -1678,75 +1853,75 @@ msgstr "חיבור אוטומטי"
 msgid "Manage Favorite Rooms"
 msgstr "ניהול חדרי שיחה מועדפים"
 
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "שיחה נכנסת"
 
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "‏%s מתקשר אליך, האם ברצונך לענות?"
 
-#: ../src/empathy-event-manager.c:387
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "_דחה"
 
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_השב"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "שיחה נכנסת מ־%s"
 
-#: ../src/empathy-event-manager.c:547
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "‏%s שולח לך הזמנה"
 
-#: ../src/empathy-event-manager.c:553
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr ""
 
-#: ../src/empathy-event-manager.c:558
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr ""
 
-#: ../src/empathy-event-manager.c:685
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "הזמנה לחדר"
 
-#: ../src/empathy-event-manager.c:688
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "‏%s מזמין אותך להצטרף אל %s"
 
-#: ../src/empathy-event-manager.c:696
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "_סרב"
 
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:650
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_הצטרף"
 
-#: ../src/empathy-event-manager.c:740
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "‏%s הזמין אותך להצטרף אל %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
-msgstr ""
+msgstr "העברת קבצים נכנסת מ־%s"
 
-#: ../src/empathy-event-manager.c:946
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
-msgstr ""
+msgstr "בקשת ההצטרפות התבקשה על ידי %s"
 
-#: ../src/empathy-event-manager.c:950
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1755,6 +1930,20 @@ msgstr ""
 "\n"
 "הודעה: %s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+#| msgid "%s went offline"
+msgid "%s is now offline."
+msgstr "‏%s עכשיו מנותק."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+#| msgid "%s has come online"
+msgid "%s is now online."
+msgstr "‏%s עכשיו מחובר."
+
 #. Translators: time left, when it is more than one hour
 #: ../src/empathy-ft-manager.c:101
 #, c-format
@@ -1862,7 +2051,8 @@ msgid "Remaining"
 msgstr "נותר"
 
 #: ../src/empathy-ft-manager.ui.h:1
-msgid "File transfers"
+#| msgid "_File Transfers"
+msgid "File Transfers"
 msgstr "העברות קבצים"
 
 #: ../src/empathy-ft-manager.ui.h:2
@@ -1870,91 +2060,87 @@ 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:259
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "ייבוא"
 
-#: ../src/empathy-import-dialog.c:268
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../src/empathy-import-dialog.c:294
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "מקור"
 
-#: ../src/empathy-import-dialog.c:388
+#: ../src/empathy-import-dialog.c:392
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
-msgstr ""
+msgstr "לא נמצאו חשבונות לייבא. Empathy תומך כרגע בייבוא חשבונות מ־Pidgin בלבד."
 
 #: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "ייבוא חשבונות"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "_ערוך חשבון"
 
-#: ../src/empathy-main-window.c:498
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "לא צוינה שגיאה"
 
-#: ../src/empathy-main-window.c:501
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "שגיאת רשת"
 
-#: ../src/empathy-main-window.c:504
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "האימות נכשל"
 
-#: ../src/empathy-main-window.c:507
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "שגיאת הצפנה"
 
-#: ../src/empathy-main-window.c:510
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "השם בשימוש"
 
-#: ../src/empathy-main-window.c:513
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "לא סופקה תעודה"
 
-#: ../src/empathy-main-window.c:516
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr ""
 
-#: ../src/empathy-main-window.c:519
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "התעודה לא תקפה"
 
-#: ../src/empathy-main-window.c:522
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr ""
 
-#: ../src/empathy-main-window.c:525
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr ""
 
-#: ../src/empathy-main-window.c:528
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr ""
 
-#: ../src/empathy-main-window.c:531
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr ""
 
-#: ../src/empathy-main-window.c:534
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "שגיאת תעודה"
 
-#: ../src/empathy-main-window.c:537
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "שגיאה לא ידועה"
 
-#: ../src/empathy-main-window.c:888
-msgid "Contact"
-msgstr "איש קשר"
-
-#: ../src/empathy-main-window.c:1220
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "הצג וערוך חשבונות"
 
@@ -1979,63 +2165,73 @@ msgid "Manage Favorites"
 msgstr "נהל מועדפים"
 
 #: ../src/empathy-main-window.ui.h:6
-msgid "_Accounts"
-msgstr "_חשבונות"
+msgid "N_ormal Size"
+msgstr "גודל נ_ורמלי"
 
 #: ../src/empathy-main-window.ui.h:7
-msgid "_Add Contact..."
-msgstr "_הוסף איש קשר..."
+msgid "Normal Size With _Avatars"
+msgstr "גודל נואמלי עם _תמונות אישיות"
+
+#: ../src/empathy-main-window.ui.h:8
+#| msgid "Sort by _name"
+msgid "Sort by _Name"
+msgstr "מיין לפי _שם"
 
 #: ../src/empathy-main-window.ui.h:9
-msgid "_Contents"
-msgstr "_תכנים"
+#| msgid "Sort by s_tate"
+msgid "Sort by _Status"
+msgstr "מיין לפי _מצב"
 
 #: ../src/empathy-main-window.ui.h:10
+msgid "_Accounts"
+msgstr "_חשבונות"
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "גודל _קומפקטי"
+
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
 msgstr "_ניפוי שגיאות"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:17
 msgid "_File Transfers"
 msgstr "העברות _קבצים"
 
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Help"
-msgstr "_עזרה"
-
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
 msgstr "_הצטרף..."
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:20
 #: ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_שיחה חדשה..."
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:21
 msgid "_Offline Contacts"
 msgstr "אנשי קשר _לא מחוברים"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "מידע _אישי"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Previous Conversations"
 msgstr "שיחות _קודמות"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_חדר"
 
-#: ../src/empathy-new-chatroom-dialog.c:332
+#: ../src/empathy-new-chatroom-dialog.c:331
 msgid "Chat Room"
 msgstr "חדר שיחה"
 
-#: ../src/empathy-new-chatroom-dialog.c:348
+#: ../src/empathy-new-chatroom-dialog.c:347
 msgid "Members"
 msgstr "חברים"
 
-#: ../src/empathy-new-chatroom-dialog.c:492
+#: ../src/empathy-new-chatroom-dialog.c:496
 #, c-format
 msgctxt "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no and a number."
 msgid ""
@@ -2049,31 +2245,31 @@ msgstr ""
 "נדרשת סיסמה: %s\n"
 "חברים: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "Yes"
 msgstr "כן"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "No"
 msgstr "לא"
 
-#: ../src/empathy-new-chatroom-dialog.c:522
+#: ../src/empathy-new-chatroom-dialog.c:526
 msgid "Could not start room listing"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:532
+#: ../src/empathy-new-chatroom-dialog.c:536
 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."
-msgstr ""
+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"
@@ -2091,187 +2287,179 @@ msgstr "רשימת חדרים"
 msgid "_Room:"
 msgstr "_חדר:"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "התקבלה הודעה"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "הודעה שנשלחה"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "שיחה חדשה"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "איש קשר מתחבר"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "איש קשר מתנתק"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "חשבון מחובר"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "חשבון התנתק"
 
-#: ../src/empathy-preferences.c:427
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "שפה"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>מראה</b>"
+msgid "Allow _GPS usage"
+msgstr "לאפשר שימוש ב־_GPS"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>התנהגות</b>"
+msgid "Allow _cellphone usage"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>רשימת אנשי קשר</b>"
+msgid "Allow _network usage"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>הפעל בדיקת איות עבור השפות:</b>"
+#| msgid "<b>Appearance</b>"
+msgid "Appearance"
+msgstr "מראה"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "<b>Geoclue Settings</b>"
-msgstr "<b>הגדרות Geoclue</b>"
+msgid "Automatically _connect on startup "
+msgstr "_התחבר אוטומטי על ההפעלה"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "<b>Play sound for events</b>"
-msgstr "<b>השמע צליל עבור אירועים</b>"
+#| msgid "<b>Behavior</b>"
+msgid "Behavior"
+msgstr "התנהגות"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "<b>Privacy</b>"
-msgstr "<b>פרטיות</b>"
+msgid "Chat Th_eme:"
+msgstr "ער_כת נושא לשיחה:"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "<small>Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will have a random value added (&#xB1;0.25&#xB0;).</small>"
-msgstr "<small>הפחתת רמת הדיוק של המיקום אומרת שהמידע המדויק ביותר שיפורסם הוא העיר, המדינה והארץ שלך. לנקודות ציון מ־GPS יתווסף ערך אקראי ‏(&#xB1;0.25&#xB0;). </small>"
+msgid "Disable notifications when _away or busy"
+msgstr "בטל התרעות בזמן מצב _מרוחק או עסוק"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid "<small>The list of languages reflects only the languages for which you have a dictionary installed.</small>"
-msgstr "<small>ברשימת השפות מוצגות שפות שעבורן מותקנים אצלך מילונים.</small>"
+msgid "Disable sounds when _away or busy"
+msgstr "בטל צלילים בזמן מצב _מרוחק או עסוק"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "<span foreground=\"red\">Not a valid adium theme</span>"
-msgstr ""
+#| msgid "Disable notifications when _away or busy"
+msgid "Enable notifications when a contact comes online"
+msgstr "הפעל התרעות כאשר איש קשר מתחבר"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Adium theme to use:"
-msgstr ""
+#| msgid "Disable notifications when _away or busy"
+msgid "Enable notifications when a contact goes offline"
+msgstr "הפעל התרעות כאשר איש קשר מתנתק"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Allow _GPS usage"
-msgstr "לאפשר שימוש ב־_GPS"
+msgid "Enable notifications when the _chat is not focused"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Allow _cellphone usage"
-msgstr ""
+#| msgid "<b>Enable spell checking for languages:</b>"
+msgid "Enable spell checking for languages:"
+msgstr "הפעל בדיקת איות עבור השפות:"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Allow _network usage"
-msgstr ""
+msgid "General"
+msgstr "כללי"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Automatically _connect on startup "
-msgstr "_התחבר אוטומטי על ההפעלה"
+#| msgid "<b>Geoclue Settings</b>"
+msgid "Geoclue Settings"
+msgstr "הגדרות Geoclue"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr ""
+msgid "Location"
+msgstr "מיקום"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Chat Th_eme:"
-msgstr "ער_כת נושא לשיחה:"
+msgid "Notifications"
+msgstr "התרעות"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Disable notifications when _away or busy"
-msgstr "בטל התרעות בזמן מצב _מרוחק או עסוק"
+#| msgid "<b>Play sound for events</b>"
+msgid "Play sound for events"
+msgstr "השמע צליל עבור אירועים"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Disable sounds when _away or busy"
-msgstr "בטל צלילים בזמן מצב _מרוחק או עסוק"
+msgid "Preferences"
+msgstr "העדפות"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Enable notifications when the _chat is not focused"
-msgstr ""
+#| msgid "<b>Privacy</b>"
+msgid "Privacy"
+msgstr "פרטיות"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "General"
-msgstr "כללי"
+#| msgid ""
+#| "<small>Reduced location accuracy means that nothing more precise than "
+#| "your city, state and country will be published.  GPS coordinates will "
+#| "have a random value added (&#xB1;0.25&#xB0;).</small>"
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will have a random value added (&#xB1;0.25&#xB0;)."
+msgstr "הפחתת רמת הדיוק של המיקום אומרת שהמידע המדויק ביותר שיפורסם הוא העיר, המדינה והארץ שלך. לנקודות ציון מ־GPS יתווסף ערך אקראי (&#xB1;0.25&#xB0;)."
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Location"
-msgstr "מיקום"
-
-#: ../src/empathy-preferences.ui.h:23
-msgid "Notifications"
-msgstr "התרעות"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Preferences"
-msgstr "העדפות"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show _avatars"
-msgstr "הצג _תמנות אישיות"
-
-#: ../src/empathy-preferences.ui.h:26
 msgid "Show _smileys as images"
 msgstr "הצד _סמיילים כתמונות"
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "Show co_mpact contact list"
-msgstr "הצג רשימת אנשי קשר מ_צומצמת"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Sort by _name"
-msgstr "מיין לפי _שם"
-
-#: ../src/empathy-preferences.ui.h:29
-msgid "Sort by s_tate"
-msgstr "מיין לפי מצ_ב"
+#: ../src/empathy-preferences.ui.h:23
+#| msgid "_Show Contact List"
+msgid "Show contact _list in rooms"
+msgstr "הצג _רשימת אנשי קשר בחדרים"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "צלילים"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "בדיקת איות"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "Sélectionner un dossier"
-msgstr ""
+#: ../src/empathy-preferences.ui.h:26
+#| msgid ""
+#| "<small>The list of languages reflects only the languages for which you "
+#| "have a dictionary installed.</small>"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "ברשימת השפות מוצגות שפות שעבורן מותקנים אצלך מילונים."
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "ערכות נושא"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "_הפעל התרעות בתוך בועה"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "_הפעל התרעות קול"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_פתח שיחות חדשות בחלונות נפרדים"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Publish location to my contacts"
 msgstr "_פרסם את המיקום שלי לאנשי הקשר שלי"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Reduce location accuracy"
 msgstr "_הפחת את דיוק המיקום"
 
@@ -2283,10 +2471,6 @@ msgstr "מצב"
 msgid "_Quit"
 msgstr "יצי_אה"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Show Contact List"
-msgstr "_הצג רשימת אנשי קשר"
-
 #: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
@@ -2307,72 +2491,100 @@ msgid "Contact Map View"
 msgstr "רשימת אנשי קשר"
 
 #: ../src/empathy-debug-dialog.c:111
-#: ../src/empathy-debug-dialog.c:1075
+#: ../src/empathy-debug-dialog.c:1083
 msgid "Error"
 msgstr "שגיאה"
 
 #: ../src/empathy-debug-dialog.c:114
-#: ../src/empathy-debug-dialog.c:1069
+#: ../src/empathy-debug-dialog.c:1077
 msgid "Critical"
 msgstr "קריטי"
 
 #: ../src/empathy-debug-dialog.c:117
-#: ../src/empathy-debug-dialog.c:1063
+#: ../src/empathy-debug-dialog.c:1071
 msgid "Warning"
 msgstr "אזהרה"
 
 #: ../src/empathy-debug-dialog.c:120
-#: ../src/empathy-debug-dialog.c:1057
-#: ../src/empathy-debug-dialog.c:1105
+#: ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
 msgid "Message"
 msgstr "הודעה"
 
 #: ../src/empathy-debug-dialog.c:123
-#: ../src/empathy-debug-dialog.c:1051
+#: ../src/empathy-debug-dialog.c:1059
 msgid "Info"
 msgstr "מידע"
 
 #: ../src/empathy-debug-dialog.c:126
-#: ../src/empathy-debug-dialog.c:1045
+#: ../src/empathy-debug-dialog.c:1053
 msgid "Debug"
 msgstr "ניפוי שגיאות"
 
-#: ../src/empathy-debug-dialog.c:837
+#: ../src/empathy-debug-dialog.c:845
 msgid "Save"
 msgstr "שמור"
 
-#: ../src/empathy-debug-dialog.c:940
+#: ../src/empathy-debug-dialog.c:948
 msgid "Debug Window"
 msgstr "חלון ניפוי שגיאות"
 
-#: ../src/empathy-debug-dialog.c:1013
+#: ../src/empathy-debug-dialog.c:1021
 msgid "Pause"
 msgstr "עצור"
 
-#: ../src/empathy-debug-dialog.c:1025
+#: ../src/empathy-debug-dialog.c:1033
 msgid "Level "
 msgstr ""
 
-#: ../src/empathy-debug-dialog.c:1094
+#: ../src/empathy-debug-dialog.c:1102
 msgid "Time"
 msgstr "זמן"
 
-#: ../src/empathy-debug-dialog.c:1096
+#: ../src/empathy-debug-dialog.c:1104
 msgid "Domain"
 msgstr "תחום"
 
-#: ../src/empathy-debug-dialog.c:1098
+#: ../src/empathy-debug-dialog.c:1106
 msgid "Category"
 msgstr ""
 
-#: ../src/empathy-debug-dialog.c:1100
+#: ../src/empathy-debug-dialog.c:1108
 msgid "Level"
 msgstr ""
 
-#: ../src/empathy-debug-dialog.c:1132
+#: ../src/empathy-debug-dialog.c:1140
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr ""
 
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "‏Empathy - מסרים מיידיים"
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>רשת</b>"
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>שרתים</b>"
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>נושא:</b>"
+#~ msgid "<b>Contact</b>"
+#~ msgstr "<b>איש קשר</b>"
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>קבוצות</b>"
+#~ msgid "Adium"
+#~ msgstr "Adium"
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Empathy Instant Messenger"
+#~ msgid "<b>Add Account</b>"
+#~ msgstr "<b>הוסף חשבון</b>"
+#~ msgid "New message from %s"
+#~ msgstr "הודעה חדשת מ־%s"
+#~ msgid "File transfers"
+#~ msgstr "העברות קבצים"
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>רשימת אנשי קשר</b>"
+#~ msgid "Show _avatars"
+#~ msgstr "הצג _תמנות אישיות"
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "הצג רשימת אנשי קשר מ_צומצמת"
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "Enable popup when contact is available"
 #~ msgid "Whether or not to show a popup when a contact becomes available."
@@ -2403,8 +2615,6 @@ msgstr ""
 #~ msgstr "סגור"
 #~ msgid "End this call?"
 #~ msgstr "לסיים את השיחה?"
-#~ msgid "Empathy Call"
-#~ msgstr "שיחת Empathy"
 #~ msgid "Ringing"
 #~ msgstr "מצלצל"
 #~ msgid "#"
@@ -2433,42 +2643,17 @@ msgstr ""
 #~ msgstr "9"
 #~ msgid "<b>Keypad</b>"
 #~ msgstr "<b>לוח מקשים</b>"
-#~ msgid "C_lear"
-#~ msgstr "נ_קה"
-#~ msgid "Chat"
-#~ msgstr "שיחה"
-#~ msgid "Insert _Smiley"
-#~ msgstr "הכנס _סמיילי"
 #~ msgid "Invitation _message:"
 #~ msgstr "הודעת הזמ_נה:"
 #~ msgid "Invite"
 #~ msgstr "הזמן"
-#~ msgid "Move Tab _Left"
-#~ msgstr "הזז לשונית _שמאלה"
-#~ msgid "Move Tab _Right"
-#~ msgstr "הזז לשונית _ימינה"
-#~ msgid "_Contact"
-#~ msgstr "_איש קשר"
-#~ msgid "_Conversation"
-#~ msgstr "_שיחה"
-#~ msgid "_Detach Tab"
-#~ msgstr "_נתק לשונית"
-
-#~| msgid "_Invite to Chat Room"
-#~ msgid "_Favorite Chatroom"
-#~ msgstr "_הזמן לחדר שיחה"
-#~ msgid "_Next Tab"
-#~ msgstr "_לשונית הבאה"
-#~ msgid "_Previous Tab"
-#~ msgstr "_לשונית קודמת"
-#~ msgid "_Tabs"
-#~ msgstr "_לשוניות"
 #~ msgid "Edit Favorite Room"
 #~ msgstr "ערוך חדר מועדף"
 #~ msgid "N_ame:"
 #~ msgstr "ש_ם:"
 #~ msgid "S_erver:"
 #~ msgstr "ש_רת:"
+
 #~| msgid "unknown"
 #~ msgctxt "file size"
 #~ msgid "Unknown"
@@ -2546,8 +2731,4 @@ msgstr ""
 #~ msgstr "התחל שיחת קול או וידאו עם איש קשר הזה"
 #~ msgid "_Use for chat rooms"
 #~ msgstr "_שימוש בחדרי שיחה"
-#~ msgid "%s went offline"
-#~ msgstr "‏%s התנתק"
-#~ msgid "%s has come online"
-#~ msgstr "‏%s התחבר"
 
diff --git a/po/kn.po b/po/kn.po
index cffa88fc1..029bc514f 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,14 +1,14 @@
-# translation of empathy.HEAD.kn.po to Kannada
+# translation of empathy.master.kn.po to Kannada
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Shankar Prasad <svenkate@redhat.com>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy.HEAD.kn\n"
+"Project-Id-Version: empathy.master.kn\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2009-02-16 21:24+0000\n"
-"PO-Revision-Date: 2009-03-14 22:43+0530\n"
+"POT-Creation-Date: 2009-08-09 09:28+0000\n"
+"PO-Revision-Date: 2009-08-12 17:45+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: Kannada <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,13 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Empathy ಕ್ಷಿಪ್ರ ಸಂದೇಶಗಾರ"
+msgid "Empathy IM Client"
+msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+#, fuzzy
+#| msgid "Send and receive instant messages"
+msgid "Send and receive messages"
 msgstr "ಕ್ಷಿಪ್ರ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸು ಹಾಗು ಪಡೆದುಕೋ"
 
 #: ../data/empathy.schemas.in.h:1
@@ -33,7 +35,7 @@ msgstr "ಹೊಸ ಚಾಟ್‌ಗಳಿಗಾಗಿ ಪ್ರತಿ ಬಾರ
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
-msgstr ""
+msgstr "ಗುಂಪಿನ ಚಾಟ್‌ನಲ್ಲಿ ಅಡ್ಡ ಹೆಸರಿನ ಪೂರ್ಣಗೊಳಿಕೆಯನ್ನು(ಟ್ಯಾಬ್) ಬಳಸುವಾಗ ಅಡ್ಡ ಹೆಸರಿನ ನಂತರ ಸೇರಿಸಬೇಕಿರುವ ಅಕ್ಷರ."
 
 #: ../data/empathy.schemas.in.h:3
 msgid "Chat window theme"
@@ -58,244 +60,333 @@ msgid "Default directory to select an avatar image from"
 msgstr "ಒಂದು ಅವತಾರದ ಚಿತ್ರಗಳನ್ನು ಆರಿಸಿಕೊಳ್ಳಬೇಕಿರುವ ಡೀಫಾಲ್ಟ್ ಕಡತಕೋಶ"
 
 #: ../data/empathy.schemas.in.h:8
-#| msgid "Enable sounds when _away"
 msgid "Disable popup notifications when away"
 msgstr "ಹೊರಗೆ ಹೋಗಿದ್ದಾಗ ಪುಟಿಕೆಯ ಸೂಚನೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"
 
 #: ../data/empathy.schemas.in.h:9
-#| msgid "Enable sounds when _away"
 msgid "Disable sounds when away"
 msgstr "ಹೊರಗೆ ಹೋಗಿದ್ದಾಗ ಶಬ್ದಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Empathy ಪೂರ್ವನಿಯೋಜಿತ ಡೌನ್‌ಲೋಡ್ ಕಡತಕೋಶ"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "ಖಾತೆಗಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲು Empathy ಅನ್ನು ಕೇಳಲಾಗಿದೆ"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "ಆರಂಭಗೊಂಡಾಗ Empathyಯು ತಾನಾಗಿಯೆ ಸಂಪರ್ಕಿತಗೊಳ್ಳಬೇಕು"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+#, fuzzy
+#| msgid "Empathy should auto-connect on startup"
+msgid "Empathy should reduce the location's accuracy"
+msgstr "ಆರಂಭಗೊಂಡಾಗ Empathyಯು ತಾನಾಗಿಯೆ ಸಂಪರ್ಕಿತಗೊಳ್ಳಬೇಕು"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathyಯು ಸಂಪರ್ಕ ವಿಳಾಸದ ಅವತಾರವನ್ನು ಚಾಟ್‌ ವಿಂಡೋ ಚಿಹ್ನೆಯಾಗಿ ಬಳಸಬೇಕು"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "ಹೊಸ ಸಂದೇಶಗಳಿಗಾಗಿ ಪುಟಿಕೆ ಸೂಚನೆಗಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "ಕಾಗುಣಿತ ಪರೀಕ್ಷಕವನ್ನು ಶಕ್ತಗೊಳಿಸು"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "ಮುಖ್ಯ ವಿಂಡೋವನ್ನು ಅಡಗಿಸು"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "ಮುಖ್ಯ ವಿಂಡೋವನ್ನು ಅಡಗಿಸು."
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "NetworkManager ಅನ್ನು ಬಳಸಬೇಕು"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "ಉಪನಾಮ ಪೂರ್ಣಗೊಳಿಸಲಾದ ಅಕ್ಷರ"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "ಹೊಸ ಚಾಟ್‌ಗಳನ್ನು ಪ್ರತ್ಯೇಕ ವಿಂಡೋಗಳಲ್ಲಿ ತೆರೆ"
 
-#: ../data/empathy.schemas.in.h:21
-#| msgid "_Play sound when messages arrive"
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:28
+#, 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/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "ಸಂದೇಶಗಳು ಬಂದಾಗ ಶಬ್ಧವನ್ನು ಮಾಡು"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "ಹೊಸ ಸಂಭಾಷಣೆಗಳಿಗಾಗಿ ಶಬ್ಧವನ್ನು ಮಾಡು"
 
-#: ../data/empathy.schemas.in.h:23
-#| msgid "_Play sound when messages arrive"
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "ಹೊರ ಹೋಗುವ ಸಂದೇಶಗಳಿಗಾಗಿ ಶಬ್ಧವನ್ನು ಮಾಡು"
 
-#: ../data/empathy.schemas.in.h:24
-#| msgid "_Play sound when messages arrive"
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "ಸಂದೇಶಗಳು ಬಂದಾಗ ಶಬ್ಧವನ್ನು ಮಾಡು"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "ಒಂದು ಸಂಪರ್ಕವು ನಿರ್ಗಮಿಸಿದಾಗ ಶಬ್ಧವನ್ನು ಮಾಡು"
 
-#: ../data/empathy.schemas.in.h:26
-#| msgid "_Play sound when messages arrive"
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "ನಾವು ಪ್ರವೇಶಿಸಿದಾಗ ಶಬ್ಧವನ್ನು ಮಾಡು"
 
-#: ../data/empathy.schemas.in.h:27
-#| msgid "_Play sound when messages arrive"
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "ನಾವು ನಿರ್ಗಮಿಸಿದಾಗ ಶಬ್ಧವನ್ನು ಮಾಡು"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "ಚಾಟ್‌ನ ಮೇಲೆ ಗಮನವನ್ನು ಕೇಂದ್ರೀಕರಿಸದೆ ಇದ್ದಲ್ಲಿ ಪುಟಿಕೆ ಸೂಚನೆ"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+#, fuzzy
+#| msgid "Popup notifications if the chat isn't focused"
+msgid "Popup notifications when a contact sign in"
+msgstr "ಚಾಟ್‌ನ ಮೇಲೆ ಗಮನವನ್ನು ಕೇಂದ್ರೀಕರಿಸದೆ ಇದ್ದಲ್ಲಿ ಪುಟಿಕೆ ಸೂಚನೆ"
+
+#: ../data/empathy.schemas.in.h:38
+#, fuzzy
+#| msgid "Popup notifications if the chat isn't focused"
+msgid "Popup notifications when a contact sign out"
+msgstr "ಚಾಟ್‌ನ ಮೇಲೆ ಗಮನವನ್ನು ಕೇಂದ್ರೀಕರಿಸದೆ ಇದ್ದಲ್ಲಿ ಪುಟಿಕೆ ಸೂಚನೆ"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Salut ಖಾತೆಯನ್ನು ರಚಿಸಲಾಗಿದೆ"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "ಅವತಾರಗಳನ್ನು ತೋರಿಸು"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+#, fuzzy
+#| msgid "_Show Contact List"
+msgid "Show contact list in rooms"
+msgstr "ವಿಳಾಸಗಳ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸು(_S)"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "ಮುಖ್ಯ ವಿಂಡೋವನ್ನು ಮುಚ್ಚುವಾಗ ಸೂಚನೆಯನ್ನು ತೋರಿಸು"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "ಆಫ್‌ಲೈನ್ ಸಂಪರ್ಕ ವಿಳಾಸಗಳನ್ನು ತೋರಿಸು"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "ಕಾಗುಣಿತ ಪರೀಕ್ಷೆಯ ಭಾಷೆಗಳು"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "ವರ್ಗಾಯಿಸಲಾದ ಕಡತಗಳನ್ನು ಉಳಿಸುವ ಪೂರ್ವನಿಯೋಜಿತ ಕಡತಕೋಶ."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ಅವತಾರ ಚಿತ್ರಗಳನ್ನು ಆರಿಸಲಾದ ಕಡತಕೋಶ."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ಚಾಟ್‌ ವಿಂಡೋಗಳಲ್ಲಿ ಸಂಭಾಷಣೆಗಳನ್ನು ತೋರಿಸಲು ಬಳಸಬೇಕಿರುವ ಪರಿಸರವಿನ್ಯಾಸ."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "ಚಿತ್ರಾತ್ಮಕ(ಗ್ರಾಫಿಕಲ್) ಸ್ಮೈಲಿಗಳನ್ನು ಬಳಸು"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "ಸೂಚನಾ ಶಬ್ಧಗಳನ್ನು ಬಳಸು"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "ಚಾಟ್‌ ರೂಮ್‌ಗಳಿಗೆ ಪರಿಸರವಿನ್ಯಾಸ‌ವನ್ನು ಬಳಸು"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+#, fuzzy
+#| msgid ""
+#| "Whether or not to show contacts that are offline in the contact list."
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "ಸಂಪರ್ಕ ವಿಳಾಸ ಪಟ್ಟಿಯಲ್ಲಿರುವ ಆಫ್‌ಲೈನ್‌ನಲ್ಲಿರುವ ಸಂಪರ್ಕ ವಿಳಾಸಗಳನ್ನು ತೋರಿಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
+
+#: ../data/empathy.schemas.in.h:53
+#, fuzzy
+#| msgid ""
+#| "Whether or not Empathy should use the avatar of the contact as the chat "
+#| "window icon."
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Empathyಯು ಸಂಪರ್ಕ ವಿಳಾಸದ ಅವತಾರವನ್ನು ಚಾಟ್‌ ವಿಂಡೋ ಚಿಹ್ನೆಯಾಗಿ ಬಳಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
+
+#: ../data/empathy.schemas.in.h:54
+#, fuzzy
+#| msgid ""
+#| "Whether or not Empathy should use the avatar of the contact as the chat "
+#| "window icon."
+msgid "Whether or not Empathy can use the cellular network to guess the location."
+msgstr "Empathyಯು ಸಂಪರ್ಕ ವಿಳಾಸದ ಅವತಾರವನ್ನು ಚಾಟ್‌ ವಿಂಡೋ ಚಿಹ್ನೆಯಾಗಿ ಬಳಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
+
+#: ../data/empathy.schemas.in.h:55
+#, fuzzy
 #| msgid ""
-#| "Whether or not Empathy should automatically log in to your accounts on "
-#| "startup."
+#| "Whether or not Empathy should use the avatar of the contact as the chat "
+#| "window icon."
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "Empathyಯು ಸಂಪರ್ಕ ವಿಳಾಸದ ಅವತಾರವನ್ನು ಚಾಟ್‌ ವಿಂಡೋ ಚಿಹ್ನೆಯಾಗಿ ಬಳಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "ಬೇರೆ ಪ್ರೊಗ್ರಾಮಿನಿಂದ Empathyಯು ಖಾತೆಗಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲು ಕೇಳಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Empathyಯು ಆರಂಭಗೊಂಡಾಗ ಅದು ನಿಮ್ಮ ಖಾತೆಗಳಿಗೆ ಲಾಗಿನ್ ಆಗಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+#, fuzzy
+#| msgid ""
+#| "Whether or not Empathy should use the avatar of the contact as the chat "
+#| "window icon."
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "Empathyಯು ಸಂಪರ್ಕ ವಿಳಾಸದ ಅವತಾರವನ್ನು ಚಾಟ್‌ ವಿಂಡೋ ಚಿಹ್ನೆಯಾಗಿ ಬಳಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "Empathyಯು ಸಂಪರ್ಕ ವಿಳಾಸದ ಅವತಾರವನ್ನು ಚಾಟ್‌ ವಿಂಡೋ ಚಿಹ್ನೆಯಾಗಿ ಬಳಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "ಮೊದಲ ಬಾರಿಗೆ Empathyಯನ್ನು ಚಲಾಯಿಸಿದಾಗ Salut ಖಾತೆಯನ್ನು ರಚಿಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
 msgstr "ತಾನಾಗಿಯೆ ಸಂಪರ್ಕವನ್ನು ಕಲ್ಪಿಸಲು/ಕಡಿದು ಹಾಕಲು ನೆಟ್‌ವರ್ಕ್ ಮ್ಯಾನೇಜರ್ ಅನ್ನು ಬಳಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
-msgstr ""
+msgstr "ನೀವು ಪರಿಶೀಲಿಸಲು ಬಯಸುವ ಭಾಷೆಯಲ್ಲಿ ಬರೆದ ಪದಗಳನ್ನು ಪರಿಶೀಲಿಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid "Whether or not to convert smileys into graphical images in conversations."
 msgstr "ಸಂಭಾಷಣೆಗಳಲ್ಲಿ ಸ್ಮೈಲಿಗಳನ್ನು ಗ್ರಾಫಿಕಲ್ ಚಿತ್ರಗಳನ್ನಾಗಿ ಮಾರ್ಪಡಿಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:47
-#| msgid ""
-#| "Whether or not to show avatars for contacts in the contact list and chat "
-#| "windows."
+#: ../data/empathy.schemas.in.h:64
 msgid "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ವಿಳಾಸಗಳು ಪ್ರವೇಶಿಸಿದಾಗ ಶಬ್ಧವನ್ನು ಮಾಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:48
-#| msgid ""
-#| "Whether or not to show avatars for contacts in the contact list and chat "
-#| "windows."
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "ಜಾಲಬಂಧದಿಂದ ಸಂಪರ್ಕ ವಿಳಾಸಗಳು ನಿರ್ಗಮಿಸಿದಾಗ ಶಬ್ಧವನ್ನು ಮಾಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:49
-#| msgid "Whether or not to play sounds when busy."
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "ಕಾರ್ಯಕ್ರಮಗಳಿಗಾಗಿನ ಸೂಚನೆಗಾಗಿ ಶಬ್ಧವನ್ನು ಮಾಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:50
-#| msgid "Whether or not to play a sound when messages arrive."
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "ಒಳಬರುವ ಸಂದೇಶಗಳಿಗಾಗಿ ಶಬ್ಧ ಮಾಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:51
-#| msgid "Whether or not to play a sound when messages arrive."
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "ಹೊಸ ಸಂಭಾಷಣೆಗಳನ್ನು ಸೂಚಿಸಲು ಶಬ್ಧ ಮಾಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:52
-#| msgid "Whether or not to play a sound when messages arrive."
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "ಹೊರಹೋಗುವ ಸಂದೇಶಗಳಿಗಾಗಿ ಶಬ್ಧ ಮಾಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:53
-#| msgid "Whether or not to play sounds when away."
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "ಜಾಲಬಂಧದಿಂದ ನಿರ್ಗಮಿಸಿದಾಗ ಶಬ್ಧವನ್ನು ಮಾಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:54
-#| msgid "Whether or not to play sounds when away."
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "ಜಾಲಬಂಧದಿಂದ ನಿರ್ಗಮಿಸಿದಾಗ ಶಬ್ಧವನ್ನು ಮಾಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:55
-#| msgid "Whether or not to play sounds when away."
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "ನೀವು ಹೊರಗಡೆ ಹೋದಾಗ ಶಬ್ಧದ ಮೂಲಕ ಸೂಚನೆಯನ್ನು ನೀಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+#, fuzzy
+#| msgid "Whether or not to show popup notifications when away or busy."
+msgid "Whether or not to show a popup notification when a contact goes offline."
+msgstr "ನೀವು ಹೊರಗಡೆ ಹೋದಾಗ ಪುಟಿಕೆ ಸೂಚನೆಗಳನ್ನು ನೀಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
+
+#: ../data/empathy.schemas.in.h:74
+#, fuzzy
+#| msgid "Whether or not to show popup notifications when away or busy."
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "ನೀವು ಹೊರಗಡೆ ಹೋದಾಗ ಪುಟಿಕೆ ಸೂಚನೆಗಳನ್ನು ನೀಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
-msgstr "ಚಾಟನ್ನು ಈಗಾಗಲೆ ತೆರೆಯಲಾಗಿದ್ದು ಆದರೆ ಅದರತ್ತ ಗಮನವಿರದೆ ಇದ್ದಾಗ, ಒಂದು ಸಂದೇಶವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಪುಟಿಕೆಯನ್ನು ತೋರಿಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
+msgstr ""
+"ಚಾಟನ್ನು ಈಗಾಗಲೆ ತೆರೆಯಲಾಗಿದ್ದು ಆದರೆ ಅದರತ್ತ ಗಮನವಿರದೆ ಇದ್ದಾಗ, ಒಂದು ಸಂದೇಶವನ್ನು "
+"ಪಡೆದುಕೊಂಡಾಗ ಪುಟಿಕೆಯನ್ನು ತೋರಿಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:57
-#| msgid "Whether or not to show a popup when a contact becomes available."
+#: ../data/empathy.schemas.in.h:76
 msgid "Whether or not to show a popup notification when receiving a new message."
 msgstr "ಒಂದು ಸಂದೇಶವನ್ನು ಪಡೆದುಕೊಂಡಾಗ ಒಂದು ಪುಟಿಕೆಯನ್ನು ತೋರಿಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -303,576 +394,834 @@ msgstr ""
 "ಸಂಪರ್ಕ ವಿಳಾಸ ಪಟ್ಟಿಯಲ್ಲಿ ಹಾಗು ಚಾಟ್‌ ವಿಂಡೋದಲ್ಲಿರುವ ಸಂಪರ್ಕಗಳಿಗಾಗಿ ಅವತಾರವನ್ನು ತೋರಿಸಬೇಕೆ "
 "ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "ಸಂಪರ್ಕ ವಿಳಾಸ ಪಟ್ಟಿಯಲ್ಲಿರುವ ಆಫ್‌ಲೈನ್‌ನಲ್ಲಿರುವ ಸಂಪರ್ಕ ವಿಳಾಸಗಳನ್ನು ತೋರಿಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:60
-#| msgid "Whether or not to play sounds when away."
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "ನೀವು ಹೊರಗಡೆ ಹೋದಾಗ ಪುಟಿಕೆ ಸೂಚನೆಗಳನ್ನು ನೀಡಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+#, fuzzy
+#| msgid "Whether to show the contact list in compact mode or not."
+msgid "Whether or not to show the contact list in chat rooms."
+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."
-msgstr ""
+msgstr "ಶೀರ್ಷಿಕೆ ಪಟ್ಟಿಯಲ್ಲಿನ x ಗುಂಡಿಯೊಂದಿಗೆ  ಪ್ರಮುಖ ವಿಂಡೊವನ್ನು ಮುಚ್ಚುವ ಸಂದೇಶ ಸಂವಾದವನ್ನು ತೋರಿಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "ಸಂಪರ್ಕ ವಿಳಾಸಗಳ ಪಟ್ಟಿಯನ್ನು ಸಣ್ಣದಾದ ರೂಪದಲ್ಲಿ ತೋರಿಸಬೇಕೆ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "ಚಾಟ್‌ ರೂಮ್‌ಗಳಿಗೆ ಪರಿಸರವಿನ್ಯಾಸವನ್ನು ಬಳಸಬೇಕೆ ಅಥವ ಬೇಡವೆ."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 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."
-msgstr "ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿಯನ್ನು ಯಾವ ಆಧಾರದಮೇಲೆ ವಿಂಗಡಿಸಬೇಕು. \"name\" ಮೌಲ್ಯದೊಂದಿಗೆ ಸಂಪರ್ಕವಿಳಾದ ಹೆಸರಿನ ಆಧಾರದ ಮೇಲೆ ವಿಂಗಡಿಸುವುದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿರುತ್ತದೆ. \"state\" ಮೌಲ್ಯದ ವಿಂಗಡಣಾ ಕ್ರಮವು ಸಂಪರ್ಕವಿಳಾಸದ ಪಟ್ಟಿಯನ್ನು ಅದರ ಸ್ಥಿತಿಯ ಆಧಾರದ ಮೇಲೆ ವಿಂಗಡಿಸುತ್ತದೆ."
+msgstr ""
+"ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿಯನ್ನು ಯಾವ ಆಧಾರದಮೇಲೆ ವಿಂಗಡಿಸಬೇಕು. \"name\" ಮೌಲ್ಯದೊಂದಿಗೆ ಸಂಪರ್ಕವಿಳಾದ "
+"ಹೆಸರಿನ ಆಧಾರದ ಮೇಲೆ ವಿಂಗಡಿಸುವುದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿರುತ್ತದೆ. \"state\" ಮೌಲ್ಯದ ವಿಂಗಡಣಾ "
+"ಕ್ರಮವು ಸಂಪರ್ಕವಿಳಾಸದ ಪಟ್ಟಿಯನ್ನು ಅದರ ಸ್ಥಿತಿಯ ಆಧಾರದ ಮೇಲೆ ವಿಂಗಡಿಸುತ್ತದೆ."
+
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr ""
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr ""
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "ಹತ್ತಿರದ ಜನರು"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "ಯಾವ ಕಾರಣವನ್ನೂ ಸೂಚಿಸಲಾಗಿಲ್ಲ"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "ಸ್ಥಿತಿಯ ಬದಲಾವಣೆಗೆ ಮನವಿ ಸಲ್ಲಿಸಲಾಗಿದೆ"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "ಕಡತದ ವರ್ಗಾವಣೆಯನ್ನು ನೀವು ರದ್ದು ಮಾಡಿದ್ದೀರಿ"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "ಕಡತದ ವರ್ಗಾವಣೆಯಲ್ಲಿ ಭಾಗಿಯಾಗಿದ ಇನ್ನೊಬ್ಬ ಅದನ್ನು ರದ್ದು ಮಾಡಿದ್ದಾರೆ"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "ಕಡತವನ್ನು ವರ್ಗಾಯಿಸುವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "ಭಾಗಿಯಾದ ಇನ್ನೊಬ್ಬ ವ್ಯಕ್ತಿಯು ಕಡತವನ್ನು ವರ್ಗಾಯಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದ್ದಾರೆ"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "ಅಜ್ಞಾತ ಕಾರಣ"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "ಲಭ್ಯ"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "ಬ್ಯುಸಿ"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "ಹೊರಗೆ ಹೋಗಿದ್ದೇನೆ"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "ಅಡಗಿಸಲಾಗಿದೆ"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "ಆಫ್‌ಲೈನ್"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "ಭವಿಷ್ಟದಲ್ಲಿ"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "ಎಲ್ಲಾ"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>ಸುಧಾರಿತ</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "ಗುಪ್ತಪದವನ್ನು ಮರೆತುಬಿಡು ಹಾಗು ನಮೂದಿಸದ್ದನ್ನು ಅಳಿಸಿ ಹಾಕು."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+#| msgid "<b>Advanced</b>"
+msgid "Advanced"
+msgstr "ಸುಧಾರಿತ"
+
+#: ../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
 msgid "Pass_word:"
 msgstr "ಗುಪ್ತಪದ(_w):"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "ತೆರೆಯ ಹೆಸರು(_N):"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../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
 msgid "_Port:"
 msgstr "ಸಂಪರ್ಕಸ್ಥಾನ(_P):"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "ಪರಿಚಾರಕ(_S):"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "ಲಾಗಿನ್ ಐಡಿ(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "ಕ್ಯಾರ್‌ಸೆಟ್(_C):"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "ಹೊಸ ಜಾಲಬಂಧ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>ಜಾಲಬಂಧ</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>ಪರಿಚಾರಕಗಳು</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "ಕ್ಯಾರ್‌ಸೆಟ್:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "ಒಂದು ಹೊಸ ಐಆರ್‌ಸಿ ಜಾಲಬಂಧವನ್ನು ನಿರ್ಮಿಸಿ"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "ಆರಿಸಲಾದ ಐಆರ್‌ಸಿ ಜಾಲಬಂಧವನ್ನು ಸಂಪಾದಿಸಿ"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "ಜಾಲಬಂಧ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "ಜಾಲಬಂಧ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "ಅಡ್ಡಹೆಸರು:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "ಗುಪ್ತಪದ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "ಸಂದೇಶವನ್ನು ಬಿಟ್ಟುಬಿಡು:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "ನಿಜವಾದ ಹೆಸರು:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "ಆರಿಸಲಾದ ಐಆರ್‌ಸಿ ಜಾಲಬಂಧವನ್ನು ತೆಗೆದುಹಾಕು"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#| msgid "Server"
+msgid "Servers"
+msgstr "ಪರಿಚಾರಕಗಳು"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>ಪರಿಚಾರಕದ ಸಂಯೋಜನೆಗಳನ್ನು ಅತಿಕ್ರಮಿಸು</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#| msgid "<b>Override server settings</b>"
+msgid "Override server settings"
+msgstr "ಪರಿಚಾರಕದ ಸಂಯೋಜನೆಗಳನ್ನು ಅತಿಕ್ರಮಿಸು"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "ಆದ್ಯತೆ(_o):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "ಸಂಪನ್ಮೂಲ(_u):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "ಹಳೆಯ SS_L ಅನ್ನು ಬಳಸು"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "ಗೂಢಲಿಪೀಕರಣದ ಅಗತ್ಯವಿದೆ(_E) (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "SSL ಪ್ರಮಾಣಪತ್ರ ದೋಷಗಳನ್ನು ಆಲಕ್ಷಿಸು(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "ಇಮೈಲ್(_E):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
-#| msgid "_First Name: "
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "ಮೊದಲ ಹೆಸರು(_F):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "ಜಬ್ಬಾರ್ ಐಡಿ(_J):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "ಕೊನೆಯ ಹೆಸರು(_L):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "ಅಡ್ಡಹೆಸರು(_N):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "ಪ್ರಕಟಿಸಲಾದ ಹೆಸರು(_P):"
 
 #. 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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "STUN ಅನ್ನು ಕಂಡು ಹಿಡಿ"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN ಪರಿಚಾರಕ"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN ಸಂಪರ್ಕ ಸ್ಥಾನ:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "ಬಳಕೆದಾರ ಹೆಸರು(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "ಯಾಹೂ ಜಪಾನ್ ಅನ್ನು ಬಳಸು(_Y)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
-#| msgid "Login I_D:"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "ಕಾನ್ಫರೆನ್ಸ್ ಹಾಗು ಚಾಟ್‌ ರೂಮ್ ಆಹ್ವಾನಗಳನ್ನು ಆಲಕ್ಷಿಸು(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "ರೂಮ್‌ಗಳ ಪಟ್ಟಿ ಲೊಕ್ಯಾಲ್(_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "ಚಿತ್ರವನ್ನು ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../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:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "ನಿಮ್ಮ ಅವತಾರ ಚಿತ್ರವನ್ನು ಆರಿಸಿ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "ಯಾವುದೆ ಚಿತ್ರವಿಲ್ಲ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "ಚಿತ್ರಗಳು"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "ಎಲ್ಲಾ ಕಡತಗಳು"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "ಹಿರಿದಾಗಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:412
+msgid "Unsupported command"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "ಆಫ್‌ಲೈನ್"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "ಅಮಾನ್ಯವಾದ ಸಂಪರ್ಕ ವಿಳಾಸ"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "ಅನುಮತಿಯು ನಿರಾಕರಿಸಲ್ಪಟ್ಟಿದೆ"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "ಬಹಳ ಉದ್ದವಾದ ಸಂದೇಶ"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "ಅನ್ವಯಿಸಲಾಗಿಲ್ಲ"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "ಅಜ್ಞಾತ"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' ಸಂದೇಶವನ್ನು ಕಳುಹಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ವಿಷಯವನ್ನು ಹೀಗೆ ಹೊಂದಿಸಲಾಗಿದೆ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "ಯಾವುದೆ ವಿಷಯವನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:969
+msgid "(No Suggestions)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "ಸ್ಮೈಲಿಯನ್ನು ತೂರಿಸಿ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "ಕಳುಹಿಸು(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "ಪದದ ಕಾಗುಣಿತವನ್ನು ಪರೀಕ್ಷಿಸಿ(_C)..."
+#: ../libempathy-gtk/empathy-chat.c:1075
+msgid "_Spelling Suggestions"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1190
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s ರೂಮ್‌ಗೆ ಸೇರ್ಪಡೆಯಾಗಿದ್ದಾರೆ"
+#| msgid "Contact disconnected"
+msgid "%s has disconnected"
+msgstr "%s ದೊಂದಿಗಿನ ಸಂಪರ್ಕ ಕಡಿದು ಹೋಗಿದೆ"
 
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1194
+#, c-format
+msgid "%s was kicked by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1197
+#, c-format
+msgid "%s was kicked"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ರೂಮ್‌ನಿಂದ ಹೊರನೆಡೆದಿದ್ದಾರೆ"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:474
+#. 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:1218
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s ರೂಮ್‌ಗೆ ಸೇರ್ಪಡೆಯಾಗಿದ್ದಾರೆ"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
 msgid "Disconnected"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹೋಗಿದೆ"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "ಸಂಭಾಷಣೆ"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>ವಿಷಯ:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "ಸಮೂಹ ಚಾಟ್"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "ವಿಷಯ:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "ಕೊಂಡಿ ವಿಳಾಸವನ್ನು ಕಾಪಿ ಮಾಡು(_C)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "ಕೊಂಡಿಯನ್ನು ತೆರೆ(_O)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
-#| msgid "%A %d %B %Y"
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ಸಂಪಾದಿಸು"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "ಸಂಪರ್ಕ ಮಾಹಿತಿ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "ನಾನು ನಿನ್ನನ್ನು ನನ್ನ ಸಂಪರ್ಕ ವಿಳಾಸಗಳ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲು ಬಯಸುತ್ತೇನೆ."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "ಹೊಸ ಸಂಪರ್ಕ ವಿಳಾಸ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "ನಂತರ ನಿರ್ಧರಿಸು(_L)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "ಚಂದಾದಾರನಾಗುವ ಅಗತ್ಯವಿದೆ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ನೀವು '%s' ಸಮೂಹವನ್ನು ನಿಜವಾಗಲೂ ತೆಗೆದು ಹಾಕಲು ಬಯಸುತ್ತೀರಿ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "ಸಮೂಹವನ್ನು ತೆಗೆಯಲಾಗುತ್ತಿದೆ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "ತೆಗೆದು ಹಾಕು(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "ನೀವು '%s' ಸಂಪರ್ಕ ವಿಳಾಸವನ್ನು ನಿಜವಾಗಲೂ ತೆಗೆದು ಹಾಕಲು ಬಯಸುತ್ತೀರಿ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "ವಿಳಾಸವನ್ನು ತೆಗೆದು ಹಾಕಲಾಗುತ್ತಿದೆ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-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:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "ಚಾಟ್ ಮಾಡು(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+#, fuzzy
+#| msgid "_Call"
+msgctxt "menu item"
+msgid "_Audio Call"
 msgstr "ಕರೆ ಮಾಡು(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+#, fuzzy
+#| msgid "_Call"
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "ಕರೆ ಮಾಡು(_C)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "ಈ ಹಿಂದಿನ ಸಂಭಾಷಣೆಗಳನ್ನು ನೋಡಿ(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#| msgid "Send Video"
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "ಕಡತವನ್ನು ಕಳುಹಿಸು"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "ಮಾಹಿತಿ(_m)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "ಸಂಪಾದಿಸು(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "ಈ ರೂಮಿಗೆ ಆಹ್ವಾನಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-#| msgid "Use theme for chat rooms"
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "ಚಾಟ್‌ ರೂಮಿಗೆ ಆಹ್ವಾನಿಸು(_I)"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "ಒಂದು ಸಂಪರ್ಕವನ್ನು ಆರಿಸು"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "ಅವತಾರವನ್ನು ಉಳಿಸು"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "ಅವತಾರವನ್ನು ಉಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "ಆರಿಸು"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "ಸಮೂಹ"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>ಕ್ಲೈಂಟ್‌ ಮಾಹಿತಿ</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#| msgid "Account:"
+msgid "Country:"
+msgstr "ದೇಶ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#| msgid "Status:"
+msgid "State:"
+msgstr "ರಾಜ್ಯ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#| msgid "Client:"
+msgid "City:"
+msgstr "ಊರು:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#| msgid "Armenian"
+msgid "Area:"
+msgstr "ಪ್ರದೇಶ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#| msgid "Select"
+msgid "Street:"
+msgstr "ರಸ್ತೆ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#, fuzzy
+#| msgid "_For:"
+msgid "Floor:"
+msgstr "ಇವರಿಗಾಗಿ(_F):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#| msgid "_Room:"
+msgid "Room:"
+msgstr "ರೂಮ್:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#| msgid "Type:"
+msgid "Text:"
+msgstr "ಪಠ್ಯ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#| msgid "Version:"
+msgid "Description:"
+msgstr "ವಿವರಣೆ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr "ವೇಗ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#, fuzzy
+#| msgid "Version:"
+msgid "Bearing:"
+msgstr "ಆವೃತ್ತಿ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>ಸಂಪರ್ಕದ ವಿವರಗಳು</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr "ರೇಖಾಂಶ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr "ಅಕ್ಷಾಂಶ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+#, fuzzy
+#| msgid "<b>Contact</b>"
+msgid "<b>Location</b>"
+msgstr "<b>ಸಂಪರ್ಕ ವಿಳಾಸ</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#, fuzzy
+#| msgid "<b>Contact</b>"
+msgid "<b>Location</b>, "
 msgstr "<b>ಸಂಪರ್ಕ ವಿಳಾಸ</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>ಸಮೂಹಗಳು</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../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 "ಖಾತೆ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "ಅಲಿಯಾಸ್:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "ಹುಟ್ಟಿದ ದಿನ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#| msgid "<b>Client Information</b>"
+msgid "Client Information"
+msgstr "ಕ್ಲೈಂಟ್‌ ಮಾಹಿತಿ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "ಕ್ಲೈಂಟ್:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "ಸಂಪರ್ಕ ಮಾಹಿತಿ"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "ಸಂಪರ್ಕ ವಿಳಾಸ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#| msgid "<b>Contact Details</b>"
+msgid "Contact Details"
+msgstr "ಸಂಪರ್ಕದ ವಿವರಗಳು"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "ಇಮೈಲ್:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "ಸಂಪೂರ್ಣ ಹೆಸರು:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#| msgid "Group"
+msgid "Groups"
+msgstr "ಸಮೂಹಗಳು"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "ಐಡೆಂಟಿಫೈರ್:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "ಮಾಹಿತಿಯ ಅಗತ್ಯವಿದೆ..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -881,190 +1230,217 @@ msgstr ""
 "ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಸಮೂಹವನ್ನು ಆರಿಸಬಹುದು ಅಥವ ಯಾವುದೆ ಸಮೂಹವನ್ನು ಆರಿಸದೆಯೂ ಇರಬಹುದು "
 "ಎನ್ನುವುದನ್ನು ನೆನಪಿಡಿ."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "ಆವೃತ್ತಿ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "ಜಾಲ ತಾಣ."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "ಸಮೂಹವನ್ನು ಸೇರಿಸು(_A)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "ಹೊಸ ಪರಿಚಾರಕ"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "ಪರಿಚಾರಕ"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "ಸಂಪರ್ಕಸ್ಥಾನ"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:277
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "ಖಾತೆ"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "ದಿನಾಂಕ"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "ಸಂಭಾಷಣೆಗಳು"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "ಈ ಹಿಂದಿನ ಸಂಭಾಷಣೆಗಳು"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "ಹುಡುಕು"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "ಇವರಿಗಾಗಿ(_F):"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
-#| msgid "Call"
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "ಕರೆ ಮಾಡು(_a)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
-#| msgid "Chat"
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "ಚಾಟ್ ಮಾಡು(_h)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "ಸಂಪರ್ಕ ಐಡಿ:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "ಹೊಸ ಸಂಭಾಷಣೆ"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
+#. 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 messages..."
+msgid "Custom Message..."
+msgstr "ಇಚ್ಛೆಯ ಸಂದೇಶ..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#, fuzzy
+#| msgid "Custom messages..."
+msgid "Edit Custom Messages..."
 msgstr "ಕಸ್ಟಮ್ ಸಂದೇಶಗಳು..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "ಕಸ್ಟಮ್ ಸಂದೇಶ"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "ಸಂದೇಶ:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "ಸಂದೇಶವನ್ನು ಉಳಿಸಿ"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "ಸ್ಥಿತಿ:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "ಪದ"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "ಪದಕ್ಕಾಗಿನ ಸಲಹೆಗಳು"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "ಪದಕ್ಕಾಗಿನ ಸಲಹೆಗಳು:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "ಕ್ಲಾಸಿಕ್"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "ಸರಳ"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "ಸ್ವಚ್ಛಗೊಳಿಸು"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "ಬ್ಲೂ"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#, fuzzy
+#| msgid "Status"
+msgid "Set status"
+msgstr "ಸ್ಥಿತಿ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "ಯುಆರ್ಐ ಅನ್ನು ತೆರೆಯಲಾಗಿಲ್ಲ"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-#| msgid "Select"
-msgid "Select a file"
-msgstr "ಒಂದು ಕಡತವನ್ನು ಆರಿಸು"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "ಕಸ್ಟಮ್ ಸಂದೇಶಗಳು..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
-#| msgid "Send and receive instant messages"
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "ಕ್ಷಿಪ್ರ ಸಂದೇಶಗಳನ್ನು ಪಡೆಯಲಾಗಿದೆ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
-#| msgid "Send and receive instant messages"
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "ಕ್ಷಿಪ್ರ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
-#| msgid "Incoming call from %s"
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "ಒಳಬರುವ ಚಾಟ್ ಮನವಿ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
-#| msgid "Connected"
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "ಸಂಪರ್ಕಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
-#| msgid "Disconnected"
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹೋಗಿದೆ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
-#| msgid "Connected"
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "ಪರಿಚಾರಕಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
-#| msgid "Disconnected"
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "ಪರಿಚಾರಕದಿಂದ ಸಂಪರ್ಕ ಕಡಿದು ಹೋಗಿದೆ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
-#| msgid "Incoming call"
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "ಬರುತ್ತಿರುವ ಧ್ವನಿ ಕರೆ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "ಹೊರಹೋಗುವ ಧ್ವನಿ ಕರೆ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "ಧ್ವನಿ ಕರೆ ಪೂರ್ಣಗೊಂಡಿದೆ"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#, fuzzy
+#| msgid "Custom message"
+msgid "Enter Custom Message"
+msgstr "ಕಸ್ಟಮ್ ಸಂದೇಶ"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#, fuzzy
+#| msgid "Custom message"
+msgid "Edit Custom Messages"
+msgstr "ಕಸ್ಟಮ್ ಸಂದೇಶ"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+#, fuzzy
+#| msgid "Save message"
+msgid "Saved Presets"
+msgstr "ಸಂದೇಶವನ್ನು ಉಳಿಸಿ"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "ಕ್ಲಾಸಿಕ್"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "ಸರಳ"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "ಸ್ವಚ್ಛಗೊಳಿಸು"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "ಬ್ಲೂ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "ಯುಆರ್ಐ ಅನ್ನು ತೆರೆಯಲಾಗಿಲ್ಲ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "ಒಂದು ಕಡತವನ್ನು ಆರಿಸು"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
+#, fuzzy
+#| msgid "Select a contact"
+msgid "Select a destination"
+msgstr "ಒಂದು ಸಂಪರ್ಕವನ್ನು ಆರಿಸು"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "ಈಗಿನ ಲೊಕ್ಯಾಲ್"
@@ -1252,7 +1628,7 @@ msgid "Megaphone"
 msgstr "ಮೆಗಾಫೋನ್"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "ಮಾತನಾಡಿ!"
 
@@ -1266,16 +1642,15 @@ msgid "_Information"
 msgstr "ಮಾಹಿತಿ(_I)"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "ಆದ್ಯತೆಗಳು(_P)"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "ದಯವಿಟ್ಟು ಒಂದು ಸಂಪರ್ಕವನ್ನು ಸಂರಚಿಸಿ."
 
-#: ../megaphone/src/megaphone-applet.c:348
-#| msgid "_Add Contact..."
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "ಸಂಪರ್ಕ ವಿಳಾಸವನ್ನು ಆರಿಸಿ..."
 
@@ -1288,23 +1663,25 @@ msgstr "ಇರುವಿಕೆ"
 msgid "Set your own presence"
 msgstr "ನಿಮ್ಮ ಸ್ವಂತ ಇರುವಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "ಆರಂಭಗೊಂಡಾಗ ಸಂಪರ್ಕ ಕಲ್ಪಿಸಬೇಡ"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "ಆರಂಭಗೊಂಡಾಗ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸಬೇಡ"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "ಖಾತೆಯ ಸಂವಾದವನ್ನು ತೋರಿಸು"
 
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:587
+#, fuzzy
+#| msgid "- Empathy Instant Messenger"
+msgid "- Empathy IM Client"
 msgstr "- Empathy ಕ್ಷಿಪ್ರ ಸಂದೇಶಗಾರ"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1316,7 +1693,7 @@ msgstr ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1328,7 +1705,7 @@ msgstr ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "
@@ -1338,31 +1715,29 @@ msgstr ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME ನಲ್ಲಿನ ಒಂದು ತಕ್ಷಣ ಸಂದೇಶ ಕಳುಹಿಸುವ ಕ್ಲೈಂಟ್"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ <svenkate@redhat.com>"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "ಶಕ್ತಗೊಳಿಸಲಾದ"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "ಖಾತೆಗಳು"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
-#| msgid "<b>New Account</b>"
 msgid "New %s account"
 msgstr "ಹೊಸ %s ಖಾತೆ"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1371,7 +1746,7 @@ msgstr ""
 "ನೀವು ನಿಮ್ಮ %s ಖಾತೆಯನ್ನು ತೆಗೆದು ಹಾಕಲು ಬಯಸಿದ್ದೀರಿ!\n"
 "ನೀವು ಖಚಿತಾವಾಗಿಯೂ ಹೀಗೆ ಮಾಡಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1379,34 +1754,39 @@ msgid ""
 "Should you decide to add the account back at a later time, they will still "
 "be available."
 msgstr ""
+"ನೀವು ಮುಂದುವರೆಯಲು ಬಯಸಿದಲ್ಲಿ ಇದಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಸಂಭಾಷಣೆಗಳು ಹಾಗು ಚಾಟ್‌ ರೂಮ್‌ಗಳನ್ನು ತೆಗೆದು ಹಾಕಲ್ಪಡುವುದಿಲ್ಲ.\n"
+"\n"
+"ನಂತರದ ಸಮಯದಲ್ಲಿ ನೀವು ಖಾತೆಯನ್ನು ಹಿಂದಕ್ಕೆ ಸೇರಿಸಲು ಬಯಸಿದಲ್ಲಿ, ಅವುಗಳು ಇನ್ನೂ ಸಹ ಲಭ್ಯವಿರುತ್ತದೆ."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>ಹೊಸ ಖಾತೆ</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-#| msgid "<b>No Account Selected</b>"
-msgid "<b>No protocol installed</b>"
-msgstr "<b>ಯಾವುದೆ ಪ್ರೊಟೋಕಾಲನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>ಸಂಯೋಜನೆಗಳು</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+#| msgid "Account"
+msgid "Add Account"
+msgstr "ಖಾತೆಯನ್ನು ಸೇರಿಸು"
 
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "ನಿರ್ಮಿಸು(_e)"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "ನಾನು ಈಗಾಗಲೆ ಹೊಂದಿರುವ ಒಂದು ಖಾತೆಯನ್ನು ಬಳಸಲು ಬಯಸುತ್ತೇನೆ"
+#: ../src/empathy-accounts-dialog.ui.h:4
+#| msgid "Email:"
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
-#| msgid "Empathy accounts"
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "ಖಾತೆಗಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "<b>No protocol installed</b>"
+msgid "No protocol installed"
+msgstr "ಯಾವುದೆ ಪ್ರೊಟೋಕಾಲನ್ನು ಅನುಸ್ಥಾಪಿಸಲಾಗಿಲ್ಲ"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+#| msgid "<b>Settings</b>"
+msgid "Settings"
+msgstr "ಸಂಯೋಜನೆಗಳು"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1414,291 +1794,262 @@ msgstr ""
 "ಒಂದು ಹೊಸ ಖಾತೆಯನ್ನು ಸೇರಿಸಲು, ಮೊದಲು ನೀವು ಬಳಸಲು ಬಯಸುವ ಪ್ರತಿ ಪ್ರೋಟೋಕಾಲ್‌ಗೂ ಒಂದು "
 "ಬ್ಯಾಕ್ಎಂಡ್‌ ಅನ್ನು ಅನುಸ್ಥಾಪಿಸಬೇಕು."
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "ಬಗೆ:"
 
-#: ../src/empathy-call-window.c:187
-#| msgid "Contact"
+#: ../src/empathy-accounts-dialog.ui.h:10
+#| msgid "_Add Contact..."
+msgid "_Add..."
+msgstr "ಸೇರಿಸು(_A)..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+#, fuzzy
+#| msgid "Create a new IRC network"
+msgid "_Create a new account"
+msgstr "ಒಂದು ಹೊಸ ಐಆರ್‌ಸಿ ಜಾಲಬಂಧವನ್ನು ನಿರ್ಮಿಸಿ"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+#, fuzzy
+#| msgid "Show and edit accounts"
+msgid "_Reuse an existing account"
+msgstr "ಖಾತೆಗಳನ್ನು ತೋರಿಸು ಸಂಪಾದಿಸು"
+
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "ವೈದೃಶ್ಯ"
 
-#: ../src/empathy-call-window.c:187
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "ಪ್ರಕಾಶ"
 
-#: ../src/empathy-call-window.c:187
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "ಗಾಮಾ"
 
-#: ../src/empathy-call-window.c:219
-#| msgid "<b>Volume</b>"
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "ಧ್ವನಿಯ ಪ್ರಮಾಣ"
 
-#: ../src/empathy-call-window.c:295
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "ಸಂಪರ್ಕ ಹೊಂದಲಾಗುತ್ತಿದೆ..."
+
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "ಬದಿಯ ಪಟ್ಟಿ(_S)"
 
-#: ../src/empathy-call-window.c:313
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "ಡಯಲ್‍ಪ್ಯಾಡ್"
 
-#: ../src/empathy-call-window.c:317
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "ಆಡಿಯೋ ಇನ್‌ಪುಟ್"
 
-#: ../src/empathy-call-window.c:321
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "ವೀಡಿಯೋ ಇನ್‌ಪುಟ್"
 
-#: ../src/empathy-call-window.c:334
-#| msgid "Connecting"
-msgid "Connecting..."
-msgstr "ಸಂಪರ್ಕ ಹೊಂದಲಾಗುತ್ತಿದೆ..."
-
-#: ../src/empathy-call-window.c:488
+#: ../src/empathy-call-window.c:866
 #, c-format
-#| msgid "Connected"
-msgid "Connected -- %d:%02dm"
+msgid "Call with %s"
+msgstr ""
+
+#: ../src/empathy-call-window.c:935
+#| msgid "_Call"
+msgid "Call"
+msgstr "ಕರೆ"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1387
+#, fuzzy, c-format
+#| msgid "Connected -- %d:%02dm"
+msgid "Connected — %d:%02dm"
 msgstr "ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ -- %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
-#| msgid "Hang Up"
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "ಹ್ಯಾಂಗ್ ಮಾಡು"
 
-#: ../src/empathy-call-window.glade.h:2
-#| msgid "Send Video"
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "ಆಡಿಯೋ ಅನ್ನು ಕಳುಹಿಸು"
 
-#: ../src/empathy-call-window.glade.h:3
-#| msgid "Send Video"
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "ವಿಡಿಯೋ ಅನ್ನು ಕಳುಹಿಸು"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "ವೀಡಿಯೊ ಮುನ್ನೋಟ"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "ಕರೆ ಮಾಡು(_C)"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "ನೋಟ(_V)"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "ಸಂಭಾಷಣೆಗಳು (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "ವಿಷಯ:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "ಒಂದು ಸಂದೇಶವನ್ನು ನಮೂದಿಸಲಾಗುತ್ತಿದೆ."
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
-#, c-format
-#| msgid ""
-#| "New message from %s:\n"
-#| "%s"
-msgid "New message from %s"
-msgstr "%s ನಿಂದ ಈ ಹೊಸ ಸಂದೇಶ ಬಂದಿದೆ"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "ಅಳಿಸು(_l)"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
 msgid "Chat"
 msgstr "ಚಾಟ್"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "ಸ್ಮೈಲಿಯನ್ನು ತೋರಿಸು(_S)"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "ಆಮಂತ್ರಣಾ ಸಂದೇಶ (_m):"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "ಆಮಂತ್ರಿಸು"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
 msgstr "ಹಾಳೆಯನ್ನು ಎಡಕ್ಕೆ ಜರುಗಿಸು(_L)"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
 msgstr "ಹಾಳೆಯನ್ನು ಬಲಕ್ಕೆ ಜರುಗಿಸು(_R)"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "ಯಾರನ್ನು ನೀವು ಆಹ್ವಾನಿಸಲು ಬಯಸುತ್ತೀರಾ ಎನ್ನುವುದನ್ನು ಆಯ್ಕೆ ಮಾಡಿ:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "ಚಾಟ್‌ ಕಾನ್ಫರೆನ್ಸನ್ನು ಸೇರಲು ನಿಮ್ಮನ್ನು ಆಹ್ವಾನಿಸಲಾಗಿದೆ."
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
 msgid "_Contact"
 msgstr "ಸಂಪರ್ಕ ವಿಳಾಸ(_C)"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "ಒಳ ವಿಷಯಗಳು(_C)"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
 msgstr "ಸಂಭಾಷಣೆ(_C)"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
 msgstr "ಹಾಳೆಯನ್ನು ಕಿತ್ತುಹಾಕು (_D)"
 
-#: ../src/empathy-chat-window.glade.h:15
-#| msgid "Edit Favorite Room"
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Favorite Chatroom"
 msgstr "ಅಚ್ಚುಮೆಚ್ಚಿನ ಚಾಟ್‌ರೂಮ್(_F)"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "ನೆರವು(_H)"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
 msgstr "ಮುಂದಿನ ಟ್ಯಾಬ್(_P)"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Previous Tab"
 msgstr "ಹಿಂದಿನ ಟ್ಯಾಬ್(_P)"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "ವಿಳಾಸಗಳ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸು(_S)"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
 msgstr "ಟ್ಯಾಬ್‌ಗಳು(_T)"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "ಹೆಸರು"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "ರೂಮ್"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "ತಾನಾಗಿಯೆ ಸಂಪರ್ಕಹೊಂದು"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "ಅಚ್ಚುಮೆಚ್ಚಿನ ರೂಮನ್ನು ಸಂಪಾದಿಸಿ"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "ಆರಂಭಗೊಂಡಾಗ ಚಾಟ್‌ ರೂಮ್‌ಗೆ ಸೇರ್ಪಡೆಯಾಗು(_u)"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "Empathyಯು ಆರಂಭಗೊಂಡಾಗ ಹಾಗು ನೀವು ಸಂಪರ್ಕಿತಗೊಂಡಾಗ ಈ ಚಾಟ್‌ ರೂಮ್‌ಗೆ ಸೇರ್ಪಡೆಯಾಗು"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "ನಿಮ್ಮ ಅಚ್ಚುಮೆಚ್ಚಿನ ರೂಮ್‌ಗಳನ್ನಿ ವ್ಯವಸ್ಥಾಪಿಸಿ"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "ಹೆಸರು(_a):"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "ಪರಿಚಾರಕ(_e):"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "ರೂಮ್(_R):"
-
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "ಬರುತ್ತಿರುವ ಕರೆ"
 
-#: ../src/empathy-event-manager.c:375
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s ನಿಮಗೆ ಕರೆ ಮಾಡುತ್ತಿದ್ದಾರೆ, ನೀವು ಉತ್ತರಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../src/empathy-event-manager.c:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "ತಿರಸ್ಕರಿಸು(_R)"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "ಉತ್ತರ(_A)"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ಇಂದ ಕರೆ ಬರುತ್ತಿದೆ"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s ನಿಮಗೆ ಇಂದು ಆಹ್ವಾನವನ್ನು ನೀಡಿದ್ದಾರೆ"
 
-#: ../src/empathy-event-manager.c:565
-#| msgid ""
-#| "%s is offering you an invitation. An external application will be started "
-#| "to handle it."
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "ಇದಕ್ಕಾಗಿ ಒಂದು ಹೊರಗಿನ ಅನ್ವಯವನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತದೆ."
 
-#: ../src/empathy-event-manager.c:570
-#| msgid ""
-#| "%s is offering you an invitation, but you don't have the needed external "
-#| "application to handle it."
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "ಇದಕ್ಕಾಗಿ ಅಗತ್ಯವಿರುವ ಒಂದು ಹೊರಗಿನ ಅನ್ವಯವು ನಿಮ್ಮಲ್ಲಿ ಇಲ್ಲ."
 
-#: ../src/empathy-event-manager.c:692
-#| msgid "Romanian"
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "ರೂಮಿನ ಆಹ್ವಾನ"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ನಿಮ್ಮನ್ನು %s ಗೆ ಸೇರುವಂತೆ ಆಹ್ವಾನಿಸುತ್ತಿದ್ದಾರೆ"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "ತಿರಸ್ಕರಿಸು(_D)"
 
-#: ../src/empathy-event-manager.c:708
-#| msgid "Join"
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "ಸೇರ್ಪಡೆಯಾಗು(_J)"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ನಿಮ್ಮನ್ನು %s ಗೆ ಸೇರುವಂತೆ ಆಹ್ವಾನಿಸಿದ್ದಾರೆ"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
-#| msgid "Incoming call from %s"
 msgid "Incoming file transfer from %s"
 msgstr "%s ಇಂದ ಕಡತದ ವರ್ಗಾವಣೆ"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s ನಿಂದ ಚಂದಾದಾರಿಕೆಯ ಅಗತ್ಯವಿದೆ"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1707,321 +2058,361 @@ msgstr ""
 "\n"
 "ಸಂದೇಶ: %s"
 
-#: ../src/empathy-ft-manager.c:113
+#. 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
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-#| msgid "No error specified"
-msgid "No reason was specified"
-msgstr "ಯಾವ ಕಾರಣವನ್ನೂ ಸೂಚಿಸಲಾಗಿಲ್ಲ"
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "ಸ್ಥಿತಿಯ ಬದಲಾವಣೆಗೆ ಮನವಿ ಸಲ್ಲಿಸಲಾಗಿದೆ"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "ಕಡತದ ವರ್ಗಾವಣೆಯನ್ನು ನೀವು ರದ್ದು ಮಾಡಿದ್ದೀರಿ"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "ಕಡತದ ವರ್ಗಾವಣೆಯಲ್ಲಿ ಭಾಗಿಯಾಗಿದ ಇನ್ನೊಬ್ಬ ಅದನ್ನು ರದ್ದು ಮಾಡಿದ್ದಾರೆ"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "Error while trying to transfer the file"
-msgstr "ಕಡತವನ್ನು ವರ್ಗಾಯಿಸುವಾಗ ದೋಷ ಉಂಟಾಗಿದೆ"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "ಗೊತ್ತಿಲ್ಲದ"
 
-#: ../src/empathy-ft-manager.c:174
-msgid "The other participant is unable to transfer the file"
-msgstr "ಭಾಗಿಯಾದ ಇನ್ನೊಬ್ಬ ವ್ಯಕ್ತಿಯು ಕಡತವನ್ನು ವರ್ಗಾಯಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದ್ದಾರೆ"
+#: ../src/empathy-ft-manager.c:275
+#, fuzzy, c-format
+#| msgid "%s of %s"
+msgid "%s of %s at %s/s"
+msgstr "%s, %s ನಲ್ಲಿ"
 
-#: ../src/empathy-ft-manager.c:176
-#| msgid "Unknown error"
-msgid "Unknown reason"
-msgstr "ಅಜ್ಞಾತ ಕಾರಣ"
+#: ../src/empathy-ft-manager.c:276
+#, 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:224
+#: ../src/empathy-ft-manager.c:307
 #, c-format
-#| msgid "Incoming call from %s"
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" ಅನ್ನು %s ಇಂದ ಸ್ವೀಕರಿಸಲಾಗುತ್ತಿದೆ"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" ಅನ್ನು %s ಗೆ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/empathy-ft-manager.c:237
-#| msgid "unknown"
-msgctxt "file size"
-msgid "Unknown"
-msgstr "ಗೊತ್ತಿಲ್ಲದ"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, fuzzy, c-format
+#| msgid "Receiving \"%s\" from %s"
+msgid "Error receiving \"%s\" from %s"
+msgstr "\"%s\" ಅನ್ನು %s ಇಂದ ಸ್ವೀಕರಿಸಲಾಗುತ್ತಿದೆ"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:245
-#, c-format
-msgid "%s of %s"
-msgstr "%s, %s ನಲ್ಲಿ"
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:252
-msgid "Waiting the other participant's response"
-msgstr "ಭಾಗಿಯಾದ ಇತರರ ಪ್ರತ್ಯುತ್ತರಕ್ಕಾಗಿ ಕಾಯಲಾಗುತ್ತಿದೆ"
+#: ../src/empathy-ft-manager.c:348
+#, fuzzy, c-format
+#| msgid "Sending \"%s\" to %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "\"%s\" ಅನ್ನು %s ಗೆ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/empathy-ft-manager.c:262
+#: ../src/empathy-ft-manager.c:351
+#, fuzzy
+#| msgid "Error sending message '%s': %s"
+msgid "Error sending a file"
+msgstr "'%s' ಸಂದೇಶವನ್ನು ಕಳುಹಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" ಅನ್ನು %s ಇಂದ ಪಡೆದುಕೊಳ್ಳಲಾಗಿದೆ"
 
-#: ../src/empathy-ft-manager.c:268
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
-#| msgid "Topic set to: %s"
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" ಅನ್ನು %s ಗೆ ಕಳುಹಿಸಲಾಗಿದೆ"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "ಕಡತದ ವರ್ಗಾವಣೆ ಪೂರ್ಣಗೊಂಡಿದೆ"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "\"%s\" ಅನ್ನು %s ಇಂದ ಪಡೆಯಲಾಗಿದೆ"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#, fuzzy
+#| msgid "Waiting the other participant's response"
+msgid "Waiting for the other participant's response"
+msgstr "ಭಾಗಿಯಾದ ಇತರರ ಪ್ರತ್ಯುತ್ತರಕ್ಕಾಗಿ ಕಾಯಲಾಗುತ್ತಿದೆ"
 
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "\"%s\" ಅನ್ನು %s ಗೆ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ"
+msgid "Checking integrity of \"%s\""
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:289
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "ಕಡತದ ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಗಿದೆ: %s"
-
-#: ../src/empathy-ft-manager.c:304
-#| msgid "unknown"
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "ಗೊತ್ತಿಲ್ಲದ"
-
-#: ../src/empathy-ft-manager.c:364
-#| msgid "unknown"
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "ಗೊತ್ತಿಲ್ಲದ"
+msgid "Hashing \"%s\""
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
-#| msgid "All Files"
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "ಕಡತ"
 
-#: ../src/empathy-ft-manager.c:734
-#| msgid "Ringing"
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "ಬಾಕಿಇರುವ"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "ಈ ಸ್ಥಳಕ್ಕೆ ಕಡತವನ್ನು ಉಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "ಕಡತವನ್ನು ಹೀಗೆ ಉಳಿಸು..."
-
-#: ../src/empathy-ft-manager.c:1001
-#| msgid "unknown"
-msgid "unknown size"
-msgstr "ಅಜ್ಞಾತ ಗಾತ್ರ"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-#| msgid "I would like to add you to my contact list."
-msgid "%s would like to send you a file"
-msgstr "%s ನಿಮಗೆ ಒಂದು ಕಡತವನ್ನು ಕಳುಹಿಸಲು ಬಯಸಿದ್ದಾರೆ"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "ನೀವು ಕಡತ \"%s\" (%s) ಅನ್ನು ಸ್ವೀಕರಿಸಲು ಬಯಸುತ್ತೀರೆ?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-#| msgid "_Accounts"
-msgid "_Accept"
-msgstr "ಸ್ವೀಕರಿಸು(_A)"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+#| msgid "File transfers"
+msgid "File Transfers"
 msgstr "ಕಡತದ ವರ್ಗಾವಣೆಗಳು"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 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:255
-#| msgid "Port"
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "ಆಮದು"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "ಪ್ರೊಟೋಕಾಲ್"
 
-#: ../src/empathy-import-dialog.c:290
-#| msgid "Reso_urce:"
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "ಮೂಲ"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
-msgstr "ಆಮದು ಮಾಡಲು ಯಾವುದೆ ಖಾತೆಯು ದೊರೆತಿಲ್ಲ. Empathy ಯು ಪ್ರಸಕ್ತ ಕೇವಲ Pidgin ಇಂದ ಮಾತ್ರ ಖಾತೆಗಳನ್ನು ಆಮದು ಮಾಡಬಲ್ಲದು."
+msgstr ""
+"ಆಮದು ಮಾಡಲು ಯಾವುದೆ ಖಾತೆಯು ದೊರೆತಿಲ್ಲ. Empathy ಯು ಪ್ರಸಕ್ತ ಕೇವಲ Pidgin ಇಂದ ಮಾತ್ರ "
+"ಖಾತೆಗಳನ್ನು ಆಮದು ಮಾಡಬಲ್ಲದು."
 
-#: ../src/empathy-import-dialog.glade.h:1
-#| msgid "Empathy accounts"
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "ಖಾತೆಗಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "ಖಾತೆಯನ್ನು ಸಂಪಾದಿಸು(_E)"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "ದೋಷವನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "ಜಾಲಬಂಧದ ದೋಷ"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "ದೃಢೀಕರಣವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ ದೋಷ"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "ಹೆಸರು ಬಳಕೆಯಲ್ಲಿದೆ"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ಒದಗಿಸಲಾಗಿಲ್ಲ"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "ಪ್ರಮಾಣಪತ್ರವನ್ನು ನಂಬಲಾಗಿಲ್ಲ"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "ಪ್ರಮಾಣಪತ್ರದ ಕಾಲಾವಧಿ ತೀರಿದೆ"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "ಪ್ರಮಾಣಪತ್ರವು ಸಕ್ರಿಯಗೊಂಡಿಲ್ಲ"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "ಪ್ರಮಾಣಪತ್ರದ ಅತಿಥೇಯದ ಹೆಸರು ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "ಪ್ರಮಾಣಪತ್ರದ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "ಪ್ರಮಾಣಪತ್ರವು ಸ್ವತಃ ಸೈನ್ ಮಾಡಲ್ಪಟ್ಟಿದೆ"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "ಪ್ರಮಾಣಪತ್ರ ದೋಷ"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "ಅಜ್ಞಾತ ದೋಷ"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "ಖಾತೆಗಳನ್ನು ತೋರಿಸು ಸಂಪಾದಿಸು"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "ಸಂಪರ್ಕ ವಿಳಾಸ"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "ಖಾತೆಯನ್ನು ಸಂಪಾದಿಸು(_E)"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "ವಿಳಾಸ ಪಟ್ಟಿ"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "ಸನ್ನಿವೇಶ"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "ಅಚ್ಚುಮೆಚ್ಚಿನವುಗಳಿಗೆ ಸೇರು(_F)"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "ಹೊಸದಕ್ಕೆ ಸೇರು(_N)..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "ಅಚ್ಚುಮೆಚ್ಚಿನವುಗಳನ್ನು ವ್ಯವಸ್ಥಾಪಿಸಿ"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "ಆಫ್‌ಲೈನ್ ಸಂಪರ್ಕ ವಿಳಾಸಗಳನ್ನು ತೋರಿಸು(_O)"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+#| msgid "Sort by _name"
+msgid "Sort by _Name"
+msgstr "ಹೆಸರಿನ ಆಧಾರದಲ್ಲಿ ವಿಂಗಡಿಸು"
+
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+#| msgid "Sort by s_tate"
+msgid "Sort by _Status"
+msgstr "ಸ್ಥಿತಿಯ ಆಧಾರದಲ್ಲಿ ವಿಂಗಡಿಸು(_t)"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "ಖಾತೆಗಳು(_A)"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "ಸಂಪರ್ಕ ವಿಳಾಸವನ್ನು ಸೇರಿಸು(_A)..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "ದೋಷ ನಿವಾರಣೆ(_Debug)"
+
+#: ../src/empathy-main-window.ui.h:17
+#| msgid "File transfers"
+msgid "_File Transfers"
+msgstr "ಕಡತದ ವರ್ಗಾವಣೆಗಳು(_F)"
+
+#: ../src/empathy-main-window.ui.h:19
+#| msgid "_Join"
+msgid "_Join..."
+msgstr "ಸೇರ್ಪಡೆಯಾಗು(_J)..."
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "ಹೊಸ ಸಂಭಾಷಣೆ(_N)..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+#, fuzzy
+#| msgid "Show _Offline Contacts"
+msgid "_Offline Contacts"
+msgstr "ಆಫ್‌ಲೈನ್ ಸಂಪರ್ಕ ವಿಳಾಸಗಳನ್ನು ತೋರಿಸು(_O)"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ(_P)"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+#, fuzzy
+#| msgid "Previous Conversations"
+msgid "_Previous Conversations"
+msgstr "ಈ ಹಿಂದಿನ ಸಂಭಾಷಣೆಗಳು"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "ರೂಮ್(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
-msgstr "ಚಾಟ್ ರೂಮುಗಳು"
+#: ../src/empathy-new-chatroom-dialog.c:331
+#| msgid "Chat Rooms"
+msgid "Chat Room"
+msgstr "ಚಾಟ್ ರೂಮ್‌"
+
+#: ../src/empathy-new-chatroom-dialog.c:347
+#| msgid "Themes"
+msgid "Members"
+msgstr "ಸದಸ್ಯರು"
+
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\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 "ಹೌದು"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "ವೀಕ್ಷಿಸು:"
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "ಇಲ್ಲ"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+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 "ಇಲ್ಲಿ ಸೇರಲು ರೂಮ್‌ನ ಹೆಸರನ್ನು ನಮೂದಿಸಿ ಅಥವ ಪಟ್ಟಿಯಿಂದ ಒಂದು ಅಥವ ಹೆಚ್ಚಿನದನ್ನು ಆರಿಸಿ."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../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"
@@ -2029,199 +2420,300 @@ msgstr ""
 "ರೂಮ್ ಅನ್ನು ಹೊಂದಿರುವ ಪರಿಚಾರಕವನ್ನು ನಮೂದಿಸಿ, ಅಥವ ರೂಮ್‌ ಈಗಿನ ಖಾತೆಯು ಇರುವ "
 "ಪರಿಚಾರಕದಲ್ಲಿದ್ದರೆ ಅದನ್ನು ಖಾಲಿ ಬಿಡಿ"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "ಸೇರ್ಪಡೆ"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "ಹೊಸ ಸೇರ್ಪಡೆ"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#, fuzzy
+#| msgid "Room"
+msgid "Join Room"
+msgstr "ರೂಮ್"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "ಪುನಶ್ಚೇತನಗೊಳಿಸು(_f)"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#| msgid "_Room List locale:"
+msgid "Room List"
+msgstr "ರೂಮ್‌ಗಳ ಪಟ್ಟಿ"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid "This list represents all chat rooms hosted on the server you have entered."
-msgstr "ಈ ಪಟ್ಟಿಯು ನೀವು ನಮೂದಿಸಿದ ಪರಿಚಾರಕದಲ್ಲಿರುವ ಎಲ್ಲಾ ಚಾಟ್‌ ರೂಮ್‌ಗಳನ್ನು ತೋರಿಸುತ್ತದೆ."
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "ರೂಮ್(_R):"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "ಸಂದೇಶವನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ"
 
-#: ../src/empathy-preferences.c:158
-#| msgid ""
-#| "\n"
-#| "Message: %s"
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ"
 
-#: ../src/empathy-preferences.c:159
-#| msgid "New Conversation"
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "ಹೊಸ ಸಂಭಾಷಣೆ"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "ಸಂಪರ್ಕವು ಆನ್‌ಲೈನಿಗೆ ತೆರಳಿದ್ದಾರೆ"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "ಸಂಪರ್ಕವು ಆಫ್‌ಲೈನಿಗೆ ತೆರಳಿದ್ದಾರೆ"
 
-#: ../src/empathy-preferences.c:162
-#| msgid "Disconnected"
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "ಖಾತೆಯೊಂದಿಗೆ ಸಂಪರ್ಕ ಜೋಡಿಸಲಾಗಿದೆ"
 
-#: ../src/empathy-preferences.c:163
-#| msgid "Disconnected"
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "ಖಾತೆಯ ಸಂಪರ್ಕ ಕಡಿದು ಹೋಗಿದೆ"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "ಭಾಷೆ"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>ಗೋಚರಿಕೆ</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-#| msgid "<b>Behaviour</b>"
-msgid "<b>Behavior</b>"
-msgstr "<b>ವರ್ತನೆ</b>"
-
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>ವಿಳಾಸ ಪಟ್ಟಿ</b>"
-
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>ಭಾಷೆಗಳಿಗಾಗಿ ಕಾಗುಣಿತ ಪರೀಕ್ಷೆಯನ್ನು ಶಕ್ತಗೊಳಿಸು:</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>ಘಟನೆಗಳಿಗಾಗಿ ಶಬ್ಧವನ್ನು ಮಾಡು</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
 msgstr ""
-"<small>ನಿಮ್ಮಲ್ಲಿ ಯಾವ ಭಾಷೆಯ ಶಬ್ಧಕೋಶವು ಅನುಸ್ಥಾಪಿತಗೊಂಡಿದೆಯೋ ಆ ಭಾಷೆಗಳು ಮಾತ್ರ ಪಟ್ಟಿಯಲ್ಲಿ "
-"ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ.</small>"
 
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:4
+#| msgid "<b>Appearance</b>"
+msgid "Appearance"
+msgstr "ಗೋಚರಿಕೆ"
+
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "ಆರಂಭಗೊಂಡಾಗ ತಾನಾಗಿಯೆ ಸಂಪರ್ಕಹೊಂದು(_c) "
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "ಅವತಾರಗಳು ಸಂಪರ್ಕ ವಿಳಾಸಗಳ ಪಟ್ಟಿಯಲ್ಲಿರುವವರು ಆರಿಸಿಕೊಳ್ಳುವ ಚಿತ್ರಗಳು"
+#: ../src/empathy-preferences.ui.h:6
+#| msgid "<b>Behavior</b>"
+msgid "Behavior"
+msgstr "ವರ್ತನೆ"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "ಚಾಟ್‌ ಪರಿಸರವಿನ್ಯಾಸ‌(_e):"
 
-#: ../src/empathy-preferences.glade.h:10
-#| msgid "Display notifications when contacts come _online"
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "ಹೊರಗೆ ಹೋಗಿದ್ದಾಗ ಅಥವ ಕಾರ್ಯನಿರತವಾಗಿದ್ದಾಗ ಸೂಚನೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು(_a)"
 
-#: ../src/empathy-preferences.glade.h:11
-#| msgid "Enable sounds when _away"
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "ಹೊರಗೆ ಹೋಗಿದ್ದಾಗ ಅಥವ ಕಾರ್ಯನಿರತವಾಗಿದ್ದಾಗ ಶಬ್ದಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು(_a)"
 
-#: ../src/empathy-preferences.glade.h:12
-#| msgid "Display notifications when contacts come _online"
+#: ../src/empathy-preferences.ui.h:10
+#, fuzzy
+#| msgid "Enable notifications when the _chat is not focused"
+msgid "Enable notifications when a contact comes online"
+msgstr "ಚಾಟ್‌ನ ಮೇಲೆ ಗಮನವನ್ನು ಕೇಂದ್ರೀಕರಿಸದೆ ಇದ್ದಲ್ಲಿ ಸೂಚನೆಯನ್ನು ಶಕ್ತಗೊಳಿಸು(_c)"
+
+#: ../src/empathy-preferences.ui.h:11
+#, fuzzy
+#| msgid "Enable notifications when the _chat is not focused"
+msgid "Enable notifications when a contact goes offline"
+msgstr "ಚಾಟ್‌ನ ಮೇಲೆ ಗಮನವನ್ನು ಕೇಂದ್ರೀಕರಿಸದೆ ಇದ್ದಲ್ಲಿ ಸೂಚನೆಯನ್ನು ಶಕ್ತಗೊಳಿಸು(_c)"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "ಚಾಟ್‌ನ ಮೇಲೆ ಗಮನವನ್ನು ಕೇಂದ್ರೀಕರಿಸದೆ ಇದ್ದಲ್ಲಿ ಸೂಚನೆಯನ್ನು ಶಕ್ತಗೊಳಿಸು(_c)"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+#| msgid "<b>Enable spell checking for languages:</b>"
+msgid "Enable spell checking for languages:"
+msgstr "ಈ ಭಾಷೆಗಳಿಗಾಗಿ ಕಾಗುಣಿತ ಪರೀಕ್ಷೆಯನ್ನು ಶಕ್ತಗೊಳಿಸು:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "ಸಾಮಾನ್ಯ"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+#| msgid "Notifications"
+msgid "Location"
+msgstr "ಸ್ಥಳ"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "ಸೂಚನೆಗಳು"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+#| msgid "<b>Play sound for events</b>"
+msgid "Play sound for events"
+msgstr "ಘಟನೆಗಳಿಗಾಗಿ ಶಬ್ಧವನ್ನು ಮಾಡು"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "ಆದ್ಯತೆಗಳು"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "ಅವತಾರಗಳನ್ನು ತೋರಿಸು(_a)"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "ಗೌಪ್ಯತೆ"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:21
+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
 msgid "Show _smileys as images"
 msgstr "ಸ್ಮೈಲಿಗಳನ್ನು ಚಿತ್ರಗಳಾಗಿ ತೋರಿಸು(_s)"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "ವಿಳಾಸಗಳ ಚಿಕ್ಕದಾದ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸು(_m)"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "ಹೆಸರಿನ ಆಧಾರದಲ್ಲಿ ವಿಂಗಡಿಸು"
-
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "ಸ್ಥಿತಿಯ ಆಧಾರದಲ್ಲಿ ವಿಂಗಡಿಸು(_t)"
+#: ../src/empathy-preferences.ui.h:23
+#, fuzzy
+#| msgid "_Show Contact List"
+msgid "Show contact _list in rooms"
+msgstr "ವಿಳಾಸಗಳ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸು(_S)"
 
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "ಧ್ವನಿಗಳು"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "ಕಾಗುಣಿತ ಪರೀಕ್ಷೆ"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+#| msgid ""
+#| "<small>The list of languages reflects only the languages for which you "
+#| "have a dictionary installed.</small>"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"ನಿಮ್ಮಲ್ಲಿ ಯಾವ ಭಾಷೆಯ ಶಬ್ಧಕೋಶವು ಅನುಸ್ಥಾಪಿತಗೊಂಡಿದೆಯೋ ಆ ಭಾಷೆಗಳು ಮಾತ್ರ ಪಟ್ಟಿಯಲ್ಲಿ "
+"ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "ಪರಿಸರವಿನ್ಯಾಸಗಳು"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "ಗುಳ್ಳೆಯ ಸೂಚನೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು(_E)"
 
-#: ../src/empathy-preferences.glade.h:25
-#| msgid "Enable sound when away"
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "ಶಬ್ಧದ ಸೂಚನೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು(_E)"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "ಹೊಸ ಚಾಟ್‌ಗಳನ್ನು ಪ್ರತ್ಯೇಕ ವಿಂಡೋಗಳಲ್ಲಿ ತೆರೆ (_O)"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr ""
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "ಸ್ಥಿತಿ"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "ಹೊರನೆಡೆ(_Q)"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "ವಿಳಾಸಗಳ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸು(_S)"
-
-#: ../src/empathy-tube-dispatch.c:356
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "%s ಸೇವೆಗಾಗಿ ಅನ್ವಯವನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s"
 
-#: ../src/empathy-tube-dispatch.c:427
+#: ../src/empathy-tube-dispatch.c:446
 #, c-format
-#| msgid ""
-#| "%s is offering you an invitation, but you don't have the needed external "
-#| "application to handle it."
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
 "application to handle it"
 msgstr ""
-"%s ಸೇವೆಗೆ ಒಂದು ಆಹ್ವಾನವನ್ನು ನೀಡಲಾಗಿದೆ, ಆದರೆ ಇದಕ್ಕೆ ಅಗತ್ಯವಿರುವ ಒಂದು ಅನ್ವಯವು "
-"ನಿಮ್ಮಲ್ಲಿ ಇಲ್ಲ."
+"%s ಸೇವೆಗೆ ಒಂದು ಆಹ್ವಾನವನ್ನು ನೀಡಲಾಗಿದೆ, ಆದರೆ ಇದಕ್ಕೆ ಅಗತ್ಯವಿರುವ ಒಂದು ಅನ್ವಯವು ನಿಮ್ಮಲ್ಲಿ "
+"ಇಲ್ಲ."
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+#, fuzzy
+#| msgid "Contact List"
+msgid "Contact Map View"
+msgstr "ವಿಳಾಸ ಪಟ್ಟಿ"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "ದೋಷ"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#| msgid "Croatian"
+msgid "Critical"
+msgstr "ಸಂದಿಗ್ಧ"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#| msgid "Remaining"
+msgid "Warning"
+msgstr "ಎಚ್ಚರಿಕೆ"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+#| msgid "Message:"
+msgid "Message"
+msgstr "ಸಂದೇಶ"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "ಮಾಹಿತಿ"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "ದೋಷನಿವಾರಣೆ"
+
+#: ../src/empathy-debug-dialog.c:845
+#| msgid "Server"
+msgid "Save"
+msgstr "ಉಳಿಸು"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "ವಿರಮಿಸು"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "ಸ್ತರ"
+
+#: ../src/empathy-debug-dialog.c:1102
+#| msgid "Simple"
+msgid "Time"
+msgstr "ಸಮಯ"
+
+#: ../src/empathy-debug-dialog.c:1104
+#| msgid "Romanian"
+msgid "Domain"
+msgstr "ಡೊಮೈನ್"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "ವರ್ಗ"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "ಸ್ತರ"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index bf3f4247e..8981ef14c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 0.24.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-10 10:03+0200\n"
-"PO-Revision-Date: 2009-06-10 10:13+0200\n"
+"POT-Creation-Date: 2009-08-21 14:47+0200\n"
+"PO-Revision-Date: 2009-08-21 15:46+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Empathy lynmelder"
+msgid "Empathy IM Client"
+msgstr "Empathy IM-klient"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "Send og motta lynmeldinger"
+msgid "Send and receive messages"
+msgstr "Send og motta meldinger"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
@@ -51,201 +51,235 @@ msgid "Compact contact list"
 msgstr "Kompakt kontaktliste"
 
 #: ../data/empathy.schemas.in.h:6
+#, fuzzy
+msgid "Connection managers should be used"
+msgstr "NetworkManager skal brukes"
+
+#: ../data/empathy.schemas.in.h:7
 msgid "Contact list sort criterium"
 msgstr "Sorteringskriterier for kontaktliste"
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/empathy.schemas.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "Forvalgt mappe for personbilde"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "Slå av varsling når du er borte"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:10
 msgid "Disable sounds when away"
 msgstr "Slå av lyder når du er borte"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:11
 msgid "Empathy can publish the user's location"
 msgstr "Empathy kan publisere brukers lokasjon"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:12
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy kan bruke GPS til å gjette lokasjonen"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:13
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy can use the network to guess the location"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy default download folder"
 msgstr "Forvalgt nedlastingsmappe for Empathy"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy har spurt om import av kontoer"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:17
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy skal koble til automatisk ved oppstart"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:18
 #, fuzzy
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy skal koble til automatisk ved oppstart"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy skal bruke personbildet for kontakten som ikon for pratevinduet"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:21
 #, fuzzy
 msgid "Enable popup notifications for new messages"
 msgstr "_Aktiver varsling med lyder"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:22
 msgid "Enable spell checker"
 msgstr "Bruk stavekontroll"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide main window"
 msgstr "Skjul hovedvinduet"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:24
 msgid "Hide the main window."
 msgstr "Skjul hovedvinduet."
 
-#: ../data/empathy.schemas.in.h:23
-msgid "NetworkManager should be used"
-msgstr "NetworkManager skal brukes"
-
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Tegn for fullføring av kallenavn"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Åpne nye samtaler i egne vinduer"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:28
+#, fuzzy
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "Om tema skal brukes for praterom eller ikke."
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Spill av lyd når meldinger kommer inn"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Spill av lyd ved nye samtaler"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Spill av lyd for utgående meldinger"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Spill av lyd når kontakter logger inn"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Spill av lyd når kontakter logger ut"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Spill av lyd når du logger inn"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Spill av lyd når du logger ut"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:37
+#, fuzzy
+msgid "Popup notifications when a contact sign in"
+msgstr "Slå av varsling når du er borte"
+
+#: ../data/empathy.schemas.in.h:38
+#, fuzzy
+msgid "Popup notifications when a contact sign out"
+msgstr "Spill av lyd når kontakter logger ut"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Salut-konto er opprettet"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Vis personbilder"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:41
+#, fuzzy
+msgid "Show contact list in rooms"
+msgstr "Vi_s kontaktliste"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Vis hint om lukking av hovedvinduet"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Vis frakoblede kontakter"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Stavekontrollspråk"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "Forvalgt mappe for lagring av filoverføringer."
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den forrige mappen et personbilde ble valgt fra."
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Temaet som brukes til å vise samtaler."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Vis smilefjes grafisk"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Bruk varslingslyder"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Bruk tema for samtalerom"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
 #, fuzzy
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:53
 #, fuzzy
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr ""
 "Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:54
 #, fuzzy
 msgid ""
 "Whether or not Empathy can use the cellular network to guess the location."
 msgstr ""
 "Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:55
 #, fuzzy
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr ""
 "Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Om Empathy har spurt om import av kontoer fra andre programmer."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:58
 #, fuzzy
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
@@ -253,111 +287,128 @@ msgid ""
 msgstr ""
 "Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr ""
 "Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
 
-#: ../data/empathy.schemas.in.h:53
-msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "Om Salut-konto ble opprettet første gang Empathy ble kjørt."
-
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:60
+#, fuzzy
 msgid ""
-"Whether or not the network manager should be used to automatically "
+"Whether or not connectivity managers should be used to automatically "
 "disconnect/reconnect."
 msgstr "Om NetworkManager skal brukes til å koble til/fra automatisk."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:61
+msgid ""
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr "Om Salut-konto ble opprettet første gang Empathy ble kjørt."
+
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "Om stavekontroll skal sjekke ord mot de språkene du ønsker å bruke."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "Om smilefjes skal konverteres til grafikk i samtaler."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:64
 #, fuzzy
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:65
 #, fuzzy
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:66
 #, fuzzy
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Om lyder skal spilles av når opptatt."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:67
 #, fuzzy
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Om lyder skal spilles av når meldinger kommer inn."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:68
 #, fuzzy
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Om lyder skal spilles av når meldinger kommer inn."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:69
 #, fuzzy
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Om lyder skal spilles av når meldinger kommer inn."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:70
 #, fuzzy
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Om lyder skal spilles av når borte."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:71
 #, fuzzy
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Om lyder skal spilles av når borte."
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:72
 #, fuzzy
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "Om lyder skal spilles av når du er borte eller opptatt."
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:73
+#, fuzzy
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "Om lyder skal spilles av når du er borte eller opptatt."
+
+#: ../data/empathy.schemas.in.h:74
+#, fuzzy
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "Om lyder skal spilles av når du er borte eller opptatt."
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not 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:67
+#: ../data/empathy.schemas.in.h:76
 #, fuzzy
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "Om lyder skal spilles av når du er borte eller opptatt."
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten."
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:79
 #, fuzzy
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "Om lyder skal spilles av når du er borte eller opptatt."
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:80
+#, fuzzy
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Om kontaktlisten skal vises i kompakt modus."
+
+#: ../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."
@@ -365,15 +416,15 @@ msgstr ""
 "Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal "
 "vises."
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Om kontaktlisten skal vises i kompakt modus."
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Om tema skal brukes for praterom eller ikke."
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:84
 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 "
@@ -389,57 +440,69 @@ msgstr ""
 
 #: ../libempathy/empathy-ft-handler.c:1098
 msgid "File transfer not supported by remote contact"
-msgstr ""
+msgstr "Filoverføring støttes ikke av ekstern kontakt"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "Valgt fil er ikke en vanlig fil"
 
-#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:286
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "Valgt fil er tom"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:290
 msgid "People nearby"
 msgstr "Personer i nærheten"
 
-#: ../libempathy/empathy-tp-file.c:300
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:398
 msgid "No reason was specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-tp-file.c:303
+#: ../libempathy/empathy-tp-file.c:401
 msgid "The change in state was requested"
 msgstr "Tilstandsendring ble etterspurt"
 
-#: ../libempathy/empathy-tp-file.c:306
+#: ../libempathy/empathy-tp-file.c:404
 msgid "You canceled the file transfer"
 msgstr "Du avbrøt filoverføringen"
 
-#: ../libempathy/empathy-tp-file.c:309
+#: ../libempathy/empathy-tp-file.c:407
 msgid "The other participant canceled the file transfer"
 msgstr "Avsender avbrøt filoverføringen"
 
-#: ../libempathy/empathy-tp-file.c:312
+#: ../libempathy/empathy-tp-file.c:410
 msgid "Error while trying to transfer the file"
 msgstr "Feil under overføring av filen"
 
-#: ../libempathy/empathy-tp-file.c:315
+#: ../libempathy/empathy-tp-file.c:413
 msgid "The other participant is unable to transfer the file"
 msgstr "Avsender kan ikke overføre filen"
 
-#: ../libempathy/empathy-tp-file.c:318
+#: ../libempathy/empathy-tp-file.c:416
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:276
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../libempathy/empathy-utils.c:279
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Borte"
 
-#: ../libempathy/empathy-utils.c:281
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Skjult"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Frakoblet"
 
@@ -447,42 +510,49 @@ msgstr "Frakoblet"
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d sekund siden"
+msgstr[1] "%d sekunder siden"
 
 #: ../libempathy/empathy-time.c:142
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minutt siden"
+msgstr[1] "%d minutter siden"
 
 #: ../libempathy/empathy-time.c:147
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d time siden"
+msgstr[1] "%d timer siden"
 
 #: ../libempathy/empathy-time.c:152
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d dag siden"
+msgstr[1] "%d dager siden"
 
 #: ../libempathy/empathy-time.c:157
 #, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d uke siden"
+msgstr[1] "%d uker siden"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d måned siden"
+msgstr[1] "%d måneder siden"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:167
 msgid "in the future"
-msgstr ""
+msgstr "i fremtiden"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:419
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Alle"
 
@@ -501,8 +571,8 @@ msgstr "%s:"
 #: ../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
-msgid "<b>Advanced</b>"
-msgstr "<b>Avansert</b>"
+msgid "Advanced"
+msgstr "Avansert"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
@@ -538,7 +608,7 @@ msgid "_Server:"
 msgstr "_Tjener:"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "InnloggingsI_D:"
@@ -552,49 +622,45 @@ msgstr "ICQ _UIN:"
 msgid "_Charset:"
 msgstr "_Tegnsett:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:241
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Nytt nettverk"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Nettverk</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Tjenere</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Charset:"
 msgstr "Tegnsett:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Nettverk"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Nettverk:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Melding ved frakobling:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Virkelig navn:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Overstyr innstillinger for tjener</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Tjenere"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "Overstyr innstillinger for tjener"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
@@ -702,108 +768,153 @@ msgstr "Alle filer"
 msgid "Click to enlarge"
 msgstr "Klikk for å forstørre"
 
-#: ../libempathy-gtk/empathy-chat.c:178
+#: ../libempathy-gtk/empathy-chat.c:186
 msgid "Failed to reconnect this chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:396
+#: ../libempathy-gtk/empathy-chat.c:412
 msgid "Unsupported command"
-msgstr ""
+msgstr "Ikke støttet kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:531
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../libempathy-gtk/empathy-chat.c:534
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:537
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "tilgang nektet"
 
-#: ../libempathy-gtk/empathy-chat.c:540
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "meldingen er for lang"
 
-#: ../libempathy-gtk/empathy-chat.c:543
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "ikke implementert"
 
-#: ../libempathy-gtk/empathy-chat.c:546
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Feil ved sending av melding «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:580
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emnet er satt til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:582
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "Emne ikke definert"
 
-#: ../libempathy-gtk/empathy-chat.c:951
+#: ../libempathy-gtk/empathy-chat.c:969
 msgid "(No Suggestions)"
-msgstr ""
+msgstr "(Ingen forslag)"
 
-#: ../libempathy-gtk/empathy-chat.c:1005
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1023
-#: ../libempathy-gtk/empathy-ui-utils.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1483
 msgid "_Send"
 msgstr "_Send"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "_Spelling Suggestions"
-msgstr ""
+msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:1171
+#: ../libempathy-gtk/empathy-chat.c:1190
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s har blitt med i rommet"
+msgid "%s has disconnected"
+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:1197
+#, c-format
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s ble sparket av %2$s"
+
+#: ../libempathy-gtk/empathy-chat.c:1200
+#, c-format
+msgid "%s was kicked"
+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:1208
+#, c-format
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s ble bannlyst av %2$s"
+
+#: ../libempathy-gtk/empathy-chat.c:1211
+#, c-format
+msgid "%s was banned"
+msgstr "%s ble bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1215
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:1289 ../src/empathy-call-window.c:1108
+#. 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:1224
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1247
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s har blitt med i rommet"
+
+#: ../libempathy-gtk/empathy-chat.c:1380 ../src/empathy-call-window.c:1277
 msgid "Disconnected"
 msgstr "Koblet fra"
 
-#: ../libempathy-gtk/empathy-chat.c:1700
+#: ../libempathy-gtk/empathy-chat.c:1815
 msgid "Connected"
 msgstr "Koblet til"
 
-#: ../libempathy-gtk/empathy-chat.c:1750
-#: ../libempathy-gtk/empathy-log-window.c:501
+#: ../libempathy-gtk/empathy-chat.c:1865
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Samtale"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Emne:</b>"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "_Kopier lenkens adresse"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_Åpne lenke"
 
 #. 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:421
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -816,7 +927,7 @@ msgstr "Endre kontaktinformasjon"
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Ny kontakt"
 
@@ -828,66 +939,76 @@ msgstr "A_vgjør senere"
 msgid "Subscription Request"
 msgstr "Abonnementsforespørsel"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, 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:1380
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1427
-#: ../libempathy-gtk/empathy-contact-list-view.c:1505
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1457
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, 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:1459
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:135
-#: ../src/empathy-main-window.ui.h:8
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_Legg til kontakt ..."
+
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Prat"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:166
+#: ../libempathy-gtk/empathy-contact-menu.c:253
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:198
+#: ../libempathy-gtk/empathy-contact-menu.c:285
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Vis tidligere samtaler"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:259
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Send fil"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:287
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "Del mitt skrivebord"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Infor_masjon"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:314
-#: ../src/empathy-main-window.ui.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:372
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Inviterer til dette rommet"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_Inviter til praterom"
 
@@ -895,178 +1016,179 @@ msgstr "_Inviter til praterom"
 msgid "Select a contact"
 msgstr "Velg en kontakt"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:440
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Lagre personbilder"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Kan ikke lagre personbilde"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:979
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Velg"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:905
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1239
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "Country ISO Code:"
 msgstr "ISO-kode for land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1241
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1243
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "State:"
 msgstr "Tilstand:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1245
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "City:"
 msgstr "By:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1247
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1249
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Postal Code:"
 msgstr "Postkode:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1251
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Street:"
 msgstr "Gate:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1253
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Building:"
 msgstr "Bygning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1255
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "Floor:"
 msgstr "Etasje:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1257
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1259
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Accuracy Level:"
-msgstr ""
+msgstr "Nøyaktighetsnivå:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Error:"
 msgstr "Feil:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Vertical Error (meters):"
 msgstr "Vertikal feil (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Horizontal Error (meters):"
 msgstr "Horisontal feil (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Bearing:"
 msgstr "Retning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Climb Speed:"
-msgstr ""
+msgstr "Klatrehastighet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
 msgid "Last Updated on:"
 msgstr "Sist oppdatert:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
 msgid "Longitude:"
 msgstr "Lengdegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
 msgid "Latitude:"
 msgstr "Breddegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
 msgid "Altitude:"
 msgstr "Høyde:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1332
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
 msgid "<b>Location</b>"
 msgstr "<b>Lokasjon</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
 msgid "<b>Location</b>, "
 msgstr "<b>Lokasjon</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1395
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y, %R UTC"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Klientinformasjon</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Kontaktdetaljer</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Kontakt</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Grupper</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Lokasjon</b> (dato)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../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 "Konto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Fødselsdag:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "Klientinformasjon"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Kontakt"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "Kontaktdetaljer"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Fullt navn:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "Grupper"
+
 #. Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
@@ -1116,12 +1238,12 @@ msgstr "Port"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:494
-#: ../src/empathy-import-dialog.c:281
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-log-window.c:511
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Dato"
 
@@ -1157,41 +1279,83 @@ msgstr "KontaktID:"
 msgid "New Conversation"
 msgstr "Ny samtale"
 
+#. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
-#. COL_STATUS_TEXT
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
+#: ../libempathy-gtk/empathy-presence-chooser.c:176
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
 msgid "Custom Message..."
 msgstr "Egendefinert melding..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#: ../libempathy-gtk/empathy-presence-chooser.c:229
+#: ../libempathy-gtk/empathy-presence-chooser.c:231
 msgid "Edit Custom Messages..."
 msgstr "Rediger egendefinerte meldinger..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:330
 msgid "Click to remove this status as a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:339
 msgid "Click to make this status a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:373
 msgid "Set status"
 msgstr "Sett status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:778
+#: ../libempathy-gtk/empathy-presence-chooser.c:794
 msgid "Set your presence and current status"
 msgstr ""
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1013
+#: ../libempathy-gtk/empathy-presence-chooser.c:1043
 msgid "Custom messages..."
 msgstr "Egendefinerte meldinger ..."
 
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr "Mottok en lynmelding"
+
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr "Send en lynmelding"
+
+#: ../libempathy-gtk/empathy-sound.c:55
+msgid "Incoming chat request"
+msgstr "Innkommende samtaleforespørsel"
+
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr "Kontakt koblet til"
+
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr "Kontakt koblet fra"
+
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr "Koblet til tjener"
+
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "Koblet fra tjener"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
+msgstr "Innkommende samtale"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "Utgående samtale"
+
+#: ../libempathy-gtk/empathy-sound.c:69
+msgid "Voice call ended"
+msgstr "Samtale avsluttet"
+
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:362
 msgid "Enter Custom Message"
 msgstr "Oppgi egendefinert melding"
@@ -1202,89 +1366,40 @@ msgstr "Rediger egendefinerte meldinger"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
 msgid "Add _New Preset"
-msgstr ""
+msgstr "Legg til _ny forhåndsverdi"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-#, fuzzy
 msgid "Saved Presets"
-msgstr "Lagre melding"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
-msgid "gtk-add"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
-msgid "gtk-remove"
-msgstr ""
+msgstr "Lagrede forhåndsverdier"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:60
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "Klassisk"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:61
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr "Enkel"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:62
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
 msgstr "Tøm"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:63
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "Blå"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1355
+#: ../libempathy-gtk/empathy-ui-utils.c:1385
 msgid "Unable to open URI"
 msgstr "Kan ikke åpne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1445
+#: ../libempathy-gtk/empathy-ui-utils.c:1475
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1503
+#: ../libempathy-gtk/empathy-ui-utils.c:1535
 msgid "Select a destination"
 msgstr "Velg en destinasjon"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1532
-msgid "Received an instant message"
-msgstr "Mottok en lynmelding"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1534
-msgid "Sent an instant message"
-msgstr "Send en lynmelding"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1536
-msgid "Incoming chat request"
-msgstr "Innkommende samtaleforespørsel"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
-msgid "Contact connected"
-msgstr "Kontakt koblet til"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1540
-msgid "Contact disconnected"
-msgstr "Kontakt koblet fra"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1542
-msgid "Connected to server"
-msgstr "Koblet til tjener"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1544
-msgid "Disconnected from server"
-msgstr "Koblet fra tjener"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1546
-msgid "Incoming voice call"
-msgstr "Innkommende samtale"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1548
-msgid "Outgoing voice call"
-msgstr "Utgående samtale"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1550
-msgid "Voice call ended"
-msgstr "Samtale avsluttet"
-
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Aktivt locale"
@@ -1470,7 +1585,7 @@ msgid "Megaphone"
 msgstr "Megafon"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:527
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Snakk!"
 
@@ -1484,7 +1599,7 @@ msgid "_Information"
 msgstr "_Informasjon"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Brukervalg"
 
@@ -1505,20 +1620,20 @@ msgstr "Tilstedeværelse"
 msgid "Set your own presence"
 msgstr "Velg din egen tilstedeværelse"
 
-#: ../src/empathy.c:476
+#: ../src/empathy.c:569
 msgid "Don't connect on startup"
 msgstr "Ikke koble til ved oppstart"
 
-#: ../src/empathy.c:480
+#: ../src/empathy.c:573
 msgid "Don't show the contact list on startup"
 msgstr "Ikke vis kontaktlisten ved oppstart"
 
-#: ../src/empathy.c:484
+#: ../src/empathy.c:577
 msgid "Show the accounts dialog"
 msgstr "Vis kontovinduet"
 
-#: ../src/empathy.c:496
-msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:589
+msgid "- Empathy IM Client"
 msgstr "- Empathy lynmeldingsprogram"
 
 #: ../src/empathy-about-dialog.c:83
@@ -1569,17 +1684,17 @@ msgstr ""
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Kontoer"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:836
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Ny %s-konto"
 
-#: ../src/empathy-accounts-dialog.c:947
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1588,7 +1703,7 @@ msgstr ""
 "Du holder på å fjerne din %s-konto!\n"
 "Er du sikker på at du vil dette?"
 
-#: ../src/empathy-accounts-dialog.c:953
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1601,30 +1716,30 @@ msgstr ""
 "\n"
 "Skulle du velge å legge til kontoen senere, vil de bli tilgjengelige igjen."
 
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Ny konto</b>"
-
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Ingen protokoll installert</b>"
+msgid "Add Account"
+msgstr "Legg til konto"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Innstillinger</b>"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Cr_eate"
 msgstr "Oppr_ett"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "I already have an account I want to use"
-msgstr "Jeg har allerede en konto jeg vil bruke"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail:"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "Importer kontoer..."
 
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Ingen protokoll installert"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "Innstillinger"
+
 #: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
@@ -1641,53 +1756,64 @@ msgstr "Type:"
 msgid "_Add..."
 msgstr "_Legg til..."
 
-#: ../src/empathy-call-window.c:63
-msgid "Connecting..."
-msgstr "Kobler til..."
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "_Lag en ny konto"
 
-#: ../src/empathy-call-window.c:405
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "Gjenb_ruk en eksisterende konto"
+
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-call-window.c:408
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "Lysstyrke"
 
-#: ../src/empathy-call-window.c:411
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:516
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "Volum"
 
-#: ../src/empathy-call-window.c:697
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "Kobler til..."
+
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "_Sidelinje"
 
-#: ../src/empathy-call-window.c:716
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "Nummertavle"
 
-#: ../src/empathy-call-window.c:722
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
-msgstr ""
+msgstr "Lydinngang"
 
-#: ../src/empathy-call-window.c:726
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
-msgstr ""
+msgstr "Videoinngang"
 
-#: ../src/empathy-call-window.c:789
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
 #, c-format
 msgid "Call with %s"
 msgstr "Samtale med %s"
 
-#: ../src/empathy-call-window.c:860
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
 msgid "Call"
 msgstr "Ring"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1204
+#: ../src/empathy-call-window.c:1390
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Koblet til - %d:%02dm"
@@ -1716,27 +1842,79 @@ msgstr "Forhåndsvis video"
 msgid "_Call"
 msgstr "_Ring"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/empathy-chat-window.c:342
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Samtaler (%d)"
 
-#: ../src/empathy-chat-window.c:470
-msgid "Topic:"
-msgstr "Emne:"
-
-#: ../src/empathy-chat-window.c:474
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Skriver en melding"
 
-#: ../src/empathy-chat-window.c:935 ../src/empathy-event-manager.c:429
-#, c-format
-msgid "New message from %s"
-msgstr "Ny melding fra %s"
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "_Tøm"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "Prat"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Sett inn _smilefjes"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "Flytt fane til _venstre"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "Flytt fane til høy_re"
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "_Innhold"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "_Samtale"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "_Detach Tab"
+msgstr "Riv _løs fane"
+
+#: ../src/empathy-chat-window.ui.h:11
+#, fuzzy
+msgid "_Favorite Chatroom"
+msgstr "_Inviter til praterom"
+
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr "_Neste fane"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "_Forrige samtaler"
+
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "Vi_s kontaktliste"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "_Faner"
 
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
@@ -1754,75 +1932,75 @@ msgstr "Koble til automatisk"
 msgid "Manage Favorite Rooms"
 msgstr "Håndter favorittrom"
 
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s ringer deg. Vil du svare?"
 
-#: ../src/empathy-event-manager.c:387
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "Av_vis"
 
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "Sv_ar"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Innkommende samtale fra %s"
 
-#: ../src/empathy-event-manager.c:547
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s tilbyr deg en invitasjon"
 
-#: ../src/empathy-event-manager.c:553
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "Et eksternt program vil bli startet for å håndtere den."
 
-#: ../src/empathy-event-manager.c:558
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "Du har ikke nødvendig eksternt program som kan håndtere dette."
 
-#: ../src/empathy-event-manager.c:685
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Invitasjon til rom"
 
-#: ../src/empathy-event-manager.c:688
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:696
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "_Avslå"
 
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:650
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/empathy-event-manager.c:740
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Innkommende filoverføring fra %s"
 
-#: ../src/empathy-event-manager.c:946
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Abonnement forespurt av %s"
 
-#: ../src/empathy-event-manager.c:950
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1831,6 +2009,18 @@ msgstr ""
 "\n"
 "Melding: %s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s er nå frakoblet."
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s er nå tilkoblet."
+
 #. Translators: time left, when it is more than one hour
 #: ../src/empathy-ft-manager.c:101
 #, c-format
@@ -1935,7 +2125,7 @@ msgid "Remaining"
 msgstr "Gjenstår"
 
 #: ../src/empathy-ft-manager.ui.h:1
-msgid "File transfers"
+msgid "File Transfers"
 msgstr "Filoverføringer"
 
 #: ../src/empathy-ft-manager.ui.h:2
@@ -1943,19 +2133,19 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Fjerning fullført. Filoverføringer fra listen er avbrutt og feilet"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:259
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/empathy-import-dialog.c:268
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-dialog.c:294
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-import-dialog.c:388
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1965,71 +2155,67 @@ msgstr "Fant ingen kontoer å importere. Empathy støtter kun import fra Pidgin.
 msgid "Import Accounts"
 msgstr "Importer kontoer"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "R_ediger konto"
 
-#: ../src/empathy-main-window.c:498
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Ingen feil oppgitt"
 
-#: ../src/empathy-main-window.c:501
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Nettverksfeil"
 
-#: ../src/empathy-main-window.c:504
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Autentiseringen feilet"
 
-#: ../src/empathy-main-window.c:507
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Krypteringsfeil"
 
-#: ../src/empathy-main-window.c:510
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Navn i bruk"
 
-#: ../src/empathy-main-window.c:513
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"
 
-#: ../src/empathy-main-window.c:516
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikat"
 
-#: ../src/empathy-main-window.c:519
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Sertifikat utgått"
 
-#: ../src/empathy-main-window.c:522
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Sertifikat ikke aktivert"
 
-#: ../src/empathy-main-window.c:525
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn i forhold til sertifikat"
 
-#: ../src/empathy-main-window.c:528
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingeravtrykk stemmer ikke for sertifikat"
 
-#: ../src/empathy-main-window.c:531
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Selvsignert sertifikat"
 
-#: ../src/empathy-main-window.c:534
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 
-#: ../src/empathy-main-window.c:537
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../src/empathy-main-window.c:888
-msgid "Contact"
-msgstr "Kontakt"
-
-#: ../src/empathy-main-window.c:1220
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Vis og rediger kontoer"
 
@@ -2054,63 +2240,70 @@ msgid "Manage Favorites"
 msgstr "Håndter favoritter"
 
 #: ../src/empathy-main-window.ui.h:6
-msgid "_Accounts"
-msgstr "_Kontoer"
+msgid "N_ormal Size"
+msgstr "N_ormal størrelse"
 
 #: ../src/empathy-main-window.ui.h:7
-msgid "_Add Contact..."
-msgstr "_Legg til kontakt ..."
+msgid "Normal Size With _Avatars"
+msgstr "Normal størrelse med _avatarer"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Sorter på _navn"
 
 #: ../src/empathy-main-window.ui.h:9
-msgid "_Contents"
-msgstr "_Innhold"
+msgid "Sort by _Status"
+msgstr "Sorter på _status"
 
 #: ../src/empathy-main-window.ui.h:10
+msgid "_Accounts"
+msgstr "_Kontoer"
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "_Kompakt størrelse"
+
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
 msgstr "_Feilsøk"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:17
 msgid "_File Transfers"
 msgstr "_Filoverføringer"
 
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: ../src/empathy-main-window.ui.h:14
-#, fuzzy
+#: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
-msgstr "Bli med i _ny ..."
+msgstr "_Bli med..."
 
-#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_Ny samtale..."
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:21
 msgid "_Offline Contacts"
 msgstr "Frak_oblede kontakter"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "Personlig _informasjon"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Previous Conversations"
 msgstr "_Tidligere samtaler"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Rom"
 
-#: ../src/empathy-new-chatroom-dialog.c:332
+#: ../src/empathy-new-chatroom-dialog.c:331
 msgid "Chat Room"
 msgstr "Samtalerom"
 
-#: ../src/empathy-new-chatroom-dialog.c:348
+#: ../src/empathy-new-chatroom-dialog.c:347
 msgid "Members"
 msgstr "Medlemmer"
 
-#: ../src/empathy-new-chatroom-dialog.c:492
+#: ../src/empathy-new-chatroom-dialog.c:496
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2122,27 +2315,27 @@ msgid ""
 "Members: %s"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#: ../src/empathy-new-chatroom-dialog.c:495
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
 msgid "No"
 msgstr "Nei"
 
-#: ../src/empathy-new-chatroom-dialog.c:522
+#: ../src/empathy-new-chatroom-dialog.c:526
 msgid "Could not start room listing"
-msgstr ""
+msgstr "Kunne ikke starte romliste"
 
-#: ../src/empathy-new-chatroom-dialog.c:532
+#: ../src/empathy-new-chatroom-dialog.c:536
 msgid "Could not stop room listing"
-msgstr ""
+msgstr "Kune ikke stoppe romliste"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "Couldn't load room list"
-msgstr ""
+msgstr "Kunne ikke laste romliste"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -2165,196 +2358,180 @@ msgid "Join Room"
 msgstr "Rom"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
-#, fuzzy
 msgid "Room List"
-msgstr "Locale for _romliste:"
+msgstr "Romliste"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "_Room:"
 msgstr "_Rom:"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:148
 msgid "Message received"
 msgstr "Melding mottatt"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:149
 msgid "Message sent"
 msgstr "Melding sendt"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:150
 msgid "New conversation"
 msgstr "Ny samtale"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes online"
 msgstr "Kontakt kobler til"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:152
 msgid "Contact goes offline"
 msgstr "Kontakt kobler fra"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:153
 msgid "Account connected"
 msgstr "Konto koblet til"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:154
 msgid "Account disconnected"
 msgstr "Konto koblet fra"
 
-#: ../src/empathy-preferences.c:435
+#: ../src/empathy-preferences.c:394
 msgid "Language"
 msgstr "Språk"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Utseende</b>"
+msgid "Allow _GPS usage"
+msgstr "Tillat bruk av _GPS"
 
 #: ../src/empathy-preferences.ui.h:2
-#, fuzzy
-msgid "<b>Behavior</b>"
-msgstr "<b>Oppførsel</b>"
+msgid "Allow _cellphone usage"
+msgstr "Tillat bruk av _mobiltelefon"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Kontaktliste</b>"
+msgid "Allow _network usage"
+msgstr "Tillat bruk av _nettverk"
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Slå på stavekontroll for språkene:</b>"
+msgid "Appearance"
+msgstr "Utseende"
 
 #: ../src/empathy-preferences.ui.h:5
-#, fuzzy
-msgid "<b>Geoclue Settings</b>"
-msgstr "<b>Innstillinger</b>"
+msgid "Automatically _connect on startup "
+msgstr "_Koble til automatisk ved oppstart "
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Spill av lyd for hendelser</b>"
+msgid "Behavior"
+msgstr "Oppførsel"
 
 #: ../src/empathy-preferences.ui.h:7
-#, fuzzy
-msgid "<b>Privacy</b>"
-msgstr "<b>Avansert</b>"
+msgid "Chat Th_eme:"
+msgstr "Samtale_tema:"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid ""
-"<small>Reduced location accuracy means that nothing more precise than your "
-"city, state and country will be published.  GPS coordinates will have a "
-"random value added (&#xB1;0.25&#xB0;).</small>"
-msgstr ""
+msgid "Disable notifications when _away or busy"
+msgstr "Slå av varsling når du er borte eller oppt_att"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr ""
-"<small>Denne listen listen viser bare de språkene det er installert ordliste "
-"for."
+msgid "Disable sounds when _away or busy"
+msgstr "Slå av lyder når du er b_orte eller opptatt"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Allow _GPS usage"
-msgstr ""
+msgid "Enable notifications when a contact comes online"
+msgstr "Slå på varsling når en kontakt kobler seg til"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Allow _cellphone usage"
-msgstr ""
+msgid "Enable notifications when a contact goes offline"
+msgstr "Slå på varsling når en kontakt kobler seg fra"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Allow _network usage"
+msgid "Enable notifications when the _chat is not focused"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Automatically _connect on startup "
-msgstr "_Koble til automatisk ved oppstart "
+msgid "Enable spell checking for languages:"
+msgstr "Slå på stavekontroll for språk:"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "Personbilder er valgt av brukerne for å vise i kontaktlisten"
+msgid "General"
+msgstr "Generelt"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Chat Th_eme:"
-msgstr "Samtale_tema:"
+msgid "Geoclue Settings"
+msgstr "Innstillinger for Geoclue"
 
 #: ../src/empathy-preferences.ui.h:16
-#, fuzzy
-msgid "Disable notifications when _away or busy"
-msgstr "Slå av lyder når du er b_orte eller opptatt"
+msgid "Location"
+msgstr "Sted"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Disable sounds when _away or busy"
-msgstr "Slå av lyder når du er b_orte eller opptatt"
+msgid "Notifications"
+msgstr "Varsling"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Enable notifications when the _chat is not focused"
-msgstr ""
+msgid "Play sound for events"
+msgstr "Spill av lyd for hendelser"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "General"
-msgstr "Generelt"
+msgid "Preferences"
+msgstr "Brukervalg"
 
 #: ../src/empathy-preferences.ui.h:20
 #, fuzzy
-msgid "Location"
-msgstr "Varsling"
+msgid "Privacy"
+msgstr "<b>Avansert</b>"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Notifications"
-msgstr "Varsling"
+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
-msgid "Preferences"
-msgstr "Brukervalg"
-
-#: ../src/empathy-preferences.ui.h:23
-msgid "Show _avatars"
-msgstr "Vis person_bilder"
-
-#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Vis _smilefjes som bilder"
 
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show co_mpact contact list"
-msgstr "Vis ko_mpakt kontaktliste"
-
-#: ../src/empathy-preferences.ui.h:26
-msgid "Sort by _name"
-msgstr "Sorter på _navn"
-
-#: ../src/empathy-preferences.ui.h:27
-msgid "Sort by s_tate"
-msgstr "Sorter på s_tatus"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "Vis kontakt_liste i rom"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Lyder"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:26
+#, fuzzy
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"<small>Denne listen listen viser bare de språkene det er installert ordliste "
+"for."
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Temaer"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:28
 #, fuzzy
 msgid "_Enable bubble notifications"
 msgstr "_Aktiver varsling med lyder"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "_Aktiver varsling med lyder"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Åpne nye samtaler i egne vinduer"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Publish location to my contacts"
-msgstr ""
+msgstr "_Publiser lokasjon til mine kontakter"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Reduce location accuracy"
 msgstr ""
 
@@ -2366,10 +2543,6 @@ msgstr "Status"
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Show Contact List"
-msgstr "Vi_s kontaktliste"
-
 #: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
@@ -2384,73 +2557,69 @@ msgstr ""
 "En invitasjon ble sendt for tjeneste %s, men du har ikke programmet som "
 "kreves for denne."
 
-#: ../src/empathy-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr ""
-
 #: ../src/empathy-map-view.ui.h:1
 #, fuzzy
 msgid "Contact Map View"
 msgstr "Kontaktliste"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1075
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1069
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1063
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1057
-#: ../src/empathy-debug-dialog.c:1105
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1051
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1045
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../src/empathy-debug-dialog.c:837
+#: ../src/empathy-debug-dialog.c:845
 msgid "Save"
 msgstr "Lagre"
 
-#: ../src/empathy-debug-dialog.c:940
+#: ../src/empathy-debug-dialog.c:948
 msgid "Debug Window"
 msgstr "Feilsøkingsvindu"
 
-#: ../src/empathy-debug-dialog.c:1013
+#: ../src/empathy-debug-dialog.c:1021
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-dialog.c:1025
+#: ../src/empathy-debug-dialog.c:1033
 msgid "Level "
 msgstr "Nivå "
 
-#: ../src/empathy-debug-dialog.c:1094
+#: ../src/empathy-debug-dialog.c:1102
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/empathy-debug-dialog.c:1096
+#: ../src/empathy-debug-dialog.c:1104
 msgid "Domain"
 msgstr "Domene"
 
-#: ../src/empathy-debug-dialog.c:1098
+#: ../src/empathy-debug-dialog.c:1106
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-dialog.c:1100
+#: ../src/empathy-debug-dialog.c:1108
 msgid "Level"
 msgstr "Nivå"
 
-#: ../src/empathy-debug-dialog.c:1132
+#: ../src/empathy-debug-dialog.c:1140
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
diff --git a/po/or.po b/po/or.po
index d89ee2e2a..2fabc6250 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,4 +1,4 @@
-# translation of empathy.po.master.or.po to Oriya
+# translation of empathy.master.or.po to Oriya
 # Oriya translation of empathy.
 # Copyright (C) 2009 empathy's COPYRIGHT HOLDER
 # This file is distributed under the same license as the empathy package.
@@ -6,24 +6,27 @@
 # Manoj Kumar Giri <mgiri@redhat.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy.po.master.or\n"
+"Project-Id-Version: empathy.master.or\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2009-07-01 13:43+0000\n"
-"PO-Revision-Date: 2009-07-01 19:21+0530\n"
+"POT-Creation-Date: 2009-08-09 09:28+0000\n"
+"PO-Revision-Date: 2009-08-12 14:55+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <oriya-it@googlegroups.com>\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\n"
+"\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Empathy ତୀବ୍ର ସନ୍ଦେଶ ବାହକ"
+msgid "Empathy IM Client"
+msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+#, fuzzy
+#| msgid "Send and receive instant messages"
+msgid "Send and receive messages"
 msgstr "ତୁରନ୍ତ ସନ୍ଦେଶଗୁଡ଼ିକୁ ପଠାନ୍ତୁ ଏବଂ ଗ୍ରହଣ କରନ୍ତୁ"
 
 #: ../data/empathy.schemas.in.h:1
@@ -103,290 +106,296 @@ msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy ଚାର୍ଟ ୱିଣ୍ଡୋ ଚିତ୍ର ସଂକେତ ପରି ସମ୍ପର୍କର ଅବତାରକୁ ବ୍ୟବହାର କରିବା ଉଚିତ"
 
 #: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "ନୂତନ ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ପପଅପ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "ବନାନ ଯାଞ୍ଚକର୍ତ୍ତାକୁ ସକ୍ରିୟ କରନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "ମୁଖ୍ଯ ୱିଣ୍ଡୋ ଲୁଚାନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "ମୁଖ୍ଯ ୱିଣ୍ଡୋ ଲୁଚାନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "ନେଟୱର୍କ ପରିଚାଳକଙ୍କୁ ବ୍ୟବହାର କରିବା ଉଚିତ"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "ଉପନାମ ସମ୍ପୂର୍ଣ୍ଣ ଅକ୍ଷର"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "ନୁଆ ଚାଟଗୁଡ଼ିକ ଅଲଗା ୱିଣ୍ଡୋରେ ଖୋଲନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
 msgid "Path of the adium theme to use"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:28
 msgid "Path of the adium theme to use if the theme used for chat is adium."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "ଆଗତ ସନ୍ଦେଶ ପାଇଁ ଏକ ଶବ୍ଦ ଚଲାନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "ନୂତନ ବାର୍ତ୍ତାଳାପ ପାଇଁ ଧ୍ୱନି ଚଲାନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "ଯାଉଥିବା ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ଧ୍ୱନି ଚଲାନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "ଗୋଟିଏ ସମ୍ପର୍କ ଲଗ ଇନ ହୋଇସାରିବା ପରେ ଧ୍ୱନି ଚଲାନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "ଗୋଟିଏ ସମ୍ପର୍କ ଲଗ ଆଉଟ ହୋଇସାରିବା ପରେ ଧ୍ୱନି ଚଲାନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "ଆମ୍ଭେ ଲଗଇନ୍ କରିବାବେଳେ ଏକ ଶବ୍ଦ ଚଲାନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "ଆମ୍ଭେ ଲଗଆଉଟ କରିବାବେଳେ ଏକ ଶବ୍ଦ ଚଲାନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "ପପଅପ ବିଜ୍ଞପ୍ତି ଯଦି ଚାର୍ଟ ଲକ୍ଷ୍ୟ ହୋଇନାହିଁ"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:37
 msgid "Popup notifications when a contact sign in"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:38
 msgid "Popup notifications when a contact sign out"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "ସେଲ୍ୟୁଟ ଖାତା ନିର୍ମିତ ହୋଇଛି"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "ଅବତାର ଦେଖାନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:41
 msgid "Show contact list in rooms"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "ମୁଖ୍ଯ ୱିଣ୍ଡୋ ବନ୍ଦ କରିବା ପାଇଁ ଆଭାସ ଦିଅନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "ଅଫଲାଇନ ସମ୍ପର୍କ ଦେଖାଅ"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "ବନାନ ଯାଞ୍ଚକାରୀ ଭାଷାଗୁଡ଼ିକ"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "ଫାଇଲ ପରିବହନକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଫୋଲଡର।"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ଅଭତାର ପ୍ରତିଛବି ଦ୍ୱାରା ବଛାଯାଇଥିବା ଶେଷ ଡିରେକ୍ଟୋରୀ।"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ଚାର୍ଟ ୱିଣ୍ଡୋରେ ବାର୍ତ୍ତାଳାପକୁ ଦର୍ଶାଯାଇବା ପାଇଁ ବ୍ୟବହୃତ ପ୍ରସଙ୍ଗ।"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "ଆଲେଖୀ ସ୍ମାଇଲିଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "ବିଜ୍ଞପ୍ତ ଶବ୍ଦ ଉପଯୋଗ କରନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "ଚାଟ ଘରଗୁଡ଼ିକ ପାଇଁ ପ୍ରସଙ୍ଗ ଉପଯୋଗ କରନ୍ତୁ"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:51
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:53
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:54
 msgid "Whether or not Empathy can use the cellular network to guess the location."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Empathy ଅନ୍ୟ ପ୍ରଗ୍ରାମଗୁଡ଼ିକରୁ ଖାତା ଆମଦାନୀ ପାଇଁ ଅନୁରୋଧ କରିବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "ଆରମ୍ଭରେ Empathy ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଆପଣଙ୍କ ଖାତାରେ ଲଗଇନ ହେବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "Empathy ସମ୍ପର୍କର ଅଭତାରକୁ ଚାର୍ଟ ୱିଣ୍ଡୋ ଚିତ୍ରସଂକେତ ଭାବରେ ବ୍ୟବହାର କରିବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
 msgid "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "ପ୍ରଥମ Empathy ଚାଳନାରେ ସେଲ୍ୟୁଟ ଖାତା ନିର୍ମାଣ କରିବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
 msgstr "ନେଟୱର୍କ ପରିଚାଳକ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ/ସଂଯୋଗ ସ୍ଥାପନ କରିବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "ଆପଣ ଯାଞ୍ଚ କରିବାକୁ ଚାହୁଁଥିବା ଭାଷାର ଶବ୍ଦ ପ୍ରକାରକୁ ଯାଞ୍ଚ କରିବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:63
 msgid "Whether or not to convert smileys into graphical images in conversations."
 msgstr "ବାର୍ତ୍ତାଳାପରେ ଆଲେଖୀ ପ୍ରତିଛବିଗୁଡ଼ିକୁ ସ୍ମାଇଲି ପରିବର୍ତ୍ତନ କରିବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:64
 msgid "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "ନେଟୱର୍କରେ ଲଗଇନ ହେଉଥିବା ସମ୍ପର୍କଗୁଡ଼ିକୁ ବିଜ୍ଞପ୍ତି ଦେବା ପାଇଁ ଧ୍ୱନି ଚଲାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "ନେଟୱର୍କରେ ଲଗଅଫ ହେଉଥିବା ସମ୍ପର୍କଗୁଡ଼ିକୁ ବିଜ୍ଞପ୍ତି ଦେବା ପାଇଁ ଧ୍ୱନି ଚଲାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "ଘଟଣାଗୁଡ଼ିକ ପାଇଁ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "ଆସୁଥିବା ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "ନୂତନ ବାର୍ତ୍ତାଳାପ ପାଇଁ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "ପଠାଯାଉଥିବା ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "ନେଟୱର୍କରେ ଲଗଇନ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "ନେଟୱର୍କରେ ଲଗଅଫ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "ଦୂରରେ ଥିବା ସମୟରେ କିମ୍ବା ବ୍ୟସ୍ତ ଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
 msgid "Whether or not to show a popup notification when a contact goes offline."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to show a popup notification when a contact goes online."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not 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:74
+#: ../data/empathy.schemas.in.h:76
 msgid "Whether or not to show a popup notification when receiving a new message."
 msgstr "ନୂତନ ସନ୍ଦେଶ ଗ୍ରହଣ କରିବା ସମୟରେ ପପଅପ ବିଜ୍ଞପ୍ତି ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "ସମ୍ପର୍କ ତାଲିକା ଏବଂ ଚାର୍ଟ ୱିଣ୍ଡୋରେ ସମ୍ପର୍କଗୁଡ଼ିକ ପାଇଁ ଅଭତାରଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "ସମ୍ପର୍କ ତାଲିକାରେ ଅଫଲାଇନ ଥିବା ସମ୍ପର୍କଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "ଦୂରରେ ଥିବା ସମୟରେ କିମ୍ବା ବ୍ୟସ୍ତ ଥିବା ସମୟରେ ପପଅପ ବିଜ୍ଞପ୍ତିକୁ ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
 msgid "Whether or not to show the contact list in chat rooms."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:79
+#: ../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."
-msgstr ""
-"ଶୀର୍ଷକ ପଟିରେ 'x' ବଟନ ସହିତ ମୂଖ୍ୟ ୱିଣ୍ଡୋକୁ ବନ୍ଦ କରିବା ପରେ ସନ୍ଦେଶ ସଂଳାପକୁ "
-"ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
+msgstr "ଶୀର୍ଷକ ପଟିରେ 'x' ବଟନ ସହିତ ମୂଖ୍ୟ ୱିଣ୍ଡୋକୁ ବନ୍ଦ କରିବା ପରେ ସନ୍ଦେଶ ସଂଳାପକୁ ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "ସମ୍ପର୍କ ତାଲିକାକୁ ସଂଗୁପ୍ତ ଧାରାରେ ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "ଚାର୍ଟରୁମ ପାଇଁ ପ୍ରସଙ୍ଗକୁ ବ୍ୟବହାର କରିବା ଉଚିତ କି ନୁହଁ।"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:84
 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."
 msgstr ""
 "ଯୋଗାଯୋଗ ତାଲିକାକୁ ସଜାଡ଼ିବା ସମୟରେ କେଉଁ ମାନଦଣ୍ଡକୁ ବ୍ୟବହାର କରିବା ଉଚିତ। ପୂର୍ବନିର୍ଦ୍ଧାରିତଟି ହେଉଛି "
-"ସମ୍ପର୍କନାମ ସହିତ ମୂଲ୍ୟ \"ନାମ\"କୁ ସଜାଡ଼ିବା। \"state\" ର ଗୋଟିଏ ମୂଲ୍ୟକୁ ଅବସ୍ଥା ଦ୍ୱାରା ଯୋଗାଯୋଗ ତାଲିକା "
-"ଅନୁସାରେ ସଜାଡ଼ିବା।"
+"ସମ୍ପର୍କନାମ ସହିତ ମୂଲ୍ୟ \"ନାମ\"କୁ ସଜାଡ଼ିବା। \"state\" ର ଗୋଟିଏ ମୂଲ୍ୟକୁ ଅବସ୍ଥା ଦ୍ୱାରା ଯୋଗାଯୋଗ "
+"ତାଲିକା ଅନୁସାରେ ସଜାଡ଼ିବା।"
 
 #: ../libempathy/empathy-ft-handler.c:838
 msgid "The hash of the received file and the sent one do not match"
@@ -404,7 +413,7 @@ msgstr ""
 msgid "The selected file is empty"
 msgstr ""
 
-#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "ନିକଟବର୍ତୀ ଲୋକ"
 
@@ -506,7 +515,7 @@ msgstr[1] "%d ମାସ ପୂର୍ବେ"
 msgid "in the future"
 msgstr "ଭବିଷ୍ୟତରେ"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:419
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "ସମସ୍ତ"
 
@@ -726,85 +735,121 @@ msgstr "ବଡ଼କରିବା ପାଇଁ କ୍ଲିକ କରନ୍ତୁ
 msgid "Failed to reconnect this chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:404
+#: ../libempathy-gtk/empathy-chat.c:412
 msgid "Unsupported command"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "ଅଫ ଲାଇନ"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "ତ୍ରୁଟିପୁର୍ଣ୍ଣ ସମ୍ପର୍କ"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "ଅନୁମତି ନାହିଁ"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "ଅତ୍ଯାଧିକ ଲମ୍ବା ସନ୍ଦେଶ"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "ନିଷ୍ପାଦନ କରାଯାଇ ନାହିଁ"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "ଅଜଣା"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "ସନ୍ଦେଶ ପଠାଇବାରେ ତ୍ରୁଟି '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ରେ ବିଷୟ ସେଟ କରାଯାଇଥାଏ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "କୌଣସି ବିଷୟ ବ୍ୟାଖ୍ୟା କରାଯାଇନାହିଁ"
 
-#: ../libempathy-gtk/empathy-chat.c:959
+#: ../libempathy-gtk/empathy-chat.c:969
 msgid "(No Suggestions)"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1013
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Smiley କୁ ଭର୍ତ୍ତି କରନ୍ତୁ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1031
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "ପଠାନ୍ତୁ (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "_Spelling Suggestions"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1190
+#, fuzzy, c-format
+#| msgid "Contact disconnected"
+msgid "%s has disconnected"
+msgstr "ସମ୍ପର୍କ ବିଚ୍ଛିନ୍ନ"
+
+#: ../libempathy-gtk/empathy-chat.c:1194
+#, c-format
+msgid "%s was kicked by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1197
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s କଠୋରିରେ ଯୋଗଦାନ କରିଛନ୍ତି"
+msgid "%s was kicked"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "%s କଠୋରିକୁ ପ୍ରସ୍ଥାନ କରିସାରିଛନ୍ତି"
 
-#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1226
+#. 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:1218
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s କଠୋରିରେ ଯୋଗଦାନ କରିଛନ୍ତି"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
 msgid "Disconnected"
 msgstr "ଅସଂଯୋଜିତ"
 
-#: ../libempathy-gtk/empathy-chat.c:1742
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "ସଂଯୋଗିତ"
 
-#: ../libempathy-gtk/empathy-chat.c:1792
+#: ../libempathy-gtk/empathy-chat.c:1859
 #: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "କଥୋପକଥନ"
@@ -813,11 +858,15 @@ msgstr "କଥୋପକଥନ"
 msgid "Topic:"
 msgstr "ବିଷୟ:"
 
+#. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "ସଂଯୋଗ ଠିକଣାକୁ ନକଲ କରନ୍ତୁ (_C)"
 
+#. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "ସଂଯୋଗକୁ ଖୋଲନ୍ତୁ (_O)"
 
@@ -836,7 +885,7 @@ msgstr "ସମ୍ପର୍କ ସୂଚନା ସମ୍ପାଦିତ କରନ
 msgid "Personal Information"
 msgstr "ବ୍ଯକ୍ତିଗତ ସୂଚନା"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:384
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "ନୂତନ ସମ୍ପର୍କ"
 
@@ -848,66 +897,76 @@ msgstr "ପରେ ସିଦ୍ଧାନ୍ତ କରନ୍ତୁ (_L)"
 msgid "Subscription Request"
 msgstr "କ୍ରୟ ଅନୁରୋଧ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ଆପଣ ପ୍ରକୃତରେ ସେହି ଶ୍ରେଣୀ '%s'କୁ କାଢ଼ିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "ସମୂହ କଢ଼ାହେଉଛି"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1424
-#: ../libempathy-gtk/empathy-contact-list-view.c:1502
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "ଅପସାରଣ କରନ୍ତୁ (_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1454
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "ଆପଣ ପ୍ରକୃତରେ ସେହି ସମ୍ପର୍କ '%s'କୁ କାଢ଼ିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1456
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "ସମ୍ପର୍କ କଢ଼ାହେଉଛି"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:135
-#: ../src/empathy-main-window.ui.h:8
+#: ../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:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "ଆଳାପ (_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:166
+#: ../libempathy-gtk/empathy-contact-menu.c:253
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-menu.c:198
+#: ../libempathy-gtk/empathy-contact-menu.c:285
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "ପୁର୍ବତନ କଥୋପକଥନ ଦେଖନ୍ତୁ (_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:259
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "ଫାଇଲ ପଠାନ୍ତୁ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:287
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "ସୂଚନା (_m)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:314
-#: ../src/empathy-main-window.ui.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:372
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "ଏହି କଠୋରିକୁ ଆମନ୍ତ୍ରଣ କରୁଅଛି"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "ଚାର୍ଟ କଠୋରିକୁ ଆମନ୍ତ୍ରଣ କରୁଅଛି (_I)"
 
@@ -915,128 +974,128 @@ msgstr "ଚାର୍ଟ କଠୋରିକୁ ଆମନ୍ତ୍ରଣ କରୁ
 msgid "Select a contact"
 msgstr "ଏକ ସମ୍ପର୍କ ଚୟନ କରନ୍ତୁ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:440
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "ଅବତାର ସଂରକ୍ଷଣ କରନ୍ତୁ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "ଅବତାର ସଂରକ୍ଷଣ କରିବାରେ ବିଫଳ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:979
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "ମନୋନୀତ କର"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:903
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "ସମୂହ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1239
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "Country ISO Code:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1241
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "Country:"
 msgstr "ଦେଶ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1243
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "State:"
 msgstr "ସ୍ଥିତି:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1245
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "City:"
 msgstr "ମହାନଗର:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1247
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Area:"
 msgstr "ଅଂଚଳ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1249
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Postal Code:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1251
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Street:"
 msgstr "ସାହି:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1253
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Building:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1255
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "Floor:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1257
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Room:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1259
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "Text:"
 msgstr "ଟେକ୍ସଟ: "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Description:"
 msgstr "ବର୍ଣ୍ଣନା:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "URI:"
 msgstr "ୟୁ.ଆର.ଆଇ.:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Accuracy Level:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Error:"
 msgstr "ତୃଟି:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Vertical Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Horizontal Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Speed:"
 msgstr "ବେଗ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Bearing:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Climb Speed:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
 msgid "Last Updated on:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
 msgid "Longitude:"
 msgstr "ଦ୍ରାଘିମା:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
 msgid "Latitude:"
 msgstr "ଅକ୍ଷାଂଶ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
 msgid "Altitude:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1332
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
 msgid "<b>Location</b>"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
 msgid "<b>Location</b>, "
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1395
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
 msgid "%B %e, %Y at %R UTC"
 msgstr ""
 
@@ -1068,7 +1127,7 @@ msgid "Client:"
 msgstr "ଗ୍ରାହକ:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:886
+#: ../src/empathy-main-window.c:1006
 msgid "Contact"
 msgstr "ସମ୍ପର୍କ"
 
@@ -1106,8 +1165,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 ""
-"ସେହି ସମୂହକୁ ବାଛନ୍ତୁ ଯେଉଁଥିରେ ଆପଣ ଏହାକୁ ଦୃଶ୍ୟମାନ କରିବାକୁ ଚାହୁଁଛନ୍ତି।  ମନେରଖନ୍ତୁ ଯେ "
-"ଆପଣ ଗୋଟିଏରୁ ଅଧିକ ଶ୍ରେଣୀ ଅଥବା କୌଣସି ଶ୍ରେଣୀ ବିନା ବାଛି ପାରିବେ।"
+"ସେହି ସମୂହକୁ ବାଛନ୍ତୁ ଯେଉଁଥିରେ ଆପଣ ଏହାକୁ ଦୃଶ୍ୟମାନ କରିବାକୁ ଚାହୁଁଛନ୍ତି।  ମନେରଖନ୍ତୁ ଯେ ଆପଣ ଗୋଟିଏରୁ "
+"ଅଧିକ ଶ୍ରେଣୀ ଅଥବା କୌଣସି ଶ୍ରେଣୀ ବିନା ବାଛି ପାରିବେ।"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
@@ -1178,16 +1237,18 @@ msgstr "ସମ୍ପର୍କ ID:"
 msgid "New Conversation"
 msgstr "ନୁଆ କଥୋପକଥନ"
 
+#. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
-#. COL_STATUS_TEXT
 #. 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 ""
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
 #: ../libempathy-gtk/empathy-presence-chooser.c:227
 msgid "Edit Custom Messages..."
 msgstr ""
@@ -1277,35 +1338,31 @@ msgstr ""
 msgid "gtk-remove"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:66
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "ଚିରପ୍ରତିଷ୍ଠିତ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr "ସରଳ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
 msgstr "ସଫା"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "ନୀଳ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Adium"
-msgstr "ଅଡିଅମ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1377
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
 msgid "Unable to open URI"
 msgstr "ୟୁ.ଆର୍.ଆଇ. ଖୋଲିବାରେ ଅସମର୍ଥ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1467
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
 msgid "Select a file"
 msgstr "ଏକ ଫାଇଲ ମନୋନୀତ କର"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1525
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
 msgid "Select a destination"
 msgstr ""
 
@@ -1506,7 +1563,7 @@ msgid "_Information"
 msgstr "ସୂଚନା (_I)"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "ପସନ୍ଦ (_P)"
 
@@ -1527,20 +1584,22 @@ msgstr "ଉପସ୍ଥିତି"
 msgid "Set your own presence"
 msgstr "ଆପଣଙ୍କର ନିଜର ଉପସ୍ଥିତିକୁ ସେଟକରନ୍ତୁ"
 
-#: ../src/empathy.c:506
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "ଆରମ୍ଭରେ ସଂଯୋଗ କରନ୍ତୁ ନାହିଁ"
 
-#: ../src/empathy.c:510
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "ଆରମ୍ଭରେ ସମ୍ପର୍କ ତାଲିକା ଦର୍ଶାନ୍ତୁ ନାହିଁ"
 
-#: ../src/empathy.c:514
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "ଖାତା ସଂଳାପ ଦର୍ଶାନ୍ତୁ"
 
-#: ../src/empathy.c:526
-msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:587
+#, fuzzy
+#| msgid "- Empathy Instant Messenger"
+msgid "- Empathy IM Client"
 msgstr "- Empathy ତୀବ୍ର ସନ୍ଦେଶ ବାହକ"
 
 #: ../src/empathy-about-dialog.c:83
@@ -1616,10 +1675,11 @@ msgid ""
 "Should you decide to add the account back at a later time, they will still "
 "be available."
 msgstr ""
-"ଯେକୌଣସି ସଂଶ୍ଳିଷ୍ଟ ବାର୍ତ୍ତାଳାପ ଏବଂ ଚାର୍ଟରୁମଗୁଡ଼ିକୁ କଢ଼ାଯାଇପାରିବ ନାହିଁ ଯଦି ଆପଣ ଅଗ୍ରସର ହେବାକୁ ସିଦ୍ଧାନ୍ତ କରନ୍ତି।\n"
+"ଯେକୌଣସି ସଂଶ୍ଳିଷ୍ଟ ବାର୍ତ୍ତାଳାପ ଏବଂ ଚାର୍ଟରୁମଗୁଡ଼ିକୁ କଢ଼ାଯାଇପାରିବ ନାହିଁ ଯଦି ଆପଣ ଅଗ୍ରସର ହେବାକୁ "
+"ସିଦ୍ଧାନ୍ତ କରନ୍ତି।\n"
 "\n"
-"ଆପଣ ସେହି ଖାତାକୁ ପରବର୍ତ୍ତି ସମୟରେ ଯୋଗ କରିବା ପାଇଁ ଉଚିତ ମନେ କଲେ, ସେମାନେ ସେପର୍ଯ୍ୟନ୍ତ "
-"ଉପଲବ୍ଧ ରହିବେ।"
+"ଆପଣ ସେହି ଖାତାକୁ ପରବର୍ତ୍ତି ସମୟରେ ଯୋଗ କରିବା ପାଇଁ ଉଚିତ ମନେ କଲେ, ସେମାନେ ସେପର୍ଯ୍ୟନ୍ତ ଉପଲବ୍ଧ "
+"ରହିବେ।"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Add Account"
@@ -1669,53 +1729,53 @@ msgstr ""
 msgid "_Reuse an existing account"
 msgstr ""
 
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "ସ୍ପଷ୍ଟତା"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "ଉଜ୍ଜ୍ବଳତା"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "ଗାମା"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "ଭଲ୍ଯୁମ"
 
-#: ../src/empathy-call-window.c:662
+#: ../src/empathy-call-window.c:671
 msgid "Connecting..."
 msgstr "ସଂଯୋଗ କରୁଅଛି..."
 
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "ପାର୍ଶ୍ବ ପଟି (_S)"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "ଡାଏଲ ପ୍ଯାଡ"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "ଧ୍ବନି ନିବେଶ"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "ଭିଡ଼ିଓ ନିବେଶ"
 
-#: ../src/empathy-call-window.c:836
+#: ../src/empathy-call-window.c:866
 #, c-format
 msgid "Call with %s"
 msgstr ""
 
-#: ../src/empathy-call-window.c:905
+#: ../src/empathy-call-window.c:935
 msgid "Call"
 msgstr "ଡାକରା"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1336
+#: ../src/empathy-call-window.c:1387
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr ""
@@ -1744,7 +1804,7 @@ msgstr "ଭିଡିଓ ପୂର୍ବଦୃଶ୍ଯ"
 msgid "_Call"
 msgstr "_କଲ"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "ଦ୍ରୁଶ୍ଯ (_V)"
 
@@ -1757,6 +1817,78 @@ msgstr "କଥୋପକଥନ (%d)"
 msgid "Typing a message."
 msgstr "ଏକ ସନ୍ଦେଶ ଟାଇପ କରୁଅଛି."
 
+#: ../src/empathy-chat-window.ui.h:1
+#, fuzzy
+#| msgid "Clean"
+msgid "C_lear"
+msgstr "ସଫା କରନ୍ତୁ (_l)"
+
+#: ../src/empathy-chat-window.ui.h:2
+#, fuzzy
+#| msgid "_Chat"
+msgid "Chat"
+msgstr "ଆଳାପ"
+
+#: ../src/empathy-chat-window.ui.h:3
+#, fuzzy
+#| msgid "Insert Smiley"
+msgid "Insert _Smiley"
+msgstr "ସ୍ମାଇଲି ଭର୍ତ୍ତି କରନ୍ତୁ (_S)"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "ଟ୍ୟାବକୁ ବାମ ପଟକୁ ଘୁଞ୍ଚାନ୍ତୁ (_L)"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "ଟ୍ୟାବକୁ ଡ଼ାହାଣ ପଟକୁ ଘୁଞ୍ଚାନ୍ତୁ (_R)"
+
+#: ../src/empathy-chat-window.ui.h:6
+#, fuzzy
+#| msgid "Contact"
+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
+#, fuzzy
+#| msgid "Conversation"
+msgid "_Conversation"
+msgstr "କଥୋପକଥନ"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "_Detach Tab"
+msgstr "_ଟାବ ବିଚ୍ଛିନ୍ନ କର"
+
+#: ../src/empathy-chat-window.ui.h:11
+#, fuzzy
+#| msgid "_Invite to chatroom"
+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 "_Next Tab"
+msgstr "ପରବର୍ତ୍ତି ଟ୍ୟାବ (_N)"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "ପୂର୍ବ ଟ୍ୟାବ (_P)"
+
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "ସମ୍ପର୍କ ତାଲିକା ଦେଖନ୍ତୁ (_S)"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "ଟ୍ୟାବଗୁଡ଼ିକ (_T)"
+
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "ନାମ"
@@ -1991,78 +2123,78 @@ msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"ଆମଦାନୀ କରିବା ପାଇଁ କୌଣସି ଖାତା ମିଳୁନାହିଁ। Empathy ବର୍ତ୍ତମାନ କେବଳ ଖାତାଗୁଡ଼ିକୁ Pidginରୁ "
-"ଆମଦାନୀ କରିବାକୁ ସମର୍ଥନ କରିଥାଏ।"
+"ଆମଦାନୀ କରିବା ପାଇଁ କୌଣସି ଖାତା ମିଳୁନାହିଁ। Empathy ବର୍ତ୍ତମାନ କେବଳ ଖାତାଗୁଡ଼ିକୁ Pidginରୁ ଆମଦାନୀ "
+"କରିବାକୁ ସମର୍ଥନ କରିଥାଏ।"
 
 #: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "ଖାତାଗୁଡ଼ିକୁ ଆମଦାନି କରନ୍ତୁ"
 
-#: ../src/empathy-main-window.c:396
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "ଖାତା ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
 
-#: ../src/empathy-main-window.c:499
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "କିଛି ତ୍ରୁଟି ଦର୍ଶାଯାଇନାହିଁ"
 
-#: ../src/empathy-main-window.c:502
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "ନେଟୱାର୍କ ତ୍ରୁଟି"
 
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "ବୈଧିକରଣ ବିଫଳ"
 
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "ସଂଗୁପ୍ତ ତ୍ରୁଟି"
 
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "ନାମ ଯାହାକି ବ୍ଯବହୃତ ହେଉଅଛି"
 
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "ପ୍ରମାଣପତ୍ର ଦିଆଯାଇନାହିଁ"
 
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "ପ୍ରମାଣପତ୍ର ବିଶ୍ୱସ୍ଥ ନୁହଁ"
 
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "ପ୍ରମାଣପତ୍ରର ସମୟ ସମାପ୍ତ"
 
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "ପ୍ରମାଣପତ୍ର ସକ୍ରିୟ କରାଯାଇନାହିଁ"
 
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "ପ୍ରମାଣପତ୍ର ହୋଷ୍ଟ ନାମ ଅମେଳ"
 
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "ପ୍ରମାଣପତ୍ର ଅଙ୍ଗୁଳିଚିହ୍ନ ମେଳଖାଉନାହିଁ"
 
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "ପ୍ରମାଣପତ୍ର ନିଜ ଦ୍ୱାରା ହସ୍ତାକ୍ଷର ହୋଇଛି"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "ପ୍ରମାଣପତ୍ର ତ୍ରୁଟି"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "ଅଜଣା ତ୍ରୁଟି"
 
-#: ../src/empathy-main-window.c:1218
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "ଖାତା ଦେଖନ୍ତୁ ଏବଂ ସମ୍ପାଦନ କରନ୍ତୁ"
 
-#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "ସମ୍ପର୍କ ତାଲିକା"
 
@@ -2083,50 +2215,62 @@ msgid "Manage Favorites"
 msgstr "ମନପସନ୍ଦଗୁଡ଼ିକୁ ପରିଚାଳନ କରନ୍ତୁ"
 
 #: ../src/empathy-main-window.ui.h:6
-msgid "_Accounts"
-msgstr "_ଆକାଉଣ୍ଟଗୁଡିକ"
+msgid "N_ormal Size"
+msgstr ""
 
 #: ../src/empathy-main-window.ui.h:7
-msgid "_Add Contact..."
-msgstr "ସମ୍ପର୍କ ଯୋଗ କରନ୍ତୁ (_A)..."
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+#| msgid "Sort by _name"
+msgid "Sort by _Name"
+msgstr "ଦ୍ବାରା ସଜାଅ _ନାମ"
 
 #: ../src/empathy-main-window.ui.h:9
-msgid "_Contents"
-msgstr "ସୂଚୀପତ୍ର (_C)"
+#, fuzzy
+#| msgid "Sort by s_tate"
+msgid "Sort by _Status"
+msgstr "ଅବସ୍ଥା ହିସାବରେ ସଜାଡ଼ନ୍ତୁ (_t)"
 
 #: ../src/empathy-main-window.ui.h:10
+msgid "_Accounts"
+msgstr "_ଆକାଉଣ୍ଟଗୁଡିକ"
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
 msgstr "ତୃଟିମୁକ୍ତ କରନ୍ତୁ (_D)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:17
 msgid "_File Transfers"
 msgstr ""
 
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Help"
-msgstr "ସହାୟତା (_H)"
-
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
 msgstr ""
 
-#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "ନୁଆ କଥୋପକଥନ (_N)..."
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:21
 msgid "_Offline Contacts"
 msgstr ""
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "ବ୍ଯକ୍ତିଗତ ସୂଚନା (_P)"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Previous Conversations"
 msgstr ""
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "କକ୍ଷ (_R)"
 
@@ -2198,196 +2342,168 @@ msgstr "କକ୍ଷତାଲିକା"
 msgid "_Room:"
 msgstr "କଠୋରି (_R):"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "ସନ୍ଦେଶ ପ୍ରାପ୍ତ"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "ସନ୍ଦେଶ ପଠାଯାଇଅଛି"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "ନୁଆ କଥୋପକଥନ"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "ସମ୍ପର୍କ ଅନଲାଇନ ଆସିଲେ"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "ସମ୍ପର୍କ ଅଫଲାଇନ ଗଲେ"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "ଖାତା ସଂଯୋଗିତ"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "ଖାତା ବିଚ୍ଛିନ୍ନ"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "ଭାଷା"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Adium theme to use:"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:2
 msgid "Allow _GPS usage"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:2
 msgid "Allow _cellphone usage"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
 msgid "Allow _network usage"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
 msgid "Appearance"
 msgstr "ସାଦ୍ରୁଶ୍ଯ"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "ଆରମ୍ଭରେ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ସଂଯୋଗ କରନ୍ତୁ (_c)"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "ଅଭତାରଗୁଡ଼ିକ ସମ୍ପର୍କ ତାଲିକାରେ ଦର୍ଶାଯାଇଥିବା ଚାଳକ ବଚ୍ଛିତ ପ୍ରତିଛବି"
-
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:6
 msgid "Behavior"
 msgstr "ଆଚରଣ"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "ଚାର୍ଟ ପ୍ରସଙ୍ଗ (_e):"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "ଦୂରରେ ଥିବା ସମୟରେ କିମ୍ବା ବ୍ୟସ୍ତ ଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ (_a)"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "ଦୂରରେ ଥିବା ସମୟରେ କିମ୍ବା ବ୍ୟସ୍ତ ଥିବା ସମୟରେ ଧ୍ୱନିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ (_a)"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "ଚାର୍ଟକୁ ଲକ୍ଷ୍ୟ କରାଯାଉନଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ସକ୍ରିୟ କରନ୍ତୁ (_c)"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "ସାଧାରଣ"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
 msgid "Geoclue Settings"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location"
 msgstr "ଅବସ୍ଥାନ"
 
-#: ../src/empathy-preferences.ui.h:20
-msgid "Not a valid adium theme"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "ବିଜ୍ଞପ୍ତି"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:18
 msgid "Play sound for events"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "ପସନ୍ଦ"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "ଗୋପନୀଯତା"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will have a random "
-"value added (&#xB1;0.25&#xB0;)."
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "Show _avatars"
-msgstr "ଅବତାର ଦେଖାନ୍ତୁ (_a)"
-
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "ସ୍ମାଇଲିକୁ ପ୍ରତିଛବି ଆକାରରେ ଦର୍ଶାନ୍ତୁ (_s)"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "Show co_mpact contact list"
-msgstr "ସଂଗୁପ୍ତ ସମ୍ପର୍କ ତାଲିକା ଦର୍ଶାନ୍ତୁ (_m)"
-
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "Sort by _name"
-msgstr "ନାମ ହିସାବରେ ସଜାଡ଼ନ୍ତୁ (_n)"
-
-#: ../src/empathy-preferences.ui.h:31
-msgid "Sort by s_tate"
-msgstr "ଅବସ୍ଥା ହିସାବରେ ସଜାଡ଼ନ୍ତୁ (_t)"
-
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "ଶବ୍ଦ"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "ବନାନ ଯାଞ୍ଚ କରାଯାଉଛି"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:26
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "ପ୍ରସଙ୍ଗ"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "ବବଲ ବିଜ୍ଞପ୍ତିକୁ ସକ୍ରିୟ କରନ୍ତୁ (_E)"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "ଧ୍ୱିନି ବିଜ୍ଞପ୍ତିକୁ ସକ୍ରିୟ କରନ୍ତୁ (_E)"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "ନୁଆ ଚାଟଗୁଡ଼ିକ ଅଲଗା ୱିଣ୍ଡୋରେ ଖୋଲନ୍ତୁ (_O)"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Publish location to my contacts"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Reduce location accuracy"
 msgstr ""
 
@@ -2399,10 +2515,6 @@ msgstr "ଅବସ୍ଥିତି"
 msgid "_Quit"
 msgstr "ବିଦାୟ ନିଅନ୍ତୁ (_Q)"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Show Contact List"
-msgstr "ସମ୍ପର୍କ ତାଲିକା ଦେଖନ୍ତୁ (_S)"
-
 #: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c80d36ef6..86a1c0be2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,28 +11,30 @@
 # Michel Recondo <michel@recondo.com.br>, 2009.
 # Jonh Wendell <jwendell@gnome.org>, 2009.
 # Vladimir Melo <vmelo@gnome.org>, 2009.
+# Rodrigo L. M. Flores <mail@rodrigoflores.org>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-19 12:38-0500\n"
+"POT-Creation-Date: 2009-08-05 12:54-0400\n"
 "PO-Revision-Date: 2009-02-19 09:32-0300\n"
-"Last-Translator:Vladimir Melo <vmelo@gnome.org>\n"
+"Last-Translator: Rodrigo L. M. Flores <mail@rodrigoflores.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Mensageiro instantâneo Empathy"
+msgid "Empathy IM Client"
+msgstr "Cliente de MI Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "Envie e receba mensagens instantâneas"
+msgid "Send and receive messages"
+msgstr "Envia e recebe mensagens"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
@@ -78,152 +80,261 @@ msgid "Disable sounds when away"
 msgstr "Desabilitar sons quando ausente"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "O Empathy pode publicar a localização do usuário"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "O Empathy pode usar o GPS para adivinhar a localização"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "O Empathy pode usar a rede de celular para adivinhar a localização"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "O Empathy pode usar a rede para adivinhar a localização"
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Pasta padrão de download do Empathy"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy perguntou a respeito da importação de contas"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Conectar-se automaticamente ao iniciar"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+#, fuzzy
+#| msgid "Empathy should auto-connect on startup"
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Conectar-se automaticamente ao iniciar"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Usar o avatar dos contatos como ícone da janela de bate-papo"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "Habilitar Ferramentas de Desenvolvedor WebKit"
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "Habilitar notificação para novas mensagens"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Habilitar verificador ortográfico"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Ocultar janela principal"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Oculta a janela principal."
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "O NetworkManager pode ser usado"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Caractere de completamento de apelidos"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Abrir novos bate-papos em janelas separadas"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "Caminho do tema do adium para utilizar"
+
+#: ../data/empathy.schemas.in.h:28
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr ""
+"Caminho do tema do adium para usar se o tema usado para este bate-papo é do "
+"adium."
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "Reproduz um som quando receber mensagens"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "Reproduz um som para novas conversas"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "Reproduz um som para mensagens enviadas"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "Reproduz um som quando um contato conectar"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "Reproduz um som quando um contato desconectar"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "Reproduz um som quando conectarmos"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "Reproduz um som quando desconectarmos"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr ""
 "Mostra notificações se a janela de bate-papo não estiver em foco no momento"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+#, fuzzy
+#| msgid "Popup notifications if the chat isn't focused"
+msgid "Popup notifications when a contact sign in"
+msgstr ""
+"Mostra notificações se a janela de bate-papo não estiver em foco no momento"
+
+#: ../data/empathy.schemas.in.h:38
+#, fuzzy
+#| msgid "Popup notifications if the chat isn't focused"
+msgid "Popup notifications when a contact sign out"
+msgstr ""
+"Mostra notificações se a janela de bate-papo não estiver em foco no momento"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Conta no Salut criada"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Mostrar avatares"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+#, fuzzy
+#| msgid "_Show Contact List"
+msgid "Show contact list in rooms"
+msgstr "_Mostrar lista de contatos"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Mostrar dica sobre como fechar a janela principal"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Mostrar contatos desconectados"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "Idiomas para verificação ortográfica"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "A pasta padrão onde salvar os arquivos transferidos."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "O último diretório onde uma imagem de avatar foi escolhida."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "O tema que é usado para exibir a conversa em janelas de bate-papo."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Usar smileys gráficos"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Usar sons de notificação"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Usar tema para salas de bate-papo"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Se ferramentas de desenvolvedor WebKit, como o Web Inspector, devem ser "
+"habilitadas"
+
+#: ../data/empathy.schemas.in.h:52
+#, fuzzy
+#| msgid ""
+#| "Whether or not to show contacts that are offline in the contact list."
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "Mostra os contatos que estejam desconectados na lista de contatos."
+
+#: ../data/empathy.schemas.in.h:53
+#, fuzzy
+#| msgid ""
+#| "Whether or not Empathy should use the avatar of the contact as the chat "
+#| "window icon."
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr ""
+"Usa os avatares da lista de contatos como ícones da janela de bate-papo."
+
+#: ../data/empathy.schemas.in.h:54
+#, fuzzy
+#| msgid ""
+#| "Whether or not Empathy should use the avatar of the contact as the chat "
+#| "window icon."
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr ""
+"Usa os avatares da lista de contatos como ícones da janela de bate-papo."
+
+#: ../data/empathy.schemas.in.h:55
+#, fuzzy
+#| msgid ""
+#| "Whether or not Empathy should use the avatar of the contact as the chat "
+#| "window icon."
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr ""
+"Usa os avatares da lista de contatos como ícones da janela de bate-papo."
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr ""
 "Se o Empathy já perguntou sobre importar as contas de outros programas."
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Conecta automaticamente às suas contas ao iniciar."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+#, fuzzy
+#| msgid ""
+#| "Whether or not Empathy should use the avatar of the contact as the chat "
+#| "window icon."
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr ""
+"Usa os avatares da lista de contatos como ícones da janela de bate-papo."
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr ""
 "Usa os avatares da lista de contatos como ícones da janela de bate-papo."
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "A conta do Salut foi criada na primeira execução do Empathy."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -231,7 +342,7 @@ msgstr ""
 "O gerenciador de rede pode ser utilizado para desconectar/reconectar "
 "automaticamente."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
@@ -239,53 +350,68 @@ msgstr ""
 "Verifica as palavras digitadas usando os idiomas escolhidos para verificação "
 "ortográfica."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "Converte os smileys para imagens gráficas durante as conversas."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
 "Reproduz ou não um som de notificação para contatos conectando-se à rede."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr ""
 "Reproduz ou não um som de notificação para contatos desconectando-se da rede."
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Reproduzir um som de notificação para eventos."
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Reproduzir um som de notificação para mensagens recebidas."
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Reproduzir um som de notificação para novas conversas."
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Reproduzir um som de notificação para mensagens enviadas."
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Reproduzir um som de notificação ao conectar-se em uma rede."
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Reproduzir um som de notificação ao desconectar-se de uma rede."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "Reproduz ou não sons de notificação quando ausente ou ocupado."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+#, fuzzy
+#| msgid "Whether or not to show popup notifications when away or busy."
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr ""
+"Se deve ou não mostrar uma notificação quado estiver ausente ou ocupado."
+
+#: ../data/empathy.schemas.in.h:74
+#, fuzzy
+#| msgid "Whether or not to show popup notifications when away or busy."
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr ""
+"Se deve ou não mostrar uma notificação quado estiver ausente ou ocupado."
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -293,29 +419,35 @@ msgstr ""
 "Se deve ou não mostrar uma notificação quando receber uma nova mensagem "
 "mesmo se a janela de bate papo estiver aberta, mas não estiver com o foco."
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr ""
 "Se deve ou não mostrar uma notificação quando receber uma nova mensagem."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr ""
 "Mostra os avatares para contatos na lista de contatos e janelas de bate-papo."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "Mostra os contatos que estejam desconectados na lista de contatos."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
 "Se deve ou não mostrar uma notificação quado estiver ausente ou ocupado."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+#, fuzzy
+#| msgid "Whether to show the contact list in compact mode or not."
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Mostra a lista de contatos no modo compacto."
+
+#: ../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."
@@ -323,15 +455,15 @@ msgstr ""
 "Mostra o diálogo de mensagens sobre fechar a janela principal com o botão \"x"
 "\" na barra do título."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Mostra a lista de contatos no modo compacto."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Usa o tema em salas de bate-papo."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 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 "
@@ -341,548 +473,792 @@ msgstr ""
 "ordenação é feita usando o nome do contato com o valor \"nome\". Um valor de "
 "\"estado\" ordenará a lista de contatos por estado."
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "O hash do arquivo recebido e do enviado não batem"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "Transferência de arquivo sem suporte pelo seu contato"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "O arquivo selecionado não é um arquivo regular"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "O arquivo selecionado é vazio"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Pessoas por perto"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "Tipo de socket sem suporte"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "Nenhum motivo foi especificado"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "A alteração de estado foi solicitada"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Você cancelou a transferência do arquivo"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "O outro participante cancelou a transferência do arquivo"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Erro ao tentar transferir o arquivo"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "O outro participante não pode transferir o arquivo"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Motivo desconhecido"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Disponível"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Oculto"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "in the future"
+msgstr "no futuro"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Todos"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+#, fuzzy
+#| msgid "<b>Advanced</b>"
+msgid "Advanced"
 msgstr "<b>Avançado</b>"
 
-# Tooltip.
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Esquece a senha e limpa a entrada."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../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
 msgid "Pass_word:"
 msgstr "Se_nha:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "_Nome exibido:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../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
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "I_D de login:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
 # Changed from Og's "conjunto de caracteres because of little room.
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "_Codificação:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Nova rede"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Rede</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Servidores</b>"
-
 # Changed from Og's "conjunto de caracteres because of little room.
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Codificação:"
 
-# Tooltip.
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Cria uma nova rede de IRC"
-
-# Tooltip.
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Edita a rede de IRC selecionada"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Rede"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Rede:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Apelido:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Mensagem de saída:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Nome verdadeiro:"
 
-# Tooltip.
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Remove a rede de IRC selecionada"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#, fuzzy
+#| msgid "Server"
+msgid "Servers"
+msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#, fuzzy
+#| msgid "<b>Override server settings</b>"
+msgid "Override server settings"
 msgstr "<b>Sobrescrever configurações do servidor</b>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "Pri_oridade:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "Rec_urso:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Usar criptografia SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "Criptografia r_equerida (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ignorar erros de certificado SSL"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "_E-mail:"
 
 # A mensagem original termina em espaço, mas suas análogas não.
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "_Primeiro nome:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "ID do _Jabber:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "_Sobrenome:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "_Apelido:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "Nome _publicado:"
 
 #. 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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "Descobrir STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "Servidor STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "Porta STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "_Nome de usuário:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "Usar _Yahoo japonês"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "I_D do Yahoo:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ignorar convites de conferências e bate-papo"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "Local da l_ista da sala:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "Não foi possível converter a imagem"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr "Seu sistema não tem suporte a nenhum dos formatos de imagem aceitos"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "Selecione sua imagem de avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Nenhuma imagem"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Imagens"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Todos os arquivos"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Clique para ampliar"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "Não foi possível reconectar a este bate-papo"
+
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
+msgstr "Sem suporte a este comando"
+
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "contato inválido"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "permissão negada"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "mensagem muito longa"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "não implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erro enviando mensagem \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tópico definido como: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "Nenhum tópico definido"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
+msgstr "(Sem Sugestões)"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "Inserir smiley"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "_Verificar ortografia..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s entrou na sala"
+msgid "%s has disconnected"
+msgstr "%s desconectou"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s foi expulso por %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "%s foi expulso"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s foi banido por %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "%s foi banido"
+
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
 msgstr "%s saiu da sala"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. 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:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s entrou na sala"
+
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Tópico:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Bate-papo em grupo"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Tópico:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "_Copiar endereço do link"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "Abrir _link"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Informações pessoais"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Editar informações do contato"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Informações do contato"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "Eu gostaria de adicioná-lo à minha lista de contatos."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Informações pessoais"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "Decidir _depois"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Requisição de inscrição"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1404
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Você realmente deseja remover o grupo \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1406
 msgid "Removing group"
 msgstr "Removendo grupo"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1453
+#: ../libempathy-gtk/empathy-contact-list-view.c:1530
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1483
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Você realmente deseja remover o contato \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1485
 msgid "Removing contact"
 msgstr "Removendo contato"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Desculpe, mas eu não desejo mais mantê-lo em minha lista de contatos."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_Adicionar contato..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Bate-papo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "_Chamar"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+#, fuzzy
+#| msgid "_End Call"
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Terminar chamada"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+#, fuzzy
+#| msgid "_End Call"
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Terminar chamada"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "_Ver conversas anteriores"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Enviar arquivo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "Compartilhar minha área de trabalho"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Infor_mações"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Convidando para esta sala"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "Conv_idar para sala de bate-papo"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Selecionar contato..."
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Salvar avatares"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Não foi possível salvar o avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:996
 msgid "Select"
 msgstr "Selecionar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1005
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Informações do cliente</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#, fuzzy
+#| msgid "Country:"
+msgid "Country ISO Code:"
+msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Detalhes do contato</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "Country:"
+msgstr "País:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "State:"
+msgstr "Estado:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "City:"
+msgstr "Cidade:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Area:"
+msgstr "Área:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Postal Code:"
+msgstr "CEP:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Street:"
+msgstr "Endereço:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Building:"
+msgstr "Construção:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Floor:"
+msgstr "Andar:"
+
+# Evitar colisão com _Salvar
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Room:"
+msgstr "Sala:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Text:"
+msgstr "Texto:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Description:"
+msgstr "Descrição:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "URI:"
+msgstr "URI"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Accuracy Level:"
+msgstr "Nível de eficácia:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Contato</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Error:"
+msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Grupos</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Vertical Error (meters):"
+msgstr "Erro na Vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Horizontal Error (meters):"
+msgstr "Erro na Horizontal (metros):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Speed:"
+msgstr "Velocidade:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#, fuzzy
+msgid "Bearing:"
+msgstr "Relação:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Climb Speed:"
+msgstr "Taxa de Subida:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Last Updated on:"
+msgstr "Atualizado pela última vez em:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Longitude:"
+msgstr "Longitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Latitude:"
+msgstr "Latitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Altitude:"
+msgstr "Altitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1349
+msgid "<b>Location</b>"
+msgstr "<b>Localização</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1362
+msgid "<b>Location</b>, "
+msgstr "<b>Localização</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1412
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y em %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Localização</b> em (data)\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 "Conta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Apelido:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Aniversário:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#, fuzzy
+#| msgid "<b>Client Information</b>"
+msgid "Client Information"
+msgstr "<b>Informações do cliente</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Informação do contato"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Contato"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#, fuzzy
+#| msgid "<b>Contact Details</b>"
+msgid "Contact Details"
+msgstr "<b>Detalhes do contato</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "E-mail:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Nome completo:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#, fuzzy
+#| msgid "Group"
+msgid "Groups"
+msgstr "Grupo"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Identificação:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "Informação solicitada..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -890,179 +1266,216 @@ msgstr ""
 "Selecione os grupos nos quais este contato aparecerá. Observe que você pode "
 "selecionar mais de um grupo ou nenhum grupo."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Versão:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "Site da web:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "_Adicionar grupo"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "novo servidor"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "Porta"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:277
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Conta"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Data"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Conversas anteriores"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Pesquisar"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_Por:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "Ch_amar"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "Ba_te-papo"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "ID do contato:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "Nova conversa"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
+#. 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 "Mensagens personalizadas..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Mensagem personalizada"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Mensagem:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Salvar mensagem"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Status:"
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "Editar Mensagens personalizadas..."
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Palavra"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "Clique para remover este estado como favorito"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Sugestões para a palavra"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "Clique para fazer deste estado um favorito"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Verificador ortográfico"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "Definir estado"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Sugestões para a palavra:"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "Clássico"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "Simples"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "Simples"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "Azul"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "Não foi possível abrir o URI"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "Define sua presença e estado atual"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "Selecionar um arquivo"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "Mensagens personalizadas..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "Uma mensagem instantânea foi recebida"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "Uma mensagem instantânea foi enviada"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "Recebendo chamada para bate-papo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "Contato conectado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "Contato desconectado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "Conectado no servidor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "Desconectado do servidor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "Recebendo chamada de voz"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "Chamada de voz realizada"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "Chamada de voz finalizada"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#, fuzzy
+#| msgid "Custom message"
+msgid "Enter Custom Message"
+msgstr "Mensagem personalizada"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#, fuzzy
+#| msgid "Custom message"
+msgid "Edit Custom Messages"
+msgstr "Mensagem personalizada"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+#, fuzzy
+#| msgid "Save message"
+msgid "Saved Presets"
+msgstr "Salvar mensagem"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+#, fuzzy
+#| msgid "gtk-clear"
+msgid "gtk-add"
+msgstr "gtk-clear"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+#, fuzzy
+#| msgid "gtk-ok"
+msgid "gtk-remove"
+msgstr "gtk-ok"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "Clássico"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "Simples"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "Simples"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "Azul"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "Não foi possível abrir o URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "Selecionar um arquivo"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+#, fuzzy
+#| msgid "Select a contact"
+msgid "Select a destination"
+msgstr "Selecionar contato..."
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Localidade atual"
@@ -1251,7 +1664,7 @@ msgid "Megaphone"
 msgstr "Megafone"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Fale!"
 
@@ -1265,15 +1678,15 @@ msgid "_Information"
 msgstr "_Informação"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Por favor configure um contato."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Selecionar contato..."
 
@@ -1286,23 +1699,25 @@ msgstr "Presença"
 msgid "Set your own presence"
 msgstr "Configure sua própria presença"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "Não conectar ao iniciar"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "Não mostrar a lista de contatos ao iniciar"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Mostrar o diálogo de contas"
 
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
-msgstr "- Mensageiro instantâneo Empathy"
+#: ../src/empathy.c:587
+#, fuzzy
+#| msgid "%s - Empathy Call"
+msgid "- Empathy IM Client"
+msgstr "%s - Chamadas do Empathy"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1314,7 +1729,7 @@ msgstr ""
 "do Software Livre (FSF); na versão 2 da Licença, ou (na sua opinião) "
 "qualquer versão."
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1325,7 +1740,7 @@ msgstr ""
 "GARANTIA; sem mesmo a garantia implícita de COMERCIABILIDADE ou ADEQUAÇÃO A "
 "PROPÓSITOS ESPECÍFICOS. Veja a Licença Pública Geral GNU para mais detalhes."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "
@@ -1335,11 +1750,11 @@ msgstr ""
 "Empathy; se não, escreva para a Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "Um cliente de mensagens instantâneas para o GNOME"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "Luiz Guaraldo <software.livre@terra.com.br>\n"
@@ -1353,22 +1768,21 @@ msgstr ""
 "Jonh Wendell <wendell@bani.com.br>\n"
 "Vladimir Melo <vmelo@gnome.org>"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Contas"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Nova conta %s"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1377,7 +1791,7 @@ msgstr ""
 "Você está prestes a remover sua conta %s!\n"
 "Você tem certeza que deseja prosseguir?"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1391,31 +1805,39 @@ msgstr ""
 "Caso você decida adicionar a conta novamente mais tarde, elas ainda estarão "
 "disponíveis."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Nova conta</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Nenhum protocolo instalado</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Configurações</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+#, fuzzy
+#| msgid "Account"
+msgid "Add Account"
+msgstr "Conta"
 
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "Cr_iar"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "Eu já tenho uma conta que desejo usar"
+#: ../src/empathy-accounts-dialog.ui.h:4
+#, fuzzy
+#| msgid "Email:"
+msgid "Gmail"
+msgstr "E-mail:"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "Importar contas..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+#, fuzzy
+#| msgid "<b>No protocol installed</b>"
+msgid "No protocol installed"
+msgstr "<b>Nenhum protocolo instalado</b>"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+#, fuzzy
+#| msgid "<b>Settings</b>"
+msgid "Settings"
+msgstr "<b>Configurações</b>"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1423,275 +1845,266 @@ msgstr ""
 "Para adicionar uma nova conta, é necessário primeiro instalar um backend "
 "para cada protocolo que você deseja usar."
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-accounts-dialog.ui.h:10
+#, fuzzy
+#| msgid "_Add"
+msgid "_Add..."
+msgstr "_Adicionar"
+
+# Tooltip.
+#: ../src/empathy-accounts-dialog.ui.h:11
+#, fuzzy
+#| msgid "Create a new IRC network"
+msgid "_Create a new account"
+msgstr "Cria uma nova rede de IRC"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+#, fuzzy
+#| msgid "Registering account"
+msgid "_Reuse an existing account"
+msgstr "Registrando conta"
+
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "Brilho"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "_Painel lateral"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "Teclado"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "Entrada de áudio"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "Conectando..."
+#: ../src/empathy-call-window.c:835
+#, fuzzy, c-format
+#| msgid "Call from %s"
+msgid "Call with %s"
+msgstr "Chamada de %s"
 
-#: ../src/empathy-call-window.c:572
-#, c-format
-msgid "Connected -- %d:%02dm"
+#: ../src/empathy-call-window.c:904
+#, fuzzy
+#| msgid "_Call"
+msgid "Call"
+msgstr "_Chamar"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1335
+#, fuzzy, c-format
+#| msgid "Connected -- %d:%02dm"
+msgid "Connected — %d:%02dm"
 msgstr "Conectado -- %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "Desligar"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "Rediscar"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "Enviar áudio"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "Enviar vídeo"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "Visualização de vídeo"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Chamar"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Conversas (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Tópico:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Digitando uma mensagem."
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
-#, c-format
-msgid "New message from %s"
-msgstr "Nova mensagem de %s"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "_Limpar"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
 msgid "Chat"
 msgstr "Bate-papo"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Inserir _smiley"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "_Mensagem de convite:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Convidar"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
 msgstr "Mover aba para a _esquerda"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
 msgstr "Mover aba para a _direita"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Selecione quem você gostaria convidar:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Você foi convidado a participar de uma conferência de bate-papo."
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
 msgid "_Contact"
 msgstr "_Contato"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "_Sumário"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
 msgstr "_Conversa"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
 msgstr "_Destacar aba"
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Favorite Chatroom"
 msgstr "Sala de bate-papo _favorita"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
 msgstr "_Próxima aba"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Previous Tab"
 msgstr "Aba _anterior"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "_Mostrar lista de contatos"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
 msgstr "_Abas"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "Sala"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "Conectar automaticamente"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Editar sala favorita"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Entrar na sala ao _iniciar"
-
-# Tooltip.
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr ""
-"Entra nesta sala de bate-papo quando o Empathy iniciar e você estiver "
-"conectado"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "Gerenciar salas favoritas"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_Nome:"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "S_ervidor:"
-
-# Evitar colisão com _Salvar
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "Sa_la:"
-
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "Recebendo chamada"
 
-#: ../src/empathy-event-manager.c:375
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s está chamando você, você quer responder?"
 
-#: ../src/empathy-event-manager.c:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "_Rejeitar"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "_Resposta"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Recebendo chamada de %s"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s está lhe fazendo um convite"
 
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "Um aplicativo externo será iniciado para lidar com o convite."
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "Você não tem o aplicativo necessário para lidar com este convite."
 
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "Convite de sala"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s está convidando você para entrar em %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "_Recusar"
 
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "E_ntrar"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s o convidou para entrar em %s"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Recebendo transferência de arquivo de %s"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Inscrição solicitada por %s"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1700,174 +2113,147 @@ msgstr ""
 "\n"
 "Mensagem: %s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, fuzzy, c-format
+msgid "%s is now offline."
+msgstr "%s desconectou"
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, fuzzy, c-format
+#| msgid "%s has come online"
+msgid "%s is now online."
+msgstr "%s conectou"
+
 # Esperando comentário do desenvolvedor explicando o que é a mensagem.
-#: ../src/empathy-ft-manager.c:113
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 # Esperando comentário do desenvolvedor explicando o que é a mensagem.
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-msgid "No reason was specified"
-msgstr "Nenhum motivo foi especificado"
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "A alteração de estado foi solicitada"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "Você cancelou a transferência do arquivo"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "O outro participante cancelou a transferência do arquivo"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "Error while trying to transfer the file"
-msgstr "Erro ao tentar transferir o arquivo"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Desconhecido"
 
-#: ../src/empathy-ft-manager.c:174
-msgid "The other participant is unable to transfer the file"
-msgstr "O outro participante não pode transferir o arquivo"
+#: ../src/empathy-ft-manager.c:275
+#, fuzzy, c-format
+#| msgid "%s of %s"
+msgid "%s of %s at %s/s"
+msgstr "%s de %s"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "Motivo desconhecido"
+#: ../src/empathy-ft-manager.c:276
+#, 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:224
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Recebendo \"%s\" de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Enviando \"%s\" para %s"
 
-#: ../src/empathy-ft-manager.c:237
-msgctxt "file size"
-msgid "Unknown"
-msgstr "Desconhecido"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Erro recebendo \"%s\" de %s"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:245
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "Erro recebendo arquivo"
+
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s de %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "Erro enviando \"%s\" para %s"
 
-#: ../src/empathy-ft-manager.c:252
-msgid "Waiting the other participant's response"
-msgstr "Aguardando a resposta do outro participante"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "Erro enviando arquivo"
 
-#: ../src/empathy-ft-manager.c:262
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" recebido de %s"
 
-#: ../src/empathy-ft-manager.c:268
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" enviado para %s"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "Transferência de arquivo concluída"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "\"%s\" recebendo de %s"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "Aguardando a resposta do outro participante"
 
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "\"%s\" enviando para %s"
+msgid "Checking integrity of \"%s\""
+msgstr "Verificando integridade de \"%s\""
 
-#: ../src/empathy-ft-manager.c:289
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "Transferência de arquivo cancelada: %s"
-
-#: ../src/empathy-ft-manager.c:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Desconhecido"
+msgid "Hashing \"%s\""
+msgstr "Fazendo hash de \"%s\""
 
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "Restando"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "Não é possível salvar o arquivo neste local"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "Salvar arquivo como..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "tamanho desconhecido"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s gostaria de enviar-lhe um arquivo"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "Você deseja aceitar o arquivo \"%s\" (%s)?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "_Aceitar"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
 msgstr "Transferências de arquivo"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Remove transferências concluídas, canceladas e falhas da lista"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Origem"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1875,133 +2261,212 @@ msgstr ""
 "Nenhuma conta para importar pôde ser localizada. Atualmente o Empathy só tem "
 "suporte a importar contas do Pidgin."
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "Importar contas"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "_Editar conta"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Nenhum erro especificado"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Falha de autenticação"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Erro de criptografia"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "Nome já em uso"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Certificado não fornecido"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Certificado não confiável"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Certificado expirado"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Certificado não ativado"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "Certificado com nome de máquina incorreto"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Certificado com impressão digital incorreto"
 
 # self-signed  - Deixei como próprio
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Certificado próprio"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Erro de certificado"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "Mostrar e editar contas"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "Contato"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "_Editar conta"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Lista de contatos"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+#, fuzzy
+msgid "Contacts on a _Map"
+msgstr "_Adicionar Contato..."
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Contexto"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "Entrar em _favoritos"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Entrar em _novo..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Gerenciar favoritos"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Mostrar contatos _offline"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "Tamanho N_ormal"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "Tamanho normal com _Avatar"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Ordenar por _Nome"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "Ordenar por es_tado"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "Cont_as"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "_Adicionar contato..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:17
+#, fuzzy
+#| msgid "File transfers"
+msgid "_File Transfers"
+msgstr "Transferências de arquivo"
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:19
+#, fuzzy
+#| msgid "_Join"
+msgid "_Join..."
+msgstr "E_ntrar"
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_Nova conversa..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+#, fuzzy
+#| msgid "Show _Offline Contacts"
+msgid "_Offline Contacts"
+msgstr "Mostrar contatos _offline"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "Informação _pessoal"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+#, fuzzy
+#| msgid "Previous Conversations"
+msgid "_Previous Conversations"
+msgstr "Conversas anteriores"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
-msgstr "Salas de bate-papo"
+#: ../src/empathy-new-chatroom-dialog.c:331
+#, fuzzy
+msgid "Chat Room"
+msgstr "Gossip - Chat"
+
+#: ../src/empathy-new-chatroom-dialog.c:347
+#, fuzzy
+#| msgid "Themes"
+msgid "Members"
+msgstr "Temas"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Navegar:"
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\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
+#, fuzzy
+msgid "Yes"
+msgstr "Sim"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+#, fuzzy
+msgid "No"
+msgstr "Não"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+#, fuzzy
+msgid "Could not stop room listing"
+msgstr "Impossível conectar"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+#, fuzzy
+#| msgid "Choose from list:"
+msgid "Couldn't load room list"
+msgstr "Escolha da lista:"
 
 # Tooltip, but imperative sentence is correct.
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../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 ""
@@ -2009,7 +2474,7 @@ msgstr ""
 "ou mais na lista."
 
 # Tooltip, but imperative sentence is correct.
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../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"
@@ -2017,186 +2482,224 @@ msgstr ""
 "Digite o servidor que hospeda a sala, ou deixe o campo vazio caso a sala "
 "esteja no servidor da conta atual"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Entrar"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Entrar em nova"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#, fuzzy
+#| msgid "Room"
+msgid "Join Room"
+msgstr "Sala"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "Atualiza_r"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#, fuzzy
+#| msgid "_Room List locale:"
+msgid "Room List"
+msgstr "Local da l_ista da sala:"
 
-# Tooltip.
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr ""
-"Esta lista representa todas as salas de bate-papo hospedadas no servidor que "
-"você entrou."
+# Evitar colisão com _Salvar
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "Sa_la:"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "Mensagem recebida"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "Nova conversa"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "O contato está conectado"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "O contato está desconectado"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "Conta conectada"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "Conta desconectada"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "Idioma"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Aparência</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>Comportamento</b>"
-
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>Lista de contatos</b>"
-
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Habilitar verificação ortográfica para os idiomas:</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>Reproduzir sons para eventos</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
 msgstr ""
-"<small>A lista de idiomas representa somente os idiomas para os quais você "
-"já possui dicionários instalados.</small>"
 
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:4
+#, fuzzy
+#| msgid "<b>Appearance</b>"
+msgid "Appearance"
+msgstr "<b>Aparência</b>"
+
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "Conectar automati_camente ao iniciar "
 
-# Tooltip.
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr ""
-"Avatares são imagens escolhidas pelo usuário exibidas na lista de contatos"
+#: ../src/empathy-preferences.ui.h:6
+#, fuzzy
+#| msgid "<b>Behavior</b>"
+msgid "Behavior"
+msgstr "<b>Comportamento</b>"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "T_ema do bate-papo:"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "Desabilitar notificações quando ausente ou _ocupado"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "Desabilitar sons quando _ausente ou ocupado"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+#, fuzzy
+#| msgid "Enable notifications when the _chat is not focused"
+msgid "Enable notifications when a contact comes online"
+msgstr "Exibir notificações quando o bate-papo não estiver em _foco"
+
+#: ../src/empathy-preferences.ui.h:11
+#, fuzzy
+#| msgid "Enable notifications when the _chat is not focused"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Exibir notificações quando o bate-papo não estiver em _foco"
+
+#: ../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.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+#, fuzzy
+#| msgid "<b>Enable spell checking for languages:</b>"
+msgid "Enable spell checking for languages:"
+msgstr "<b>Habilitar verificação ortográfica para os idiomas:</b>"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Geral"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+#, fuzzy
+#| msgid "Notifications"
+msgid "Location"
+msgstr "Notificações"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+#, fuzzy
+#| msgid "<b>Play sound for events</b>"
+msgid "Play sound for events"
+msgstr "<b>Reproduzir sons para eventos</b>"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "Mostrar _avatares"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:21
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will have a random "
+"value added (&#xB1;0.25&#xB0;)."
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Mostrar _smileys como imagens"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "Mostrar lista co_mpacta de contatos"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "Ordenar por _nome"
-
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "Ordenar por es_tado"
+#: ../src/empathy-preferences.ui.h:23
+#, fuzzy
+#| msgid "_Show Contact List"
+msgid "Show contact _list in rooms"
+msgstr "_Mostrar lista de contatos"
 
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Verificação de ortografia"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+#, fuzzy
+#| msgid ""
+#| "<small>The list of languages reflects only the languages for which you "
+#| "have a dictionary installed.</small>"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"<small>A lista de idiomas representa somente os idiomas para os quais você "
+"já possui dicionários instalados.</small>"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "Ha_bilitar balões de notificação"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "H_abilitar sons de notificação"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Abrir novos bate-papos em janelas separadas"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr ""
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
-msgstr "Status"
+msgstr "Estado"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "Sai_r"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Mostrar lista de contatos"
-
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "Não foi possível iniciar o aplicativo para o serviço %s: %s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../src/empathy-tube-dispatch.c:446
 #, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
@@ -2205,6 +2708,270 @@ msgstr ""
 "Foi feito um convite para o serviço %s, mas você não possui o aplicativo "
 "necessário para manipulá-lo."
 
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+#, fuzzy
+#| msgid "Contact List"
+msgid "Contact Map View"
+msgstr "Lista de contatos"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#, fuzzy
+#| msgid "Croatian"
+msgid "Critical"
+msgstr "Croata"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#, fuzzy
+#| msgid "Remaining"
+msgid "Warning"
+msgstr "Restando"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+#, fuzzy
+#| msgid "Message:"
+msgid "Message"
+msgstr "Mensagem:"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:845
+#, fuzzy
+#| msgid "Server"
+msgid "Save"
+msgstr "Servidor"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1021
+#, fuzzy
+#| msgid "_Paste"
+msgid "Pause"
+msgstr "C_olar"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1102
+#, fuzzy
+#| msgid "Simple"
+msgid "Time"
+msgstr "Simples"
+
+#: ../src/empathy-debug-dialog.c:1104
+#, fuzzy
+#| msgid "Romanian"
+msgid "Domain"
+msgstr "Romeno"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Mensageiro instantâneo Empathy"
+
+# Tooltip.
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Esquece a senha e limpa a entrada."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Rede</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Servidores</b>"
+
+# Tooltip.
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Edita a rede de IRC selecionada"
+
+# Tooltip.
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Remove a rede de IRC selecionada"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "_Verificar ortografia..."
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>Tópico:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "Bate-papo em grupo"
+
+#~ msgid "Contact Information"
+#~ msgstr "Informações do contato"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Eu gostaria de adicioná-lo à minha lista de contatos."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr ""
+#~ "Desculpe, mas eu não desejo mais mantê-lo em minha lista de contatos."
+
+#~ msgid "<b>Contact</b>"
+#~ msgstr "<b>Contato</b>"
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Grupos</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "Informação do contato"
+
+#~ msgid "Word"
+#~ msgstr "Palavra"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Sugestões para a palavra"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Verificador ortográfico"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Sugestões para a palavra:"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Mensageiro instantâneo Empathy"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Nova conta</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "Eu já tenho uma conta que desejo usar"
+
+#~ msgid "New message from %s"
+#~ msgstr "Nova mensagem de %s"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "_Mensagem de convite:"
+
+#~ msgid "Invite"
+#~ msgstr "Convidar"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Selecione quem você gostaria convidar:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Você foi convidado a participar de uma conferência de bate-papo."
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Editar sala favorita"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "Entrar na sala ao _iniciar"
+
+# Tooltip.
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr ""
+#~ "Entra nesta sala de bate-papo quando o Empathy iniciar e você estiver "
+#~ "conectado"
+
+#~ msgid "N_ame:"
+#~ msgstr "_Nome:"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_ervidor:"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "Desconhecido"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "\"%s\" recebendo de %s"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "\"%s\" enviando para %s"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "Transferência de arquivo cancelada: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "Desconhecido"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "Não é possível salvar o arquivo neste local"
+
+#~ msgid "Save file as..."
+#~ msgstr "Salvar arquivo como..."
+
+#~ msgid "unknown size"
+#~ msgstr "tamanho desconhecido"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s gostaria de enviar-lhe um arquivo"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "Você deseja aceitar o arquivo \"%s\" (%s)?"
+
+#~ msgid "_Accept"
+#~ msgstr "_Aceitar"
+
+#~ msgid "Join _New..."
+#~ msgstr "Entrar em _novo..."
+
+#~ msgid "Chat Rooms"
+#~ msgstr "Salas de bate-papo"
+
+#~ msgid "Browse:"
+#~ msgstr "Navegar:"
+
+#~ msgid "Join"
+#~ msgstr "Entrar"
+
+#~ msgid "Join New"
+#~ msgstr "Entrar em nova"
+
+#~ msgid "Re_fresh"
+#~ msgstr "Atualiza_r"
+
+# Tooltip.
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr ""
+#~ "Esta lista representa todas as salas de bate-papo hospedadas no servidor "
+#~ "que você entrou."
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Lista de contatos</b>"
+
+# Tooltip.
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr ""
+#~ "Avatares são imagens escolhidas pelo usuário exibidas na lista de contatos"
+
+#~ msgid "Show _avatars"
+#~ msgstr "Mostrar _avatares"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "Mostrar lista co_mpacta de contatos"
+
 #~ msgid "menuitem2"
 #~ msgstr "menuitem2"
 
@@ -2217,18 +2984,9 @@ msgstr ""
 #~ msgid "Closing this window will end the call in progress."
 #~ msgstr "Fechar esta janela irá terminar a chamada em andamento."
 
-#~ msgid "_End Call"
-#~ msgstr "_Terminar chamada"
-
-#~ msgid "Empathy Call"
-#~ msgstr "Chamada do Empathy"
-
 #~ msgid "Readying"
 #~ msgstr "Preparando"
 
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - Chamadas do Empathy"
-
 #~ msgid "Ringing"
 #~ msgstr "Tocando"
 
@@ -2296,15 +3054,9 @@ msgstr ""
 #~ msgid "Invitation Error"
 #~ msgstr "Erro ao convidar"
 
-#~ msgid "gtk-clear"
-#~ msgstr "gtk-clear"
-
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-
 #~ msgid "<b>Audio</b>"
 #~ msgstr "<b>Áudio</b>"
 
@@ -2393,9 +3145,6 @@ msgstr ""
 #~ msgid "_Copy"
 #~ msgstr "_Copiar"
 
-#~ msgid "_Paste"
-#~ msgstr "C_olar"
-
 #~ msgid "_Show Contacts"
 #~ msgstr "_Mostrar Contatos"
 
@@ -2426,21 +3175,12 @@ msgstr ""
 #~ msgid "Enter the new topic you want to set for this room:"
 #~ msgstr "Digite o novo tópico que você deseja definir para esta sala:"
 
-#~ msgid "<b>Options</b>"
-#~ msgstr "<b>Opções</b>"
-
 #~ msgid "_Use for chat rooms"
 #~ msgstr "_Usar em salas de bate-papo"
 
 #~ msgid "%s went offline"
 #~ msgstr "%s desconectou"
 
-#~ msgid "%s has come online"
-#~ msgstr "%s conectou"
-
-#~ msgid "Call from %s"
-#~ msgstr "Chamada de %s"
-
 #~ msgid "_New Message..."
 #~ msgstr "_Nova Mensagem..."
 
@@ -2478,10 +3218,6 @@ msgstr ""
 #~ msgstr "<span size=\"small\">Por exemplo: usuario@jabber.org</span>"
 
 #, fuzzy
-#~ msgid "Chat Room"
-#~ msgstr "Gossip - Chat"
-
-#, fuzzy
 #~ msgid "Clear List..."
 #~ msgstr "_Limpar"
 
@@ -2709,13 +3445,6 @@ msgstr ""
 #~ msgstr "Chat"
 
 #, fuzzy
-#~ msgid "Contacts"
-#~ msgstr "_Adicionar Contato..."
-
-#~ msgid "Country:"
-#~ msgstr "País:"
-
-#, fuzzy
 #~ msgid "Edit Contact"
 #~ msgstr "_Adicionar Contato..."
 
@@ -2761,10 +3490,6 @@ msgstr ""
 #~ msgid "_Connect"
 #~ msgstr "Conectar"
 
-#, fuzzy
-#~ msgid "_Description:"
-#~ msgstr "descrição"
-
 #~ msgid "_Disconnect"
 #~ msgstr "_desconectar"
 
@@ -2844,9 +3569,6 @@ msgstr ""
 #~ msgid "Conversation Log"
 #~ msgstr "Log da Conversa"
 
-#~ msgid "Registering account"
-#~ msgstr "Registrando conta"
-
 #, fuzzy
 #~ msgid "Respond"
 #~ msgstr "Motivo:"
@@ -2985,17 +3707,9 @@ msgstr ""
 #~ msgid "_Group Chat"
 #~ msgstr "Gossip - Chat"
 
-#, fuzzy
-#~ msgid "_No"
-#~ msgstr "Não"
-
 #~ msgid "_Search..."
 #~ msgstr "_Procurar..."
 
-#, fuzzy
-#~ msgid "_Yes"
-#~ msgstr "Sim"
-
 #~ msgid "Be silent when away"
 #~ msgstr "Ficar em silêncio quando longe"
 
@@ -3033,10 +3747,6 @@ msgstr ""
 #~ msgid "Requested Information"
 #~ msgstr "Informação da Cont_a"
 
-#, fuzzy
-#~ msgid "%s has gone offline"
-#~ msgstr "%s desconectou"
-
 #~ msgid "Available..."
 #~ msgstr "Disponível..."
 
@@ -3074,10 +3784,6 @@ msgstr ""
 #~ msgstr "Solicitando detalhes pessoais, por favor aguarde..."
 
 #, fuzzy
-#~ msgid "Could not open connection"
-#~ msgstr "Impossível conectar"
-
-#, fuzzy
 #~ msgid "Could not find the server you wanted to use"
 #~ msgstr "Qual servidor você quer usar?"
 
@@ -3226,9 +3932,6 @@ msgstr ""
 #~ msgid "R_emove"
 #~ msgstr "R_emover"
 
-#~ msgid "_Add"
-#~ msgstr "_Adicionar"
-
 #~ msgid " "
 #~ msgstr " "
 
@@ -3254,9 +3957,6 @@ msgstr ""
 #~ msgid "Choose a Server"
 #~ msgstr "escolha um servidor"
 
-#~ msgid "Choose from list:"
-#~ msgstr "Escolha da lista:"
-
 #~ msgid "Information about ..."
 #~ msgstr "Informação sobre..."
 
diff --git a/po/sv.po b/po/sv.po
index 007755526..0c7ed1158 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: 2009-07-22 23:53+0200\n"
-"PO-Revision-Date: 2009-07-22 23:53+0100\n"
+"POT-Creation-Date: 2009-08-20 23:39+0200\n"
+"PO-Revision-Date: 2009-08-20 23:40+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Snabbmeddelandeklienten Empathy"
+msgid "Empathy IM Client"
+msgstr "Empathy snabbmeddelandeklient"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "Skicka och ta emot snabbmeddelanden"
+msgid "Send and receive messages"
+msgstr "Skicka och ta emot meddelanden"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
@@ -48,85 +48,85 @@ msgid "Compact contact list"
 msgstr "Kompakt kontaktlista"
 
 #: ../data/empathy.schemas.in.h:6
+msgid "Connection managers should be used"
+msgstr "Anslutningshanterare ska användas"
+
+#: ../data/empathy.schemas.in.h:7
 msgid "Contact list sort criterium"
 msgstr "Sorteringskriteria för kontaktlista"
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/empathy.schemas.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "Standardkatalog att välja avatarbild från"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "Inaktivera popupnotifieringar under frånvaro"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:10
 msgid "Disable sounds when away"
 msgstr "Inaktivera ljud under frånvaro"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:11
 msgid "Empathy can publish the user's location"
 msgstr "Empathy kan publicera användarens plats"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:12
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy kan använda GPS:en för att gissa platsen"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:13
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy kan använda nätverket för att gissa platsen"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy default download folder"
 msgstr "Standardhämtningsmapp för Empathy"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy har frågat om att importera konton"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:17
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy ska ansluta automatiskt vid uppstart"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy bör minska precisionen för platsen"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy ska använda avataren för kontakten som chattfönsterikon"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable WebKit Developer Tools"
 msgstr "Aktivera utvecklingsverktyg för WebKit"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable popup notifications for new messages"
 msgstr "Aktivera popupnotifieringar för nya meddelanden"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
 msgid "Enable spell checker"
 msgstr "Aktivera stavningskontroll"
 
 # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
 # inte ska hittas, döljer gör man för att det inte ska synas.
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide main window"
 msgstr "Dölj huvudfönstret"
 
 # Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
 # inte ska hittas, döljer gör man för att det inte ska synas.
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
 msgid "Hide the main window."
 msgstr "Dölj huvudfönstret."
 
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr "NetworkManager ska användas"
-
 #: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Tecken för smeknamnskomplettering"
@@ -268,12 +268,12 @@ msgid "Whether or not Empathy should use the avatar of the contact as the chat w
 msgstr "Huruvida Empathy ska använda avataren för kontakten som chattfönsterikon eller inte."
 
 #: ../data/empathy.schemas.in.h:60
-msgid "Whether or not the Salut account has been created on the first Empathy run."
-msgstr "Huruvida Salut-kontot har skapats eller inte vid första starten av Empathy."
+msgid "Whether or not connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta eller inte."
 
 #: ../data/empathy.schemas.in.h:61
-msgid "Whether or not the network manager should be used to automatically disconnect/reconnect."
-msgstr "Huruvida nätverkshanteraren ska användas för att automatiskt koppla från/återansluta eller inte."
+msgid "Whether or not the Salut account has been created on the first Empathy run."
+msgstr "Huruvida Salut-kontot har skapats eller inte vid första starten av Empathy."
 
 #: ../data/empathy.schemas.in.h:62
 msgid "Whether or not to check words typed against the languages you want to check with."
@@ -384,7 +384,7 @@ msgid "The selected file is empty"
 msgstr "Den valda filen är tom"
 
 #: ../libempathy/empathy-tp-contact-list.c:843
-#: ../src/empathy.c:289
+#: ../src/empathy.c:290
 msgid "People nearby"
 msgstr "Personer i närheten"
 
@@ -706,92 +706,98 @@ msgstr "Klicka för att förstora"
 msgid "Failed to reconnect this chat"
 msgstr "Misslyckades med att återansluta till denna chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:404
+#: ../libempathy-gtk/empathy-chat.c:412
 msgid "Unsupported command"
 msgstr "Kommandot stöds inte"
 
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "frånkopplad"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "ogiltig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "åtkomst nekad"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "för långt meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "inte implementerat"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "okänt"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fel vid sändning av meddelandet \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Ämnet inställt till: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "Inget ämne definierat"
 
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:969
 msgid "(No Suggestions)"
 msgstr "(Inga förslag)"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Infoga smilis"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
-#: ../libempathy-gtk/empathy-ui-utils.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1483
 msgid "_Send"
 msgstr "_Skicka"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "_Spelling Suggestions"
 msgstr "Sta_vningsförslag"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1190
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har kopplat från"
 
-#: ../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:1197
 #, c-format
-msgid "%s was kicked by %s"
-msgstr "%s sparkades ut av %s"
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s sparkades ut av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s was kicked"
 msgstr "%s sparkades ut"
 
-#: ../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:1208
 #, c-format
-msgid "%s was banned by %s"
-msgstr "%s blev bannlyst av %s"
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s blev bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:1196
+#: ../libempathy-gtk/empathy-chat.c:1211
 #, c-format
 msgid "%s was banned"
 msgstr "%s blev bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:1215
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har lämnat rummet"
@@ -801,26 +807,26 @@ 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:1209
+#: ../libempathy-gtk/empathy-chat.c:1224
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:1247
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har gått in i rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:1365
-#: ../src/empathy-call-window.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1380
+#: ../src/empathy-call-window.c:1277
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1815
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-chat.c:1865
 #: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Samtal"
@@ -832,13 +838,13 @@ msgstr "Ämne:"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:264
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "_Kopiera länkadress"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:272
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_Öppna länk"
 
@@ -857,7 +863,7 @@ msgstr "Redigera kontaktinformation"
 msgid "Personal Information"
 msgstr "Personlig information"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:393
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Ny kontakt"
 
@@ -869,27 +875,27 @@ msgstr "Bestäm _senare"
 msgid "Subscription Request"
 msgstr "Prenumerationsbegäran"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1400
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, 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:1402
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "Tar bort grupp"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1449
-#: ../libempathy-gtk/empathy-contact-list-view.c:1526
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1479
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, 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:1481
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Tar bort kontakt"
 
@@ -930,6 +936,7 @@ msgid "Infor_mation"
 msgstr "Infor_mation"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10
 #: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "R_edigera"
@@ -954,120 +961,120 @@ msgstr "Spara avatar"
 msgid "Unable to save avatar"
 msgstr "Kunde inte spara avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:992
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Markera"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
 #: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Grupp"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1252
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "Country ISO Code:"
 msgstr "Landets ISO-kod:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1254
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "State:"
 msgstr "Län:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "City:"
 msgstr "Stad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Street:"
 msgstr "Gata:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Building:"
 msgstr "Byggnad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "Floor:"
 msgstr "Våning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Accuracy Level:"
 msgstr "Precisionsnivå:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Error:"
 msgstr "Fel:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Vertical Error (meters):"
 msgstr "Vertikalt fel (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Horizontal Error (meters):"
 msgstr "Horisontellt fel (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Bearing:"
 msgstr "Riktning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Climb Speed:"
 msgstr "Höjdökning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
 msgid "Last Updated on:"
 msgstr "Senast uppdaterad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
 msgid "Longitude:"
 msgstr "Longitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
 msgid "Latitude:"
 msgstr "Latitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
 msgid "Altitude:"
 msgstr "Höjd:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
 msgid "<b>Location</b>"
 msgstr "<b>Plats</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1358
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
 msgid "<b>Location</b>, "
 msgstr "<b>Plats</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1408
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y klockan %H.%M UTC"
 
@@ -1206,38 +1213,40 @@ msgstr "Kontakt-id:"
 msgid "New Conversation"
 msgstr "Nytt samtal"
 
+#. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
-#. COL_STATUS_TEXT
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
+#: ../libempathy-gtk/empathy-presence-chooser.c:176
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
 msgid "Custom Message..."
 msgstr "Anpassat meddelande..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#: ../libempathy-gtk/empathy-presence-chooser.c:229
+#: ../libempathy-gtk/empathy-presence-chooser.c:231
 msgid "Edit Custom Messages..."
 msgstr "Redigera anpassade meddelanden..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:330
 msgid "Click to remove this status as a favorite"
 msgstr "Klicka för att ta bort denna status som favorit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:339
 msgid "Click to make this status a favorite"
 msgstr "Klicka för att göra denna status till favorit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:373
 msgid "Set status"
 msgstr "Ange status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:794
 msgid "Set your presence and current status"
 msgstr "Ange din närvaro och aktuell status"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+#: ../libempathy-gtk/empathy-presence-chooser.c:1043
 msgid "Custom messages..."
 msgstr "Anpassade meddelanden..."
 
@@ -1297,14 +1306,6 @@ msgstr "Lägg till _nytt förval"
 msgid "Saved Presets"
 msgstr "Sparade förval"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
-msgid "gtk-add"
-msgstr "Lägg till"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
-msgid "gtk-remove"
-msgstr "Ta bort"
-
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "Klassiskt"
@@ -1321,15 +1322,15 @@ msgstr "Rent"
 msgid "Blue"
 msgstr "Blått"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1382
+#: ../libempathy-gtk/empathy-ui-utils.c:1385
 msgid "Unable to open URI"
 msgstr "Kunde inte öppna uri"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#: ../libempathy-gtk/empathy-ui-utils.c:1475
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
+#: ../libempathy-gtk/empathy-ui-utils.c:1535
 msgid "Select a destination"
 msgstr "Välj ett mål"
 
@@ -1552,20 +1553,20 @@ msgstr "Närvaro"
 msgid "Set your own presence"
 msgstr "Ställ in din egna närvaro"
 
-#: ../src/empathy.c:567
+#: ../src/empathy.c:569
 msgid "Don't connect on startup"
 msgstr "Anslut inte vid uppstart"
 
-#: ../src/empathy.c:571
+#: ../src/empathy.c:573
 msgid "Don't show the contact list on startup"
 msgstr "Visa inte kontaktlistan vid uppstart"
 
-#: ../src/empathy.c:575
+#: ../src/empathy.c:577
 msgid "Show the accounts dialog"
 msgstr "Visa kontodialogrutan"
 
-#: ../src/empathy.c:587
-msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:589
+msgid "- Empathy IM Client"
 msgstr "- Empathy snabbmeddelandeklient"
 
 #: ../src/empathy-about-dialog.c:83
@@ -1672,53 +1673,56 @@ msgstr "_Skapa ett nytt konto"
 msgid "_Reuse an existing account"
 msgstr "_Återanvänd ett befintligt konto"
 
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "Ljusstyrka"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "Volym"
 
-#: ../src/empathy-call-window.c:662
+#: ../src/empathy-call-window.c:671
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "_Sidopanel"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "Knappsats"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "Ljudingång"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "Videoingång"
 
-#: ../src/empathy-call-window.c:835
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
 #, c-format
 msgid "Call with %s"
 msgstr "Ring med %s"
 
-#: ../src/empathy-call-window.c:904
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
 msgid "Call"
 msgstr "Ring"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1335
+#: ../src/empathy-call-window.c:1390
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Ansluten — %d:%02dm"
@@ -1761,6 +1765,69 @@ msgstr "Samtal (%d)"
 msgid "Typing a message."
 msgstr "Skriver ett meddelande."
 
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "T_öm"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "Chatta"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Infoga _smilis"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "Flytta flik till _vänster"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "Flytta flik till _höger"
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: ../src/empathy-chat-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "I_nnehåll"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "_Samtal"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "_Detach Tab"
+msgstr "_Koppla loss flik"
+
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Favorite Chatroom"
+msgstr "_Favoritchattrum"
+
+#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr "_Nästa flik"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "_Föregående flik"
+
+#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "_Visa kontaktlista"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "_Flikar"
+
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Namn"
@@ -2110,10 +2177,6 @@ msgstr "_Konton"
 msgid "_Compact Size"
 msgstr "_Kompakt storlek"
 
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Contents"
-msgstr "I_nnehåll"
-
 #: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
 msgstr "_Felsökning"
@@ -2122,10 +2185,6 @@ msgstr "_Felsökning"
 msgid "_File Transfers"
 msgstr "Fi_löverföringar"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Help"
-msgstr "_Hjälp"
-
 #: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
 msgstr "_Gå in..."
@@ -2215,35 +2274,35 @@ msgstr "Rumslista"
 msgid "_Room:"
 msgstr "_Rum:"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:148
 msgid "Message received"
 msgstr "Meddelande togs emot"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:149
 msgid "Message sent"
 msgstr "Meddelandet skickat"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:150
 msgid "New conversation"
 msgstr "Nytt samtal"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes online"
 msgstr "Kontakt ansluts"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:152
 msgid "Contact goes offline"
 msgstr "Kontakt kopplas ner"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:153
 msgid "Account connected"
 msgstr "Kontot anslutet"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:154
 msgid "Account disconnected"
 msgstr "Kontot frånkopplat"
 
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:394
 msgid "Language"
 msgstr "Språk"
 
@@ -2328,8 +2387,8 @@ msgid "Privacy"
 msgstr "Integritet"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will have a random value added (&#xB1;0.25&#xB0;)."
-msgstr "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer att få ett slumpmässigt värde (&#xB1;0.25&#xB0;)."
+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:22
 msgid "Show _smileys as images"
@@ -2383,10 +2442,6 @@ msgstr "Status"
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Show Contact List"
-msgstr "_Visa kontaktlista"
-
 #: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
@@ -2397,10 +2452,6 @@ msgstr "Kunde inte starta program för tjänsten %s: %s"
 msgid "An invitation was offered for service %s, but you don't have the needed application to handle it"
 msgstr "Du blev erbjuden en inbjudan för tjänsten %s, men du har inte det nödvändiga programmet att hantera den med"
 
-#: ../src/empathy-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr "Lämna helskärmsläge"
-
 #: ../src/empathy-map-view.ui.h:1
 msgid "Contact Map View"
 msgstr "Kartvy för kontakter"
@@ -2472,6 +2523,16 @@ 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."
 
+#~ msgid "gtk-add"
+#~ msgstr "Lägg till"
+#~ msgid "gtk-remove"
+#~ msgstr "Ta bort"
+#~ msgid "gtk-leave-fullscreen"
+#~ msgstr "Lämna helskärmsläge"
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Snabbmeddelandeklienten Empathy"
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Empathy snabbmeddelandeklient"
 #~ msgid "Avatars are user chosen images shown in the contact list"
 #~ msgstr "Avatarer är användarvalda bilder som visas i kontaktlistan"
 #~ msgid "Show _avatars"
@@ -2528,38 +2589,14 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ msgstr "<b>Nytt konto</b>"
 #~ msgid "I already have an account I want to use"
 #~ msgstr "Jag har redan ett konto som jag vill använda"
-#~ msgid "C_lear"
-#~ msgstr "T_öm"
-#~ msgid "Chat"
-#~ msgstr "Chatta"
-#~ msgid "Insert _Smiley"
-#~ msgstr "Infoga _smilis"
 #~ msgid "Invitation _message:"
 #~ msgstr "Inbjudnings_meddelande:"
 #~ msgid "Invite"
 #~ msgstr "Bjud in"
-#~ msgid "Move Tab _Left"
-#~ msgstr "Flytta flik till _vänster"
-#~ msgid "Move Tab _Right"
-#~ msgstr "Flytta flik till _höger"
 #~ msgid "Select who would you like to invite:"
 #~ msgstr "Välj vem du vill bjuda in:"
 #~ msgid "You have been invited to join a chat conference."
 #~ msgstr "Du har blivit inbjuden till en chattkonferens."
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-#~ msgid "_Conversation"
-#~ msgstr "_Samtal"
-#~ msgid "_Detach Tab"
-#~ msgstr "_Koppla loss flik"
-#~ msgid "_Favorite Chatroom"
-#~ msgstr "_Favoritchattrum"
-#~ msgid "_Next Tab"
-#~ msgstr "_Nästa flik"
-#~ msgid "_Previous Tab"
-#~ msgstr "_Föregående flik"
-#~ msgid "_Tabs"
-#~ msgstr "_Flikar"
 #~ msgid "Edit Favorite Room"
 #~ msgstr "Redigera favoritrum"
 #~ msgid "Join room on start_up"
@@ -2619,12 +2656,8 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ msgstr "Avsluta samtalet?"
 #~ msgid "Closing this window will end the call in progress."
 #~ msgstr "Stängning av detta fönster gör att alla pågående samtal avslutas."
-#~ msgid "Empathy Call"
-#~ msgstr "Empathy-samtal"
 #~ msgid "Readying"
 #~ msgstr "Förbereder"
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - Empathy-samtal"
 #~ msgid "Ringing"
 #~ msgstr "Ringer"
 #~ msgid "Connecting"
diff --git a/po/te.po b/po/te.po
new file mode 100644
index 000000000..aba908cce
--- /dev/null
+++ b/po/te.po
@@ -0,0 +1,2813 @@
+# translation of te.po to Telugu
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Krishna Babu K <kkrothap@redhat.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: te\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2009-08-14 08:19+0000\n"
+"PO-Revision-Date: 2009-03-12 20:25+0530\n"
+"Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
+"Language-Team: Telugu <en@li.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"
+"\n"
+"\n"
+
+#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy IM Client"
+msgstr ""
+
+#: ../data/empathy.desktop.in.in.h:2
+#, fuzzy
+msgid "Send and receive messages"
+msgstr "సత్వర సందేశములను పంపుము మరియు స్వీకరించుము"
+
+#: ../data/empathy.schemas.in.h:1
+msgid "Always open a separate chat window for new chats."
+msgstr "కొత్త చాట్సుకు యెల్లప్పుడు కొత్త చాట్ విండోను తెరువుము."
+
+#: ../data/empathy.schemas.in.h:2
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"సమూహరీతి చాట్ నందు నిక్ కంప్లీషన్ (టాబ్) వుపయోగిస్తున్నప్పుడు ముద్దుపేరు తర్వాత జతచేయవలసిన అక్షరము."
+
+#: ../data/empathy.schemas.in.h:3
+msgid "Chat window theme"
+msgstr "చాట్ విండో థీమ్"
+
+#: ../data/empathy.schemas.in.h:4
+msgid ""
+"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+msgstr "వుపయోగించుటకు కామాతో వేరుచేయబడివున్న స్పెల్ చెకర్ బాషలయొక్క జాబితా (ఉ.దా. en, fr, nl)."
+
+#: ../data/empathy.schemas.in.h:5
+msgid "Compact contact list"
+msgstr "పరిచయ జాబితాను నిశ్చయముచేయుము"
+
+#: ../data/empathy.schemas.in.h:6
+msgid "Contact list sort criterium"
+msgstr "పరిచయ జాబితా క్రమీకరణ విధానము"
+
+#: ../data/empathy.schemas.in.h:7
+msgid "Default directory to select an avatar image from"
+msgstr "అవతర్ ప్రతిబింబమును యెంపికచేయుటకు అప్రమేయ డైరెక్టరి"
+
+#: ../data/empathy.schemas.in.h:8
+msgid "Disable popup notifications when away"
+msgstr "దూరంగా వున్నప్పుడు పాప్అప్ నోటీసులను అచేతనముచేయుము"
+
+#: ../data/empathy.schemas.in.h:9
+msgid "Disable sounds when away"
+msgstr "దూరంగా వున్నప్పుడు శబ్దములను అచేతనముచేయుము"
+
+#: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:14
+msgid "Empathy default download folder"
+msgstr "Empathy అప్రమేయ డౌన్‌లోడు సంచయం"
+
+#: ../data/empathy.schemas.in.h:15
+msgid "Empathy has asked about importing accounts"
+msgstr "Empathy దిగుమతి చేయుచున్న ఖాతాలగురించి అడిగింది"
+
+#: ../data/empathy.schemas.in.h:16
+msgid "Empathy should auto-connect on startup"
+msgstr "ప్రారంభంనందు Empathy స్వయంచాలకంగా-అనుసంధానించబడాలి"
+
+#: ../data/empathy.schemas.in.h:17
+#, fuzzy
+msgid "Empathy should reduce the location's accuracy"
+msgstr "ప్రారంభంనందు Empathy స్వయంచాలకంగా-అనుసంధానించబడాలి"
+
+#: ../data/empathy.schemas.in.h:18
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy పరిచయం యొక్క అవతార్‌ను చాట్ విండో ప్రతిమవలె వుపయోగించాలి"
+
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
+msgid "Enable popup notifications for new messages"
+msgstr "కొత్త సందేశముల కొరకు పాపప్ నోటీసులను చేతనము చేయుము"
+
+#: ../data/empathy.schemas.in.h:21
+msgid "Enable spell checker"
+msgstr "స్పెల్ చెకర్‌ను చేతనముచేయుము"
+
+#: ../data/empathy.schemas.in.h:22
+msgid "Hide main window"
+msgstr "ముఖ్య విండోను మరుగున వుంచుము"
+
+#: ../data/empathy.schemas.in.h:23
+msgid "Hide the main window."
+msgstr "ముఖ్య విండోను మరుగునవుంచుము."
+
+#: ../data/empathy.schemas.in.h:24
+msgid "NetworkManager should be used"
+msgstr "నెట్వర్కునిర్వాహకి ఉపయోగించాలి"
+
+#: ../data/empathy.schemas.in.h:25
+msgid "Nick completed character"
+msgstr "ముద్దుపేరు పూర్తిచేయు అక్షరము"
+
+#: ../data/empathy.schemas.in.h:26
+msgid "Open new chats in separate windows"
+msgstr "కొత్త చాట్‌లను వేరువేరు విండోలనందు తెరువుము"
+
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:28
+#, fuzzy
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "చాట్ రూముల కొరకు థీమ్ వుపయోగించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:29
+msgid "Play a sound for incoming messages"
+msgstr "లోనికివచ్చు సందేశములకు శబ్దమును వినిపించుము"
+
+#: ../data/empathy.schemas.in.h:30
+msgid "Play a sound for new conversations"
+msgstr "కొత్త చర్చలకు శబ్దమును వినిపించుము"
+
+#: ../data/empathy.schemas.in.h:31
+msgid "Play a sound for outgoing messages"
+msgstr "బయటకుపోవు సందేశములకు శబ్దమును వినిపించుము"
+
+#: ../data/empathy.schemas.in.h:32
+msgid "Play a sound when a contact logs in"
+msgstr "పరిచయం లాగిన్ అయినప్పుడు శబ్దమును వినిపించుము"
+
+#: ../data/empathy.schemas.in.h:33
+msgid "Play a sound when a contact logs out"
+msgstr "పరిచయం లాగ్అవుట్ అయినప్పుడు శబ్దమును వినిపించుము"
+
+#: ../data/empathy.schemas.in.h:34
+msgid "Play a sound when we log in"
+msgstr "మనము లాగిన్ అయినప్పుడు శబ్దమును వినిపించుము"
+
+#: ../data/empathy.schemas.in.h:35
+msgid "Play a sound when we log out"
+msgstr "మనము లాగ్అవుట్ అయినప్పుడు శబ్దమును వినిపించుము"
+
+#: ../data/empathy.schemas.in.h:36
+msgid "Popup notifications if the chat isn't focused"
+msgstr "చాట్ దృష్టీకరించకపోతే పాపప్ నోటీసులు"
+
+#: ../data/empathy.schemas.in.h:37
+#, fuzzy
+msgid "Popup notifications when a contact sign in"
+msgstr "చాట్ దృష్టీకరించకపోతే పాపప్ నోటీసులు"
+
+#: ../data/empathy.schemas.in.h:38
+#, fuzzy
+msgid "Popup notifications when a contact sign out"
+msgstr "చాట్ దృష్టీకరించకపోతే పాపప్ నోటీసులు"
+
+#: ../data/empathy.schemas.in.h:39
+msgid "Salut account is created"
+msgstr "Salut ఖాతా సృష్టించబడింది"
+
+#: ../data/empathy.schemas.in.h:40
+msgid "Show avatars"
+msgstr "అవతారములను చూపుము"
+
+#: ../data/empathy.schemas.in.h:41
+#, fuzzy
+msgid "Show contact list in rooms"
+msgstr "పరిచయ జాబితాను చూపుము (_S)"
+
+#: ../data/empathy.schemas.in.h:42
+msgid "Show hint about closing the main window"
+msgstr "ముఖ్య విండోను మూయుటకు జాడ చూపుము"
+
+#: ../data/empathy.schemas.in.h:43
+msgid "Show offline contacts"
+msgstr "ఆఫ్‌లైన్ పరిచయాలను చూపుము"
+
+#: ../data/empathy.schemas.in.h:44
+msgid "Spell checking languages"
+msgstr "స్పెల్ పరిశీలన భాషలు"
+
+#: ../data/empathy.schemas.in.h:45
+msgid "The default folder to save file transfers in."
+msgstr "దస్త్రపు బదిలీకరణలను దాయుటకు అప్రమేయ ఫోల్డర్."
+
+#: ../data/empathy.schemas.in.h:46
+msgid "The last directory that an avatar image was chosen from."
+msgstr "అవతారము ప్రతిబింబము యెంచుకొనబడినటువంటి ఆఖరి డైరెక్టరి."
+
+#: ../data/empathy.schemas.in.h:47
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "చాట్ విండోలనందు చర్చను ప్రదర్శించుటకు వుపయోగించబడిన థీమ్."
+
+#: ../data/empathy.schemas.in.h:48
+msgid "Use graphical smileys"
+msgstr "గ్రాఫికల్ చిరునవ్వులను వుపయోగించుము"
+
+#: ../data/empathy.schemas.in.h:49
+msgid "Use notification sounds"
+msgstr "నోటీసు శబ్దములను వుపయోగించుము"
+
+#: ../data/empathy.schemas.in.h:50
+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."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+#, fuzzy
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "పరిచయ జాబితానందు ఆఫ్‌లైనుగావున్న పరిచయాలను చూయించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:53
+#, fuzzy
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "పరిచయంయొక్క అవతారమును Empathy చాట్ విండో ప్రతిమవలె వుపయోగించవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:54
+#, fuzzy
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr "పరిచయంయొక్క అవతారమును Empathy చాట్ విండో ప్రతిమవలె వుపయోగించవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:55
+#, fuzzy
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "పరిచయంయొక్క అవతారమును Empathy చాట్ విండో ప్రతిమవలె వుపయోగించవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:56
+msgid ""
+"Whether or not Empathy has asked about importing accounts from other "
+"programs."
+msgstr "ఇతర ప్రోగ్రామ్సునుండి ఖాతాలను డౌనులోడు చేయుట గురించి Empathy అడగవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:57
+msgid ""
+"Whether or not Empathy should automatically log in to your accounts on "
+"startup."
+msgstr "Empathy ప్రారంభంనందు మీ ఖాతాలలోనికి స్వయంచాలకంగా లాగిన్ అవ్వాలా లేదా."
+
+#: ../data/empathy.schemas.in.h:58
+#, fuzzy
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "పరిచయంయొక్క అవతారమును Empathy చాట్ విండో ప్రతిమవలె వుపయోగించవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:59
+msgid ""
+"Whether or not Empathy should use the avatar of the contact as the chat "
+"window icon."
+msgstr "పరిచయంయొక్క అవతారమును Empathy చాట్ విండో ప్రతిమవలె వుపయోగించవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:60
+msgid ""
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr "Empathy మొదటిసారి నడిపినప్పుడు Salut ఖాతా సృష్టించవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:61
+msgid ""
+"Whether or not the network manager should be used to automatically "
+"disconnect/reconnect."
+msgstr "స్వయంచాలకంగా అననుసంధానించుటకు/పునఃసంధానించుటకు నెట్వర్కు నిర్వాహిక వుపయోగించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:62
+msgid ""
+"Whether or not 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."
+msgstr "చర్చలనందు చిరునవ్వులను గ్రాఫికల్ చిత్రములలోనికి మార్చాలా వద్దా"
+
+#: ../data/empathy.schemas.in.h:64
+msgid ""
+"Whether or not to play a sound to notify for contacts logging in the network."
+msgstr "నెట్వర్కునందు లాగిన్ అయ్యిన పరిచయములకు శబ్ధము వినిపించవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:65
+msgid ""
+"Whether or not to play a sound to notify for contacts logging off the "
+"network."
+msgstr "నెట్వర్కునుండి లాగాఫ్ అయిన పరిచయములకు శబ్ధములను వినిపించవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:66
+msgid "Whether or not to play a sound to notify for events."
+msgstr "ఘటనలను తెలియజేయుటకు శబ్దమును వినిపించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:67
+msgid "Whether or not to play a sound to notify for incoming messages."
+msgstr "లోనికివచ్చు సందేశములను తెలియజేయుటకు శబ్ధమును వినిపించవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:68
+msgid "Whether or not to play a sound to notify for new conversations."
+msgstr "కొత్త చర్చలను తెలియజెప్పుటకు శబ్ధమును వినిపించవలెనా."
+
+#: ../data/empathy.schemas.in.h:69
+msgid "Whether or not to play a sound to notify for outgoing messages."
+msgstr "బయటకువెళ్ళు సందేశములను తెలియజెప్పుటకు శబ్ధములను వినిపించవలెనా."
+
+#: ../data/empathy.schemas.in.h:70
+msgid "Whether or not to play a sound when logging in a network."
+msgstr "నెట్వర్కునందు లాగిన్ అయ్యనప్పుడు శబ్ధమును వినిపించవలెనా."
+
+#: ../data/empathy.schemas.in.h:71
+msgid "Whether or not to play a sound when logging off a network."
+msgstr "నెట్వర్కునుండి లాగాఫ్ అయినప్పుడు శబ్ధమును వినిపించవలెనా."
+
+#: ../data/empathy.schemas.in.h:72
+msgid "Whether or not to play sound notifications when away or busy."
+msgstr "దూరంగావున్నప్పుడు లేదా బ్యుజీగావున్నప్పుడు శబ్దములను వినిపించవలెనా."
+
+#: ../data/empathy.schemas.in.h:73
+#, fuzzy
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "దూరంగా లేదా బ్యుజిగా వున్నప్పుడు పాపప్ నోటీసులు చూయించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:74
+#, fuzzy
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "దూరంగా లేదా బ్యుజిగా వున్నప్పుడు పాపప్ నోటీసులు చూయించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:75
+msgid ""
+"Whether or not 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."
+msgstr "కొత్త సందేశము వచ్చినప్పుడు పాపప్ నోటీసు చూయించవలెనా లేదా."
+
+#: ../data/empathy.schemas.in.h:77
+msgid ""
+"Whether or not 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."
+msgstr "పరిచయ జాబితానందు ఆఫ్‌లైనుగావున్న పరిచయాలను చూయించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:79
+msgid "Whether or not to show popup notifications when away or busy."
+msgstr "దూరంగా లేదా బ్యుజిగా వున్నప్పుడు పాపప్ నోటీసులు చూయించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:80
+#, fuzzy
+msgid "Whether or not to show the contact list in chat rooms."
+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."
+msgstr "ముఖ్య విండో మూయుటకు సందేశపు డైలాగ్ 'x' బటన్‌తో శీర్షిక పట్టీనందు చూయించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:82
+msgid "Whether to show the contact list in compact mode or not."
+msgstr "పరిచయ జాబితాను యిమిడిక రీతిలో చూయించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:83
+msgid "Whether to use the theme for chat rooms or not."
+msgstr "చాట్ రూముల కొరకు థీమ్ వుపయోగించాలా వద్దా."
+
+#: ../data/empathy.schemas.in.h:84
+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."
+msgstr ""
+"పరిచయ జాబితాను క్రమీకరిస్తున్నప్పుడు ఏ విధానాన్ని వుపయోగించాలి. పరిచయ నామమును \"name\" విలువతో "
+"వుపయోగించి క్రమీకరణ చేయుట అప్రమేయం. విలువ \"state\" అనునది పరిచయ జాబితాను స్థితితో క్రమీకరిస్తుంది."
+
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr ""
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
+msgid "People nearby"
+msgstr "దగ్గరలోని ప్రజలు"
+
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "ఎటువంటి కారణం తెలుపలేదు"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "స్థితినందు మార్పు అభ్యర్దించబడినది"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "మీరు దస్త్రపు బదిలీకరణను రద్దుచేసినారు"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "వేరొకరు దస్త్రపు బదిలీకరణను రద్దుచేసినారు"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "దస్త్రమును బదిలీకరించుటకు ప్రయత్నిస్తున్నప్పుడు దోషము"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "పాల్గొనిన వానిలో మరియొకరు దస్త్రమును బదిలీకరించలేక పోయినారు"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "తెలియని కారణం"
+
+#: ../libempathy/empathy-utils.c:265
+msgid "Available"
+msgstr "అందుబాటులోవుంది"
+
+#: ../libempathy/empathy-utils.c:267
+msgid "Busy"
+msgstr "తీరికలేదు"
+
+#: ../libempathy/empathy-utils.c:270
+msgid "Away"
+msgstr "దూరంగా"
+
+#: ../libempathy/empathy-utils.c:272
+msgid "Hidden"
+msgstr "మరుగుపడిన"
+
+#: ../libempathy/empathy-utils.c:274
+msgid "Offline"
+msgstr "లైనువెలుపల"
+
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
+msgid "All"
+msgstr "అన్ని"
+
+#: ../libempathy-gtk/empathy-account-widget.c:302
+#: ../libempathy-gtk/empathy-account-widget.c:354
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+#, fuzzy
+msgid "Advanced"
+msgstr "<b>అధునాతన</b>"
+
+#: ../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
+msgid "Pass_word:"
+msgstr "సంకేతపదం (_w):"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "Screen _Name:"
+msgstr "తెర నామము (_N):"
+
+#: ../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
+msgid "_Port:"
+msgstr "పోర్టు(_P):"
+
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
+msgid "_Server:"
+msgstr "సేవిక(_S):"
+
+#: ../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
+msgid "Login I_D:"
+msgstr "లాగిన్ I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "_Charset:"
+msgstr "అక్షరసమితి (_C):"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+msgid "New Network"
+msgstr "కొత్త నెట్వర్కు"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Charset:"
+msgstr "అక్షరసమితి:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network"
+msgstr "నెట్ వర్క్"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Network:"
+msgstr "నెట్వర్కు:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Nickname:"
+msgstr "ముద్దుపేరు:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid "Password:"
+msgstr "రహస్యపదం:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Quit message:"
+msgstr "సందేశమును నిష్క్రమించుము:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+msgid "Real name:"
+msgstr "వాస్తవ నామము:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#, fuzzy
+msgid "Servers"
+msgstr "సేవిక"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#, fuzzy
+msgid "Override server settings"
+msgstr "<b>సేవిక అమరికలను తిరిగివ్రాయుము</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "Pri_ority:"
+msgstr "ప్రాముఖ్యత(_o):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "Reso_urce:"
+msgstr "వనరు (_u):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+msgid "Use old SS_L"
+msgstr "పాత SS_L వుపయోగించుము"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "_Encryption required (TLS/SSL)"
+msgstr "ఎన్క్రిప్షన్ అవసరమైంది (_E) (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "_Ignore SSL certificate errors"
+msgstr "SSL దృవీకరణపత్రం దోషములను వదిలివేయుము (_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+msgid "_Email:"
+msgstr "ఈమెయిల్ (_E):"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+msgid "_First Name:"
+msgstr "మొదటి నామము (_F):"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+msgid "_Jabber ID:"
+msgstr "జబ్బర్ ID (_J):"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+msgid "_Last Name:"
+msgstr "చివరి నామము (_L):"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+msgid "_Nickname:"
+msgstr "ముద్దుపేరు (_N):"
+
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+msgid "_Published Name:"
+msgstr "ప్రచురించిన నామము (_P):"
+
+#. 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:3
+msgid "Discover STUN"
+msgstr "STUN కనుగొనుము"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "STUN Server:"
+msgstr "STUN సేవిక:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "STUN port:"
+msgstr "STUN పోర్టు:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "_Username:"
+msgstr "వినియోగదారు నామము (_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Use _Yahoo Japan"
+msgstr "_Yahoo జపాన్ వుపయోగించుము"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+msgid "Yahoo I_D:"
+msgstr "Yahoo I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Ignore conference and chatroom invitations"
+msgstr "కాన్ఫరెన్సును మరియు చాట్‌గది ఆహ్వానములను వదిలివేయుము (_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Room List locale:"
+msgstr "గది జాబితా స్థానికం (_R):"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+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:933
+msgid "Select Your Avatar Image"
+msgstr "మీ అవతార్ ప్రతిబింబమును యెంచుకొనుము"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+msgid "No Image"
+msgstr "ప్రతిరూపం లేదు"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+msgid "Images"
+msgstr "చిత్రాలు"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+msgid "All Files"
+msgstr "అన్ని దస్త్రాలు"
+
+#: ../libempathy-gtk/empathy-avatar-image.c:324
+msgid "Click to enlarge"
+msgstr "పెద్దదిచేయుటకు నొక్కుము"
+
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:412
+msgid "Unsupported command"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:548
+msgid "offline"
+msgstr "ఆఫ్‌లైన్"
+
+#: ../libempathy-gtk/empathy-chat.c:551
+msgid "invalid contact"
+msgstr "చెల్లని పరిచయం"
+
+#: ../libempathy-gtk/empathy-chat.c:554
+msgid "permission denied"
+msgstr "అనుమతి నిరాకరించబడింది"
+
+#: ../libempathy-gtk/empathy-chat.c:557
+msgid "too long message"
+msgstr "మరీ పొడవైన సందేశము"
+
+#: ../libempathy-gtk/empathy-chat.c:560
+msgid "not implemented"
+msgstr "అభివృద్ది పరచబడలేదు"
+
+#: ../libempathy-gtk/empathy-chat.c:563
+msgid "unknown"
+msgstr "తెలియని"
+
+#: ../libempathy-gtk/empathy-chat.c:567
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "'%s' సందేశం పంపడంలో దోషము: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:597
+#, c-format
+msgid "Topic set to: %s"
+msgstr "విషయం దీనికు అమర్చబడింది: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:599
+msgid "No topic defined"
+msgstr "ఏ విషయం నిర్వచించిలేదు"
+
+#: ../libempathy-gtk/empathy-chat.c:969
+msgid "(No Suggestions)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1023
+msgid "Insert Smiley"
+msgstr "చిరునవ్వును చేర్చుము"
+
+#. send button
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
+msgid "_Send"
+msgstr "పంపుట (_S)"
+
+#: ../libempathy-gtk/empathy-chat.c:1075
+msgid "_Spelling Suggestions"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1190
+#, fuzzy, c-format
+msgid "%s has disconnected"
+msgstr "పరిచయం అననుసంధానించబడింది"
+
+#: ../libempathy-gtk/empathy-chat.c:1194
+#, c-format
+msgid "%s was kicked by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1197
+#, c-format
+msgid "%s was kicked"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid "%s has left the room"
+msgstr "%s గదిని వదిలినది"
+
+#. 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:1218
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s గదినందు జేరినది"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
+msgid "Disconnected"
+msgstr "తెంచబడినది"
+
+#: ../libempathy-gtk/empathy-chat.c:1809
+msgid "Connected"
+msgstr "అనుసంధానించబడింది"
+
+#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-log-window.c:502
+msgid "Conversation"
+msgstr "చర్చ"
+
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "విషయం:"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
+msgid "_Copy Link Address"
+msgstr "జోడి చిరునామాను నకలుతీయు (_C)"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
+msgid "_Open Link"
+msgstr "జోడి తెరువుము (_O)"
+
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
+msgid "%A %B %d %Y"
+msgstr "%A %B %d %Y"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+msgid "Edit Contact Information"
+msgstr "పరిచయ సమాచారమును సరికూర్చుము"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "వ్యక్తిగత సమాచారం"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+msgid "New Contact"
+msgstr "కొత్త  పరిచయం"
+
+#: ../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 "చందా అభ్యర్ధన"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "మీరు నిజంగా సమూహం '%s'ను తీసివేద్దామని అనుకొనుచున్నారా?"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+msgid "Removing group"
+msgstr "సమూహమును తీసివేయుచున్నది"
+
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+msgid "_Remove"
+msgstr "తీసివేయి (_R)"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "మీరు నిజంగా పరిచయం '%s'ను తీసివేద్దామని అనుకొనుచున్నారా?"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+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:222
+#: ../src/empathy-main-window.ui.h:12
+msgid "_Chat"
+msgstr "చాట్ (_C)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+#, fuzzy
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "కాల్ (_C)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+#, fuzzy
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "కాల్ (_C)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
+msgid "_View Previous Conversations"
+msgstr "మునుపటి చర్చలను దర్శించుము (_V)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:346
+msgid "Send file"
+msgstr "ఫైలును పంపుము"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
+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
+msgid "_Edit"
+msgstr "సరిచేయు (_E)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:501
+msgid "Inviting to this room"
+msgstr "ఈ గదికి ఆహ్వానిస్తోంది"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:532
+msgid "_Invite to chatroom"
+msgstr "చాట్‌గదికి ఆహ్వానిస్తోంది (_I)"
+
+#: ../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:503
+msgid "Unable to save avatar"
+msgstr "అవతార్‌ను దాయలేకపోయింది"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+msgid "Select"
+msgstr "ఎంపిక"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
+msgid "Group"
+msgstr "గ్రూప్"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#, fuzzy
+msgid "Country:"
+msgstr "ఖాతా:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#, fuzzy
+msgid "State:"
+msgstr "స్థితి:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#, fuzzy
+msgid "City:"
+msgstr "కక్షిదారు:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#, fuzzy
+msgid "Area:"
+msgstr "అర్మేనియన్"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#, fuzzy
+msgid "Street:"
+msgstr "ఎంపిక"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#, fuzzy
+msgid "Floor:"
+msgstr "కొరకు (_F):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#, fuzzy
+msgid "Room:"
+msgstr "గది (_R):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#, fuzzy
+msgid "Text:"
+msgstr "రకం:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#, fuzzy
+msgid "Description:"
+msgstr "వర్షన్:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#, fuzzy
+msgid "Bearing:"
+msgstr "వర్షన్:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+#, fuzzy
+msgid "<b>Location</b>"
+msgstr "<b>పరిచయము</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#, fuzzy
+msgid "<b>Location</b>, "
+msgstr "<b>పరిచయము</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+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 "ఖాతా:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+msgid "Alias:"
+msgstr "ఉపనామము:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+msgid "Birthday:"
+msgstr "పుట్టినరోజు:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#, fuzzy
+msgid "Client Information"
+msgstr "<b>కక్షిదారి సమాచారము</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+msgid "Client:"
+msgstr "కక్షిదారు:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "చిరునామా"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#, fuzzy
+msgid "Contact Details"
+msgstr "<b>పరిచయ వివరములు</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Email:"
+msgstr "ఈమెయిల్:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Fullname:"
+msgstr "పుర్తినామము:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#, fuzzy
+msgid "Groups"
+msgstr "గ్రూప్"
+
+#. Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Identifier:"
+msgstr "గుర్తించునది:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+msgid "Information requested..."
+msgstr "అభ్యర్దించిన సమాచారము..."
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+msgid "OS:"
+msgstr "OS:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+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-contact-widget.ui.h:17
+msgid "Version:"
+msgstr "వర్షన్:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+msgid "Web site:"
+msgstr "వెబ్ సైటు:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+msgid "_Add Group"
+msgstr "సమూహంను చేర్చుము (_A)"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+msgid "new server"
+msgstr "కొత్త సేవిక"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+msgid "Server"
+msgstr "సేవిక"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+msgid "Port"
+msgstr "పోర్టు"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+msgid "SSL"
+msgstr "SSL"
+
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
+msgid "Account"
+msgstr "ఖాతా"
+
+#: ../libempathy-gtk/empathy-log-window.c:512
+msgid "Date"
+msgstr "తేద"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "Conversations"
+msgstr "సంభాషణలు"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+msgid "Previous Conversations"
+msgstr "గత చర్చ"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Search"
+msgstr "వెతుకు"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "_For:"
+msgstr "కొరకు (_F):"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
+msgid "C_all"
+msgstr "కాల్ (_a)"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+msgid "C_hat"
+msgstr "చాట్ (_h)"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
+msgid "Contact ID:"
+msgstr "పరిచయ ID:"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+msgid "New Conversation"
+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
+#, fuzzy
+msgid "Custom Message..."
+msgstr "మలచుకొనిన సందేశాలు..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#, fuzzy
+msgid "Edit Custom Messages..."
+msgstr "మలచుకొనిన సందేశాలు..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#, fuzzy
+msgid "Set status"
+msgstr "స్థితి"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr ""
+
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "మలచుకొనిన సందేశాలు..."
+
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr "సత్వర సందేశమును స్వీకరించినది"
+
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr "సత్వర సందేశమును పంపుము"
+
+#: ../libempathy-gtk/empathy-sound.c:55
+msgid "Incoming chat request"
+msgstr "లోనికివచ్చు చాట్ అభ్యర్ధన"
+
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr "పరిచయం అనుసంధానించబడింది"
+
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr "పరిచయం అననుసంధానించబడింది"
+
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr "సేవికకు అనుసంధానించబడింది"
+
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "సేవికనుండి అననుసంధానించబడింది"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
+msgstr "లోనికివచ్చు వాయిస్ కాల్"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "బయటకు వెళ్ళు వాయిస్ కాల్"
+
+#: ../libempathy-gtk/empathy-sound.c:69
+msgid "Voice call ended"
+msgstr "వాయిల్ కాల్ ముగిసినది"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#, fuzzy
+msgid "Enter Custom Message"
+msgstr "మలచుకొనిన సందేశము"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#, fuzzy
+msgid "Edit Custom Messages"
+msgstr "మలచుకొనిన సందేశము"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+#, fuzzy
+msgid "Saved Presets"
+msgstr "సందేశమును దాయుము"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "శాస్త్రీయ"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "సరళమైన"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "శుభ్రముచేయి"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "నీలం"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "URI తెరువలేదు"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "ఒక దస్త్రాన్ని ఎంచుకొనుము"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
+#, fuzzy
+msgid "Select a destination"
+msgstr "పరిచయం యెంపికచేయుము"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr "ప్రస్తుత స్థానికం"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr "అరబిక్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr "అర్మేనియన్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:173
+#: ../libempathy-gtk/totem-subtitle-encoding.c:175
+#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+msgid "Baltic"
+msgstr "బాల్టిక్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+msgid "Celtic"
+msgstr "సెల్టిక్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:183
+#: ../libempathy-gtk/totem-subtitle-encoding.c:185
+#: ../libempathy-gtk/totem-subtitle-encoding.c:187
+#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+msgid "Central European"
+msgstr "సెంట్రల్ యూరోపియన్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:192
+#: ../libempathy-gtk/totem-subtitle-encoding.c:194
+#: ../libempathy-gtk/totem-subtitle-encoding.c:196
+#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+msgid "Chinese Simplified"
+msgstr "చైనీస్ సింప్లిఫైడ్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:201
+#: ../libempathy-gtk/totem-subtitle-encoding.c:203
+#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+msgid "Chinese Traditional"
+msgstr "చైనీస్ ట్రెడిషనల్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+msgid "Croatian"
+msgstr "Croatian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:211
+#: ../libempathy-gtk/totem-subtitle-encoding.c:213
+#: ../libempathy-gtk/totem-subtitle-encoding.c:215
+#: ../libempathy-gtk/totem-subtitle-encoding.c:217
+#: ../libempathy-gtk/totem-subtitle-encoding.c:219
+#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+msgid "Cyrillic"
+msgstr "సిరిల్లిక్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+msgid "Cyrillic/Russian"
+msgstr "సిరిలిక్/రష్యన్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:227
+#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+msgid "Cyrillic/Ukrainian"
+msgstr "సిరిలిక్/ఉక్రైనియన్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+msgid "Georgian"
+msgstr "జార్జియన్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:235
+#: ../libempathy-gtk/totem-subtitle-encoding.c:237
+#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+msgid "Greek"
+msgstr "గ్రీక్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+msgid "Gujarati"
+msgstr " గుజరాతీ"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+msgid "Gurmukhi"
+msgstr "గుర్ముఖి"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:248
+#: ../libempathy-gtk/totem-subtitle-encoding.c:250
+#: ../libempathy-gtk/totem-subtitle-encoding.c:252
+#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+msgid "Hebrew"
+msgstr "హెబ్రూ"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+msgid "Hebrew Visual"
+msgstr "హెబ్రూ విజువల్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+msgid "Hindi"
+msgstr "హింది"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+msgid "Icelandic"
+msgstr "Icelandic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:266
+#: ../libempathy-gtk/totem-subtitle-encoding.c:268
+#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+msgid "Japanese"
+msgstr "జపనీస్"
+
+#: ../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 "కొరియన్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+msgid "Nordic"
+msgstr "నార్డిక్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+msgid "Persian"
+msgstr "పర్షియన్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:288
+#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+msgid "Romanian"
+msgstr "రొమానియన్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+msgid "South European"
+msgstr "సౌత్ యూరోపియన్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+msgid "Thai"
+msgstr "థాయ్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:299
+#: ../libempathy-gtk/totem-subtitle-encoding.c:301
+#: ../libempathy-gtk/totem-subtitle-encoding.c:303
+#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+msgid "Turkish"
+msgstr "టర్కిష్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:308
+#: ../libempathy-gtk/totem-subtitle-encoding.c:310
+#: ../libempathy-gtk/totem-subtitle-encoding.c:312
+#: ../libempathy-gtk/totem-subtitle-encoding.c:314
+#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+msgid "Unicode"
+msgstr "యూనికోడ్"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:319
+#: ../libempathy-gtk/totem-subtitle-encoding.c:321
+#: ../libempathy-gtk/totem-subtitle-encoding.c:323
+#: ../libempathy-gtk/totem-subtitle-encoding.c:325
+#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+msgid "Western"
+msgstr "పడమర"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:330
+#: ../libempathy-gtk/totem-subtitle-encoding.c:332
+#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+msgid "Vietnamese"
+msgstr "Vietnamese"
+
+#.
+#. * 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:519
+msgid "Talk!"
+msgstr "మాట్లాడు!"
+
+#: ../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:168
+msgid "Please configure a contact."
+msgstr "దయచేసి వొక పరిచయం ఆకృతీకరించుము."
+
+#: ../megaphone/src/megaphone-applet.c:258
+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:106
+msgid "Set your own presence"
+msgstr "మీ స్వంత హాజరును అమర్చుము"
+
+#: ../src/empathy.c:567
+msgid "Don't connect on startup"
+msgstr "ప్రారంభంనందు అనుసంధానించ వద్దు"
+
+#: ../src/empathy.c:571
+msgid "Don't show the contact list on startup"
+msgstr "ప్రారంభంవద్ద పరిచయ జాబితాను చూపవద్దు"
+
+#: ../src/empathy.c:575
+msgid "Show the accounts dialog"
+msgstr "ఖాతాల డైలాగును చూపవద్దు"
+
+#: ../src/empathy.c:587
+#, fuzzy
+msgid "- Empathy IM Client"
+msgstr "- Empathy సత్వర సందేశిని"
+
+#: ../src/empathy-about-dialog.c:83
+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 ఉచిత సాఫ్టువేర్; ఉచిత సాఫ్టువేర్ సంస్థ తరుపున ప్రచురితమైనGNU జనరల్ పబ్లిక్ లైసెన్సు కు "
+"లోబడి దీనిని మీరు పునఃపంపిణి మరియు/లేదాసవరణ చేయవచ్చు; మీరు అనుసరించవలిసినది లైసెన్సు యొక్క వర్షన్ 2, "
+"లేదా(మీ ఐచ్చికం వద్ద) దాని తరువాతి వర్షన్ కాని."
+
+#: ../src/empathy-about-dialog.c:87
+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 అది ఉపయోగపడుతుందనే నమ్మకం తో పంపిణీ చేయబడింది,అయితే ఏ హామి లేదు; వ్యాపారసంబంధితంగా కాని లేదా "
+"ప్రతిపాదిత ప్రయోజనం కొరకుకాని హామీ లేదు. అధికవివరములకొరకు GNU జనరల్ పబ్లిక్ లైసెన్సు నుచూడండి."
+
+#: ../src/empathy-about-dialog.c:91
+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 ""
+"Empathyతో మీరు GNU జనరల్ పబ్లిక్ లైసెన్సు నకలు ను పొంది ఉంటారు;పొందకపోతే, Free Software "
+"Foundation, Inc., 51 Franklin Street, FifthFloor, Boston. MA02110-1301, USA "
+"కు వ్రాయండి."
+
+#: ../src/empathy-about-dialog.c:119
+msgid "An Instant Messaging client for GNOME"
+msgstr "GNOME కొరకు సత్వర సందేశ కక్షిదారి"
+
+#: ../src/empathy-about-dialog.c:125
+msgid "translator-credits"
+msgstr "KrishnaBabu K <kkrothap@redhat.com> 2008."
+
+#: ../src/empathy-accounts-dialog.c:392
+msgid "Enabled"
+msgstr "క్రియాశీలీకరించిన"
+
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "ఖాతాలు"
+
+#. To translator: %s is the protocol name
+#: ../src/empathy-accounts-dialog.c:837
+#, c-format
+msgid "New %s account"
+msgstr "కొత్త %s ఖాతా"
+
+#: ../src/empathy-accounts-dialog.c:950
+#, c-format
+msgid ""
+"You are about to remove your %s account!\n"
+"Are you sure you want to proceed?"
+msgstr ""
+"మీరు మీ %s ఖాతాను తీసివేయబోతున్నారు!\n"
+"మీరు ఖచ్చితముగా తీసివేద్దామని అనుకొనుచున్నారా?"
+
+#: ../src/empathy-accounts-dialog.c:956
+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 ""
+"మీరు కొనసాగించినా సంభందిత చాట్‌గదులు మరియు చర్చలు తీసివేయబడవు.\n"
+"\n"
+"మీరు ఖాతాను తర్వాత తిరిగి జతచేయాలని అనుకొన్నా, అవి అందుబాటులోనే వుంటాయి."
+
+#: ../src/empathy-accounts-dialog.ui.h:2
+#, fuzzy
+msgid "Add Account"
+msgstr "ఖాతా"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "Cr_eate"
+msgstr "సృష్టించు (_e)"
+
+#: ../src/empathy-accounts-dialog.ui.h:4
+#, fuzzy
+msgid "Gmail"
+msgstr "ఈమెయిల్:"
+
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "Import Accounts..."
+msgstr "ఖాతాలను దిగుమతిచేయి..."
+
+#: ../src/empathy-accounts-dialog.ui.h:6
+#, fuzzy
+msgid "No protocol installed"
+msgstr "<b>ఏ ప్రోటోకాల్ సంస్థాపించబడిలేదు</b>"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+#, fuzzy
+msgid "Settings"
+msgstr "<b>అమరికలు</b>"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
+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 "రకం:"
+
+#: ../src/empathy-accounts-dialog.ui.h:10
+#, fuzzy
+msgid "_Add..."
+msgstr "పరిచయం జతచేయుము (_A)..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+#, fuzzy
+msgid "_Create a new account"
+msgstr "కొత్త IRC నెట్వర్కును సృష్టించుము"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+#, fuzzy
+msgid "_Reuse an existing account"
+msgstr "ఖాతాలను చూపుము మరియు సరికూర్చుము"
+
+#: ../src/empathy-call-window.c:426
+msgid "Contrast"
+msgstr "భేదము"
+
+#: ../src/empathy-call-window.c:429
+msgid "Brightness"
+msgstr "కాంతివంతము"
+
+#: ../src/empathy-call-window.c:432
+msgid "Gamma"
+msgstr "గామా"
+
+#: ../src/empathy-call-window.c:539
+msgid "Volume"
+msgstr "సంపుటము"
+
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "అనుసంధానించబడుచున్నది..."
+
+#: ../src/empathy-call-window.c:778
+msgid "_Sidebar"
+msgstr "పక్క పట్టీ(_S)"
+
+#: ../src/empathy-call-window.c:797
+msgid "Dialpad"
+msgstr "డయల్‌పాడ్"
+
+#: ../src/empathy-call-window.c:803
+msgid "Audio input"
+msgstr "ఆడియో ఇన్పుట్"
+
+#: ../src/empathy-call-window.c:807
+msgid "Video input"
+msgstr "వీడియో ఇన్పుట్"
+
+#: ../src/empathy-call-window.c:866
+#, c-format
+msgid "Call with %s"
+msgstr ""
+
+#: ../src/empathy-call-window.c:935
+#, fuzzy
+msgid "Call"
+msgstr "కాల్ (_C)"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1387
+#, fuzzy, c-format
+msgid "Connected — %d:%02dm"
+msgstr "అనుసంధానించబడింది -- %d:%02dm"
+
+#: ../src/empathy-call-window.ui.h:1
+msgid "Hang up"
+msgstr "హాంగ్ చేయి"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Send Audio"
+msgstr "ఆడియోను పంపుము"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Send video"
+msgstr "వీడియోను పంపుము"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Video preview"
+msgstr "దృశ్య ఉపదర్శనం"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "కాల్ (_C)"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+msgid "_View"
+msgstr "దర్శనం (_V)"
+
+#: ../src/empathy-chat-window.c:344
+#, c-format
+msgid "Conversations (%d)"
+msgstr "చర్చలు (%d)"
+
+#: ../src/empathy-chat-window.c:476
+msgid "Typing a message."
+msgstr "సందేశమును టైపు చేస్తున్నారు."
+
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "శుభ్రపరచు (_l)"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "మాటామంతి"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "చిరునవ్వును జతచేయుము (_S)"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "నెట్టును ఎడమవైపు జరుపు (_L)"
+
+#: ../src/empathy-chat-window.ui.h:5
+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 "_Conversation"
+msgstr "చర్చ (_C)"
+
+#: ../src/empathy-chat-window.ui.h:9
+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 "_Next Tab"
+msgstr "తర్వాత నెట్టు (_N)"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "పూర్వపు నెట్టు (_P)"
+
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "పరిచయ జాబితాను చూపుము (_S)"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "నెట్టులు (_T)"
+
+#: ../src/empathy-chatrooms-window.c:258
+msgid "Name"
+msgstr "నామము"
+
+#: ../src/empathy-chatrooms-window.c:276
+msgid "Room"
+msgstr "గది"
+
+#: ../src/empathy-chatrooms-window.c:285
+msgid "Auto-Connect"
+msgstr "స్వయంచాలక-అనుసంధానం"
+
+#: ../src/empathy-chatrooms-window.ui.h:2
+msgid "Manage Favorite Rooms"
+msgstr "అభీష్ట గదులను నిర్వహించుము"
+
+#: ../src/empathy-event-manager.c:321
+msgid "Incoming call"
+msgstr "లోనికివచ్చు కాల్"
+
+#: ../src/empathy-event-manager.c:324
+#, c-format
+msgid "%s is calling you, do you want to answer?"
+msgstr "%s మిమ్ములను కాల్ చేస్తున్నారు, మీరు సమాధానం యివ్వాలని అనుకొనుచున్నారా?"
+
+#: ../src/empathy-event-manager.c:331
+msgid "_Reject"
+msgstr "తిరస్కరించు (_R)"
+
+#: ../src/empathy-event-manager.c:337
+msgid "_Answer"
+msgstr "సమాధానంయివ్వు (_A)"
+
+#: ../src/empathy-event-manager.c:452
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%sనుండి లోనికివచ్చు కాల్"
+
+#: ../src/empathy-event-manager.c:496
+#, c-format
+msgid "%s is offering you an invitation"
+msgstr "%s మీకు ఆహ్వానమును అందించుచున్నది"
+
+#: ../src/empathy-event-manager.c:502
+msgid "An external application will be started to handle it."
+msgstr "దీనిని సంబాలించుటకు వొక బహిర్గత అనువర్తనము ప్రారంభించబడుతుంది."
+
+#: ../src/empathy-event-manager.c:507
+msgid "You don't have the needed external application to handle it."
+msgstr "దీనిని సంభాలించుటకు అవసరమైన బహిర్గత అనువర్తనము మీరు కలిగిలేరు."
+
+#: ../src/empathy-event-manager.c:634
+msgid "Room invitation"
+msgstr "గది ఆహ్వానము"
+
+#: ../src/empathy-event-manager.c:637
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr "%s మిమ్మలను %sకు జేరుటకు ఆహ్వానిస్తున్నారు"
+
+#: ../src/empathy-event-manager.c:645
+msgid "_Decline"
+msgstr "తిరస్కరించు(_D)"
+
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "_Join"
+msgstr "జేరు (_J)"
+
+#: ../src/empathy-event-manager.c:689
+#, c-format
+msgid "%s invited you to join %s"
+msgstr "%s మిమ్ములను %sనందు జేరుటకు ఆహ్వానించారు"
+
+#: ../src/empathy-event-manager.c:715
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr "%sనుండి వచ్చుచున్న దస్త్రము బదిలీకరణ"
+
+#: ../src/empathy-event-manager.c:895
+#, c-format
+msgid "Subscription requested by %s"
+msgstr "%s ద్వారా చందా అభ్యర్ధించబడింది"
+
+#: ../src/empathy-event-manager.c:899
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"సందేశం: %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
+#, 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
+#, c-format
+msgid "%02u.%02u"
+msgstr "%02u.%02u"
+
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "తెలియని"
+
+#: ../src/empathy-ft-manager.c:275
+#, fuzzy, c-format
+msgid "%s of %s at %s/s"
+msgstr "%2$s లో %1$s"
+
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%2$s లో %1$s"
+
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:307
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "\"%s\"ను \"%s\"నుండి స్వీకరిస్తోంది"
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:348
+#, fuzzy, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "\"%s\"ను \"%s\"కు పంపుతోంది"
+
+#: ../src/empathy-ft-manager.c:351
+#, fuzzy
+msgid "Error sending a file"
+msgstr "'%s' సందేశం పంపడంలో దోషము: %s"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
+#, 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
+#, c-format
+msgid "\"%s\" sent to %s"
+msgstr "\"%s\" అనునది %sకు పంపబడింది"
+
+#: ../src/empathy-ft-manager.c:498
+msgid "File transfer completed"
+msgstr "దస్త్రము బదిలీకరణ పూర్తైనది"
+
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#, fuzzy
+msgid "Waiting for the other participant's response"
+msgstr "పాల్గొనినవానిలో మరియొకరి స్పందన కొరకు వేచివుంది"
+
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#, c-format
+msgid "Hashing \"%s\""
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:1024
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1036
+msgid "File"
+msgstr "దస్త్రం"
+
+#: ../src/empathy-ft-manager.c:1058
+msgid "Remaining"
+msgstr "మిగిలినవి"
+
+#: ../src/empathy-ft-manager.ui.h:1
+#, fuzzy
+msgid "File Transfers"
+msgstr "దస్త్రము బదిలీకరణలు"
+
+#: ../src/empathy-ft-manager.ui.h:2
+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 "దిగుమతి"
+
+#: ../src/empathy-import-dialog.c:272
+msgid "Protocol"
+msgstr "నియమం"
+
+#: ../src/empathy-import-dialog.c:298
+msgid "Source"
+msgstr "వనరు"
+
+#: ../src/empathy-import-dialog.c:392
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"దిగుమతి చేయుటకు ఖాతాలు కనుగొనలేక పోయింది. Empathy ప్రస్తుతం ఖాతాలను Pidgin నుండి దిగుమతి "
+"చేయుటకు మాత్రమే మద్దతిస్తోంది."
+
+#: ../src/empathy-import-dialog.ui.h:1
+msgid "Import Accounts"
+msgstr "ఖాతాలను దిగుమతిచేయి"
+
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "ఖాతాను సరికూర్చుము (_E)"
+
+#: ../src/empathy-main-window.c:505
+msgid "No error specified"
+msgstr "ఎటువంటి దోషము తెలుపబడలేదు"
+
+#: ../src/empathy-main-window.c:508
+msgid "Network error"
+msgstr "నెట్వర్కు దోషము"
+
+#: ../src/empathy-main-window.c:511
+msgid "Authentication failed"
+msgstr "ప్రామాణీకరణ విఫలమైంది"
+
+#: ../src/empathy-main-window.c:514
+msgid "Encryption error"
+msgstr "ఎన్క్రిప్షన్ దోషము"
+
+#: ../src/empathy-main-window.c:517
+msgid "Name in use"
+msgstr "నామము వుపయోగంలోవుంది"
+
+#: ../src/empathy-main-window.c:520
+msgid "Certificate not provided"
+msgstr "దృవీకరణపత్రం అందివ్వలేదు"
+
+#: ../src/empathy-main-window.c:523
+msgid "Certificate untrusted"
+msgstr "నిదర్శన పత్రి అవిశ్వాసమైనది"
+
+#: ../src/empathy-main-window.c:526
+msgid "Certificate expired"
+msgstr "దృవీకరణపత్రం కాలముతీరినది"
+
+#: ../src/empathy-main-window.c:529
+msgid "Certificate not activated"
+msgstr "దృవీకరణపత్రం క్రియాశీలపర్చిలేదు"
+
+#: ../src/empathy-main-window.c:532
+msgid "Certificate hostname mismatch"
+msgstr "దృవీకరణపత్ర అతిధేయనామము సరిపోలడంలేదు"
+
+#: ../src/empathy-main-window.c:535
+msgid "Certificate fingerprint mismatch"
+msgstr "దృవీకరణపత్రం వేలిముద్ర సరిపోలలేదు"
+
+#: ../src/empathy-main-window.c:538
+msgid "Certificate self-signed"
+msgstr "దృవీకరణపత్రం స్వంతగా-సతకం చేసినది"
+
+#: ../src/empathy-main-window.c:541
+msgid "Certificate error"
+msgstr "దృవీకరణపత్రం దోషము"
+
+#: ../src/empathy-main-window.c:544
+msgid "Unknown error"
+msgstr "తెలియని దోషము"
+
+#: ../src/empathy-main-window.c:1293
+msgid "Show and edit accounts"
+msgstr "ఖాతాలను చూపుము మరియు సరికూర్చుము"
+
+#: ../src/empathy-main-window.ui.h:1
+msgid "Contact List"
+msgstr "పరిచయముల జాబితా"
+
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:3
+msgid "Context"
+msgstr "సంధర్భము"
+
+#: ../src/empathy-main-window.ui.h:4
+msgid "Join _Favorites"
+msgstr "అభీష్టాలను జేర్చుము (_F)"
+
+#: ../src/empathy-main-window.ui.h:5
+msgid "Manage Favorites"
+msgstr "అభీష్టాలను నిర్వహించుము"
+
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+msgid "Sort by _Name"
+msgstr "నామము ద్వారా క్రమీకరణం (_n)"
+
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+msgid "Sort by _Status"
+msgstr "స్థితి ద్వారా క్రమీకరణం (_t)"
+
+#: ../src/empathy-main-window.ui.h:10
+msgid "_Accounts"
+msgstr "ఖాతాలు (_A)"
+
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:17
+#, fuzzy
+msgid "_File Transfers"
+msgstr "దస్త్రము బదిలీకరణలు"
+
+#: ../src/empathy-main-window.ui.h:19
+#, fuzzy
+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.ui.h:21
+#, fuzzy
+msgid "_Offline Contacts"
+msgstr "ఆఫ్‌లైన్ పరిచయాలను చూపుము (_O)"
+
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Personal Information"
+msgstr "వ్యక్తిగత సమాచారము (_P)"
+
+#: ../src/empathy-main-window.ui.h:24
+#, fuzzy
+msgid "_Previous Conversations"
+msgstr "గత చర్చ"
+
+#: ../src/empathy-main-window.ui.h:25
+msgid "_Room"
+msgstr "గది (_R)"
+
+#: ../src/empathy-new-chatroom-dialog.c:331
+#, fuzzy
+msgid "Chat Room"
+msgstr "చాట్ గదులు"
+
+#: ../src/empathy-new-chatroom-dialog.c:347
+#, fuzzy
+msgid "Members"
+msgstr "థీమ్సు"
+
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\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 ""
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+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 "ఇక్కడ జేరుటకు గది నామమును ప్రవేశపెట్టుము లేదా జాబితానందలి వొకటి లేదా యెక్కువ గదులపై నొక్కుము."
+
+#: ../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 "Join Room"
+msgstr "గది"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#, fuzzy
+msgid "Room List"
+msgstr "గది జాబితా స్థానికం (_R):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "గది (_R):"
+
+#: ../src/empathy-preferences.c:148
+msgid "Message received"
+msgstr "సందేశం స్వీకరించబడింది"
+
+#: ../src/empathy-preferences.c:149
+msgid "Message sent"
+msgstr "సందేశం పంపబడింది"
+
+#: ../src/empathy-preferences.c:150
+msgid "New conversation"
+msgstr "కొత్త చర్చ"
+
+#: ../src/empathy-preferences.c:151
+msgid "Contact goes online"
+msgstr "పరిచయం ఆన్‌లైన్‌కు వెళుతుంది"
+
+#: ../src/empathy-preferences.c:152
+msgid "Contact goes offline"
+msgstr "పరిచయం ఆఫ్‌లైనుకు వెళుతుంది"
+
+#: ../src/empathy-preferences.c:153
+msgid "Account connected"
+msgstr "ఖాతా అనుసంధానమైంది"
+
+#: ../src/empathy-preferences.c:154
+msgid "Account disconnected"
+msgstr "ఖాతా అననుసంధానమైంది"
+
+#: ../src/empathy-preferences.c:394
+msgid "Language"
+msgstr "భాష"
+
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:4
+#, fuzzy
+msgid "Appearance"
+msgstr "<b>రూపము</b>"
+
+#: ../src/empathy-preferences.ui.h:5
+msgid "Automatically _connect on startup "
+msgstr "ప్రారంభంనందు స్వయంచాలకంగా అనుసంధానమవ్వు (_c) "
+
+#: ../src/empathy-preferences.ui.h:6
+#, fuzzy
+msgid "Behavior"
+msgstr "<b>ప్రవర్తన</b>"
+
+#: ../src/empathy-preferences.ui.h:7
+msgid "Chat Th_eme:"
+msgstr "చాట్ థీమ్ (_e):"
+
+#: ../src/empathy-preferences.ui.h:8
+msgid "Disable notifications when _away or busy"
+msgstr "దూరంగా లేదా బ్యుజీగా వున్నప్పుడు నోటీసులను అచేతనముచేయి (_a)"
+
+#: ../src/empathy-preferences.ui.h:9
+msgid "Disable sounds when _away or busy"
+msgstr "దూరంగా లేదా బ్యుజీగా వున్నప్పుడు శబ్దములను అచేతనముచేయి (_a)"
+
+#: ../src/empathy-preferences.ui.h:10
+#, fuzzy
+msgid "Enable notifications when a contact comes online"
+msgstr "చాట్‌పై దృష్టిసారించనప్పుడు నోటీసులను చేతనముచేయి (_c)"
+
+#: ../src/empathy-preferences.ui.h:11
+#, fuzzy
+msgid "Enable notifications when a contact goes offline"
+msgstr "చాట్‌పై దృష్టిసారించనప్పుడు నోటీసులను చేతనముచేయి (_c)"
+
+#: ../src/empathy-preferences.ui.h:12
+msgid "Enable notifications when the _chat is not focused"
+msgstr "చాట్‌పై దృష్టిసారించనప్పుడు నోటీసులను చేతనముచేయి (_c)"
+
+#: ../src/empathy-preferences.ui.h:13
+#, fuzzy
+msgid "Enable spell checking for languages:"
+msgstr "<b>భాషల కొరకు ఉచ్ఛారణను చేతనము చేయుము:</b>"
+
+#: ../src/empathy-preferences.ui.h:14
+msgid "General"
+msgstr "సాధారణ"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+#, fuzzy
+msgid "Location"
+msgstr "నోటీసులు"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "నోటీసులు"
+
+#: ../src/empathy-preferences.ui.h:18
+#, fuzzy
+msgid "Play sound for events"
+msgstr "<b>ఘటనల కొరకు శబ్ధమును చేయుము</b>"
+
+#: ../src/empathy-preferences.ui.h:19
+msgid "Preferences"
+msgstr "అభీష్టాలు"
+
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:21
+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
+msgid "Show _smileys as images"
+msgstr "చిరునవ్వులను ప్రతిబింబములవలె చూపుము (_s)"
+
+#: ../src/empathy-preferences.ui.h:23
+#, fuzzy
+msgid "Show contact _list in rooms"
+msgstr "పరిచయ జాబితాను చూపుము (_S)"
+
+#: ../src/empathy-preferences.ui.h:24
+msgid "Sounds"
+msgstr "ధ్వనులు"
+
+#: ../src/empathy-preferences.ui.h:25
+msgid "Spell Checking"
+msgstr "స్పెల్ పరిశీలన"
+
+#: ../src/empathy-preferences.ui.h:26
+#, fuzzy
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "<small>మీరు సంస్థాపించిన డైరెక్టరీ కొరకు మాత్రమే భాషల జాబితా భాషలను చూయించుతోంది.</small>"
+
+#: ../src/empathy-preferences.ui.h:27
+msgid "Themes"
+msgstr "థీమ్సు"
+
+#: ../src/empathy-preferences.ui.h:28
+msgid "_Enable bubble notifications"
+msgstr "ద్వంద నోటీసులను చేతనముచేయి (_E)"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Enable sound notifications"
+msgstr "శబ్దపు నోటీసులను చేతనముచేయి (_E)"
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Open new chats in separate windows"
+msgstr "వేరువేరు విండోలనందు కొత్త చాట్లను తెరువుము (_O)"
+
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr ""
+
+#: ../src/empathy-status-icon.ui.h:1
+msgid "Status"
+msgstr "స్థితి"
+
+#: ../src/empathy-status-icon.ui.h:3
+msgid "_Quit"
+msgstr "నిష్క్రమించు (_Q)"
+
+#: ../src/empathy-tube-dispatch.c:375
+#, c-format
+msgid "Unable to start application for service %s: %s"
+msgstr "సేవ %s కొరకు అనువర్తనమును ప్రారంభించలేదు: %s"
+
+#: ../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"
+msgstr ""
+"సేవ %s కొరకు వొక అహ్వానము అందించబడింది, అయితే దానిని సంభాలించుటకు అవసరమైన అనువర్తనమును మీరు "
+"కలిగిలేరు."
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+#, fuzzy
+msgid "Contact Map View"
+msgstr "పరిచయముల జాబితా"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#, fuzzy
+msgid "Critical"
+msgstr "Croatian"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#, fuzzy
+msgid "Warning"
+msgstr "మిగిలినవి"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+#, fuzzy
+msgid "Message"
+msgstr "సందేశం:"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:845
+#, fuzzy
+msgid "Save"
+msgstr "సేవిక"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1102
+#, fuzzy
+msgid "Time"
+msgstr "సరళమైన"
+
+#: ../src/empathy-debug-dialog.c:1104
+#, fuzzy
+msgid "Domain"
+msgstr "రొమానియన్"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy సత్వర సందేశిని"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "సంకేతపదమును మర్చిపొమ్ము మరియు ప్రవేశమును శుభ్రముచేయి."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>నెట్వర్కు</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>సేవికలు</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "ఎంపికచేసిన IRC నెట్వర్కును సరికూర్చుము"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "ఎంపికచేసిన IRC నెట్వర్కును తీసివేయుము"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "పద ఉచ్ఛారణను పరిశీలించుము (_C)..."
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>విషయం:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "సమూహ చాట్"
+
+#~ msgid "Contact Information"
+#~ msgstr "సంప్రదింపు సమాచారం"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "నేను మిమ్ములను నా పరిచయజాబితాకు జతచేయుటకు యిష్టపడతాను."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "క్షమించండి, నేను మిమ్ములను నా పరిచయ జాబితానందు కలిగివుండాలని అనుకోవడంలేదు."
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>సమూహములు</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "చిరునామా సమాచారం"
+
+#~ msgid "Word"
+#~ msgstr "పదము"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "పదము కొరకు సలహాలు"
+
+#~ msgid "Spell Checker"
+#~ msgstr "స్పెల్ చెకర్"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "పదము కొరకు సలహాలు:"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>కొత్త ఖాతా</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "నేను యిప్పటికే ఖాతాను కలిగివున్నాను నేను దానిని వుపయోగించుదామని అనుకొనుచున్నాను"
+
+#~ msgid "New message from %s"
+#~ msgstr "%s నుండి కొత్త సందేశము"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "ఆహ్వాన సందేశము (_m):"
+
+#~ msgid "Invite"
+#~ msgstr "ఆహ్వానము"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "మీరు యెవరిని ఆహ్వానించాలని అనుకొనుచున్నారో యెంపికచేయుము:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "చాట్ కాన్ఫరెన్సునందు జేరుటకు మీరు ఆహ్వానించబడినారు."
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "అభీష్ట గదిని సరికూర్చుము"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "ప్రారంభంనందు గదిని జేర్చుము (_u)"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr "Empathy ప్రారంభమై మీరు అనుసంధానింప బడినప్పుడు ఈ చాట్‌గదిని జేర్చుము"
+
+#~ msgid "N_ame:"
+#~ msgstr "నామము (_a):"
+
+#~ msgid "S_erver:"
+#~ msgstr "సేవిక(_e):"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "తెలియని"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "\"%s\" అనునది %sనుండి స్వీకరిస్తోంది"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "\"%s\" అనునది %sకు పంపబడుచున్నది"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "దస్త్రము బదిలీకరణ రద్దైనది: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "తెలియని"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "దస్త్రమును ఈ స్థానమునకు దాయలేక పోయింది"
+
+#~ msgid "Save file as..."
+#~ msgstr "దస్త్రాన్ని ఇలా దాయుము..."
+
+#~ msgid "unknown size"
+#~ msgstr "తెలియని పరిమాణము"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s మీకు వొక దస్త్రమును పంపుదామని అనుకొనుచున్నారు"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "మీరు దస్త్రము \"%s\" ఆమోదిస్తారా (%s)?"
+
+#~ msgid "_Accept"
+#~ msgstr "ఆమోదించు (_A)"
+
+#~ msgid "Join _New..."
+#~ msgstr "కొత్తవాటిని జేర్చుము (_N)..."
+
+#~ msgid "Browse:"
+#~ msgstr "అన్వేషించు:"
+
+#~ msgid "Join"
+#~ msgstr "చేరుము"
+
+#~ msgid "Join New"
+#~ msgstr "కొత్తగా చేరిన"
+
+#~ msgid "Re_fresh"
+#~ msgstr "రీఫ్రెష్(_f)"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr "మీరు ప్రవేశపెట్టిన సేవికనందు వున్న అన్ని చాట్ గదులను ఈ జాబితా చూయించుతుంది."
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>పరిచయ జాబితా</b>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "అవతారములు అంటే పరిచయ జాబితానందు కనిపించే వినియోగదారి యెంచుకొనిన ప్రతిబింబములు"
+
+#~ msgid "Show _avatars"
+#~ msgstr "అవతారములను చూపము (_a)"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "నిశ్చయ పరిచయ జాబితాను చూపుము (_m)"
diff --git a/po/tr.po b/po/tr.po
index ac8f18a8a..ae99aca6a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,13 +3,13 @@
 # Copyright (C) 2008
 # Görkem Çetin <gorkem@kde.org>, 2004.
 #
-# Baris Cicek <baris@teamforce.name.tr>, 2008.
+# Baris Cicek <baris@teamforce.name.tr>, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-26 15:11+0200\n"
-"PO-Revision-Date: 2008-11-26 15:20+0200\n"
+"POT-Creation-Date: 2009-08-13 19:26+0300\n"
+"PO-Revision-Date: 2009-03-01 20:01+0200\n"
 "Last-Translator: Baris Cicek <baris@teamforce.name.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Empathy Anında Mesajlaşma Aracı"
+#, fuzzy
+msgid "Empathy IM Client"
+msgstr "Empathy Çağrısı"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+#, fuzzy
+msgid "Send and receive messages"
 msgstr "Anında mesaj al ve gönder"
 
 #: ../data/empathy.schemas.in.h:1
@@ -60,103 +62,217 @@ msgid "Default directory to select an avatar image from"
 msgstr "Bir avatar resmi seçmek için öntanımlı dizin"
 
 #: ../data/empathy.schemas.in.h:8
-msgid "Empathy default download folder"
-msgstr "Empathy öntanımlı indirme klasörü"
+msgid "Disable popup notifications when away"
+msgstr "Uzaktayken açılır uyarıları etkisizleştir"
 
 #: ../data/empathy.schemas.in.h:9
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy içe aktarılan hesaplar hakkında sordu"
+msgid "Disable sounds when away"
+msgstr "Uzaktayken sesleri etkisizleştir"
 
 #: ../data/empathy.schemas.in.h:10
-msgid "Empathy should auto-connect on startup"
-msgstr "Başlangıçta Empathy otomatik bağlanmalı"
+msgid "Empathy can publish the user's location"
+msgstr ""
 
 #: ../data/empathy.schemas.in.h:11
-msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgid "Empathy can use the GPS to guess the location"
 msgstr ""
-"Empathy sohbet penceresi simgesi olarak bağlantının avatarını kullanmalı"
 
 #: ../data/empathy.schemas.in.h:12
-msgid "Enable popup when contact is available"
-msgstr "Bağlantı uygun olduğunda açılır pencereyi etkinleştir"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
 
 #: ../data/empathy.schemas.in.h:13
-msgid "Enable sound when away"
-msgstr "Uzaktayken sesi etkinleştir"
+msgid "Empathy can use the network to guess the location"
+msgstr ""
 
 #: ../data/empathy.schemas.in.h:14
-msgid "Enable sound when busy"
-msgstr "Meşgulken sesi etkinleştir"
+msgid "Empathy default download folder"
+msgstr "Empathy öntanımlı indirme klasörü"
 
 #: ../data/empathy.schemas.in.h:15
+msgid "Empathy has asked about importing accounts"
+msgstr "Empathy içe aktarılan hesaplar hakkında sordu"
+
+#: ../data/empathy.schemas.in.h:16
+msgid "Empathy should auto-connect on startup"
+msgstr "Başlangıçta Empathy otomatik bağlanmalı"
+
+#: ../data/empathy.schemas.in.h:17
+#, fuzzy
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Başlangıçta Empathy otomatik bağlanmalı"
+
+#: ../data/empathy.schemas.in.h:18
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Empathy sohbet penceresi simgesi olarak bağlantının avatarını kullanmalı"
+
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
+msgid "Enable popup notifications for new messages"
+msgstr "Yeni mesajlar için açılır uyarıları etkinleştir"
+
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "İmla denetçisini etkinleştir"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Ana pencereyi gizle"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Ana pencereyi gizle."
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "Ağ Yöneticisi kullanılmalı"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Takma ad tamamlama karakteri"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Yeni sohbetleri ayrı pencerelerde aç"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:28
+#, fuzzy
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "Sohbet odaları için tema kullanılıp kullanılmayacağı."
+
+#: ../data/empathy.schemas.in.h:29
+msgid "Play a sound for incoming messages"
+msgstr "Gelen mesajlar için bir ses çal"
+
+#: ../data/empathy.schemas.in.h:30
+msgid "Play a sound for new conversations"
+msgstr "Yeni sohbetler için bir ses çal"
+
+#: ../data/empathy.schemas.in.h:31
+msgid "Play a sound for outgoing messages"
+msgstr "Giden mesajlar için bir ses çal"
+
+#: ../data/empathy.schemas.in.h:32
+msgid "Play a sound when a contact logs in"
+msgstr "Bir bağlantı giriş yaptığında bir ses çal"
+
+#: ../data/empathy.schemas.in.h:33
+msgid "Play a sound when a contact logs out"
+msgstr "Bir kişi çıkış yaptığında bir ses çal"
+
+#: ../data/empathy.schemas.in.h:34
+msgid "Play a sound when we log in"
+msgstr "Giriş yaptığımızda bir ses çal"
+
+#: ../data/empathy.schemas.in.h:35
+msgid "Play a sound when we log out"
+msgstr "Çıkış yaptığımızda bir ses çal"
+
+#: ../data/empathy.schemas.in.h:36
+msgid "Popup notifications if the chat isn't focused"
+msgstr "Sohbet odaklanmamışsa uyarıları açılır yap"
+
+#: ../data/empathy.schemas.in.h:37
+#, fuzzy
+msgid "Popup notifications when a contact sign in"
+msgstr "Sohbet odaklanmamışsa uyarıları açılır yap"
+
+#: ../data/empathy.schemas.in.h:38
+#, fuzzy
+msgid "Popup notifications when a contact sign out"
+msgstr "Sohbet odaklanmamışsa uyarıları açılır yap"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Salut hesabı yaratıldı"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Avatarları göster"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:41
+#, fuzzy
+msgid "Show contact list in rooms"
+msgstr "Bağlantı Listesini Gö_ster"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "Ana pencereyi kapatırken ipucu göster"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Çevrimdışı bağlantıları göster"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "İmla denetimi dilleri"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "Dosya transferlerini içine kaydetmek için öntanımlı klasör."
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Bir avatar resminin seçildiği son dizin."
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:47
 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/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Grafiksel gülümsemeleri kullan"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Uyarı seslerini kullan"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Sohbet odaları için tema kullan"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+#, fuzzy
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr ""
+"Bağlantı listesindeki çevrimdışı bağlantıların gösterilip gösterilmeyeceği."
+
+#: ../data/empathy.schemas.in.h:53
+#, fuzzy
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr ""
+"Empathy'nin bağlantının avatarını sohbet penceresi simgesi olarak kullanıp "
+"kullanmayacağı."
+
+#: ../data/empathy.schemas.in.h:54
+#, fuzzy
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr ""
+"Empathy'nin bağlantının avatarını sohbet penceresi simgesi olarak kullanıp "
+"kullanmayacağı."
+
+#: ../data/empathy.schemas.in.h:55
+#, fuzzy
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr ""
+"Empathy'nin bağlantının avatarını sohbet penceresi simgesi olarak kullanıp "
+"kullanmayacağı."
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
@@ -164,14 +280,23 @@ msgstr ""
 "Empathy'nin diğer programlardan hesapları içe aktarmasi için sorup "
 "sormayacağı."
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr ""
 "Başlangıçta Empathy'nin hesabınıza otomatik olarak giriş yapıp yapmayacağı."
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:58
+#, fuzzy
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr ""
+"Empathy'nin bağlantının avatarını sohbet penceresi simgesi olarak kullanıp "
+"kullanmayacağı."
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
@@ -179,14 +304,14 @@ msgstr ""
 "Empathy'nin bağlantının avatarını sohbet penceresi simgesi olarak kullanıp "
 "kullanmayacağı."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr ""
 "Empathy ilk kez çalıştırıldığında Salut hesabının oluşturulup "
 "oluşturulmayacağı."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -194,38 +319,86 @@ msgstr ""
 "Otomatik olarak bağlanma/bağlantı kesme için ağ yöneticisinin kullanılıp "
 "kullanılmayacağı."
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr ""
 "Yazılan kelimelerin seçtiğiniz dile göre imla denetiminden geçip geçmeyeceği."
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr ""
 "Konuşmalarda gülümsemelerin grafiksel görüntülere çevrilip çevrilmeyeceği."
 
-#: ../data/empathy.schemas.in.h:39
-msgid "Whether or not to play a sound when messages arrive."
-msgstr "Bir mesaj geldiğinde ses çalınıp çalınmayacağı."
+#: ../data/empathy.schemas.in.h:64
+msgid ""
+"Whether or not to play a sound to notify for contacts logging in the network."
+msgstr ""
+"Bağlantılar ağa giriş yaparken uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/empathy.schemas.in.h:40
-msgid "Whether or not to play sounds when away."
-msgstr "Uzaktayken ses çalınıp çalınmayacağı."
+#: ../data/empathy.schemas.in.h:65
+msgid ""
+"Whether or not to play a sound to notify for contacts logging off the "
+"network."
+msgstr ""
+"Bağlantılar ağdan çıkış yaparken uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/empathy.schemas.in.h:41
-msgid "Whether or not to play sounds when busy."
-msgstr "Meşgulken ses çalınıp çalınmayacağı."
+#: ../data/empathy.schemas.in.h:66
+msgid "Whether or not to play a sound to notify for events."
+msgstr "Olaylar için uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/empathy.schemas.in.h:42
-msgid "Whether or not to show a popup when a contact becomes available."
+#: ../data/empathy.schemas.in.h:67
+msgid "Whether or not to play a sound to notify for incoming messages."
+msgstr "Gelen mesajlar için uyarı amaçlı bir ses çalınıp çalınmayacağı."
+
+#: ../data/empathy.schemas.in.h:68
+msgid "Whether or not to play a sound to notify for new conversations."
+msgstr "Yeni sohbetler için uyarı amaçlı bir ses çalınıp çalınmayacağı."
+
+#: ../data/empathy.schemas.in.h:69
+msgid "Whether or not to play a sound to notify for outgoing messages."
+msgstr "Giden mesajlar için uyarı amaçlı bir ses çalınıp çalınmayacağı."
+
+#: ../data/empathy.schemas.in.h:70
+msgid "Whether or not to play a sound when logging in a network."
+msgstr "Bir ağa giriş yapılırken uyarı amaçlı bir ses çalınıp çalınmayacağı."
+
+#: ../data/empathy.schemas.in.h:71
+msgid "Whether or not to play a sound when logging off a network."
+msgstr "Bir ağdan çıkış yapılırken uyarı amaçlı bir ses çalınıp çalınmayacağı."
+
+#: ../data/empathy.schemas.in.h:72
+msgid "Whether or not to play sound notifications when away or busy."
+msgstr "Uzakta veya meşgul iken uyarı amaçlı bir ses çalınıp çalınmayacağı."
+
+#: ../data/empathy.schemas.in.h:73
+#, fuzzy
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "Uzakta veya meşgul iken açılır uyarıların gösterilip gösterilmeyeceği."
+
+#: ../data/empathy.schemas.in.h:74
+#, fuzzy
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "Uzakta veya meşgul iken açılır uyarıların gösterilip gösterilmeyeceği."
+
+#: ../data/empathy.schemas.in.h:75
+msgid ""
+"Whether or not to show a popup notification when receiving a new message "
+"even if the chat is already opened, but not focused."
 msgstr ""
-"Bir bağlantı erişilebilir olduğunda açılır bir pencere gösterilip "
-"gösterilmeyeceği."
+"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/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:76
+msgid ""
+"Whether or not 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/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -233,12 +406,21 @@ msgstr ""
 "Sohbet pencerelerindeki ve bağlantı listesindeki bağlantılar için avatar "
 "gösterilip gösterilmeyeceği."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not 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/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:79
+msgid "Whether or not 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/empathy.schemas.in.h:80
+#, fuzzy
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "Bağlantı listesinin sıkışık kipte gösterilip gösterilmeyeceği."
+
+#: ../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."
@@ -246,15 +428,15 @@ msgstr ""
 "Başlık çubuğundaki 'x' düğmesi ile ana pencerenin kapatılması hakkında mesaj "
 "penceresinin gösterilip gösterilmeyeceği."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Bağlantı listesinin sıkışık kipte gösterilip gösterilmeyeceği."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Sohbet odaları için tema kullanılıp kullanılmayacağı."
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:84
 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 "
@@ -264,532 +446,789 @@ msgstr ""
 "bağlantı adına göre \"name\" (isim) değerine bakarak sıralamaktır. \"state"
 "\" (durum) değeri bağlantı listesini duruma göre sıralayacaktır."
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:258
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr ""
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Yakındaki kişiler"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "Sebep belirtilmemiş"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "Durumda değişiklik istendi"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Dosya transferini iptal ettiniz"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "Diğer katılımcı dosya transferini iptal etti"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Dosya transfer etmeye çalışılırken hata"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "Diğer katılımcı dosya transfer edemiyor"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Bilinmeyen sebep"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Ulaşılabilir"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Meşgul"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Uzakta"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Gizli"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:337
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Hepsi"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+#, fuzzy
+msgid "Advanced"
 msgstr "<b>Gelişmiş</b>"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Parolayı unut ve girdi alanını temizle."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../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
 msgid "Pass_word:"
 msgstr "Par_ola:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "Görüne_n İsim:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../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
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Sunucu:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "Giriş I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "_Karakter Kümesi:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Yeni Ağ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Ağ</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Sunucular</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Karakter Kümesi:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Yeni bir IRC ağı oluştur"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Seçili IRC ağını düzenle"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Ağ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Ağ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Takma ad:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Çıkış mesajı:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Geçek isim:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Seçili IRC ağını kaldır"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#, fuzzy
+msgid "Servers"
+msgstr "Sunucu"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#, fuzzy
+msgid "Override server settings"
 msgstr "<b>Sunucu ayarlarının yerine geç</b>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "Ö_ncelik:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "Ka_ynak:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Eski SS_L kullan"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "Şifr_eleme gerekli (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "SSL sertifika hatalarını _yoksay"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "_E-posta:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
-msgid "_First Name: "
-msgstr "İ_lk İsim: "
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+msgid "_First Name:"
+msgstr "İ_lk Ad:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "_Soyad:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "_Takma ad:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "_Görünen İsim:"
 
 #. 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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "STUN Bul"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN Sunucusu:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN portu:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "K_ullanıcı adı:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "_Yahoo Japonya kullan"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "So_hbet odası ve konferans davetlerini yoksay"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "Oda Listesi ye_reli:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:461
-#: ../libempathy-gtk/empathy-avatar-chooser.c:536
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "Resim çevirilemedi"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
 msgstr "Kabul edilen hiçbir resim türü sisteminiz tarafından desteklenmiyor"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "Avatar Resminizi Seçin"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:950
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Resim Yok"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1010
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Resimler"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1014
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Büyütmek için tıklayın"
 
-#: ../libempathy-gtk/empathy-chat.c:498
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:412
+msgid "Unsupported command"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "çevrimdışı"
 
-#: ../libempathy-gtk/empathy-chat.c:501
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "geçersiz bağlantı"
 
-#: ../libempathy-gtk/empathy-chat.c:504
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
 msgstr "izin verilmedi"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "çok uzun mesaj"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "uygulanmamış"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "bilinmiyor"
 
-#: ../libempathy-gtk/empathy-chat.c:517
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' mesajı gönderilirken hata : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Başlık değiştirildi: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:549
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "Başlık belirtilmemiş"
 
-#: ../libempathy-gtk/empathy-chat.c:964
+#: ../libempathy-gtk/empathy-chat.c:969
+msgid "(No Suggestions)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Gülümseme Ekle"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:980
-#: ../libempathy-gtk/empathy-ui-utils.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Gönder"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
-msgid "_Check Word Spelling..."
-msgstr "Kelime Yazımını _Kontrol Et..."
+#: ../libempathy-gtk/empathy-chat.c:1075
+msgid "_Spelling Suggestions"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1190
+#, fuzzy, c-format
+msgid "%s has disconnected"
+msgstr "Bağlantı bağlı değil"
 
-#: ../libempathy-gtk/empathy-chat.c:1120
+#: ../libempathy-gtk/empathy-chat.c:1194
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s odaya katıldı"
+msgid "%s was kicked by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1197
+#, c-format
+msgid "%s was kicked"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "%s odayı terk etti"
 
-#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-call-window.c:406
+#. 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:1218
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s odaya katıldı"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1274
 msgid "Disconnected"
 msgstr "Bağlı Değil"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "Bağlı"
 
-#: ../libempathy-gtk/empathy-chat.c:1657
-#: ../libempathy-gtk/empathy-log-window.c:504
+#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "Konuşma"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Başlık:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Grup Sohbeti"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Başlık:"
 
-#: ../libempathy-gtk/empathy-chat-view.c:430
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "Bağ Adresini _Kopyala"
 
-#: ../libempathy-gtk/empathy-chat-view.c:438
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_Bağı Aç"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Kişisel Bilgi"
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
+msgid "%A %B %d %Y"
+msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Bağlantı Bilgisini Düzenle"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Bağlantı Bilgisi"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:283
-msgid "I would like to add you to my contact list."
-msgstr "Sizi bağlantı listeme eklemek istiyorum."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Kişisel Bilgi"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:307
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Yeni Bağlantı"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "_Sonra Karar Ver"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Kayıt İsteği"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1244
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, 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:1246
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "Grup kaldırılıyor"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1293
-#: ../libempathy-gtk/empathy-contact-list-view.c:1372
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "Kaldı_r"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1323
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, 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:1325
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Bağlantı kaldırılıyor"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Üzgünüm, sizi bağlantı listemde daha fazla istemiyorum."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "Bağlantı _Ekle..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:121
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "S_ohbet"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:142
-msgid "_Call"
-msgstr "_Ara"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+#, fuzzy
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "Çağrıyı _Sonlandır"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+#, fuzzy
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "Çağrıyı _Sonlandır"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:181
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "Önceki Konuşmaları _Görüntüle"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "Dosya gönder"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Bil_gi"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:258
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "Düzenl_e"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:322
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Bu odaya davet ediliyor"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:362
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_Sohbet odasına davet et"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-selector.c:129
+msgid "Select a contact"
+msgstr "Bir bağlantı seç"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "Avatarı Kaydet"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Avatar kaydedilemiyor"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Seç"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:855
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Grup"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>İstemci Bilgisi</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Bağlantı Ayrıntıları</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#, fuzzy
+msgid "Country:"
+msgstr "Hesap:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#, fuzzy
+msgid "State:"
+msgstr "Durum:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#, fuzzy
+msgid "City:"
+msgstr "İstemci:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#, fuzzy
+msgid "Area:"
+msgstr "Ermenice"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#, fuzzy
+msgid "Street:"
+msgstr "Seç"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#, fuzzy
+msgid "Floor:"
+msgstr "_Aranan:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#, fuzzy
+msgid "Room:"
+msgstr "_Oda:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#, fuzzy
+msgid "Text:"
+msgstr "Tür:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#, fuzzy
+msgid "Description:"
+msgstr "Sürüm:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#, fuzzy
+msgid "Bearing:"
+msgstr "Sürüm:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+#, fuzzy
+msgid "<b>Location</b>"
+msgstr "<b>Bağlantı</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#, fuzzy
+msgid "<b>Location</b>, "
 msgstr "<b>Bağlantı</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Gruplar</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../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 "Hesap:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Takma ad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "Doğum günü:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#, fuzzy
+msgid "Client Information"
+msgstr "<b>İstemci Bilgisi</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "İstemci:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Bağlantı bilgisi"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Bağlantı"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#, fuzzy
+msgid "Contact Details"
+msgstr "<b>Bağlantı Ayrıntıları</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "E-posta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Tam isim:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#, fuzzy
+msgid "Groups"
+msgstr "Grup"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Tanımlayıcı:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "Bilgi istendi..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "İşletim Sistemi:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -797,144 +1236,213 @@ 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-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Sürüm:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "Web sitesi:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "Grup Ek_le"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "yeni sunucu"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Sunucu"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:497
-#: ../src/empathy-import-dialog.c:271
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Hesap"
 
-#: ../libempathy-gtk/empathy-log-window.c:514
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Tarih"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Konuşmalar"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Önceki Konuşmalar"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Ara"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_Aranan:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "Ç_ağrı"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "So_hbet"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "Bağlantı ID:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "Yeni Konuşma"
 
+#. 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
+#, fuzzy
+msgid "Custom Message..."
+msgstr "Özel mesaj..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#, fuzzy
+msgid "Edit Custom Messages..."
+msgstr "Özel mesaj..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#, fuzzy
+msgid "Set status"
+msgstr "Durum"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr ""
+
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
 msgid "Custom messages..."
 msgstr "Özel mesaj..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Özel mesaj"
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr "Bir anında mesaj alındı"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Mesaj:"
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr "Bir anında mesaj gönder"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Mesajı kaydet"
+#: ../libempathy-gtk/empathy-sound.c:55
+msgid "Incoming chat request"
+msgstr "Gelen sohbet isteği"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Durum:"
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr "Bağlantı bağlı"
+
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr "Bağlantı bağlı değil"
+
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr "Sunucuya bağlı"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Kelime"
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "Sunucuya bağlı değil"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Kelime için öneriler"
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
+msgstr "Gelen ses çağrısı"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "İmla Denetçisi"
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "Giden sesli çağrı"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Kelime için öneriler:"
+#: ../libempathy-gtk/empathy-sound.c:69
+msgid "Voice call ended"
+msgstr "Sesli çağrı sonlandı"
 
-#: ../libempathy-gtk/empathy-theme-boxes.c:745
-#: ../libempathy-gtk/empathy-theme-irc.c:293
-msgid "%A %d %B %Y"
-msgstr "%A %d %B %Y"
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#, fuzzy
+msgid "Enter Custom Message"
+msgstr "Özel mesaj"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#, fuzzy
+msgid "Edit Custom Messages"
+msgstr "Özel mesaj"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+#, fuzzy
+msgid "Saved Presets"
+msgstr "Mesajı kaydet"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+#, fuzzy
+msgid "gtk-add"
+msgstr "gtk-clear"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+#, fuzzy
+msgid "gtk-remove"
+msgstr "gtk-ok"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:73
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "Klasik"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:74
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr "Basit"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
 msgstr "Temiz"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "Mavi"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1354
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
 msgid "Unable to open URI"
 msgstr "URI açılamıyor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1500
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
 msgid "Select a file"
 msgstr "Bir dosya seçin"
 
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
+#, fuzzy
+msgid "Select a destination"
+msgstr "Bir bağlantı seç"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Şimdiki Yerel"
@@ -1122,7 +1630,7 @@ msgid "Megaphone"
 msgstr "Megafon"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Konuş!"
 
@@ -1136,15 +1644,15 @@ msgid "_Information"
 msgstr "_Bilgi"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Tercihler"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "Lütfen bir bağlantı yapılandırın."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Bağlantı seç..."
 
@@ -1157,23 +1665,24 @@ msgstr "Durum"
 msgid "Set your own presence"
 msgstr "Kendi durumunuzu belirtin"
 
-#: ../src/empathy.c:390
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "Başlangıçta bağlanma"
 
-#: ../src/empathy.c:394
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "Başlangıçta bağlantı listesini gösterme"
 
-#: ../src/empathy.c:398
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Hesaplar penceresini göster"
 
-#: ../src/empathy.c:410
-msgid "- Empathy Instant Messenger"
-msgstr "- Empathy Anında Mesajlaşma Aracı"
+#: ../src/empathy.c:587
+#, fuzzy
+msgid "- Empathy IM Client"
+msgstr "%s - Empathy Çağrısı"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1184,7 +1693,7 @@ msgstr ""
 "Genel Kamu Lisansı sürüm 2 veya daha sonraki bir sürümün şartları altında "
 "yeniden dağıtabilir ve/veya değiştirebilirsiniz."
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1195,7 +1704,7 @@ msgstr ""
 "KALİTE GARANTİSİ veya ÖZEL BİR AMAÇ İÇİN UYGUNLUĞU bile olmadan faydalı "
 "olması umuduyla dağıtılmaktadır."
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "
@@ -1205,32 +1714,31 @@ msgstr ""
 "gereklidir; eğer almadıysanız Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA adresine yazın."
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME için Anında Mesajlaşma istemcisi"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "Deniz Koçak <deniz.kocak@linux.org.tr>\n"
 "Barış Çiçek <baris@teamforce.name.tr>"
 
-#: ../src/empathy-accounts-dialog.c:394
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Etkinleştirilmiş"
 
-#: ../src/empathy-accounts-dialog.c:404
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Hesaplar"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:867
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Yeni %s hesabı"
 
-#: ../src/empathy-accounts-dialog.c:977
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1239,7 +1747,7 @@ msgstr ""
 "%s hesabınızı kaldırmak üzeresiniz!\n"
 "Devam etmek istediğinize emin misiniz?"
 
-#: ../src/empathy-accounts-dialog.c:983
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1253,31 +1761,35 @@ msgstr ""
 "Daha sonraki bir zamanda hesabı geri eklemeye karar verirseniz yine de "
 "erişilebilir olacaklardır."
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Yeni Hesap</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Bir protokol kurulmamış</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Ayarlar</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+#, fuzzy
+msgid "Add Account"
+msgstr "Hesap"
 
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "O_luştur"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "Zaten kullanmak istediğim bir hesabım mevcut"
+#: ../src/empathy-accounts-dialog.ui.h:4
+#, fuzzy
+msgid "Gmail"
+msgstr "E-posta:"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "Hesapları İçe Aktar..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+#, fuzzy
+msgid "No protocol installed"
+msgstr "<b>Bir protokol kurulmamış</b>"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+#, fuzzy
+msgid "Settings"
+msgstr "<b>Ayarlar</b>"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -1285,309 +1797,259 @@ 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.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "Tür:"
 
-#: ../src/empathy-call-window.c:142
-msgid "Closed"
-msgstr "Kapandı"
+#: ../src/empathy-accounts-dialog.ui.h:10
+#, fuzzy
+msgid "_Add..."
+msgstr "Bağlantı _Ekle..."
 
-#: ../src/empathy-call-window.c:254
-msgid "End this call?"
-msgstr "Bu çağrı sonlandırılsın mı?"
+#: ../src/empathy-accounts-dialog.ui.h:11
+#, fuzzy
+msgid "_Create a new account"
+msgstr "Yeni bir IRC ağı oluştur"
 
-#: ../src/empathy-call-window.c:256
-msgid "Closing this window will end the call in progress."
-msgstr "Bu pencereyi kapatmak aktif çağrıyı sonlandıracaktır."
+#: ../src/empathy-accounts-dialog.ui.h:12
+#, fuzzy
+msgid "_Reuse an existing account"
+msgstr "Hesapları göster ve düzenle"
 
-#: ../src/empathy-call-window.c:257
-msgid "_End Call"
-msgstr "Çağrıyı _Sonlandır"
+#: ../src/empathy-call-window.c:426
+msgid "Contrast"
+msgstr "Karşıtlık"
 
-#: ../src/empathy-call-window.c:311
-msgid "Incoming call"
-msgstr "Gelen çağrı"
-
-#: ../src/empathy-call-window.c:313
-#, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s sizi arıyor, cevap vermek istiyor musunuz?"
+#: ../src/empathy-call-window.c:429
+msgid "Brightness"
+msgstr "Parlaklık"
 
-#: ../src/empathy-call-window.c:319
-msgid "_Reject"
-msgstr "_Reddet"
+#: ../src/empathy-call-window.c:432
+msgid "Gamma"
+msgstr "Gama"
 
-#: ../src/empathy-call-window.c:324
-msgid "_Answer"
-msgstr "Cev_apla"
+#: ../src/empathy-call-window.c:539
+msgid "Volume"
+msgstr "Ses Seviyesi"
 
-#: ../src/empathy-call-window.c:379
-msgid "Empathy Call"
-msgstr "Empathy Çağrısı"
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "Bağlanıyor..."
 
-#. To translators: Readying is the first state of the call, it is
-#. * preparing the connection and it does not yet ring.
-#: ../src/empathy-call-window.c:382
-msgid "Readying"
-msgstr "Hazırlanıyor"
+#: ../src/empathy-call-window.c:778
+msgid "_Sidebar"
+msgstr "_Kenar çubuğu"
 
-#: ../src/empathy-call-window.c:391
-#, c-format
-msgid "%s - Empathy Call"
-msgstr "%s - Empathy Çağrısı"
+#: ../src/empathy-call-window.c:797
+msgid "Dialpad"
+msgstr "Tuş Takımı"
 
-#: ../src/empathy-call-window.c:395
-msgid "Ringing"
-msgstr "Çalıyor"
+#: ../src/empathy-call-window.c:803
+msgid "Audio input"
+msgstr "Ses girişi"
 
-#: ../src/empathy-call-window.c:408
-msgid "Connecting"
-msgstr "Bağlanıyor"
+#: ../src/empathy-call-window.c:807
+msgid "Video input"
+msgstr "Video girişi"
 
-#: ../src/empathy-call-window.c:524
+#: ../src/empathy-call-window.c:866
 #, c-format
-msgid "Incoming call from %s rejected because there is already a running call."
-msgstr "%s kişisinden gelen çağrı reddedildi, çünkü halen aktif bir çağrı var."
-
-#: ../src/empathy-call-window.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../src/empathy-call-window.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../src/empathy-call-window.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../src/empathy-call-window.glade.h:4
-msgid "1"
-msgstr "1"
-
-#: ../src/empathy-call-window.glade.h:5
-msgid "2"
-msgstr "2"
-
-#: ../src/empathy-call-window.glade.h:6
-msgid "3"
-msgstr "3"
-
-#: ../src/empathy-call-window.glade.h:7
-msgid "4"
-msgstr "4"
+msgid "Call with %s"
+msgstr ""
 
-#: ../src/empathy-call-window.glade.h:8
-msgid "5"
-msgstr "5"
+#: ../src/empathy-call-window.c:935
+#, fuzzy
+msgid "Call"
+msgstr "_Ara"
 
-#: ../src/empathy-call-window.glade.h:9
-msgid "6"
-msgstr "6"
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1387
+#, fuzzy, c-format
+msgid "Connected — %d:%02dm"
+msgstr "Bağlı -- %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:10
-msgid "7"
-msgstr "7"
+#: ../src/empathy-call-window.ui.h:1
+msgid "Hang up"
+msgstr "Askıya al"
 
-#: ../src/empathy-call-window.glade.h:11
-msgid "8"
-msgstr "8"
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr ""
 
-#: ../src/empathy-call-window.glade.h:12
-msgid "9"
-msgstr "9"
+#: ../src/empathy-call-window.ui.h:3
+msgid "Send Audio"
+msgstr "Ses Gönder"
 
-#. To translators: The keypad is numbers [0-9], asterisk (*) and hash (#). Presented like on any phone
-#: ../src/empathy-call-window.glade.h:14
-msgid "<b>Keypad</b>"
-msgstr "<b>Tuş Takımı</b>"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Send video"
+msgstr "Görüntü Gönder"
 
-#: ../src/empathy-call-window.glade.h:15
-msgid "<b>Volume</b>"
-msgstr "<b>Ses Seviyesi</b>"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Video preview"
+msgstr "Video önizlemesi"
 
-#: ../src/empathy-call-window.glade.h:16
-msgid "Hang Up"
-msgstr "Kapat"
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Ara"
 
-#: ../src/empathy-call-window.glade.h:17
-msgid "Send Video"
-msgstr "Görüntü Gönder"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+msgid "_View"
+msgstr "_Görünüm"
 
-#: ../src/empathy-chat-window.c:309
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Konuşmalar (%d)"
 
-#: ../src/empathy-chat-window.c:411
-msgid "Topic:"
-msgstr "Başlık:"
-
-#: ../src/empathy-chat-window.c:416
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Bir mesaj yazıyor."
 
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "Temiz_le"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
 msgid "Chat"
 msgstr "Sohbet"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Gülüm_seme Ekle"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "Davet _mesajı:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Davet et"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
 msgstr "Sekmeyi So_la Taşı"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
 msgstr "Sekmeyi _Sağa Taşı"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Davet etmek istediğiniz kişiyi seçin:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Bir sohbet konferansına katılmak için davet edildiniz."
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
 msgid "_Contact"
 msgstr "_Bağlantı"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "_İçindekiler"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
 msgstr "Ko_nuşmalar"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
 msgstr "_Sekmeyi Ayır"
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Favorite Chatroom"
 msgstr "_Sık Kullanılan Sohbet Odası"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
 msgstr "_Sonraki Sekme"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Previous Tab"
 msgstr "Ö_nceki Sekme"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "Bağlantı Listesini Gö_ster"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
 msgstr "Sek_meler"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Ad"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "Oda"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "Otomatik-Bağlan"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Sık Kullanılan Odayı Düzenle"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "_Başlangıçta odaya katıl"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "Empathy başladığında ve bağlı olduğunda bu odaya katıl"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "Sık Kullanılan Odaları Yönet"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_Ad:"
+#: ../src/empathy-event-manager.c:321
+msgid "Incoming call"
+msgstr "Gelen çağrı"
 
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "S_unucu:"
+#: ../src/empathy-event-manager.c:324
+#, c-format
+msgid "%s is calling you, do you want to answer?"
+msgstr "%s sizi arıyor, cevap vermek istiyor musunuz?"
 
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_Oda:"
+#: ../src/empathy-event-manager.c:331
+msgid "_Reject"
+msgstr "_Reddet"
 
-#: ../src/empathy-event-manager.c:170
-#, c-format
-msgid ""
-"New message from %s:\n"
-"%s"
-msgstr ""
-"%s kişisinden yeni mesaj.\n"
-"%s"
+#: ../src/empathy-event-manager.c:337
+msgid "_Answer"
+msgstr "Cev_apla"
 
-#: ../src/empathy-event-manager.c:209
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s kişisinden gelen çağrı"
 
-#: ../src/empathy-event-manager.c:237
+#: ../src/empathy-event-manager.c:496
 #, c-format
-msgid "Incoming file transfer from %s"
-msgstr "%s kişisinden gelen dosya transferi"
+msgid "%s is offering you an invitation"
+msgstr "%s size bir davet öneriyor"
 
-#: ../src/empathy-event-manager.c:271
+#: ../src/empathy-event-manager.c:502
+msgid "An external application will be started to handle it."
+msgstr "Yönetebilmek için harici bir uygulama başlatılacak."
+
+#: ../src/empathy-event-manager.c:507
+msgid "You don't have the needed external application to handle it."
+msgstr "Yönetebilecek harici bir uygulamaya ihtiyacınız yok."
+
+#: ../src/empathy-event-manager.c:634
+msgid "Room invitation"
+msgstr "Oda daveti"
+
+#: ../src/empathy-event-manager.c:637
 #, c-format
-msgid ""
-"%s is offering you an invitation, but you don't have the needed external "
-"application to handle it."
-msgstr ""
-"%s size bir davet öneriyor, fakat bu isteği karşılamak için gerekli harici "
-"uygulamanız yok."
+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:296
-msgid "Invitation Error"
-msgstr "Davet Hatası"
+#: ../src/empathy-event-manager.c:645
+msgid "_Decline"
+msgstr "_Reddet"
+
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "_Join"
+msgstr "_Katıl"
 
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:689
 #, c-format
-msgid ""
-"%s is offering you an invitation. An external application will be started to "
-"handle it."
-msgstr ""
-"%s size bir davet öneriyor. Bu isteği karşılamak için harici bir uygulama "
-"başlatılacaktır."
+msgid "%s invited you to join %s"
+msgstr "%s sizi %s 'e katılmanız için davet etti"
 
-#: ../src/empathy-event-manager.c:378
+#: ../src/empathy-event-manager.c:715
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr "%s kişisinden gelen dosya transferi"
+
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s tarafından kayıt istendi"
 
-#: ../src/empathy-event-manager.c:381
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1596,166 +2058,147 @@ msgstr ""
 "\n"
 "Mesaj: %s"
 
-#: ../src/empathy-ft-manager.c:110
+#. 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
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:112
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:161
-msgid "No reason was specified"
-msgstr "Sebep belirtilmemiş"
-
-#: ../src/empathy-ft-manager.c:163
-msgid "The change in state was requested"
-msgstr "Durumda değişiklik istendi"
-
-#: ../src/empathy-ft-manager.c:165
-msgid "You canceled the file transfer"
-msgstr "Dosya transferini iptal ettiniz"
-
-#: ../src/empathy-ft-manager.c:167
-msgid "The other participant canceled the file transfer"
-msgstr "Diğer katılımcı dosya transferini iptal etti"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Bilinmiyor"
 
-#: ../src/empathy-ft-manager.c:169
-msgid "Error while trying to transfer the file"
-msgstr "Dosya transfer etmeye çalışılırken hata"
-
-#: ../src/empathy-ft-manager.c:171
-msgid "The other participant is unable to transfer the file"
-msgstr "Diğer katılımcı dosya transfer edemiyor"
+#: ../src/empathy-ft-manager.c:275
+#, fuzzy, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s / %s"
 
-#: ../src/empathy-ft-manager.c:173
-msgid "Unknown reason"
-msgstr "Bilinmeyen sebep"
+#: ../src/empathy-ft-manager.c:276
+#, 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:221
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" dosyası %s kişisinden alınıyor"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:224
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" dosyası %s kişisine gönderiliyor"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:242
-#, 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:340
+#, fuzzy, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "\"%s\" dosyası %s kişisinden alınıyor"
 
-#: ../src/empathy-ft-manager.c:249
-msgid "Waiting the other participant's response"
-msgstr "Diğer katılımcının cevabı bekleniyor"
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr ""
+
+#: ../src/empathy-ft-manager.c:348
+#, fuzzy, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "\"%s\" dosyası %s kişisine gönderiliyor"
+
+#: ../src/empathy-ft-manager.c:351
+#, fuzzy
+msgid "Error sending a file"
+msgstr "'%s' mesajı gönderilirken hata : %s"
 
-#: ../src/empathy-ft-manager.c:259
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" dosyası %s kişisinden alındı"
 
-#: ../src/empathy-ft-manager.c:265
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" dosyası %s kişisine gönderildi"
 
-#: ../src/empathy-ft-manager.c:268
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "Dosya transferi tamamlandı"
 
-#: ../src/empathy-ft-manager.c:277
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "\"%s\" dosyası %s kişisinden alınıyor"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#, fuzzy
+msgid "Waiting for the other participant's response"
+msgstr "Diğer katılımcının cevabı bekleniyor"
 
-#: ../src/empathy-ft-manager.c:283
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "\"%s\" dosyası %s kişisine gönderiliyor"
+msgid "Checking integrity of \"%s\""
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "Dosya transferi iptal edildi: %s"
+msgid "Hashing \"%s\""
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "Dosya"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "Kalan"
 
-#: ../src/empathy-ft-manager.c:870
-msgid "Cannot save file to this location"
-msgstr "Dosya bu konuma kaydedilemiyor"
-
-#: ../src/empathy-ft-manager.c:916
-msgid "Save file as..."
-msgstr "Dosyayı farklı kaydet..."
-
-#: ../src/empathy-ft-manager.c:986
-msgid "unknown size"
-msgstr "bilinmeyen boyut"
-
-#: ../src/empathy-ft-manager.c:992
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s size bir dosya göndermek istiyor"
-
-#: ../src/empathy-ft-manager.c:997
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "\"%s\" (%s) dosyasını kabul etmek ister misiniz?"
-
-#. Decline button
-#: ../src/empathy-ft-manager.c:1006
-msgid "_Decline"
-msgstr "_Reddet"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1015
-msgid "_Accept"
-msgstr "_Kabul et"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+#, fuzzy
+msgid "File Transfers"
 msgstr "Dosya transferleri"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Listeden tamamlanmış, iptal edilmiş ve başarısız dosya transferlerini kaldı"
 
-#: ../src/empathy-ft-manager.glade.h:3
-msgid "gtk-clear"
-msgstr "gtk-clear"
-
-#: ../src/empathy-import-dialog.c:249
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "İçe Aktar"
 
-#: ../src/empathy-import-dialog.c:258
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-dialog.c:284
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "Kaynak"
 
-#: ../src/empathy-import-dialog.c:372
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -1763,146 +2206,208 @@ msgstr ""
 "İçe aktarmak için hiçbir hesap bulunamadı. Empathy şu anda sadece Pidgin'den "
 "hesapları içe aktarmayı destekliyor."
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "Hesapları İçe Aktar"
 
-#: ../src/empathy-import-dialog.glade.h:2
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../src/empathy-import-dialog.glade.h:3
-msgid "gtk-ok"
-msgstr "gtk-ok"
-
-#: ../src/empathy-main-window.c:466
-msgid "Show and edit accounts"
-msgstr "Hesapları göster ve düzenle"
-
-#: ../src/empathy-main-window.c:838
-msgid "Contact"
-msgstr "Bağlantı"
-
-#: ../src/empathy-main-window.c:1040
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "Hesabı düz_enle"
 
-#: ../src/empathy-main-window.c:1123
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Hata belirtilmemiş"
 
-#: ../src/empathy-main-window.c:1126
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Ağ hatası"
 
-#: ../src/empathy-main-window.c:1129
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Kimlik denetimi başarısız"
 
-#: ../src/empathy-main-window.c:1132
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Şifreleme hatası"
 
-#: ../src/empathy-main-window.c:1135
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "İsim kullanımda"
 
-#: ../src/empathy-main-window.c:1138
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Sertifika sağlanmamış"
 
-#: ../src/empathy-main-window.c:1141
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Sertifika güvenilmez"
 
-#: ../src/empathy-main-window.c:1144
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Sertifikanın süresi dolmuş"
 
-#: ../src/empathy-main-window.c:1147
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Sertifika etkinleştirilmemiş"
 
-#: ../src/empathy-main-window.c:1150
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "Sertifikanın makine adı uyuşmuyor"
 
-#: ../src/empathy-main-window.c:1153
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Sertifikanın parmak izi uyuşmuyor"
 
-#: ../src/empathy-main-window.c:1156
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Sertifika kendinden-imzalı"
 
-#: ../src/empathy-main-window.c:1159
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Sertifika hatası"
 
-#: ../src/empathy-main-window.c:1162
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.c:1293
+msgid "Show and edit accounts"
+msgstr "Hesapları göster ve düzenle"
+
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "Bağlantı Listesi"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Bağlam"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Sık Kullanılanlara Katıl"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Ye_ni Katıl..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Sık Kullanılanları Yönet"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Çevrimdışı _Bağlantıları Göster"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+msgid "Sort by _Name"
+msgstr "_Ada göre sırala"
+
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+msgid "Sort by _Status"
+msgstr "_Duruma göre sırala"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "Hes_aplar"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "Bağlantı _Ekle..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr ""
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:17
+#, fuzzy
+msgid "_File Transfers"
+msgstr "Dosya transferleri"
+
+#: ../src/empathy-main-window.ui.h:19
+#, fuzzy
+msgid "_Join..."
+msgstr "_Katıl"
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "Ye_ni Konuşma..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+#, fuzzy
+msgid "_Offline Contacts"
+msgstr "Çevrimdışı _Bağlantıları Göster"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "_Kişisel Bilgi"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+#, fuzzy
+msgid "_Previous Conversations"
+msgstr "Önceki Konuşmalar"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Oda"
 
-#: ../src/empathy-new-chatroom-dialog.c:290
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:331
+#, fuzzy
+msgid "Chat Room"
 msgstr "Sohbet Odaları"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Gözat:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+#, fuzzy
+msgid "Members"
+msgstr "Temalar"
+
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\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 ""
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../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 ""
 "Katılmak istediğiniz odanın adını girin ya da listeden bir veya daha fazla "
 "odaya tıklayın."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../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"
@@ -1910,142 +2415,533 @@ msgstr ""
 "Odayı barındıran sunucuyu girin ya da oda şimdiki hesabın sunucusunda ise "
 "boş bırakın."
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Katıl"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#, fuzzy
+msgid "Join Room"
+msgstr "Oda"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Yeni katıl"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#, fuzzy
+msgid "Room List"
+msgstr "Oda Listesi ye_reli:"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "_Tazele"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Oda:"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr ""
-"Bu liste girdiğiniz sunucuda barındırılan tüm sohbet odalarını gösterir."
+#: ../src/empathy-preferences.c:148
+msgid "Message received"
+msgstr "Mesaj alındı"
 
-#: ../src/empathy-preferences.c:264
-msgid "Language"
-msgstr "Dil"
+#: ../src/empathy-preferences.c:149
+msgid "Message sent"
+msgstr "Mesaj gönderildi"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Görünüm</b>"
+#: ../src/empathy-preferences.c:150
+msgid "New conversation"
+msgstr "Yeni sohbet"
 
-#. To translators: Audio notifications preferences
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Ses</b>"
+#: ../src/empathy-preferences.c:151
+msgid "Contact goes online"
+msgstr "Bağlantı çevrimiçi oldu"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Behaviour</b>"
-msgstr "<b>Davranış</b>"
+#: ../src/empathy-preferences.c:152
+msgid "Contact goes offline"
+msgstr "Bağlantı çevrimdışı oldu"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Contact List</b>"
-msgstr "<b>Bağlantı Listesi</b>"
+#: ../src/empathy-preferences.c:153
+msgid "Account connected"
+msgstr "Hesap bağlı"
 
-#: ../src/empathy-preferences.glade.h:6
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>İmla denetiminin etkinleştirileceği diller:</b>"
+#: ../src/empathy-preferences.c:154
+msgid "Account disconnected"
+msgstr "Hesap bağlı değil"
 
-#. To translators: Visual notifications preferences, like notify bubbles, etc.
-#: ../src/empathy-preferences.glade.h:8
-msgid "<b>Visual</b>"
-msgstr "<b>Görsel</b>"
+#: ../src/empathy-preferences.c:394
+msgid "Language"
+msgstr "Dil"
 
-#: ../src/empathy-preferences.glade.h:9
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
 msgstr ""
-"<small>Diller listesi sadece gerekli sözlüğü kurduğunuz dilleri "
-"yansıtmaktadır.</small>"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:4
+#, fuzzy
+msgid "Appearance"
+msgstr "<b>Görünüm</b>"
+
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "_Başlangıçta otomatik olarak bağlan."
 
-#: ../src/empathy-preferences.glade.h:11
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "Avatarlar bağlantı listesinde görünen kullanıcının seçtiği resimlerdir"
+#: ../src/empathy-preferences.ui.h:6
+#, fuzzy
+msgid "Behavior"
+msgstr "<b>Davranış</b>"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "Sohbet Teması:"
 
-#: ../src/empathy-preferences.glade.h:13
-msgid "Display notifications when contacts come _online"
-msgstr "Bağlantılar çevrimiçi _olduklarında uyarı göster"
+#: ../src/empathy-preferences.ui.h:8
+msgid "Disable notifications when _away or busy"
+msgstr "Uz_akta veya meşgul iken uyarıları etkisizleştir"
+
+#: ../src/empathy-preferences.ui.h:9
+msgid "Disable sounds when _away or busy"
+msgstr "Uz_akta veya meşgul iken sesleri etkisizleştir"
+
+#: ../src/empathy-preferences.ui.h:10
+#, fuzzy
+msgid "Enable notifications when a contact comes online"
+msgstr "_Sohbet odaklı değilken uyarıları etkinleştir"
 
-#: ../src/empathy-preferences.glade.h:14
-msgid "Enable sounds when _away"
-msgstr "Uz_aktayken sesleri etkinleştir"
+#: ../src/empathy-preferences.ui.h:11
+#, fuzzy
+msgid "Enable notifications when a contact goes offline"
+msgstr "_Sohbet odaklı değilken uyarıları etkinleştir"
 
-#: ../src/empathy-preferences.glade.h:15
-msgid "Enable sounds when _busy"
-msgstr "_Meşgulken sesleri etkinleştir"
+#: ../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:13
+#, fuzzy
+msgid "Enable spell checking for languages:"
+msgstr "<b>İmla denetiminin etkinleştirileceği diller:</b>"
 
-#: ../src/empathy-preferences.glade.h:16
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Genel"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+#, fuzzy
+msgid "Location"
+msgstr "Uyarılar"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Uyarılar"
 
-#: ../src/empathy-preferences.glade.h:18
+#: ../src/empathy-preferences.ui.h:18
+#, fuzzy
+msgid "Play sound for events"
+msgstr "<b>Olaylar için ses çal</b>"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../src/empathy-preferences.glade.h:19
-msgid "Show _avatars"
-msgstr "Av_atarları göster"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:20
+#: ../src/empathy-preferences.ui.h:21
+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
 msgid "Show _smileys as images"
 msgstr "Gülüm_semeleri görüntü olarak göster"
 
-#: ../src/empathy-preferences.glade.h:21
-msgid "Show co_mpact contact list"
-msgstr "_Sıkışık bağlantı listesini göster"
-
-#: ../src/empathy-preferences.glade.h:22
-msgid "Sort by _name"
-msgstr "_Ada göre sırala"
+#: ../src/empathy-preferences.ui.h:23
+#, fuzzy
+msgid "Show contact _list in rooms"
+msgstr "Bağlantı Listesini Gö_ster"
 
-#: ../src/empathy-preferences.glade.h:23
-msgid "Sort by s_tate"
-msgstr "_Duruma göre sırala"
+#: ../src/empathy-preferences.ui.h:24
+msgid "Sounds"
+msgstr "Sesler"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "İmla Denetimi"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:26
+#, fuzzy
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"<small>Diller listesi sadece gerekli sözlüğü kurduğunuz dilleri "
+"yansıtmaktadır.</small>"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Temalar"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:28
+msgid "_Enable bubble notifications"
+msgstr "Balon uyarıları _etkinleştir"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Enable sound notifications"
+msgstr "Ses uyarılarını _etkinleştir"
+
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "Yeni s_ohbetleri ayrı pencerelerde aç"
 
-#: ../src/empathy-preferences.glade.h:27
-msgid "_Play sound when messages arrive"
-msgstr "_Mesaj geldiğinde ses çal"
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr ""
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "Durum"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "Çı_k"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "Bağlantı Listesini Gö_ster"
+#: ../src/empathy-tube-dispatch.c:375
+#, c-format
+msgid "Unable to start application for service %s: %s"
+msgstr "%s servisi için uygulama başlatılamıyor: %s"
+
+#: ../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"
+msgstr ""
+"%s servisi için bir davet önerildi, fakat bunu yönetebilmek için gerekli "
+"olan uygulamaya sahip değilsiniz."
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+#, fuzzy
+msgid "Contact Map View"
+msgstr "Bağlantı Listesi"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#, fuzzy
+msgid "Critical"
+msgstr "Hırvatça"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#, fuzzy
+msgid "Warning"
+msgstr "Kalan"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+#, fuzzy
+msgid "Message"
+msgstr "Mesaj:"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:845
+#, fuzzy
+msgid "Save"
+msgstr "Sunucu"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1102
+#, fuzzy
+msgid "Time"
+msgstr "Basit"
+
+#: ../src/empathy-debug-dialog.c:1104
+#, fuzzy
+msgid "Domain"
+msgstr "Rumence"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy Anında Mesajlaşma Aracı"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Parolayı unut ve girdi alanını temizle."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Ağ</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Sunucular</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Seçili IRC ağını düzenle"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Seçili IRC ağını kaldır"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "Kelime Yazımını _Kontrol Et..."
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>Başlık:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "Grup Sohbeti"
+
+#~ msgid "Contact Information"
+#~ msgstr "Bağlantı Bilgisi"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Sizi bağlantı listeme eklemek istiyorum."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Üzgünüm, sizi bağlantı listemde daha fazla istemiyorum."
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Gruplar</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "Bağlantı bilgisi"
+
+#~ msgid "Word"
+#~ msgstr "Kelime"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Kelime için öneriler"
+
+#~ msgid "Spell Checker"
+#~ msgstr "İmla Denetçisi"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Kelime için öneriler:"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Empathy Anında Mesajlaşma Aracı"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Yeni Hesap</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "Zaten kullanmak istediğim bir hesabım mevcut"
+
+#~ msgid "New message from %s"
+#~ msgstr "%s kişisinden yeni mesaj"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "Davet _mesajı:"
+
+#~ msgid "Invite"
+#~ msgstr "Davet et"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Davet etmek istediğiniz kişiyi seçin:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Bir sohbet konferansına katılmak için davet edildiniz."
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Sık Kullanılan Odayı Düzenle"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "_Başlangıçta odaya katıl"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr "Empathy başladığında ve bağlı olduğunda bu odaya katıl"
+
+#~ msgid "N_ame:"
+#~ msgstr "_Ad:"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_unucu:"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "Bilinmiyor"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "\"%s\" dosyası %s kişisinden alınıyor"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "\"%s\" dosyası %s kişisine gönderiliyor"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "Dosya transferi iptal edildi: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "Bilinmiyor"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "Dosya bu konuma kaydedilemiyor"
+
+#~ msgid "Save file as..."
+#~ msgstr "Dosyayı farklı kaydet..."
+
+#~ msgid "unknown size"
+#~ msgstr "bilinmeyen boyut"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s size bir dosya göndermek istiyor"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "\"%s\" (%s) dosyasını kabul etmek ister misiniz?"
+
+#~ msgid "_Accept"
+#~ msgstr "_Kabul et"
+
+#~ msgid "Join _New..."
+#~ msgstr "Ye_ni Katıl..."
+
+#~ msgid "Browse:"
+#~ msgstr "Gözat:"
+
+#~ msgid "Join"
+#~ msgstr "Katıl"
+
+#~ msgid "Join New"
+#~ msgstr "Yeni katıl"
+
+#~ msgid "Re_fresh"
+#~ msgstr "_Tazele"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr ""
+#~ "Bu liste girdiğiniz sunucuda barındırılan tüm sohbet odalarını gösterir."
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Bağlantı Listesi</b>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr ""
+#~ "Avatarlar bağlantı listesinde görünen kullanıcının seçtiği resimlerdir"
+
+#~ msgid "Show _avatars"
+#~ msgstr "Av_atarları göster"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "_Sıkışık bağlantı listesini göster"
+
+#~ msgid "Enable popup when contact is available"
+#~ msgstr "Bağlantı uygun olduğunda açılır pencereyi etkinleştir"
+
+#~ msgid "Enable sound when busy"
+#~ msgstr "Meşgulken sesi etkinleştir"
+
+#~ msgid "Closed"
+#~ msgstr "Kapandı"
+
+#~ msgid "End this call?"
+#~ msgstr "Bu çağrı sonlandırılsın mı?"
+
+#~ msgid "Closing this window will end the call in progress."
+#~ msgstr "Bu pencereyi kapatmak aktif çağrıyı sonlandıracaktır."
+
+#~ msgid "Readying"
+#~ msgstr "Hazırlanıyor"
+
+#~ msgid "Ringing"
+#~ msgstr "Çalıyor"
+
+#~ msgid ""
+#~ "Incoming call from %s rejected because there is already a running call."
+#~ msgstr ""
+#~ "%s kişisinden gelen çağrı reddedildi, çünkü halen aktif bir çağrı var."
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "<b>Keypad</b>"
+#~ msgstr "<b>Tuş Takımı</b>"
+
+#~ msgid "Invitation Error"
+#~ msgstr "Davet Hatası"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>Ses</b>"
+
+#~ msgid "<b>Visual</b>"
+#~ msgstr "<b>Görsel</b>"
+
+#~ msgid "Enable sounds when _busy"
+#~ msgstr "_Meşgulken sesleri etkinleştir"
diff --git a/po/uk.po b/po/uk.po
index 5e2bd44c1..bc8c491b6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,46 +3,55 @@
 # This file is distributed under the same license as the gossip package.
 # Sergiy Dolgopolov <virgo@gnome.org.ua>, 2004.
 # Maxim Dziumanenko <dziumanenko@gmail.com>, 2008
-#
+# Sergey Panasenko <nitay@users.sourceforge.net>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gossip 0.7.5\n"
+"Project-Id-Version: Empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-02 15:21+0000\n"
-"PO-Revision-Date: 2008-11-02 16:06-0000\n"
-"Last-Translator: Maxim V. Dziumanenko <dziumanenko@gmail.com>\n"
-"Language-Team: Ukrainian <uk@li.org>\n"
+"POT-Creation-Date: 2009-08-18 22:49+0300\n"
+"PO-Revision-Date: 2009-08-05 06:12+0300\n"
+"Last-Translator: Sergey Panasenko <nitay@users.sourceforge.net>\n"
+"Language-Team: Ukrainian <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Обмін повідомленнями Empathy"
+msgid "Empathy IM Client"
+msgstr "Миттєві повідомлення Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
-msgstr "Отримання  та надсилання миттєвих повідомлень"
+msgid "Send and receive messages"
+msgstr "Отримання та надсилання миттєвих повідомлень"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Завжди відкривати нову бесіду у новому вікні."
 
 #: ../data/empathy.schemas.in.h:2
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Символ для додавання після псевдоніму, якщо у бесіді використовується автодоповнення псевдонімів клавішею Tab."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Символ для додавання після псевдоніму, якщо у бесіді використовується "
+"автодоповнення псевдонімів клавішею Tab."
 
 #: ../data/empathy.schemas.in.h:3
 msgid "Chat window theme"
 msgstr "Тема вікна бесіди"
 
 #: ../data/empathy.schemas.in.h:4
-msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr "Список мов, що використовуються при перевірці орфографії, розділених комами (наприклад «en, ru, uk»)."
+msgid ""
+"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+msgstr ""
+"Список мов, що використовуються при перевірці орфографії, розділених комами "
+"(наприклад «en, ru, uk»)."
 
 #: ../data/empathy.schemas.in.h:5
 msgid "Compact contact list"
-msgstr "Стиснутий список контактів"
+msgstr "Список контактів компактно"
 
 #: ../data/empathy.schemas.in.h:6
 msgid "Contact list sort criterium"
@@ -53,810 +62,1332 @@ msgid "Default directory to select an avatar image from"
 msgstr "Каталог, що використовується для вибору зображень аватарів"
 
 #: ../data/empathy.schemas.in.h:8
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy запитує імпорт облікових рахунків"
+msgid "Disable popup notifications when away"
+msgstr "Вимкнути контекстні сповіщення у стані «відійшов»"
 
 #: ../data/empathy.schemas.in.h:9
-msgid "Empathy should auto-connect on startup"
-msgstr "З'єднуватися під час запуску"
+msgid "Disable sounds when away"
+msgstr "Вимкнути звуки у стані «відійшов»"
 
 #: ../data/empathy.schemas.in.h:10
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy має використовувати аватар контакту, як значок вікна із бесідою"
+msgid "Empathy can publish the user's location"
+msgstr "Empathy може публікувати місцезнаходження користувачів"
 
 #: ../data/empathy.schemas.in.h:11
-msgid "Enable popup when contact is available"
-msgstr "Показувати контекстне вікно, коли співрозмовник доступний"
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy може використовувати GPS для визначення місцезнаходження."
 
 #: ../data/empathy.schemas.in.h:12
-msgid "Enable sound when away"
-msgstr "Увімкнути звуки у стані «відійшов»"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+"Empathy може використовувати стільникову мережу для визначення  "
+"місцезнаходження"
 
 #: ../data/empathy.schemas.in.h:13
-msgid "Enable sound when busy"
-msgstr "Увімкнути звуки у стані «зайнятий»"
+msgid "Empathy can use the network to guess the location"
+msgstr ""
+"Empathy може використовувати  мережу для припущень щодо місцезнаходження"
 
 #: ../data/empathy.schemas.in.h:14
+msgid "Empathy default download folder"
+msgstr "Типова тека для завантаження файлів"
+
+#: ../data/empathy.schemas.in.h:15
+msgid "Empathy has asked about importing accounts"
+msgstr "Empathy запитує імпорт облікових рахунків"
+
+#: ../data/empathy.schemas.in.h:16
+msgid "Empathy should auto-connect on startup"
+msgstr "З'єднуватися під час запуску"
+
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy має послабити точність визначення місцезнаходження"
+
+#: ../data/empathy.schemas.in.h:18
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Empathy має використовувати аватар співрозмовника, як значок вікна із бесідою"
+
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr "Увімкнути інструменти розробки WebKit"
+
+#: ../data/empathy.schemas.in.h:20
+msgid "Enable popup notifications for new messages"
+msgstr "Ввімкнути контекстні сповіщення для нових повідомлень"
+
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "Увімкнути перевірку орфографії"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "Сховати головне вікно"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "Сховати головне вікно."
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
-msgstr "Менеджер мережі, що використовується"
+msgstr "Використовувати Менеджер мережі"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "Символ автодоповнення псевдоніму"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "Відкривати нові бесіди у новому вікні"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:27
+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."
+msgstr "Шлях до теми Adium для використання у чаті Adium."
+
+#: ../data/empathy.schemas.in.h:29
+msgid "Play a sound for incoming messages"
+msgstr "Відтворити звук при отриманні повідомлення"
+
+#: ../data/empathy.schemas.in.h:30
+msgid "Play a sound for new conversations"
+msgstr "Відтворити звук для нової бесіди"
+
+#: ../data/empathy.schemas.in.h:31
+msgid "Play a sound for outgoing messages"
+msgstr "Відтворити звук при відправленні повідомлення"
+
+#: ../data/empathy.schemas.in.h:32
+msgid "Play a sound when a contact logs in"
+msgstr "Відтворити звук при появі співрозмовнику в мережі"
+
+#: ../data/empathy.schemas.in.h:33
+msgid "Play a sound when a contact logs out"
+msgstr "Відтворити звук при відключенні співрозмовника"
+
+#: ../data/empathy.schemas.in.h:34
+msgid "Play a sound when we log in"
+msgstr "Відтворити звук вході"
+
+#: ../data/empathy.schemas.in.h:35
+msgid "Play a sound when we log out"
+msgstr "Відтворити звук при виході"
+
+#: ../data/empathy.schemas.in.h:36
+msgid "Popup notifications if the chat isn't focused"
+msgstr "Контекстні сповіщення, коли чат не в фокусі"
+
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "Контекстні сповіщення, коли контакт реєструється"
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "Контекстні сповіщення, коли контакт відреєструється"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "Обліковий рахунок Salut створено"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "Показувати аватари"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "Показати список співрозмовників у кімнаті"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
-msgstr "Показувати підказку про закриття головного вікна"
+msgstr "Показувати підтвердження про закриття головного вікна"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "Показувати відсутніх співрозмовників"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
-msgstr "Мови для перевірки орфографії"
+msgstr "Перевірка правопису для мов"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:45
+msgid "The default folder to save file transfers in."
+msgstr "Типова тека для збереження вхідних файлів."
+
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Останній каталог, з якого обирались зображення аватарів."
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Ця тема використовується для діалогу у вікні бесіди."
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "Використовувати графічні смайли"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "Використовувати звуки"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "Використовувати тему для бесід"
 
-#: ../data/empathy.schemas.in.h:30
-msgid "Whether or not Empathy has asked about importing accounts from other programs."
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Чи вмикати інструменти розробки WebKit, такі як Web Inspector."
+
+#: ../data/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "Чи показувати місцезнаходження вашим співрозмовникам."
+
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Чи використовувати GPS для визначення місцезнаходження."
+
+#: ../data/empathy.schemas.in.h:54
+msgid ""
+"Whether or not Empathy can use the cellular 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."
+msgstr "Чи використовувати мережу для визначення місцезнаходження."
+
+#: ../data/empathy.schemas.in.h:56
+msgid ""
+"Whether or not Empathy has asked about importing accounts from other "
+"programs."
 msgstr "Чи запитувати про імпорт облікових рахунків з інших програм."
 
-#: ../data/empathy.schemas.in.h:31
-msgid "Whether or not Empathy should automatically log in to your accounts on startup."
+#: ../data/empathy.schemas.in.h:57
+msgid ""
+"Whether or not Empathy should automatically log in to your accounts on "
+"startup."
 msgstr "Автоматично підключати облікові записи при запуску."
 
-#: ../data/empathy.schemas.in.h:32
-msgid "Whether or not Empathy should use the avatar of the contact as the chat window icon."
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr ""
+"Чи слід зменшити точність визначення місцезнаходження з причини "
+"конфіденційності."
+
+#: ../data/empathy.schemas.in.h:59
+msgid ""
+"Whether or not Empathy should use the avatar of the contact as the chat "
+"window icon."
 msgstr "Чи використовувати атавари співрозмовників як значки вікон із бесідами"
 
-#: ../data/empathy.schemas.in.h:33
-msgid "Whether or not the Salut account has been created on the first Empathy run."
+#: ../data/empathy.schemas.in.h:60
+msgid ""
+"Whether or not the Salut account has been created on the first Empathy run."
 msgstr "Створювати обліковий запис Salut під час першого запуску."
 
-#: ../data/empathy.schemas.in.h:34
-msgid "Whether or not the network manager should be used to automatically disconnect/reconnect."
-msgstr "Використовувати менеджер мережі для автоматичного встановлення/розриву зв'язку."
+#: ../data/empathy.schemas.in.h:61
+msgid ""
+"Whether or not the network manager should be used to automatically "
+"disconnect/reconnect."
+msgstr ""
+"Використовувати менеджер мережі для автоматичного встановлення/розриву "
+"зв'язку."
 
-#: ../data/empathy.schemas.in.h:35
-msgid "Whether or not to check words typed against the languages you want to check with."
+#: ../data/empathy.schemas.in.h:62
+msgid ""
+"Whether or not to check words typed against the languages you want to check "
+"with."
 msgstr "Перевіряти набрані слова за списком мов для перевірки орфографії."
 
-#: ../data/empathy.schemas.in.h:36
-msgid "Whether or not to convert smileys into graphical images in conversations."
+#: ../data/empathy.schemas.in.h:63
+msgid ""
+"Whether or not to convert smileys into graphical images in conversations."
 msgstr "Перетворювати текстові смайли на графічне представлення."
 
-#: ../data/empathy.schemas.in.h:37
-msgid "Whether or not to play a sound when messages arrive."
-msgstr "Відтворювати звук при надходженні повідомлення."
+#: ../data/empathy.schemas.in.h:64
+msgid ""
+"Whether or not to play a sound to notify for contacts logging in the network."
+msgstr "Чи відтворювати звуковий сигнал при вході співрозмовника у мережу."
 
-#: ../data/empathy.schemas.in.h:38
-msgid "Whether or not to play sounds when away."
-msgstr "Відтворювати звук у стані «відійшов»."
+#: ../data/empathy.schemas.in.h:65
+msgid ""
+"Whether or not to play a sound to notify for contacts logging off the "
+"network."
+msgstr "Чи відтворювати звуковий сигнал при виході співрозмовника з мережі."
 
-#: ../data/empathy.schemas.in.h:39
-msgid "Whether or not to play sounds when busy."
-msgstr "Відтворювати звук у стані «зайнятий»."
+#: ../data/empathy.schemas.in.h:66
+msgid "Whether or not to play a sound to notify for events."
+msgstr "Чи відтворювати звукові сигнали при подіях."
 
-#: ../data/empathy.schemas.in.h:40
-msgid "Whether or not to show a popup when a contact becomes available."
-msgstr "Показувати контекстне вікно при появі співрозмовника."
+#: ../data/empathy.schemas.in.h:67
+msgid "Whether or not to play a sound to notify for incoming messages."
+msgstr "Чи відтворювати звуковий сигнал при надходженні повідомлення."
 
-#: ../data/empathy.schemas.in.h:41
-msgid "Whether or not to show avatars for contacts in the contact list and chat windows."
-msgstr "Показувати відсутніх користувачів у списку контактів."
+#: ../data/empathy.schemas.in.h:68
+msgid "Whether or not to play a sound to notify for new conversations."
+msgstr "Чи відтворювати звуковий сигнал для нової бесіди."
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:69
+msgid "Whether or not to play a sound to notify for outgoing messages."
+msgstr "Чи відтворювати звуковий сигнал при відправленні повідомлення."
+
+#: ../data/empathy.schemas.in.h:70
+msgid "Whether or not to play a sound when logging in a network."
+msgstr "Чи відтворювати звуковий сигнал при вході у мережу."
+
+#: ../data/empathy.schemas.in.h:71
+msgid "Whether or not to play a sound when logging off a network."
+msgstr "Чи відтворювати звуковий сигнал при виході з мережі."
+
+#: ../data/empathy.schemas.in.h:72
+msgid "Whether or not 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."
+msgstr "Чи показувати контекстні сповіщення коли контакт виходить з мережі."
+
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "Чи показувати контекстні сповіщення коли контакт входить у мережу."
+
+#: ../data/empathy.schemas.in.h:75
+msgid ""
+"Whether or not 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."
+msgstr ""
+"Чи показувати контекстні сповіщення при надходженні нового повідомлення."
+
+#: ../data/empathy.schemas.in.h:77
+msgid ""
+"Whether or not 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."
 msgstr "Чи показувати недоступних у мережі користувачів у списку контактів."
 
-#: ../data/empathy.schemas.in.h:43
-msgid "Whether or not to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Підтверджувати закриття головного вікна."
+#: ../data/empathy.schemas.in.h:79
+msgid "Whether or not to show popup notifications when away or busy."
+msgstr "Чи показувати контекстні сповіщення у станах «відійшов» або «зайнятий»."
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
+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."
+msgstr ""
+"Чи показувати повідомлення про закриття головного вікна кнопкою 'х' у "
+"заголовку."
+
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Показувати список контактів стисненим або ні."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Використовувати теми для вікон бесід чи ні."
 
-#: ../data/empathy.schemas.in.h:46
-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."
-msgstr "Критерій для впорядковування списку співрозмовників. Типово впорядковується за іменем співрозмовника — «name». При значенні «state» список буде впорядковано на статусом."
+#: ../data/empathy.schemas.in.h:84
+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."
+msgstr ""
+"Критерій для впорядковування списку співрозмовників. Типово впорядковується "
+"за іменем співрозмовника — «name». При значенні «state» список буде "
+"впорядковано на статусом."
+
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "Хеш отриманого файлу та надісланий хеш оригіналу не збігаються"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "Передача файлів не працює для віддалених співрозмовників"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "Обраний файл не є звичайним файлом"
 
-#: ../libempathy/empathy-tp-contact-list.c:731
-#: ../src/empathy.c:248
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "Обраний файл пустий"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "Люди поблизу"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "Такий тип сокету не підтримується"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "Причину не вказано"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "Запрошено заміну стану"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "Ви скасували передачу файлу "
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "Інший учасник передачі файлу її скасував"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "Помилка при спробі передати файл"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "Інший учасник не може передати файл"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "Невідома причина"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "Доступний"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "Відійшов"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "Прихований"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "Не у мережі"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:337
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d секунду тому"
+msgstr[1] "%d секунди тому"
+msgstr[2] "%d секунд тому"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d хвилину тому"
+msgstr[1] "%d хвилини тому"
+msgstr[2] "%d хвилин тому"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d годину тому"
+msgstr[1] "%d години тому"
+msgstr[2] "%d годин тому"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d день тому"
+msgstr[1] "%d дні тому"
+msgstr[2] "%d днів тому"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d тиждень тому"
+msgstr[1] "%d тижня тому"
+msgstr[2] "%d тижнів тому"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d місяць тому"
+msgstr[1] "%d місяця тому"
+msgstr[2] "%d місяців тому"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "в майбутньому"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "Усі"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Додатково</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "Забути пароль та очистити рядок."
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+msgid "Advanced"
+msgstr "Додатково"
+
+#: ../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
 msgid "Pass_word:"
 msgstr "_Пароль:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
-msgstr "_Ім'я:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+msgstr "_Ім'я(на екрані):"
+
+#: ../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
 msgid "_Port:"
 msgstr "П_орт:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "_Ідентифікатор:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "_Кодування:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "Нова мережа"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>Мережа</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>Сервери</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "Кодування:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "Створити нову мережу IRC"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "Редагувати обрану мережу IRC"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Мережа"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "Мережа:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "Псевдонім:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "Повідомлення при виході:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "Справжнє ім'я:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "Видалити обрану мережу IRC"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "Сервери"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>Замінювати параметри сервера</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "Замінювати параметри сервера"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "Прі_оритет:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "Ре_сурс:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "Використовувати старе _шифрування (SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "_Шифрування обов'язкове (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ігнорувати помилки сертифікатів SSL"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "_Електронна пошта:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
-msgid "_First Name: "
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+msgid "_First Name:"
 msgstr "_Ім'я: "
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "_Прізвище:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "_Псевдонім:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
-msgstr "_Ім'я:"
+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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "Знайти STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "Сервер STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "Порт STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
-msgstr "_Ім'я:"
+msgstr "_Ім'я користувача:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "Використовувати _Yahoo японія"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ігнорувати запрошення до бесід та конференцій"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "_Локаль списку бесід:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:457
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+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:933
 msgid "Select Your Avatar Image"
-msgstr "Виберіть зображення вашого аватару"
+msgstr "Виберіть зображення Вашого аватару"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:460
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "Немає зображення"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:520
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "Зображення"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "Усі файли"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "Клацніть для збільшення"
 
-#: ../libempathy-gtk/empathy-chat.c:497
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "Провалилися спроби знов підключитися до цього чату"
+
+#: ../libempathy-gtk/empathy-chat.c:412
+msgid "Unsupported command"
+msgstr "Команда не підтримується"
+
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "offline"
 msgstr "не у мережі"
 
-#: ../libempathy-gtk/empathy-chat.c:500
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "invalid contact"
 msgstr "неправильний контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:503
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "permission denied"
-msgstr "відмовлено"
+msgstr "відмовлено у доступі"
 
-#: ../libempathy-gtk/empathy-chat.c:506
+#: ../libempathy-gtk/empathy-chat.c:557
 msgid "too long message"
 msgstr "надто довге повідомлення"
 
-#: ../libempathy-gtk/empathy-chat.c:509
+#: ../libempathy-gtk/empathy-chat.c:560
 msgid "not implemented"
 msgstr "не реалізовано"
 
-#: ../libempathy-gtk/empathy-chat.c:512
+#: ../libempathy-gtk/empathy-chat.c:563
 msgid "unknown"
 msgstr "невідомо"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:567
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Помилка при надсиланні повідмолення «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:546
+#: ../libempathy-gtk/empathy-chat.c:597
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:599
 msgid "No topic defined"
 msgstr "Тему не встановлено"
 
-#: ../libempathy-gtk/empathy-chat.c:963
+#: ../libempathy-gtk/empathy-chat.c:969
+msgid "(No Suggestions)"
+msgstr "(Нема пропозицій)"
+
+#: ../libempathy-gtk/empathy-chat.c:1023
 msgid "Insert Smiley"
 msgstr "Вставити посмішку"
 
-#: ../libempathy-gtk/empathy-chat.c:979
+#. send button
+#: ../libempathy-gtk/empathy-chat.c:1041
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "_Надіслати"
 
-#: ../libempathy-gtk/empathy-chat.c:1013
-msgid "_Check Word Spelling..."
-msgstr "Пе_ревірити написання слова..."
+#: ../libempathy-gtk/empathy-chat.c:1075
+msgid "_Spelling Suggestions"
+msgstr "_Пропозиції з правопису"
 
-#: ../libempathy-gtk/empathy-chat.c:1119
+#: ../libempathy-gtk/empathy-chat.c:1190
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s приєднався до бесіди"
+msgid "%s has disconnected"
+msgstr "%s від'єднано"
+
+#: ../libempathy-gtk/empathy-chat.c:1194
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s був викинутий %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1197
+#, c-format
+msgid "%s was kicked"
+msgstr "%s був викинутий"
+
+#: ../libempathy-gtk/empathy-chat.c:1202
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s був заблокований %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1205
+#, c-format
+msgid "%s was banned"
+msgstr "%s вуб заблокований"
+
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
 msgid "%s has left the room"
 msgstr "%s покинув бесіду"
 
-#: ../libempathy-gtk/empathy-chat.c:1236
-#: ../src/empathy-call-window.c:406
+#. 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:1218
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1241
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s приєднався до бесіди"
+
+#: ../libempathy-gtk/empathy-chat.c:1374 ../src/empathy-call-window.c:1277
 msgid "Disconnected"
 msgstr "Від'єднаний"
 
-#: ../libempathy-gtk/empathy-chat.c:1608
+#: ../libempathy-gtk/empathy-chat.c:1809
 msgid "Connected"
 msgstr "З'єднаний"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Тема:</b>"
+#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-log-window.c:502
+msgid "Conversation"
+msgstr "Бесіда"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Розмова"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat-view.c:430
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "_Копіювати адресу посилання"
 
-#: ../libempathy-gtk/empathy-chat-view.c:438
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "_Відкрити посилання"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "Особиста інформація"
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
+msgid "%A %B %d %Y"
+msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Редагувати інформацію про співрозмовника"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "Інформація про співрозмовника"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:283
-msgid "I would like to add you to my contact list."
-msgstr "Я хотів би додати Вас у свій список контактів."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "Особиста інформація"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:307
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Новий контакт"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "_Вирішити пізніше"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Запис на підписку"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1244
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Хочете видалити групу «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1246
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "Видалення групи"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1293
-#: ../libempathy-gtk/empathy-contact-list-view.c:1372
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "В_идалити"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1323
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Хочете видалити контакт «%s» з вашого списку?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1325
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "Видалення контакту"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Вибачте, я не хочу додавати вас до свого списку."
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "_Додати контакт..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:115
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "_Розмова"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:136
-msgid "_Call"
-msgstr "_Виклик"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Голосовий виклик"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Відео виклик"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:175
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "Перегляд попередніх _бесід"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../libempathy-gtk/empathy-contact-menu.c:346
+msgid "Send file"
+msgstr "Надіслати файл"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr "Спільний доступ до мого робочого столу"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "Інфор_мація"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../src/empathy-chat-window.glade.h:14
-#: ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:294
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "Запрошення до цієї кімнати"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:334
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "_Запросити до кімнати"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../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:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "Неможливо зберегти аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:875
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "Вибрати"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:884
-#: ../src/empathy-main-window.c:855
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Інформація про використану програму</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Country ISO Code:"
+msgstr "ISO код країни:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Country:"
+msgstr "Країна:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "State:"
+msgstr "Регіон:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "City:"
+msgstr "Місто:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Area:"
+msgstr "Район:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Postal Code:"
+msgstr "Індекс:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Street:"
+msgstr "Вулиця:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Building:"
+msgstr "Дім:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Floor:"
+msgstr "Квартира:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Room:"
+msgstr "Кімната:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Text:"
+msgstr "Текст:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Description:"
+msgstr "Опис:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "URI:"
+msgstr "Адреса (URI):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Accuracy Level:"
+msgstr "Рівень точності:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Error:"
+msgstr "Помилка:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Vertical Error (meters):"
+msgstr "Вертикальна помилка (метри):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Horizontal Error (meters):"
+msgstr "Горизонтальна помилка (метри):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Speed:"
+msgstr "Швидкість:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Bearing:"
+msgstr "Азимут:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Climb Speed:"
+msgstr "Швидкість підйому:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Інформація про співрозмовника</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Last Updated on:"
+msgstr "Останнє оновлення о:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Співрозмовник</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Longitude:"
+msgstr "Довгота:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Групи</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
+msgid "Latitude:"
+msgstr "Широта:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
+msgid "Altitude:"
+msgstr "Висота:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
+msgid "<b>Location</b>"
+msgstr "<b>Місцезнаходження</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
+msgid "<b>Location</b>, "
+msgstr "<b>Місцезнаходження</b>,"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y у %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Місцезнаходження</b> у (дата)\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 "Обліковий запис:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Псевдонім:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "День народження:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "Інформація про використану програму"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "Програма:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Інформація про співрозмовника"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "Співрозмовник"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "Підробиці про співрозмовника"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "Електронна пошта:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "Повна назва:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "Група"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "Ідентифікатор:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "Інформацію запрошено..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
-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-contact-widget.ui.h:16
+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-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "Версія:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "Сайт:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "_Додати групу"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "новий сервер"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "Сервер"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
-msgstr "Порт:"
+msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "Шифрування SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:497
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: ../libempathy-gtk/empathy-log-window.c:504
-#: ../src/empathy-chat-window.c:280
-msgid "Conversation"
-msgstr "Бесіда"
-
-#: ../libempathy-gtk/empathy-log-window.c:514
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "Дата"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "Бесіди"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "Переглянути попередні бесіди"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "Пошук"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "_Для:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "_Подзвонити"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "_Розмова"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "Ідентифікатор контакту:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 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 "Типові повідомлення..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "Редагувати типові повідомлення..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "Клацніть, щоб прибрати статут \"улюблений\""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "Клацніть, щоб встановити статут \"улюблений\""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "Встановити стан"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "Встановіть Вашу наявність та поточний стан"
+
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
 msgid "Custom messages..."
-msgstr "Інші повідомлення..."
+msgstr "Типові повідомлення..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Інше повідомлення"
+#: ../libempathy-gtk/empathy-sound.c:51
+msgid "Received an instant message"
+msgstr "Отримання миттєвих повідомлень"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Нове повідомлення:"
+#: ../libempathy-gtk/empathy-sound.c:53
+msgid "Sent an instant message"
+msgstr "Надсилання миттєвих повідомлень"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Зберегти повідомлення"
+#: ../libempathy-gtk/empathy-sound.c:55
+msgid "Incoming chat request"
+msgstr "Вхідне запрошення до чату "
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Стан:"
+#: ../libempathy-gtk/empathy-sound.c:57
+msgid "Contact connected"
+msgstr "Співрозмовник підключений "
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "Слово"
+#: ../libempathy-gtk/empathy-sound.c:59
+msgid "Contact disconnected"
+msgstr "Співрозмовник відключений"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "Пропозиція, щодо заміни"
+#: ../libempathy-gtk/empathy-sound.c:61
+msgid "Connected to server"
+msgstr "Підключений до серверу"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Перевірка орфографії"
+#: ../libempathy-gtk/empathy-sound.c:63
+msgid "Disconnected from server"
+msgstr "Відключений від сервера"
+
+#: ../libempathy-gtk/empathy-sound.c:65
+msgid "Incoming voice call"
+msgstr "Вхідний голосовий виклик"
+
+#: ../libempathy-gtk/empathy-sound.c:67
+msgid "Outgoing voice call"
+msgstr "Вихідний голосовий виклик"
+
+#: ../libempathy-gtk/empathy-sound.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
+msgid "Edit Custom Messages"
+msgstr "Редагувати типові повідомлення..."
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "Додати _новій набір попередніх налаштувань"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Запропонувати слово:"
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "Зберегти набір попередніх налаштувань"
 
-#: ../libempathy-gtk/empathy-theme-boxes.c:745
-#: ../libempathy-gtk/empathy-theme-irc.c:293
-msgid "%A %d %B %Y"
-msgstr "%A %d %B %Y"
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "gtk-додати"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:73
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-видалити"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "Класична"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:74
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Simple"
 msgstr "Проста"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
 msgstr "Ясна"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "Блакитна"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1330
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
 msgid "Unable to open URI"
-msgstr "Неможливо відкрити URL"
+msgstr "Неможливо відкрити URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "Обрати файл"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
+msgid "Select a destination"
+msgstr "Обрати призначення"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -1029,19 +1560,23 @@ 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 "Співрозмовник для показу у аплеті. Відсутність значення означає - не відображати контакт."
+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 "Аватар співрозмовника. Відсутність значення означає - не відображати аватар."
+msgstr ""
+"Аватар співрозмовника. Відсутність значення означає - не відображати аватар."
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
 msgid "Megaphone"
 msgstr "Megaphone"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "Talk!"
 
@@ -1055,15 +1590,15 @@ msgid "_Information"
 msgstr "_Інформація"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "_Параметри"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
-msgstr "Налаштуйте контакт."
+msgstr "Налаштуйте контакт, будь ласка."
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "Вибрати контакт..."
 
@@ -1076,395 +1611,383 @@ msgstr "Присутність"
 msgid "Set your own presence"
 msgstr "Встановити стан"
 
-#: ../src/empathy.c:380
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "Не з'єднуватися під час запуску"
 
-#: ../src/empathy.c:384
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "Не показувати список співрозмовників під час запуску"
 
-#: ../src/empathy.c:388
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "Показати діалог налаштовування облікових записів"
 
-#: ../src/empathy.c:400
-msgid "- Empathy Instant Messenger"
-msgstr " — Empathy обмін миттєвими повідомленнями"
+#: ../src/empathy.c:587
+msgid "- Empathy IM Client"
+msgstr "- клієнт миттєвих повідомлень Empathy"
 
-#: ../src/empathy-about-dialog.c:84
-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 - вільна програма, ви можете розповсюджувати та/або змінювати його на умовах Універсальної Публічної Ліцензії GNU, що опублікована Фондом вільного програмного забезпечення, або версії 2 Ліцензії, або (на ваш розсуд) будь-якої старшої версії."
+#: ../src/empathy-about-dialog.c:83
+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 - вільна програма, ви можете розповсюджувати та/або змінювати його "
+"на умовах Універсальної Публічної Ліцензії GNU, що опублікована Фондом "
+"вільного програмного забезпечення, або версії 2 Ліцензії, або (на ваш "
+"розсуд) будь-якої старшої версії."
 
-#: ../src/empathy-about-dialog.c:88
-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 розповсюджується зі сподіванням, що програма буде корисною, але без БУДЬ-ЯКИХ ГАРАНТІЙ; навіть не гарантується ПРИДАТНІСТЬ та ВІДПОВІДНІСТЬ БУДЬ-ЯКИМ ВИМОГАМ. Докладніше про це дивіться GNU General Public License."
+#: ../src/empathy-about-dialog.c:87
+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 розповсюджується зі сподіванням, що програма буде корисною, але без "
+"БУДЬ-ЯКИХ ГАРАНТІЙ; навіть не гарантується ПРИДАТНІСТЬ та ВІДПОВІДНІСТЬ БУДЬ-"
+"ЯКИМ ВИМОГАМ. Докладніше про це дивіться GNU General Public License."
 
-#: ../src/empathy-about-dialog.c:92
-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 "Ви мали отримати копію GNU General Public License разом з цією програмою; якщо це не так, напишіть до Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+#: ../src/empathy-about-dialog.c:91
+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 ""
+"Ви мали отримати копію GNU General Public License разом з цією програмою; "
+"якщо це не так, напишіть до Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "Програма для швидкого обміну повідомленнями для GNOME"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "Сергій Довгополов <virgo@gnome.org.ua>\n"
-"Максим Дзюманенко <dziumanenko@gmail.com>"
+"Максим Дзюманенко <dziumanenko@gmail.com>\n"
+"Сергій Панасенко <nitay@users.sourceforge.net>"
 
-#: ../src/empathy-accounts-dialog.c:394
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: ../src/empathy-accounts-dialog.c:404
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Облікові записи"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:867
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "Новий обліковий запис %s"
 
-#: ../src/empathy-accounts-dialog.c:977
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
 "Are you sure you want to proceed?"
-msgstr "Ви видаляєте свій обліковий запис «%s»! Продовжити?"
+msgstr "Ви знищуете свій обліковий запис «%s»! Продовжити?"
 
-#: ../src/empathy-accounts-dialog.c:983
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you decide to proceed.\n"
+"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."
+"Should you decide to add the account back at a later time, they will still "
+"be available."
 msgstr ""
-"Будь-які пов'язані бесіди та кімнати НЕ БУДУТЬ видалені, якщо ви продовжите.\n"
-"Якщо ви вирішите відновити цей обліковий запис пізніше, вони знову стануть доступні."
-
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Новий обліковий рахунок</b>"
+"Будь-які пов'язані бесіди та кімнати НЕ БУДУТЬ знищені, якщо ви продовжите.\n"
+"Якщо ви вирішите відновити цей обліковий запис пізніше, вони знову стануть "
+"доступні."
 
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>Немає встановлених протоколів</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "Додати обліковий запис"
 
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Параметри</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "_Створити"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "В мене вже є обліковий запис"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
-msgstr "Імпор облікових записів..."
+msgstr "Імпорт облікових записів..."
+
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Немає встановлених протоколів"
 
-#: ../src/empathy-accounts-dialog.glade.h:8
-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:7
+msgid "Settings"
+msgstr "Налаштування"
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:8
+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 "Тип:"
 
-#: ../src/empathy-call-window.c:142
-msgid "Closed"
-msgstr "Закрито"
-
-#: ../src/empathy-call-window.c:254
-msgid "End this call?"
-msgstr "Завершити виклик?"
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "_Додати ..."
 
-#: ../src/empathy-call-window.c:256
-msgid "Closing this window will end the call in progress."
-msgstr "Закриття вікна призведе до закінчення виклику."
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "_Створити новий обліковий запис"
 
-#: ../src/empathy-call-window.c:257
-msgid "_End Call"
-msgstr "_Закінчити виклик"
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "_Показати та редагувати облікові записи"
 
-#: ../src/empathy-call-window.c:311
-msgid "Incoming call"
-msgstr "Вхідний виклик"
+#: ../src/empathy-call-window.c:426
+msgid "Contrast"
+msgstr "Контраст"
 
-#: ../src/empathy-call-window.c:313
-#, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s викликає вас, хочете відповісти?"
+#: ../src/empathy-call-window.c:429
+msgid "Brightness"
+msgstr "Яскравість"
 
-#: ../src/empathy-call-window.c:319
-msgid "_Reject"
-msgstr "Від_хилити"
+#: ../src/empathy-call-window.c:432
+msgid "Gamma"
+msgstr "Гамма"
 
-#: ../src/empathy-call-window.c:324
-msgid "_Answer"
-msgstr "_Відповісти"
+#: ../src/empathy-call-window.c:539
+msgid "Volume"
+msgstr "Гучність"
 
-#: ../src/empathy-call-window.c:379
-msgid "Empathy Call"
-msgstr "Виклик Empathy"
+#: ../src/empathy-call-window.c:671
+msgid "Connecting..."
+msgstr "З'єднання..."
 
-#. To translators: Readying is the first state of the call, it is
-#. * preparing the connection and it does not yet ring.
-#: ../src/empathy-call-window.c:382
-msgid "Readying"
-msgstr "Підготовка"
+#: ../src/empathy-call-window.c:778
+msgid "_Sidebar"
+msgstr "_Контур"
 
-#: ../src/empathy-call-window.c:391
-#, c-format
-msgid "%s - Empathy Call"
-msgstr "%s - виклик Empathy"
+#: ../src/empathy-call-window.c:797
+msgid "Dialpad"
+msgstr "Табло набору номеру"
 
-#: ../src/empathy-call-window.c:395
-msgid "Ringing"
-msgstr "Дзвонимо"
+#: ../src/empathy-call-window.c:803
+msgid "Audio input"
+msgstr "Звуковий вхід"
 
-#: ../src/empathy-call-window.c:408
-msgid "Connecting"
-msgstr "З'єднання"
+#: ../src/empathy-call-window.c:807
+msgid "Video input"
+msgstr "Відеовхід"
 
-#: ../src/empathy-call-window.c:524
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
 #, c-format
-msgid "Incoming call from %s rejected because there is already a running call."
-msgstr "Виклик відхилено %s, тому що вже запущено інший виклик."
-
-#: ../src/empathy-call-window.glade.h:1
-msgid "#"
-msgstr "#"
-
-#: ../src/empathy-call-window.glade.h:2
-msgid "*"
-msgstr "*"
-
-#: ../src/empathy-call-window.glade.h:3
-msgid "0"
-msgstr "0"
-
-#: ../src/empathy-call-window.glade.h:4
-msgid "1"
-msgstr "1"
+msgid "Call with %s"
+msgstr "Дзвонити з %s"
 
-#: ../src/empathy-call-window.glade.h:5
-msgid "2"
-msgstr "2"
-
-#: ../src/empathy-call-window.glade.h:6
-msgid "3"
-msgstr "3"
-
-#: ../src/empathy-call-window.glade.h:7
-msgid "4"
-msgstr "4"
-
-#: ../src/empathy-call-window.glade.h:8
-msgid "5"
-msgstr "5"
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
+msgid "Call"
+msgstr "_Виклик"
 
-#: ../src/empathy-call-window.glade.h:9
-msgid "6"
-msgstr "6"
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1390
+#, c-format
+msgid "Connected — %d:%02dm"
+msgstr "Підключений — %d:%02d мин"
 
-#: ../src/empathy-call-window.glade.h:10
-msgid "7"
-msgstr "7"
+#: ../src/empathy-call-window.ui.h:1
+msgid "Hang up"
+msgstr "Розірвати зв'язок"
 
-#: ../src/empathy-call-window.glade.h:11
-msgid "8"
-msgstr "8"
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "Повторно набрати номер"
 
-#: ../src/empathy-call-window.glade.h:12
-msgid "9"
-msgstr "9"
+#: ../src/empathy-call-window.ui.h:3
+msgid "Send Audio"
+msgstr "Надіслати звук"
 
-#. To translators: The keypad is numbers [0-9], asterisk (*) and hash (#). Presented like on any phone
-#: ../src/empathy-call-window.glade.h:14
-msgid "<b>Keypad</b>"
-msgstr "<b>Розкладка</b>"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Send video"
+msgstr "Надіслати відео"
 
-#: ../src/empathy-call-window.glade.h:15
-msgid "<b>Volume</b>"
-msgstr "<b>Гучність</b>"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Video preview"
+msgstr "Перегляд власного відео"
 
-#: ../src/empathy-call-window.glade.h:16
-msgid "Hang Up"
-msgstr "Розірвати зв'язок"
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "_Виклик"
 
-#: ../src/empathy-call-window.glade.h:17
-msgid "Send Video"
-msgstr "Надіслати відео"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+msgid "_View"
+msgstr "_Перегляд"
 
-#: ../src/empathy-chat-window.c:326
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Бесіди (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "Тема:"
-
-#: ../src/empathy-chat-window.c:421
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "Набирає повідомлення."
 
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "О_чистити"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
 msgid "Chat"
 msgstr "Розмова"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Вставити _посмішку"
 
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "Повідомлення _запрошення:"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "Запросити"
-
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
 msgstr "Перемістити закладку _ліворуч"
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
 msgstr "Перемістити закладку _праворуч"
 
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "Виберіть кого запросити:"
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "Вас запросили прийняти участь у конференції."
-
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
 msgid "_Contact"
 msgstr "_Співрозмовники"
 
-#: ../src/empathy-chat-window.glade.h:11
-#: ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "_Зміст"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
 msgid "_Conversation"
 msgstr "_Бесіда"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
 msgstr "_Відокремити закладку"
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Favorite Chatroom"
 msgstr "_Улюблена кімната"
 
-#: ../src/empathy-chat-window.glade.h:16
-#: ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
 msgstr "_Наступна закладка"
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Previous Tab"
 msgstr "_Попередня закладка"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "Показати _список співрозмовників"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
 msgstr "_Закладки"
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "Ім'я:"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "Кімната"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "Автоматичне з'єднання"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Редагувати кімнату"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Входити під час _запуску"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "Входити до цієї кімнати після запуску Empathy та встановлення з'єднання."
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
-msgstr "Керування переговорними кімнатами"
+msgstr "Керування улюбленими кімнатами"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "_Назва:"
+#: ../src/empathy-event-manager.c:321
+msgid "Incoming call"
+msgstr "Вхідний виклик"
 
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "_Сервер:"
+#: ../src/empathy-event-manager.c:324
+#, c-format
+msgid "%s is calling you, do you want to answer?"
+msgstr "%s викликає вас, хочете відповісти?"
 
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_Кімната:"
+#: ../src/empathy-event-manager.c:331
+msgid "_Reject"
+msgstr "Від_хилити"
 
-#: ../src/empathy-event-manager.c:166
-#, c-format
-msgid ""
-"New message from %s:\n"
-"%s"
-msgstr ""
-"Нове повідомлення від %s:\n"
-"%s"
+#: ../src/empathy-event-manager.c:337
+msgid "_Answer"
+msgstr "_Відповісти"
 
-#: ../src/empathy-event-manager.c:205
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Вхідний виклик від %s"
 
-#: ../src/empathy-event-manager.c:238
+#: ../src/empathy-event-manager.c:496
 #, c-format
-msgid "%s is offering you an invitation, but you don't have the needed external application to handle it."
-msgstr "%s прислав запрошення, але у вас відсутня програма, щоб його обробити."
+msgid "%s is offering you an invitation"
+msgstr "%s прислав Вам запрошення"
+
+#: ../src/empathy-event-manager.c:502
+msgid "An external application will be started to handle it."
+msgstr "Щоб його прийняти буде запущено зовнішню програму."
+
+#: ../src/empathy-event-manager.c:507
+msgid "You don't have the needed external application to handle it."
+msgstr "У Вас відсутня програма, щоб його обробити."
 
-#: ../src/empathy-event-manager.c:263
-msgid "Invitation Error"
-msgstr "Помилка при запрошенні"
+#: ../src/empathy-event-manager.c:634
+msgid "Room invitation"
+msgstr "Кімната запрошення"
 
-#: ../src/empathy-event-manager.c:289
+#: ../src/empathy-event-manager.c:637
 #, c-format
-msgid "%s is offering you an invitation. An external application will be started to handle it."
-msgstr "%s прислав запрошення. Щоб його прийняти буде запущено зовнішню програму."
+msgid "%s is inviting you to join %s"
+msgstr "%s запрошує Вас ввійти у %s"
 
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:645
+msgid "_Decline"
+msgstr "Від_хилити"
+
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "_Join"
+msgstr "_Увійти"
+
+#: ../src/empathy-event-manager.c:689
+#, c-format
+msgid "%s invited you to join %s"
+msgstr "%s запросив Вас ввійти у %s"
+
+#: ../src/empathy-event-manager.c:715
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr "Вхідний передача файлу від %s"
+
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
-msgstr "Запит на приєднання від %s"
+msgstr "Запит на підписку від %s"
 
-#: ../src/empathy-event-manager.c:348
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1473,266 +1996,830 @@ msgstr ""
 "\n"
 "Повідомлення: %s"
 
-#: ../src/empathy-main-window.c:466
-msgid "Show and edit accounts"
-msgstr "_Показати та редагувати облікові записи"
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s не у мережі."
 
-#: ../src/empathy-main-window.c:838
-msgid "Contact"
-msgstr "Контакт"
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, 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
+#, 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
+#, c-format
+msgid "%02u.%02u"
+msgstr "%02u.%02u"
+
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Невідомо"
+
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s з %s у %s/с"
+
+#: ../src/empathy-ft-manager.c:276
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Помилка приймання \"%s\" від %s"
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "Помилка прийому файлу"
+
+#: ../src/empathy-ft-manager.c:348
+#, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "Помилка відправлення \"%s\" до %s"
+
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "Помилка відправлення файлу"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
+#, c-format
+msgid "\"%s\" received from %s"
+msgstr "\"%s\" надійшов від %s"
 
-#: ../src/empathy-main-window.c:1040
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
+#, c-format
+msgid "\"%s\" sent to %s"
+msgstr "\"%s\" надіслано до %s"
+
+#: ../src/empathy-ft-manager.c:498
+msgid "File transfer completed"
+msgstr "Передачу файлу завершено"
+
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "Почекати, поки інший учасник відповість"
+
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr "Перевірка цілісності \"%s\""
+
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#, c-format
+msgid "Hashing \"%s\""
+msgstr "Хешування \"%s\""
+
+#: ../src/empathy-ft-manager.c:1024
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1036
+msgid "File"
+msgstr "Файл"
+
+#: ../src/empathy-ft-manager.c:1058
+msgid "Remaining"
+msgstr "Лишаємось"
+
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "Передача файлів"
+
+#: ../src/empathy-ft-manager.ui.h:2
+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 "Імпорт:"
+
+#: ../src/empathy-import-dialog.c:272
+msgid "Protocol"
+msgstr "Протокол:"
+
+#: ../src/empathy-import-dialog.c:298
+msgid "Source"
+msgstr "Джерело"
+
+#: ../src/empathy-import-dialog.c:392
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Не знайдено облікових записів для імпорту. Empathy на цей час підтримує "
+"імпорт контактів лише з Pidgin."
+
+#: ../src/empathy-import-dialog.ui.h:1
+msgid "Import Accounts"
+msgstr "Імпорт облікових записів"
+
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "Редагування облікового _запису"
 
-#: ../src/empathy-main-window.c:1123
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "Помилку не вказано"
 
-#: ../src/empathy-main-window.c:1126
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "Помилка мережі"
 
-#: ../src/empathy-main-window.c:1129
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "Аутентифікація завершилась невдало"
 
-#: ../src/empathy-main-window.c:1132
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "Помилка шифрування"
 
-#: ../src/empathy-main-window.c:1135
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
-msgstr "Назва вже використовується"
+msgstr "Ім'я вже використовується"
 
-#: ../src/empathy-main-window.c:1138
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "Сертифікат недоступний"
 
-#: ../src/empathy-main-window.c:1141
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "Сертифікат не має довіри"
 
-#: ../src/empathy-main-window.c:1144
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "Сертифіката застарів"
 
-#: ../src/empathy-main-window.c:1147
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "Сертифікат не активовано"
 
-#: ../src/empathy-main-window.c:1150
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "Сертифікат з помилкою  у назві вузла"
 
-#: ../src/empathy-main-window.c:1153
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "Відбитки сертифікатів не збігаються"
 
-#: ../src/empathy-main-window.c:1156
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "Самопідписаний сертифікат"
 
-#: ../src/empathy-main-window.c:1159
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "Помилка сертифікату"
 
-#: ../src/empathy-main-window.c:1162
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.c:1293
+msgid "Show and edit accounts"
+msgstr "Показати та редагувати облікові записи"
+
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
-msgstr "Список контактів"
+msgstr "Список співрозмовників"
+
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "Співрозмовники на _карті"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "Зміст"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "Підключити _близьких"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Приєднатися _до..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "Налаштувати _близьких"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "_Показувати відсутніх"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "З_вичайний розмір"
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr "Звичайний розмір _аватарів"
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "Сортувати за _іменем"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "Впорядкувати за с_татусом"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "_Облікові записи"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "_Додати контакт..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "_Компактний розмір"
 
-#: ../src/empathy-main-window.glade.h:13
-#: ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "_Налагодження"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "Передача _файлів"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "Приєднатися _до..."
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "_Нова розмова..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "_Показувати відсутніх"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "_Особиста інформація"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "Переглянути _попередні бесіди"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "_Кімната"
 
-#: ../src/empathy-new-chatroom-dialog.c:290
-msgid "Chat Rooms"
-msgstr "Кімнати"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
+msgstr "Кімната спілкування"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Огляд:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "Члени"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
-msgid "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "Введіть назву бесіди, до якої хочете приєднатися, або виберіть одну (або пізніше) у списку."
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"Обов'язкова вимога: %s\n"
+"Потрібен пароль: %s\n"
+"Члени: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "Так"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "Ні"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "Не можу почати лістинг кімнати"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "Не можу зупинити лістинг кімнати"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+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 ""
+"Введіть назву бесіди, до якої хочете приєднатися, або виберіть одну або "
+"декілька кімнат зі списку."
 
-#: ../src/empathy-new-chatroom-dialog.glade.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: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.glade.h:5
-msgid "Join"
-msgstr "Увійти"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "Увійти у кімнату"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Приєднатися до..."
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "Список бесід"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "_Оновити"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "_Кімната:"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid "This list represents all chat rooms hosted on the server you have entered."
-msgstr "У списку показано всі бесіди сервера"
+#: ../src/empathy-preferences.c:148
+msgid "Message received"
+msgstr "Надійшло повідомлення"
 
-#: ../src/empathy-preferences.c:264
-msgid "Language"
-msgstr "Мова"
+#: ../src/empathy-preferences.c:149
+msgid "Message sent"
+msgstr "Повідомлення надіслано"
+
+#: ../src/empathy-preferences.c:150
+msgid "New conversation"
+msgstr "Нова бесіда"
+
+#: ../src/empathy-preferences.c:151
+msgid "Contact goes online"
+msgstr "Співрозмовник входить у мережу"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Вигляд</b>"
+#: ../src/empathy-preferences.c:152
+msgid "Contact goes offline"
+msgstr "Співрозмовник виходить з мережі"
 
-#. To translators: Audio notifications preferences
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>Звук</b>"
+#: ../src/empathy-preferences.c:153
+msgid "Account connected"
+msgstr "Обліковий запис підключено"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Behaviour</b>"
-msgstr "<b>Поведінка</b>"
+#: ../src/empathy-preferences.c:154
+msgid "Account disconnected"
+msgstr "Обліковий запис відключено"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Contact List</b>"
-msgstr "<b>Список контактів</b>"
+#: ../src/empathy-preferences.c:394
+msgid "Language"
+msgstr "Мова"
 
-#: ../src/empathy-preferences.glade.h:6
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Увімкнути перевірку орфографії для мов:</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "Дозволити використання _GPS"
 
-#. To translators: Visual notifications preferences, like notify bubbles, etc.
-#: ../src/empathy-preferences.glade.h:8
-msgid "<b>Visual</b>"
-msgstr "<b>Вигляд</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "Дозволити використання _мобільного телефону"
 
-#: ../src/empathy-preferences.glade.h:9
-msgid "<small>The list of languages reflects only the languages for which you have a dictionary installed.</small>"
-msgstr "<small>У цьому списку показані лише мови, для яких встановлені словники.</small>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "Дозволити використання _мережі"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "Вигляд"
+
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "Автоматично _з'єднуватися під час запуску"
 
-#: ../src/empathy-preferences.glade.h:11
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "Аватари - вибрані користувачем зображення, що показані у списку контактів"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "Поведінка"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "Тема оф_ормлення бесіди:"
 
-#: ../src/empathy-preferences.glade.h:13
-msgid "Display notifications when contacts come _online"
-msgstr "Показувати сповіщення при підключ_енні співрозмовників"
+#: ../src/empathy-preferences.ui.h:8
+msgid "Disable notifications when _away or busy"
+msgstr "Вимкнути сповіщення у стані «_відійшов». або «зайнятий»"
+
+#: ../src/empathy-preferences.ui.h:9
+msgid "Disable sounds when _away or busy"
+msgstr "Вимкнути звуки у стані «_відійшов». або «зайнятий»"
 
-#: ../src/empathy-preferences.glade.h:14
-msgid "Enable sounds when _away"
-msgstr "Увімкнути звуки у стані «_відійшов»"
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "Показувати сповіщення коли контакт входить в мережу"
 
-#: ../src/empathy-preferences.glade.h:15
-msgid "Enable sounds when _busy"
-msgstr "Увімкнути звуки у стані «_зайнятий»"
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "Показувати сповіщення коли контакт залишає мережу"
 
-#: ../src/empathy-preferences.glade.h:16
+#: ../src/empathy-preferences.ui.h:12
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Показувати сповіщення коли вікно _чату не активне"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "Увімкнути перевірку орфографії для мов:"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Загальні"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Налаштування Geoclue"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "Місцезнаходження"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Сповіщення"
 
-#: ../src/empathy-preferences.glade.h:18
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "Звукові сигнали при подіях"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../src/empathy-preferences.glade.h:19
-msgid "Show _avatars"
-msgstr "Показати _аватари"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "Приватність"
+
+#: ../src/empathy-preferences.ui.h:21
+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.glade.h:20
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Показувати графічні _посмішки"
 
-#: ../src/empathy-preferences.glade.h:21
-msgid "Show co_mpact contact list"
-msgstr "Показати _стиснений список контактів"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "Показати _список співрозмовників у кімнаті"
 
-#: ../src/empathy-preferences.glade.h:22
-msgid "Sort by _name"
-msgstr "Сортувати за _іменем"
-
-#: ../src/empathy-preferences.glade.h:23
-msgid "Sort by s_tate"
-msgstr "Впорядкувати за с_татусом"
+#: ../src/empathy-preferences.ui.h:24
+msgid "Sounds"
+msgstr "Звуки"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Перевірка орфографії"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"<small>У цьому списку показані лише мови, для яких встановлені словники.</"
+"small>"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "Теми"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:28
+msgid "_Enable bubble notifications"
+msgstr "_Ввімкнути спливаючі сповіщення"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Enable sound notifications"
+msgstr "_Ввімкнути звукові сповіщення"
+
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "_Відкривати нові бесіди у окремому вікні"
 
-#: ../src/empathy-preferences.glade.h:27
-msgid "_Play sound when messages arrive"
-msgstr "_Відтворити звук при отриманні повідомлення"
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "_Публікувати місцезнаходження моїм співрозмовникам"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "По_низити точність визначення місцезнаходження"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "Стан"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "Ви_йти"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "Показати _список контактів"
+#: ../src/empathy-tube-dispatch.c:375
+#, c-format
+msgid "Unable to start application for service %s: %s"
+msgstr "Не можу стартувати програму для служби %s: %s"
+
+#: ../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"
+msgstr "%s прислав запрошення, але у вас відсутня програма, щоб його обробити."
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "Карта співрозмовників"
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "Помилка"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "Критична"
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "Попередження"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "Повідомлення"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "Інформація"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "Відлагодження"
+
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "Зберегти"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "Вікно відлагодження"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "Пауза"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "Рівень"
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "Час"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "Домен"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "Категорія"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "Рівень"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"Обраний менеджер з'єднань не підтримує розширення віддаленого відлагодження "
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Обмін повідомленнями Empathy"
+
+#~ msgid "Adium"
+#~ msgstr "Адіум"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr " — Empathy обмін миттєвими повідомленнями"
+
+#~| msgid ""
+#~| "New message from %s:\n"
+#~| "%s"
+#~ msgid "New message from %s"
+#~ msgstr "Нове повідомлення від %s"
+
+#~ msgid "Adium theme to use:"
+#~ msgstr "Тема Адиум використовується:"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr ""
+#~ "Аватари - вибрані користувачем зображення, що показані у списку контактів"
+
+#~ msgid "Not a valid adium theme"
+#~ msgstr "Не дійсна тема Адіум"
+
+#~ msgid "Show _avatars"
+#~ msgstr "Показати _аватари"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "Показати _стиснений список контактів"
+
+#~ msgid "Enable popup when contact is available"
+#~ msgstr "Показувати контекстне вікно, коли співрозмовник доступний"
+
+#~ msgid "Enable sound when busy"
+#~ msgstr "Увімкнути звуки у стані «зайнятий»"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Забути пароль та очистити рядок."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Мережа</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Сервери</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Редагувати обрану мережу IRC"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Видалити обрану мережу IRC"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "Пе_ревірити написання слова..."
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>Тема:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "Розмова"
+
+#~ msgid "Contact Information"
+#~ msgstr "Інформація про співрозмовника"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Я хотів би додати Вас у свій список контактів."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Вибачте, я не хочу додавати вас до свого списку."
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Групи</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "Інформація про співрозмовника"
+
+#~ msgid "Word"
+#~ msgstr "Слово"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Пропозиція, щодо заміни"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Перевірка орфографії"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Запропонувати слово:"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Новий обліковий рахунок</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "В мене вже є обліковий запис"
+
+#~ msgid "Closed"
+#~ msgstr "Закрито"
+
+#~ msgid "End this call?"
+#~ msgstr "Завершити виклик?"
+
+#~ msgid "Closing this window will end the call in progress."
+#~ msgstr "Закриття вікна призведе до закінчення виклику."
+
+#~ msgid "Readying"
+#~ msgstr "Підготовка"
+
+#~ msgid ""
+#~ "Incoming call from %s rejected because there is already a running call."
+#~ msgstr "Виклик відхилено %s, тому що вже запущено інший виклик."
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "2"
+#~ msgstr "2"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "<b>Keypad</b>"
+#~ msgstr "<b>Розкладка</b>"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "Повідомлення _запрошення:"
+
+#~ msgid "Invite"
+#~ msgstr "Запросити"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "Виберіть кого запросити:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Вас запросили прийняти участь у конференції."
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Редагувати кімнату"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "Входити під час _запуску"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr ""
+#~ "Входити до цієї кімнати після запуску Empathy та встановлення з'єднання."
+
+#~ msgid "N_ame:"
+#~ msgstr "_Назва:"
+
+#~ msgid "S_erver:"
+#~ msgstr "_Сервер:"
+
+#~ msgid "Invitation Error"
+#~ msgstr "Помилка при запрошенні"
+
+#~ msgid "Browse:"
+#~ msgstr "Огляд:"
+
+#~ msgid "Join New"
+#~ msgstr "Приєднатися до..."
+
+#~ msgid "Re_fresh"
+#~ msgstr "_Оновити"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr "У списку показано всі бесіди сервера"
+
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>Звук</b>"
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Список контактів</b>"
+
+#~ msgid "<b>Visual</b>"
+#~ msgstr "<b>Вигляд</b>"
 
+#~ msgid "Enable sounds when _busy"
+#~ msgstr "Увімкнути звуки у стані «_зайнятий»"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 293b5a3d0..0730c8f71 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,25 +2,29 @@
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Abel Cheung <abel@oaka.org>, 2003, 2004.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
+# Tryneeds translation team, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.25.92\n"
+"Project-Id-Version: empathy 2.27.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 21:30+0800\n"
-"PO-Revision-Date: 2009-02-17 21:30+0800\n"
+"POT-Creation-Date: 2009-08-02 16:10+0800\n"
+"PO-Revision-Date: 2009-08-02 16:10+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Empathy 即時通訊程式"
+msgid "Empathy IM Client"
+msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+#, fuzzy
+#| msgid "Send and receive instant messages"
+msgid "Send and receive messages"
 msgstr "傳送與接收即時訊息"
 
 #: ../data/empathy.schemas.in.h:1
@@ -63,963 +67,1296 @@ msgid "Disable sounds when away"
 msgstr "當狀態為離開時停用音效"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "Empathy 可以發佈使用者的位置"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy 可以利用 GPS 來推測位置"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy 可以利用手機網絡基地台來推測位置"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy 可以利用網絡來推測位置"
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Empathy 預設下載資料夾"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy 已詢問匯入帳號"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 啟動時自動連線"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy 應降低位置的準確度"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 要使用聯絡人的大頭貼做為聊天視窗圖示"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "啟用新訊息的彈出式通知"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "啟用拼字檢查程式"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "隱藏主視窗"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "隱藏主視窗。"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "應該使用 NetworkManager"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "網名補齊字符"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "要使用的 adium 佈景主題路徑"
+
+#: ../data/empathy.schemas.in.h:28
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "如果聊天室使用的主題是 adium 時要使用的 adium 佈景主題路徑。"
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "收到訊息時播放音效"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "送出訊息時播放音效"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "當聯絡人登入時播放音效"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "當有聯絡人登出時播放音效"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "如果聊天視窗失去焦點則彈出通知"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "當聯絡人登入時彈出通知"
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "當聯絡人登出時彈出通知"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "已建立 Salut 帳號"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "在聊天室顯示聯絡人清單"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示提示"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "顯示離線聯絡人"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "拼字檢查語言"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次選擇大頭貼圖片的目錄。"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在聊天視窗的談話中的佈景主題。"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "使用圖片式表情符號"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "在聊天室使用佈景主題"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "Empathy 是否要將使用者的位置發佈給他的聯絡人。"
+
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Empathy 是否使用 GPS 來推測位置。"
+
+#: ../data/empathy.schemas.in.h:54
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr "Empathy 是否使用流動電話網絡來推測位置。"
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "Empathy 是否使用網絡來推測位置。"
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Empathy 是否應詢問你要不要從其他程式匯入帳號。"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Empathy 是否應在啟動時自動登入你的帳號。"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "Empathy 是否基於私隱權的理由減低位置的準確度。"
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "Empathy 是否使用聯絡人大頭貼做為聊天視窗圖示。"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "是否在 Empathy 第一次執行時建立 Salut 帳號。"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
 msgstr "在斷線/重新連線時是否自動使用網絡管理程式。"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "是否以你設定的語言檢查輸入有無錯字。"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "在談話中是否將表情符號轉換為圖片形式。"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "是否播放音效來通知有聯絡人登入網絡。"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "是否播放音效來通知有聯絡人登出網絡。"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "是否播放音效來通知有事件發生。"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "是否播放音效來通知有訊息抵達。"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "是否播放音效來通知開啟新的談話。"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "是否播放音效來通知有訊息送出。"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "當登入網絡時是否播放音效。"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "當登出網絡時是否播放音效。"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否播放音效通知。"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+msgid ""
+"Whether or not 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."
+msgstr "當聯絡人上線時是否顯示彈出式通知。"
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not 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:57
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "當收到新訊息時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "是否在聯絡人清單與聊天視窗顯示聯絡人大頭貼。"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "是否在聯絡人清單中顯示離線的聯絡人。"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
+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."
 msgstr "使用標題列的「x」按鈕關閉主視窗時是否顯示訊息。"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "是否以精簡模式顯示聯絡人清單。"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "是否在聊天室使用佈景主題。"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 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."
 msgstr "排序聯絡人清單時要使用哪個條件。預設值是使用聯絡人的名稱「name」數值來排序。而數值「state」則會使用其狀態來排序聯絡人清單。"
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "已接收檔案的雜湊值與送出的不符"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "遠端聯絡人不支援檔案傳輸"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "選取的檔案不是正規的檔案"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "選取的檔案是空白的"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "臨近人員"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "Socket 類型不支援"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "沒有指定原因"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "已要求更改狀態"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "你已取消檔案傳輸"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "其他的參與者取消了檔案傳輸"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "嘗試傳輸檔案時發生錯誤"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "其他的參與者無法傳輸該檔案"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "不明的原因"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "隱藏"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d 秒前"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d 分鐘以前"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d 小時以前"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天以前"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d 週前"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d 個月以前"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "未來"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "全部"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>進階</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "清除密碼及這個項目。"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+msgid "Advanced"
+msgstr "進階"
+
+#: ../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
 msgid "Pass_word:"
 msgstr "密碼(_W):"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "螢幕名稱(_N):"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../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
 msgid "_Port:"
 msgstr "連接埠(_P):"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "登入 I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "編碼(_C):"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "新網絡"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>網絡</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>伺服器</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "編碼:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "建立一個新的 IRC 網絡"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "編輯選取的 IRC 網絡"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "網絡"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "網絡:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "稱呼："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "離開訊息:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "真實姓名:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "移除選取的 IRC 網絡"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "伺服器"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>覆蓋伺服器設定值</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "覆蓋伺服器設定值"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "優先權(_O):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "資源(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "使用舊的 SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "要求加密[TLS/SSL](_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "忽略 SSL 證書錯誤(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "電子郵件(_E):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "名字(_F):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "姓氏(_L):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "網名(_N):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "發佈的名稱(_P):"
 
 #. 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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "探索 STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN 伺服器:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN 通訊埠:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "使用者名稱(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "使用 _Yahoo 日本"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "忽略會議與聊天室邀請(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "聊天室清單地區(_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "無法轉換圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../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:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "選擇你的大頭貼圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "沒有圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "所有檔案"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "請按這裏放大"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "無法重連這個聊天會議"
+
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
+msgstr "不支援此指令"
+
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "無效的聯絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "權限被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "太長的訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "不明"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳送訊息「%s」時發生錯誤；%s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
+msgstr "(沒有建議)"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "插入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "檢查拼字(_C)..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s 已經加入此聊天室"
+msgid "%s has disconnected"
+msgstr "%s 已斷線"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s 被 %s 踢出去了"
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "%s 被踢出去了"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s 被 %s設為黑名單"
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "%s 被設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. 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:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s 已經加入此聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "成功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "談話"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>主題:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "羣組聊天"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "主題:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "複製連結位址(_C)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "開啟連結(_O)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "個人資料"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "編輯聯絡人資訊"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "聯絡人資訊"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "我想要將你加入我的聯絡人清單。"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "個人資料"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "新增聯絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "稍後再決定"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "訂閱要求"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1404
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是否想要移除羣組「%s」？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1406
 msgid "Removing group"
 msgstr "正在移除羣組"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1453
+#: ../libempathy-gtk/empathy-contact-list-view.c:1530
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1483
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是否想要移除聯絡人「%s」？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1485
 msgid "Removing contact"
 msgstr "正在移除聯絡人"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-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:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "通話(_C)"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "語音通話(_A)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "視像通話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "檢視前一次談話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "傳送檔案"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "資訊(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "邀請到這個聊天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "邀請到這個聊天室(_I)"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "選擇聯絡人"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:996
 msgid "Select"
 msgstr "選擇"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1005
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "羣組"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>客戶端資訊</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
+msgid "Country ISO Code:"
+msgstr "國家 ISO 碼："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "Country:"
+msgstr "國家："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "State:"
+msgstr "州："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>聯絡人詳細資料</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "City:"
+msgstr "市："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>聯絡人</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Area:"
+msgstr "區域："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>羣組</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Postal Code:"
+msgstr "郵遞區號："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Street:"
+msgstr "街："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Building:"
+msgstr "建築："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Floor:"
+msgstr "樓層："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Room:"
+msgstr "室："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Text:"
+msgstr "文字："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Description:"
+msgstr "描述："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "URI:"
+msgstr "URI："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Accuracy Level:"
+msgstr "準確度等級："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Error:"
+msgstr "錯誤："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Vertical Error (meters):"
+msgstr "垂直誤差（米）："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Horizontal Error (meters):"
+msgstr "水平誤差（米）："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Speed:"
+msgstr "速度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#, fuzzy
+msgid "Bearing:"
+msgstr "版本:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Climb Speed:"
+msgstr "爬升速度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Last Updated on:"
+msgstr "上次更新於："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Longitude:"
+msgstr "經度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Latitude:"
+msgstr "緯度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Altitude:"
+msgstr "緯度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1349
+msgid "<b>Location</b>"
+msgstr "<b>位置</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1362
+msgid "<b>Location</b>, "
+msgstr "<b>位置<b>，"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1412
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y 於 %R UTC"
+
+#: ../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 "帳號："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "別名:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "生日:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "客戶端資訊"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "客戶端:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "聯絡人資訊"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "聯絡人"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "聯絡人詳細資料"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "電子郵件:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "全名:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "羣組"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "識別器:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "要求資訊..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 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-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "版本:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "網站:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "加入羣組(_G)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "新增伺服器"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "伺服器"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "連接埠"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:277
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "帳號"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "日期"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "談話"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "上一次談話"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "搜尋"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "搜尋(_F):"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "通話(_A)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "聯絡人 ID:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "新增談話"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
+#. 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 "自選訊息..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "自選訊息"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "訊息:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "儲存訊息"
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "編輯自選訊息..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "狀態:"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "按這裏將這個狀態從喜好中移除"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "字"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "按這裏將這個狀態設為喜好"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "對這個字的建議"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "設定狀態"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "拼字檢查"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "對這個字的建議："
-
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "古典"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "設定你的上線與目前的狀態"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "簡易"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "清除"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "藍色"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "無法開啓 URI"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "選擇一個檔案"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "自選訊息..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "收到即時訊息"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "傳送即時訊息"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "收到聊天要求"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "聯絡人已連線"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "聯絡人已斷線"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "連接到伺服器"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "與伺服器斷線"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "收到語音通話"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "播出語音通話"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.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
+msgid "Edit Custom Messages"
+msgstr "編輯自選訊息"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "加入新的預先設定(_N)"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "已儲存的預先設定"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "古典"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "簡易"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "清除"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "藍色"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "無法開啓 URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "選擇一個檔案"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a destination"
+msgstr "選取目的地"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "目前的地區設定"
@@ -1204,7 +1541,7 @@ msgid "Megaphone"
 msgstr "話筒"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "講話！"
 
@@ -1218,15 +1555,15 @@ msgid "_Information"
 msgstr "資訊(_I)"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "請設定聯絡人。"
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "選擇聯絡人..."
 
@@ -1239,23 +1576,25 @@ msgstr "上線狀態"
 msgid "Set your own presence"
 msgstr "設定你自己的上線狀態"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "啟動時不顯示聯絡人清單"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "顯示帳號對話盒"
 
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:587
+#, fuzzy
+#| msgid "- Empathy Instant Messenger"
+msgid "- Empathy IM Client"
 msgstr "- Empathy 即時通訊程式"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1263,7 +1602,7 @@ msgid ""
 "version."
 msgstr "Empathy 是自由軟件，你可以遵照自由軟件基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈這一程式，或者自由選擇使用任何更新的版本。"
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1271,18 +1610,18 @@ msgid ""
 "details."
 msgstr "發佈 Empathy 的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的擔保。更詳細的情況請參閱 GNU 通用公共許可證。"
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "你應該已經和 Empathy 一起收到一份 GNU 通用公共許可證的副本；如果還沒有，寫信給： Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME 的即時訊息客戶端程式"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -1293,22 +1632,21 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "帳號"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "新增 %s 帳號"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1317,7 +1655,7 @@ msgstr ""
 "你即將移除你的 %s 帳號！\n"
 "確定要繼續？"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1329,301 +1667,299 @@ msgstr ""
 "\n"
 "當你往後決定要將該帳號重新加入時，上述資源將仍然可以取用。"
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>新增帳號</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "加入帳號"
 
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>尚未安裝通訊協定</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>設定值</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "建立(_E)"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "我已經有要使用的帳號"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "匯入帳號..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "尚未安裝通訊協定"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "設定值"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 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.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "類型:"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "加入(_A)..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "建立新的使用者帳號(_C)"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "重複使用既存的帳號(_R)"
+
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
 msgstr "對比"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "音量"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "連線中..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "側邊列(_S)"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "播號盤"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "音效輸入"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "視像輸入"
 
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "連線中..."
+#: ../src/empathy-call-window.c:835
+#, c-format
+msgid "Call with %s"
+msgstr "與 %s 通話中"
 
-#: ../src/empathy-call-window.c:572
+#: ../src/empathy-call-window.c:904
+msgid "Call"
+msgstr "通話"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1335
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "已連線 -- %d:%02dm"
+msgid "Connected — %d:%02dm"
+msgstr "已連線 — %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "掛斷"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "重撥"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "傳送音訊"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "傳送視像"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "視像預覽"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "通話(_C)"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "談話 (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "主題:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "正在輸入訊息。"
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
-#, c-format
-msgid "New message from %s"
-msgstr "來自 %s 的新訊息"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
+#, fuzzy
+#| msgid "Clean"
 msgid "C_lear"
-msgstr "清除(_L)"
+msgstr "清除"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
+#, fuzzy
+#| msgid "_Chat"
 msgid "Chat"
-msgstr "聊天"
+msgstr "聊天(_C)"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
+#, fuzzy
+#| msgid "Insert Smiley"
 msgid "Insert _Smiley"
-msgstr "插入表情符號(_S)"
-
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "邀請訊息(_M):"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "邀請"
+msgstr "插入表情符號"
 
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
-msgstr "將分頁左移(_L)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
-msgstr "將分頁右移(_R)"
-
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "選擇你要邀請誰："
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "你已經被邀請加入聊天會議。"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
+#, fuzzy
+#| msgid "Contact"
 msgid "_Contact"
-msgstr "聯絡人(_C)"
+msgstr "聯絡人"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
+#, fuzzy
+#| msgid "Conversation"
 msgid "_Conversation"
-msgstr "談話(_C)"
+msgstr "談話"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
-msgstr "轉為獨立視窗(_D)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
+#, fuzzy
+#| msgid "_Invite to chatroom"
 msgid "_Favorite Chatroom"
-msgstr "喜好的聊天室(_F)"
+msgstr "邀請到這個聊天室(_I)"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
-msgstr "下一個分頁(_N)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
+#, fuzzy
+#| msgid "_Previous Conversations"
 msgid "_Previous Tab"
-msgstr "上一個分頁(_P)"
+msgstr "上一次談話(_P)"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "顯示聯絡人清單(_S)"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
-msgstr "分頁(_T)"
+msgstr ""
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "聊天室"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "自動連線"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "編輯喜好的聊天室"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "啟動時加入聊天室(_U)"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "當 Empathy 啟動並連上網絡時加入這個聊天室"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "管理喜好的聊天室"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "名稱(_A):"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "伺服器(_E):"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "聊天室(_R):"
-
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-event-manager.c:375
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s 要與你通話，是否要接聽？"
 
-#: ../src/empathy-event-manager.c:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "接聽(_A)"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s 正在邀請你"
 
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "將啟動外部應用程式來處理它。"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "你沒有處理它所需的外部應用程式。"
 
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "聊天邀請"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請你加入 %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請你加入 %s"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "來自 %s 的訂閱要求"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1632,595 +1968,628 @@ msgstr ""
 "\n"
 "訊息：%s"
 
-#: ../src/empathy-ft-manager.c:113
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s 現在離線。"
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, 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
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-msgid "No reason was specified"
-msgstr "沒有指定原因"
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "已要求更改狀態"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "你已取消檔案傳輸"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "其他的參與者取消了檔案傳輸"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "Error while trying to transfer the file"
-msgstr "嘗試傳輸檔案時發生錯誤"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "不明"
 
-#: ../src/empathy-ft-manager.c:174
-msgid "The other participant is unable to transfer the file"
-msgstr "其他的參與者無法傳輸該檔案"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s / %s 於 %s/s"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "不明的原因"
+#: ../src/empathy-ft-manager.c:276
+#, 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:224
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正在接收 %2$s 送出的「%1$s」"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "正在傳送「%s」給 %s"
 
-#: ../src/empathy-ft-manager.c:237
-msgctxt "file size"
-msgid "Unknown"
-msgstr "不明"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "從 %2$s 接收「%1$s」時發生錯誤"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:245
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "接收檔案時發生錯誤"
+
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s / %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "傳送「%s」給 %s 時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:252
-msgid "Waiting the other participant's response"
-msgstr "正在等待其他參與者的回應"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "傳送檔案時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:262
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "「%s」接收自 %s"
 
-#: ../src/empathy-ft-manager.c:268
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "「%s」傳送給 %s"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "檔案傳輸完畢"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "「%s」正接收自 %s"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "正在等待其他參與者的回應"
 
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "「%s」正傳送給 %s"
+msgid "Checking integrity of \"%s\""
+msgstr "正在檢查檔案「%s」的完整性"
 
-#: ../src/empathy-ft-manager.c:289
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "檔案傳輸已取消：%s"
+msgid "Hashing \"%s\""
+msgstr "正在計算「%s」雜湊值"
 
-#: ../src/empathy-ft-manager.c:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "不明"
-
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "不明"
-
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "檔案"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "剩餘"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "無法將檔案儲存到這個位置"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "另存新檔..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "不明的大小"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr " %s 想要傳送給你一個檔案"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "是否要接收檔案「%s」(%s)？"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "接受(_A)"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 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:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "來源"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "找不到可匯入的帳號。Empathy 目前只支援從 Pidgin 匯入帳號。"
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "匯入帳號"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "編輯帳號(_E)"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "沒有指定的錯誤"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "網絡錯誤"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "使用中的名稱"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "沒有提供證書"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "證書不被信任"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "證書已逾期"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "證書尚未使用"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "證書主機名稱不符"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "證書指紋檔不符"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "證書為自我簽署"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "證書錯誤"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳號"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "聯絡人"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "編輯帳號(_E)"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "聯絡人清單"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "聯絡人地圖(_M)"
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "脈絡"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "加入喜好(_F)"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "加入新的(_N)..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "管理喜好"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "顯示離線聯絡人(_O)"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+#| msgid "Sort by _name"
+msgid "Sort by _Name"
+msgstr "根據名稱排序(_N)"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+#| msgid "Sort by s_tate"
+msgid "Sort by _Status"
+msgstr "根據狀態排序(_T)"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "新增聯絡人(_A)..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "偵錯(_D)"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "檔案傳輸(_F)"
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:19
+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.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "離線聯絡人(_O)"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "個人資料(_P)"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "上一次談話(_P)"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "聊天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
 msgstr "聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "瀏覽:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "成員"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no and a number."
+msgstr ""
+"<b>%s</b>\n"
+"需要邀請：%s\n"
+"需要密碼：%s\n"
+"成員：%s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "否"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "無法開始列出聊天室清單"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "無法停止列出聊天室清單"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+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 "在這裏輸入要加入的聊天室名稱或從清單中點選一或多個聊天室。"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../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.glade.h:5
-msgid "Join"
-msgstr "加入"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "加入聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "參加新的"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "聊天室清單"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "重新整理(_F)"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr "這個清單中呈現了你進入的伺服器上開設的所有聊天室。"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "聊天室(_R):"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "訊息已收到"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "訊息已送出"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "新增談話"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "聯絡人上線"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "聯絡人離線"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "帳號已連線"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "帳號已斷線"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "語言"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>外觀</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "允許使用 _GPS"
 
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>行為</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "允許使用流動電話(_C)"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>聯絡人清單</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "允許使用網絡(_N)"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>啟用拼字檢查程式語言：</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "外觀"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>播放事件音效</b>"
-
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr "<small>這裏的語言清單只反映出你已經安裝字典的語言。</small>"
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "啟動時自動連線(_C)"
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "在連線人清單中顯示使用者選擇的大頭貼"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "行為"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "聊天佈景主題(_E):"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "當狀態為離開或忙碌時停用通知(_D)"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "當狀態為離開或忙碌時停用音效(_A)"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "當聯絡人上線時啟用通知"
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "當聯絡人離線時啟用通知"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "當聊天視窗失去焦點時啟用通知(_C)"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "啟用拼字檢查程式語言："
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "一般"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Geoclue 設定值"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "位置"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "通知"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "播放事件音效"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "顯示大頭貼(_A)"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "私隱"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:21
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will have a random "
+"value added (&#xB1;0.25&#xB0;)."
+msgstr "降低位置準確度意指除了你所在的城市、洲和國家會被公開之外，不會提供其他訊息。全球定位系統的座標將會隨機加入數值(&#xB1;0.25&#xB0;)。"
+
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "將表情符號以圖片顯示(_S)"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "顯示精簡聯絡人清單(_M)"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "根據名稱排序(_N)"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "在聊天室顯示聯絡人清單(_L)"
 
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "根據狀態排序(_T)"
-
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "音效"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "拼字檢查程式"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "這裏的語言清單只反映出你已經安裝字典的語言。"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡式通知(_E)"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天(_O)"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "對我的聯絡人公開位置(_P)"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "降低位置準確度(_R)"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "狀態"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "顯示聯絡人清單(_S)"
-
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "無法啟動服務 %s 的應用程式：%s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../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"
 msgstr "有提出服務 %s 的邀請，但是你沒有處理它所需的外部應用程式。"
 
-#~ msgid "Closed"
-#~ msgstr "已關閉"
-
-#~ msgid "End this call?"
-#~ msgstr "結束這次通話？"
-
-#~ msgid "Closing this window will end the call in progress."
-#~ msgstr "關閉這個視窗會結束還在進行中的通話。"
-
-#~ msgid "_End Call"
-#~ msgstr "結束通話(_E)"
-
-#~ msgid "Empathy Call"
-#~ msgstr "Empathy 電話"
-
-#~ msgid "Readying"
-#~ msgstr "正在準備"
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
 
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - Empathy 電話"
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "聯絡人地圖檢視"
 
-#~ msgid "Ringing"
-#~ msgstr "電話鈴響"
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "錯誤"
 
-#~ msgid ""
-#~ "Incoming call from %s rejected because there is already a running call."
-#~ msgstr "已拒絕 %s 的來電，因為目前已經在通話中。"
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "嚴重"
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "警告"
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "訊息"
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "資訊"
 
-#~ msgid "1"
-#~ msgstr "1"
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "偵錯"
 
-#~ msgid "2"
-#~ msgstr "2"
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "儲存"
 
-#~ msgid "3"
-#~ msgstr "3"
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "偵錯視窗"
 
-#~ msgid "4"
-#~ msgstr "4"
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "暫停"
 
-#~ msgid "5"
-#~ msgstr "5"
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "等級"
 
-#~ msgid "6"
-#~ msgstr "6"
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "時刻"
 
-#~ msgid "7"
-#~ msgstr "7"
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "網域"
 
-#~ msgid "8"
-#~ msgstr "8"
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "分類"
 
-#~ msgid "9"
-#~ msgstr "9"
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "等級"
 
-#~ msgid "<b>Keypad</b>"
-#~ msgstr "<b>撥號盤</b>"
-
-#~ msgid "Enable popup when contact is available"
-#~ msgstr "當連絡人有空時啟用彈出視窗"
-
-#~ msgid "Enable sound when busy"
-#~ msgstr "當忙碌時啟用音效"
-
-#~ msgid "Invitation Error"
-#~ msgstr "邀請發生錯誤"
-
-#~ msgid "<b>Audio</b>"
-#~ msgstr "<b>音效提示</b>"
-
-#~ msgid "<b>Visual</b>"
-#~ msgstr "<b>視覺提示</b>"
-
-#~ msgid "Enable sounds when _busy"
-#~ msgstr "當忙碌時啟用音效(_B)"
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 
-#~ msgid "Configure Telepathy account settings"
-#~ msgstr "設定 Telepathy 帳號設定值"
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy 即時通訊程式"
 
-#~ msgid ""
-#~ "To add a new account, you can click on the 'Add' button and a new entry "
-#~ "will be created for you to start configuring."
-#~ msgstr ""
-#~ "要加入新的帳號，您可以按下「加入」按鈕，這樣就會建立一個新的項目讓您開始設"
-#~ "定。"
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "在連線人清單中顯示使用者選擇的大頭貼"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "If you do not want to add an account, simply click on the account you "
-#~ "want to configure in the list on the left."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "如果您不想加入帳號，只要在左邊清單中點選想要設定的帳號即可。"
+#~ msgid "Show _avatars"
+#~ msgstr "顯示大頭貼(_A)"
 
-#~ msgid "<b>No Accounts Configured</b>"
-#~ msgstr "<b>尚未設定帳號</b>"
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "顯示精簡連絡人清單(_M)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5574d981b..5dabbf59a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,25 +2,29 @@
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Abel Cheung <abel@oaka.org>, 2003, 2004.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
+# Tryneeds translation team, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.25.92\n"
+"Project-Id-Version: empathy 2.27.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 21:30+0800\n"
-"PO-Revision-Date: 2009-02-17 21:30+0800\n"
+"POT-Creation-Date: 2009-08-02 16:10+0800\n"
+"PO-Revision-Date: 2009-06-19 08:17+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Empathy 即時通訊程式"
+msgid "Empathy IM Client"
+msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+#, fuzzy
+#| msgid "Send and receive instant messages"
+msgid "Send and receive messages"
 msgstr "傳送與接收即時訊息"
 
 #: ../data/empathy.schemas.in.h:1
@@ -63,244 +67,329 @@ msgid "Disable sounds when away"
 msgstr "當狀態為離開時停用音效"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "Empathy 可以發佈使用者的位置"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy 可以利用 GPS 來推測位置"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy 可以利用手機網路基地台來推測位置"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy 可以利用網路來推測位置"
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Empathy 預設下載資料夾"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy 已詢問匯入帳號"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 啟動時自動連線"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy 應降低位置的準確度"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 要使用連絡人的大頭貼做為聊天視窗圖示"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "啟用新訊息的彈出式通知"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "啟用拼字檢查程式"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "隱藏主視窗"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "隱藏主視窗。"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "應該使用 NetworkManager"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "暱稱補齊字元"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "要使用的 adium 佈景主題路徑"
+
+#: ../data/empathy.schemas.in.h:28
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr "如果聊天室使用的主題是 adium 時要使用的 adium 佈景主題路徑。"
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "收到訊息時播放音效"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "送出訊息時播放音效"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "當連絡人登入時播放音效"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "當有連絡人登出時播放音效"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
 msgstr "如果聊天視窗失去焦點則彈出通知"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "當連絡人登入時彈出通知"
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "當連絡人登出時彈出通知"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
 msgstr "已建立 Salut 帳號"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "在聊天室顯示連絡人清單"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示提示"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "顯示離線連絡人"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "拼字檢查語言"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次選擇大頭貼圖片的目錄。"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在聊天視窗的談話中的佈景主題。"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "使用圖片式表情符號"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "在聊天室使用佈景主題"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "Empathy 是否要將使用者的位置發佈給他的連絡人。"
+
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "Empathy 是否使用 GPS 來推測位置。"
+
+#: ../data/empathy.schemas.in.h:54
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr "Empathy 是否使用行動電話網路來推測位置。"
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "Empathy 是否使用網路來推測位置。"
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Empathy 是否應詢問您要不要從其他程式匯入帳號。"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Empathy 是否應在啟動時自動登入您的帳號。"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "Empathy 是否基於隱私權的理由減低位置的準確度。"
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "Empathy 是否使用連絡人大頭貼做為聊天視窗圖示。"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "是否在 Empathy 第一次執行時建立 Salut 帳號。"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
 msgstr "在斷線/重新連線時是否自動使用網路管理程式。"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "是否以您設定的語言檢查輸入有無錯字。"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "在談話中是否將表情符號轉換為圖片形式。"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "是否播放音效來通知有連絡人登入網路。"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "是否播放音效來通知有連絡人登出網路。"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "是否播放音效來通知有事件發生。"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "是否播放音效來通知有訊息抵達。"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "是否播放音效來通知開啟新的談話。"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "是否播放音效來通知有訊息送出。"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "當登入網路時是否播放音效。"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "當登出網路時是否播放音效。"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否播放音效通知。"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+msgid ""
+"Whether or not 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."
+msgstr "當連絡人上線時是否顯示彈出式通知。"
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not 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:57
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "當收到新訊息時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "是否在連絡人清單與聊天視窗顯示連絡人大頭貼。"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "是否在連絡人清單中顯示離線的連絡人。"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
+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."
 msgstr "使用標題列的「x」按鈕關閉主視窗時是否顯示訊息。"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "是否以精簡模式顯示連絡人清單。"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "是否在聊天室使用佈景主題。"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 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 "
@@ -309,720 +398,968 @@ msgstr ""
 "排序連絡人清單時要使用哪個條件。預設值是使用連絡人的名稱「name」數值來排序。"
 "而數值「state」則會使用其狀態來排序連絡人清單。"
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "已接收檔案的雜湊值與送出的不符"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "遠端連絡人不支援檔案傳輸"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "選取的檔案不是正規的檔案"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "選取的檔案是空白的"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "臨近人員"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "Socket 類型不支援"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "沒有指定原因"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "已要求變更狀態"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "您已取消檔案傳輸"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "其他的參與者取消了檔案傳輸"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "嘗試傳輸檔案時發生錯誤"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "其他的參與者無法傳輸該檔案"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "不明的原因"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "隱藏"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d 秒前"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d 分鐘以前"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d 小時以前"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天以前"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d 週前"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d 個月以前"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "未來"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "全部"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>進階</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr "清除密碼及這個項目。"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../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
+msgid "Advanced"
+msgstr "進階"
+
+#: ../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
 msgid "Pass_word:"
 msgstr "密碼(_W):"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "螢幕名稱(_N):"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+#: ../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
 msgid "_Port:"
 msgstr "連接埠(_P):"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
-#: ../src/empathy-new-chatroom-dialog.glade.h:10
+#: ../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
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../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
 msgid "Login I_D:"
 msgstr "登入 I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "編碼(_C):"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "新網路"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>網路</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>伺服器</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "編碼:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "建立一個新的 IRC 網路"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "編輯選取的 IRC 網路"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "網路"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "網路:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "稱呼："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "離開訊息:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "真實姓名:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "移除選取的 IRC 網路"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "伺服器"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>覆蓋伺服器設定值</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "覆蓋伺服器設定值"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "優先權(_O):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "資源(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "使用舊的 SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "要求加密[TLS/SSL](_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "忽略 SSL 憑證錯誤(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "電子郵件(_E):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 msgstr "名字(_F):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "姓氏(_L):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "暱稱(_N):"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "發佈的名稱(_P):"
 
 #. 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.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "探索 STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN 伺服器:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN 通訊埠:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "使用者名稱(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "使用 _Yahoo 日本"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "忽略會議與聊天室邀請(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
 msgstr "聊天室清單地區(_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "無法轉換圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../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:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "選擇您的大頭貼圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "沒有圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "所有檔案"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "請按這裡放大"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "無法重連這個聊天會議"
+
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
+msgstr "不支援此指令"
+
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "無效的連絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "權限被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "太長的訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "不明"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳送訊息「%s」時發生錯誤；%s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
+msgstr "(沒有建議)"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "插入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "檢查拼字(_C)..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s 已經加入此聊天室"
+msgid "%s has disconnected"
+msgstr "%s 已斷線"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s 被 %s 踢出去了"
+
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "%s 被踢出去了"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s 被 %s設為黑名單"
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "%s 被設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:1134
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. 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:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s 已經加入此聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "成功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "談話"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>主題:</b>"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Group Chat"
-msgstr "群組聊天"
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "主題:"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "複製連結位址(_C)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "開啟連結(_O)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "個人資訊"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "編輯連絡人資訊"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "連絡人資訊"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "我想要將您加入我的連絡人清單。"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "個人資訊"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "新增連絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "稍後再決定"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "訂閱要求"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1404
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是否想要移除群組「%s」？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1406
 msgid "Removing group"
 msgstr "正在移除群組"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1453
+#: ../libempathy-gtk/empathy-contact-list-view.c:1530
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1483
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是否想要移除連絡人「%s」？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1485
 msgid "Removing contact"
 msgstr "正在移除連絡人"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-msgid "Sorry, I don't want you in my contact list anymore."
-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:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "通話(_C)"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "語音通話(_A)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "視訊通話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "檢視前一次談話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "傳送檔案"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "資訊(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
 msgstr "邀請到這個聊天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "邀請到這個聊天室(_I)"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "選擇連絡人"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:996
 msgid "Select"
 msgstr "選擇"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1005
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "群組"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>客戶端資訊</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
+msgid "Country ISO Code:"
+msgstr "國家 ISO 碼："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "Country:"
+msgstr "國家："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "State:"
+msgstr "州："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "City:"
+msgstr "市："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Area:"
+msgstr "區域："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Postal Code:"
+msgstr "郵遞區號："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Street:"
+msgstr "街："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Building:"
+msgstr "建築："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Floor:"
+msgstr "樓層："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Room:"
+msgstr "室："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Text:"
+msgstr "文字："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Description:"
+msgstr "描述："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "URI:"
+msgstr "URI："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Accuracy Level:"
+msgstr "準確度等級："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Error:"
+msgstr "錯誤："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Vertical Error (meters):"
+msgstr "垂直誤差（公尺）："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Horizontal Error (meters):"
+msgstr "水平誤差（公尺）："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>連絡人詳細資料</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Speed:"
+msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>連絡人</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#, fuzzy
+msgid "Bearing:"
+msgstr "版本:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Climb Speed:"
+msgstr "爬升速度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Last Updated on:"
+msgstr "上次更新於："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Longitude:"
+msgstr "經度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Latitude:"
+msgstr "緯度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Altitude:"
+msgstr "緯度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1349
+msgid "<b>Location</b>"
+msgstr "<b>位置</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1362
+msgid "<b>Location</b>, "
+msgstr "<b>位置<b>，"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>群組</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1412
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y 於 %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-#: ../src/empathy-chatrooms-window.glade.h:1
-#: ../src/empathy-new-chatroom-dialog.glade.h:1
+#: ../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 "帳號："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "別名:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "生日:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "客戶端資訊"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "客戶端:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "連絡人資訊"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "連絡人"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "連絡人詳細資料"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "電子郵件:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "全名:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr "群組"
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "識別器:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "要求資訊..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 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-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "版本:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "網站:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "加入群組(_G)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "新增伺服器"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "伺服器"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "連接埠"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:277
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "帳號"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "日期"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "談話"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "上一次談話"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "搜尋"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "搜尋(_F):"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "通話(_A)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "連絡人 ID:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "新增談話"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
+#. 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 "自訂訊息..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "自訂訊息"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "訊息:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "儲存訊息"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "狀態:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "字"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "對這個字的建議"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "拼字檢查"
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "編輯自訂訊息..."
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "對這個字的建議："
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "按這裡將這個狀態從喜好中移除"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:60
-msgid "Classic"
-msgstr "古典"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "簡易"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "清除"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "按這裡將這個狀態設為喜好"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "藍色"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "設定狀態"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "無法開啓 URI"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "設定您的上線與目前的狀態"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "選擇一個檔案"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "自訂訊息..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "收到即時訊息"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "傳送即時訊息"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "收到聊天要求"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "連絡人已連線"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "連絡人已斷線"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "連接到伺服器"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "與伺服器斷線"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "收到語音通話"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "播出語音通話"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../libempathy-gtk/empathy-sound.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
+msgid "Edit Custom Messages"
+msgstr "編輯自訂訊息"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr "加入新的預先設定(_N)"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr "已儲存的預先設定"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "古典"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "簡易"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "清除"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "藍色"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "無法開啓 URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "選擇一個檔案"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a destination"
+msgstr "選取目的地"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "目前的地區設定"
@@ -1207,7 +1544,7 @@ msgid "Megaphone"
 msgstr "話筒"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "講話！"
 
@@ -1221,15 +1558,15 @@ msgid "_Information"
 msgstr "資訊(_I)"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "請設定連絡人。"
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "選擇連絡人..."
 
@@ -1242,23 +1579,25 @@ msgstr "上線狀態"
 msgid "Set your own presence"
 msgstr "設定您自己的上線狀態"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "啟動時不顯示連絡人清單"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "顯示帳號對話盒"
 
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:587
+#, fuzzy
+#| msgid "- Empathy Instant Messenger"
+msgid "- Empathy IM Client"
 msgstr "- Empathy 即時通訊程式"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1269,7 +1608,7 @@ msgstr ""
 "的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈"
 "這一程式，或者自由選擇使用任何更新的版本。"
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1279,7 +1618,7 @@ msgstr ""
 "發佈 Empathy 的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的"
 "擔保。更詳細的情況請參閱 GNU 通用公共許可證。"
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "
@@ -1289,11 +1628,11 @@ msgstr ""
 "給： Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME 的即時訊息客戶端程式"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -1304,22 +1643,21 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "帳號"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "新增 %s 帳號"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1328,7 +1666,7 @@ msgstr ""
 "您即將移除您的 %s 帳號！\n"
 "確定要繼續？"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1340,301 +1678,299 @@ msgstr ""
 "\n"
 "當您往後決定要將該帳號重新加入時，上述資源將仍然可以取用。"
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>新增帳號</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>尚未安裝通訊協定</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "加入帳號"
 
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>設定值</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "建立(_E)"
 
-#: ../src/empathy-accounts-dialog.glade.h:6
-msgid "I already have an account I want to use"
-msgstr "我已經有要使用的帳號"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "匯入帳號..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "尚未安裝通訊協定"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "設定值"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 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.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "類型:"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "加入(_A)..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "建立新的使用者帳號(_C)"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "重複使用既存的帳號(_R)"
+
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
 msgstr "對比"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "音量"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "連線中..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "側邊列(_S)"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "播號盤"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "音效輸入"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "視訊輸入"
 
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "連線中..."
+#: ../src/empathy-call-window.c:835
+#, c-format
+msgid "Call with %s"
+msgstr "與 %s 通話中"
+
+#: ../src/empathy-call-window.c:904
+msgid "Call"
+msgstr "通話"
 
-#: ../src/empathy-call-window.c:572
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1335
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "已連線 -- %d:%02dm"
+msgid "Connected — %d:%02dm"
+msgstr "已連線 — %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "掛斷"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "重撥"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "傳送音訊"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "傳送視訊"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
 msgstr "視訊預覽"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "通話(_C)"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "談話 (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "主題:"
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "正在輸入訊息。"
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
-#, c-format
-msgid "New message from %s"
-msgstr "來自 %s 的新訊息"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
+#, fuzzy
+#| msgid "Clean"
 msgid "C_lear"
-msgstr "清除(_L)"
+msgstr "清除"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
+#, fuzzy
+#| msgid "_Chat"
 msgid "Chat"
-msgstr "聊天"
+msgstr "聊天(_C)"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
+#, fuzzy
+#| msgid "Insert Smiley"
 msgid "Insert _Smiley"
-msgstr "插入表情符號(_S)"
-
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "邀請訊息(_M):"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "邀請"
+msgstr "插入表情符號"
 
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
-msgstr "將分頁左移(_L)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Move Tab _Right"
-msgstr "將分頁右移(_R)"
-
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "選擇您要邀請誰："
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "您已經被邀請加入聊天會議。"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
+#, fuzzy
+#| msgid "Contact"
 msgid "_Contact"
-msgstr "連絡人(_C)"
+msgstr "連絡人"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
+#, fuzzy
+#| msgid "Conversation"
 msgid "_Conversation"
-msgstr "談話(_C)"
+msgstr "談話"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
-msgstr "轉為獨立視窗(_D)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
+#, fuzzy
+#| msgid "_Invite to chatroom"
 msgid "_Favorite Chatroom"
-msgstr "喜好的聊天室(_F)"
+msgstr "邀請到這個聊天室(_I)"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
-msgstr "下一個分頁(_N)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
+#, fuzzy
+#| msgid "_Previous Conversations"
 msgid "_Previous Tab"
-msgstr "上一個分頁(_P)"
+msgstr "上一次談話(_P)"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "顯示連絡人清單(_S)"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
-msgstr "分頁(_T)"
+msgstr ""
 
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
 msgstr "聊天室"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "自動連線"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "編輯喜好的聊天室"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "啟動時加入聊天室(_U)"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "當 Empathy 啟動並連上網路時加入這個聊天室"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "管理喜好的聊天室"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "名稱(_A):"
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "伺服器(_E):"
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "聊天室(_R):"
-
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-event-manager.c:375
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s 要與您通話，是否要接聽？"
 
-#: ../src/empathy-event-manager.c:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "接聽(_A)"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s 正在邀請您"
 
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "將啟動外部應用程式來處理它。"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "您沒有處理它所需的外部應用程式。"
 
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "聊天邀請"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請您加入 %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請您加入 %s"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "來自 %s 的訂閱要求"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1643,596 +1979,632 @@ msgstr ""
 "\n"
 "訊息：%s"
 
-#: ../src/empathy-ft-manager.c:113
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s 現在離線。"
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, 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
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-msgid "No reason was specified"
-msgstr "沒有指定原因"
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "已要求變更狀態"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "您已取消檔案傳輸"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "其他的參與者取消了檔案傳輸"
-
-#: ../src/empathy-ft-manager.c:172
-msgid "Error while trying to transfer the file"
-msgstr "嘗試傳輸檔案時發生錯誤"
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "不明"
 
-#: ../src/empathy-ft-manager.c:174
-msgid "The other participant is unable to transfer the file"
-msgstr "其他的參與者無法傳輸該檔案"
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s / %s 於 %s/s"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "不明的原因"
+#: ../src/empathy-ft-manager.c:276
+#, 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:224
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正在接收 %2$s 送出的「%1$s」"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "正在傳送「%s」給 %s"
 
-#: ../src/empathy-ft-manager.c:237
-msgctxt "file size"
-msgid "Unknown"
-msgstr "不明"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "從 %2$s 接收「%1$s」時發生錯誤"
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "接收檔案時發生錯誤"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:245
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s / %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "傳送「%s」給 %s 時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:252
-msgid "Waiting the other participant's response"
-msgstr "正在等待其他參與者的回應"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "傳送檔案時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:262
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "「%s」接收自 %s"
 
-#: ../src/empathy-ft-manager.c:268
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "「%s」傳送給 %s"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "檔案傳輸完畢"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "「%s」正接收自 %s"
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "正在等待其他參與者的回應"
 
-#: ../src/empathy-ft-manager.c:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "「%s」正傳送給 %s"
+msgid "Checking integrity of \"%s\""
+msgstr "正在檢查檔案「%s」的完整性"
 
-#: ../src/empathy-ft-manager.c:289
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "檔案傳輸已取消：%s"
-
-#: ../src/empathy-ft-manager.c:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "不明"
+msgid "Hashing \"%s\""
+msgstr "正在計算「%s」雜湊值"
 
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "不明"
-
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "檔案"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "剩餘"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "無法將檔案儲存到這個位置"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "另存新檔..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "不明的大小"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr " %s 想要傳送給您一個檔案"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "是否要接收檔案「%s」(%s)？"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "接受(_A)"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 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:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "來源"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "找不到可匯入的帳號。Empathy 目前只支援從 Pidgin 匯入帳號。"
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "匯入帳號"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "編輯帳號(_E)"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "沒有指定的錯誤"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "網路錯誤"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "使用中的名稱"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "沒有提供憑證"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "憑證不被信任"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "憑證已逾期"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "憑證尚未使用"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "憑證主機名稱不符"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "憑證指紋檔不符"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "憑證為自我簽署"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "憑證錯誤"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳號"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "連絡人"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "編輯帳號(_E)"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "連絡人清單"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr "連絡人地圖(_M)"
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "脈絡"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "加入喜好(_F)"
 
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "加入新的(_N)..."
-
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "管理喜好"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "顯示離線連絡人(_O)"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+#| msgid "Sort by _name"
+msgid "Sort by _Name"
+msgstr "依名稱排序(_N)"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+#| msgid "Sort by s_tate"
+msgid "Sort by _Status"
+msgstr "依狀態排序(_T)"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "新增聯絡人(_A)..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "偵錯(_D)"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "檔案傳輸(_F)"
+
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "加入(_J)..."
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "新增談話(_N)..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "離線連絡人(_O)"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "個人資訊(_P)"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "上一次談話(_P)"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
 msgstr "聊天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
 msgstr "聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "瀏覽:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "成員"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"需要邀請：%s\n"
+"需要密碼：%s\n"
+"成員：%s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "否"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "無法開始列出聊天室清單"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "無法停止列出聊天室清單"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+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 "在這裡輸入要加入的聊天室名稱或從清單中點選一或多個聊天室。"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../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.glade.h:5
-msgid "Join"
-msgstr "加入"
-
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "參加新的"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "加入聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "重新整理(_F)"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "聊天室清單"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr "這個清單中呈現了您進入的伺服器上開設的所有聊天室。"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "聊天室(_R):"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "訊息已收到"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "訊息已送出"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "新增談話"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "連絡人上線"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "連絡人離線"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "帳號已連線"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "帳號已斷線"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "語言"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>外觀</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>行為</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "允許使用 _GPS"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>連絡人清單</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "允許使用行動電話(_C)"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>啟用拼字檢查程式語言：</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "允許使用網路(_N)"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>播放事件音效</b>"
-
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr "<small>這裡的語言清單只反映出您已經安裝字典的語言。</small>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "外觀"
 
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 msgstr "啟動時自動連線(_C)"
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "在連線人清單中顯示使用者選擇的大頭貼"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "行為"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "聊天佈景主題(_E):"
 
-#: ../src/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "當狀態為離開或忙碌時停用通知(_D)"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "當狀態為離開或忙碌時停用音效(_A)"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "當連絡人上線時啟用通知"
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "當連絡人離線時啟用通知"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "當聊天視窗失去焦點時啟用通知(_C)"
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "啟用拼字檢查程式語言："
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "一般"
 
-#: ../src/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Geoclue 設定值"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "位置"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "通知"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "播放事件音效"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "顯示大頭貼(_A)"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "隱私"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will have a random "
+"value added (&#xB1;0.25&#xB0;)."
+msgstr ""
+"降低位置準確度意指除了你所在的城市、洲和國家會被公開之外，不會提供其他訊息。"
+"全球定位系統的座標將會隨機加入數值(&#xB1;0.25&#xB0;)。"
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "將表情符號以圖片顯示(_S)"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "顯示精簡連絡人清單(_M)"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "依名稱排序(_N)"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "在聊天室顯示連絡人清單(_L)"
 
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "依狀態排序(_T)"
-
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "音效"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "拼字檢查程式"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "這裡的語言清單只反映出您已經安裝字典的語言。"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡式通知(_E)"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天(_O)"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "對我的連絡人公開位置(_P)"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "降低位置準確度(_R)"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "狀態"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../src/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "顯示連絡人清單(_S)"
-
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "無法啟動服務 %s 的應用程式：%s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../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"
 msgstr "有提出服務 %s 的邀請，但是您沒有處理它所需的外部應用程式。"
 
-#~ msgid "Closed"
-#~ msgstr "已關閉"
-
-#~ msgid "End this call?"
-#~ msgstr "結束這次通話？"
-
-#~ msgid "Closing this window will end the call in progress."
-#~ msgstr "關閉這個視窗會結束還在進行中的通話。"
-
-#~ msgid "_End Call"
-#~ msgstr "結束通話(_E)"
-
-#~ msgid "Empathy Call"
-#~ msgstr "Empathy 電話"
-
-#~ msgid "Readying"
-#~ msgstr "正在準備"
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
 
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - Empathy 電話"
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "連絡人地圖檢視"
 
-#~ msgid "Ringing"
-#~ msgstr "電話鈴響"
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "錯誤"
 
-#~ msgid ""
-#~ "Incoming call from %s rejected because there is already a running call."
-#~ msgstr "已拒絕 %s 的來電，因為目前已經在通話中。"
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "嚴重"
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "警告"
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "訊息"
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "資訊"
 
-#~ msgid "1"
-#~ msgstr "1"
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "偵錯"
 
-#~ msgid "2"
-#~ msgstr "2"
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "儲存"
 
-#~ msgid "3"
-#~ msgstr "3"
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "偵錯視窗"
 
-#~ msgid "4"
-#~ msgstr "4"
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "暫停"
 
-#~ msgid "5"
-#~ msgstr "5"
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "等級"
 
-#~ msgid "6"
-#~ msgstr "6"
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "時刻"
 
-#~ msgid "7"
-#~ msgstr "7"
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "網域"
 
-#~ msgid "8"
-#~ msgstr "8"
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "分類"
 
-#~ msgid "9"
-#~ msgstr "9"
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "等級"
 
-#~ msgid "<b>Keypad</b>"
-#~ msgstr "<b>撥號盤</b>"
-
-#~ msgid "Enable popup when contact is available"
-#~ msgstr "當連絡人有空時啟用彈出視窗"
-
-#~ msgid "Enable sound when busy"
-#~ msgstr "當忙碌時啟用音效"
-
-#~ msgid "Invitation Error"
-#~ msgstr "邀請發生錯誤"
-
-#~ msgid "<b>Audio</b>"
-#~ msgstr "<b>音效提示</b>"
-
-#~ msgid "<b>Visual</b>"
-#~ msgstr "<b>視覺提示</b>"
-
-#~ msgid "Enable sounds when _busy"
-#~ msgstr "當忙碌時啟用音效(_B)"
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 
-#~ msgid "Configure Telepathy account settings"
-#~ msgstr "設定 Telepathy 帳號設定值"
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy 即時通訊程式"
 
-#~ msgid ""
-#~ "To add a new account, you can click on the 'Add' button and a new entry "
-#~ "will be created for you to start configuring."
-#~ msgstr ""
-#~ "要加入新的帳號，您可以按下「加入」按鈕，這樣就會建立一個新的項目讓您開始設"
-#~ "定。"
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "在連線人清單中顯示使用者選擇的大頭貼"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "If you do not want to add an account, simply click on the account you "
-#~ "want to configure in the list on the left."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "如果您不想加入帳號，只要在左邊清單中點選想要設定的帳號即可。"
+#~ msgid "Show _avatars"
+#~ msgstr "顯示大頭貼(_A)"
 
-#~ msgid "<b>No Accounts Configured</b>"
-#~ msgstr "<b>尚未設定帳號</b>"
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "顯示精簡連絡人清單(_M)"
diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 669c09013..b8f0b40aa 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -233,6 +233,7 @@
     '("location" "EMPATHY_DEBUG_LOCATION")
     '("other" "EMPATHY_DEBUG_OTHER")
     '("share-desktop" "EMPATHY_DEBUG_SHARE_DESKTOP")
+    '("connectivity" "EMPATHY_DEBUG_CONNECTIVITY")
   )
 )
 
@@ -1740,21 +1741,6 @@
   )
 )
 
-(define-method get_use_nm
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_get_use_nm")
-  (return-type "gboolean")
-)
-
-(define-method set_use_nm
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_use_nm")
-  (return-type "none")
-  (parameters
-    '("gboolean" "use_nm")
-  )
-)
-
 
 
 ;; From empathy-irc-network.h
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index 5b23def9a..51d32709e 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -2033,4 +2033,12 @@
   )
 )
 
+(define-function make_absolute_url
+  (c-name "empathy_make_absolute_url")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "url")
+  )
+)
+
 
diff --git a/src/empathy-call-window-fullscreen.ui b/src/empathy-call-window-fullscreen.ui
index 5bf5e509b..4e864bce6 100644
--- a/src/empathy-call-window-fullscreen.ui
+++ b/src/empathy-call-window-fullscreen.ui
@@ -12,7 +12,7 @@
     <signal name="motion_notify_event" handler="empathy_call_window_fullscreen_motion_notify_cb"/>
     <child>
       <object class="GtkButton" id="leave_fullscreen_button">
-        <property name="label" translatable="yes">gtk-leave-fullscreen</property>
+        <property name="label">gtk-leave-fullscreen</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index bd958aada..f7ba24232 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -31,6 +31,8 @@
 
 #include <telepathy-farsight/channel.h>
 
+#include <gst/farsight/fs-element-added-notifier.h>
+
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-utils.h>
@@ -137,8 +139,10 @@ struct _EmpathyCallWindowPriv
   GtkWidget *vbox;
 
   gulong video_output_motion_handler_id;
+  guint bus_message_source_id;
 
   gdouble volume;
+  GtkWidget *volume_scale;
   GtkWidget *volume_progress_bar;
   GtkAdjustment *audio_input_adj;
 
@@ -153,6 +157,8 @@ struct _EmpathyCallWindowPriv
   GstElement *funnel;
   GstElement *liveadder;
 
+  FsElementAddedNotifier *fsnotifier;
+
   guint context_id;
 
   GTimer *timer;
@@ -485,7 +491,10 @@ empathy_call_window_mic_volume_changed_cb (GtkAdjustment *adj,
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
   gdouble volume;
 
-  volume =  gtk_adjustment_get_value (adj)/100.0;
+  if (priv->audio_input == NULL)
+    return;
+
+  volume = gtk_adjustment_get_value (adj)/100.0;
 
   /* Don't store the volume because of muting */
   if (volume > 0 || gtk_toggle_tool_button_get_active (
@@ -518,27 +527,27 @@ static GtkWidget *
 empathy_call_window_create_audio_input (EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
-  GtkWidget *hbox, *vbox, *scale, *label;
-  GtkAdjustment *adj;
+  GtkWidget *hbox, *vbox, *label;
 
   hbox = gtk_hbox_new (TRUE, 3);
 
   vbox = gtk_vbox_new (FALSE, 3);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 3);
 
-  scale = gtk_vscale_new_with_range (0, 150, 100);
-  gtk_range_set_inverted (GTK_RANGE (scale), TRUE);
+  priv->volume_scale = gtk_vscale_new_with_range (0, 150, 100);
+  gtk_range_set_inverted (GTK_RANGE (priv->volume_scale), TRUE);
   label = gtk_label_new (_("Volume"));
 
-  priv->audio_input_adj = adj = gtk_range_get_adjustment (GTK_RANGE (scale));
+  priv->audio_input_adj = gtk_range_get_adjustment (
+    GTK_RANGE (priv->volume_scale));
   priv->volume =  empathy_audio_src_get_volume (EMPATHY_GST_AUDIO_SRC
     (priv->audio_input));
-  gtk_adjustment_set_value (adj, priv->volume * 100);
+  gtk_adjustment_set_value (priv->audio_input_adj, priv->volume * 100);
 
-  g_signal_connect (G_OBJECT (adj), "value-changed",
+  g_signal_connect (G_OBJECT (priv->audio_input_adj), "value-changed",
     G_CALLBACK (empathy_call_window_mic_volume_changed_cb), self);
 
-  gtk_box_pack_start (GTK_BOX (vbox), scale, TRUE, TRUE, 3);
+  gtk_box_pack_start (GTK_BOX (vbox), priv->volume_scale, TRUE, TRUE, 3);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 3);
 
   priv->volume_progress_bar = gtk_progress_bar_new ();
@@ -678,6 +687,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
   GtkWidget *page;
   GstBus *bus;
   gchar *filename;
+  GKeyFile *keyfile;
+  GError *error = NULL;
 
   filename = empathy_file_lookup ("empathy-call-window.ui", "src");
   gui = empathy_builder_get_file (filename,
@@ -694,6 +705,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
     "ui_manager", &priv->ui_manager,
     "menufullscreen", &priv->menu_fullscreen,
     NULL);
+  g_free (filename);
 
   empathy_builder_connect (gui, self,
     "menuhangup", "activate", empathy_call_window_hangup_cb,
@@ -720,7 +732,27 @@ empathy_call_window_init (EmpathyCallWindow *self)
 
   priv->pipeline = gst_pipeline_new (NULL);
   bus = gst_pipeline_get_bus (GST_PIPELINE (priv->pipeline));
-  gst_bus_add_watch (bus, empathy_call_window_bus_message, self);
+  priv->bus_message_source_id = gst_bus_add_watch (bus,
+      empathy_call_window_bus_message, self);
+
+  priv->fsnotifier = fs_element_added_notifier_new ();
+  fs_element_added_notifier_add (priv->fsnotifier, GST_BIN (priv->pipeline));
+
+  keyfile = g_key_file_new ();
+  filename = empathy_file_lookup ("element-properties", "data");
+  if (g_key_file_load_from_file (keyfile, filename, G_KEY_FILE_NONE, &error))
+    {
+      fs_element_added_notifier_set_properties_from_keyfile (priv->fsnotifier,
+          keyfile);
+    }
+  else
+    {
+      g_warning ("Could not load element-properties file: %s", error->message);
+      g_key_file_free (keyfile);
+      g_clear_error (&error);
+    }
+  g_free (filename);
+
 
   priv->remote_user_output_frame = gtk_frame_new (NULL);
   gtk_widget_set_size_request (priv->remote_user_output_frame,
@@ -800,7 +832,6 @@ empathy_call_window_init (EmpathyCallWindow *self)
 
   g_object_ref (priv->ui_manager);
   g_object_unref (gui);
-  g_free (filename);
 }
 
 /* Instead of specifying a width and a height, we specify only one size. That's
@@ -832,6 +863,8 @@ set_window_title (EmpathyCallWindow *self)
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
   gchar *tmp;
 
+  /* translators: Call is a noun and %s is the contact name. This string is used
+   * in the window title */
   tmp = g_strdup_printf (_("Call with %s"),
       empathy_contact_get_name (priv->contact));
   gtk_window_set_title (GTK_WINDOW (self), tmp);
@@ -901,6 +934,7 @@ empathy_call_window_setup_avatars (EmpathyCallWindow *self,
   else
     {
       g_warning ("call handler doesn't have a contact");
+      /* translators: Call is a noun. This string is used in the window title */
       gtk_window_set_title (GTK_WINDOW (self), _("Call"));
 
       /* Since we can't access the remote contact, we can't get a connection
@@ -1041,7 +1075,6 @@ empathy_call_window_dispose (GObject *object)
 
   if (priv->handler != NULL)
     g_object_unref (priv->handler);
-
   priv->handler = NULL;
 
   if (priv->pipeline != NULL)
@@ -1064,6 +1097,10 @@ empathy_call_window_dispose (GObject *object)
     g_object_unref (priv->video_tee);
   priv->video_tee = NULL;
 
+  if (priv->fsnotifier != NULL)
+    g_object_unref (priv->fsnotifier);
+  priv->fsnotifier = NULL;
+
   if (priv->timer_id != 0)
     g_source_remove (priv->timer_id);
   priv->timer_id = 0;
@@ -1098,6 +1135,12 @@ empathy_call_window_finalize (GObject *object)
       priv->video_output_motion_handler_id = 0;
     }
 
+  if (priv->bus_message_source_id != 0)
+    {
+      g_source_remove (priv->bus_message_source_id);
+      priv->bus_message_source_id = 0;
+    }
+
   /* free any data held directly by the object here */
   g_mutex_free (priv->lock);
 
@@ -1152,6 +1195,12 @@ empathy_call_window_reset_pipeline (EmpathyCallWindow *self)
   if (priv->pipeline == NULL)
     return TRUE;
 
+  if (priv->bus_message_source_id != 0)
+    {
+      g_source_remove (priv->bus_message_source_id);
+      priv->bus_message_source_id = 0;
+    }
+
   state_change_return = gst_element_set_state (priv->pipeline, GST_STATE_NULL);
 
   if (state_change_return == GST_STATE_CHANGE_SUCCESS ||
@@ -1169,6 +1218,9 @@ empathy_call_window_reset_pipeline (EmpathyCallWindow *self)
         g_object_unref (priv->audio_input);
       priv->audio_input = NULL;
 
+      g_signal_handlers_disconnect_by_func (priv->audio_input_adj,
+          empathy_call_window_mic_volume_changed_cb, self);
+
       if (priv->audio_output != NULL)
         g_object_unref (priv->audio_output);
       priv->audio_output = NULL;
@@ -1243,6 +1295,9 @@ empathy_call_window_disconnected (EmpathyCallWindow *self)
           FALSE);
       gtk_action_set_sensitive (priv->show_preview, FALSE);
 
+      gtk_progress_bar_set_fraction (
+          GTK_PROGRESS_BAR (priv->volume_progress_bar), 0);
+
       gtk_widget_hide (priv->video_output);
       gtk_widget_show (priv->remote_user_avatar_widget);
 
@@ -1656,7 +1711,15 @@ empathy_call_window_delete_cb (GtkWidget *widget, GdkEvent*event,
   EmpathyCallWindowPriv *priv = GET_PRIV (window);
 
   if (priv->pipeline != NULL)
-    gst_element_set_state (priv->pipeline, GST_STATE_NULL);
+    {
+      if (priv->bus_message_source_id != 0)
+        {
+          g_source_remove (priv->bus_message_source_id);
+          priv->bus_message_source_id = 0;
+        }
+
+      gst_element_set_state (priv->pipeline, GST_STATE_NULL);
+    }
 
   if (priv->call_state == CONNECTING)
     empathy_sound_stop (EMPATHY_SOUND_PHONE_OUTGOING);
@@ -1951,11 +2014,20 @@ empathy_call_window_restart_call (EmpathyCallWindow *window)
 
   priv->pipeline = gst_pipeline_new (NULL);
   bus = gst_pipeline_get_bus (GST_PIPELINE (priv->pipeline));
-  gst_bus_add_watch (bus, empathy_call_window_bus_message, window);
+  priv->bus_message_source_id = gst_bus_add_watch (bus,
+      empathy_call_window_bus_message, window);
 
   empathy_call_window_setup_remote_frame (bus, window);
   empathy_call_window_setup_self_frame (bus, window);
 
+  g_signal_connect (G_OBJECT (priv->audio_input_adj), "value-changed",
+      G_CALLBACK (empathy_call_window_mic_volume_changed_cb), window);
+
+  /* While the call was disconnected, the input volume might have changed.
+   * However, since the audio_input source was destroyed, its volume has not
+   * been updated during that time. That's why we manually update it here */
+  empathy_call_window_mic_volume_changed_cb (priv->audio_input_adj, window);
+
   g_object_unref (bus);
 
   gtk_widget_show_all (priv->content_hbox);
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 822f22826..5f81ac167 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -850,7 +850,7 @@ chat_window_help_contents_activate_cb (GtkAction         *action,
 {
 	EmpathyChatWindowPriv *priv = GET_PRIV (window);
 
-	empathy_url_show (priv->dialog, "ghelp:empathy?chat");
+	empathy_url_show (priv->dialog, "ghelp:empathy");
 }
 
 static void
@@ -945,7 +945,6 @@ chat_window_show_or_update_notification (EmpathyChatWindow *window,
 	char *escaped;
 	const char *body;
 	GdkPixbuf *pixbuf;
-	NotificationData *cb_data;
 	EmpathyChatWindowPriv *priv = GET_PRIV (window);
 	gboolean res;
 
@@ -959,37 +958,36 @@ chat_window_show_or_update_notification (EmpathyChatWindow *window,
 		}
 	}
 
-	cb_data = g_slice_new0 (NotificationData);
-	cb_data->chat = g_object_ref (chat);
-	cb_data->window = window;
-
 	sender = empathy_message_get_sender (message);
 	header = empathy_contact_get_name (sender);
 	body = empathy_message_get_body (message);
 	escaped = g_markup_escape_text (body, -1);
 
-	pixbuf = empathy_misc_get_pixbuf_for_notification (sender, EMPATHY_IMAGE_NEW_MESSAGE);
-
 	if (priv->notification != NULL) {
 		notify_notification_update (priv->notification,
 					    header, escaped, NULL);
-		/* if icon doesn't exist libnotify will crash */
-		if (pixbuf != NULL)
-			notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
 	} else {
+		NotificationData *cb_data = cb_data = g_slice_new0 (NotificationData);
+
+		cb_data->chat = g_object_ref (chat);
+		cb_data->window = window;
+
 		priv->notification = notify_notification_new (header, escaped, NULL, NULL);
 		notify_notification_set_timeout (priv->notification, NOTIFY_EXPIRES_DEFAULT);
-		/* if icon doesn't exist libnotify will crash */
-		if (pixbuf != NULL)
-			notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
 
 		g_signal_connect (priv->notification, "closed",
 				  G_CALLBACK (chat_window_notification_closed_cb), cb_data);
 	}
 
+	pixbuf = empathy_misc_get_pixbuf_for_notification (sender, EMPATHY_IMAGE_NEW_MESSAGE);
+
+	if (pixbuf != NULL) {
+		notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
+		g_object_unref (pixbuf);
+	}
+
 	notify_notification_show (priv->notification, NULL);
 
-	g_object_unref (pixbuf);
 	g_free (escaped);
 }
 
@@ -1002,7 +1000,8 @@ chat_window_set_highlight_room_tab_label (EmpathyChat *chat)
 	if (!empathy_chat_is_room (chat))
 		return;
 
-	markup = g_markup_printf_escaped ("<span color=\"red\">%s</span>",
+	markup = g_markup_printf_escaped (
+		"<span color=\"red\" weight=\"bold\">%s</span>",
 		empathy_chat_get_name (chat));
 
 	widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c
index 86e15bdff..8df13922a 100644
--- a/src/empathy-map-view.c
+++ b/src/empathy-map-view.c
@@ -26,7 +26,7 @@
 
 #include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 #include <telepathy-glib/util.h>
 
 #include <libempathy/empathy-contact.h>
@@ -83,7 +83,7 @@ map_view_marker_update_position (ChamplainMarker *marker,
   if (location == NULL ||
       g_hash_table_size (location) == 0)
   {
-    clutter_actor_hide (CLUTTER_ACTOR (marker));
+    champlain_base_marker_animate_out (CHAMPLAIN_BASE_MARKER (marker));
     return;
   }
 
@@ -103,8 +103,8 @@ map_view_marker_update_position (ChamplainMarker *marker,
     }
   lon = g_value_get_double (value);
 
-  clutter_actor_show (CLUTTER_ACTOR (marker));
   champlain_base_marker_set_position (CHAMPLAIN_BASE_MARKER (marker), lat, lon);
+  champlain_base_marker_animate_in (CHAMPLAIN_BASE_MARKER (marker));
 }
 
 static void
@@ -171,7 +171,7 @@ map_view_contacts_foreach (GtkTreeModel *model,
   gchar *date;
   gchar *label;
   GValue *gtime;
-  time_t time;
+  time_t loctime;
 
   gtk_tree_model_get (model, iter, EMPATHY_CONTACT_LIST_STORE_COL_CONTACT,
      &contact, -1);
@@ -181,7 +181,7 @@ map_view_contacts_foreach (GtkTreeModel *model,
 
   location = empathy_contact_get_location (contact);
 
-  if (location == NULL)
+  if (location == NULL || g_hash_table_size (location) == 0)
     return FALSE;
 
   marker = champlain_marker_new ();
@@ -190,7 +190,8 @@ map_view_contacts_foreach (GtkTreeModel *model,
   if (avatar != NULL)
     {
       texture = clutter_texture_new ();
-      gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar);
+      gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar,
+          NULL);
       champlain_marker_set_image (CHAMPLAIN_MARKER (marker), texture);
       g_object_unref (avatar);
     }
@@ -201,10 +202,18 @@ map_view_contacts_foreach (GtkTreeModel *model,
   gtime = g_hash_table_lookup (location, EMPATHY_LOCATION_TIMESTAMP);
   if (gtime != NULL)
     {
-      time = g_value_get_int64 (gtime);
-      date = empathy_time_to_string_relative (time);
+      time_t now;
+
+      loctime = g_value_get_int64 (gtime);
+      date = empathy_time_to_string_relative (loctime);
       label = g_strconcat ("<b>", name, "</b>\n<small>", date, "</small>", NULL);
       g_free (date);
+
+      now = time (NULL);
+
+      /* if location is older than a week */
+      if (now - loctime > (60 * 60 * 24 * 7))
+        clutter_actor_set_opacity (CLUTTER_ACTOR (marker), 0.75 * 255);
     }
   else
     {
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 65c496547..d277273e9 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -29,6 +29,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <telepathy-glib/dbus.h>
+#include <telepathy-glib/util.h>
 
 #include <libempathy/empathy-utils.h>
 
@@ -557,7 +558,7 @@ preferences_languages_load_foreach (GtkTreeModel  *model,
 	}
 
 	for (i = 0, lang = languages[i]; lang; lang = languages[++i]) {
-		if (strcmp (lang, code) == 0) {
+		if (!tp_strdiff (lang, code)) {
 			found = TRUE;
 		}
 	}
@@ -616,7 +617,7 @@ preferences_widget_sync_string (const gchar *key, GtkWidget *widget)
 		if (GTK_IS_ENTRY (widget)) {
 			gtk_entry_set_text (GTK_ENTRY (widget), value);
 		} else if (GTK_IS_RADIO_BUTTON (widget)) {
-			if (strcmp (key, EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM) == 0) {
+			if (!tp_strdiff (key, EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM)) {
 				GType        type;
 				GEnumClass  *enum_class;
 				GEnumValue  *enum_value;
@@ -877,7 +878,7 @@ preferences_radio_button_toggled_cb (GtkWidget *button,
 
 	key = g_object_get_data (G_OBJECT (button), "key");
 
-	if (key && strcmp (key, EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM) == 0) {
+	if (!tp_strdiff (key, EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM)) {
 		GSList      *group;
 		GType        type;
 		GEnumClass  *enum_class;
@@ -897,7 +898,7 @@ preferences_radio_button_toggled_cb (GtkWidget *button,
 		}
 
 		value = enum_value->value_nick;
-	} else if (key && strcmp (key, EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM) == 0) {
+	} else if (!tp_strdiff (key, EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM)) {
            return;
 	}
 
@@ -941,9 +942,9 @@ preferences_theme_notify_cb (EmpathyConf *conf,
 					    COL_COMBO_PATH, &path,
 					    -1);
 
-			if (strcmp (name, conf_name) == 0) {
-				if (strcmp (name, "adium") != 0 ||
-				    strcmp (path, conf_path) == 0) {
+			if (!tp_strdiff (name, conf_name)) {
+				if (tp_strdiff (name, "adium") ||
+				    !tp_strdiff (path, conf_path)) {
 					found = TRUE;
 					gtk_combo_box_set_active_iter (combo, &iter);
 					g_free (name);
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index a383607aa..1e3a42580 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -434,7 +434,7 @@
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="wrap">True</property>
-                                    <property name="label" translatable="yes">Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will have a random value added (&#xB1;0.25&#xB0;).</property>
+                                    <property name="label" translatable="yes">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.</property>
                                     <attributes>
                                       <attribute name="scale" value="0.8"/>
                                     </attributes>
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index aca2d85c2..430c93343 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -23,6 +23,8 @@
 
 #include <string.h>
 
+#include <glib.h>
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -136,30 +138,37 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 	}
 
 	if (priv->event) {
-		pixbuf = empathy_misc_get_pixbuf_for_notification (priv->event->contact,
-								   priv->event->icon_name);
+		gchar *message_esc = NULL;
+
+		if (priv->event->message != NULL)
+			message_esc = g_markup_escape_text (priv->event->message, -1);
 
 		if (priv->notification) {
 			notify_notification_update (priv->notification,
-						    priv->event->header, priv->event->message,
+						    priv->event->header, message_esc,
 						    NULL);
 		} else {
 			priv->notification = notify_notification_new_with_status_icon
-				(priv->event->header, priv->event->message, NULL, priv->icon);
+				(priv->event->header, message_esc, NULL, priv->icon);
 			notify_notification_set_timeout (priv->notification,
 							 NOTIFY_EXPIRES_DEFAULT);
 
 			g_signal_connect (priv->notification, "closed",
 					  G_CALLBACK (status_icon_notification_closed_cb), icon);
+		}
 
- 		}
-		/* if icon doesn't exist libnotify will crash */
-		if (pixbuf != NULL)
+		pixbuf = empathy_misc_get_pixbuf_for_notification (priv->event->contact,
+								   priv->event->icon_name);
+
+		if (pixbuf != NULL) {
 			notify_notification_set_icon_from_pixbuf (priv->notification,
 							  pixbuf);
+			g_object_unref (pixbuf);
+		}
+
 		notify_notification_show (priv->notification, NULL);
 
-		g_object_unref (pixbuf);
+		g_free (message_esc);
 	} else {
 		notification_close_helper (priv);
 	}
@@ -173,12 +182,12 @@ status_icon_update_tooltip (EmpathyStatusIcon *icon)
 
 	if (priv->event) {
 		if (priv->event->message != NULL)
-				tooltip = g_strdup_printf ("<i>%s</i>\n%s",
-							   priv->event->header,
-							   priv->event->message);
+				tooltip = g_markup_printf_escaped ("<i>%s</i>\n%s",
+								   priv->event->header,
+								   priv->event->message);
 		else
-				tooltip = g_strdup_printf ("<i>%s</i>",
-							   priv->event->header);
+				tooltip = g_markup_printf_escaped ("<i>%s</i>",
+								   priv->event->header);
 		gtk_status_icon_set_tooltip_markup (priv->icon, tooltip);
 	} else {
 		tooltip = g_strdup (empathy_idle_get_status (priv->idle));
diff --git a/src/empathy.c b/src/empathy.c
index 3cc494a94..718fe70bf 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -33,7 +33,7 @@
 #include <unique/unique.h>
 
 #if HAVE_LIBCHAMPLAIN
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 #endif
 
 #include <libebook/e-book.h>
@@ -49,6 +49,7 @@
 #include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-account-settings.h>
+#include <libempathy/empathy-connectivity.h>
 #include <libempathy/empathy-account-manager.h>
 #include <libempathy/empathy-connection-managers.h>
 #include <libempathy/empathy-debugger.h>
@@ -148,19 +149,6 @@ dispatch_cb (EmpathyDispatcher *dispatcher,
 	}
 }
 
-static void
-use_nm_notify_cb (EmpathyConf *conf,
-		  const gchar *key,
-		  gpointer     user_data)
-{
-	EmpathyIdle *idle = user_data;
-	gboolean     use_nm;
-
-	if (empathy_conf_get_bool (conf, key, &use_nm)) {
-		empathy_idle_set_use_nm (idle, use_nm);
-	}
-}
-
 /* Salut account creation */
 static gboolean
 should_create_salut_account (void)
@@ -229,6 +217,19 @@ salut_account_created (GObject *source,
 }
 
 static void
+use_conn_notify_cb (EmpathyConf *conf,
+		    const gchar *key,
+		    gpointer     user_data)
+{
+	EmpathyConnectivity *connectivity = user_data;
+	gboolean     use_conn;
+
+	if (empathy_conf_get_bool (conf, key, &use_conn)) {
+		empathy_connectivity_set_use_conn (connectivity, use_conn);
+	}
+}
+
+static void
 create_salut_account_if_needed (EmpathyConnectionManagers *managers)
 {
 	EmpathyAccountSettings  *settings;
@@ -535,6 +536,7 @@ main (int argc, char *argv[])
 	EmpathyFTFactory  *ft_factory;
 	GtkWidget         *window;
 	EmpathyIdle       *idle;
+	EmpathyConnectivity *connectivity;
 	gboolean           autoconnect = TRUE;
 	gboolean           no_connect = FALSE;
 	gboolean           hide_contact_list = FALSE;
@@ -637,9 +639,13 @@ main (int argc, char *argv[])
 	/* Setting up Idle */
 	idle = empathy_idle_dup_singleton ();
 	empathy_idle_set_auto_away (idle, TRUE);
-	use_nm_notify_cb (empathy_conf_get (), EMPATHY_PREFS_USE_NM, idle);
-	empathy_conf_notify_add (empathy_conf_get (), EMPATHY_PREFS_USE_NM,
-				 use_nm_notify_cb, idle);
+
+	/* Setting up Connectivity */
+	connectivity = empathy_connectivity_dup_singleton ();
+	use_conn_notify_cb (empathy_conf_get (), EMPATHY_PREFS_USE_CONN,
+			    connectivity);
+	empathy_conf_notify_add (empathy_conf_get (), EMPATHY_PREFS_USE_CONN,
+				 use_conn_notify_cb, connectivity);
 
 	/* Autoconnect */
 	empathy_conf_get_bool (empathy_conf_get (),
@@ -699,6 +705,7 @@ main (int argc, char *argv[])
 	empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_OFFLINE);
 
 	g_object_unref (idle);
+	g_object_unref (connectivity);
 	g_object_unref (icon);
 	g_object_unref (account_manager);
 	g_object_unref (log_manager);
author	Sjoerd Simons <sjoerd.simons@collabora.co.uk>	2009-08-22 00:37:48 +0800
committer	Sjoerd Simons <sjoerd.simons@collabora.co.uk>	2009-08-22 00:37:48 +0800
commit	84e30dab1428affe335ef904377d07f8b5fdeb66 (patch)
tree	fee9c8ec124a2b5804f6bb4ee31772db56a6e374
parent	fd8e9c5dc2584055177c7a79021cdd53ca431c22 (diff)
parent	3803736b4326d4bc00d58ccd25f910907f0b4521 (diff)
download	gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.gz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.bz2 gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.lz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.xz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.zst gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.zip