Merge branch 'master' into mc5

18 files changed, 2135 insertions, 164 deletions

diff --git a/NEWS b/NEWS
index 30fd2c733..b638a3e02 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,37 @@
+NEW in 2.27.5
+==============
+Bugs fixed:
+ - Fixed #459161, Remove should be insensitive for salut contact
+ - Fixed #494007, Empathy should conform to the XDG directory specification (Frédéric Péters)
+ - Fixed #545282, [accessibility] the names of items in friends list are not correct (Frédéric Péters)
+ - Fixed #547327, Wrongly sized dialog
+ - Fixed #579724, Enable building with shave
+ - Fixed #579940, Show a notification when a buddy goes to offline or online
+ - Fixed #584120, "Video call" button shouldn't be sensitive in Contact menu if contact supports only audio
+ - Fixed #584122, "Send Video" should be disable if contact doesn't support video
+ - Fixed #586967, Remeber chat window size and configuration (Nicolò Chieffo)
+ - Fixed #588498, Mark muc tabs in which you are highlighted differently (Abner Silva)
+ - Fixed #588662, Add gconf option to enable usage of the WebKit inspector, for adium themes.
+ - Fixed #588810, respect the button-images setting (Matthias Clasen)
+ - Fixed #588886, crash when selecting an image and clicking "open link" in adium (Gustavo Noronha Silva)
+ - Fixed #589091, Feature Share My Desktop for Empathy
+ - Fixed #589830, Online status combo box items are not correctly spoken with the Orca screen reader. (Frédéric Péters)
+ - Fixed #589846, wrap text in contact label status (Nicolò Chieffo)
+
+Translations:
+ - Updated ar Translation (Khaled Hosny)
+ - Updated be Translation (Alexander Nyakhaychyk)
+ - Updated es Translation (Jorge González)
+ - Updated et Translation (Priit Laes)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated lt Translation (Žygimantas Beručka)
+ - Updated sv Translation (Daniel Nylander)
+ - Updated ta Translation (drtvasudevan)
+ - Updated zh_CN Translation (Aron Xu)
+
+Documentation translations:
+ - Updated de Documentation translation (Mario Blättermann)
+
 NEW in 2.27.4
 ==============
 Bugs fixed:
