diff --git a/configure.ac b/configure.ac
index e0d92fa..0dab5e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,7 +162,7 @@ AM_GLIB_GNU_GETTEXT
 AC_ARG_ENABLE(network-manager,
               AS_HELP_STRING([--enable-network-manager=@<:@no/yes/auto@:>@],
                              [build with network-manager support]), ,
-                             enable_network_manager=auto)
+                             enable_webkit=auto)
 
 if test "x$enable_network_manager" != "xno"; then
    PKG_CHECK_MODULES(NETWORK_MANAGER,
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 5903efb..1093101 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -60,7 +60,6 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-theme-boxes.c			\
 	empathy-theme-irc.c			\
 	empathy-theme-manager.c			\
-	empathy-kludge-label.c			\
 	empathy-ui-utils.c
 
 libempathy_gtk_la_SOURCES =			\
@@ -121,7 +120,6 @@ libempathy_gtk_headers =			\
 	empathy-theme-boxes.h			\
 	empathy-theme-irc.h			\
 	empathy-theme-manager.h			\
-	empathy-kludge-label.h			\
 	empathy-ui-utils.h
 
 check_c_sources = \
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 7dccb21..488486f 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -65,7 +65,7 @@ typedef struct {
 
 typedef struct {
 	EmpathyAccountChooser *chooser;
-	EmpathyAccount        *account;
+	McAccount             *account;
 	gboolean               set;
 } SetAccountData;
 
@@ -88,19 +88,19 @@ static void     account_chooser_set_property           (GObject
 							GParamSpec               *pspec);
 static void     account_chooser_setup                  (EmpathyAccountChooser    *chooser);
 static void     account_chooser_account_created_cb     (EmpathyAccountManager    *manager,
-							EmpathyAccount           *account,
+							McAccount                *account,
 							EmpathyAccountChooser    *chooser);
-static void     account_chooser_account_add_foreach    (EmpathyAccount                *account,
+static void     account_chooser_account_add_foreach    (McAccount                *account,
 							EmpathyAccountChooser    *chooser);
 static void     account_chooser_account_deleted_cb     (EmpathyAccountManager    *manager,
-							EmpathyAccount           *account,
+							McAccount                *account,
 							EmpathyAccountChooser    *chooser);
-static void     account_chooser_account_remove_foreach (EmpathyAccount                *account,
+static void     account_chooser_account_remove_foreach (McAccount                *account,
 							EmpathyAccountChooser    *chooser);
 static void     account_chooser_update_iter            (EmpathyAccountChooser    *chooser,
 							GtkTreeIter              *iter);
 static void     account_chooser_connection_changed_cb  (EmpathyAccountManager    *manager,
-							EmpathyAccount                *account,
+							McAccount                *account,
 							TpConnectionStatusReason  reason,
 							TpConnectionStatus        new_status,
 							TpConnectionStatus        old_status,
@@ -253,16 +253,16 @@ empathy_account_chooser_new (void)
  * @chooser: an #EmpathyAccountChooser
  *
  * Returns the account which is currently selected in the chooser or %NULL
- * if there is no account selected. The #EmpathyAccount returned should be
+ * if there is no account selected. The #McAccount returned should be
  * unrefed with g_object_unref() when finished with.
  *
- * Return value: a new ref to the #EmpathyAccount currently selected, or %NULL.
+ * Return value: a new ref to the #McAccount currently selected, or %NULL.
  */
-EmpathyAccount *
+McAccount *
 empathy_account_chooser_dup_account (EmpathyAccountChooser *chooser)
 {
 	EmpathyAccountChooserPriv *priv;
-	EmpathyAccount           *account;
+	McAccount                *account;
 	GtkTreeModel             *model;
 	GtkTreeIter               iter;
 
@@ -295,7 +295,7 @@ TpConnection *
 empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser)
 {
 	EmpathyAccountChooserPriv *priv;
-	EmpathyAccount            *account;
+	McAccount                 *account;
 	TpConnection              *connection;
 
 	g_return_val_if_fail (EMPATHY_IS_ACCOUNT_CHOOSER (chooser), NULL);
@@ -303,7 +303,7 @@ empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser)
 	priv = GET_PRIV (chooser);
 
 	account = empathy_account_chooser_dup_account (chooser);
-	connection = empathy_account_get_connection (account);
+	connection = empathy_account_manager_get_connection (priv->manager, account);
 	g_object_unref (account);
 
 	return connection;
@@ -312,7 +312,7 @@ empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser)
 /**
  * empathy_account_chooser_set_account:
  * @chooser: an #EmpathyAccountChooser
- * @account: an #EmpathyAccount
+ * @account: an #McAccount
  *
  * Sets the currently selected account to @account, if it exists in the list.
  *
@@ -320,7 +320,7 @@ empathy_account_chooser_get_connection (EmpathyAccountChooser *chooser)
  */
 gboolean
 empathy_account_chooser_set_account (EmpathyAccountChooser *chooser,
-				     EmpathyAccount *account)
+				     McAccount             *account)
 {
 	GtkComboBox    *combobox;
 	GtkTreeModel   *model;
@@ -457,7 +457,7 @@ account_chooser_setup (EmpathyAccountChooser *chooser)
 				    G_TYPE_STRING,    /* Image */
 				    G_TYPE_STRING,    /* Name */
 				    G_TYPE_BOOLEAN,   /* Enabled */
-				    EMPATHY_TYPE_ACCOUNT);
+				    MC_TYPE_ACCOUNT);
 
 	gtk_combo_box_set_model (combobox, GTK_TREE_MODEL (store));
 
@@ -477,25 +477,25 @@ account_chooser_setup (EmpathyAccountChooser *chooser)
 					NULL);
 
 	/* Populate accounts */
-	accounts = empathy_account_manager_dup_accounts (priv->manager);
+	accounts = mc_accounts_list ();
 	g_list_foreach (accounts,
 			(GFunc) account_chooser_account_add_foreach,
 			chooser);
 
-	g_list_free (accounts);
+	mc_accounts_list_free (accounts);
 	g_object_unref (store);
 }
 
 static void
 account_chooser_account_created_cb (EmpathyAccountManager *manager,
-				    EmpathyAccount        *account,
+				    McAccount             *account,
 				    EmpathyAccountChooser *chooser)
 {
 	account_chooser_account_add_foreach (account, chooser);
 }
 
 static void
-account_chooser_account_add_foreach (EmpathyAccount        *account,
+account_chooser_account_add_foreach (McAccount             *account,
 				     EmpathyAccountChooser *chooser)
 {
 	GtkListStore *store;
@@ -511,20 +511,18 @@ account_chooser_account_add_foreach (EmpathyAccount        *account,
 					   COL_ACCOUNT_POINTER, account,
 					   -1);
 	account_chooser_update_iter (chooser, &iter);
-	/* We got a reffed account and it was reffed by the liststore as well */
-	g_object_unref (account);
 }
 
 static void
 account_chooser_account_deleted_cb (EmpathyAccountManager *manager,
-				    EmpathyAccount        *account,
+				    McAccount             *account,
 				    EmpathyAccountChooser *chooser)
 {
 	account_chooser_account_remove_foreach (account, chooser);
 }
 
 typedef struct {
-	EmpathyAccount   *account;
+	McAccount   *account;
 	GtkTreeIter *iter;
 	gboolean     found;
 } FindAccountData;
@@ -536,7 +534,7 @@ account_chooser_find_account_foreach (GtkTreeModel *model,
 				      gpointer      user_data)
 {
 	FindAccountData *data = user_data;
-	EmpathyAccount  *account;
+	McAccount       *account;
 
 	gtk_tree_model_get (model, iter, COL_ACCOUNT_POINTER, &account, -1);
 
@@ -555,7 +553,7 @@ account_chooser_find_account_foreach (GtkTreeModel *model,
 
 static gboolean
 account_chooser_find_account (EmpathyAccountChooser *chooser,
-			      EmpathyAccount        *account,
+			      McAccount             *account,
 			      GtkTreeIter           *iter)
 {
 	GtkListStore    *store;
@@ -575,7 +573,7 @@ account_chooser_find_account (EmpathyAccountChooser *chooser,
 }
 
 static void
-account_chooser_account_remove_foreach (EmpathyAccount        *account,
+account_chooser_account_remove_foreach (McAccount            *account,
 					EmpathyAccountChooser *chooser)
 {
 	GtkListStore *store;
@@ -597,7 +595,7 @@ account_chooser_update_iter (EmpathyAccountChooser *chooser,
 	EmpathyAccountChooserPriv *priv;
 	GtkListStore              *store;
 	GtkComboBox               *combobox;
-	EmpathyAccount            *account;
+	McAccount                 *account;
 	const gchar               *icon_name;
 	gboolean                   is_enabled = TRUE;
 
@@ -617,7 +615,7 @@ account_chooser_update_iter (EmpathyAccountChooser *chooser,
 
 	gtk_list_store_set (store, iter,
 			    COL_ACCOUNT_IMAGE, icon_name,
-			    COL_ACCOUNT_TEXT, empathy_account_get_display_name (account),
+			    COL_ACCOUNT_TEXT, mc_account_get_display_name (account),
 			    COL_ACCOUNT_ENABLED, is_enabled,
 			    -1);
 
@@ -632,7 +630,7 @@ account_chooser_update_iter (EmpathyAccountChooser *chooser,
 
 static void
 account_chooser_connection_changed_cb (EmpathyAccountManager   *manager,
-				       EmpathyAccount          *account,
+				       McAccount               *account,
 				       TpConnectionStatusReason reason,
 				       TpConnectionStatus       new_status,
 				       TpConnectionStatus       old_status,
@@ -673,7 +671,7 @@ account_chooser_set_account_foreach (GtkTreeModel   *model,
 				     GtkTreeIter    *iter,
 				     SetAccountData *data)
 {
-	EmpathyAccount *account;
+	McAccount *account;
 	gboolean   equal;
 
 	gtk_tree_model_get (model, iter, COL_ACCOUNT_POINTER, &account, -1);
@@ -746,7 +744,7 @@ empathy_account_chooser_set_filter (EmpathyAccountChooser           *chooser,
 
 /**
  * EmpathyAccountChooserFilterFunc:
- * @account: an #EmpathyAccount
+ * @account: an #McAccount
  * @user_data: user data, or %NULL
  *
  * A function which decides whether the account indicated by @account
@@ -757,7 +755,7 @@ empathy_account_chooser_set_filter (EmpathyAccountChooser           *chooser,
 
 /**
  * empathy_account_chooser_filter_is_connected:
- * @account: an #EmpathyAccount
+ * @account: an #McAccount
  * @user_data: user data or %NULL
  *
  * A useful #EmpathyAccountChooserFilterFunc that one could pass into
@@ -766,12 +764,17 @@ empathy_account_chooser_set_filter (EmpathyAccountChooser           *chooser,
  * Return value: Whether @account is connected
  */
 gboolean
-empathy_account_chooser_filter_is_connected (EmpathyAccount *account,
+empathy_account_chooser_filter_is_connected (McAccount *account,
 					     gpointer   user_data)
 {
+	MissionControl     *mc;
 	TpConnectionStatus  status;
 
-	g_object_get (account, "status", &status, NULL);
+	g_return_val_if_fail (MC_IS_ACCOUNT (account), FALSE);
+
+	mc = empathy_mission_control_dup_singleton ();
+	status = mission_control_get_connection_status (mc, account, NULL);
+	g_object_unref (mc);
 
 	return status == TP_CONNECTION_STATUS_CONNECTED;
 }
diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index 255b684..c210540 100644
--- a/libempathy-gtk/empathy-account-chooser.h
+++ b/libempathy-gtk/empathy-account-chooser.h
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
 
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
 #define EMPATHY_IS_ACCOUNT_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_ACCOUNT_CHOOSER))
 #define EMPATHY_ACCOUNT_CHOOSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_ACCOUNT_CHOOSER, EmpathyAccountChooserClass))
 
-typedef gboolean (* EmpathyAccountChooserFilterFunc) (EmpathyAccount *account,
+typedef gboolean (* EmpathyAccountChooserFilterFunc) (McAccount *account,
 						      gpointer   user_data);
 
 
@@ -58,17 +58,17 @@ struct _EmpathyAccountChooserClass {
 
 GType          empathy_account_chooser_get_type           (void) G_GNUC_CONST;
 GtkWidget *    empathy_account_chooser_new                (void);
-EmpathyAccount *    empathy_account_chooser_dup_account        (EmpathyAccountChooser *chooser);
+McAccount *    empathy_account_chooser_dup_account        (EmpathyAccountChooser *chooser);
 TpConnection * empathy_account_chooser_get_connection     (EmpathyAccountChooser *chooser);
 gboolean       empathy_account_chooser_set_account        (EmpathyAccountChooser *chooser,
-							   EmpathyAccount        *account);
+							   McAccount            *account);
 gboolean       empathy_account_chooser_get_has_all_option (EmpathyAccountChooser *chooser);
 void           empathy_account_chooser_set_has_all_option (EmpathyAccountChooser *chooser,
 							   gboolean               has_all_option);
 void           empathy_account_chooser_set_filter         (EmpathyAccountChooser *chooser,
 							   EmpathyAccountChooserFilterFunc filter,
 							   gpointer               user_data);
-gboolean       empathy_account_chooser_filter_is_connected (EmpathyAccount       *account,
+gboolean       empathy_account_chooser_filter_is_connected (McAccount             *account,
 							   gpointer               user_data);
 
 G_END_DECLS
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 688a3e0..1306f51 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -27,6 +27,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
+#include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-protocol.h>
 
 #include <libempathy/empathy-utils.h>
@@ -43,7 +44,7 @@
 #define IRC_NETWORKS_FILENAME "irc-networks.xml"
 
 typedef struct {
-  EmpathyAccount *account;
+  McAccount *account;
   EmpathyIrcNetworkManager *network_manager;
 
   GtkWidget *vbox_settings;
@@ -69,9 +70,9 @@ static void
 unset_server_params (EmpathyAccountWidgetIrc *settings)
 {
   DEBUG ("Unset server, port and use-ssl");
-  empathy_account_unset_param (settings->account, "server");
-  empathy_account_unset_param (settings->account, "port");
-  empathy_account_unset_param (settings->account, "use-ssl");
+  mc_account_unset_param (settings->account, "server");
+  mc_account_unset_param (settings->account, "port");
+  mc_account_unset_param (settings->account, "use-ssl");
 }
 
 static void
@@ -97,7 +98,7 @@ update_server_params (EmpathyAccountWidgetIrc *settings)
 
   g_object_get (network, "charset", &charset, NULL);
   DEBUG ("Setting charset to %s", charset);
-  empathy_account_set_param_string (settings->account, "charset", charset);
+  mc_account_set_param_string (settings->account, "charset", charset);
   g_free (charset);
 
   servers = empathy_irc_network_get_servers (network);
@@ -116,11 +117,11 @@ update_server_params (EmpathyAccountWidgetIrc *settings)
           NULL);
 
       DEBUG ("Setting server to %s", address);
-      empathy_account_set_param_string (settings->account, "server", address);
+      mc_account_set_param_string (settings->account, "server", address);
       DEBUG ("Setting port to %u", port);
-      empathy_account_set_param_int (settings->account, "port", port);
+      mc_account_set_param_int (settings->account, "port", port);
       DEBUG ("Setting use-ssl to %s", ssl ? "TRUE": "FALSE" );
-      empathy_account_set_param_boolean (settings->account, "use-ssl", ssl);
+      mc_account_set_param_boolean (settings->account, "use-ssl", ssl);
 
       g_free (address);
     }
@@ -331,17 +332,17 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
   gboolean ssl = FALSE;
   EmpathyIrcNetwork *network = NULL;
 
-  nick = empathy_account_get_param_string (settings->account, "account");
-  fullname = empathy_account_get_param_string (settings->account, "fullname");
-  server = empathy_account_get_param_string (settings->account, "server");
-  charset = empathy_account_get_param_string (settings->account, "charset");
-  port = empathy_account_get_param_int (settings->account, "port");
-  ssl = empathy_account_get_param_boolean (settings->account, "use-ssl");
+  mc_account_get_param_string (settings->account, "account", &nick);
+  mc_account_get_param_string (settings->account, "fullname", &fullname);
+  mc_account_get_param_string (settings->account, "server", &server);
+  mc_account_get_param_string (settings->account, "charset", &charset);
+  mc_account_get_param_int (settings->account, "port", &port);
+  mc_account_get_param_boolean (settings->account, "use-ssl", &ssl);
 
   if (!nick)
     {
       nick = g_strdup (g_get_user_name ());
-      empathy_account_set_param_string (settings->account, "account", nick);
+      mc_account_set_param_string (settings->account, "account", nick);
     }
 
   if (!fullname)
@@ -351,7 +352,7 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
         {
           fullname = g_strdup (nick);
         }
-      empathy_account_set_param_string (settings->account, "fullname", fullname);
+      mc_account_set_param_string (settings->account, "fullname", fullname);
     }
 
   if (server != NULL)
@@ -413,14 +414,14 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
 
 /**
  * empathy_account_widget_irc_new:
- * @account: the #EmpathyAccount to configure
+ * @account: the #McAccount to configure
  *
- * Creates a new IRC account widget to configure a given #EmpathyAccount
+ * Creates a new IRC account widget to configure a given #McAccount
  *
  * Returns: The toplevel container of the configuration widget
  */
 GtkWidget *
-empathy_account_widget_irc_new (EmpathyAccount *account)
+empathy_account_widget_irc_new (McAccount *account)
 {
   EmpathyAccountWidgetIrc *settings;
   gchar *dir, *user_file_with_path, *global_file_with_path;
diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index 40e58bb..a89081f 100644
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -22,11 +22,11 @@
 #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 
 #include <gtk/gtk.h>
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
 
-GtkWidget * empathy_account_widget_irc_new (EmpathyAccount *account);
+GtkWidget * empathy_account_widget_irc_new (McAccount *account);
 
 G_END_DECLS
 
diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index 05e917e..da60824 100644
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -28,6 +28,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
+#include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-protocol.h>
 
 #include <libempathy/empathy-utils.h>
@@ -37,7 +38,7 @@
 #include "empathy-ui-utils.h"
 
 typedef struct {
-  EmpathyAccount *account;
+  McAccount *account;
 
   GtkWidget *vbox_settings;
 
@@ -68,14 +69,14 @@ account_widget_sip_discover_stun_toggled_cb (
 
 /**
  * empathy_account_widget_sip_new:
- * @account: the #EmpathyAccount to configure
+ * @account: the #McAccount to configure
  *
- * Creates a new SIP account widget to configure a given #EmpathyAccount
+ * Creates a new SIP account widget to configure a given #McAccount
  *
  * Returns: The toplevel container of the configuration widget
  */
 GtkWidget *
-empathy_account_widget_sip_new (EmpathyAccount *account)
+empathy_account_widget_sip_new (McAccount *account)
 {
   EmpathyAccountWidgetSip *settings;
   GtkBuilder *gui;
diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 69f60aa..9187c1e 100644
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -22,11 +22,11 @@
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 
 #include <gtk/gtk.h>
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
 
-GtkWidget * empathy_account_widget_sip_new (EmpathyAccount *account);
+GtkWidget * empathy_account_widget_sip_new (McAccount *account);
 
 G_END_DECLS
 
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index f602cd8..b0d7f8d 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -29,10 +29,10 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
+#include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-protocol.h>
 
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-account.h>
 
 #include "empathy-account-widget.h"
 #include "empathy-ui-utils.h"
@@ -43,7 +43,7 @@
 static gboolean
 account_widget_entry_focus_cb (GtkWidget     *widget,
 			       GdkEventFocus *event,
-			       EmpathyAccount     *account)
+			       McAccount     *account)
 {
 	const gchar *str;
 	const gchar *param_name;
@@ -54,8 +54,8 @@ account_widget_entry_focus_cb (GtkWidget     *widget,
 	if (EMP_STR_EMPTY (str)) {
 		gchar *value = NULL;
 
-		empathy_account_unset_param (account, param_name);
-		value = empathy_account_get_param_string (account, param_name);
+		mc_account_unset_param (account, param_name);
+		mc_account_get_param_string (account, param_name, &value);
 		DEBUG ("Unset %s and restore to %s", param_name, value);
 		gtk_entry_set_text (GTK_ENTRY (widget), value ? value : "");
 		g_free (value);
@@ -64,7 +64,7 @@ account_widget_entry_focus_cb (GtkWidget     *widget,
 		const gchar *domain = NULL;
 		gchar       *dup_str = NULL;
 
-		profile = empathy_account_get_profile (account);
+		profile = mc_account_get_profile (account);
 		if (mc_profile_get_capabilities (profile) &
 		    MC_PROFILE_CAPABILITY_SPLIT_ACCOUNT) {
 			domain = mc_profile_get_default_account_domain (profile);
@@ -78,7 +78,7 @@ account_widget_entry_focus_cb (GtkWidget     *widget,
 		}
 		DEBUG ("Setting %s to %s", param_name,
 			strstr (param_name, "password") ? "***" : str);
-		empathy_account_set_param_string (account, param_name, str);
+		mc_account_set_param_string (account, param_name, str);
 		g_free (dup_str);
 		g_object_unref (profile);
 	}
@@ -88,7 +88,7 @@ account_widget_entry_focus_cb (GtkWidget     *widget,
 
 static void
 account_widget_int_changed_cb (GtkWidget *widget,
-			       EmpathyAccount *account)
+			       McAccount *account)
 {
 	const gchar *param_name;
 	gint         value;
@@ -97,19 +97,19 @@ account_widget_int_changed_cb (GtkWidget *widget,
 	param_name = g_object_get_data (G_OBJECT (widget), "param_name");
 
 	if (value == 0) {
-		empathy_account_unset_param (account, param_name);
-		value = empathy_account_get_param_int (account, param_name);
+		mc_account_unset_param (account, param_name);
+		mc_account_get_param_int (account, param_name, &value);
 		DEBUG ("Unset %s and restore to %d", param_name, value);
 		gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
 	} else {
 		DEBUG ("Setting %s to %d", param_name, value);
-		empathy_account_set_param_int (account, param_name, value);
+		mc_account_set_param_int (account, param_name, value);
 	}
 }
 
 static void
 account_widget_checkbutton_toggled_cb (GtkWidget *widget,
-				       EmpathyAccount *account)
+				       McAccount *account)
 {
 	gboolean     value;
 	gboolean     default_value;
@@ -121,14 +121,14 @@ account_widget_checkbutton_toggled_cb (GtkWidget *widget,
 	/* FIXME: This is ugly! checkbox don't have a "not-set" value so we
 	 * always unset the param and set the value if different from the
 	 * default value. */
-	empathy_account_unset_param (account, param_name);
-	default_value = empathy_account_get_param_boolean (account, param_name);
+	mc_account_unset_param (account, param_name);
+	mc_account_get_param_boolean (account, param_name, &default_value);
 
 	if (default_value == value) {
 		DEBUG ("Unset %s and restore to %d", param_name, default_value);
 	} else {
 		DEBUG ("Setting %s to %d", param_name, value);
-		empathy_account_set_param_boolean (account, param_name, value);
+		mc_account_set_param_boolean (account, param_name, value);
 	}
 }
 
@@ -136,14 +136,14 @@ static void
 account_widget_forget_clicked_cb (GtkWidget *button,
 				  GtkWidget *entry)
 {
-	EmpathyAccount   *account;
+	McAccount   *account;
 	const gchar *param_name;
 
 	param_name = g_object_get_data (G_OBJECT (entry), "param_name");
 	account = g_object_get_data (G_OBJECT (entry), "account");
 
 	DEBUG ("Unset %s", param_name);
-	empathy_account_unset_param (account, param_name);
+	mc_account_unset_param (account, param_name);
 	gtk_entry_set_text (GTK_ENTRY (entry), "");
 }
 
@@ -161,13 +161,13 @@ static void
 account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl,
 				      GtkWidget *spinbutton_port)
 {
-	EmpathyAccount *account;
+	McAccount *account;
 	gboolean   value;
 	gint       port = 0;
 
 	value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton_ssl));
 	account = g_object_get_data (G_OBJECT (spinbutton_port), "account");
-	port = empathy_account_get_param_int (account, "port");
+	mc_account_get_param_int (account, "port", &port);
 
 	if (value) {
 		if (port == 5222 || port == 0) {
@@ -184,7 +184,7 @@ account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl,
 
 static void
 account_widget_setup_widget (GtkWidget   *widget,
-			     EmpathyAccount   *account,
+			     McAccount   *account,
 			     const gchar *param_name)
 {
 	g_object_set_data_full (G_OBJECT (widget), "param_name",
@@ -195,7 +195,7 @@ account_widget_setup_widget (GtkWidget   *widget,
 	if (GTK_IS_SPIN_BUTTON (widget)) {
 		gint value = 0;
 
-		value = empathy_account_get_param_int (account, param_name);
+		mc_account_get_param_int (account, param_name, &value);
 		gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
 
 		g_signal_connect (widget, "value-changed",
@@ -205,7 +205,7 @@ account_widget_setup_widget (GtkWidget   *widget,
 	else if (GTK_IS_ENTRY (widget)) {
 		gchar *str = NULL;
 
-		str = empathy_account_get_param_string (account, param_name);
+		mc_account_get_param_string (account, param_name, &str);
 		gtk_entry_set_text (GTK_ENTRY (widget), str ? str : "");
 		g_free (str);
 
@@ -220,7 +220,7 @@ account_widget_setup_widget (GtkWidget   *widget,
 	else if (GTK_IS_TOGGLE_BUTTON (widget)) {
 		gboolean value = FALSE;
 
-		value = empathy_account_get_param_boolean (account, param_name);
+		mc_account_get_param_boolean (account, param_name, &value);
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
 
 		g_signal_connect (widget, "toggled",
@@ -256,7 +256,7 @@ account_widget_generic_format_param_name (const gchar *param_name)
 }
 
 static void
-accounts_widget_generic_setup (EmpathyAccount *account,
+accounts_widget_generic_setup (McAccount *account,
 			       GtkWidget *table_common_settings,
 			       GtkWidget *table_advanced_settings)
 {
@@ -264,7 +264,7 @@ accounts_widget_generic_setup (EmpathyAccount *account,
 	McProfile  *profile;
 	GSList     *params, *l;
 
-	profile = empathy_account_get_profile (account);
+	profile = mc_account_get_profile (account);
 	protocol = mc_profile_get_protocol (profile);
 
 	if (!protocol) {
@@ -400,7 +400,7 @@ accounts_widget_generic_setup (EmpathyAccount *account,
 }
 
 static void
-account_widget_handle_params_valist (EmpathyAccount   *account,
+account_widget_handle_params_valist (McAccount   *account,
 				     GtkBuilder  *gui,
 				     const gchar *first_widget,
 				     va_list      args)
@@ -424,13 +424,14 @@ account_widget_handle_params_valist (EmpathyAccount   *account,
 }
 
 void
-empathy_account_widget_handle_params (EmpathyAccount   *account,
+empathy_account_widget_handle_params (McAccount   *account,
 				      GtkBuilder  *gui,
 				      const gchar *first_widget,
 				      ...)
 {
 	va_list args;
 
+	g_return_if_fail (MC_IS_ACCOUNT (account));
 	g_return_if_fail (GTK_IS_BUILDER (gui));
 
 	va_start (args, first_widget);
@@ -439,7 +440,7 @@ empathy_account_widget_handle_params (EmpathyAccount   *account,
 }
 
 void
-empathy_account_widget_add_forget_button (EmpathyAccount   *account,
+empathy_account_widget_add_forget_button (McAccount   *account,
 					  GtkBuilder  *gui,
 					  const gchar *button,
 					  const gchar *entry)
@@ -451,7 +452,7 @@ empathy_account_widget_add_forget_button (EmpathyAccount   *account,
 	button_forget = GTK_WIDGET (gtk_builder_get_object (gui, button));
 	entry_password = GTK_WIDGET (gtk_builder_get_object (gui, entry));
 
-	password = empathy_account_get_param_string (account, "password");
+	mc_account_get_param_string (account, "password", &password);
 	gtk_widget_set_sensitive (button_forget, !EMP_STR_EMPTY (password));
 	g_free (password);
 
@@ -476,7 +477,7 @@ empathy_account_widget_set_default_focus (GtkBuilder  *gui,
 }
 
 GtkWidget *
-empathy_account_widget_generic_new (EmpathyAccount *account)
+empathy_account_widget_generic_new (McAccount *account)
 {
 	GtkBuilder *gui;
 	GtkWidget *widget;
@@ -484,6 +485,8 @@ empathy_account_widget_generic_new (EmpathyAccount *account)
 	GtkWidget *table_advanced_settings;
 	gchar     *filename;
 
+	g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+
 	filename = empathy_file_lookup ("empathy-account-widget-generic.ui",
 					"libempathy-gtk");
 	gui = empathy_builder_get_file (filename,
@@ -499,7 +502,7 @@ empathy_account_widget_generic_new (EmpathyAccount *account)
 }
 
 GtkWidget *
-empathy_account_widget_salut_new (EmpathyAccount *account)
+empathy_account_widget_salut_new (McAccount *account)
 {
 	GtkBuilder *gui;
 	GtkWidget *widget;
@@ -527,7 +530,7 @@ empathy_account_widget_salut_new (EmpathyAccount *account)
 }
 
 GtkWidget *
-empathy_account_widget_msn_new (EmpathyAccount *account)
+empathy_account_widget_msn_new (McAccount *account)
 {
 	GtkBuilder *gui;
 	GtkWidget *widget;
@@ -557,7 +560,7 @@ empathy_account_widget_msn_new (EmpathyAccount *account)
 }
 
 GtkWidget *
-empathy_account_widget_jabber_new (EmpathyAccount *account)
+empathy_account_widget_jabber_new (McAccount *account)
 {
 	GtkBuilder *gui;
 	GtkWidget *widget;
@@ -600,7 +603,7 @@ empathy_account_widget_jabber_new (EmpathyAccount *account)
 }
 
 GtkWidget *
-empathy_account_widget_icq_new (EmpathyAccount *account)
+empathy_account_widget_icq_new (McAccount *account)
 {
 	GtkBuilder *gui;
 	GtkWidget *widget;
@@ -633,7 +636,7 @@ empathy_account_widget_icq_new (EmpathyAccount *account)
 }
 
 GtkWidget *
-empathy_account_widget_aim_new (EmpathyAccount *account)
+empathy_account_widget_aim_new (McAccount *account)
 {
 	GtkBuilder *gui;
 	GtkWidget *widget;
@@ -665,7 +668,7 @@ empathy_account_widget_aim_new (EmpathyAccount *account)
 }
 
 GtkWidget *
-empathy_account_widget_yahoo_new (EmpathyAccount *account)
+empathy_account_widget_yahoo_new (McAccount *account)
 {
 	GtkBuilder *gui;
 	GtkWidget *widget;
@@ -699,7 +702,7 @@ empathy_account_widget_yahoo_new (EmpathyAccount *account)
 }
 
 GtkWidget *
-empathy_account_widget_groupwise_new (EmpathyAccount *account)
+empathy_account_widget_groupwise_new (McAccount *account)
 {
 	GtkBuilder *gui;
 	GtkWidget *widget;
diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h
index 7a76db9..7287f56 100644
--- a/libempathy-gtk/empathy-account-widget.h
+++ b/libempathy-gtk/empathy-account-widget.h
@@ -27,28 +27,28 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
 
-void       empathy_account_widget_handle_params     (EmpathyAccount   *account,
+void       empathy_account_widget_handle_params     (McAccount   *account,
 						     GtkBuilder  *gui,
 						     const gchar *first_widget,
 						     ...);
-void       empathy_account_widget_add_forget_button (EmpathyAccount   *account,
+void       empathy_account_widget_add_forget_button (McAccount   *account,
 						     GtkBuilder  *gui,
 						     const gchar *button,
 						     const gchar *entry);
 void	   empathy_account_widget_set_default_focus (GtkBuilder  *gui,
 						     const gchar *entry);
-GtkWidget *empathy_account_widget_generic_new       (EmpathyAccount   *account);
-GtkWidget *empathy_account_widget_salut_new         (EmpathyAccount   *account);
-GtkWidget *empathy_account_widget_msn_new           (EmpathyAccount   *account);
-GtkWidget *empathy_account_widget_jabber_new        (EmpathyAccount   *account);
-GtkWidget *empathy_account_widget_icq_new           (EmpathyAccount   *account);
-GtkWidget *empathy_account_widget_aim_new           (EmpathyAccount   *account);
-GtkWidget *empathy_account_widget_yahoo_new         (EmpathyAccount   *account);
-GtkWidget *empathy_account_widget_groupwise_new     (EmpathyAccount   *account);
+GtkWidget *empathy_account_widget_generic_new       (McAccount   *account);
+GtkWidget *empathy_account_widget_salut_new         (McAccount   *account);
+GtkWidget *empathy_account_widget_msn_new           (McAccount   *account);
+GtkWidget *empathy_account_widget_jabber_new        (McAccount   *account);
+GtkWidget *empathy_account_widget_icq_new           (McAccount   *account);
+GtkWidget *empathy_account_widget_aim_new           (McAccount   *account);
+GtkWidget *empathy_account_widget_yahoo_new         (McAccount   *account);
+GtkWidget *empathy_account_widget_groupwise_new     (McAccount   *account);
 
 G_END_DECLS
 
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index af96885..83475b5 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -786,24 +786,24 @@ avatar_chooser_drag_data_received_cb (GtkWidget          *widget,
 	gchar    *target_type;
 	gboolean  handled = FALSE;
 
-	target_type = gdk_atom_name (gtk_selection_data_get_target (selection_data));
+	target_type = gdk_atom_name (selection_data->target);
 	if (!strcmp (target_type, URI_LIST_TYPE)) {
 		GFile            *file;
 		GFileInputStream *input_stream;
 		gchar            *nl;
 		gchar            *data = NULL;
 
-		nl = strstr (gtk_selection_data_get_data (selection_data), "\r\n");
+		nl = strstr (selection_data->data, "\r\n");
 		if (nl) {
 			gchar *uri;
 
-			uri = g_strndup (gtk_selection_data_get_data (selection_data),
-					 nl - (gchar *) gtk_selection_data_get_data (selection_data));
+			uri = g_strndup (selection_data->data,
+					 nl - (gchar *) selection_data->data);
 
 			file = g_file_new_for_uri (uri);
 			g_free (uri);
 		} else {
-			file = g_file_new_for_uri (gtk_selection_data_get_data (selection_data));
+			file = g_file_new_for_uri (selection_data->data);
 		}
 
 		input_stream = g_file_read (file, NULL, NULL);
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index f7898e1..d430c0f 100644
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -232,7 +232,7 @@ avatar_image_button_press_event (GtkWidget *widget, GdkEventButton *event)
 	gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
 	g_object_unref (pixbuf);
 
-	gdk_window_get_origin (gtk_widget_get_window (priv->image), &x, &y);
+	gdk_window_get_origin (priv->image->window, &x, &y);
 
 	x = x - (popup_width - width) / 2;
 	y = y - (popup_height - height) / 2;
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index bd5c89f..6fb7cfd 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -101,11 +101,9 @@ empathy_cell_renderer_expander_init (EmpathyCellRendererExpander *expander)
 	priv->activatable = TRUE;
 	priv->animation_node = NULL;
 
-	g_object_set (expander,
-		      "xpad", 2,
-		      "ypad", 2,
-		      "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE,
-		      NULL);
+	GTK_CELL_RENDERER (expander)->xpad = 2;
+	GTK_CELL_RENDERER (expander)->ypad = 2;
+	GTK_CELL_RENDERER (expander)->mode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
 }
 
 static void
@@ -254,27 +252,18 @@ empathy_cell_renderer_expander_get_size (GtkCellRenderer *cell,
 {
 	EmpathyCellRendererExpander     *expander;
 	EmpathyCellRendererExpanderPriv *priv;
-	gfloat xalign, yalign;
-	guint xpad, ypad;
 
 	expander = (EmpathyCellRendererExpander *) cell;
 	priv = GET_PRIV (expander);
 
-	g_object_get (cell,
-		      "xalign", &xalign,
-		      "yalign", &yalign,
-		      "xpad", &xpad,
-		      "ypad", &ypad,
-		      NULL);
-
 	if (cell_area) {
 		if (x_offset) {
-			*x_offset = xalign * (cell_area->width - (priv->expander_size + (2 * xpad)));
+			*x_offset = cell->xalign * (cell_area->width - (priv->expander_size + (2 * cell->xpad)));
 			*x_offset = MAX (*x_offset, 0);
 		}
 
 		if (y_offset) {
-			*y_offset = yalign * (cell_area->height - (priv->expander_size + (2 * ypad)));
+			*y_offset = cell->yalign * (cell_area->height - (priv->expander_size + (2 * cell->ypad)));
 			*y_offset = MAX (*y_offset, 0);
 		}
 	} else {
@@ -286,10 +275,10 @@ empathy_cell_renderer_expander_get_size (GtkCellRenderer *cell,
 	}
 
 	if (width)
-		*width = xpad * 2 + priv->expander_size;
+		*width = cell->xpad * 2 + priv->expander_size;
 
 	if (height)
-		*height = ypad * 2 + priv->expander_size;
+		*height = cell->ypad * 2 + priv->expander_size;
 }
 
 static void
@@ -305,8 +294,6 @@ empathy_cell_renderer_expander_render (GtkCellRenderer      *cell,
 	EmpathyCellRendererExpanderPriv *priv;
 	GtkExpanderStyle                expander_style;
 	gint                            x_offset, y_offset;
-	guint                           xpad, ypad;
-
 
 	expander = (EmpathyCellRendererExpander *) cell;
 	priv = GET_PRIV (expander);
@@ -332,19 +319,14 @@ empathy_cell_renderer_expander_render (GtkCellRenderer      *cell,
 						&x_offset, &y_offset,
 						NULL, NULL);
 
-	g_object_get (cell,
-		      "xpad", &xpad,
-		      "ypad", &ypad,
-		      NULL);
-
-	gtk_paint_expander (gtk_widget_get_style (widget),
+	gtk_paint_expander (widget->style,
 			    window,
 			    GTK_STATE_NORMAL,
 			    expose_area,
 			    widget,
 			    "treeview",
-			    cell_area->x + x_offset + xpad + priv->expander_size / 2,
-			    cell_area->y + y_offset + ypad + priv->expander_size / 2,
+			    cell_area->x + x_offset + cell->xpad + priv->expander_size / 2,
+			    cell_area->y + y_offset + cell->ypad + priv->expander_size / 2,
 			    expander_style);
 }
 
diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index d7ebda6..4fceb62 100644
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -34,9 +34,9 @@
 #include <gtk/gtk.h>
 
 #include <telepathy-glib/util.h>
+#include <libmissioncontrol/mc-account.h>
 
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-account.h>
 
 #include "empathy-chat-text-view.h"
 #include "empathy-chat.h"
@@ -495,9 +495,7 @@ chat_text_view_size_allocate (GtkWidget     *widget,
 		GtkAdjustment *adj;
 
 		adj = GTK_TEXT_VIEW (widget)->vadjustment;
-		gtk_adjustment_set_value (adj,
-					  gtk_adjustment_get_upper (adj) -
-					  gtk_adjustment_get_page_size (adj));
+		gtk_adjustment_set_value (adj, adj->upper - adj->page_size);
 	}
 }
 
@@ -654,7 +652,7 @@ chat_text_view_scroll_cb (EmpathyChatTextView *view)
 
 	priv = GET_PRIV (view);
 	adj = GTK_TEXT_VIEW (view)->vadjustment;
-	max_val = gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj);
+	max_val = adj->upper - adj->page_size;
 
 	g_return_val_if_fail (priv->scroll_time != NULL, FALSE);
 
@@ -819,10 +817,6 @@ chat_text_view_clear (EmpathyChatView *view)
 	priv = GET_PRIV (view);
 
 	priv->last_timestamp = 0;
-	if (priv->last_contact) {
-		g_object_unref (priv->last_contact);
-		priv->last_contact = NULL;
-	}
 }
 
 static gboolean
@@ -1159,14 +1153,58 @@ static void
 chat_text_view_copy_clipboard (EmpathyChatView *view)
 {
 	GtkTextBuffer *buffer;
+	GtkTextIter start, iter, end;
 	GtkClipboard  *clipboard;
+	GdkPixbuf *pixbuf;
+	gunichar c;
+	GtkTextChildAnchor *anchor = NULL;
+	GString *str;
+	GList *list;
+	gboolean ignore_newlines = FALSE;
+
+	str = g_string_new ("");
 
 	g_return_if_fail (EMPATHY_IS_CHAT_TEXT_VIEW (view));
 
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
 
-	gtk_text_buffer_copy_clipboard (buffer, clipboard);
+	if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
+		return;
+
+	for (iter = start; !gtk_text_iter_equal (&iter, &end); gtk_text_iter_forward_char (&iter)) {
+		c = gtk_text_iter_get_char (&iter);
+		if (c == 0xFFFC) {
+			ignore_newlines = FALSE;
+			if ((pixbuf = gtk_text_iter_get_pixbuf (&iter))) {
+				gchar *text;
+				text = g_object_get_data (G_OBJECT(pixbuf),
+							  "smiley_str");
+				if (text)
+					str = g_string_append (str, text);
+			} else if ((anchor = gtk_text_iter_get_child_anchor (&iter))) {
+				gchar *text;
+				list = gtk_text_child_anchor_get_widgets (anchor);
+				if (list) {
+					text = g_object_get_data (G_OBJECT(list->data),
+								  "str_obj");
+					if (text)
+						str = g_string_append (str, text);
+				}
+				g_list_free (list);
+			}
+		} else if (c == '\n') {
+			if (!ignore_newlines) {
+				ignore_newlines = TRUE;
+				str = g_string_append_unichar (str, c);
+			}
+		} else {
+			ignore_newlines = FALSE;
+			str = g_string_append_unichar (str, c);
+		}
+	}
+
+	gtk_clipboard_set_text (clipboard, g_string_free (str, FALSE), str->len);
 }
 
 static void
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index a8ca745..9c5e47b 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -64,7 +64,7 @@
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChat)
 typedef struct {
 	EmpathyTpChat     *tp_chat;
-	EmpathyAccount    *account;
+	McAccount         *account;
 	gchar             *id;
 	gchar             *name;
 	gchar             *subject;
@@ -201,7 +201,7 @@ chat_new_connection_cb (EmpathyAccountManager *manager,
 			EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv = GET_PRIV (chat);
-	EmpathyAccount *account;
+	McAccount *account;
 
 	account = empathy_account_manager_get_account (manager, connection);
 	if (!priv->tp_chat && empathy_account_equal (account, priv->account) &&
@@ -748,14 +748,13 @@ chat_input_key_press_event_cb (GtkWidget   *widget,
 	if (!(event->state & GDK_CONTROL_MASK) &&
 	    event->keyval == GDK_Page_Up) {
 		adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (text_view_sw));
-		gtk_adjustment_set_value (adj, gtk_adjustment_get_value (adj) - gtk_adjustment_get_page_size (adj));
+		gtk_adjustment_set_value (adj, adj->value - adj->page_size);
 		return TRUE;
 	}
 	if ((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK &&
 	    event->keyval == GDK_Page_Down) {
 		adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (text_view_sw));
-		val = MIN (gtk_adjustment_get_value (adj) + gtk_adjustment_get_page_size (adj),
-			   gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj));
+		val = MIN (adj->value + adj->page_size, adj->upper - adj->page_size);
 		gtk_adjustment_set_value (adj, val);
 		return TRUE;
 	}
@@ -1162,56 +1161,6 @@ chat_contacts_completion_func (const gchar *s1,
 	return ret;
 }
 
-static gchar *
-build_part_message (guint           reason,
-		    const gchar    *name,
-		    EmpathyContact *actor,
-		    const gchar    *message)
-{
-	GString *s = g_string_new ("");
-	const gchar *actor_name = NULL;
-
-	if (actor != NULL) {
-		actor_name = empathy_contact_get_name (actor);
-	}
-
-	/* Having an actor only really makes sense for a few actions... */
-	switch (reason) {
-	case TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE:
-		g_string_append_printf (s, _("%s has disconnected"), name);
-		break;
-	case TP_CHANNEL_GROUP_CHANGE_REASON_KICKED:
-		if (actor_name != NULL) {
-			g_string_append_printf (s, _("%s was kicked by %s"),
-				name, actor_name);
-		} else {
-			g_string_append_printf (s, _("%s was kicked"), name);
-		}
-		break;
-	case TP_CHANNEL_GROUP_CHANGE_REASON_BANNED:
-		if (actor_name != NULL) {
-			g_string_append_printf (s, _("%s was banned by %s"),
-				name, actor_name);
-		} else {
-			g_string_append_printf (s, _("%s was banned"), name);
-		}
-		break;
-	default:
-		g_string_append_printf (s, _("%s has left the room"), name);
-	}
-
-	if (!EMP_STR_EMPTY (message)) {
-		/* 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. :-)
-		 */
-		g_string_append_printf (s, _(" (%s)"), message);
-	}
-
-	return g_string_free (s, FALSE);
-}
-
 static void
 chat_members_changed_cb (EmpathyTpChat  *tp_chat,
 			 EmpathyContact *contact,
@@ -1222,21 +1171,20 @@ chat_members_changed_cb (EmpathyTpChat  *tp_chat,
 			 EmpathyChat    *chat)
 {
 	EmpathyChatPriv *priv = GET_PRIV (chat);
-	const gchar *name = empathy_contact_get_name (contact);
-	gchar *str;
 
-	if (priv->block_events_timeout_id != 0)
-		return;
+	if (priv->block_events_timeout_id == 0) {
+		gchar *str;
 
-	if (is_member) {
-		str = g_strdup_printf (_("%s has joined the room"),
-				       name);
-	} else {
-		str = build_part_message (reason, name, actor, message);
+		if (is_member) {
+			str = g_strdup_printf (_("%s has joined the room"),
+					       empathy_contact_get_name (contact));
+		} else {
+			str = g_strdup_printf (_("%s has left the room"),
+					       empathy_contact_get_name (contact));
+		}
+		empathy_chat_view_append_event (chat->view, str);
+		g_free (str);
 	}
-
-	empathy_chat_view_append_event (chat->view, str);
-	g_free (str);
 }
 
 static gboolean
@@ -1479,18 +1427,15 @@ chat_size_request (GtkWidget      *widget,
 		   GtkRequisition *requisition)
 {
   GtkBin *bin = GTK_BIN (widget);
-  GtkWidget *child;
-
-  requisition->width = gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2;
-  requisition->height = gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2;
 
-  child = gtk_bin_get_child (bin);
+  requisition->width = GTK_CONTAINER (widget)->border_width * 2;
+  requisition->height = GTK_CONTAINER (widget)->border_width * 2;
 
-  if (child && GTK_WIDGET_VISIBLE (child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
       GtkRequisition child_requisition;
 
-      gtk_widget_size_request (child, &child_requisition);
+      gtk_widget_size_request (bin->child, &child_requisition);
 
       requisition->width += child_requisition.width;
       requisition->height += child_requisition.height;
@@ -1503,20 +1448,17 @@ chat_size_allocate (GtkWidget     *widget,
 {
   GtkBin *bin = GTK_BIN (widget);
   GtkAllocation child_allocation;
-  GtkWidget *child;
 
   widget->allocation = *allocation;
 
-  child = gtk_bin_get_child (bin);
-
-  if (child && GTK_WIDGET_VISIBLE (child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
-      child_allocation.x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (widget));
-      child_allocation.y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (widget));
-      child_allocation.width = MAX (allocation->width - gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2, 0);
-      child_allocation.height = MAX (allocation->height - gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2, 0);
+      child_allocation.x = allocation->x + GTK_CONTAINER (widget)->border_width;
+      child_allocation.y = allocation->y + GTK_CONTAINER (widget)->border_width;
+      child_allocation.width = MAX (allocation->width - GTK_CONTAINER (widget)->border_width * 2, 0);
+      child_allocation.height = MAX (allocation->height - GTK_CONTAINER (widget)->border_width * 2, 0);
 
-      gtk_widget_size_allocate (child, &child_allocation);
+      gtk_widget_size_allocate (bin->child, &child_allocation);
     }
 }
 
@@ -1620,7 +1562,7 @@ empathy_chat_class_init (EmpathyChatClass *klass)
 					 g_param_spec_object ("account",
 							      "Account of the chat",
 							      "The account of the chat",
-							      EMPATHY_TYPE_ACCOUNT,
+							      MC_TYPE_ACCOUNT,
 							      G_PARAM_READABLE |
 							      G_PARAM_STATIC_STRINGS));
 	g_object_class_install_property (object_class,
@@ -1811,7 +1753,7 @@ empathy_chat_set_tp_chat (EmpathyChat   *chat,
 	show_pending_messages (chat);
 }
 
-EmpathyAccount *
+McAccount *
 empathy_chat_get_account (EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv = GET_PRIV (chat);
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index c715875..c38fd64 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -66,7 +66,7 @@ EmpathyChat *      empathy_chat_new                  (EmpathyTpChat *tp_chat);
 EmpathyTpChat *    empathy_chat_get_tp_chat          (EmpathyChat   *chat);
 void               empathy_chat_set_tp_chat          (EmpathyChat   *chat,
 						      EmpathyTpChat *tp_chat);
-EmpathyAccount *        empathy_chat_get_account          (EmpathyChat   *chat);
+McAccount *        empathy_chat_get_account          (EmpathyChat   *chat);
 const gchar *      empathy_chat_get_id               (EmpathyChat   *chat);
 const gchar *      empathy_chat_get_name             (EmpathyChat   *chat);
 const gchar *      empathy_chat_get_subject          (EmpathyChat   *chat);
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index d271cdd..39edbf5 100644
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -193,7 +193,7 @@ empathy_contact_information_dialog_show (EmpathyContact *contact,
 		EMPATHY_CONTACT_WIDGET_SHOW_LOCATION |
 		EMPATHY_CONTACT_WIDGET_EDIT_NONE);
 	gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8);
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
 			    contact_widget,
 			    TRUE, TRUE, 0);
 	gtk_widget_show (contact_widget);
@@ -252,7 +252,7 @@ empathy_contact_edit_dialog_show (EmpathyContact *contact,
 		EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |
 		EMPATHY_CONTACT_WIDGET_EDIT_GROUPS);
 	gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8);
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
 			    contact_widget,
 			    TRUE, TRUE, 0);
 	gtk_widget_show (contact_widget);
@@ -304,7 +304,7 @@ empathy_contact_personal_dialog_show (GtkWindow *parent)
 		EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |
 		EMPATHY_CONTACT_WIDGET_EDIT_AVATAR);
 	gtk_container_set_border_width (GTK_CONTAINER (contact_widget), 8);
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (personal_dialog))),
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (personal_dialog)->vbox),
 			    contact_widget,
 			    TRUE, TRUE, 0);
 	empathy_contact_widget_set_account_filter (contact_widget,
@@ -328,20 +328,26 @@ empathy_contact_personal_dialog_show (GtkWindow *parent)
  */
 
 static gboolean
-can_add_contact_to_account (EmpathyAccount *account,
+can_add_contact_to_account (McAccount *account,
 			    gpointer   user_data)
 {
+	EmpathyAccountManager *account_manager;
 	EmpathyContactManager *contact_manager;
 	TpConnection          *connection;
 	gboolean               result;
 
-	connection = empathy_account_get_connection (account);
-	if (connection == NULL)
+	account_manager = empathy_account_manager_dup_singleton ();
+	connection = empathy_account_manager_get_connection (account_manager,
+							     account);
+	if (!connection) {
+		g_object_unref (account_manager);
 		return FALSE;
+	}
 
 	contact_manager = empathy_contact_manager_dup_singleton ();
 	result = empathy_contact_manager_can_add (contact_manager, connection);
 	g_object_unref (contact_manager);
+	g_object_unref (account_manager);
 
 	return result;
 }
@@ -407,7 +413,7 @@ empathy_new_contact_dialog_show (GtkWindow *parent)
 						     EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT |
 						     EMPATHY_CONTACT_WIDGET_EDIT_ID |
 						     EMPATHY_CONTACT_WIDGET_EDIT_GROUPS);
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
 			    contact_widget,
 			    TRUE, TRUE, 0);
 	empathy_contact_widget_set_account_filter (contact_widget,
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 9cebe1d..61db60c 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -32,6 +32,7 @@
 #include <gtk/gtk.h>
 
 #include <telepathy-glib/util.h>
+#include <libmissioncontrol/mc-account.h>
 
 #include <libempathy/empathy-account-manager.h>
 #include <libempathy/empathy-call-factory.h>
@@ -246,7 +247,7 @@ contact_list_view_drag_data_received (GtkWidget         *view,
 	EmpathyContactListViewPriv *priv;
 	EmpathyAccountManager      *account_manager;
 	EmpathyTpContactFactory    *factory = NULL;
-	EmpathyAccount             *account;
+	McAccount                  *account;
 	GtkTreeModel               *model;
 	GtkTreeViewDropPosition     position;
 	GtkTreePath                *path;
@@ -292,7 +293,7 @@ contact_list_view_drag_data_received (GtkWidget         *view,
 		goto OUT;
 	}
 
-	id = (const gchar*) gtk_selection_data_get_data (selection);
+	id = (const gchar*) selection->data;
 	DEBUG ("Received %s%s drag & drop contact from roster with id:'%s'",
 		context->action == GDK_ACTION_MOVE ? "move" : "",
 		context->action == GDK_ACTION_COPY ? "copy" : "",
@@ -301,17 +302,19 @@ contact_list_view_drag_data_received (GtkWidget         *view,
 	strv = g_strsplit (id, "/", 2);
 	account_id = strv[0];
 	contact_id = strv[1];
-  account_manager = empathy_account_manager_dup_singleton ();
-	account = empathy_account_manager_lookup (account_manager, account_id);
+	account = mc_account_lookup (account_id);
 	if (account) {
 		TpConnection *connection;
 
-		connection = empathy_account_get_connection (account);
+		/* FIXME: We assume we have already an account manager */
+		account_manager = empathy_account_manager_dup_singleton ();
+		connection = empathy_account_manager_get_connection (account_manager,
+								     account);
 		if (connection) {
 			factory = empathy_tp_contact_factory_dup_singleton (connection);
 		}
+		g_object_unref (account_manager);
 	}
-	g_object_unref (account_manager);
 
 	if (!factory) {
 		DEBUG ("Failed to get factory for account '%s'", account_id);
@@ -448,7 +451,7 @@ contact_list_view_drag_data_get (GtkWidget        *widget,
 	GtkTreeIter                 iter;
 	GtkTreeModel               *model;
 	EmpathyContact             *contact;
-	EmpathyAccount             *account;
+	McAccount                  *account;
 	const gchar                *contact_id;
 	const gchar                *account_id;
 	gchar                      *str;
@@ -478,7 +481,7 @@ contact_list_view_drag_data_get (GtkWidget        *widget,
 	}
 
 	account = empathy_contact_get_account (contact);
-	account_id = empathy_account_get_unique_name (account);
+	account_id = mc_account_get_unique_name (account);
 	contact_id = empathy_contact_get_id (contact);
 	g_object_unref (contact);
 	str = g_strconcat (account_id, "/", contact_id, NULL);
@@ -851,7 +854,7 @@ contact_list_view_expander_cell_data_func (GtkTreeViewColumn     *column,
 		gboolean     row_expanded;
 
 		path = gtk_tree_model_get_path (model, iter);
-		row_expanded = gtk_tree_view_row_expanded (GTK_TREE_VIEW (gtk_tree_view_column_get_tree_view (column)), path);
+		row_expanded = gtk_tree_view_row_expanded (GTK_TREE_VIEW (column->tree_view), path);
 		gtk_tree_path_free (path);
 
 		g_object_set (cell,
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index f078f52..12a1393 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -32,6 +32,7 @@
 #include <champlain-gtk/champlain-gtk.h>
 #endif
 
+#include <libmissioncontrol/mc-account.h>
 #include <telepathy-glib/util.h>
 
 #include <libempathy/empathy-tp-contact-factory.h>
@@ -40,14 +41,12 @@
 #include <libempathy/empathy-location.h>
 #include <libempathy/empathy-time.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-account.h>
 
 #include "empathy-contact-widget.h"
 #include "empathy-account-chooser.h"
 #include "empathy-avatar-chooser.h"
 #include "empathy-avatar-image.h"
 #include "empathy-ui-utils.h"
-#include "empathy-kludge-label.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
@@ -220,6 +219,7 @@ empathy_contact_widget_new (EmpathyContact *contact,
        "hbox_presence", &information->hbox_presence,
        "label_alias", &information->label_alias,
        "image_state", &information->image_state,
+       "label_status", &information->label_status,
        "table_contact", &information->table_contact,
        "vbox_avatar", &information->vbox_avatar,
        "vbox_location", &information->vbox_location,
@@ -587,12 +587,6 @@ update_avatar_chooser_account_cb (EmpathyAccountChooser *account_chooser,
 static void
 contact_widget_contact_setup (EmpathyContactWidget *information)
 {
-  /* Setup label_status as a KludgeLabel */
-  information->label_status = empathy_kludge_label_new ("");
-  gtk_box_pack_start (GTK_BOX (information->hbox_presence),
-        information->label_status, TRUE, TRUE, 0);
-  gtk_widget_show (information->label_status);
-
   /* Setup account label/chooser */
   if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT)
     {
@@ -703,7 +697,7 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
 static void
 contact_widget_contact_update (EmpathyContactWidget *information)
 {
-  EmpathyAccount *account = NULL;
+  McAccount *account = NULL;
   const gchar *id = NULL;
 
   /* Connect and get info from new contact */
@@ -743,7 +737,7 @@ contact_widget_contact_update (EmpathyContactWidget *information)
         {
           const gchar *name;
 
-          name = empathy_account_get_display_name (account);
+          name = mc_account_get_display_name (account);
           gtk_label_set_label (GTK_LABEL (information->widget_account), name);
         }
     }
diff --git a/libempathy-gtk/empathy-contact-widget.ui b/libempathy-gtk/empathy-contact-widget.ui
index 5737b7d..c5bbd5b 100644
--- a/libempathy-gtk/empathy-contact-widget.ui
+++ b/libempathy-gtk/empathy-contact-widget.ui
@@ -112,7 +112,17 @@
                           </packing>
                         </child>
                         <child>
-                          <placeholder/>
+                          <object class="GtkLabel" id="label_status">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="xalign">0</property>
+                            <property name="use_markup">True</property>
+                            <property name="wrap">True</property>
+                            <property name="selectable">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index e6b4a6f..63222ba 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -27,10 +27,10 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
+#include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-protocol.h>
 
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-account.h>
 
 #include <libempathy/empathy-irc-network-manager.h>
 #include "empathy-ui-utils.h"
diff --git a/libempathy-gtk/empathy-kludge-label.c b/libempathy-gtk/empathy-kludge-label.c
deleted file mode 100644
index f4a29de..0000000
--- a/libempathy-gtk/empathy-kludge-label.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* vim: set ts=4 sts=4 sw=4 et: */
-/*
- * 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: Davyd Madeley <davyd.madeley@collabora.co.uk>
- */
-
-#include "empathy-kludge-label.h"
-
-G_DEFINE_TYPE (EmpathyKludgeLabel, empathy_kludge_label, GTK_TYPE_LABEL);
-
-static void
-empathy_kludge_label_size_allocate (GtkWidget     *self,
-                                    GtkAllocation *allocation)
-{
-    PangoLayout *layout;
-
-    GTK_WIDGET_CLASS (empathy_kludge_label_parent_class)->size_allocate (
-            self, allocation);
-
-    /* force the width of the PangoLayout to be the width of the allocation */
-    layout = gtk_label_get_layout (GTK_LABEL (self));
-    pango_layout_set_width (layout, allocation->width * PANGO_SCALE);
-}
-
-static gboolean
-empathy_kludge_label_expose_event (GtkWidget      *self,
-                                   GdkEventExpose *event)
-{
-    PangoLayout *layout;
-    PangoRectangle rect;
-    GtkAllocation real_allocation;
-    gboolean r;
-
-    layout = gtk_label_get_layout (GTK_LABEL (self));
-    pango_layout_get_pixel_extents (layout, NULL, &rect);
-
-    /* this is mind-bendingly evil:
-     * get_layout_location() is going to remove rect.x from the position of the
-     * layout when painting it. This really sucks. We're going to compensate by
-     * adding this value to the allocation.
-     */
-    real_allocation = self->allocation;
-    self->allocation.x += rect.x;
-
-    r = GTK_WIDGET_CLASS (empathy_kludge_label_parent_class)->expose_event (
-            self, event);
-
-    self->allocation = real_allocation;
-
-    return r;
-}
-
-static void
-empathy_kludge_label_class_init (EmpathyKludgeLabelClass *klass)
-{
-    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-    widget_class->size_allocate = empathy_kludge_label_size_allocate;
-    widget_class->expose_event = empathy_kludge_label_expose_event;
-}
-
-static void
-empathy_kludge_label_init (EmpathyKludgeLabel *self)
-{
-}
-
-GtkWidget *
-empathy_kludge_label_new (const char *str)
-{
-    return g_object_new (EMPATHY_TYPE_KLUDGE_LABEL,
-            "label", str,
-            "xalign", 0.,
-            NULL);
-}
diff --git a/libempathy-gtk/empathy-kludge-label.h b/libempathy-gtk/empathy-kludge-label.h
deleted file mode 100644
index f2ea1e9..0000000
--- a/libempathy-gtk/empathy-kludge-label.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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: Davyd Madeley <davyd.madeley@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_KLUDGE_LABEL_H__
-#define __EMPATHY_KLUDGE_LABEL_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_KLUDGE_LABEL	(empathy_kludge_label_get_type ())
-#define EMPATHY_KLUDGE_LABEL(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_KLUDGE_LABEL, EmpathyKludgeLabel))
-#define EMPATHY_KLUDGE_LABEL_CLASS(obj)	(G_TYPE_CHECK_CLASS_CAST ((obj), EMPATHY_TYPE_KLUDGE_LABEL, EmpathyKludgeLabelClass))
-#define EMPATHY_IS_KLUDGE_LABEL(obj)	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_KLUDGE_LABEL))
-#define EMPATHY_IS_KLUDGE_LABEL_CLASS(obj)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EMPATHY_TYPE_KLUDGE_LABEL))
-#define EMPATHY_KLUDGE_LABEL_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_KLUDGE_LABEL, EmpathyKludgeLabelClass))
-
-typedef struct _EmpathyKludgeLabel EmpathyKludgeLabel;
-typedef struct _EmpathyKludgeLabelClass EmpathyKludgeLabelClass;
-
-struct _EmpathyKludgeLabel
-{
-	GtkLabel parent;
-};
-
-struct _EmpathyKludgeLabelClass
-{
-	GtkLabelClass parent_class;
-};
-
-GType empathy_kludge_label_get_type (void);
-GtkWidget *empathy_kludge_label_new (const char *str);
-
-G_END_DECLS
-
-#endif
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index f05017c..21d73f8 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -31,7 +31,6 @@
 #include <gtk/gtk.h>
 
 #include <libempathy/empathy-log-manager.h>
-#include <libempathy/empathy-account-manager.h>
 #include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-message.h>
@@ -95,11 +94,11 @@ static void     log_window_chats_setup                     (EmpathyLogWindow *wi
 static void     log_window_chats_accounts_changed_cb       (GtkWidget        *combobox,
 							    EmpathyLogWindow *window);
 static void     log_window_chats_set_selected              (EmpathyLogWindow *window,
-							    EmpathyAccount   *account,
+							    McAccount        *account,
 							    const gchar      *chat_id,
 							    gboolean          is_chatroom);
 static gboolean log_window_chats_get_selected              (EmpathyLogWindow *window,
-							    EmpathyAccount  **account,
+							    McAccount       **account,
 							    gchar           **chat_id,
 							    gboolean         *is_chatroom);
 static void     log_window_chats_get_messages              (EmpathyLogWindow *window,
@@ -135,14 +134,14 @@ enum {
 };
 
 GtkWidget *
-empathy_log_window_show (EmpathyAccount   *account,
+empathy_log_window_show (McAccount   *account,
 			const gchar *chat_id,
 			gboolean     is_chatroom,
 			GtkWindow   *parent)
 {
 	static EmpathyLogWindow *window = NULL;
 	EmpathyAccountChooser   *account_chooser;
-	EmpathyAccountManager  *account_manager;
+	GList                  *accounts;
 	gint                    account_num;
 	GtkBuilder             *gui;
 	gchar                  *filename;
@@ -229,9 +228,9 @@ empathy_log_window_show (EmpathyAccount   *account,
 			  window);
 
 	/* Populate */
-	account_manager = empathy_account_manager_dup_singleton ();
-	account_num = empathy_account_manager_get_count (account_manager);
-	g_object_unref (account_manager);
+	accounts = mc_accounts_list ();
+	account_num = g_list_length (accounts);
+	mc_accounts_list_free (accounts);
 
 	if (account_num > 1) {
 		gtk_widget_show (window->vbox_chats);
@@ -302,7 +301,7 @@ log_window_find_changed_cb (GtkTreeSelection *selection,
 	GtkTreeView   *view;
 	GtkTreeModel  *model;
 	GtkTreeIter    iter;
-	EmpathyAccount     *account;
+	McAccount     *account;
 	gchar         *chat_id;
 	gboolean       is_chatroom;
 	gchar         *date;
@@ -418,7 +417,7 @@ log_window_find_populate (EmpathyLogWindow *window,
 		}
 
 		date_readable = empathy_log_manager_get_date_readable (hit->date);
-		account_name = empathy_account_get_display_name (hit->account);
+		account_name = mc_account_get_display_name (hit->account);
 		account_icon = empathy_icon_name_from_account (hit->account);
 
 		gtk_list_store_append (store, &iter);
@@ -465,7 +464,7 @@ log_window_find_setup (EmpathyLogWindow *window)
 	store = gtk_list_store_new (COL_FIND_COUNT,
 				    G_TYPE_STRING,          /* account icon name */
 				    G_TYPE_STRING,          /* account name */
-				    EMPATHY_TYPE_ACCOUNT,   /* account */
+				    MC_TYPE_ACCOUNT,        /* account */
 				    G_TYPE_STRING,          /* chat name */
 				    G_TYPE_STRING,          /* chat id */
 				    G_TYPE_BOOLEAN,         /* is chatroom */
@@ -609,7 +608,7 @@ static void
 log_window_chats_populate (EmpathyLogWindow *window)
 {
 	EmpathyAccountChooser *account_chooser;
-	EmpathyAccount       *account;
+	McAccount            *account;
 	GList                *chats, *l;
 
 	GtkTreeView          *view;
@@ -685,11 +684,11 @@ log_window_chats_setup (EmpathyLogWindow *window)
 
 	/* new store */
 	store = gtk_list_store_new (COL_CHAT_COUNT,
-				    G_TYPE_STRING,        /* icon */
-				    G_TYPE_STRING,        /* name */
-				    EMPATHY_TYPE_ACCOUNT, /* account */
-				    G_TYPE_STRING,        /* id */
-				    G_TYPE_BOOLEAN);      /* is chatroom */
+				    G_TYPE_STRING,    /* icon */
+				    G_TYPE_STRING,    /* name */
+				    MC_TYPE_ACCOUNT,  /* account */
+				    G_TYPE_STRING,    /* id */
+				    G_TYPE_BOOLEAN);  /* is chatroom */
 
 	model = GTK_TREE_MODEL (store);
 	sortable = GTK_TREE_SORTABLE (store);
@@ -740,7 +739,7 @@ log_window_chats_accounts_changed_cb (GtkWidget       *combobox,
 
 static void
 log_window_chats_set_selected  (EmpathyLogWindow *window,
-				EmpathyAccount  *account,
+				McAccount       *account,
 				const gchar     *chat_id,
 				gboolean         is_chatroom)
 {
@@ -764,7 +763,7 @@ log_window_chats_set_selected  (EmpathyLogWindow *window,
 	}
 
 	for (ok = TRUE; ok; ok = gtk_tree_model_iter_next (model, &iter)) {
-		EmpathyAccount *this_account;
+		McAccount *this_account;
 		gchar     *this_chat_id;
 		gboolean   this_is_chatroom;
 
@@ -793,7 +792,7 @@ log_window_chats_set_selected  (EmpathyLogWindow *window,
 
 static gboolean
 log_window_chats_get_selected (EmpathyLogWindow  *window,
-			       EmpathyAccount  **account,
+			       McAccount       **account,
 			       gchar           **chat_id,
 			       gboolean         *is_chatroom)
 {
@@ -802,7 +801,7 @@ log_window_chats_get_selected (EmpathyLogWindow  *window,
 	GtkTreeSelection *selection;
 	GtkTreeIter       iter;
 	gchar            *id = NULL;
-	EmpathyAccount   *acc = NULL;
+	McAccount        *acc = NULL;
 	gboolean          room = FALSE;
 
 	view = GTK_TREE_VIEW (window->treeview_chats);
@@ -840,7 +839,7 @@ static void
 log_window_chats_get_messages (EmpathyLogWindow *window,
 			       const gchar     *date_to_show)
 {
-	EmpathyAccount     *account;
+	McAccount     *account;
 	gchar         *chat_id;
 	gboolean       is_chatroom;
 	EmpathyMessage *message;
@@ -1000,7 +999,7 @@ static void
 log_window_calendar_chats_month_changed_cb (GtkWidget       *calendar,
 					    EmpathyLogWindow *window)
 {
-	EmpathyAccount     *account;
+	McAccount     *account;
 	gchar         *chat_id;
 	gboolean       is_chatroom;
 	guint          year_selected;
diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h
index 298d960..6dd8c03 100644
--- a/libempathy-gtk/empathy-log-window.h
+++ b/libempathy-gtk/empathy-log-window.h
@@ -25,11 +25,11 @@
 #ifndef __EMPATHY_LOG_WINDOW_H__
 #define __EMPATHY_LOG_WINDOW_H__
 
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
 
-GtkWidget * empathy_log_window_show (EmpathyAccount   *account,
+GtkWidget * empathy_log_window_show (McAccount   *account,
 				     const gchar *chat_id,
 				     gboolean     chatroom,
 				     GtkWindow   *parent);
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 77b368b..9aee429 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -27,6 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
+#include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mission-control.h>
 
 #include <libempathy/empathy-call-factory.h>
@@ -34,7 +35,6 @@
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-account.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index 900e921..0d3e4c5 100644
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -245,6 +245,8 @@ smiley_manager_add_valist (EmpathySmileyManager *manager,
 	}
 
 	/* We give the ownership of path to the smiley */
+	g_object_set_data_full (G_OBJECT (pixbuf), "smiley_str",
+				g_strdup (first_str), g_free);
 	smiley = smiley_new (pixbuf, g_strdup (first_str), path);
 	priv->smileys = g_slist_prepend (priv->smileys, smiley);
 }
diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 802d116..7ac13ad 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -559,8 +559,8 @@ empathy_status_preset_dialog_init (EmpathyStatusPresetDialog *self)
 	status_preset_dialog_setup_presets_treeview (self);
 	status_preset_dialog_setup_add_combobox (self);
 
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))),
-	    toplevel_vbox, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (self)->vbox), toplevel_vbox,
+			TRUE, TRUE, 0);
 
 	g_object_unref (gui);
 }
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index d513c91..b16a3e7 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -52,7 +52,6 @@ typedef struct {
 	EmpathySmileyManager *smiley_manager;
 	EmpathyContact       *last_contact;
 	time_t                last_timestamp;
-	gboolean              last_is_backlog;
 	gboolean              page_loaded;
 	GList                *message_queue;
 } EmpathyThemeAdiumPriv;
@@ -67,20 +66,12 @@ struct _EmpathyAdiumData {
 	gchar *template_html;
 	gchar *in_content_html;
 	gsize  in_content_len;
-	gchar *in_context_html;
-	gsize  in_context_len;
 	gchar *in_nextcontent_html;
 	gsize  in_nextcontent_len;
-	gchar *in_nextcontext_html;
-	gsize  in_nextcontext_len;
 	gchar *out_content_html;
 	gsize  out_content_len;
-	gchar *out_context_html;
-	gsize  out_context_len;
 	gchar *out_nextcontent_html;
 	gsize  out_nextcontent_len;
-	gchar *out_nextcontext_html;
-	gsize  out_nextcontext_len;
 	gchar *status_html;
 	gsize  status_len;
 	GHashTable *info;
@@ -401,7 +392,7 @@ theme_adium_append_message (EmpathyChatView *view,
 	EmpathyThemeAdium     *theme = EMPATHY_THEME_ADIUM (view);
 	EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
 	EmpathyContact        *sender;
-	EmpathyAccount        *account;
+	McAccount             *account;
 	McProfile             *account_profile;
 	gchar                 *dup_body = NULL;
 	const gchar           *body;
@@ -414,8 +405,7 @@ theme_adium_append_message (EmpathyChatView *view,
 	gsize                  len = 0;
 	const gchar           *func;
 	const gchar           *service_name;
-	GString               *message_classes = NULL;
-	gboolean              is_backlog;
+	const gchar           *message_classes = NULL;
 
 	if (!priv->page_loaded) {
 		priv->message_queue = g_list_prepend (priv->message_queue,
@@ -426,7 +416,7 @@ theme_adium_append_message (EmpathyChatView *view,
 	/* Get information */
 	sender = empathy_message_get_sender (msg);
 	account = empathy_contact_get_account (sender);
-	account_profile = empathy_account_get_profile (account);
+	account_profile = mc_account_get_profile (account);
 	service_name = mc_profile_get_display_name (account_profile);
 	timestamp = empathy_message_get_timestamp (msg);
 	body = empathy_message_get_body (msg);
@@ -468,103 +458,46 @@ theme_adium_append_message (EmpathyChatView *view,
 			avatar_filename = priv->data->default_avatar_filename;
 		}
 	}
-	
-	is_backlog = empathy_message_is_backlog (msg);
 
 	/* Get the right html/func to add the message */
 	func = "appendMessage";
-	
-	message_classes = g_string_new ("message");
-	
-	/* eventually append the "history" class */
-	if (is_backlog) {
-		g_string_append (message_classes, " history");
-	}
-	
-	/* check the sender of the message and append the appropriate class */
-	if (empathy_contact_is_user (sender)) {
-		g_string_append (message_classes, " outgoing");
-	}
-	else {
-		g_string_append (message_classes, " incoming");
-	}
-	
 	/*
 	 * To mimick Adium's behavior, we only want to join messages
-	 * sent by the same contact within a 5 minute time frame.
+	 * sent within a 5 minute time frame.
 	 */
 	if (empathy_contact_equal (priv->last_contact, sender) &&
-	    (timestamp - priv->last_timestamp < MESSAGE_JOIN_PERIOD) && 
-	    (is_backlog == priv->last_is_backlog)) {
-		/* the messages can be appended */
+	    (timestamp - priv->last_timestamp < MESSAGE_JOIN_PERIOD)) {
 		func = "appendNextMessage";
-		g_string_append (message_classes, " consecutive");
-		
-		/* check who is the sender of the message to use the correct html file */
 		if (empathy_contact_is_user (sender)) {
-			/* check if this is a backlog message and use NextContext.html */
-			if (is_backlog) {
-				html = priv->data->out_nextcontext_html;
-				len = priv->data->out_nextcontext_len;
-			}
-			
-			/*
-			 * html is null if this is not a backlog message or
-			 * if we have to fallback (NextContext.html missing).
-			 * use NextContent.html
-			 */
-			if (html == NULL) {
-				html = priv->data->out_nextcontent_html;
-				len = priv->data->out_nextcontent_len;
-			}
+			message_classes = "consecutive incoming message";
+			html = priv->data->out_nextcontent_html;
+			len = priv->data->out_nextcontent_len;
 		}
-		else {
-			if (is_backlog) {
-				html = priv->data->in_nextcontext_html;
-				len = priv->data->in_nextcontext_len;
-			}
-			
-			if (html == NULL) {
-				html = priv->data->in_nextcontent_html;
-				len = priv->data->in_nextcontent_len;
-			}
+		if (!html) {
+			message_classes = "consecutive message outgoing";
+			html = priv->data->in_nextcontent_html;
+			len = priv->data->in_nextcontent_len;
 		}
 	}
-			
-	/*
-	 * we have html == NULL here if:
-	 * 1. the message didn't have to be appended because
-	 *    the sender was different or the timestamp was too far
-	 * 2. NextContent.html file does not exist, so we must
-	 *    not forget to fallback to the correct Content.html
-	 */
-	if (html == NULL) {
+	if (!html) {
 		if (empathy_contact_is_user (sender)) {
-			if (is_backlog) {
-				html = priv->data->out_context_html;
-				len = priv->data->out_context_len;
-			}
-			
-			if (html == NULL) {
-				html = priv->data->out_content_html;
-				len = priv->data->out_content_len;
+			if (!message_classes) {
+				message_classes = "incoming message";
 			}
+			html = priv->data->out_content_html;
+			len = priv->data->out_content_len;
 		}
-		else {
-			if (is_backlog) {
-				html = priv->data->in_context_html;
-				len = priv->data->in_context_len;
-			}
-			
-			if (html == NULL) {
-				html = priv->data->in_content_html;
-				len = priv->data->in_content_len;
+		if (!html) {
+			if (!message_classes) {
+				message_classes = "message outgoing";
 			}
+			html = priv->data->in_content_html;
+			len = priv->data->in_content_len;
 		}
 	}
 
 	theme_adium_append_html (theme, func, html, len, body, avatar_filename,
-				 name, contact_id, service_name, message_classes->str,
+				 name, contact_id, service_name, message_classes,
 				 timestamp);
 
 	/* Keep the sender of the last displayed message */
@@ -573,10 +506,8 @@ theme_adium_append_message (EmpathyChatView *view,
 	}
 	priv->last_contact = g_object_ref (sender);
 	priv->last_timestamp = timestamp;
-	priv->last_is_backlog = is_backlog;
 
 	g_free (dup_body);
-	g_string_free (message_classes, TRUE);
 }
 
 static void
@@ -633,13 +564,6 @@ theme_adium_clear (EmpathyChatView *view)
 					  priv->data->template_html,
 					  basedir_uri);
 	g_free (basedir_uri);
-
-	/* Clear last contact to avoid trying to add a 'joined'
-	 * message when we don't have an insertion point. */
-	if (priv->last_contact) {
-		g_object_unref (priv->last_contact);
-		priv->last_contact = NULL;
-	}
 }
 
 static gboolean
@@ -889,15 +813,6 @@ empathy_adium_path_is_valid (const gchar *path)
 	gboolean ret;
 	gchar   *file;
 
-	/* The theme is not valid if there is no Info.plist */
-	file = g_build_filename (path, "Contents", "Info.plist",
-				 NULL);
-	ret = g_file_test (file, G_FILE_TEST_EXISTS);
-	g_free (file);
-
-	if (ret == FALSE)
-		return ret;
-
 	/* We ship a default Template.html as fallback if there is any problem
 	 * with the one inside the theme. The only other required file is
 	 * Content.html for incoming messages (outgoing fallback to use
@@ -923,15 +838,10 @@ empathy_adium_info_new (const gchar *path)
 	value = empathy_plist_parse_from_file (file);
 	g_free (file);
 
-	if (value == NULL)
-		return NULL;
-
-	info = g_value_dup_boxed (value);
-	tp_g_value_slice_free (value);
-
-	/* Insert the theme's path into the hash table,
-	 * keys have to be dupped */
-	tp_asv_set_string (info, g_strdup ("path"), path);
+	if (value) {
+		info = g_value_dup_boxed (value);
+		tp_g_value_slice_free (value);
+	}
 
 	return info;
 }
@@ -983,14 +893,6 @@ empathy_adium_data_new_with_info (const gchar *path, GHashTable *info)
 	file = g_build_filename (data->basedir, "Incoming", "NextContent.html", NULL);
 	g_file_get_contents (file, &data->in_nextcontent_html, &data->in_nextcontent_len, NULL);
 	g_free (file);
-	
-	file = g_build_filename (data->basedir, "Incoming", "Context.html", NULL);
-	g_file_get_contents (file, &data->in_context_html, &data->in_context_len, NULL);
-	g_free (file);
-
-	file = g_build_filename (data->basedir, "Incoming", "NextContext.html", NULL);
-	g_file_get_contents (file, &data->in_nextcontext_html, &data->in_nextcontext_len, NULL);
-	g_free (file);
 
 	file = g_build_filename (data->basedir, "Outgoing", "Content.html", NULL);
 	g_file_get_contents (file, &data->out_content_html, &data->out_content_len, NULL);
@@ -1000,14 +902,6 @@ empathy_adium_data_new_with_info (const gchar *path, GHashTable *info)
 	g_file_get_contents (file, &data->out_nextcontent_html, &data->out_nextcontent_len, NULL);
 	g_free (file);
 
-	file = g_build_filename (data->basedir, "Outgoing", "Context.html", NULL);
-	g_file_get_contents (file, &data->out_context_html, &data->out_context_len, NULL);
-	g_free (file);
-
-	file = g_build_filename (data->basedir, "Outgoing", "NextContext.html", NULL);
-	g_file_get_contents (file, &data->out_nextcontext_html, &data->out_nextcontext_len, NULL);
-	g_free (file);
-
 	file = g_build_filename (data->basedir, "Status.html", NULL);
 	g_file_get_contents (file, &data->status_html, &data->status_len, NULL);
 	g_free (file);
@@ -1111,7 +1005,7 @@ empathy_adium_data_ref (EmpathyAdiumData *data)
 {
 	g_return_val_if_fail (data != NULL, NULL);
 
-	g_atomic_int_inc (&data->ref_count);
+	data->ref_count++;
 
 	return data;
 }
@@ -1121,18 +1015,15 @@ empathy_adium_data_unref (EmpathyAdiumData *data)
 {
 	g_return_if_fail (data != NULL);
 
-	if (g_atomic_int_dec_and_test (&data->ref_count)) {
+	data->ref_count--;
+	if (data->ref_count == 0) {
 		g_free (data->path);
 		g_free (data->basedir);
 		g_free (data->template_html);
 		g_free (data->in_content_html);
 		g_free (data->in_nextcontent_html);
-		g_free (data->in_context_html);
-		g_free (data->in_nextcontext_html);
 		g_free (data->out_content_html);
 		g_free (data->out_nextcontent_html);
-		g_free (data->out_context_html);
-		g_free (data->out_nextcontext_html);
 		g_free (data->default_avatar_filename);
 		g_free (data->default_incoming_avatar_filename);
 		g_free (data->default_outgoing_avatar_filename);
diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index f522427..3d8b8ae 100644
--- a/libempathy-gtk/empathy-theme-boxes.c
+++ b/libempathy-gtk/empathy-theme-boxes.c
@@ -199,6 +199,7 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
 	gboolean              color_set;
 	GtkTextTagTable      *table;
 	GtkTextTag           *tag;
+	GString              *str_obj;
 
 	contact = empathy_message_get_sender (msg);
 	name = empathy_contact_get_name (contact);
@@ -267,6 +268,12 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
 			       "use-markup", TRUE,
 			       "xalign", 1.0,
 			       NULL);
+
+	str_obj = g_string_new ("\n- ");
+	g_string_append (str_obj, name);
+	g_string_append (str_obj, ", ");
+	g_string_append (str_obj, tmp);
+	g_string_append (str_obj, " -");
 	g_free (tmp);
 	g_free (str);
 
@@ -290,6 +297,10 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
 	gtk_box_pack_start (GTK_BOX (box), label2, TRUE, TRUE, 0);
 
 	/* Add the header box to the text view */
+	g_object_set_data_full (G_OBJECT (box),
+				"str_obj",
+				g_string_free (str_obj, FALSE),
+				g_free);
 	gtk_text_view_add_child_at_anchor (GTK_TEXT_VIEW (view),
 					   box,
 					   anchor);
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index fea2eca..ba3d48e 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
-#include <telepathy-glib/dbus.h>
 #include <gtk/gtk.h>
 
 #include <telepathy-glib/util.h>
@@ -68,6 +67,9 @@ static const gchar *themes[] = {
 	"simple", N_("Simple"),
 	"clean", N_("Clean"),
 	"blue", N_("Blue"),
+#ifdef HAVE_WEBKIT
+	"adium", N_("Adium"),
+#endif
 	NULL
 };
 
@@ -376,10 +378,6 @@ theme_manager_ensure_theme_exists (const gchar *name)
 		return FALSE;
 	}
 
-	if (strcmp ("adium", name) == 0) {
-		return TRUE;
-	}
-
 	for (i = 0; themes[i]; i += 2) {
 		if (strcmp (themes[i], name) == 0) {
 			return TRUE;
@@ -536,62 +534,3 @@ empathy_theme_manager_get_themes (void)
 	return themes;
 }
 
-#ifdef HAVE_WEBKIT
-static void
-find_themes (GList **list, const gchar *dirpath)
-{
-	GDir *dir;
-	GError *error = NULL;
-	const gchar *name = NULL;
-	GHashTable *info = NULL;
-
-	dir = g_dir_open (dirpath, 0, &error);
-	if (dir != NULL) {
-		name = g_dir_read_name (dir);
-		while (name != NULL) {
-			gchar *path;
-
-			path = g_build_path (G_DIR_SEPARATOR_S, dirpath, name, NULL);
-			if (empathy_adium_path_is_valid (path)) {
-				info = empathy_adium_info_new (path);
-				if (info != NULL) {
-					*list = g_list_prepend (*list, info);
-				}
-			}
-			g_free (path);
-			name = g_dir_read_name (dir);
-		}
-		g_dir_close (dir);
-	} else {
-		DEBUG ("Error opening %s: %s\n", dirpath, error->message);
-		g_error_free (error);
-	}
-}
-#endif /* HAVE_WEBKIT */
-
-GList *
-empathy_theme_manager_get_adium_themes (void)
-{
-#ifdef HAVE_WEBKIT
-	GList *themes = NULL;
-	gchar *userpath = NULL;
-	const gchar *const *paths = NULL;
-	gint i = 0;
-
-	userpath = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), "adium/message-styles", NULL);
-	find_themes (&themes, userpath);
-	g_free (userpath);
-
-	paths = g_get_system_data_dirs ();
-	for (i = 0; paths[i] != NULL; i++) {
-		userpath = g_build_path (G_DIR_SEPARATOR_S, paths[i],
-			"adium/message-styles", NULL);
-		find_themes (&themes, userpath);
-		g_free (userpath);
-	}
-
-	return themes;
-#else
-	return NULL;
-#endif /* HAVE_WEBKIT */
-}
diff --git a/libempathy-gtk/empathy-theme-manager.h b/libempathy-gtk/empathy-theme-manager.h
index a459b43..99c96d7 100644
--- a/libempathy-gtk/empathy-theme-manager.h
+++ b/libempathy-gtk/empathy-theme-manager.h
@@ -51,7 +51,6 @@ struct _EmpathyThemeManagerClass {
 GType                   empathy_theme_manager_get_type    (void) G_GNUC_CONST;
 EmpathyThemeManager *   empathy_theme_manager_get         (void);
 const gchar **          empathy_theme_manager_get_themes  (void);
-GList *                 empathy_theme_manager_get_adium_themes (void);
 EmpathyChatView *       empathy_theme_manager_create_view (EmpathyThemeManager *manager);
 
 G_END_DECLS
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index e91ac62..ffe81a3 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -183,11 +183,11 @@ empathy_builder_unref_and_keep_widget (GtkBuilder *gui,
 }
 
 const gchar *
-empathy_icon_name_from_account (EmpathyAccount *account)
+empathy_icon_name_from_account (McAccount *account)
 {
 	McProfile *profile;
 
-	profile = empathy_account_get_profile (account);
+	profile = mc_account_get_profile (account);
 
 	return mc_profile_get_icon_name (profile);
 }
@@ -1250,7 +1250,7 @@ empathy_window_get_is_visible (GtkWindow *window)
 
 	g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
-	gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
+	gdk_window = GTK_WIDGET (window)->window;
 	if (!gdk_window) {
 		return FALSE;
 	}
@@ -1272,7 +1272,7 @@ empathy_window_iconify (GtkWindow *window, GtkStatusIcon *status_icon)
 	GdkWindow    *gdk_window;
 
 	gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL);
-	gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
+	gdk_window = GTK_WIDGET (window)->window;
 	dpy = gdk_x11_drawable_get_xdisplay (gdk_window);
 
 	data[0] = icon_location.x;
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 10f889b..4c13846 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -34,10 +34,10 @@
 
 #include <gtk/gtk.h>
 
+#include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-profile.h>
 
 #include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-account.h>
 #include <libempathy/empathy-ft-handler.h>
 
 #include "empathy-chat-view.h"
@@ -59,7 +59,7 @@ GtkWidget     *empathy_builder_unref_and_keep_widget    (GtkBuilder       *gui,
 							 GtkWidget        *root);
 
 /* Pixbufs */
-const gchar * empathy_icon_name_from_account            (EmpathyAccount   *account);
+const gchar * empathy_icon_name_from_account            (McAccount        *account);
 const gchar * empathy_icon_name_for_presence            (TpConnectionPresenceType  presence);
 const gchar * empathy_icon_name_for_contact             (EmpathyContact   *contact);
 GdkPixbuf *   empathy_pixbuf_from_data                  (gchar            *data,
diff --git a/libempathy-gtk/empathy-video-widget.c b/libempathy-gtk/empathy-video-widget.c
index 0f62496..79f2781 100644
--- a/libempathy-gtk/empathy-video-widget.c
+++ b/libempathy-gtk/empathy-video-widget.c
@@ -403,7 +403,7 @@ empathy_video_widget_sync_message_cb (GstBus *bus, GstMessage *message,
     {
       g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (self)));
       gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (priv->overlay),
-        GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (self))));
+        GDK_WINDOW_XID (GTK_WIDGET (self)->window));
     }
 }
 
@@ -418,13 +418,13 @@ empathy_video_widget_expose_event (GtkWidget *widget, GdkEventExpose *event)
 
   if (priv->overlay == NULL)
     {
-      gdk_window_clear_area (gtk_widget_get_window (widget), 0, 0,
+      gdk_window_clear_area (widget->window, 0, 0,
         widget->allocation.width, widget->allocation.height);
       return TRUE;
     }
 
   gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (priv->overlay),
-    GDK_WINDOW_XID (gtk_widget_get_window (widget)));
+    GDK_WINDOW_XID (widget->window));
 
   gst_x_overlay_expose (GST_X_OVERLAY (priv->overlay));
 
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 2767154..2877dc6 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -24,8 +24,6 @@ BUILT_SOURCES = 					\
 lib_LTLIBRARIES = libempathy.la
 
 libempathy_la_SOURCES =					\
-	empathy-account.c			\
-	empathy-account-priv.h			\
 	empathy-account-manager.c			\
 	empathy-chatroom.c				\
 	empathy-chatroom-manager.c			\
@@ -76,7 +74,6 @@ libempathy_la_LDFLAGS =		\
        -export-symbols-regex ^empathy_
 
 libempathy_headers =				\
-	empathy-account.h		\
 	empathy-account-manager.h		\
 	empathy-chatroom.h			\
 	empathy-chatroom-manager.h		\
diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c
index fd8a21b..ff9fd25 100644
--- a/libempathy/empathy-account-manager.c
+++ b/libempathy/empathy-account-manager.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Authors: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
- *          Sjoerd Simons <sjoerd.simons@collabora.co.uk>
  */
 
 #include "config.h"
@@ -24,7 +23,6 @@
 #include <libmissioncontrol/mc-account-monitor.h>
 
 #include "empathy-account-manager.h"
-#include "empathy-account-priv.h"
 #include "empathy-marshal.h"
 #include "empathy-utils.h"
 
@@ -37,13 +35,22 @@ typedef struct {
   McAccountMonitor *monitor;
   MissionControl   *mc;
 
-  /* (owned) unique name -> (reffed) EmpathyAccount */
-  GHashTable       *accounts;
+  GHashTable       *accounts; /* McAccount -> AccountData */
+  GHashTable       *connections; /* TpConnection -> McAccount */
   int               connected;
   int               connecting;
   gboolean          dispose_run;
 } EmpathyAccountManagerPriv;
 
+typedef struct {
+  TpConnection *connection;
+  TpConnectionPresenceType presence;
+  TpConnectionStatus status;
+  gboolean is_enabled;
+
+  guint source_id;
+} AccountData;
+
 enum {
   ACCOUNT_CREATED,
   ACCOUNT_DELETED,
@@ -61,154 +68,122 @@ static EmpathyAccountManager *manager_singleton = NULL;
 
 G_DEFINE_TYPE (EmpathyAccountManager, empathy_account_manager, G_TYPE_OBJECT);
 
-static TpConnectionPresenceType
-mc_presence_to_tp_presence (McPresence presence)
+static AccountData *
+account_data_new (McPresence presence,
+                  TpConnectionStatus status,
+                  gboolean is_enabled)
 {
-  switch (presence)
-    {
-      case MC_PRESENCE_OFFLINE:
-        return TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
-      case MC_PRESENCE_AVAILABLE:
-        return TP_CONNECTION_PRESENCE_TYPE_AVAILABLE;
-      case MC_PRESENCE_AWAY:
-        return TP_CONNECTION_PRESENCE_TYPE_AWAY;
-      case MC_PRESENCE_EXTENDED_AWAY:
-        return TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY;
-      case MC_PRESENCE_HIDDEN:
-        return TP_CONNECTION_PRESENCE_TYPE_HIDDEN;
-      case MC_PRESENCE_DO_NOT_DISTURB:
-        return TP_CONNECTION_PRESENCE_TYPE_BUSY;
-      default:
-        return TP_CONNECTION_PRESENCE_TYPE_UNSET;
-    }
-}
+  AccountData *retval;
 
-static void
-emp_account_connection_cb (EmpathyAccount *account,
-  GParamSpec *spec,
-  gpointer manager)
-{
-  TpConnection *connection = empathy_account_get_connection (account);
-
-  DEBUG ("Signalling connection %p of account %s",
-      connection, empathy_account_get_unique_name (account));
+  retval = g_slice_new0 (AccountData);
+  retval->presence = presence;
+  retval->status = status;
+  retval->is_enabled = is_enabled;
+  retval->source_id = 0;
 
-  if (connection != NULL)
-    g_signal_emit (manager, signals[NEW_CONNECTION], 0, connection);
+  return retval;
 }
 
-static void
-emp_account_status_changed_cb (EmpathyAccount *account,
-  TpConnectionStatus old,
-  TpConnectionStatus new,
-  TpConnectionStatusReason reason,
-  gpointer user_data)
+static AccountData *
+account_data_new_default (MissionControl *mc,
+                          McAccount *account)
 {
-  EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (user_data);
-  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+  McPresence actual_p;
+  TpConnectionStatus actual_c;
+  GError *err = NULL;
 
-  switch (old)
+  actual_p = mission_control_get_presence_actual (mc, &err);
+  if (err != NULL)
     {
-      case TP_CONNECTION_STATUS_CONNECTING:
-        priv->connecting--;
-        break;
-      case TP_CONNECTION_STATUS_CONNECTED:
-        priv->connected--;
-        break;
-      default:
-        break;
+      actual_p = MC_PRESENCE_UNSET;
+      g_clear_error (&err);
     }
 
-  switch (new)
+  actual_c = mission_control_get_connection_status (mc, account, &err);
+
+  if (err != NULL)
     {
-      case TP_CONNECTION_STATUS_CONNECTING:
-        priv->connecting++;
-        break;
-      case TP_CONNECTION_STATUS_CONNECTED:
-        priv->connected++;
-        break;
-      default:
-        break;
+      actual_c = TP_CONNECTION_STATUS_DISCONNECTED;
+      g_error_free (err);
     }
 
-  g_signal_emit (manager, signals[ACCOUNT_CONNECTION_CHANGED], 0,
-    account, reason, new, old);
+  return account_data_new (actual_p, actual_c, mc_account_is_enabled (account));
 }
 
 static void
-emp_account_presence_changed_cb (EmpathyAccount *account,
-  TpConnectionPresenceType old,
-  TpConnectionPresenceType new,
-  gpointer user_data)
+account_data_free (AccountData *data)
 {
-  EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (user_data);
-  g_signal_emit (manager, signals[ACCOUNT_PRESENCE_CHANGED], 0,
-    account, new, old);
+  if (data->source_id > 0)
+    {
+      g_source_remove (data->source_id);
+      data->source_id = 0;
+    }
+  if (data->connection != NULL)
+    {
+      g_object_unref (data->connection);
+      data->connection = NULL;
+    }
+
+  g_slice_free (AccountData, data);
 }
 
-static EmpathyAccount *
-create_account (EmpathyAccountManager *manager,
-  const gchar *account_name,
-  McAccount *mc_account)
+static void
+connection_invalidated_cb (TpProxy *connection,
+                           guint    domain,
+                           gint     code,
+                           gchar   *message,
+                           EmpathyAccountManager *manager)
 {
   EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
-  EmpathyAccount *account;
-  TpConnectionStatus status;
-  TpConnectionPresenceType presence;
-  McPresence mc_presence;
-  TpConnection *connection;
-  GError *error = NULL;
-
-  if ((account = g_hash_table_lookup (priv->accounts, account_name)) != NULL)
-    return account;
-
-  account = _empathy_account_new (mc_account);
-  g_hash_table_insert (priv->accounts, g_strdup (account_name),
-    account);
+  McAccount *account;
+  AccountData *data;
 
-  _empathy_account_set_enabled (account,
-      mc_account_is_enabled (mc_account));
+  DEBUG ("Message: %s", message);
 
-  g_signal_emit (manager, signals[ACCOUNT_CREATED], 0, account);
+  account = g_hash_table_lookup (priv->connections, connection);
+  g_assert (account != NULL);
 
-  g_signal_connect (account, "notify::connection",
-    G_CALLBACK (emp_account_connection_cb), manager);
+  data = g_hash_table_lookup (priv->accounts, account);
+  g_assert (data != NULL);
 
-  connection = mission_control_get_tpconnection (priv->mc,
-    mc_account, NULL);
-  _empathy_account_set_connection (account, connection);
+  g_object_unref (data->connection);
+  data->connection = NULL;
 
-  status = mission_control_get_connection_status (priv->mc,
-     mc_account, &error);
-
-  if (error != NULL)
-    {
-      status = TP_CONNECTION_STATUS_DISCONNECTED;
-      g_clear_error (&error);
-    }
+  g_hash_table_remove (priv->connections, connection);
+}
 
-  mc_presence = mission_control_get_presence_actual (priv->mc, &error);
+static void
+connection_ready_cb (TpConnection *connection,
+                     const GError *error,
+                     gpointer manager)
+{
+  /* Errors will be handled in invalidated callback */
   if (error != NULL)
-    {
-      presence = TP_CONNECTION_PRESENCE_TYPE_UNSET;
-      g_clear_error (&error);
-    }
-  else
-    {
-      presence = mc_presence_to_tp_presence (mc_presence);
-    }
+    return;
 
-  g_signal_connect (account, "status-changed",
-    G_CALLBACK (emp_account_status_changed_cb), manager);
+  g_signal_emit (manager, signals[NEW_CONNECTION], 0, connection);
+}
 
-  g_signal_connect (account, "presence-changed",
-    G_CALLBACK (emp_account_presence_changed_cb), manager);
+static void
+account_manager_update_connection (EmpathyAccountManager *manager,
+                                   AccountData *data,
+                                   McAccount *account)
+{
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
 
-  _empathy_account_set_status (account, status,
-    TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED,
-    presence);
+  if (data->connection)
+    return;
 
-  return account;
+  data->connection = mission_control_get_tpconnection (priv->mc, account, NULL);
+  if (data->connection != NULL)
+    {
+      g_signal_connect (data->connection, "invalidated",
+          G_CALLBACK (connection_invalidated_cb), manager);
+      g_hash_table_insert (priv->connections, g_object_ref (data->connection),
+          g_object_ref (account));
+      tp_connection_call_when_ready (data->connection, connection_ready_cb,
+          manager);
+    }
 }
 
 static void
@@ -216,10 +191,32 @@ account_created_cb (McAccountMonitor *mon,
                     gchar *account_name,
                     EmpathyAccountManager *manager)
 {
-  McAccount *mc_account = mc_account_lookup (account_name);
+  McAccount *account;
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+  TpConnectionStatus initial_status;
+
+  account = mc_account_lookup (account_name);
+
+  if (account)
+    {
+      AccountData *data;
+
+      data = account_data_new_default (priv->mc, account);
+      g_hash_table_insert (priv->accounts, g_object_ref (account), data);
+
+      initial_status = mission_control_get_connection_status (priv->mc,
+							      account, NULL);
+
+      if (initial_status == TP_CONNECTION_STATUS_CONNECTED)
+	priv->connected++;
+      else if (initial_status == TP_CONNECTION_STATUS_CONNECTING)
+	priv->connecting++;
+
+      account_manager_update_connection (manager, data, account);
 
-  if (mc_account != NULL)
-    create_account (manager, account_name, mc_account);
+      g_signal_emit (manager, signals[ACCOUNT_CREATED], 0, account);
+      g_object_unref (account);
+    }
 }
 
 static void
@@ -227,15 +224,16 @@ account_deleted_cb (McAccountMonitor *mon,
                     gchar *account_name,
                     EmpathyAccountManager *manager)
 {
+  McAccount *account;
   EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
-  EmpathyAccount *account;
 
-  account = g_hash_table_lookup (priv->accounts, account_name);
+  account = mc_account_lookup (account_name);
 
   if (account)
     {
+      g_hash_table_remove (priv->accounts, account);
       g_signal_emit (manager, signals[ACCOUNT_DELETED], 0, account);
-      g_hash_table_remove (priv->accounts, account_name);
+      g_object_unref (account);
     }
 }
 
@@ -244,13 +242,15 @@ account_changed_cb (McAccountMonitor *mon,
                     gchar *account_name,
                     EmpathyAccountManager *manager)
 {
-  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
-  EmpathyAccount *account;
+  McAccount *account;
 
-  account = g_hash_table_lookup (priv->accounts, account_name);
+  account = mc_account_lookup (account_name);
 
-  if (account != NULL)
-    g_signal_emit (manager, signals[ACCOUNT_CHANGED], 0, account);
+  if (account)
+    {
+      g_signal_emit (manager, signals[ACCOUNT_CHANGED], 0, account);
+      g_object_unref (account);
+    }
 }
 
 static void
@@ -258,15 +258,20 @@ account_disabled_cb (McAccountMonitor *mon,
                      gchar *account_name,
                      EmpathyAccountManager *manager)
 {
+  McAccount *account;
   EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
-  EmpathyAccount *account;
+  AccountData *data;
 
-  account = g_hash_table_lookup (priv->accounts, account_name);
+  account = mc_account_lookup (account_name);
 
   if (account)
     {
-      _empathy_account_set_enabled (account, FALSE);
+      data = g_hash_table_lookup (priv->accounts, account);
+      g_assert (data);
+      data->is_enabled = FALSE;
+
       g_signal_emit (manager, signals[ACCOUNT_DISABLED], 0, account);
+      g_object_unref (account);
     }
 }
 
@@ -275,60 +280,135 @@ account_enabled_cb (McAccountMonitor *mon,
                     gchar *account_name,
                     EmpathyAccountManager *manager)
 {
+  McAccount *account;
   EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
-  EmpathyAccount *account;
+  AccountData *data;
 
-  account = g_hash_table_lookup (priv->accounts, account_name);
+  account = mc_account_lookup (account_name);
 
   if (account)
     {
-      _empathy_account_set_enabled (account, TRUE);
+      data = g_hash_table_lookup (priv->accounts, account);
+      g_assert (data);
+      data->is_enabled = TRUE;
+
       g_signal_emit (manager, signals[ACCOUNT_ENABLED], 0, account);
+      g_object_unref (account);
     }
 }
 
+static void
+update_connection_numbers (EmpathyAccountManager *manager,
+                           TpConnectionStatus status,
+                           TpConnectionStatus old_s)
+{
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+
+  if (status == TP_CONNECTION_STATUS_CONNECTED)
+    {
+      priv->connected++;
+      if (old_s == TP_CONNECTION_STATUS_CONNECTING)
+        priv->connecting--;
+    }
+
+  if (status == TP_CONNECTION_STATUS_CONNECTING)
+    {
+      priv->connecting++;
+      if (old_s == TP_CONNECTION_STATUS_CONNECTED)
+        priv->connected--;
+    }
+
+  if (status == TP_CONNECTION_STATUS_DISCONNECTED)
+    {
+      if (old_s == TP_CONNECTION_STATUS_CONNECTED)
+        priv->connected--;
+
+      if (old_s == TP_CONNECTION_STATUS_CONNECTING)
+        priv->connecting--;
+    }
+}
+
+static gboolean
+remove_data_timeout (gpointer _data)
+{
+  AccountData *data = _data;
+
+  data->source_id = 0;
+
+  return FALSE;
+}
+
 typedef struct {
   TpConnectionStatus status;
-  TpConnectionPresenceType presence;
+  McPresence presence;
   TpConnectionStatusReason reason;
   gchar *unique_name;
   EmpathyAccountManager *manager;
-  McAccount *mc_account;
 } ChangedSignalData;
 
 static gboolean
 account_status_changed_idle_cb (ChangedSignalData *signal_data)
 {
-  EmpathyAccount *account;
+  McAccount *account;
+  AccountData *data;
+  McPresence presence, old_p;
+  TpConnectionStatus status, old_s;
+  gboolean emit_presence = FALSE, emit_connection = FALSE;
   EmpathyAccountManager *manager = signal_data->manager;
   EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
 
-  account = g_hash_table_lookup (priv->accounts,
-    signal_data->unique_name);
+  presence = signal_data->presence;
+  status = signal_data->status;
+  account = mc_account_lookup (signal_data->unique_name);
 
   if (account)
     {
-      if (empathy_account_get_connection (account) == NULL)
+      data = g_hash_table_lookup (priv->accounts, account);
+      g_assert (data);
+
+      old_p = data->presence;
+      old_s = data->status;
+
+      if (old_p != presence)
         {
-          TpConnection *connection;
+          data->presence = presence;
+          emit_presence = TRUE;
+        }
 
-          connection = mission_control_get_tpconnection (priv->mc,
-             signal_data->mc_account, NULL);
+      if (old_s != status)
+        {
+          data->status = status;
+          update_connection_numbers (manager, status, old_s);
 
-          if (connection != NULL)
+          if (status == TP_CONNECTION_STATUS_CONNECTED)
             {
-              _empathy_account_set_connection (account, connection);
-              g_object_unref (connection);
+                if (data->source_id > 0)
+                  {
+                    g_source_remove (data->source_id);
+                    data->source_id = 0;
+                  }
+
+                data->source_id = g_timeout_add_seconds (10,
+                                                         remove_data_timeout,
+                                                         data);
             }
+          emit_connection = TRUE;
         }
 
-      _empathy_account_set_status (account, signal_data->status,
-        signal_data->reason,
-        signal_data->presence);
+      account_manager_update_connection (manager, data, account);
+
+      if (emit_presence)
+        g_signal_emit (manager, signals[ACCOUNT_PRESENCE_CHANGED], 0,
+                       account, presence, old_p);
+
+      if (emit_connection)
+        g_signal_emit (manager, signals[ACCOUNT_CONNECTION_CHANGED], 0,
+                       account, signal_data->reason, status, old_s);
+
+      g_object_unref (account);
     }
 
   g_object_unref (signal_data->manager);
-  g_object_unref (signal_data->mc_account);
   g_free (signal_data->unique_name);
   g_slice_free (ChangedSignalData, signal_data);
 
@@ -344,18 +424,38 @@ account_status_changed_cb (MissionControl *mc,
                            EmpathyAccountManager *manager)
 {
   ChangedSignalData *data;
+  TpConnectionPresenceType tp_presence;
 
-  DEBUG ("Status of account %s became "
-    "status: %d presence: %d reason: %d", unique_name, status,
-    presence, reason);
+  switch (presence)
+    {
+      case MC_PRESENCE_OFFLINE:
+        tp_presence = TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
+        break;
+      case MC_PRESENCE_AVAILABLE:
+        tp_presence = TP_CONNECTION_PRESENCE_TYPE_AVAILABLE;
+        break;
+      case MC_PRESENCE_AWAY:
+        tp_presence = TP_CONNECTION_PRESENCE_TYPE_AWAY;
+        break;
+      case MC_PRESENCE_EXTENDED_AWAY:
+        tp_presence = TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY;
+        break;
+      case MC_PRESENCE_HIDDEN:
+        tp_presence = TP_CONNECTION_PRESENCE_TYPE_HIDDEN;
+        break;
+      case MC_PRESENCE_DO_NOT_DISTURB:
+        tp_presence = TP_CONNECTION_PRESENCE_TYPE_BUSY;
+        break;
+      default:
+        tp_presence = TP_CONNECTION_PRESENCE_TYPE_UNSET;
+    }
 
   data = g_slice_new0 (ChangedSignalData);
   data->status = status;
-  data->presence = mc_presence_to_tp_presence (presence);
+  data->presence = tp_presence;
   data->reason = reason;
   data->unique_name = g_strdup (unique_name);
   data->manager = g_object_ref (manager);
-  data->mc_account = mc_account_lookup (unique_name);
 
   g_idle_add ((GSourceFunc) account_status_changed_idle_cb, data);
 }
@@ -367,33 +467,35 @@ empathy_account_manager_init (EmpathyAccountManager *manager)
   GList *mc_accounts, *l;
 
   priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
-      EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv);
-
+				      EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv);
   manager->priv = priv;
   priv->monitor = mc_account_monitor_new ();
   priv->mc = empathy_mission_control_dup_singleton ();
   priv->connected = priv->connecting = 0;
   priv->dispose_run = FALSE;
 
-  priv->accounts = g_hash_table_new_full (g_str_hash, g_str_equal,
-      g_free, (GDestroyNotify) g_object_unref);
+  priv->accounts = g_hash_table_new_full (empathy_account_hash,
+                                          empathy_account_equal,
+                                          g_object_unref,
+                                          (GDestroyNotify) account_data_free);
+  priv->connections = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+                                             g_object_unref, g_object_unref);
 
   mc_accounts = mc_accounts_list ();
 
   for (l = mc_accounts; l; l = l->next)
-    account_created_cb (priv->monitor,
-      (char *) mc_account_get_unique_name (l->data), manager);
+    account_created_cb (priv->monitor, (char *) mc_account_get_unique_name (l->data), manager);
 
   g_signal_connect (priv->monitor, "account-created",
-      G_CALLBACK (account_created_cb), manager);
+                    G_CALLBACK (account_created_cb), manager);
   g_signal_connect (priv->monitor, "account-deleted",
-      G_CALLBACK (account_deleted_cb), manager);
+                    G_CALLBACK (account_deleted_cb), manager);
   g_signal_connect (priv->monitor, "account-disabled",
-      G_CALLBACK (account_disabled_cb), manager);
+                    G_CALLBACK (account_disabled_cb), manager);
   g_signal_connect (priv->monitor, "account-enabled",
-      G_CALLBACK (account_enabled_cb), manager);
+                    G_CALLBACK (account_enabled_cb), manager);
   g_signal_connect (priv->monitor, "account-changed",
-      G_CALLBACK (account_changed_cb), manager);
+                    G_CALLBACK (account_changed_cb), manager);
 
   dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc), "AccountStatusChanged",
                                G_CALLBACK (account_status_changed_cb),
@@ -403,12 +505,27 @@ empathy_account_manager_init (EmpathyAccountManager *manager)
 }
 
 static void
+account_manager_disconnect_foreach (gpointer key,
+                                    gpointer value,
+                                    gpointer user_data)
+{
+  TpConnection *connection = key;
+  EmpathyAccountManager *manager = user_data;
+
+  g_signal_handlers_disconnect_by_func (connection, connection_invalidated_cb,
+    manager);
+}
+
+static void
 do_finalize (GObject *obj)
 {
   EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (obj);
   EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
 
-  g_hash_table_destroy (priv->accounts);
+  g_hash_table_unref (priv->accounts);
+  g_hash_table_foreach (priv->connections, account_manager_disconnect_foreach,
+    obj);
+  g_hash_table_unref (priv->connections);
 
   G_OBJECT_CLASS (empathy_account_manager_parent_class)->finalize (obj);
 }
@@ -493,7 +610,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass)
                   NULL, NULL,
                   g_cclosure_marshal_VOID__OBJECT,
                   G_TYPE_NONE,
-                  1, EMPATHY_TYPE_ACCOUNT);
+                  1, MC_TYPE_ACCOUNT);
 
   signals[ACCOUNT_DELETED] =
     g_signal_new ("account-deleted",
@@ -503,7 +620,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass)
                   NULL, NULL,
                   g_cclosure_marshal_VOID__OBJECT,
                   G_TYPE_NONE,
-                  1, EMPATHY_TYPE_ACCOUNT);
+                  1, MC_TYPE_ACCOUNT);
 
   signals[ACCOUNT_ENABLED] =
     g_signal_new ("account-enabled",
@@ -513,7 +630,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass)
                   NULL, NULL,
                   g_cclosure_marshal_VOID__OBJECT,
                   G_TYPE_NONE,
-                  1, EMPATHY_TYPE_ACCOUNT);
+                  1, MC_TYPE_ACCOUNT);
 
   signals[ACCOUNT_DISABLED] =
     g_signal_new ("account-disabled",
@@ -523,7 +640,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass)
                   NULL, NULL,
                   g_cclosure_marshal_VOID__OBJECT,
                   G_TYPE_NONE,
-                  1, EMPATHY_TYPE_ACCOUNT);
+                  1, MC_TYPE_ACCOUNT);
 
   signals[ACCOUNT_CHANGED] =
     g_signal_new ("account-changed",
@@ -533,7 +650,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass)
                   NULL, NULL,
                   g_cclosure_marshal_VOID__OBJECT,
                   G_TYPE_NONE,
-                  1, EMPATHY_TYPE_ACCOUNT);
+                  1, MC_TYPE_ACCOUNT);
 
   signals[ACCOUNT_CONNECTION_CHANGED] =
     g_signal_new ("account-connection-changed",
@@ -543,7 +660,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass)
                   NULL, NULL,
                   _empathy_marshal_VOID__OBJECT_INT_UINT_UINT,
                   G_TYPE_NONE,
-                  4, EMPATHY_TYPE_ACCOUNT,
+                  4, MC_TYPE_ACCOUNT,
                   G_TYPE_INT,   /* reason */
                   G_TYPE_UINT,  /* actual connection */
                   G_TYPE_UINT); /* previous connection */
@@ -556,7 +673,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass)
                   NULL, NULL,
                   _empathy_marshal_VOID__OBJECT_INT_INT,
                   G_TYPE_NONE,
-                  3, EMPATHY_TYPE_ACCOUNT,
+                  3, MC_TYPE_ACCOUNT,
                   G_TYPE_INT,  /* actual presence */
                   G_TYPE_INT); /* previous presence */
 
@@ -581,16 +698,6 @@ empathy_account_manager_dup_singleton (void)
   return g_object_new (EMPATHY_TYPE_ACCOUNT_MANAGER, NULL);
 }
 
-EmpathyAccount *
-empathy_account_manager_create (EmpathyAccountManager *manager,
-  McProfile *profile)
-{
-  McAccount *mc_account = mc_account_create (profile);
-  return g_object_ref (create_account (manager,
-      mc_account_get_unique_name (mc_account),
-      mc_account));
-}
-
 int
 empathy_account_manager_get_connected_accounts (EmpathyAccountManager *manager)
 {
@@ -615,6 +722,23 @@ empathy_account_manager_get_connecting_accounts (EmpathyAccountManager *manager)
   return priv->connecting;
 }
 
+gboolean
+empathy_account_manager_is_account_just_connected (EmpathyAccountManager *manager,
+                                                   McAccount *account)
+{
+  EmpathyAccountManagerPriv *priv;
+  AccountData *data;
+
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), FALSE);
+
+  priv = GET_PRIV (manager);
+  data = g_hash_table_lookup (priv->accounts, account);
+
+  g_assert (data);
+
+  return (data->source_id > 0);
+}
+
 /**
  * empathy_account_manager_get_count:
  * @manager: a #EmpathyAccountManager
@@ -635,59 +759,62 @@ empathy_account_manager_get_count (EmpathyAccountManager *manager)
   return g_hash_table_size (priv->accounts);
 }
 
-EmpathyAccount *
+McAccount *
 empathy_account_manager_get_account (EmpathyAccountManager *manager,
                                      TpConnection          *connection)
 {
   EmpathyAccountManagerPriv *priv;
-  GHashTableIter iter;
-  gpointer value;
 
   g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0);
 
   priv = GET_PRIV (manager);
 
-  g_hash_table_iter_init (&iter, priv->accounts);
-  while (g_hash_table_iter_next (&iter, NULL, &value))
-    {
-      EmpathyAccount *account = EMPATHY_ACCOUNT (value);
-
-      if (connection == empathy_account_get_connection (account))
-          return account;
-    }
-
-  return NULL;
+  return g_hash_table_lookup (priv->connections, connection);
 }
 
-EmpathyAccount *
-empathy_account_manager_lookup (EmpathyAccountManager *manager,
-    const gchar *unique_name)
+GList *
+empathy_account_manager_dup_accounts (EmpathyAccountManager *manager)
 {
-  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
-  EmpathyAccount *account;
+  EmpathyAccountManagerPriv *priv;
+  GList *ret;
+
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL);
 
-  account = g_hash_table_lookup (priv->accounts, unique_name);
+  priv = GET_PRIV (manager);
 
-  if (account != NULL)
-    g_object_ref (account);
+  ret = g_hash_table_get_keys (priv->accounts);
+  g_list_foreach (ret, (GFunc) g_object_ref, NULL);
 
-  return account;
+  return ret;
 }
 
-GList *
-empathy_account_manager_dup_accounts (EmpathyAccountManager *manager)
+/**
+ * empathy_account_manager_get_connection:
+ * @manager: a #EmpathyAccountManager
+ * @account: a #McAccount
+ *
+ * Get the connection of the accounts, or NULL if account is offline or the
+ * connection is not yet ready. This function does not return a new ref.
+ *
+ * Returns: the connection of the accounts.
+ **/
+TpConnection *
+empathy_account_manager_get_connection (EmpathyAccountManager *manager,
+                                        McAccount *account)
 {
   EmpathyAccountManagerPriv *priv;
-  GList *ret;
+  AccountData *data;
 
   g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL);
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
 
   priv = GET_PRIV (manager);
 
-  ret = g_hash_table_get_values (priv->accounts);
-  g_list_foreach (ret, (GFunc) g_object_ref, NULL);
+  data = g_hash_table_lookup (priv->accounts, account);
+  if (data && data->connection && tp_connection_is_ready (data->connection))
+    return data->connection;
 
-  return ret;
+  return NULL;
 }
 
 /**
@@ -704,30 +831,18 @@ empathy_account_manager_dup_connections (EmpathyAccountManager *manager)
 {
   EmpathyAccountManagerPriv *priv;
   GHashTableIter iter;
-  gpointer value;
+  gpointer connection;
   GList *ret = NULL;
 
   g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL);
 
   priv = GET_PRIV (manager);
 
-  g_hash_table_iter_init (&iter, priv->accounts);
-  while (g_hash_table_iter_next (&iter, NULL, &value))
-    {
-      EmpathyAccount *account = EMPATHY_ACCOUNT (value);
-      TpConnection *connection;
-
-      connection = empathy_account_get_connection (account);
-      if (connection != NULL)
-        ret = g_list_prepend (ret, g_object_ref (connection));
-    }
+  g_hash_table_iter_init (&iter, priv->connections);
+  while (g_hash_table_iter_next (&iter, &connection, NULL))
+    if (connection != NULL && tp_connection_is_ready (connection))
+      ret = g_list_prepend (ret, g_object_ref (connection));
 
   return ret;
 }
 
-void
-empathy_account_manager_remove (EmpathyAccountManager *manager,
-    EmpathyAccount *account)
-{
-  mc_account_delete (_empathy_account_get_mc_account (account));
-}
diff --git a/libempathy/empathy-account-manager.h b/libempathy/empathy-account-manager.h
index b04571f..11ca6ac 100644
--- a/libempathy/empathy-account-manager.h
+++ b/libempathy/empathy-account-manager.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 
-#include "empathy-account.h"
+#include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
 
@@ -52,28 +52,25 @@ GType empathy_account_manager_get_type (void);
 /* public methods */
 
 EmpathyAccountManager * empathy_account_manager_dup_singleton (void);
-EmpathyAccount *        empathy_account_manager_create
-                                (EmpathyAccountManager *manager,
-                                 McProfile *profile);
 int                     empathy_account_manager_get_connected_accounts
                                 (EmpathyAccountManager *manager);
 int                     empathy_account_manager_get_connecting_accounts
                                 (EmpathyAccountManager *manager);
+gboolean                empathy_account_manager_is_account_just_connected
+                                (EmpathyAccountManager *manager,
+                                 McAccount             *account);
 int                     empathy_account_manager_get_count
                                 (EmpathyAccountManager *manager);
-EmpathyAccount *        empathy_account_manager_get_account
+McAccount *             empathy_account_manager_get_account
                                 (EmpathyAccountManager *manager,
                                  TpConnection          *connection);
-EmpathyAccount *        empathy_account_manager_lookup
-                                (EmpathyAccountManager *manager,
-                                 const gchar *unique_name);
 GList *                 empathy_account_manager_dup_accounts
                                 (EmpathyAccountManager *manager);
+TpConnection *          empathy_account_manager_get_connection
+                                (EmpathyAccountManager *manager,
+                                 McAccount             *account);
 GList *                 empathy_account_manager_dup_connections
                                 (EmpathyAccountManager *manager);
-void                    empathy_account_manager_remove (
-                                 EmpathyAccountManager *manager,
-                                 EmpathyAccount *account);
 
 G_END_DECLS
 
diff --git a/libempathy/empathy-account-priv.h b/libempathy/empathy-account-priv.h
deleted file mode 100644
index 8b656b4..0000000
--- a/libempathy/empathy-account-priv.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * empathy-account-priv.h - Private Header for EmpathyAccount
- * Copyright (C) 2009 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd.simons@collabora.co.uk>
- *
- * 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
- */
-
-#ifndef __EMPATHY_ACCOUNT_PRIV_H__
-#define __EMPATHY_ACCOUNT_PRIV_H__
-
-#include <glib.h>
-
-#include <libmissioncontrol/mc-account.h>
-#include "empathy-account.h"
-
-G_BEGIN_DECLS
-
-EmpathyAccount *_empathy_account_new (McAccount *account);
-void _empathy_account_set_status (EmpathyAccount *account,
-    TpConnectionStatus status,
-    TpConnectionStatusReason reason,
-    TpConnectionPresenceType presence);
-void _empathy_account_set_connection (EmpathyAccount *account,
-    TpConnection *connection);
-void _empathy_account_set_enabled (EmpathyAccount *account,
-    gboolean enabled);
-McAccount *_empathy_account_get_mc_account (EmpathyAccount *account);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNT_PRIV_H__*/
diff --git a/libempathy/empathy-account.c b/libempathy/empathy-account.c
deleted file mode 100644
index e0a8e75..0000000
--- a/libempathy/empathy-account.c
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
- * empathy-account.c - Source for EmpathyAccount
- * Copyright (C) 2009 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd.simons@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <telepathy-glib/enums.h>
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-account.h"
-#include "empathy-account-priv.h"
-#include "empathy-utils.h"
-#include "empathy-marshal.h"
-
-/* signals */
-enum {
-  STATUS_CHANGED,
-  PRESENCE_CHANGED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-/* properties */
-enum {
-  PROP_ENABLED = 1,
-  PROP_PRESENCE,
-  PROP_CONNECTION_STATUS,
-  PROP_CONNECTION_STATUS_REASON,
-  PROP_CONNECTION,
-  PROP_UNIQUE_NAME,
-  PROP_DISPLAY_NAME
-};
-
-G_DEFINE_TYPE(EmpathyAccount, empathy_account, G_TYPE_OBJECT)
-
-/* private structure */
-typedef struct _EmpathyAccountPriv EmpathyAccountPriv;
-
-struct _EmpathyAccountPriv
-{
-  gboolean dispose_has_run;
-
-  TpConnection *connection;
-  guint connection_invalidated_id;
-
-  TpConnectionStatus status;
-  TpConnectionStatusReason reason;
-  TpConnectionPresenceType presence;
-
-  gboolean enabled;
-  /* Timestamp when the connection got connected in seconds since the epoch */
-  glong connect_time;
-
-  McAccount *mc_account;
-};
-
-#define GET_PRIV(obj)  EMPATHY_GET_PRIV (obj, EmpathyAccount)
-
-static void
-empathy_account_init (EmpathyAccount *obj)
-{
-  EmpathyAccountPriv *priv;
-
-  priv =  G_TYPE_INSTANCE_GET_PRIVATE (obj,
-    EMPATHY_TYPE_ACCOUNT, EmpathyAccountPriv);
-
-  obj->priv = priv;
-
-  priv->status = TP_CONNECTION_STATUS_DISCONNECTED;
-}
-
-static void
-empathy_account_get_property (GObject *object,
-    guint prop_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyAccount *account = EMPATHY_ACCOUNT (object);
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  switch (prop_id)
-    {
-      case PROP_ENABLED:
-        g_value_set_boolean (value, priv->enabled);
-        break;
-      case PROP_PRESENCE:
-        g_value_set_uint (value, priv->presence);
-        break;
-      case PROP_CONNECTION_STATUS:
-        g_value_set_uint (value, priv->status);
-        break;
-      case PROP_CONNECTION_STATUS_REASON:
-        g_value_set_uint (value, priv->reason);
-        break;
-      case PROP_CONNECTION:
-        g_value_set_object (value,
-            empathy_account_get_connection (account));
-        break;
-      case PROP_UNIQUE_NAME:
-        g_value_set_string (value,
-            empathy_account_get_unique_name (account));
-        break;
-      case PROP_DISPLAY_NAME:
-        g_value_set_string (value,
-            empathy_account_get_display_name (account));
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void empathy_account_dispose (GObject *object);
-static void empathy_account_finalize (GObject *object);
-
-static void
-empathy_account_class_init (EmpathyAccountClass *empathy_account_class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (empathy_account_class);
-
-  g_type_class_add_private (empathy_account_class,
-    sizeof (EmpathyAccountPriv));
-
-  object_class->get_property = empathy_account_get_property;
-  object_class->dispose = empathy_account_dispose;
-  object_class->finalize = empathy_account_finalize;
-
-  g_object_class_install_property (object_class, PROP_ENABLED,
-    g_param_spec_boolean ("enabled",
-      "Enabled",
-      "Whether this account is enabled or not",
-      FALSE,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
-
-  g_object_class_install_property (object_class, PROP_PRESENCE,
-    g_param_spec_uint ("presence",
-      "Presence",
-      "The account connections presence type",
-      0,
-      NUM_TP_CONNECTION_PRESENCE_TYPES,
-      TP_CONNECTION_PRESENCE_TYPE_UNSET,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
-
-  g_object_class_install_property (object_class, PROP_CONNECTION_STATUS,
-    g_param_spec_uint ("status",
-      "ConnectionStatus",
-      "The accounts connections status type",
-      0,
-      NUM_TP_CONNECTION_STATUSES,
-      TP_CONNECTION_STATUS_DISCONNECTED,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
-
-  g_object_class_install_property (object_class, PROP_CONNECTION_STATUS_REASON,
-    g_param_spec_uint ("status-reason",
-      "ConnectionStatusReason",
-      "The account connections status reason",
-      0,
-      NUM_TP_CONNECTION_STATUS_REASONS,
-      TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
-
-  g_object_class_install_property (object_class, PROP_CONNECTION,
-    g_param_spec_object ("connection",
-      "Connection",
-      "The accounts connection",
-      TP_TYPE_CONNECTION,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
-
-  g_object_class_install_property (object_class, PROP_UNIQUE_NAME,
-    g_param_spec_string ("unique-name",
-      "UniqueName",
-      "The accounts unique name",
-      NULL,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
-
-  g_object_class_install_property (object_class, PROP_DISPLAY_NAME,
-    g_param_spec_string ("display-name",
-      "DisplayName",
-      "The accounts display name",
-      NULL,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
-
-  signals[STATUS_CHANGED] = g_signal_new ("status-changed",
-    G_TYPE_FROM_CLASS (object_class),
-    G_SIGNAL_RUN_LAST,
-    0, NULL, NULL,
-    _empathy_marshal_VOID__UINT_UINT_UINT,
-    G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
-
-  signals[PRESENCE_CHANGED] = g_signal_new ("presence-changed",
-    G_TYPE_FROM_CLASS (object_class),
-    G_SIGNAL_RUN_LAST,
-    0, NULL, NULL,
-    _empathy_marshal_VOID__UINT_UINT,
-    G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
-}
-
-void
-empathy_account_dispose (GObject *object)
-{
-  EmpathyAccount *self = EMPATHY_ACCOUNT (object);
-  EmpathyAccountPriv *priv = GET_PRIV (self);
-
-  if (priv->dispose_has_run)
-    return;
-
-  priv->dispose_has_run = TRUE;
-
-  if (priv->connection_invalidated_id != 0)
-    g_signal_handler_disconnect (priv->connection,
-        priv->connection_invalidated_id);
-  priv->connection_invalidated_id = 0;
-
-  if (priv->connection != NULL)
-    g_object_unref (priv->connection);
-  priv->connection = NULL;
-
-  /* release any references held by the object here */
-  if (G_OBJECT_CLASS (empathy_account_parent_class)->dispose != NULL)
-    G_OBJECT_CLASS (empathy_account_parent_class)->dispose (object);
-}
-
-void
-empathy_account_finalize (GObject *object)
-{
-  /* free any data held directly by the object here */
-  if (G_OBJECT_CLASS (empathy_account_parent_class)->finalize != NULL)
-    G_OBJECT_CLASS (empathy_account_parent_class)->finalize (object);
-}
-
-gboolean
-empathy_account_is_just_connected (EmpathyAccount *account)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  GTimeVal val;
-
-  if (priv->status != TP_CONNECTION_STATUS_CONNECTED)
-    return FALSE;
-
-  g_get_current_time (&val);
-
-  return (val.tv_sec - priv->connect_time) < 10;
-}
-
-/**
- * empathy_account_get_connection:
- * @account: a #EmpathyAccount
- *
- * Get the connection of the account, or NULL if account is offline or the
- * connection is not yet ready. This function does not return a new ref.
- *
- * Returns: the connection of the account.
- **/
-TpConnection *
-empathy_account_get_connection (EmpathyAccount *account)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  if (priv->connection != NULL &&
-      tp_connection_is_ready (priv->connection))
-    return priv->connection;
-
-  return NULL;
-}
-
-/**
- * empathy_account_get_unique_name:
- * @account: a #EmpathyAccount
- *
- * Returns: the unique name of the account.
- **/
-const gchar *
-empathy_account_get_unique_name (EmpathyAccount *account)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  return mc_account_get_unique_name (priv->mc_account);
-}
-
-/**
- * empathy_account_get_display_name:
- * @account: a #EmpathyAccount
- *
- * Returns: the display name of the account.
- **/
-const gchar *
-empathy_account_get_display_name (EmpathyAccount *account)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  return mc_account_get_display_name (priv->mc_account);
-}
-
-gboolean
-empathy_account_is_valid (EmpathyAccount *account)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  return mc_account_is_complete (priv->mc_account);
-}
-
-void
-empathy_account_set_enabled (EmpathyAccount *account, gboolean enabled)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  mc_account_set_enabled (priv->mc_account, enabled);
-}
-
-gboolean
-empathy_account_is_enabled (EmpathyAccount *account)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  return priv->enabled;
-}
-
-void
-empathy_account_unset_param (EmpathyAccount *account, const gchar *param)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  mc_account_unset_param (priv->mc_account, param);
-}
-
-gchar *
-empathy_account_get_param_string (EmpathyAccount *account, const gchar *param)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  gchar *value = NULL;
-
-  mc_account_get_param_string (priv->mc_account, param, &value);
-  return value;
-}
-
-gint
-empathy_account_get_param_int (EmpathyAccount *account, const gchar *param)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  int value;
-
-  mc_account_get_param_int (priv->mc_account, param, &value);
-  return value;
-}
-
-gboolean
-empathy_account_get_param_boolean (EmpathyAccount *account, const gchar *param)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  gboolean value;
-
-  mc_account_get_param_boolean (priv->mc_account, param, &value);
-  return value;
-}
-
-void
-empathy_account_set_param_string (EmpathyAccount *account,
-  const gchar *param,
-  const gchar *value)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  mc_account_set_param_string (priv->mc_account, param, value);
-}
-
-void
-empathy_account_set_param_int (EmpathyAccount *account,
-  const gchar *param,
-  gint value)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  mc_account_set_param_int (priv->mc_account, param, value);
-}
-
-void
-empathy_account_set_param_boolean (EmpathyAccount *account,
-  const gchar *param,
-  gboolean value)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  mc_account_set_param_boolean (priv->mc_account, param, value);
-}
-
-void
-empathy_account_set_display_name (EmpathyAccount *account,
-    const gchar *display_name)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  mc_account_set_display_name (priv->mc_account, display_name);
-}
-
-McProfile *
-empathy_account_get_profile (EmpathyAccount *account)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  return mc_account_get_profile (priv->mc_account);
-}
-
-EmpathyAccount *
-_empathy_account_new (McAccount *mc_account)
-{
-  EmpathyAccount *account;
-  EmpathyAccountPriv *priv;
-
-  account = g_object_new (EMPATHY_TYPE_ACCOUNT, NULL);
-  priv = GET_PRIV (account);
-  priv->mc_account = mc_account;
-
-  return account;
-}
-
-void
-_empathy_account_set_status (EmpathyAccount *account,
-    TpConnectionStatus status,
-    TpConnectionStatusReason reason,
-    TpConnectionPresenceType presence)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  TpConnectionStatus old_s = priv->status;
-  TpConnectionPresenceType old_p = priv->presence;
-
-  priv->status = status;
-  priv->presence = presence;
-
-  if (priv->status != old_s)
-    {
-      if (priv->status == TP_CONNECTION_STATUS_CONNECTED)
-        {
-          GTimeVal val;
-          g_get_current_time (&val);
-
-          priv->connect_time = val.tv_sec;
-        }
-
-      priv->reason = reason;
-      g_signal_emit (account, signals[STATUS_CHANGED], 0,
-        old_s, priv->status, reason);
-
-      g_object_notify (G_OBJECT (account), "status");
-    }
-
-  if (priv->presence != old_p)
-    {
-      g_signal_emit (account, signals[PRESENCE_CHANGED], 0,
-        old_p, priv->presence);
-      g_object_notify (G_OBJECT (account), "presence");
-    }
-}
-
-static void
-empathy_account_connection_ready_cb (TpConnection *connection,
-    const GError *error,
-    gpointer user_data)
-{
-  EmpathyAccount *account = EMPATHY_ACCOUNT (user_data);
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  if (error != NULL)
-    {
-      DEBUG ("(%s) Connection failed to become ready: %s",
-        empathy_account_get_unique_name (account), error->message);
-      priv->connection = NULL;
-    }
-  else
-    {
-      DEBUG ("(%s) Connection ready",
-        empathy_account_get_unique_name (account));
-      g_object_notify (G_OBJECT (account), "connection");
-    }
-}
-
-static void
-_empathy_account_connection_invalidated_cb (TpProxy *self,
-  guint    domain,
-  gint     code,
-  gchar   *message,
-  gpointer user_data)
-{
-  EmpathyAccount *account = EMPATHY_ACCOUNT (user_data);
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  if (priv->connection == NULL)
-    return;
-
-  DEBUG ("(%s) Connection invalidated",
-    empathy_account_get_unique_name (account));
-
-  g_assert (priv->connection == TP_CONNECTION (self));
-
-  g_signal_handler_disconnect (priv->connection,
-    priv->connection_invalidated_id);
-  priv->connection_invalidated_id = 0;
-
-  g_object_unref (priv->connection);
-  priv->connection = NULL;
-
-  g_object_notify (G_OBJECT (account), "connection");
-}
-
-void
-_empathy_account_set_connection (EmpathyAccount *account,
-    TpConnection *connection)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  if (priv->connection == connection)
-    return;
-
-  /* Connection already set, don't set the new one */
-  if (connection != NULL && priv->connection != NULL)
-    return;
-
-  if (connection == NULL)
-    {
-      g_signal_handler_disconnect (priv->connection,
-        priv->connection_invalidated_id);
-      priv->connection_invalidated_id = 0;
-
-      g_object_unref (priv->connection);
-      priv->connection = NULL;
-      g_object_notify (G_OBJECT (account), "connection");
-    }
-  else
-    {
-      priv->connection = g_object_ref (connection);
-      priv->connection_invalidated_id = g_signal_connect (priv->connection,
-          "invalidated",
-          G_CALLBACK (_empathy_account_connection_invalidated_cb),
-          account);
-
-      /* notify a change in the connection property when it's ready */
-      tp_connection_call_when_ready (priv->connection,
-        empathy_account_connection_ready_cb, account);
-    }
-}
-
-void
-_empathy_account_set_enabled (EmpathyAccount *account,
-    gboolean enabled)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-
-  if (priv->enabled == enabled)
-    return;
-
-  priv->enabled = enabled;
-  g_object_notify (G_OBJECT (account), "enabled");
-}
-
-McAccount *
-_empathy_account_get_mc_account (EmpathyAccount *account)
-{
-  EmpathyAccountPriv *priv = GET_PRIV (account);
-  return priv->mc_account;
-}
diff --git a/libempathy/empathy-account.h b/libempathy/empathy-account.h
deleted file mode 100644
index 75babd8..0000000
--- a/libempathy/empathy-account.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * empathy-account.h - Header for EmpathyAccount
- * Copyright (C) 2009 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd.simons@collabora.co.uk>
- *
- * 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
- */
-
-#ifndef __EMPATHY_ACCOUNT_H__
-#define __EMPATHY_ACCOUNT_H__
-
-#include <glib-object.h>
-
-#include <telepathy-glib/connection.h>
-#include <libmissioncontrol/mc-profile.h>
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccount EmpathyAccount;
-typedef struct _EmpathyAccountClass EmpathyAccountClass;
-
-struct _EmpathyAccountClass {
-    GObjectClass parent_class;
-};
-
-struct _EmpathyAccount {
-    GObject parent;
-    gpointer priv;
-};
-
-GType empathy_account_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNT (empathy_account_get_type ())
-#define EMPATHY_ACCOUNT(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_ACCOUNT, EmpathyAccount))
-#define EMPATHY_ACCOUNT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_ACCOUNT, EmpathyAccountClass))
-#define EMPATHY_IS_ACCOUNT(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_ACCOUNT))
-#define EMPATHY_IS_ACCOUNT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_ACCOUNT))
-#define EMPATHY_ACCOUNT_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ACCOUNT, \
-    EmpathyAccountClass))
-
-gboolean empathy_account_is_just_connected (EmpathyAccount *account);
-TpConnection *empathy_account_get_connection (EmpathyAccount *account);
-const gchar *empathy_account_get_unique_name (EmpathyAccount *account);
-const gchar *empathy_account_get_display_name (EmpathyAccount *account);
-
-void empathy_account_set_enabled (EmpathyAccount *account,
-  gboolean enabled);
-gboolean empathy_account_is_enabled (EmpathyAccount *account);
-
-void empathy_account_unset_param (EmpathyAccount *account, const gchar *param);
-gchar *empathy_account_get_param_string (EmpathyAccount *account,
-    const gchar *param);
-gint empathy_account_get_param_int (EmpathyAccount *account,
-    const gchar *param);
-gboolean empathy_account_get_param_boolean (EmpathyAccount *account,
-    const gchar *param);
-
-void empathy_account_set_param_string (EmpathyAccount *account,
-    const gchar *param, const gchar *value);
-void empathy_account_set_param_int (EmpathyAccount *account,
-    const gchar *param, gint value);
-void empathy_account_set_param_boolean (EmpathyAccount *account,
-    const gchar *param, gboolean value);
-
-gboolean empathy_account_is_valid (EmpathyAccount *account);
-
-void empathy_account_set_display_name (EmpathyAccount *account,
-    const gchar *display_name);
-
-
-/* TODO remove McProfile */
-McProfile *empathy_account_get_profile (EmpathyAccount *account);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNT_H__*/
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 1ce7a6e..4441667 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -100,8 +100,7 @@ chatroom_manager_file_save (EmpathyChatroomManager *manager)
 			continue;
 		}
 
-		account_id = empathy_account_get_unique_name (
-		  empathy_chatroom_get_account (chatroom));
+		account_id = mc_account_get_unique_name (empathy_chatroom_get_account (chatroom));
 
 		node = xmlNewChild (root, NULL, "chatroom", NULL);
 		xmlNewTextChild (node, NULL, "name", empathy_chatroom_get_name (chatroom));
@@ -175,7 +174,7 @@ chatroom_manager_parse_chatroom (EmpathyChatroomManager *manager,
 {
 	EmpathyChatroomManagerPriv *priv;
 	EmpathyChatroom            *chatroom;
-	EmpathyAccount             *account;
+	McAccount                 *account;
 	xmlNodePtr                 child;
 	gchar                     *str;
 	gchar                     *name;
@@ -221,7 +220,7 @@ chatroom_manager_parse_chatroom (EmpathyChatroomManager *manager,
 		xmlFree (str);
 	}
 
-	account = empathy_account_manager_lookup (priv->account_manager, account_id);
+	account = mc_account_lookup (account_id);
 	if (!account) {
 		g_free (name);
 		g_free (room);
@@ -521,11 +520,10 @@ chatroom_manager_remove_link (EmpathyChatroomManager *manager,
   if (empathy_chatroom_is_favorite (chatroom))
     reset_save_timeout (manager);
 
-  priv->chatrooms = g_list_delete_link (priv->chatrooms, l);
-
   g_signal_emit (manager, signals[CHATROOM_REMOVED], 0, chatroom);
   g_signal_handlers_disconnect_by_func (chatroom, chatroom_changed_cb, manager);
 
+  priv->chatrooms = g_list_delete_link (priv->chatrooms, l);
   g_object_unref (chatroom);
 }
 
@@ -558,20 +556,21 @@ empathy_chatroom_manager_remove (EmpathyChatroomManager *manager,
 
 EmpathyChatroom *
 empathy_chatroom_manager_find (EmpathyChatroomManager *manager,
-                               EmpathyAccount *account,
+                               McAccount *account,
                                const gchar *room)
 {
 	EmpathyChatroomManagerPriv *priv;
 	GList                     *l;
 
 	g_return_val_if_fail (EMPATHY_IS_CHATROOM_MANAGER (manager), NULL);
+	g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
 	g_return_val_if_fail (room != NULL, NULL);
 
 	priv = GET_PRIV (manager);
 
 	for (l = priv->chatrooms; l; l = l->next) {
 		EmpathyChatroom *chatroom;
-		EmpathyAccount *this_account;
+		McAccount      *this_account;
 		const gchar    *this_room;
 
 		chatroom = l->data;
@@ -590,7 +589,7 @@ empathy_chatroom_manager_find (EmpathyChatroomManager *manager,
 
 GList *
 empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
-				       EmpathyAccount *account)
+				       McAccount             *account)
 {
 	EmpathyChatroomManagerPriv *priv;
 	GList                     *chatrooms, *l;
@@ -620,7 +619,7 @@ empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
 
 guint
 empathy_chatroom_manager_get_count (EmpathyChatroomManager *manager,
-				   EmpathyAccount *account)
+				   McAccount             *account)
 {
 	EmpathyChatroomManagerPriv *priv;
 	GList                     *l;
@@ -687,7 +686,7 @@ chatroom_manager_observe_channel_cb (EmpathyDispatcher *dispatcher,
   const gchar *roomname;
   GQuark channel_type;
   TpHandleType handle_type;
-  EmpathyAccount *account;
+  McAccount *account;
   TpConnection *connection;
 
   channel_type = empathy_dispatch_operation_get_channel_type_id (operation);
diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h
index a6038f7..76c71d9 100644
--- a/libempathy/empathy-chatroom-manager.h
+++ b/libempathy/empathy-chatroom-manager.h
@@ -27,7 +27,8 @@
 
 #include <glib-object.h>
 
-#include "empathy-account.h"
+#include <libmissioncontrol/mc-account.h>
+
 #include "empathy-chatroom.h"
 #include "empathy-dispatcher.h"
 
@@ -59,12 +60,12 @@ gboolean               empathy_chatroom_manager_add           (EmpathyChatroomMa
 void                   empathy_chatroom_manager_remove        (EmpathyChatroomManager *manager,
 							      EmpathyChatroom        *chatroom);
 EmpathyChatroom *       empathy_chatroom_manager_find          (EmpathyChatroomManager *manager,
-							      EmpathyAccount           *account,
-							      const gchar              *room);
+							      McAccount             *account,
+							      const gchar           *room);
 GList *                empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
-							      EmpathyAccount          *account);
+							      McAccount             *account);
 guint                  empathy_chatroom_manager_get_count     (EmpathyChatroomManager *manager,
-							      EmpathyAccount          *account);
+							      McAccount             *account);
 void                   empathy_chatroom_manager_observe       (EmpathyChatroomManager *manager,
 							      EmpathyDispatcher *dispatcher);
 
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index b62d6ad..147fca0 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -31,7 +31,7 @@
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom)
 typedef struct {
-	EmpathyAccount *account;
+	McAccount *account;
 	gchar     *room;
 	gchar     *name;
 	gboolean   auto_connect;
@@ -84,7 +84,7 @@ empathy_chatroom_class_init (EmpathyChatroomClass *klass)
 					 g_param_spec_object ("account",
 							      "Chatroom Account",
 							      "The account associated with an chatroom",
-							      EMPATHY_TYPE_ACCOUNT,
+							      MC_TYPE_ACCOUNT,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class,
@@ -312,19 +312,22 @@ chatroom_set_property (GObject      *object,
 }
 
 EmpathyChatroom *
-empathy_chatroom_new (EmpathyAccount *account)
+empathy_chatroom_new (McAccount *account)
 {
+	g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+
 	return g_object_new (EMPATHY_TYPE_CHATROOM,
 			     "account", account,
 			     NULL);
 }
 
 EmpathyChatroom *
-empathy_chatroom_new_full (EmpathyAccount *account,
+empathy_chatroom_new_full (McAccount   *account,
 			  const gchar *room,
 			  const gchar *name,
 			  gboolean     auto_connect)
 {
+	g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
 	g_return_val_if_fail (room != NULL, NULL);
 
 	return g_object_new (EMPATHY_TYPE_CHATROOM,
@@ -335,7 +338,7 @@ empathy_chatroom_new_full (EmpathyAccount *account,
 			     NULL);
 }
 
-EmpathyAccount *
+McAccount *
 empathy_chatroom_get_account (EmpathyChatroom *chatroom)
 {
 	EmpathyChatroomPriv *priv;
@@ -348,11 +351,12 @@ empathy_chatroom_get_account (EmpathyChatroom *chatroom)
 
 void
 empathy_chatroom_set_account (EmpathyChatroom *chatroom,
-			     EmpathyAccount *account)
+			     McAccount      *account)
 {
 	EmpathyChatroomPriv *priv;
 
 	g_return_if_fail (EMPATHY_IS_CHATROOM (chatroom));
+	g_return_if_fail (MC_IS_ACCOUNT (account));
 
 	priv = GET_PRIV (chatroom);
 
@@ -466,8 +470,8 @@ gboolean
 empathy_chatroom_equal (gconstpointer v1,
 		       gconstpointer v2)
 {
-	EmpathyAccount *account_a;
-	EmpathyAccount *account_b;
+	McAccount   *account_a;
+	McAccount   *account_b;
 	const gchar *room_a;
 	const gchar *room_b;
 
diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index c18c274..560517d 100644
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -24,7 +24,8 @@
 
 #include <glib-object.h>
 
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
+
 #include <libempathy/empathy-tp-chat.h>
 
 G_BEGIN_DECLS
@@ -51,14 +52,14 @@ struct _EmpathyChatroomClass {
 };
 
 GType            empathy_chatroom_get_type        (void) G_GNUC_CONST;
-EmpathyChatroom *empathy_chatroom_new             (EmpathyAccount  *account);
-EmpathyChatroom *empathy_chatroom_new_full        (EmpathyAccount  *account,
+EmpathyChatroom *empathy_chatroom_new             (McAccount       *account);
+EmpathyChatroom *empathy_chatroom_new_full        (McAccount       *account,
 						   const gchar     *room,
 						   const gchar     *name,
 						   gboolean         auto_connect);
-EmpathyAccount *     empathy_chatroom_get_account      (EmpathyChatroom *chatroom);
+McAccount *     empathy_chatroom_get_account      (EmpathyChatroom *chatroom);
 void            empathy_chatroom_set_account      (EmpathyChatroom *chatroom,
-						   EmpathyAccount  *account);
+						   McAccount       *account);
 const gchar *   empathy_chatroom_get_room         (EmpathyChatroom *chatroom);
 void            empathy_chatroom_set_room         (EmpathyChatroom *chatroom,
 						   const gchar     *room);
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 059382b..7af2bd3 100644
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -535,7 +535,6 @@ empathy_contact_manager_can_add (EmpathyContactManager *manager,
 	EmpathyTpContactList      *list;
 
 	g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), FALSE);
-	g_return_val_if_fail (connection != NULL, FALSE);
 
 	list = g_hash_table_lookup (priv->lists, connection);
 	if (list == NULL)
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index d351aec..bad6ef4 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -39,7 +39,7 @@
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContact)
 typedef struct {
   TpContact *tp_contact;
-  EmpathyAccount *account;
+  McAccount *account;
   gchar *id;
   gchar *name;
   EmpathyAvatar *avatar;
@@ -159,7 +159,7 @@ empathy_contact_class_init (EmpathyContactClass *class)
       g_param_spec_object ("account",
         "The account",
         "The account associated with the contact",
-        EMPATHY_TYPE_ACCOUNT,
+        MC_TYPE_ACCOUNT,
         G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (object_class,
@@ -409,11 +409,12 @@ empathy_contact_new (TpContact *tp_contact)
 }
 
 EmpathyContact *
-empathy_contact_new_for_log (EmpathyAccount *account,
+empathy_contact_new_for_log (McAccount *account,
                              const gchar *id,
                              const gchar *name,
                              gboolean is_user)
 {
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (id != NULL, NULL);
 
   return g_object_new (EMPATHY_TYPE_CONTACT,
@@ -553,7 +554,7 @@ empathy_contact_set_avatar (EmpathyContact *contact,
   g_object_notify (G_OBJECT (contact), "avatar");
 }
 
-EmpathyAccount *
+McAccount *
 empathy_contact_get_account (EmpathyContact *contact)
 {
   EmpathyContactPriv *priv;
@@ -829,7 +830,7 @@ static gchar *
 contact_get_avatar_filename (EmpathyContact *contact,
                              const gchar *token)
 {
-  EmpathyAccount *account;
+  McAccount *account;
   gchar *avatar_path;
   gchar *avatar_file;
   gchar *token_escaped;
@@ -846,7 +847,7 @@ contact_get_avatar_filename (EmpathyContact *contact,
   avatar_path = g_build_filename (g_get_user_cache_dir (),
       PACKAGE_NAME,
       "avatars",
-      empathy_account_get_unique_name (account),
+      mc_account_get_unique_name (account),
       contact_escaped,
       NULL);
   g_mkdir_with_parents (avatar_path, 0700);
diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index d4e3859..f888313 100644
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -25,7 +25,7 @@
 #include <glib-object.h>
 
 #include <telepathy-glib/contact.h>
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
 
@@ -70,7 +70,7 @@ typedef enum {
 
 GType empathy_contact_get_type (void) G_GNUC_CONST;
 EmpathyContact * empathy_contact_new (TpContact *tp_contact);
-EmpathyContact * empathy_contact_new_for_log (EmpathyAccount *account,
+EmpathyContact * empathy_contact_new_for_log (McAccount *account,
     const gchar *id, const gchar *name, gboolean is_user);
 TpContact * empathy_contact_get_tp_contact (EmpathyContact *contact);
 const gchar * empathy_contact_get_id (EmpathyContact *contact);
@@ -80,7 +80,7 @@ void empathy_contact_set_name (EmpathyContact *contact, const gchar *name);
 EmpathyAvatar * empathy_contact_get_avatar (EmpathyContact *contact);
 void empathy_contact_set_avatar (EmpathyContact *contact,
     EmpathyAvatar *avatar);
-EmpathyAccount * empathy_contact_get_account (EmpathyContact *contact);
+McAccount * empathy_contact_get_account (EmpathyContact *contact);
 TpConnection * empathy_contact_get_connection (EmpathyContact *contact);
 TpConnectionPresenceType empathy_contact_get_presence (EmpathyContact *contact);
 void empathy_contact_set_presence (EmpathyContact *contact,
diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c
index 79fe8c6..7a116f8 100644
--- a/libempathy/empathy-dispatch-operation.c
+++ b/libempathy/empathy-dispatch-operation.c
@@ -22,8 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/interfaces.h>
-
 #include "empathy-dispatch-operation.h"
 #include <libempathy/empathy-enum-types.h>
 #include <libempathy/empathy-tp-contact-factory.h>
@@ -217,7 +215,7 @@ empathy_dispatch_operation_constructed (GObject *object)
 
   handle = tp_channel_get_handle (priv->channel, &handle_type);
 
-  if (handle_type == TP_HANDLE_TYPE_CONTACT && priv->contact == NULL)
+  if (handle_type == TP_CONN_HANDLE_TYPE_CONTACT && priv->contact == NULL)
     {
       EmpathyTpContactFactory *factory;
 
diff --git a/libempathy/empathy-dispatch-operation.h b/libempathy/empathy-dispatch-operation.h
index 148adec..84ed360 100644
--- a/libempathy/empathy-dispatch-operation.h
+++ b/libempathy/empathy-dispatch-operation.h
@@ -24,8 +24,6 @@
 #include <glib-object.h>
 
 #include <libempathy/empathy-contact.h>
-#include <telepathy-glib/connection.h>
-#include <telepathy-glib/channel.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index c1e20f4..b4c1f1a 100644
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -157,7 +157,7 @@ empathy_log_manager_add_message (EmpathyLogManager *manager,
 
 gboolean
 empathy_log_manager_exists (EmpathyLogManager *manager,
-                            EmpathyAccount *account,
+                            McAccount *account,
                             const gchar *chat_id,
                             gboolean chatroom)
 {
@@ -165,6 +165,7 @@ empathy_log_manager_exists (EmpathyLogManager *manager,
   EmpathyLogManagerPriv *priv;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), FALSE);
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), FALSE);
   g_return_val_if_fail (chat_id != NULL, FALSE);
 
   priv = GET_PRIV (manager);
@@ -181,7 +182,7 @@ empathy_log_manager_exists (EmpathyLogManager *manager,
 
 GList *
 empathy_log_manager_get_dates (EmpathyLogManager *manager,
-                               EmpathyAccount *account,
+                               McAccount *account,
                                const gchar *chat_id,
                                gboolean chatroom)
 {
@@ -189,6 +190,7 @@ empathy_log_manager_get_dates (EmpathyLogManager *manager,
   EmpathyLogManagerPriv *priv;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (chat_id != NULL, NULL);
 
   priv = GET_PRIV (manager);
@@ -217,7 +219,7 @@ empathy_log_manager_get_dates (EmpathyLogManager *manager,
 
 GList *
 empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager,
-                                           EmpathyAccount *account,
+                                           McAccount *account,
                                            const gchar *chat_id,
                                            gboolean chatroom,
                                            const gchar *date)
@@ -226,6 +228,7 @@ empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager,
   EmpathyLogManagerPriv *priv;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (chat_id != NULL, NULL);
 
   priv = GET_PRIV (manager);
@@ -258,7 +261,7 @@ log_manager_message_date_cmp (gconstpointer a,
 
 GList *
 empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
-					   EmpathyAccount *account,
+					   McAccount *account,
 					   const gchar *chat_id,
 					   gboolean chatroom,
 					   guint num_messages,
@@ -271,6 +274,7 @@ empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
   guint i = 0;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (chat_id != NULL, NULL);
 
   priv = GET_PRIV (manager);
@@ -318,12 +322,13 @@ empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
 
 GList *
 empathy_log_manager_get_chats (EmpathyLogManager *manager,
-                               EmpathyAccount *account)
+                               McAccount *account)
 {
   GList *l, *out = NULL;
   EmpathyLogManagerPriv *priv;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
 
   priv = GET_PRIV (manager);
 
diff --git a/libempathy/empathy-log-manager.h b/libempathy/empathy-log-manager.h
index 6907e2e..da7be4a 100644
--- a/libempathy/empathy-log-manager.h
+++ b/libempathy/empathy-log-manager.h
@@ -65,7 +65,7 @@ struct _EmpathyLogManagerClass
 
 struct _EmpathyLogSearchHit
 {
-  EmpathyAccount *account;
+  McAccount *account;
   gchar     *chat_id;
   gboolean   is_chatroom;
   gchar     *filename;
@@ -81,17 +81,17 @@ gboolean empathy_log_manager_add_message (EmpathyLogManager *manager,
     const gchar *chat_id, gboolean chatroom, EmpathyMessage *message,
     GError **error);
 gboolean empathy_log_manager_exists (EmpathyLogManager *manager,
-    EmpathyAccount *account, const gchar *chat_id, gboolean chatroom);
+    McAccount *account, const gchar *chat_id, gboolean chatroom);
 GList *empathy_log_manager_get_dates (EmpathyLogManager *manager,
-    EmpathyAccount *account, const gchar *chat_id, gboolean chatroom);
+    McAccount *account, const gchar *chat_id, gboolean chatroom);
 GList *empathy_log_manager_get_messages_for_date (EmpathyLogManager *manager,
-    EmpathyAccount *account, const gchar *chat_id, gboolean chatroom,
+    McAccount *account, const gchar *chat_id, gboolean chatroom,
     const gchar *date);
 GList *empathy_log_manager_get_filtered_messages (EmpathyLogManager *manager,
-    EmpathyAccount *account, const gchar *chat_id, gboolean chatroom,
+    McAccount *account, const gchar *chat_id, gboolean chatroom,
     guint num_messages, EmpathyLogMessageFilter filter, gpointer user_data);
 GList *empathy_log_manager_get_chats (EmpathyLogManager *manager,
-    EmpathyAccount *account);
+    McAccount *account);
 GList *empathy_log_manager_search_new (EmpathyLogManager *manager,
     const gchar *text);
 void empathy_log_manager_search_free (GList *hits);
diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c
index b73c721..94f4d14 100644
--- a/libempathy/empathy-log-store-empathy.c
+++ b/libempathy/empathy-log-store-empathy.c
@@ -32,7 +32,6 @@
 #include "empathy-log-store.h"
 #include "empathy-log-store-empathy.h"
 #include "empathy-log-manager.h"
-#include "empathy-account-manager.h"
 #include "empathy-contact.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
@@ -60,7 +59,6 @@ typedef struct
 {
   gchar *basedir;
   gchar *name;
-  EmpathyAccountManager *account_manager;
 } EmpathyLogStoreEmpathyPriv;
 
 static void log_store_iface_init (gpointer g_iface,gpointer iface_data);
@@ -75,7 +73,6 @@ log_store_empathy_finalize (GObject *object)
   EmpathyLogStoreEmpathy *self = EMPATHY_LOG_STORE_EMPATHY (object);
   EmpathyLogStoreEmpathyPriv *priv = GET_PRIV (self);
 
-  g_object_unref (priv->account_manager);
   g_free (priv->basedir);
   g_free (priv->name);
 }
@@ -102,12 +99,11 @@ empathy_log_store_empathy_init (EmpathyLogStoreEmpathy *self)
       ".gnome2", PACKAGE_NAME, "logs", NULL);
 
   priv->name = g_strdup ("Empathy");
-  priv->account_manager = empathy_account_manager_dup_singleton ();
 }
 
 static gchar *
 log_store_empathy_get_dir (EmpathyLogStore *self,
-                           EmpathyAccount *account,
+                           McAccount *account,
                            const gchar *chat_id,
                            gboolean chatroom)
 {
@@ -117,7 +113,7 @@ log_store_empathy_get_dir (EmpathyLogStore *self,
 
   priv = GET_PRIV (self);
 
-  account_id = empathy_account_get_unique_name (account);
+  account_id = mc_account_get_unique_name (account);
 
   if (chatroom)
     basedir = g_build_path (G_DIR_SEPARATOR_S, priv->basedir, account_id,
@@ -158,7 +154,7 @@ log_store_empathy_get_timestamp_from_message (EmpathyMessage *message)
 
 static gchar *
 log_store_empathy_get_filename (EmpathyLogStore *self,
-                                EmpathyAccount *account,
+                                McAccount *account,
                                 const gchar *chat_id,
                                 gboolean chatroom)
 {
@@ -184,7 +180,7 @@ log_store_empathy_add_message (EmpathyLogStore *self,
                                GError **error)
 {
   FILE *file;
-  EmpathyAccount *account;
+  McAccount *account;
   EmpathyContact *sender;
   const gchar *body_str;
   const gchar *str;
@@ -271,7 +267,7 @@ log_store_empathy_add_message (EmpathyLogStore *self,
 
 static gboolean
 log_store_empathy_exists (EmpathyLogStore *self,
-                          EmpathyAccount *account,
+                          McAccount *account,
                           const gchar *chat_id,
                           gboolean chatroom)
 {
@@ -287,7 +283,7 @@ log_store_empathy_exists (EmpathyLogStore *self,
 
 static GList *
 log_store_empathy_get_dates (EmpathyLogStore *self,
-                             EmpathyAccount *account,
+                             McAccount *account,
                              const gchar *chat_id,
                              gboolean chatroom)
 {
@@ -299,6 +295,7 @@ log_store_empathy_get_dates (EmpathyLogStore *self,
   const gchar *p;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), NULL);
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (chat_id != NULL, NULL);
 
   directory = log_store_empathy_get_dir (self, account, chat_id, chatroom);
@@ -339,7 +336,7 @@ log_store_empathy_get_dates (EmpathyLogStore *self,
 
 static gchar *
 log_store_empathy_get_filename_for_date (EmpathyLogStore *self,
-                                         EmpathyAccount *account,
+                                         McAccount *account,
                                          const gchar *chat_id,
                                          gboolean chatroom,
                                          const gchar *date)
@@ -362,7 +359,6 @@ static EmpathyLogSearchHit *
 log_store_empathy_search_hit_new (EmpathyLogStore *self,
                                   const gchar *filename)
 {
-  EmpathyLogStoreEmpathyPriv *priv = GET_PRIV (self);
   EmpathyLogSearchHit *hit;
   const gchar *account_name;
   const gchar *end;
@@ -387,8 +383,7 @@ log_store_empathy_search_hit_new (EmpathyLogStore *self,
   else
     account_name = strv[len-3];
 
-  hit->account = empathy_account_manager_lookup (priv->account_manager,
-    account_name);
+  hit->account = mc_account_lookup (account_name);
   hit->filename = g_strdup (filename);
 
   g_strfreev (strv);
@@ -406,7 +401,7 @@ log_store_empathy_get_messages_for_file (EmpathyLogStore *self,
   xmlNodePtr log_node;
   xmlNodePtr node;
   EmpathyLogSearchHit *hit;
-  EmpathyAccount *account;
+  McAccount *account;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), NULL);
   g_return_val_if_fail (filename != NULL, NULL);
@@ -497,7 +492,6 @@ log_store_empathy_get_messages_for_file (EmpathyLogStore *self,
       empathy_message_set_sender (message, sender);
       empathy_message_set_timestamp (message, t);
       empathy_message_set_tptype (message, msg_type);
-      empathy_message_set_is_backlog (message, TRUE);
 
       if (cm_id_str)
         empathy_message_set_id (message, cm_id);
@@ -672,7 +666,7 @@ log_store_empathy_get_chats_for_dir (EmpathyLogStore *self,
 
 static GList *
 log_store_empathy_get_messages_for_date (EmpathyLogStore *self,
-                                         EmpathyAccount *account,
+                                         McAccount *account,
                                          const gchar *chat_id,
                                          gboolean chatroom,
                                          const gchar *date)
@@ -681,6 +675,7 @@ log_store_empathy_get_messages_for_date (EmpathyLogStore *self,
   GList *messages;
 
   g_return_val_if_fail (EMPATHY_IS_LOG_STORE (self), NULL);
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
   g_return_val_if_fail (chat_id != NULL, NULL);
 
   filename = log_store_empathy_get_filename_for_date (self, account,
@@ -693,7 +688,7 @@ log_store_empathy_get_messages_for_date (EmpathyLogStore *self,
 
 static GList *
 log_store_empathy_get_chats (EmpathyLogStore *self,
-                              EmpathyAccount *account)
+                              McAccount *account)
 {
   gchar *dir;
   GList *hits;
@@ -702,7 +697,7 @@ log_store_empathy_get_chats (EmpathyLogStore *self,
   priv = GET_PRIV (self);
 
   dir = g_build_filename (priv->basedir,
-      empathy_account_get_unique_name (account), NULL);
+      mc_account_get_unique_name (account), NULL);
 
   hits = log_store_empathy_get_chats_for_dir (self, dir, FALSE);
 
@@ -721,7 +716,7 @@ log_store_empathy_get_name (EmpathyLogStore *self)
 
 static GList *
 log_store_empathy_get_filtered_messages (EmpathyLogStore *self,
-                                         EmpathyAccount *account,
+                                         McAccount *account,
                                          const gchar *chat_id,
                                          gboolean chatroom,
                                          guint num_messages,
diff --git a/libempathy/empathy-log-store.c b/libempathy/empathy-log-store.c
index f136f79..21a8815 100644
--- a/libempathy/empathy-log-store.c
+++ b/libempathy/empathy-log-store.c
@@ -55,7 +55,7 @@ empathy_log_store_get_name (EmpathyLogStore *self)
 
 gboolean
 empathy_log_store_exists (EmpathyLogStore *self,
-                          EmpathyAccount *account,
+                          McAccount *account,
                           const gchar *chat_id,
                           gboolean chatroom)
 {
@@ -84,7 +84,7 @@ empathy_log_store_add_message (EmpathyLogStore *self,
 
 GList *
 empathy_log_store_get_dates (EmpathyLogStore *self,
-                             EmpathyAccount *account,
+                             McAccount *account,
                              const gchar *chat_id,
                              gboolean chatroom)
 {
@@ -97,7 +97,7 @@ empathy_log_store_get_dates (EmpathyLogStore *self,
 
 GList *
 empathy_log_store_get_messages_for_date (EmpathyLogStore *self,
-                                         EmpathyAccount *account,
+                                         McAccount *account,
                                          const gchar *chat_id,
                                          gboolean chatroom,
                                          const gchar *date)
@@ -111,7 +111,7 @@ empathy_log_store_get_messages_for_date (EmpathyLogStore *self,
 
 GList *
 empathy_log_store_get_last_messages (EmpathyLogStore *self,
-                                     EmpathyAccount *account,
+                                     McAccount *account,
                                      const gchar *chat_id,
                                      gboolean chatroom)
 {
@@ -124,7 +124,7 @@ empathy_log_store_get_last_messages (EmpathyLogStore *self,
 
 GList *
 empathy_log_store_get_chats (EmpathyLogStore *self,
-                             EmpathyAccount *account)
+                             McAccount *account)
 {
   if (!EMPATHY_LOG_STORE_GET_INTERFACE (self)->get_chats)
     return NULL;
@@ -157,7 +157,7 @@ empathy_log_store_ack_message (EmpathyLogStore *self,
 
 GList *
 empathy_log_store_get_filtered_messages (EmpathyLogStore *self,
-                                         EmpathyAccount *account,
+                                         McAccount *account,
                                          const gchar *chat_id,
                                          gboolean chatroom,
                                          guint num_messages,
diff --git a/libempathy/empathy-log-store.h b/libempathy/empathy-log-store.h
index 5b6a878..db698c4 100644
--- a/libempathy/empathy-log-store.h
+++ b/libempathy/empathy-log-store.h
@@ -25,7 +25,7 @@
 
 #include <glib-object.h>
 
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 
 #include "empathy-message.h"
 #include "empathy-log-manager.h"
@@ -50,23 +50,23 @@ struct _EmpathyLogStoreInterface
   GTypeInterface parent;
 
   const gchar * (*get_name) (EmpathyLogStore *self);
-  gboolean (*exists) (EmpathyLogStore *self, EmpathyAccount *account,
+  gboolean (*exists) (EmpathyLogStore *self, McAccount *account,
       const gchar *chat_id, gboolean chatroom);
   gboolean (*add_message) (EmpathyLogStore *self, const gchar *chat_id,
       gboolean chatroom, EmpathyMessage *message, GError **error);
-  GList * (*get_dates) (EmpathyLogStore *self, EmpathyAccount *account,
+  GList * (*get_dates) (EmpathyLogStore *self, McAccount *account,
       const gchar *chat_id, gboolean chatroom);
   GList * (*get_messages_for_date) (EmpathyLogStore *self,
-      EmpathyAccount *account, const gchar *chat_id, gboolean chatroom,
+      McAccount *account, const gchar *chat_id, gboolean chatroom,
       const gchar *date);
-  GList * (*get_last_messages) (EmpathyLogStore *self, EmpathyAccount *account,
+  GList * (*get_last_messages) (EmpathyLogStore *self, McAccount *account,
       const gchar *chat_id, gboolean chatroom);
   GList * (*get_chats) (EmpathyLogStore *self,
-            EmpathyAccount    *account);
+            McAccount         *account);
   GList * (*search_new) (EmpathyLogStore *self, const gchar *text);
   void (*ack_message) (EmpathyLogStore *self, const gchar *chat_id,
       gboolean chatroom, EmpathyMessage *message);
-  GList * (*get_filtered_messages) (EmpathyLogStore *self, EmpathyAccount *account,
+  GList * (*get_filtered_messages) (EmpathyLogStore *self, McAccount *account,
       const gchar *chat_id, gboolean chatroom, guint num_messages,
       EmpathyLogMessageFilter filter, gpointer user_data);
 };
@@ -75,25 +75,25 @@ GType empathy_log_store_get_type (void) G_GNUC_CONST;
 
 const gchar *empathy_log_store_get_name (EmpathyLogStore *self);
 gboolean empathy_log_store_exists (EmpathyLogStore *self,
-    EmpathyAccount *account, const gchar *chat_id, gboolean chatroom);
+    McAccount *account, const gchar *chat_id, gboolean chatroom);
 gboolean empathy_log_store_add_message (EmpathyLogStore *self,
     const gchar *chat_id, gboolean chatroom, EmpathyMessage *message,
     GError **error);
 GList *empathy_log_store_get_dates (EmpathyLogStore *self,
-    EmpathyAccount *account, const gchar *chat_id, gboolean chatroom);
+    McAccount *account, const gchar *chat_id, gboolean chatroom);
 GList *empathy_log_store_get_messages_for_date (EmpathyLogStore *self,
-    EmpathyAccount *account, const gchar *chat_id, gboolean chatroom,
+    McAccount *account, const gchar *chat_id, gboolean chatroom,
     const gchar *date);
 GList *empathy_log_store_get_last_messages (EmpathyLogStore *self,
-    EmpathyAccount *account, const gchar *chat_id, gboolean chatroom);
+    McAccount *account, const gchar *chat_id, gboolean chatroom);
 GList *empathy_log_store_get_chats (EmpathyLogStore *self,
-    EmpathyAccount *account);
+    McAccount *account);
 GList *empathy_log_store_search_new (EmpathyLogStore *self,
     const gchar *text);
 void empathy_log_store_ack_message (EmpathyLogStore *self,
     const gchar *chat_id, gboolean chatroom, EmpathyMessage *message);
 GList *empathy_log_store_get_filtered_messages (EmpathyLogStore *self,
-    EmpathyAccount *account, const gchar *chat_id, gboolean chatroom,
+    McAccount *account, const gchar *chat_id, gboolean chatroom,
     guint num_messages, EmpathyLogMessageFilter filter, gpointer user_data);
 
 G_END_DECLS
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 41b44bf..d020b72 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -39,7 +39,6 @@ typedef struct {
 	EmpathyContact           *receiver;
 	gchar                    *body;
 	time_t                    timestamp;
-	gboolean                  is_backlog;
 	guint                     id;
 } EmpathyMessagePriv;
 
@@ -62,7 +61,6 @@ enum {
 	PROP_RECEIVER,
 	PROP_BODY,
 	PROP_TIMESTAMP,
-	PROP_IS_BACKLOG,
 };
 
 static void
@@ -114,13 +112,6 @@ empathy_message_class_init (EmpathyMessageClass *class)
 							    G_MAXLONG,
 							    -1,
 							    G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_IS_BACKLOG,
-					 g_param_spec_boolean ("is-backlog",
-							       "History message",
-							       "If the message belongs to history",
-							       FALSE,
-							       G_PARAM_READWRITE));
 
 
 	g_type_class_add_private (object_class, sizeof (EmpathyMessagePriv));
@@ -396,33 +387,6 @@ empathy_message_set_timestamp (EmpathyMessage *message,
 	g_object_notify (G_OBJECT (message), "timestamp");
 }
 
-gboolean
-empathy_message_is_backlog (EmpathyMessage *message)
-{
-	EmpathyMessagePriv *priv;
-
-	g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
-
-	priv = GET_PRIV (message);
-
-	return priv->is_backlog;
-}
-
-void
-empathy_message_set_is_backlog (EmpathyMessage *message,
-				gboolean is_backlog)
-{
-	EmpathyMessagePriv *priv;
-
-	g_return_if_fail (EMPATHY_IS_MESSAGE (message));
-
-	priv = GET_PRIV (message);
-
-	priv->is_backlog = is_backlog;
-
-	g_object_notify (G_OBJECT (message), "is-backlog");
-}				
-
 #define IS_SEPARATOR(ch) (ch == ' ' || ch == ',' || ch == '.' || ch == ':')
 gboolean
 empathy_message_should_highlight (EmpathyMessage *message)
diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index 00064df..2172c97 100644
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -68,9 +68,6 @@ void                     empathy_message_set_body          (EmpathyMessage
 time_t                   empathy_message_get_timestamp     (EmpathyMessage           *message);
 void                     empathy_message_set_timestamp     (EmpathyMessage           *message,
 							    time_t                    timestamp);
-gboolean                 empathy_message_is_backlog        (EmpathyMessage           *message);
-void                     empathy_message_set_is_backlog    (EmpathyMessage           *message,
-							    gboolean                 is_backlog);
 gboolean                 empathy_message_should_highlight  (EmpathyMessage           *message);
 TpChannelTextMessageType empathy_message_type_from_str     (const gchar              *type_str);
 const gchar *            empathy_message_type_to_str       (TpChannelTextMessageType  type);
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index a328281..ac61392 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -875,34 +875,6 @@ tp_chat_got_added_contacts_cb (EmpathyTpContactFactory *factory,
 	tp_chat_check_if_ready (EMPATHY_TP_CHAT (chat));
 }
 
-static EmpathyContact *
-chat_lookup_contact (EmpathyTpChat *chat,
-		     TpHandle       handle,
-		     gboolean       remove)
-{
-	EmpathyTpChatPriv *priv = GET_PRIV (chat);
-	GList *l;
-
-	for (l = priv->members; l; l = l->next) {
-		EmpathyContact *c = l->data;
-
-		if (empathy_contact_get_handle (c) != handle) {
-			continue;
-		}
-
-		if (remove) {
-			/* Caller takes the reference. */
-			priv->members = g_list_delete_link (priv->members, l);
-		} else {
-			g_object_ref (c);
-		}
-
-		return c;
-	}
-
-	return NULL;
-}
-
 static void
 tp_chat_group_members_changed_cb (TpChannel     *self,
 				  gchar         *message,
@@ -916,30 +888,23 @@ tp_chat_group_members_changed_cb (TpChannel     *self,
 {
 	EmpathyTpChatPriv *priv = GET_PRIV (chat);
 	EmpathyContact *contact;
-	EmpathyContact *actor_contact = NULL;
+	TpHandle handle;
 	guint i;
-
-	if (actor != 0) {
-		actor_contact = chat_lookup_contact (chat, actor, FALSE);
-		if (actor_contact == NULL) {
-			/* FIXME: handle this a tad more gracefully: perhaps
-			 * the actor was a server op. We could use the
-			 * contact-ids detail of MembersChangedDetailed.
-			 */
-			DEBUG ("actor %u not a channel member", actor);
-		}
-	}
+	GList *l;
 
 	/* Remove contacts that are not members anymore */
 	for (i = 0; i < removed->len; i++) {
-		contact = chat_lookup_contact (chat,
-			g_array_index (removed, TpHandle, i), TRUE);
-
-		if (contact != NULL) {
-			g_signal_emit_by_name (chat, "members-changed", contact,
-					       actor_contact, reason, message,
-					       FALSE);
-			g_object_unref (contact);
+		for (l = priv->members; l; l = l->next) {
+			contact = l->data;
+			handle = empathy_contact_get_handle (contact);
+			if (handle == g_array_index (removed, TpHandle, i)) {
+				priv->members = g_list_delete_link (priv->members, l);
+				g_signal_emit_by_name (chat, "members-changed",
+						       contact, NULL, reason,
+						       message, FALSE);
+				g_object_unref (contact);
+				break;
+			}
 		}
 	}
 
@@ -952,10 +917,6 @@ tp_chat_group_members_changed_cb (TpChannel     *self,
 	}
 
 	tp_chat_update_remote_contact (chat);
-
-	if (actor_contact != NULL) {
-		g_object_unref (actor_contact);
-	}
 }
 
 static void
diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c
index b3d955e..1b2e393 100644
--- a/libempathy/empathy-tp-roomlist.c
+++ b/libempathy/empathy-tp-roomlist.c
@@ -27,7 +27,7 @@
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/util.h>
 
-#include "empathy-account.h"
+#include <libmissioncontrol/mission-control.h>
 
 #include "empathy-tp-roomlist.h"
 #include "empathy-chatroom.h"
@@ -40,7 +40,7 @@
 typedef struct {
 	TpConnection *connection;
 	TpChannel    *channel;
-	EmpathyAccount    *account;
+	McAccount    *account;
 	gboolean      is_listing;
 	gboolean      start_requested;
 } EmpathyTpRoomlistPriv;
@@ -54,7 +54,7 @@ enum {
 
 enum {
 	PROP_0,
-	PROP_ACCOUNT,
+	PROP_CONNECTION,
 	PROP_IS_LISTING,
 };
 
@@ -352,9 +352,13 @@ static void
 tp_roomlist_constructed (GObject *list)
 {
 	EmpathyTpRoomlistPriv *priv = GET_PRIV (list);
+	MissionControl        *mc;
 
-	priv->connection = empathy_account_get_connection (priv->account);
-	g_object_ref (priv->connection);
+	mc = empathy_mission_control_dup_singleton ();
+	priv->account = mission_control_get_account_for_tpconnection (mc,
+								      priv->connection,
+								      NULL);
+	g_object_unref (mc);
 
 	tp_cli_connection_call_request_channel (priv->connection, -1,
 						TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
@@ -375,8 +379,8 @@ tp_roomlist_get_property (GObject    *object,
 	EmpathyTpRoomlistPriv *priv = GET_PRIV (object);
 
 	switch (param_id) {
-	case PROP_ACCOUNT:
-		g_value_set_object (value, priv->account);
+	case PROP_CONNECTION:
+		g_value_set_object (value, priv->connection);
 		break;
 	case PROP_IS_LISTING:
 		g_value_set_boolean (value, priv->is_listing);
@@ -396,8 +400,8 @@ tp_roomlist_set_property (GObject      *object,
 	EmpathyTpRoomlistPriv *priv = GET_PRIV (object);
 
 	switch (param_id) {
-	case PROP_ACCOUNT:
-		priv->account = g_value_dup_object (value);
+	case PROP_CONNECTION:
+		priv->connection = g_object_ref (g_value_get_object (value));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -416,11 +420,11 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
 	object_class->set_property = tp_roomlist_set_property;
 
 	g_object_class_install_property (object_class,
-					 PROP_ACCOUNT,
-					 g_param_spec_object ("account",
-							      "The Account",
-							      "The account on which it lists rooms",
-							      EMPATHY_TYPE_ACCOUNT,
+					 PROP_CONNECTION,
+					 g_param_spec_object ("connection",
+							      "The Connection",
+							      "The connection on which it lists rooms",
+							      TP_TYPE_CONNECTION,
 							      G_PARAM_READWRITE |
 							      G_PARAM_CONSTRUCT_ONLY));
 	g_object_class_install_property (object_class,
@@ -476,14 +480,24 @@ empathy_tp_roomlist_init (EmpathyTpRoomlist *list)
 }
 
 EmpathyTpRoomlist *
-empathy_tp_roomlist_new (EmpathyAccount *account)
+empathy_tp_roomlist_new (McAccount *account)
 {
 	EmpathyTpRoomlist *list;
+	MissionControl    *mc;
+	TpConnection      *connection;
+
+	g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+
+	mc = empathy_mission_control_dup_singleton ();
+	connection = mission_control_get_tpconnection (mc, account, NULL);
 
 	list = g_object_new (EMPATHY_TYPE_TP_ROOMLIST,
-			     "account", account,
+			     "connection", connection,
 			     NULL);
 
+	g_object_unref (mc);
+	g_object_unref (connection);
+
 	return list;
 }
 
diff --git a/libempathy/empathy-tp-roomlist.h b/libempathy/empathy-tp-roomlist.h
index 801e5c6..9f45b7f 100644
--- a/libempathy/empathy-tp-roomlist.h
+++ b/libempathy/empathy-tp-roomlist.h
@@ -25,7 +25,7 @@
 #include <glib.h>
 
 #include <telepathy-glib/connection.h>
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
 
@@ -49,7 +49,7 @@ struct _EmpathyTpRoomlistClass {
 };
 
 GType              empathy_tp_roomlist_get_type   (void) G_GNUC_CONST;
-EmpathyTpRoomlist *empathy_tp_roomlist_new        (EmpathyAccount *account);
+EmpathyTpRoomlist *empathy_tp_roomlist_new        (McAccount *account);
 gboolean           empathy_tp_roomlist_is_listing (EmpathyTpRoomlist *list);
 void               empathy_tp_roomlist_start      (EmpathyTpRoomlist *list);
 void               empathy_tp_roomlist_stop       (EmpathyTpRoomlist *list);
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index fd54c9a..fca7fcb 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -230,16 +230,25 @@ empathy_xml_node_find_child_prop_value (xmlNodePtr   node,
 guint
 empathy_account_hash (gconstpointer key)
 {
-	g_return_val_if_fail (EMPATHY_IS_ACCOUNT (key), 0);
+	g_return_val_if_fail (MC_IS_ACCOUNT (key), 0);
 
-	return g_str_hash (empathy_account_get_unique_name (EMPATHY_ACCOUNT (key)));
+	return g_str_hash (mc_account_get_unique_name (MC_ACCOUNT (key)));
 }
 
 gboolean
 empathy_account_equal (gconstpointer a,
 		       gconstpointer b)
 {
-  return a == b;
+	const gchar *name_a;
+	const gchar *name_b;
+
+	g_return_val_if_fail (MC_IS_ACCOUNT (a), FALSE);
+	g_return_val_if_fail (MC_IS_ACCOUNT (b), FALSE);
+
+	name_a = mc_account_get_unique_name (MC_ACCOUNT (a));
+	name_b = mc_account_get_unique_name (MC_ACCOUNT (b));
+
+	return g_str_equal (name_a, name_b);
 }
 
 MissionControl *
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 42acbc8..de1437b 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -32,6 +32,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
+#include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mission-control.h>
 
 #include "empathy-contact.h"
diff --git a/megaphone/src/megaphone-applet.c b/megaphone/src/megaphone-applet.c
index 132e8b7..0879e75 100644
--- a/megaphone/src/megaphone-applet.c
+++ b/megaphone/src/megaphone-applet.c
@@ -32,10 +32,10 @@
 #include <gconf/gconf-client.h>
 
 #include <libmissioncontrol/mission-control.h>
+#include <libmissioncontrol/mc-account.h>
 
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-account-manager.h>
-#include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-contact-manager.h>
@@ -55,7 +55,7 @@
 typedef struct {
 	EmpathyTpContactFactory *factory;
 	EmpathyAccountManager   *account_manager;
-	EmpathyAccount          *account;
+	McAccount               *account;
 	gchar                   *id;
 	GtkWidget               *image;
 	gint                     image_size;
@@ -194,7 +194,7 @@ megaphone_applet_got_contact_cb (EmpathyTpContactFactory *factory,
 static void
 megaphone_applet_new_connection_cb (EmpathyAccountManager *manager,
 				    TpConnection          *connection,
-				    EmpathyAccount        *account,
+				    McAccount             *account,
 				    MegaphoneApplet       *applet)
 {
 	MegaphoneAppletPriv *priv = GET_PRIV (applet);
@@ -223,13 +223,13 @@ megaphone_applet_preferences_response_cb (GtkWidget       *dialog,
 		contact_list = g_object_get_data (G_OBJECT (dialog), "contact-list");
 		contact = empathy_contact_list_view_dup_selected (contact_list);
 		if (contact) {
-			EmpathyAccount   *account;
+			McAccount   *account;
 			const gchar *account_id;
 			const gchar *contact_id;
 			gchar       *str;
 
 			account = empathy_contact_get_account (contact);
-			account_id = empathy_account_get_unique_name (account);
+			account_id = mc_account_get_unique_name (account);
 			contact_id = empathy_contact_get_id (contact);
 
 			str = g_strconcat (account_id, "/", contact_id, NULL);
@@ -282,7 +282,7 @@ megaphone_applet_show_preferences (MegaphoneApplet *applet)
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 500);
 	scroll = gtk_scrolled_window_new (NULL, NULL);
 	gtk_container_add (GTK_CONTAINER (scroll), GTK_WIDGET (contact_list));
-	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scroll);
+	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), scroll);
 	gtk_widget_show (scroll);
 	
 	g_object_set_data (G_OBJECT (dialog), "contact-list", contact_list);
@@ -300,6 +300,7 @@ megaphone_applet_button_press_event_cb (GtkWidget       *widget,
 					MegaphoneApplet *applet)
 {
 	MegaphoneAppletPriv *priv = GET_PRIV (applet);
+	MissionControl      *mc;
 
 	/* Only react on left-clicks */
 	if (event->button != 1 || event->type != GDK_BUTTON_PRESS) {
@@ -316,8 +317,15 @@ megaphone_applet_button_press_event_cb (GtkWidget       *widget,
 		empathy_contact_get_id (priv->contact),
 		empathy_contact_get_handle (priv->contact));
 
-	empathy_dispatcher_chat_with_contact (priv->contact, NULL, NULL);
-
+	mc = empathy_mission_control_dup_singleton ();
+	mission_control_request_channel (mc,
+					 empathy_contact_get_account (priv->contact),
+					 TP_IFACE_CHANNEL_TYPE_TEXT,
+					 empathy_contact_get_handle (priv->contact),
+					 TP_HANDLE_TYPE_CONTACT,
+					 NULL, NULL);
+	g_object_unref (mc);
+	
 	return TRUE;
 }
 
@@ -445,15 +453,15 @@ megaphone_applet_set_contact (MegaphoneApplet *applet,
 	/* Lookup the new contact */
 	if (str) {
 		strv = g_strsplit (str, "/", 2);
-		priv->account = empathy_account_manager_lookup (priv->account_manager, 
-			strv[0]);
+		priv->account = mc_account_lookup (strv[0]);
 		priv->id = strv[1];
 		g_free (strv[0]);
 		g_free (strv);
 	}
 
 	if (priv->account) {
-		connection = empathy_account_get_connection (priv->account);
+		connection = empathy_account_manager_get_connection (
+			priv->account_manager, priv->account);
 		if (connection) {
 			megaphone_applet_new_connection_cb (priv->account_manager,
 				connection, priv->account, applet);
diff --git a/po/LINGUAS b/po/LINGUAS
index b1de6b5..039fa07 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -41,7 +41,6 @@ nb
 ne
 nl
 oc
-or
 pa
 pl
 ps
diff --git a/po/es.po b/po/es.po
index 034587a..33c53b1 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-02 19:42+0000\n"
-"PO-Revision-Date: 2009-07-05 11:38+0200\n"
+"POT-Creation-Date: 2009-06-23 10:10+0000\n"
+"PO-Revision-Date: 2009-06-27 15:03+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"
@@ -176,10 +176,12 @@ msgstr ""
 "Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
 
 #: ../data/empathy.schemas.in.h:36
+#| msgid "Popup notifications if the chat isn't focused"
 msgid "Popup notifications when a contact sign in"
 msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta."
 
 #: ../data/empathy.schemas.in.h:37
+#| msgid "Popup notifications if the chat isn't focused"
 msgid "Popup notifications when a contact sign out"
 msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta."
 
@@ -363,6 +365,7 @@ msgstr ""
 "ausente u ocupado."
 
 #: ../data/empathy.schemas.in.h:71
+#| 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 ""
@@ -370,6 +373,7 @@ msgstr ""
 "se desconecta."
 
 #: ../data/empathy.schemas.in.h:72
+#| 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 ""
 "Indica si se deben mostrar las notificaciones emergentes cuando se conecta."
@@ -455,7 +459,7 @@ msgstr "El archivo seleccionado no es un archivo regular"
 msgid "The selected file is empty"
 msgstr "El archivo seleccionado está vacío"
 
-#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:287
 msgid "People nearby"
 msgstr "Gente cerca"
 
@@ -491,23 +495,23 @@ msgstr "El otro participante no puede transferir el archivo"
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:274
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:276
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:279
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:281
 msgid "Hidden"
 msgstr "Oculto"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:283
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -627,7 +631,7 @@ msgstr "_UIN ICQ:"
 msgid "_Charset:"
 msgstr "Conjunto de _caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:241
 msgid "New Network"
 msgstr "Red nueva"
 
@@ -829,7 +833,7 @@ msgstr "Insertar emoticono"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1031
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
+#: ../libempathy-gtk/empathy-ui-utils.c:1476
 msgid "_Send"
 msgstr "E_nviar"
 
@@ -837,66 +841,30 @@ msgstr "E_nviar"
 msgid "_Spelling Suggestions"
 msgstr "_Sugerencias ortográficas"
 
-#: ../libempathy-gtk/empathy-chat.c:1180
-#, c-format
-#| msgid "Contact disconnected"
-msgid "%s has disconnected"
-msgstr "%s se ha desconectado"
-
-#: ../libempathy-gtk/empathy-chat.c:1184
-#, c-format
-msgid "%s was kicked by %s"
-msgstr "%s fue expulsado por %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1179
 #, c-format
-msgid "%s was kicked"
-msgstr "%s fue expulsado"
-
-#: ../libempathy-gtk/empathy-chat.c:1192
-#, c-format
-msgid "%s was banned by %s"
-msgstr "%s fue vetado por %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1195
-#, c-format
-msgid "%s was banned"
-msgstr "%s fue vetado"
+msgid "%s has joined the room"
+msgstr "%s ha entrado en la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:1199
+#: ../libempathy-gtk/empathy-chat.c:1182
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha dejado 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:1208
-#, c-format
-msgid " (%s)"
-msgstr " (%s)"
-
-#: ../libempathy-gtk/empathy-chat.c:1231
-#, c-format
-msgid "%s has joined the room"
-msgstr "%s ha entrado en la sala"
-
-#: ../libempathy-gtk/empathy-chat.c:1364 ../src/empathy-call-window.c:1226
+#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1199
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1793
+#: ../libempathy-gtk/empathy-chat.c:1742
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1843
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:1792
+#: ../libempathy-gtk/empathy-log-window.c:501
 msgid "Conversation"
 msgstr "Conversación"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
 msgid "Topic:"
 msgstr "Tema:"
 
@@ -910,7 +878,7 @@ msgstr "_Abrir enlace"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -923,7 +891,7 @@ msgstr "Editar información del contacto"
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:384
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
@@ -935,26 +903,26 @@ msgstr "Decidir _luego"
 msgid "Subscription Request"
 msgstr "Petición de suscripción"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1378
 #, 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:1377
+#: ../libempathy-gtk/empathy-contact-list-view.c:1380
 msgid "Removing group"
 msgstr "Quitando grupo"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1424
-#: ../libempathy-gtk/empathy-contact-list-view.c:1502
+#: ../libempathy-gtk/empathy-contact-list-view.c:1427
+#: ../libempathy-gtk/empathy-contact-list-view.c:1505
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1454
+#: ../libempathy-gtk/empathy-contact-list-view.c:1457
 #, 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:1456
+#: ../libempathy-gtk/empathy-contact-list-view.c:1459
 msgid "Removing contact"
 msgstr "Quitando el contacto"
 
@@ -1015,7 +983,7 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:903
+#: ../src/empathy-main-window.c:905
 msgid "Group"
 msgstr "Grupo"
 
@@ -1155,7 +1123,7 @@ msgid "Client:"
 msgstr "Cliente:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:886
+#: ../src/empathy-main-window.c:888
 msgid "Contact"
 msgstr "Contacto"
 
@@ -1224,12 +1192,12 @@ msgstr "Puerto"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../libempathy-gtk/empathy-log-window.c:494
+#: ../src/empathy-import-dialog.c:281
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:511
 msgid "Date"
 msgstr "Fecha"
 
@@ -1300,46 +1268,6 @@ msgstr "Establecer su presencia y estado actual"
 msgid "Custom messages..."
 msgstr "Mensajes personalizados…"
 
-#: ../libempathy-gtk/empathy-sound.c:51
-msgid "Received an instant message"
-msgstr "Mensaje instantáneo recibido"
-
-#: ../libempathy-gtk/empathy-sound.c:53
-msgid "Sent an instant message"
-msgstr "Enviar un mensaje instantáneo"
-
-#: ../libempathy-gtk/empathy-sound.c:55
-msgid "Incoming chat request"
-msgstr "Solicitud de chat entrante"
-
-#: ../libempathy-gtk/empathy-sound.c:57
-msgid "Contact connected"
-msgstr "Contacto conectado"
-
-#: ../libempathy-gtk/empathy-sound.c:59
-msgid "Contact disconnected"
-msgstr "Contacto desconectado"
-
-#: ../libempathy-gtk/empathy-sound.c:61
-msgid "Connected to server"
-msgstr "Conectado con el servidor"
-
-#: ../libempathy-gtk/empathy-sound.c:63
-msgid "Disconnected from server"
-msgstr "Desconectado del servidor"
-
-#: ../libempathy-gtk/empathy-sound.c:65
-msgid "Incoming voice call"
-msgstr "Llamada de voz entrante"
-
-#: ../libempathy-gtk/empathy-sound.c:67
-msgid "Outgoing voice call"
-msgstr "Llamada de voz saliente"
-
-#: ../libempathy-gtk/empathy-sound.c:69
-msgid "Voice call ended"
-msgstr "Finalizó la llamada de vz"
-
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:362
 msgid "Enter Custom Message"
 msgstr "Introducir mensaje personalizado"
@@ -1364,34 +1292,78 @@ msgstr "gtk-add"
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:66
 msgid "Classic"
 msgstr "Clásico"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Simple"
 msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Clean"
 msgstr "Limpio"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Blue"
 msgstr "Azul"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1377
+#: ../libempathy-gtk/empathy-theme-manager.c:71
+msgid "Adium"
+msgstr "Adium"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1378
 msgid "Unable to open URI"
 msgstr "No se pudo abrir el URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1467
+#: ../libempathy-gtk/empathy-ui-utils.c:1468
 msgid "Select a file"
 msgstr "Seleccionar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1525
+#: ../libempathy-gtk/empathy-ui-utils.c:1526
 msgid "Select a destination"
 msgstr "Seleccionar un destino"
 
+#: ../libempathy-gtk/empathy-ui-utils.c:1555
+msgid "Received an instant message"
+msgstr "Mensaje instantáneo recibido"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1557
+msgid "Sent an instant message"
+msgstr "Enviar un mensaje instantáneo"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1559
+msgid "Incoming chat request"
+msgstr "Solicitud de chat entrante"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1561
+msgid "Contact connected"
+msgstr "Contacto conectado"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1563
+msgid "Contact disconnected"
+msgstr "Contacto desconectado"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1565
+msgid "Connected to server"
+msgstr "Conectado con el servidor"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1567
+msgid "Disconnected from server"
+msgstr "Desconectado del servidor"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1569
+msgid "Incoming voice call"
+msgstr "Llamada de voz entrante"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1571
+msgid "Outgoing voice call"
+msgstr "Llamada de voz saliente"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1573
+msgid "Voice call ended"
+msgstr "Finalizó la llamada de vz"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Configuración regional actual"
@@ -1578,7 +1550,7 @@ msgid "Megaphone"
 msgstr "Megáfono"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:527
 msgid "Talk!"
 msgstr "Hablar"
 
@@ -1613,19 +1585,19 @@ msgstr "Presencia"
 msgid "Set your own presence"
 msgstr "Establezca su propia presencia"
 
-#: ../src/empathy.c:506
+#: ../src/empathy.c:478
 msgid "Don't connect on startup"
 msgstr "No conectarse automáticamente al inicio"
 
-#: ../src/empathy.c:510
+#: ../src/empathy.c:482
 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:486
 msgid "Show the accounts dialog"
 msgstr "Mostrar el diálogo de las cuentas"
 
-#: ../src/empathy.c:526
+#: ../src/empathy.c:498
 msgid "- Empathy Instant Messenger"
 msgstr "- Mensajería instantánea Empathy"
 
@@ -1671,11 +1643,11 @@ msgstr "Un cliente de mensajería instantánea para GNOME"
 msgid "translator-credits"
 msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2007-2009"
 
-#: ../src/empathy-accounts-dialog.c:392
+#: ../src/empathy-accounts-dialog.c:393
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "Cuentas"
 
@@ -1755,53 +1727,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:63
+msgid "Connecting..."
+msgstr "Conectando…"
+
+#: ../src/empathy-call-window.c:415
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:418
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:421
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:526
 msgid "Volume"
 msgstr "Volumen"
 
-#: ../src/empathy-call-window.c:662
-msgid "Connecting..."
-msgstr "Conectando…"
-
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:728
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:747
 msgid "Dialpad"
 msgstr "Teclado de llamada"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:753
 msgid "Audio input"
 msgstr "Entrada de sonido"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:757
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-call-window.c:836
+#: ../src/empathy-call-window.c:820
 #, c-format
 msgid "Call with %s"
 msgstr "Llamar con %s"
 
-#: ../src/empathy-call-window.c:905
+#: ../src/empathy-call-window.c:889
 msgid "Call"
 msgstr "Llamar"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1336
+#: ../src/empathy-call-window.c:1308
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
@@ -1834,12 +1806,12 @@ msgstr "_Llamar"
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:343
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Conversaciones (%d)"
 
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:475
 msgid "Typing a message."
 msgstr "Tecleando un mensaje."
 
@@ -1859,75 +1831,75 @@ msgstr "Autoconectar"
 msgid "Manage Favorite Rooms"
 msgstr "Gestionar salas favoritas"
 
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:395
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:398
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s le está llamando, ¿quiere responder?"
 
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:405
 msgid "_Reject"
 msgstr "_Rechazar"
 
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:411
 msgid "_Answer"
 msgstr "Re_spuesta"
 
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:523
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Llamada entrante de %s"
 
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:563
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s le está ofreciendo una invitación"
 
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:569
 msgid "An external application will be started to handle it."
 msgstr "Se iniciará una aplicación externa para manejarla."
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:574
 msgid "You don't have the needed external application to handle it."
 msgstr "No tiene la aplicación externa necesaria para manejarla."
 
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:701
 msgid "Room invitation"
 msgstr "Invitación a una sala"
 
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:704
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s le está invitando a unirse a %s"
 
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:712
 msgid "_Decline"
 msgstr "_Rechazar"
 
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:717
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:756
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s le ha invitado a unirse a %s"
 
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:782
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de archivo entrante de %s"
 
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:962
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Petición de suscripción de %s"
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:966
 #, c-format
 msgid ""
 "\n"
@@ -1937,13 +1909,13 @@ msgstr ""
 "Mensaje: %s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:1009
 #, c-format
 msgid "%s is now offline."
 msgstr "Ahora %s está desconectado."
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:1025
 #, c-format
 msgid "%s is now online."
 msgstr "Ahora %s está conectado."
@@ -2062,19 +2034,19 @@ msgstr ""
 "lista"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-dialog.c:259
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-dialog.c:268
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-dialog.c:294
 msgid "Source"
 msgstr "Origen"
 
-#: ../src/empathy-import-dialog.c:392
+#: ../src/empathy-import-dialog.c:388
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -2086,71 +2058,71 @@ msgstr ""
 msgid "Import Accounts"
 msgstr "Importar cuentas"
 
-#: ../src/empathy-main-window.c:396
+#: ../src/empathy-main-window.c:395
 msgid "_Edit account"
 msgstr "_Editar cuenta"
 
-#: ../src/empathy-main-window.c:499
+#: ../src/empathy-main-window.c:498
 msgid "No error specified"
 msgstr "No se especificó el error"
 
-#: ../src/empathy-main-window.c:502
+#: ../src/empathy-main-window.c:501
 msgid "Network error"
 msgstr "Error de red"
 
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:504
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:507
 msgid "Encryption error"
 msgstr "Error de cifrado"
 
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:510
 msgid "Name in use"
 msgstr "Nombre en uso"
 
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:513
 msgid "Certificate not provided"
 msgstr "No se proporcionó el certificado"
 
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:516
 msgid "Certificate untrusted"
 msgstr "Certificado sin confianza"
 
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:519
 msgid "Certificate expired"
 msgstr "El certificado ha expirado"
 
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:522
 msgid "Certificate not activated"
 msgstr "El certificado no está activado"
 
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:525
 msgid "Certificate hostname mismatch"
 msgstr "El nombre del equipo del certificado no coincide"
 
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:528
 msgid "Certificate fingerprint mismatch"
 msgstr "La huella del certificado no coincide"
 
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:531
 msgid "Certificate self-signed"
 msgstr "Certificado firmado consigo mismo"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:534
 msgid "Certificate error"
 msgstr "Error del certificado"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:537
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../src/empathy-main-window.c:1218
+#: ../src/empathy-main-window.c:1220
 msgid "Show and edit accounts"
 msgstr "Mostrar y editar cuentas"
 
-#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10
 msgid "Contact List"
 msgstr "Lista de contactos"
 
@@ -2218,15 +2190,15 @@ msgstr "Conversaciones an_teriores"
 msgid "_Room"
 msgstr "_Sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:332
 msgid "Chat Room"
 msgstr "Sala de chat"
 
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:348
 msgid "Members"
 msgstr "Miembros"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:492
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2242,21 +2214,21 @@ msgstr ""
 "Contraseña necesaria: %s\n"
 "Miembros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:495
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:495
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:522
 msgid "Could not start room listing"
 msgstr "No se pudo iniciar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:532
 msgid "Could not stop room listing"
 msgstr "No se pudo parar la lista de la sala"
 
@@ -2324,92 +2296,102 @@ msgid "Language"
 msgstr "Idioma"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Adium theme to use:"
+msgstr "Tema adium que usar:"
+
+#: ../src/empathy-preferences.ui.h:2
 msgid "Allow _GPS usage"
 msgstr "Permitir el usso de _GPS"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Allow _cellphone usage"
 msgstr "Permitir el uso de teléfono _móvil"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:4
 msgid "Allow _network usage"
 msgstr "Permitir el uso de la _red"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:5
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:6
 msgid "Automatically _connect on startup "
 msgstr "_Conectarse automáticamente al inicio"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:7
 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 "
 "lista de contactos"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:8
 msgid "Behavior"
 msgstr "Comportamiento"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:9
 msgid "Chat Th_eme:"
 msgstr "_Tema del chat:"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Disable notifications when _away or busy"
 msgstr "Desactivar notificaciones al _ausentarse o estar ocupado"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar sonidos al _ausentarse o estar ocupado"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
+#| msgid "Enable notifications when the _chat is not focused"
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar notificaciones cuando un contacto se conecta"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+#| msgid "Enable notifications when the _chat is not focused"
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar notificaciones cuando un contacto se desconecta"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:15
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar notificaciones cuando el _chat no tenga el foco"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
 msgid "Enable spell checking for languages:"
 msgstr "Activar la revisión ortográfica para idiomas:"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "General"
 msgstr "General"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:18
 msgid "Geoclue Settings"
 msgstr "Configuración de Geoclue"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
+msgid "Not a valid adium theme"
+msgstr "No es un tema adium válido"
+
+#: ../src/empathy-preferences.ui.h:21
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:22
 msgid "Play sound for events"
 msgstr "Reproducir sonido para eventos"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:23
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:24
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:25
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will have a random "
@@ -2419,39 +2401,39 @@ msgstr ""
 "preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
 "aleatorio añadido (&#xB1;0.25&#xB0;)."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
 msgid "Show _avatars"
 msgstr "Mostrar _avatares"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:27
 msgid "Show _smileys as images"
 msgstr "Mostrar los _emoticonos como imágenes"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:28
 msgid "Show co_mpact contact list"
 msgstr "Mostrar lista de contactos co_mpacta"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:29
 msgid "Show contact _list in rooms"
 msgstr "Mostrar _lista de contactos en salas"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:30
 msgid "Sort by _name"
 msgstr "Ordenar por _nombre"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:31
 msgid "Sort by s_tate"
 msgstr "Ordenar por es_tado"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:32
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:33
 msgid "Spell Checking"
 msgstr "Revisión ortográfica"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:34
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -2459,27 +2441,27 @@ msgstr ""
 "La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
 "diccionario instalado."
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:35
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Enable bubble notifications"
 msgstr "_Activar notificaciones de burbuja"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Enable sound notifications"
 msgstr "_Activar notificaciones de sonido"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Open new chats in separate windows"
 msgstr "_Abrir charlas nuevas en ventanas separadas"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Publish location to my contacts"
 msgstr "_Publicar mi ubicación a mis contactos"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Reducir la precisión de la ubicación"
 
@@ -2517,64 +2499,64 @@ msgstr "gtk-leave-fullscreen"
 msgid "Contact Map View"
 msgstr "Vista del mapa de contactos"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1075
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1069
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1063
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1057
+#: ../src/empathy-debug-dialog.c:1105
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1051
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1045
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-dialog.c:837
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-dialog.c:940
 msgid "Debug Window"
 msgstr "Depurar ventana"
 
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-dialog.c:1013
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-dialog.c:1025
 msgid "Level "
 msgstr "Nivel "
 
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-dialog.c:1094
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-dialog.c:1096
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-dialog.c:1098
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-dialog.c:1100
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-dialog.c:1132
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -2582,15 +2564,6 @@ msgstr ""
 "El gestor de conexiones seleccionado no soporta la extensión de depuración "
 "remota."
 
-#~ msgid "Adium"
-#~ msgstr "Adium"
-
-#~ msgid "Adium theme to use:"
-#~ msgstr "Tema adium que usar:"
-
-#~ msgid "Not a valid adium theme"
-#~ msgstr "No es un tema adium válido"
-
 #~ msgid "<b>Network</b>"
 #~ msgstr "<b>Red</b>"
 
diff --git a/po/fr.po b/po/fr.po
index 460c9b2..318cb73 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,17 +15,16 @@
 # Frederic Peters <fpeters@0d.be>, 2007-2008.
 # Laurent Bigonville <bigon@bigon.be>, 2007.
 # Stéphane Raimbault <stephane.raimbault@gmail.com>, 2007.
-# Christophe Benz <christophe.benz@gmail.com>, 2007-2009.
+# Christophe Benz <christophe.benz@gmail.com>, 2007.
 # Yannick Tailliez <ytdispatch-libre@yahoo.com>, 2008.
 # Laurent Coudeur <laurentc@iol.ie>, 2009.
 #
 msgid ""
 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-02 19:42+0000\n"
-"PO-Revision-Date: 2009-07-06 12:06+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-02-17 21:38+0100\n"
+"PO-Revision-Date: 2009-02-17 21:43+0100\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -88,189 +87,128 @@ msgid "Disable sounds when away"
 msgstr "Désactiver les sons en mode absent"
 
 #: ../data/empathy.schemas.in.h:10
-msgid "Empathy can publish the user's location"
-msgstr "Empathy peut publier l'emplacement de l'utilisateur"
-
-#: ../data/empathy.schemas.in.h:11
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy peut utiliser le GPS pour découvrir l'emplacement"
-
-#: ../data/empathy.schemas.in.h:12
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy peut utiliser le réseau cellulaire pour découvrir l'emplacement"
-
-#: ../data/empathy.schemas.in.h:13
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy peut utiliser le réseau pour découvrir l'emplacement"
-
-#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Dossier de téléchargement par défaut d'Empathy"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:11
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy a demandé à importer des comptes"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:12
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy doit se connecter automatiquement au démarrage"
 
-#: ../data/empathy.schemas.in.h:17
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy doit réduire la précision de l'emplacement"
-
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:13
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy doit utiliser l'avatar du contact comme icône de fenêtre de "
 "discussion"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:14
 msgid "Enable popup notifications for new messages"
 msgstr "Activer les bulles de notification pour les nouveaux messages"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:15
 msgid "Enable spell checker"
 msgstr "Activer le correcteur orthographique"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:16
 msgid "Hide main window"
 msgstr "Masquer la fenêtre principale"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:17
 msgid "Hide the main window."
 msgstr "Masque la fenêtre principale."
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:18
 msgid "NetworkManager should be used"
 msgstr "NetworkManager devrait être utilisé"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:19
 msgid "Nick completed character"
 msgstr "Caractère d'auto-complétion du pseudonyme"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:20
 msgid "Open new chats in separate windows"
 msgstr "Ouvrir les nouvelles discussions dans des fenêtres séparées"
 
-#: ../data/empathy.schemas.in.h:26
-msgid "Path of the adium theme to use"
-msgstr "Chemin vers le thème Adium à utiliser"
-
-#: ../data/empathy.schemas.in.h:27
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr ""
-"Chemin vers le thème Adium à utiliser si un thème Adium est choisi pour les discussions."
-
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:21
 msgid "Play a sound for incoming messages"
 msgstr "Jouer un son lors de la réception des messages"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:22
 msgid "Play a sound for new conversations"
 msgstr "Jouer un son lors de nouvelles discussions"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:23
 msgid "Play a sound for outgoing messages"
 msgstr "Jouer un son lors de l'envoi des messages"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:24
 msgid "Play a sound when a contact logs in"
 msgstr "Jouer un son lorsqu'un contact se connecte"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:25
 msgid "Play a sound when a contact logs out"
 msgstr "Jouer un son lorsqu'un contact se déconnecte"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:26
 msgid "Play a sound when we log in"
 msgstr "Jouer un son lors de la connexion"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:27
 msgid "Play a sound when we log out"
 msgstr "Jouer un son lors de la déconnexion"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:28
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Bulles de notification si la discussion n'a pas le focus"
 
-#: ../data/empathy.schemas.in.h:36
-msgid "Popup notifications when a contact sign in"
-msgstr "Bulles de notification lorsqu'un contact se connecte"
-
-#: ../data/empathy.schemas.in.h:37
-msgid "Popup notifications when a contact sign out"
-msgstr "Bulles de notification lorsqu'un contact se déconnecte"
-
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:29
 msgid "Salut account is created"
 msgstr "Le compte Salut est créé"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:30
 msgid "Show avatars"
 msgstr "Afficher les avatars"
 
-#: ../data/empathy.schemas.in.h:40
-msgid "Show contact list in rooms"
-msgstr "Afficher la liste des contacts dans les salles"
-
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:31
 msgid "Show hint about closing the main window"
 msgstr "Afficher une astuce sur la fermeture de la fenêtre principale"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:32
 msgid "Show offline contacts"
 msgstr "Afficher les contacts déconnectés"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:33
 msgid "Spell checking languages"
 msgstr "Langues de la correction orthographique"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:34
 msgid "The default folder to save file transfers in."
 msgstr "Le dossier par défaut pour enregistrer les transferts de fichiers."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:35
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Dernier répertoire où un avatar a été choisi."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:36
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Le thème utilisé pour l'affichage dans les fenêtres de discussion."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:37
 msgid "Use graphical smileys"
 msgstr "Utiliser des frimousses graphiques"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:38
 msgid "Use notification sounds"
 msgstr "Utiliser des sons de notification"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:39
 msgid "Use theme for chat rooms"
 msgstr "Utiliser des thèmes pour les salles de discussion"
 
-#: ../data/empathy.schemas.in.h:50
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr ""
-"Indique si Empathy peut publier l'emplacement de l'utilisateur à ses contacts."
-
-#: ../data/empathy.schemas.in.h:51
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Indique si Empathy peut utiliser le GPS pour découvrir l'emplacement."
-
-#: ../data/empathy.schemas.in.h:52
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
-msgstr ""
-"Indique si Empathy peut utiliser le réseau cellulaire pour découvrir l'emplacement."
-
-#: ../data/empathy.schemas.in.h:53
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr ""
-"Indique si Empathy peut utiliser le réseau pour découvrir l'emplacement."
-
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:40
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
@@ -278,7 +216,7 @@ msgstr ""
 "Indique si Empathy a demandé l'importation de comptes provenant d'autres "
 "logiciels."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:41
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
@@ -286,15 +224,7 @@ msgstr ""
 "Indique si Empathy doit se connecter automatiquement à vos comptes au "
 "démarrage."
 
-#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr ""
-"Indique si Empathy doit réduire la précision de l'emplacement pour des raisons "
-"de confidentialité."
-
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:42
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
@@ -302,12 +232,12 @@ msgstr ""
 "Indique si Empathy doit utiliser l'avatar des contacts comme icône de "
 "fenêtre de discussion."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:43
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "Indique si le compte Salut a été créé au premier lancement d'Empathy."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:44
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -315,7 +245,7 @@ msgstr ""
 "Indique si NetworkManager doit être utilisé pour se déconnecter ou se "
 "reconnecter automatiquement."
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:45
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
@@ -323,21 +253,21 @@ msgstr ""
 "Indique s'il faut vérifier l'orthographe des mots saisis selon les langues "
 "choisies."
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:46
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr ""
 "Indique s'il faut changer les frimousses en images graphiques dans les "
 "conversations."
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:47
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr ""
 "Indique s'il faut jouer un son pour avertir lorsque des contacts se "
 "connectent au réseau."
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:48
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
@@ -345,48 +275,37 @@ msgstr ""
 "Indique s'il faut jouer un son pour avertir lorsque des contacts se "
 "déconnectent du réseau."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:49
 msgid "Whether or not to play a sound to notify for events."
 msgstr "Indique s'il faut jouer un son pour signaler des événements."
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:50
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "Indique s'il faut jouer un son pour avertir de l'arrivée de messages."
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:51
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr ""
 "Indique s'il faut jouer un son pour signaler de nouvelles conversations."
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:52
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Indique s'il faut jouer un son pour signaler qu'un message est envoyé."
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:53
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "Indique s'il faut jouer un son lors de la connexion à un réseau."
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:54
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "Indique s'il faut jouer un son lors de la déconnexion d'un réseau."
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr ""
 "Indique s'il faut émettre des sons en cas d'absence ou d'indisponibilité."
 
-#: ../data/empathy.schemas.in.h:71
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
-msgstr ""
-"Indique s'il faut afficher des notifications lorsqu'un contact se déconnecte."
-
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to show a popup notification when a contact goes online."
-msgstr ""
-"Indique s'il faut afficher des notifications lorsqu'un contact se connecte."
-
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -394,14 +313,14 @@ msgstr ""
 "Indique s'il faut afficher une bulle de notification lorsqu'un message est "
 "reçu, même si la discussion est ouverte, mais sans disposer du focus."
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr ""
 "Indique s'il faut afficher une bulle de notification lorsqu'un message est "
 "reçu."
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:58
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -409,23 +328,19 @@ msgstr ""
 "Indique s'il faut afficher les avatars des contacts dans la liste des "
 "contacts et les fenêtres de discussion."
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:59
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr ""
 "Indique s'il faut afficher les contacts qui sont déconnectés dans la liste "
 "des contacts."
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:60
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr ""
 "Indique s'il faut afficher des notifications en cas d'absence ou "
 "d'indisponibilité."
 
-#: ../data/empathy.schemas.in.h:78
-msgid "Whether or not to show the contact list in chat rooms."
-msgstr "Indique s'il faut afficher la liste des contacts dans les salles de discussion."
-
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
@@ -433,15 +348,15 @@ msgstr ""
 "Indique s'il faut afficher la boîte de dialogue au sujet de la fermeture de "
 "la fenêtre principale avec le bouton « x » dans la barre de titre."
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:62
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Indique s'il faut afficher la liste des contacts en mode compact."
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:63
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Indique s'il faut utiliser les thèmes pour les salles de discussion."
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:64
 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 "
@@ -451,757 +366,542 @@ msgstr ""
 "par défaut est de trier selon le nom du contact (valeur: « name »).  Une "
 "valeur « state » triera la liste des contacts selon leur état."
 
-#: ../libempathy/empathy-ft-handler.c:838
-msgid "The hash of the received file and the sent one do not match"
-msgstr ""
-"La somme de contrôle du fichier reçu ne correspond pas à celle du fichier envoyé"
-
-#: ../libempathy/empathy-ft-handler.c:1098
-msgid "File transfer not supported by remote contact"
-msgstr "Le transfert de fichier n'est pas pris en charge par le contact distant"
-
-#: ../libempathy/empathy-ft-handler.c:1156
-msgid "The selected file is not a regular file"
-msgstr "Le fichier sélectionné n'est pas un fichier conventionnel"
-
-#: ../libempathy/empathy-ft-handler.c:1165
-msgid "The selected file is empty"
-msgstr "Le fichier sélectionné est vide"
-
-#: ../libempathy/empathy-tp-contact-list.c:757 ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
 msgid "People nearby"
 msgstr "Personnes à proximité"
 
-#: ../libempathy/empathy-tp-file.c:279
-msgid "Socket type not supported"
-msgstr "Le type de connecteur réseau (socket) n'est pas pris en charge"
-
-#: ../libempathy/empathy-tp-file.c:398
-msgid "No reason was specified"
-msgstr "Aucune raison n'a été indiquée"
-
-#: ../libempathy/empathy-tp-file.c:401
-msgid "The change in state was requested"
-msgstr "Le changement d'état a été demandé"
-
-#: ../libempathy/empathy-tp-file.c:404
-msgid "You canceled the file transfer"
-msgstr "Vous avez annulé le transfert de fichiers"
-
-#: ../libempathy/empathy-tp-file.c:407
-msgid "The other participant canceled the file transfer"
-msgstr "Le correspondant a annulé le transfert de fichiers"
-
-#: ../libempathy/empathy-tp-file.c:410
-msgid "Error while trying to transfer the file"
-msgstr "Erreur lors du téléchargement du fichier"
-
-#: ../libempathy/empathy-tp-file.c:413
-msgid "The other participant is unable to transfer the file"
-msgstr "Le correspondant n'est pas capable de transférer le fichier"
-
-#: ../libempathy/empathy-tp-file.c:416
-msgid "Unknown reason"
-msgstr "Raison inconnue"
-
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:252
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:254
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:257
 msgid "Away"
 msgstr "Absent"
 
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:259
 msgid "Hidden"
 msgstr "Masqué"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:262
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: ../libempathy/empathy-time.c:137
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "il y a %d seconde"
-msgstr[1] "il y a %d secondes"
-
-#: ../libempathy/empathy-time.c:142
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "il y a %d minute"
-msgstr[1] "il y a %d minutes"
-
-#: ../libempathy/empathy-time.c:147
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "il y a %d heure"
-msgstr[1] "il y a %d heures"
-
-#: ../libempathy/empathy-time.c:152
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "il y a %d jour"
-msgstr[1] "il y a %d jours"
-
-#: ../libempathy/empathy-time.c:157
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "il y a %d semaine"
-msgstr[1] "il y a %d semaines"
-
-#: ../libempathy/empathy-time.c:162
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "il y a %d mois"
-msgstr[1] "il y a %d mois"
-
-#: ../libempathy/empathy-time.c:167
-msgid "in the future"
-msgstr "dans le futur"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:419
+#: ../libempathy-gtk/empathy-account-chooser.c:326
 msgid "All"
 msgstr "Toutes"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:347
 #, 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 "Avancé"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-aim.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>Avancé</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 "Oublier le mot de passe et effacer la zone."
+
+#: ../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
 msgid "Pass_word:"
 msgstr "_Mot de passe :"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
 msgid "Screen _Name:"
 msgstr "_Nom de l'écran :"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.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
 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
+#: ../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
 msgid "_Server:"
 msgstr "_Serveur :"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
 msgid "Login I_D:"
 msgstr "I_dentifiant de connexion :"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
 msgid "ICQ _UIN:"
 msgstr "_UIN ICQ :"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
 msgid "_Charset:"
 msgstr "Jeu de _caractères :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:245
 msgid "New Network"
 msgstr "Nouveau réseau"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
+msgid "<b>Network</b>"
+msgstr "<b>Réseau</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
+msgid "<b>Servers</b>"
+msgstr "<b>Serveurs</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
 msgid "Charset:"
 msgstr "Jeu de caractères :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
+msgid "Create a new IRC network"
+msgstr "Crée un nouveau réseau IRC"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
+msgid "Edit the selected IRC network"
+msgstr "Modifie le réseau IRC sélectionné"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
 msgid "Network"
 msgstr "Réseau"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
 msgid "Network:"
 msgstr "Réseau :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
 msgid "Nickname:"
 msgstr "Pseudonyme :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
 msgid "Quit message:"
 msgstr "Message de départ :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
 msgid "Real name:"
 msgstr "Nom réel :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Servers"
-msgstr "Serveurs"
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
+msgid "Remove the selected IRC network"
+msgstr "Supprime le réseau IRC sélectionné"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-msgid "Override server settings"
-msgstr "Outrepasser les paramètres du serveur"
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
+msgid "<b>Override server settings</b>"
+msgstr "<b>Outrepasser les paramètres du serveur</b>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
 msgid "Pri_ority:"
 msgstr "Pri_orité :"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
 msgid "Reso_urce:"
 msgstr "Resso_urce :"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
 msgid "Use old SS_L"
 msgstr "Utiliser l'ancien SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
 msgid "_Encryption required (TLS/SSL)"
 msgstr "Chiffr_ement requis (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ignorer les erreurs de certificat SSL"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
 msgid "_Email:"
 msgstr "_Adresse électronique :"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
 msgid "_First Name:"
 msgstr "_Prénom :"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
 msgid "_Jabber ID:"
 msgstr "_Identifiant Jabber :"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
 msgid "_Last Name:"
 msgstr "_Nom :"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
+#: ../src/empathy-chatrooms-window.glade.h:8
 msgid "_Nickname:"
 msgstr "_Pseudonyme :"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
 msgid "_Published Name:"
 msgstr "Nom _publié :"
 
 #. 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
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
 msgid "Discover STUN"
 msgstr "Découvrir STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
 msgid "STUN Server:"
 msgstr "Serveur STUN :"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
 msgid "STUN port:"
 msgstr "Port STUN :"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
 msgid "_Username:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
 msgid "Use _Yahoo Japan"
 msgstr "Utiliser _Yahoo Japan"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
 msgid "Yahoo I_D:"
 msgstr "I_dentifiant Yahoo :"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ignorer les invitations à des réunions ou à des salles de discussion"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
 msgid "_Room List locale:"
 msgstr "Locale de la liste des _salles :"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:462
+#: ../libempathy-gtk/empathy-avatar-chooser.c:537
 msgid "Couldn't convert image"
 msgstr "Impossible de convertir l'image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+#: ../libempathy-gtk/empathy-avatar-chooser.c:463
 msgid "None of the accepted image formats is supported on your system"
 msgstr ""
 "Aucun des formats d'image acceptés n'est pris en charge par votre système"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:956
 msgid "Select Your Avatar Image"
 msgstr "Sélection de l'image d'avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:959
 msgid "No Image"
 msgstr "Aucune image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "Images"
 msgstr "Images"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:294
 msgid "Click to enlarge"
 msgstr "Cliquer pour agrandir"
 
-#: ../libempathy-gtk/empathy-chat.c:186
-msgid "Failed to reconnect this chat"
-msgstr "Échec de reconnexion à cette discussion"
-
-#: ../libempathy-gtk/empathy-chat.c:404
-msgid "Unsupported command"
-msgstr "Commande non prise en charge"
-
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:507
 msgid "offline"
 msgstr "déconnecté"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:510
 msgid "invalid contact"
 msgstr "contact non valide"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:513
 msgid "permission denied"
 msgstr "permission refusée"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:516
 msgid "too long message"
 msgstr "message trop long"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:519
 msgid "not implemented"
 msgstr "non implémenté"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:522
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:526
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erreur à l'envoi du message « %s » : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:556
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Sujet défini : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:558
 msgid "No topic defined"
 msgstr "Pas de sujet défini"
 
-#: ../libempathy-gtk/empathy-chat.c:959
-msgid "(No Suggestions)"
-msgstr "(aucune suggestion)"
-
-#: ../libempathy-gtk/empathy-chat.c:1013
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Insert Smiley"
 msgstr "Insérer une frimousse"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1031
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
+#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-ui-utils.c:1538
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
-msgid "_Spelling Suggestions"
-msgstr "_Suggestions orthographiques"
+#: ../libempathy-gtk/empathy-chat.c:1025
+msgid "_Check Word Spelling..."
+msgstr "_Vérifier l'orthographe..."
 
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1131
 #, c-format
-msgid "%s has disconnected"
-msgstr "%s s'est déconnecté"
-
-#: ../libempathy-gtk/empathy-chat.c:1184
-#, c-format
-msgid "%s was kicked by %s"
-msgstr "%s a été expulsé par %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1187
-#, c-format
-msgid "%s was kicked"
-msgstr "%s a été expulsé"
-
-#: ../libempathy-gtk/empathy-chat.c:1192
-#, c-format
-msgid "%s was banned by %s"
-msgstr "%s a été banni par %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1195
-#, c-format
-msgid "%s was banned"
-msgstr "%s a été banni"
+msgid "%s has joined the room"
+msgstr "%s a rejoint la salle"
 
-#: ../libempathy-gtk/empathy-chat.c:1199
+#: ../libempathy-gtk/empathy-chat.c:1134
 #, c-format
 msgid "%s has left the room"
 msgstr "%s a quitté la salle"
 
-#. 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:1208
-#, c-format
-msgid " (%s)"
-msgstr " (%s)"
-
-#: ../libempathy-gtk/empathy-chat.c:1231
-#, c-format
-msgid "%s has joined the room"
-msgstr "%s a rejoint la salle"
-
-#: ../libempathy-gtk/empathy-chat.c:1364 ../src/empathy-call-window.c:1226
+#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: ../libempathy-gtk/empathy-chat.c:1793
+#: ../libempathy-gtk/empathy-chat.c:1644
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../libempathy-gtk/empathy-chat.c:1843
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:1694
+#: ../libempathy-gtk/empathy-log-window.c:505
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
-msgid "Topic:"
-msgstr "Sujet :"
+#: ../libempathy-gtk/empathy-chat.glade.h:1
+msgid "<b>Topic:</b>"
+msgstr "<b>Sujet :</b>"
+
+#: ../libempathy-gtk/empathy-chat.glade.h:2
+msgid "Group Chat"
+msgstr "Groupe de discussion"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-chat-text-view.c:340
 msgid "_Copy Link Address"
 msgstr "_Copier l'adresse du lien"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-chat-text-view.c:348
 msgid "_Open Link"
 msgstr "_Ouvrir le lien"
 
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:439
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:180
+msgid "Personal Information"
+msgstr "Informations personnelles"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:183
 msgid "Edit Contact Information"
 msgstr "Modifier les informations du contact"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
-msgid "Personal Information"
-msgstr "Informations personnelles"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:186
+msgid "Contact Information"
+msgstr "Informations du contact"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:267
+msgid "I would like to add you to my contact list."
+msgstr "Je voudrais vous ajouter à ma liste de contacts."
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:384
+#: ../libempathy-gtk/empathy-contact-dialogs.c:291
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
 msgid "Decide _Later"
 msgstr "Décider plus _tard"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
 msgid "Subscription Request"
 msgstr "Requête d'abonnement"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1249
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Voulez-vous réellement supprimer le groupe « %s » ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#: ../libempathy-gtk/empathy-contact-list-view.c:1251
 msgid "Removing group"
 msgstr "Suppression du groupe"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1424
-#: ../libempathy-gtk/empathy-contact-list-view.c:1502
+#: ../libempathy-gtk/empathy-contact-list-view.c:1298
+#: ../libempathy-gtk/empathy-contact-list-view.c:1377
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1454
+#: ../libempathy-gtk/empathy-contact-list-view.c:1328
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Voulez-vous réellement supprimer le contact « %s » ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1456
+#: ../libempathy-gtk/empathy-contact-list-view.c:1330
 msgid "Removing contact"
 msgstr "Suppression du contact"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:135
-#: ../src/empathy-main-window.ui.h:8
+#: ../libempathy-gtk/empathy-contact-list-view.c:1335
+msgid "Sorry, I don't want you in my contact list anymore."
+msgstr "Désolé, je ne te veux plus dans ma liste de contacts."
+
+#: ../libempathy-gtk/empathy-contact-menu.c:130
+#: ../src/empathy-main-window.glade.h:9
 msgid "_Chat"
 msgstr "Dis_cussion"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:166
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "Appel _audio"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:198
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "Appel _vidéo"
+#: ../libempathy-gtk/empathy-contact-menu.c:161
+#: ../src/empathy-call-window.glade.h:5
+msgid "_Call"
+msgstr "_Appeler"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
+#: ../libempathy-gtk/empathy-contact-menu.c:200
+#: ../src/empathy-main-window.glade.h:17
 msgid "_View Previous Conversations"
 msgstr "_Afficher les conversations précédentes"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:259
+#: ../libempathy-gtk/empathy-contact-menu.c:222
 msgid "Send file"
 msgstr "Envoyer un fichier"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:287
+#: ../libempathy-gtk/empathy-contact-menu.c:250
 msgid "Infor_mation"
 msgstr "Infor_mations"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:314
-#: ../src/empathy-main-window.ui.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:277
+#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:372
+#: ../libempathy-gtk/empathy-contact-menu.c:336
 msgid "Inviting to this room"
 msgstr "Inviter à ce salon"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:369
 msgid "_Invite to chatroom"
 msgstr "_Inviter à un salon de discussion"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
+#: ../libempathy-gtk/empathy-contact-selector.c:111
 msgid "Select a contact"
 msgstr "Sélectionner un contact"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:440
+#: ../libempathy-gtk/empathy-contact-widget.c:358
 msgid "Save Avatar"
 msgstr "Enregistrer l'avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:414
 msgid "Unable to save avatar"
 msgstr "Impossible d'enregistrer l'avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:979
+#: ../libempathy-gtk/empathy-contact-widget.c:895
 msgid "Select"
 msgstr "Sélectionner"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:903
+#: ../libempathy-gtk/empathy-contact-widget.c:904
+#: ../src/empathy-main-window.c:991
 msgid "Group"
 msgstr "Groupe"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1239
-msgid "Country ISO Code:"
-msgstr "Code ISO du pays :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1241
-msgid "Country:"
-msgstr "Pays :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1243
-msgid "State:"
-msgstr "État :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1245
-msgid "City:"
-msgstr "Ville :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1247
-msgid "Area:"
-msgstr "Région :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1249
-msgid "Postal Code:"
-msgstr "Code postal :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1251
-msgid "Street:"
-msgstr "Rue :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1253
-msgid "Building:"
-msgstr "Bâtiment :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1255
-msgid "Floor:"
-msgstr "Étage :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1257
-msgid "Room:"
-msgstr "Salle :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1259
-msgid "Text:"
-msgstr "Texte :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
-msgid "Description:"
-msgstr "Description :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
-msgid "URI:"
-msgstr "URI :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
-msgid "Accuracy Level:"
-msgstr "Niveau de précision :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
-msgid "Error:"
-msgstr "Erreur :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
-msgid "Vertical Error (meters):"
-msgstr "Erreur verticale (mètres) :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
-msgid "Horizontal Error (meters):"
-msgstr "Erreur horizontale (mètres) :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
-msgid "Speed:"
-msgstr "Vitesse :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
-msgid "Bearing:"
-msgstr "Relèvement :"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
+msgid "<b>Client Information</b>"
+msgstr "<b>Informations du client</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
-msgid "Climb Speed:"
-msgstr "Vitesse ascensionnelle :"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
+msgid "<b>Contact Details</b>"
+msgstr "<b>Détails sur le contact</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
-msgid "Last Updated on:"
-msgstr "Dernière mise à jour le :"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
+msgid "<b>Contact</b>"
+msgstr "<b>Contact</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
-msgid "Longitude:"
-msgstr "Longitude :"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
+msgid "<b>Groups</b>"
+msgstr "<b>Groupes</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
-msgid "Latitude:"
-msgstr "Latitude :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
-msgid "Altitude:"
-msgstr "Altitude :"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1332
-msgid "<b>Location</b>"
-msgstr "<b>Emplacement</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
-msgid "<b>Location</b>, "
-msgstr "<b>Emplacement</b>, "
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1395
-msgid "%B %e, %Y at %R UTC"
-msgstr "%e %B %Y à %R UTC"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Emplacement</b> le (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
+#: ../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
 msgid "Account:"
 msgstr "Compte :"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
 msgid "Alias:"
 msgstr "Alias :"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
 msgid "Birthday:"
 msgstr "Anniversaire :"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client Information"
-msgstr "Informations du client"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
 msgid "Client:"
 msgstr "Client :"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:886
-msgid "Contact"
-msgstr "Contact"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
+msgid "Contact information"
+msgstr "Informations sur le contact"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "Contact Details"
-msgstr "Détails sur le contact"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
 msgid "Email:"
 msgstr "Adresse électronique :"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
 msgid "Fullname:"
 msgstr "Nom complet :"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Groups"
-msgstr "Groupes"
-
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
 msgid "Identifier:"
 msgstr "Identifiant :"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
 msgid "Information requested..."
 msgstr "Demande des informations en cours..."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
 msgid "OS:"
 msgstr "OS :"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../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."
@@ -1209,204 +909,181 @@ msgstr ""
 "Sélectionnez les groupes auxquels ce contact appartiendra ; vous pouvez "
 "sélectionner plus d'un groupe ou aucun groupe."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
 msgid "Version:"
 msgstr "Version :"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
 msgid "Web site:"
 msgstr "Site Web :"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
 msgid "_Add Group"
 msgstr "_Ajouter un groupe"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
 msgid "new server"
 msgstr "nouveau serveur"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
 msgid "Server"
 msgstr "Serveur"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../libempathy-gtk/empathy-log-window.c:498
+#: ../src/empathy-import-dialog.c:277
 msgid "Account"
 msgstr "Compte"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:515
 msgid "Date"
 msgstr "Date"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.glade.h:2
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.glade.h:3
 msgid "Previous Conversations"
 msgstr "Conversations précédentes"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.glade.h:5
 msgid "Search"
 msgstr "Rechercher"
 
 # Search est le titre de l'onglet, et est suivi de _For placé devant la zone de
 # texte à rechercher, j'ai donc essayé d'adapter au mieux.
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.glade.h:7
 msgid "_For:"
 msgstr "ce _terme :"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
 msgid "C_all"
 msgstr "_Appeler"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
 msgid "C_hat"
 msgstr "_Discuter"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
 msgid "Contact ID:"
 msgstr "Identifiant du contact :"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
 msgid "New Conversation"
 msgstr "Nouvelle conversation"
 
-#. COL_STATE_ICON_NAME
-#. COL_STATE
-#. COL_STATUS_TEXT
-#. COL_DISPLAY_MARKUP
-#. COL_STATUS_CUSTOMISABLE
-#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-msgid "Custom Message..."
-msgstr "Message personnalisé..."
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:685
+msgid "Custom messages..."
+msgstr "Messages personnalisés..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
-msgid "Edit Custom Messages..."
-msgstr "Modifier les messages personnalisés..."
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
+msgid "Custom message"
+msgstr "Message personnalisé"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
-msgid "Click to remove this status as a favorite"
-msgstr "Cliquez pour enlever cet état des favoris"
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
+msgid "Message:"
+msgstr "Message :"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
-msgid "Click to make this status a favorite"
-msgstr "Cliquez pour ajouter cet état aux favoris"
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
+msgid "Save message"
+msgstr "Enregistrer le message"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
-msgid "Set status"
-msgstr "Changer l'état"
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
+msgid "Status:"
+msgstr "État :"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
-msgid "Set your presence and current status"
-msgstr "Définit votre état de présence actuel"
+#: ../libempathy-gtk/empathy-spell-dialog.c:88
+msgid "Word"
+msgstr "Mot"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
-msgid "Custom messages..."
-msgstr "Messages personnalisés..."
+#: ../libempathy-gtk/empathy-spell-dialog.c:265
+msgid "Suggestions for the word"
+msgstr "Suggestions pour le mot"
+
+#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
+msgid "Spell Checker"
+msgstr "Correcteur orthographique"
+
+#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
+msgid "Suggestions for the word:"
+msgstr "Suggestions pour le mot :"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:60
+msgid "Classic"
+msgstr "Classique"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:61
+msgid "Simple"
+msgstr "Simple"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:62
+msgid "Clean"
+msgstr "Propre"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:63
+msgid "Blue"
+msgstr "Bleu"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1385
+msgid "Unable to open URI"
+msgstr "Impossible d'ouvrir l'URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a file"
+msgstr "Sélectionner un fichier"
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-ui-utils.c:1566
 msgid "Received an instant message"
 msgstr "Réception d'un message instantané"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-ui-utils.c:1568
 msgid "Sent an instant message"
 msgstr "Envoi d'un message instantané"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-ui-utils.c:1570
 msgid "Incoming chat request"
 msgstr "Réception d'une demande de discussion"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-ui-utils.c:1572
 msgid "Contact connected"
 msgstr "Contact connecté"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-ui-utils.c:1574
 msgid "Contact disconnected"
 msgstr "Contact déconnecté"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-ui-utils.c:1576
 msgid "Connected to server"
 msgstr "Connecté au serveur"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-ui-utils.c:1578
 msgid "Disconnected from server"
 msgstr "Déconnecté du serveur"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-ui-utils.c:1580
 msgid "Incoming voice call"
 msgstr "Appel vocal entrant"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-ui-utils.c:1582
 msgid "Outgoing voice call"
 msgstr "Appel vocal sortant"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-ui-utils.c:1584
 msgid "Voice call ended"
 msgstr "Appel vocal terminé"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
-msgid "Enter Custom Message"
-msgstr "Saisissez un message personnalisé"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
-msgid "Edit Custom Messages"
-msgstr "Édition des messages personnalisés"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "Ajouter _nouveau message prédéfini"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "Messages prédéfinis enregistrés"
-
-#: ../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 "Classique"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:68
-msgid "Simple"
-msgstr "Simple"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:69
-msgid "Clean"
-msgstr "Propre"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Blue"
-msgstr "Bleu"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1377
-msgid "Unable to open URI"
-msgstr "Impossible d'ouvrir l'URI"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1467
-msgid "Select a file"
-msgstr "Sélectionner un fichier"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1525
-msgid "Select a destination"
-msgstr "Sélectionner une destination"
-
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Locale actuelle"
@@ -1595,7 +1272,7 @@ msgid "Megaphone"
 msgstr "Mégaphone"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:417
 msgid "Talk!"
 msgstr "Parlez !"
 
@@ -1609,15 +1286,15 @@ msgid "_Information"
 msgstr "_Informations"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.glade.h:15
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../megaphone/src/megaphone-applet.c:168
+#: ../megaphone/src/megaphone-applet.c:255
 msgid "Please configure a contact."
 msgstr "Veuillez configurer un contact."
 
-#: ../megaphone/src/megaphone-applet.c:258
+#: ../megaphone/src/megaphone-applet.c:348
 msgid "Select contact..."
 msgstr "Sélectionner le contact..."
 
@@ -1630,23 +1307,23 @@ msgstr "Présence"
 msgid "Set your own presence"
 msgstr "Définissez votre présence"
 
-#: ../src/empathy.c:506
+#: ../src/empathy.c:426
 msgid "Don't connect on startup"
 msgstr "Ne pas se connecter au démarrage"
 
-#: ../src/empathy.c:510
+#: ../src/empathy.c:430
 msgid "Don't show the contact list on startup"
 msgstr "Ne pas afficher la liste des contacts au démarrage"
 
-#: ../src/empathy.c:514
+#: ../src/empathy.c:434
 msgid "Show the accounts dialog"
 msgstr "Afficher la boîte de dialogue des comptes"
 
-#: ../src/empathy.c:526
+#: ../src/empathy.c:446
 msgid "- Empathy Instant Messenger"
 msgstr "- Messagerie instantanée Empathy"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../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 "
@@ -1658,7 +1335,7 @@ msgstr ""
 "publiée par la Free Software Foundation ; version 2 de la licence ou (à "
 "votre discrétion) toute version ultérieure."
 
-#: ../src/empathy-about-dialog.c:87
+#: ../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 "
@@ -1670,7 +1347,7 @@ msgstr ""
 "D'ADÉQUATION À UN BESOIN PARTICULIER. Pour plus de détails, voir la Licence "
 "Publique Générale GNU."
 
-#: ../src/empathy-about-dialog.c:91
+#: ../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 "
@@ -1680,11 +1357,11 @@ msgstr ""
 "Empathy ; si ce n'est pas le cas, écrivez à la Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:120
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un client de messagerie instantanée pour GNOME"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:126
 msgid "translator-credits"
 msgstr ""
 "Frédéric Brin <duckx@mezimail.com>\n"
@@ -1702,21 +1379,22 @@ msgstr ""
 "Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
 "Christophe Benz <christophe.benz@gmail.com>"
 
-#: ../src/empathy-accounts-dialog.c:392
+#: ../src/empathy-accounts-dialog.c:391
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.c:401
+#: ../src/empathy-accounts-dialog.glade.h:4
 msgid "Accounts"
 msgstr "Comptes"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#: ../src/empathy-accounts-dialog.c:833
 #, c-format
 msgid "New %s account"
 msgstr "Nouveau compte %s"
 
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-accounts-dialog.c:943
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1725,7 +1403,7 @@ msgstr ""
 "Vous êtes sur le point de supprimer votre compte %s !\n"
 "Voulez-vous vraiment continuer ?"
 
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:949
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1739,31 +1417,31 @@ msgstr ""
 "Si vous décidez de recréer ce compte plus tard, elles seront toujours "
 "disponibles."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "Ajouter un compte"
+#: ../src/empathy-accounts-dialog.glade.h:1
+msgid "<b>New Account</b>"
+msgstr "<b>Nouveau compte</b>"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.glade.h:2
+msgid "<b>No protocol installed</b>"
+msgstr "<b>Aucun protocole installé</b>"
+
+#: ../src/empathy-accounts-dialog.glade.h:3
+msgid "<b>Settings</b>"
+msgstr "<b>Paramètres</b>"
+
+#: ../src/empathy-accounts-dialog.glade.h:5
 msgid "Cr_eate"
 msgstr "C_réer"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/empathy-accounts-dialog.glade.h:6
+msgid "I already have an account I want to use"
+msgstr "Je possède déjà un compte que je souhaite utiliser"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.glade.h:7
 msgid "Import Accounts..."
 msgstr "Importer des comptes..."
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "Aucun protocole installé"
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "Paramètres"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../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."
@@ -1771,195 +1449,273 @@ msgstr ""
 "Pour ajouter un nouveau compte, vous devez d'abord installer le moteur "
 "correspondant à chaque protocole que vous voulez utiliser."
 
-#: ../src/empathy-accounts-dialog.ui.h:9
+#: ../src/empathy-accounts-dialog.glade.h:9
 msgid "Type:"
 msgstr "Type :"
 
-#: ../src/empathy-accounts-dialog.ui.h:10
-msgid "_Add..."
-msgstr "A_jouter..."
-
-#: ../src/empathy-accounts-dialog.ui.h:11
-msgid "_Create a new account"
-msgstr "_Créer un nouveau compte"
-
-#: ../src/empathy-accounts-dialog.ui.h:12
-msgid "_Reuse an existing account"
-msgstr "Ré_utiliser un compte existant"
-
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-call-window.c:258
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:258
 msgid "Brightness"
 msgstr "Luminosité"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:258
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:290
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-call-window.c:662
-msgid "Connecting..."
-msgstr "Connexion en cours ..."
-
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:366
 msgid "_Sidebar"
 msgstr "Barre _latérale"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:384
 msgid "Dialpad"
 msgstr "Numéroteur"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:390
 msgid "Audio input"
 msgstr "Entrée audio"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:394
 msgid "Video input"
 msgstr "Entrée vidéo"
 
-#: ../src/empathy-call-window.c:836
-#, c-format
-msgid "Call with %s"
-msgstr "Conversation avec %s"
-
-#: ../src/empathy-call-window.c:905
-msgid "Call"
-msgstr "Appeler"
+#: ../src/empathy-call-window.c:407
+msgid "Connecting..."
+msgstr "Connexion en cours ..."
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1336
+#: ../src/empathy-call-window.c:572
 #, c-format
-msgid "Connected — %d:%02dm"
-msgstr "Connecté — %d:%02dm"
+msgid "Connected -- %d:%02dm"
+msgstr "Connecté -- %d:%02dm"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.glade.h:1
 msgid "Hang up"
 msgstr "Raccrocher"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Redial"
-msgstr "Rappeler"
-
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.glade.h:2
 msgid "Send Audio"
 msgstr "Envoyer le son"
 
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.glade.h:3
 msgid "Send video"
 msgstr "Envoyer la vidéo"
 
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.glade.h:4
 msgid "Video preview"
 msgstr "Aperçu de la vidéo"
 
-#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Appeler"
-
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-call-window.glade.h:6
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:313
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Conversations (%d)"
 
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:418
+msgid "Topic:"
+msgstr "Sujet :"
+
+#: ../src/empathy-chat-window.c:423
 msgid "Typing a message."
 msgstr "Saisie d'un message."
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
+#, c-format
+msgid "New message from %s"
+msgstr "Nouveau message de %s"
+
+#: ../src/empathy-chat-window.glade.h:1
+msgid "C_lear"
+msgstr "_Nettoyer"
+
+#: ../src/empathy-chat-window.glade.h:2
+msgid "Chat"
+msgstr "Discuter"
+
+#: ../src/empathy-chat-window.glade.h:3
+msgid "Insert _Smiley"
+msgstr "Insérer une _frimousse"
+
+#: ../src/empathy-chat-window.glade.h:4
+msgid "Invitation _message:"
+msgstr "_Message d'invitation :"
+
+#: ../src/empathy-chat-window.glade.h:5
+msgid "Invite"
+msgstr "Inviter"
+
+#: ../src/empathy-chat-window.glade.h:6
+msgid "Move Tab _Left"
+msgstr "Déplacer l'onglet à _gauche"
+
+#: ../src/empathy-chat-window.glade.h:7
+msgid "Move Tab _Right"
+msgstr "Déplacer l'onglet à _droite"
+
+#: ../src/empathy-chat-window.glade.h:8
+msgid "Select who would you like to invite:"
+msgstr "Sélectionnez la personne à inviter :"
+
+#: ../src/empathy-chat-window.glade.h:9
+msgid "You have been invited to join a chat conference."
+msgstr "Vous avez été invité(e) à joindre une salle de discussion"
+
+#: ../src/empathy-chat-window.glade.h:10
+msgid "_Contact"
+msgstr "_Contact"
+
+#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+msgid "_Contents"
+msgstr "_Sommaire"
+
+#: ../src/empathy-chat-window.glade.h:12
+msgid "_Conversation"
+msgstr "_Conversation"
+
+#: ../src/empathy-chat-window.glade.h:13
+msgid "_Detach Tab"
+msgstr "_Détacher l'onglet"
+
+#: ../src/empathy-chat-window.glade.h:15
+msgid "_Favorite Chatroom"
+msgstr "Salles de discussion _favorites"
+
+#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+msgid "_Help"
+msgstr "Aid_e"
+
+#: ../src/empathy-chat-window.glade.h:17
+msgid "_Next Tab"
+msgstr "Onglet _suivant"
+
+#: ../src/empathy-chat-window.glade.h:18
+msgid "_Previous Tab"
+msgstr "Onglet _précédent"
+
+#: ../src/empathy-chat-window.glade.h:19
+msgid "_Tabs"
+msgstr "_Onglets"
+
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:280
 msgid "Room"
 msgstr "Salle"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:289
 msgid "Auto-Connect"
 msgstr "Connexion automatique"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.glade.h:2
+msgid "Edit Favorite Room"
+msgstr "Modifier les salles favorites"
+
+#: ../src/empathy-chatrooms-window.glade.h:3
+msgid "Join room on start_up"
+msgstr "Joindre la salle au _démarrage"
+
+#: ../src/empathy-chatrooms-window.glade.h:4
+msgid "Join this chat room when Empathy starts and you are connected"
+msgstr ""
+"Joindre cette salle de discussion quand Empathy démarre et que vous êtes "
+"connecté"
+
+#: ../src/empathy-chatrooms-window.glade.h:5
 msgid "Manage Favorite Rooms"
 msgstr "Gérer les salles favorites"
 
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-chatrooms-window.glade.h:6
+msgid "N_ame:"
+msgstr "_Nom :"
+
+#: ../src/empathy-chatrooms-window.glade.h:7
+msgid "S_erver:"
+msgstr "_Serveur :"
+
+#: ../src/empathy-chatrooms-window.glade.h:9
+#: ../src/empathy-new-chatroom-dialog.glade.h:9
+msgid "_Room:"
+msgstr "Sall_e :"
+
+#: ../src/empathy-event-manager.c:372
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:375
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s vous appelle, souhaitez-vous répondre ?"
 
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:382
 msgid "_Reject"
 msgstr "Re_fuser"
 
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:388
 msgid "_Answer"
 msgstr "_Répondre"
 
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:511
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Appel entrant de %s"
 
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:559
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s vous invite"
 
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:565
 msgid "An external application will be started to handle it."
 msgstr "Une application externe sera lancée pour la gérer."
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:570
 msgid "You don't have the needed external application to handle it."
 msgstr "Vous ne disposez pas de l'application externe nécessaire."
 
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:692
 msgid "Room invitation"
 msgstr "Invitation dans une salle"
 
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:695
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vous invite à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:645
+#. Decline button
+#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: ../src/empathy-event-manager.c:650
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:708
 msgid "_Join"
 msgstr "_Joindre"
 
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:738
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vous a invité à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:860
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transfert de fichier entrant de %s"
 
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:954
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Demande d'abonnement de %s"
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:958
 #, c-format
 msgid ""
 "\n"
@@ -1968,143 +1724,173 @@ msgstr ""
 "\n"
 "Message : %s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:935
-#, c-format
-msgid "%s is now offline."
-msgstr "%s s'est déconnecté."
-
-#. someone is logging in
-#: ../src/empathy-event-manager.c:951
-#, c-format
-msgid "%s is now online."
-msgstr "%s s'est connecté."
-
-#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:113
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:104
+#: ../src/empathy-ft-manager.c:115
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Inconnu"
+#: ../src/empathy-ft-manager.c:164
+msgid "No reason was specified"
+msgstr "Aucune raison n'a été indiquée"
 
-#: ../src/empathy-ft-manager.c:275
-#, c-format
-msgid "%s of %s at %s/s"
-msgstr "%s sur %s à %s/s"
+#: ../src/empathy-ft-manager.c:166
+msgid "The change in state was requested"
+msgstr "Le changement d'état a été demandé"
 
-#: ../src/empathy-ft-manager.c:276
-#, c-format
-msgid "%s of %s"
-msgstr "%s sur %s"
+#: ../src/empathy-ft-manager.c:168
+msgid "You canceled the file transfer"
+msgstr "Vous avez annulé le transfert de fichiers"
+
+#: ../src/empathy-ft-manager.c:170
+msgid "The other participant canceled the file transfer"
+msgstr "Le correspondant a annulé le transfert de fichiers"
+
+#: ../src/empathy-ft-manager.c:172
+msgid "Error while trying to transfer the file"
+msgstr "Erreur lors du téléchargement du fichier"
+
+#: ../src/empathy-ft-manager.c:174
+msgid "The other participant is unable to transfer the file"
+msgstr "Le correspondant n'est pas capable de transférer le fichier"
+
+#: ../src/empathy-ft-manager.c:176
+msgid "Unknown reason"
+msgstr "Raison inconnue"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:224
 #, c-format
 msgid "Receiving \"%s\" from %s"
-msgstr "Réception de « %s » de la part de %s"
+msgstr "Réception de « %s » de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:227
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Envoi de « %s » à %s"
 
-#. translators: first %s is filename, second %s
-#. * is the contact name
-#: ../src/empathy-ft-manager.c:340
-#, c-format
-msgid "Error receiving \"%s\" from %s"
-msgstr "Erreur lors de la réception de « %s » de la part de %s"
-
-#: ../src/empathy-ft-manager.c:343
-msgid "Error receiving a file"
-msgstr "Erreur de réception de fichier"
+#: ../src/empathy-ft-manager.c:237
+msgctxt "file size"
+msgid "Unknown"
+msgstr "Inconnue"
 
-#: ../src/empathy-ft-manager.c:348
+#. translators: first %s is the transferred size, second %s is
+#. * the total file size
+#: ../src/empathy-ft-manager.c:245
 #, c-format
-msgid "Error sending \"%s\" to %s"
-msgstr "Erreur lors de l'envoi de « %s » à %s"
+msgid "%s of %s"
+msgstr "%s sur %s"
 
-#: ../src/empathy-ft-manager.c:351
-msgid "Error sending a file"
-msgstr "Erreur d'envoi de fichier"
+#: ../src/empathy-ft-manager.c:252
+msgid "Waiting the other participant's response"
+msgstr "Attente de la réponse du correspondant"
 
-#. translators: first %s is filename, second %s
-#. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:262
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "« %s » reçu de %s"
 
-#. translators: first %s is filename, second %s
-#. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "« %s » envoyé à %s"
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:271
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
-msgid "Waiting for the other participant's response"
-msgstr "Attente de la réponse du correspondant"
+#: ../src/empathy-ft-manager.c:280
+#, c-format
+msgid "\"%s\" receiving from %s"
+msgstr "Réception de « %s » de %s"
 
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:286
 #, c-format
-msgid "Checking integrity of \"%s\""
-msgstr "Vérification de l'intégrité de « %s »"
+msgid "\"%s\" sending to %s"
+msgstr "Envoi de « %s » à %s"
 
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:289
 #, c-format
-msgid "Hashing \"%s\""
-msgstr "Création de la somme de contrôle pour « %s »"
+msgid "File transfer canceled: %s"
+msgstr "Transfert de fichier annulé : %s"
+
+# remaining time
+#: ../src/empathy-ft-manager.c:304
+msgctxt "remaining time"
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../src/empathy-ft-manager.c:364
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Inconnu"
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:700
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:712
 msgid "File"
 msgstr "Fichier"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:734
 msgid "Remaining"
 msgstr "Restant"
 
-#: ../src/empathy-ft-manager.ui.h:1
-msgid "File Transfers"
+#: ../src/empathy-ft-manager.c:885
+msgid "Cannot save file to this location"
+msgstr "Impossible d'enregistrer ce fichier à cet emplacement"
+
+#: ../src/empathy-ft-manager.c:931
+msgid "Save file as..."
+msgstr "Enregistrer le fichier sous..."
+
+#: ../src/empathy-ft-manager.c:1001
+msgid "unknown size"
+msgstr "taille inconnue"
+
+#: ../src/empathy-ft-manager.c:1007
+#, c-format
+msgid "%s would like to send you a file"
+msgstr "%s souhaite vous envoyer un fichier"
+
+#: ../src/empathy-ft-manager.c:1012
+#, c-format
+msgid "Do you want to accept the file \"%s\" (%s)?"
+msgstr "Voulez-vous accepter le fichier « %s » (%s) ?"
+
+#. Accept button
+#: ../src/empathy-ft-manager.c:1030
+msgid "_Accept"
+msgstr "_Accepter"
+
+#: ../src/empathy-ft-manager.glade.h:1
+msgid "File transfers"
 msgstr "Transferts de fichiers"
 
-#: ../src/empathy-ft-manager.ui.h:2
+#: ../src/empathy-ft-manager.glade.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Enlever les transferts terminés, annulés et non réussis de la liste"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-dialog.c:255
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-dialog.c:264
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-dialog.c:290
 msgid "Source"
 msgstr "Source"
 
-#: ../src/empathy-import-dialog.c:392
+#: ../src/empathy-import-dialog.c:378
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -2112,196 +1898,138 @@ msgstr ""
 "Aucun compte à importer n'a été trouvé. Empathy n'est actuellement capable "
 "d'importer des comptes que de Pidgin."
 
-#: ../src/empathy-import-dialog.ui.h:1
+#: ../src/empathy-import-dialog.glade.h:1
 msgid "Import Accounts"
 msgstr "Importer des comptes"
 
-#: ../src/empathy-main-window.c:396
-msgid "_Edit account"
-msgstr "Mo_difier le compte"
-
-#: ../src/empathy-main-window.c:499
+#: ../src/empathy-main-window.c:391
 msgid "No error specified"
 msgstr "Aucune erreur indiquée"
 
-#: ../src/empathy-main-window.c:502
+#: ../src/empathy-main-window.c:394
 msgid "Network error"
 msgstr "Erreur réseau"
 
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:397
 msgid "Authentication failed"
 msgstr "L'authentification a échoué"
 
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:400
 msgid "Encryption error"
 msgstr "Erreur de chiffrement"
 
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:403
 msgid "Name in use"
 msgstr "Nom déjà utilisé"
 
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:406
 msgid "Certificate not provided"
 msgstr "Certificat non fourni"
 
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:409
 msgid "Certificate untrusted"
 msgstr "Certificat non validé"
 
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:412
 msgid "Certificate expired"
 msgstr "Le certificat a expiré"
 
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:415
 msgid "Certificate not activated"
 msgstr "Certificat non activé"
 
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:418
 msgid "Certificate hostname mismatch"
 msgstr "Le nom de l'hôte du certificat ne correspond pas"
 
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:421
 msgid "Certificate fingerprint mismatch"
 msgstr "L'empreinte du certificat ne correspond pas"
 
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:424
 msgid "Certificate self-signed"
 msgstr "Certificat auto-signé"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:427
 msgid "Certificate error"
 msgstr "Erreur de certificat"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:430
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../src/empathy-main-window.c:1218
+#: ../src/empathy-main-window.c:594
 msgid "Show and edit accounts"
 msgstr "Afficher et modifier les comptes"
 
-#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-main-window.c:974
+msgid "Contact"
+msgstr "Contact"
+
+#: ../src/empathy-main-window.c:1176
+msgid "_Edit account"
+msgstr "Mo_difier le compte"
+
+#: ../src/empathy-main-window.glade.h:1
 msgid "Contact List"
 msgstr "Liste des contacts"
 
-#: ../src/empathy-main-window.ui.h:2
-msgid "Contacts on a _Map"
-msgstr "Contacts sur une _carte"
-
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.glade.h:2
 msgid "Context"
 msgstr "Contexte"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.glade.h:3
 msgid "Join _Favorites"
 msgstr "Joindre les _favoris"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.glade.h:4
+msgid "Join _New..."
+msgstr "Rejoindre _nouveau"
+
+#: ../src/empathy-main-window.glade.h:5
 msgid "Manage Favorites"
 msgstr "Gérer les favoris"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.glade.h:6
+msgid "Show _Offline Contacts"
+msgstr "Afficher les contacts _déconnectés"
+
+#: ../src/empathy-main-window.glade.h:7
 msgid "_Accounts"
 msgstr "_Comptes"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.glade.h:8
 msgid "_Add Contact..."
 msgstr "A_jouter un contact..."
 
-#: ../src/empathy-main-window.ui.h:9
-msgid "_Contents"
-msgstr "_Sommaire"
-
-#: ../src/empathy-main-window.ui.h:10
-msgid "_Debug"
-msgstr "_Débogage"
-
-#: ../src/empathy-main-window.ui.h:12
-msgid "_File Transfers"
-msgstr "Transferts de _fichiers"
-
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Help"
-msgstr "Aid_e"
-
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Join..."
-msgstr "_Joindre..."
-
-#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
 msgid "_New Conversation..."
 msgstr "_Nouvelle conversation..."
 
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Offline Contacts"
-msgstr "Contacts _déconnectés"
-
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.glade.h:14
 msgid "_Personal Information"
 msgstr "_Informations personnelles"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Previous Conversations"
-msgstr "Conversations _précédentes"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.glade.h:16
 msgid "_Room"
 msgstr "_Salle"
 
-#: ../src/empathy-new-chatroom-dialog.c:331
-msgid "Chat Room"
-msgstr "Salle de discussion"
+#: ../src/empathy-new-chatroom-dialog.c:291
+msgid "Chat Rooms"
+msgstr "Salles de discussion"
 
-#: ../src/empathy-new-chatroom-dialog.c:347
-msgid "Members"
-msgstr "Membres"
+#: ../src/empathy-new-chatroom-dialog.glade.h:2
+msgid "Browse:"
+msgstr "Parcourir :"
 
-#: ../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"
-"Invitation nécessaire : %s\n"
-"Mot de passe nécessaire : %s\n"
-"Membres : %s"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "Oui"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "No"
-msgstr "Non"
-
-#: ../src/empathy-new-chatroom-dialog.c:526
-msgid "Could not start room listing"
-msgstr "Impossible de lancer la liste des salles"
-
-#: ../src/empathy-new-chatroom-dialog.c:536
-msgid "Could not stop room listing"
-msgstr "Impossible d'arrêter la liste des salles"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Le chargement de la liste des salles de discussion a échoué"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#: ../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 ""
 "Saisissez le nom de salle à rejoindre ou cliquez sur une ou plusieurs salles "
 "dans la liste."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
+#: ../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"
@@ -2309,229 +2037,186 @@ msgstr ""
 "Saisissez le serveur qui héberge la salle ou laissez-le vide si la salle est "
 "sur le même serveur que le compte actuel"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Joindre la salle"
+#: ../src/empathy-new-chatroom-dialog.glade.h:5
+msgid "Join"
+msgstr "Joindre"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "Room List"
-msgstr "Liste des salles"
+#: ../src/empathy-new-chatroom-dialog.glade.h:6
+msgid "Join New"
+msgstr "Joindre une nouvelle salle"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Sall_e :"
+#: ../src/empathy-new-chatroom-dialog.glade.h:7
+msgid "Re_fresh"
+msgstr "_Actualiser"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-new-chatroom-dialog.glade.h:8
+msgid ""
+"This list represents all chat rooms hosted on the server you have entered."
+msgstr ""
+"Cette liste représente toutes les salles de discussion hébergées sur le "
+"serveur actuel."
+
+#: ../src/empathy-preferences.c:157
 msgid "Message received"
 msgstr "Message reçu"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:158
 msgid "Message sent"
 msgstr "Message envoyé"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:159
 msgid "New conversation"
 msgstr "Nouvelle conversation"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:160
 msgid "Contact goes online"
 msgstr "Le contact est en ligne"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:161
 msgid "Contact goes offline"
 msgstr "Le contact est hors ligne"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:162
 msgid "Account connected"
 msgstr "Compte connecté"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:163
 msgid "Account disconnected"
 msgstr "Compte déconnecté"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:397
 msgid "Language"
 msgstr "Langue"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "Autoriser l'utilisation du _GPS"
+#: ../src/empathy-preferences.glade.h:1
+msgid "<b>Appearance</b>"
+msgstr "<b>Apparence</b>"
+
+#: ../src/empathy-preferences.glade.h:2
+msgid "<b>Behavior</b>"
+msgstr "<b>Comportement</b>"
 
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "Autoriser l'utilisation du téléphone _cellulaire"
+#: ../src/empathy-preferences.glade.h:3
+msgid "<b>Contact List</b>"
+msgstr "<b>Liste des contacts</b>"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "Autoriser l'utilisation du _réseau"
+#: ../src/empathy-preferences.glade.h:4
+msgid "<b>Enable spell checking for languages:</b>"
+msgstr "<b>Activer la correction orthographique pour les langues :</b>"
 
-#: ../src/empathy-preferences.ui.h:4
-msgid "Appearance"
-msgstr "Apparence"
+#: ../src/empathy-preferences.glade.h:5
+msgid "<b>Play sound for events</b>"
+msgstr "<b>Jouer un son lors des événements</b>"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../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>La liste de langues ne contient que les langues pour lesquelles vous "
+"avez un dictionnaire installé.</small>"
+
+#: ../src/empathy-preferences.glade.h:7
 msgid "Automatically _connect on startup "
 msgstr "Se _connecter automatiquement au démarrage"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.glade.h:8
 msgid "Avatars are user chosen images shown in the contact list"
 msgstr ""
 "Les avatars sont des images choisies par l'utilisateur et visibles dans la "
 "liste de contacts"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Behavior"
-msgstr "Comportement"
-
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.glade.h:9
 msgid "Chat Th_eme:"
 msgstr "_Thème de la fenêtre de discussion :"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.glade.h:10
 msgid "Disable notifications when _away or busy"
 msgstr "Désactiver les notifications lorsque vous êtes _absent ou occupé"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.glade.h:11
 msgid "Disable sounds when _away or busy"
 msgstr "Désactiver les sons lorsque vous êtes _absent ou occupé"
 
-#: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when a contact comes online"
-msgstr "Afficher des notifications quand un contact se connecte"
-
-#: ../src/empathy-preferences.ui.h:13
-msgid "Enable notifications when a contact goes offline"
-msgstr "Afficher des notifications quand un contact se déconnecte"
-
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.glade.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr ""
 "Afficher des notifications quand la discussion n'est pas au premier plan"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Enable spell checking for languages:"
-msgstr "Activer la correction orthographique pour les langues :"
-
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.glade.h:13
 msgid "General"
 msgstr "Général"
 
-#: ../src/empathy-preferences.ui.h:17
-msgid "Geoclue Settings"
-msgstr "Paramètres Geoclue"
-
-#: ../src/empathy-preferences.ui.h:18
-msgid "Location"
-msgstr "Emplacement"
-
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.glade.h:14
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../src/empathy-preferences.ui.h:20
-msgid "Play sound for events"
-msgstr "Jouer un son lors des événements"
-
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.glade.h:15
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Confidentialité"
-
-#: ../src/empathy-preferences.ui.h:23
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will have a random "
-"value added (&#xB1;0.25&#xB0;)."
-msgstr ""
-"Lorsque la précision de l'emplacement est réduite, les informations de "
-"géolocalisation publiées se limitent au pays, à la région ou à la ville. "
-"Une valeur aléatoire est appliquée aux coordonnées GPS (±0.25°)."
-
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.glade.h:16
 msgid "Show _avatars"
 msgstr "Afficher les _avatars"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.glade.h:17
 msgid "Show _smileys as images"
 msgstr "Convertir les _frimousses en images"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.glade.h:18
 msgid "Show co_mpact contact list"
 msgstr "Afficher la liste co_mpacte des contacts"
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "Show contact _list in rooms"
-msgstr "Afficher la _liste des contacts dans les salles"
-
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.glade.h:19
 msgid "Sort by _name"
 msgstr "Trié par _nom"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.glade.h:20
 msgid "Sort by s_tate"
 msgstr "Trié par é_tat"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.glade.h:21
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.glade.h:22
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"La liste de langues ne contient que les langues pour lesquelles vous "
-"avez un dictionnaire installé."
-
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.glade.h:23
 msgid "Themes"
 msgstr "Thèmes"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.glade.h:24
 msgid "_Enable bubble notifications"
 msgstr "_Activer les bulles de notification"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.glade.h:25
 msgid "_Enable sound notifications"
 msgstr "_Activer les notifications sonores"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.glade.h:26
 msgid "_Open new chats in separate windows"
 msgstr "_Ouvrir les nouvelles discussions dans des fenêtres séparées"
 
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Publier mon emplacement pour mes contacts"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "_Reduce location accuracy"
-msgstr "Réduire la précision de l'_emplacement"
-
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.glade.h:1
 msgid "Status"
 msgstr "État"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.glade.h:3
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.glade.h:4
 msgid "_Show Contact List"
 msgstr "_Afficher la liste des contacts"
 
-#: ../src/empathy-tube-dispatch.c:375
+#: ../src/empathy-tube-dispatch.c:364
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "Impossible de démarrer l'application pour le service %s : %s"
 
-#: ../src/empathy-tube-dispatch.c:446
+#: ../src/empathy-tube-dispatch.c:435
 #, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
@@ -2539,239 +2224,3 @@ msgid ""
 msgstr ""
 "Vous avez reçu une invitation pour le service %s, mais vous ne disposez pas "
 "de l'application nécessaire pour le gérer"
-
-#: ../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 "Carte des contacts"
-
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
-msgid "Error"
-msgstr "Erreur"
-
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
-msgid "Critical"
-msgstr "Critique"
-
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
-msgid "Warning"
-msgstr "Avertissement"
-
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
-msgid "Message"
-msgstr "Message"
-
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
-msgid "Info"
-msgstr "Information"
-
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
-msgid "Debug"
-msgstr "Débogage"
-
-# Titre de fenêtre
-#: ../src/empathy-debug-dialog.c:845
-msgid "Save"
-msgstr "Enregistrer"
-
-#: ../src/empathy-debug-dialog.c:948
-msgid "Debug Window"
-msgstr "Fenêtre de débogage"
-
-#: ../src/empathy-debug-dialog.c:1021
-msgid "Pause"
-msgstr "Pause"
-
-#: ../src/empathy-debug-dialog.c:1033
-msgid "Level "
-msgstr "Niveau "
-
-#: ../src/empathy-debug-dialog.c:1102
-msgid "Time"
-msgstr "Heure"
-
-#: ../src/empathy-debug-dialog.c:1104
-msgid "Domain"
-msgstr "Domaine"
-
-#: ../src/empathy-debug-dialog.c:1106
-msgid "Category"
-msgstr "Catégorie"
-
-#: ../src/empathy-debug-dialog.c:1108
-msgid "Level"
-msgstr "Niveau"
-
-#: ../src/empathy-debug-dialog.c:1140
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr ""
-"Le gestionnaire de connexions sélectionné ne prend pas en charge l'extension "
-"de débogage distant."
-
-#~ msgid "New message from %s"
-#~ msgstr "Nouveau message de %s"
-
-#~ msgctxt "file size"
-#~ msgid "Unknown"
-#~ msgstr "Inconnue"
-
-#~ msgctxt "remaining time"
-#~ msgid "Stalled"
-#~ msgstr "Bloqué"
-
-# remaining time
-#~ msgctxt "remaining time"
-#~ msgid "Unknown"
-#~ msgstr "Inconnu"
-
-#~ msgid "Cannot save file to this location"
-#~ msgstr "Impossible d'enregistrer ce fichier à cet emplacement"
-
-#~ msgid "Save file as..."
-#~ msgstr "Enregistrer le fichier sous..."
-
-#~ msgid "unknown size"
-#~ msgstr "taille inconnue"
-
-#~ msgid "%s would like to send you a file"
-#~ msgstr "%s souhaite vous envoyer un fichier"
-
-#~ msgid "Do you want to accept the file \"%s\" (%s)?"
-#~ msgstr "Voulez-vous accepter le fichier « %s » (%s) ?"
-
-#~ msgid "_Accept"
-#~ msgstr "_Accepter"
-
-#~ msgid "Show _File Transfers"
-#~ msgstr "Afficher les transferts de _fichiers"
-
-#~ msgid "Forget password and clear the entry."
-#~ msgstr "Oublier le mot de passe et effacer la zone."
-
-#~ msgid "Edit the selected IRC network"
-#~ msgstr "Modifie le réseau IRC sélectionné"
-
-#~ msgid "Remove the selected IRC network"
-#~ msgstr "Supprime le réseau IRC sélectionné"
-
-#~ msgid "_Check Word Spelling..."
-#~ msgstr "_Vérifier l'orthographe..."
-
-#~ msgid "Group Chat"
-#~ msgstr "Groupe de discussion"
-
-#~ msgid "Contact Information"
-#~ msgstr "Informations du contact"
-
-#~ msgid "I would like to add you to my contact list."
-#~ msgstr "Je voudrais vous ajouter à ma liste de contacts."
-
-#~ msgid "Sorry, I don't want you in my contact list anymore."
-#~ msgstr "Désolé, je ne te veux plus dans ma liste de contacts."
-
-#~ msgid "Contact information"
-#~ msgstr "Informations sur le contact"
-
-#~ msgid "Word"
-#~ msgstr "Mot"
-
-#~ msgid "Suggestions for the word"
-#~ msgstr "Suggestions pour le mot"
-
-#~ msgid "Spell Checker"
-#~ msgstr "Correcteur orthographique"
-
-#~ msgid "Suggestions for the word:"
-#~ msgstr "Suggestions pour le mot :"
-
-#~ msgid "C_lear"
-#~ msgstr "_Nettoyer"
-
-#~ msgid "Chat"
-#~ msgstr "Discuter"
-
-#~ msgid "Insert _Smiley"
-#~ msgstr "Insérer une _frimousse"
-
-#~ msgid "Invitation _message:"
-#~ msgstr "_Message d'invitation :"
-
-#~ msgid "Invite"
-#~ msgstr "Inviter"
-
-#~ msgid "Move Tab _Left"
-#~ msgstr "Déplacer l'onglet à _gauche"
-
-#~ msgid "Move Tab _Right"
-#~ msgstr "Déplacer l'onglet à _droite"
-
-#~ msgid "Select who would you like to invite:"
-#~ msgstr "Sélectionnez la personne à inviter :"
-
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "Vous avez été invité(e) à joindre une salle de discussion"
-
-#~ msgid "_Contact"
-#~ msgstr "_Contact"
-
-#~ msgid "_Conversation"
-#~ msgstr "_Conversation"
-
-#~ msgid "_Detach Tab"
-#~ msgstr "_Détacher l'onglet"
-
-#~ msgid "_Favorite Chatroom"
-#~ msgstr "Salles de discussion _favorites"
-
-#~ msgid "_Next Tab"
-#~ msgstr "Onglet _suivant"
-
-#~ msgid "_Previous Tab"
-#~ msgstr "Onglet _précédent"
-
-#~ msgid "_Tabs"
-#~ msgstr "_Onglets"
-
-#~ msgid "Edit Favorite Room"
-#~ msgstr "Modifier les salles favorites"
-
-#~ msgid "Join room on start_up"
-#~ msgstr "Joindre la salle au _démarrage"
-
-#~ msgid "Join this chat room when Empathy starts and you are connected"
-#~ msgstr ""
-#~ "Joindre cette salle de discussion quand Empathy démarre et que vous êtes "
-#~ "connecté"
-
-#~ msgid "N_ame:"
-#~ msgstr "_Nom :"
-
-#~ msgid "S_erver:"
-#~ msgstr "_Serveur :"
-
-#~ msgid "Join _New..."
-#~ msgstr "Rejoindre _nouveau"
-
-#~ msgid "Browse:"
-#~ msgstr "Parcourir :"
-
-#~ msgid "Join"
-#~ msgstr "Joindre"
-
-#~ msgid "Join New"
-#~ msgstr "Joindre une nouvelle salle"
-
-#~ msgid "Re_fresh"
-#~ msgstr "_Actualiser"
-
-#~ msgid ""
-#~ "This list represents all chat rooms hosted on the server you have entered."
-#~ msgstr ""
-#~ "Cette liste représente toutes les salles de discussion hébergées sur le "
-#~ "serveur actuel."
diff --git a/po/or.po b/po/or.po
deleted file mode 100644
index d89ee2e..0000000
--- a/po/or.po
+++ /dev/null
@@ -1,2490 +0,0 @@
-# translation of empathy.po.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.
-#
-# Manoj Kumar Giri <mgiri@redhat.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: empathy.po.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"
-"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"
-"X-Generator: KBabel 1.11.4\n"
-
-#: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy Instant Messenger"
-msgstr "Empathy ତୀବ୍ର ସନ୍ଦେଶ ବାହକ"
-
-#: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant 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
-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 "Empathy ଚାର୍ଟ ୱିଣ୍ଡୋ ଚିତ୍ର ସଂକେତ ପରି ସମ୍ପର୍କର ଅବତାରକୁ ବ୍ୟବହାର କରିବା ଉଚିତ"
-
-#: ../data/empathy.schemas.in.h:19
-msgid "Enable popup notifications for new messages"
-msgstr "ନୂତନ ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ପପଅପ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:20
-msgid "Enable spell checker"
-msgstr "ବନାନ ଯାଞ୍ଚକର୍ତ୍ତାକୁ ସକ୍ରିୟ କରନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:21
-msgid "Hide main window"
-msgstr "ମୁଖ୍ଯ ୱିଣ୍ଡୋ ଲୁଚାନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:22
-msgid "Hide the main window."
-msgstr "ମୁଖ୍ଯ ୱିଣ୍ଡୋ ଲୁଚାନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:23
-msgid "NetworkManager should be used"
-msgstr "ନେଟୱର୍କ ପରିଚାଳକଙ୍କୁ ବ୍ୟବହାର କରିବା ଉଚିତ"
-
-#: ../data/empathy.schemas.in.h:24
-msgid "Nick completed character"
-msgstr "ଉପନାମ ସମ୍ପୂର୍ଣ୍ଣ ଅକ୍ଷର"
-
-#: ../data/empathy.schemas.in.h:25
-msgid "Open new chats in separate windows"
-msgstr "ନୁଆ ଚାଟଗୁଡ଼ିକ ଅଲଗା ୱିଣ୍ଡୋରେ ଖୋଲନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:26
-msgid "Path of the adium theme to use"
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:27
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:28
-msgid "Play a sound for incoming messages"
-msgstr "ଆଗତ ସନ୍ଦେଶ ପାଇଁ ଏକ ଶବ୍ଦ ଚଲାନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:29
-msgid "Play a sound for new conversations"
-msgstr "ନୂତନ ବାର୍ତ୍ତାଳାପ ପାଇଁ ଧ୍ୱନି ଚଲାନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:30
-msgid "Play a sound for outgoing messages"
-msgstr "ଯାଉଥିବା ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ଧ୍ୱନି ଚଲାନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:31
-msgid "Play a sound when a contact logs in"
-msgstr "ଗୋଟିଏ ସମ୍ପର୍କ ଲଗ ଇନ ହୋଇସାରିବା ପରେ ଧ୍ୱନି ଚଲାନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:32
-msgid "Play a sound when a contact logs out"
-msgstr "ଗୋଟିଏ ସମ୍ପର୍କ ଲଗ ଆଉଟ ହୋଇସାରିବା ପରେ ଧ୍ୱନି ଚଲାନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:33
-msgid "Play a sound when we log in"
-msgstr "ଆମ୍ଭେ ଲଗଇନ୍ କରିବାବେଳେ ଏକ ଶବ୍ଦ ଚଲାନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:34
-msgid "Play a sound when we log out"
-msgstr "ଆମ୍ଭେ ଲଗଆଉଟ କରିବାବେଳେ ଏକ ଶବ୍ଦ ଚଲାନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:35
-msgid "Popup notifications if the chat isn't focused"
-msgstr "ପପଅପ ବିଜ୍ଞପ୍ତି ଯଦି ଚାର୍ଟ ଲକ୍ଷ୍ୟ ହୋଇନାହିଁ"
-
-#: ../data/empathy.schemas.in.h:36
-msgid "Popup notifications when a contact sign in"
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:37
-msgid "Popup notifications when a contact sign out"
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:38
-msgid "Salut account is created"
-msgstr "ସେଲ୍ୟୁଟ ଖାତା ନିର୍ମିତ ହୋଇଛି"
-
-#: ../data/empathy.schemas.in.h:39
-msgid "Show avatars"
-msgstr "ଅବତାର ଦେଖାନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:40
-msgid "Show contact list in rooms"
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:41
-msgid "Show hint about closing the main window"
-msgstr "ମୁଖ୍ଯ ୱିଣ୍ଡୋ ବନ୍ଦ କରିବା ପାଇଁ ଆଭାସ ଦିଅନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:42
-msgid "Show offline contacts"
-msgstr "ଅଫଲାଇନ ସମ୍ପର୍କ ଦେଖାଅ"
-
-#: ../data/empathy.schemas.in.h:43
-msgid "Spell checking languages"
-msgstr "ବନାନ ଯାଞ୍ଚକାରୀ ଭାଷାଗୁଡ଼ିକ"
-
-#: ../data/empathy.schemas.in.h:44
-msgid "The default folder to save file transfers in."
-msgstr "ଫାଇଲ ପରିବହନକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଫୋଲଡର।"
-
-#: ../data/empathy.schemas.in.h:45
-msgid "The last directory that an avatar image was chosen from."
-msgstr "ଅଭତାର ପ୍ରତିଛବି ଦ୍ୱାରା ବଛାଯାଇଥିବା ଶେଷ ଡିରେକ୍ଟୋରୀ।"
-
-#: ../data/empathy.schemas.in.h:46
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "ଚାର୍ଟ ୱିଣ୍ଡୋରେ ବାର୍ତ୍ତାଳାପକୁ ଦର୍ଶାଯାଇବା ପାଇଁ ବ୍ୟବହୃତ ପ୍ରସଙ୍ଗ।"
-
-#: ../data/empathy.schemas.in.h:47
-msgid "Use graphical smileys"
-msgstr "ଆଲେଖୀ ସ୍ମାଇଲିଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:48
-msgid "Use notification sounds"
-msgstr "ବିଜ୍ଞପ୍ତ ଶବ୍ଦ ଉପଯୋଗ କରନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:49
-msgid "Use theme for chat rooms"
-msgstr "ଚାଟ ଘରଗୁଡ଼ିକ ପାଇଁ ପ୍ରସଙ୍ଗ ଉପଯୋଗ କରନ୍ତୁ"
-
-#: ../data/empathy.schemas.in.h:50
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:51
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:52
-msgid "Whether or not Empathy can use the cellular network to guess the location."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:53
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:54
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "Empathy ଅନ୍ୟ ପ୍ରଗ୍ରାମଗୁଡ଼ିକରୁ ଖାତା ଆମଦାନୀ ପାଇଁ ଅନୁରୋଧ କରିବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:55
-msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "ଆରମ୍ଭରେ Empathy ସ୍ୱୟଂଚାଳିତ ଭାବରେ ଆପଣଙ୍କ ଖାତାରେ ଲଗଇନ ହେବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:57
-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
-msgid "Whether or not the Salut account has been created on the first Empathy run."
-msgstr "ପ୍ରଥମ Empathy ଚାଳନାରେ ସେଲ୍ୟୁଟ ଖାତା ନିର୍ମାଣ କରିବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:59
-msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
-msgstr "ନେଟୱର୍କ ପରିଚାଳକ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ/ସଂଯୋଗ ସ୍ଥାପନ କରିବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:60
-msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
-msgstr "ଆପଣ ଯାଞ୍ଚ କରିବାକୁ ଚାହୁଁଥିବା ଭାଷାର ଶବ୍ଦ ପ୍ରକାରକୁ ଯାଞ୍ଚ କରିବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:61
-msgid "Whether or not to convert smileys into graphical images in conversations."
-msgstr "ବାର୍ତ୍ତାଳାପରେ ଆଲେଖୀ ପ୍ରତିଛବିଗୁଡ଼ିକୁ ସ୍ମାଇଲି ପରିବର୍ତ୍ତନ କରିବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:62
-msgid "Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "ନେଟୱର୍କରେ ଲଗଇନ ହେଉଥିବା ସମ୍ପର୍କଗୁଡ଼ିକୁ ବିଜ୍ଞପ୍ତି ଦେବା ପାଇଁ ଧ୍ୱନି ଚଲାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:63
-msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
-msgstr "ନେଟୱର୍କରେ ଲଗଅଫ ହେଉଥିବା ସମ୍ପର୍କଗୁଡ଼ିକୁ ବିଜ୍ଞପ୍ତି ଦେବା ପାଇଁ ଧ୍ୱନି ଚଲାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:64
-msgid "Whether or not to play a sound to notify for events."
-msgstr "ଘଟଣାଗୁଡ଼ିକ ପାଇଁ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:65
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "ଆସୁଥିବା ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:66
-msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "ନୂତନ ବାର୍ତ୍ତାଳାପ ପାଇଁ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:67
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "ପଠାଯାଉଥିବା ସନ୍ଦେଶଗୁଡ଼ିକ ପାଇଁ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound when logging in a network."
-msgstr "ନେଟୱର୍କରେ ଲଗଇନ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "ନେଟୱର୍କରେ ଲଗଅଫ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play sound notifications when away or busy."
-msgstr "ଦୂରରେ ଥିବା ସମୟରେ କିମ୍ବା ବ୍ୟସ୍ତ ଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତି ଦେବାକୁ ଧ୍ୱନି ଚାଲାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to show a popup notification when a contact goes offline."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to show a popup notification when a contact goes online."
-msgstr ""
-
-#: ../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."
-msgstr ""
-"ଗୋଟିଏ ନୂତନ ସନ୍ଦେଶ ଗ୍ରହଣ କରିସାରିବା ପରେ ଗୋଟିଏ ପପଅପ ବିଜ୍ଞପ୍ତି ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ "
-"ଯଦି ଚାଟଟି ପୂର୍ବରୁ ଖୋଲାଅଛି, କିନ୍ତୁ ଲକ୍ଷ୍ୟ କରାଯାଇନାହିଁ।"
-
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to show a popup notification when receiving a new message."
-msgstr "ନୂତନ ସନ୍ଦେଶ ଗ୍ରହଣ କରିବା ସମୟରେ ପପଅପ ବିଜ୍ଞପ୍ତି ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:75
-msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
-msgstr "ସମ୍ପର୍କ ତାଲିକା ଏବଂ ଚାର୍ଟ ୱିଣ୍ଡୋରେ ସମ୍ପର୍କଗୁଡ଼ିକ ପାଇଁ ଅଭତାରଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr "ସମ୍ପର୍କ ତାଲିକାରେ ଅଫଲାଇନ ଥିବା ସମ୍ପର୍କଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:77
-msgid "Whether or not to show popup notifications when away or busy."
-msgstr "ଦୂରରେ ଥିବା ସମୟରେ କିମ୍ବା ବ୍ୟସ୍ତ ଥିବା ସମୟରେ ପପଅପ ବିଜ୍ଞପ୍ତିକୁ ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:78
-msgid "Whether or not to show the contact list in chat rooms."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:79
-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:80
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "ସମ୍ପର୍କ ତାଲିକାକୁ ସଂଗୁପ୍ତ ଧାରାରେ ଦର୍ଶାଇବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:81
-msgid "Whether to use the theme for chat rooms or not."
-msgstr "ଚାର୍ଟରୁମ ପାଇଁ ପ୍ରସଙ୍ଗକୁ ବ୍ୟବହାର କରିବା ଉଚିତ କି ନୁହଁ।"
-
-#: ../data/empathy.schemas.in.h:82
-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\" ର ଗୋଟିଏ ମୂଲ୍ୟକୁ ଅବସ୍ଥା ଦ୍ୱାରା ଯୋଗାଯୋଗ ତାଲିକା "
-"ଅନୁସାରେ ସଜାଡ଼ିବା।"
-
-#: ../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:757 ../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] "%d ମିନଟ ପୂର୍ବେ"
-msgstr[1] "%d ମିନଟ ପୂର୍ବେ"
-
-#: ../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 ଦିନ ପୂର୍ବେ"
-msgstr[1] "%d ଦିନ ପୂର୍ବେ"
-
-#: ../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] "%d ମାସ ପୂର୍ବେ"
-msgstr[1] "%d ମାସ ପୂର୍ବେ"
-
-#: ../libempathy/empathy-time.c:167
-msgid "in the future"
-msgstr "ଭବିଷ୍ୟତରେ"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:419
-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
-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.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 "ICS_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
-msgid "Servers"
-msgstr "ସେବକ ମାନେ"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-msgid "Override server settings"
-msgstr ""
-
-#: ../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 "ପୁରୁଣା SSL ଉପଯୋଗ କରନ୍ତୁ (_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "_Encryption required (TLS/SSL)"
-msgstr "ସଂଗୁପ୍ତ ଆବଶ୍ୟକ (TLS/SSL) (_E)"
-
-#: ../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 ଜାପାନ ଉପଯୋଗ କରନ୍ତୁ (_Y)"
-
-#: ../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:404
-msgid "Unsupported command"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-chat.c:539
-msgid "offline"
-msgstr "ଅଫ ଲାଇନ"
-
-#: ../libempathy-gtk/empathy-chat.c:542
-msgid "invalid contact"
-msgstr "ତ୍ରୁଟିପୁର୍ଣ୍ଣ ସମ୍ପର୍କ"
-
-#: ../libempathy-gtk/empathy-chat.c:545
-msgid "permission denied"
-msgstr "ଅନୁମତି ନାହିଁ"
-
-#: ../libempathy-gtk/empathy-chat.c:548
-msgid "too long message"
-msgstr "ଅତ୍ଯାଧିକ ଲମ୍ବା ସନ୍ଦେଶ"
-
-#: ../libempathy-gtk/empathy-chat.c:551
-msgid "not implemented"
-msgstr "ନିଷ୍ପାଦନ କରାଯାଇ ନାହିଁ"
-
-#: ../libempathy-gtk/empathy-chat.c:554
-msgid "unknown"
-msgstr "ଅଜଣା"
-
-#: ../libempathy-gtk/empathy-chat.c:558
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "ସନ୍ଦେଶ ପଠାଇବାରେ ତ୍ରୁଟି '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:588
-#, c-format
-msgid "Topic set to: %s"
-msgstr "ରେ ବିଷୟ ସେଟ କରାଯାଇଥାଏ: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:590
-msgid "No topic defined"
-msgstr "କୌଣସି ବିଷୟ ବ୍ୟାଖ୍ୟା କରାଯାଇନାହିଁ"
-
-#: ../libempathy-gtk/empathy-chat.c:959
-msgid "(No Suggestions)"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-chat.c:1013
-msgid "Insert Smiley"
-msgstr "Smiley କୁ ଭର୍ତ୍ତି କରନ୍ତୁ"
-
-#. send button
-#: ../libempathy-gtk/empathy-chat.c:1031
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
-msgid "_Send"
-msgstr "ପଠାନ୍ତୁ (_S)"
-
-#: ../libempathy-gtk/empathy-chat.c:1065
-msgid "_Spelling Suggestions"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-chat.c:1179
-#, c-format
-msgid "%s has joined the room"
-msgstr "%s କଠୋରିରେ ଯୋଗଦାନ କରିଛନ୍ତି"
-
-#: ../libempathy-gtk/empathy-chat.c:1182
-#, c-format
-msgid "%s has left the room"
-msgstr "%s କଠୋରିକୁ ପ୍ରସ୍ଥାନ କରିସାରିଛନ୍ତି"
-
-#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1226
-msgid "Disconnected"
-msgstr "ଅସଂଯୋଜିତ"
-
-#: ../libempathy-gtk/empathy-chat.c:1742
-msgid "Connected"
-msgstr "ସଂଯୋଗିତ"
-
-#: ../libempathy-gtk/empathy-chat.c:1792
-#: ../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 "ବିଷୟ:"
-
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-msgid "_Copy Link Address"
-msgstr "ସଂଯୋଗ ଠିକଣାକୁ ନକଲ କରନ୍ତୁ (_C)"
-
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-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:384
-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:1375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "ଆପଣ ପ୍ରକୃତରେ ସେହି ଶ୍ରେଣୀ '%s'କୁ କାଢ଼ିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
-msgid "Removing group"
-msgstr "ସମୂହ କଢ଼ାହେଉଛି"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1424
-#: ../libempathy-gtk/empathy-contact-list-view.c:1502
-msgid "_Remove"
-msgstr "ଅପସାରଣ କରନ୍ତୁ (_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1454
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "ଆପଣ ପ୍ରକୃତରେ ସେହି ସମ୍ପର୍କ '%s'କୁ କାଢ଼ିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1456
-msgid "Removing contact"
-msgstr "ସମ୍ପର୍କ କଢ଼ାହେଉଛି"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:135
-#: ../src/empathy-main-window.ui.h:8
-msgid "_Chat"
-msgstr "ଆଳାପ (_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:166
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-menu.c:198
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-menu.c:237
-msgid "_View Previous Conversations"
-msgstr "ପୁର୍ବତନ କଥୋପକଥନ ଦେଖନ୍ତୁ (_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:259
-msgid "Send file"
-msgstr "ଫାଇଲ ପଠାନ୍ତୁ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:287
-msgid "Infor_mation"
-msgstr "ସୂଚନା (_m)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:314
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Edit"
-msgstr "ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:372
-msgid "Inviting to this room"
-msgstr "ଏହି କଠୋରିକୁ ଆମନ୍ତ୍ରଣ କରୁଅଛି"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:403
-msgid "_Invite to chatroom"
-msgstr "ଚାର୍ଟ କଠୋରିକୁ ଆମନ୍ତ୍ରଣ କରୁଅଛି (_I)"
-
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "ଏକ ସମ୍ପର୍କ ଚୟନ କରନ୍ତୁ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:440
-msgid "Save Avatar"
-msgstr "ଅବତାର ସଂରକ୍ଷଣ କରନ୍ତୁ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:496
-msgid "Unable to save avatar"
-msgstr "ଅବତାର ସଂରକ୍ଷଣ କରିବାରେ ବିଫଳ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:979
-msgid "Select"
-msgstr "ମନୋନୀତ କର"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:903
-msgid "Group"
-msgstr "ସମୂହ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1239
-msgid "Country ISO Code:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1241
-msgid "Country:"
-msgstr "ଦେଶ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1243
-msgid "State:"
-msgstr "ସ୍ଥିତି:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1245
-msgid "City:"
-msgstr "ମହାନଗର:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1247
-msgid "Area:"
-msgstr "ଅଂଚଳ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1249
-msgid "Postal Code:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1251
-msgid "Street:"
-msgstr "ସାହି:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1253
-msgid "Building:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1255
-msgid "Floor:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1257
-msgid "Room:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1259
-msgid "Text:"
-msgstr "ଟେକ୍ସଟ: "
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
-msgid "Description:"
-msgstr "ବର୍ଣ୍ଣନା:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
-msgid "URI:"
-msgstr "ୟୁ.ଆର.ଆଇ.:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
-msgid "Accuracy Level:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
-msgid "Error:"
-msgstr "ତୃଟି:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
-msgid "Vertical Error (meters):"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
-msgid "Horizontal Error (meters):"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
-msgid "Speed:"
-msgstr "ବେଗ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
-msgid "Bearing:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
-msgid "Climb Speed:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
-msgid "Last Updated on:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
-msgid "Longitude:"
-msgstr "ଦ୍ରାଘିମା:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
-msgid "Latitude:"
-msgstr "ଅକ୍ଷାଂଶ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
-msgid "Altitude:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1332
-msgid "<b>Location</b>"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
-msgid "<b>Location</b>, "
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1395
-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
-msgid "Client Information"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-msgid "Client:"
-msgstr "ଗ୍ରାହକ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:886
-msgid "Contact"
-msgstr "ସମ୍ପର୍କ"
-
-#: ../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.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.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 "ଓ.ଏସ:"
-
-#: ../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 "କ_ଲ"
-
-#: ../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_STATE_ICON_NAME
-#. COL_STATE
-#. COL_STATUS_TEXT
-#. COL_DISPLAY_MARKUP
-#. COL_STATUS_CUSTOMISABLE
-#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-msgid "Custom Message..."
-msgstr ""
-
-#: ../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: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 ""
-
-#: ../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-status-preset-dialog.ui.h:2
-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:66
-msgid "Classic"
-msgstr "ଚିରପ୍ରତିଷ୍ଠିତ"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:67
-msgid "Simple"
-msgstr "ସରଳ"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:68
-msgid "Clean"
-msgstr "ସଫା"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:69
-msgid "Blue"
-msgstr "ନୀଳ"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Adium"
-msgstr "ଅଡିଅମ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1377
-msgid "Unable to open URI"
-msgstr "ୟୁ.ଆର୍.ଆଇ. ଖୋଲିବାରେ ଅସମର୍ଥ"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1467
-msgid "Select a file"
-msgstr "ଏକ ଫାଇଲ ମନୋନୀତ କର"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1525
-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 "କ୍ରୋଏସିଆନ"
-
-#: ../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 "ଆଇସଲ୍ଯାଣ୍ଡିକ"
-
-#: ../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 "ଭିୟେତନାମୀ"
-
-#.
-#. * 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"
-
-#: ../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:18
-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:506
-msgid "Don't connect on startup"
-msgstr "ଆରମ୍ଭରେ ସଂଯୋଗ କରନ୍ତୁ ନାହିଁ"
-
-#: ../src/empathy.c:510
-msgid "Don't show the contact list on startup"
-msgstr "ଆରମ୍ଭରେ ସମ୍ପର୍କ ତାଲିକା ଦର୍ଶାନ୍ତୁ ନାହିଁ"
-
-#: ../src/empathy.c:514
-msgid "Show the accounts dialog"
-msgstr "ଖାତା ସଂଳାପ ଦର୍ଶାନ୍ତୁ"
-
-#: ../src/empathy.c:526
-msgid "- Empathy Instant Messenger"
-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 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: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: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:119
-msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME ପାଇଁ ଗୋଟିଏ ତୀବ୍ର ସନ୍ଦେଶ ବାହକ ଗ୍ରାହକ"
-
-#: ../src/empathy-about-dialog.c:125
-msgid "translator-credits"
-msgstr "ଶୁଭ୍ରାଂଶୁ ବେହେରା <arya_subhransu@yahoo.co.in>"
-
-#: ../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
-msgid "Add Account"
-msgstr "ଆକାଉଣ୍ଟ ୟୋଗ କର"
-
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "ସୃଷ୍ଟି କରନ୍ତୁ (_r)"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr ""
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "ଖାତାଗୁଡ଼ିକୁ ଆମଦାନି କରନ୍ତୁ..."
-
-#: ../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.ui.h:9
-msgid "Type:"
-msgstr "ପ୍ରକାର:"
-
-#: ../src/empathy-accounts-dialog.ui.h:10
-msgid "_Add..."
-msgstr "ଯୋଗ କରନ୍ତୁ (_A)..."
-
-#: ../src/empathy-accounts-dialog.ui.h:11
-msgid "_Create a new account"
-msgstr ""
-
-#: ../src/empathy-accounts-dialog.ui.h:12
-msgid "_Reuse an existing account"
-msgstr ""
-
-#: ../src/empathy-call-window.c:420
-msgid "Contrast"
-msgstr "ସ୍ପଷ୍ଟତା"
-
-#: ../src/empathy-call-window.c:423
-msgid "Brightness"
-msgstr "ଉଜ୍ଜ୍ବଳତା"
-
-#: ../src/empathy-call-window.c:426
-msgid "Gamma"
-msgstr "ଗାମା"
-
-#: ../src/empathy-call-window.c:531
-msgid "Volume"
-msgstr "ଭଲ୍ଯୁମ"
-
-#: ../src/empathy-call-window.c:662
-msgid "Connecting..."
-msgstr "ସଂଯୋଗ କରୁଅଛି..."
-
-#: ../src/empathy-call-window.c:746
-msgid "_Sidebar"
-msgstr "ପାର୍ଶ୍ବ ପଟି (_S)"
-
-#: ../src/empathy-call-window.c:765
-msgid "Dialpad"
-msgstr "ଡାଏଲ ପ୍ଯାଡ"
-
-#: ../src/empathy-call-window.c:771
-msgid "Audio input"
-msgstr "ଧ୍ବନି ନିବେଶ"
-
-#: ../src/empathy-call-window.c:775
-msgid "Video input"
-msgstr "ଭିଡ଼ିଓ ନିବେଶ"
-
-#: ../src/empathy-call-window.c:836
-#, c-format
-msgid "Call with %s"
-msgstr ""
-
-#: ../src/empathy-call-window.c:905
-msgid "Call"
-msgstr "ଡାକରା"
-
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1336
-#, c-format
-msgid "Connected — %d:%02dm"
-msgstr ""
-
-#: ../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 "_କଲ"
-
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21
-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-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 "_ଅସ୍ବୀକାର"
-
-#: ../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
-#, c-format
-msgid "%s of %s at %s/s"
-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: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 ""
-
-#: ../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 "\"%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
-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
-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:396
-msgid "_Edit account"
-msgstr "ଖାତା ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
-
-#: ../src/empathy-main-window.c:499
-msgid "No error specified"
-msgstr "କିଛି ତ୍ରୁଟି ଦର୍ଶାଯାଇନାହିଁ"
-
-#: ../src/empathy-main-window.c:502
-msgid "Network error"
-msgstr "ନେଟୱାର୍କ ତ୍ରୁଟି"
-
-#: ../src/empathy-main-window.c:505
-msgid "Authentication failed"
-msgstr "ବୈଧିକରଣ ବିଫଳ"
-
-#: ../src/empathy-main-window.c:508
-msgid "Encryption error"
-msgstr "ସଂଗୁପ୍ତ ତ୍ରୁଟି"
-
-#: ../src/empathy-main-window.c:511
-msgid "Name in use"
-msgstr "ନାମ ଯାହାକି ବ୍ଯବହୃତ ହେଉଅଛି"
-
-#: ../src/empathy-main-window.c:514
-msgid "Certificate not provided"
-msgstr "ପ୍ରମାଣପତ୍ର ଦିଆଯାଇନାହିଁ"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate untrusted"
-msgstr "ପ୍ରମାଣପତ୍ର ବିଶ୍ୱସ୍ଥ ନୁହଁ"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate expired"
-msgstr "ପ୍ରମାଣପତ୍ରର ସମୟ ସମାପ୍ତ"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate not activated"
-msgstr "ପ୍ରମାଣପତ୍ର ସକ୍ରିୟ କରାଯାଇନାହିଁ"
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate hostname mismatch"
-msgstr "ପ୍ରମାଣପତ୍ର ହୋଷ୍ଟ ନାମ ଅମେଳ"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate fingerprint mismatch"
-msgstr "ପ୍ରମାଣପତ୍ର ଅଙ୍ଗୁଳିଚିହ୍ନ ମେଳଖାଉନାହିଁ"
-
-#: ../src/empathy-main-window.c:532
-msgid "Certificate self-signed"
-msgstr "ପ୍ରମାଣପତ୍ର ନିଜ ଦ୍ୱାରା ହସ୍ତାକ୍ଷର ହୋଇଛି"
-
-#: ../src/empathy-main-window.c:535
-msgid "Certificate error"
-msgstr "ପ୍ରମାଣପତ୍ର ତ୍ରୁଟି"
-
-#: ../src/empathy-main-window.c:538
-msgid "Unknown error"
-msgstr "ଅଜଣା ତ୍ରୁଟି"
-
-#: ../src/empathy-main-window.c:1218
-msgid "Show and edit accounts"
-msgstr "ଖାତା ଦେଖନ୍ତୁ ଏବଂ ସମ୍ପାଦନ କରନ୍ତୁ"
-
-#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10
-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 "_Accounts"
-msgstr "_ଆକାଉଣ୍ଟଗୁଡିକ"
-
-#: ../src/empathy-main-window.ui.h:7
-msgid "_Add Contact..."
-msgstr "ସମ୍ପର୍କ ଯୋଗ କରନ୍ତୁ (_A)..."
-
-#: ../src/empathy-main-window.ui.h:9
-msgid "_Contents"
-msgstr "ସୂଚୀପତ୍ର (_C)"
-
-#: ../src/empathy-main-window.ui.h:10
-msgid "_Debug"
-msgstr "ତୃଟିମୁକ୍ତ କରନ୍ତୁ (_D)"
-
-#: ../src/empathy-main-window.ui.h:12
-msgid "_File Transfers"
-msgstr ""
-
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Help"
-msgstr "ସହାୟତା (_H)"
-
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Join..."
-msgstr ""
-
-#: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "ନୁଆ କଥୋପକଥନ (_N)..."
-
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Offline Contacts"
-msgstr ""
-
-#: ../src/empathy-main-window.ui.h:17
-msgid "_Personal Information"
-msgstr "ବ୍ଯକ୍ତିଗତ ସୂଚନା (_P)"
-
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Previous Conversations"
-msgstr ""
-
-#: ../src/empathy-main-window.ui.h:20
-msgid "_Room"
-msgstr "କକ୍ଷ (_R)"
-
-#: ../src/empathy-new-chatroom-dialog.c:331
-msgid "Chat Room"
-msgstr ""
-
-#: ../src/empathy-new-chatroom-dialog.c:347
-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
-msgid "Join Room"
-msgstr ""
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "Room List"
-msgstr "କକ୍ଷତାଲିକା"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "କଠୋରି (_R):"
-
-#: ../src/empathy-preferences.c:161
-msgid "Message received"
-msgstr "ସନ୍ଦେଶ ପ୍ରାପ୍ତ"
-
-#: ../src/empathy-preferences.c:162
-msgid "Message sent"
-msgstr "ସନ୍ଦେଶ ପଠାଯାଇଅଛି"
-
-#: ../src/empathy-preferences.c:163
-msgid "New conversation"
-msgstr "ନୁଆ କଥୋପକଥନ"
-
-#: ../src/empathy-preferences.c:164
-msgid "Contact goes online"
-msgstr "ସମ୍ପର୍କ ଅନଲାଇନ ଆସିଲେ"
-
-#: ../src/empathy-preferences.c:165
-msgid "Contact goes offline"
-msgstr "ସମ୍ପର୍କ ଅଫଲାଇନ ଗଲେ"
-
-#: ../src/empathy-preferences.c:166
-msgid "Account connected"
-msgstr "ଖାତା ସଂଯୋଗିତ"
-
-#: ../src/empathy-preferences.c:167
-msgid "Account disconnected"
-msgstr "ଖାତା ବିଚ୍ଛିନ୍ନ"
-
-#: ../src/empathy-preferences.c:446
-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
-msgid "Allow _cellphone usage"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:4
-msgid "Allow _network usage"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:5
-msgid "Appearance"
-msgstr "ସାଦ୍ରୁଶ୍ଯ"
-
-#: ../src/empathy-preferences.ui.h:6
-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
-msgid "Behavior"
-msgstr "ଆଚରଣ"
-
-#: ../src/empathy-preferences.ui.h:9
-msgid "Chat Th_eme:"
-msgstr "ଚାର୍ଟ ପ୍ରସଙ୍ଗ (_e):"
-
-#: ../src/empathy-preferences.ui.h:11
-msgid "Disable notifications when _away or busy"
-msgstr "ଦୂରରେ ଥିବା ସମୟରେ କିମ୍ବା ବ୍ୟସ୍ତ ଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ (_a)"
-
-#: ../src/empathy-preferences.ui.h:12
-msgid "Disable sounds when _away or busy"
-msgstr "ଦୂରରେ ଥିବା ସମୟରେ କିମ୍ବା ବ୍ୟସ୍ତ ଥିବା ସମୟରେ ଧ୍ୱନିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ (_a)"
-
-#: ../src/empathy-preferences.ui.h:13
-msgid "Enable notifications when a contact comes online"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:14
-msgid "Enable notifications when a contact goes offline"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:15
-msgid "Enable notifications when the _chat is not focused"
-msgstr "ଚାର୍ଟକୁ ଲକ୍ଷ୍ୟ କରାଯାଉନଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ସକ୍ରିୟ କରନ୍ତୁ (_c)"
-
-#: ../src/empathy-preferences.ui.h:16
-msgid "Enable spell checking for languages:"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:17
-msgid "General"
-msgstr "ସାଧାରଣ"
-
-#: ../src/empathy-preferences.ui.h:18
-msgid "Geoclue Settings"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:19
-msgid "Location"
-msgstr "ଅବସ୍ଥାନ"
-
-#: ../src/empathy-preferences.ui.h:20
-msgid "Not a valid adium theme"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:21
-msgid "Notifications"
-msgstr "ବିଜ୍ଞପ୍ତି"
-
-#: ../src/empathy-preferences.ui.h:22
-msgid "Play sound for events"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:23
-msgid "Preferences"
-msgstr "ପସନ୍ଦ"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Privacy"
-msgstr "ଗୋପନୀଯତା"
-
-#: ../src/empathy-preferences.ui.h:25
-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:26
-msgid "Show _avatars"
-msgstr "ଅବତାର ଦେଖାନ୍ତୁ (_a)"
-
-#: ../src/empathy-preferences.ui.h:27
-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
-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
-msgid "Sounds"
-msgstr "ଶବ୍ଦ"
-
-#: ../src/empathy-preferences.ui.h:33
-msgid "Spell Checking"
-msgstr "ବନାନ ଯାଞ୍ଚ କରାଯାଉଛି"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "Themes"
-msgstr "ପ୍ରସଙ୍ଗ"
-
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Enable bubble notifications"
-msgstr "ବବଲ ବିଜ୍ଞପ୍ତିକୁ ସକ୍ରିୟ କରନ୍ତୁ (_E)"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Enable sound notifications"
-msgstr "ଧ୍ୱିନି ବିଜ୍ଞପ୍ତିକୁ ସକ୍ରିୟ କରନ୍ତୁ (_E)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "ନୁଆ ଚାଟଗୁଡ଼ିକ ଅଲଗା ୱିଣ୍ଡୋରେ ଖୋଲନ୍ତୁ (_O)"
-
-#: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:40
-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-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"
-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
-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 ""
-
diff --git a/po/pa.po b/po/pa.po
index d22f67f..f5d251c 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,8 +8,8 @@ msgid ""
 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-02 19:42+0000\n"
-"PO-Revision-Date: 2009-07-07 06:28+0530\n"
+"POT-Creation-Date: 2009-06-04 16:15+0000\n"
+"PO-Revision-Date: 2009-06-05 06:42+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "ਤੁਰੰਤ ਸੁਨੇਹੇ ਲਵੋ ਅਤੇ ਭੇਜੋ"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
-msgstr "ਨਵੀਆਂ ਗੱਲਾਂ ਲਈ ਹਮੇਸ਼ਾ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਰਤੋਂ।"
+msgstr "ਨਵੀਂ ਗੱਲਬਾਤ ਲਈ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ ਝਰੋਖਾ ਵਰਤੋਂ।"
 
 #: ../data/empathy.schemas.in.h:2
 msgid ""
@@ -41,7 +41,7 @@ msgstr "ਨਾਂ ਦੇ ਬਾਅਦ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅੱਖ
 
 #: ../data/empathy.schemas.in.h:3
 msgid "Chat window theme"
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ"
+msgstr "ਗੱਲਬਾਤ ਝਰੋਖਾ ਸਰੂਪ"
 
 #: ../data/empathy.schemas.in.h:4
 msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
@@ -49,15 +49,15 @@ msgstr "ਸਪੈਲ ਚੈਕਰ ਭਾਸ਼ਾਵਾਂ ਦੀ ਕਾਮਿ
 
 #: ../data/empathy.schemas.in.h:5
 msgid "Compact contact list"
-msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ"
+msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਸੂਚੀ"
 
 #: ../data/empathy.schemas.in.h:6
 msgid "Contact list sort criterium"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ"
+msgstr "ਸੰਪਰਕ ਸੂਚੀ ਲੜੀਬੱਧ"
 
 #: ../data/empathy.schemas.in.h:7
 msgid "Default directory to select an avatar image from"
-msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਨ ਵਾਸਤੇ ਡਿਫਾਲਟ ਡਾਇਰੈਕਟਰੀ"
+msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਨ ਵਾਸਤੇ ਮੂਲ ਡਾਇਰੈਕਟਰੀ"
 
 #: ../data/empathy.schemas.in.h:8
 msgid "Disable popup notifications when away"
@@ -85,17 +85,18 @@ 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 "ਇੰਪੈਂਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਕੁਨੈਕਟ ਹੋਵੇ"
+msgstr "ਇੰਪੈਂਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਸਵੈ-ਚਾਲਤ ਜੁੜੇ"
 
 #: ../data/empathy.schemas.in.h:17
+#| msgid "Empathy should auto-connect on startup"
 msgid "Empathy should reduce the location's accuracy"
 msgstr "ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ"
 
@@ -113,11 +114,11 @@ msgstr "ਸ਼ਬਦ-ਜੋੜ ਯੋਗ"
 
 #: ../data/empathy.schemas.in.h:21
 msgid "Hide main window"
-msgstr "ਮੁੱਖ ਵਿੰਡੋ ਓਹਲੇ"
+msgstr "ਮੁੱਖ ਝਰੋਖਾ ਓਹਲੇ"
 
 #: ../data/empathy.schemas.in.h:22
 msgid "Hide the main window."
-msgstr "ਮੁੱਖ ਵਿੰਡੋ ਓਹਲੇ ਕਰੋ"
+msgstr "ਮੁੱਖ ਝਰੋਖਾ ਓਹਲੇ ਕਰੋ"
 
 #: ../data/empathy.schemas.in.h:23
 msgid "NetworkManager should be used"
@@ -129,269 +130,230 @@ msgstr "ਨਾਂ ਪੂਰਾ ਅੱਖਰ"
 
 #: ../data/empathy.schemas.in.h:25
 msgid "Open new chats in separate windows"
-msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ"
+msgstr "ਵੱਖਰੇ ਝਰੋਖਿਆਂ ਵਿੱਚ ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਖੋਲ੍ਹੋ"
 
 #: ../data/empathy.schemas.in.h:26
-msgid "Path of the adium theme to use"
-msgstr "ਵਰਤਣ ਵਾਸਤੀ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ"
-
-#: ../data/empathy.schemas.in.h:27
-#| 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:28
 msgid "Play a sound for incoming messages"
 msgstr "ਆ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਇੱਕ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:27
 msgid "Play a sound for new conversations"
 msgstr "ਨਵੀਆਂ ਗੱਲਾਂਬਾਤਾਂ ਲਈ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:28
 msgid "Play a sound for outgoing messages"
 msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਆਵਾਜ਼ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound when a contact logs in"
 msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗਇਨ ਕਰੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound when a contact logs out"
 msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗ-ਆਉਟ ਕਰੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound when we log in"
 msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗਇਨ ਕਰੀਏ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when we log out"
 msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:33
 msgid "Popup notifications if the chat isn't focused"
 msgstr "ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਕਰੋ"
 
-#: ../data/empathy.schemas.in.h:36
-#| msgid "Popup notifications if the chat isn't focused"
-msgid "Popup notifications when a contact sign in"
-msgstr "ਜੇ ਸੰਪਰਕ ਸਾਇਨ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਕਰੋ"
-
-#: ../data/empathy.schemas.in.h:37
-#| msgid "Popup notifications if the chat isn't focused"
-msgid "Popup notifications when a contact sign out"
-msgstr "ਜੇ ਸੰਪਰਕ ਸਾਈਨ-ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਕਰੋ"
-
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:34
 msgid "Salut account is created"
 msgstr "ਸਲਾਉਟ ਅਕਾਊਂਟ ਬਣਾਇਆ"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:35
 msgid "Show avatars"
 msgstr "ਅਵਤਾਰ ਵੇਖੋ"
 
-#: ../data/empathy.schemas.in.h:40
-#| msgid "_Show Contact List"
-msgid "Show contact list in rooms"
-msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ"
-
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:36
 msgid "Show hint about closing the main window"
-msgstr "ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
+msgstr "ਮੁੱਖ ਝਰੋਖਾ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:37
 msgid "Show offline contacts"
 msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ ਵੇਖੋ"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:38
 msgid "Spell checking languages"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਭਾਸ਼ਾਵਾਂ"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:39
 msgid "The default folder to save file transfers in."
 msgstr "ਫਾਇਲ ਸੰਚਾਰ ਸੰਭਾਲਣ ਲਈ ਡਿਫਾਲਟ ਫੋਲਡਰ ਹੈ।"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:40
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ, ਜਿੱਥੇ ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਿਆ ਗਿਆ ਸੀ।"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:41
 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:42
 msgid "Use graphical smileys"
 msgstr "ਗਰਾਫਿਕਸ ਚਿਹਰੇ ਵਰਤੋਂ"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:43
 msgid "Use notification sounds"
 msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਰਤੋਂ"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:44
 msgid "Use theme for chat rooms"
 msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤੋਂ"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:45
 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:46
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੇ।"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:47
 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:48
 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:49
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਹੋਰ ਪਰੋਗਰਾਮਾਂ ਤੋਂ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਪੁੱਛੇ।"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:50
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤੁਹਾਡੇ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਲਾਗਇਨ ਕਰੇ।"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:51
 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:52
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "ਕੀ ਇੰਪੈਂਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:53
 msgid "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "ਕੀ ਪਹਿਲੀ ਵਾਰ ਇੰਪੈਂਥੀ ਚਲਾਉਣ ਲਈ ਲਾਉਟ ਅਕਾਊਂਟ ਬਣਾਇਆ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:54
 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:55
 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:56
 msgid "Whether or not to convert smileys into graphical images in conversations."
 msgstr "ਕੀ ਸਮਾਈਲੀ ਨੂੰ ਗੱਲਬਾਤ ਵਿੱਚ ਗਰਾਫਿਕਲ ਚਿੱਤਰਾਂ ਵਿੱਚ ਬਦਲਿਆ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:57
 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:58
 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:59
 msgid "Whether or not to play a sound to notify for events."
 msgstr "ਕੀ ਈਵੈਂਟਾਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:60
 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:61
 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:62
 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:63
 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:64
 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:65
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝੇ ਹੋਵੇ ਤਾਂ ਕੀ ਸਾਊਂਡ ਸੂਚਨਾਵਾਂ ਚਲਾਉਣੀਆਂ ਹਨ ਜਾਂ ਨਹੀਂ।"
 
-#: ../data/empathy.schemas.in.h:71
-#| 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:72
-#| 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:73
+#: ../data/empathy.schemas.in.h:66
 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:67
 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:68
 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:69
 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:70
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਦੂਰ ਰੁੱਝੇ ਹੋਵੋ"
 
-#: ../data/empathy.schemas.in.h:78
-#| 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:79
+#: ../data/empathy.schemas.in.h:71
 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:80
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਨੂੰ ਸੰਖੇਪ ਮੋਡ ਵਿੱਚ ਵੇਖਣਾ ਹੈ।"
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:73
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "ਕੀ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤਣਾ ਹੈ।"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:74
 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 (ਹਾਲਤ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ"
+"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ ਡਿਫਾਲਟ "
+"ਸੰਪਰਕ ਦੇ ਨਾਂ ਨਾਲ \"name (ਨਾਂ)\" ਹੈ। \"state (ਹਾਲਤ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ"
 
 #: ../libempathy/empathy-ft-handler.c:838
 msgid "The hash of the received file and the sent one do not match"
@@ -401,67 +363,55 @@ msgstr "ਮਿਲੀ ਫਾਇਲ ਅਤੇ ਭੇਜੀ ਦਾ ਹੈਸ਼ ਰ
 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:757 ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:727 ../src/empathy.c:286
 msgid "People nearby"
 msgstr "ਨੇੜਲੇ ਲੋਕ"
 
-#: ../libempathy/empathy-tp-file.c:279
-msgid "Socket type not supported"
-msgstr "ਸਾਕਟ ਟਾਈਪ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:300
 msgid "No reason was specified"
 msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:303
 msgid "The change in state was requested"
 msgstr "ਹਾਲਤ ਬਦਲਣ ਲਈ ਮੰਗ ਹੈ"
 
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:306
 msgid "You canceled the file transfer"
 msgstr "ਤੁਸੀਂ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
 
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:309
 msgid "The other participant canceled the file transfer"
 msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਨੇ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
 
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:312
 msgid "Error while trying to transfer the file"
 msgstr "ਫਾਇਲ ਸੰਚਾਰ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:315
 msgid "The other participant is unable to transfer the file"
 msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਫਾਇਲ ਸੰਚਾਰ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:318
 msgid "Unknown reason"
 msgstr "ਅਣਜਾਣ ਕਾਰਨ"
 
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:274
 msgid "Available"
 msgstr "ਉਪਲੱਬਧ"
 
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:276
 msgid "Busy"
 msgstr "ਰੁਝੇ"
 
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:279
 msgid "Away"
 msgstr "ਦੂਰ"
 
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:281
 msgid "Hidden"
 msgstr "ਓਹਲੇ"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:283
 msgid "Offline"
 msgstr "ਆਫਲਾਈਨ"
 
@@ -493,22 +443,14 @@ msgid_plural "%d days ago"
 msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
 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] "%d ਹਫ਼ਤਾ ਪਹਿਲਾਂ"
-msgstr[1] "%d ਹਫ਼ਤੇ ਪਹਿਲਾਂ"
-
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:157
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ਮਹੀਨਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:162
 msgid "in the future"
 msgstr "ਭਵਿੱਖ ਵਿੱਚ"
 
@@ -531,9 +473,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>"
-msgid "Advanced"
-msgstr "ਤਕਨੀਕੀ"
+msgid "<b>Advanced</b>"
+msgstr "<b>ਤਕਨੀਕੀ</b>"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
@@ -569,7 +510,7 @@ 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-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "ਲਾਗਇਨ I_D:"
@@ -583,47 +524,49 @@ msgstr "ICQ _UIN:"
 msgid "_Charset:"
 msgstr "ਅੱਖਰ-ਸੈੱਟ(_C):"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:241
 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:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "ਨੈੱਟਵਰਕ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "ਨੈੱਟਵਰਕ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "ਬੰਦ ਕਰਨ ਸੁਨੇਹਾ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "ਅਸਲੀ ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-#| 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:2
+msgid "<b>Override server settings</b>"
+msgstr "<b>ਸਰਵਰ ਸੈਟਿੰਗ ਅਣਡਿੱਠਾ</b>"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
@@ -700,7 +643,7 @@ msgstr "ਕਨਫਰੰਸ ਅਤੇ ਗੱਲਬਾਤ-ਰੂਮ ਸੱਦੇ 
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
-msgstr "ਰੂਮ ਲਿਸਟ ਭਾਸ਼ਾ(_R):"
+msgstr "ਰੂਮ ਸੂਚੀ ਭਾਸ਼ਾ(_R):"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:449
 #: ../libempathy-gtk/empathy-avatar-chooser.c:525
@@ -731,143 +674,108 @@ msgstr "ਸਭ ਫਾਇਲਾਂ"
 msgid "Click to enlarge"
 msgstr "ਵੱਡਾ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:178
 msgid "Failed to reconnect this chat"
 msgstr "ਇਸ ਗੱਲ ਨਾਲ ਫੇਰ-ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../libempathy-gtk/empathy-chat.c:404
+#: ../libempathy-gtk/empathy-chat.c:396
 msgid "Unsupported command"
 msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਕਮਾਂਡ"
 
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:531
 msgid "offline"
 msgstr "ਆਫਲਾਈਨ"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:534
 msgid "invalid contact"
 msgstr "ਗਲਤ ਸੰਪਰਕ"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:537
 msgid "permission denied"
 msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:540
 msgid "too long message"
 msgstr "ਬਹੁਤ ਲੰਮਾ ਸੁਨੇਹਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:543
 msgid "not implemented"
 msgstr "ਸਥਾਪਤ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:546
 msgid "unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:550
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "ਸੁਨੇਹਾ '%s' ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:580
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ਵਿਸ਼ਾ ਨਹੀਂ ਕੀਤਾ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:582
 msgid "No topic defined"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:959
+#: ../libempathy-gtk/empathy-chat.c:951
 msgid "(No Suggestions)"
 msgstr "(ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ)"
 
-#: ../libempathy-gtk/empathy-chat.c:1013
+#: ../libempathy-gtk/empathy-chat.c:1005
 msgid "Insert Smiley"
 msgstr "ਚਿਹਰਾ ਸ਼ਾਮਲ ਕਰੋ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1031
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
+#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-ui-utils.c:1453
 msgid "_Send"
 msgstr "ਭੇਜੋ(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1057
 msgid "_Spelling Suggestions"
 msgstr "ਸਪੈਲਿੰਗ ਸੁਝਾਅ(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1180, c-format
-#| msgid "Contact disconnected"
-msgid "%s has disconnected"
-msgstr "%s ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
-
-#: ../libempathy-gtk/empathy-chat.c:1184
-#, c-format
-msgid "%s was kicked by %s"
-msgstr "%s ਨੂੰ %s ਨੇ ਕਿੱਕ ਮਾਰੀ"
-
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1171
 #, c-format
-msgid "%s was kicked"
-msgstr "%s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
-
-#: ../libempathy-gtk/empathy-chat.c:1192
-#, c-format
-msgid "%s was banned by %s"
-msgstr "%s ਉੱਤੇ %s ਵਲੋਂ ਪਾਬੰਦੀ ਲਾਈ"
-
-#: ../libempathy-gtk/empathy-chat.c:1195
-#, c-format
-msgid "%s was banned"
-msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
+msgid "%s has joined the room"
+msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
 
-#: ../libempathy-gtk/empathy-chat.c:1199
+#: ../libempathy-gtk/empathy-chat.c:1174
 #, 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:1208
-#, c-format
-msgid " (%s)"
-msgstr " (%s)"
-
-#: ../libempathy-gtk/empathy-chat.c:1231
-#, c-format
-msgid "%s has joined the room"
-msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
-
-#: ../libempathy-gtk/empathy-chat.c:1364 ../src/empathy-call-window.c:1226
+#: ../libempathy-gtk/empathy-chat.c:1289 ../src/empathy-call-window.c:1014
 msgid "Disconnected"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
 
-#: ../libempathy-gtk/empathy-chat.c:1793
+#: ../libempathy-gtk/empathy-chat.c:1700
 msgid "Connected"
 msgstr "ਕੁਨੈਕਟ ਕੀਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:1843
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:1750
+#: ../libempathy-gtk/empathy-log-window.c:501
 msgid "Conversation"
 msgstr "ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
-msgid "Topic:"
-msgstr "ਵਿਸ਼ਾ:"
+#: ../libempathy-gtk/empathy-chat.ui.h:1
+msgid "<b>Topic:</b>"
+msgstr "<b>ਵਿਸ਼ਾ:</b>"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
 msgid "_Copy Link Address"
-msgstr "ਲਿੰਕ ਐਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_C)"
+msgstr "ਲਿੰਕ ਸਿਰਨਾਵਾਂ ਨਕਲ ਕਰੋ(_C)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
 msgid "_Open Link"
 msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -880,7 +788,7 @@ msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸੋਧ"
 msgid "Personal Information"
 msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:384
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
 msgid "New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ"
 
@@ -892,26 +800,26 @@ msgstr "ਬਾਅਦ 'ਚ ਸੋਚੂ(_L)"
 msgid "Subscription Request"
 msgstr "ਮੈਂਬਰੀ ਮੰਗ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1378
 #, 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:1380
 msgid "Removing group"
 msgstr "ਗਰੁੱਪ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1424
-#: ../libempathy-gtk/empathy-contact-list-view.c:1502
+#: ../libempathy-gtk/empathy-contact-list-view.c:1427
+#: ../libempathy-gtk/empathy-contact-list-view.c:1505
 msgid "_Remove"
 msgstr "ਹਟਾਓ(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1454
+#: ../libempathy-gtk/empathy-contact-list-view.c:1457
 #, 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:1459
 msgid "Removing contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
@@ -972,7 +880,7 @@ msgid "Select"
 msgstr "ਚੁਣੋ"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:903
+#: ../src/empathy-main-window.c:905
 msgid "Group"
 msgstr "ਗਰੁੱਪ"
 
@@ -1082,59 +990,55 @@ msgstr "<b>ਟਿਕਾਣਾ</b>, "
 
 #: ../libempathy-gtk/empathy-contact-widget.c:1395
 msgid "%B %e, %Y at %R UTC"
-msgstr "%R UTC %e %B %Y ਨੂੰ"
+msgstr "%B %e, %Y at %R UTC"
 
 #: ../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 "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../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
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 msgid "Alias:"
 msgstr "ਉਪ-ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Birthday:"
 msgstr "ਜਨਮਦਿਨ:"
 
-#: ../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
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Client:"
 msgstr "ਕਲਾਇਟ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:886
-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
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Email:"
 msgstr "ਈਮੇਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
 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:"
@@ -1153,7 +1057,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
@@ -1184,12 +1089,12 @@ msgstr "ਪੋਰਟ"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../libempathy-gtk/empathy-log-window.c:494
+#: ../src/empathy-import-dialog.c:281
 msgid "Account"
 msgstr "ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:511
 msgid "Date"
 msgstr "ਮਿਤੀ"
 
@@ -1251,55 +1156,15 @@ msgstr "ਇਹ ਹਾਲਤ ਨੂੰ ਪਸੰਦੀਦਾ ਬਣਾਉਣ ਲ
 msgid "Set status"
 msgstr "ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:778
 msgid "Set your presence and current status"
 msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਅਤੇ ਮੌਜੂਦਾ ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+#: ../libempathy-gtk/empathy-presence-chooser.c:1013
 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 "ਪਸੰਦੀਦਾ ਸੁਨੇਹਾ ਦਿਓ"
@@ -1324,34 +1189,75 @@ msgstr "gtk-add"
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:60
 msgid "Classic"
 msgstr "ਕਲਾਸਿਕ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:61
 msgid "Simple"
 msgstr "ਸਧਾਰਨ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:62
 msgid "Clean"
 msgstr "ਸਾਫ਼"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:63
 msgid "Blue"
 msgstr "ਨੀਲਾ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1377
+#: ../libempathy-gtk/empathy-ui-utils.c:1355
 msgid "Unable to open URI"
 msgstr "URI ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1467
+#: ../libempathy-gtk/empathy-ui-utils.c:1445
 msgid "Select a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1525
+#: ../libempathy-gtk/empathy-ui-utils.c:1503
+#| msgid "Select a contact"
 msgid "Select a destination"
 msgstr "ਟਿਕਾਣਾ ਚੁਣੋ"
 
+#: ../libempathy-gtk/empathy-ui-utils.c:1532
+msgid "Received an instant message"
+msgstr "ਇੱਕ ਤੁਰੰਤ ਸੁਨੇਹੇ ਮਿਲਿਆ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1534
+msgid "Sent an instant message"
+msgstr "ਇੱਕ ਤੁਰੰਤ ਸੁਨੇਹੇ ਭੇਜਿਆ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1536
+msgid "Incoming chat request"
+msgstr "ਆ ਰਹੀ ਗੱਲਬਾਤ ਮੰਗ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1538
+msgid "Contact connected"
+msgstr "ਸੰਪਰਕ ਕੁਨੈਕਟ ਹੋਇਆ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1540
+msgid "Contact disconnected"
+msgstr "ਸੰਪਰਕ ਨੇ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1542
+msgid "Connected to server"
+msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1544
+msgid "Disconnected from server"
+msgstr "ਸਰਵਰ ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1546
+msgid "Incoming voice call"
+msgstr "ਆ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1548
+msgid "Outgoing voice call"
+msgstr "ਜਾ ਰਹੀ ਆਵਾਜ਼ ਕਾਲ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1550
+msgid "Voice call ended"
+msgstr "ਆਵਾਜ਼ ਕਾਲ ਖਤਮ ਕੀਤੀ"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "ਮੌਜੂਦਾ ਲੋਕੇਲ"
@@ -1535,7 +1441,7 @@ msgid "Megaphone"
 msgstr "ਮੇਗਾਫੋਨ"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:527
 msgid "Talk!"
 msgstr "ਗੱਲ!"
 
@@ -1570,79 +1476,79 @@ msgstr "ਮੌਜੂਦਗੀ"
 msgid "Set your own presence"
 msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਦਿਓ"
 
-#: ../src/empathy.c:506
+#: ../src/empathy.c:476
 msgid "Don't connect on startup"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਕੁਨੈਕਟ ਨਾ ਕਰੋ"
 
-#: ../src/empathy.c:510
+#: ../src/empathy.c:480
 msgid "Don't show the contact list on startup"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਸੰਪਰਕ ਸੂਚੀ ਨਾ ਵੇਖਾਓ"
 
-#: ../src/empathy.c:514
+#: ../src/empathy.c:484
 msgid "Show the accounts dialog"
 msgstr "ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਵੇਖੋ"
 
-#: ../src/empathy.c:526
+#: ../src/empathy.c:496
 msgid "- Empathy Instant Messenger"
 msgstr "- ਇੰਪਥੀ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../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 ""
-"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਇੱਕ ਮੁਫਤ ਸਾਫਟਵੇਅਰ ਹੈ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ, ਜਿਸ ਨੂੰ ਫਰੀ "
-"ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ ੨ ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ (ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ "
-"ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
+"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਇੱਕ ਮੁਫਤ ਸਾਫਟਵੇਅਰ ਹੈ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ, "
+"ਜਿਸ ਨੂੰ ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ ੨ ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ "
+"(ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
 
-#: ../src/empathy-about-dialog.c:87
+#: ../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 ""
-"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ, ਪਰ ਇਸ ਦੀ ਕੋਈ ਵਾਰੰਟੀ "
-"ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ "
-"ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।"
+"ਇੰਪੈਂਥੀ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ, "
+"ਪਰ ਇਸ ਦੀ ਕੋਈ ਵਾਰੰਟੀ ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ "
+"ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।"
 
-#: ../src/empathy-about-dialog.c:91
+#: ../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 ""
 "ਇੰਪੈਂਥੀ ਨਾਲ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਦੀ ਕਾਪੀ ਪ੍ਰਾਪਤ ਕਰੋਗੇ, ਜੇਕਰ ਤੁਹਾਨੂੰ ਨਹੀਂ ਮਿਲੀ ਹੈ ਤਾਂ "
-"ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, ਐਮ ਏ ੦੨੧੧੦-੧੩੦੧੫੯, "
-"ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।"
+"ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, ਐਮ ਏ "
+"੦੨੧੧੦-੧੩੦੧੫੯, ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:120
 msgid "An Instant Messaging client for GNOME"
 msgstr "ਗਨੋਮ ਲਈ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਕਲਾਇਟ"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:126
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net) 2007, 2008, 2009\n"
 "http://www.satluj.com/"
 
-#: ../src/empathy-accounts-dialog.c:392
+#: ../src/empathy-accounts-dialog.c:391
 msgid "Enabled"
 msgstr "ਚਾਲੂ"
 
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.c:401 ../src/empathy-accounts-dialog.ui.h:4
 msgid "Accounts"
 msgstr "ਅਕਾਊਂਟ"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#: ../src/empathy-accounts-dialog.c:834
 #, c-format
 msgid "New %s account"
 msgstr "ਨਵਾਂ %s ਅਕਾਊਂਟ"
 
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-accounts-dialog.c:944
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1651,7 +1557,7 @@ msgstr ""
 "ਤੁਸੀਂ %s ਅਕਾਊਂਟ ਹਟਾਉਣ ਲਈ ਤਿਆਰ ਹੋ!\n"
 "ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:950
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1663,33 +1569,29 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਉਹ ਤਾਂ ਵੀ ਉਪਲੱਬਧ ਰਹਿਣਗੇ।"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "<b>New Account</b>"
+msgstr "<b>ਨਵਾਂ ਅਕਾਊਂਟ</b>"
+
 #: ../src/empathy-accounts-dialog.ui.h:2
-#| msgid "Account"
-msgid "Add Account"
-msgstr "ਅਕਾਊਂਟ ਸ਼ਾਮਲ"
+msgid "<b>No protocol installed</b>"
+msgstr "<b>ਕੋਈ ਪਰੋਟੋਕਾਲ ਇੰਸਟਾਲ ਨਹੀਂ</b>"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "ਬਣਾਓ(_e)"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
-#| msgid "Email:"
-msgid "Gmail"
-msgstr "ਜੀਮੇਲ"
+msgid "<b>Settings</b>"
+msgstr "<b>ਸੈਟਿੰਗ</b>"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ..."
+msgid "Cr_eate"
+msgstr "ਬਣਾਓ(_e)"
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-#| msgid "<b>No protocol installed</b>"
-msgid "No protocol installed"
-msgstr "ਕੋਈ ਪਰੋਟੋਕਾਲ ਇੰਸਟਾਲ ਨਹੀਂ"
+msgid "I already have an account I want to use"
+msgstr "ਮੇਰੇ ਕੋਲ ਪਹਿਲਾਂ ਹੀ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਮੈਂ ਵਰਤਣਾ ਚਾਹੁੰਦਾ ਹਾਂ"
 
 #: ../src/empathy-accounts-dialog.ui.h:7
-#| msgid "<b>Settings</b>"
-msgid "Settings"
-msgstr "ਸੈਟਿੰਗ"
+msgid "Import Accounts..."
+msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ..."
 
 #: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
@@ -1707,63 +1609,53 @@ msgstr "ਕਿਸਮ:"
 msgid "_Add..."
 msgstr "ਸ਼ਾਮਲ(_A)..."
 
-#: ../src/empathy-accounts-dialog.ui.h:11
-#| msgid "Create a new IRC network"
-msgid "_Create a new account"
-msgstr "ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ(_C)"
-
-#: ../src/empathy-accounts-dialog.ui.h:12
-#| msgid "Show and edit accounts"
-msgid "_Reuse an existing account"
-msgstr "ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਨੂੰ ਵਰਤੋਂ(_R)"
-
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-call-window.c:382
 msgid "Contrast"
 msgstr "ਕਨਟਰਾਸਟ"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:385
 msgid "Brightness"
 msgstr "ਚਮਕ"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:388
 msgid "Gamma"
 msgstr "ਗਾਮਾ"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:492
 msgid "Volume"
 msgstr "ਆਵਾਜ਼"
 
-#: ../src/empathy-call-window.c:662
-msgid "Connecting..."
-msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:638
 msgid "_Sidebar"
 msgstr "ਬਾਹੀ(_S)"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:657
 msgid "Dialpad"
 msgstr "ਡਾਇਲ-ਪੈਡ"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:663
 msgid "Audio input"
 msgstr "ਆਡੀਓ ਆਉਟਪੁੱਟ"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:667
 msgid "Video input"
 msgstr "ਵੀਡਿਓ ਆਉਟਪੁੱਟ"
 
-#: ../src/empathy-call-window.c:836
+#: ../src/empathy-call-window.c:691
+msgid "Connecting..."
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../src/empathy-call-window.c:730
 #, c-format
 msgid "Call with %s"
 msgstr "%s ਲਈ ਕਾਲ ਕਰੋ"
 
-#: ../src/empathy-call-window.c:905
+#: ../src/empathy-call-window.c:801
 msgid "Call"
 msgstr "ਕਾਲ ਕਰੋ"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1336
+#: ../src/empathy-call-window.c:1096
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "ਕੁਨੈਕਟ ਹੈ -- %d:%02dm"
@@ -1773,38 +1665,43 @@ 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
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send video"
 msgstr "ਵੀਡਿਓ ਭੇਜੋ"
 
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:4
 msgid "Video preview"
 msgstr "ਵੀਡਿਓ ਝਲਕ"
 
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:5
 msgid "_Call"
 msgstr "ਕਾਲ ਕਰੋ(_C)"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:6 ../src/empathy-main-window.ui.h:21
 msgid "_View"
 msgstr "ਵੇਖੋ(_V)"
 
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:342
 #, c-format
 msgid "Conversations (%d)"
 msgstr "ਗੱਲਬਾਤ (%d)"
 
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:449
+msgid "Topic:"
+msgstr "ਵਿਸ਼ਾ:"
+
+#: ../src/empathy-chat-window.c:454
 msgid "Typing a message."
 msgstr "ਸੁਨੇਹਾ ਲਿਖਦਾ/ਲਿਖਦੀ ਹੈ।"
 
+#: ../src/empathy-chat-window.c:917 ../src/empathy-event-manager.c:429
+#, c-format
+msgid "New message from %s"
+msgstr "%s ਵਲੋਂ ਨਵਾਂ ਸੁਨੇਹਾ"
+
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "ਨਾਂ"
@@ -1821,75 +1718,75 @@ msgstr "ਆਟੋ-ਕੁਨੈਕਟ"
 msgid "Manage Favorite Rooms"
 msgstr "ਪਸੰਦੀਦਾ ਰੂਮ ਪਰਬੰਧ"
 
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:377
 msgid "Incoming call"
 msgstr "ਆ ਰਹੀ ਕਾਲ"
 
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:380
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s ਤੁਹਾਨੂੰ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤੁਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:387
 msgid "_Reject"
 msgstr "ਰੱਦ ਕਰੋ(_R)"
 
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:393
 msgid "_Answer"
 msgstr "ਜਵਾਬ ਦਿਓ(_A)"
 
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ਤੋਂ ਕਾਲ ਆ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:547
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s ਤੁਹਾਨੂੰ ਇੱਕ ਸੱਦਾ ਦੇ ਰਿਹਾ ਹੈ"
 
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:553
 msgid "An external application will be started to handle it."
 msgstr "ਇਸ ਨੂੰ ਵਰਤਣ ਲਈ ਇੱਕ ਬਾਹਰੀ ਐਪਲੀਕੇਸ਼ਨ ਵਰਤੀ ਜਾਵੇਗੀ।"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:558
 msgid "You don't have the needed external application to handle it."
-msgstr "ਤੁਹਾਨੂੰ ਇਹ ਹੈਂਡਲ ਕਰਨ ਲਈ ਬਾਹਰੀ ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
+msgstr "ਤੁਹਾਨੂੰ ਇਹ ਹੈਂਡਲ ਕਰਨ ਲਈ ਬਾਹਰੀ ਕਾਰਜ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ।"
 
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:685
 msgid "Room invitation"
 msgstr "ਰੂਮ ਸੱਦਾ"
 
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:688
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "%s ਤੁਹਾਨੂੰ %s ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
+msgstr "%s ਤੁਹਾਨੂੰ %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
 
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:696
 msgid "_Decline"
 msgstr "ਇਨਕਾਰ(_D)"
 
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:701
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "ਦਾਖਲ(_J)"
 
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:740
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ਨੇ ਤੁਹਾਨੂੰ %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦਿਆ"
 
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:766
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s ਤੋਂ ਆ ਰਿਹਾ ਫਾਇਲ ਸੰਚਾਰ"
 
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:946
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s ਵਲੋਂ ਮੈਂਬਰੀ ਚਾਹੀਦੀ ਹੈ"
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid ""
 "\n"
@@ -1898,18 +1795,6 @@ msgstr ""
 "\n"
 "ਸੁਨੇਹਾ: %s"
 
-#. 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
@@ -1932,8 +1817,8 @@ msgstr "ਅਣਜਾਣ"
 msgid "%s of %s at %s/s"
 msgstr "%3$s/s ਨਾਲ %2$s ਵਿੱਚੋਂ %1$s"
 
-#: ../src/empathy-ft-manager.c:276
-#, c-format
+#: ../src/empathy-ft-manager.c:276, c-format
+#| msgid "%s of %s at %s/s"
 msgid "%s of %s"
 msgstr "%2$s ਵਿੱਚੋਂ %1$s"
 
@@ -1952,20 +1837,21 @@ 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"
+#| msgid "Receiving \"%s\" from %s"
 msgid "Error receiving \"%s\" from %s"
-msgstr "%2$s ਤੋਂ \"%1$s\"  ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
+msgstr "%2$s ਤੋਂ \"%s\"  ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
 
 #: ../src/empathy-ft-manager.c:343
 msgid "Error receiving a file"
 msgstr "ਫਾਇਲ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/empathy-ft-manager.c:348
-#, c-format
+#: ../src/empathy-ft-manager.c:348, c-format
+#| msgid "Sending \"%s\" to %s"
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" %s ਨੂੰ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
 
 #: ../src/empathy-ft-manager.c:351
+#| msgid "Error sending message '%s': %s"
 msgid "Error sending a file"
 msgstr "ਫਾਇਲ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
 
@@ -2014,28 +1900,27 @@ msgid "Remaining"
 msgstr "ਬਾਕੀ"
 
 #: ../src/empathy-ft-manager.ui.h:1
-#| msgid "_File Transfers"
-msgid "File Transfers"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ"
+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
+#: ../src/empathy-import-dialog.c:259
 msgid "Import"
 msgstr "ਇੰਪੋਰਟ"
 
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-dialog.c:268
 msgid "Protocol"
 msgstr "ਪਰੋਟੋਕਾਲ"
 
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-dialog.c:294
 msgid "Source"
 msgstr "ਸਰੋਤ"
 
-#: ../src/empathy-import-dialog.c:392
+#: ../src/empathy-import-dialog.c:388
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -2047,75 +1932,80 @@ msgstr ""
 msgid "Import Accounts"
 msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ"
 
-#: ../src/empathy-main-window.c:396
+#: ../src/empathy-main-window.c:395
 msgid "_Edit account"
 msgstr "ਅਕਾਊਂਟ ਸੋਧ(_E)"
 
-#: ../src/empathy-main-window.c:499
+#: ../src/empathy-main-window.c:498
 msgid "No error specified"
 msgstr "ਕੋਈ ਗਲਤੀ ਨਹੀਂ ਦਿੱਤੀ"
 
-#: ../src/empathy-main-window.c:502
+#: ../src/empathy-main-window.c:501
 msgid "Network error"
 msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ"
 
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:504
 msgid "Authentication failed"
 msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:507
 msgid "Encryption error"
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਗਲਤੀ"
 
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:510
 msgid "Name in use"
 msgstr "ਵਰਤਣ ਲਈ ਨਾਂ"
 
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:513
 msgid "Certificate not provided"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:516
 msgid "Certificate untrusted"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਬੇਭਰੋਸੇਯੋਗ"
 
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:519
 msgid "Certificate expired"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗੀ"
 
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:522
 msgid "Certificate not activated"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਸਰਗਰਮ ਨਹੀਂ ਹੈ"
 
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:525
 msgid "Certificate hostname mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ ਨਹੀਂ ਮਿਲਦਾ"
 
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:528
 msgid "Certificate fingerprint mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਫਿੰਗਰ-ਪਰਿੰਟ ਮਿਲਦਾ ਨਹੀਂ"
 
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:531
 msgid "Certificate self-signed"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਖੁਦ-ਦਸਤਖਤੀ ਹੈ"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:534
 msgid "Certificate error"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤੀ"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:537
 msgid "Unknown error"
 msgstr "ਅਣਜਾਣ ਗਲਤੀ"
 
-#: ../src/empathy-main-window.c:1218
+#: ../src/empathy-main-window.c:888
+msgid "Contact"
+msgstr "ਸੰਪਰਕ"
+
+#: ../src/empathy-main-window.c:1220
 msgid "Show and edit accounts"
 msgstr "ਅਕਾਊਂਟ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"
 
-#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ"
 
 #: ../src/empathy-main-window.ui.h:2
+#| msgid "Show Contacts on a Map"
 msgid "Contacts on a _Map"
 msgstr "ਨਕਸ਼ੇ ਉੱਤੇ ਸੰਪਰਕ(_M)"
 
@@ -2148,6 +2038,7 @@ msgid "_Debug"
 msgstr "ਡੀਬੱਗ(_D)"
 
 #: ../src/empathy-main-window.ui.h:12
+#| msgid "File transfers"
 msgid "_File Transfers"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
 
@@ -2157,13 +2048,14 @@ msgstr "ਮੱਦਦ(_H)"
 
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Join..."
-msgstr "ਜੁਆਇੰਨ(_J)..."
+msgstr "ਦਾਖਲ(_J)..."
 
 #: ../src/empathy-main-window.ui.h:15 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ(_N)..."
 
 #: ../src/empathy-main-window.ui.h:16
+#| msgid "Show _Offline Contacts"
 msgid "_Offline Contacts"
 msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ(_O)"
 
@@ -2172,6 +2064,7 @@ msgid "_Personal Information"
 msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ(_P)"
 
 #: ../src/empathy-main-window.ui.h:19
+#| msgid "Previous Conversations"
 msgid "_Previous Conversations"
 msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
 
@@ -2179,15 +2072,15 @@ msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
 msgid "_Room"
 msgstr "ਰੂਮ(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:332
 msgid "Chat Room"
 msgstr "ਗੱਲਬਾਤ ਰੂਮ"
 
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:348
 msgid "Members"
 msgstr "ਮੈਂਬਰ"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:492
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2203,21 +2096,21 @@ msgstr ""
 "ਪਾਸਵਰਡ ਲੋੜੀਦਾ: %s\n"
 "ਮੈਂਬਰ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:495
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:495
 msgid "No"
 msgstr "ਨਹੀਂ"
 
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:522
 msgid "Could not start room listing"
 msgstr "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:532
 msgid "Could not stop room listing"
 msgstr "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਰੋਕਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
@@ -2247,206 +2140,185 @@ msgstr "ਰੂਮ ਲਿਸਟ"
 msgid "_Room:"
 msgstr "ਰੂਮ(_R):"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:162
 msgid "Message received"
 msgstr "ਸੁਨੇਹਾ ਮਿਲਿਆ"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:163
 msgid "Message sent"
 msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:164
 msgid "New conversation"
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:165
 msgid "Contact goes online"
 msgstr "ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਇਆ"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:166
 msgid "Contact goes offline"
 msgstr "ਸੰਪਰਕ ਬੰਦ ਕਰ ਗਿਆ"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:167
 msgid "Account connected"
 msgstr "ਅਕਾਊਂਟ ਕੁਨੈਕਟ ਕੀਤਾ"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:168
 msgid "Account disconnected"
 msgstr "ਅਕਾਊਂਟ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਹੋਇਆ"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:435
 msgid "Language"
 msgstr "ਭਾਸ਼ਾ"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "_GPS ਵਰਤੋਂ ਮਨਜ਼ੂਰ"
+msgid "<b>Appearance</b>"
+msgstr "<b>ਦਿੱਖ</b>"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "ਸੈਲ-ਫੋਨ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_C)"
+msgid "<b>Behavior</b>"
+msgstr "<b>ਰਵੱਈਆ</b>"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_N)"
+msgid "<b>Contact List</b>"
+msgstr "<b>ਸੰਪਰਕ ਲਿਸਟ</b>"
 
 #: ../src/empathy-preferences.ui.h:4
-#| msgid "<b>Appearance</b>"
-msgid "Appearance"
-msgstr "ਦਿੱਖ"
+msgid "<b>Enable spell checking for languages:</b>"
+msgstr "<b>ਭਾਸ਼ਾਵਾਂ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:</b>"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Automatically _connect on startup "
-msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕੁਨੈਕਟ ਕਰੋ(_c)"
+#| msgid "<b>Settings</b>"
+msgid "<b>Geoclue Settings</b>"
+msgstr "<b>ਜੀਓ-ਕਲੂ ਸੈਟਿੰਗ</b>"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "ਅਵਤਾਰ ਯੂਜ਼ਰਾਂ ਲਈ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚੋਂ ਚੁਣੇ ਚਿੱਤਰ ਹਨ"
+msgid "<b>Play sound for events</b>"
+msgstr "<b>ਘਟਨਾਵਾਂ ਲਈ ਸਾਊਂਡ ਚਲਾਓ</b>"
 
 #: ../src/empathy-preferences.ui.h:7
-#| msgid "<b>Behavior</b>"
-msgid "Behavior"
-msgstr "ਰਵੱਈਆ"
+#| msgid "<b>Advanced</b>"
+msgid "<b>Privacy</b>"
+msgstr "<b>ਪਰਾਈਵੇਸੀ</b>"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Chat Th_eme:"
-msgstr "ਗੱਲਬਾਤ ਥੀਮ(_e):"
+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>"
+
+#: ../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>"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Disable notifications when _away or busy"
-msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝਿਆ/ਰੁਝੀ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਰੱਖੋ(_a)"
+msgid "Allow _GPS usage"
+msgstr "_GPS ਵਰਤੋਂ ਮਨਜ਼ੂਰ"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Disable sounds when _away or busy"
-msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁਝਿਆ/ਰੁਝੀ ਹੋਵਾਂ ਤਾਂ ਸਾਊਂਡ ਬੰਦ ਰੱਖੋ(_a)"
+msgid "Allow _cellphone usage"
+msgstr "ਸੈਲ-ਫੋਨ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_C)"
 
 #: ../src/empathy-preferences.ui.h:12
-#| msgid "Enable notifications when the _chat is not focused"
-msgid "Enable notifications when a contact comes online"
-msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਆਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
+msgid "Allow _network usage"
+msgstr "ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਮਨਜ਼ੂਰ(_N)"
 
 #: ../src/empathy-preferences.ui.h:13
-#| msgid "Enable notifications when the _chat is not focused"
-msgid "Enable notifications when a contact goes offline"
-msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਜਾਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
+msgid "Automatically _connect on startup "
+msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕੁਨੈਕਟ ਕਰੋ(_c)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Enable notifications when the _chat is not focused"
-msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ(_c)"
+msgid "Avatars are user chosen images shown in the contact list"
+msgstr "ਅਵਤਾਰ ਯੂਜ਼ਰਾਂ ਲਈ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚੋਂ ਚੁਣੇ ਚਿੱਤਰ ਹਨ"
 
 #: ../src/empathy-preferences.ui.h:15
-#| msgid "<b>Enable spell checking for languages:</b>"
-msgid "Enable spell checking for languages:"
-msgstr "ਭਾਸ਼ਾਵਾਂ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:"
+msgid "Chat Th_eme:"
+msgstr "ਗੱਲਬਾਤ ਥੀਮ(_e):"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "General"
-msgstr "ਆਮ"
+msgid "Disable notifications when _away or busy"
+msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝਿਆ/ਰੁਝੀ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਰੱਖੋ(_a)"
 
 #: ../src/empathy-preferences.ui.h:17
-#| msgid "<b>Geoclue Settings</b>"
-msgid "Geoclue Settings"
-msgstr "ਭੂਗੋਲਿਕ-ਸੁਰਾਗ ਸੈਟਿੰਗ"
+msgid "Disable sounds when _away or busy"
+msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁਝਿਆ/ਰੁਝੀ ਹੋਵਾਂ ਤਾਂ ਸਾਊਂਡ ਬੰਦ ਰੱਖੋ(_a)"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location"
-msgstr "ਟਿਕਾਣਾ"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਦਿਓ(_c)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Notifications"
-msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ"
+msgid "General"
+msgstr "ਆਮ"
 
 #: ../src/empathy-preferences.ui.h:20
-#| msgid "<b>Play sound for events</b>"
-msgid "Play sound for events"
-msgstr "ਘਟਨਾਵਾਂ ਲਈ ਸਾਊਂਡ ਚਲਾਓ"
+#| msgid "<b>Location</b>"
+msgid "Location"
+msgstr "ਟਿਕਾਣਾ"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Preferences"
-msgstr "ਪਸੰਦ"
+msgid "Notifications"
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
 #: ../src/empathy-preferences.ui.h:22
-#| msgid "<b>Privacy</b>"
-msgid "Privacy"
-msgstr "ਪਰਾਈਵੇਸੀ"
+msgid "Preferences"
+msgstr "ਪਸੰਦ"
 
 #: ../src/empathy-preferences.ui.h:23
-#| 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:24
 msgid "Show _avatars"
 msgstr "ਅਵਤਾਰ ਵੇਖੋ(_a)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "ਖੁਸ਼ ਚਿੱਤਰਾਂ ਵਾਂਗ ਵੇਖੋ(_s)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show co_mpact contact list"
 msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_m)"
 
-#: ../src/empathy-preferences.ui.h:27
-#| msgid "_Show Contact List"
-msgid "Show contact _list in rooms"
-msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_l)"
-
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sort by _name"
 msgstr "ਨਾਂ ਨਾਲ ਲੜੀਬੱਧ(_n)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
 msgid "Sort by s_tate"
 msgstr "ਹਾਲਤ ਨਾਲ ਲੜੀਬੱਧ(_t)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:28
 msgid "Sounds"
 msgstr "ਸਾਊਂਡ"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:29
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦਜੋੜ ਜਾਂਚ"
 
-#: ../src/empathy-preferences.ui.h:32
-#| 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:30
 msgid "Themes"
 msgstr "ਥੀਮ"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Enable bubble notifications"
 msgstr "ਬੁਲਬੁਲਾ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Enable sound notifications"
 msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Open new chats in separate windows"
 msgstr "ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ(_O)"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Publish location to my contacts"
 msgstr "ਮੇਰੇ ਸੰਪਰਕਾਂ ਲਈ ਟਿਕਾਣਾ ਦੱਸੋ(_P)"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Reduce location accuracy"
 msgstr "ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਘਟਾਓ(_R)"
 
@@ -2482,99 +2354,76 @@ msgstr "gtk-leave-fullscreen"
 msgid "Contact Map View"
 msgstr "ਸੰਪਰਕ ਮੈਪ ਝਲਕ"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1075
+#| msgid "Error:"
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1069
+#| msgid "Croatian"
 msgid "Critical"
 msgstr "ਨਾਜ਼ੁਕ"
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1063
+#| msgid "Bearing:"
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1057
+#: ../src/empathy-debug-dialog.c:1105
+#| msgid "Message:"
 msgid "Message"
 msgstr "ਸੁਨੇਹਾ"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1051
 msgid "Info"
 msgstr "ਜਾਣਕਾਰੀ"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1045
 msgid "Debug"
 msgstr "ਡੀਬੱਗ"
 
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-dialog.c:836
+#| msgid "State:"
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-dialog.c:939
 msgid "Debug Window"
 msgstr "ਡੀਬੱਗ ਵਿੰਡੋ"
 
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-dialog.c:1013
 msgid "Pause"
 msgstr "ਵਿਰਾਮ"
 
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-dialog.c:1025
 msgid "Level "
 msgstr "ਲੈਵਲ "
 
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-dialog.c:1094
+#| msgid "Simple"
 msgid "Time"
 msgstr "ਸਮਾਂ"
 
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-dialog.c:1096
+#| msgid "Romanian"
 msgid "Domain"
 msgstr "ਡੋਮੇਨ"
 
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-dialog.c:1098
 msgid "Category"
 msgstr "ਕੈਟਾਗਰੀ"
 
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-dialog.c:1100
 msgid "Level"
 msgstr "ਲੈਵਲ"
 
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-dialog.c:1133
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "ਚੁਣਿਆ ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਰਿਮੋਟ ਡੀਬੱਗ ਇਕਸਟੈਨਸ਼ਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#~ 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 "<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 "File transfers"
-#~ msgstr "ਫਾਇਲ ਸੰਚਾਰ"
-
-#~ msgid "<b>Contact List</b>"
-#~ msgstr "<b>ਸੰਪਰਕ ਲਿਸਟ</b>"
-
 #~ msgctxt "file size"
 #~ msgid "Unknown"
 #~ msgstr "ਅਣਜਾਣ"
@@ -2621,6 +2470,9 @@ msgstr "ਚੁਣਿਆ ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਰਿਮੋ
 #~ msgid "Forget password and clear the entry."
 #~ msgstr "ਪਾਸਵਰਡ ਭੁੱਲੋ ਅਤੇ ਐਂਟਰੀ ਸਾਫ਼ ਕਰੋ।"
 
+#~ msgid "Create a new IRC network"
+#~ msgstr "ਇੱਕ ਨਵਾਂ IRC ਨੈੱਟਵਰਕ ਬਣਾਓ"
+
 #~ msgid "Edit the selected IRC network"
 #~ msgstr "ਚੁਣੇ IRC ਨੈੱਟਵਰਕ ਸੋਧੋ"
 
diff --git a/po/sv.po b/po/sv.po
index 0a7be3a..9967adf 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-07 12:14+0200\n"
-"PO-Revision-Date: 2009-07-07 15:38+0100\n"
+"POT-Creation-Date: 2009-02-19 20:27+0100\n"
+"PO-Revision-Date: 2009-02-19 00:38+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"
@@ -32,16 +32,23 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Öppna alltid ett separat fönster för nya chattar."
 
 #: ../data/empathy.schemas.in.h:2
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) "
+"används i gruppchatt."
 
 #: ../data/empathy.schemas.in.h:3
 msgid "Chat window theme"
 msgstr "Chattfönstertema"
 
 #: ../data/empathy.schemas.in.h:4
-msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr "Kommaseparerad lista av språk att använda för stavningskontroll (tex en, fr, nl)."
+msgid ""
+"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+msgstr ""
+"Kommaseparerad lista av språk att använda för stavningskontroll (tex en, fr, "
+"nl)."
 
 #: ../data/empathy.schemas.in.h:5
 msgid "Compact contact list"
@@ -64,1253 +71,1002 @@ msgid "Disable sounds when away"
 msgstr "Inaktivera ljud under frånvaro"
 
 #: ../data/empathy.schemas.in.h:10
-msgid "Empathy can publish the user's location"
-msgstr "Empathy kan publicera användarens plats"
-
-#: ../data/empathy.schemas.in.h:11
-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
-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
-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
 msgid "Empathy default download folder"
 msgstr "Standardhämtningsmapp för Empathy"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:11
 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:12
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy ska ansluta automatiskt vid uppstart"
 
-#: ../data/empathy.schemas.in.h:17
-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:13
 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:14
 msgid "Enable popup notifications for new messages"
 msgstr "Aktivera popupnotifieringar för nya meddelanden"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:15
 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:21
+#: ../data/empathy.schemas.in.h:16
 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:22
+#: ../data/empathy.schemas.in.h:17
 msgid "Hide the main window."
 msgstr "Dölj huvudfönstret."
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:18
 msgid "NetworkManager should be used"
 msgstr "NetworkManager ska användas"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:19
 msgid "Nick completed character"
 msgstr "Tecken för smeknamnskomplettering"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:20
 msgid "Open new chats in separate windows"
 msgstr "Öppna nya chattar i separata fönster"
 
-#: ../data/empathy.schemas.in.h:26
-msgid "Path of the adium theme to use"
-msgstr "Sökväg för adium-temat att använda"
-
-#: ../data/empathy.schemas.in.h:27
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "Sökväg för adium-temat som ska användas om temat som används för chatt är adium."
-
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:21
 msgid "Play a sound for incoming messages"
 msgstr "Spela upp ljud för inkommande meddelanden"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:22
 msgid "Play a sound for new conversations"
 msgstr "Spela upp ett ljud för nya samtal"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:23
 msgid "Play a sound for outgoing messages"
 msgstr "Spela upp ljud för utgående meddelanden"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:24
 msgid "Play a sound when a contact logs in"
 msgstr "Spela upp ljud när en kontakt loggar in"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:25
 msgid "Play a sound when a contact logs out"
 msgstr "Spela upp ett ljud när en kontakt loggar ut"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:26
 msgid "Play a sound when we log in"
 msgstr "Spela upp ljud när vi loggar in"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:27
 msgid "Play a sound when we log out"
 msgstr "Spela upp ljud när vi loggar ut"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:28
 msgid "Popup notifications if the chat isn't focused"
 msgstr "Visa popupnotifieringar om chatten inte är fokuserad"
 
-#: ../data/empathy.schemas.in.h:36
-msgid "Popup notifications when a contact sign in"
-msgstr "Visa popupnotifieringar när en kontakt loggar in"
-
-#: ../data/empathy.schemas.in.h:37
-msgid "Popup notifications when a contact sign out"
-msgstr "Visa popupnotifieringar när en kontakt loggar ut"
-
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:29
 msgid "Salut account is created"
 msgstr "Salut-konto har skapats"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:30
 msgid "Show avatars"
 msgstr "Visa avatarer"
 
-#: ../data/empathy.schemas.in.h:40
-msgid "Show contact list in rooms"
-msgstr "Visa kontaktlista i rum"
-
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:31
 msgid "Show hint about closing the main window"
 msgstr "Visa tips om att stänga huvudfönstret"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:32
 msgid "Show offline contacts"
 msgstr "Visa frånkopplade kontakter"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:33
 msgid "Spell checking languages"
 msgstr "Rättstavningsspråk"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:34
 msgid "The default folder to save file transfers in."
 msgstr "Standardmappen att spara filöverföringar i."
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:35
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den senaste katalogen som en avatarbild valdes från."
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:36
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Det tema som används för att visa samtal i chattfönster."
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:37
 msgid "Use graphical smileys"
 msgstr "Använd grafiska smilisar"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:38
 msgid "Use notification sounds"
 msgstr "Använd notifieringsljud"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:39
 msgid "Use theme for chat rooms"
 msgstr "Använd tema för chattrum"
 
-#: ../data/empathy.schemas.in.h:50
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr "Huruvida Empathy kan publicera användarens plats till kontakter eller inte."
-
-#: ../data/empathy.schemas.in.h:51
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Huruvida Empathy kan använda GPS:en för att gissa platsen eller inte."
-
-#: ../data/empathy.schemas.in.h:52
-msgid "Whether or not Empathy can use the cellular network to guess the location."
-msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen eller inte."
-
-#: ../data/empathy.schemas.in.h:53
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen eller inte."
-
-#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy has asked about importing accounts from other programs."
-msgstr "Huruvida Empathy har frågat om att importera konton från andra program eller inte."
-
-#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy should automatically log in to your accounts on startup."
-msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart eller inte."
+#: ../data/empathy.schemas.in.h:40
+msgid ""
+"Whether or not Empathy has asked about importing accounts from other "
+"programs."
+msgstr ""
+"Huruvida Empathy har frågat om att importera konton från andra program eller "
+"inte."
 
-#: ../data/empathy.schemas.in.h:56
-msgid "Whether or not Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl eller inte."
+#: ../data/empathy.schemas.in.h:41
+msgid ""
+"Whether or not Empathy should automatically log in to your accounts on "
+"startup."
+msgstr ""
+"Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart eller "
+"inte."
 
-#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Huruvida Empathy ska använda avataren för kontakten som chattfönsterikon eller inte."
+#: ../data/empathy.schemas.in.h:42
+msgid ""
+"Whether or not Empathy should use the avatar of the contact as the chat "
+"window icon."
+msgstr ""
+"Huruvida Empathy ska använda avataren för kontakten som chattfönsterikon "
+"eller inte."
 
-#: ../data/empathy.schemas.in.h:58
-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:43
+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:59
-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."
+#: ../data/empathy.schemas.in.h:44
+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."
 
-#: ../data/empathy.schemas.in.h:60
-msgid "Whether or not to check words typed against the languages you want to check with."
+#: ../data/empathy.schemas.in.h:45
+msgid ""
+"Whether or not to check words typed against the languages you want to check "
+"with."
 msgstr "Huruvida ord som skrivs ska kontrolleras mot språken du valt."
 
-#: ../data/empathy.schemas.in.h:61
-msgid "Whether or not to convert smileys into graphical images in conversations."
-msgstr "Huruvida smilisar ska omvandlas till grafiska bilder eller inte i samtal."
+#: ../data/empathy.schemas.in.h:46
+msgid ""
+"Whether or not to convert smileys into graphical images in conversations."
+msgstr ""
+"Huruvida smilisar ska omvandlas till grafiska bilder eller inte i samtal."
 
-#: ../data/empathy.schemas.in.h:62
-msgid "Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar in i nätverket."
+#: ../data/empathy.schemas.in.h:47
+msgid ""
+"Whether or not to play a sound to notify for contacts logging in the network."
+msgstr ""
+"Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar in i "
+"nätverket."
 
-#: ../data/empathy.schemas.in.h:63
-msgid "Whether or not to play a sound to notify for contacts logging off the network."
-msgstr "Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar ut från nätverket."
+#: ../data/empathy.schemas.in.h:48
+msgid ""
+"Whether or not to play a sound to notify for contacts logging off the "
+"network."
+msgstr ""
+"Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar ut från "
+"nätverket."
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:49
 msgid "Whether or not to play a sound to notify for events."
-msgstr "Huruvida ett ljud ska spelas upp eller inte för att notifiera om händelser."
+msgstr ""
+"Huruvida ett ljud ska spelas upp eller inte för att notifiera om händelser."
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:50
 msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "Huruvida ett ljud ska spelas upp eller inte för inkommande meddelanden."
+msgstr ""
+"Huruvida ett ljud ska spelas upp eller inte för inkommande meddelanden."
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:51
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "Huruvida ett ljud ska spelas upp eller inte för nya samtal."
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:52
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "Huruvida ett ljud ska spelas upp eller inte för utgående meddelanden."
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:53
 msgid "Whether or not to play a sound when logging in a network."
-msgstr "Huruvida ett ljud ska spelas upp eller inte vid inloggning i ett nätverk."
+msgstr ""
+"Huruvida ett ljud ska spelas upp eller inte vid inloggning i ett nätverk."
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:54
 msgid "Whether or not to play a sound when logging off a network."
-msgstr "Huruvida ett ljud ska spelas upp eller inte vid utloggning från ett nätverk."
+msgstr ""
+"Huruvida ett ljud ska spelas upp eller inte vid utloggning från ett nätverk."
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not to play sound notifications when away or busy."
-msgstr "Huruvida ljudnotifieringar ska spelas upp eller inte vid frånvaro eller upptagen."
-
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to show a popup notification when a contact goes offline."
-msgstr "Huruvida popupnotifieringar ska visas eller inte när en kontakt kopplar från."
-
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to show a popup notification when a contact goes online."
-msgstr "Huruvida popupnotifieringar ska visas eller inte när en kontakt ansluter."
+msgstr ""
+"Huruvida ljudnotifieringar ska spelas upp eller inte vid frånvaro eller "
+"upptagen."
 
-#: ../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."
-msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad."
+#: ../data/empathy.schemas.in.h:56
+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 ""
+"Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, "
+"även om chatten redan är öppnad, men inte fokuserad."
 
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to show a popup notification when receiving a new message."
-msgstr "Huruvida en popupnotifiering ska visas eller inte när ett nytt meddelande tas emot."
+#: ../data/empathy.schemas.in.h:57
+msgid ""
+"Whether or not to show a popup notification when receiving a new message."
+msgstr ""
+"Huruvida en popupnotifiering ska visas eller inte när ett nytt meddelande "
+"tas emot."
 
-#: ../data/empathy.schemas.in.h:75
-msgid "Whether or not to show avatars for contacts in the contact list and chat windows."
-msgstr "Huruvida avatarer ska visas i kontaktlistan och chattfönster eller inte."
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not to show avatars for contacts in the contact list and chat "
+"windows."
+msgstr ""
+"Huruvida avatarer ska visas i kontaktlistan och chattfönster eller inte."
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:59
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan eller inte."
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:60
 msgid "Whether or not to show popup notifications when away or busy."
-msgstr "Huruvida popupnotifieringar ska visas eller inte under frånvaro eller upptagen."
-
-#: ../data/empathy.schemas.in.h:78
-msgid "Whether or not to show the contact list in chat rooms."
-msgstr "Huruvida kontaktlistan ska visas i chattrum eller inte."
+msgstr ""
+"Huruvida popupnotifieringar ska visas eller inte under frånvaro eller "
+"upptagen."
 
-#: ../data/empathy.schemas.in.h:79
-msgid "Whether or not to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas eller inte när man klickar på \"x\"-knappen i titelraden."
+#: ../data/empathy.schemas.in.h:61
+msgid ""
+"Whether or not to show the message dialog about closing the main window with "
+"the 'x' button in the title bar."
+msgstr ""
+"Huruvida meddelandedialogen om att stänga huvudfönstret ska visas eller inte "
+"när man klickar på \"x\"-knappen i titelraden."
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:62
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Huruvida kontaktlistan ska visas i kompakt läge eller inte."
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:63
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Huruvida tema ska användas för chattrum eller inte."
 
-#: ../data/empathy.schemas.in.h:82
-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 "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd."
-
-#: ../libempathy/empathy-ft-handler.c:838
-msgid "The hash of the received file and the sent one do not match"
-msgstr "Hashsumman för den mottagna filen och den som skickades stämmer inte överens"
-
-#: ../libempathy/empathy-ft-handler.c:1098
-msgid "File transfer not supported by remote contact"
-msgstr "Filöverföringar stöds inte fjärrkontakten"
-
-#: ../libempathy/empathy-ft-handler.c:1156
-msgid "The selected file is not a regular file"
-msgstr "Den valda filen är inte en vanlig fil"
-
-#: ../libempathy/empathy-ft-handler.c:1165
-msgid "The selected file is empty"
-msgstr "Den valda filen är tom"
+#: ../data/empathy.schemas.in.h:64
+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 ""
+"Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att "
+"sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer "
+"att sortera kontaktlistan efter tillstånd."
 
-#: ../libempathy/empathy-tp-contact-list.c:757
-#: ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
 msgid "People nearby"
 msgstr "Personer i närheten"
 
-#: ../libempathy/empathy-tp-file.c:279
-msgid "Socket type not supported"
-msgstr "Uttagstypen stöds inte"
-
-#: ../libempathy/empathy-tp-file.c:398
-msgid "No reason was specified"
-msgstr "Ingen anledning angavs"
-
-#: ../libempathy/empathy-tp-file.c:401
-msgid "The change in state was requested"
-msgstr "Ändring i tillstånd begärdes"
-
-#: ../libempathy/empathy-tp-file.c:404
-msgid "You canceled the file transfer"
-msgstr "Du avbröt filöverföringen"
-
-#: ../libempathy/empathy-tp-file.c:407
-msgid "The other participant canceled the file transfer"
-msgstr "Den andra deltagaren avbröt filöverföringen"
-
-#: ../libempathy/empathy-tp-file.c:410
-msgid "Error while trying to transfer the file"
-msgstr "Fel vid försök att överföra filen"
-
-#: ../libempathy/empathy-tp-file.c:413
-msgid "The other participant is unable to transfer the file"
-msgstr "Den andra deltagaren kunde inte överföra filen"
-
-#: ../libempathy/empathy-tp-file.c:416
-msgid "Unknown reason"
-msgstr "Okänd anledning"
-
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:252
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:254
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:257
 msgid "Away"
 msgstr "Frånvarande"
 
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:259
 msgid "Hidden"
 msgstr "Dold"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:262
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../libempathy/empathy-time.c:137
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d sekund sedan"
-msgstr[1] "%d sekunder sedan"
-
-#: ../libempathy/empathy-time.c:142
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minut sedan"
-msgstr[1] "%d minuter sedan"
-
-#: ../libempathy/empathy-time.c:147
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d timme sedan"
-msgstr[1] "%d timmar sedan"
-
-#: ../libempathy/empathy-time.c:152
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d dag sedan"
-msgstr[1] "%d dagar sedan"
-
-#: ../libempathy/empathy-time.c:157
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d vecka sedan"
-msgstr[1] "%d veckor sedan"
-
-#: ../libempathy/empathy-time.c:162
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d månad sedan"
-msgstr[1] "%d månader sedan"
-
-#: ../libempathy/empathy-time.c:167
-msgid "in the future"
-msgstr "i framtiden"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:419
+#: ../libempathy-gtk/empathy-account-chooser.c:326
 msgid "All"
 msgstr "Alla"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:347
 #, 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 "Avancerat"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-aim.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>Avancerat</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 "Glöm lösenordet och töm inmatningen."
+
+#: ../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
 msgid "Pass_word:"
 msgstr "L_ösenord:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
 msgid "Screen _Name:"
 msgstr "Skärm_namn:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.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
 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
+#: ../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
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
 msgid "Login I_D:"
 msgstr "Inloggningsi_d:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
 msgid "_Charset:"
 msgstr "Tec_kenuppsättning:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:245
 msgid "New Network"
 msgstr "Nytt nätverk"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
+msgid "<b>Network</b>"
+msgstr "<b>Nätverk</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
+msgid "<b>Servers</b>"
+msgstr "<b>Servrar</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
 msgid "Charset:"
 msgstr "Teckenuppsättning:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
+msgid "Create a new IRC network"
+msgstr "Skapa ett nytt irc-nätverk"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
+msgid "Edit the selected IRC network"
+msgstr "Redigera markerat irc-nätverk"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
 msgid "Network:"
 msgstr "Nätverk:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
 msgid "Quit message:"
 msgstr "Avslutningsmeddelande:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
 msgid "Real name:"
 msgstr "Verkligt namn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Servers"
-msgstr "Servrar"
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
+msgid "Remove the selected IRC network"
+msgstr "Ta bort markerat irc-nätverk"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-msgid "Override server settings"
-msgstr "Åsidosätt serverinställningar"
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
+msgid "<b>Override server settings</b>"
+msgstr "<b>Åsidosätt serverinställningar</b>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
 msgid "Pri_ority:"
 msgstr "Pri_oritet:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
 msgid "Reso_urce:"
 msgstr "_Resurs:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
 msgid "Use old SS_L"
 msgstr "Använd gammal SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
 msgid "_Encryption required (TLS/SSL)"
 msgstr "_Kryptering krävs (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ignorera SSL-certifikatfel"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
 msgid "_Email:"
 msgstr "_E-post:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
 msgid "_First Name:"
 msgstr "_Förnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber-id:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
 msgid "_Last Name:"
 msgstr "_Efternamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
+#: ../src/empathy-chatrooms-window.glade.h:8
 msgid "_Nickname:"
 msgstr "Smek_namn:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
 msgid "_Published Name:"
 msgstr "_Publikt namn:"
 
 #. 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
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
 msgid "Discover STUN"
 msgstr "Upptäck STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
 msgid "STUN Server:"
 msgstr "STUN-server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
 msgid "STUN port:"
 msgstr "STUN-port:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
 msgid "_Username:"
 msgstr "A_nvändarnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
 msgid "Use _Yahoo Japan"
 msgstr "Använd _Yahoo Japan"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
 msgid "Yahoo I_D:"
 msgstr "Yahoo-I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ignorera inbjudningar till konferenser och chattrum"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
 msgid "_Room List locale:"
 msgstr "Lokalanpassning för _rumslista:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:462
+#: ../libempathy-gtk/empathy-avatar-chooser.c:537
 msgid "Couldn't convert image"
 msgstr "Kunde inte konvertera bild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+#: ../libempathy-gtk/empathy-avatar-chooser.c:463
 msgid "None of the accepted image formats is supported on your system"
 msgstr "Inga av de accepterade bildformaten stöds på ditt system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:956
 msgid "Select Your Avatar Image"
 msgstr "Välj din avatarbild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:959
 msgid "No Image"
 msgstr "Ingen bild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "Images"
 msgstr "Bilder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
 msgid "All Files"
 msgstr "Alla filer"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:294
 msgid "Click to enlarge"
 msgstr "Klicka för att förstora"
 
-#: ../libempathy-gtk/empathy-chat.c:186
-msgid "Failed to reconnect this chat"
-msgstr "Misslyckades med att återansluta till denna chatt"
-
-#: ../libempathy-gtk/empathy-chat.c:404
-msgid "Unsupported command"
-msgstr "Kommandot stöds inte"
-
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:507
 msgid "offline"
 msgstr "frånkopplad"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:510
 msgid "invalid contact"
 msgstr "ogiltig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:513
 msgid "permission denied"
 msgstr "åtkomst nekad"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:516
 msgid "too long message"
 msgstr "för långt meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:519
 msgid "not implemented"
 msgstr "inte implementerat"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:522
 msgid "unknown"
 msgstr "okänt"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:526
 #, 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:556
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Ämnet inställt till: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:558
 msgid "No topic defined"
 msgstr "Inget ämne definierat"
 
-#: ../libempathy-gtk/empathy-chat.c:959
-msgid "(No Suggestions)"
-msgstr "(Inga förslag)"
-
-#: ../libempathy-gtk/empathy-chat.c:1013
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Insert Smiley"
 msgstr "Infoga smilis"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1031
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
+#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-ui-utils.c:1538
 msgid "_Send"
 msgstr "_Skicka"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
-msgid "_Spelling Suggestions"
-msgstr "Sta_vningsförslag"
-
-#: ../libempathy-gtk/empathy-chat.c:1180
-#, c-format
-msgid "%s has disconnected"
-msgstr "%s har kopplat från"
-
-#: ../libempathy-gtk/empathy-chat.c:1184
-#, c-format
-msgid "%s was kicked by %s"
-msgstr "%s sparkades ut av %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1187
-#, c-format
-msgid "%s was kicked"
-msgstr "%s sparkades ut"
-
-#: ../libempathy-gtk/empathy-chat.c:1192
-#, c-format
-msgid "%s was banned by %s"
-msgstr "%s blev bannlyst av %s"
+#: ../libempathy-gtk/empathy-chat.c:1025
+msgid "_Check Word Spelling..."
+msgstr "_Kontrollera stavning..."
 
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1131
 #, c-format
-msgid "%s was banned"
-msgstr "%s blev bannlyst"
+msgid "%s has joined the room"
+msgstr "%s har gått in i rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:1199
+#: ../libempathy-gtk/empathy-chat.c:1134
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har lämnat rummet"
 
-#. 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:1208
-#, c-format
-msgid " (%s)"
-msgstr " (%s)"
-
-#: ../libempathy-gtk/empathy-chat.c:1231
-#, c-format
-msgid "%s has joined the room"
-msgstr "%s har gått in i rummet"
-
-#: ../libempathy-gtk/empathy-chat.c:1364
-#: ../src/empathy-call-window.c:1226
+#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: ../libempathy-gtk/empathy-chat.c:1793
+#: ../libempathy-gtk/empathy-chat.c:1644
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../libempathy-gtk/empathy-chat.c:1843
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:1694
+#: ../libempathy-gtk/empathy-log-window.c:505
 msgid "Conversation"
 msgstr "Samtal"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1
-#: ../src/empathy-chat-window.c:472
-msgid "Topic:"
-msgstr "Ämne:"
+#: ../libempathy-gtk/empathy-chat.glade.h:1
+msgid "<b>Topic:</b>"
+msgstr "<b>Ämne:</b>"
+
+#: ../libempathy-gtk/empathy-chat.glade.h:2
+msgid "Group Chat"
+msgstr "Gruppchatt"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-chat-text-view.c:340
 msgid "_Copy Link Address"
 msgstr "_Kopiera länkadress"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-chat-text-view.c:348
 msgid "_Open Link"
 msgstr "_Öppna länk"
 
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:439
 msgid "%A %B %d %Y"
 msgstr "%A %e %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:180
+msgid "Personal Information"
+msgstr "Personlig information"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:183
 msgid "Edit Contact Information"
 msgstr "Redigera kontaktinformation"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
-msgid "Personal Information"
-msgstr "Personlig information"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:186
+msgid "Contact Information"
+msgstr "Kontaktinformation"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:267
+msgid "I would like to add you to my contact list."
+msgstr "Jag vill lägga till dig i min kontaktlista."
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:384
+#: ../libempathy-gtk/empathy-contact-dialogs.c:291
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
 msgid "Decide _Later"
 msgstr "Bestäm _senare"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
 msgid "Subscription Request"
 msgstr "Prenumerationsbegäran"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1249
 #, 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:1377
+#: ../libempathy-gtk/empathy-contact-list-view.c:1251
 msgid "Removing group"
 msgstr "Tar bort grupp"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1424
-#: ../libempathy-gtk/empathy-contact-list-view.c:1502
+#: ../libempathy-gtk/empathy-contact-list-view.c:1298
+#: ../libempathy-gtk/empathy-contact-list-view.c:1377
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1454
+#: ../libempathy-gtk/empathy-contact-list-view.c:1328
 #, 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:1456
+#: ../libempathy-gtk/empathy-contact-list-view.c:1330
 msgid "Removing contact"
 msgstr "Tar bort kontakt"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:135
-#: ../src/empathy-main-window.ui.h:8
+#: ../libempathy-gtk/empathy-contact-list-view.c:1335
+msgid "Sorry, I don't want you in my contact list anymore."
+msgstr "Tyvärr, jag vill inte längre ha dig i min kontaktlista."
+
+#: ../libempathy-gtk/empathy-contact-menu.c:130
+#: ../src/empathy-main-window.glade.h:9
 msgid "_Chat"
 msgstr "_Chatt"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:166
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Ljudsamtal"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:198
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videosamtal"
+#: ../libempathy-gtk/empathy-contact-menu.c:161
+#: ../src/empathy-call-window.glade.h:5
+msgid "_Call"
+msgstr "_Ring"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
+#: ../libempathy-gtk/empathy-contact-menu.c:200
+#: ../src/empathy-main-window.glade.h:17
 msgid "_View Previous Conversations"
 msgstr "_Visa tidigare samtal"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:259
+#: ../libempathy-gtk/empathy-contact-menu.c:222
 msgid "Send file"
 msgstr "Skicka fil"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:287
+#: ../libempathy-gtk/empathy-contact-menu.c:250
 msgid "Infor_mation"
 msgstr "Infor_mation"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:314
-#: ../src/empathy-main-window.ui.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:277
+#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:372
+#: ../libempathy-gtk/empathy-contact-menu.c:336
 msgid "Inviting to this room"
 msgstr "Bjuder in till detta rum"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:369
 msgid "_Invite to chatroom"
 msgstr "_Bjud in till chattrum"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
+#: ../libempathy-gtk/empathy-contact-selector.c:111
 msgid "Select a contact"
 msgstr "Välj en kontakt"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:440
+#: ../libempathy-gtk/empathy-contact-widget.c:358
 msgid "Save Avatar"
 msgstr "Spara avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:414
 msgid "Unable to save avatar"
 msgstr "Kunde inte spara avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:979
+#: ../libempathy-gtk/empathy-contact-widget.c:895
 msgid "Select"
 msgstr "Markera"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:903
+#: ../libempathy-gtk/empathy-contact-widget.c:904
+#: ../src/empathy-main-window.c:991
 msgid "Group"
 msgstr "Grupp"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1239
-msgid "Country ISO Code:"
-msgstr "Landets ISO-kod:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1241
-msgid "Country:"
-msgstr "Land:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1243
-msgid "State:"
-msgstr "Län:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1245
-msgid "City:"
-msgstr "Stad:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1247
-msgid "Area:"
-msgstr "Område:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1249
-msgid "Postal Code:"
-msgstr "Postnummer:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1251
-msgid "Street:"
-msgstr "Gata:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1253
-msgid "Building:"
-msgstr "Byggnad:"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
+msgid "<b>Client Information</b>"
+msgstr "<b>Klientinformation</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1255
-msgid "Floor:"
-msgstr "Våning:"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
+msgid "<b>Contact Details</b>"
+msgstr "<b>Kontaktdetaljer</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1257
-msgid "Room:"
-msgstr "Rum:"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
+msgid "<b>Contact</b>"
+msgstr "<b>Kontakt</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1259
-msgid "Text:"
-msgstr "Text:"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
+msgid "<b>Groups</b>"
+msgstr "<b>Grupper</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
-msgid "Description:"
-msgstr "Beskrivning:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
-msgid "URI:"
-msgstr "URI:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
-msgid "Accuracy Level:"
-msgstr "Precisionsnivå:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
-msgid "Error:"
-msgstr "Fel:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
-msgid "Vertical Error (meters):"
-msgstr "Vertikalt fel (meter):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
-msgid "Horizontal Error (meters):"
-msgstr "Horisontellt fel (meter):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
-msgid "Speed:"
-msgstr "Hastighet:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
-msgid "Bearing:"
-msgstr "Riktning:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
-msgid "Climb Speed:"
-msgstr "Höjdökning:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
-msgid "Last Updated on:"
-msgstr "Senast uppdaterad:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
-msgid "Longitude:"
-msgstr "Longitud:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
-msgid "Latitude:"
-msgstr "Latitud:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
-msgid "Altitude:"
-msgstr "Höjd:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1332
-msgid "<b>Location</b>"
-msgstr "<b>Plats</b>"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1345
-msgid "<b>Location</b>, "
-msgstr "<b>Plats</b>, "
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1395
-msgid "%B %e, %Y at %R UTC"
-msgstr "%e %B, %Y klockan %H.%M UTC"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Plats</b> den (datum)\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
+#: ../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
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
 msgid "Birthday:"
 msgstr "Födelsedag:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client Information"
-msgstr "Klientinformation"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:886
-msgid "Contact"
-msgstr "Kontakt"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "Contact Details"
-msgstr "Kontaktdetaljer"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
+msgid "Contact information"
+msgstr "Kontaktinformation"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
 msgid "Fullname:"
 msgstr "Fullständigt namn:"
 
-#: ../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
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
 msgid "Identifier:"
 msgstr "Identifierare:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
 msgid "Information requested..."
 msgstr "Information begärd..."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.glade.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 "Välj de grupper som du vill att denna kontakt ska finnas i. Observera att du kan välja fler än en grupp eller inga grupper alls."
+#: ../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 ""
+"Välj de grupper som du vill att denna kontakt ska finnas i. Observera att du "
+"kan välja fler än en grupp eller inga grupper alls."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
 msgid "Version:"
 msgstr "Version:"
 
 # "Web site" är "webbplats". "Web page" är "webbsida".
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
 msgid "Web site:"
 msgstr "Webbplats:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
 msgid "_Add Group"
 msgstr "_Lägg till grupp"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
 msgid "new server"
 msgstr "ny server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../libempathy-gtk/empathy-log-window.c:498
+#: ../src/empathy-import-dialog.c:277
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:515
 msgid "Date"
 msgstr "Datum"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.glade.h:2
 msgid "Conversations"
 msgstr "Samtal"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.glade.h:3
 msgid "Previous Conversations"
 msgstr "Tidigare samtal"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.glade.h:5
 msgid "Search"
 msgstr "Sök"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.glade.h:7
 msgid "_For:"
 msgstr "_För:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
 msgid "C_all"
 msgstr "Rin_g"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
 msgid "C_hat"
 msgstr "C_hatta"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
 msgid "Contact ID:"
 msgstr "Kontakt-id:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
 msgid "New Conversation"
 msgstr "Nytt samtal"
 
-#. COL_STATE_ICON_NAME
-#. COL_STATE
-#. COL_STATUS_TEXT
-#. COL_DISPLAY_MARKUP
-#. COL_STATUS_CUSTOMISABLE
-#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-msgid "Custom Message..."
-msgstr "Anpassat meddelande..."
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:685
+msgid "Custom messages..."
+msgstr "Anpassade meddelanden..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
-msgid "Edit Custom Messages..."
-msgstr "Redigera anpassade meddelanden..."
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
+msgid "Custom message"
+msgstr "Anpassat meddelande"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
-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.glade.h:2
+msgid "Message:"
+msgstr "Meddelande:"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
-msgid "Click to make this status a favorite"
-msgstr "Klicka för att göra denna status till favorit"
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
+msgid "Save message"
+msgstr "Spara meddelande"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
-msgid "Set status"
-msgstr "Ange status"
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
+msgid "Status:"
+msgstr "Status:"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
-msgid "Set your presence and current status"
-msgstr "Ange din närvaro och aktuell status"
+#: ../libempathy-gtk/empathy-spell-dialog.c:88
+msgid "Word"
+msgstr "Ord"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
-msgid "Custom messages..."
-msgstr "Anpassade meddelanden..."
+#: ../libempathy-gtk/empathy-spell-dialog.c:265
+msgid "Suggestions for the word"
+msgstr "Förslag för ordet"
+
+#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
+msgid "Spell Checker"
+msgstr "Stavningskontroll"
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
+msgid "Suggestions for the word:"
+msgstr "Förslag för ordet:"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:60
+msgid "Classic"
+msgstr "Klassiskt"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:61
+msgid "Simple"
+msgstr "Enkelt"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:62
+msgid "Clean"
+msgstr "Rent"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:63
+msgid "Blue"
+msgstr "Blått"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1385
+msgid "Unable to open URI"
+msgstr "Kunde inte öppna uri"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a file"
+msgstr "Välj en fil"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1566
 msgid "Received an instant message"
 msgstr "Tog emot ett snabbmeddelande"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-ui-utils.c:1568
 msgid "Sent an instant message"
 msgstr "Skickade ett snabbmeddelande"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-ui-utils.c:1570
 msgid "Incoming chat request"
 msgstr "Inkommande chattbegäran"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-ui-utils.c:1572
 msgid "Contact connected"
 msgstr "Kontakten ansluten"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-ui-utils.c:1574
 msgid "Contact disconnected"
 msgstr "Kontakten frånkopplad"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-ui-utils.c:1576
 msgid "Connected to server"
 msgstr "Ansluten till server"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-ui-utils.c:1578
 msgid "Disconnected from server"
 msgstr "Frånkopplad från server"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-ui-utils.c:1580
 msgid "Incoming voice call"
 msgstr "Inkommande röstsamtal"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-ui-utils.c:1582
 msgid "Outgoing voice call"
 msgstr "Utgående röstsamtal"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-ui-utils.c:1584
 msgid "Voice call ended"
 msgstr "Röstsamtal avslutat"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
-msgid "Enter Custom Message"
-msgstr "Ange anpassat meddelande"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
-msgid "Edit Custom Messages"
-msgstr "Redigera anpassade meddelanden"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "Lägg till _nytt förval"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-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"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:68
-msgid "Simple"
-msgstr "Enkelt"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:69
-msgid "Clean"
-msgstr "Rent"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Blue"
-msgstr "Blått"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1377
-msgid "Unable to open URI"
-msgstr "Kunde inte öppna uri"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1467
-msgid "Select a file"
-msgstr "Välj en fil"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1525
-msgid "Select a destination"
-msgstr "Välj ett mål"
-
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Aktuell lokal"
@@ -1483,8 +1239,10 @@ msgstr "Vietnamesisk"
 #. * 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 "Kontakten att visa i panelprogrammet. Tom betyder att ingen kontakt visas."
+msgid ""
+"The contact to display in the applet. Empty means no contact is displayed."
+msgstr ""
+"Kontakten att visa i panelprogrammet. Tom betyder att ingen kontakt visas."
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
 msgid "The contact's avatar token. Empty means contact has no avatar."
@@ -1495,7 +1253,7 @@ msgid "Megaphone"
 msgstr "Megaphone"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:417
 msgid "Talk!"
 msgstr "Prata!"
 
@@ -1509,15 +1267,15 @@ msgid "_Information"
 msgstr "_Information"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.glade.h:15
 msgid "_Preferences"
 msgstr "In_ställningar"
 
-#: ../megaphone/src/megaphone-applet.c:168
+#: ../megaphone/src/megaphone-applet.c:255
 msgid "Please configure a contact."
 msgstr "Konfigurera en kontakt."
 
-#: ../megaphone/src/megaphone-applet.c:258
+#: ../megaphone/src/megaphone-applet.c:348
 msgid "Select contact..."
 msgstr "Välj kontakt..."
 
@@ -1530,39 +1288,60 @@ msgstr "Närvaro"
 msgid "Set your own presence"
 msgstr "Ställ in din egna närvaro"
 
-#: ../src/empathy.c:506
+#: ../src/empathy.c:426
 msgid "Don't connect on startup"
 msgstr "Anslut inte vid uppstart"
 
-#: ../src/empathy.c:510
+#: ../src/empathy.c:430
 msgid "Don't show the contact list on startup"
 msgstr "Visa inte kontaktlistan vid uppstart"
 
-#: ../src/empathy.c:514
+#: ../src/empathy.c:434
 msgid "Show the accounts dialog"
 msgstr "Visa kontodialogrutan"
 
-#: ../src/empathy.c:526
+#: ../src/empathy.c:446
 msgid "- Empathy Instant Messenger"
 msgstr "- Empathy snabbmeddelandeklient"
 
-#: ../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 är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version."
+#: ../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 är fri programvara. Du kan distribuera det och/eller modifiera det "
+"under villkoren i GNU General Public License, publicerad av Free Software "
+"Foundation, antingen version 2 eller (om du så vill) någon senare version."
 
-#: ../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 distribueras i hopp om att det ska vara användbart, men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information."
+#: ../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 distribueras i hopp om att det ska vara användbart, men UTAN NÅGON "
+"SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller "
+"LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för "
+"ytterligare information."
 
-#: ../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 "Du bör ha fått en kopia av GNU General Public License tillsammans med Empathy. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+#: ../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 ""
+"Du bör ha fått en kopia av GNU General Public License tillsammans med "
+"Empathy. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:120
 msgid "An Instant Messaging client for GNOME"
 msgstr "En snabbmeddelandeklient för GNOME"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:126
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander\n"
@@ -1572,22 +1351,22 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "tp-sv@listor.tp-sv.se"
 
-#: ../src/empathy-accounts-dialog.c:392
+#: ../src/empathy-accounts-dialog.c:391
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../src/empathy-accounts-dialog.c:402
-#: ../src/empathy-accounts-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.c:401
+#: ../src/empathy-accounts-dialog.glade.h:4
 msgid "Accounts"
 msgstr "Konton"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#: ../src/empathy-accounts-dialog.c:833
 #, c-format
 msgid "New %s account"
 msgstr "Nytt %s-konto"
 
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-accounts-dialog.c:943
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1596,234 +1375,316 @@ msgstr ""
 "Du håller på att ta bort kontot %s!\n"
 "Är du säker att du vill fortsätta?"
 
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:949
 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 ""
 "Eventuella samtal och chattrum kommer inte tas bort.\n"
 "\n"
-"Om du senare lägger till kontot igen, kommer dessa fortfarande vara tillgängliga."
+"Om du senare lägger till kontot igen, kommer dessa fortfarande vara "
+"tillgängliga."
+
+#: ../src/empathy-accounts-dialog.glade.h:1
+msgid "<b>New Account</b>"
+msgstr "<b>Nytt konto</b>"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "Lägg till konto"
+#: ../src/empathy-accounts-dialog.glade.h:2
+msgid "<b>No protocol installed</b>"
+msgstr "<b>Inga protokoll installerade</b>"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.glade.h:3
+msgid "<b>Settings</b>"
+msgstr "<b>Inställningar</b>"
+
+#: ../src/empathy-accounts-dialog.glade.h:5
 msgid "Cr_eate"
 msgstr "Ska_pa"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/empathy-accounts-dialog.glade.h:6
+msgid "I already have an account I want to use"
+msgstr "Jag har redan ett konto som jag vill använda"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.glade.h:7
 msgid "Import Accounts..."
 msgstr "Importera konton..."
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "Inga protokoll installerade"
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "Inställningar"
-
-#: ../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 "För att lägga till ett nytt konto måste du först installera en bakände för varje protokoll som du vill använda."
+#: ../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 ""
+"För att lägga till ett nytt konto måste du först installera en bakände för "
+"varje protokoll som du vill använda."
 
-#: ../src/empathy-accounts-dialog.ui.h:9
+#: ../src/empathy-accounts-dialog.glade.h:9
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/empathy-accounts-dialog.ui.h:10
-msgid "_Add..."
-msgstr "_Lägg till..."
-
-#: ../src/empathy-accounts-dialog.ui.h:11
-msgid "_Create a new account"
-msgstr "_Skapa ett nytt konto"
-
-#: ../src/empathy-accounts-dialog.ui.h:12
-msgid "_Reuse an existing account"
-msgstr "_Återanvänd ett befintligt konto"
-
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-call-window.c:258
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:258
 msgid "Brightness"
 msgstr "Ljusstyrka"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:258
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:290
 msgid "Volume"
 msgstr "Volym"
 
-#: ../src/empathy-call-window.c:662
-msgid "Connecting..."
-msgstr "Ansluter..."
-
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:366
 msgid "_Sidebar"
 msgstr "_Sidopanel"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:384
 msgid "Dialpad"
 msgstr "Knappsats"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:390
 msgid "Audio input"
 msgstr "Ljudingång"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:394
 msgid "Video input"
 msgstr "Videoingång"
 
-#: ../src/empathy-call-window.c:836
-#, c-format
-msgid "Call with %s"
-msgstr "Ring med %s"
-
-#: ../src/empathy-call-window.c:905
-msgid "Call"
-msgstr "Ring"
+#: ../src/empathy-call-window.c:407
+msgid "Connecting..."
+msgstr "Ansluter..."
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1336
+#: ../src/empathy-call-window.c:572
 #, c-format
-msgid "Connected — %d:%02dm"
-msgstr "Ansluten — %d:%02dm"
+msgid "Connected -- %d:%02dm"
+msgstr "Ansluten -- %d:%02dm"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.glade.h:1
 msgid "Hang up"
 msgstr "Lägg på"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Redial"
-msgstr "Ring igen"
-
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.glade.h:2
 msgid "Send Audio"
 msgstr "Skicka ljud"
 
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.glade.h:3
 msgid "Send video"
 msgstr "Skicka video"
 
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.glade.h:4
 msgid "Video preview"
 msgstr "Videoförhandsvisning"
 
-#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Ring"
-
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-call-window.glade.h:6
 msgid "_View"
 msgstr "_Visa"
 
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:313
 #, c-format
 msgid "Conversations (%d)"
 msgstr "Samtal (%d)"
 
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:418
+msgid "Topic:"
+msgstr "Ämne:"
+
+#: ../src/empathy-chat-window.c:423
 msgid "Typing a message."
 msgstr "Skriver ett meddelande."
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:424
+#, c-format
+msgid "New message from %s"
+msgstr "Nytt meddelande från %s"
+
+#: ../src/empathy-chat-window.glade.h:1
+msgid "C_lear"
+msgstr "T_öm"
+
+#: ../src/empathy-chat-window.glade.h:2
+msgid "Chat"
+msgstr "Chatta"
+
+#: ../src/empathy-chat-window.glade.h:3
+msgid "Insert _Smiley"
+msgstr "Infoga _smilis"
+
+#: ../src/empathy-chat-window.glade.h:4
+msgid "Invitation _message:"
+msgstr "Inbjudnings_meddelande:"
+
+#: ../src/empathy-chat-window.glade.h:5
+msgid "Invite"
+msgstr "Bjud in"
+
+#: ../src/empathy-chat-window.glade.h:6
+msgid "Move Tab _Left"
+msgstr "Flytta flik till _vänster"
+
+#: ../src/empathy-chat-window.glade.h:7
+msgid "Move Tab _Right"
+msgstr "Flytta flik till _höger"
+
+#: ../src/empathy-chat-window.glade.h:8
+msgid "Select who would you like to invite:"
+msgstr "Välj vem du vill bjuda in:"
+
+#: ../src/empathy-chat-window.glade.h:9
+msgid "You have been invited to join a chat conference."
+msgstr "Du har blivit inbjuden till en chattkonferens."
+
+#: ../src/empathy-chat-window.glade.h:10
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+msgid "_Contents"
+msgstr "I_nnehåll"
+
+#: ../src/empathy-chat-window.glade.h:12
+msgid "_Conversation"
+msgstr "_Samtal"
+
+#: ../src/empathy-chat-window.glade.h:13
+msgid "_Detach Tab"
+msgstr "_Koppla loss flik"
+
+#: ../src/empathy-chat-window.glade.h:15
+msgid "_Favorite Chatroom"
+msgstr "_Favoritchattrum"
+
+#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: ../src/empathy-chat-window.glade.h:17
+msgid "_Next Tab"
+msgstr "_Nästa flik"
+
+#: ../src/empathy-chat-window.glade.h:18
+msgid "_Previous Tab"
+msgstr "_Föregående flik"
+
+#: ../src/empathy-chat-window.glade.h:19
+msgid "_Tabs"
+msgstr "_Flikar"
+
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:280
 msgid "Room"
 msgstr "Rum"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:289
 msgid "Auto-Connect"
 msgstr "Anslut automatiskt"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.glade.h:2
+msgid "Edit Favorite Room"
+msgstr "Redigera favoritrum"
+
+#: ../src/empathy-chatrooms-window.glade.h:3
+msgid "Join room on start_up"
+msgstr "Gå in i rummet vid _uppstart"
+
+#: ../src/empathy-chatrooms-window.glade.h:4
+msgid "Join this chat room when Empathy starts and you are connected"
+msgstr "Gå in i detta chattrum när Empathy startar och du är ansluten"
+
+#: ../src/empathy-chatrooms-window.glade.h:5
 msgid "Manage Favorite Rooms"
 msgstr "Hantera favoritrum"
 
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-chatrooms-window.glade.h:6
+msgid "N_ame:"
+msgstr "N_amn:"
+
+#: ../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 "_Rum:"
+
+#: ../src/empathy-event-manager.c:372
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:375
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s ringer dig. Vill du svara?"
 
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:382
 msgid "_Reject"
 msgstr "Avv_isa"
 
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:388
 msgid "_Answer"
 msgstr "_Svara"
 
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:511
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Inkommande samtal från %s"
 
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:559
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s erbjuder dig en inbjudan"
 
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:565
 msgid "An external application will be started to handle it."
 msgstr "Ett externt program kommer att startas för att hantera den."
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:570
 msgid "You don't have the needed external application to handle it."
 msgstr "Du har inte det nödvändiga externa programmet att hantera den med."
 
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:692
 msgid "Room invitation"
 msgstr "Rumsinbjudan"
 
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:695
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s bjuder in dig till %s"
 
-#: ../src/empathy-event-manager.c:645
+#. Decline button
+#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
 msgid "_Decline"
 msgstr "_Neka"
 
-#: ../src/empathy-event-manager.c:650
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:708
 msgid "_Join"
 msgstr "_Gå in"
 
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:738
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s har bjudit in dig till %s"
 
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:860
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Inkommande filöverföring från %s"
 
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:954
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Prenumeration begärd av %s"
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:958
 #, c-format
 msgid ""
 "\n"
@@ -1832,846 +1693,631 @@ msgstr ""
 "\n"
 "Meddelande: %s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:935
-#, c-format
-msgid "%s is now offline."
-msgstr "%s är nu frånkopplad."
-
-#. someone is logging in
-#: ../src/empathy-event-manager.c:951
-#, c-format
-msgid "%s is now online."
-msgstr "%s är nu ansluten."
-
-#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:113
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:104
+#: ../src/empathy-ft-manager.c:115
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "Okänt"
+#: ../src/empathy-ft-manager.c:164
+msgid "No reason was specified"
+msgstr "Ingen anledning angavs"
 
-#: ../src/empathy-ft-manager.c:275
-#, c-format
-msgid "%s of %s at %s/s"
-msgstr "%s av %s i %s/s"
+#: ../src/empathy-ft-manager.c:166
+msgid "The change in state was requested"
+msgstr "Ändring i tillstånd begärdes"
 
-#: ../src/empathy-ft-manager.c:276
-#, c-format
-msgid "%s of %s"
-msgstr "%s av %s"
+#: ../src/empathy-ft-manager.c:168
+msgid "You canceled the file transfer"
+msgstr "Du avbröt filöverföringen"
+
+#: ../src/empathy-ft-manager.c:170
+msgid "The other participant canceled the file transfer"
+msgstr "Den andra deltagaren avbröt filöverföringen"
+
+#: ../src/empathy-ft-manager.c:172
+msgid "Error while trying to transfer the file"
+msgstr "Fel vid försök att överföra filen"
+
+#: ../src/empathy-ft-manager.c:174
+msgid "The other participant is unable to transfer the file"
+msgstr "Den andra deltagaren kunde inte överföra filen"
+
+#: ../src/empathy-ft-manager.c:176
+msgid "Unknown reason"
+msgstr "Okänd anledning"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:224
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Tar emot \"%s\" från %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:227
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Skickar \"%s\" till %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 "Fel vid mottagning av \"%s\" från %s"
-
-#: ../src/empathy-ft-manager.c:343
-msgid "Error receiving a file"
-msgstr "Fel vid mottagning av en fil"
+#: ../src/empathy-ft-manager.c:237
+msgctxt "file size"
+msgid "Unknown"
+msgstr "Okänt"
 
-#: ../src/empathy-ft-manager.c:348
+#. translators: first %s is the transferred size, second %s is
+#. * the total file size
+#: ../src/empathy-ft-manager.c:245
 #, c-format
-msgid "Error sending \"%s\" to %s"
-msgstr "Fel vid sändning av \"%s\" till %s"
+msgid "%s of %s"
+msgstr "%s av %s"
 
-#: ../src/empathy-ft-manager.c:351
-msgid "Error sending a file"
-msgstr "Fel vid sändning av en fil"
+#: ../src/empathy-ft-manager.c:252
+msgid "Waiting the other participant's response"
+msgstr "Väntar på svar från den andra deltagaren"
 
-#. translators: first %s is filename, second %s
-#. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:262
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" togs emot från %s"
 
-#. translators: first %s is filename, second %s
-#. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" skickades till %s"
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:271
 msgid "File transfer completed"
 msgstr "Filöverföringen är färdig"
 
-#: ../src/empathy-ft-manager.c:617
-#: ../src/empathy-ft-manager.c:784
-msgid "Waiting for the other participant's response"
-msgstr "Väntar på svar från den andra deltagaren"
+#: ../src/empathy-ft-manager.c:280
+#, c-format
+msgid "\"%s\" receiving from %s"
+msgstr "\"%s\" tas emot från %s"
 
-#: ../src/empathy-ft-manager.c:643
-#: ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:286
 #, c-format
-msgid "Checking integrity of \"%s\""
-msgstr "Kontrollerar integritet för \"%s\""
+msgid "\"%s\" sending to %s"
+msgstr "\"%s\" skickas till %s"
 
-#: ../src/empathy-ft-manager.c:646
-#: ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:289
 #, c-format
-msgid "Hashing \"%s\""
-msgstr "Hashar \"%s\""
+msgid "File transfer canceled: %s"
+msgstr "Filöverföringen avbröts: %s"
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:304
+msgctxt "remaining time"
+msgid "Unknown"
+msgstr "Okänt"
+
+#: ../src/empathy-ft-manager.c:364
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Okänt"
+
+#: ../src/empathy-ft-manager.c:700
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:712
 msgid "File"
 msgstr "Fil"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:734
 msgid "Remaining"
 msgstr "Återstår"
 
-#: ../src/empathy-ft-manager.ui.h:1
-msgid "File Transfers"
+#: ../src/empathy-ft-manager.c:885
+msgid "Cannot save file to this location"
+msgstr "Kan inte spara fil till denna plats"
+
+#: ../src/empathy-ft-manager.c:931
+msgid "Save file as..."
+msgstr "Spara fil som..."
+
+#: ../src/empathy-ft-manager.c:1001
+msgid "unknown size"
+msgstr "okänd storlek"
+
+#: ../src/empathy-ft-manager.c:1007
+#, c-format
+msgid "%s would like to send you a file"
+msgstr "%s vill skicka en fil till dig"
+
+#: ../src/empathy-ft-manager.c:1012
+#, c-format
+msgid "Do you want to accept the file \"%s\" (%s)?"
+msgstr "Vill du ta emot filen \"%s\" (%s)?"
+
+#. Accept button
+#: ../src/empathy-ft-manager.c:1030
+msgid "_Accept"
+msgstr "_Acceptera"
+
+#: ../src/empathy-ft-manager.glade.h:1
+msgid "File transfers"
 msgstr "Filöverföringar"
 
-#: ../src/empathy-ft-manager.ui.h:2
+#: ../src/empathy-ft-manager.glade.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Ta bort färdiga, avbrutna och misslyckade filöverföringar från listan"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-dialog.c:255
 msgid "Import"
 msgstr "Importera"
 
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-dialog.c:264
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-dialog.c:290
 msgid "Source"
 msgstr "Källa"
 
-#: ../src/empathy-import-dialog.c:392
-msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
-msgstr "Inga konton att importera kunde hittas. Empathy har för närvarande endast stöd för att importera konton från Pidgin."
+#: ../src/empathy-import-dialog.c:378
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Inga konton att importera kunde hittas. Empathy har för närvarande endast "
+"stöd för att importera konton från Pidgin."
 
-#: ../src/empathy-import-dialog.ui.h:1
+#: ../src/empathy-import-dialog.glade.h:1
 msgid "Import Accounts"
 msgstr "Importera konton"
 
-#: ../src/empathy-main-window.c:396
-msgid "_Edit account"
-msgstr "_Redigera konto"
-
-#: ../src/empathy-main-window.c:499
+#: ../src/empathy-main-window.c:391
 msgid "No error specified"
 msgstr "Inget fel angivet"
 
-#: ../src/empathy-main-window.c:502
+#: ../src/empathy-main-window.c:394
 msgid "Network error"
 msgstr "Nätverksfel"
 
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:397
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:400
 msgid "Encryption error"
 msgstr "Krypteringsfel"
 
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:403
 msgid "Name in use"
 msgstr "Namnet används"
 
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:406
 msgid "Certificate not provided"
 msgstr "Certifikat inte tillhandahållet"
 
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:409
 msgid "Certificate untrusted"
 msgstr "Certifikatet är inte betrott"
 
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:412
 msgid "Certificate expired"
 msgstr "Certifikatet har gått ut"
 
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:415
 msgid "Certificate not activated"
 msgstr "Certifikatet är inte aktiverat"
 
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:418
 msgid "Certificate hostname mismatch"
 msgstr "Värdnamnet i certifikatet stämmer inte"
 
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:421
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikatets fingeravtryck stämmer inte"
 
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:424
 msgid "Certificate self-signed"
 msgstr "Självsignerat certifikat"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:427
 msgid "Certificate error"
 msgstr "Certifikatfel"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:430
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ../src/empathy-main-window.c:1218
+#: ../src/empathy-main-window.c:594
 msgid "Show and edit accounts"
 msgstr "Visa och redigera konton"
 
-#: ../src/empathy-main-window.ui.h:1
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-main-window.c:974
+msgid "Contact"
+msgstr "Kontakt"
+
+#: ../src/empathy-main-window.c:1176
+msgid "_Edit account"
+msgstr "_Redigera konto"
+
+#: ../src/empathy-main-window.glade.h:1
 msgid "Contact List"
 msgstr "Kontaktlista"
 
-#: ../src/empathy-main-window.ui.h:2
-msgid "Contacts on a _Map"
-msgstr "Kontakter på en ka_rta"
-
 # Hm?
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.glade.h:2
 msgid "Context"
 msgstr "Sammanhang"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.glade.h:3
 msgid "Join _Favorites"
 msgstr "Gå in i _favoriter"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.glade.h:4
+msgid "Join _New..."
+msgstr "Gå in i _nytt..."
+
+#: ../src/empathy-main-window.glade.h:5
 msgid "Manage Favorites"
 msgstr "Hantera favoriter"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.glade.h:6
+msgid "Show _Offline Contacts"
+msgstr "Visa _frånkopplade kontakter"
+
+#: ../src/empathy-main-window.glade.h:7
 msgid "_Accounts"
 msgstr "_Konton"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.glade.h:8
 msgid "_Add Contact..."
 msgstr "_Lägg till kontakt..."
 
-#: ../src/empathy-main-window.ui.h:9
-msgid "_Contents"
-msgstr "I_nnehåll"
-
-#: ../src/empathy-main-window.ui.h:10
-msgid "_Debug"
-msgstr "_Felsökning"
-
-#: ../src/empathy-main-window.ui.h:12
-msgid "_File Transfers"
-msgstr "Fi_löverföringar"
-
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Join..."
-msgstr "_Gå in..."
-
-#: ../src/empathy-main-window.ui.h:15
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
 msgid "_New Conversation..."
 msgstr "_Nytt samtal..."
 
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Offline Contacts"
-msgstr "_Frånkopplade kontakter"
-
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.glade.h:14
 msgid "_Personal Information"
 msgstr "_Personlig information"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Previous Conversations"
-msgstr "Ti_digare samtal"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.glade.h:16
 msgid "_Room"
 msgstr "_Rum"
 
-#: ../src/empathy-new-chatroom-dialog.c:331
-msgid "Chat Room"
+#: ../src/empathy-new-chatroom-dialog.c:291
+msgid "Chat Rooms"
 msgstr "Chattrum"
 
-#: ../src/empathy-new-chatroom-dialog.c:347
-msgid "Members"
-msgstr "Medlemmar"
+#: ../src/empathy-new-chatroom-dialog.glade.h:2
+msgid "Browse:"
+msgstr "Bläddra:"
 
-#: ../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."
+#: ../src/empathy-new-chatroom-dialog.glade.h:3
 msgid ""
-"<b>%s</b>\n"
-"Invite required: %s\n"
-"Password required: %s\n"
-"Members: %s"
+"Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
-"<b>%s</b>\n"
-"Inbjudan krävs: %s\n"
-"Lösenord krävs: %s\n"
-"Medlemmar: %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 "Nej"
-
-#: ../src/empathy-new-chatroom-dialog.c:526
-msgid "Could not start room listing"
-msgstr "Kunde inte starta rumslistningen"
-
-#: ../src/empathy-new-chatroom-dialog.c:536
-msgid "Could not stop room listing"
-msgstr "Kunde inte stoppa rumslistningen"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Kunde inte läsa in rumslistan"
-
-#: ../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 "Ange rumsnamnet för att gå in i eller klicka på ett eller flera rum i listan."
-
-#: ../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 "Ange servern som tillhandahåller rummet, eller lämna den tom om rummet finns på servern för det aktuella kontot"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Gå in i rum"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "Room List"
-msgstr "Rumslista"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Rum:"
+"Ange rumsnamnet för att gå in i eller klicka på ett eller flera rum i listan."
 
-#: ../src/empathy-preferences.c:161
+#: ../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 ""
+"Ange servern som tillhandahåller rummet, eller lämna den tom om rummet finns "
+"på servern för det aktuella kontot"
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:5
+msgid "Join"
+msgstr "Gå in"
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:6
+msgid "Join New"
+msgstr "Gå in i nytt"
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:7
+msgid "Re_fresh"
+msgstr "Uppda_tera"
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:8
+msgid ""
+"This list represents all chat rooms hosted on the server you have entered."
+msgstr ""
+"Den här listan representerar alla chattrum som finns på servern som du har "
+"gått in på."
+
+#: ../src/empathy-preferences.c:157
 msgid "Message received"
 msgstr "Meddelande togs emot"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:158
 msgid "Message sent"
 msgstr "Meddelandet skickat"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:159
 msgid "New conversation"
 msgstr "Nytt samtal"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:160
 msgid "Contact goes online"
 msgstr "Kontakt ansluts"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:161
 msgid "Contact goes offline"
 msgstr "Kontakt kopplas ner"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:162
 msgid "Account connected"
 msgstr "Kontot anslutet"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:163
 msgid "Account disconnected"
 msgstr "Kontot frånkopplat"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:397
 msgid "Language"
 msgstr "Språk"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "Tillåt _GPS-användning"
+#: ../src/empathy-preferences.glade.h:1
+msgid "<b>Appearance</b>"
+msgstr "<b>Utseende</b>"
+
+#: ../src/empathy-preferences.glade.h:2
+msgid "<b>Behavior</b>"
+msgstr "<b>Beteende</b>"
+
+#: ../src/empathy-preferences.glade.h:3
+msgid "<b>Contact List</b>"
+msgstr "<b>Kontaktlista</b>"
 
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "Tillåt användning av _mobiltelefon"
+#: ../src/empathy-preferences.glade.h:4
+msgid "<b>Enable spell checking for languages:</b>"
+msgstr "<b>Aktivera rättstavning för språk:</b>"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "Tillåt _nätverksanvändning"
+#: ../src/empathy-preferences.glade.h:5
+msgid "<b>Play sound for events</b>"
+msgstr "<b>Spela upp ljud för händelser</b>"
 
-#: ../src/empathy-preferences.ui.h:4
-msgid "Appearance"
-msgstr "Utseende"
+#: ../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>Listan visar endast språk du har en ordlista installerad för.</small>"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.glade.h:7
 msgid "Automatically _connect on startup "
 msgstr "Anslut _automatiskt vid uppstart"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.glade.h:8
 msgid "Avatars are user chosen images shown in the contact list"
 msgstr "Avatarer är användarvalda bilder som visas i kontaktlistan"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Behavior"
-msgstr "Beteende"
-
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.glade.h:9
 msgid "Chat Th_eme:"
 msgstr "Chatt_ema:"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.glade.h:10
 msgid "Disable notifications when _away or busy"
 msgstr "Inaktivera notifieringar under fr_ånvaro eller upptagen"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.glade.h:11
 msgid "Disable sounds when _away or busy"
 msgstr "Inaktivera ljud under fr_ånvaro eller upptagen"
 
-#: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when a contact comes online"
-msgstr "Aktivera notifieringar när en kontakt ansluter"
-
-#: ../src/empathy-preferences.ui.h:13
-msgid "Enable notifications when a contact goes offline"
-msgstr "Aktivera notifieringar när en kontakt kopplar från"
-
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.glade.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Aktivera notifieringar när _chatten inte är fokuserad"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Enable spell checking for languages:"
-msgstr "Aktivera rättstavning för språk:"
-
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.glade.h:13
 msgid "General"
 msgstr "Allmänt"
 
-#: ../src/empathy-preferences.ui.h:17
-msgid "Geoclue Settings"
-msgstr "Inställningar för Geoclue"
-
-#: ../src/empathy-preferences.ui.h:18
-msgid "Location"
-msgstr "Plats"
-
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.glade.h:14
 msgid "Notifications"
 msgstr "Notifieringar"
 
-#: ../src/empathy-preferences.ui.h:20
-msgid "Play sound for events"
-msgstr "Spela upp ljud för händelser"
-
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.glade.h:15
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Integritet"
-
-#: ../src/empathy-preferences.ui.h:23
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will 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;)."
-
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.glade.h:16
 msgid "Show _avatars"
 msgstr "Visa _avatarer"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.glade.h:17
 msgid "Show _smileys as images"
 msgstr "Visa _smilisar som bilder"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.glade.h:18
 msgid "Show co_mpact contact list"
 msgstr "Visa ko_mpakt kontaktlista"
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "Show contact _list in rooms"
-msgstr "Visa kontakt_lista i rum"
-
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.glade.h:19
 msgid "Sort by _name"
 msgstr "Sortera efter _namn"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.glade.h:20
 msgid "Sort by s_tate"
 msgstr "Sortera efter _tillstånd"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.glade.h:21
 msgid "Sounds"
 msgstr "Ljud"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.glade.h:22
 msgid "Spell Checking"
 msgstr "Stavningskontroll"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "Listan visar endast språk som du har en ordlista installerad för."
-
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.glade.h:23
 msgid "Themes"
 msgstr "Teman"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.glade.h:24
 msgid "_Enable bubble notifications"
 msgstr "_Aktivera bubbelnotifieringar"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.glade.h:25
 msgid "_Enable sound notifications"
 msgstr "_Aktivera ljudnotifieringar"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.glade.h:26
 msgid "_Open new chats in separate windows"
 msgstr "_Öppna nya chattar i separata fönster"
 
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Publicera platsen till mina kontakter"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "_Reduce location accuracy"
-msgstr "_Minska precision för plats"
-
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.glade.h:1
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.glade.h:3
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.glade.h:4
 msgid "_Show Contact List"
 msgstr "_Visa kontaktlista"
 
-#: ../src/empathy-tube-dispatch.c:375
+#: ../src/empathy-tube-dispatch.c:364
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr "Kunde inte starta program för tjänsten %s: %s"
 
-#: ../src/empathy-tube-dispatch.c:446
+#: ../src/empathy-tube-dispatch.c:435
 #, c-format
-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"
-
-#: ../src/empathy-debug-dialog.c:111
-#: ../src/empathy-debug-dialog.c:1083
-msgid "Error"
-msgstr "Fel"
-
-#: ../src/empathy-debug-dialog.c:114
-#: ../src/empathy-debug-dialog.c:1077
-msgid "Critical"
-msgstr "Kritiskt"
-
-#: ../src/empathy-debug-dialog.c:117
-#: ../src/empathy-debug-dialog.c:1071
-msgid "Warning"
-msgstr "Varning"
-
-#: ../src/empathy-debug-dialog.c:120
-#: ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
-msgid "Message"
-msgstr "Meddelande"
-
-#: ../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 "Felsökning"
-
-#: ../src/empathy-debug-dialog.c:845
-msgid "Save"
-msgstr "Spara"
-
-#: ../src/empathy-debug-dialog.c:948
-msgid "Debug Window"
-msgstr "Felsökningsfönster"
-
-#: ../src/empathy-debug-dialog.c:1021
-msgid "Pause"
-msgstr "Gör paus"
-
-#: ../src/empathy-debug-dialog.c:1033
-msgid "Level "
-msgstr "Nivå "
-
-#: ../src/empathy-debug-dialog.c:1102
-msgid "Time"
-msgstr "Tid"
-
-#: ../src/empathy-debug-dialog.c:1104
-msgid "Domain"
-msgstr "Domän"
-
-#: ../src/empathy-debug-dialog.c:1106
-msgid "Category"
-msgstr "Kategori"
-
-#: ../src/empathy-debug-dialog.c:1108
-msgid "Level"
-msgstr "Nivå"
-
-#: ../src/empathy-debug-dialog.c:1140
-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 "<b>Network</b>"
-#~ msgstr "<b>Nätverk</b>"
-#~ msgid "<b>Servers</b>"
-#~ msgstr "<b>Servrar</b>"
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>Ämne:</b>"
-#~ msgid "<b>Contact</b>"
-#~ msgstr "<b>Kontakt</b>"
-#~ msgid "<b>Groups</b>"
-#~ msgstr "<b>Grupper</b>"
+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"
 
-#, fuzzy
-#~ msgid "<b>Add Account</b>"
-#~ msgstr "<b>Konto</b>"
-#~ msgid "New message from %s"
-#~ msgstr "Nytt meddelande från %s"
-#~ msgid "File transfers"
-#~ msgstr "Filöverföringar"
-#~ msgid "<b>Contact List</b>"
-#~ msgstr "<b>Kontaktlista</b>"
-#~ msgid "Forget password and clear the entry."
-#~ msgstr "Glöm lösenordet och töm inmatningen."
-#~ msgid "Edit the selected IRC network"
-#~ msgstr "Redigera markerat irc-nätverk"
-#~ msgid "Remove the selected IRC network"
-#~ msgstr "Ta bort markerat irc-nätverk"
-#~ msgid "_Check Word Spelling..."
-#~ msgstr "_Kontrollera stavning..."
-#~ msgid "Group Chat"
-#~ msgstr "Gruppchatt"
-#~ msgid "Contact Information"
-#~ msgstr "Kontaktinformation"
-#~ msgid "I would like to add you to my contact list."
-#~ msgstr "Jag vill lägga till dig i min kontaktlista."
-#~ msgid "Sorry, I don't want you in my contact list anymore."
-#~ msgstr "Tyvärr, jag vill inte längre ha dig i min kontaktlista."
-#~ msgid "Contact information"
-#~ msgstr "Kontaktinformation"
-#~ msgid "Word"
-#~ msgstr "Ord"
-#~ msgid "Suggestions for the word"
-#~ msgstr "Förslag för ordet"
-#~ msgid "Spell Checker"
-#~ msgstr "Stavningskontroll"
-#~ msgid "Suggestions for the word:"
-#~ msgstr "Förslag för ordet:"
-#~ msgid "<b>New Account</b>"
-#~ 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"
-#~ msgstr "Gå in i rummet vid _uppstart"
-#~ msgid "Join this chat room when Empathy starts and you are connected"
-#~ msgstr "Gå in i detta chattrum när Empathy startar och du är ansluten"
-#~ msgid "N_ame:"
-#~ msgstr "N_amn:"
-#~ msgid "S_erver:"
-#~ msgstr "S_erver:"
-#~ msgctxt "file size"
-#~ msgid "Unknown"
-#~ msgstr "Okänt"
-#~ msgid "\"%s\" receiving from %s"
-#~ msgstr "\"%s\" tas emot från %s"
-#~ msgid "\"%s\" sending to %s"
-#~ msgstr "\"%s\" skickas till %s"
-#~ msgid "File transfer canceled: %s"
-#~ msgstr "Filöverföringen avbröts: %s"
-#~ msgctxt "remaining time"
-#~ msgid "Unknown"
-#~ msgstr "Okänt"
-#~ msgid "Cannot save file to this location"
-#~ msgstr "Kan inte spara fil till denna plats"
-#~ msgid "Save file as..."
-#~ msgstr "Spara fil som..."
-#~ msgid "unknown size"
-#~ msgstr "okänd storlek"
-#~ msgid "%s would like to send you a file"
-#~ msgstr "%s vill skicka en fil till dig"
-#~ msgid "Do you want to accept the file \"%s\" (%s)?"
-#~ msgstr "Vill du ta emot filen \"%s\" (%s)?"
-#~ msgid "_Accept"
-#~ msgstr "_Acceptera"
-#~ msgid "Join _New..."
-#~ msgstr "Gå in i _nytt..."
-#~ msgid "Chat Rooms"
-#~ msgstr "Chattrum"
-#~ msgid "Browse:"
-#~ msgstr "Bläddra:"
-#~ msgid "Join"
-#~ msgstr "Gå in"
-#~ msgid "Join New"
-#~ msgstr "Gå in i nytt"
-#~ msgid "Re_fresh"
-#~ msgstr "Uppda_tera"
-#~ msgid ""
-#~ "This list represents all chat rooms hosted on the server you have entered."
-#~ msgstr ""
-#~ "Den här listan representerar alla chattrum som finns på servern som du "
-#~ "har gått in på."
 #~ msgid "menuitem2"
 #~ msgstr "menyobjekt2"
+
 #~ msgid "Closed"
 #~ msgstr "Stängd"
+
 #~ msgid "End this call?"
 #~ 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 "_End Call"
+#~ msgstr "A_vsluta samtal"
+
 #~ 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"
 #~ msgstr "Ansluter"
+
 #~ msgid ""
 #~ "Incoming call from %s rejected because there is already a running call."
 #~ msgstr ""
 #~ "Inkommande samtal från %s avvisades därför att det redan finns ett "
 #~ "pågående samtal."
+
 #~ 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>Knappsats</b>"
+
 #~ msgid "<b>Volume</b>"
 #~ msgstr "<b>Volym</b>"
+
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "Aktivera popup när kontakt är tillgänglig"
+
 #~ msgid "Whether or not to show a popup when a contact becomes available."
 #~ msgstr ""
 #~ "Huruvida en popup ska visas eller inte när en kontakt blir tillgänglig."
+
 #~ msgid ""
 #~ "%s is offering you an invitation, but you don't have the needed external "
 #~ "application to handle it."
 #~ msgstr ""
 #~ "%s erbjuder dig en inbjudan men du har inte det nödvändiga externa "
 #~ "programmet för att hantera den."
+
 #~ msgid "Invitation Error"
 #~ msgstr "Inbjudningsfel"
+
+#~ msgid "gtk-clear"
+#~ msgstr "Töm"
+
 #~ msgid "gtk-cancel"
 #~ msgstr "Avbryt"
+
+#~ msgid "gtk-ok"
+#~ msgstr "OK"
+
 #~ msgid "Enable sound when busy"
 #~ msgstr "Aktivera ljud under upptagetläge"
+
 #~ msgid "<b>Audio</b>"
 #~ msgstr "<b>Ljud</b>"
+
 #~ msgid "<b>Visual</b>"
 #~ msgstr "<b>Visuellt</b>"
+
 #~ msgid "Enable sounds when _busy"
 #~ msgstr "Aktivera ljud under _upptagetläge"
+
 #~ msgid "Configure Telepathy account settings"
 #~ msgstr "Konfigurera inställningar för Telepathy-konto"
+
 #~ msgid "Empathy accounts"
 #~ msgstr "Empathy-konton"
+
 #~ 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 ""
 #~ "För att lägga till ett nytt konto, klicka på knappen \"Lägg till\" och en "
 #~ "ny post kommer att skapas för dig att börja konfigurera."
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -2682,30 +2328,46 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "\n"
 #~ "Om du inte vill lägga till ett konto, kan du helt enkelt klicka på "
 #~ "kontot, i listan till vänster, som du vill konfigurera."
+
 #~ msgid "<b>No Accounts Configured</b>"
 #~ msgstr "<b>Inga konton konfigurerade</b>"
+
 #~ msgid "J_apan server:"
 #~ msgstr "J_apansk server:"
+
 #~ msgid "Invalid handle"
 #~ msgstr "Ogiltig hanterare"
+
 #~ msgid "No matching connection"
 #~ msgstr "Ingen matchande anslutning"
+
 #~ msgid "Invalid account"
 #~ msgstr "Ogiltigt konto"
+
 #~ msgid "Presence failure"
 #~ msgstr "Närvarofel"
+
+#~ msgid "Contact does not support voice"
+#~ msgstr "Kontakten saknar stöd för röstsamtal"
+
 #~ msgid "Lowmem"
 #~ msgstr "Lågminne"
+
 #~ msgid "Channel request generic error"
 #~ msgstr "Allmänt fel vid kanalbegäran"
+
 #~ msgid "Channel banned"
 #~ msgstr "Bannlyst från kanalen"
+
 #~ msgid "Channel full"
 #~ msgstr "Kanalen är full"
+
 #~ msgid "Channel invite only"
 #~ msgstr "Kanalen är endast för inbjudna"
+
 #~ msgid "Unknown error code"
 #~ msgstr "Okänd felkod"
+
 #~ 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"
@@ -2718,177 +2380,272 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "\n"
 #~ "Om du inte vill lägga till ett konto, kan du helt enkelt klicka på "
 #~ "kontot, i listan till vänster, som du vill konfigurera."
+
 #~ msgid "Chat with contact"
 #~ msgstr "Chatta med kontakten"
+
 #~ msgid "View contact information"
 #~ msgstr "Visa kontaktinformation"
+
 #~ msgid "Re_name"
 #~ msgstr "Byt _namn"
+
 #~ msgid "Rename"
 #~ msgstr "Byt namn"
+
 #~ msgid "Edit the groups and name for this contact"
 #~ msgstr "Redigera grupper och namn för kontakten"
+
 #~ msgid "Invite to a currently open chat room"
 #~ msgstr "Bjud in till ett för tillfället öppet chattrum"
+
 #~ msgid "View previous conversations with this contact"
 #~ msgstr "Visa tidigare samtal med denna kontakt"
+
 #~ msgid "Start a voice or video conversation with this contact"
 #~ msgstr "Starta röst- eller videosamtal med denna kontakt"
+
 #~ msgid "Start Call"
 #~ msgstr "Påbörja samtal"
+
 #~ msgid "gtk-cut"
 #~ msgstr "Klipp ut"
+
 #~ msgid "gtk-paste"
 #~ msgstr "Klistra in"
+
 #~ msgid "gtk-about"
 #~ msgstr "Om"
+
 #~ msgid "gtk-quit"
 #~ msgstr "Avsluta"
+
 #~ msgid "ICQ account settings"
 #~ msgstr "Inställningar för ICQ-konto"
+
 #~ msgid "jabber account settings"
 #~ msgstr "inställningar för jabberkonto"
+
 #~ msgid "msn account settings"
 #~ msgstr "inställningar för msn-konto"
+
 #~ msgid "salut account settings"
 #~ msgstr "inställningar för salut-konto"
+
 #~ msgid "Yahoo! account settings"
 #~ msgstr "Inställningar för Yahoo!-konto"
+
 #~ msgid "Input"
 #~ msgstr "Ingång"
+
 #~ msgid "Mute"
 #~ msgstr "Tyst"
 
 # Det måste finnas ett bättre ord
 #~ msgid "Output"
 #~ msgstr "Utgång"
+
 #~ msgid "Ca_ll"
 #~ msgstr "R_ing"
+
 #~ msgid "Change _Topic..."
 #~ msgstr "Ändra _ämne..."
+
 #~ msgid "Contact Infor_mation"
 #~ msgstr "Kontaktinfor_mation"
+
 #~ msgid "Cu_t"
 #~ msgstr "Klipp _ut"
+
 #~ msgid "In_vite..."
 #~ msgstr "_Bjud in..."
+
 #~ msgid "_Add To Favorites"
 #~ msgstr "_Lägg till i favoriter"
+
 #~ msgid "_Copy"
 #~ msgstr "_Kopiera"
+
+#~ msgid "_Paste"
+#~ msgstr "Klistra _in"
+
 #~ msgid "_Show Contacts"
 #~ msgstr "_Visa kontakter"
+
 #~ msgid "Enter the new topic you want to set for this room:"
 #~ msgstr "Ange det nya ämnet som du vill ställa in för det här rummet:"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>Alternativ</b>"
+
 #~ msgid "_Use for chat rooms"
 #~ msgstr "Använd för _chattrum"
+
 #~ msgid "%s went offline"
 #~ msgstr "%s kopplade från"
+
+#~ msgid "%s has come online"
+#~ msgstr "%s anslöt sig"
+
 #~ msgid "Disable"
 #~ msgstr "Inaktivera"
+
+#~ msgid "Call from %s"
+#~ msgstr "Samtal från %s"
+
 #~ msgid "Edit Account _Details"
 #~ msgstr "Redigera konto_detaljer"
+
 #~ msgid "_New Message..."
 #~ msgstr "_Nytt meddelande..."
+
 #~ msgid "New message"
 #~ msgstr "Nytt meddelande"
+
 #~ msgid "A unique name for this account to identify it personally to you."
 #~ msgstr ""
 #~ "Ett unikt namn på kontot för att personligen identifiera det till dig."
+
+#~ msgid "Chat Room"
+#~ msgstr "Chattrum"
+
 #~ msgid "Contact List - Empathy"
 #~ msgstr "Kontaktlista - Empathy"
+
 #~ msgid "<b>Languages</b>"
 #~ msgstr "<b>Språk</b>"
+
 #~ msgid "_Enable spell checking"
 #~ msgstr "_Aktivera stavningskontroll"
+
 #~ msgid "Clear List..."
 #~ msgstr "Töm listan..."
+
 #~ msgid "Are you sure you want to clear the list?"
 #~ msgstr "Är du säker på att du vill tömma listan?"
+
 #~ msgid ""
 #~ "This will remove any custom messages you have added to the list of preset "
 #~ "status messages."
 #~ msgstr ""
 #~ "Detta kommer att ta bort de meddelanden du har lagt till i listan med "
 #~ "förinställda statusmeddelanden"
+
 #~ msgid "Clear List"
 #~ msgstr "Töm listan"
+
 #~ msgid "Enter status message:"
 #~ msgstr "Ange statusmeddelande:"
+
 #~ msgid "Status Message Presets"
 #~ msgstr "Förinställda statusmeddelanden"
+
 #~ msgid "_Add to status message list"
 #~ msgstr "_Lägg till i statusmeddelandelistan"
+
 #~ msgid ""
 #~ "Subscription requested for %s\n"
 #~ "Message: %s"
 #~ msgstr ""
 #~ "Prenumerationsförfrågan för %s\n"
 #~ "Meddelande: %s"
+
 #~ msgid "Instant Messenger"
 #~ msgstr "Snabbmeddelandeklient"
+
 #~ msgid "Sorry, I don't want you in my contact list."
 #~ msgstr "Tyvärr, jag vill inte ha dig i min kontaktlista."
+
+#~ msgid "<b>Account</b>"
+#~ msgstr "<b>Konto</b>"
+
 #~ msgid "Imendio "
 #~ msgstr "Imendio "
+
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
+
 #~ msgid "Create"
 #~ msgstr "Skapa"
+
 #~ msgid ""
 #~ "<small><b><span foreground=\"#555\">Example: user@jabber.org</span></b></"
 #~ "small>"
 #~ msgstr ""
 #~ "<small><b><span foreground=\"#555\">Exempel: användare@jabber.org</span></"
 #~ "b></small>"
+
 #~ msgid "Gnome Instant Messaging Client"
 #~ msgstr "Snabbmeddelandeklient för Gnome"
+
 #~ msgid "-"
 #~ msgstr "-"
+
 #~ msgid "<b>Personal Details</b>"
 #~ msgstr "<b>Personliga detaljer</b>"
+
 #~ msgid "<b>Status</b>"
 #~ msgstr "<b>Status</b>"
+
 #~ msgid "<b>Subscription</b>"
 #~ msgstr "<b>Prenumeration</b>"
+
 #~ msgid "<span size=\"smaller\">Example: Mikael or user@server.org</span>"
 #~ msgstr ""
 #~ "<span size=\"smaller\">Exempel: Mikael eller användare@server.org</span>"
+
 #~ msgid ""
 #~ "<span size=\"smaller\">Note: You must select an account if the contact is "
 #~ "unknown</span>"
 #~ msgstr ""
 #~ "<span size=\"smaller\">Observera: Du måste välja ett konto om kontakten "
 #~ "är okänd</span>"
+
 #~ msgid "Accou_nt:"
 #~ msgstr "Ko_nto:"
+
 #~ msgid "Add Contact"
 #~ msgstr "Lägg till kontakt"
+
 #~ msgid "C_hange"
 #~ msgstr "_Ändra"
+
 #~ msgid "Ch_at"
 #~ msgstr "Ch_atta"
+
 #~ msgid "Con_tact:"
 #~ msgstr "_Kontakt:"
+
 #~ msgid "Contact List - Gossip"
 #~ msgstr "Kontaktlista - Gossip"
+
+#~ msgid "Country:"
+#~ msgstr "Land:"
+
 #~ msgid "Edit Contact"
 #~ msgstr "Redigera kontakt"
+
 #~ msgid "Edit Groups"
 #~ msgstr "Redigera grupper"
+
 #~ msgid "ID:"
 #~ msgstr "Id:"
+
 #~ msgid ""
 #~ "If you chose to decide later you will be asked the next time you log on."
 #~ msgstr ""
 #~ "Om du väljer att bestämma dig senare kommer du att bli frågad nästa gång "
 #~ "du logga in."
+
 #~ msgid "Name:"
 #~ msgstr "Namn:"
+
 #~ msgid "Personal Details"
 #~ msgstr "Personliga detaljer"
+
 #~ msgid "R_egister"
 #~ msgstr "Re_gistrera"
+
 #~ msgid ""
 #~ "Set the alias you want to use for:\n"
 #~ "<b>foo@bar.baz</b>\n"
@@ -2899,6 +2656,7 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "<b>foo@bar.baz</b>\n"
 #~ "\n"
 #~ "Du kan hämta kontaktinformation från servern."
+
 #~ msgid ""
 #~ "This acts as a filter to the contact list below.\n"
 #~ "\n"
@@ -2915,6 +2673,7 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "\n"
 #~ "Du kan även använda namnet på en grupp för att endast visa kontakterna i "
 #~ "en specifik grupp."
+
 #~ msgid ""
 #~ "This acts as a filter to the contact list below. You can use segments of "
 #~ "contact's name or ID, for example, \"jabber.org\" will list everyone "
@@ -2923,198 +2682,289 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "Detta fungerar som ett filter till kontaktlistan nedan. Du kan använda "
 #~ "delar av kontaktens namn eller id, till exempel \"jabber.org\" kommer att "
 #~ "lista alla som använder den servern"
+
 #~ msgid "This is the name that will be used on your roster for this contact"
 #~ msgstr ""
 #~ "Detta är namnet som kommer att användas på din kontaktlista för denna "
 #~ "kontakt"
+
 #~ msgid "This name will be used to identify you in chat windows"
 #~ msgstr ""
 #~ "Detta namn kommer att användas för att identifiera dig i chattfönster"
+
 #~ msgid ""
 #~ "This name will be used to identify you when new contacts lookup your "
 #~ "details"
 #~ msgstr ""
 #~ "Detta namn kommer att användas för att identifiera dig när nya kontakter "
 #~ "kontrollerar din information"
+
 #~ msgid "Use default name here from the contact's VCard."
 #~ msgstr "Använd standardnamnet här från kontaktens VCard."
+
 #~ msgid "Use system pro_xy"
 #~ msgstr "Använd systemets pro_xyinställningar"
+
 #~ msgid "You are not subscribed to this contact."
 #~ msgstr "Du prenumererar inte på denna kontakt."
+
 #~ msgid "_Birthday:"
 #~ msgstr "_Födelsedag:"
+
 #~ msgid "_Connect"
 #~ msgstr "An_slut"
+
 #~ msgid "_Deny"
 #~ msgstr "_Neka"
+
+#~ msgid "_Description:"
+#~ msgstr "_Beskrivning:"
+
 #~ msgid "_Disconnect"
 #~ msgstr "_Koppla ifrån"
+
 #~ msgid ""
 #~ "_Enter the name or contact ID of the person you want to chat to below:"
 #~ msgstr "Ange _namnet eller kontakt-id för den person du vill chatta med:"
+
 #~ msgid "_Group:"
 #~ msgstr "_Grupp:"
+
 #~ msgid "_Password:"
 #~ msgstr "_Lösenord:"
+
 #~ msgid "_Retrieve"
 #~ msgstr "_Hämta"
+
 #~ msgid "_Subscribe"
 #~ msgstr "_Prenumerera"
+
 # "Web site" är "webbplats". "Web page" är "webbsida".
 #~ msgid "_Web site:"
 #~ msgstr "_Webbplats:"
+
 #~ msgid "Gossip Instant Messenger"
 #~ msgstr "Snabbmeddelandeklienten Gossip"
+
 #~ msgid "Normal"
 #~ msgstr "Normalt"
+
 #~ msgid "Active"
 #~ msgstr "Aktivt"
+
 #~ msgid "Inactive"
 #~ msgstr "Inaktivt"
+
+#~ msgid "Error"
+#~ msgstr "Fel"
+
 #~ msgid "Moderator"
 #~ msgid_plural "Moderators"
 #~ msgstr[0] "Moderator"
 #~ msgstr[1] "Moderatorer"
+
 #~ msgid "Participant"
 #~ msgid_plural "Participants"
 #~ msgstr[0] "Deltagare"
 #~ msgstr[1] "Deltagare"
+
 #~ msgid "Visitor"
 #~ msgid_plural "Visitors"
 #~ msgstr[0] "Besökare"
 #~ msgstr[1] "Besökare"
+
 #~ msgid "No role"
 #~ msgstr "Ingen roll"
+
 #~ msgid "Owner"
 #~ msgid_plural "Owners"
 #~ msgstr[0] "Ägare"
 #~ msgstr[1] "Ägare"
+
 #~ msgid "Administrator"
 #~ msgid_plural "Administrators"
 #~ msgstr[0] "Administrator"
 #~ msgstr[1] "Administratörer"
+
+#~ msgid "Member"
+#~ msgid_plural "Members"
+#~ msgstr[0] "Medlem"
+#~ msgstr[1] "Medlemmar"
+
 #~ msgid "The nickname you have chosen is already in use."
 #~ msgstr "Smeknamnet du har valt är upptaget."
+
 #~ msgid "The chat room you tried to join requires a password."
 #~ msgstr "Chattrummet du försökte gå in i kräver ett lösenord."
+
 #~ msgid "The remote conference server did not respond in a sensible time."
 #~ msgstr "Fjärrkonferensservern svarade inte inom en rimlig tid."
+
 #~ msgid "The conference server you tried to join could not be found."
 #~ msgstr "Konferensservern du försökte gå in på kunde inte hittas."
+
 #~ msgid "An unknown error occurred, check your details are correct."
 #~ msgstr ""
 #~ "Ett okänt fel har inträffat, kontrollera att dina detaljer är korrekta."
+
 #~ msgid "Joining the chatroom was canceled."
 #~ msgstr "Gå in i chattrummet avbröts."
+
 #~ msgid "Unavailable"
 #~ msgstr "Otillgänglig"
+
 #~ msgid "An unknown error occurred."
 #~ msgstr "Ett okänt fel inträffade."
+
 #~ msgid "Connection refused."
 #~ msgstr "Anslutning vägrades."
+
 #~ msgid "Server address could not be resolved."
 #~ msgstr "Serverns address kunde inte slås upp."
+
 #~ msgid "Connection timed out."
 #~ msgstr "Anslutning timade ut."
+
 #~ msgid "Authentication failed."
 #~ msgstr "Autentisering misslyckades."
+
 #~ msgid "The username you are trying already exists."
 #~ msgstr "Användarnamnet du försöker använda existerar redan."
+
 #~ msgid "The username you are trying is not valid."
 #~ msgstr "Användarnamnet du försöker använda är inte giltigt."
+
 #~ msgid "This feature is unavailable."
 #~ msgstr "Denna funktion är inte tillgänglig."
+
 #~ msgid "This feature is unauthorized."
 #~ msgstr "Denna funktion är inte auktoriserad."
+
 #~ msgid "A specific protocol error occurred that was unexpected."
 #~ msgstr "Ett oväntat specifikt protokollfel inträffade."
+
 #~ msgid "Connection could not be opened"
 #~ msgstr "Anslutning kunde inte öppnas"
+
 #~ msgid "Service has gone and is no longer available"
 #~ msgstr "Tjänsten ar försvunnit och finns inte längre tillgänglig"
+
 #~ msgid "Bad or malformed request to this service"
 #~ msgstr "Felaktig eller felformulerad begäran till den här tjänsten"
+
 #~ msgid "Unauthorized request to this service"
 #~ msgstr "Obehörig begäran till den här tjänsten"
+
 #~ msgid "Payment is required for this service"
 #~ msgstr "Betalning krävs för den här tjänsten"
+
 #~ msgid "This service is forbidden"
 #~ msgstr "Den här tjänsten är förbjuden"
+
 #~ msgid "This service is unavailable or not found"
 #~ msgstr "Den här tjänsten är inte tillgänglig eller hittades inte"
+
 #~ msgid "Unacceptable request sent to this services"
 #~ msgstr "Oaccepterbar begäran skickades till den här tjänsten"
+
 #~ msgid "Registration is required"
 #~ msgstr "Registrering krävs"
+
 #~ msgid "There was a conflict of interest trying to use this service"
 #~ msgstr ""
 #~ "Det inträffade en intressekonflikt vid försök att använda den här "
 #~ "tjänsten "
+
 #~ msgid "There was an internal service error"
 #~ msgstr "Det inträffade ett internt fel i tjänsten"
+
 #~ msgid "This feature is not implemented"
 #~ msgstr "Den här funktionen är inte implementerad"
+
 #~ msgid "The remote service timed out"
 #~ msgstr "Tidsgränsen för fjärrtjänsten överstegs"
+
 #~ msgid "Using the %s backend"
 #~ msgstr "Använder bakänden %s"
+
 #~ msgid "Stop"
 #~ msgstr "Stopp"
+
 #~ msgid "Disconnect"
 #~ msgstr "Koppla ifrån"
+
 #~ msgid "Connect"
 #~ msgstr "Anslut"
+
 #~ msgid "Bye bye"
 #~ msgstr "Hej då"
+
 #~ msgid "Successfully registered your new account settings."
 #~ msgstr "Registrering av dina nya kontoinställningar lyckades."
+
 #~ msgid "You should now be able to connect to your new account."
 #~ msgstr "Du ska nu kunna ansluta med ditt nya konto."
+
 #~ msgid "Failed to register your new account settings."
 #~ msgstr "Misslyckades med att registrera dina nya kontoinställningar."
+
 #~ msgid "Successfully changed your account password."
 #~ msgstr "Ditt kontolösenord ändrades."
+
 #~ msgid "You should now be able to connect with your new password."
 #~ msgstr "Du ska nu kunna ansluta med ditt nya lösenord."
+
 #~ msgid "Failed to change your account password."
 #~ msgstr "Misslyckades med att ändra ditt kontolösenord."
+
 #~ msgid ""
 #~ "Please enter a new password for this account:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Ange ett nytt lösenord för det här kontot:\n"
 #~ "%s"
+
 #~ msgid "No information is available for this contact."
 #~ msgstr "Ingen information finns tillgänglig för denna kontakt."
+
 #~ msgid "Information requested, please wait..."
 #~ msgstr "Information begärd, var vänlig vänta..."
+
 #~ msgid "To summarize:"
 #~ msgstr "Sammanfattning:"
+
 #~ msgid "%d subscription request"
 #~ msgid_plural "%d subscription requests"
 #~ msgstr[0] "%d prenumerationsförfrågan"
 #~ msgstr[1] "%d prenumerationsförfrågan"
+
 #~ msgid "%d file transfer request"
 #~ msgid_plural "%d file transfer requests"
 #~ msgstr[0] "%d filöverföringsförfrågan"
 #~ msgstr[1] "%d filöverföringsförfrågan"
+
 #~ msgid "%d server message"
 #~ msgid_plural "%d server messages"
 #~ msgstr[0] "%d servermeddelande"
 #~ msgstr[1] "%d servermeddelanden"
+
 #~ msgid "%d error"
 #~ msgid_plural "%d errors"
 #~ msgstr[0] "%d fel"
 #~ msgstr[1] "%d fel"
+
 #~ msgid "If you quit, you will lose all unread information."
 #~ msgstr "Om du avslutar kommer all oläst information förloras."
+
 #~ msgid "Gossip is still running, it is just hidden."
 #~ msgstr "Gossip kör fortfarande, den är bara dold."
+
 #~ msgid "Click on the notification area icon to show Gossip."
 #~ msgstr "Klicka på ikonen i notifieringsytan för att visa Gossip."
+
 #~ msgid "You were about to quit!"
 #~ msgstr "Du är på väg att avsluta!"
+
 #~ msgid ""
 #~ "Since no system or notification tray has been found, this action would "
 #~ "normally quit Gossip.\n"
@@ -3127,22 +2977,29 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "\n"
 #~ "Detta är bara en påminnelse, från och med nu kommer Gossip att avslutas "
 #~ "när denna åtgärd genomförs såvida du inte avkryssar alternativet nedan."
+
 #~ msgid "Select who would you like to invite to room:"
 #~ msgstr "Välj vilka du vill bjuda in till rummet:"
+
 #~ msgid "Select which room you would like to invite:"
 #~ msgstr "Välj vilket rum du vill bjuda in till:"
+
 #~ msgid "Your invitation has been declined"
 #~ msgstr "Ditt inbjudan har nekats."
+
 #~ msgid "Accept"
 #~ msgstr "Acceptera"
+
 #~ msgid ""
 #~ "Please enter a new name for the group:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Ange ett nytt namn för gruppen:\n"
 #~ "%s"
+
 #~ msgid "Unsorted"
 #~ msgstr "Osorterade"
+
 #~ msgid ""
 #~ "Set the alias you want to use for:\n"
 #~ "<b>%s</b>\n"
@@ -3153,105 +3010,160 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "<b>%s</b>\n"
 #~ "\n"
 #~ "Du kan hämta kontaktinformation från servern."
+
 #~ msgid "New file transfer request from %s"
 #~ msgstr "Ny filöverföringsförfrågan från %s"
+
+#~ msgid "File transfer is not supported by both parties."
+#~ msgstr "Filöverföring stöds inte av båda parter."
+
 #~ msgid "Your file transfer offer declined."
 #~ msgstr "Ditt erbjudande om filöverföring nekades."
+
 #~ msgid "The other user decided not to continue."
 #~ msgstr "Den andra användaren beslöts sig för att inte fortsätta."
+
 #~ msgid "Unknown error occurred during file transfer."
 #~ msgstr "Ett okänt fel inträffade under filöverföringen."
+
 #~ msgid "Someone would like to send you a file."
 #~ msgstr "Någon vill skicka en fil till dig."
+
 #~ msgid "Retry connection"
 #~ msgstr "Återanslut"
+
 #~ msgid "Invited %s to join this chat conference."
 #~ msgstr "Inbjöd %s till att gå med i chattkonferens."
+
 #~ msgid "%s has set the topic: %s"
 #~ msgstr "%s har satt ämnet: %s"
+
 #~ msgid "Conversation With"
 #~ msgstr "Samtal med"
+
 #~ msgid "Allow multiple instances of the application to run at the same time"
 #~ msgstr "Tillåt flera instanser av applikationen att köras samtidigt"
+
 # "Lista" som verb brukar vi inte använda; hellre "visa" eller möjligtvis
 # "visa i lista"
 #~ msgid "List the available accounts"
 #~ msgstr "Visa tillgängliga konton"
+
 #~ msgid "ACCOUNT-NAME"
 #~ msgstr "KONTONAMN"
+
 #~ msgid "You can not use --no-connect together with --account"
 #~ msgstr "Du kan inte använda --no-connect tillsammans med --account"
+
 #~ msgid "No accounts available."
 #~ msgstr "Inga konton tillgängliga."
+
 #~ msgid "Available accounts:"
 #~ msgstr "Tillgängliga konton:"
+
 #~ msgid "[default]"
 #~ msgstr "[standard]"
+
 #~ msgid "There is no account with the name '%s'."
 #~ msgstr "Det finns inget konto med namnet \"%s\"."
+
 #~ msgid "Found %d conference rooms"
 #~ msgstr "Hittade %d konferensrum"
+
 #~ msgid "Browsing for conference rooms, please wait..."
 #~ msgstr "Bläddrar efter konferensrum, vänta..."
+
 #~ msgid "Browsing cancelled!"
 #~ msgstr "Bläddring avbröts!"
+
 #~ msgid "Default"
 #~ msgstr "Standard"
+
 #~ msgid "Chat!"
 #~ msgstr "Chatta!"
+
 #~ msgid "%s wants to be added to your contact list."
 #~ msgstr "%s vill bli tillagd till din kontaktlista."
+
 #~ msgid "Someone wants to be added to your contact list."
 #~ msgstr "Någon vill bli tillagd till din kontaktlista."
+
 #~ msgid "Show"
 #~ msgstr "Visa"
+
 #~ msgid "Contact has been removed"
 #~ msgstr "Kontakten har tagits bort"
+
 #~ msgid "Subject: %s"
 #~ msgstr "Ämne: %s"
+
 #~ msgid "Do you want to add this person to your contact list?"
 #~ msgstr "Vill du lägga till denna person till din kontaktlista?"
+
 #~ msgid "Do you want to add %s to your contact list?"
 #~ msgstr "Vill du lägga till %s till din kontaktlista?"
+
 #~ msgid "Please enter your %s account password"
 #~ msgstr "Ange lösenordet för kontot %s"
+
 #~ msgid "Logging in to account '%s'"
 #~ msgstr "Loggar in mot kontot \"%s\""
+
 #~ msgid "Remember Password?"
 #~ msgstr "Kom ihåg lösenord?"
+
 #~ msgid "Do not show this again"
 #~ msgstr "Visa inte det här igen"
+
 #~ msgid "Could not display the help contents."
 #~ msgstr "Kunde inte visa hjälpinnehållet."
+
 #~ msgid "OK"
 #~ msgstr "OK"
+
 #~ msgid "The server does not seem to be responding."
 #~ msgstr "Servern verkar inte svara."
+
 #~ msgid "Try again later."
 #~ msgstr "Försök igen senare."
+
 #~ msgid "Change"
 #~ msgstr "Ändra"
+
 #~ msgid "File name:"
 #~ msgstr "Filnamn:"
+
 # "Web site" är "webbplats". "Web page" är "webbsida".
 #~ msgid "File size:"
 #~ msgstr "Filstorlek:"
+
 #~ msgid "Not supported yet"
 #~ msgstr "Stöds inte ännu"
+
 #~ msgid "This person wishes to send you this file:"
 #~ msgstr "Denna person vill skicka den här filen till dig:"
+
+#~ msgid "me"
+#~ msgstr "jag"
+
 #~ msgid "Choose the protocol"
 #~ msgstr "Välj protokollet"
+
 #~ msgid "Gossip"
 #~ msgstr "Gossip"
+
 #~ msgid "%s - New Message"
 #~ msgstr "%s - Nytt meddelande"
+
 #~ msgid "%s - Conversation"
 #~ msgstr "%s - Samtal"
+
 #~ msgid "_Forget"
 #~ msgstr "_Glöm"
+
 #~ msgid "Martyn Russell"
 #~ msgstr "Martyn Russell"
+
 #~ msgid ""
 #~ "Set the alias you want to use for:\n"
 #~ "<b>martyn@imendio.com</b>\n"
@@ -3262,64 +3174,92 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "<b>martyn@imendio.com</b>\n"
 #~ "\n"
 #~ "Du kan hämta kontaktinformation från servern. "
+
 #~ msgid "    "
 #~ msgstr "    "
+
 #~ msgid "Group:"
 #~ msgstr "Grupp:"
+
 # "Web site" är "webbplats". "Web page" är "webbsida".
 #~ msgid "Web Site:"
 #~ msgstr "Webbplats:"
+
 #~ msgid "Favourite"
 #~ msgstr "Favorit"
+
 #~ msgid "Add to _favourites"
 #~ msgstr "_Lägg till i favoriter"
+
 #~ msgid ""
 #~ "Customize your own nickname, the server and chatroom which you wish to "
 #~ "join."
 #~ msgstr "Anpassa ditt smeknamn, servern och chattrummet du vill gå in i."
+
 #~ msgid "Edit your chat room details:"
 #~ msgstr "Redigera chattrumsdetaljer:"
+
 #~ msgid "Na_me:"
 #~ msgstr "Na_mn:"
+
 #~ msgid "New Chat Room"
 #~ msgstr "Nytt chattrum"
+
 #~ msgid ""
 #~ "Pick a saved chat room from the presets available below and click Join to "
 #~ "start chatting."
 #~ msgstr ""
 #~ "Välj ett sparat chattrum nedan och tryck Gå in för att börja chatta."
+
 #~ msgid "Save _this chat room"
 #~ msgstr "Spara detta chattrum"
+
 #~ msgid "Press Subscribe to request to receive their status"
 #~ msgstr "Tryck på Prenumerera för att ta emot kontaktens status"
+
 #~ msgid "_Group Chat"
 #~ msgstr "_Gruppchatt"
+
 #~ msgid "You have no Instant Messaging accounts configured!"
 #~ msgstr "Du har inte konfigurerar ett snabbmeddelandekonto!"
+
 #~ msgid ""
 #~ "Next you will be presented with the Account Information dialog to set "
 #~ "your details up."
 #~ msgstr ""
 #~ "Kontoinformationsdialogen kommer nu att visas så att du kan mata in din "
 #~ "information."
+
+#~ msgid "Registering account"
+#~ msgstr "Registrerar konto"
+
 #~ msgid "<span size=\"smaller\">Example:</span>"
 #~ msgstr "<span size=\"smaller\">Exempel:</span>"
+
 #~ msgid "Account Name"
 #~ msgstr "Kontonamn"
+
 #~ msgid "Connection Details"
 #~ msgstr "Anslutningsdetaljer"
+
 #~ msgid "Enter a name for this account"
 #~ msgstr "Ange ett namn för detta konto"
+
 #~ msgid "Enter the port used in the connection for this account"
 #~ msgstr "Ange porten att ansluta till för detta konto"
+
 #~ msgid "Enter the server used in the connection for this account"
 #~ msgstr "Ange den server som ska anslutas till för detta konto"
+
 #~ msgid "Enter your real name here"
 #~ msgstr "Ange ditt riktiga namn här"
+
 #~ msgid "Finished"
 #~ msgstr "Slutfört"
+
 #~ msgid "For increased security, enable this option"
 #~ msgstr "För ökad säkerhet, aktivera detta val"
+
 #~ msgid ""
 #~ "Gossip is a modern client for the Jabber Instant Messaging system.\n"
 #~ "\n"
@@ -3334,6 +3274,7 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "till din Jabber-favoritserver.\n"
 #~ "\n"
 #~ "För att börja klickar du bara på \"Framåt\"."
+
 #~ msgid ""
 #~ "If you have another machine on your network which 'proxies' the "
 #~ "connection to the internet and you want to use it, enable this option"
@@ -3341,12 +3282,14 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "Om du har en annan dator på ditt nätverk som fungerar som proxy för "
 #~ "anslutningar till internet och du vill använda den, aktivera detta "
 #~ "alternativ"
+
 #~ msgid ""
 #~ "If you need to set specific connection details, like a different server "
 #~ "or port, you can configure that here:"
 #~ msgstr ""
 #~ "Om du behöver ställa in specifika anslutningsdetaljer, som en annan "
 #~ "server eller port, kan du konfigurera det här:"
+
 #~ msgid ""
 #~ "Leave this blank if you don't want your password stored on a public "
 #~ "machine. If you decide to do this, you will be prompted each time you "
@@ -3355,12 +3298,16 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "Lämna denna blank om du inte vill lagra ditt lösenord på en publik dator. "
 #~ "Om du väljer att göra det, kommer du att frågas efter ett lösenord varje "
 #~ "gång du ansluter"
+
 #~ msgid "Registering Account"
 #~ msgstr "Registrerar konto"
+
 #~ msgid "Welcome to Gossip"
 #~ msgstr "Välkommen till Gossip"
+
 #~ msgid "What is your name?"
 #~ msgstr "Vad heter du?"
+
 #~ msgid ""
 #~ "What name do you want to use to identify this account?\n"
 #~ "\n"
@@ -3371,42 +3318,63 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "\n"
 #~ "Detta namn skulle kunna vara något som kan kopplas ihop med "
 #~ "tjänsteleverantören, till exempel <b>Google</b>."
+
 #~ msgid "What password do you want to use?"
 #~ msgstr "Vilket lösenord vill du använda?"
+
 #~ msgid "What username do you use?"
 #~ msgstr "Vad använder du för användarnamn?"
+
 #~ msgid "What username do you want to use?"
 #~ msgstr "Vilket användarnamn vill du använda?"
+
 #~ msgid ""
 #~ "You can change your account settings later by selecting the Edit-"
 #~ ">Accounts menu item."
 #~ msgstr ""
 #~ "Du kan ändra dina kontoinställningar senare genom att välja menyvalet "
 #~ "Redigera->Konton."
+
 #~ msgid ""
 #~ "You need to set a name for the connection, for example, <b>Home</b> or "
 #~ "<b>Laptop</b>."
 #~ msgstr ""
 #~ "Du behöver ställa in ett namn för anslutningen, till exempel <b>Hem</b> "
 #~ "eller <b>Bärbar dator</b>."
+
 #~ msgid "Your Account"
 #~ msgstr "Ditt konto"
+
 #~ msgid "Your Identity"
 #~ msgstr "Din identitet"
+
 #~ msgid "Your new account has now been set up."
 #~ msgstr "Ditt nya konto är nu inställt."
+
+#~ msgid "_No"
+#~ msgstr "_Nej"
+
+#~ msgid "_Yes"
+#~ msgstr "_Ja"
+
 #~ msgid "<b>Information requested, please wait...</b>"
 #~ msgstr "<b>Information begärd, var vänlig vänta...</b>"
+
 #~ msgid "%s will be added to your contact list."
 #~ msgstr "%s kommer att läggas till i din kontaktlista."
+
 #~ msgid "%s ID of new contact:"
 #~ msgstr "%s id för ny kontakt:"
+
 #~ msgid "Example: %s"
 #~ msgstr "Exempel: %s"
+
 #~ msgid "Add a contact"
 #~ msgstr "Lägg till en kontakt"
+
 #~ msgid "Enter the user's contact ID:"
 #~ msgstr "Ange användarens kontakt-ID:"
+
 #~ msgid ""
 #~ "In order to subscribe to presence notifications from the user, a request "
 #~ "will be sent. Until this request is approved, the user will always be "
@@ -3416,242 +3384,353 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ "en förfrågan att skickas. Användaren kommer alltid att visas som "
 #~ "\"Frånkopplad\" i din kontaktlista till dess att denna förfrågan är "
 #~ "godkänd."
+
 #~ msgid "In which group do you want to place this contact?"
 #~ msgstr "I vilken grupp vill du placera denna kontakt?"
+
 #~ msgid "Jabber ID:"
 #~ msgstr "Jabber-id:"
+
 #~ msgid "What instant messaging system does the contact use?"
 #~ msgstr "Vilket meddelandesystem använder kontakten?"
+
 #~ msgid "Which account do you want to add this contact to?"
 #~ msgstr "Till vilket konto vill du lägga till denna kontakt?"
+
 #~ msgid "_Search..."
 #~ msgstr "_Sök..."
+
 #~ msgid "_Compact contact list"
 #~ msgstr "_Kompakt kontaktlista"
+
 #~ msgid "Show accounts and pending connections"
 #~ msgstr "Visa konton och avvaktande anslutningar"
+
 #~ msgid "Edit"
 #~ msgstr "Redigera"
+
 #~ msgid "Perhaps you are trying to connect to the wrong port?"
 #~ msgstr "Försöker du kanske ansluta till fel port?"
+
 #~ msgid "Perhaps the service is not currently running?"
 #~ msgstr "Tjänsten kanske inte är igång just nu?"
+
 #~ msgid "Check your connection details."
 #~ msgstr "Kontrollera dina anslutningsdetaljer."
+
 #~ msgid "Perhaps the server is not running this service."
 #~ msgstr "Servern kanske inte kör denna tjänsten."
+
 #~ msgid "Check your username and password are correct."
 #~ msgstr "Kontrollera att användarnamn och lösenord är korrekta."
+
 #~ msgid "Re_name group"
 #~ msgstr "Byt _namn på grupp"
+
 #~ msgid "_Remove contact"
 #~ msgstr "_Ta bort kontakt"
+
 #~ msgid ""
 #~ "Please enter your invitation message to:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Ange ditt inbjudningsmeddelande till:\n"
 #~ "%s"
+
 # Vi brukar förvisso låta R:et vara åtkomsttangent i "Redigera"
 #~ msgid "_Edit Groups"
 #~ msgstr "R_edigera grupper"
+
 #~ msgid ""
 #~ "Please enter a new nickname for the contact\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Ange ett nytt smeknamn för kontakten\n"
 #~ "%s"
+
 #~ msgid "Edit groups for %s"
 #~ msgstr "Redigera grupper för %s"
+
 # 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.
 #~ msgid "_Hide Contact List"
 #~ msgstr "_Dölj kontaktlista"
+
 #~ msgid "/Contact Infor_mation"
 #~ msgstr "/Kontaktinfor_mation"
+
 #~ msgid "/_View Previous Conversations"
 #~ msgstr "/Visa tidigare samtal"
+
 #~ msgid "Enable Spell Checker"
 #~ msgstr "Aktivera stavningskontroll"
+
 #~ msgid "Preset status messages"
 #~ msgstr "Förinställda statusmeddelanden"
+
 #~ msgid "Preset status messages."
 #~ msgstr "Förinställda statusmeddelanden."
+
 #~ msgid "Peekaboo"
 #~ msgstr "Peekaboo"
+
 # 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.
 #~ msgid "_Show/Hide Contact List"
 #~ msgstr "_Dölj/Visa kontaktlista"
+
 #~ msgid "An instant messaging applet."
 #~ msgstr "En snabbmeddelandeklient för GNOME"
+
 #~ msgid "Contact Information for %s"
 #~ msgstr "Kontaktinformation för %s"
+
 #~ msgid "Convert smiley text into images when chatting"
 #~ msgstr "Konvertera textsmilisar till bilder"
+
 #~ msgid "Be silent when away"
 #~ msgstr "Var tyst under frånvaro"
+
 #~ msgid "Be silent when busy"
 #~ msgstr "Var tyst under upptagetläge"
+
 #~ msgid "<b>Chat Window</b>"
 #~ msgstr "<b>Chattfönster</b>"
+
 #~ msgid "Join _Group Chat..."
 #~ msgstr "_Gå in i gruppchatt..."
+
 #~ msgid "Available..."
 #~ msgstr "Tillgänglig..."
+
 #~ msgid "Busy..."
 #~ msgstr "Upptagen..."
+
 #~ msgid "Away..."
 #~ msgstr "Frånvarande..."
+
 #~ msgid "Requesting contact information, please wait..."
 #~ msgstr "Begär kontaktinformation, var vänlig vänta..."
+
 #~ msgid "Height of main window"
 #~ msgstr "Höjden på huvudfönstret"
+
 #~ msgid "The X position of the main window."
 #~ msgstr "X-positionen av huvudfönstret."
+
 #~ msgid "The Y position of the main window."
 #~ msgstr "Y-positionen av huvudfönstret."
+
 #~ msgid "The width of the main window."
 #~ msgstr "Bredden på huvudfönstret."
+
 #~ msgid "Whether spell checking should be turned on."
 #~ msgstr "Huruvida stavningskontroll ska vara påslaget."
+
 #~ msgid "Width of the main window"
 #~ msgstr "Bredden på huvudfönstret"
+
 #~ msgid "X position of main window"
 #~ msgstr "X-positionen av huvudfönstret"
+
 #~ msgid "Y position of main window"
 #~ msgstr "Y-positionen av huvudfönstret"
+
 #~ msgid "<b>Appearance and Behavior</b>"
 #~ msgstr "<b>Utseende och beteende</b>"
+
 #~ msgid "Check spelling while I _type"
 #~ msgstr "Kontrollera stavning medan jag skriver"
+
 #~ msgid "Close this chat window"
 #~ msgstr "Stäng detta chattfönster"
+
 #~ msgid "Requested Information"
 #~ msgstr "Information efterfrågad"
+
 #~ msgid "Requested information."
 #~ msgstr "Information efterfrågad."
+
 #~ msgid "/_Contact Information"
 #~ msgstr "/_Kontaktinformation"
+
 #~ msgid "Contact _Information"
 #~ msgstr "Kontakti_nformation"
+
 #~ msgid "Gossip - Accounts"
 #~ msgstr "Gossip - konton"
+
 #~ msgid "Por_t:"
 #~ msgstr "_Port:"
+
 #~ msgid "/_Invite to Chat Conference"
 #~ msgstr "/_Bjud in till chattkonferens"
+
+#~ msgid "%s has gone offline"
+#~ msgstr "%s kopplade från"
+
 #~ msgid "/View Message _History"
 #~ msgstr "/Visa _meddelandehistorik"
+
 #~ msgid "View Message _History"
 #~ msgstr "Visa _meddelandehistorik"
+
 #~ msgid "View Message Hi_story"
 #~ msgstr "Visa _meddelandehistorik"
+
 #~ msgid "View Message History"
 #~ msgstr "Visa meddelandehistorik"
+
 #~ msgid "Gossip - Group Chat"
 #~ msgstr "Gossip - gruppchatt"
+
 #~ msgid "Gossip - New Chatroom"
 #~ msgstr "Gossip - nytt chattrum"
+
 #~ msgid "Gossip - Add contact"
 #~ msgstr "Gossip - lägg till kontakt"
+
 #~ msgid "Gossip - Contact Information"
 #~ msgstr "Gossip - kontaktinformation"
+
 #~ msgid "Gossip - Edit Groups"
 #~ msgstr "Gossip - redigera grupper"
+
 #~ msgid "Gossip - New Account"
 #~ msgstr "Gossip - nytt konto"
+
 #~ msgid "Gossip - Personal Details"
 #~ msgstr "Gossip - personlig information"
+
 #~ msgid "Gossip - Preferences"
 #~ msgstr "Gossip - inställningar"
+
 #~ msgid "Gossip - Spell Checker"
 #~ msgstr "Gossip - stavningskontroll"
+
 #~ msgid "Gossip - Status Message"
 #~ msgstr "Gossip - statusmeddelande"
+
 #~ msgid "Gossip - View Message History"
 #~ msgstr "Gossip - visa meddelandehistorik"
+
 #~ msgid "Written by:"
 #~ msgstr "Skrivet av:"
+
 #~ msgid "Artwork by:"
 #~ msgstr "Grafik av:"
+
 #~ msgid "Translated by:"
 #~ msgstr "Översatt av:"
+
 #~ msgid "/Show _Log"
 #~ msgstr "/_Visa logg"
+
 #~ msgid "View Lo_g"
 #~ msgstr "_Visa logg"
+
 #~ msgid ""
 #~ "You can identify this account with a name, for example, <b>Home</b> or "
 #~ "<b>Work</b>. Choose a name for this account:"
 #~ msgstr ""
 #~ "Du kan identifiera detta kontot med ett namn, till exempel <b>Hemma</b> "
 #~ "eller <b>Jobb</b>. Välj ett namn för kontot:"
+
 #~ msgid "Open"
 #~ msgstr "Öppet"
+
 #~ msgid "Account ID"
 #~ msgstr "Kontoid"
+
 #~ msgid "Could not find the server you wanted to use"
 #~ msgstr "Kunde inte hitta servern du ville använda"
+
 #~ msgid "Connection to the server failed."
 #~ msgstr "Anslutningen till servern misslyckades."
+
 #~ msgid "Connection could not be created"
 #~ msgstr "Anslutning kunde inte skapas"
+
 #~ msgid "Bad Request"
 #~ msgstr "Felaktig förfrågan"
+
 #~ msgid "Payment Required"
 #~ msgstr "Betalning krävd"
+
 #~ msgid "Not Found"
 #~ msgstr "Inte hittad"
+
 #~ msgid "Not Allowed"
 #~ msgstr "Inte tillåten"
+
 #~ msgid "Not Acceptable"
 #~ msgstr "Inte acceptabel"
+
 #~ msgid "Request Timeout"
 #~ msgstr "Förfrågan timade ut"
+
 #~ msgid "Conflict"
 #~ msgstr "Konflikt"
+
 #~ msgid "Remote Server Error"
 #~ msgstr "Fjärrserverfel"
+
 #~ msgid "Service Unavailable"
 #~ msgstr "Tjänst otillgänglig"
+
 #~ msgid "Custom"
 #~ msgstr "Anpassad"
+
 #~ msgid "Check the server host name is correct and is available."
 #~ msgstr ""
 #~ "Kontrollera att serverns namn är korrent och att den finns tillgänglig."
+
 # Dessa meddelanden slutar inte båda i punkt, borde kanske rapporteras
 #~ msgid "Gossip will now try to use your account:"
 #~ msgstr "Gossip kommer nu att försöka använda ditt konto:"
+
 #~ msgid "Gossip will now try to register the account:"
 #~ msgstr "Gossip kommer nu att försöka registrera kontot:"
+
 #~ msgid "Reason:"
 #~ msgstr "Orsak:"
+
 #~ msgid "R_esource:"
 #~ msgstr "R_esurs:"
+
 #~ msgid "<b>Personal Information</b>"
 #~ msgstr "<b>Personlig information</b>"
+
 #~ msgid "Choose a Server"
 #~ msgstr "Välj en server"
+
 #~ msgid "On what server do you have an account?"
 #~ msgstr "På vilken server har du ett konto?"
+
 #~ msgid "_Jabber ID of new contact:"
 #~ msgstr "_Jabber-id för ny kontakt:"
+
 #~ msgid "<b>Preferences</b>"
 #~ msgstr "<b>Inställningar</b>"
+
 #~ msgid "Connect _Server:"
 #~ msgstr "Anslut till _server:"
+
 #~ msgid "_Automatically Connect"
 #~ msgstr "_Anslut automatiskt"
+
 #~ msgid "_Resource:"
 #~ msgstr "_Resurs:"
+
 #~ msgid ""
 #~ "The default account is used for information like your name in chat "
 #~ "windows."
 #~ msgstr ""
 #~ "Standardkontot används för information som ditt namn i chattfönster."
+
 #~ msgid "_Connect..."
 #~ msgstr "_Anslut..."
+
 #, fuzzy
 #~ msgid ""
 #~ "<b>Configuring your new service...</b>\n"
@@ -3663,6 +3742,7 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #, fuzzy
 #~ msgid "<b>Preferred Service</b>"
 #~ msgstr "<b>Rekommenderade tjänster</b>"
+
 #~ msgid "<b>Recommended Services</b>"
 #~ msgstr "<b>Rekommenderade tjänster</b>"
 
@@ -3673,46 +3753,64 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #~ msgstr ""
 #~ "<b>Söker efter den bästa servern...</b>\n"
 #~ "Detta kommer att ta en stund, var god vänta."
+
+#~ msgid "Add Account"
+#~ msgstr "Lägg till konto"
+
 #~ msgid "Add Another Account"
 #~ msgstr "Lägg till ytterligare konto"
+
 #~ msgid "Configuring Service"
 #~ msgstr "Konfigurerar tjänst"
+
 #~ msgid "Nick name:"
 #~ msgstr "Smeknamn:"
+
 #~ msgid "Please complete the details below to set up your account:  "
 #~ msgstr "Fyll i detaljerna nedan för att ställa in ditt konto:  "
+
 #~ msgid "Remove Account"
 #~ msgstr "Ta bort konto"
+
 #~ msgid "Service Details"
 #~ msgstr "Tjänstedetaljer"
+
 #~ msgid "Service:"
 #~ msgstr "Tjänst:"
+
 #~ msgid ""
 #~ "This wizard will allow you to configure your account settings for another "
 #~ "protocol. "
 #~ msgstr ""
 #~ "Denna guide kommer att låta dig konfigurera dina kontoinställningar för "
 #~ "ytterligare ett protokoll. "
+
 #~ msgid "Which protocol would you like to set up? "
 #~ msgstr "Vilket protokoll vill du konfigurera? "
+
 #~ msgid "Edit List..."
 #~ msgstr "Redigera listan..."
+
 #~ msgid "Gossip - Status Presets"
 #~ msgstr "Gossip - förinställd status"
 
 #, fuzzy
 #~ msgid "Choose _from list:"
 #~ msgstr "Välj från lista:"
+
 #~ msgid "Jabber.com"
 #~ msgstr "Jabber.com"
+
 #~ msgid "Jabber.org"
 #~ msgstr "Jabber.org"
 
 #, fuzzy
 #~ msgid "Use a _different server"
 #~ msgstr "Använd en annan server"
+
 #~ msgid "_Account Information"
 #~ msgstr "_Kontoinformation"
+
 #~ msgid "Searching Local Services..."
 #~ msgstr "Söker lokala tjänster..."
 
@@ -3729,70 +3827,99 @@ msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfe
 #, fuzzy
 #~ msgid "Registration Successful!"
 #~ msgstr "Registrerar konto"
+
 #~ msgid "Service"
 #~ msgstr "Tjänst"
 
 #, fuzzy
 #~ msgid "Registering With Service"
 #~ msgstr "Konfigurerar tjänst"
+
 #~ msgid "From:"
 #~ msgstr "Från:"
+
 #~ msgid "In reply to:"
 #~ msgstr "Svar på:"
+
 #~ msgid "To:"
 #~ msgstr "Till:"
+
 #~ msgid "_Reply..."
 #~ msgstr "_Svara..."
+
 #~ msgid "C_onnect"
 #~ msgstr "A_nslut"
+
 #~ msgid "        "
 #~ msgstr "        "
+
 #~ msgid "<b>Available chat rooms</b>"
 #~ msgstr "<b>Tillgängliga chattrum</b>"
+
 #~ msgid "N_ickname:"
 #~ msgstr "Smek_namn:"
+
+#~ msgid "_Add"
+#~ msgstr "_Lägg till"
+
 #~ msgid "<b>Preset status messages</b>"
 #~ msgstr "<b>Förinställda statusmeddelanden</b>"
+
 #~ msgid "<i>Information not available</i>"
 #~ msgstr "<i>Informationen inte tillgänglig</i>"
+
 #~ msgid "Information about ..."
 #~ msgstr "Information om..."
+
 #~ msgid "Jabber Account"
 #~ msgstr "Jabberkonto"
+
 #~ msgid "Personal information"
 #~ msgstr "Personlig information"
+
 #~ msgid "Status Message"
 #~ msgstr "Statusmeddelande"
+
 #~ msgid "What request message do you want to send to %s?"
 #~ msgstr "Vilket förfrågansmeddelande vill du skicka till %s?"
+
 #~ msgid "%s wants to be notified of your status."
 #~ msgstr "%s vill bli meddelad om din status."
+
 #~ msgid "Add to your contact list"
 #~ msgstr "Lägg till i din kontaktlista"
+
 #~ msgid "What request message do you want to send to ...?"
 #~ msgstr "Vilket förfrågansmeddelande vill du skicka till ..."
+
 #~ msgid "Make sure that your account information is correct."
 #~ msgstr "Kontrollera att din kontoinformation är korrekt."
+
 #~ msgid "You were disconnected from the server. Do you want to reconnect?"
 #~ msgstr "Du frånkopplades från servern. Vill du återansluta?"
+
 #~ msgid ""
 #~ "Make sure that your account information is correct. The server may also "
 #~ "currently be unavailable."
 #~ msgstr ""
 #~ "Kontrollera att din kontoinformation är korrekt. Servern kan också vara "
 #~ "otillgänglig för tillfället."
+
 #~ msgid "An error occurred when chatting in the group chat %s."
 #~ msgstr "Ett fel inträffade under samtal i gruppchatten %s."
+
 #~ msgid "Details:"
 #~ msgstr "Detaljer:"
+
 #~ msgid "Unable to enter the group chat %s."
 #~ msgstr "Kunde inte gå in i gruppchatten %s."
+
 #~ msgid "An error occurred when chatting with %s."
 #~ msgstr "Ett fel inträffade under chatt med %s."
+
 #~ msgid ""
 #~ "Please enter your user name, password and all other required details "
 #~ "below to set up your account."
 #~ msgstr ""
 #~ "Ange ditt användarnamn, lösenord och alla andra nödvändiga detaljer nedan "
 #~ "för att konfigurera ditt konto."
-
diff --git a/po/ta.po b/po/ta.po
index 9f1306d..d070d0b 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-03 22:10+0530\n"
-"PO-Revision-Date: 2009-07-04 14:42+0530\n"
+"POT-Creation-Date: 2009-06-19 05:47+0530\n"
+"PO-Revision-Date: 2009-06-20 14:19+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: Tamil <Ubuntu-l10n-tam@lists.ubuntu.com>\n"
 "MIME-Version: 1.0\n"
@@ -169,107 +169,98 @@ msgid "Popup notifications if the chat isn't focused"
 msgstr "அரட்டை குவிப்பில் இல்லையானால் வெளித்துள்ளல் மூலம் அறிவி"
 
 #: ../data/empathy.schemas.in.h:36
-msgid "Popup notifications when a contact sign in"
-msgstr "தொடர்பு உள் நுழைகையில் வெளித்துள்ளல் மூலம் அறிவி"
-
-#: ../data/empathy.schemas.in.h:37
-msgid "Popup notifications when a contact sign out"
-msgstr "தொடர்பு உள் நுழைகையில்  வெளித்துள்ளல் மூலம் அறிவி"
-
-#: ../data/empathy.schemas.in.h:38
 msgid "Salut account is created"
 msgstr "சாலுட் கணக்கு துவக்கப்பட்டது "
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:37
 msgid "Show avatars"
 msgstr "அவதாரங்களை காட்டு"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:38
 msgid "Show contact list in rooms"
 msgstr "தொடர்பு பட்டியல் ஐ அறைகளில் காட்டு "
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:39
 msgid "Show hint about closing the main window"
 msgstr "முதன்மை சாளரத்தை மூடிவது குறித்து குறிப்பு காட்டு "
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:40
 msgid "Show offline contacts"
 msgstr " வலை தொடர்பில்லாத தொடர்புகளை காட்டு"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:41
 msgid "Spell checking languages"
 msgstr "எழுத்துப்பிழை திருத்த மொழி"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:42
 msgid "The default folder to save file transfers in."
 msgstr "இடமாற்றிய கோப்புகளை சேமிக்க முன்னிருப்பு அடைவு"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:43
 msgid "The last directory that an avatar image was chosen from."
 msgstr "அவதாரம் படம் தேர்ந்தெடுத்த கடைசி அடைவு "
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:44
 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:45
 msgid "Use graphical smileys"
 msgstr "வரைகலை சிரிப்பான்களை பயன்படுத்துக"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:46
 msgid "Use notification sounds"
 msgstr "அறிவிப்பு ஒலிகளை பயன்படுத்துக"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:47
 msgid "Use theme for chat rooms"
 msgstr "அரட்டை அறைகளுக்கு கருத்துக்களை பயன்படுத்துக"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:48
 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:49
 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:50
 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:51
 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:52
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "எம்பதி மற்ற நிரல்களில் இருந்து கணக்குகளை இறக்குமதி செய்வது குறித்து வினவியதா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:53
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "எம்பதி துவங்கும்போது கணக்குகளில் தானியங்கியாக உள்நுழைய வேண்டுமா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:54
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
-msgstr ""
-"அந்தரங்கத்தை காப்பாற்ற துவங்கும் போது எம்பதி இடத்தின் குறிப்பை குறைக்க வேண்டுமா இல்லையா"
+msgstr "அந்தரங்கத்தை காப்பாற்ற துவங்கும் போது எம்பதி இடத்தின் குறிப்பை குறைக்க வேண்டுமா இல்லையா"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:55
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "எம்பதி தொடர்பின் அவதாரத்தை அரட்டை அறை சின்னமாக பயன்படுத்த வேண்டுமா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:56
 msgid "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "முதல் ஓட்டத்தில் எம்பதி சலூட் கணக்கை உருவாக்கியதா இல்லையா."
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
@@ -277,63 +268,55 @@ msgstr ""
 "வலைப்பின்னல் மேலாளர் ஐ தானியங்கியாக இணைக்கவும் இணைப்பு விலகவும் பயன்படுத்த வேண்டுமா "
 "இல்லையா"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:58
 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:59
 msgid "Whether or not to convert smileys into graphical images in conversations."
 msgstr "உரையாடல்களில் சிரிப்பான்களை வரைகலை படங்களாக மாற்ற வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:60
 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:61
 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:62
 msgid "Whether or not to play a sound to notify for events."
 msgstr "நிகழ்வுகள் போது ஒலியை எழுப்ப வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:63
 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:64
 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:65
 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:66
 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:67
 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:68
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "வெளியே அல்லது வேலையாக உள்ள போது ஒலி அறிக்கைகளை இயக்க வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to show a popup notification when a contact goes offline."
-msgstr "தொடர்பு இணைப்பு விலகி செல்கையில்  துள்ளு அறிக்கைகளை காட்ட வேண்டுமா இல்லையா?"
-
-#: ../data/empathy.schemas.in.h:72
-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:69
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
@@ -341,29 +324,29 @@ msgstr ""
 "புதிய செய்தி ஒன்று வரும்போது அரட்டை திறந்து இருந்து குவிப்பில் இல்லாவிட்டாலும் துள்ளு "
 "அறிக்கையை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:70
 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:71
 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:72
 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:73
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "வெளியே அல்லது வேலையாக உள்ள போது துள்ளு அறிக்கைகளை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to show the contact list in chat rooms."
 msgstr "அரட்டை அறையில் தொடர்பு பட்டியலை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
@@ -371,15 +354,15 @@ msgstr ""
 "தலைப்பு பட்டியில் x பொத்தானால் முதன்மை சாளரத்தை மூடுவதை குறித்த உரையாடலை காட்ட "
 "வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:76
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "அடக்கப்பாங்கில் தொடர்பு பட்டியலை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:77
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "அரட்டை அறைகளில் கருத்துக்களை பயன்படுத்த வேண்டுமா இல்லையா?"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:78
 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 "
@@ -405,7 +388,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:757 ../src/empathy.c:287
 msgid "People nearby"
 msgstr "அருகில் உள்ள மக்கள்"
 
@@ -441,23 +424,23 @@ msgstr "மற்ற பங்குதாரர் கோப்பு பரி
 msgid "Unknown reason"
 msgstr "தெரியாத காரணம்"
 
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:274
 msgid "Available"
 msgstr "இருப்பவை"
 
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:276
 msgid "Busy"
 msgstr "வேலையில்"
 
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:279
 msgid "Away"
 msgstr "வெளியில்"
 
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:281
 msgid "Hidden"
 msgstr "மறைந்துள்ள"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:283
 msgid "Offline"
 msgstr "இணைப்பு விலகி"
 
@@ -577,7 +560,7 @@ msgstr "(_U) ஐசிக்யூ (ICQ) யுஐஎன்:"
 msgid "_Charset:"
 msgstr "(_C) எழுத்துருதொகுதி:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:241
 msgid "New Network"
 msgstr "புதிய வலையமைப்பு"
 
@@ -779,7 +762,7 @@ msgstr "சிரிப்பானை சொருகு"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1031
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
+#: ../libempathy-gtk/empathy-ui-utils.c:1476
 msgid "_Send"
 msgstr "அனுப்பு (_S)"
 
@@ -787,64 +770,30 @@ msgstr "அனுப்பு (_S)"
 msgid "_Spelling Suggestions"
 msgstr "_S எழுத்தாக்க பரிந்துரைகள் "
 
-#: ../libempathy-gtk/empathy-chat.c:1180, c-format
-msgid "%s has disconnected"
-msgstr "%s தொடர்பை துண்டித்தார்"
-
-#: ../libempathy-gtk/empathy-chat.c:1184
-#, c-format
-msgid "%s was kicked by %s"
-msgstr "%s  %s ஆல் உதைத்து வெளியேற்றப்பட்டார்"
-
-#: ../libempathy-gtk/empathy-chat.c:1187
-#, c-format
-msgid "%s was kicked"
-msgstr "%s உதைத்து வெளியேற்றப்பட்டார்"
-
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1179
 #, c-format
-msgid "%s was banned by %s"
-msgstr "%s %s ஆல் தடை செய்யப்பட்டார்"
-
-#: ../libempathy-gtk/empathy-chat.c:1195
-#, c-format
-msgid "%s was banned"
-msgstr "%s தடை செய்யப்பட்டார்"
+msgid "%s has joined the room"
+msgstr "%s அறையில் சேர்ந்தார்"
 
-#: ../libempathy-gtk/empathy-chat.c:1199
+#: ../libempathy-gtk/empathy-chat.c:1182
 #, 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:1208
-#, c-format
-msgid " (%s)"
-msgstr " (%s)"
-
-#: ../libempathy-gtk/empathy-chat.c:1231
-#, c-format
-msgid "%s has joined the room"
-msgstr "%s அறையில் சேர்ந்தார்"
-
-#: ../libempathy-gtk/empathy-chat.c:1364 ../src/empathy-call-window.c:1226
+#: ../libempathy-gtk/empathy-chat.c:1313 ../src/empathy-call-window.c:1199
 msgid "Disconnected"
 msgstr "துண்டிக்கபட்டது"
 
-#: ../libempathy-gtk/empathy-chat.c:1793
+#: ../libempathy-gtk/empathy-chat.c:1742
 msgid "Connected"
 msgstr "இணைக்கப்பட்டது"
 
-#: ../libempathy-gtk/empathy-chat.c:1843
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:1792
+#: ../libempathy-gtk/empathy-log-window.c:501
 msgid "Conversation"
 msgstr "உரையாடல்"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
 msgid "Topic:"
 msgstr "தலைப்பு:"
 
@@ -858,7 +807,7 @@ msgstr "இணைப்பினை திற (_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
@@ -871,7 +820,7 @@ msgstr "தொடர்பின்  தகவல் ஐ திருத்த
 msgid "Personal Information"
 msgstr "தனிப்பட்ட தகவல்"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:384
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
 msgid "New Contact"
 msgstr "புதிய தொடர்பு"
 
@@ -883,26 +832,26 @@ msgstr "(_L) பிறகு முடிவு எடுக்கலாம்"
 msgid "Subscription Request"
 msgstr "சந்தா வேண்டுதல்"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1378
 #, 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:1380
 msgid "Removing group"
 msgstr "குழுவை நீக்குதல்"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1424
-#: ../libempathy-gtk/empathy-contact-list-view.c:1502
+#: ../libempathy-gtk/empathy-contact-list-view.c:1427
+#: ../libempathy-gtk/empathy-contact-list-view.c:1505
 msgid "_Remove"
 msgstr "நீக்கவும் (_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1454
+#: ../libempathy-gtk/empathy-contact-list-view.c:1457
 #, 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:1459
 msgid "Removing contact"
 msgstr "தொடர்பு ஐ நீக்குதல்"
 
@@ -963,7 +912,7 @@ msgid "Select"
 msgstr "தேர்வு"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:988
-#: ../src/empathy-main-window.c:903
+#: ../src/empathy-main-window.c:905
 msgid "Group"
 msgstr "குழு"
 
@@ -1103,7 +1052,7 @@ msgid "Client:"
 msgstr "சார்ந்தோன்:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:886
+#: ../src/empathy-main-window.c:888
 msgid "Contact"
 msgstr "தொடர்பு"
 
@@ -1172,12 +1121,12 @@ msgstr "துறை"
 msgid "SSL"
 msgstr "எஸ்எஸ்எல்"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../libempathy-gtk/empathy-log-window.c:494
+#: ../src/empathy-import-dialog.c:281
 msgid "Account"
 msgstr "கணக்கு"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:511
 msgid "Date"
 msgstr "தேதி"
 
@@ -1248,46 +1197,6 @@ msgstr "உங்கள் நடப்பு நிலையையும் இ
 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 "தனிப்பயன் செய்தியை உள்ளிடுக"
@@ -1312,34 +1221,78 @@ msgstr "ஜிடிகே-சேர்"
 msgid "gtk-remove"
 msgstr "ஜிடிகே-நீக்கு"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:66
 msgid "Classic"
 msgstr "தொன்மையான"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Simple"
 msgstr "எளிய"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:68
 msgid "Clean"
 msgstr "சுத்தமான"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Blue"
 msgstr "நீலம்"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1377
+#: ../libempathy-gtk/empathy-theme-manager.c:71
+msgid "Adium"
+msgstr "ஏடியம்"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1378
 msgid "Unable to open URI"
 msgstr "யூஆர்ஐ ஐ திறக்க முடியவில்லை"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1467
+#: ../libempathy-gtk/empathy-ui-utils.c:1468
 msgid "Select a file"
 msgstr "கோப்பை தேர்வு செய்"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1525
+#: ../libempathy-gtk/empathy-ui-utils.c:1526
 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 "தற்போதைய மொழி உள்ளமைவு"
@@ -1523,7 +1476,7 @@ msgid "Megaphone"
 msgstr "ஒலி பெருக்கி"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:527
 msgid "Talk!"
 msgstr "பேசு!"
 
@@ -1558,19 +1511,19 @@ msgstr "இருப்பு"
 msgid "Set your own presence"
 msgstr "உங்கள் இருப்பை அமைக்கவும்"
 
-#: ../src/empathy.c:506
+#: ../src/empathy.c:478
 msgid "Don't connect on startup"
 msgstr "துவங்கும்போது இணைக்க வேண்டாம்"
 
-#: ../src/empathy.c:510
+#: ../src/empathy.c:482
 msgid "Don't show the contact list on startup"
 msgstr "துவங்கும்போது தொடர்பு பட்டியல் ஐ காட்ட வேண்டாம்"
 
-#: ../src/empathy.c:514
+#: ../src/empathy.c:486
 msgid "Show the accounts dialog"
 msgstr "கணக்குகள் உரையாடல் ஐ காட்டு "
 
-#: ../src/empathy.c:526
+#: ../src/empathy.c:498
 msgid "- Empathy Instant Messenger"
 msgstr "- எம்பதி உடனடி செய்தியாளர்"
 
@@ -1614,11 +1567,11 @@ msgstr "க்னோமுக்கு ஒரு உடனடி செய்த
 msgid "translator-credits"
 msgstr "மொழிபெயர்ப்பாளர்-நன்றி அறிதல் "
 
-#: ../src/empathy-accounts-dialog.c:392
+#: ../src/empathy-accounts-dialog.c:393
 msgid "Enabled"
 msgstr "செயலாக்கப்பட்டது"
 
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "கணக்குகள்"
 
@@ -1698,53 +1651,53 @@ msgstr "(_C) ஒரு புதிய கணக்கை துவக்கு"
 msgid "_Reuse an existing account"
 msgstr "(_R) இருக்கும் ஒரு கணக்கை மறு உபயோகம் செய்க"
 
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-call-window.c:63
+msgid "Connecting..."
+msgstr "இணைக்கிறது...."
+
+#: ../src/empathy-call-window.c:415
 msgid "Contrast"
 msgstr "வேறுபாடு"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:418
 msgid "Brightness"
 msgstr "வெளிச்சம்"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:421
 msgid "Gamma"
 msgstr "காமா"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:526
 msgid "Volume"
 msgstr "ஒலி அளவு"
 
-#: ../src/empathy-call-window.c:662
-msgid "Connecting..."
-msgstr "இணைக்கிறது...."
-
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:728
 msgid "_Sidebar"
 msgstr "பக்கப்பட்டை(_S)"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:747
 msgid "Dialpad"
 msgstr "டயல் அட்டை"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:753
 msgid "Audio input"
 msgstr "ஒலி உள்ளீடு"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:757
 msgid "Video input"
 msgstr "வீடியோ உள்ளீடு"
 
-#: ../src/empathy-call-window.c:836
+#: ../src/empathy-call-window.c:820
 #, c-format
 msgid "Call with %s"
 msgstr "%s ஆல் அழை "
 
-#: ../src/empathy-call-window.c:905
+#: ../src/empathy-call-window.c:889
 msgid "Call"
 msgstr "அழை"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1336
+#: ../src/empathy-call-window.c:1308
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "இணைக்கப்பட்டது — %d:%02dm"
@@ -1777,12 +1730,12 @@ msgstr "(_C) அழை"
 msgid "_View"
 msgstr "பார்வை (_V)"
 
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:343
 #, c-format
 msgid "Conversations (%d)"
 msgstr "உரையாடல்கள் (%d)"
 
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:475
 msgid "Typing a message."
 msgstr "செய்திகள் தட்டச்சிடல்"
 
@@ -1802,75 +1755,75 @@ msgstr "தானியங்கி இணை"
 msgid "Manage Favorite Rooms"
 msgstr "பிடித்தமான அறைகளை மேலாள"
 
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:377
 msgid "Incoming call"
 msgstr "உள்வரும் அழைப்பு"
 
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:380
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s உங்களை அழைக்கிறார். நீங்கள் பதில் பேச வேண்டுமா?"
 
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:387
 msgid "_Reject"
 msgstr "(_R) ஏற்காதே"
 
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:393
 msgid "_Answer"
 msgstr "(_A) பதிலளி"
 
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:505
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s இடமிருந்து உள்வரும் அழைப்பு"
 
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:545
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s உங்களுக்கு ஒரு அழைப்பு வேண்டுதல் விடுக்கிறார்"
 
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:551
 msgid "An external application will be started to handle it."
 msgstr "இதை கையாள ஒரு வெளி பயன்பாடு துவக்கப்படும்."
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:556
 msgid "You don't have the needed external application to handle it."
 msgstr "இதை கையாள தேவையான ஒரு வெளி பயன்பாடு உங்கள் கணினியில் இல்லை."
 
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:683
 msgid "Room invitation"
 msgstr "அறை அழைப்பு"
 
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:686
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s உங்களை %s உடன் சேர அழைக்கிறார்."
 
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:694
 msgid "_Decline"
 msgstr "நிராகரி (_D)"
 
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:699
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "(_J) இணை"
 
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:738
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s  %s இல் சேர உங்களை அழைத்துள்ளார்"
 
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:764
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s இடமிருந்து உள்வரும் கோப்பு பரிமாற்றம்."
 
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s இன் சந்தா வேண்டுதல்"
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:948
 #, c-format
 msgid ""
 "\n"
@@ -1879,18 +1832,6 @@ msgstr ""
 "\n"
 "செய்தி: %s"
 
-#. 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
@@ -2005,19 +1946,19 @@ msgstr ""
 "இருந்து  நீக்கு "
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-dialog.c:259
 msgid "Import"
 msgstr "இறக்குமதி செய்"
 
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-dialog.c:268
 msgid "Protocol"
 msgstr "விதிமுறை"
 
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-dialog.c:294
 msgid "Source"
 msgstr "மூலம்"
 
-#: ../src/empathy-import-dialog.c:392
+#: ../src/empathy-import-dialog.c:388
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -2029,71 +1970,71 @@ msgstr ""
 msgid "Import Accounts"
 msgstr "இறக்குமதி செய் கணக்குகள்"
 
-#: ../src/empathy-main-window.c:396
+#: ../src/empathy-main-window.c:395
 msgid "_Edit account"
 msgstr "(_E) கணக்குகளை திருத்துக"
 
-#: ../src/empathy-main-window.c:499
+#: ../src/empathy-main-window.c:498
 msgid "No error specified"
 msgstr "பிழை ஏதும் குறிப்பிடவில்லை"
 
-#: ../src/empathy-main-window.c:502
+#: ../src/empathy-main-window.c:501
 msgid "Network error"
 msgstr "வலையமைப்பு பிழை"
 
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:504
 msgid "Authentication failed"
 msgstr "உறுதி செய்தல் தோல்வி"
 
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:507
 msgid "Encryption error"
 msgstr "மறையாக்க பிழை"
 
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:510
 msgid "Name in use"
 msgstr "பயனில் உள்ள பெயர் "
 
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:513
 msgid "Certificate not provided"
 msgstr "சான்றிதழ் தரப்படவில்லை"
 
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:516
 msgid "Certificate untrusted"
 msgstr "சான்றிதழில் நம்பக தன்மை இல்லை"
 
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:519
 msgid "Certificate expired"
 msgstr "சான்றிதழ் காலாவதியானது"
 
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:522
 msgid "Certificate not activated"
 msgstr "சான்றிதழ் செயல்படுத்தப்படவில்லை"
 
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:525
 msgid "Certificate hostname mismatch"
 msgstr "சான்றிதழ் புரவலன் பெயர் ஒத்திசையவில்லை"
 
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:528
 msgid "Certificate fingerprint mismatch"
 msgstr "சான்றிதழ் அடையாளம் ஒத்திசையவில்லை"
 
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:531
 msgid "Certificate self-signed"
 msgstr "சான்றிதழ் தானே கையெழுத்திட்டது"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:534
 msgid "Certificate error"
 msgstr "சான்றிதழ் பிழை"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:537
 msgid "Unknown error"
 msgstr "தெரியாத பிழை"
 
-#: ../src/empathy-main-window.c:1218
+#: ../src/empathy-main-window.c:1220
 msgid "Show and edit accounts"
 msgstr "கணக்குகளை காட்டவும் மற்றும் திருத்தவும் "
 
-#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-main-window.ui.h:1 ../src/empathy-preferences.ui.h:10
 msgid "Contact List"
 msgstr "தொடர்பு பட்டியல்"
 
@@ -2161,15 +2102,15 @@ msgstr "(_P) முந்தைய உரையாடல்கள்"
 msgid "_Room"
 msgstr "(_R) அறை"
 
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:332
 msgid "Chat Room"
 msgstr "அரட்டை அறை"
 
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:348
 msgid "Members"
 msgstr "உறுப்பினர்கள்"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:492
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2185,21 +2126,21 @@ msgstr ""
 "கடவுச்சொல் தேவை: %s\n"
 "உறுப்பினர்கள்: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:495
 msgid "Yes"
 msgstr "ஆம்"
 
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:495
 msgid "No"
 msgstr "இல்லை"
 
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:522
 msgid "Could not start room listing"
 msgstr "அறை பட்டியலை எடுப்பதை துவக்க முடியவில்லை"
 
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:532
 msgid "Could not stop room listing"
 msgstr "அறை பட்டியலை எடுப்பதை நிறுத்த முடியவில்லை"
 
@@ -2233,106 +2174,106 @@ msgstr "அறை பட்டியல்"
 msgid "_Room:"
 msgstr "(_R) அறை:"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:159
 msgid "Message received"
 msgstr "தகவல் பெறப்பட்டது"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:160
 msgid "Message sent"
 msgstr "தகவல் அனுப்பப்பட்டது"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:161
 msgid "New conversation"
 msgstr "புதிய உரையாடல்"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:162
 msgid "Contact goes online"
 msgstr "தொடர்பு இணைபில் வருகிறார்"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:163
 msgid "Contact goes offline"
 msgstr "தொடர்பு இணைப்பு விலகி செல்கிறார்"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:164
 msgid "Account connected"
 msgstr "கணக்கு இணைக்கப்பட்டது"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:165
 msgid "Account disconnected"
 msgstr "கணக்கு இணைப்பு நீக்கப்பட்டது"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:432
 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 "(_G) ஜிபிஎஸ் பயனை அனுமதி"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Allow _cellphone usage"
 msgstr "(_c)  அலைபேசி பயனை அனுமதி"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:4
 msgid "Allow _network usage"
 msgstr "(_n)  வலைப்பின்னல் பயனை அனுமதி"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:5
 msgid "Appearance"
 msgstr "தோற்றம்"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:6
 msgid "Automatically _connect on startup "
 msgstr "(_c) துவங்கும்போது தானியங்கியாக இணை"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:7
 msgid "Avatars are user chosen images shown in the contact list"
 msgstr "அவதாரங்கள் என்பது தொடர்பு பட்டியலில் காணப்படும் பயனர் தேர்ந்தெடுத்த பிம்பங்கள்"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:8
 msgid "Behavior"
 msgstr "நடத்தை"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:9
 msgid "Chat Th_eme:"
 msgstr "(_e) அரட்டை கருத்து:"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Disable notifications when _away or busy"
 msgstr "(_a) வெளியே  அல்லது வேலையில் உள்ளபோது அறிவிப்புகளை செயல் நீக்கு"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Disable sounds when _away or busy"
 msgstr "(_a) வெளியே  அல்லது வேலையில் உள்ளபோது ஒலிகளை செயல் நீக்கு"
 
-#: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when a contact comes online"
-msgstr "தொடர்பு உள் நுழைகையில் அறிவிப்புகளை செயல்படுத்து"
-
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable notifications when a contact goes offline"
-msgstr "தொடர்பு இணைப்பு விலகி செல்கையில் அறிவிப்புகளை செயல்படுத்து"
-
-#: ../src/empathy-preferences.ui.h:14
 msgid "Enable notifications when the _chat is not focused"
 msgstr "(_c) அரட்டை குவிப்பில் இல்லாத போது அறிவிப்புகளை செயல்படுத்து"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:14
 msgid "Enable spell checking for languages:"
 msgstr "மொழிகளுக்கு எழுத்து பிழை திருத்தத்தை செயல்படுத்து:"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "பொது"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
 msgid "Geoclue Settings"
 msgstr "ஜியோ க்ளூ அமைப்புகள்"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "இடம்"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "Not a valid adium theme"
+msgstr "செல்லுபடியாகும் ஏடியம் கருத்து அல்ல"
+
 #: ../src/empathy-preferences.ui.h:19
 msgid "Notifications"
 msgstr "அறிவிப்புகள்"
@@ -2355,8 +2296,9 @@ msgid ""
 "state and country will be published.  GPS coordinates will have a random "
 "value added (&#xB1;0.25&#xB0;)."
 msgstr ""
-"குறைத்த இட குறிப்பு எனில் உங்கள் மாநகரம், மாநிலம், நாடு தவிர ஒன்றும் வெளியிடப்படாது. "
-"ஜிபிஎஸ் ஆயத்தொலைவுகளுக்கு தற்போக்கு மதிப்பு சேர்க்கப்படும் (&#xB1;0.25&#xB0;)."
+"குறைத்த இட குறிப்பு எனில் உங்கள் மாநகரம், மாநிலம், நாடு தவிர ஒன்றும் "
+"வெளியிடப்படாது. ஜிபிஎஸ் ஆயத்தொலைவுகளுக்கு தற்போக்கு மதிப்பு சேர்க்கப்படும் "
+"(&#xB1;0.25&#xB0;)."
 
 #: ../src/empathy-preferences.ui.h:24
 msgid "Show _avatars"
@@ -2394,9 +2336,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:33
 msgid "Themes"
@@ -2445,8 +2385,8 @@ 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"
@@ -2456,74 +2396,67 @@ msgstr "ஜிடிகே முழுத்திரையை  விட்ட
 msgid "Contact Map View"
 msgstr "தொடர்புகள் படக்காட்சி"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1075
 msgid "Error"
 msgstr " பிழை"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1069
 msgid "Critical"
 msgstr "ஆபத்தானன்"
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1063
 msgid "Warning"
 msgstr "எச்சரிக்கை"
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1057
+#: ../src/empathy-debug-dialog.c:1105
 msgid "Message"
 msgstr "செய்தி"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1051
 msgid "Info"
 msgstr "தகவல்"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1045
 msgid "Debug"
 msgstr "வழுநீக்கு"
 
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-dialog.c:837
 msgid "Save"
 msgstr "சேமி"
 
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-dialog.c:940
 msgid "Debug Window"
 msgstr "வழு நீக்கு சாளரம்"
 
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-dialog.c:1013
 msgid "Pause"
 msgstr "தாமதி"
 
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-dialog.c:1025
 msgid "Level "
 msgstr "மட்டம்"
 
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-dialog.c:1094
 msgid "Time"
 msgstr "நேரம்"
 
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-dialog.c:1096
 msgid "Domain"
 msgstr "களம்"
 
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-dialog.c:1098
 msgid "Category"
 msgstr "வகை"
 
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-dialog.c:1100
 msgid "Level"
 msgstr "மட்டம்"
 
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-dialog.c:1132
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "தேர்ந்தெடுத்த இணைப்பு மேலாளர் தொலை வழு நீக்கத்தை ஆதரிக்கவில்லை"
 
-#~ msgid "Adium"
-#~ msgstr "ஏடியம்"
-
-#~ msgid "Adium theme to use:"
-#~ msgstr "பயன்படுத்த வேண்டிய ஏடியம்  கருத்து:"
 
-#~ msgid "Not a valid adium theme"
-#~ msgstr "செல்லுபடியாகும் ஏடியம் கருத்து அல்ல"
diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 6b6f7df..ed19c7a 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -259,8 +259,6 @@
     '("tp-error" "EMPATHY_FT_ERROR_TP_ERROR")
     '("socket" "EMPATHY_FT_ERROR_SOCKET")
     '("not-supported" "EMPATHY_FT_ERROR_NOT_SUPPORTED")
-    '("invalid-source-file" "EMPATHY_FT_ERROR_INVALID_SOURCE_FILE")
-    '("empty-source-file" "EMPATHY_FT_ERROR_EMPTY_SOURCE_FILE")
   )
 )
 
@@ -277,15 +275,6 @@
   (return-type "EmpathyAccountManager*")
 )
 
-(define-method create
-  (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_create")
-  (return-type "EmpathyAccount*")
-  (parameters
-    '("McProfile*" "profile")
-  )
-)
-
 (define-method get_connected_accounts
   (of-object "EmpathyAccountManager")
   (c-name "empathy_account_manager_get_connected_accounts")
@@ -298,6 +287,15 @@
   (return-type "int")
 )
 
+(define-method is_account_just_connected
+  (of-object "EmpathyAccountManager")
+  (c-name "empathy_account_manager_is_account_just_connected")
+  (return-type "gboolean")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
 (define-method get_count
   (of-object "EmpathyAccountManager")
   (c-name "empathy_account_manager_get_count")
@@ -307,40 +305,31 @@
 (define-method get_account
   (of-object "EmpathyAccountManager")
   (c-name "empathy_account_manager_get_account")
-  (return-type "EmpathyAccount*")
+  (return-type "McAccount*")
   (parameters
     '("TpConnection*" "connection")
   )
 )
 
-(define-method lookup
-  (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_lookup")
-  (return-type "EmpathyAccount*")
-  (parameters
-    '("const-gchar*" "unique_name")
-  )
-)
-
 (define-method dup_accounts
   (of-object "EmpathyAccountManager")
   (c-name "empathy_account_manager_dup_accounts")
   (return-type "GList*")
 )
 
-(define-method dup_connections
+(define-method get_connection
   (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_dup_connections")
-  (return-type "GList*")
+  (c-name "empathy_account_manager_get_connection")
+  (return-type "TpConnection*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-method remove
+(define-method dup_connections
   (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_remove")
-  (return-type "none")
-  (parameters
-    '("EmpathyAccount*" "account")
-  )
+  (c-name "empathy_account_manager_dup_connections")
+  (return-type "GList*")
 )
 
 
@@ -357,7 +346,7 @@
   (is-constructor-of "EmpathyChatroom")
   (return-type "EmpathyChatroom*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
   )
 )
 
@@ -365,7 +354,7 @@
   (c-name "empathy_chatroom_new_full")
   (return-type "EmpathyChatroom*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "room")
     '("const-gchar*" "name")
     '("gboolean" "auto_connect")
@@ -375,7 +364,7 @@
 (define-method get_account
   (of-object "EmpathyChatroom")
   (c-name "empathy_chatroom_get_account")
-  (return-type "EmpathyAccount*")
+  (return-type "McAccount*")
 )
 
 (define-method set_account
@@ -383,7 +372,7 @@
   (c-name "empathy_chatroom_set_account")
   (return-type "none")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
   )
 )
 
@@ -571,7 +560,7 @@
   (c-name "empathy_chatroom_manager_find")
   (return-type "EmpathyChatroom*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "room")
   )
 )
@@ -581,7 +570,7 @@
   (c-name "empathy_chatroom_manager_get_chatrooms")
   (return-type "GList*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
   )
 )
 
@@ -590,7 +579,7 @@
   (c-name "empathy_chatroom_manager_get_count")
   (return-type "guint")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
   )
 )
 
@@ -692,18 +681,6 @@
   (return-type "none")
 )
 
-(define-method stop_call
-  (of-object "EmpathyCallHandler")
-  (c-name "empathy_call_handler_stop_call")
-  (return-type "none")
-)
-
-(define-method has_initial_video
-  (of-object "EmpathyCallHandler")
-  (c-name "empathy_call_handler_has_initial_video")
-  (return-type "gboolean")
-)
-
 (define-method bus_message
   (of-object "EmpathyCallHandler")
   (c-name "empathy_call_handler_bus_message")
@@ -736,7 +713,7 @@
   (c-name "empathy_contact_new_for_log")
   (return-type "EmpathyContact*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "id")
     '("const-gchar*" "name")
     '("gboolean" "is_user")
@@ -797,7 +774,7 @@
 (define-method get_account
   (of-object "EmpathyContact")
   (c-name "empathy_contact_get_account")
-  (return-type "EmpathyAccount*")
+  (return-type "McAccount*")
 )
 
 (define-method get_connection
@@ -995,15 +972,6 @@
   )
 )
 
-(define-function contact_equal
-  (c-name "empathy_contact_equal")
-  (return-type "gboolean")
-  (parameters
-    '("gconstpointer" "contact1")
-    '("gconstpointer" "contact2")
-  )
-)
-
 
 
 ;; From empathy-contact-groups.h
@@ -1211,11 +1179,6 @@
   (varargs #t)
 )
 
-(define-function debug_free
-  (c-name "empathy_debug_free")
-  (return-type "none")
-)
-
 (define-function debug_set_flags
   (c-name "empathy_debug_set_flags")
   (return-type "none")
@@ -1831,7 +1794,7 @@
   (c-name "empathy_log_manager_exists")
   (return-type "gboolean")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1842,7 +1805,7 @@
   (c-name "empathy_log_manager_get_dates")
   (return-type "GList*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1853,7 +1816,7 @@
   (c-name "empathy_log_manager_get_messages_for_date")
   (return-type "GList*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
     '("const-gchar*" "date")
@@ -1865,7 +1828,7 @@
   (c-name "empathy_log_manager_get_filtered_messages")
   (return-type "GList*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
     '("guint" "num_messages")
@@ -1879,7 +1842,7 @@
   (c-name "empathy_log_manager_get_chats")
   (return-type "GList*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
   )
 )
 
@@ -1945,7 +1908,7 @@
   (c-name "empathy_log_store_exists")
   (return-type "gboolean")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1968,7 +1931,7 @@
   (c-name "empathy_log_store_get_dates")
   (return-type "GList*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1979,7 +1942,7 @@
   (c-name "empathy_log_store_get_messages_for_date")
   (return-type "GList*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
     '("const-gchar*" "date")
@@ -1991,7 +1954,7 @@
   (c-name "empathy_log_store_get_last_messages")
   (return-type "GList*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -2002,7 +1965,7 @@
   (c-name "empathy_log_store_get_chats")
   (return-type "GList*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
   )
 )
 
@@ -2031,7 +1994,7 @@
   (c-name "empathy_log_store_get_filtered_messages")
   (return-type "GList*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
     '("guint" "num_messages")
@@ -2253,14 +2216,6 @@
   (return-type "none")
 )
 
-(define-function status_presets_is_valid
-  (c-name "empathy_status_presets_is_valid")
-  (return-type "gboolean")
-  (parameters
-    '("TpConnectionPresenceType" "state")
-  )
-)
-
 
 
 ;; From empathy-time.h
@@ -2383,18 +2338,6 @@
   (return-type "gboolean")
 )
 
-(define-method is_receiving_video
-  (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_is_receiving_video")
-  (return-type "gboolean")
-)
-
-(define-method is_sending_video
-  (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_is_sending_video")
-  (return-type "gboolean")
-)
-
 
 
 ;; From empathy-tp-chat.h
@@ -2718,7 +2661,7 @@
   (is-constructor-of "EmpathyTpRoomlist")
   (return-type "EmpathyTpRoomlist*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
   )
 )
 
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index 377eea4..cf85c78 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -290,7 +290,7 @@
 (define-method dup_account
   (of-object "EmpathyAccountChooser")
   (c-name "empathy_account_chooser_dup_account")
-  (return-type "EmpathyAccount*")
+  (return-type "McAccount*")
 )
 
 (define-method get_connection
@@ -304,7 +304,7 @@
   (c-name "empathy_account_chooser_set_account")
   (return-type "gboolean")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
   )
 )
 
@@ -333,11 +333,11 @@
   )
 )
 
-(define-method chooser_filter_is_connected
-  (of-object "EmpathyAccount")
+(define-function account_chooser_filter_is_connected
   (c-name "empathy_account_chooser_filter_is_connected")
   (return-type "gboolean")
   (parameters
+    '("McAccount*" "account")
     '("gpointer" "user_data")
   )
 )
@@ -346,22 +346,22 @@
 
 ;; From empathy-account-widget.h
 
-(define-method widget_handle_params
-  (of-object "EmpathyAccount")
+(define-function account_widget_handle_params
   (c-name "empathy_account_widget_handle_params")
   (return-type "none")
   (parameters
+    '("McAccount*" "account")
     '("GtkBuilder*" "gui")
     '("const-gchar*" "first_widget")
   )
   (varargs #t)
 )
 
-(define-method widget_add_forget_button
-  (of-object "EmpathyAccount")
+(define-function account_widget_add_forget_button
   (c-name "empathy_account_widget_add_forget_button")
   (return-type "none")
   (parameters
+    '("McAccount*" "account")
     '("GtkBuilder*" "gui")
     '("const-gchar*" "button")
     '("const-gchar*" "entry")
@@ -377,72 +377,102 @@
   )
 )
 
-(define-method widget_generic_new
-  (of-object "EmpathyAccount")
+(define-function account_widget_generic_new
   (c-name "empathy_account_widget_generic_new")
+  (is-constructor-of "EmpathyAccountWidgetGeneric")
   (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-method widget_salut_new
-  (of-object "EmpathyAccount")
+(define-function account_widget_salut_new
   (c-name "empathy_account_widget_salut_new")
+  (is-constructor-of "EmpathyAccountWidgetSalut")
   (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-method widget_msn_new
-  (of-object "EmpathyAccount")
+(define-function account_widget_msn_new
   (c-name "empathy_account_widget_msn_new")
+  (is-constructor-of "EmpathyAccountWidgetMsn")
   (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-method widget_jabber_new
-  (of-object "EmpathyAccount")
+(define-function account_widget_jabber_new
   (c-name "empathy_account_widget_jabber_new")
+  (is-constructor-of "EmpathyAccountWidgetJabber")
   (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-method widget_icq_new
-  (of-object "EmpathyAccount")
+(define-function account_widget_icq_new
   (c-name "empathy_account_widget_icq_new")
+  (is-constructor-of "EmpathyAccountWidgetIcq")
   (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-method widget_aim_new
-  (of-object "EmpathyAccount")
+(define-function account_widget_aim_new
   (c-name "empathy_account_widget_aim_new")
+  (is-constructor-of "EmpathyAccountWidgetAim")
   (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-method widget_yahoo_new
-  (of-object "EmpathyAccount")
+(define-function account_widget_yahoo_new
   (c-name "empathy_account_widget_yahoo_new")
+  (is-constructor-of "EmpathyAccountWidgetYahoo")
   (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-method widget_groupwise_new
-  (of-object "EmpathyAccount")
+(define-function account_widget_groupwise_new
   (c-name "empathy_account_widget_groupwise_new")
+  (is-constructor-of "EmpathyAccountWidgetGroupwise")
   (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
 
 
 ;; From empathy-account-widget-irc.h
 
-(define-method widget_irc_new
-  (of-object "EmpathyAccount")
+(define-function account_widget_irc_new
   (c-name "empathy_account_widget_irc_new")
+  (is-constructor-of "EmpathyAccountWidgetIrc")
   (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
 
 
 ;; From empathy-account-widget-sip.h
 
-(define-method widget_sip_new
-  (of-object "EmpathyAccount")
+(define-function account_widget_sip_new
   (c-name "empathy_account_widget_sip_new")
+  (is-constructor-of "EmpathyAccountWidgetSip")
   (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
 
@@ -585,7 +615,7 @@
 (define-method get_account
   (of-object "EmpathyChat")
   (c-name "empathy_chat_get_account")
-  (return-type "EmpathyAccount*")
+  (return-type "McAccount*")
 )
 
 (define-method get_id
@@ -665,15 +695,6 @@
   (return-type "gboolean")
 )
 
-(define-method set_show_contacts
-  (of-object "EmpathyChat")
-  (c-name "empathy_chat_set_show_contacts")
-  (return-type "none")
-  (parameters
-    '("gboolean" "show")
-  )
-)
-
 
 
 ;; From empathy-chat-text-view.h
@@ -1500,7 +1521,7 @@
   (c-name "empathy_log_window_show")
   (return-type "GtkWidget*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
     '("GtkWindow*" "parent")
@@ -1786,7 +1807,7 @@
   (c-name "empathy_icon_name_from_account")
   (return-type "const-gchar*")
   (parameters
-    '("EmpathyAccount*" "account")
+    '("McAccount*" "account")
   )
 )
 
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 98e8485..4cf3911 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -31,6 +31,7 @@
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 
+#include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-profile.h>
 #include <telepathy-glib/util.h>
 
@@ -95,7 +96,7 @@ enum {
 };
 
 static void       accounts_dialog_update_account            (EmpathyAccountsDialog    *dialog,
-							     EmpathyAccount           *account);
+							     McAccount                *account);
 static void       accounts_dialog_model_setup               (EmpathyAccountsDialog    *dialog);
 static void       accounts_dialog_model_add_columns         (EmpathyAccountsDialog    *dialog);
 static void       accounts_dialog_name_editing_started_cb   (GtkCellRenderer          *renderer,
@@ -108,19 +109,19 @@ static void       accounts_dialog_model_pixbuf_data_func    (GtkTreeViewColumn
 							     GtkTreeModel             *model,
 							     GtkTreeIter              *iter,
 							     EmpathyAccountsDialog    *dialog);
-static EmpathyAccount *accounts_dialog_model_get_selected        (EmpathyAccountsDialog    *dialog);
+static McAccount *accounts_dialog_model_get_selected        (EmpathyAccountsDialog    *dialog);
 static void       accounts_dialog_model_set_selected        (EmpathyAccountsDialog    *dialog,
-							     EmpathyAccount           *account);
+							     McAccount                *account);
 static gboolean   accounts_dialog_model_remove_selected     (EmpathyAccountsDialog    *dialog);
 static void       accounts_dialog_model_selection_changed   (GtkTreeSelection         *selection,
 							     EmpathyAccountsDialog    *dialog);
 static void       accounts_dialog_add_or_update_account     (EmpathyAccountsDialog    *dialog,
-							     EmpathyAccount           *account);
+							     McAccount                *account);
 static void       accounts_dialog_account_added_cb          (EmpathyAccountManager    *manager,
-							     EmpathyAccount           *account,
+							     McAccount                *account,
 							     EmpathyAccountsDialog    *dialog);
 static void       accounts_dialog_account_removed_cb        (EmpathyAccountManager    *manager,
-							     EmpathyAccount           *account,
+							     McAccount                *account,
 							     EmpathyAccountsDialog    *dialog);
 static gboolean   accounts_dialog_row_changed_foreach       (GtkTreeModel             *model,
 							     GtkTreePath              *path,
@@ -128,7 +129,7 @@ static gboolean   accounts_dialog_row_changed_foreach       (GtkTreeModel
 							     gpointer                  user_data);
 static gboolean   accounts_dialog_flash_connecting_cb       (EmpathyAccountsDialog    *dialog);
 static void       accounts_dialog_connection_changed_cb     (EmpathyAccountManager    *manager,
-							     EmpathyAccount           *account,
+							     McAccount                *account,
 							     TpConnectionStatusReason  reason,
 							     TpConnectionStatus        current,
 							     TpConnectionStatus        previous,
@@ -153,12 +154,12 @@ static void       accounts_dialog_destroy_cb                (GtkWidget
 
 static void
 accounts_dialog_update_name_label (EmpathyAccountsDialog *dialog,
-				   EmpathyAccount        *account)
+				   McAccount             *account)
 {
 	gchar *text;
 
 	text = g_markup_printf_escaped ("<big><b>%s</b></big>",
-			empathy_account_get_display_name (account));
+			mc_account_get_display_name (account));
 	gtk_label_set_markup (GTK_LABEL (dialog->label_name), text);
 
 	g_free (text);
@@ -166,7 +167,7 @@ accounts_dialog_update_name_label (EmpathyAccountsDialog *dialog,
 
 static void
 accounts_dialog_update_account (EmpathyAccountsDialog *dialog,
-				EmpathyAccount       *account)
+				McAccount            *account)
 {
 	McProfile   *profile;
 	const gchar *config_ui;
@@ -215,7 +216,7 @@ accounts_dialog_update_account (EmpathyAccountsDialog *dialog,
 		dialog->settings_widget = NULL;
 	}
 
-	profile = empathy_account_get_profile (account);
+	profile = mc_account_get_profile (account);
 	config_ui = mc_profile_get_configuration_ui (profile);
 	if (!tp_strdiff (config_ui, "jabber")) {
 		dialog->settings_widget =
@@ -281,10 +282,10 @@ accounts_dialog_model_setup (EmpathyAccountsDialog *dialog)
 	GtkTreeSelection *selection;
 
 	store = gtk_list_store_new (COL_COUNT,
-				    G_TYPE_BOOLEAN,        /* enabled */
-				    G_TYPE_STRING,         /* name */
-				    G_TYPE_UINT,           /* status */
-				    EMPATHY_TYPE_ACCOUNT); /* account */
+				    G_TYPE_BOOLEAN,    /* enabled */
+				    G_TYPE_STRING,     /* name */
+				    G_TYPE_UINT,       /* status */
+				    MC_TYPE_ACCOUNT);  /* account */
 
 	gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->treeview),
 				 GTK_TREE_MODEL (store));
@@ -310,7 +311,7 @@ accounts_dialog_name_edited_cb (GtkCellRendererText   *renderer,
 				gchar                 *new_text,
 				EmpathyAccountsDialog *dialog)
 {
-	EmpathyAccount    *account;
+	McAccount    *account;
 	GtkTreeModel *model;
 	GtkTreePath  *treepath;
 	GtkTreeIter   iter;
@@ -332,7 +333,7 @@ accounts_dialog_name_edited_cb (GtkCellRendererText   *renderer,
 			    -1);
 	gtk_tree_path_free (treepath);
 
-	empathy_account_set_display_name (account, new_text);
+	mc_account_set_display_name (account, new_text);
 	g_object_unref (account);
 }
 
@@ -341,7 +342,7 @@ accounts_dialog_enable_toggled_cb (GtkCellRendererToggle *cell_renderer,
 				   gchar                 *path,
 				   EmpathyAccountsDialog *dialog)
 {
-	EmpathyAccount    *account;
+	McAccount    *account;
 	GtkTreeModel *model;
 	GtkTreePath  *treepath;
 	GtkTreeIter   iter;
@@ -355,11 +356,11 @@ accounts_dialog_enable_toggled_cb (GtkCellRendererToggle *cell_renderer,
 			    -1);
 	gtk_tree_path_free (treepath);
 
-	enabled = empathy_account_is_enabled (account);
-	empathy_account_set_enabled (account, !enabled);
+	enabled = mc_account_is_enabled (account);
+	mc_account_set_enabled (account, !enabled);
 
 	DEBUG ("%s account %s", enabled ? "Disabled" : "Enable",
-		empathy_account_get_display_name (account));
+		mc_account_get_display_name (account));
 
 	g_object_unref (account);
 }
@@ -456,7 +457,7 @@ accounts_dialog_model_pixbuf_data_func (GtkTreeViewColumn    *tree_column,
 					GtkTreeIter          *iter,
 					EmpathyAccountsDialog *dialog)
 {
-	EmpathyAccount     *account;
+	McAccount          *account;
 	const gchar        *icon_name;
 	GdkPixbuf          *pixbuf;
 	TpConnectionStatus  status;
@@ -503,7 +504,7 @@ accounts_dialog_model_pixbuf_data_func (GtkTreeViewColumn    *tree_column,
 
 static gboolean
 accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
-				 EmpathyAccount        *account,
+				 McAccount             *account,
 				 GtkTreeIter           *iter)
 {
 	GtkTreeView      *view;
@@ -519,7 +520,7 @@ accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
 	for (ok = gtk_tree_model_get_iter_first (model, iter);
 	     ok;
 	     ok = gtk_tree_model_iter_next (model, iter)) {
-		EmpathyAccount *this_account;
+		McAccount *this_account;
 		gboolean   equal;
 
 		gtk_tree_model_get (model, iter,
@@ -537,14 +538,14 @@ accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
 	return FALSE;
 }
 
-static EmpathyAccount *
+static McAccount *
 accounts_dialog_model_get_selected (EmpathyAccountsDialog *dialog)
 {
 	GtkTreeView      *view;
 	GtkTreeModel     *model;
 	GtkTreeSelection *selection;
 	GtkTreeIter       iter;
-	EmpathyAccount   *account;
+	McAccount        *account;
 
 	view = GTK_TREE_VIEW (dialog->treeview);
 	selection = gtk_tree_view_get_selection (view);
@@ -560,7 +561,7 @@ accounts_dialog_model_get_selected (EmpathyAccountsDialog *dialog)
 
 static void
 accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
-				    EmpathyAccount        *account)
+				    McAccount             *account)
 {
 	GtkTreeSelection *selection;
 	GtkTreeIter       iter;
@@ -593,7 +594,7 @@ static void
 accounts_dialog_model_selection_changed (GtkTreeSelection     *selection,
 					 EmpathyAccountsDialog *dialog)
 {
-	EmpathyAccount    *account;
+	McAccount    *account;
 	GtkTreeModel *model;
 	GtkTreeIter   iter;
 	gboolean      is_selection;
@@ -610,7 +611,7 @@ accounts_dialog_model_selection_changed (GtkTreeSelection     *selection,
 
 static void
 accounts_dialog_add_or_update_account (EmpathyAccountsDialog *dialog,
-				       EmpathyAccount        *account)
+				       McAccount             *account)
 {
 	GtkTreeModel       *model;
 	GtkTreeIter         iter;
@@ -619,9 +620,9 @@ accounts_dialog_add_or_update_account (EmpathyAccountsDialog *dialog,
 	gboolean            enabled;
 
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
-	g_object_get (account, "status", &status, NULL);
-	name = empathy_account_get_display_name (account);
-	enabled = empathy_account_is_enabled (account);
+	status = mission_control_get_connection_status (dialog->mc, account, NULL);
+	name = mc_account_get_display_name (account);
+	enabled = mc_account_is_enabled (account);
 
 	if (!accounts_dialog_get_account_iter (dialog, account, &iter)) {
 		DEBUG ("Adding new account");
@@ -645,7 +646,7 @@ accounts_dialog_add_or_update_account (EmpathyAccountsDialog *dialog,
 
 static void
 accounts_dialog_account_added_cb (EmpathyAccountManager *manager,
-				  EmpathyAccount *account,
+				  McAccount *account,
 				  EmpathyAccountsDialog *dialog)
 {
 	const gchar *current_name;
@@ -655,25 +656,25 @@ accounts_dialog_account_added_cb (EmpathyAccountManager *manager,
 
 	/* Change the display name to "%s (%s)" % (protocol, account).
 	 *  - The protocol is the display name of the profile.
-	 *  - The account should be the normalized name of the EmpathyAccount but
+	 *  - The account should be the normalized name of the McAccount but
 	 *    it's not set until first connection, so we get the "account"
 	 *    parameter for CM that have it. */
-	current_name = empathy_account_get_display_name (account);
-	account_param = empathy_account_get_param_string (account, "account");
+	current_name = mc_account_get_display_name (account);
+	mc_account_get_param_string (account, "account", &account_param);
 	if (!EMP_STR_EMPTY (account_param)) {
 		McProfile   *profile;
 		const gchar *profile_name;
 		gchar       *new_name;
 
-		profile = empathy_account_get_profile (account);
+		profile = mc_account_get_profile (account);
 		profile_name = mc_profile_get_display_name (profile);
 		new_name = g_strdup_printf ("%s (%s)", profile_name,
 					    account_param);
 
 		DEBUG ("Setting new display name for account %s: '%s'",
-		       empathy_account_get_unique_name (account), new_name);
+		       mc_account_get_unique_name (account), new_name);
 
-		empathy_account_set_display_name (account, new_name);
+		mc_account_set_display_name (account, new_name);
 		g_free (new_name);
 		g_object_unref (profile);
 	} else {
@@ -684,7 +685,7 @@ accounts_dialog_account_added_cb (EmpathyAccountManager *manager,
 
 static void
 accounts_dialog_account_removed_cb (EmpathyAccountManager *manager,
-				    EmpathyAccount       *account,
+				    McAccount            *account,
 				    EmpathyAccountsDialog *dialog)
 {
 
@@ -721,7 +722,7 @@ accounts_dialog_flash_connecting_cb (EmpathyAccountsDialog *dialog)
 
 static void
 accounts_dialog_connection_changed_cb     (EmpathyAccountManager    *manager,
-					   EmpathyAccount           *account,
+					   McAccount                *account,
 					   TpConnectionStatusReason  reason,
 					   TpConnectionStatus        current,
 					   TpConnectionStatus        previous,
@@ -762,7 +763,7 @@ accounts_dialog_connection_changed_cb     (EmpathyAccountManager    *manager,
 
 static void
 enable_or_disable_account (EmpathyAccountsDialog *dialog,
-			   EmpathyAccount *account,
+			   McAccount *account,
 			   gboolean enabled)
 {
 	GtkTreeModel *model;
@@ -772,7 +773,7 @@ enable_or_disable_account (EmpathyAccountsDialog *dialog,
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
 
 	DEBUG ("Account %s is now %s",
-		empathy_account_get_display_name (account),
+		mc_account_get_display_name (account),
 		enabled ? "enabled" : "disabled");
 
 	if (accounts_dialog_get_account_iter (dialog, account, &iter)) {
@@ -784,7 +785,7 @@ enable_or_disable_account (EmpathyAccountsDialog *dialog,
 
 static void
 accounts_dialog_account_disabled_cb (EmpathyAccountManager *manager,
-				     EmpathyAccount        *account,
+				     McAccount             *account,
 				     EmpathyAccountsDialog *dialog)
 {
 	enable_or_disable_account (dialog, account, FALSE);
@@ -792,7 +793,7 @@ accounts_dialog_account_disabled_cb (EmpathyAccountManager *manager,
 
 static void
 accounts_dialog_account_enabled_cb (EmpathyAccountManager *manager,
-				    EmpathyAccount        *account,
+				    McAccount             *account,
 				    EmpathyAccountsDialog *dialog)
 {
 	enable_or_disable_account (dialog, account, TRUE);
@@ -800,10 +801,10 @@ accounts_dialog_account_enabled_cb (EmpathyAccountManager *manager,
 
 static void
 accounts_dialog_account_changed_cb (EmpathyAccountManager *manager,
-				    EmpathyAccount        *account,
+				    McAccount             *account,
 				    EmpathyAccountsDialog  *dialog)
 {
-	EmpathyAccount *selected_account;
+	McAccount *selected_account;
 
 	accounts_dialog_add_or_update_account (dialog, account);
 	selected_account = accounts_dialog_model_get_selected (dialog);
@@ -817,7 +818,7 @@ accounts_dialog_button_create_clicked_cb (GtkWidget             *button,
 					  EmpathyAccountsDialog  *dialog)
 {
 	McProfile *profile;
-	EmpathyAccount *account;
+	McAccount *account;
 	gchar     *str;
 	McProfileCapabilityFlags cap;
 
@@ -825,7 +826,7 @@ accounts_dialog_button_create_clicked_cb (GtkWidget             *button,
 	    EMPATHY_PROFILE_CHOOSER (dialog->combobox_profile));
 
 	/* Create account */
-	account = empathy_account_manager_create (dialog->account_manager, profile);
+	account = mc_account_create (profile);
 	if (account == NULL) {
 		/* We can't display an error to the user as MC doesn't give us
 		 * any clue about the reason of the failure... */
@@ -836,7 +837,7 @@ accounts_dialog_button_create_clicked_cb (GtkWidget             *button,
 	/* To translator: %s is the protocol name */
 	str = g_strdup_printf (_("New %s account"),
 			       mc_profile_get_display_name (profile));
-	empathy_account_set_display_name (account, str);
+	mc_account_set_display_name (account, str);
 	g_free (str);
 
 	cap = mc_profile_get_capabilities (profile);
@@ -845,7 +846,7 @@ accounts_dialog_button_create_clicked_cb (GtkWidget             *button,
 
 		active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->radiobutton_register));
 		if (active) {
-			empathy_account_set_param_boolean (account, "register", TRUE);
+			mc_account_set_param_boolean (account, "register", TRUE);
 		}
 	}
 
@@ -860,7 +861,7 @@ static void
 accounts_dialog_button_back_clicked_cb (GtkWidget             *button,
 					EmpathyAccountsDialog  *dialog)
 {
-	EmpathyAccount *account;
+	McAccount *account;
 
 	account = accounts_dialog_model_get_selected (dialog);
 	accounts_dialog_update_account (dialog, account);
@@ -931,13 +932,13 @@ static void
 accounts_dialog_button_remove_clicked_cb (GtkWidget            *button,
 					  EmpathyAccountsDialog *dialog)
 {
-	EmpathyAccount *account;
+	McAccount *account;
 	GtkWidget *message_dialog;
 	gint       res;
 
 	account = accounts_dialog_model_get_selected (dialog);
 
-	if (!empathy_account_is_valid (account)) {
+	if (!mc_account_is_complete (account)) {
 		accounts_dialog_model_remove_selected (dialog);
 		accounts_dialog_model_select_first (dialog);
 		return;
@@ -949,7 +950,7 @@ accounts_dialog_button_remove_clicked_cb (GtkWidget            *button,
 		 GTK_BUTTONS_NONE,
 		 _("You are about to remove your %s account!\n"
 		   "Are you sure you want to proceed?"),
-		 empathy_account_get_display_name (account));
+		 mc_account_get_display_name (account));
 
 	gtk_message_dialog_format_secondary_text
 		(GTK_MESSAGE_DIALOG (message_dialog),
@@ -970,7 +971,7 @@ accounts_dialog_button_remove_clicked_cb (GtkWidget            *button,
 	res = gtk_dialog_run (GTK_DIALOG (message_dialog));
 
 	if (res == GTK_RESPONSE_YES) {
-		empathy_account_manager_remove (dialog->account_manager, account);
+		mc_account_delete (account);
 		accounts_dialog_model_select_first (dialog);
 	}
 	gtk_widget_destroy (message_dialog);
@@ -1020,15 +1021,15 @@ accounts_dialog_destroy_cb (GtkWidget            *widget,
 					      dialog);
 
 	/* Delete incomplete accounts */
-	accounts = empathy_account_manager_dup_accounts (dialog->account_manager);
+	accounts = mc_accounts_list ();
 	for (l = accounts; l; l = l->next) {
-		EmpathyAccount *account;
+		McAccount *account;
 
 		account = l->data;
-		if (!empathy_account_is_valid (account)) {
+		if (!mc_account_is_complete (account)) {
 			/* FIXME: Warn the user the account is not complete
 			 *        and is going to be removed. */
-			empathy_account_manager_remove (dialog->account_manager, account);
+			mc_account_delete (account);
 		}
 
 		g_object_unref (account);
@@ -1047,7 +1048,7 @@ accounts_dialog_destroy_cb (GtkWidget            *widget,
 
 GtkWidget *
 empathy_accounts_dialog_show (GtkWindow *parent,
-			      EmpathyAccount *selected_account)
+			      McAccount *selected_account)
 {
 	static EmpathyAccountsDialog *dialog = NULL;
 	GtkBuilder                   *gui;
@@ -1135,7 +1136,7 @@ empathy_accounts_dialog_show (GtkWindow *parent,
 	accounts_dialog_model_setup (dialog);
 
 	/* Add existing accounts */
-	accounts = empathy_account_manager_dup_accounts (dialog->account_manager);
+	accounts = mc_accounts_list ();
 	for (l = accounts; l; l = l->next) {
 		accounts_dialog_add_or_update_account (dialog, l->data);
 		g_object_unref (l->data);
diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index 11e237c..b8c3d36 100644
--- a/src/empathy-accounts-dialog.h
+++ b/src/empathy-accounts-dialog.h
@@ -27,12 +27,12 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 
 G_BEGIN_DECLS
 
 GtkWidget *empathy_accounts_dialog_show (GtkWindow *parent,
-					 EmpathyAccount *selected_account);
+					 McAccount *selected_account);
 
 G_END_DECLS
 
diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index e1c3d7a..33f4085 100644
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -71,11 +71,11 @@ empathy_call_window_fullscreen_set_cursor_visible (
 
   if (priv->video_widget != NULL && !show_cursor)
     {
-      gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget),
+      gdk_window_set_cursor (priv->video_widget->window,
           gdk_cursor_new (GDK_BLANK_CURSOR));
     }
   else
-    gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget), NULL);
+    gdk_window_set_cursor (priv->video_widget->window, NULL);
 }
 
 static void
@@ -130,7 +130,7 @@ empathy_call_window_fullscreen_show_popup (EmpathyCallWindowFullscreen *self)
   screen = gtk_window_get_screen (GTK_WINDOW (priv->parent_window));
   gdk_screen_get_monitor_geometry (screen,
       gdk_screen_get_monitor_at_window (screen,
-          gtk_widget_get_window (GTK_WIDGET (priv->parent_window))),
+          GTK_WIDGET (priv->parent_window)->window),
       &fullscreen_rect);
 
   /* Getting the popup window sizes */
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 7bc64bb..8e317f6 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -176,7 +176,7 @@ chat_tab_style_set_cb (GtkWidget *hbox,
 		"chat-window-tab-close-button");
 	context = gtk_widget_get_pango_context (hbox);
 
-	metrics = pango_context_get_metrics (context, gtk_widget_get_style (hbox)->font_desc,
+	metrics = pango_context_get_metrics (context, hbox->style->font_desc,
 		pango_context_get_language (context));
 	char_width = pango_font_metrics_get_approximate_char_width (metrics);
 	pango_font_metrics_unref (metrics);
@@ -408,7 +408,7 @@ chat_window_update_chat_tab (EmpathyChat *chat)
 	EmpathyContact        *remote_contact;
 	const gchar           *name;
 	const gchar           *id;
-	EmpathyAccount        *account;
+	McAccount             *account;
 	const gchar           *subject;
 	const gchar           *status = NULL;
 	GtkWidget             *widget;
@@ -429,7 +429,7 @@ chat_window_update_chat_tab (EmpathyChat *chat)
 	remote_contact = empathy_chat_get_remote_contact (chat);
 
 	DEBUG ("Updating chat tab, name=%s, account=%s, subject=%s, remote_contact=%p",
-		name, empathy_account_get_unique_name (account), subject, remote_contact);
+		name, mc_account_get_unique_name (account), subject, remote_contact);
 
 	/* Update tab image */
 	if (g_list_find (priv->chats_new_msg, chat)) {
@@ -461,7 +461,7 @@ chat_window_update_chat_tab (EmpathyChat *chat)
 	append_markup_printf (tooltip,
 			      "<b>%s</b><small> (%s)</small>",
 			      id,
-			      empathy_account_get_display_name (account));
+			      mc_account_get_display_name (account));
 
 	if (!EMP_STR_EMPTY (status)) {
 		append_markup_printf (tooltip, "\n<i>%s</i>", status);
@@ -556,16 +556,13 @@ chat_window_conv_activate_cb (GtkAction         *action,
 	is_room = empathy_chat_is_room (priv->current_chat);
 	if (is_room) {
 		const gchar *room;
-		EmpathyAccount   *account;
-		gboolean     found = FALSE;
-		EmpathyChatroom *chatroom;
+		McAccount   *account;
+		gboolean     found;
 
 		room = empathy_chat_get_id (priv->current_chat);
 		account = empathy_chat_get_account (priv->current_chat);
-		chatroom = empathy_chatroom_manager_find (priv->chatroom_manager,
-						       account, room);
-		if (chatroom != NULL)
-			found = empathy_chatroom_is_favorite (chatroom);
+		found = empathy_chatroom_manager_find (priv->chatroom_manager,
+						       account, room) != NULL;
 
 		DEBUG ("This room %s favorite", found ? "is" : "is not");
 		gtk_toggle_action_set_active (
@@ -605,7 +602,7 @@ chat_window_favorite_toggled_cb (GtkToggleAction   *toggle_action,
 {
 	EmpathyChatWindowPriv *priv = GET_PRIV (window);
 	gboolean               active;
-	EmpathyAccount        *account;
+	McAccount             *account;
 	const gchar           *room;
 	EmpathyChatroom       *chatroom;
 
@@ -616,16 +613,19 @@ chat_window_favorite_toggled_cb (GtkToggleAction   *toggle_action,
 	chatroom = empathy_chatroom_manager_find (priv->chatroom_manager,
 						  account, room);
 
-	if (chatroom == NULL) {
+	if (active && !chatroom) {
 		const gchar *name;
 
 		name = empathy_chat_get_name (priv->current_chat);
 		chatroom = empathy_chatroom_new_full (account, room, name, FALSE);
 		empathy_chatroom_manager_add (priv->chatroom_manager, chatroom);
 		g_object_unref (chatroom);
-  }
+		return;
+	}
 
-	empathy_chatroom_set_favorite (chatroom, active);
+	if (!active && chatroom) {
+		empathy_chatroom_manager_remove (priv->chatroom_manager, chatroom);
+	}
 }
 
 static void
@@ -1235,40 +1235,41 @@ chat_window_drag_data_received (GtkWidget        *widget,
 	if (info == DND_DRAG_TYPE_CONTACT_ID) {
 		EmpathyChat           *chat;
 		EmpathyChatWindow     *old_window;
-		EmpathyAccount        *account;
-		EmpathyAccountManager *account_manager;
+		McAccount             *account;
 		const gchar           *id;
 		gchar                **strv;
 		const gchar           *account_id;
 		const gchar           *contact_id;
 
-		id = (const gchar*) gtk_selection_data_get_data (selection);
-		account_manager = empathy_account_manager_dup_singleton ();
+		id = (const gchar*) selection->data;
 
 		DEBUG ("DND contact from roster with id:'%s'", id);
 
 		strv = g_strsplit (id, "/", 2);
 		account_id = strv[0];
 		contact_id = strv[1];
-		account = empathy_account_manager_lookup (account_manager, account_id);
+		account = mc_account_lookup (account_id);
 		chat = empathy_chat_window_find_chat (account, contact_id);
 
 		if (!chat) {
+			EmpathyAccountManager *account_manager;
 			TpConnection *connection;
 
-			connection = empathy_account_get_connection (account);
+			account_manager = empathy_account_manager_dup_singleton ();
+			connection = empathy_account_manager_get_connection (
+				account_manager, account);
 
 			if (connection) {
 				empathy_dispatcher_chat_with_contact_id (
 					connection, contact_id, NULL, NULL);
 			}
 
+			g_object_unref (account_manager);
 			g_object_unref (account);
 			g_strfreev (strv);
 			return;
 		}
 		g_object_unref (account);
-		g_object_unref (account_manager);
 		g_strfreev (strv);
 
 		old_window = chat_window_find_chat (chat);
@@ -1299,7 +1300,7 @@ chat_window_drag_data_received (GtkWidget        *widget,
 
 		DEBUG ("DND tab");
 
-		chat = (void *) gtk_selection_data_get_data (selection);
+		chat = (void *) selection->data;
 		old_window = chat_window_find_chat (*chat);
 
 		if (old_window) {
@@ -1739,11 +1740,12 @@ empathy_chat_window_has_focus (EmpathyChatWindow *window)
 }
 
 EmpathyChat *
-empathy_chat_window_find_chat (EmpathyAccount   *account,
+empathy_chat_window_find_chat (McAccount   *account,
 			       const gchar *id)
 {
 	GList *l;
 
+	g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
 	g_return_val_if_fail (!EMP_STR_EMPTY (id), NULL);
 
 	for (l = chat_windows; l; l = l->next) {
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 6f3d21f..c46ef8f 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -31,7 +31,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 #include <libempathy-gtk/empathy-chat.h>
 
 G_BEGIN_DECLS
@@ -69,7 +69,7 @@ void               empathy_chat_window_move_chat      (EmpathyChatWindow *old_wi
 void               empathy_chat_window_switch_to_chat (EmpathyChatWindow *window,
 						       EmpathyChat       *chat);
 gboolean           empathy_chat_window_has_focus      (EmpathyChatWindow *window);
-EmpathyChat *      empathy_chat_window_find_chat      (EmpathyAccount   *account,
+EmpathyChat *      empathy_chat_window_find_chat      (McAccount        *account,
 						       const gchar      *id);
 void               empathy_chat_window_present_chat   (EmpathyChat      *chat);
 
diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index 3b5dd1f..a0fb8e6 100644
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -308,7 +308,7 @@ chatrooms_window_model_refresh_data (EmpathyChatroomsWindow *window,
 	GtkTreeIter            iter;
 	GtkTreeViewColumn     *column;
 	EmpathyAccountChooser  *account_chooser;
-	EmpathyAccount        *account;
+	McAccount             *account;
 	GList                 *chatrooms, *l;
 
 	view = GTK_TREE_VIEW (window->treeview);
@@ -506,7 +506,7 @@ chatrooms_window_chatroom_added_cb (EmpathyChatroomManager *manager,
 				    EmpathyChatroomsWindow *window)
 {
 	EmpathyAccountChooser *account_chooser;
-	EmpathyAccount       *account;
+	McAccount            *account;
 
 	account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser);
 	account = empathy_account_chooser_dup_account (account_chooser);
diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c
index 9d047ba..cd0d925 100644
--- a/src/empathy-debug-dialog.c
+++ b/src/empathy-debug-dialog.c
@@ -212,7 +212,7 @@ debug_dialog_set_toolbar_sensitivity (EmpathyDebugDialog *debug_dialog,
     gboolean sensitive)
 {
   EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
-  GtkWidget *vbox = gtk_dialog_get_content_area (GTK_DIALOG (debug_dialog));
+  GtkWidget *vbox = GTK_DIALOG (debug_dialog)->vbox;
 
   gtk_widget_set_sensitive (GTK_WIDGET (priv->save_button), sensitive);
   gtk_widget_set_sensitive (GTK_WIDGET (priv->copy_button), sensitive);
@@ -948,7 +948,7 @@ debug_dialog_constructor (GType type,
   gtk_window_set_title (GTK_WINDOW (object), _("Debug Window"));
   gtk_window_set_default_size (GTK_WINDOW (object), 800, 400);
 
-  vbox = gtk_dialog_get_content_area (GTK_DIALOG (object));
+  vbox = GTK_DIALOG (object)->vbox;
 
   toolbar = gtk_toolbar_new ();
   gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 1a7ec09..a80aad2 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -914,12 +914,19 @@ event_manager_presence_changed_cb (EmpathyContactMonitor *monitor,
     TpConnectionPresenceType previous,
     EmpathyEventManager *manager)
 {
-  EmpathyAccount *account;
+  McAccount *account;
+  gboolean just_connected;
+  EmpathyAccountManager *account_manager;
   gchar *header = NULL;
   gboolean preference = FALSE;
 
   account = empathy_contact_get_account (contact);
-  if (empathy_account_is_just_connected (account))
+  account_manager = empathy_account_manager_dup_singleton ();
+  just_connected = empathy_account_manager_is_account_just_connected (
+                  account_manager, account);
+
+  g_object_unref (account_manager);
+  if (just_connected)
     return;
 
   if (tp_connection_presence_type_cmp_availability (previous,
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index 1e13589..8e9a045 100644
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -27,6 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include <libmissioncontrol/mc-account.h>
 #include <telepathy-glib/util.h>
 
 #include "empathy-import-dialog.h"
@@ -35,7 +36,6 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-account-manager.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
 
@@ -91,16 +91,13 @@ empathy_import_account_data_free (EmpathyImportAccountData *data)
 static void
 import_dialog_add_account (EmpathyImportAccountData *data)
 {
-  EmpathyAccountManager *account_manager;
-  EmpathyAccount *account;
+  McAccount *account;
   GHashTableIter iter;
   gpointer key, value;
   gchar *display_name;
   GValue *username;
 
-  account_manager = empathy_account_manager_dup_singleton ();
-  account = empathy_account_manager_create (account_manager, data->profile);
-  g_object_unref (account_manager);
+  account = mc_account_create (data->profile);
   if (account == NULL)
     {
       DEBUG ("Failed to create account");
@@ -118,21 +115,21 @@ import_dialog_add_account (EmpathyImportAccountData *data)
           case G_TYPE_STRING:
             DEBUG ("Set param '%s' to '%s' (string)",
                 param, g_value_get_string (gvalue));
-            empathy_account_set_param_string (account,
+            mc_account_set_param_string (account,
                 param, g_value_get_string (gvalue));
             break;
 
           case G_TYPE_BOOLEAN:
             DEBUG ("Set param '%s' to %s (boolean)",
                 param, g_value_get_boolean (gvalue) ? "TRUE" : "FALSE");
-            empathy_account_set_param_boolean (account,
+            mc_account_set_param_boolean (account,
                 param, g_value_get_boolean (gvalue));
             break;
 
           case G_TYPE_INT:
             DEBUG ("Set param '%s' to '%i' (integer)",
                 param, g_value_get_int (gvalue));
-            empathy_account_set_param_int (account,
+            mc_account_set_param_int (account,
                 param, g_value_get_int (gvalue));
             break;
         }
@@ -143,7 +140,7 @@ import_dialog_add_account (EmpathyImportAccountData *data)
   display_name = g_strdup_printf ("%s (%s)",
       mc_profile_get_display_name (data->profile),
       g_value_get_string (username));
-  empathy_account_set_display_name (account, display_name);
+  mc_account_set_display_name (account, display_name);
 
   g_free (display_name);
   g_object_unref (account);
@@ -158,12 +155,11 @@ import_dialog_account_id_in_list (GList *accounts,
   for (l = accounts; l; l = l->next)
     {
       McAccount *account = l->data;
-      gchar *value = NULL;
+      gchar *value;
       gboolean result;
 
-      mc_account_get_param_string (account, "account", &value);
-
-      if (value == NULL)
+      if (mc_account_get_param_string (account, "account", &value)
+          == MC_ACCOUNT_SETTING_ABSENT)
         continue;
 
       result = tp_strdiff (value, account_id);
diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h
index 0e3fd14..a3ef3e1 100644
--- a/src/empathy-import-dialog.h
+++ b/src/empathy-import-dialog.h
@@ -20,7 +20,6 @@
  */
 
 #include <gtk/gtk.h>
-#include <libmissioncontrol/mc-profile.h>
 
 #ifndef __EMPATHY_IMPORT_DIALOG_H__
 #define __EMPATHY_IMPORT_DIALOG_H__
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 935c022..804936e 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -28,6 +28,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
+#include <libmissioncontrol/mc-account.h>
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/dbus.h>
 
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index c7816d7..0da037b 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -302,7 +302,7 @@ static void
 main_window_error_edit_clicked_cb (GtkButton         *button,
 				   EmpathyMainWindow *window)
 {
-	EmpathyAccount *account;
+	McAccount *account;
 	GtkWidget *error_widget;
 
 	account = g_object_get_data (G_OBJECT (button), "account");
@@ -317,7 +317,7 @@ static void
 main_window_error_clear_clicked_cb (GtkButton         *button,
 				    EmpathyMainWindow *window)
 {
-	EmpathyAccount *account;
+	McAccount *account;
 	GtkWidget *error_widget;
 
 	account = g_object_get_data (G_OBJECT (button), "account");
@@ -328,7 +328,7 @@ main_window_error_clear_clicked_cb (GtkButton         *button,
 
 static void
 main_window_error_display (EmpathyMainWindow *window,
-			   EmpathyAccount    *account,
+			   McAccount         *account,
 			   const gchar       *message)
 {
 	GtkWidget *child;
@@ -349,7 +349,7 @@ main_window_error_display (EmpathyMainWindow *window,
 
 		/* Just set the latest error and return */
 		str = g_markup_printf_escaped ("<b>%s</b>\n%s",
-					       empathy_account_get_display_name (account),
+					       mc_account_get_display_name (account),
 					       message);
 		gtk_label_set_markup (GTK_LABEL (label), str);
 		g_free (str);
@@ -430,7 +430,7 @@ main_window_error_display (EmpathyMainWindow *window,
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 
 	str = g_markup_printf_escaped ("<b>%s</b>\n%s",
-				       empathy_account_get_display_name (account),
+				       mc_account_get_display_name (account),
 				       message);
 	gtk_label_set_markup (GTK_LABEL (label), str);
 	g_free (str);
@@ -482,7 +482,7 @@ main_window_update_status (EmpathyMainWindow *window, EmpathyAccountManager *man
 
 static void
 main_window_connection_changed_cb (EmpathyAccountManager *manager,
-				   EmpathyAccount *account,
+				   McAccount *account,
 				   TpConnectionStatusReason reason,
 				   TpConnectionStatus current,
 				   TpConnectionStatus previous,
@@ -569,11 +569,11 @@ main_window_contact_presence_changed_cb (EmpathyContactMonitor *monitor,
 					 TpConnectionPresenceType previous,
 					 EmpathyMainWindow *window)
 {
-	EmpathyAccount *account;
+	McAccount *account;
 	gboolean should_play;
 
 	account = empathy_contact_get_account (contact);
-	should_play = !empathy_account_is_just_connected (account);
+	should_play = !empathy_account_manager_is_account_just_connected (window->account_manager, account);
 
 	if (!should_play) {
 		return;
@@ -729,13 +729,16 @@ main_window_view_show_map_cb (GtkCheckMenuItem  *item,
 static void
 main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
 {
-	EmpathyAccount *account;
+	EmpathyAccountManager *manager;
+	McAccount      *account;
 	TpConnection   *connection;
 	const gchar    *room;
 
+	manager = empathy_account_manager_dup_singleton ();
 	account = empathy_chatroom_get_account (chatroom);
-	connection = empathy_account_get_connection (account);
+	connection = empathy_account_manager_get_connection (manager, account);
 	room = empathy_chatroom_get_room (chatroom);
+	g_object_unref (manager);
 
 	if (connection != NULL) {
 		DEBUG ("Requesting channel for '%s'", room);
@@ -1006,7 +1009,7 @@ main_window_configure_event_cb (GtkWidget         *widget,
 
 static void
 main_window_account_created_or_deleted_cb (EmpathyAccountManager  *manager,
-					   EmpathyAccount         *account,
+					   McAccount              *account,
 					   EmpathyMainWindow      *window)
 {
 	gtk_action_set_sensitive (window->view_history,
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index e16da91..da90cbb 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -33,6 +33,7 @@
 #include <glib/gprintf.h>
 
 #include <libmissioncontrol/mission-control.h>
+#include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-profile.h>
 
 #include <libempathy/empathy-tp-roomlist.h>
@@ -357,14 +358,14 @@ static void
 new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *dialog)
 {
 	EmpathyAccountChooser *account_chooser;
-	EmpathyAccount        *account;
+	McAccount             *account;
 	McProfile             *profile;
 	const gchar           *protocol;
 	const gchar           *room;
 
 	account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);
 	account = empathy_account_chooser_dup_account (account_chooser);
-	profile = empathy_account_get_profile (account);
+	profile = mc_account_get_profile (account);
 	protocol = mc_profile_get_protocol_name (profile);
 
 	gtk_entry_set_text (GTK_ENTRY (dialog->entry_server), "");
@@ -398,13 +399,12 @@ new_chatroom_dialog_account_changed_cb (GtkComboBox             *combobox,
 					EmpathyNewChatroomDialog *dialog)
 {
 	EmpathyAccountChooser *account_chooser;
-	EmpathyAccount        *account;
+	McAccount             *account;
 	gboolean               listing = FALSE;
 	gboolean               expanded = FALSE;
 
 	if (dialog->room_list) {
 		g_object_unref (dialog->room_list);
-		dialog->room_list = NULL;
 	}
 
 	ephy_spinner_stop (EPHY_SPINNER (dialog->throbber));
@@ -412,9 +412,6 @@ new_chatroom_dialog_account_changed_cb (GtkComboBox             *combobox,
 
 	account_chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);
 	account = empathy_account_chooser_dup_account (account_chooser);
-	if (account == NULL)
-		goto out;
-
 	dialog->room_list = empathy_tp_roomlist_new (account);
 
 	if (dialog->room_list) {
@@ -447,10 +444,9 @@ new_chatroom_dialog_account_changed_cb (GtkComboBox             *combobox,
 		}
 	}
 
-	g_object_unref (account);
-
-out:
 	new_chatroom_dialog_update_widgets (dialog);
+
+	g_object_unref (account);
 }
 
 static void
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index c6545ea..0e2299c 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -28,7 +28,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <telepathy-glib/dbus.h>
 
 #include <libempathy/empathy-utils.h>
 
@@ -55,6 +54,9 @@ typedef struct {
 	GtkWidget *checkbutton_show_smileys;
 	GtkWidget *checkbutton_show_contacts_in_rooms;
 	GtkWidget *combobox_chat_theme;
+	GtkWidget *hbox_adium_theme;
+	GtkWidget *filechooserbutton_adium_theme;
+	GtkWidget *label_invalid_adium_theme;
 	GtkWidget *checkbutton_separate_chat_windows;
 	GtkWidget *checkbutton_autoconnect;
 	GtkWidget *radiobutton_contact_list_sort_by_name;
@@ -137,10 +139,8 @@ enum {
 };
 
 enum {
-	COL_COMBO_IS_ADIUM,
 	COL_COMBO_VISIBLE_NAME,
 	COL_COMBO_NAME,
-	COL_COMBO_PATH,
 	COL_COMBO_COUNT
 };
 
@@ -953,6 +953,73 @@ preferences_radio_button_toggled_cb (GtkWidget *button,
 	empathy_conf_set_string (empathy_conf_get (), key, value);
 }
 
+
+static void
+preferences_theme_adium_update_visibility (EmpathyPreferences *preferences,
+					   const gchar        *name)
+{
+	if (name && strcmp (name, "adium") == 0) {
+		gtk_widget_show (preferences->hbox_adium_theme);
+	} else {
+		gtk_widget_hide (preferences->hbox_adium_theme);
+		gtk_widget_hide (preferences->label_invalid_adium_theme);
+	}
+}
+
+static void
+preferences_theme_adium_update_validity (EmpathyPreferences *preferences,
+					 const gchar        *path)
+{
+#ifdef HAVE_WEBKIT
+	if (empathy_adium_path_is_valid (path)) {
+		gtk_widget_hide (preferences->label_invalid_adium_theme);
+	} else {
+		gtk_widget_show (preferences->label_invalid_adium_theme);
+	}
+#endif
+}
+
+static void
+preferences_theme_adium_path_notify_cb (EmpathyConf *conf,
+					const gchar *key,
+					gpointer     user_data)
+{
+	EmpathyPreferences *preferences = user_data;
+	GtkFileChooser     *chooser;
+	gchar              *value;
+	const gchar        *path;
+
+	if (!empathy_conf_get_string (conf, key, &value)) {
+		return;
+	}
+
+	if (EMP_STR_EMPTY (value)) {
+		path = g_get_home_dir ();
+	} else {
+		path = value;
+	}
+
+	chooser = GTK_FILE_CHOOSER (preferences->filechooserbutton_adium_theme);
+	gtk_file_chooser_set_current_folder (chooser, path);
+	preferences_theme_adium_update_validity (preferences, path);
+	g_free (value);
+}
+
+static void
+preferences_theme_adium_file_set_cb (GtkFileChooser     *chooser,
+				     EmpathyPreferences *preferences)
+{
+	gchar *path;
+
+	path = gtk_file_chooser_get_current_folder (chooser);
+	empathy_conf_set_string (empathy_conf_get (),
+				 EMPATHY_PREFS_CHAT_ADIUM_PATH,
+				 path);
+	preferences_theme_adium_update_validity (preferences, path);
+
+	g_free (path);
+}
+
 static void
 preferences_theme_notify_cb (EmpathyConf *conf,
 			     const gchar *key,
@@ -960,48 +1027,34 @@ preferences_theme_notify_cb (EmpathyConf *conf,
 {
 	EmpathyPreferences *preferences = user_data;
 	GtkComboBox        *combo;
-	gchar              *conf_name;
-	gchar              *conf_path;
+	gchar              *value;
 	GtkTreeModel       *model;
 	GtkTreeIter         iter;
 	gboolean            found = FALSE;
 
-	if (!empathy_conf_get_string (conf, EMPATHY_PREFS_CHAT_THEME, &conf_name)) {
+	if (!empathy_conf_get_string (conf, key, &value)) {
 		return;
 	}
 
-	if (!empathy_conf_get_string (conf, EMPATHY_PREFS_CHAT_ADIUM_PATH, &conf_path)) {
-		g_free (conf_name);
-		return;
-	}
+	preferences_theme_adium_update_visibility (preferences, value);
 
 	combo = GTK_COMBO_BOX (preferences->combobox_chat_theme);
 	model = gtk_combo_box_get_model (combo);
-	if (gtk_tree_model_get_iter_first (model, &iter)) {
-		gboolean is_adium;
+	if (value && gtk_tree_model_get_iter_first (model, &iter)) {
 		gchar *name;
-		gchar *path;
 
 		do {
 			gtk_tree_model_get (model, &iter,
-					    COL_COMBO_IS_ADIUM, &is_adium,
 					    COL_COMBO_NAME, &name,
-					    COL_COMBO_PATH, &path,
 					    -1);
 
-			if (strcmp (name, conf_name) == 0) {
-				if (strcmp (name, "adium") != 0 ||
-				    strcmp (path, conf_path) == 0) {
-					found = TRUE;
-					gtk_combo_box_set_active_iter (combo, &iter);
-					g_free (name);
-					g_free (path);
-					break;
-				}
+			if (strcmp (name, value) == 0) {
+				found = TRUE;
+				gtk_combo_box_set_active_iter (combo, &iter);
+				break;
 			}
 
 			g_free (name);
-			g_free (path);
 		} while (gtk_tree_model_iter_next (model, &iter));
 	}
 
@@ -1012,8 +1065,7 @@ preferences_theme_notify_cb (EmpathyConf *conf,
 		}
 	}
 
-	g_free (conf_name);
-	g_free (conf_path);
+	g_free (value);
 }
 
 static void
@@ -1022,28 +1074,21 @@ preferences_theme_changed_cb (GtkComboBox        *combo,
 {
 	GtkTreeModel *model;
 	GtkTreeIter   iter;
-	gboolean      is_adium;
 	gchar        *name;
-	gchar        *path;
 
 	if (gtk_combo_box_get_active_iter (combo, &iter)) {
 		model = gtk_combo_box_get_model (combo);
 
 		gtk_tree_model_get (model, &iter,
-				    COL_COMBO_IS_ADIUM, &is_adium,
 				    COL_COMBO_NAME, &name,
-				    COL_COMBO_PATH, &path,
 				    -1);
 
+		preferences_theme_adium_update_visibility (preferences, name);
+
 		empathy_conf_set_string (empathy_conf_get (),
 					 EMPATHY_PREFS_CHAT_THEME,
 					 name);
-		if (is_adium == TRUE)
-			empathy_conf_set_string (empathy_conf_get (),
-						 EMPATHY_PREFS_CHAT_ADIUM_PATH,
-						 path);
 		g_free (name);
-		g_free (path);
 	}
 }
 
@@ -1055,7 +1100,6 @@ preferences_themes_setup (EmpathyPreferences *preferences)
 	GtkCellRenderer *renderer;
 	GtkListStore  *store;
 	const gchar  **themes;
-	GList         *adium_themes;
 	gint           i;
 	guint          id;
 
@@ -1064,46 +1108,18 @@ preferences_themes_setup (EmpathyPreferences *preferences)
 
 	/* Create the model */
 	store = gtk_list_store_new (COL_COMBO_COUNT,
-				    G_TYPE_BOOLEAN, /* Is an Adium theme */
 				    G_TYPE_STRING,  /* Display name */
-				    G_TYPE_STRING,  /* Theme name */
-				    G_TYPE_STRING); /* Theme path */
-	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
-		COL_COMBO_VISIBLE_NAME, GTK_SORT_ASCENDING);
+				    G_TYPE_STRING); /* Theme name */
 
 	/* Fill the model */
 	themes = empathy_theme_manager_get_themes ();
 	for (i = 0; themes[i]; i += 2) {
 		gtk_list_store_insert_with_values (store, NULL, -1,
-			COL_COMBO_IS_ADIUM, FALSE,
 			COL_COMBO_VISIBLE_NAME, _(themes[i + 1]),
 			COL_COMBO_NAME, themes[i],
-			COL_COMBO_PATH, NULL,
 			-1);
 	}
 
-	adium_themes = empathy_theme_manager_get_adium_themes ();
-	while (adium_themes != NULL) {
-		GHashTable *info;
-		const gchar *name;
-		const gchar *path;
-
-		info = adium_themes->data;
-		name = tp_asv_get_string (info, "CFBundleName");
-		path = tp_asv_get_string (info, "path");
-
-		if (name != NULL && path != NULL) {
-			gtk_list_store_insert_with_values (store, NULL, -1,
-				COL_COMBO_IS_ADIUM, TRUE,
-				COL_COMBO_VISIBLE_NAME, name,
-				COL_COMBO_NAME, "adium",
-				COL_COMBO_PATH, path,
-				-1);
-		}
-		g_hash_table_unref (info);
-		adium_themes = g_list_delete_link (adium_themes, adium_themes);
-	}
-
 	/* Add cell renderer */
 	renderer = gtk_cell_renderer_text_new ();
 	gtk_cell_layout_pack_start (cell_layout, renderer, TRUE);
@@ -1129,9 +1145,17 @@ preferences_themes_setup (EmpathyPreferences *preferences)
 		preferences_add_id (preferences, id);
 	}
 
+	g_signal_connect (preferences->filechooserbutton_adium_theme,
+			  "file-set",
+			  G_CALLBACK (preferences_theme_adium_file_set_cb),
+			  preferences);
+	/* Select the adium path from the gconf key and track changes */
+	preferences_theme_adium_path_notify_cb (empathy_conf_get (),
+						EMPATHY_PREFS_CHAT_ADIUM_PATH,
+						preferences);
 	id = empathy_conf_notify_add (empathy_conf_get (),
 				      EMPATHY_PREFS_CHAT_ADIUM_PATH,
-				      preferences_theme_notify_cb,
+				      preferences_theme_adium_path_notify_cb,
 				      preferences);
 	if (id) {
 		preferences_add_id (preferences, id);
@@ -1187,6 +1211,9 @@ empathy_preferences_show (GtkWindow *parent)
 		"checkbutton_show_smileys", &preferences->checkbutton_show_smileys,
 		"checkbutton_show_contacts_in_rooms", &preferences->checkbutton_show_contacts_in_rooms,
 		"combobox_chat_theme", &preferences->combobox_chat_theme,
+		"hbox_adium_theme", &preferences->hbox_adium_theme,
+		"filechooserbutton_adium_theme", &preferences->filechooserbutton_adium_theme,
+		"label_invalid_adium_theme", &preferences->label_invalid_adium_theme,
 		"checkbutton_separate_chat_windows", &preferences->checkbutton_separate_chat_windows,
 		"checkbutton_autoconnect", &preferences->checkbutton_autoconnect,
 		"radiobutton_contact_list_sort_by_name", &preferences->radiobutton_contact_list_sort_by_name,
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index e4ec183..38cfd34 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -851,6 +851,50 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox_adium_theme">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="label587">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Adium theme to use:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkFileChooserButton" id="filechooserbutton_adium_theme">
+                                    <property name="visible">True</property>
+                                    <property name="preview_widget_active">False</property>
+                                    <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label_invalid_adium_theme">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Not a valid adium theme</property>
+                                <attributes>
+                                  <attribute name="foreground" value="red"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
diff --git a/src/empathy-sidebar.c b/src/empathy-sidebar.c
index 85a3826..7b70229 100644
--- a/src/empathy-sidebar.c
+++ b/src/empathy-sidebar.c
@@ -243,7 +243,7 @@ empathy_sidebar_menu_position_under (GtkMenu *menu,
 
   widget = GTK_WIDGET (user_data);
 
-  gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
+  gdk_window_get_origin (widget->window, x, y);
 
   *x += widget->allocation.x;
   *y += widget->allocation.y + widget->allocation.height;
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index f6c63c5..a4b01b7 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -306,20 +306,14 @@ status_icon_set_visibility (EmpathyStatusIcon *icon,
 		empathy_window_iconify (priv->window, priv->icon);
 	} else {
 		GList *accounts;
-		GList *l;
-		gboolean one_enabled = FALSE;
 
 		empathy_window_present (GTK_WINDOW (priv->window), TRUE);
 
 		/* Show the accounts dialog if there is no enabled accounts */
-		accounts = empathy_account_manager_dup_accounts (priv->account_manager);
-		for (l = accounts ; l != NULL ; l = g_list_next (l)) {
-			one_enabled = empathy_account_is_enabled (EMPATHY_ACCOUNT (l->data))
-				|| one_enabled;
-			g_object_unref (l->data);
-		}
-		g_list_free (accounts);
-		if (!one_enabled) {
+		accounts = mc_accounts_list_by_enabled (TRUE);
+		if (accounts) {
+			mc_accounts_list_free (accounts);
+		} else {
 			DEBUG ("No enabled account, Showing account dialog");
 			empathy_accounts_dialog_show (GTK_WINDOW (priv->window), NULL);
 		}
@@ -490,7 +484,7 @@ status_icon_create_menu (EmpathyStatusIcon *icon)
 
 static void
 status_icon_connection_changed_cb (EmpathyAccountManager *manager,
-				   EmpathyAccount *account,
+				   McAccount *account,
 				   TpConnectionStatusReason reason,
 				   TpConnectionStatus current,
 				   TpConnectionStatus previous,
diff --git a/src/empathy.c b/src/empathy.c
index aef3610..85124d1 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -40,6 +40,7 @@
 
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/util.h>
+#include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mission-control.h>
 
 #include <libempathy/empathy-idle.h>
@@ -106,7 +107,7 @@ dispatch_cb (EmpathyDispatcher *dispatcher,
 		if (id) {
 			EmpathyAccountManager *manager;
 			TpConnection *connection;
-			EmpathyAccount *account;
+			McAccount *account;
 
 			manager = empathy_account_manager_dup_singleton ();
 			connection = empathy_tp_chat_get_connection (tp_chat);
@@ -226,8 +227,7 @@ create_salut_account (void)
 	McProfile  *profile;
 	McProtocol *protocol;
 	gboolean    salut_created = FALSE;
-	EmpathyAccount  *account;
-	EmpathyAccountManager *account_manager;
+	McAccount  *account;
 	GList      *accounts;
 	EBook      *book;
 	EContact   *contact;
@@ -284,10 +284,8 @@ create_salut_account (void)
 		return;
 	}
 
-	account_manager = empathy_account_manager_dup_singleton ();
-	account = empathy_account_manager_create (account_manager, profile);
-	empathy_account_set_display_name (account, _("People nearby"));
-	g_object_unref (account_manager);
+	account = mc_account_create (profile);
+	mc_account_set_display_name (account, _("People nearby"));
 
 	nickname = e_contact_get (contact, E_CONTACT_NICKNAME);
 	first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME);
@@ -304,11 +302,11 @@ create_salut_account (void)
 		"last-name=%s\nemail=%s\njid=%s\n",
 		nickname, first_name, last_name, email, jid);
 
-	empathy_account_set_param_string (account, "nickname", nickname ? nickname : "");
-	empathy_account_set_param_string (account, "first-name", first_name ? first_name : "");
-	empathy_account_set_param_string (account, "last-name", last_name ? last_name : "");
-	empathy_account_set_param_string (account, "email", email ? email : "");
-	empathy_account_set_param_string (account, "jid", jid ? jid : "");
+	mc_account_set_param_string (account, "nickname", nickname ? nickname : "");
+	mc_account_set_param_string (account, "first-name", first_name ? first_name : "");
+	mc_account_set_param_string (account, "last-name", last_name ? last_name : "");
+	mc_account_set_param_string (account, "email", email ? email : "");
+	mc_account_set_param_string (account, "jid", jid ? jid : "");
 
 	g_free (nickname);
 	g_free (first_name);
@@ -357,7 +355,7 @@ on_bacon_message_received (const char *message,
 				gtk_widget_realize (GTK_WIDGET (window));
 			}
 
-			startup_timestamp = gdk_x11_get_server_time (gtk_widget_get_window (window));
+			startup_timestamp = gdk_x11_get_server_time (window->window);
 		}
 
 		gtk_window_present_with_time (GTK_WINDOW (window), startup_timestamp);
diff --git a/src/ephy-spinner.c b/src/ephy-spinner.c
index e7285bc..30ffa57 100644
--- a/src/ephy-spinner.c
+++ b/src/ephy-spinner.c
@@ -666,8 +666,8 @@ ephy_spinner_expose (GtkWidget *widget,
 		return FALSE;
 	}
 
-	gc = gdk_gc_new (gtk_widget_get_window (widget));
-	gdk_draw_pixbuf (gtk_widget_get_window (widget), gc, pixbuf,
+	gc = gdk_gc_new (widget->window);
+	gdk_draw_pixbuf (widget->window, gc, pixbuf,
 			 dest.x - x_offset - widget->allocation.x,
 			 dest.y - y_offset - widget->allocation.y,
 			 dest.x, dest.y,
diff --git a/tests/check-empathy-chatroom-manager.c b/tests/check-empathy-chatroom-manager.c
index 1c0f924..ef5c776 100644
--- a/tests/check-empathy-chatroom-manager.c
+++ b/tests/check-empathy-chatroom-manager.c
@@ -13,7 +13,6 @@
 #include "check-empathy-helpers.h"
 
 #include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-account-manager.h>
 
 #define CHATROOM_SAMPLE "chatrooms-sample.xml"
 #define CHATROOM_FILE "chatrooms.xml"
@@ -44,7 +43,7 @@ struct chatroom_t
 
 static void
 check_chatrooms_list (EmpathyChatroomManager *mgr,
-                      EmpathyAccount *account,
+                      McAccount *account,
                       struct chatroom_t *_chatrooms,
                       guint nb_chatrooms)
 {
@@ -84,13 +83,13 @@ check_chatrooms_list (EmpathyChatroomManager *mgr,
 }
 
 static gboolean
-change_account_name_in_file (EmpathyAccount *account,
+change_account_name_in_file (McAccount *account,
                              const gchar *file)
 {
   gchar *cmd;
 
   cmd = g_strdup_printf ("sed -i 's/CHANGE_ME/%s/' %s",
-      empathy_account_get_unique_name (account), file);
+      mc_account_get_unique_name (account), file);
 
   if (system (cmd) == -1)
     {
@@ -107,13 +106,11 @@ START_TEST (test_empathy_chatroom_manager_dup_singleton)
 {
   EmpathyChatroomManager *mgr;
   gchar *file;
-  EmpathyAccount *account;
-  EmpathyAccountManager *account_manager;
+  McAccount *account;
   struct chatroom_t chatrooms[] = {
         { "name1", "room1", TRUE, TRUE },
         { "name2", "room2", FALSE, TRUE }};
 
-  account_manager = empathy_account_manager_dup_singleton ();
   account = get_test_account ();
 
   copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE);
@@ -129,7 +126,6 @@ START_TEST (test_empathy_chatroom_manager_dup_singleton)
 
   g_free (file);
   g_object_unref (mgr);
-  g_object_unref (account_manager);
   g_object_unref (account);
 }
 END_TEST
@@ -138,8 +134,7 @@ START_TEST (test_empathy_chatroom_manager_add)
 {
   EmpathyChatroomManager *mgr;
   gchar *file;
-  EmpathyAccount *account;
-  EmpathyAccountManager *account_manager;
+  McAccount *account;
   struct chatroom_t chatrooms[] = {
         { "name1", "room1", TRUE, TRUE },
         { "name2", "room2", FALSE, TRUE },
@@ -147,8 +142,6 @@ START_TEST (test_empathy_chatroom_manager_add)
         { "name4", "room4", FALSE, FALSE }};
   EmpathyChatroom *chatroom;
 
-  account_manager = empathy_account_manager_dup_singleton ();
-
   account = get_test_account ();
 
   copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE);
@@ -156,7 +149,8 @@ START_TEST (test_empathy_chatroom_manager_add)
   file = get_user_xml_file (CHATROOM_FILE);
 
   /* change the chatrooms XML file to use the account we just created */
-  fail_unless (change_account_name_in_file (account, file));
+  if (!change_account_name_in_file (account, file))
+    return;
 
   mgr = empathy_chatroom_manager_dup_singleton (file);
 
@@ -192,7 +186,6 @@ START_TEST (test_empathy_chatroom_manager_add)
 
   g_object_unref (mgr);
   g_free (file);
-  g_object_unref (account_manager);
   g_object_unref (account);
 }
 END_TEST
@@ -201,13 +194,11 @@ START_TEST (test_empathy_chatroom_manager_remove)
 {
   EmpathyChatroomManager *mgr;
   gchar *file;
-  EmpathyAccount *account;
+  McAccount *account;
   struct chatroom_t chatrooms[] = {
         { "name2", "room2", FALSE, TRUE }};
   EmpathyChatroom *chatroom;
-  EmpathyAccountManager *account_mgr;
 
-  account_mgr = empathy_account_manager_dup_singleton ();
   account = get_test_account ();
 
   copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE);
@@ -215,7 +206,8 @@ START_TEST (test_empathy_chatroom_manager_remove)
   file = get_user_xml_file (CHATROOM_FILE);
 
   /* change the chatrooms XML file to use the account we just created */
-  fail_unless (change_account_name_in_file (account, file));
+  if (!change_account_name_in_file (account, file))
+    return;
 
   mgr = empathy_chatroom_manager_dup_singleton (file);
 
@@ -249,7 +241,6 @@ START_TEST (test_empathy_chatroom_manager_remove)
   g_object_unref (mgr);
   g_free (file);
   g_object_unref (account);
-  g_object_unref (account_mgr);
 }
 END_TEST
 
@@ -257,14 +248,12 @@ START_TEST (test_empathy_chatroom_manager_change_favorite)
 {
   EmpathyChatroomManager *mgr;
   gchar *file;
-  EmpathyAccount *account;
-  EmpathyAccountManager *account_manager;
+  McAccount *account;
   struct chatroom_t chatrooms[] = {
         { "name1", "room1", TRUE, TRUE },
         { "name2", "room2", FALSE, FALSE }};
   EmpathyChatroom *chatroom;
 
-  account_manager = empathy_account_manager_dup_singleton ();
   account = get_test_account ();
 
   copy_xml_file (CHATROOM_SAMPLE, CHATROOM_FILE);
@@ -272,7 +261,8 @@ START_TEST (test_empathy_chatroom_manager_change_favorite)
   file = get_user_xml_file (CHATROOM_FILE);
 
   /* change the chatrooms XML file to use the account we just created */
-  fail_unless (change_account_name_in_file (account, file));
+  if (!change_account_name_in_file (account, file))
+    return;
 
   mgr = empathy_chatroom_manager_dup_singleton (file);
 
@@ -312,7 +302,6 @@ START_TEST (test_empathy_chatroom_manager_change_favorite)
   g_object_unref (mgr);
   g_object_unref (chatroom);
   g_free (file);
-  g_object_unref (account_manager);
   g_object_unref (account);
 }
 END_TEST
@@ -321,14 +310,12 @@ START_TEST (test_empathy_chatroom_manager_change_chatroom)
 {
   EmpathyChatroomManager *mgr;
   gchar *file;
-  EmpathyAccount *account;
-  EmpathyAccountManager *account_manager;
+  McAccount *account;
   struct chatroom_t chatrooms[] = {
         { "name1", "room1", TRUE, TRUE },
         { "name2", "room2", FALSE, TRUE }};
   EmpathyChatroom *chatroom;
 
-  account_manager = empathy_account_manager_dup_singleton ();
   account = get_test_account ();
 
   copy_xml_file (CHATROOM_SAMPLE, "foo.xml");
@@ -336,7 +323,8 @@ START_TEST (test_empathy_chatroom_manager_change_chatroom)
   file = get_user_xml_file ("foo.xml");
 
   /* change the chatrooms XML file to use the account we just created */
-  fail_unless (change_account_name_in_file (account, file));
+  if (!change_account_name_in_file (account, file))
+    return;
 
   mgr = empathy_chatroom_manager_dup_singleton (file);
 
@@ -381,7 +369,6 @@ START_TEST (test_empathy_chatroom_manager_change_chatroom)
   g_object_unref (mgr);
   g_free (file);
   g_object_unref (account);
-  g_object_unref (account_manager);
 }
 END_TEST
 
diff --git a/tests/check-empathy-chatroom.c b/tests/check-empathy-chatroom.c
index f2110a8..a4adf6c 100644
--- a/tests/check-empathy-chatroom.c
+++ b/tests/check-empathy-chatroom.c
@@ -12,7 +12,7 @@
 static EmpathyChatroom *
 create_chatroom (void)
 {
-  EmpathyAccount *account;
+  McAccount *account;
   EmpathyChatroom *chatroom;
 
   account = get_test_account ();
diff --git a/tests/check-empathy-helpers.c b/tests/check-empathy-helpers.c
index c77cf9b..65273f8 100644
--- a/tests/check-empathy-helpers.c
+++ b/tests/check-empathy-helpers.c
@@ -24,8 +24,6 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
-#include <libempathy/empathy-account-manager.h>
-
 #include "check-helpers.h"
 #include "check-empathy-helpers.h"
 
@@ -65,31 +63,25 @@ copy_xml_file (const gchar *orig,
   g_free (buffer);
 }
 
-EmpathyAccount *
+McAccount *
 get_test_account (void)
 {
   McProfile *profile;
-  EmpathyAccountManager *account_manager;
-  EmpathyAccount *account;
+  McAccount *account;
   GList *accounts;
 
-  account_manager = empathy_account_manager_dup_singleton ();
   profile = mc_profile_lookup ("test");
   accounts = mc_accounts_list_by_profile (profile);
   if (g_list_length (accounts) == 0)
     {
       /* need to create a test account */
-      account = empathy_account_manager_create (account_manager, profile);
+      account = mc_account_create (profile);
     }
   else
     {
       /* reuse an existing test account */
-      McAccount *mc_account;
-      mc_account = accounts->data;
-      account = empathy_account_manager_lookup (account_manager,
-        mc_account_get_unique_name (mc_account));
+      account = accounts->data;
     }
-  g_object_unref (account_manager);
 
   g_object_unref (profile);
 
@@ -99,17 +91,16 @@ get_test_account (void)
 /* Not used for now as there is no API to remove completely gconf keys.
  * So we reuse existing accounts instead of creating new ones */
 void
-destroy_test_account (EmpathyAccount *account)
+destroy_test_account (McAccount *account)
 {
   GConfClient *client;
   gchar *path;
   GError *error = NULL;
   GSList *entries = NULL, *l;
-  EmpathyAccountManager *manager;
 
   client = gconf_client_get_default ();
   path = g_strdup_printf ("/apps/telepathy/mc/accounts/%s",
-      empathy_account_get_unique_name (account));
+      mc_account_get_unique_name (account));
 
   entries = gconf_client_all_entries (client, path, &error);
   if (error != NULL)
@@ -160,8 +151,6 @@ destroy_test_account (EmpathyAccount *account)
   g_object_unref (client);
   g_free (path);
 
-  manager = empathy_account_manager_dup_singleton ();
-  empathy_account_manager_remove (manager, account);
+  mc_account_delete (account);
   g_object_unref (account);
-  g_object_unref (manager);
 }
diff --git a/tests/check-empathy-helpers.h b/tests/check-empathy-helpers.h
index 5544b80..4d52c04 100644
--- a/tests/check-empathy-helpers.h
+++ b/tests/check-empathy-helpers.h
@@ -20,12 +20,12 @@
 #define __CHECK_EMPATHY_HELPERS_H__
 
 #include <glib.h>
-#include <libempathy/empathy-account.h>
+#include <libmissioncontrol/mc-account.h>
 
 gchar * get_xml_file (const gchar *filename);
 gchar * get_user_xml_file (const gchar *filename);
 void copy_xml_file (const gchar *orig, const gchar *dest);
-EmpathyAccount * get_test_account (void);
-void destroy_test_account (EmpathyAccount *account);
+McAccount * get_test_account (void);
+void destroy_test_account (McAccount *account);
 
 #endif /* #ifndef __CHECK_EMPATHY_HELPERS_H__ */
diff --git a/tests/check-helpers.h b/tests/check-helpers.h
index b71b3b6..3e07838 100644
--- a/tests/check-helpers.h
+++ b/tests/check-helpers.h
@@ -21,6 +21,7 @@
 
 #include <glib.h>
 #include <check.h>
+#include <libmissioncontrol/mc-account.h>
 
 void
 check_helpers_init (void);
