diff --git a/configure.ac b/configure.ac
index 57ad3ed..31a7c05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,6 +135,30 @@ AS_COMPILER_FLAG(-Wmissing-declarations, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-d
 AC_SUBST(ERROR_CFLAGS)
 
 # -----------------------------------------------------------
+# Enable TPL
+# -----------------------------------------------------------
+
+# It needs to be defined before PKG_CHECK_MODULES calls
+AC_ARG_ENABLE(tpl,
+  AC_HELP_STRING([--enable-tpl],[enable telepathy-logger code and disable the
+    empathy logger]), enable_tpl=$enableval, enable_tpl=no )
+AM_CONDITIONAL(ENABLE_TPL, test "x$enable_tpl" = "xyes")
+
+if test x${enable_tpl} = xyes; then
+  AC_DEFINE(ENABLE_TPL, [], [Enable TPL code])
+fi
+
+if test "x$enable_tpl" = "xyes"; then
+  PKG_CHECK_MODULES(TPL,
+  [
+     telepathy-logger
+  ])
+  AC_SUBST(TPL_CFLAGS)
+  AC_SUBST(TPL_LIBS)
+fi
+
+
+# -----------------------------------------------------------
 # Pkg-Config dependency checks
 # -----------------------------------------------------------
 
@@ -528,6 +552,9 @@ Configure summary:
 	Meego widgets ..............:  ${have_meego}
 	Control center embedding....:  ${have_control_center_embedding}
 
+    Logging:
+        Telepathy Logger............:  ${enable_tpl}
+
     Connectivity:
 	NetworkManager integration..:  ${have_nm}
 	ConnMan integration.........:  ${have_connman}
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 674579a..c9736ac 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS =                                           \
 	-DDATADIR=\""$(datadir)"\"              	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(LIBEMPATHYGTK_CFLAGS)				\
+	$(TPL_CFLAGS)					\
 	$(LIBNOTIFY_CFLAGS)				\
 	$(ENCHANT_CFLAGS)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
@@ -129,6 +130,7 @@ nodist_libempathy_gtk_la_SOURCES =\
 libempathy_gtk_la_LIBADD =			\
 	$(LIBEMPATHYGTK_LIBS)			\
 	$(LIBNOTIFY_LIBS)			\
+	$(TPL_LIBS)				\
 	$(ENCHANT_LIBS)				\
 	$(LIBCHAMPLAIN_LIBS)			\
 	$(GEOCLUE_LIBS)				\
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 1361840..15786c9 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -36,8 +36,12 @@
 
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/util.h>
+#ifdef ENABLE_TPL
+#include <telepathy-logger/log-manager.h>
+#else
 
 #include <libempathy/empathy-log-manager.h>
+#endif /* ENABLE_TPL */
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-dispatcher.h>
@@ -72,7 +76,11 @@ typedef struct {
 	EmpathyContact    *remote_contact;
 	gboolean           show_contacts;
 
+#ifdef ENABLE_TPL
+	TplLogManager     *log_manager;
+#else
 	EmpathyLogManager *log_manager;
+#endif /* ENABLE_TPL */
 	TpAccountManager  *account_manager;
 	GList             *input_history;
 	GList             *input_history_current;
@@ -1708,15 +1716,35 @@ chat_input_populate_popup_cb (GtkTextView *view,
 	}
 }
 
+
+#ifdef ENABLE_TPL
+static gboolean
+chat_log_filter (TplLogEntry *log,
+		 gpointer user_data)
+#else
 static gboolean
 chat_log_filter (EmpathyMessage *message,
 		 gpointer user_data)
+#endif /* ENABLE_TPL */
 {
-	EmpathyChat *chat = (EmpathyChat *) user_data;
+	EmpathyChat *chat = user_data;
+#ifdef ENABLE_TPL
+	EmpathyMessage *message;
+#endif /* ENABLE_TPL */
 	EmpathyChatPriv *priv = GET_PRIV (chat);
 	const GList *pending;
 
+#ifdef ENABLE_TPL
+	g_return_val_if_fail (TPL_IS_LOG_ENTRY (log), FALSE);
+#else
+	g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
+#endif /* ENABLE_TPL */
+	g_return_val_if_fail (EMPATHY_IS_CHAT (chat), FALSE);
+
 	pending = empathy_tp_chat_get_pending_messages (priv->tp_chat);
+#ifdef ENABLE_TPL
+	message = empathy_message_from_tpl_log_entry (log);
+#endif /* ENABLE_TPL */
 
 	for (; pending; pending = g_list_next (pending)) {
 		if (empathy_message_equal (message, pending->data)) {
@@ -1727,12 +1755,81 @@ chat_log_filter (EmpathyMessage *message,
 	return TRUE;
 }
 
+
+static void
+show_pending_messages (EmpathyChat *chat) {
+	EmpathyChatPriv *priv = GET_PRIV (chat);
+	const GList *messages, *l;
+
+	g_return_if_fail (EMPATHY_IS_CHAT (chat));
+
+	if (chat->view == NULL || priv->tp_chat == NULL)
+		return;
+
+	if (!priv->can_show_pending)
+		return;
+
+	messages = empathy_tp_chat_get_pending_messages (priv->tp_chat);
+
+	for (l = messages; l != NULL ; l = g_list_next (l)) {
+		EmpathyMessage *message = EMPATHY_MESSAGE (l->data);
+		chat_message_received (chat, message);
+	}
+}
+
+
+#ifdef ENABLE_TPL
+static void
+got_filtered_messages_cb (GObject *manager,
+		GAsyncResult *result,
+		gpointer user_data)
+{
+	GList *l;
+	GList *messages;
+	EmpathyChat *chat = EMPATHY_CHAT (user_data);
+	EmpathyChatPriv *priv = GET_PRIV (chat);
+	GError *error = NULL;
+
+	messages = tpl_log_manager_async_operation_finish (result, &error);
+
+	if (error != NULL) {
+		DEBUG ("%s. Aborting.", error->message);
+		empathy_chat_view_append_event (chat->view,
+			_("Failed to retrieve recent logs"));
+		g_error_free (error);
+		return;
+	}
+
+	for (l = messages; l; l = g_list_next (l)) {
+		EmpathyMessage *message;
+		g_assert (TPL_IS_LOG_ENTRY (l->data));
+
+		message = empathy_message_from_tpl_log_entry (l->data);
+		g_object_unref (l->data);
+
+		empathy_chat_view_append_message (chat->view, message);
+		g_object_unref (message);
+
+	}
+	g_list_free (messages);
+
+	/* Turn back on scrolling */
+	empathy_chat_view_scroll (chat->view, TRUE);
+
+	priv->can_show_pending = TRUE;
+	show_pending_messages (chat);
+}
+#endif /* ENABLE_TPL */
+
+
 static void
 chat_add_logs (EmpathyChat *chat)
 {
 	EmpathyChatPriv *priv = GET_PRIV (chat);
 	gboolean         is_chatroom;
+#ifndef ENABLE_TPL
 	GList           *messages, *l;
+#endif /* ENABLE_TPL */
 
 	if (!priv->id) {
 		return;
@@ -1744,6 +1841,7 @@ chat_add_logs (EmpathyChat *chat)
 	/* Add messages from last conversation */
 	is_chatroom = priv->handle_type == TP_HANDLE_TYPE_ROOM;
 
+#ifndef ENABLE_TPL
 	messages = empathy_log_manager_get_filtered_messages (priv->log_manager,
 							      priv->account,
 							      priv->id,
@@ -1761,6 +1859,18 @@ chat_add_logs (EmpathyChat *chat)
 
 	/* Turn back on scrolling */
 	empathy_chat_view_scroll (chat->view, TRUE);
+#else
+	tpl_log_manager_get_filtered_messages_async (priv->log_manager,
+							      priv->account,
+							      priv->id,
+							      is_chatroom,
+							      5,
+							      chat_log_filter,
+							      chat,
+							      got_filtered_messages_cb,
+							      (gpointer) chat);
+
+#endif /* ENABLE_TPL */
 }
 
 static gint
@@ -2046,26 +2156,6 @@ chat_hpaned_pos_changed_cb (GtkWidget* hpaned, gpointer user_data)
 	return TRUE;
 }
 
-
-static void
-show_pending_messages (EmpathyChat *chat) {
-	EmpathyChatPriv *priv = GET_PRIV (chat);
-	const GList *messages, *l;
-
-	if (chat->view == NULL || priv->tp_chat == NULL)
-		return;
-
-	if (!priv->can_show_pending)
-		return;
-
-	messages = empathy_tp_chat_get_pending_messages (priv->tp_chat);
-
-	for (l = messages; l != NULL ; l = g_list_next (l)) {
-		EmpathyMessage *message = EMPATHY_MESSAGE (l->data);
-		chat_message_received (chat, message);
-	}
-}
-
 static void
 chat_create_ui (EmpathyChat *chat)
 {
@@ -2437,7 +2527,11 @@ empathy_chat_init (EmpathyChat *chat)
 		EMPATHY_TYPE_CHAT, EmpathyChatPriv);
 
 	chat->priv = priv;
+#ifndef ENABLE_TPL
 	priv->log_manager = empathy_log_manager_dup_singleton ();
+#else
+	priv->log_manager = tpl_log_manager_dup_singleton ();
+#endif /* ENABLE_TPL */
 	priv->contacts_width = -1;
 	priv->input_history = NULL;
 	priv->input_history_current = NULL;
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 3d194fc..54bb4b2 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -25,9 +25,13 @@
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
+#ifdef ENABLE_TPL
+#include <telepathy-logger/log-manager.h>
+#else
 
-#include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-log-manager.h>
+#endif /* ENABLE_TPL */
+#include <libempathy/empathy-call-factory.h>
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-utils.h>
@@ -307,18 +311,30 @@ contact_log_menu_item_activate_cb (EmpathyContact *contact)
 GtkWidget *
 empathy_contact_log_menu_item_new (EmpathyContact *contact)
 {
+#ifndef ENABLE_TPL
 	EmpathyLogManager *manager;
+#else
+	TplLogManager     *manager;
+#endif /* ENABLE_TPL */
 	gboolean           have_log;
 	GtkWidget         *item;
 	GtkWidget         *image;
 
 	g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
+#ifndef ENABLE_TPL
 	manager = empathy_log_manager_dup_singleton ();
 	have_log = empathy_log_manager_exists (manager,
 					       empathy_contact_get_account (contact),
 					       empathy_contact_get_id (contact),
 					       FALSE);
+#else
+	manager = tpl_log_manager_dup_singleton ();
+	have_log = tpl_log_manager_exists (manager,
+					       empathy_contact_get_account (contact),
+					       empathy_contact_get_id (contact),
+					       FALSE);
+#endif /* ENABLE_TPL */
 	g_object_unref (manager);
 
 	item = gtk_image_menu_item_new_with_mnemonic (_("_Previous Conversations"));
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index f12abf3..7044d2e 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -31,8 +31,13 @@
 #include <gtk/gtk.h>
 
 #include <telepathy-glib/account-manager.h>
+#ifdef ENABLE_TPL
+#include <telepathy-logger/log-manager.h>
+#endif /* ENABLE_TPL */
 
+#ifndef ENABLE_TPL
 #include <libempathy/empathy-log-manager.h>
+#endif /* ENABLE_TPL */
 #include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-message.h>
@@ -71,7 +76,11 @@ typedef struct {
 
 	gchar             *last_find;
 
+#ifndef ENABLE_TPL
 	EmpathyLogManager *log_manager;
+#else
+	TplLogManager     *log_manager;
+#endif /* ENABLE_TPL */
 
 	/* Those are only used while waiting for the account chooser to be ready */
 	TpAccount         *selected_account;
@@ -204,7 +213,11 @@ empathy_log_window_show (TpAccount  *account,
 	}
 
 	window = g_new0 (EmpathyLogWindow, 1);
+#ifndef ENABLE_TPL
 	window->log_manager = empathy_log_manager_dup_singleton ();
+#else
+	window->log_manager = tpl_log_manager_dup_singleton ();
+#endif /* ENABLE_TPL */
 
 	filename = empathy_file_lookup ("empathy-log-window.ui",
 					"libempathy-gtk");
@@ -339,6 +352,64 @@ log_window_entry_find_changed_cb (GtkWidget       *entry,
 	gtk_widget_set_sensitive (window->button_find, is_sensitive);
 }
 
+#ifdef ENABLE_TPL
+static void
+got_messages_for_date_cb (GObject *manager,
+                       GAsyncResult *result,
+                       gpointer user_data)
+{
+	EmpathyLogWindow *window = user_data;
+	GList         *messages;
+	GList         *l;
+	gboolean       can_do_previous;
+	gboolean       can_do_next;
+	GError        *error = NULL;
+
+	messages = tpl_log_manager_async_operation_finish (result, &error);
+
+	if (error != NULL) {
+			DEBUG ("Unable to retrieve messages for the selected date: %s. Aborting",
+					error->message);
+			empathy_chat_view_append_event (window->chatview_find,
+					"Unable to retrieve messages for the selected date");
+			g_error_free (error);
+			return;
+	}
+
+	for (l = messages; l; l = l->next) {
+			EmpathyMessage *message;
+
+			g_assert (TPL_IS_LOG_ENTRY (l->data));
+
+			message = empathy_message_from_tpl_log_entry (l->data);
+			g_object_unref (l->data);
+			empathy_chat_view_append_message (window->chatview_find, message);
+			g_object_unref (message);
+	}
+	g_list_free (messages);
+
+	/* Scroll to the most recent messages */
+	empathy_chat_view_scroll (window->chatview_find, TRUE);
+
+	/* Highlight and find messages */
+	empathy_chat_view_highlight (window->chatview_find,
+			window->last_find,
+			FALSE);
+	empathy_chat_view_find_next (window->chatview_find,
+			window->last_find,
+			TRUE,
+			FALSE);
+	empathy_chat_view_find_abilities (window->chatview_find,
+			window->last_find,
+			FALSE,
+			&can_do_previous,
+			&can_do_next);
+	gtk_widget_set_sensitive (window->button_previous, can_do_previous);
+	gtk_widget_set_sensitive (window->button_next, can_do_next);
+	gtk_widget_set_sensitive (window->button_find, FALSE);
+}
+#endif /* ENABLE_TPL */
+
 static void
 log_window_find_changed_cb (GtkTreeSelection *selection,
 			    EmpathyLogWindow  *window)
@@ -350,11 +421,13 @@ log_window_find_changed_cb (GtkTreeSelection *selection,
 	gchar         *chat_id;
 	gboolean       is_chatroom;
 	gchar         *date;
+#ifndef ENABLE_TPL
 	EmpathyMessage *message;
 	GList         *messages;
 	GList         *l;
 	gboolean       can_do_previous;
 	gboolean       can_do_next;
+#endif /* ENABLE_TPL */
 
 	/* Get selected information */
 	view = GTK_TREE_VIEW (window->treeview_find);
@@ -386,15 +459,26 @@ log_window_find_changed_cb (GtkTreeSelection *selection,
 	empathy_chat_view_scroll (window->chatview_find, FALSE);
 
 	/* Get messages */
+#ifndef ENABLE_TPL
 	messages = empathy_log_manager_get_messages_for_date (window->log_manager,
 							      account,
 							      chat_id,
 							      is_chatroom,
 							      date);
+#else
+	tpl_log_manager_get_messages_for_date_async (window->log_manager,
+							      account,
+							      chat_id,
+							      is_chatroom,
+							      date,
+							      got_messages_for_date_cb,
+							      window);
+#endif /* ENABLE_TPL */
 	g_object_unref (account);
 	g_free (date);
 	g_free (chat_id);
 
+#ifndef ENABLE_TPL
 	for (l = messages; l; l = l->next) {
 		message = l->data;
 		empathy_chat_view_append_message (window->chatview_find, message);
@@ -420,19 +504,89 @@ log_window_find_changed_cb (GtkTreeSelection *selection,
 	gtk_widget_set_sensitive (window->button_previous, can_do_previous);
 	gtk_widget_set_sensitive (window->button_next, can_do_next);
 	gtk_widget_set_sensitive (window->button_find, FALSE);
+#endif /* ENABLE_TPL */
+}
+
+
+#ifdef ENABLE_TPL
+static void
+log_manager_searched_new_cb (GObject *manager,
+                             GAsyncResult *result,
+                             gpointer user_data)
+{
+	GList               *hits;
+	GList               *l;
+	GtkTreeIter          iter;
+	GtkListStore        *store = user_data;
+	GError              *error = NULL;
+
+	hits = tpl_log_manager_async_operation_finish (result, &error);
+
+	if (error != NULL) {
+			DEBUG ("%s. Aborting", error->message);
+			g_error_free (error);
+			return;
+	}
+
+	for (l = hits; l; l = l->next) {
+			TplLogSearchHit *hit;
+			const gchar         *account_name;
+			const gchar         *account_icon;
+			gchar               *date_readable;
+
+			hit = l->data;
+
+			/* Protect against invalid data (corrupt or old log files. */
+			if (!hit->account || !hit->chat_id) {
+					continue;
+			}
+
+			date_readable = tpl_log_manager_get_date_readable (hit->date);
+			account_name = tp_account_get_display_name (hit->account);
+			account_icon = tp_account_get_icon_name (hit->account);
+
+			gtk_list_store_append (store, &iter);
+			gtk_list_store_set (store, &iter,
+					COL_FIND_ACCOUNT_ICON, account_icon,
+					COL_FIND_ACCOUNT_NAME, account_name,
+					COL_FIND_ACCOUNT, hit->account,
+					COL_FIND_CHAT_NAME, hit->chat_id, /* FIXME */
+					COL_FIND_CHAT_ID, hit->chat_id,
+					COL_FIND_IS_CHATROOM, hit->is_chatroom,
+					COL_FIND_DATE, hit->date,
+					COL_FIND_DATE_READABLE, date_readable,
+					-1);
+
+			g_free (date_readable);
+
+			/* FIXME: Update COL_FIND_CHAT_NAME */
+			if (hit->is_chatroom) {
+			} else {
+			}
+	}
+
+	if (hits) {
+			tpl_log_manager_search_free (hits);
+	}
 }
+#endif /* ENABLE_TPL */
+
 
 static void
 log_window_find_populate (EmpathyLogWindow *window,
 			  const gchar     *search_criteria)
 {
+#ifndef ENABLE_TPL
 	GList              *hits, *l;
 
+#endif /* ENABLE_TPL */
 	GtkTreeView        *view;
 	GtkTreeModel       *model;
 	GtkTreeSelection   *selection;
 	GtkListStore       *store;
+#ifndef ENABLE_TPL
 	GtkTreeIter         iter;
+#endif /* ENABLE_TPL */
 
 	view = GTK_TREE_VIEW (window->treeview_find);
 	model = gtk_tree_view_get_model (view);
@@ -448,6 +602,10 @@ log_window_find_populate (EmpathyLogWindow *window,
 		return;
 	}
 
+#ifdef ENABLE_TPL
+	tpl_log_manager_search_new_async (window->log_manager, search_criteria,
+			log_manager_searched_new_cb, (gpointer) store);
+#else
 	hits = empathy_log_manager_search_new (window->log_manager, search_criteria);
 
 	for (l = hits; l; l = l->next) {
@@ -490,6 +648,7 @@ log_window_find_populate (EmpathyLogWindow *window,
 	if (hits) {
 		empathy_log_manager_search_free (hits);
 	}
+#endif /* ENABLE_TPL */
 }
 
 static void
@@ -655,18 +814,87 @@ log_window_chats_changed_cb (GtkTreeSelection *selection,
 	log_window_chats_get_messages (window, NULL);
 }
 
+#ifdef ENABLE_TPL
+static void
+log_manager_got_chats_cb (GObject *manager,
+                       GAsyncResult *result,
+                       gpointer user_data)
+{
+	EmpathyLogWindow      *window = user_data;
+	GList                 *chats;
+	GList                 *l;
+	EmpathyAccountChooser *account_chooser;
+	TpAccount             *account;
+	GtkTreeView           *view;
+	GtkTreeModel          *model;
+	GtkTreeSelection      *selection;
+	GtkListStore          *store;
+	GtkTreeIter            iter;
+	GError                *error = NULL;
+
+	chats = tpl_log_manager_async_operation_finish (result, &error);
+
+	if (error != NULL) {
+			DEBUG ("%s. Aborting", error->message);
+			g_error_free (error);
+			return;
+	}
+
+	account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser_chats);
+	account = empathy_account_chooser_dup_account (account_chooser);
+
+	view = GTK_TREE_VIEW (window->treeview_chats);
+	model = gtk_tree_view_get_model (view);
+	selection = gtk_tree_view_get_selection (view);
+	store = GTK_LIST_STORE (model);
+
+	for (l = chats; l; l = l->next) {
+			TplLogSearchHit *hit;
+
+			hit = l->data;
+
+			gtk_list_store_append (store, &iter);
+			gtk_list_store_set (store, &iter,
+					COL_CHAT_ICON, "empathy-available", /* FIXME */
+					COL_CHAT_NAME, hit->chat_id,
+					COL_CHAT_ACCOUNT, account,
+					COL_CHAT_ID, hit->chat_id,
+					COL_CHAT_IS_CHATROOM, hit->is_chatroom,
+					-1);
+
+			/* FIXME: Update COL_CHAT_ICON/NAME */
+			if (hit->is_chatroom) {
+			} else {
+			}
+	}
+	tpl_log_manager_search_free (chats);
+
+	/* Unblock signals */
+	g_signal_handlers_unblock_by_func (selection,
+			log_window_chats_changed_cb,
+			window);
+
+	g_object_unref (account);
+}
+#endif /* ENABLE_TPL */
+
+
 static void
 log_window_chats_populate (EmpathyLogWindow *window)
 {
 	EmpathyAccountChooser *account_chooser;
 	TpAccount             *account;
+#ifndef ENABLE_TPL
 	GList                *chats, *l;
+#endif /* ENABLE_TPL */
 
 	GtkTreeView          *view;
 	GtkTreeModel         *model;
 	GtkTreeSelection     *selection;
 	GtkListStore         *store;
+#ifndef ENABLE_TPL
 	GtkTreeIter           iter;
+#endif /* ENABLE_TPL */
 
 	account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser_chats);
 	account = empathy_account_chooser_dup_account (account_chooser);
@@ -688,6 +916,10 @@ log_window_chats_populate (EmpathyLogWindow *window)
 
 	gtk_list_store_clear (store);
 
+#ifdef ENABLE_TPL
+	tpl_log_manager_get_chats_async (window->log_manager, account,
+			log_manager_got_chats_cb, (gpointer) window);
+#else
 	chats = empathy_log_manager_get_chats (window->log_manager, account);
 	for (l = chats; l; l = l->next) {
 		EmpathyLogSearchHit *hit;
@@ -717,6 +949,7 @@ log_window_chats_populate (EmpathyLogWindow *window)
 
 
 	g_object_unref (account);
+#endif /* ENABLE_TPL */
 }
 
 static void
@@ -886,6 +1119,219 @@ log_window_chats_get_selected (EmpathyLogWindow  *window,
 	return TRUE;
 }
 
+#ifdef ENABLE_TPL
+static void
+log_window_got_messages_for_date_cb (GObject *manager,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  EmpathyLogWindow *window = user_data;
+  GList *messages;
+  GList *l;
+  GError *error = NULL;
+
+  messages = tpl_log_manager_async_operation_finish (result, &error);
+
+  if (error != NULL) {
+      DEBUG ("Unable to retrieve messages for the selected date: %s. Aborting",
+          error->message);
+      empathy_chat_view_append_event (window->chatview_find,
+          "Unable to retrieve messages for the selected date");
+      g_error_free (error);
+      return;
+  }
+
+  for (l = messages; l; l = l->next) {
+      EmpathyMessage *message = empathy_message_from_tpl_log_entry (l->data);
+      g_object_unref (l->data);
+      empathy_chat_view_append_message (window->chatview_chats,
+          message);
+      g_object_unref (message);
+  }
+  g_list_free (messages);
+
+  /* Turn back on scrolling */
+  empathy_chat_view_scroll (window->chatview_find, TRUE);
+
+  /* Give the search entry main focus */
+  gtk_widget_grab_focus (window->entry_chats);
+}
+
+
+static void
+log_window_get_messages_for_date (EmpathyLogWindow *window,
+                                 const gchar *date)
+{
+  TpAccount *account;
+  gchar *chat_id;
+  gboolean is_chatroom;
+
+  gtk_calendar_clear_marks (GTK_CALENDAR (window->calendar_chats));
+
+  if (!log_window_chats_get_selected (window, &account,
+        &chat_id, &is_chatroom)) {
+      return;
+  }
+
+  /* Clear all current messages shown in the textview */
+  empathy_chat_view_clear (window->chatview_chats);
+
+  /* Turn off scrolling temporarily */
+  empathy_chat_view_scroll (window->chatview_find, FALSE);
+
+  /* Get messages */
+  tpl_log_manager_get_messages_for_date_async (window->log_manager,
+      account, chat_id,
+      is_chatroom,
+      date,
+      log_window_got_messages_for_date_cb,
+      (gpointer) window);
+}
+
+static void
+log_manager_got_dates_cb (GObject *manager,
+                          GAsyncResult *result,
+                          gpointer user_data)
+{
+  EmpathyLogWindow *window = user_data;
+  GList         *dates;
+  GList         *l;
+  guint          year_selected;
+  guint          year;
+  guint          month;
+  guint          month_selected;
+  guint          day;
+  gboolean       day_selected = FALSE;
+  const gchar   *date = NULL;
+  GError        *error = NULL;
+
+  dates = tpl_log_manager_async_operation_finish (result, &error);
+
+  if (error != NULL) {
+    DEBUG ("Unable to retrieve messages' dates: %s. Aborting",
+        error->message);
+    empathy_chat_view_append_event (window->chatview_find,
+        "Unable to retrieve messages' dates");
+      return;
+  }
+
+  for (l = dates; l; l = l->next) {
+      const gchar *str;
+
+      str = l->data;
+      if (!str) {
+          continue;
+      }
+
+      sscanf (str, "%4d%2d%2d", &year, &month, &day);
+      gtk_calendar_get_date (GTK_CALENDAR (window->calendar_chats),
+          &year_selected,
+          &month_selected,
+          NULL);
+
+      month_selected++;
+
+      if (!l->next) {
+          date = str;
+      }
+
+      if (year != year_selected || month != month_selected) {
+          continue;
+      }
+
+      DEBUG ("Marking date:'%s'", str);
+      gtk_calendar_mark_day (GTK_CALENDAR (window->calendar_chats), day);
+
+      if (l->next) {
+          continue;
+      }
+
+      day_selected = TRUE;
+
+      gtk_calendar_select_day (GTK_CALENDAR (window->calendar_chats), day);
+  }
+
+  if (!day_selected) {
+      /* Unselect the day in the calendar */
+      gtk_calendar_select_day (GTK_CALENDAR (window->calendar_chats), 0);
+  }
+
+  g_signal_handlers_unblock_by_func (window->calendar_chats,
+      log_window_calendar_chats_day_selected_cb,
+      window);
+
+  if (date) {
+      log_window_get_messages_for_date (window, date);
+  }
+
+  g_list_foreach (dates, (GFunc) g_free, NULL);
+  g_list_free (dates);
+}
+
+
+static void
+log_window_chats_get_messages (EmpathyLogWindow *window,
+			       const gchar     *date_to_show)
+{
+	TpAccount     *account;
+	gchar         *chat_id;
+	gboolean       is_chatroom;
+	const gchar   *date;
+	guint          year_selected;
+	guint          year;
+	guint          month;
+	guint          month_selected;
+	guint          day;
+
+
+	if (!log_window_chats_get_selected (window, &account,
+					    &chat_id, &is_chatroom)) {
+		return;
+	}
+
+	g_signal_handlers_block_by_func (window->calendar_chats,
+					 log_window_calendar_chats_day_selected_cb,
+					 window);
+
+	/* Either use the supplied date or get the last */
+	date = date_to_show;
+	if (!date) {
+		/* Get a list of dates and show them on the calendar */
+		tpl_log_manager_get_dates_async (window->log_manager,
+						       account, chat_id,
+						       is_chatroom,
+						       log_manager_got_dates_cb, (gpointer) window);
+    /* signal unblocked at the end of the CB flow */
+	} else {
+		sscanf (date, "%4d%2d%2d", &year, &month, &day);
+		gtk_calendar_get_date (GTK_CALENDAR (window->calendar_chats),
+				&year_selected,
+				&month_selected,
+				NULL);
+
+		month_selected++;
+
+		if (year != year_selected && month != month_selected) {
+			day = 0;
+		}
+
+		gtk_calendar_select_day (GTK_CALENDAR (window->calendar_chats), day);
+
+    g_signal_handlers_unblock_by_func (window->calendar_chats,
+        log_window_calendar_chats_day_selected_cb,
+        window);
+	}
+
+	if (date) {
+      log_window_get_messages_for_date (window, date);
+	}
+
+	g_object_unref (account);
+	g_free (chat_id);
+}
+
+#else
+
 static void
 log_window_chats_get_messages (EmpathyLogWindow *window,
 			       const gchar     *date_to_show)
@@ -1022,6 +1468,8 @@ OUT:
 	g_free (chat_id);
 }
 
+#endif /* ENABLE_TPL */
+
 static void
 log_window_calendar_chats_day_selected_cb (GtkWidget       *calendar,
 					   EmpathyLogWindow *window)
@@ -1046,6 +1494,67 @@ log_window_calendar_chats_day_selected_cb (GtkWidget       *calendar,
 	g_free (date);
 }
 
+
+#ifdef ENABLE_TPL
+static void
+log_window_updating_calendar_month_cb (GObject *manager,
+		GAsyncResult *result, gpointer user_data)
+{
+	EmpathyLogWindow *window = user_data;
+	GList					*dates;
+	GList					*l;
+	guint					 year_selected;
+	guint					 month_selected;
+	GError				*error = NULL;
+
+	dates = tpl_log_manager_async_operation_finish (result, &error);
+
+	if (error != NULL) {
+			DEBUG ("Unable to retrieve messages' dates: %s. Aborting",
+					error->message);
+			empathy_chat_view_append_event (window->chatview_find,
+					"Unable to retrieve messages' dates");
+			g_error_free (error);
+			return;
+	}
+
+	gtk_calendar_clear_marks (GTK_CALENDAR (window->calendar_chats));
+	g_object_get (window->calendar_chats,
+			"month", &month_selected,
+			"year", &year_selected,
+			NULL);
+
+	/* We need this here because it appears that the months start from 0 */
+	month_selected++;
+
+	for (l = dates; l; l = l->next) {
+			const gchar *str;
+			guint        year;
+			guint        month;
+			guint        day;
+
+			str = l->data;
+			if (!str) {
+					continue;
+			}
+
+			sscanf (str, "%4d%2d%2d", &year, &month, &day);
+
+			if (year == year_selected && month == month_selected) {
+					DEBUG ("Marking date:'%s'", str);
+					gtk_calendar_mark_day (GTK_CALENDAR (window->calendar_chats), day);
+			}
+	}
+
+	g_list_foreach (dates, (GFunc) g_free, NULL);
+	g_list_free (dates);
+
+	DEBUG ("Currently showing month %d and year %d", month_selected,
+			year_selected);
+}
+#endif /* ENABLE_TPL */
+
+
 static void
 log_window_calendar_chats_month_changed_cb (GtkWidget       *calendar,
 					    EmpathyLogWindow *window)
@@ -1053,11 +1562,13 @@ log_window_calendar_chats_month_changed_cb (GtkWidget       *calendar,
 	TpAccount     *account;
 	gchar         *chat_id;
 	gboolean       is_chatroom;
+#ifndef ENABLE_TPL
 	guint          year_selected;
 	guint          month_selected;
 
 	GList         *dates;
 	GList         *l;
+#endif /* ENABLE_TPL */
 
 	gtk_calendar_clear_marks (GTK_CALENDAR (calendar));
 
@@ -1067,20 +1578,24 @@ log_window_calendar_chats_month_changed_cb (GtkWidget       *calendar,
 		return;
 	}
 
+	/* Get the log object for this contact */
+#ifdef ENABLE_TPL
+	tpl_log_manager_get_dates_async (window->log_manager, account,
+					       chat_id, is_chatroom,
+					       log_window_updating_calendar_month_cb,
+					       (gpointer) window);
+#else
+	dates = empathy_log_manager_get_dates (window->log_manager, account,
+					       chat_id, is_chatroom);
+
 	g_object_get (calendar,
 		      "month", &month_selected,
 		      "year", &year_selected,
 		      NULL);
 
-	/* We need this hear because it appears that the months start from 0 */
+	/* We need this here because it appears that the months start from 0 */
 	month_selected++;
 
-	/* Get the log object for this contact */
-	dates = empathy_log_manager_get_dates (window->log_manager, account,
-					       chat_id, is_chatroom);
-	g_object_unref (account);
-	g_free (chat_id);
-
 	for (l = dates; l; l = l->next) {
 		const gchar *str;
 		guint        year;
@@ -1105,6 +1620,10 @@ log_window_calendar_chats_month_changed_cb (GtkWidget       *calendar,
 
 	DEBUG ("Currently showing month %d and year %d", month_selected,
 		year_selected);
+#endif /* ENABLE_TPL */
+
+	g_object_unref (account);
+	g_free (chat_id);
 }
 
 static void
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index f6f0c0a..f9c18c2 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS =                                           \
 	-DDATADIR=\""$(datadir)"\"              	\
 	-DLOCALEDIR=\""$(datadir)/locale"\"		\
 	-DG_LOG_DOMAIN=\"empathy\"			\
+	$(TPL_CFLAGS)					\
 	$(LIBEMPATHY_CFLAGS)				\
 	$(GEOCLUE_CFLAGS)				\
 	$(NETWORK_MANAGER_CFLAGS)			\
@@ -48,9 +49,6 @@ libempathy_headers =				\
 	empathy-irc-network.h			\
 	empathy-irc-server.h			\
 	empathy-location.h			\
-	empathy-log-manager.h			\
-	empathy-log-store-empathy.h		\
-	empathy-log-store.h			\
 	empathy-message.h			\
 	empathy-status-presets.h		\
 	empathy-time.h				\
@@ -63,6 +61,14 @@ libempathy_headers =				\
 	empathy-types.h				\
 	empathy-utils.h
 
+if !ENABLE_TPL
+libempathy_headers +=	\
+	empathy-log-manager.h				\
+	empathy-log-store-empathy.h			\
+	empathy-log-store.h				\
+	$(NULL)
+endif
+
 libempathy_la_SOURCES =					\
 	$(libempathy_headers)				\
 	empathy-account-settings.c			\
@@ -87,9 +93,6 @@ libempathy_la_SOURCES =					\
 	empathy-irc-network-manager.c			\
 	empathy-irc-network.c				\
 	empathy-irc-server.c				\
-	empathy-log-manager.c				\
-	empathy-log-store-empathy.c			\
-	empathy-log-store.c				\
 	empathy-message.c				\
 	empathy-status-presets.c			\
 	empathy-time.c					\
@@ -101,6 +104,14 @@ libempathy_la_SOURCES =					\
 	empathy-tp-roomlist.c				\
 	empathy-utils.c
 
+if !ENABLE_TPL
+libempathy_la_SOURCES += \
+	empathy-log-manager.c				\
+	empathy-log-store-empathy.c			\
+	empathy-log-store.c				\
+	$(NULL)
+endif
+
 # do not distribute generated files
 nodist_libempathy_la_SOURCES =\
 	$(BUILT_SOURCES)
@@ -109,6 +120,7 @@ libempathy_la_LIBADD =		\
 	$(top_builddir)/extensions/libemp-extensions.la \
 	$(LIBEMPATHY_LIBS) \
 	$(GEOCLUE_LIBS) \
+	$(TPL_LIBS) \
 	$(NETWORK_MANAGER_LIBS) \
 	$(CONNMAN_LIBS)
 
@@ -181,9 +193,10 @@ dtd_DATA = 					\
 	empathy-chatroom-manager.dtd		\
 	empathy-irc-networks.dtd
 
+if !ENABLE_TPL
 stylesheetdir = $(datadir)/empathy
-stylesheet_DATA =		\
-	empathy-log-manager.xsl
+stylesheet_DATA = empathy-log-manager.xsl
+endif
 
 ircnetworksdir = $(datadir)/empathy
 ircnetworks_DATA =		\
@@ -192,8 +205,10 @@ ircnetworks_DATA =		\
 EXTRA_DIST = 			\
 	empathy-marshal.list	\
 	$(stylesheet_DATA)	\
-	$(dtd_DATA)		\
 	$(ircnetworks_DATA)
+if ENABLE_TPL
+EXTRA_DIST +=  $(dtd_DATA)
+endif
 
 CLEANFILES = 				\
 	$(BUILT_SOURCES)		\
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index a440ef2..0a4812b 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -27,6 +27,9 @@
 
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/util.h>
+#ifdef ENABEL_TPL
+#include <telepathy-logger/contact.h>
+#endif /* ENABLE_TPL */
 
 #include "empathy-contact.h"
 #include "empathy-utils.h"
@@ -408,6 +411,31 @@ empathy_contact_new (TpContact *tp_contact)
       NULL);
 }
 
+#ifdef ENABLE_TPL
+EmpathyContact *
+empathy_contact_from_tpl_contact (TpAccount *account,
+    TplContact *tpl_contact)
+{
+  EmpathyContact *retval;
+  gboolean is_user;
+
+  g_return_val_if_fail (TPL_IS_CONTACT (tpl_contact), NULL);
+
+  is_user = (TPL_CONTACT_USER == tpl_contact_get_contact_type (tpl_contact));
+
+  retval = g_object_new (EMPATHY_TYPE_CONTACT,
+      "id", tpl_contact_get_alias (tpl_contact),
+      "name", tpl_contact_get_identifier (tpl_contact),
+      "account", account,
+      "is-user", is_user,
+      NULL);
+  empathy_contact_load_avatar_cache (retval,
+      tpl_contact_get_avatar_token (tpl_contact));
+
+  return retval;
+}
+#endif /* ENABLE_TPL */
+
 EmpathyContact *
 empathy_contact_new_for_log (TpAccount *account,
                              const gchar *id,
diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 2dd6bc0..231f95b 100644
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -26,6 +26,9 @@
 
 #include <telepathy-glib/contact.h>
 #include <telepathy-glib/account.h>
+#ifdef ENABLE_TPL
+#include <telepathy-logger/contact.h>
+#endif /* ENABLE_TPL */
 
 G_BEGIN_DECLS
 
@@ -70,6 +73,10 @@ typedef enum {
 
 GType empathy_contact_get_type (void) G_GNUC_CONST;
 EmpathyContact * empathy_contact_new (TpContact *tp_contact);
+#ifdef ENABLE_TPL
+EmpathyContact * empathy_contact_from_tpl_contact (TpAccount *account,
+    TplContact *tpl_contact);
+#endif /* ENABLE_TPL */
 EmpathyContact * empathy_contact_new_for_log (TpAccount *account,
     const gchar *id, const gchar *name, gboolean is_user);
 TpContact * empathy_contact_get_tp_contact (EmpathyContact *contact);
diff --git a/libempathy/empathy-log-manager.h b/libempathy/empathy-log-manager.h
index 25f1b5f..4e4097d 100644
--- a/libempathy/empathy-log-manager.h
+++ b/libempathy/empathy-log-manager.h
@@ -24,6 +24,9 @@
 #ifndef __EMPATHY_LOG_MANAGER_H__
 #define __EMPATHY_LOG_MANAGER_H__
 
+#include <config.h>
+#ifndef ENABLE_TPL
+
 #include <glib-object.h>
 
 #include "empathy-message.h"
@@ -100,4 +103,5 @@ void empathy_log_manager_observe (EmpathyLogManager *log_manager,
 
 G_END_DECLS
 
+#endif /* ENABLE_TPL */
 #endif /* __EMPATHY_LOG_MANAGER_H__ */
diff --git a/libempathy/empathy-log-store-empathy.h b/libempathy/empathy-log-store-empathy.h
index e77076a..3b26d2c 100644
--- a/libempathy/empathy-log-store-empathy.h
+++ b/libempathy/empathy-log-store-empathy.h
@@ -25,6 +25,9 @@
 #ifndef __EMPATHY_LOG_STORE_EMPATHY_H__
 #define __EMPATHY_LOG_STORE_EMPATHY_H__
 
+#include <config.h>
+#ifndef ENABLE_TPL
+
 #include <glib.h>
 
 G_BEGIN_DECLS
@@ -63,4 +66,5 @@ GType empathy_log_store_empathy_get_type (void);
 
 G_END_DECLS
 
+#endif /* ENABLE_TPL */
 #endif /* __EMPATHY_LOG_STORE_EMPATHY_H__ */
diff --git a/libempathy/empathy-log-store.h b/libempathy/empathy-log-store.h
index 94bc873..185e38c 100644
--- a/libempathy/empathy-log-store.h
+++ b/libempathy/empathy-log-store.h
@@ -23,6 +23,9 @@
 #ifndef __EMPATHY_LOG_STORE_H__
 #define __EMPATHY_LOG_STORE_H__
 
+#include <config.h>
+#ifndef ENABLE_TPL
+
 #include <glib-object.h>
 
 #include <telepathy-glib/account.h>
@@ -98,4 +101,5 @@ GList *empathy_log_store_get_filtered_messages (EmpathyLogStore *self,
 
 G_END_DECLS
 
+#endif /* ENABLE_TPL */
 #endif /* __EMPATHY_LOG_STORE_H__ */
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 0fe4578..4757aa3 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -27,6 +27,14 @@
 #include <string.h>
 
 #include <telepathy-glib/util.h>
+#ifdef ENABLE_TPL
+#include <telepathy-glib/account.h>
+#include <telepathy-glib/account-manager.h>
+
+#include <telepathy-logger/contact.h>
+#include <telepathy-logger/log-entry.h>
+#include <telepathy-logger/log-entry-text.h>
+#endif /* ENABLE_TPL */
 
 #include "empathy-message.h"
 #include "empathy-utils.h"
@@ -252,6 +260,69 @@ empathy_message_new (const gchar *body)
 			     NULL);
 }
 
+#ifdef ENABLE_TPL
+EmpathyMessage *
+empathy_message_from_tpl_log_entry (TplLogEntry *logentry)
+{
+	EmpathyMessage *retval = NULL;
+	TpAccountManager *acc_man = NULL;
+	TpAccount *account = NULL;
+	TplContact *receiver = NULL;
+	TplContact *sender = NULL;
+	gchar *body= NULL;
+
+	g_return_val_if_fail (TPL_IS_LOG_ENTRY (logentry), NULL);
+
+	acc_man = tp_account_manager_dup ();
+	/* FIXME Currently Empathy shows in the log viewer only valid accounts, so it
+	 * won't be selected any non-existing (ie removed) account.
+	 * When #610455 will be fixed, calling tp_account_manager_ensure_account()
+	 * might add a not existing account to the AM. tp_account_new() probably
+	 * will be the best way to handle it.
+	 * Note: When creating an EmpathyContact from a TplContact instance, the
+	 * TpAccount is passed *only* to let EmpathyContact be able to retrieve the
+	 * avatar (contact_get_avatar_filename() need a TpAccount).
+	 * If the way EmpathyContact stores the avatar is changes, it might not be
+	 * needed anymore any TpAccount passing and the following call will be
+	 * useless */
+	account = tp_account_manager_ensure_account (acc_man,
+			tpl_log_entry_get_account_path (logentry));
+	g_object_unref (acc_man);
+
+	/* TODO Currently only TplLogEntryText exists as subclass of TplLogEntry, in
+	 * future more TplLogEntry will exist and EmpathyMessage should probably
+	 * be enhanced to support other types of log entries (ie TplLogEntryCall).
+	 *
+	 * For now we just check (simply) that we are dealing with the only supported type,
+	 * then there will be a if/then/else or switch handling all the supported
+	 * cases.
+	 */
+	g_return_val_if_fail (TPL_IS_LOG_ENTRY_TEXT (logentry), NULL);
+	body = g_strdup (tpl_log_entry_text_get_message (
+				TPL_LOG_ENTRY_TEXT (logentry)));
+	receiver = tpl_log_entry_text_get_receiver (TPL_LOG_ENTRY_TEXT (logentry));
+	sender = tpl_log_entry_text_get_sender (TPL_LOG_ENTRY_TEXT (logentry));
+
+	retval = empathy_message_new (body);
+	if (receiver != NULL)
+		empathy_message_set_receiver (retval,
+				empathy_contact_from_tpl_contact (account, receiver));
+	if (sender != NULL)
+		empathy_message_set_sender (retval,
+				empathy_contact_from_tpl_contact (account, sender));
+
+	empathy_message_set_timestamp (retval,
+			tpl_log_entry_get_timestamp (logentry));
+	empathy_message_set_id (retval,
+			tpl_log_entry_text_get_log_id (TPL_LOG_ENTRY_TEXT (logentry)));
+	empathy_message_set_is_backlog (retval, FALSE);
+
+	g_free (body);
+
+	return retval;
+}
+#endif /* ENABLE_TPL */
+
 TpChannelTextMessageType
 empathy_message_get_tptype (EmpathyMessage *message)
 {
diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index 5128693..0c01e96 100644
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -26,6 +26,9 @@
 #define __EMPATHY_MESSAGE_H__
 
 #include <glib-object.h>
+#ifdef ENABLE_TPL
+#include <telepathy-logger/log-entry.h>
+#endif
 
 #include "empathy-contact.h"
 #include "empathy-time.h"
@@ -53,6 +56,9 @@ struct _EmpathyMessageClass {
 
 GType                    empathy_message_get_type          (void) G_GNUC_CONST;
 EmpathyMessage *         empathy_message_new               (const gchar              *body);
+#ifdef ENABLE_TPL
+EmpathyMessage *         empathy_message_from_tpl_log_entry (TplLogEntry						*logentry);
+#endif /* ENABLE_TPL */
 TpChannelTextMessageType empathy_message_get_tptype        (EmpathyMessage           *message);
 void                     empathy_message_set_tptype        (EmpathyMessage           *message,
 							    TpChannelTextMessageType  type);
diff --git a/po/de.po b/po/de.po
index ac01d0c..119c47f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,15 +8,14 @@
 # Michael Kanis <mkanis@gmx.de>, 2009.
 # Mario Blättermann <mariobl@gnome.org>, 2008-2010.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2010-02-23 14:48+0000\n"
-"PO-Revision-Date: 2010-02-23 17:42+0100\n"
-"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
+"POT-Creation-Date: 2010-02-02 03:24+0000\n"
+"PO-Revision-Date: 2010-01-31 23:25+0100\n"
+"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -474,15 +473,6 @@ msgstr ""
 "sortiert, bei »state« (Status) wird die Kontaktliste nach dem Status der "
 "Kontakte sortiert."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Sofortnachrichten- und VoIP-Konten verwalten"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:201 ../src/cc-empathy-accounts-panel.c:70
-msgid "Messaging and VoIP Accounts"
-msgstr "Sofortnachrichten- und VoIP-Konten"
-
 #: ../libempathy/empathy-ft-handler.c:840
 msgid "The hash of the received file and the sent one do not match"
 msgstr ""
@@ -614,15 +604,15 @@ msgstr "Selbstsigniertes Zertifikat"
 msgid "Certificate error"
 msgstr "Zertifikat-Fehler"
 
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
 msgstr "Personen in der Nähe"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:429
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:430
 msgid "Facebook Chat"
 msgstr "Facebook-Chat"
 
@@ -672,7 +662,7 @@ msgstr[1] "Vor %d Monaten"
 msgid "in the future"
 msgstr "in der Zukunft"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:450
 msgid "All"
 msgstr "Alle"
 
@@ -682,15 +672,11 @@ msgstr "Alle"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1117
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1446
+#: ../libempathy-gtk/empathy-account-widget.c:1329
 msgid "L_og in"
 msgstr "_Anmelden"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1514
+#: ../libempathy-gtk/empathy-account-widget.c:1396
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -698,15 +684,15 @@ msgstr "_Anmelden"
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1525
+#: ../libempathy-gtk/empathy-account-widget.c:1407
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1590
+#: ../libempathy-gtk/empathy-account-widget.c:1472
 msgid "This account already exists on the server"
 msgstr "Dieses Konto ist bereits auf dem Server vorhanden"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1593
+#: ../libempathy-gtk/empathy-account-widget.c:1475
 msgid "Create a new account on the server"
 msgstr "Ein neues Konto auf dem Server anlegen"
 
@@ -715,19 +701,19 @@ msgstr "Ein neues Konto auf dem Server anlegen"
 #. * like: "MyUserName on chat.freenode.net".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1968
+#: ../libempathy-gtk/empathy-account-widget.c:1858
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s auf %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:1994
+#: ../libempathy-gtk/empathy-account-widget.c:1876
 #, c-format
 msgid "%s Account"
 msgstr "%s-Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1998
+#: ../libempathy-gtk/empathy-account-widget.c:1880
 msgid "New account"
 msgstr "Neues Konto"
 
@@ -772,7 +758,7 @@ msgstr "Wie lautet Ihr AIM AOL-Name?"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
@@ -781,7 +767,7 @@ msgstr "P_ort:"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -918,58 +904,38 @@ msgid "Reso_urce:"
 msgstr "_Ressource:"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid ""
-"This is your username, not your normal Facebook login.\n"
-"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
-"Facebook username if you don't have one."
-msgstr ""
-"Dies ist Ihr Benutzername, nicht Ihr gewöhnlicher Facebook-Anmeldename.\n"
-"Falls Sie facebook.com/<b>dachs</b> sind, geben Sie <b>dachs</b> ein.\n"
-"Wählen Sie auf <a href=\"http://www.facebook.com/username/\">dieser Seite</"
-"a> einen Facebook-Benutzernamen, falls Sie noch keinen besitzen."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Use old SS_L"
 msgstr "Alte SS_L-Verschlüsselung verwenden"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-msgid "What is your Facebook password?"
-msgstr "Wie lautet Ihr Facebook-Passwort?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-msgid "What is your Facebook username?"
-msgstr "Wie lautet Ihr Facebook-Benutzername?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google ID?"
 msgstr "Wie lautet Ihre Google-ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 msgid "What is your Google password?"
 msgstr "Wie lautet Ihr Passwort bei Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "What is your Jabber ID?"
 msgstr "Wie lautet Ihre Jabber-Kennung?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "What is your Jabber password?"
 msgstr "Wie lautet Ihr Jabber-Passwort?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid "What is your desired Jabber ID?"
 msgstr "Wie lautet Ihre gewünschte Jabber-Kennung?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "What is your desired Jabber password?"
 msgstr "Wie lautet Ihr gewünschtes Jabber-Passwort?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "_Encryption required (TLS/SSL)"
 msgstr "_Verschlüsselung erforderlich (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "_Ignore SSL certificate errors"
 msgstr "SSL-Zertifikat-_Fehler ignorieren"
 
@@ -1259,63 +1225,63 @@ msgstr "Unbekannter Befehl"
 msgid "Unknown command; see /help for the available commands"
 msgstr "Unbekannter Befehl; Bitte lesen Sie /help zu verfügbaren Befehlen"
 
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1143
 msgid "offline"
 msgstr "Abgemeldet"
 
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1146
 msgid "invalid contact"
 msgstr "Ungültiger Kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1148
+#: ../libempathy-gtk/empathy-chat.c:1149
 msgid "permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: ../libempathy-gtk/empathy-chat.c:1151
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "too long message"
 msgstr "Zu lange Nachricht"
 
-#: ../libempathy-gtk/empathy-chat.c:1154
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "not implemented"
 msgstr "Nicht implementiert"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1162
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fehler beim Senden der Nachricht »%s«: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:1192
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Thema wurde gesetzt auf: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1194
 msgid "No topic defined"
 msgstr "Kein Thema gesetzt"
 
-#: ../libempathy-gtk/empathy-chat.c:1592
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "(No Suggestions)"
 msgstr "(Keine Vorschläge)"
 
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1647
 msgid "Insert Smiley"
 msgstr "Emoticon einfügen"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1664
+#: ../libempathy-gtk/empathy-chat.c:1665
 #: ../libempathy-gtk/empathy-ui-utils.c:1658
 msgid "_Send"
 msgstr "_Senden"
 
-#: ../libempathy-gtk/empathy-chat.c:1698
+#: ../libempathy-gtk/empathy-chat.c:1699
 msgid "_Spelling Suggestions"
 msgstr "Vor_schläge zur Rechtschreibung"
 
-#: ../libempathy-gtk/empathy-chat.c:1813
+#: ../libempathy-gtk/empathy-chat.c:1814
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s hat sich abgemeldet"
@@ -1323,12 +1289,12 @@ msgstr "%s hat sich abgemeldet"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1820
+#: ../libempathy-gtk/empathy-chat.c:1821
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s wurde von %2$s rausgeworfen"
 
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1824
 #, c-format
 msgid "%s was kicked"
 msgstr "%s wurde rausgeworfen"
@@ -1336,17 +1302,17 @@ msgstr "%s wurde rausgeworfen"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1831
+#: ../libempathy-gtk/empathy-chat.c:1832
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s wurde von %2$s verbannt"
 
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1835
 #, c-format
 msgid "%s was banned"
 msgstr "%s wurde verbannt"
 
-#: ../libempathy-gtk/empathy-chat.c:1838
+#: ../libempathy-gtk/empathy-chat.c:1839
 #, c-format
 msgid "%s has left the room"
 msgstr "%s hat den Raum verlassen"
@@ -1356,51 +1322,51 @@ msgstr "%s hat den Raum verlassen"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-chat.c:1848
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1872
+#: ../libempathy-gtk/empathy-chat.c:1873
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s hat den Raum betreten"
 
-#: ../libempathy-gtk/empathy-chat.c:1897
+#: ../libempathy-gtk/empathy-chat.c:1898
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ist jetzt bekannt als %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2032 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2033 ../src/empathy-call-window.c:1531
 msgid "Disconnected"
 msgstr "Getrennt"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2568
 msgid "Wrong password; please try again:"
 msgstr "Falsches Kennwort; Bitte versuchen Sie es erneut:"
 
-#: ../libempathy-gtk/empathy-chat.c:2567
+#: ../libempathy-gtk/empathy-chat.c:2569
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2574
 msgid "This room is protected by a password:"
 msgstr "Dieser Raum ist durch ein Kennwort geschützt:"
 
-#: ../libempathy-gtk/empathy-chat.c:2573
+#: ../libempathy-gtk/empathy-chat.c:2575
 msgid "Join"
 msgstr "Beitreten"
 
-#: ../libempathy-gtk/empathy-chat.c:2713
+#: ../libempathy-gtk/empathy-chat.c:2715
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../libempathy-gtk/empathy-chat.c:2766
+#: ../libempathy-gtk/empathy-chat.c:2768
 #: ../libempathy-gtk/empathy-log-window.c:548
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:681
 msgid "Topic:"
 msgstr "Thema:"
 
@@ -1422,15 +1388,15 @@ msgstr "Link _öffnen"
 msgid "%A %B %d %Y"
 msgstr "%A, %d. %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "Kontaktinformationen bearbeiten"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:300
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
 msgid "Personal Information"
 msgstr "Persönliche Informationen"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
@@ -1442,28 +1408,28 @@ msgstr "_Später entscheiden"
 msgid "Subscription Request"
 msgstr "Abonnementanfrage"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1516
+#: ../libempathy-gtk/empathy-contact-list-view.c:1512
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Möchten Sie wirklich die Gruppe »%s« entfernen?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1518
+#: ../libempathy-gtk/empathy-contact-list-view.c:1514
 msgid "Removing group"
 msgstr "Gruppe entfernen"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1565
-#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../libempathy-gtk/empathy-contact-list-view.c:1561
+#: ../libempathy-gtk/empathy-contact-list-view.c:1638
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1595
+#: ../libempathy-gtk/empathy-contact-list-view.c:1591
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Möchten Sie wirklich den Kontakt »%s« entfernen?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1597
+#: ../libempathy-gtk/empathy-contact-list-view.c:1593
 msgid "Removing contact"
 msgstr "Kontakt entfernen"
 
@@ -1504,17 +1470,17 @@ msgstr "Meine Arbeitsumgebung freigeben"
 msgid "Infor_mation"
 msgstr "Infor_mationen"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:443
-msgctxt "Edit contact (contextual menu)"
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:497
-#: ../src/empathy-chat-window.c:865
+#: ../libempathy-gtk/empathy-contact-menu.c:496
+#: ../src/empathy-chat-window.c:866
 msgid "Inviting you to this room"
 msgstr "Sie werden in diesen Chatraum eingeladen"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:528
+#: ../libempathy-gtk/empathy-contact-menu.c:527
 msgid "_Invite to chat room"
 msgstr "In den Chatraum _einladen"
 
@@ -1527,7 +1493,7 @@ msgid "Select"
 msgstr "Wählen"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:244
-#: ../src/empathy-main-window.c:1045
+#: ../src/empathy-main-window.c:1042
 msgid "Group"
 msgstr "Gruppe"
 
@@ -2104,15 +2070,19 @@ msgstr "Keine Fehlermeldung"
 msgid "Instant Message (Empathy)"
 msgstr "Sofortnachricht (Empathy)"
 
-#: ../src/empathy.c:569
+#: ../src/empathy.c:762
 msgid "Don't connect on startup"
 msgstr "Nicht automatisch beim Start verbinden"
 
-#: ../src/empathy.c:573
+#: ../src/empathy.c:766
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Kontaktliste und andere Dialoge nicht automatisch beim Start anzeigen"
 
-#: ../src/empathy.c:585
+#: ../src/empathy.c:770
+msgid "Show the accounts dialog"
+msgstr "Konten-Dialog anzeigen"
+
+#: ../src/empathy.c:782
 msgid "- Empathy IM Client"
 msgstr "- Empathy Sofortnachrichtenprogramm"
 
@@ -2166,28 +2136,28 @@ msgstr ""
 "Michael Kanis\n"
 "Christian Kirbach"
 
-#: ../src/empathy-account-assistant.c:167
+#: ../src/empathy-account-assistant.c:165
 msgid "There was an error while importing the accounts."
 msgstr "Es ist ein Fehler beim Importieren der Konten aufgetreten."
 
-#: ../src/empathy-account-assistant.c:170
+#: ../src/empathy-account-assistant.c:168
 msgid "There was an error while parsing the account details."
 msgstr "Es ist ein Fehler beim Analysieren der Kontodetails aufgetreten."
 
-#: ../src/empathy-account-assistant.c:173
+#: ../src/empathy-account-assistant.c:171
 msgid "There was an error while creating the account."
 msgstr "Es ist ein Fehler beim Anlegen des Kontos aufgetreten."
 
-#: ../src/empathy-account-assistant.c:175
+#: ../src/empathy-account-assistant.c:173
 msgid "There was an error."
 msgstr "Es ist ein Fehler aufgetreten."
 
-#: ../src/empathy-account-assistant.c:179
+#: ../src/empathy-account-assistant.c:177
 #, c-format
 msgid "The error message was: %s"
 msgstr "Die Fehlermeldung war: %s"
 
-#: ../src/empathy-account-assistant.c:183
+#: ../src/empathy-account-assistant.c:181
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
@@ -2195,46 +2165,47 @@ msgstr ""
 "Sie können zurück gehen und die Kontodetails erneut eingeben oder diesen "
 "Assistenten beenden und später über das »Bearbeiten»-Menü Konten hinzufügen."
 
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1294
+#: ../src/empathy-account-assistant.c:218
+#: ../src/empathy-account-assistant.c:1241
 msgid "An error occurred"
 msgstr "Ein Fehler ist aufgetreten"
 
+#. Create account
 #. To translator: %s is the protocol name
 #. Create account
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:415 ../src/empathy-accounts-dialog.c:564
+#: ../src/empathy-account-assistant.c:395 ../src/empathy-accounts-dialog.c:552
 #, c-format
 msgid "New %s account"
 msgstr "Neues %s-Konto"
 
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:472
 msgid "What kind of chat account do you have?"
 msgstr "Welche Art Chat-Konto haben Sie?"
 
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:478
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Haben Sie weitere Chat-Konten, die Sie einrichten wollen?"
 
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:484
 msgid "Enter your account details"
 msgstr "Geben Sie Ihre Kontodetails ein"
 
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:489
 msgid "What kind of chat account do you want to create?"
 msgstr "Welche Art von Chat-Konto wollen Sie anlegen?"
 
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:495
 msgid "Do you want to create other chat accounts?"
 msgstr "Möchten Sie weitere Chat-Konten anlegen?"
 
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:502
 msgid "Enter the details for the new account"
 msgstr "Geben Sie die Details für das neue Konto ein"
 
-#: ../src/empathy-account-assistant.c:647
+#: ../src/empathy-account-assistant.c:617
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2246,43 +2217,43 @@ msgstr ""
 "Programme verwenden. Mit einem Mikrofon oder einer Webcam können Sie auch "
 "Audio- bzw. Videoanrufe tätigen."
 
-#: ../src/empathy-account-assistant.c:664
+#: ../src/empathy-account-assistant.c:634
 msgid "Do you have an account you've been using with another chat program?"
 msgstr ""
 "Haben Sie ein Konto, das Sie zuvor mit einem anderen Chat-Programm verwendet "
 "haben?"
 
-#: ../src/empathy-account-assistant.c:687
+#: ../src/empathy-account-assistant.c:657
 msgid "Yes, import my account details from "
 msgstr "Ja, meine Kontodetails importieren von "
 
-#: ../src/empathy-account-assistant.c:708
+#: ../src/empathy-account-assistant.c:678
 msgid "Yes, I'll enter my account details now"
 msgstr "Ja, ich möchte jetzt meine Kontodetails eingeben"
 
-#: ../src/empathy-account-assistant.c:730
+#: ../src/empathy-account-assistant.c:700
 msgid "No, I want a new account"
 msgstr "Nein, ich möchte ein neues Konto"
 
-#: ../src/empathy-account-assistant.c:740
+#: ../src/empathy-account-assistant.c:710
 msgid "No, I just want to see people online nearby for now"
 msgstr "Nein, ich möchte nur Personen in der Nähe sehen"
 
-#: ../src/empathy-account-assistant.c:761
+#: ../src/empathy-account-assistant.c:731
 msgid "Select the accounts you want to import:"
 msgstr "Wählen Sie die zu importierenden Konten:"
 
-#: ../src/empathy-account-assistant.c:845
+#: ../src/empathy-account-assistant.c:815
 #: ../src/empathy-new-chatroom-dialog.c:541
 #: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-account-assistant.c:822
 msgid "No, that's all for now"
 msgstr "Nein, das ist alles"
 
-#: ../src/empathy-account-assistant.c:1111
+#: ../src/empathy-account-assistant.c:1064
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2294,83 +2265,85 @@ msgstr ""
 "bitte die Angaben unten auf Vollständigkeit. Sie können sie später leicht "
 "ändern oder das Merkmal im Dialog »Konten« ausschalten"
 
-#: ../src/empathy-account-assistant.c:1117
-#: ../src/empathy-account-assistant.c:1173
+#: ../src/empathy-account-assistant.c:1070
+#: ../src/empathy-account-assistant.c:1126
 msgid "Edit->Accounts"
 msgstr "Bearbeiten→Konten"
 
-#: ../src/empathy-account-assistant.c:1133
+#: ../src/empathy-account-assistant.c:1086
 msgid "I don't want to enable this feature for now"
 msgstr "Nein, ich möchte dieses Funktionsmerkmal derzeit nicht aktivieren"
 
-#: ../src/empathy-account-assistant.c:1169
+#: ../src/empathy-account-assistant.c:1122
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
+"telepathy-salut is not installed.\n"
+"If you want to enable this feature, please install the telepathy-salut "
+"package\n"
+"and create a People Nearby account from the Accounts dialog "
 msgstr ""
 "Sie können sich nicht mit Personen im lokalen Netzwerk unterhalten, weil "
-"telepathy-salut nicht installiert ist. Wenn Sie dieses Merkmal einschalten "
-"wollen, so installieren Sie bitte das Paket telepathy-salut\n"
+"telepathy-salut nicht installiert ist.\n"
+"Wenn Sie dieses Merkmal einschalten wollen, so installieren Sie bitte das "
+"Paket telepathy-salut\n"
 "und erstellen Sie ein Konto vom Typ »Personen in der Nähe« im Dialog »Konten«."
 
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1128
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut ist nicht installiert"
 
-#: ../src/empathy-account-assistant.c:1252
+#: ../src/empathy-account-assistant.c:1205
 msgid "Welcome to Empathy"
 msgstr "Willkommen bei Empathy"
 
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1214
 msgid "Import your existing accounts"
 msgstr "Bestehende Konten importieren"
 
-#: ../src/empathy-account-assistant.c:1279
+#: ../src/empathy-account-assistant.c:1232
 msgid "Please enter personal details"
 msgstr "Bitte geben Sie persönliche Informationen ein"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:66
+#: ../src/empathy-accounts-dialog.c:65
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Es sind nicht gespeicherte Änderungen zu Ihrem Konto »%s« vorhanden."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:70
+#: ../src/empathy-accounts-dialog.c:69
 msgid "Your new account has not been saved yet."
 msgstr "Ihr neues Konto ist noch nicht gespeichert worden."
 
-#: ../src/empathy-accounts-dialog.c:265 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:259 ../src/empathy-call-window.c:729
 msgid "Connecting…"
 msgstr "Verbindung wird aufgebaut …"
 
-#: ../src/empathy-accounts-dialog.c:292
+#: ../src/empathy-accounts-dialog.c:286
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Getrennt — %s"
 
-#: ../src/empathy-accounts-dialog.c:297
+#: ../src/empathy-accounts-dialog.c:291
 #, c-format
 msgid "Offline — %s"
 msgstr "Abgemeldet — %s"
 
-#: ../src/empathy-accounts-dialog.c:310
+#: ../src/empathy-accounts-dialog.c:304
 msgid "Offline — No Network Connection"
 msgstr "Abgemeldet — Keine Netzwerkverbindung"
 
-#: ../src/empathy-accounts-dialog.c:318
+#: ../src/empathy-accounts-dialog.c:312
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: ../src/empathy-accounts-dialog.c:329
+#: ../src/empathy-accounts-dialog.c:323
 msgid "Offline — Account Disabled"
 msgstr "Abgemeldet — Konto ist deaktiviert"
 
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:720
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2379,16 +2352,16 @@ msgstr ""
 "Ihre Änderungen verworfen. Sind Sie sicher, dass Sie\n"
 "fortfahren möchten?"
 
-#: ../src/empathy-accounts-dialog.c:1082
+#: ../src/empathy-accounts-dialog.c:1054
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Möchten Sie %s wirklich von Ihrem Rechner entfernen?"
 
-#: ../src/empathy-accounts-dialog.c:1086
+#: ../src/empathy-accounts-dialog.c:1058
 msgid "This will not remove your account on the server."
 msgstr "Dadurch wird Ihr Konto nicht vom Server entfernt."
 
-#: ../src/empathy-accounts-dialog.c:1316
+#: ../src/empathy-accounts-dialog.c:1286
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2397,7 +2370,7 @@ msgstr ""
 "Ihre Änderungen verworfen. Sind Sie sicher, dass Sie\n"
 "fortfahren möchten?"
 
-#: ../src/empathy-accounts-dialog.c:1863
+#: ../src/empathy-accounts-dialog.c:1829
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2407,7 +2380,7 @@ msgstr ""
 "fortfahren möchten?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1996
+#: ../src/empathy-accounts-dialog.c:1956
 msgid "Accounts"
 msgstr "Konten"
 
@@ -2626,35 +2599,35 @@ msgstr "Video-Vorschau"
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#: ../src/empathy-chat-window.c:437 ../src/empathy-chat-window.c:457
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ungelesen)"
 msgstr[1] "%s (%d ungelesen)"
 
-#: ../src/empathy-chat-window.c:448
+#: ../src/empathy-chat-window.c:449
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (und %u weitere)"
 msgstr[1] "%s (und %u weitere)"
 
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:465
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d von anderen ungelesen)"
 msgstr[1] "%s (%d von anderen ungelesene)"
 
-#: ../src/empathy-chat-window.c:473
+#: ../src/empathy-chat-window.c:474
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d von allen nicht gelesen)"
 msgstr[1] "%s (%d von allen nicht gelesene)"
 
-#: ../src/empathy-chat-window.c:684
+#: ../src/empathy-chat-window.c:685
 msgid "Typing a message."
 msgstr "Schreibt eine Nachricht."
 
@@ -2698,10 +2671,6 @@ msgstr "_Unterhaltung"
 msgid "_Detach Tab"
 msgstr "Reiter ab_trennen"
 
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
 #: ../src/empathy-chat-window.ui.h:12
 msgid "_Favorite Chat Room"
 msgstr "_Favorisierter Chatraum"
@@ -2975,23 +2944,23 @@ msgstr "Quelle"
 msgid "%s account"
 msgstr "%s-Konto"
 
-#: ../src/empathy-main-window.c:433
+#: ../src/empathy-main-window.c:430
 msgid "Reconnect"
 msgstr "Erneut verbinden"
 
-#: ../src/empathy-main-window.c:439
+#: ../src/empathy-main-window.c:436
 msgid "Edit Account"
 msgstr "Konto bearbeiten"
 
-#: ../src/empathy-main-window.c:445
+#: ../src/empathy-main-window.c:442
 msgid "Close"
 msgstr "Schließen"
 
-#: ../src/empathy-main-window.c:1028
+#: ../src/empathy-main-window.c:1025
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:1369
+#: ../src/empathy-main-window.c:1363
 msgid "Show and edit accounts"
 msgstr "Konten anzeigen und bearbeiten"
 
@@ -3313,7 +3282,7 @@ msgstr "_Position an meine Kontakte übermitteln"
 msgid "_Reduce location accuracy"
 msgstr "Positionsgenauigkeit ve_rringern"
 
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:175
 msgid "Respond"
 msgstr "Antworten"
 
@@ -3329,63 +3298,63 @@ msgstr "_Beenden"
 msgid "Contact Map View"
 msgstr "Kartenansicht mit Kontakten"
 
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1063
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/empathy-debug-window.c:1188
+#: ../src/empathy-debug-window.c:1185
 msgid "Debug Window"
 msgstr "Fehlerdiagnosefenster"
 
-#: ../src/empathy-debug-window.c:1268
+#: ../src/empathy-debug-window.c:1265
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1280
+#: ../src/empathy-debug-window.c:1277
 msgid "Level "
 msgstr "Stufe"
 
-#: ../src/empathy-debug-window.c:1300
+#: ../src/empathy-debug-window.c:1297
 msgid "Debug"
 msgstr "Fehlerdiagnose"
 
-#: ../src/empathy-debug-window.c:1306
+#: ../src/empathy-debug-window.c:1303
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1312 ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../src/empathy-debug-window.c:1318
+#: ../src/empathy-debug-window.c:1315
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../src/empathy-debug-window.c:1324
+#: ../src/empathy-debug-window.c:1321
 msgid "Critical"
 msgstr "Kritisch"
 
-#: ../src/empathy-debug-window.c:1330
+#: ../src/empathy-debug-window.c:1327
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1346
 msgid "Time"
 msgstr "Zeit"
 
-#: ../src/empathy-debug-window.c:1352
+#: ../src/empathy-debug-window.c:1349
 msgid "Domain"
 msgstr "Domäne"
 
-#: ../src/empathy-debug-window.c:1354
+#: ../src/empathy-debug-window.c:1351
 msgid "Category"
 msgstr "Kategorie"
 
-#: ../src/empathy-debug-window.c:1356
+#: ../src/empathy-debug-window.c:1353
 msgid "Level"
 msgstr "Stufe"
 
-#: ../src/empathy-debug-window.c:1388
+#: ../src/empathy-debug-window.c:1385
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3402,40 +3371,6 @@ msgstr "Teilnehmer einladen"
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Wählen Sie einen Kontakt für eine Einladung zur Unterhaltung:"
 
-#: ../src/empathy-accounts.c:196
-msgid ""
-"Try to import any recognized accounts and display an assistant if that fails"
-msgstr ""
-"Versuchen, erkannte Konten zu importieren und im Fall des Scheiterns einen "
-"Assistenten anzeigen"
-
-#: ../src/empathy-accounts.c:201
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"Keine Dialoge anzeigen, diverse Aufgaben ausführen (z.B. Importieren) und "
-"schließen"
-
-#: ../src/empathy-accounts.c:205
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"Anfänglich angegebenes Konto auswählen (z.B. gabble/jabber/"
-"foo_40example_2eorg0)"
-
-#: ../src/empathy-accounts.c:207
-msgid "<account-id>"
-msgstr "<Kontokennung>"
-
-#: ../src/empathy-accounts.c:215
-msgid "- Empathy Accounts"
-msgstr "- Empathy-Konten"
-
-#: ../src/empathy-accounts.c:231
-msgid " Accounts"
-msgstr "Konten"
-
-#~ msgid "Show the accounts dialog"
-#~ msgstr "Konten-Dialog anzeigen"
-
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "Die Fehlermeldung war: <span style=\"italic\">%s</span>"
 
@@ -3445,6 +3380,9 @@ msgstr "Konten"
 #~ msgid "Hidden"
 #~ msgstr "Versteckt"
 
+#~ msgid "What is your Windows Live user name?"
+#~ msgstr "Wie lautet Ihr Windows Live-Benutzername?"
+
 #~ msgid "Unsupported command"
 #~ msgstr "Nicht unterstützter Befehl"
 
@@ -3520,3 +3458,472 @@ msgstr "Konten"
 #~ "\n"
 #~ "Falls Sie sich dazu entschließen, das Konto später wieder hinzuzufügen, "
 #~ "werden diese weiterhin verfügbar sein."
+
+#~| msgid "_Next Tab"
+#~ msgid "_Next"
+#~ msgstr "_Nächste"
+
+#~ msgid "Add new"
+#~ msgstr "Neu hinzufügen"
+
+#~ msgid "Cr_eate"
+#~ msgstr "Er_stellen"
+
+#~ msgid "_Add..."
+#~ msgstr "_Hinzufügen …"
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "Ein _existierendes Konto verwenden"
+
+#~ msgid "account"
+#~ msgstr "Konto"
+
+#~ msgid "Conversations (%d)"
+#~ msgstr "Unterhaltungen (%d)"
+
+#~ msgid "_Contact"
+#~ msgstr "_Kontakt"
+
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s bietet Ihnen eine Einladung an"
+
+#~ msgid "An external application will be started to handle it."
+#~ msgstr ""
+#~ "Eine externe Anwendung wird gestartet, um dieses zu bearbeiten/anzunehmen."
+
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr ""
+#~ "Sie besitzen die benötigte externe Anwendung nicht, um dieses zu "
+#~ "bearbeiten/anzunehmen."
+
+#~ msgid "No error specified"
+#~ msgstr "Kein Fehler angegeben"
+
+#~ msgid "Unknown error"
+#~ msgstr "Unbekannter Fehler"
+
+#~ msgid "_Join..."
+#~ msgstr "_Beitreten …"
+
+#~ msgid "_New Conversation..."
+#~ msgstr "_Neue Unterhaltung …"
+
+#~ msgid "Allow _GPS usage"
+#~ msgstr "GPS-Verwendung erlauben"
+
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "Nutzung des Mobiltelefons erlauben"
+
+#~ msgid "Allow _network usage"
+#~ msgstr "Nutzung des Netzwerks erlauben"
+
+#~ msgid "Geoclue Settings"
+#~ msgstr "Geoclue-Einstellungen"
+
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "Anwendung für Dienst %s konnte nicht gestartet werden: %s"
+
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the needed "
+#~ "application to handle it"
+#~ msgstr ""
+#~ "Ihnen wurde eine Einladung für den Dienst %s angeboten, aber Sie besitzen "
+#~ "nicht die benötigte externe Anwendung, um diese zu bearbeiten/anzunehmen."
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Add Account"
+#~ msgstr "Konto hnzufügen"
+
+#~ msgid "Gmail"
+#~ msgstr "Gmail"
+
+#~ msgid "Import Accounts..."
+#~ msgstr "Benutzerkonten importieren …"
+
+#~ msgid "Settings"
+#~ msgstr "Einstellungen"
+
+#~ msgid "Type:"
+#~ msgstr "Typ:"
+
+#~ msgid "gtk-leave-fullscreen"
+#~ msgstr "gtk-leave-fullscreen"
+
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy Sofortnachrichtendienst"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "Passwort vergessen und den Eintrag löschen."
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>Netzwerk</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>Server</b>"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "Gewähltes IRC-Netzwerk bearbeiten"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "Gewähltes IRC-Netzwerk entfernen"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "_Rechtschreibung prüfen …"
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>Thema:</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "Gruppen-Chat"
+
+#~ msgid "Contact Information"
+#~ msgstr "Kontaktinformationen"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "Ich möchte Sie/Dich gerne zu meiner Kontaktliste hinzufügen."
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "Sorry, ich möchte Sie/Dich nicht mehr in meiner Kontaktliste."
+
+#~ msgid "<b>Contact</b>"
+#~ msgstr "<b>Kontakt</b>"
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>Gruppen</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "Kontaktinformationen"
+
+#~ msgid "Word"
+#~ msgstr "Wort"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "Vorschläge für das Wort"
+
+#~ msgid "Spell Checker"
+#~ msgstr "Rechtschreibprüfung"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "Vorschläge für das Wort:"
+
+#~ msgid "- Empathy Instant Messenger"
+#~ msgstr "- Empathy Sofortnachrichtendienst"
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>Neues Konto</b>"
+
+#~ msgid "New message from %s"
+#~ msgstr "Neue Nachricht von %s"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "Einladungs_nachricht:"
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "Sie wurden eingeladen, einer Chat-Konferenz beizutreten."
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "Raumfavoriten bearbeiten"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "Raum beim Start betreten"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr ""
+#~ "Beim Start von Empathy und einer Verbindung diesen Chatraum betreten"
+
+#~ msgid "N_ame:"
+#~ msgstr "_Name:"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_erver:"
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "Unbekannt"
+
+#~ msgid "\"%s\" receiving from %s"
+#~ msgstr "»%s« wird von %s empfangen"
+
+#~ msgid "\"%s\" sending to %s"
+#~ msgstr "»%s« wird an %s gesendet"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "Dateiübertragung abgebrochen: %s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "Unbekannt"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "Datei kann an diesem Ort nicht gespeichert werden"
+
+#~ msgid "Save file as..."
+#~ msgstr "Datei speichern unter …"
+
+#~ msgid "unknown size"
+#~ msgstr "Unbekannte Größe"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s möchte Ihnen eine Datei zusenden"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "Möchten Sie die Datei »%s« (%s) annehmen?"
+
+#~ msgid "_Accept"
+#~ msgstr "_Annehmen"
+
+#~ msgid "Join _New..."
+#~ msgstr "_Jetzt beitreten …"
+
+#~ msgid "Browse:"
+#~ msgstr "Durchsuchen:"
+
+#~ msgid "Join New"
+#~ msgstr "Jetzt beitreten"
+
+#~ msgid "Re_fresh"
+#~ msgstr "Auf_frischen"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr ""
+#~ "Diese Liste zeigt alle Chaträume an, die auf dem von Ihnen betretenen "
+#~ "Server vorhanden sind."
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>Kontaktliste</b>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr ""
+#~ "Benutzerbilder sind von den Benutzern ausgesuchte Bilder, die in der "
+#~ "Kontaktliste angezeigt werden"
+
+#~ msgid "Show _avatars"
+#~ msgstr "_Benutzerbilder anzeigen"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "Ko_mpakte Kontaktliste anzeigen"
+
+#~ msgid "Enable popup when contact is available"
+#~ msgstr "Popup aktivieren, falls Kontakt verfügbar ist"
+
+#~ msgid "Whether or not to show a popup when a contact becomes available."
+#~ msgstr ""
+#~ "Legt fest, ob ein Popup angezeigt werden soll, wenn ein Kontakt verfügbar "
+#~ "wird."
+
+#~ msgid "End this call?"
+#~ msgstr "Anruf beenden?"
+
+#~ msgid "Closing this window will end the call in progress."
+#~ msgstr "Das Schließen dieses Fensters beendet den momentanen Anruf."
+
+#~ msgid "Readying"
+#~ msgstr "Vorbereiten"
+
+#~ msgid "Ringing"
+#~ msgstr "Klingeln"
+
+#~ msgid ""
+#~ "Incoming call from %s rejected because there is already a running call."
+#~ msgstr ""
+#~ "Eingehender Anruf von %s wurde abgewiesen, da bereits ein Telefonat "
+#~ "besteht."
+
+#~ 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>Nummernblock</b>"
+
+#~ msgid "<b>Volume</b>"
+#~ msgstr "<b>Lautstärke</b>"
+
+#~ msgid "Enable sound when busy"
+#~ msgstr "Klänge bei Beschäftigung aktivieren"
+
+#~ msgid "Invitation Error"
+#~ msgstr "Einladungsfehler"
+
+#~ msgid "<b>Audio</b>"
+#~ msgstr "<b>Klang</b>"
+
+#~ msgid "<b>Visual</b>"
+#~ msgstr "<b>Visuell</b>"
+
+#~ msgid "Enable sounds when _busy"
+#~ msgstr "Klänge bei _Beschäftigung aktivieren"
+
+#~ msgid "Configure Telepathy account settings"
+#~ msgstr "Telepathy-Kontoeinstellungen bearbeiten"
+
+#~ msgid "J_apan server:"
+#~ msgstr "J_apan-Server:"
+
+#~ msgid "Invalid handle"
+#~ msgstr "Ungültiger Handler"
+
+#~ msgid "No matching connection"
+#~ msgstr "Keine passende Verbindung"
+
+#~ msgid "Invalid account"
+#~ msgstr "Ungültiges Konto"
+
+#~ msgid "Presence failure"
+#~ msgstr "Anwesenheitsfehler"
+
+#~ msgid "Lowmem"
+#~ msgstr "Lowmem-Fehler"
+
+#~ msgid "Channel request generic error"
+#~ msgstr "Allgemeiner Fehler bei der Anfrage nach einem Raum"
+
+#~ msgid "Channel banned"
+#~ msgstr "Raum gesperrt"
+
+#~ msgid "Channel full"
+#~ msgstr "Raum bereits voll"
+
+#~ msgid "Channel invite only"
+#~ msgstr "Zugang zum Raum nur auf Einladung"
+
+#~ msgid "Unknown error code"
+#~ msgstr "Unbekannter Fehler"
+
+#~ 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 ""
+#~ "Um ein neues Konto hinzuzufügen klicken Sie auf den »Hinzufügen«-Knopf. "
+#~ "Ein neuer Eintrag wird nun für Sie erstellt, der danach bearbeitet werden "
+#~ "kann."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "If you do not want to add an account, simply click on the account you "
+#~ "want to configure in the list on the left."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Falls Sie kein neues Konto erstellen möchten klicken Sie einfach in der "
+#~ "Liste links auf das Konto, welches Sie bearbeiten möchten."
+
+#~ msgid "<b>No Accounts Configured</b>"
+#~ msgstr "<b>Keine Konten konfiguriert</b>"
+
+#~ msgid ""
+#~ "To add a new account, you can click on the 'Add' button and a new entry "
+#~ "will be created for you to started configuring.\n"
+#~ "\n"
+#~ "If you do not want to add an account, simply click on the account you "
+#~ "want to configure in the list on the left."
+#~ msgstr ""
+#~ "Um ein neues Konto hinzuzufügen klicken Sie auf den »Hinzufügen«-Knopf. "
+#~ "Ein neuer Eintrag wird nun für Sie erstellt, der danach bearbeitet werden "
+#~ "kann.\n"
+#~ "\n"
+#~ "Falls Sie kein neues Konto erstellen möchten klicken Sie einfach in der "
+#~ "Liste links auf das Konto, welches Sie bearbeiten möchten."
+
+#~ msgid "msn account settings"
+#~ msgstr "MSN-Kontoeinstellungen"
+
+#~ msgid "Disable"
+#~ msgstr "Deaktivieren"
+
+#~ msgid "Input"
+#~ msgstr "Eingang"
+
+#~ msgid "Mute"
+#~ msgstr "Stummschalten"
+
+#~ msgid "Output"
+#~ msgstr "Ausgang"
+
+#~ msgid "Ca_ll"
+#~ msgstr "Anr_ufen"
+
+#~ msgid "Change _Topic..."
+#~ msgstr "Thema _ändern …"
+
+#~ msgid "Contact Infor_mation"
+#~ msgstr "Kontakt_informationen"
+
+#~ msgid "Cu_t"
+#~ msgstr "_Ausschneiden"
+
+#~ msgid "In_vite..."
+#~ msgstr "Einla_den …"
+
+#~ msgid "_Add To Favorites"
+#~ msgstr "Zu Favoriten hinzu_fügen"
+
+#~ msgid "_Copy"
+#~ msgstr "_Kopieren"
+
+#~ msgid "View contact information"
+#~ msgstr "Kontaktinformationen anschauen"
+
+#~ msgid "Re_name"
+#~ msgstr "Umbe_nennen"
+
+#~ msgid "Edit the groups and name for this contact"
+#~ msgstr "Gruppen und Namen für diesen Kontakt bearbeiten"
+
+#~ msgid "Invite to a currently open chat room"
+#~ msgstr "In einen momentan geöffneten Chatraum einladen"
+
+#~ msgid "View previous conversations with this contact"
+#~ msgstr "Vorherige Unterhaltungen mit diesem Kontakt anschauen"
+
+#~ msgid "Start a voice or video conversation with this contact"
+#~ msgstr "Eine Sprach- oder Videobildunterhaltung mit diesem Kontakt beginnen"
+
+#~ msgid "Enter the new topic you want to set for this room:"
+#~ msgstr ""
+#~ "Geben Sie das neue Thema ein, dass Sie für diesen Raum setzen möchten:"
+
+#~ msgid "_New Message..."
+#~ msgstr "_Neue Nachricht …"
+
+#~ msgid "_Use for chat rooms"
+#~ msgstr "Für Chaträume _benutzen"
diff --git a/src/Makefile.am b/src/Makefile.am
index 9460fc9..3f8d157 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,7 @@ CPPFLAGS_COMMON =					\
 AM_LDFLAGS = -lm
 AM_CPPFLAGS =						\
 	$(CPPFLAGS_COMMON)				\
+	$(TPL_CFLAGS)					\
 	$(LIBNOTIFY_CFLAGS)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
 	$(WEBKIT_CFLAGS)				\
@@ -22,6 +23,7 @@ LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
 	$(top_builddir)/extensions/libemp-extensions.la		\
+	$(TPL_LIBS)						\
 	$(LIBNOTIFY_LIBS)					\
 	$(EMPATHY_LIBS)						\
 	$(LIBCHAMPLAIN_LIBS)					\
diff --git a/src/empathy.c b/src/empathy.c
index 308ea21..afc0acf 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -44,6 +44,13 @@
 #include <telepathy-glib/connection-manager.h>
 #include <telepathy-glib/interfaces.h>
 
+#ifdef ENABLE_TPL
+#include <telepathy-logger/log-manager.h>
+#include <telepathy-logger/log-store-empathy.h>
+#else
+
+#include <libempathy/empathy-log-manager.h>
+#endif /* ENABLE_TPL */
 #include <libempathy/empathy-idle.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-call-factory.h>
@@ -53,7 +60,6 @@
 #include <libempathy/empathy-connection-managers.h>
 #include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-dispatch-operation.h>
-#include <libempathy/empathy-log-manager.h>
 #include <libempathy/empathy-ft-factory.h>
 #include <libempathy/empathy-tp-chat.h>
 #include <libempathy/empathy-tp-call.h>
@@ -547,7 +553,11 @@ main (int argc, char *argv[])
   EmpathyStatusIcon *icon;
   EmpathyDispatcher *dispatcher;
   TpAccountManager *account_manager;
+#ifdef ENABLE_TPL
+  TplLogManager *log_manager;
+#else
   EmpathyLogManager *log_manager;
+#endif /* ENABLE_TPL */
   EmpathyChatroomManager *chatroom_manager;
   EmpathyCallFactory *call_factory;
   EmpathyFTFactory  *ft_factory;
@@ -560,7 +570,7 @@ main (int argc, char *argv[])
 
 #ifdef ENABLE_DEBUG
   TpDebugSender *debug_sender;
-#endif
+#endif /* ENABLE_TPL */
 
   GOptionContext *optcontext;
   GOptionEntry options[] = {
@@ -654,8 +664,12 @@ main (int argc, char *argv[])
       G_CALLBACK (unique_app_message_cb), window);
 
   /* Logging */
+#ifdef ENABLE_TPL
+  log_manager = tpl_log_manager_dup_singleton ();
+#else
   log_manager = empathy_log_manager_dup_singleton ();
   empathy_log_manager_observe (log_manager, dispatcher);
+#endif
 
   chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
   empathy_chatroom_manager_observe (chatroom_manager, dispatcher);