diff --git a/configure.ac b/configure.ac
index f54e0247b..62e08f0a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 2.27.5, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 2.27.90, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
@@ -9,12 +9,12 @@ AC_COPYRIGHT([
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=27
-LIBEMPATHY_AGE=0
+LIBEMPATHY_CURRENT=28
+LIBEMPATHY_AGE=1
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=25
-LIBEMPATHY_GTK_AGE=0
+LIBEMPATHY_GTK_CURRENT=26
+LIBEMPATHY_GTK_AGE=1
 LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)
diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in
index d7feab251..c22206b84 100644
--- a/data/empathy.desktop.in.in
+++ b/data/empathy.desktop.in.in
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Version=1.0
-_Name=Empathy Instant Messenger
-_Comment=Send and receive instant messages
+_Name=Empathy IM Client
+_Comment=Send and receive messages
 Exec=empathy
 Icon=empathy
 StartupNotify=false
 Terminal=false
 Type=Application
-Categories=GNOME;GTK;Network;InstantMessaging;
+Categories=GNOME;GTK;Network;IM;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=empathy
 X-GNOME-Bugzilla-Component=General
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index bfe64799c..f85c616b0 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -366,7 +366,7 @@
       <applyto>/apps/empathy/conversation/enable_webkit_developer_tools</applyto>
       <owner>empathy</owner>
       <type>bool</type>
-      <default></default>
+      <default>false</default>
       <locale name="C">
          <short>Enable WebKit Developer Tools</short>
          <long>
diff --git a/empathy.doap b/empathy.doap
index b1d14fa30..63a18444e 100644
--- a/empathy.doap
+++ b/empathy.doap
@@ -4,8 +4,8 @@
          xmlns:foaf="http://xmlns.com/foaf/0.1/"
          xmlns:gnome="http://api.gnome.org/doap-extensions#"
          xmlns="http://usefulinc.com/ns/doap#">
-  <name xml:lang="en">Empathy Instant Messenger</name>
-  <shortdesc xml:lang="en">Send and receive instant messages</shortdesc>
+  <name xml:lang="en">Empathy IM Client</name>
+  <shortdesc xml:lang="en">Send and receive messages</shortdesc>
   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
 
   <homepage rdf:resource="http://live.gnome.org/Empathy" />
diff --git a/help/C/empathy.xml b/help/C/empathy.xml
index 7eea5e9fd..e6a1a7282 100644
--- a/help/C/empathy.xml
+++ b/help/C/empathy.xml
@@ -228,7 +228,7 @@
 	    <para>Choose 
 	      <menuchoice>
 		<guisubmenu>Internet</guisubmenu>
-		<guimenuitem>Empathy Instant Messenger</guimenuitem>
+		<guimenuitem>Empathy IM Client</guimenuitem>
 	      </menuchoice>.
 	    </para>
 	  </listitem>
diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h
index 937a4bf9c..2383a7edf 100644
--- a/libempathy-gtk/empathy-conf.h
+++ b/libempathy-gtk/empathy-conf.h
@@ -68,6 +68,7 @@ struct _EmpathyConfClass {
 #define EMPATHY_PREFS_CHAT_SPELL_CHECKER_ENABLED   EMPATHY_PREFS_PATH "/conversation/spell_checker_enabled"
 #define EMPATHY_PREFS_CHAT_NICK_COMPLETION_CHAR    EMPATHY_PREFS_PATH "/conversation/nick_completion_char"
 #define EMPATHY_PREFS_CHAT_AVATAR_IN_ICON          EMPATHY_PREFS_PATH "/conversation/avatar_in_icon"
+#define EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS  EMPATHY_PREFS_PATH "/conversation/enable_webkit_developer_tools"
 #define EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS     EMPATHY_PREFS_PATH "/ui/separate_chat_windows"
 #define EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN        EMPATHY_PREFS_PATH "/ui/main_window_hidden"
 #define EMPATHY_PREFS_UI_AVATAR_DIRECTORY          EMPATHY_PREFS_PATH "/ui/avatar_directory"
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index 725011c0b..ad466da50 100644
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -342,7 +342,8 @@ can_add_contact_to_account (EmpathyAccount *account,
 	}
 
 	contact_manager = empathy_contact_manager_dup_singleton ();
-	result = empathy_contact_manager_get_flags_for_connection (contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
+	result = empathy_contact_manager_get_flags_for_connection (
+		contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
 	g_object_unref (contact_manager);
 
 	return result;
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index a4c1d7ab9..ea386e14a 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -858,7 +858,7 @@ contact_list_store_add_contact (EmpathyContactListStore *store,
 	GtkTreeIter                 iter;
 	GList                      *groups = NULL, *l;
 	TpConnection               *connection;
-	EmpathyContactListFlags     flags;
+	EmpathyContactListFlags     flags = 0;
 
 	priv = GET_PRIV (store);
 
@@ -875,10 +875,7 @@ contact_list_store_add_contact (EmpathyContactListStore *store,
 	if (EMPATHY_IS_CONTACT_MANAGER (priv->list)) {
 		flags = empathy_contact_manager_get_flags_for_connection (
 			EMPATHY_CONTACT_MANAGER (priv->list), connection);
-	} else {
-		flags = 0;
 	}
-
 	/* If no groups just add it at the top level. */
 	if (!groups) {
 		gtk_tree_store_append (GTK_TREE_STORE (store), &iter, NULL);
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index a9a673c43..5b2e2de91 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -596,6 +596,10 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
 {
   /* Setup label_status as a KludgeLabel */
   information->label_status = empathy_kludge_label_new ("");
+  gtk_label_set_line_wrap_mode (GTK_LABEL (information->label_status),
+                                PANGO_WRAP_WORD_CHAR);
+  gtk_label_set_line_wrap (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-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index e04771597..2889aa304 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -106,8 +106,11 @@ theme_adium_update_enable_webkit_developer_tools (EmpathyThemeAdium *theme)
 	WebKitWebView  *web_view = WEBKIT_WEB_VIEW (theme);
 	gboolean        enable_webkit_developer_tools;
 
-	if (empathy_conf_get_bool (empathy_conf_get (), "/apps/empathy/conversation/enable_webkit_developer_tools", &enable_webkit_developer_tools) == FALSE)
+	if (!empathy_conf_get_bool (empathy_conf_get (),
+				    EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS,
+				    &enable_webkit_developer_tools)) {
 		return;
+	}
 
 	g_object_set (G_OBJECT (webkit_web_view_get_settings (web_view)),
 		      "enable-developer-extras",
@@ -881,29 +884,22 @@ theme_adium_dispose (GObject *object)
 
 static gboolean
 theme_adium_inspector_show_window_cb (WebKitWebInspector *inspector,
-				      gpointer            user_data)
+				      EmpathyThemeAdium  *theme)
 {
-	EmpathyThemeAdium     *theme = user_data;
 	EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
 
-	gtk_widget_show_all (priv->inspector_window);
+	if (priv->inspector_window) {
+		gtk_widget_show_all (priv->inspector_window);
+	}
 
 	return TRUE;
 }
 
 static gboolean
 theme_adium_inspector_close_window_cb (WebKitWebInspector *inspector,
-				       gpointer            user_data)
+				       EmpathyThemeAdium  *theme)
 {
-	EmpathyThemeAdium     *theme = user_data;
-	EmpathyThemeAdiumPriv *priv;
-
-	/* We may be called too late - when the theme has already been
-	 * destroyed */
-	if (!theme)
-		return FALSE;
-
-	priv = GET_PRIV (theme);
+	EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
 
 	if (priv->inspector_window) {
 		gtk_widget_hide (priv->inspector_window);
@@ -914,27 +910,36 @@ theme_adium_inspector_close_window_cb (WebKitWebInspector *inspector,
 
 static WebKitWebView *
 theme_adium_inspect_web_view_cb (WebKitWebInspector *inspector,
-				 WebKitWebView *web_view,
-				 gpointer data)
+				 WebKitWebView      *web_view,
+				 EmpathyThemeAdium  *theme)
 {
-	EmpathyThemeAdiumPriv *priv = GET_PRIV (EMPATHY_THEME_ADIUM (web_view));
+	EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
 	GtkWidget             *scrolled_window;
 	GtkWidget             *inspector_web_view;
 
 	if (!priv->inspector_window) {
+		/* Create main window */
 		priv->inspector_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 		gtk_window_set_default_size (GTK_WINDOW (priv->inspector_window),
 					     800, 600);
-
 		g_signal_connect (priv->inspector_window, "delete-event",
 				  G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 
+		/* Pack a scrolled window */
 		scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-		gtk_container_add (GTK_CONTAINER (priv->inspector_window), scrolled_window);
-
+		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+						GTK_POLICY_AUTOMATIC,
+						GTK_POLICY_AUTOMATIC);
+		gtk_container_add (GTK_CONTAINER (priv->inspector_window),
+				   scrolled_window);
+		gtk_widget_show  (scrolled_window);
+
+		/* Pack a webview in the scrolled window. That webview will be
+		 * used to render the inspector tool.  */
 		inspector_web_view = webkit_web_view_new ();
-		gtk_container_add (GTK_CONTAINER (scrolled_window), inspector_web_view);
+		gtk_container_add (GTK_CONTAINER (scrolled_window),
+				   inspector_web_view);
+		gtk_widget_show (scrolled_window);
 
 		return WEBKIT_WEB_VIEW (inspector_web_view);
 	}
@@ -949,35 +954,42 @@ theme_adium_constructed (GObject *object)
 	gchar                 *basedir_uri;
 	const gchar           *font_family = NULL;
 	gint                   font_size = 0;
+	WebKitWebView         *webkit_view = WEBKIT_WEB_VIEW (object);
 	WebKitWebSettings     *webkit_settings;
+	WebKitWebInspector    *webkit_inspector;
 
 	/* Set default settings */
 	font_family = tp_asv_get_string (priv->data->info, "DefaultFontFamily");
 	font_size = tp_asv_get_int32 (priv->data->info, "DefaultFontSize", NULL);
-	webkit_settings = webkit_web_settings_new ();
+	webkit_settings = webkit_web_view_get_settings (webkit_view);
 	if (font_family) {
-		g_object_set (G_OBJECT (webkit_settings), "default-font-family", font_family, NULL);
+		g_object_set (webkit_settings,
+			      "default-font-family", font_family,
+			      NULL);
 	}
 	if (font_size) {
-		g_object_set (G_OBJECT (webkit_settings), "default-font-size", font_size, NULL);
+		g_object_set (webkit_settings,
+			      "default-font-size", font_size,
+			      NULL);
 	}
 
-	g_signal_connect (webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (object)), "inspect-web-view",
-			  G_CALLBACK (theme_adium_inspect_web_view_cb), NULL);
-
-	g_signal_connect (webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (object)), "show-window",
-			  G_CALLBACK (theme_adium_inspector_show_window_cb), object);
-
-	g_signal_connect (webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (object)), "close-window",
-			  G_CALLBACK (theme_adium_inspector_close_window_cb), NULL);
+	/* Setup webkit inspector */
+	webkit_inspector = webkit_web_view_get_inspector (webkit_view);
+	g_signal_connect (webkit_inspector, "inspect-web-view",
+			  G_CALLBACK (theme_adium_inspect_web_view_cb),
+			  object);
+	g_signal_connect (webkit_inspector, "show-window",
+			  G_CALLBACK (theme_adium_inspector_show_window_cb),
+			  object);
+	g_signal_connect (webkit_inspector, "close-window",
+			  G_CALLBACK (theme_adium_inspector_close_window_cb),
+			  object);
 
 	/* Load template */
 	basedir_uri = g_strconcat ("file://", priv->data->basedir, NULL);
 	webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (object),
 					  priv->data->template_html,
 					  basedir_uri);
-
-	g_object_unref (webkit_settings);
 	g_free (basedir_uri);
 }
 
@@ -1067,7 +1079,7 @@ empathy_theme_adium_init (EmpathyThemeAdium *theme)
 
 	priv->notify_enable_webkit_developer_tools_id =
 		empathy_conf_notify_add (empathy_conf_get (),
-					 "/apps/empathy/conversation/enable_webkit_developer_tools",
+					 EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS,
 					 theme_adium_notify_enable_webkit_developer_tools_cb,
 					 theme);
 
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index b697b4d0b..3dcefdcfb 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1351,7 +1351,7 @@ empathy_url_show (GtkWidget *parent,
 	gchar  *real_url;
 	GError *error = NULL;
 
-	g_return_if_fail (GTK_IS_WIDGET (parent));
+	g_return_if_fail (parent == NULL || GTK_IS_WIDGET (parent));
 	g_return_if_fail (url != NULL);
 
 	real_url = fixup_url (url);
@@ -1359,7 +1359,7 @@ empathy_url_show (GtkWidget *parent,
 		url = real_url;
 	}
 
-	gtk_show_uri (gtk_widget_get_screen (parent), url,
+	gtk_show_uri (parent ? gtk_widget_get_screen (parent) : NULL, url,
 		      gtk_get_current_event_time (), &error);
 
 	if (error) {
diff --git a/po/LINGUAS b/po/LINGUAS
index b1de6b5a5..27f3509dc 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -16,6 +16,7 @@ en_CA
 en_GB
 eo
 es
+et
 eu
 fi
 fr
diff --git a/po/et.po b/po/et.po
new file mode 100644
index 000000000..edff3cc18
--- /dev/null
+++ b/po/et.po
@@ -0,0 +1,1917 @@
+# Empathy'i eesti keele tõlge.
+# Estonian translation of Pidgin.
+#
+# 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"
+"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"
+"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"
+
+#, fuzzy
+msgid "Send and receive instant messages"
+msgstr "Kõiki välksõnumeid _logitakse"
+
+msgid "Always open a separate chat window for new chats."
+msgstr ""
+
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+
+#, fuzzy
+msgid "Chat window theme"
+msgstr "_Jututoaakendele"
+
+msgid ""
+"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+msgstr ""
+
+#, fuzzy
+msgid "Compact contact list"
+msgstr "Pole nimekirjas"
+
+msgid "Contact list sort criterium"
+msgstr ""
+
+msgid "Default directory to select an avatar image from"
+msgstr ""
+
+#, fuzzy
+msgid "Disable popup notifications when away"
+msgstr "Tippimismärguande lubamine"
+
+#, fuzzy
+msgid "Disable sounds when away"
+msgstr "Keelatakse minu eemaloleku korral"
+
+msgid "Empathy can publish the user's location"
+msgstr ""
+
+msgid "Empathy can use the GPS to guess the location"
+msgstr ""
+
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+
+msgid "Empathy can use the network to guess the location"
+msgstr ""
+
+msgid "Empathy default download folder"
+msgstr ""
+
+msgid "Empathy has asked about importing accounts"
+msgstr ""
+
+msgid "Empathy should auto-connect on startup"
+msgstr ""
+
+msgid "Empathy should reduce the location's accuracy"
+msgstr ""
+
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+
+#, fuzzy
+msgid "Enable popup notifications for new messages"
+msgstr "Tippimismärguande lubamine"
+
+msgid "Enable spell checker"
+msgstr ""
+
+#, fuzzy
+msgid "Hide main window"
+msgstr "Avatakse välksõnumi aken"
+
+#, fuzzy
+msgid "Hide the main window."
+msgstr "Olemasolevasse aknasse"
+
+msgid "NetworkManager should be used"
+msgstr ""
+
+msgid "Nick completed character"
+msgstr ""
+
+#, fuzzy
+msgid "Open new chats in separate windows"
+msgstr "_Välksõnumeid ja vestlusi näidatakse kaartidega aknas"
+
+msgid "Path of the adium theme to use"
+msgstr ""
+
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr ""
+
+#, fuzzy
+msgid "Play a sound for incoming messages"
+msgstr "Sissetulevatel sõnumitel _näidatakse vormindust"
+
+#, fuzzy
+msgid "Play a sound for new conversations"
+msgstr "%s lahkus vestlusest."
+
+msgid "Play a sound for outgoing messages"
+msgstr ""
+
+msgid "Play a sound when a contact logs in"
+msgstr ""
+
+msgid "Play a sound when a contact logs out"
+msgstr ""
+
+msgid "Play a sound when we log in"
+msgstr "Sisselogimisel mängitakse heli"
+
+msgid "Play a sound when we log out"
+msgstr "Väljalogimisel mängitakse heli"
+
+msgid "Popup notifications if the chat isn't focused"
+msgstr ""
+
+msgid "Popup notifications when a contact sign in"
+msgstr ""
+
+msgid "Popup notifications when a contact sign out"
+msgstr ""
+
+msgid "Salut account is created"
+msgstr ""
+
+msgid "Show avatars"
+msgstr ""
+
+msgid "Show contact list in rooms"
+msgstr ""
+
+msgid "Show hint about closing the main window"
+msgstr ""
+
+msgid "Show offline contacts"
+msgstr "Ühendamata sõpru näidatakse"
+
+msgid "Spell checking languages"
+msgstr ""
+
+msgid "The default folder to save file transfers in."
+msgstr ""
+
+msgid "The last directory that an avatar image was chosen from."
+msgstr ""
+
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr ""
+
+msgid "Use graphical smileys"
+msgstr ""
+
+msgid "Use notification sounds"
+msgstr "Teatehelisid esitatakse"
+
+msgid "Use theme for chat rooms"
+msgstr ""
+
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr ""
+
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr ""
+
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr ""
+
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr ""
+
+msgid ""
+"Whether or not Empathy has asked about importing accounts from other "
+"programs."
+msgstr ""
+
+msgid ""
+"Whether or not Empathy should automatically log in to your accounts on "
+"startup."
+msgstr ""
+
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr ""
+
+msgid ""
+"Whether or not Empathy should use the avatar of the contact as the chat "
+"window icon."
+msgstr ""
+
+msgid ""
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr ""
+
+msgid ""
+"Whether or not the network manager should be used to automatically "
+"disconnect/reconnect."
+msgstr ""
+
+msgid ""
+"Whether or not to check words typed against the languages you want to check "
+"with."
+msgstr ""
+
+msgid ""
+"Whether or not to convert smileys into graphical images in conversations."
+msgstr ""
+
+msgid ""
+"Whether or not to play a sound to notify for contacts logging in the network."
+msgstr ""
+
+msgid ""
+"Whether or not to play a sound to notify for contacts logging off the "
+"network."
+msgstr ""
+
+msgid "Whether or not to play a sound to notify for events."
+msgstr ""
+
+msgid "Whether or not to play a sound to notify for incoming messages."
+msgstr ""
+
+msgid "Whether or not to play a sound to notify for new conversations."
+msgstr ""
+
+msgid "Whether or not to play a sound to notify for outgoing messages."
+msgstr ""
+
+msgid "Whether or not to play a sound when logging in a network."
+msgstr ""
+
+msgid "Whether or not to play a sound when logging off a network."
+msgstr ""
+
+msgid "Whether or not to play sound notifications when away or busy."
+msgstr ""
+
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr ""
+
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr ""
+
+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 ""
+
+msgid ""
+"Whether or not to show a popup notification when receiving a new message."
+msgstr ""
+
+msgid ""
+"Whether or not to show avatars for contacts in the contact list and chat "
+"windows."
+msgstr ""
+
+msgid "Whether or not to show contacts that are offline in the contact list."
+msgstr ""
+
+msgid "Whether or not to show popup notifications when away or busy."
+msgstr ""
+
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr ""
+
+msgid ""
+"Whether or not to show the message dialog about closing the main window with "
+"the 'x' button in the title bar."
+msgstr ""
+
+msgid "Whether to show the contact list in compact mode or not."
+msgstr ""
+
+msgid "Whether to use the theme for chat rooms or not."
+msgstr ""
+
+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 ""
+
+msgid "The hash of the received file and the sent one do not match"
+msgstr ""
+
+msgid "File transfer not supported by remote contact"
+msgstr ""
+
+#, fuzzy
+msgid "The selected file is not a regular file"
+msgstr "Valitud fail pole korrektne plugin."
+
+#, fuzzy
+msgid "The selected file is empty"
+msgstr "Kasutajaprofiil on tühi."
+
+msgid "People nearby"
+msgstr ""
+
+#, fuzzy
+msgid "Socket type not supported"
+msgstr "Riik pole toetatud."
+
+#, fuzzy
+msgid "No reason was specified"
+msgstr "Põhjendust pole määratud."
+
+msgid "The change in state was requested"
+msgstr ""
+
+#, fuzzy
+msgid "You canceled the file transfer"
+msgstr "%s katkestas failiülekande"
+
+#, fuzzy
+msgid "The other participant canceled the file transfer"
+msgstr "%s 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 ""
+
+msgid "Unknown reason"
+msgstr "Tundmatu põhjus"
+
+msgid "Available"
+msgstr "Saadaval"
+
+msgid "Busy"
+msgstr "Hõivatud"
+
+msgid "Away"
+msgstr "Eemal"
+
+msgid "Hidden"
+msgstr "Nähtamatu"
+
+msgid "Offline"
+msgstr "Ühendamata"
+
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d sekund tagasi"
+msgstr[1] "%d sekundit tagasi"
+
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minut tagasi"
+msgstr[1] "%d minutit tagasi"
+
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d tund tagasi"
+msgstr[1] "%d tundi tagasi"
+
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d päev tagasi"
+msgstr[1] "%d päeva tagasi"
+
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "in the future"
+msgstr ""
+
+msgid "All"
+msgstr "Kõik"
+
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+msgid "Advanced"
+msgstr "Laiendatud"
+
+#, fuzzy
+msgid "Pass_word:"
+msgstr "Parool:"
+
+#, fuzzy
+msgid "Screen _Name:"
+msgstr "Eesnimi"
+
+msgid "_Port:"
+msgstr "_Port:"
+
+msgid "_Server:"
+msgstr "_Server:"
+
+#, fuzzy
+msgid "Login I_D:"
+msgstr "Logi sisse"
+
+msgid "ICQ _UIN:"
+msgstr ""
+
+#, fuzzy
+msgid "_Charset:"
+msgstr "Ka_nal:"
+
+msgid "New Network"
+msgstr "Uus võrk"
+
+#, fuzzy
+msgid "Charset:"
+msgstr "Vestlus"
+
+msgid "Network"
+msgstr "Võrk"
+
+msgid "Network:"
+msgstr "Võrk:"
+
+msgid "Nickname:"
+msgstr "Hüüdnimi:"
+
+msgid "Password:"
+msgstr "Parool:"
+
+msgid "Quit message:"
+msgstr "Lahkumise teade:"
+
+msgid "Real name:"
+msgstr "Pärisnimi:"
+
+msgid "Servers"
+msgstr "Serverid"
+
+#, fuzzy
+msgid "Override server settings"
+msgstr "Vigased proksi sätted"
+
+msgid "Pri_ority:"
+msgstr "_Tähtsus:"
+
+msgid "Reso_urce:"
+msgstr "_Vahend:"
+
+msgid "Use old SS_L"
+msgstr "Kasutatakse _vana SSL-i"
+
+msgid "_Encryption required (TLS/SSL)"
+msgstr ""
+
+msgid "_Ignore SSL certificate errors"
+msgstr "SSL-sertifikaadi vigu _eiratakse"
+
+msgid "_Email:"
+msgstr "_E-post:"
+
+msgid "_First Name:"
+msgstr "_Eesnimi:"
+
+msgid "_Jabber ID:"
+msgstr ""
+
+msgid "_Last Name:"
+msgstr "_Perekonnanimi:"
+
+msgid "_Nickname:"
+msgstr "_Hüüdnimi:"
+
+#, fuzzy
+msgid "_Published Name:"
+msgstr "Isiklik mobiiltelefon"
+
+#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
+msgid "Discover STUN"
+msgstr ""
+
+msgid "STUN Server:"
+msgstr "STUN server:"
+
+msgid "STUN port:"
+msgstr "STUN port:"
+
+msgid "_Username:"
+msgstr "_Kasutajanimi:"
+
+#, fuzzy
+msgid "Use _Yahoo Japan"
+msgstr "Jaapani Yahoo"
+
+#, fuzzy
+msgid "Yahoo I_D:"
+msgstr "Yahoo! ID"
+
+#, fuzzy
+msgid "_Ignore conference and chatroom invitations"
+msgstr "Konverentside ja jututubade kutseid eiratakse"
+
+#, fuzzy
+msgid "_Room List locale:"
+msgstr "Tubade nimekiri"
+
+#, fuzzy
+msgid "Couldn't convert image"
+msgstr "Pole võimalik ühenduda"
+
+msgid "None of the accepted image formats is supported on your system"
+msgstr ""
+
+msgid "Select Your Avatar Image"
+msgstr ""
+
+msgid "No Image"
+msgstr "Pilti pole"
+
+msgid "Images"
+msgstr "Pildid"
+
+msgid "All Files"
+msgstr "Kõik failid"
+
+msgid "Click to enlarge"
+msgstr ""
+
+#, fuzzy
+msgid "Failed to reconnect this chat"
+msgstr "Tõrge vestlusega ühinemisel"
+
+#, fuzzy
+msgid "Unsupported command"
+msgstr "Toetamata kooditabel"
+
+msgid "offline"
+msgstr "ühendamata"
+
+#, fuzzy
+msgid "invalid contact"
+msgstr "Vigane nimi"
+
+msgid "permission denied"
+msgstr "ligipääs keelatud"
+
+msgid "too long message"
+msgstr "liiga pikk sõnum"
+
+msgid "not implemented"
+msgstr "pole veel teostatud"
+
+msgid "unknown"
+msgstr "tundmatu"
+
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Viga teate '%s' saatmisel: %s"
+
+#, c-format
+msgid "Topic set to: %s"
+msgstr "Teema on: %s"
+
+msgid "No topic defined"
+msgstr "Teemat pole seatud"
+
+msgid "(No Suggestions)"
+msgstr ""
+
+msgid "Insert Smiley"
+msgstr "Tujunäo lisamine"
+
+#. send button
+msgid "_Send"
+msgstr "_Saada"
+
+msgid "_Spelling Suggestions"
+msgstr ""
+
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s sisenes tuppa"
+
+#, c-format
+msgid "%s has left the room"
+msgstr "%s väljus toast"
+
+msgid "Disconnected"
+msgstr "Ühendus katkestatud"
+
+msgid "Connected"
+msgstr "Ühendatud"
+
+msgid "Conversation"
+msgstr "Vestlus"
+
+msgid "Topic:"
+msgstr "Teema:"
+
+msgid "_Copy Link Address"
+msgstr "_Kopeeri lingi aadress"
+
+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"
+
+#, fuzzy
+msgid "Edit Contact Information"
+msgstr "Täiendavad andmed"
+
+msgid "Personal Information"
+msgstr "Isiklikud andmed"
+
+msgid "New Contact"
+msgstr "Uus kontakt"
+
+msgid "Decide _Later"
+msgstr ""
+
+#, fuzzy
+msgid "Subscription Request"
+msgstr "Tellimus"
+
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Kas tahad tõesti eemaldada grupi '%s'?"
+
+msgid "Removing group"
+msgstr "Grupi eemaldamine"
+
+msgid "_Remove"
+msgstr "_Eemalda"
+
+#, fuzzy, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Kas sa soovid eemaldada kontot %s?"
+
+#, fuzzy
+msgid "Removing contact"
+msgstr "Kontakti eemaldamine"
+
+msgid "_Chat"
+msgstr "_Vestlus"
+
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audiovestlus"
+
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videovestlus"
+
+#, fuzzy
+msgid "_View Previous Conversations"
+msgstr "_Uued vestlused:"
+
+msgid "Send file"
+msgstr "Saada fail"
+
+#, fuzzy
+msgid "Infor_mation"
+msgstr "Andmed"
+
+msgid "_Edit"
+msgstr "_Redaktor"
+
+msgid "Inviting to this room"
+msgstr ""
+
+#, fuzzy
+msgid "_Invite to chatroom"
+msgstr "Konverentsile kutsumine"
+
+#, fuzzy
+msgid "Select a contact"
+msgstr "Tegevuse valimine"
+
+#, fuzzy
+msgid "Save Avatar"
+msgstr "Kasutaja avatar"
+
+#, fuzzy
+msgid "Unable to save avatar"
+msgstr "Uut kontot pole võimalik salvestada"
+
+msgid "Select"
+msgstr "Vali"
+
+msgid "Group"
+msgstr "Grupp"
+
+msgid "Country ISO Code:"
+msgstr ""
+
+msgid "Country:"
+msgstr "Riik:"
+
+msgid "State:"
+msgstr "Maakond:"
+
+msgid "City:"
+msgstr "Linn:"
+
+msgid "Area:"
+msgstr "Piirkond:"
+
+msgid "Postal Code:"
+msgstr "Postiindeks:"
+
+msgid "Street:"
+msgstr "Tänav:"
+
+msgid "Building:"
+msgstr ""
+
+msgid "Floor:"
+msgstr "Korrus:"
+
+msgid "Room:"
+msgstr "Tuba:"
+
+msgid "Text:"
+msgstr "Tekst:"
+
+msgid "Description:"
+msgstr "Kirjeldus:"
+
+msgid "URI:"
+msgstr "URI:"
+
+msgid "Accuracy Level:"
+msgstr ""
+
+msgid "Error:"
+msgstr "Viga:"
+
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#, fuzzy
+msgid "Horizontal Error (meters):"
+msgstr "Rõhtjoon"
+
+msgid "Speed:"
+msgstr "Kiirus:"
+
+#, fuzzy
+msgid "Bearing:"
+msgstr "Hoiatused"
+
+#, fuzzy
+msgid "Climb Speed:"
+msgstr "Ronimise kiirus:"
+
+msgid "Last Updated on:"
+msgstr "Viimati uuendatud:"
+
+#, fuzzy
+msgid "Longitude:"
+msgstr "Valjem"
+
+msgid "Latitude:"
+msgstr ""
+
+msgid "Altitude:"
+msgstr ""
+
+msgid "<b>Location</b>"
+msgstr "<b>Asukoht</b>"
+
+msgid "<b>Location</b>, "
+msgstr "<b>Asukoht</b>,"
+
+msgid "%B %e, %Y at %R UTC"
+msgstr ""
+
+msgid "<b>Location</b> at (date)\t"
+msgstr ""
+
+msgid "Account:"
+msgstr "Konto:"
+
+msgid "Alias:"
+msgstr "Alias:"
+
+msgid "Birthday:"
+msgstr "Sünnipäev:"
+
+msgid "Client Information"
+msgstr "Kliendi andmed"
+
+msgid "Client:"
+msgstr "Klient:"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Contact Details"
+msgstr "Kontaktandmed"
+
+msgid "Email:"
+msgstr "E-post:"
+
+msgid "Fullname:"
+msgstr "Täisnimi:"
+
+msgid "Groups"
+msgstr "Grupid"
+
+#. Identifier to connect to Instant Messaging network
+msgid "Identifier:"
+msgstr "Kasutajanimi:"
+
+#, fuzzy
+msgid "Information requested..."
+msgstr "Andmed"
+
+msgid "OS:"
+msgstr ""
+
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+
+msgid "Version:"
+msgstr "Versioon:"
+
+msgid "Web site:"
+msgstr "Veebileht:"
+
+msgid "_Add Group"
+msgstr "_Lisa grupp"
+
+msgid "new server"
+msgstr "uus server"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "SSL"
+msgstr "SSL"
+
+msgid "Account"
+msgstr "Konto"
+
+msgid "Date"
+msgstr "Kuupäev"
+
+msgid "Conversations"
+msgstr "Vestlused"
+
+msgid "Previous Conversations"
+msgstr "Eelmised vestlused"
+
+msgid "Search"
+msgstr "Otsing"
+
+#, fuzzy
+msgid "_For:"
+msgstr "_Port:"
+
+msgid "C_all"
+msgstr "_Helista"
+
+msgid "C_hat"
+msgstr "_Vestle"
+
+msgid "Contact ID:"
+msgstr "Kontakti ID:"
+
+msgid "New Conversation"
+msgstr "Uus vestlus"
+
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_STATUS_TEXT
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+msgid "Custom Message..."
+msgstr "Oma sõnum..."
+
+msgid "Edit Custom Messages..."
+msgstr "Teadete redigeerimine..."
+
+msgid "Click to remove this status as a favorite"
+msgstr ""
+
+msgid "Click to make this status a favorite"
+msgstr ""
+
+msgid "Set status"
+msgstr "Määra olek"
+
+msgid "Set your presence and current status"
+msgstr ""
+
+#. Custom messages
+msgid "Custom messages..."
+msgstr "Muud teated..."
+
+msgid "Received an instant message"
+msgstr "Võeti vastu välksõnum"
+
+msgid "Sent an instant message"
+msgstr "Saadeti välksõnum"
+
+msgid "Incoming chat request"
+msgstr "Sissetulev vestluspäring"
+
+msgid "Contact connected"
+msgstr "Kontakt ühendus"
+
+msgid "Contact disconnected"
+msgstr "Kontakt katkestas ühenduse"
+
+msgid "Connected to server"
+msgstr "Ühendatud serveriga"
+
+msgid "Disconnected from server"
+msgstr "Ühendus serveriga katkestatud"
+
+msgid "Incoming voice call"
+msgstr ""
+
+msgid "Outgoing voice call"
+msgstr ""
+
+msgid "Voice call ended"
+msgstr ""
+
+msgid "Enter Custom Message"
+msgstr "Sisesta oma teade"
+
+msgid "Edit Custom Messages"
+msgstr "Teadete redigeerimine"
+
+msgid "Add _New Preset"
+msgstr "_Uue oleku lisamine"
+
+msgid "Saved Presets"
+msgstr "Salvestatud olekud"
+
+msgid "gtk-add"
+msgstr "_Lisa"
+
+msgid "gtk-remove"
+msgstr "Eemalda"
+
+msgid "Classic"
+msgstr "Klassikaline"
+
+msgid "Simple"
+msgstr "Lihtne"
+
+msgid "Clean"
+msgstr "Puhas"
+
+msgid "Blue"
+msgstr "Sinine"
+
+msgid "Adium"
+msgstr "Adium"
+
+msgid "Unable to open URI"
+msgstr "URI-d pole võimalik avada"
+
+msgid "Select a file"
+msgstr "Faili valimine"
+
+msgid "Select a destination"
+msgstr "Vali sihtkoht"
+
+#, fuzzy
+msgid "Current Locale"
+msgstr "Praegune tõend"
+
+msgid "Arabic"
+msgstr "Araabia"
+
+msgid "Armenian"
+msgstr "Armeenia"
+
+msgid "Baltic"
+msgstr "Balti"
+
+msgid "Celtic"
+msgstr "Keldi"
+
+msgid "Central European"
+msgstr "Kesk-Euroopa"
+
+msgid "Chinese Simplified"
+msgstr "Hiina lihtsustatud"
+
+msgid "Chinese Traditional"
+msgstr "Hiina traditsiooniline"
+
+msgid "Croatian"
+msgstr "Kroaatia"
+
+msgid "Cyrillic"
+msgstr "Kirillits"
+
+msgid "Cyrillic/Russian"
+msgstr "Kirillits/Vene"
+
+msgid "Cyrillic/Ukrainian"
+msgstr "Kirillits/Ukraina"
+
+msgid "Georgian"
+msgstr "Gruusia"
+
+msgid "Greek"
+msgstr "Kreeka"
+
+msgid "Gujarati"
+msgstr "Gujarati"
+
+msgid "Gurmukhi"
+msgstr ""
+
+msgid "Hebrew"
+msgstr "Heebrea"
+
+#, fuzzy
+msgid "Hebrew Visual"
+msgstr "Heebrea"
+
+msgid "Hindi"
+msgstr "Hindi"
+
+msgid "Icelandic"
+msgstr ""
+
+msgid "Japanese"
+msgstr "Jaapani"
+
+msgid "Korean"
+msgstr "Korea"
+
+#, fuzzy
+msgid "Nordic"
+msgstr "Sodiaagimärk"
+
+msgid "Persian"
+msgstr "Pärsia"
+
+msgid "Romanian"
+msgstr "Rumeenia"
+
+msgid "South European"
+msgstr "Lõuna-Euroopa"
+
+msgid "Thai"
+msgstr "Tai"
+
+msgid "Turkish"
+msgstr "Türgi"
+
+msgid "Unicode"
+msgstr "Unicode"
+
+msgid "Western"
+msgstr "Lääne"
+
+msgid "Vietnamese"
+msgstr "Vietnami"
+
+#.
+#. * vim: sw=2 ts=8 cindent noai bs=2
+#.
+msgid ""
+"The contact to display in the applet. Empty means no contact is displayed."
+msgstr ""
+
+msgid "The contact's avatar token. Empty means contact has no avatar."
+msgstr ""
+
+msgid "Megaphone"
+msgstr "Mögafon"
+
+msgid "Talk!"
+msgstr "Räägi!"
+
+msgid "_About"
+msgstr "_Lähemalt"
+
+msgid "_Information"
+msgstr "_Teave"
+
+msgid "_Preferences"
+msgstr "_Eelistused"
+
+msgid "Please configure a contact."
+msgstr ""
+
+msgid "Select contact..."
+msgstr "Vali kontakt..."
+
+msgid "Presence"
+msgstr ""
+
+#, fuzzy
+msgid "Set your own presence"
+msgstr "Oma kodutelefoni numbri määramine."
+
+#, fuzzy
+msgid "Don't connect on startup"
+msgstr "Hostiga pole võimalik ühenduda"
+
+msgid "Don't show the contact list on startup"
+msgstr ""
+
+#, fuzzy
+msgid "Show the accounts dialog"
+msgstr "accounts: Kontode akna näitamine."
+
+#, fuzzy
+msgid "- Empathy Instant Messenger"
+msgstr "Interneti sõnumivahetus"
+
+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 ""
+
+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 ""
+
+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 ""
+
+#, fuzzy
+msgid "An Instant Messaging client for GNOME"
+msgstr "Välksõnumivahendid"
+
+msgid "translator-credits"
+msgstr "Mattias Põldaru 2009"
+
+msgid "Enabled"
+msgstr "Lubatud"
+
+msgid "Accounts"
+msgstr "Kontod"
+
+#. To translator: %s is the protocol name
+#, fuzzy, c-format
+msgid "New %s account"
+msgstr "Uus konto"
+
+#, fuzzy, 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?"
+
+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 ""
+
+msgid "Add Account"
+msgstr "Konto lisamine"
+
+#, fuzzy
+msgid "Cr_eate"
+msgstr "Algata"
+
+msgid "Gmail"
+msgstr "Gmail"
+
+#, fuzzy
+msgid "Import Accounts..."
+msgstr "_Impordi..."
+
+#, fuzzy
+msgid "No protocol installed"
+msgstr "Protokollide pluginaid pole paigaldatud."
+
+msgid "Settings"
+msgstr "Sätted"
+
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+
+msgid "Type:"
+msgstr "Liik:"
+
+msgid "_Add..."
+msgstr "_Lisa..."
+
+#, fuzzy
+msgid "_Create a new account"
+msgstr "Uut kontot pole võimalik salvestada"
+
+#, fuzzy
+msgid "_Reuse an existing account"
+msgstr "Viga konto registreeringu tühistamisel"
+
+msgid "Contrast"
+msgstr "Kontrastsus"
+
+msgid "Brightness"
+msgstr "Heledus"
+
+msgid "Gamma"
+msgstr "Gamma"
+
+msgid "Volume"
+msgstr "Valjus"
+
+msgid "Connecting..."
+msgstr "Ühendumine..."
+
+msgid "_Sidebar"
+msgstr "_Külgriba"
+
+msgid "Dialpad"
+msgstr "Sõrmlaud"
+
+msgid "Audio input"
+msgstr "Helisisend"
+
+msgid "Video input"
+msgstr "Videosisend"
+
+#, fuzzy, c-format
+msgid "Call with %s"
+msgstr "Vestlused - %s"
+
+msgid "Call"
+msgstr "Kõne"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#, c-format
+msgid "Connected — %d:%02dm"
+msgstr "Ühendatud — %d:%02dm"
+
+msgid "Hang up"
+msgstr "Toru hargile"
+
+msgid "Redial"
+msgstr "Vali uuesti"
+
+msgid "Send Audio"
+msgstr "Saada heli"
+
+msgid "Send video"
+msgstr "Saada video"
+
+msgid "Video preview"
+msgstr ""
+
+msgid "_Call"
+msgstr "_Helista"
+
+msgid "_View"
+msgstr "_Vaade"
+
+#, c-format
+msgid "Conversations (%d)"
+msgstr "Vestlused (%d)"
+
+#, fuzzy
+msgid "Typing a message."
+msgstr "Saadetakse sõnum"
+
+msgid "Name"
+msgstr "Nimi"
+
+msgid "Room"
+msgstr "Tuba"
+
+#, fuzzy
+msgid "Auto-Connect"
+msgstr "Ühendu"
+
+msgid "Manage Favorite Rooms"
+msgstr "Lemmiktubade haldamine"
+
+msgid "Incoming call"
+msgstr "Sissetulev kõne"
+
+#, c-format
+msgid "%s is calling you, do you want to answer?"
+msgstr "%s helistab sulle. Kas vastata talle?"
+
+msgid "_Reject"
+msgstr "_Lükka tagasi"
+
+msgid "_Answer"
+msgstr "_Vasta"
+
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Sissetulev kõne kasutajalt %s"
+
+#, fuzzy, c-format
+msgid "%s is offering you an invitation"
+msgstr "%s pakub faili %s saatmist"
+
+msgid "An external application will be started to handle it."
+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"
+
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr "%s kutsub sind ühinema vestlusega %s"
+
+msgid "_Decline"
+msgstr "Lükka _tagasi"
+
+msgid "_Join"
+msgstr "Ü_hine"
+
+#, fuzzy, c-format
+msgid "%s invited you to join %s"
+msgstr "%s kutsub kasutajat %s jututuppa %s\n"
+
+#, fuzzy, c-format
+msgid "Incoming file transfer from %s"
+msgstr "Kas nõustud failiülekandega kasutajalt %s?"
+
+#, fuzzy, c-format
+msgid "Subscription requested by %s"
+msgstr "Tellimus"
+
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"Sõnum: %s"
+
+#. someone is logging off
+#, fuzzy, c-format
+msgid "%s is now offline."
+msgstr "Kasutaja pole ühendatud."
+
+#. someone is logging in
+#, fuzzy, c-format
+msgid "%s is now online."
+msgstr "%s pole enam jõude."
+
+#. Translators: time left, when it is more than one hour
+#, c-format
+msgid "%u:%02u.%02u"
+msgstr "%u:%02u:%02u"
+
+#. Translators: time left, when is is less than one hour
+#, c-format
+msgid "%02u.%02u"
+msgstr "%02u:%02u"
+
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Tundmatu"
+
+#, fuzzy, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s (%s -- %s"
+
+#, fuzzy, c-format
+msgid "%s of %s"
+msgstr "%s (%s)"
+
+#. translators: first %s is filename, second %s is the contact name
+#, c-format
+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
+msgid "Sending \"%s\" to %s"
+msgstr "Pakun faili %s saatmist kasutajale %s"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#, fuzzy, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Viga tubade loendi vastuvõtmisel"
+
+#, fuzzy
+msgid "Error receiving a file"
+msgstr "Viga profiili vastuvõtmisel"
+
+#, fuzzy, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "Viga \"%s\" käivitamisel: %s"
+
+#, fuzzy
+msgid "Error sending a file"
+msgstr "Viga profiili vastuvõtmisel"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#, fuzzy, c-format
+msgid "\"%s\" received from %s"
+msgstr "Serverilt saadi ping-vastus"
+
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#, fuzzy, c-format
+msgid "\"%s\" sent to %s"
+msgstr "%s saatis sulle sõnumi"
+
+#, fuzzy
+msgid "File transfer completed"
+msgstr "Fail on täielikult üle kantud"
+
+msgid "Waiting for the other participant's response"
+msgstr "Ootamine teise osalise vastuse järel"
+
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr "\"%s\" tervikluse kontroll"
+
+#, fuzzy, c-format
+msgid "Hashing \"%s\""
+msgstr "Käepigistus"
+
+msgid "%"
+msgstr "%"
+
+msgid "File"
+msgstr "Fail"
+
+msgid "Remaining"
+msgstr "Jäänud"
+
+msgid "File Transfers"
+msgstr "Failiülekanded"
+
+msgid "Remove completed, canceled and failed file transfers from the list"
+msgstr ""
+
+#. Translators: this is the header of a treeview column
+msgid "Import"
+msgstr "Importimine"
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid "Source"
+msgstr "Allikas"
+
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+
+msgid "Import Accounts"
+msgstr "Kontode importimine"
+
+msgid "_Edit account"
+msgstr "_Redigeeri kontot"
+
+msgid "No error specified"
+msgstr "Vea põhjust ei määratud"
+
+msgid "Network error"
+msgstr "Võrgu viga"
+
+msgid "Authentication failed"
+msgstr "Tõrge autentimisel"
+
+msgid "Encryption error"
+msgstr "Krüpteerimise viga"
+
+msgid "Name in use"
+msgstr "Nimi on juba kasutusel"
+
+#, fuzzy
+msgid "Certificate not provided"
+msgstr "Sertifikaadi importimise viga"
+
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "Sertifitseerimiskeskused"
+
+#, fuzzy
+msgid "Certificate expired"
+msgstr "Sertifikaadi importimine"
+
+#, fuzzy
+msgid "Certificate not activated"
+msgstr "Sertifikaadi andmed"
+
+#, fuzzy
+msgid "Certificate hostname mismatch"
+msgstr "Sertifitseerimiskeskused"
+
+#, fuzzy
+msgid "Certificate fingerprint mismatch"
+msgstr "\"%s\" sertifikaat"
+
+#, fuzzy
+msgid "Certificate self-signed"
+msgstr "Sertifikaadid"
+
+#, fuzzy
+msgid "Certificate error"
+msgstr "SSL-sertifikaadi viga"
+
+msgid "Unknown error"
+msgstr "Tundmatu viga"
+
+msgid "Show and edit accounts"
+msgstr ""
+
+#, fuzzy
+msgid "Contact List"
+msgstr "Kontaktandmed"
+
+#, fuzzy
+msgid "Contacts on a _Map"
+msgstr "Kontaktandmed"
+
+#, fuzzy
+msgid "Context"
+msgstr "Ühendu"
+
+#, fuzzy
+msgid "Join _Favorites"
+msgstr "Lemmikasjad"
+
+msgid "Manage Favorites"
+msgstr ""
+
+msgid "_Accounts"
+msgstr "_Kontod"
+
+msgid "_Add Contact..."
+msgstr "Lisa _kontakt..."
+
+#, fuzzy
+msgid "_Contents"
+msgstr "Ühendu"
+
+msgid "_Debug"
+msgstr ""
+
+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"
+
+msgid "_Personal Information"
+msgstr "_Isiklikud andmed"
+
+msgid "_Previous Conversations"
+msgstr "_Eelmised vestlused"
+
+msgid "_Room"
+msgstr "_Tuba"
+
+msgid "Chat Room"
+msgstr "Jututuba"
+
+msgid "Members"
+msgstr "Liikmed"
+
+#, 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 ""
+
+msgid "Yes"
+msgstr "Jah"
+
+msgid "No"
+msgstr "Ei"
+
+#, fuzzy
+msgid "Could not start room listing"
+msgstr "Tubade nimekirja pole võimalik hankida"
+
+#, fuzzy
+msgid "Could not stop room listing"
+msgstr "Kuulatavat porti pole võimalik avada."
+
+#, fuzzy
+msgid "Couldn't load room list"
+msgstr "Sõbranimekirja pole võimalik laadida"
+
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+
+msgid "Join Room"
+msgstr "Toaga ühinemine"
+
+msgid "Room List"
+msgstr "Tubade nimekiri"
+
+msgid "_Room:"
+msgstr "_Tuba:"
+
+msgid "Message received"
+msgstr "Sõnum võeti vastu"
+
+msgid "Message sent"
+msgstr "Sõnum saadeti"
+
+msgid "New conversation"
+msgstr "Uus vestlus"
+
+msgid "Contact goes online"
+msgstr ""
+
+msgid "Contact goes offline"
+msgstr ""
+
+msgid "Account connected"
+msgstr "Konto on ühendatud"
+
+msgid "Account disconnected"
+msgstr "Konto ühendus katkestatud"
+
+msgid "Language"
+msgstr "Keel"
+
+msgid "Adium theme to use:"
+msgstr ""
+
+msgid "Allow _GPS usage"
+msgstr ""
+
+msgid "Allow _cellphone usage"
+msgstr ""
+
+msgid "Allow _network usage"
+msgstr ""
+
+msgid "Appearance"
+msgstr ""
+
+#, 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 ""
+
+msgid "Behavior"
+msgstr ""
+
+#, fuzzy
+msgid "Chat Th_eme:"
+msgstr "Vestluse _nimi:"
+
+#, fuzzy
+msgid "Disable notifications when _away or busy"
+msgstr "Tippimismärguande lubamine"
+
+#, fuzzy
+msgid "Disable sounds when _away or busy"
+msgstr "Keelatakse minu eemaloleku korral"
+
+msgid "Enable notifications when a contact comes online"
+msgstr ""
+
+msgid "Enable notifications when a contact goes offline"
+msgstr ""
+
+msgid "Enable notifications when the _chat is not focused"
+msgstr ""
+
+msgid "Enable spell checking for languages:"
+msgstr ""
+
+msgid "General"
+msgstr "Üldine"
+
+#, fuzzy
+msgid "Geoclue Settings"
+msgstr "Sätete redigeerimine"
+
+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"
+
+msgid "Preferences"
+msgstr "Eelistused"
+
+msgid "Privacy"
+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"
+msgstr ""
+
+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"
+
+msgid "Sounds"
+msgstr "Helid"
+
+msgid "Spell Checking"
+msgstr ""
+
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+msgid "Themes"
+msgstr "Teemad"
+
+msgid "_Enable bubble notifications"
+msgstr "_Teatemullid lubatud"
+
+msgid "_Enable sound notifications"
+msgstr "_Heliteated lubatud"
+
+msgid "_Open new chats in separate windows"
+msgstr "_Uued vestlused avanevad eraldi akendes"
+
+msgid "_Publish location to my contacts"
+msgstr ""
+
+msgid "_Reduce location accuracy"
+msgstr ""
+
+msgid "Status"
+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"
+
+#, c-format
+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 ""
+
+msgid "Contact Map View"
+msgstr ""
+
+msgid "Error"
+msgstr "Viga"
+
+msgid "Critical"
+msgstr "Kriitiline"
+
+msgid "Warning"
+msgstr "Hoiatus"
+
+msgid "Message"
+msgstr "Sõnum"
+
+msgid "Info"
+msgstr "Andmed"
+
+msgid "Debug"
+msgstr ""
+
+msgid "Save"
+msgstr "Salvesta"
+
+msgid "Debug Window"
+msgstr "Silumisaken"
+
+msgid "Pause"
+msgstr "Pausi"
+
+msgid "Level "
+msgstr "Tase "
+
+msgid "Time"
+msgstr "Aeg"
+
+msgid "Domain"
+msgstr "Domeen"
+
+msgid "Category"
+msgstr "Kategooria"
+
+msgid "Level"
+msgstr "Tase"
+
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2cedfd1c8..66efcb6d1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,13 +9,14 @@
 # YangZhang <zyangmath@gmail.com>, 2008.
 # Funda Wang <fundawang@gmail.com>, 2009.
 # Aron Xu <aronxu@gnome.org>, 2009.
+# Lyper Lai <lyp069@gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gossip\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2009-07-25 07:51+0000\n"
+"POT-Creation-Date: 2009-07-30 18:04+0000\n"
 "PO-Revision-Date: 2009-07-25 21:28+0000\n"
 "Last-Translator: Aron Xu <aronxu@gnome.org>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
@@ -25,11 +26,11 @@ msgstr ""
 "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 "Empathy IM 客户端"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+msgid "Send and receive messages"
 msgstr "发送接收即时消息"
 
 #: ../data/empathy.schemas.in.h:1
@@ -109,11 +110,11 @@ msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
 
 #: ../data/empathy.schemas.in.h:19
 msgid "Enable WebKit Developer Tools"
-msgstr ""
+msgstr "启用 WebKit 开发工具"
 
 #: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
-msgstr "启用弹出提示"
+msgstr "启用新消息弹出提示"
 
 #: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
@@ -145,7 +146,7 @@ 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 ""
+msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径"
 
 #: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
@@ -238,7 +239,7 @@ msgstr "为聊天室使用主题"
 #: ../data/empathy.schemas.in.h:51
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
+msgstr "WebKit 开发工具，例如 Web Inspector 是否应该启用。"
 
 #: ../data/empathy.schemas.in.h:52
 msgid "Whether or not Empathy can publish the user's location to his contacts."
@@ -355,7 +356,7 @@ msgstr "当联系人上线时是否显示弹出通知"
 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:76
 msgid ""
@@ -400,8 +401,8 @@ msgid ""
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
-"使用何种准则来排序联系人列表。默认情况下使用值“name”以按联系人姓名\n"
-"排序。取值为“state”时将按状态排序联系人列表。"
+"使用何种准则来排序联系人列表。默认情况下使用值\"name\"以按联系人姓名\n"
+"排序。取值为\"state\"时将按状态排序联系人列表。"
 
 #: ../libempathy/empathy-ft-handler.c:838
 msgid "The hash of the received file and the sent one do not match"
@@ -859,13 +860,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 "复制链接地址(_C)"
 
 #. 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 "打开链接(_O)"
 
@@ -884,7 +885,7 @@ msgstr "编辑联系人信息"
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:393
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "新建联系人"
 
@@ -896,27 +897,27 @@ msgstr "以后再决定(_L)"
 msgid "Subscription Request"
 msgstr "订阅请求"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1400
+#: ../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:1402
+#: ../libempathy-gtk/empathy-contact-list-view.c:1406
 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:1453
+#: ../libempathy-gtk/empathy-contact-list-view.c:1530
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1479
+#: ../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:1481
+#: ../libempathy-gtk/empathy-contact-list-view.c:1485
 msgid "Removing contact"
 msgstr "删除联系人"
 
@@ -950,7 +951,7 @@ msgstr "发送文件"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:369
 msgid "Share my desktop"
-msgstr ""
+msgstr "共享我的桌面"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
@@ -981,126 +982,126 @@ msgstr "保存头像"
 msgid "Unable to save avatar"
 msgstr "无法保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:992
+#: ../libempathy-gtk/empathy-contact-widget.c:996
 msgid "Select"
 msgstr "选择"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../libempathy-gtk/empathy-contact-widget.c:1005
 #: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "群组"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1252
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
 msgid "Country ISO Code:"
 msgstr "包括 ISO 编码"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1254
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
 msgid "Country:"
 msgstr "国家"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "State:"
 msgstr "省"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "City:"
 msgstr "市"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "Area:"
 msgstr "地区"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "Postal Code:"
 msgstr "邮政编码"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Street:"
 msgstr "街"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Building:"
 msgstr "建筑物"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Floor:"
 msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Room:"
 msgstr "房间："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "Text:"
 msgstr "文本："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Description:"
 msgstr "描述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Accuracy Level:"
 msgstr "准确程度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "Error:"
 msgstr "错误："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Vertical Error (meters):"
-msgstr ""
+msgstr "垂直误差(米):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Horizontal Error (meters):"
-msgstr ""
+msgstr "水平误差(米):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Speed:"
-msgstr "速度："
+msgstr "速度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Bearing:"
-msgstr ""
+msgstr "方位朝向:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Climb Speed:"
-msgstr "爬升速度："
+msgstr "爬升速度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Last Updated on:"
 msgstr "最近更新于:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Longitude:"
 msgstr "经度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
 msgid "Latitude:"
 msgstr "纬度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
 msgid "Altitude:"
 msgstr "海拔："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
+#: ../libempathy-gtk/empathy-contact-widget.c:1349
 msgid "<b>Location</b>"
 msgstr "<b>位置</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1358
+#: ../libempathy-gtk/empathy-contact-widget.c:1362
 msgid "<b>Location</b>, "
 msgstr "<b>位置</b>，"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1408
+#: ../libempathy-gtk/empathy-contact-widget.c:1412
 msgid "%B %e, %Y at %R UTC"
-msgstr ""
+msgstr "%B %e,%Y 于 %R UTC 时间"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
-msgstr ""
+msgstr "<b>位置</b>于(日期）\t"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
@@ -1132,7 +1133,7 @@ msgstr "联系人"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Contact Details"
-msgstr ""
+msgstr "联系人详情"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
@@ -1144,7 +1145,7 @@ msgstr "全称："
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
 msgid "Groups"
-msgstr ""
+msgstr "组"
 
 #. Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:13
@@ -1234,27 +1235,29 @@ 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 "自定义消息..."
+msgstr "自定义状态..."
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
 #: ../libempathy-gtk/empathy-presence-chooser.c:227
 msgid "Edit Custom Messages..."
-msgstr "编辑自定义消息..."
+msgstr "编辑自定义状态..."
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:326
 msgid "Click to remove this status as a favorite"
-msgstr ""
+msgstr "点击移除自定义状态"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to make this status a favorite"
-msgstr ""
+msgstr "点击设置自定义状态"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:369
 msgid "Set status"
@@ -1262,12 +1265,12 @@ msgstr "设置状态"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:782
 msgid "Set your presence and current status"
-msgstr ""
+msgstr "设置你的状态信息和现在的状态"
 
 #. Custom messages
 #: ../libempathy-gtk/empathy-presence-chooser.c:1017
 msgid "Custom messages..."
-msgstr "自定义消息..."
+msgstr "自定义状态..."
 
 #: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
@@ -1311,27 +1314,27 @@ msgstr "语音通话结束"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:362
 msgid "Enter Custom Message"
-msgstr "输入自定义消息"
+msgstr "输入自定义状态"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:521
 msgid "Edit Custom Messages"
-msgstr "编辑自定义消息"
+msgstr "编辑自定义状态"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
 msgid "Add _New Preset"
-msgstr ""
+msgstr "添加新自定义状态(_N)"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
 msgid "Saved Presets"
-msgstr ""
+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"
@@ -1593,8 +1596,8 @@ msgid "Show the accounts dialog"
 msgstr "显示账户对话框"
 
 #: ../src/empathy.c:587
-msgid "- Empathy Instant Messenger"
-msgstr "- Empathy 即时通讯程序"
+msgid "- Empathy IM Client"
+msgstr " - Empathy IM 客户端"
 
 #: ../src/empathy-about-dialog.c:83
 msgid ""
@@ -1633,10 +1636,8 @@ msgstr "一个 GNOME 即时消息客户端"
 #: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
-
-"YangZhang, <zyangmath@gmail.com>\n"
+"翻译-贡献者YangZhang, <zyangmath@gmail.com>\n"
 "Aron Xu <aronxu@gnome.org>\n"
-""
 "Launchpad Contributions:\n"
 "  =KK= https://launchpad.net/~sevkme\n"
 "  AnThOnYhO https://launchpad.net/~anthonyho\n"
@@ -1753,7 +1754,7 @@ msgstr "侧边栏(_S)"
 
 #: ../src/empathy-call-window.c:765
 msgid "Dialpad"
-msgstr ""
+msgstr "电话键盘"
 
 #: ../src/empathy-call-window.c:771
 msgid "Audio input"
@@ -2004,12 +2005,12 @@ msgstr "正在等待其他参与者的回应"
 #: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
 msgid "Checking integrity of \"%s\""
-msgstr ""
+msgstr "检查\"%s\"完整性"
 
 #: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
 msgid "Hashing \"%s\""
-msgstr ""
+msgstr "校验中 \"%s\""
 
 #: ../src/empathy-ft-manager.c:1024
 msgid "%"
@@ -2124,7 +2125,7 @@ msgstr "联系人列表"
 
 #: ../src/empathy-main-window.ui.h:2
 msgid "Contacts on a _Map"
-msgstr ""
+msgstr "联系人地图(_M)"
 
 #: ../src/empathy-main-window.ui.h:3
 msgid "Context"
@@ -2140,15 +2141,15 @@ msgstr "管理收藏夹"
 
 #: ../src/empathy-main-window.ui.h:6
 msgid "N_ormal Size"
-msgstr "正常尺寸(_O)"
+msgstr "常规视图(_O)"
 
 #: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
-msgstr ""
+msgstr "扩展视图(_A)"
 
 #: ../src/empathy-main-window.ui.h:8
 msgid "Sort by _Name"
-msgstr "按姓姓名序(_N)"
+msgstr "按姓名排序(_N)"
 
 #: ../src/empathy-main-window.ui.h:9
 msgid "Sort by _Status"
@@ -2160,7 +2161,7 @@ msgstr "账户(_A)"
 
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Compact Size"
-msgstr "紧凑模式(_C)"
+msgstr "紧凑视图(_C)"
 
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
@@ -2297,7 +2298,7 @@ msgstr "账户已连接"
 
 #: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
-msgstr "账户已断开连接"
+msgstr "账户已断开"
 
 #: ../src/empathy-preferences.c:393
 msgid "Language"
@@ -2305,7 +2306,7 @@ msgstr "语言"
 
 #: ../src/empathy-preferences.ui.h:1
 msgid "Allow _GPS usage"
-msgstr "允许使用 _GPS 信息"
+msgstr "允许使用 GPS 信息(_G)"
 
 #: ../src/empathy-preferences.ui.h:2
 msgid "Allow _cellphone usage"
@@ -2349,7 +2350,7 @@ msgstr "当联系人离线时允许提示"
 
 #: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
-msgstr ""
+msgstr "当会话闲置时允许提示"
 
 #: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
@@ -2361,7 +2362,7 @@ msgstr "常规"
 
 #: ../src/empathy-preferences.ui.h:15
 msgid "Geoclue Settings"
-msgstr ""
+msgstr "Geoclue 设置"
 
 #: ../src/empathy-preferences.ui.h:16
 msgid "Location"
@@ -2389,6 +2390,8 @@ msgid ""
 "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 "Show _smileys as images"
@@ -2410,7 +2413,7 @@ msgstr "拼写检查"
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
-msgstr ""
+msgstr "语言列表仅反映已安装的字典"
 
 #: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
@@ -2451,22 +2454,22 @@ msgstr "显示联系人列表(_S)"
 #: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
-msgstr ""
+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 ""
+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"
-msgstr ""
+msgstr "联系地图视图"
 
 #: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
 msgid "Error"
@@ -2474,7 +2477,7 @@ msgstr "错误"
 
 #: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
 msgid "Critical"
-msgstr ""
+msgstr "危急"
 
 #: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
 msgid "Warning"
@@ -2529,7 +2532,13 @@ msgstr "级别"
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr ""
+msgstr "已选定的连接管理不支持远程调试扩展"
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy 即时通讯程序"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Empathy 即时通讯程序"
 
 #~ msgid "<b>Advanced</b>"
 #~ msgstr "<b>高级</b>"
@@ -2797,15 +2806,9 @@ msgstr ""
 #~ msgid "_End Call"
 #~ msgstr "结束通话(_E)"
 
-#~ msgid "Empathy Call"
-#~ msgstr "Empathy 电话"
-
 #~ msgid "Readying"
 #~ msgstr "正在准备"
 
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - Empathy 电话"
-
 #~ msgid "Ringing"
 #~ msgstr "正在响铃"
 
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 520a92821..bd958aada 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1346,8 +1346,10 @@ empathy_call_window_connected (gpointer user_data)
   EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
   EmpathyTpCall *call;
-  gboolean can_send_video = priv->video_input != NULL && priv->contact != NULL
-    && empathy_contact_can_voip_video (priv->contact);
+  gboolean can_send_video;
+
+  can_send_video = priv->video_input != NULL && priv->contact != NULL &&
+    empathy_contact_can_voip_video (priv->contact);
 
   g_object_get (priv->handler, "tp-call", &call, NULL);
 
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 47ef37c42..822f22826 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -999,12 +999,11 @@ chat_window_set_highlight_room_tab_label (EmpathyChat *chat)
 	gchar *markup;
 	GtkWidget *widget;
 
-	if (empathy_chat_is_room (chat) == FALSE)
+	if (!empathy_chat_is_room (chat))
 		return;
 
-	markup = g_markup_printf_escaped ("<span color=\"%s\">%s</span>",
-			"red",
-			empathy_chat_get_name (chat));
+	markup = g_markup_printf_escaped ("<span color=\"red\">%s</span>",
+		empathy_chat_get_name (chat));
 
 	widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
 	gtk_label_set_markup (GTK_LABEL (widget), markup);
diff --git a/src/empathy.c b/src/empathy.c
index 956b05e5f..637470773 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -621,7 +621,7 @@ main (int argc, char *argv[])
 	empathy_init ();
 
 	if (!gtk_init_with_args (&argc, &argv,
-				 N_("- Empathy Instant Messenger"),
+				 N_("- Empathy IM Client"),
 				 options, GETTEXT_PACKAGE, &error)) {
 		g_warning ("Error in empathy init: %s", error->message);
 		return EXIT_FAILURE;