diff options
| -rw-r--r-- | configure.ac | 28 | ||||
| -rw-r--r-- | libempathy-gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 183 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-menu.c | 18 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 533 | ||||
| -rw-r--r-- | libempathy/Makefile.am | 34 | ||||
| -rw-r--r-- | libempathy/empathy-contact.c | 30 | ||||
| -rw-r--r-- | libempathy/empathy-contact.h | 7 | ||||
| -rw-r--r-- | libempathy/empathy-log-manager.h | 4 | ||||
| -rw-r--r-- | libempathy/empathy-log-store-empathy.h | 4 | ||||
| -rw-r--r-- | libempathy/empathy-log-store.h | 4 | ||||
| -rw-r--r-- | libempathy/empathy-message.c | 78 | ||||
| -rw-r--r-- | libempathy/empathy-message.h | 6 | ||||
| -rw-r--r-- | po/de.po | 252 | ||||
| -rw-r--r-- | po/es.po | 248 | ||||
| -rw-r--r-- | po/et.po | 144 | ||||
| -rw-r--r-- | po/it.po | 187 | ||||
| -rw-r--r-- | po/sl.po | 256 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 2 | ||||
| -rw-r--r-- | src/empathy-debug-window.c | 36 | ||||
| -rw-r--r-- | src/empathy.c | 19 |
22 files changed, 1517 insertions, 560 deletions
diff --git a/configure.ac b/configure.ac index aabb7fe4d..abb05a4a1 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,7 @@ GLIB_REQUIRED=2.22.0 GTK_REQUIRED=2.18.0 GCONF_REQUIRED=1.2.0 TELEPATHY_GLIB_REQUIRED=0.9.2 +TELEPATHY_LOGGER=0.1.0 ENCHANT_REQUIRED=1.2.0 ISO_CODES_REQUIRED=0.35 LIBNOTIFY_REQUIRED=0.4.4 @@ -135,6 +136,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, + [ + libtelepathy-logger = $TELEPATHY_LOGGER + ]) + AC_SUBST(TPL_CFLAGS) + AC_SUBST(TPL_LIBS) +fi + + +# ----------------------------------------------------------- # Pkg-Config dependency checks # ----------------------------------------------------------- @@ -528,6 +553,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 674579a22..c9736ac43 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 1361840fa..edb2aabc3 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; @@ -100,6 +108,29 @@ typedef struct { /* TRUE if the pending messages can be displayed. This is to avoid to show * pending messages *before* messages from logs. (#603980) */ gboolean can_show_pending; + + /* FIXME: retrieving_backlogs flag is a workaround for Bug#610994 and should + * be differently handled since it introduces another race condition, which + * is really hard to occur, but still possible. + * + * With the current workaround (which has the race above), we need to be + * sure to ACK any pending messages only when the retrieval of backlogs is + * finished, that's why using retrieving_backlogs flag. + * empathy_chat_messages_read () will check this variable and not ACK + * anything when TRUE. It will be set TRUE at chat_constructed () and set + * back to FALSE when the backlog has been retrieved and the pending + * messages actually showed to the user. + * + * Race condition introduced with this workaround: + * Scenario: a message is pending, the user is notified and selects the tab. + * the tab with a pending message is focused before the messages are properly + * shown (since the preparation of the window is slower AND async WRT the + * tab showing), which means the user won't see any new messages (rare but + * possible), if he/she will change tab focus before the messages are + * properly shown, the tab will be set as 'seen' and the user won't be + * notified again about the already notified pending messages when the + * messages in tab will be properly shown */ + gboolean retrieving_backlogs; } EmpathyChatPriv; typedef struct { @@ -1708,31 +1739,128 @@ 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)) { return FALSE; } } - +#ifdef ENABLE_TPL + g_object_unref (message); +#endif 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); + goto out; + } + + 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); + +out: + /* in case of TPL error, skip backlog and show pending messages */ + priv->can_show_pending = TRUE; + show_pending_messages (chat); + + /* FIXME: See Bug#610994, we are forcing the ACK of the queue. See comments + * about it in EmpathyChatPriv definition */ + priv->retrieving_backlogs = FALSE; + empathy_chat_messages_read (chat); + + /* Turn back on scrolling */ + empathy_chat_view_scroll (chat->view, TRUE); +} +#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 +1872,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 +1890,18 @@ chat_add_logs (EmpathyChat *chat) /* Turn back on scrolling */ empathy_chat_view_scroll (chat->view, TRUE); +#else + priv->retrieving_backlogs = TRUE; + 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 +2187,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) { @@ -2293,8 +2414,12 @@ chat_constructed (GObject *object) if (priv->handle_type != TP_HANDLE_TYPE_ROOM) chat_add_logs (chat); +#ifndef ENABLE_TPL + /* When async API are involved, pending message are shown at the end of the + * callbacks' chain fired by chat_add_logs */ priv->can_show_pending = TRUE; show_pending_messages (chat); +#endif /* ENABLE_TPL */ } static void @@ -2437,7 +2562,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; @@ -2945,9 +3074,13 @@ empathy_chat_messages_read (EmpathyChat *self) g_return_if_fail (EMPATHY_IS_CHAT (self)); - if (priv->tp_chat != NULL) { - empathy_tp_chat_acknowledge_all_messages (priv->tp_chat); + /* FIXME: See Bug#610994, See comments about it in EmpathyChatPriv + * definition. If we are still retrieving the backlogs, do not ACK */ + if (priv->retrieving_backlogs) + return; + + if (priv->tp_chat != NULL ) { + empathy_tp_chat_acknowledge_all_messages (priv->tp_chat); } - priv->unread_messages = 0; } diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index 3d194fced..54bb4b286 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 f12abf374..7044d2e91 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 f6f0c0a23..1f1423952 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 = \ @@ -191,10 +204,13 @@ ircnetworks_DATA = \ EXTRA_DIST = \ empathy-marshal.list \ - $(stylesheet_DATA) \ $(dtd_DATA) \ $(ircnetworks_DATA) +if !ENABLE_TPL +EXTRA_DIST += $(stylesheet_DATA) +endif + CLEANFILES = \ $(BUILT_SOURCES) \ stamp-empathy-enum-types.h diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index a440ef23b..feba1c0b7 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,33 @@ 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); + + if (!EMP_STR_EMPTY (tpl_contact_get_avatar_token (tpl_contact))) + 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 2dd6bc0fb..231f95b9d 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 25f1b5fcd..4e4097dc7 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 e77076a5b..3b26d2ccf 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 94bc87386..185e38c93 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 0fe457886..a46d7d9a7 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,71 @@ 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. + */ + if (!TPL_IS_LOG_ENTRY_TEXT (logentry)) + return 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) { @@ -593,7 +666,12 @@ empathy_message_equal (EmpathyMessage *message1, EmpathyMessage *message2) priv1 = GET_PRIV (message1); priv2 = GET_PRIV (message2); +#ifdef ENABLE_TPL + if (priv1->timestamp == priv2->timestamp && + !tp_strdiff (priv1->body, priv2->body)) { +#else if (priv1->id == priv2->id && !tp_strdiff (priv1->body, priv2->body)) { +#endif /* ENABLE_TPL */ return TRUE; } diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h index 512869373..d8d0c9603 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); @@ -14,8 +14,8 @@ 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" +"POT-Creation-Date: 2010-02-26 08:49+0000\n" +"PO-Revision-Date: 2010-02-26 21:16+0100\n" "Last-Translator: Mario Blättermann <mariobl@gnome.org>\n" "Language-Team: Deutsch <gnome-de@gnome.org>\n" "MIME-Version: 1.0\n" @@ -268,13 +268,11 @@ msgstr "Erscheinungsbild für Chaträume verwenden" #: ../data/empathy.schemas.in.h:54 msgid "Whether Empathy can publish the user's location to their contacts." msgstr "" -"Legt fest, ob Empathy den Ort des Benutzers dessen Kontakten übermitteln " -"darf." +"Legt fest, ob Empathy den Ort des Benutzers dessen Kontakten übermitteln darf." #: ../data/empathy.schemas.in.h:55 msgid "Whether Empathy can use the GPS to guess the location." -msgstr "" -"Legt fest, ob Empathy das GPS nutzen darf, um den Standort zu schätzen." +msgstr "Legt fest, ob Empathy das GPS nutzen darf, um den Standort zu schätzen." #: ../data/empathy.schemas.in.h:56 msgid "Whether Empathy can use the cellular network to guess the location." @@ -395,19 +393,19 @@ msgstr "" #: ../data/empathy.schemas.in.h:76 msgid "Whether to show a popup notification when a contact goes offline." msgstr "" -"Legt fest, ob beim Abmelden eines Kontakts eine Benachrichtigung " -"eingeblendet werden soll." +"Legt fest, ob beim Abmelden eines Kontakts eine Benachrichtigung eingeblendet " +"werden soll." #: ../data/empathy.schemas.in.h:77 msgid "Whether to show a popup notification when a contact goes online." msgstr "" -"Legt fest, ob beim Anmelden eines Kontakts eine Benachrichtigung " -"eingeblendet werden soll." +"Legt fest, ob beim Anmelden eines Kontakts eine Benachrichtigung eingeblendet " +"werden soll." #: ../data/empathy.schemas.in.h:78 msgid "" -"Whether to show a popup notification when receiving a new message even if " -"the chat is already opened, but not focused." +"Whether to show a popup notification when receiving a new message even if the " +"chat is already opened, but not focused." msgstr "" "Legt fest, ob eine eine Benachrichtigung beim Empfang einer neuen Nachricht " "auch dann eingeblendet werden soll, wenn der Chat bereits geöffnet, aber " @@ -453,8 +451,8 @@ msgstr "Legt fest, ob die Kontaktliste im Kompaktmodus angezeigt werden soll." #: ../data/empathy.schemas.in.h:86 msgid "" -"Whether to show the message dialog about closing the main window with the " -"'x' button in the title bar." +"Whether to show the message dialog about closing the main window with the 'x' " +"button in the title bar." msgstr "" "Legt fest, ob der Dialog zum Schließen des Hauptfensters mit dem »x«-Knopf in " "der Titelleiste angezeigt werden soll." @@ -483,21 +481,21 @@ msgstr "Sofortnachrichten- und VoIP-Konten verwalten" msgid "Messaging and VoIP Accounts" msgstr "Sofortnachrichten- und VoIP-Konten" -#: ../libempathy/empathy-ft-handler.c:840 +#: ../libempathy/empathy-ft-handler.c:842 msgid "The hash of the received file and the sent one do not match" msgstr "" "Die Hash-Werte der empfangenen und der verschickten Datei stimmen nicht " "überein" -#: ../libempathy/empathy-ft-handler.c:1100 +#: ../libempathy/empathy-ft-handler.c:1102 msgid "File transfer not supported by remote contact" msgstr "Dateiübertragungen werden vom Gegenüber nicht unterstützt" -#: ../libempathy/empathy-ft-handler.c:1158 +#: ../libempathy/empathy-ft-handler.c:1160 msgid "The selected file is not a regular file" msgstr "Die ausgewählte Datei ist keine normale Datei" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1169 msgid "The selected file is empty" msgstr "Die ausgewählte Datei ist leer" @@ -926,8 +924,8 @@ msgid "" msgstr "" "Dies ist Ihr Benutzername, nicht Ihr gewöhnlicher Facebook-Anmeldename.\n" "Falls Sie facebook.com/<b>dachs</b> sind, geben Sie <b>dachs</b> ein.\n" -"Wählen Sie auf <a href=\"http://www.facebook.com/username/\">dieser Seite</" -"a> einen Facebook-Benutzernamen, falls Sie noch keinen besitzen." +"Wählen Sie auf <a href=\"http://www.facebook.com/username/\">dieser Seite</a> " +"einen Facebook-Benutzernamen, falls Sie noch keinen besitzen." #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 msgid "Use old SS_L" @@ -1173,149 +1171,153 @@ msgstr "Alle Dateien" msgid "Click to enlarge" msgstr "Zum Vergrößern klicken" -#: ../libempathy-gtk/empathy-chat.c:201 +#: ../libempathy-gtk/empathy-chat.c:232 msgid "Failed to reconnect this chat" -msgstr "" -"Verbindung für diese Unterhaltung konnte nicht wiederaufgenommen werden" +msgstr "Verbindung für diese Unterhaltung konnte nicht wiederaufgenommen werden" -#: ../libempathy-gtk/empathy-chat.c:623 +#: ../libempathy-gtk/empathy-chat.c:654 msgid "Failed to join chat room" msgstr "Beitritt in den Chatraum ist fehlgeschlagen" -#: ../libempathy-gtk/empathy-chat.c:641 +#: ../libempathy-gtk/empathy-chat.c:672 msgid "Failed to open private chat" msgstr "Eine private Unterhaltung konnte nicht geöffnet werden" -#: ../libempathy-gtk/empathy-chat.c:680 +#: ../libempathy-gtk/empathy-chat.c:711 msgid "Topic not supported on this conversation" msgstr "Ein Thema wird in dieser Unterhaltung nicht unterstützt" -#: ../libempathy-gtk/empathy-chat.c:686 +#: ../libempathy-gtk/empathy-chat.c:717 msgid "You are not allowed to change the topic" msgstr "Sie sind nicht berechtigt, das Thema zu ändern" -#: ../libempathy-gtk/empathy-chat.c:815 +#: ../libempathy-gtk/empathy-chat.c:846 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: Alle Nachrichten der aktuellen Unterhaltung löschen" -#: ../libempathy-gtk/empathy-chat.c:818 +#: ../libempathy-gtk/empathy-chat.c:849 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <Thema>: Das Thema der aktuellen Unterhaltung festlegen" -#: ../libempathy-gtk/empathy-chat.c:821 +#: ../libempathy-gtk/empathy-chat.c:852 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <Chatraum-Kennung>: Einem neuen Chatraum beitreten" -#: ../libempathy-gtk/empathy-chat.c:824 +#: ../libempathy-gtk/empathy-chat.c:855 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <Chatraum-Kennung>: Einem neuen Chatraum beitreten" -#: ../libempathy-gtk/empathy-chat.c:827 +#: ../libempathy-gtk/empathy-chat.c:858 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "" "/query <Kontaktkennung> [<Nachricht>]: Eine private Unterhaltung starten" -#: ../libempathy-gtk/empathy-chat.c:830 +#: ../libempathy-gtk/empathy-chat.c:861 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <Kontaktkennung> <Nachricht>: Eine private Unterhaltung starten" -#: ../libempathy-gtk/empathy-chat.c:833 +#: ../libempathy-gtk/empathy-chat.c:864 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <Spitzname>: Den Spitznamen auf dem aktuellen Server wechseln" -#: ../libempathy-gtk/empathy-chat.c:836 +#: ../libempathy-gtk/empathy-chat.c:867 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "" "/me <Nachricht>: Eine »ACTION«-Nachricht zur aktuellen Unterhaltung senden" -#: ../libempathy-gtk/empathy-chat.c:839 +#: ../libempathy-gtk/empathy-chat.c:870 msgid "" "/say <message>: send <message> to the current conversation. This is used to " -"send a message starting with a '/'. For example: \"/say /join is used to " -"join a new chat room\"" +"send a message starting with a '/'. For example: \"/say /join is used to join " +"a new chat room\"" msgstr "" "/say <Nachricht>: <Nachricht> zur aktuellen Unterhaltung senden. Es wird " "verwendet, um eine Nachricht zu senden, die mit »/« beginnt, wie z.B. »/say /" "join tritt einem Chatraum bei«" -#: ../libempathy-gtk/empathy-chat.c:844 +#: ../libempathy-gtk/empathy-chat.c:875 msgid "" -"/help [<command>]: show all supported commands. If <command> is defined, " -"show its usage." +"/help [<command>]: show all supported commands. If <command> is defined, show " +"its usage." msgstr "" "/help [<Befehl>]: Alle verfügbaren Befehle zeigen. Falls <Befehl> angegeben " "wird, so wird dessen Verwendung erklärt." -#: ../libempathy-gtk/empathy-chat.c:854 +#: ../libempathy-gtk/empathy-chat.c:885 #, c-format msgid "Usage: %s" msgstr "Aufruf: %s" -#: ../libempathy-gtk/empathy-chat.c:883 +#: ../libempathy-gtk/empathy-chat.c:914 msgid "Unknown command" msgstr "Unbekannter Befehl" -#: ../libempathy-gtk/empathy-chat.c:1004 +#: ../libempathy-gtk/empathy-chat.c:1035 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:1173 msgid "offline" msgstr "Abgemeldet" -#: ../libempathy-gtk/empathy-chat.c:1145 +#: ../libempathy-gtk/empathy-chat.c:1176 msgid "invalid contact" msgstr "Ungültiger Kontakt" -#: ../libempathy-gtk/empathy-chat.c:1148 +#: ../libempathy-gtk/empathy-chat.c:1179 msgid "permission denied" msgstr "Erlaubnis verweigert" -#: ../libempathy-gtk/empathy-chat.c:1151 +#: ../libempathy-gtk/empathy-chat.c:1182 msgid "too long message" msgstr "Zu lange Nachricht" -#: ../libempathy-gtk/empathy-chat.c:1154 +#: ../libempathy-gtk/empathy-chat.c:1185 msgid "not implemented" msgstr "Nicht implementiert" -#: ../libempathy-gtk/empathy-chat.c:1157 +#: ../libempathy-gtk/empathy-chat.c:1188 msgid "unknown" msgstr "Unbekannt" -#: ../libempathy-gtk/empathy-chat.c:1161 +#: ../libempathy-gtk/empathy-chat.c:1192 #, 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:1222 #, c-format msgid "Topic set to: %s" msgstr "Thema wurde gesetzt auf: %s" -#: ../libempathy-gtk/empathy-chat.c:1193 +#: ../libempathy-gtk/empathy-chat.c:1224 msgid "No topic defined" msgstr "Kein Thema gesetzt" -#: ../libempathy-gtk/empathy-chat.c:1592 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "(No Suggestions)" msgstr "(Keine Vorschläge)" -#: ../libempathy-gtk/empathy-chat.c:1646 +#: ../libempathy-gtk/empathy-chat.c:1677 msgid "Insert Smiley" msgstr "Emoticon einfügen" #. send button -#: ../libempathy-gtk/empathy-chat.c:1664 +#: ../libempathy-gtk/empathy-chat.c:1695 #: ../libempathy-gtk/empathy-ui-utils.c:1658 msgid "_Send" msgstr "_Senden" -#: ../libempathy-gtk/empathy-chat.c:1698 +#: ../libempathy-gtk/empathy-chat.c:1729 msgid "_Spelling Suggestions" msgstr "Vor_schläge zur Rechtschreibung" -#: ../libempathy-gtk/empathy-chat.c:1813 +#: ../libempathy-gtk/empathy-chat.c:1823 +#| msgid "Failed to open private chat" +msgid "Failed to retrieve recent logs" +msgstr "Letzte Protokolle konnten nicht geholt werden" + +#: ../libempathy-gtk/empathy-chat.c:1954 #, c-format msgid "%s has disconnected" msgstr "%s hat sich abgemeldet" @@ -1323,12 +1325,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:1961 #, 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:1964 #, c-format msgid "%s was kicked" msgstr "%s wurde rausgeworfen" @@ -1336,17 +1338,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:1972 #, 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:1975 #, c-format msgid "%s was banned" msgstr "%s wurde verbannt" -#: ../libempathy-gtk/empathy-chat.c:1838 +#: ../libempathy-gtk/empathy-chat.c:1979 #, c-format msgid "%s has left the room" msgstr "%s hat den Raum verlassen" @@ -1356,47 +1358,47 @@ 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:1988 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:1872 +#: ../libempathy-gtk/empathy-chat.c:2013 #, 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:2038 #, 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:2173 ../src/empathy-call-window.c:1531 msgid "Disconnected" msgstr "Getrennt" -#: ../libempathy-gtk/empathy-chat.c:2566 +#: ../libempathy-gtk/empathy-chat.c:2695 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:2696 msgid "Retry" msgstr "Wiederholen" -#: ../libempathy-gtk/empathy-chat.c:2572 +#: ../libempathy-gtk/empathy-chat.c:2701 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:2702 msgid "Join" msgstr "Beitreten" -#: ../libempathy-gtk/empathy-chat.c:2713 +#: ../libempathy-gtk/empathy-chat.c:2842 msgid "Connected" msgstr "Verbunden" -#: ../libempathy-gtk/empathy-chat.c:2766 -#: ../libempathy-gtk/empathy-log-window.c:548 +#: ../libempathy-gtk/empathy-chat.c:2895 +#: ../libempathy-gtk/empathy-log-window.c:707 msgid "Conversation" msgstr "Unterhaltung" @@ -1467,54 +1469,54 @@ msgstr "Möchten Sie wirklich den Kontakt »%s« entfernen?" msgid "Removing contact" msgstr "Kontakt entfernen" -#: ../libempathy-gtk/empathy-contact-menu.c:195 +#: ../libempathy-gtk/empathy-contact-menu.c:199 #: ../src/empathy-main-window.ui.h:14 msgid "_Add Contact…" msgstr "Kontakt _hinzufügen …" -#: ../libempathy-gtk/empathy-contact-menu.c:222 +#: ../libempathy-gtk/empathy-contact-menu.c:226 #: ../src/empathy-main-window.ui.h:15 msgid "_Chat" msgstr "_Chat" -#: ../libempathy-gtk/empathy-contact-menu.c:253 +#: ../libempathy-gtk/empathy-contact-menu.c:257 msgctxt "menu item" msgid "_Audio Call" msgstr "_Audioanruf" -#: ../libempathy-gtk/empathy-contact-menu.c:285 +#: ../libempathy-gtk/empathy-contact-menu.c:289 msgctxt "menu item" msgid "_Video Call" msgstr "_Videoanruf" -#: ../libempathy-gtk/empathy-contact-menu.c:324 +#: ../libempathy-gtk/empathy-contact-menu.c:340 #: ../src/empathy-main-window.ui.h:26 msgid "_Previous Conversations" msgstr "_Vorherige Unterhaltungen" -#: ../libempathy-gtk/empathy-contact-menu.c:346 +#: ../libempathy-gtk/empathy-contact-menu.c:362 msgid "Send file" msgstr "Datei senden" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:385 msgid "Share my desktop" msgstr "Meine Arbeitsumgebung freigeben" -#: ../libempathy-gtk/empathy-contact-menu.c:397 +#: ../libempathy-gtk/empathy-contact-menu.c:413 msgid "Infor_mation" msgstr "Infor_mationen" -#: ../libempathy-gtk/empathy-contact-menu.c:443 +#: ../libempathy-gtk/empathy-contact-menu.c:459 msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "_Bearbeiten" -#: ../libempathy-gtk/empathy-contact-menu.c:497 +#: ../libempathy-gtk/empathy-contact-menu.c:513 #: ../src/empathy-chat-window.c:865 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:544 msgid "_Invite to chat room" msgstr "In den Chatraum _einladen" @@ -1627,24 +1629,24 @@ msgstr "Breitengrad:" msgid "Altitude:" msgstr "Höhe:" -#: ../libempathy-gtk/empathy-contact-widget.c:584 +#: ../libempathy-gtk/empathy-contact-widget.c:585 #: ../src/empathy-preferences.ui.h:12 msgid "Location" msgstr "Position" -#: ../libempathy-gtk/empathy-contact-widget.c:600 +#: ../libempathy-gtk/empathy-contact-widget.c:601 msgid "<b>Location</b>, " msgstr "<b>Ort</b>" -#: ../libempathy-gtk/empathy-contact-widget.c:650 +#: ../libempathy-gtk/empathy-contact-widget.c:651 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y um %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:721 +#: ../libempathy-gtk/empathy-contact-widget.c:734 msgid "Save Avatar" msgstr "Benutzerbild speichern" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:790 msgid "Unable to save avatar" msgstr "Benutzerbild konnte nicht gespeichert werden" @@ -1733,12 +1735,12 @@ msgstr "Port" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:541 +#: ../libempathy-gtk/empathy-log-window.c:700 #: ../src/empathy-import-widget.c:310 msgid "Account" msgstr "Konto" -#: ../libempathy-gtk/empathy-log-window.c:558 +#: ../libempathy-gtk/empathy-log-window.c:717 msgid "Date" msgstr "Datum" @@ -2104,15 +2106,15 @@ msgstr "Keine Fehlermeldung" msgid "Instant Message (Empathy)" msgstr "Sofortnachricht (Empathy)" -#: ../src/empathy.c:569 +#: ../src/empathy.c:580 msgid "Don't connect on startup" msgstr "Nicht automatisch beim Start verbinden" -#: ../src/empathy.c:573 +#: ../src/empathy.c:584 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:596 msgid "- Empathy IM Client" msgstr "- Empathy Sofortnachrichtenprogramm" @@ -2125,15 +2127,14 @@ msgid "" msgstr "" "Empathy ist freie Software, Sie können sie weitergeben und/oder verändern " "solange Sie sich an die Regeln der GNU General Public License halten, so wie " -"sie von der Free Software Foundation festgelegt wurden; entweder in Version " -"2 der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz." +"sie von der Free Software Foundation festgelegt wurden; entweder in Version 2 " +"der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz." #: ../src/empathy-about-dialog.c:89 msgid "" "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -"details." +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR " +"A PARTICULAR PURPOSE. See the GNU General Public License for more details." msgstr "" "Empathy wurde mit dem Ziel veröffentlicht, dass Sie es nützlich finden, " "jedoch OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie der " @@ -2525,15 +2526,15 @@ msgstr "Es gab im Netzwerk einen Fehler" msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" -"Die für diesen Anruf erforderlichen Audioformate sind nicht auf Ihrem " -"Rechner installiert" +"Die für diesen Anruf erforderlichen Audioformate sind nicht auf Ihrem Rechner " +"installiert" #: ../src/empathy-call-window.c:1817 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" -"Die für diesen Anruf erforderlichen Videoformate sind nicht auf Ihrem " -"Rechner installiert" +"Die für diesen Anruf erforderlichen Videoformate sind nicht auf Ihrem Rechner " +"installiert" #: ../src/empathy-call-window.c:1827 #, c-format @@ -2791,8 +2792,7 @@ msgstr "%s lädt Sie ein, %s beizutreten" msgid "_Decline" msgstr "A_blehnen" -#: ../src/empathy-event-manager.c:595 -#: ../src/empathy-new-chatroom-dialog.ui.h:7 +#: ../src/empathy-event-manager.c:595 ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Beitreten" @@ -2950,8 +2950,8 @@ msgid "" "No accounts to import could be found. Empathy currently only supports " "importing accounts from Pidgin." msgstr "" -"Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur " -"den Import von Benutzerkonten aus Pidgin." +"Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur den " +"Import von Benutzerkonten aus Pidgin." #: ../src/empathy-import-dialog.c:199 msgid "Import Accounts" @@ -3333,59 +3333,59 @@ msgstr "Kartenansicht mit Kontakten" msgid "Save" msgstr "Speichern" -#: ../src/empathy-debug-window.c:1188 +#: ../src/empathy-debug-window.c:1219 msgid "Debug Window" msgstr "Fehlerdiagnosefenster" -#: ../src/empathy-debug-window.c:1268 +#: ../src/empathy-debug-window.c:1299 msgid "Pause" msgstr "Pause" -#: ../src/empathy-debug-window.c:1280 +#: ../src/empathy-debug-window.c:1311 msgid "Level " msgstr "Stufe" -#: ../src/empathy-debug-window.c:1300 +#: ../src/empathy-debug-window.c:1331 msgid "Debug" msgstr "Fehlerdiagnose" -#: ../src/empathy-debug-window.c:1306 +#: ../src/empathy-debug-window.c:1337 msgid "Info" msgstr "Info" -#: ../src/empathy-debug-window.c:1312 ../src/empathy-debug-window.c:1361 +#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392 msgid "Message" msgstr "Nachricht" -#: ../src/empathy-debug-window.c:1318 +#: ../src/empathy-debug-window.c:1349 msgid "Warning" msgstr "Warnung" -#: ../src/empathy-debug-window.c:1324 +#: ../src/empathy-debug-window.c:1355 msgid "Critical" msgstr "Kritisch" -#: ../src/empathy-debug-window.c:1330 +#: ../src/empathy-debug-window.c:1361 msgid "Error" msgstr "Fehler" -#: ../src/empathy-debug-window.c:1349 +#: ../src/empathy-debug-window.c:1380 msgid "Time" msgstr "Zeit" -#: ../src/empathy-debug-window.c:1352 +#: ../src/empathy-debug-window.c:1383 msgid "Domain" msgstr "Domäne" -#: ../src/empathy-debug-window.c:1354 +#: ../src/empathy-debug-window.c:1385 msgid "Category" msgstr "Kategorie" -#: ../src/empathy-debug-window.c:1356 +#: ../src/empathy-debug-window.c:1387 msgid "Level" msgstr "Stufe" -#: ../src/empathy-debug-window.c:1388 +#: ../src/empathy-debug-window.c:1424 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -3472,8 +3472,8 @@ msgstr "Konten" #~ msgid "" #~ "The contact to display in the applet. Empty means no contact is displayed." #~ msgstr "" -#~ "Der Kontakt, der im Applet angezeigt werden soll. Leer bedeutet, dass " -#~ "kein Kontakt angezeigt wird." +#~ "Der Kontakt, der im Applet angezeigt werden soll. Leer bedeutet, dass kein " +#~ "Kontakt angezeigt wird." #~ msgid "The contact's avatar token. Empty means contact has no avatar." #~ msgstr "" @@ -3512,8 +3512,8 @@ msgstr "Konten" #~ "Any associated conversations and chat rooms will NOT be removed if you " #~ "decide to proceed.\n" #~ "\n" -#~ "Should you decide to add the account back at a later time, they will " -#~ "still be available." +#~ "Should you decide to add the account back at a later time, they will still " +#~ "be available." #~ msgstr "" #~ "Jegliche zugehörigen Unterhaltungen und Chaträume werden NICHT entfernt, " #~ "wenn Sie fortfahren.\n" @@ -7,8 +7,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: 2010-02-17 10:08+0000\n" -"PO-Revision-Date: 2010-02-17 20:54+0100\n" +"POT-Creation-Date: 2010-02-26 08:49+0000\n" +"PO-Revision-Date: 2010-02-26 14:56+0100\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" @@ -470,19 +470,19 @@ msgstr "Gestionar las cuentas de mensajería y Voz IP" msgid "Messaging and VoIP Accounts" msgstr "Cuentas de mensajería y Voz IP" -#: ../libempathy/empathy-ft-handler.c:840 +#: ../libempathy/empathy-ft-handler.c:842 msgid "The hash of the received file and the sent one do not match" msgstr "El «hash» del archivo recibido y del enviado no coinciden" -#: ../libempathy/empathy-ft-handler.c:1100 +#: ../libempathy/empathy-ft-handler.c:1102 msgid "File transfer not supported by remote contact" msgstr "El contacto remoto no soporta la transferencia de archivos" -#: ../libempathy/empathy-ft-handler.c:1158 +#: ../libempathy/empathy-ft-handler.c:1160 msgid "The selected file is not a regular file" msgstr "El archivo seleccionado no es un archivo regular" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1169 msgid "The selected file is empty" msgstr "El archivo seleccionado está vacío" @@ -1159,59 +1159,59 @@ msgstr "Todos los archivos" msgid "Click to enlarge" msgstr "Pulse para agrandar" -#: ../libempathy-gtk/empathy-chat.c:201 +#: ../libempathy-gtk/empathy-chat.c:232 msgid "Failed to reconnect this chat" msgstr "Falló al reconectar a este chat" -#: ../libempathy-gtk/empathy-chat.c:623 +#: ../libempathy-gtk/empathy-chat.c:654 msgid "Failed to join chat room" msgstr "Falló al unirse a la sala de chat" -#: ../libempathy-gtk/empathy-chat.c:641 +#: ../libempathy-gtk/empathy-chat.c:672 msgid "Failed to open private chat" msgstr "Falló al abrir el chat privado" -#: ../libempathy-gtk/empathy-chat.c:680 +#: ../libempathy-gtk/empathy-chat.c:711 msgid "Topic not supported on this conversation" msgstr "El tema no está soportado en esta conversación" -#: ../libempathy-gtk/empathy-chat.c:686 +#: ../libempathy-gtk/empathy-chat.c:717 msgid "You are not allowed to change the topic" msgstr "No le está permitido cambiar el tema" -#: ../libempathy-gtk/empathy-chat.c:815 +#: ../libempathy-gtk/empathy-chat.c:846 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: limpiar todos los mensajes de la conversación actual" -#: ../libempathy-gtk/empathy-chat.c:818 +#: ../libempathy-gtk/empathy-chat.c:849 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <tema>: establecer el tema para la conversación actual" -#: ../libempathy-gtk/empathy-chat.c:821 +#: ../libempathy-gtk/empathy-chat.c:852 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <id de sala de chat>: unirse a una sala de chat nueva" -#: ../libempathy-gtk/empathy-chat.c:824 +#: ../libempathy-gtk/empathy-chat.c:855 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <id de sala de chat>: unirse a una sala de chat nueva" -#: ../libempathy-gtk/empathy-chat.c:827 +#: ../libempathy-gtk/empathy-chat.c:858 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado" -#: ../libempathy-gtk/empathy-chat.c:830 +#: ../libempathy-gtk/empathy-chat.c:861 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado" -#: ../libempathy-gtk/empathy-chat.c:833 +#: ../libempathy-gtk/empathy-chat.c:864 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <apodo>: cambiar su apodo en el servidor actual" -#: ../libempathy-gtk/empathy-chat.c:836 +#: ../libempathy-gtk/empathy-chat.c:867 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <mensaje>: enviar un mensaje de ACCIÓN a la conversación actual" -#: ../libempathy-gtk/empathy-chat.c:839 +#: ../libempathy-gtk/empathy-chat.c:870 msgid "" "/say <message>: send <message> to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1221,7 +1221,7 @@ msgstr "" "para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa " "para unirse a una sala de chat nueva»" -#: ../libempathy-gtk/empathy-chat.c:844 +#: ../libempathy-gtk/empathy-chat.c:875 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1229,76 +1229,81 @@ msgstr "" "/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está " "definido, muestra su uso." -#: ../libempathy-gtk/empathy-chat.c:854 +#: ../libempathy-gtk/empathy-chat.c:885 #, c-format msgid "Usage: %s" msgstr "Uso: %s" -#: ../libempathy-gtk/empathy-chat.c:883 +#: ../libempathy-gtk/empathy-chat.c:914 msgid "Unknown command" msgstr "Comando desconocido" -#: ../libempathy-gtk/empathy-chat.c:1004 +#: ../libempathy-gtk/empathy-chat.c:1035 msgid "Unknown command; see /help for the available commands" msgstr "Comando desconocido; consulte /help para ver los comandos disponibles" -#: ../libempathy-gtk/empathy-chat.c:1142 +#: ../libempathy-gtk/empathy-chat.c:1173 msgid "offline" msgstr "desconectado" -#: ../libempathy-gtk/empathy-chat.c:1145 +#: ../libempathy-gtk/empathy-chat.c:1176 msgid "invalid contact" msgstr "contacto no válido" -#: ../libempathy-gtk/empathy-chat.c:1148 +#: ../libempathy-gtk/empathy-chat.c:1179 msgid "permission denied" msgstr "permiso denegado" -#: ../libempathy-gtk/empathy-chat.c:1151 +#: ../libempathy-gtk/empathy-chat.c:1182 msgid "too long message" msgstr "mensaje demasiado largo" -#: ../libempathy-gtk/empathy-chat.c:1154 +#: ../libempathy-gtk/empathy-chat.c:1185 msgid "not implemented" msgstr "no implementado" -#: ../libempathy-gtk/empathy-chat.c:1157 +#: ../libempathy-gtk/empathy-chat.c:1188 msgid "unknown" msgstr "desconocido" -#: ../libempathy-gtk/empathy-chat.c:1161 +#: ../libempathy-gtk/empathy-chat.c:1192 #, c-format msgid "Error sending message '%s': %s" msgstr "Error al enviar el mensaje «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:1191 +#: ../libempathy-gtk/empathy-chat.c:1222 #, c-format msgid "Topic set to: %s" msgstr "El tema se ha establecido a: %s" -#: ../libempathy-gtk/empathy-chat.c:1193 +#: ../libempathy-gtk/empathy-chat.c:1224 msgid "No topic defined" msgstr "No se ha definido el tema" -#: ../libempathy-gtk/empathy-chat.c:1592 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "(No Suggestions)" msgstr "(Sin sugerencias)" -#: ../libempathy-gtk/empathy-chat.c:1646 +#: ../libempathy-gtk/empathy-chat.c:1677 msgid "Insert Smiley" msgstr "Insertar emoticono" #. send button -#: ../libempathy-gtk/empathy-chat.c:1664 +#: ../libempathy-gtk/empathy-chat.c:1695 #: ../libempathy-gtk/empathy-ui-utils.c:1658 msgid "_Send" msgstr "E_nviar" -#: ../libempathy-gtk/empathy-chat.c:1698 +#: ../libempathy-gtk/empathy-chat.c:1729 msgid "_Spelling Suggestions" msgstr "_Sugerencias ortográficas" -#: ../libempathy-gtk/empathy-chat.c:1813 +#: ../libempathy-gtk/empathy-chat.c:1823 +#| msgid "Failed to open private chat" +msgid "Failed to retrieve recent logs" +msgstr "Falló al recibir los registros recientes" + +#: ../libempathy-gtk/empathy-chat.c:1954 #, c-format msgid "%s has disconnected" msgstr "%s se ha desconectado" @@ -1306,12 +1311,12 @@ msgstr "%s se ha desconectado" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1820 +#: ../libempathy-gtk/empathy-chat.c:1961 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s expulsó a %1$s" -#: ../libempathy-gtk/empathy-chat.c:1823 +#: ../libempathy-gtk/empathy-chat.c:1964 #, c-format msgid "%s was kicked" msgstr "%s fue expulsado" @@ -1319,17 +1324,17 @@ msgstr "%s fue expulsado" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1831 +#: ../libempathy-gtk/empathy-chat.c:1972 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s vetó a %1$s" -#: ../libempathy-gtk/empathy-chat.c:1834 +#: ../libempathy-gtk/empathy-chat.c:1975 #, c-format msgid "%s was banned" msgstr "%s fue vetado" -#: ../libempathy-gtk/empathy-chat.c:1838 +#: ../libempathy-gtk/empathy-chat.c:1979 #, c-format msgid "%s has left the room" msgstr "%s ha dejado la sala" @@ -1339,47 +1344,47 @@ msgstr "%s ha dejado la sala" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1847 +#: ../libempathy-gtk/empathy-chat.c:1988 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:1872 +#: ../libempathy-gtk/empathy-chat.c:2013 #, c-format msgid "%s has joined the room" msgstr "%s ha entrado en la sala" -#: ../libempathy-gtk/empathy-chat.c:1897 +#: ../libempathy-gtk/empathy-chat.c:2038 #, c-format msgid "%s is now known as %s" msgstr "Ahora %s se llama %s" -#: ../libempathy-gtk/empathy-chat.c:2032 ../src/empathy-call-window.c:1531 +#: ../libempathy-gtk/empathy-chat.c:2173 ../src/empathy-call-window.c:1531 msgid "Disconnected" msgstr "Desconectado" -#: ../libempathy-gtk/empathy-chat.c:2566 +#: ../libempathy-gtk/empathy-chat.c:2695 msgid "Wrong password; please try again:" msgstr "Contraseña incorrecta; inténtelo de nuevo:" -#: ../libempathy-gtk/empathy-chat.c:2567 +#: ../libempathy-gtk/empathy-chat.c:2696 msgid "Retry" msgstr "Volver a intentarlo" -#: ../libempathy-gtk/empathy-chat.c:2572 +#: ../libempathy-gtk/empathy-chat.c:2701 msgid "This room is protected by a password:" msgstr "Esta sala está protegida por contraseña:" -#: ../libempathy-gtk/empathy-chat.c:2573 +#: ../libempathy-gtk/empathy-chat.c:2702 msgid "Join" msgstr "Unirse" -#: ../libempathy-gtk/empathy-chat.c:2713 +#: ../libempathy-gtk/empathy-chat.c:2842 msgid "Connected" msgstr "Conectado" -#: ../libempathy-gtk/empathy-chat.c:2766 -#: ../libempathy-gtk/empathy-log-window.c:548 +#: ../libempathy-gtk/empathy-chat.c:2895 +#: ../libempathy-gtk/empathy-log-window.c:707 msgid "Conversation" msgstr "Conversación" @@ -1450,54 +1455,54 @@ msgstr "¿Realmente quiere quitar el contacto «%s»?" msgid "Removing contact" msgstr "Quitando el contacto" -#: ../libempathy-gtk/empathy-contact-menu.c:195 +#: ../libempathy-gtk/empathy-contact-menu.c:199 #: ../src/empathy-main-window.ui.h:14 msgid "_Add Contact…" msgstr "_Añadir contacto…" -#: ../libempathy-gtk/empathy-contact-menu.c:222 +#: ../libempathy-gtk/empathy-contact-menu.c:226 #: ../src/empathy-main-window.ui.h:15 msgid "_Chat" msgstr "_Chat" -#: ../libempathy-gtk/empathy-contact-menu.c:253 +#: ../libempathy-gtk/empathy-contact-menu.c:257 msgctxt "menu item" msgid "_Audio Call" msgstr "Llamada de _sonido" -#: ../libempathy-gtk/empathy-contact-menu.c:285 +#: ../libempathy-gtk/empathy-contact-menu.c:289 msgctxt "menu item" msgid "_Video Call" msgstr "Llamada de _vídeo" -#: ../libempathy-gtk/empathy-contact-menu.c:324 +#: ../libempathy-gtk/empathy-contact-menu.c:340 #: ../src/empathy-main-window.ui.h:26 msgid "_Previous Conversations" msgstr "Conversaciones an_teriores" -#: ../libempathy-gtk/empathy-contact-menu.c:346 +#: ../libempathy-gtk/empathy-contact-menu.c:362 msgid "Send file" msgstr "Enviar archivo" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:385 msgid "Share my desktop" msgstr "Compartir mi escritorio" -#: ../libempathy-gtk/empathy-contact-menu.c:397 +#: ../libempathy-gtk/empathy-contact-menu.c:413 msgid "Infor_mation" msgstr "Infor_mación" -#: ../libempathy-gtk/empathy-contact-menu.c:443 +#: ../libempathy-gtk/empathy-contact-menu.c:459 msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "_Editar" -#: ../libempathy-gtk/empathy-contact-menu.c:497 +#: ../libempathy-gtk/empathy-contact-menu.c:513 #: ../src/empathy-chat-window.c:865 msgid "Inviting you to this room" msgstr "Invitándolo a esta sala" -#: ../libempathy-gtk/empathy-contact-menu.c:528 +#: ../libempathy-gtk/empathy-contact-menu.c:544 msgid "_Invite to chat room" msgstr "_Invitar a la sala de chat" @@ -1610,24 +1615,24 @@ msgstr "Latitud:" msgid "Altitude:" msgstr "Altitud:" -#: ../libempathy-gtk/empathy-contact-widget.c:584 +#: ../libempathy-gtk/empathy-contact-widget.c:585 #: ../src/empathy-preferences.ui.h:12 msgid "Location" msgstr "Ubicación geográfica" -#: ../libempathy-gtk/empathy-contact-widget.c:600 +#: ../libempathy-gtk/empathy-contact-widget.c:601 msgid "<b>Location</b>, " msgstr "<b>Ubicación</b>, " -#: ../libempathy-gtk/empathy-contact-widget.c:650 +#: ../libempathy-gtk/empathy-contact-widget.c:651 msgid "%B %e, %Y at %R UTC" msgstr "%e de %B de %Y a las %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:721 +#: ../libempathy-gtk/empathy-contact-widget.c:734 msgid "Save Avatar" msgstr "Guardar avatar" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:790 msgid "Unable to save avatar" msgstr "No se pudo guardar el avatar" @@ -1716,12 +1721,12 @@ msgstr "Puerto" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:541 +#: ../libempathy-gtk/empathy-log-window.c:700 #: ../src/empathy-import-widget.c:310 msgid "Account" msgstr "Cuenta" -#: ../libempathy-gtk/empathy-log-window.c:558 +#: ../libempathy-gtk/empathy-log-window.c:717 msgid "Date" msgstr "Fecha" @@ -2087,19 +2092,15 @@ msgstr "Sin mensaje de eeror" msgid "Instant Message (Empathy)" msgstr "Mensaje instantáneo (Empathy)" -#: ../src/empathy.c:583 +#: ../src/empathy.c:580 msgid "Don't connect on startup" msgstr "No conectarse automáticamente al inicio" -#: ../src/empathy.c:587 +#: ../src/empathy.c:584 msgid "Don't display the contact list or any other dialogs on startup" msgstr "No mostrar la lista de contactos o cualquier otro diálogo al inicio" -#: ../src/empathy.c:591 -msgid "Show the accounts dialog" -msgstr "Mostrar el diálogo de las cuentas" - -#: ../src/empathy.c:603 +#: ../src/empathy.c:596 msgid "- Empathy IM Client" msgstr "- Cliente de mensajería instantánea Empathy" @@ -2176,7 +2177,7 @@ msgstr "" "Editar." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1276 +#: ../src/empathy-account-assistant.c:1294 msgid "An error occurred" msgstr "Ocurrió un error" @@ -2190,31 +2191,31 @@ msgstr "Ocurrió un error" msgid "New %s account" msgstr "Cuenta de %s nueva" -#: ../src/empathy-account-assistant.c:496 +#: ../src/empathy-account-assistant.c:502 msgid "What kind of chat account do you have?" msgstr "¿Qué tipo de cuenta tiene?" -#: ../src/empathy-account-assistant.c:502 +#: ../src/empathy-account-assistant.c:508 msgid "Do you have any other chat accounts you want to set up?" msgstr "¿Tiene otras cuentas de chat que quiera configurar?" -#: ../src/empathy-account-assistant.c:508 +#: ../src/empathy-account-assistant.c:514 msgid "Enter your account details" msgstr "Introducir los detalles de su cuenta" -#: ../src/empathy-account-assistant.c:513 +#: ../src/empathy-account-assistant.c:519 msgid "What kind of chat account do you want to create?" msgstr "¿Qué tipo de cuenta quiere crear?" -#: ../src/empathy-account-assistant.c:519 +#: ../src/empathy-account-assistant.c:525 msgid "Do you want to create other chat accounts?" msgstr "¿Quiere crear otras cuentas de chat?" -#: ../src/empathy-account-assistant.c:526 +#: ../src/empathy-account-assistant.c:532 msgid "Enter the details for the new account" msgstr "Introducir los detalles para la cuenta nueva" -#: ../src/empathy-account-assistant.c:641 +#: ../src/empathy-account-assistant.c:647 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 " @@ -2225,41 +2226,41 @@ msgstr "" "Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un " "micrófono o una cámara web puede hacer incluso llamadas de sonido o vídeo." -#: ../src/empathy-account-assistant.c:658 +#: ../src/empathy-account-assistant.c:664 msgid "Do you have an account you've been using with another chat program?" msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?" -#: ../src/empathy-account-assistant.c:681 +#: ../src/empathy-account-assistant.c:687 msgid "Yes, import my account details from " msgstr "Sí, importar los detalles de mi cuenta desde " -#: ../src/empathy-account-assistant.c:702 +#: ../src/empathy-account-assistant.c:708 msgid "Yes, I'll enter my account details now" msgstr "Sí, introduciré ahora los detalles de mi cuenta" -#: ../src/empathy-account-assistant.c:724 +#: ../src/empathy-account-assistant.c:730 msgid "No, I want a new account" msgstr "No, quiero crear una cuenta nueva" -#: ../src/empathy-account-assistant.c:734 +#: ../src/empathy-account-assistant.c:740 msgid "No, I just want to see people online nearby for now" msgstr "No, por ahora sólo quiero ver la gente conectada cerca" -#: ../src/empathy-account-assistant.c:755 +#: ../src/empathy-account-assistant.c:761 msgid "Select the accounts you want to import:" msgstr "Seleccione las cuentas que quiere importar:" -#: ../src/empathy-account-assistant.c:839 +#: ../src/empathy-account-assistant.c:845 #: ../src/empathy-new-chatroom-dialog.c:541 #: ../src/empathy-new-chatroom-dialog.c:542 msgid "Yes" msgstr "Sí" -#: ../src/empathy-account-assistant.c:846 +#: ../src/empathy-account-assistant.c:852 msgid "No, that's all for now" msgstr "No, eso es todo por ahora" -#: ../src/empathy-account-assistant.c:1099 +#: ../src/empathy-account-assistant.c:1111 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 " @@ -2272,22 +2273,16 @@ msgstr "" "estos detalles posteriormente o desactivar esta característica usando el " "diálogo «Cuentas»." -#: ../src/empathy-account-assistant.c:1105 -#: ../src/empathy-account-assistant.c:1161 +#: ../src/empathy-account-assistant.c:1117 +#: ../src/empathy-account-assistant.c:1173 msgid "Edit->Accounts" msgstr "Editar->Cuentas" -#: ../src/empathy-account-assistant.c:1121 +#: ../src/empathy-account-assistant.c:1133 msgid "I don't want to enable this feature for now" msgstr "No quiero activar esta característica por ahora" -#: ../src/empathy-account-assistant.c:1157 -#| msgid "" -#| "You won't be able to chat with people connected to your local network, as " -#| "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 " +#: ../src/empathy-account-assistant.c:1169 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 " @@ -2299,19 +2294,19 @@ msgstr "" "instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde el " "diálogo Cuentas." -#: ../src/empathy-account-assistant.c:1163 +#: ../src/empathy-account-assistant.c:1175 msgid "telepathy-salut not installed" msgstr "telepathy-salut no está instalado" -#: ../src/empathy-account-assistant.c:1240 +#: ../src/empathy-account-assistant.c:1252 msgid "Welcome to Empathy" msgstr "Bienvenido a Empathy" -#: ../src/empathy-account-assistant.c:1249 +#: ../src/empathy-account-assistant.c:1261 msgid "Import your existing accounts" msgstr "Importar sus cuentas existentes" -#: ../src/empathy-account-assistant.c:1267 +#: ../src/empathy-account-assistant.c:1279 msgid "Please enter personal details" msgstr "Introduzca los detalles personales" @@ -3293,7 +3288,7 @@ msgstr "_Publicar mi ubicación a mis contactos" msgid "_Reduce location accuracy" msgstr "_Reducir la precisión de la ubicación" -#: ../src/empathy-status-icon.c:175 +#: ../src/empathy-status-icon.c:176 msgid "Respond" msgstr "Respuesta" @@ -3313,59 +3308,59 @@ msgstr "Vista del mapa de contactos" msgid "Save" msgstr "Guardar" -#: ../src/empathy-debug-window.c:1188 +#: ../src/empathy-debug-window.c:1219 msgid "Debug Window" msgstr "Depurar ventana" -#: ../src/empathy-debug-window.c:1268 +#: ../src/empathy-debug-window.c:1299 msgid "Pause" msgstr "Pausar" -#: ../src/empathy-debug-window.c:1280 +#: ../src/empathy-debug-window.c:1311 msgid "Level " msgstr "Nivel " -#: ../src/empathy-debug-window.c:1300 +#: ../src/empathy-debug-window.c:1331 msgid "Debug" msgstr "Depurar" -#: ../src/empathy-debug-window.c:1306 +#: ../src/empathy-debug-window.c:1337 msgid "Info" msgstr "Información" -#: ../src/empathy-debug-window.c:1312 ../src/empathy-debug-window.c:1361 +#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392 msgid "Message" msgstr "Mensaje" -#: ../src/empathy-debug-window.c:1318 +#: ../src/empathy-debug-window.c:1349 msgid "Warning" msgstr "Advertencia" -#: ../src/empathy-debug-window.c:1324 +#: ../src/empathy-debug-window.c:1355 msgid "Critical" msgstr "Crítico" -#: ../src/empathy-debug-window.c:1330 +#: ../src/empathy-debug-window.c:1361 msgid "Error" msgstr "Error" -#: ../src/empathy-debug-window.c:1349 +#: ../src/empathy-debug-window.c:1380 msgid "Time" msgstr "Hora" -#: ../src/empathy-debug-window.c:1352 +#: ../src/empathy-debug-window.c:1383 msgid "Domain" msgstr "Dominio" -#: ../src/empathy-debug-window.c:1354 +#: ../src/empathy-debug-window.c:1385 msgid "Category" msgstr "Categoría" -#: ../src/empathy-debug-window.c:1356 +#: ../src/empathy-debug-window.c:1387 msgid "Level" msgstr "Nivel" -#: ../src/empathy-debug-window.c:1388 +#: ../src/empathy-debug-window.c:1424 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -3410,6 +3405,9 @@ msgstr ": Cuentas en Empathy" msgid " Accounts" msgstr " Cuentas" +#~ msgid "Show the accounts dialog" +#~ msgstr "Mostrar el diálogo de las cuentas" + #~ msgid "The error message was: <span style=\"italic\">%s</span>" #~ msgstr "El mensaje de error fue: <span style=\"italic\">%s</span>" @@ -11,14 +11,16 @@ 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-01-29 12:17+0000\n" -"PO-Revision-Date: 2010-01-31 10:24+0300\n" +"POT-Creation-Date: 2010-02-26 08:49+0000\n" +"PO-Revision-Date: 2010-02-26 13:21+0300\n" "Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n" "Language-Team: Estonian <et@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Estonian\n" +"X-Poedit-Country: ESTONIA\n" msgid "Empathy" msgstr "Empathy" @@ -327,6 +329,12 @@ msgstr "" "juhul sorditakse kontaktid nime järgi. Väärtuse \"state\" korral toimub " "sortimine oleku järgi." +msgid "Manage Messaging and VoIP accounts" +msgstr "Sõnumi- ja VoIP kontode haldamine" + +msgid "Messaging and VoIP Accounts" +msgstr "Sõnumite ja VoIP kontod" + msgid "The hash of the received file and the sent one do not match" msgstr "Vastuvõetud faili ja saadetud faili räsi ei kattu" @@ -361,7 +369,7 @@ msgid "Error while trying to transfer the file" msgstr "Viga faili ülekandmisel" msgid "The other participant is unable to transfer the file" -msgstr "Vestluse teine osapool pole võimelie faili edastama" +msgstr "Vestluse teine osapool pole võimeline faili edastama" msgid "Unknown reason" msgstr "Tundmatu põhjus" @@ -478,6 +486,9 @@ msgstr "Kõik" msgid "%s:" msgstr "%s:" +msgid "Username:" +msgstr "Kasutajanimi:" + msgid "L_og in" msgstr "Logi _sisse" @@ -524,10 +535,10 @@ msgid "Screen _Name:" msgstr "Ekraani_nimi:" msgid "What is your AIM password?" -msgstr "Milline on sinu AIM-i parool?" +msgstr "Mis on sinu AIM-i parool?" msgid "What is your AIM screen name?" -msgstr "Milline on sinu AIM-i ekraaninimi?" +msgstr "Mis on sinu AIM-i ekraaninimi?" msgid "_Port:" msgstr "_Port:" @@ -542,10 +553,10 @@ msgid "Login I_D:" msgstr "Sisselogimise I_D:" msgid "What is your GroupWise User ID?" -msgstr "Milline on sinu GroupWise kasutaja ID?" +msgstr "Mis on sinu GroupWise kasutaja ID?" msgid "What is your GroupWise password?" -msgstr "Milline on sinu GroupWise parool?" +msgstr "Mis on sinu GroupWise parool?" msgid "<b>Example:</b> 123456789" msgstr "<b>Näide:</b> 123456789" @@ -554,10 +565,10 @@ msgid "ICQ _UIN:" msgstr "ICQ _UIN:" msgid "What is your ICQ UIN?" -msgstr "Milline on sinu ICQ UIN?" +msgstr "Mis on sinu ICQ UIN?" msgid "What is your ICQ password?" -msgstr "Milline on sinu ICQ parool?" +msgstr "Mis on sinu ICQ parool?" msgid "_Character set:" msgstr "_Kooditabel:" @@ -588,7 +599,7 @@ msgid "Options" msgstr "" msgid "None" -msgstr "Puuudub" +msgstr "Puudub" msgid "Character set:" msgstr "Kooditabel:" @@ -629,26 +640,43 @@ msgstr "_Tähtsus:" msgid "Reso_urce:" msgstr "_Vahend:" +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 "" +"See on sinu kasutajanimi, mitte tavaline Facebooki sisselogimise nimi.\n" +"Kui sinu leht on facebook.com/<b>hüüdnimi</b>, sisesta <b>hüüdnimi</b>.\n" +"Kui sul veel ei ole Facebooki kasutajanime, saad selle luua <a href=\"http://" +"www.facebook.com/username/\">siin lehel</a>." + msgid "Use old SS_L" msgstr "Kasutatakse _vana SSL-i" +msgid "What is your Facebook password?" +msgstr "Mis on sinu Facebooki parool?" + +msgid "What is your Facebook username?" +msgstr "Mis on sinu Facebooki kasutajanimi?" + msgid "What is your Google ID?" -msgstr "Milline on sinu Google ID?" +msgstr "Mis on sinu Google ID?" msgid "What is your Google password?" -msgstr "Milline on sinu Google parool?" +msgstr "Mis on sinu Google parool?" msgid "What is your Jabber ID?" -msgstr "Milline on sinu Jabberi ID?" +msgstr "Mis on sinu Jabberi ID?" msgid "What is your Jabber password?" -msgstr "Milline on sinu Jabberi parool?" +msgstr "Mis on sinu Jabberi parool?" msgid "What is your desired Jabber ID?" -msgstr "Milline on sinu poolt eelistatav Jabberi ID?" +msgstr "Mis on sinu poolt eelistatav Jabberi ID?" msgid "What is your desired Jabber password?" -msgstr "Milline on sinu poolt eelistatav Jabberi parool?" +msgstr "Mis on sinu poolt eelistatav Jabberi parool?" msgid "_Encryption required (TLS/SSL)" msgstr "_Krüpteeringu nõudmine (TLS/SSL)" @@ -660,10 +688,10 @@ msgid "<b>Example:</b> user@hotmail.com" msgstr "<b>Näide:</b> kasutaja@hotmail.com" msgid "What is your Windows Live ID?" -msgstr "Milline on sinu Windows Live ID?" +msgstr "Mis on sinu Windows Live ID?" msgid "What is your Windows Live password?" -msgstr "Milline on sinu Windows Live parool?" +msgstr "Mis on sinu Windows Live parool?" msgid "_E-mail address:" msgstr "_E-posti aadress:" @@ -747,7 +775,6 @@ msgstr "" msgid "Transport:" msgstr "Transport:" -#, fuzzy msgid "" "Update the registration binding if the external address for the client is " "discovered to be different from the local binding." @@ -763,10 +790,10 @@ msgstr "" "dokumendis RFC 3261." msgid "What is your SIP account password?" -msgstr "Milline on sinu SIP-konto parool?" +msgstr "Mis on sinu SIP-konto parool?" msgid "What is your SIP login ID?" -msgstr "Milline on sinu SIP-i sisselogimise ID?" +msgstr "Mis on sinu SIP-i sisselogimise ID?" msgid "_Username:" msgstr "_Kasutajanimi:" @@ -775,10 +802,10 @@ msgid "Use _Yahoo! Japan" msgstr "Jaapani _Yahoo! kasutamine" msgid "What is your Yahoo! ID?" -msgstr "Milline on sinu Yahoo! ID?" +msgstr "Mis on sinu Yahoo! ID?" msgid "What is your Yahoo! password?" -msgstr "Milline on sinu Yahoo! parool?" +msgstr "Mis on sinu Yahoo! parool?" msgid "Yahoo! I_D:" msgstr "Yahoo! I_D:" @@ -917,6 +944,9 @@ msgstr "_Saada" msgid "_Spelling Suggestions" msgstr "_Õigekirja soovitused" +msgid "Failed to retrieve recent logs" +msgstr "Hiljutiste logide avamine nurjus" + #, c-format msgid "%s has disconnected" msgstr "%s lahkus" @@ -1060,8 +1090,9 @@ msgstr "Minu töölauda jagatakse" msgid "Infor_mation" msgstr "_Andmed" +msgctxt "Edit contact (contextual menu)" msgid "_Edit" -msgstr "_Redaktor" +msgstr "_Muuda" msgid "Inviting you to this room" msgstr "Kutse sellesse tuppa" @@ -1399,13 +1430,13 @@ msgid "Croatian" msgstr "Kroaatia" msgid "Cyrillic" -msgstr "Kirillits" +msgstr "Kirillitsa" msgid "Cyrillic/Russian" -msgstr "Kirillits/Vene" +msgstr "Kirillitsa/Vene" msgid "Cyrillic/Ukrainian" -msgstr "Kirillits/Ukraina" +msgstr "Kirillitsa/Ukraina" msgid "Georgian" msgstr "Gruusia" @@ -1482,9 +1513,6 @@ msgstr "Käivitumisel ei ühenduta" msgid "Don't display the contact list or any other dialogs on startup" msgstr "Käivitumisel ei näidata kontaktide nimekirja ega teisi dialoogiaknaid" -msgid "Show the accounts dialog" -msgstr "Näita kontode nimekirja" - msgid "- Empathy IM Client" msgstr "- Empathy interneti sõnumivahetus" @@ -1554,7 +1582,6 @@ msgstr "" msgid "An error occurred" msgstr "Tekkis viga" -#. 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 @@ -1588,22 +1615,23 @@ msgid "" "programs. With a microphone or a webcam you can also have audio or video " "calls." msgstr "" -"Empathy abil saad suhelda internetis lähedal asuvate inimestega, samuti " -"sõprade ja kolleegidega, kes kasutavad Google Talki, AIM-i, Windows Live-i " -"või teisi rakendusi. Mikrofoni või veebikaameraga võid teha ka tavalisi või " +"Empathy abil saad suhelda lähinaabruses asuvate inimestega, samuti sõprade " +"ja kolleegidega, kes kasutavad Google Talk-i, AIM-i, Windows Live-i või " +"teisi rakendusi. Mikrofoni või veebikaameraga võid teha ka tavalisi või " "videokõnesid." msgid "Do you have an account you've been using with another chat program?" -msgstr "On sul juba mõne konto, mida sa mõne teise vestlusprogrammiga kasutad?" +msgstr "" +"Kas sul on juba mõni konto, mida sa mõne teise vestlusprogrammiga kasutad?" msgid "Yes, import my account details from " -msgstr "Jah, ma impordin oma konto üksikasjad allikast " +msgstr "Jah, impordi mu konto andmed rakendusest " msgid "Yes, I'll enter my account details now" -msgstr "Jah, ma määran nüüd oma konto üksikasjad" +msgstr "Jah, ma määran oma konto andmed ise" msgid "No, I want a new account" -msgstr "Ei, mulle on vaja uut kontot" +msgstr "Ei, ma tahan uut kontot" msgid "No, I just want to see people online nearby for now" msgstr "Ei, ma tahan lihtsalt näha, kes mu lähinaabruses asuvad" @@ -1636,16 +1664,14 @@ msgstr "Ma ei taha seda võimalust praegu lubada" msgid "" "You won't be able to chat with people connected to your local network, as " -"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 " +"telepathy-salut is not installed. If you want to enable this feature, please " +"install the telepathy-salut package and create a People Nearby account from " +"the Accounts dialog" msgstr "" "Kui telepathy-salut pole paigaldatud, ei saa sa vestelda kohtvõrgus olevate " -"inimestega.\n" -"Kui sa tahad seda võimalust kasutada, pead paigaldama telepathy-salut " -"paketi\n" -"ja looma kontode dialoogiaknas \"Lähedalasuvate inimeste\" konto." +"inimestega. Kui sa tahad seda võimalust kasutada, pead paigaldama telepathy-" +"salut paketi ja looma kontode dialoogiaknas \"Lähedalasuvate inimeste\" " +"konto." msgid "telepathy-salut not installed" msgstr "telepathy-salut pole paigaldatud" @@ -1948,6 +1974,9 @@ msgstr "_Vestlus" msgid "_Detach Tab" msgstr "_Haagi kaart lahti" +msgid "_Edit" +msgstr "_Redaktor" + msgid "_Favorite Chat Room" msgstr "_Lemmikjututuba" @@ -2484,3 +2513,26 @@ msgstr "Osalise kutsumine" msgid "Choose a contact to invite into the conversation:" msgstr "Vali kontakt, keda vestlusesse kutsuda:" + +msgid "" +"Try to import any recognized accounts and display an assistant if that fails" +msgstr "" +"Proovitakse importida kõik tuntud kontod ning selle nurjumisel kuvatakse " +"abiline" + +msgid "Don't display any dialogs; do any work (eg, importing) and exit" +msgstr "" +"Ei kuvata mingeid dialooge; sooritatakse ülesanne (nt. importimine) ja " +"väljutakse" + +msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" +msgstr "Alguses vali antud konto (nt. gabble/jabber/mingi_40näidis_2eorg0)" + +msgid "<account-id>" +msgstr "" + +msgid "- Empathy Accounts" +msgstr "- Empathy kontod" + +msgid " Accounts" +msgstr "Kontod" @@ -1,5 +1,5 @@ # Italian translation for Empaty -# Copyright (C) 2003-2008, 2009 The Free Software Foundation, Inc. +# Copyright (C) 2003-2008, 2009, 2010 The Free Software Foundation, Inc. # This file is distributed under the same license as the Empaty package. # Fabio Bonelli <fabiobonelli@libero.it>, 2003 # Michele Baldessari <michele@pupazzo.org>, 2003 @@ -9,10 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Empathy\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=empathy&component=general\n" -"POT-Creation-Date: 2010-02-22 14:47+0000\n" -"PO-Revision-Date: 2010-02-17 22:36+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-02-26 21:19+0100\n" +"PO-Revision-Date: 2010-02-26 21:19+0100\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "MIME-Version: 1.0\n" @@ -485,21 +484,21 @@ msgid "Messaging and VoIP Accounts" msgstr "Account di messaggistica e VoIP" # (ndt) metto 'codice di controllo' anche se è molto libera, ma se è visibile all'utente, forse è più comprensibile -#: ../libempathy/empathy-ft-handler.c:840 +#: ../libempathy/empathy-ft-handler.c:842 msgid "The hash of the received file and the sent one do not match" msgstr "" "Il codice di controllo del file ricevuto e di quello inviato non " "corrispondono" -#: ../libempathy/empathy-ft-handler.c:1100 +#: ../libempathy/empathy-ft-handler.c:1102 msgid "File transfer not supported by remote contact" msgstr "Il trasferimento di file non è supportato dal contatto remoto" -#: ../libempathy/empathy-ft-handler.c:1158 +#: ../libempathy/empathy-ft-handler.c:1160 msgid "The selected file is not a regular file" msgstr "Il file selezionato non è un file regolare" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1169 msgid "The selected file is empty" msgstr "Il file selezionato è vuoto" @@ -1199,59 +1198,59 @@ msgstr "Tutti i file" msgid "Click to enlarge" msgstr "Clic per ingrandire" -#: ../libempathy-gtk/empathy-chat.c:201 +#: ../libempathy-gtk/empathy-chat.c:232 msgid "Failed to reconnect this chat" msgstr "Riconnessione della conversazione non riuscita" -#: ../libempathy-gtk/empathy-chat.c:623 +#: ../libempathy-gtk/empathy-chat.c:654 msgid "Failed to join chat room" msgstr "Ingresso nella stanza non riuscito" -#: ../libempathy-gtk/empathy-chat.c:641 +#: ../libempathy-gtk/empathy-chat.c:672 msgid "Failed to open private chat" msgstr "Apertura della conversazione privata non riuscita" -#: ../libempathy-gtk/empathy-chat.c:680 +#: ../libempathy-gtk/empathy-chat.c:711 msgid "Topic not supported on this conversation" msgstr "Argomento non supportato in questa conversazione" -#: ../libempathy-gtk/empathy-chat.c:686 +#: ../libempathy-gtk/empathy-chat.c:717 msgid "You are not allowed to change the topic" msgstr "Non si è autorizzati a modificare l'argomento" -#: ../libempathy-gtk/empathy-chat.c:815 +#: ../libempathy-gtk/empathy-chat.c:846 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: pulisce tutti i messaggi dalla conversazione attuale" -#: ../libempathy-gtk/empathy-chat.c:818 +#: ../libempathy-gtk/empathy-chat.c:849 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <argomento>: imposta l'argomento per la conversazione attuale" -#: ../libempathy-gtk/empathy-chat.c:821 +#: ../libempathy-gtk/empathy-chat.c:852 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <ID stanza>: entra in una nuova stanza" -#: ../libempathy-gtk/empathy-chat.c:824 +#: ../libempathy-gtk/empathy-chat.c:855 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <ID stanza>: entra in una nuova stanza" -#: ../libempathy-gtk/empathy-chat.c:827 +#: ../libempathy-gtk/empathy-chat.c:858 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <ID contatto> [<messaggio>]: apre una conversazione privata" -#: ../libempathy-gtk/empathy-chat.c:830 +#: ../libempathy-gtk/empathy-chat.c:861 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <ID contatto> <messaggio>: apre una conversazione privata" -#: ../libempathy-gtk/empathy-chat.c:833 +#: ../libempathy-gtk/empathy-chat.c:864 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <soprannome>: modifica il proprio soprannome sul server attuale" -#: ../libempathy-gtk/empathy-chat.c:836 +#: ../libempathy-gtk/empathy-chat.c:867 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <messaggio>: invia un messaggio ACTION alla conversazione attuale" -#: ../libempathy-gtk/empathy-chat.c:839 +#: ../libempathy-gtk/empathy-chat.c:870 msgid "" "/say <message>: send <message> to the current conversation. This is used to " "send a message starting with a '/'. For example: \"/say /join is used to " @@ -1261,7 +1260,7 @@ msgstr "" "inviare un messaggio che inizia con «/». Per esempio: \"/say /join è usato " "per entrare in una nuova stanza\"" -#: ../libempathy-gtk/empathy-chat.c:844 +#: ../libempathy-gtk/empathy-chat.c:875 msgid "" "/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." @@ -1269,77 +1268,81 @@ msgstr "" "/help [<comando>]: mostra tutti i comandi supportati. Se <comando> è " "definito, ne mostra l'uso." -#: ../libempathy-gtk/empathy-chat.c:854 +#: ../libempathy-gtk/empathy-chat.c:885 #, c-format msgid "Usage: %s" msgstr "Uso: %s" -#: ../libempathy-gtk/empathy-chat.c:883 +#: ../libempathy-gtk/empathy-chat.c:914 msgid "Unknown command" msgstr "Comando sconosciuto" -#: ../libempathy-gtk/empathy-chat.c:1004 +#: ../libempathy-gtk/empathy-chat.c:1035 msgid "Unknown command; see /help for the available commands" msgstr "Comando sconosciuto. Provare /help per i comandi disponibili." -#: ../libempathy-gtk/empathy-chat.c:1142 +#: ../libempathy-gtk/empathy-chat.c:1173 msgid "offline" msgstr "fuori rete" -#: ../libempathy-gtk/empathy-chat.c:1145 +#: ../libempathy-gtk/empathy-chat.c:1176 msgid "invalid contact" msgstr "contatto non valido" -#: ../libempathy-gtk/empathy-chat.c:1148 +#: ../libempathy-gtk/empathy-chat.c:1179 msgid "permission denied" msgstr "permesso negato" -#: ../libempathy-gtk/empathy-chat.c:1151 +#: ../libempathy-gtk/empathy-chat.c:1182 msgid "too long message" msgstr "messaggio troppo lungo" -#: ../libempathy-gtk/empathy-chat.c:1154 +#: ../libempathy-gtk/empathy-chat.c:1185 msgid "not implemented" msgstr "non implementato" -#: ../libempathy-gtk/empathy-chat.c:1157 +#: ../libempathy-gtk/empathy-chat.c:1188 msgid "unknown" msgstr "sconosciuto" -#: ../libempathy-gtk/empathy-chat.c:1161 +#: ../libempathy-gtk/empathy-chat.c:1192 #, c-format msgid "Error sending message '%s': %s" msgstr "Errore nell'inviare il messaggio «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:1191 +#: ../libempathy-gtk/empathy-chat.c:1222 #, c-format msgid "Topic set to: %s" msgstr "Argomento impostato a: %s" -#: ../libempathy-gtk/empathy-chat.c:1193 +#: ../libempathy-gtk/empathy-chat.c:1224 msgid "No topic defined" msgstr "Nessun argomento definito" -#: ../libempathy-gtk/empathy-chat.c:1592 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "(No Suggestions)" msgstr "(Nessun suggerimento)" -#: ../libempathy-gtk/empathy-chat.c:1646 +#: ../libempathy-gtk/empathy-chat.c:1677 msgid "Insert Smiley" msgstr "Inserisci faccina" #. send button -#: ../libempathy-gtk/empathy-chat.c:1664 +#: ../libempathy-gtk/empathy-chat.c:1695 #: ../libempathy-gtk/empathy-ui-utils.c:1658 msgid "_Send" msgstr "_Invia" -#: ../libempathy-gtk/empathy-chat.c:1698 +#: ../libempathy-gtk/empathy-chat.c:1729 msgid "_Spelling Suggestions" msgstr "_Suggerimenti ortografici" +#: ../libempathy-gtk/empathy-chat.c:1823 +msgid "Failed to retrieve recent logs" +msgstr "Recupero dei registri non riuscito" + # (ndt) messa così per renderla asessuale -#: ../libempathy-gtk/empathy-chat.c:1813 +#: ../libempathy-gtk/empathy-chat.c:1954 #, c-format msgid "%s has disconnected" msgstr "L'utente %s si è disconnesso" @@ -1347,13 +1350,13 @@ msgstr "L'utente %s si è disconnesso" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1820 +#: ../libempathy-gtk/empathy-chat.c:1961 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s ha espulso %1$s" # (ndt) messa così per renderla asessuale -#: ../libempathy-gtk/empathy-chat.c:1823 +#: ../libempathy-gtk/empathy-chat.c:1964 #, c-format msgid "%s was kicked" msgstr "L'utente %s è stato espulso" @@ -1361,19 +1364,19 @@ msgstr "L'utente %s è stato espulso" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1831 +#: ../libempathy-gtk/empathy-chat.c:1972 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s ha bandito %1$s" # (ndt) messa così per renderla asessuale -#: ../libempathy-gtk/empathy-chat.c:1834 +#: ../libempathy-gtk/empathy-chat.c:1975 #, c-format msgid "%s was banned" msgstr "L'utente %s è stato bandito" # (ndt) messa così per renderla asessuale -#: ../libempathy-gtk/empathy-chat.c:1838 +#: ../libempathy-gtk/empathy-chat.c:1979 #, c-format msgid "%s has left the room" msgstr "L'utente %s ha lasciato la stanza" @@ -1383,51 +1386,51 @@ msgstr "L'utente %s ha lasciato la stanza" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1847 +#: ../libempathy-gtk/empathy-chat.c:1988 #, c-format msgid " (%s)" msgstr "(%s)" # (ndt) per renderla "asessuale" -#: ../libempathy-gtk/empathy-chat.c:1872 +#: ../libempathy-gtk/empathy-chat.c:2013 #, c-format msgid "%s has joined the room" msgstr "L'utente %s è entrato nella stanza" # (ndt) per cercare di stare "asessuali" -#: ../libempathy-gtk/empathy-chat.c:1897 +#: ../libempathy-gtk/empathy-chat.c:2038 #, c-format msgid "%s is now known as %s" msgstr "L'utente %s è ora conosciuto come %s" # (ndt) plurale per comprendere uomini e donne -#: ../libempathy-gtk/empathy-chat.c:2032 ../src/empathy-call-window.c:1531 +#: ../libempathy-gtk/empathy-chat.c:2173 ../src/empathy-call-window.c:1531 msgid "Disconnected" msgstr "Disconnessi" -#: ../libempathy-gtk/empathy-chat.c:2566 +#: ../libempathy-gtk/empathy-chat.c:2695 msgid "Wrong password; please try again:" msgstr "Password errata. Provare nuovamente:" -#: ../libempathy-gtk/empathy-chat.c:2567 +#: ../libempathy-gtk/empathy-chat.c:2696 msgid "Retry" msgstr "Riprova" -#: ../libempathy-gtk/empathy-chat.c:2572 +#: ../libempathy-gtk/empathy-chat.c:2701 msgid "This room is protected by a password:" msgstr "Questa stanza è protetta da una password:" # (ndt) pulsante -#: ../libempathy-gtk/empathy-chat.c:2573 +#: ../libempathy-gtk/empathy-chat.c:2702 msgid "Join" msgstr "Entra" -#: ../libempathy-gtk/empathy-chat.c:2713 +#: ../libempathy-gtk/empathy-chat.c:2842 msgid "Connected" msgstr "Connessi" -#: ../libempathy-gtk/empathy-chat.c:2766 -#: ../libempathy-gtk/empathy-log-window.c:548 +#: ../libempathy-gtk/empathy-chat.c:2895 +#: ../libempathy-gtk/empathy-log-window.c:707 msgid "Conversation" msgstr "Conversazione" @@ -1502,54 +1505,54 @@ msgstr "Rimuovere veramente il contatto «%s»?" msgid "Removing contact" msgstr "Rimozione contatto" -#: ../libempathy-gtk/empathy-contact-menu.c:195 +#: ../libempathy-gtk/empathy-contact-menu.c:199 #: ../src/empathy-main-window.ui.h:14 msgid "_Add Contact…" msgstr "A_ggiungi contatto..." -#: ../libempathy-gtk/empathy-contact-menu.c:222 +#: ../libempathy-gtk/empathy-contact-menu.c:226 #: ../src/empathy-main-window.ui.h:15 msgid "_Chat" msgstr "_Conversazione" -#: ../libempathy-gtk/empathy-contact-menu.c:253 +#: ../libempathy-gtk/empathy-contact-menu.c:257 msgctxt "menu item" msgid "_Audio Call" msgstr "Chiamata _audio" -#: ../libempathy-gtk/empathy-contact-menu.c:285 +#: ../libempathy-gtk/empathy-contact-menu.c:289 msgctxt "menu item" msgid "_Video Call" msgstr "Chiamata _video" -#: ../libempathy-gtk/empathy-contact-menu.c:324 +#: ../libempathy-gtk/empathy-contact-menu.c:340 #: ../src/empathy-main-window.ui.h:26 msgid "_Previous Conversations" msgstr "Conversazioni _precedenti" -#: ../libempathy-gtk/empathy-contact-menu.c:346 +#: ../libempathy-gtk/empathy-contact-menu.c:362 msgid "Send file" msgstr "Invia file" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:385 msgid "Share my desktop" msgstr "Condividi il desktop" -#: ../libempathy-gtk/empathy-contact-menu.c:397 +#: ../libempathy-gtk/empathy-contact-menu.c:413 msgid "Infor_mation" msgstr "Informa_zioni" -#: ../libempathy-gtk/empathy-contact-menu.c:443 +#: ../libempathy-gtk/empathy-contact-menu.c:459 msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "_Modifica" -#: ../libempathy-gtk/empathy-contact-menu.c:497 +#: ../libempathy-gtk/empathy-contact-menu.c:513 #: ../src/empathy-chat-window.c:865 msgid "Inviting you to this room" msgstr "Invito per questa stanza" -#: ../libempathy-gtk/empathy-contact-menu.c:528 +#: ../libempathy-gtk/empathy-contact-menu.c:544 msgid "_Invite to chat room" msgstr "_Invita nella stanza" @@ -1667,24 +1670,24 @@ msgid "Altitude:" msgstr "Altitudine:" # (ndt) nome della scheda -#: ../libempathy-gtk/empathy-contact-widget.c:584 +#: ../libempathy-gtk/empathy-contact-widget.c:585 #: ../src/empathy-preferences.ui.h:12 msgid "Location" msgstr "Posizione geografica" -#: ../libempathy-gtk/empathy-contact-widget.c:600 +#: ../libempathy-gtk/empathy-contact-widget.c:601 msgid "<b>Location</b>, " msgstr "<b>Posizione</b>, " -#: ../libempathy-gtk/empathy-contact-widget.c:650 +#: ../libempathy-gtk/empathy-contact-widget.c:651 msgid "%B %e, %Y at %R UTC" msgstr "%-d %B %Y alle %H.%M UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:721 +#: ../libempathy-gtk/empathy-contact-widget.c:734 msgid "Save Avatar" msgstr "Salva immagine" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:790 msgid "Unable to save avatar" msgstr "Impossibile salvare l'immagine" @@ -1776,12 +1779,12 @@ msgstr "Porta" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:541 +#: ../libempathy-gtk/empathy-log-window.c:700 #: ../src/empathy-import-widget.c:310 msgid "Account" msgstr "Account" -#: ../libempathy-gtk/empathy-log-window.c:558 +#: ../libempathy-gtk/empathy-log-window.c:717 msgid "Date" msgstr "Data" @@ -2157,16 +2160,16 @@ msgid "Instant Message (Empathy)" msgstr "Messaggio istantaneo (Empathy)" # (ndt) opzione -#: ../src/empathy.c:569 +#: ../src/empathy.c:580 msgid "Don't connect on startup" msgstr "Non connettere all'avvio" # (ndt) opzione -#: ../src/empathy.c:573 +#: ../src/empathy.c:584 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Non mostrare l'elenco contatti o qualsiasi altro dialogo all'avvio" -#: ../src/empathy.c:585 +#: ../src/empathy.c:596 msgid "- Empathy IM Client" msgstr "- Messaggistica istantanea Empathy" @@ -3434,59 +3437,59 @@ msgstr "Mappa posizioni dei contatti" msgid "Save" msgstr "Salva" -#: ../src/empathy-debug-window.c:1188 +#: ../src/empathy-debug-window.c:1219 msgid "Debug Window" msgstr "Finestra di debug" -#: ../src/empathy-debug-window.c:1268 +#: ../src/empathy-debug-window.c:1299 msgid "Pause" msgstr "Pausa" -#: ../src/empathy-debug-window.c:1280 +#: ../src/empathy-debug-window.c:1311 msgid "Level " msgstr "Livello " -#: ../src/empathy-debug-window.c:1300 +#: ../src/empathy-debug-window.c:1331 msgid "Debug" msgstr "Debug" -#: ../src/empathy-debug-window.c:1306 +#: ../src/empathy-debug-window.c:1337 msgid "Info" msgstr "Informazioni" -#: ../src/empathy-debug-window.c:1312 ../src/empathy-debug-window.c:1361 +#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392 msgid "Message" msgstr "Messaggio" -#: ../src/empathy-debug-window.c:1318 +#: ../src/empathy-debug-window.c:1349 msgid "Warning" msgstr "Avviso" -#: ../src/empathy-debug-window.c:1324 +#: ../src/empathy-debug-window.c:1355 msgid "Critical" msgstr "Critico" -#: ../src/empathy-debug-window.c:1330 +#: ../src/empathy-debug-window.c:1361 msgid "Error" msgstr "Errore" -#: ../src/empathy-debug-window.c:1349 +#: ../src/empathy-debug-window.c:1380 msgid "Time" msgstr "Orario" -#: ../src/empathy-debug-window.c:1352 +#: ../src/empathy-debug-window.c:1383 msgid "Domain" msgstr "Dominio" -#: ../src/empathy-debug-window.c:1354 +#: ../src/empathy-debug-window.c:1385 msgid "Category" msgstr "Categoria" -#: ../src/empathy-debug-window.c:1356 +#: ../src/empathy-debug-window.c:1387 msgid "Level" msgstr "Livello" -#: ../src/empathy-debug-window.c:1388 +#: ../src/empathy-debug-window.c:1424 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n" -"POT-Creation-Date: 2010-02-18 00:47+0000\n" -"PO-Revision-Date: 2010-02-18 09:43+0100\n" +"POT-Creation-Date: 2010-02-26 08:49+0000\n" +"PO-Revision-Date: 2010-02-26 11:19+0100\n" "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n" "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" "MIME-Version: 1.0\n" @@ -31,11 +31,11 @@ msgstr "Empathy sporočilnik" #: ../data/empathy.desktop.in.in.h:3 msgid "IM Client" -msgstr "Trenutni sporočilnik" +msgstr "Hipni sporočilnik" #: ../data/empathy.desktop.in.in.h:4 msgid "Send and receive messages" -msgstr "Pošiljanje in sprejemanje trenutnih sporočil" +msgstr "Pošiljanje in sprejemanje hipnih sporočil" #: ../data/empathy.schemas.in.h:1 msgid "Always open a separate chat window for new chats." @@ -399,19 +399,19 @@ msgstr "Upravljanje s sporočanjem in VoIP računi" msgid "Messaging and VoIP Accounts" msgstr "Sporočanje in VoIP računi" -#: ../libempathy/empathy-ft-handler.c:840 +#: ../libempathy/empathy-ft-handler.c:842 msgid "The hash of the received file and the sent one do not match" msgstr "Razpršili prejete in poslane datoteke nista skladni" -#: ../libempathy/empathy-ft-handler.c:1100 +#: ../libempathy/empathy-ft-handler.c:1102 msgid "File transfer not supported by remote contact" msgstr "Prenos datotek ni podprt s strani oddaljenega stika" -#: ../libempathy/empathy-ft-handler.c:1158 +#: ../libempathy/empathy-ft-handler.c:1160 msgid "The selected file is not a regular file" msgstr "Izbrana datoteka ni običajna datoteka" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1169 msgid "The selected file is empty" msgstr "Izbrana datoteka je prazna" @@ -1088,136 +1088,140 @@ msgstr "Vse datoteke" msgid "Click to enlarge" msgstr "Kliknite za povečavo" -#: ../libempathy-gtk/empathy-chat.c:201 +#: ../libempathy-gtk/empathy-chat.c:232 msgid "Failed to reconnect this chat" msgstr "Ponovna povezava s tem klepetom ni bila uspešna" -#: ../libempathy-gtk/empathy-chat.c:623 +#: ../libempathy-gtk/empathy-chat.c:654 msgid "Failed to join chat room" msgstr "Napaka med pridruževanjem v klepetalnico" -#: ../libempathy-gtk/empathy-chat.c:641 +#: ../libempathy-gtk/empathy-chat.c:672 msgid "Failed to open private chat" msgstr "Napaka med odpiranjem zasebnega klepeta" -#: ../libempathy-gtk/empathy-chat.c:680 +#: ../libempathy-gtk/empathy-chat.c:711 msgid "Topic not supported on this conversation" msgstr "Vsebina ni podprta pri tem pogovoru" -#: ../libempathy-gtk/empathy-chat.c:686 +#: ../libempathy-gtk/empathy-chat.c:717 msgid "You are not allowed to change the topic" msgstr "Za spreminjanje vsebine je treba imeti ustrezna dovoljenja." -#: ../libempathy-gtk/empathy-chat.c:815 +#: ../libempathy-gtk/empathy-chat.c:846 msgid "/clear: clear all messages from the current conversation" msgstr "/clear: počisti vsa sporočila trenutnega pogovora" -#: ../libempathy-gtk/empathy-chat.c:818 +#: ../libempathy-gtk/empathy-chat.c:849 msgid "/topic <topic>: set the topic of the current conversation" msgstr "/topic <vsebina>: določi vsebino trenutnega pogovora" -#: ../libempathy-gtk/empathy-chat.c:821 +#: ../libempathy-gtk/empathy-chat.c:852 msgid "/join <chat room ID>: join a new chat room" msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici" -#: ../libempathy-gtk/empathy-chat.c:824 +#: ../libempathy-gtk/empathy-chat.c:855 msgid "/j <chat room ID>: join a new chat room" msgstr "/j <ID klepetalnice>: pridruževanje novi klepetalnici" -#: ../libempathy-gtk/empathy-chat.c:827 +#: ../libempathy-gtk/empathy-chat.c:858 msgid "/query <contact ID> [<message>]: open a private chat" msgstr "/query <ID stika> [<sporočilo>]: odpre zasebni klepet" -#: ../libempathy-gtk/empathy-chat.c:830 +#: ../libempathy-gtk/empathy-chat.c:861 msgid "/msg <contact ID> <message>: open a private chat" msgstr "/msg <ID stika> <sporočilo>: odpre zasebni klepet" -#: ../libempathy-gtk/empathy-chat.c:833 +#: ../libempathy-gtk/empathy-chat.c:864 msgid "/nick <nickname>: change your nickname on the current server" msgstr "/nick <vzdevek>: spremeni vzdevek na trenutnem strežniku" -#: ../libempathy-gtk/empathy-chat.c:836 +#: ../libempathy-gtk/empathy-chat.c:867 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "/me <sporočilo>: pošlje sporočilo v trenutni pogovor" -#: ../libempathy-gtk/empathy-chat.c:839 +#: ../libempathy-gtk/empathy-chat.c:870 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\"" msgstr "/say <sporočilo>: send <sporočilo> v trenutni pogovor. Možnost se uporablja za pošiljanje sporočila, ki se začne z '/'. Primer: \"/say /join se uporablja za pridruževanje novi klepetalnici\"" -#: ../libempathy-gtk/empathy-chat.c:844 +#: ../libempathy-gtk/empathy-chat.c:875 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage." msgstr "/help [<ukaz>], pokaže vse podprte ukaze in njihov način uporabe." -#: ../libempathy-gtk/empathy-chat.c:854 +#: ../libempathy-gtk/empathy-chat.c:885 #, c-format msgid "Usage: %s" msgstr "Uporaba: %s" -#: ../libempathy-gtk/empathy-chat.c:883 +#: ../libempathy-gtk/empathy-chat.c:914 msgid "Unknown command" msgstr "Neznan ukaz" -#: ../libempathy-gtk/empathy-chat.c:1004 +#: ../libempathy-gtk/empathy-chat.c:1035 msgid "Unknown command; see /help for the available commands" msgstr "Neznan ukaz, več podrobnosti je mogoče najti preko /help argumenta ukaza" -#: ../libempathy-gtk/empathy-chat.c:1142 +#: ../libempathy-gtk/empathy-chat.c:1173 msgid "offline" msgstr "brez povezave" -#: ../libempathy-gtk/empathy-chat.c:1145 +#: ../libempathy-gtk/empathy-chat.c:1176 msgid "invalid contact" msgstr "neveljaven stik" -#: ../libempathy-gtk/empathy-chat.c:1148 +#: ../libempathy-gtk/empathy-chat.c:1179 msgid "permission denied" msgstr "ni dovoljenja" -#: ../libempathy-gtk/empathy-chat.c:1151 +#: ../libempathy-gtk/empathy-chat.c:1182 msgid "too long message" msgstr "predolgo sporočilo" -#: ../libempathy-gtk/empathy-chat.c:1154 +#: ../libempathy-gtk/empathy-chat.c:1185 msgid "not implemented" msgstr "ni del programa" -#: ../libempathy-gtk/empathy-chat.c:1157 +#: ../libempathy-gtk/empathy-chat.c:1188 msgid "unknown" msgstr "neznano" -#: ../libempathy-gtk/empathy-chat.c:1161 +#: ../libempathy-gtk/empathy-chat.c:1192 #, c-format msgid "Error sending message '%s': %s" msgstr "Napaka med pošiljanjem sporočila '%s': %s" -#: ../libempathy-gtk/empathy-chat.c:1191 +#: ../libempathy-gtk/empathy-chat.c:1222 #, c-format msgid "Topic set to: %s" msgstr "Tema določena na: %s" -#: ../libempathy-gtk/empathy-chat.c:1193 +#: ../libempathy-gtk/empathy-chat.c:1224 msgid "No topic defined" msgstr "Ni določene teme" -#: ../libempathy-gtk/empathy-chat.c:1592 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "(No Suggestions)" msgstr "(ni predlogov)" -#: ../libempathy-gtk/empathy-chat.c:1646 +#: ../libempathy-gtk/empathy-chat.c:1677 msgid "Insert Smiley" msgstr "Vstavi smeška" #. send button -#: ../libempathy-gtk/empathy-chat.c:1664 +#: ../libempathy-gtk/empathy-chat.c:1695 #: ../libempathy-gtk/empathy-ui-utils.c:1658 msgid "_Send" msgstr "_Pošlji" -#: ../libempathy-gtk/empathy-chat.c:1698 +#: ../libempathy-gtk/empathy-chat.c:1729 msgid "_Spelling Suggestions" msgstr "Predlogi čr_kovalnika" -#: ../libempathy-gtk/empathy-chat.c:1813 +#: ../libempathy-gtk/empathy-chat.c:1823 +msgid "Failed to retrieve recent logs" +msgstr "Napaka med pridobivanjem nedavnih dnevnikov" + +#: ../libempathy-gtk/empathy-chat.c:1954 #, c-format msgid "%s has disconnected" msgstr "%s je prekinil povezavo" @@ -1225,12 +1229,12 @@ msgstr "%s je prekinil povezavo" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1820 +#: ../libempathy-gtk/empathy-chat.c:1961 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s je izgnal %1$s" -#: ../libempathy-gtk/empathy-chat.c:1823 +#: ../libempathy-gtk/empathy-chat.c:1964 #, c-format msgid "%s was kicked" msgstr "%s je bil izgnan" @@ -1238,17 +1242,17 @@ msgstr "%s je bil izgnan" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1831 +#: ../libempathy-gtk/empathy-chat.c:1972 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s je izobčil %1$s" -#: ../libempathy-gtk/empathy-chat.c:1834 +#: ../libempathy-gtk/empathy-chat.c:1975 #, c-format msgid "%s was banned" msgstr "%s je izobčen" -#: ../libempathy-gtk/empathy-chat.c:1838 +#: ../libempathy-gtk/empathy-chat.c:1979 #, c-format msgid "%s has left the room" msgstr "%s je zapustil klepetalnico" @@ -1258,48 +1262,48 @@ msgstr "%s je zapustil klepetalnico" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1847 +#: ../libempathy-gtk/empathy-chat.c:1988 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:1872 +#: ../libempathy-gtk/empathy-chat.c:2013 #, c-format msgid "%s has joined the room" msgstr "%s je vstopil v klepetalnico" -#: ../libempathy-gtk/empathy-chat.c:1897 +#: ../libempathy-gtk/empathy-chat.c:2038 #, c-format msgid "%s is now known as %s" msgstr "%s je preimenovan v %s" -#: ../libempathy-gtk/empathy-chat.c:2032 +#: ../libempathy-gtk/empathy-chat.c:2173 #: ../src/empathy-call-window.c:1531 msgid "Disconnected" msgstr "Prekinjena povezava" -#: ../libempathy-gtk/empathy-chat.c:2566 +#: ../libempathy-gtk/empathy-chat.c:2695 msgid "Wrong password; please try again:" msgstr "Napačno geslo; poskusite znova:" -#: ../libempathy-gtk/empathy-chat.c:2567 +#: ../libempathy-gtk/empathy-chat.c:2696 msgid "Retry" msgstr "Poskusi znova" -#: ../libempathy-gtk/empathy-chat.c:2572 +#: ../libempathy-gtk/empathy-chat.c:2701 msgid "This room is protected by a password:" msgstr "Klepetalnica je zaščitena z geslom:" -#: ../libempathy-gtk/empathy-chat.c:2573 +#: ../libempathy-gtk/empathy-chat.c:2702 msgid "Join" msgstr "Pridruži se" -#: ../libempathy-gtk/empathy-chat.c:2713 +#: ../libempathy-gtk/empathy-chat.c:2842 msgid "Connected" msgstr "Povezano" -#: ../libempathy-gtk/empathy-chat.c:2766 -#: ../libempathy-gtk/empathy-log-window.c:548 +#: ../libempathy-gtk/empathy-chat.c:2895 +#: ../libempathy-gtk/empathy-log-window.c:707 msgid "Conversation" msgstr "Pogovor" @@ -1371,54 +1375,54 @@ msgstr "Ali zares želite odstraniti stik '%s'?" msgid "Removing contact" msgstr "Odstranjevanje stika" -#: ../libempathy-gtk/empathy-contact-menu.c:195 +#: ../libempathy-gtk/empathy-contact-menu.c:199 #: ../src/empathy-main-window.ui.h:14 msgid "_Add Contact…" msgstr "_Dodaj stik ..." -#: ../libempathy-gtk/empathy-contact-menu.c:222 +#: ../libempathy-gtk/empathy-contact-menu.c:226 #: ../src/empathy-main-window.ui.h:15 msgid "_Chat" msgstr "_Klepet" -#: ../libempathy-gtk/empathy-contact-menu.c:253 +#: ../libempathy-gtk/empathy-contact-menu.c:257 msgctxt "menu item" msgid "_Audio Call" msgstr "_Zvočni klic" -#: ../libempathy-gtk/empathy-contact-menu.c:285 +#: ../libempathy-gtk/empathy-contact-menu.c:289 msgctxt "menu item" msgid "_Video Call" msgstr "_Video klic" -#: ../libempathy-gtk/empathy-contact-menu.c:324 +#: ../libempathy-gtk/empathy-contact-menu.c:340 #: ../src/empathy-main-window.ui.h:26 msgid "_Previous Conversations" msgstr "Predhodni po_govori" -#: ../libempathy-gtk/empathy-contact-menu.c:346 +#: ../libempathy-gtk/empathy-contact-menu.c:362 msgid "Send file" msgstr "Pošlji datoteko" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:385 msgid "Share my desktop" msgstr "Souporaba namizja" -#: ../libempathy-gtk/empathy-contact-menu.c:397 +#: ../libempathy-gtk/empathy-contact-menu.c:413 msgid "Infor_mation" msgstr "_Podrobnosti" -#: ../libempathy-gtk/empathy-contact-menu.c:443 +#: ../libempathy-gtk/empathy-contact-menu.c:459 msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "_Uredi" -#: ../libempathy-gtk/empathy-contact-menu.c:497 +#: ../libempathy-gtk/empathy-contact-menu.c:513 #: ../src/empathy-chat-window.c:865 msgid "Inviting you to this room" msgstr "Vabila v klepetalnico" -#: ../libempathy-gtk/empathy-contact-menu.c:528 +#: ../libempathy-gtk/empathy-contact-menu.c:544 msgid "_Invite to chat room" msgstr "_Povabi v klepetalnico" @@ -1531,24 +1535,24 @@ msgstr "Zemljepisna širina:" msgid "Altitude:" msgstr "Nadmorska višina:" -#: ../libempathy-gtk/empathy-contact-widget.c:584 +#: ../libempathy-gtk/empathy-contact-widget.c:585 #: ../src/empathy-preferences.ui.h:12 msgid "Location" msgstr "Mesto" -#: ../libempathy-gtk/empathy-contact-widget.c:600 +#: ../libempathy-gtk/empathy-contact-widget.c:601 msgid "<b>Location</b>, " msgstr "<b>Mesto</b>, " -#: ../libempathy-gtk/empathy-contact-widget.c:650 +#: ../libempathy-gtk/empathy-contact-widget.c:651 msgid "%B %e, %Y at %R UTC" msgstr "%e.%B.%Y ob %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:721 +#: ../libempathy-gtk/empathy-contact-widget.c:734 msgid "Save Avatar" msgstr "Shrani podobo" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:790 msgid "Unable to save avatar" msgstr "Ni mogoče shraniti podobe" @@ -1633,12 +1637,12 @@ msgstr "Vrata" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:541 +#: ../libempathy-gtk/empathy-log-window.c:700 #: ../src/empathy-import-widget.c:310 msgid "Account" msgstr "Račun" -#: ../libempathy-gtk/empathy-log-window.c:558 +#: ../libempathy-gtk/empathy-log-window.c:717 msgid "Date" msgstr "Datum" @@ -1739,11 +1743,11 @@ msgstr "Rekla ni mogoče najti" #: ../libempathy-gtk/empathy-sound.c:51 msgid "Received an instant message" -msgstr "Prejeto trenutno sporočilo" +msgstr "Prejeto hipno sporočilo" #: ../libempathy-gtk/empathy-sound.c:53 msgid "Sent an instant message" -msgstr "Poslano trenutno sporočilo" +msgstr "Poslano hipno sporočilo" #: ../libempathy-gtk/empathy-sound.c:55 msgid "Incoming chat request" @@ -2002,21 +2006,17 @@ msgstr "Ni sporočil o napakah" #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 msgid "Instant Message (Empathy)" -msgstr "Trenutno sporočanje (Empathy)" +msgstr "Hipno sporočanje (Empathy)" -#: ../src/empathy.c:583 +#: ../src/empathy.c:580 msgid "Don't connect on startup" msgstr "Brez samodejne povezave ob zagonu" -#: ../src/empathy.c:587 +#: ../src/empathy.c:584 msgid "Don't display the contact list or any other dialogs on startup" msgstr "Ne prikaži seznama stikov in drugih pogovornih oken ob zagonu" -#: ../src/empathy.c:591 -msgid "Show the accounts dialog" -msgstr "Pokaži pogovorno okno računov" - -#: ../src/empathy.c:603 +#: ../src/empathy.c:596 msgid "- Empathy IM Client" msgstr "- Empathy sporočilnik" @@ -2034,7 +2034,7 @@ msgstr "Skupaj s tem programom bi morali prejeti izvod Splošnega javnega dovolj #: ../src/empathy-about-dialog.c:121 msgid "An Instant Messaging client for GNOME" -msgstr "Odjemalec trenutnega sporočanja za namizje GNOME" +msgstr "Odjemalec hipnega sporočanja za namizje GNOME" #: ../src/empathy-about-dialog.c:127 msgid "translator-credits" @@ -2066,7 +2066,7 @@ msgid "You can either go back and try to enter your accounts' details again or q msgstr "Lahko ponovno vnesete podatke računa ali pa končate pomočnika in dodate račune kasneje preko menija urejanja." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1276 +#: ../src/empathy-account-assistant.c:1294 msgid "An error occurred" msgstr "Prišlo je do napake" @@ -2081,98 +2081,98 @@ msgstr "Prišlo je do napake" msgid "New %s account" msgstr "Nov %s račun" -#: ../src/empathy-account-assistant.c:496 +#: ../src/empathy-account-assistant.c:502 msgid "What kind of chat account do you have?" msgstr "Kakšno vrsto klepetalnega računa imate?" -#: ../src/empathy-account-assistant.c:502 +#: ../src/empathy-account-assistant.c:508 msgid "Do you have any other chat accounts you want to set up?" msgstr "Ali želite nastaviti še kakšen drug račun?" -#: ../src/empathy-account-assistant.c:508 +#: ../src/empathy-account-assistant.c:514 msgid "Enter your account details" msgstr "Vnos podrobnosti računa" -#: ../src/empathy-account-assistant.c:513 +#: ../src/empathy-account-assistant.c:519 msgid "What kind of chat account do you want to create?" msgstr "Kateri klepetalni račun naj bo ustvarjen?" -#: ../src/empathy-account-assistant.c:519 +#: ../src/empathy-account-assistant.c:525 msgid "Do you want to create other chat accounts?" msgstr "Ali želite ustvariti drugi klepetalni račun?" -#: ../src/empathy-account-assistant.c:526 +#: ../src/empathy-account-assistant.c:532 msgid "Enter the details for the new account" msgstr "Vnos podrobnosti novega računa" -#: ../src/empathy-account-assistant.c:641 +#: ../src/empathy-account-assistant.c:647 msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls." msgstr "S programom Empathy lahko klepetate s posamezniki, ki uporabljajo Google Talk, AIM, Windows Live in mnogo drugih klepetalnih programov. S spletno kamero in mikrofonom lahko uporabljate tudi možnosti pogovora ali video konference." -#: ../src/empathy-account-assistant.c:658 +#: ../src/empathy-account-assistant.c:664 msgid "Do you have an account you've been using with another chat program?" msgstr "Ali imate račun, ki ste ga uporabljali z drugim programom?" -#: ../src/empathy-account-assistant.c:681 +#: ../src/empathy-account-assistant.c:687 msgid "Yes, import my account details from " msgstr "Da, uvoziti želim podrobnosti računa iz" -#: ../src/empathy-account-assistant.c:702 +#: ../src/empathy-account-assistant.c:708 msgid "Yes, I'll enter my account details now" msgstr "Da, takoj želim vnesti podrobnosti računa" -#: ../src/empathy-account-assistant.c:724 +#: ../src/empathy-account-assistant.c:730 msgid "No, I want a new account" msgstr "Ne, ustvariti želim nov račun" -#: ../src/empathy-account-assistant.c:734 +#: ../src/empathy-account-assistant.c:740 msgid "No, I just want to see people online nearby for now" msgstr "Ne, želim le videti ljudi, ki so trenutno v mreži" -#: ../src/empathy-account-assistant.c:755 +#: ../src/empathy-account-assistant.c:761 msgid "Select the accounts you want to import:" msgstr "Izbor računov za uvoz:" -#: ../src/empathy-account-assistant.c:839 +#: ../src/empathy-account-assistant.c:845 #: ../src/empathy-new-chatroom-dialog.c:541 #: ../src/empathy-new-chatroom-dialog.c:542 msgid "Yes" msgstr "Da" -#: ../src/empathy-account-assistant.c:846 +#: ../src/empathy-account-assistant.c:852 msgid "No, that's all for now" msgstr "Ne, to je trenutno vse" -#: ../src/empathy-account-assistant.c:1099 +#: ../src/empathy-account-assistant.c:1111 msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog" msgstr "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki istega omrežja. V primeru, da želite uporabljati to možnost, preverite spodnje podrobnosti. Možnosti je mogoče spreminjati tudi kasneje preko pogovornega okna 'računov'." -#: ../src/empathy-account-assistant.c:1105 -#: ../src/empathy-account-assistant.c:1161 +#: ../src/empathy-account-assistant.c:1117 +#: ../src/empathy-account-assistant.c:1173 msgid "Edit->Accounts" msgstr "Uredi->Računi" -#: ../src/empathy-account-assistant.c:1121 +#: ../src/empathy-account-assistant.c:1133 msgid "I don't want to enable this feature for now" msgstr "Ne želim omogočiti te možnosti" -#: ../src/empathy-account-assistant.c:1157 +#: ../src/empathy-account-assistant.c:1169 msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog" msgstr "Ni mogoče klepetati z uporabniki, povezanimi v krajevnem omrežju, saj paket telepathy-salut ni nameščen. V primeru, da želite omogočiti to možnost, namestite zahtevani paket in ustvarite račun bližnjih uporabnikov med možnostmi računa." -#: ../src/empathy-account-assistant.c:1163 +#: ../src/empathy-account-assistant.c:1175 msgid "telepathy-salut not installed" msgstr "telepathy-salut ni nameščen" -#: ../src/empathy-account-assistant.c:1240 +#: ../src/empathy-account-assistant.c:1252 msgid "Welcome to Empathy" msgstr "Dobrodošli v program Empathy" -#: ../src/empathy-account-assistant.c:1249 +#: ../src/empathy-account-assistant.c:1261 msgid "Import your existing accounts" msgstr "Uvoz obstoječih računov" -#: ../src/empathy-account-assistant.c:1267 +#: ../src/empathy-account-assistant.c:1279 msgid "Please enter personal details" msgstr "Vnesite osebne podrobnosti" @@ -3143,60 +3143,60 @@ msgstr "Prikaz zemljevida stikov" msgid "Save" msgstr "Shrani" -#: ../src/empathy-debug-window.c:1188 +#: ../src/empathy-debug-window.c:1219 msgid "Debug Window" msgstr "Razhroščevalno okno" -#: ../src/empathy-debug-window.c:1268 +#: ../src/empathy-debug-window.c:1299 msgid "Pause" msgstr "Premor" -#: ../src/empathy-debug-window.c:1280 +#: ../src/empathy-debug-window.c:1311 msgid "Level " msgstr "Raven" -#: ../src/empathy-debug-window.c:1300 +#: ../src/empathy-debug-window.c:1331 msgid "Debug" msgstr "Razhroščevanje" -#: ../src/empathy-debug-window.c:1306 +#: ../src/empathy-debug-window.c:1337 msgid "Info" msgstr "Podrobnosti" -#: ../src/empathy-debug-window.c:1312 -#: ../src/empathy-debug-window.c:1361 +#: ../src/empathy-debug-window.c:1343 +#: ../src/empathy-debug-window.c:1392 msgid "Message" msgstr "Sporočilo" -#: ../src/empathy-debug-window.c:1318 +#: ../src/empathy-debug-window.c:1349 msgid "Warning" msgstr "Opozorilo" -#: ../src/empathy-debug-window.c:1324 +#: ../src/empathy-debug-window.c:1355 msgid "Critical" msgstr "Kritično" -#: ../src/empathy-debug-window.c:1330 +#: ../src/empathy-debug-window.c:1361 msgid "Error" msgstr "Napaka" -#: ../src/empathy-debug-window.c:1349 +#: ../src/empathy-debug-window.c:1380 msgid "Time" msgstr "Čas" -#: ../src/empathy-debug-window.c:1352 +#: ../src/empathy-debug-window.c:1383 msgid "Domain" msgstr "Domena" -#: ../src/empathy-debug-window.c:1354 +#: ../src/empathy-debug-window.c:1385 msgid "Category" msgstr "Kategorija" -#: ../src/empathy-debug-window.c:1356 +#: ../src/empathy-debug-window.c:1387 msgid "Level" msgstr "Raven" -#: ../src/empathy-debug-window.c:1388 +#: ../src/empathy-debug-window.c:1424 msgid "The selected connection manager does not support the remote debugging extension." msgstr "Izbrani upravljalnik povezav ne podpira razširitve za oddaljeno razhroščevanje." @@ -3233,6 +3233,8 @@ msgstr "- Empathy računi" msgid " Accounts" msgstr "Računi" +#~ msgid "Show the accounts dialog" +#~ msgstr "Pokaži pogovorno okno računov" #~ msgid "Hidden" #~ msgstr "Skrito" #~ msgid "User requested disconnect" @@ -3366,9 +3368,9 @@ msgstr "Računi" #~ msgid "gtk-leave-fullscreen" #~ msgstr "gtk-leave-fullscreen" #~ msgid "Empathy Instant Messenger" -#~ msgstr "Takojšnje sporočanje Empathy" +#~ msgstr "Hipni sporočilnik Empathy" #~ msgid "- Empathy Instant Messenger" -#~ msgstr "- Takojšnja sporočila Empathy" +#~ msgstr "- Hipni sporočilnik Empathy" #~ msgid "<b>Advanced</b>" #~ msgstr "<b>Napredno</b>" #~ msgid "Forget password and clear the entry." diff --git a/src/Makefile.am b/src/Makefile.am index 9460fc959..3f8d15733 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-chat-window.c b/src/empathy-chat-window.c index d8c68dc03..2e2f5c003 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1315,6 +1315,8 @@ chat_window_new_message_cb (EmpathyChat *chat, if (has_focus && priv->current_chat == chat) { /* window and tab are focused so consider the message to be read */ + + /* FIXME: see Bug#610994 and coments about it in EmpathyChatPriv */ empathy_chat_messages_read (chat); return; } diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index f15bb3def..6c0c9c69e 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -1165,6 +1165,37 @@ debug_window_key_press_event_cb (GtkWidget *widget, return FALSE; } +static gboolean +tree_view_search_equal_func_cb (GtkTreeModel *model, + gint column, + const gchar *key, + GtkTreeIter *iter, + gpointer search_data) +{ + gchar *str; + gint key_len; + gint len; + gint i; + gboolean ret = TRUE; /* The return value is counter-intuitive */ + + gtk_tree_model_get (model, iter, column, &str, -1); + + key_len = strlen (key); + len = strlen (str) - key_len; + + for (i = 0; i <= len; ++i) + { + if (!g_ascii_strncasecmp (key, str + i, key_len)) + { + ret = FALSE; + break; + } + } + + g_free (str); + return ret; +} + static GObject * debug_window_constructor (GType type, guint n_construct_params, @@ -1373,6 +1404,11 @@ debug_window_constructor (GType type, gtk_tree_view_set_model (GTK_TREE_VIEW (priv->view), priv->store_filter); + gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->view), + COL_DEBUG_MESSAGE); + gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (priv->view), + tree_view_search_equal_func_cb, NULL, NULL); + /* Scrolled window */ priv->scrolled_win = g_object_ref (gtk_scrolled_window_new (NULL, NULL)); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_win), diff --git a/src/empathy.c b/src/empathy.c index 5ba8be1b2..2cc5a9f28 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> @@ -273,6 +279,7 @@ unique_app_message_cb (UniqueApp *unique_app, gtk_window_set_startup_id (GTK_WINDOW (window), unique_message_data_get_startup_id (data)); gtk_window_present_with_time (GTK_WINDOW (window), timestamp); + gtk_window_set_skip_taskbar_hint (window, FALSE); return UNIQUE_RESPONSE_OK; } @@ -547,7 +554,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 +571,7 @@ main (int argc, char *argv[]) #ifdef ENABLE_DEBUG TpDebugSender *debug_sender; -#endif +#endif /* ENABLE_TPL */ GOptionContext *optcontext; GOptionEntry options[] = { @@ -654,8 +665,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); |