diff options
47 files changed, 3371 insertions, 2154 deletions
diff --git a/configure.ac b/configure.ac index aabb7fe4d..5d09d86f0 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.1 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, + [ + telepathy-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/data/icons/Makefile.am b/data/icons/Makefile.am index ae6c9804b..13c166576 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -41,8 +41,6 @@ private_icons = \ hicolor_apps_16x16_im-myspace.png \ hicolor_apps_16x16_im-sametime.png \ hicolor_apps_16x16_im-zephyr.png \ - hicolor_apps_16x16_empathy-starred.png \ - hicolor_apps_16x16_empathy-unstarred.png \ hicolor_apps_22x22_im-ekiga.png \ hicolor_apps_22x22_im-facebook.png \ hicolor_apps_22x22_im-gizmo.png \ @@ -61,8 +59,6 @@ private_icons = \ hicolor_apps_22x22_im-myspace.png \ hicolor_apps_22x22_im-sametime.png \ hicolor_apps_22x22_im-zephyr.png \ - hicolor_apps_22x22_empathy-starred.png \ - hicolor_apps_22x22_empathy-unstarred.png \ hicolor_apps_24x24_im-ekiga.png \ hicolor_apps_24x24_im-gizmo.png \ hicolor_apps_24x24_im-google-talk.png \ @@ -80,8 +76,6 @@ private_icons = \ hicolor_apps_24x24_im-myspace.png \ hicolor_apps_24x24_im-sametime.png \ hicolor_apps_24x24_im-zephyr.png \ - hicolor_apps_24x24_empathy-starred.png \ - hicolor_apps_24x24_empathy-unstarred.png \ hicolor_apps_32x32_im-ekiga.png \ hicolor_apps_32x32_im-gizmo.png \ hicolor_apps_32x32_im-google-talk.png \ @@ -99,8 +93,6 @@ private_icons = \ hicolor_apps_32x32_im-myspace.png \ hicolor_apps_32x32_im-sametime.png \ hicolor_apps_32x32_im-zephyr.png \ - hicolor_apps_32x32_empathy-starred.png \ - hicolor_apps_32x32_empathy-unstarred.png \ hicolor_apps_48x48_im-ekiga.png \ hicolor_apps_48x48_im-facebook.png \ hicolor_apps_48x48_im-gizmo.png \ @@ -119,8 +111,6 @@ private_icons = \ hicolor_apps_48x48_im-myspace.png \ hicolor_apps_48x48_im-sametime.png \ hicolor_apps_48x48_im-zephyr.png \ - hicolor_apps_48x48_empathy-starred.png \ - hicolor_apps_48x48_empathy-unstarred.png \ hicolor_apps_scalable_im-ekiga.svg \ hicolor_apps_scalable_im-gizmo.svg \ hicolor_apps_scalable_im-google-talk.svg \ diff --git a/data/icons/hicolor_apps_16x16_empathy-starred.png b/data/icons/hicolor_apps_16x16_empathy-starred.png Binary files differdeleted file mode 100644 index 755a0835b..000000000 --- a/data/icons/hicolor_apps_16x16_empathy-starred.png +++ /dev/null diff --git a/data/icons/hicolor_apps_16x16_empathy-unstarred.png b/data/icons/hicolor_apps_16x16_empathy-unstarred.png Binary files differdeleted file mode 100644 index c21921679..000000000 --- a/data/icons/hicolor_apps_16x16_empathy-unstarred.png +++ /dev/null diff --git a/data/icons/hicolor_apps_22x22_empathy-starred.png b/data/icons/hicolor_apps_22x22_empathy-starred.png Binary files differdeleted file mode 100644 index 181588f6e..000000000 --- a/data/icons/hicolor_apps_22x22_empathy-starred.png +++ /dev/null diff --git a/data/icons/hicolor_apps_22x22_empathy-unstarred.png b/data/icons/hicolor_apps_22x22_empathy-unstarred.png Binary files differdeleted file mode 100644 index 012b8ee57..000000000 --- a/data/icons/hicolor_apps_22x22_empathy-unstarred.png +++ /dev/null diff --git a/data/icons/hicolor_apps_24x24_empathy-starred.png b/data/icons/hicolor_apps_24x24_empathy-starred.png Binary files differdeleted file mode 100644 index b4027c909..000000000 --- a/data/icons/hicolor_apps_24x24_empathy-starred.png +++ /dev/null diff --git a/data/icons/hicolor_apps_24x24_empathy-unstarred.png b/data/icons/hicolor_apps_24x24_empathy-unstarred.png Binary files differdeleted file mode 100644 index 55e8bb5b9..000000000 --- a/data/icons/hicolor_apps_24x24_empathy-unstarred.png +++ /dev/null diff --git a/data/icons/hicolor_apps_32x32_empathy-starred.png b/data/icons/hicolor_apps_32x32_empathy-starred.png Binary files differdeleted file mode 100644 index 8448e76ac..000000000 --- a/data/icons/hicolor_apps_32x32_empathy-starred.png +++ /dev/null diff --git a/data/icons/hicolor_apps_32x32_empathy-unstarred.png b/data/icons/hicolor_apps_32x32_empathy-unstarred.png Binary files differdeleted file mode 100644 index bdb37c352..000000000 --- a/data/icons/hicolor_apps_32x32_empathy-unstarred.png +++ /dev/null diff --git a/data/icons/hicolor_apps_48x48_empathy-starred.png b/data/icons/hicolor_apps_48x48_empathy-starred.png Binary files differdeleted file mode 100644 index deefaec97..000000000 --- a/data/icons/hicolor_apps_48x48_empathy-starred.png +++ /dev/null diff --git a/data/icons/hicolor_apps_48x48_empathy-unstarred.png b/data/icons/hicolor_apps_48x48_empathy-unstarred.png Binary files differdeleted file mode 100644 index 15448636e..000000000 --- a/data/icons/hicolor_apps_48x48_empathy-unstarred.png +++ /dev/null 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-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 12667162d..8862c3ba4 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -679,9 +679,6 @@ account_widget_account_enabled_cb (GObject *source_object, TpAccount *account = TP_ACCOUNT (source_object); EmpathyAccountWidget *widget = EMPATHY_ACCOUNT_WIDGET (user_data); EmpathyAccountWidgetPriv *priv = GET_PRIV (widget); - TpConnectionPresenceType presence; - gchar *message = NULL; - gchar *status = NULL; tp_account_set_enabled_finish (account, res, &error); @@ -692,28 +689,11 @@ account_widget_account_enabled_cb (GObject *source_object, } else { - /* only force presence if presence was offline, unknown or unset */ - presence = tp_account_get_requested_presence (account, NULL, NULL); - switch (presence) - { - case TP_CONNECTION_PRESENCE_TYPE_OFFLINE: - case TP_CONNECTION_PRESENCE_TYPE_UNKNOWN: - case TP_CONNECTION_PRESENCE_TYPE_UNSET: - presence = tp_account_manager_get_most_available_presence ( - priv->account_manager, &status, &message); - tp_account_request_presence_async (account, presence, - status, NULL, NULL, NULL); - break; - default: - /* do nothing if the presence is not offline */ - break; - } + empathy_connect_new_account (account, priv->account_manager); } /* unref widget - part of the workaround */ g_object_unref (widget); - g_free (message); - g_free (status); } static void diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 1361840fa..bec1d7704 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_get_filtered_messages_async_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..3345f5b15 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_get_messages_for_date_async_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_search_new_async_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_get_chats_async_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_get_messages_for_date_async_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_get_dates_async_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_get_dates_async_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-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index f8c4212dd..7c4aae9ba 100644 --- a/libempathy-gtk/empathy-presence-chooser.c +++ b/libempathy-gtk/empathy-presence-chooser.c @@ -111,6 +111,7 @@ typedef struct { PresenceChooserEntryType previous_type; TpAccountManager *account_manager; + GdkPixbuf *not_favorite_pixbuf; } EmpathyPresenceChooserPriv; /* States to be listed in the menu. @@ -327,6 +328,7 @@ presence_chooser_is_preset (EmpathyPresenceChooser *self) static void presence_chooser_set_favorite_icon (EmpathyPresenceChooser *self) { + EmpathyPresenceChooserPriv *priv = GET_PRIV (self); GtkWidget *entry; PresenceChooserEntryType type; @@ -338,16 +340,16 @@ presence_chooser_set_favorite_icon (EmpathyPresenceChooser *self) /* saved entries can be removed from the list */ gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, - "empathy-starred"); + "emblem-favorite"); gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, _("Click to remove this status as a favorite")); } else { /* custom entries can be favorited */ - gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), + gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, - "empathy-unstarred"); + priv->not_favorite_pixbuf); gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, _("Click to make this status a favorite")); @@ -807,6 +809,36 @@ presence_chooser_connectivity_state_change (EmpathyConnectivity *connectivity, presence_chooser_update_sensitivity (chooser); } +/* Create a greyed version of the 'favorite' icon */ +static GdkPixbuf * +create_not_favorite_pixbuf (void) +{ + GdkPixbuf *favorite, *result; + + favorite = empathy_pixbuf_from_icon_name ("emblem-favorite", + GTK_ICON_SIZE_MENU); + + result = gdk_pixbuf_copy (favorite); + gdk_pixbuf_saturate_and_pixelate (favorite, result, 1.0, TRUE); + + g_object_unref (favorite); + return result; +} + +static void +icon_theme_changed_cb (GtkIconTheme *icon_theme, + EmpathyPresenceChooser *self) +{ + EmpathyPresenceChooserPriv *priv = GET_PRIV (self); + + /* Theme has changed, recreate the not-favorite icon */ + g_object_unref (priv->not_favorite_pixbuf); + priv->not_favorite_pixbuf = create_not_favorite_pixbuf (); + + /* Update the icon */ + presence_chooser_set_favorite_icon (self); +} + static void empathy_presence_chooser_init (EmpathyPresenceChooser *chooser) { @@ -817,6 +849,14 @@ empathy_presence_chooser_init (EmpathyPresenceChooser *chooser) chooser->priv = priv; + /* Create the not-favorite icon */ + priv->not_favorite_pixbuf = create_not_favorite_pixbuf (); + g_assert (priv->not_favorite_pixbuf != NULL); + + empathy_signal_connect_weak (gtk_icon_theme_get_default (), "changed", + G_CALLBACK (icon_theme_changed_cb), + G_OBJECT (chooser)); + presence_chooser_create_model (chooser); gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (chooser), @@ -924,6 +964,7 @@ presence_chooser_finalize (GObject *object) g_object_unref (priv->idle); g_object_unref (priv->connectivity); + g_object_unref (priv->not_favorite_pixbuf); G_OBJECT_CLASS (empathy_presence_chooser_parent_class)->finalize (object); } 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); diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index fedb14b98..7d169ff94 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -606,3 +606,40 @@ empathy_account_manager_get_accounts_connected (gboolean *connecting) return out_connected; } + +/* Change the RequestedPresence of a newly created account to ensure that it + * is actually connected. */ +void +empathy_connect_new_account (TpAccount *account, + TpAccountManager *account_manager) +{ + TpConnectionPresenceType presence; + gchar *status, *message; + + /* only force presence if presence was offline, unknown or unset */ + presence = tp_account_get_requested_presence (account, NULL, NULL); + switch (presence) + { + case TP_CONNECTION_PRESENCE_TYPE_OFFLINE: + case TP_CONNECTION_PRESENCE_TYPE_UNKNOWN: + case TP_CONNECTION_PRESENCE_TYPE_UNSET: + presence = tp_account_manager_get_most_available_presence ( + account_manager, &status, &message); + + if (presence == TP_CONNECTION_PRESENCE_TYPE_OFFLINE) + /* Global presence is offline; we force it so user doesn't have to + * manually change the presence to connect his new account. */ + presence = TP_CONNECTION_PRESENCE_TYPE_AVAILABLE; + + tp_account_request_presence_async (account, presence, + status, NULL, NULL, NULL); + + g_free (status); + g_free (message); + break; + + default: + /* do nothing if the presence is not offline */ + break; + } +} diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index 0fc6fc2a9..0ab905282 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -31,6 +31,7 @@ #include <libxml/parser.h> #include <libxml/tree.h> +#include <telepathy-glib/account-manager.h> #include "empathy-contact.h" @@ -90,6 +91,9 @@ TpAccount * empathy_get_account_for_connection (TpConnection *connection); gboolean empathy_account_manager_get_accounts_connected (gboolean *connecting); +void empathy_connect_new_account (TpAccount *account, + TpAccountManager *account_manager); + G_END_DECLS #endif /* __EMPATHY_UTILS_H__ */ @@ -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" @@ -1,25 +1,26 @@ # translation of empathy.HEAD.po to Greek # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Empathy package. -# # Dimitris Glezos <dimitris@glezos.com>, 2006. # Christos Trochalakis <yatiohi@ideopolis.gr>, 2006. # Marios Zindilis <m.zindilis@dmajor.org>, 2009. -# Jennie Petoumenou <epetoumenou@gmail.com>, 2009. +# Jennie Petoumenou <epetoumenou@gmail.com>, 2009, 2010. # Russell Kyaw <rkyaw@yahoo.com>, 2010. msgid "" msgstr "" "Project-Id-Version: empathy.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-31 02:23+0200\n" -"PO-Revision-Date: 2010-01-31 02:22+0200\n" -"Last-Translator: Russell Kyaw <rkyaw@yahoo.com>\n" -"Language-Team: Burmese <my@li.org>\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=empathy&component=general\n" +"POT-Creation-Date: 2010-02-26 08:49+0000\n" +"PO-Revision-Date: 2010-02-28 11:45+0100\n" +"Last-Translator: Jennie Petoumenou <epetoumenou@gmail.com>\n" +"Language-Team: Ελληνικά <team@gnome.gr>\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.0\n" #: ../data/empathy.desktop.in.in.h:1 msgid "Empathy" @@ -54,12 +55,11 @@ msgid "Chat window theme" msgstr "Θέμα παραθύρων συζήτησης" #: ../data/empathy.schemas.in.h:4 -#, fuzzy msgid "" "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" -"Λίστα γλωσσών για ορθογραφικό έλεγχο, χωρισμένων με κόμματα (πχ. en, el, " -"fr). " +"Λίστα γλωσσών για ορθογραφικό έλεγχο, χωρισμένη με κόμματα (πχ. \"en, el, fr" +"\"). " #: ../data/empathy.schemas.in.h:5 msgid "Compact contact list" @@ -67,7 +67,7 @@ msgstr "Συμπτυγμένη λίστα επαφών" #: ../data/empathy.schemas.in.h:6 msgid "Connection managers should be used" -msgstr "Na χρησιμοποιούνται οι εφαρμογές διαχείρισης συνδέσεων" +msgstr "Να χρησιμοποιούνται οι εφαρμογές διαχείρισης συνδέσεων" #: ../data/empathy.schemas.in.h:7 msgid "Contact list sort criterion" @@ -161,15 +161,13 @@ msgid "Open new chats in separate windows" msgstr "Άνοιγμα νέων συζητήσεων σε ξεχωριστά παράθυρα" #: ../data/empathy.schemas.in.h:29 -#, fuzzy msgid "Path of the Adium theme to use" -msgstr "Διαδρομή του θέματος adium" +msgstr "Διαδρομή του θέματος Adium" #: ../data/empathy.schemas.in.h:30 -#, fuzzy msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "" -"Διαδρομή του θέματος adium, αν χρησιμοποιείται το θέμα adium για τις " +"Διαδρομή του θέματος Adium, αν χρησιμοποιείται το θέμα Adium για τις " "συζητήσεις." #: ../data/empathy.schemas.in.h:31 @@ -201,17 +199,14 @@ msgid "Play a sound when we log out" msgstr "Αναπαραγωγή ήχου όταν αποσυνδεόμαστε" #: ../data/empathy.schemas.in.h:38 -#, fuzzy msgid "Pop up notifications if the chat isn't focused" msgstr "Αναδυόμενες ειδοποιήσεις όταν η συζήτηση δεν είναι εστιασμένη" #: ../data/empathy.schemas.in.h:39 -#, fuzzy msgid "Pop up notifications when a contact logs in" msgstr "Αναδυόμενες ειδοποιήσεις όταν συνδέεται μια επαφή" #: ../data/empathy.schemas.in.h:40 -#, fuzzy msgid "Pop up notifications when a contact logs out" msgstr "Αναδυόμενες ειδοποιήσεις όταν αποσυνδέεται μια επαφή" @@ -269,52 +264,42 @@ msgid "Use theme for chat rooms" msgstr "Χρήση θέματος για τα δωμάτια συζήτησης" #: ../data/empathy.schemas.in.h:54 -#, fuzzy msgid "Whether Empathy can publish the user's location to their contacts." msgstr "" -"Αν το Empathy θα μπορεί να δημοσιεύει την τοποθεσία σας στις επαφές σας." +"Αν το Empathy θα μπορεί να δημοσιεύει την τοποθεσία του χρήστη στις επαφές " +"του." #: ../data/empathy.schemas.in.h:55 -#, fuzzy msgid "Whether Empathy can use the GPS to guess the location." -msgstr "" -"Αν το Empathy θα χρησιμοποιεί το GPS για να μαντέψει την τοποθεσία σας." +msgstr "Αν το Empathy θα χρησιμοποιεί το GPS για να μαντέψει την τοποθεσία." #: ../data/empathy.schemas.in.h:56 -#, fuzzy msgid "Whether Empathy can use the cellular network to guess the location." msgstr "" "Αν το Empathy θα χρησιμοποιεί το δίκτυο κινητής τηλ/νίας για να μαντέψει την " -"τοποθεσία σας." +"τοποθεσία." #: ../data/empathy.schemas.in.h:57 -#, fuzzy msgid "Whether Empathy can use the network to guess the location." -msgstr "" -"Αν το Empathy θα χρησιμοποιεί το δίκτυο για να μαντέψει την τοποθεσία σας." +msgstr "Αν το Empathy θα χρησιμοποιεί το δίκτυο για να μαντέψει την τοποθεσία." #: ../data/empathy.schemas.in.h:58 -#, fuzzy msgid "Whether Empathy has asked about importing accounts from other programs." msgstr "" "Αν το Empathy έχει ζητήσει την εισαγωγή λογαριασμών από άλλα προγράμματα." #: ../data/empathy.schemas.in.h:59 -#, fuzzy msgid "Whether Empathy should automatically log into your accounts on startup." msgstr "" "Αν το Empathy θα συνδέεται αυτόματα στους λογαριασμούς σας κατά την εκκίνηση." #: ../data/empathy.schemas.in.h:60 -#, fuzzy msgid "" "Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" -"Αν το Empathy θα μειώνει την ακρίβεια της τοποθεσίας σας για λόγους " -"απορρήτου." +"Αν το Empathy θα μειώνει την ακρίβεια της τοποθεσίας για λόγους απορρήτου." #: ../data/empathy.schemas.in.h:61 -#, fuzzy msgid "" "Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" @@ -329,41 +314,33 @@ msgstr "" "Επιθεωρητής Ιστού." #: ../data/empathy.schemas.in.h:63 -#, fuzzy msgid "" "Whether connectivity managers should be used to automatically disconnect/" "reconnect." msgstr "" -"Αν θα χρησιμοποιούνται οι εφαρμογές διαχείρισης συνδέσεων για να σας " -"αποοσυνδέουν/επανασυνδέουν αυτόματα." +"Αν θα χρησιμοποιούνται οι εφαρμογές διαχείρισης συνδέσεων για αυτόματη " +"αποσύνδεση/επανασύνδεση." #: ../data/empathy.schemas.in.h:64 -#, fuzzy msgid "Whether the Salut account has been created on the first Empathy run." msgstr "" -"Αν δημιουργήθηκε ο λογαριασμός salut κατά την πρώτη εκτέλεση του Empathy." +"Αν δημιουργήθηκε ο λογαριασμός Salut κατά την πρώτη εκτέλεση του Empathy." #: ../data/empathy.schemas.in.h:65 -#, fuzzy msgid "" "Whether to check words typed against the languages you want to check with." -msgstr "" -"Αν θα γίνεται ορθογραφικός έλεγχος των μηνυμάτων σας στις γλώσσες που έχετε " -"επιλέξει." +msgstr "Αν θα γίνεται ορθογραφικός έλεγχος στις γλώσσες που έχετε επιλέξει." #: ../data/empathy.schemas.in.h:66 -#, fuzzy msgid "Whether to convert smileys into graphical images in conversations." msgstr "Αν θα μετατρέπονται τα χαμόγελα σε εικονίδια στις συζητήσεις." #: ../data/empathy.schemas.in.h:67 -#, fuzzy msgid "Whether to play a sound to notify of contacts logging into the network." msgstr "" "Αν θα αναπαράγονται ήχοι ειδοποίησης όταν μια επαφή συνδέεται στο δίκτυο." #: ../data/empathy.schemas.in.h:68 -#, fuzzy msgid "" "Whether to play a sound to notify of contacts logging out of the network." msgstr "" @@ -371,56 +348,46 @@ msgstr "" "δίκτυο." #: ../data/empathy.schemas.in.h:69 -#, fuzzy msgid "Whether to play a sound to notify of events." msgstr "Αν θα αναπαράγονται ήχοι ειδοποίησης για γεγονότα." #: ../data/empathy.schemas.in.h:70 -#, fuzzy msgid "Whether to play a sound to notify of incoming messages." msgstr "Αν θα αναπαράγονται ήχοι ειδοποίησης για εισερχόμενα μηνύματα." #: ../data/empathy.schemas.in.h:71 -#, fuzzy msgid "Whether to play a sound to notify of new conversations." msgstr "Αν θα αναπαράγονται ήχοι ειδοποίησης για νέες συζητήσεις." #: ../data/empathy.schemas.in.h:72 -#, fuzzy msgid "Whether to play a sound to notify of outgoing messages." msgstr "Αν θα αναπαράγονται ήχοι ειδοποίησης για εξερχόμενα μηνύματα." #: ../data/empathy.schemas.in.h:73 -#, fuzzy msgid "Whether to play a sound when logging into a network." msgstr "" "Αν θα αναπαράγονται ήχοι ειδοποίησης όταν γίνεται σύνδεση σε ένα δίκτυο." #: ../data/empathy.schemas.in.h:74 -#, fuzzy msgid "Whether to play a sound when logging out of a network." msgstr "" "Αν θα αναπαράγονται ήχοι ειδοποίησης όταν γίνεται αποσύνδεση από ένα δίκτυο." #: ../data/empathy.schemas.in.h:75 -#, fuzzy msgid "Whether to play sound notifications when away or busy." msgstr "" "Αν θα αναπαράγονται ήχοι ειδοποίησης όταν απουσιάζετε ή είστε απασχολημένοι." #: ../data/empathy.schemas.in.h:76 -#, fuzzy msgid "Whether to show a popup notification when a contact goes offline." msgstr "" "Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν αποσυνδέεται μια επαφή." #: ../data/empathy.schemas.in.h:77 -#, fuzzy msgid "Whether to show a popup notification when a contact goes online." msgstr "Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν συνδέεται μια επαφή." #: ../data/empathy.schemas.in.h:78 -#, fuzzy msgid "" "Whether to show a popup notification when receiving a new message even if " "the chat is already opened, but not focused." @@ -429,13 +396,11 @@ msgstr "" "ακόμη και αν το παράθυρο συζήτησης είναι ήδη ανοιχτό, αλλά όχι εστιασμένο." #: ../data/empathy.schemas.in.h:79 -#, fuzzy msgid "Whether to show a popup notification when receiving a new message." msgstr "" "Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν λαμβάνονται νέα μηνύματα." #: ../data/empathy.schemas.in.h:80 -#, fuzzy msgid "" "Whether to show avatars for contacts in the contact list and chat windows." msgstr "" @@ -443,36 +408,28 @@ msgstr "" "παράθυρα συζήτησης." #: ../data/empathy.schemas.in.h:81 -#, fuzzy msgid "Whether to show contacts that are offline in the contact list." msgstr "Αν θα εμφανίζονται οι επαφές εκτός σύνδεσης στη λίστα επαφών." #: ../data/empathy.schemas.in.h:82 -#, fuzzy msgid "Whether to show popup notifications when away or busy." msgstr "" "Αν θα εμφανίζονται αναδυόμενες ειδοποιήσεις όταν απουσιάζετε ή είστε " "απασχολημένοι." #: ../data/empathy.schemas.in.h:83 -#, fuzzy msgid "Whether to show protocols for contacts in the contact list." -msgstr "" -"Αν θα εμφανίζονται οι προσωπικές εικόνες των επαφών στη λίστα επαφών και τα " -"παράθυρα συζήτησης." +msgstr "Αν θα εμφανίζονται τα πρωτόκολλα των επαφών στη λίστα επαφών." #: ../data/empathy.schemas.in.h:84 -#, fuzzy msgid "Whether to show the contact list in chat rooms." msgstr "Αν θα εμφανίζεται η λίστα επαφών στα δωμάτια συζήτησης." #: ../data/empathy.schemas.in.h:85 -#, fuzzy msgid "Whether to show the contact list in compact mode." msgstr "Αν η λίστα επαφών θα εμφανίζεται σε συμπτυγμένη μορφή." #: ../data/empathy.schemas.in.h:86 -#, fuzzy msgid "" "Whether to show the message dialog about closing the main window with the " "'x' button in the title bar." @@ -481,34 +438,41 @@ msgstr "" "παραθύρου, όταν πατιέται το κουμπί 'x' στη γραμμή τίτλου." #: ../data/empathy.schemas.in.h:87 -#, fuzzy msgid "Whether to use the theme for chat rooms." msgstr "Αν το θέμα θα χρησιμοποιείται για τα δωμάτια συζήτησης." #: ../data/empathy.schemas.in.h:88 -#, fuzzy msgid "" "Which criterion to use when sorting the contact list. Default is to sort by " "the contact's name with the value \"name\". A value of \"state\" will sort " "the contact list by state." msgstr "" "Το κριτήριο που θα χρησιμοποιείται κατά την ταξινόμηση της λίστας επαφών. Η " -"προεπιλεγμένη τιμή \"όνομα\" ταξινομεί τα ονόματα των επαφών αλφαβητικά. Η " -"τιμή \"κατάσταση\" ταξινομεί τη λίστα επαφών με βάση την κατάσταση." +"προεπιλεγμένη τιμή \"όνομα\" ταξινομεί τα ονόματα των επαφών με βάση το " +"όνομα. Η τιμή \"κατάσταση\" ταξινομεί τη λίστα επαφών με βάση την κατάσταση." + +#: ../data/empathy-accounts.desktop.in.in.h:1 +msgid "Manage Messaging and VoIP accounts" +msgstr "Διαχείριση λογαριασμών μηνυμάτων και τηλεφωνίας" -#: ../libempathy/empathy-ft-handler.c:840 +#: ../data/empathy-accounts.desktop.in.in.h:2 +#: ../src/cc-empathy-accounts-page.c:201 ../src/cc-empathy-accounts-panel.c:70 +msgid "Messaging and VoIP Accounts" +msgstr "Λογαριασμοί μηνυμάτων και τηλεφωνίας" + +#: ../libempathy/empathy-ft-handler.c:842 msgid "The hash of the received file and the sent one do not match" -msgstr "Τα hash του ληφθέντος και του σταλμένου αρχείου είναι διαφορετικά" +msgstr "Τα hash του ληφθέντος και του απεσταλμένου αρχείου είναι διαφορετικά" -#: ../libempathy/empathy-ft-handler.c:1100 +#: ../libempathy/empathy-ft-handler.c:1102 msgid "File transfer not supported by remote contact" msgstr "Η απομακρυσμένη επαφή δεν υποστηρίζει τη μεταφορά αρχείων" -#: ../libempathy/empathy-ft-handler.c:1158 +#: ../libempathy/empathy-ft-handler.c:1160 msgid "The selected file is not a regular file" msgstr "Το επιλεγμένο αρχείο δεν είναι κανονικό αρχείο" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1169 msgid "The selected file is empty" msgstr "Το επιλεγμένο αρχείο είναι κενό" @@ -625,15 +589,15 @@ msgstr "Αυτο-υπογεγραμμένο πιστοποιητικό " msgid "Certificate error" msgstr "Σφάλμα πιστοποιητικού" -#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104 +#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104 msgid "People Nearby" msgstr "Γειτονικά άτομα" -#: ../libempathy/empathy-utils.c:429 +#: ../libempathy/empathy-utils.c:434 msgid "Yahoo! Japan" msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:430 +#: ../libempathy/empathy-utils.c:435 msgid "Facebook Chat" msgstr "Συζήτηση Facebook" @@ -683,7 +647,7 @@ msgstr[1] "%d μήνες πριν" msgid "in the future" msgstr "στο μέλλον" -#: ../libempathy-gtk/empathy-account-chooser.c:450 +#: ../libempathy-gtk/empathy-account-chooser.c:462 msgid "All" msgstr "Όλα" @@ -693,11 +657,16 @@ msgstr "Όλα" msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1329 +#: ../libempathy-gtk/empathy-account-widget.c:1117 +#| msgid "_Username:" +msgid "Username:" +msgstr "Όνομα χρήστη: " + +#: ../libempathy-gtk/empathy-account-widget.c:1446 msgid "L_og in" msgstr "_Είσοδος" -#: ../libempathy-gtk/empathy-account-widget.c:1396 +#: ../libempathy-gtk/empathy-account-widget.c:1514 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 #: ../src/empathy-chatrooms-window.ui.h:1 @@ -705,15 +674,15 @@ msgstr "_Είσοδος" msgid "Account:" msgstr "Λογαριασμός:" -#: ../libempathy-gtk/empathy-account-widget.c:1407 +#: ../libempathy-gtk/empathy-account-widget.c:1525 msgid "Enabled" msgstr "Ενεργός" -#: ../libempathy-gtk/empathy-account-widget.c:1472 +#: ../libempathy-gtk/empathy-account-widget.c:1590 msgid "This account already exists on the server" msgstr "Αυτός ο λογαριασμός υπάρχει ήδη στον εξυπηρετητή" -#: ../libempathy-gtk/empathy-account-widget.c:1475 +#: ../libempathy-gtk/empathy-account-widget.c:1593 msgid "Create a new account on the server" msgstr "Δημιουργία νέου λογαριασμού στον εξυπηρετητή" @@ -722,19 +691,19 @@ msgstr "Δημιουργία νέου λογαριασμού στον εξυπη #. * like: "MyUserName on chat.freenode.net". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:1858 +#: ../libempathy-gtk/empathy-account-widget.c:1968 #, c-format msgid "%1$s on %2$s" msgstr "%1$s στο %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:1876 +#: ../libempathy-gtk/empathy-account-widget.c:1994 #, c-format msgid "%s Account" msgstr "Λογαριασμός %s " -#: ../libempathy-gtk/empathy-account-widget.c:1880 +#: ../libempathy-gtk/empathy-account-widget.c:1998 msgid "New account" msgstr "Νέος λογαριασμός" @@ -779,7 +748,7 @@ msgstr "Ποιο είναι το ψευδώνυμό σας στο AIM;" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "_Port:" @@ -788,7 +757,7 @@ msgstr "_Θύρα:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12 #: ../src/empathy-new-chatroom-dialog.ui.h:9 @@ -925,38 +894,62 @@ msgid "Reso_urce:" msgstr "_Πόρος:" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "" +"This is your username, not your normal Facebook login.\n" +"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n" +"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a " +"Facebook username if you don't have one." +msgstr "" +"Αυτό είναι το όνομα χρήστη σας, όχι το όνομα λογαριασμού \n" +"που χρησιμοποιείτε για να συνδεθείτε στο Facebook. Αν είστε \n" +"ο facebook.com/<b>kanenas</b>, εισάγετε <b>kanenas</b>.\n" +"Χρησιμοποιήστε <a href=\"http://www.facebook.com/username/\">αυτή τη σελίδα</" +"a> για να αποκτήσετε λογαριασμό στο Facebook, \n" +"αν δεν έχετε ήδη." + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 msgid "Use old SS_L" msgstr "Χρήση παλιού SS_L" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#| msgid "What is your Yahoo! password?" +msgid "What is your Facebook password?" +msgstr "Ποιο είναι το συνθηματικό σας στο Facebook;" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#| msgid "What is your Windows Live user name?" +msgid "What is your Facebook username?" +msgstr "Ποιο είναι το όνομα χρήστη σας στο Facebook;" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 msgid "What is your Google ID?" msgstr "Ποιο είναι το όνομα χρήστη σας στο Google;" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 msgid "What is your Google password?" msgstr "Ποιο είναι το συνθηματικό σας στο Google;" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 msgid "What is your Jabber ID?" msgstr "Ποιο είναι το όνομα χρήστη σας στο Jabber;" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 msgid "What is your Jabber password?" msgstr "Ποιο είναι το συνθηματικό σας στο Jabber;" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 msgid "What is your desired Jabber ID?" msgstr "Επιλέξτε όνομα χρήστη για το Jabber." -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 msgid "What is your desired Jabber password?" msgstr "Επιλέξτε συνθηματικό για το Jabber." -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 msgid "_Encryption required (TLS/SSL)" msgstr "Απαιτείται _κρυπτογράφηση (TLS/SSL)" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 msgid "_Ignore SSL certificate errors" msgstr "Α_γνόηση σφαλμάτων πιστοποιητικών SSL" @@ -965,9 +958,8 @@ msgid "<b>Example:</b> user@hotmail.com" msgstr "<b>Παράδειγμα:</b> myusername@hotmail.com" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -#, fuzzy msgid "What is your Windows Live ID?" -msgstr "Ποιο είναι το συνθηματικό σας στο Windows Live;" +msgstr "Ποιο είναι το όνομα χρήστη σας στο Windows Live;" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 msgid "What is your Windows Live password?" @@ -1002,26 +994,24 @@ msgid "<b>Example:</b> user@my.sip.server" msgstr "<b>Παράδειγμα:</b> myusername@my.sip.server" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -#, fuzzy msgid "Authentication username:" -msgstr "Η πιστοποίηση απέτυχε" +msgstr "Όνομα χρήστη για πιστοποίηση:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -#, fuzzy msgid "Discover Binding" -msgstr "Ανακάλυψη του STUN" +msgstr "Ανακάλυψη σύνδεσης" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 msgid "Discover the STUN server automatically" -msgstr "" +msgstr "Αυτόματη ανακάλυψη εξυπηρετητή STUN" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 msgid "Hostname of the proxy for outbound requests." -msgstr "" +msgstr "Διεύθυνση διαμεσολαβητή για εξερχόμενα αιτήματα." #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 msgid "Interval (seconds)" -msgstr "" +msgstr "Διάστημα (σε δευτερόλεπτα)" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 msgid "Keep-Alive Options" @@ -1032,26 +1022,28 @@ msgid "" "Look up the DNS SRV record at the service's domain for the host name of a " "STUN server." msgstr "" +"Εύρεση της διεύθυνσης του εξυπηρετητή STUN από την εγγραφή DNS SRV στο " +"domain της υπηρεσίας." #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 msgid "Loose Routing" -msgstr "" +msgstr "Loose Routing" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 msgid "Mechanism:" -msgstr "" +msgstr "Μηχανισμός:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 msgid "Miscellaneous Options" -msgstr "" +msgstr "Λοιπές επιλογές" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 msgid "NAT Traversal Options" -msgstr "" +msgstr "Επιλογές NAT Traversal" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 msgid "Port of the proxy for outbound requests." -msgstr "" +msgstr "Θύρα διαμεσολαβητή για εξερχόμενα αιτήματα." #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 msgid "Port:" @@ -1074,23 +1066,28 @@ msgid "" "The username for SIP authentication, if different from the SIP URI\n" "username." msgstr "" +"Το όνομα χρήστη για την πιστοποίηση SIP, αν διαφέρει από το όνομα χρήστη του " +"SIP URI." #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 -#, fuzzy msgid "Transport:" -msgstr "Θύρα STUN:" +msgstr "Μεταφορά:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "" "Update the registration binding if the external address for the client is " "discovered to be different from the local binding." msgstr "" +"Ενημέρωση της σύνδεσης της καταχώρησης, αν η εξωτερική διεύθυνση του πελάτη " +"προκύψει διαφορετική από αυτή της τοπικής σύνδεσης." #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "" "Use the loose routing behavior and the Route header as recommended in RFC " "3261." msgstr "" +"Χρησιμοποίηση συμπεριφοράς loose routing και κεφαλίδας Route, όπως συνιστά " +"η RFC 3261." #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 msgid "What is your SIP account password?" @@ -1121,9 +1118,8 @@ msgid "Yahoo! I_D:" msgstr "Yahoo! I_D:" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -#, fuzzy msgid "_Ignore conference and chat room invitations" -msgstr "Α_γνόηση προσκλήσεων σε δωμάτια συζήτησης ή τηλεδιασκέψεις" +msgstr "Α_γνόηση προσκλήσεων σε δωμάτια συζήτησης ή διασκέψεις" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "_Room List locale:" @@ -1135,7 +1131,6 @@ msgid "Couldn't convert image" msgstr "Δεν ήταν δυνατή η μετατροπή της εικόνας" #: ../libempathy-gtk/empathy-avatar-chooser.c:450 -#, fuzzy msgid "None of the accepted image formats are supported on your system" msgstr "" "Το σύστημά σας δεν υποστηρίζει κανέναν από τους επιτρεπτούς τύπους εικόνων." @@ -1160,143 +1155,151 @@ msgstr "Όλα τα αρχεία" msgid "Click to enlarge" msgstr "Κλικ για μεγέθυνση" -#: ../libempathy-gtk/empathy-chat.c:201 +#: ../libempathy-gtk/empathy-chat.c:232 msgid "Failed to reconnect this chat" msgstr "Αποτυχία επανασύνδεσης στη συζήτηση" -#: ../libempathy-gtk/empathy-chat.c:623 -#, fuzzy +#: ../libempathy-gtk/empathy-chat.c:654 msgid "Failed to join chat room" -msgstr "_Πρόσκληση στο δωμάτιο συζήτησης" +msgstr "Αποτυχία εισόδου στο δωμάτιο συζήτησης" -#: ../libempathy-gtk/empathy-chat.c:641 -#, fuzzy +#: ../libempathy-gtk/empathy-chat.c:672 msgid "Failed to open private chat" -msgstr "Αποτυχία επανασύνδεσης στη συζήτηση" +msgstr "Αποτυχία ανοίγματος ιδιωτικής συζήτησης" -#: ../libempathy-gtk/empathy-chat.c:680 +#: ../libempathy-gtk/empathy-chat.c:711 msgid "Topic not supported on this conversation" -msgstr "" +msgstr "Η συζήτηση δεν υποστηρίζει θέματα" -#: ../libempathy-gtk/empathy-chat.c:686 +#: ../libempathy-gtk/empathy-chat.c:717 msgid "You are not allowed to change the topic" -msgstr "" +msgstr "Δεν έχετε δικαίωμα αλλαγής του θέματος" -#: ../libempathy-gtk/empathy-chat.c:815 +#: ../libempathy-gtk/empathy-chat.c:846 msgid "/clear: clear all messages from the current conversation" -msgstr "" +msgstr "/clear: Εκκαθάριση όλων των μηνυμάτων της τρέχουσας συζήτησης" -#: ../libempathy-gtk/empathy-chat.c:818 +#: ../libempathy-gtk/empathy-chat.c:849 msgid "/topic <topic>: set the topic of the current conversation" -msgstr "" +msgstr "/topic <θέμα>: Ορισμός του θέματος της τρέχουσας συζήτησης" -#: ../libempathy-gtk/empathy-chat.c:821 +#: ../libempathy-gtk/empathy-chat.c:852 msgid "/join <chat room ID>: join a new chat room" -msgstr "" +msgstr "/join <όνομα δωματίου>: Είσοδος σε νέο δωμάτιο συζήτησης" -#: ../libempathy-gtk/empathy-chat.c:824 +#: ../libempathy-gtk/empathy-chat.c:855 msgid "/j <chat room ID>: join a new chat room" -msgstr "" +msgstr "/ <όνομα δωματίου>: Είσοδος σε νέο δωμάτιο συζήτησης" -#: ../libempathy-gtk/empathy-chat.c:827 +#: ../libempathy-gtk/empathy-chat.c:858 msgid "/query <contact ID> [<message>]: open a private chat" -msgstr "" +msgstr "/query <όνομα επαφής> [<μήνυμα>]: Άνοιγμα ιδιωτικής συζήτησης" -#: ../libempathy-gtk/empathy-chat.c:830 +#: ../libempathy-gtk/empathy-chat.c:861 msgid "/msg <contact ID> <message>: open a private chat" -msgstr "" +msgstr "/msg <όνομα επαφής> <μήνυμα>: Άνοιγμα ιδιωτικής συζήτησης" -#: ../libempathy-gtk/empathy-chat.c:833 +#: ../libempathy-gtk/empathy-chat.c:864 msgid "/nick <nickname>: change your nickname on the current server" -msgstr "" +msgstr "/nick <ψευδώνυμο>: Αλλαγή του ψευδωνύμου σας στον τρέχοντα εξυπηρετητή" -#: ../libempathy-gtk/empathy-chat.c:836 +#: ../libempathy-gtk/empathy-chat.c:867 msgid "/me <message>: send an ACTION message to the current conversation" -msgstr "" +msgstr "/me <μήνυμα>: Αποστολή μηνύματος ΕΝΕΡΓΕΙΑΣ στην τρέχουσα συζήτηση" -#: ../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 <μήνυμα>: Αποστολή του <μήνυμα> στην τρέχουσα συζήτηση. Χρησιμοποιείται " +"για την αποστολή μηνυμάτων που ξεκινούν από '/'. Π.χ.: \"/say /join - " +"χρησιμοποιείται για είσοδο σε νέο δωμάτιο\"" -#: ../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 [<εντολή>]: Εμφάνιση όλων των υποστηριζόμενων εντολών. Αν έχει οριστεί " +"συγκεκριμένη <εντολή>, εμφάνιση του τρόπου χρήσης της." -#: ../libempathy-gtk/empathy-chat.c:854 +#: ../libempathy-gtk/empathy-chat.c:885 #, c-format msgid "Usage: %s" msgstr "Χρήση: %s" -#: ../libempathy-gtk/empathy-chat.c:883 +#: ../libempathy-gtk/empathy-chat.c:914 msgid "Unknown command" msgstr "Άγνωστη εντολή" -#: ../libempathy-gtk/empathy-chat.c:1004 +#: ../libempathy-gtk/empathy-chat.c:1035 msgid "Unknown command; see /help for the available commands" msgstr "" +"Άγνωστη εντολή. Πληκτρολογήστε /help για να δείτε τις διαθέσιμες εντολές" -#: ../libempathy-gtk/empathy-chat.c:1143 +#: ../libempathy-gtk/empathy-chat.c:1173 msgid "offline" msgstr "εκτός σύνδεσης" -#: ../libempathy-gtk/empathy-chat.c:1146 +#: ../libempathy-gtk/empathy-chat.c:1176 msgid "invalid contact" msgstr "μη έγκυρη επαφή" -#: ../libempathy-gtk/empathy-chat.c:1149 +#: ../libempathy-gtk/empathy-chat.c:1179 msgid "permission denied" msgstr "δε δόθηκε άδεια" -#: ../libempathy-gtk/empathy-chat.c:1152 +#: ../libempathy-gtk/empathy-chat.c:1182 msgid "too long message" msgstr "υπερβολικά μεγάλο μήνυμα" -#: ../libempathy-gtk/empathy-chat.c:1155 +#: ../libempathy-gtk/empathy-chat.c:1185 msgid "not implemented" msgstr "δεν υποστηρίζεται" -#: ../libempathy-gtk/empathy-chat.c:1158 +#: ../libempathy-gtk/empathy-chat.c:1188 msgid "unknown" msgstr "άγνωστο" -#: ../libempathy-gtk/empathy-chat.c:1162 +#: ../libempathy-gtk/empathy-chat.c:1192 #, c-format msgid "Error sending message '%s': %s" msgstr "Σφάλμα κατά την αποστολή του μηνύματος '%s': %s" -#: ../libempathy-gtk/empathy-chat.c:1192 +#: ../libempathy-gtk/empathy-chat.c:1222 #, c-format msgid "Topic set to: %s" msgstr "Το θέμα ορίστηκε ως: %s" -#: ../libempathy-gtk/empathy-chat.c:1194 +#: ../libempathy-gtk/empathy-chat.c:1224 msgid "No topic defined" msgstr "Δεν έχει οριστεί θέμα" -#: ../libempathy-gtk/empathy-chat.c:1593 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "(No Suggestions)" msgstr "(Δεν υπάρχουν υποδείξεις)" -#: ../libempathy-gtk/empathy-chat.c:1647 +#: ../libempathy-gtk/empathy-chat.c:1677 msgid "Insert Smiley" msgstr "Εισαγωγή χαμόγελου" #. send button -#: ../libempathy-gtk/empathy-chat.c:1665 +#: ../libempathy-gtk/empathy-chat.c:1695 #: ../libempathy-gtk/empathy-ui-utils.c:1658 msgid "_Send" msgstr "Α_ποστολή" -#: ../libempathy-gtk/empathy-chat.c:1699 +#: ../libempathy-gtk/empathy-chat.c:1729 msgid "_Spelling Suggestions" msgstr "_Υποδείξεις ορθογραφίας" -#: ../libempathy-gtk/empathy-chat.c:1814 +#: ../libempathy-gtk/empathy-chat.c:1823 +msgid "Failed to retrieve recent logs" +msgstr "Αποτυχία ανάκτησης" + +#: ../libempathy-gtk/empathy-chat.c:1954 #, c-format msgid "%s has disconnected" msgstr "Ο/Η %s αποσυνδέθηκε" @@ -1304,12 +1307,12 @@ msgstr "Ο/Η %s αποσυνδέθηκε" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1821 +#: ../libempathy-gtk/empathy-chat.c:1961 #, c-format msgid "%1$s was kicked by %2$s" msgstr "Ο/Η %2$s έδιωξε τον/την %1$s" -#: ../libempathy-gtk/empathy-chat.c:1824 +#: ../libempathy-gtk/empathy-chat.c:1964 #, c-format msgid "%s was kicked" msgstr "Ο/Η %s διώχτηκε" @@ -1317,17 +1320,17 @@ msgstr "Ο/Η %s διώχτηκε" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1832 +#: ../libempathy-gtk/empathy-chat.c:1972 #, c-format msgid "%1$s was banned by %2$s" msgstr "Ο/Η %2$s απαγόρευσε την είσοδο στον/στην %1$s" -#: ../libempathy-gtk/empathy-chat.c:1835 +#: ../libempathy-gtk/empathy-chat.c:1975 #, c-format msgid "%s was banned" msgstr "Απαγορεύτηκε η είσοδος στον/στην %s" -#: ../libempathy-gtk/empathy-chat.c:1839 +#: ../libempathy-gtk/empathy-chat.c:1979 #, c-format msgid "%s has left the room" msgstr "Ο/Η %s βγήκε από το δωμάτιο συζήτησης" @@ -1337,51 +1340,51 @@ msgstr "Ο/Η %s βγήκε από το δωμάτιο συζήτησης" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1848 +#: ../libempathy-gtk/empathy-chat.c:1988 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:1873 +#: ../libempathy-gtk/empathy-chat.c:2013 #, c-format msgid "%s has joined the room" msgstr "Ο/Η %s μπήκε στο δωμάτιο συζήτησης" -#: ../libempathy-gtk/empathy-chat.c:1898 -#, fuzzy, c-format +#: ../libempathy-gtk/empathy-chat.c:2038 +#, c-format msgid "%s is now known as %s" -msgstr "Ο/Η %s μόλις συνδέθηκε." +msgstr "Ο/Η %s ονομάζεται πλέον %s" -#: ../libempathy-gtk/empathy-chat.c:2033 ../src/empathy-call-window.c:1531 +#: ../libempathy-gtk/empathy-chat.c:2173 ../src/empathy-call-window.c:1531 msgid "Disconnected" msgstr "Εκτός σύνδεσης" -#: ../libempathy-gtk/empathy-chat.c:2568 +#: ../libempathy-gtk/empathy-chat.c:2695 msgid "Wrong password; please try again:" -msgstr "" +msgstr "Λάθος συνθηματικό. Παρακαλώ, προσπαθήστε ξανά:" -#: ../libempathy-gtk/empathy-chat.c:2569 +#: ../libempathy-gtk/empathy-chat.c:2696 msgid "Retry" msgstr "Προσπάθεια ξανά" -#: ../libempathy-gtk/empathy-chat.c:2574 +#: ../libempathy-gtk/empathy-chat.c:2701 msgid "This room is protected by a password:" -msgstr "" +msgstr "Αυτό το δωμάτιο προστατεύεται με συνθηματικό:" -#: ../libempathy-gtk/empathy-chat.c:2575 +#: ../libempathy-gtk/empathy-chat.c:2702 msgid "Join" msgstr "Είσοδος" -#: ../libempathy-gtk/empathy-chat.c:2715 +#: ../libempathy-gtk/empathy-chat.c:2842 msgid "Connected" msgstr "Σε σύνδεση" -#: ../libempathy-gtk/empathy-chat.c:2768 -#: ../libempathy-gtk/empathy-log-window.c:548 +#: ../libempathy-gtk/empathy-chat.c:2895 +#: ../libempathy-gtk/empathy-log-window.c:707 msgid "Conversation" msgstr "Συζήτηση" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:681 +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680 msgid "Topic:" msgstr "Θέμα:" @@ -1403,15 +1406,15 @@ msgstr "Ά_νοιγμα συνδέσμου" msgid "%A %B %d %Y" msgstr "%A %B %d %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:238 +#: ../libempathy-gtk/empathy-contact-dialogs.c:249 msgid "Edit Contact Information" msgstr "Επεξεργασία πληροφοριών επαφής" -#: ../libempathy-gtk/empathy-contact-dialogs.c:289 +#: ../libempathy-gtk/empathy-contact-dialogs.c:300 msgid "Personal Information" msgstr "Προσωπικές πληροφορίες" -#: ../libempathy-gtk/empathy-contact-dialogs.c:394 +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 msgid "New Contact" msgstr "Νέα επαφή" @@ -1423,81 +1426,80 @@ msgstr "Θα αποφασίσω αρ_γότερα" msgid "Subscription Request" msgstr "Αίτηση εγγραφής" -#: ../libempathy-gtk/empathy-contact-list-view.c:1512 +#: ../libempathy-gtk/empathy-contact-list-view.c:1516 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Σίγουρα θέλετε να διαγράψετε την ομάδα '%s';" -#: ../libempathy-gtk/empathy-contact-list-view.c:1514 +#: ../libempathy-gtk/empathy-contact-list-view.c:1518 msgid "Removing group" msgstr "Διαγραφή ομάδας..." #. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1561 -#: ../libempathy-gtk/empathy-contact-list-view.c:1638 +#: ../libempathy-gtk/empathy-contact-list-view.c:1565 +#: ../libempathy-gtk/empathy-contact-list-view.c:1642 #: ../src/empathy-accounts-dialog.ui.h:6 msgid "_Remove" msgstr "_Διαγραφή" -#: ../libempathy-gtk/empathy-contact-list-view.c:1591 +#: ../libempathy-gtk/empathy-contact-list-view.c:1595 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Σίγουρα θέλετε να διαγράψετε την επαφή '%s';" -#: ../libempathy-gtk/empathy-contact-list-view.c:1593 +#: ../libempathy-gtk/empathy-contact-list-view.c:1597 msgid "Removing contact" msgstr "Διαγραφή επαφής..." -#: ../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 "Προσ_θήκη επαφής..." -#: ../libempathy-gtk/empathy-contact-menu.c:222 +#: ../libempathy-gtk/empathy-contact-menu.c:226 #: ../src/empathy-main-window.ui.h:15 msgid "_Chat" msgstr "_Συζήτηση" -#: ../libempathy-gtk/empathy-contact-menu.c:253 +#: ../libempathy-gtk/empathy-contact-menu.c:257 msgctxt "menu item" msgid "_Audio Call" msgstr "_Φωνητική κλήση" -#: ../libempathy-gtk/empathy-contact-menu.c:285 +#: ../libempathy-gtk/empathy-contact-menu.c:289 msgctxt "menu item" msgid "_Video Call" msgstr "_Βιντεοκλήση" -#: ../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 "_Προηγούμενες συζητήσεις" -#: ../libempathy-gtk/empathy-contact-menu.c:346 +#: ../libempathy-gtk/empathy-contact-menu.c:362 msgid "Send file" msgstr "Αποστολή αρχείου" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:385 msgid "Share my desktop" msgstr "Κοινή χρήση της επιφάνειας εργασίας μου" -#: ../libempathy-gtk/empathy-contact-menu.c:397 +#: ../libempathy-gtk/empathy-contact-menu.c:413 msgid "Infor_mation" msgstr "Πληροφο_ρίες" -#: ../libempathy-gtk/empathy-contact-menu.c:441 -#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19 +#: ../libempathy-gtk/empathy-contact-menu.c:459 +#| msgid "_Edit" +msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "_Επεξεργασία" -#: ../libempathy-gtk/empathy-contact-menu.c:496 -#: ../src/empathy-chat-window.c:866 -#, fuzzy +#: ../libempathy-gtk/empathy-contact-menu.c:513 +#: ../src/empathy-chat-window.c:865 msgid "Inviting you to this room" msgstr "Πρόσκληση στο δωμάτιο..." -#: ../libempathy-gtk/empathy-contact-menu.c:527 -#, fuzzy +#: ../libempathy-gtk/empathy-contact-menu.c:544 msgid "_Invite to chat room" msgstr "_Πρόσκληση στο δωμάτιο συζήτησης" @@ -1510,7 +1512,7 @@ msgid "Select" msgstr "Επιλογή" #: ../libempathy-gtk/empathy-contact-widget.c:244 -#: ../src/empathy-main-window.c:1042 +#: ../src/empathy-main-window.c:1045 msgid "Group" msgstr "Ομάδα" @@ -1610,24 +1612,24 @@ msgstr "Γεωγρ. πλάτος:" msgid "Altitude:" msgstr "Υψόμετρο:" -#: ../libempathy-gtk/empathy-contact-widget.c:584 +#: ../libempathy-gtk/empathy-contact-widget.c:585 #: ../src/empathy-preferences.ui.h:12 msgid "Location" msgstr "Τοποθεσία" -#: ../libempathy-gtk/empathy-contact-widget.c:600 +#: ../libempathy-gtk/empathy-contact-widget.c:601 msgid "<b>Location</b>, " msgstr "<b>Τοποθεσία</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 στις %R UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:721 +#: ../libempathy-gtk/empathy-contact-widget.c:734 msgid "Save Avatar" msgstr "Αποθήκευση προσωπικής εικόνας" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:790 msgid "Unable to save avatar" msgstr "Αδυναμία αποθήκευσης προσωπικής εικόνας" @@ -1716,12 +1718,12 @@ msgstr "Θύρα" 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 "Λογαριασμός" -#: ../libempathy-gtk/empathy-log-window.c:558 +#: ../libempathy-gtk/empathy-log-window.c:717 msgid "Date" msgstr "Ημερομηνία" @@ -1814,11 +1816,11 @@ msgstr "Εύρεση:" #: ../libempathy-gtk/empathy-search-bar.ui.h:2 msgid "Match case" -msgstr "" +msgstr "Διάκριση πεζών/κεφαλαίων" #: ../libempathy-gtk/empathy-search-bar.ui.h:3 msgid "Phrase not found" -msgstr "" +msgstr "Δε βρέθηκε η φράση" #: ../libempathy-gtk/empathy-sound.c:51 msgid "Received an instant message" @@ -1830,7 +1832,7 @@ msgstr "Εστάλη άμεσο μήνυμα" #: ../libempathy-gtk/empathy-sound.c:55 msgid "Incoming chat request" -msgstr "Εισερχόμενη αίτηση συζήτησης" +msgstr "Εισερχόμενο αίτημα συζήτησης" #: ../libempathy-gtk/empathy-sound.c:57 msgid "Contact connected" @@ -2040,7 +2042,7 @@ msgstr "Νότιας Ευρώπης" #: ../libempathy-gtk/totem-subtitle-encoding.c:296 msgid "Thai" -msgstr "Ταϋλανδέζικα" +msgstr "Ταϊλανδέζικα" #: ../libempathy-gtk/totem-subtitle-encoding.c:299 #: ../libempathy-gtk/totem-subtitle-encoding.c:301 @@ -2072,12 +2074,10 @@ msgid "Vietnamese" msgstr "Βιετναμέζικα" #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 -#, fuzzy msgid "The selected contact cannot receive files." msgstr "Η επιλεγμένη επαφή δεν μπορεί να λαμβάνει αρχεία." #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 -#, fuzzy msgid "The selected contact is offline." msgstr "Η επιλεγμένη επαφή βρίσκεται εκτός σύνδεσης." @@ -2089,24 +2089,19 @@ msgstr "Χωρίς μήνυμα σφάλματος" msgid "Instant Message (Empathy)" msgstr "Άμεσο μήνυμα (Empathy)" -#: ../src/empathy.c:762 +#: ../src/empathy.c:580 msgid "Don't connect on startup" msgstr "Να μη γίνεται σύνδεση κατά την εκκίνηση" -#: ../src/empathy.c:766 -#, fuzzy +#: ../src/empathy.c:584 msgid "Don't display the contact list or any other dialogs on startup" -msgstr "Να μην εμφανίζεται η λίστα επαφών κατά την εκκίνηση" - -#: ../src/empathy.c:770 -msgid "Show the accounts dialog" -msgstr "Εμφάνιση του διαλόγου λογαριασμών" +msgstr "Να μην εμφανίζεται η λίστα επαφών ή άλλοι διάλογοι κατά την εκκίνηση" -#: ../src/empathy.c:782 +#: ../src/empathy.c:596 msgid "- Empathy IM Client" msgstr "- Αποστολέας άμεσων μηνυμάτων Empathy" -#: ../src/empathy-about-dialog.c:84 +#: ../src/empathy-about-dialog.c:85 msgid "" "Empathy is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -2119,7 +2114,7 @@ msgstr "" "της έκδοσης 2 της Άδειας, είτε (κατ' επιλογήν σας) οποιασδήποτε " "μεταγενέστερης έκδοσης." -#: ../src/empathy-about-dialog.c:88 +#: ../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 " @@ -2131,7 +2126,7 @@ msgstr "" "ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΙΔΙΚΟ ΣΚΟΠΟ. Για περισσότερες λεπτομέρειες ανατρέξτε στη " "Γενική Άδεια Δημόσιας Χρήσης GNU (GPL)." -#: ../src/empathy-about-dialog.c:92 +#: ../src/empathy-about-dialog.c:93 msgid "" "You should have received a copy of the GNU General Public License along with " "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " @@ -2141,11 +2136,11 @@ msgstr "" "GNU (GPL) μαζί με το Empathy. Αν όχι, γράψτε στο Free Software Foundation, " "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:120 +#: ../src/empathy-about-dialog.c:121 msgid "An Instant Messaging client for GNOME" msgstr "Αποστολέας άμεσων μηνυμάτων για το GNOME" -#: ../src/empathy-about-dialog.c:126 +#: ../src/empathy-about-dialog.c:127 msgid "translator-credits" msgstr "" "Ελληνική μεταφραστική ομάδα GNOME\n" @@ -2156,32 +2151,28 @@ msgstr "" "\n" "Για περισσότερα δείτε http://www.gnome.gr/" -#: ../src/empathy-account-assistant.c:165 -#, fuzzy +#: ../src/empathy-account-assistant.c:167 msgid "There was an error while importing the accounts." msgstr "Παρουσιάστηκε σφάλμα κατά την εισαγωγή των λογαριασμών." -#: ../src/empathy-account-assistant.c:168 -#, fuzzy +#: ../src/empathy-account-assistant.c:170 msgid "There was an error while parsing the account details." msgstr "Παρουσιάστηκε σφάλμα κατά την ανάλυση των στοιχείων του λογαριασμού." -#: ../src/empathy-account-assistant.c:171 -#, fuzzy +#: ../src/empathy-account-assistant.c:173 msgid "There was an error while creating the account." msgstr "Παρουσιάστηκε σφάλμα κατά τη δημιουργία του λογαριασμού." -#: ../src/empathy-account-assistant.c:173 -#, fuzzy +#: ../src/empathy-account-assistant.c:175 msgid "There was an error." msgstr "Παρουσιάστηκε σφάλμα." -#: ../src/empathy-account-assistant.c:177 -#, fuzzy, c-format +#: ../src/empathy-account-assistant.c:179 +#, c-format msgid "The error message was: %s" -msgstr "Χωρίς μήνυμα σφάλματος" +msgstr "Το μήνυμα σφάλματος ήταν: %s" -#: ../src/empathy-account-assistant.c:181 +#: ../src/empathy-account-assistant.c:183 msgid "" "You can either go back and try to enter your accounts' details again or quit " "this assistant and add accounts later from the Edit menu." @@ -2190,47 +2181,46 @@ msgstr "" "των λογαριασμών σας, ή να εγκαταλείψετε το βοηθό και να προσθέσετε τους " "λογαριασμούς αργότερα, από το μενού Επεξεργασία." -#: ../src/empathy-account-assistant.c:218 -#: ../src/empathy-account-assistant.c:1241 +#: ../src/empathy-account-assistant.c:220 +#: ../src/empathy-account-assistant.c:1294 msgid "An error occurred" msgstr "Παρουσιάστηκε σφάλμα" -#. Create account #. To translator: %s is the protocol name #. Create account #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../src/empathy-account-assistant.c:395 ../src/empathy-accounts-dialog.c:552 +#: ../src/empathy-account-assistant.c:415 ../src/empathy-accounts-dialog.c:564 #, c-format msgid "New %s account" msgstr "Νέος λογαριασμός %s" -#: ../src/empathy-account-assistant.c:472 +#: ../src/empathy-account-assistant.c:502 msgid "What kind of chat account do you have?" msgstr "Τι είδους λογαριασμό έχετε;" -#: ../src/empathy-account-assistant.c:478 +#: ../src/empathy-account-assistant.c:508 msgid "Do you have any other chat accounts you want to set up?" msgstr "Θέλετε να ρυθμίσετε και άλλους λογαριασμούς σας;" -#: ../src/empathy-account-assistant.c:484 +#: ../src/empathy-account-assistant.c:514 msgid "Enter your account details" msgstr "Εισάγετε τα στοιχεία του λογαριασμού σας" -#: ../src/empathy-account-assistant.c:489 +#: ../src/empathy-account-assistant.c:519 msgid "What kind of chat account do you want to create?" msgstr "Τι είδους λογαριασμό θέλετε να δημιουργήσετε;" -#: ../src/empathy-account-assistant.c:495 +#: ../src/empathy-account-assistant.c:525 msgid "Do you want to create other chat accounts?" msgstr "Θέλετε να δημιουργήσετε άλλους λογαριασμούς;" -#: ../src/empathy-account-assistant.c:502 +#: ../src/empathy-account-assistant.c:532 msgid "Enter the details for the new account" msgstr "Εισάγετε τα στοιχεία του νέου λογαριασμού" -#: ../src/empathy-account-assistant.c:617 +#: ../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 " @@ -2240,128 +2230,133 @@ msgstr "" "Με το Empathy μπορείτε να συζητάτε με συνδεδεμένα γειτονικά άτομα, καθώς και " "με φίλους και συναδέλφους που χρησιμοποιούν Google Talk, AIM, Windows Live " "και πολλά άλλα προγράμματα αυτού του τύπου. Αν έχετε μικρόφωνο ή κάμερα, " -"μπορείτε επίσης να κάνετε φωνητικές κλήσεις ή βίντεοκλήσεις." +"μπορείτε επίσης να κάνετε φωνητικές κλήσεις ή βιντεοκλήσεις." -#: ../src/empathy-account-assistant.c:634 +#: ../src/empathy-account-assistant.c:664 msgid "Do you have an account you've been using with another chat program?" msgstr "Έχετε ήδη λογαριασμό που χρησιμοποιούσατε με άλλο πρόγραμμα μηνυμάτων;" -#: ../src/empathy-account-assistant.c:657 +#: ../src/empathy-account-assistant.c:687 msgid "Yes, import my account details from " msgstr "Ναι, να γίνει εισαγωγή των στοιχείων του λογαριασμού μου από το " -#: ../src/empathy-account-assistant.c:678 +#: ../src/empathy-account-assistant.c:708 msgid "Yes, I'll enter my account details now" msgstr "Ναι, θα εισάγω τα στοιχεία του λογαριασμού μου" -#: ../src/empathy-account-assistant.c:700 +#: ../src/empathy-account-assistant.c:730 msgid "No, I want a new account" msgstr "Όχι, θέλω να δημιουργήσω νέο λογαριασμό" -#: ../src/empathy-account-assistant.c:710 +#: ../src/empathy-account-assistant.c:740 msgid "No, I just want to see people online nearby for now" msgstr "" "Όχι, αλλά προς το παρόν θέλω μόνο να βλέπω τα συνδεδεμένα γειτονικά άτομα" -#: ../src/empathy-account-assistant.c:731 +#: ../src/empathy-account-assistant.c:761 msgid "Select the accounts you want to import:" msgstr "Επιλέξτε τους λογαριασμούς που θέλετε να εισάγετε:" -#: ../src/empathy-account-assistant.c:815 +#: ../src/empathy-account-assistant.c:845 #: ../src/empathy-new-chatroom-dialog.c:541 #: ../src/empathy-new-chatroom-dialog.c:542 msgid "Yes" msgstr "Ναι" -#: ../src/empathy-account-assistant.c:822 +#: ../src/empathy-account-assistant.c:852 msgid "No, that's all for now" msgstr "Όχι, αυτά προς το παρόν" -#: ../src/empathy-account-assistant.c:1064 +#: ../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 "" +"Το Empathy μπορεί να ανακαλύπτει αυτόματα και να επιτρέπει συζητήσεις με " +"άτομα συνδεδεμένα στο ίδιο δίκτυο με εσάς. Αν επιθυμείτε να χρησιμοποιήσετε " +"αυτή τη δυνατότητα, παρακαλώ ελέγξτε την ακρίβεια των παρακάτω στοιχείων. " +"Φυσικά, μπορείτε πολύ εύκολα να αλλάξετε τα στοιχεία ή να απενεργοποιήσετε " +"την υπηρεσία από το διάλογο 'Λογαριασμοί'." -#: ../src/empathy-account-assistant.c:1070 -#: ../src/empathy-account-assistant.c:1126 +#: ../src/empathy-account-assistant.c:1117 +#: ../src/empathy-account-assistant.c:1173 msgid "Edit->Accounts" msgstr "Επεξεργασία->Λογαριασμοί" -#: ../src/empathy-account-assistant.c:1086 -#, fuzzy +#: ../src/empathy-account-assistant.c:1133 msgid "I don't want to enable this feature for now" -msgstr "" -"Όχι, αλλά προς το παρόν θέλω μόνο να βλέπω τα συνδεδεμένα γειτονικά άτομα" +msgstr "Προς το παρόν δεν επιθυμώ να ενεργοποιήσω αυτή τη δυνατότητα" -#: ../src/empathy-account-assistant.c:1122 +#: ../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.\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 "" +"Δε θα μπορείτε να συζητάτε με άτομα συνδεδεμένα στο τοπικό σας δίκτυο, γιατί " +"δεν είναι εγκατεστημένο το telepathy-salut. Αν επιθυμείτε να ενεργοποιήσετε " +"αυτή τη δυνατότητα, παρακαλώ εγκαταστήστε το πακέτο telepathy-salut και " +"δημιουργήστε λογαριασμό 'Γειτονικά άτομα' από το διάλογο Λογαριασμοί" -#: ../src/empathy-account-assistant.c:1128 +#: ../src/empathy-account-assistant.c:1175 msgid "telepathy-salut not installed" -msgstr "" +msgstr "Δεν είναι εγκατεστημένο το telepathy-salut" -#: ../src/empathy-account-assistant.c:1205 +#: ../src/empathy-account-assistant.c:1252 msgid "Welcome to Empathy" msgstr "Καλώς ήλθατε στο Empathy" -#: ../src/empathy-account-assistant.c:1214 +#: ../src/empathy-account-assistant.c:1261 msgid "Import your existing accounts" msgstr "Εισαγωγή λογαριασμών" -#: ../src/empathy-account-assistant.c:1232 +#: ../src/empathy-account-assistant.c:1279 msgid "Please enter personal details" msgstr "Παρακαλώ εισάγετε τα προσωπικά σας στοιχεία" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:65 +#: ../src/empathy-accounts-dialog.c:66 #, c-format msgid "There are unsaved modifications to your %s account." msgstr "Υπάρχουν μη αποθηκευμένες αλλαγές στο λογαριασμό %s." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:69 +#: ../src/empathy-accounts-dialog.c:70 msgid "Your new account has not been saved yet." -msgstr "" +msgstr "Ο νέος λογαριασμός δεν έχει αποθηκευτεί ακόμη." -#: ../src/empathy-accounts-dialog.c:259 ../src/empathy-call-window.c:729 -#, fuzzy +#: ../src/empathy-accounts-dialog.c:265 ../src/empathy-call-window.c:729 msgid "Connecting…" msgstr "Γίνεται σύνδεση..." -#: ../src/empathy-accounts-dialog.c:286 +#: ../src/empathy-accounts-dialog.c:292 #, c-format msgid "Disconnected — %s" msgstr "Αποσυνδέθηκε — %s" -#: ../src/empathy-accounts-dialog.c:291 +#: ../src/empathy-accounts-dialog.c:297 #, c-format msgid "Offline — %s" msgstr "Εκτός σύνδεσης — %s" -#: ../src/empathy-accounts-dialog.c:304 +#: ../src/empathy-accounts-dialog.c:310 msgid "Offline — No Network Connection" msgstr "Εκτός σύνδεσης — Δεν υπάρχει σύνδεση δικτύου" -#: ../src/empathy-accounts-dialog.c:312 +#: ../src/empathy-accounts-dialog.c:318 msgid "Unknown Status" msgstr "Άγνωστη κατάσταση" -#: ../src/empathy-accounts-dialog.c:323 +#: ../src/empathy-accounts-dialog.c:329 msgid "Offline — Account Disabled" -msgstr "" +msgstr "Εκτός σύνδεσης — απενεργοποιημένος λογαριασμός" -#: ../src/empathy-accounts-dialog.c:720 +#: ../src/empathy-accounts-dialog.c:735 msgid "" "You are about to create a new account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2369,16 +2364,16 @@ msgstr "" "Αν δημιουργήσετε νέο λογαριασμό, θα απορριφθούν \n" "οι αλλαγές σας. Σίγουρα θέλετε να συνεχίσετε;" -#: ../src/empathy-accounts-dialog.c:1054 +#: ../src/empathy-accounts-dialog.c:1082 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Θέλετε να διαγράψετε το '%s' από τον υπολογιστή;" -#: ../src/empathy-accounts-dialog.c:1058 +#: ../src/empathy-accounts-dialog.c:1086 msgid "This will not remove your account on the server." msgstr "Ο λογαριασμός σας δε θα διαγραφεί από τον εξυπηρετητή." -#: ../src/empathy-accounts-dialog.c:1286 +#: ../src/empathy-accounts-dialog.c:1316 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2386,7 +2381,7 @@ msgstr "" "Αν επιλέξετε άλλο λογαριασμό, θα απορριφθούν \n" "οι αλλαγές σας. Σίγουρα θέλετε να συνεχίσετε;" -#: ../src/empathy-accounts-dialog.c:1829 +#: ../src/empathy-accounts-dialog.c:1863 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2395,7 +2390,7 @@ msgstr "" "οι αλλαγές σας. Σίγουρα θέλετε να συνεχίσετε;" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:1956 +#: ../src/empathy-accounts-dialog.c:1996 msgid "Accounts" msgstr "Λογαριασμός" @@ -2484,6 +2479,8 @@ msgid "" "%s's software does not understand any of the audio formats supported by your " "computer" msgstr "" +"Το λογισμικό του %s δεν υποστηρίζει καμία από τις μορφές ήχου που " +"υποστηρίζει ο υπολογιστής σας" #: ../src/empathy-call-window.c:1798 #, c-format @@ -2491,6 +2488,8 @@ msgid "" "%s's software does not understand any of the video formats supported by your " "computer" msgstr "" +"Το λογισμικό του %s δεν υποστηρίζει καμία από τις μορφές βίντεο που " +"υποστηρίζει ο υπολογιστής σας" #: ../src/empathy-call-window.c:1804 #, c-format @@ -2498,20 +2497,26 @@ msgid "" "Can't establish a connection to %s. One of you might be on a network that " "does not allow direct connections." msgstr "" +"Αδυναμία σύνδεσης με %s. Ένας από εσάς μπορεί να χρησιμοποιεί δίκτυο που δεν " +"επιτρέπει άμεσες συνδέσεις." #: ../src/empathy-call-window.c:1810 msgid "There was a failure on the network" -msgstr "" +msgstr "Παρουσιάστηκε κώλυμα στο δίκτυο" #: ../src/empathy-call-window.c:1814 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" +"Δεν είναι εγκατεστημένη η υποστήριξη για τις μορφές ήχου που απαιτεί αυτή η " +"κλήση" #: ../src/empathy-call-window.c:1817 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" +"Δεν είναι εγκατεστημένη η υποστήριξη για τις μορφές βίντεο που απαιτεί αυτή " +"η κλήση" #: ../src/empathy-call-window.c:1827 #, c-format @@ -2520,23 +2525,25 @@ msgid "" "\">report this bug</a> and attach logs gathered from the 'Debug' window in " "the Help menu." msgstr "" +"Παρουσιάστηκε μη αναμενόμενο σφάλμα σε ένα συστατικό του Telepathy. " +"Παρακαλώ, κάνετε <a href=\"%s\">αναφορά του σφάλματος</a>, επισυνάπτοντας " +"τις καταγραφές από το παράθυρο 'Αποσφαλμάτωση' του μενού Βοήθεια." #: ../src/empathy-call-window.c:1835 msgid "There was a failure in the call engine" -msgstr "" +msgstr "Αποτυχία του μηχανισμού κλήσης" #: ../src/empathy-call-window.c:1874 msgid "Can't establish audio stream" -msgstr "" +msgstr "Αδυναμία δημιουργίας ροής ήχου" #: ../src/empathy-call-window.c:1884 msgid "Can't establish video stream" -msgstr "" +msgstr "Αδυναμία δημιουργίας ροής βίντεο" #: ../src/empathy-call-window.ui.h:1 -#, fuzzy msgid "Call the contact again" -msgstr "Συμπτυγμένη λίστα επαφών" +msgstr "Εκ νέου κλήση της επαφής" #: ../src/empathy-call-window.ui.h:2 msgid "Camera Off" @@ -2548,7 +2555,7 @@ msgstr "Κάμερα ενεργή" #: ../src/empathy-call-window.ui.h:4 msgid "Disable camera and stop sending video" -msgstr "" +msgstr "Απενεργοποίηση κάμερας και διακοπή αποστολής βίντεο" #: ../src/empathy-call-window.ui.h:5 msgid "Enable camera and send video" @@ -2580,7 +2587,7 @@ msgstr "Αποστολή ήχου" #: ../src/empathy-call-window.ui.h:12 msgid "Toggle audio transmission" -msgstr "" +msgstr "Εναλλαγή της δυνατότητας αποστολής ήχου" #: ../src/empathy-call-window.ui.h:13 msgid "V_ideo" @@ -2602,35 +2609,35 @@ msgstr "Προεπισκόπηση βίντεο" msgid "_View" msgstr "_Προβολή" -#: ../src/empathy-chat-window.c:437 ../src/empathy-chat-window.c:457 +#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d μη αναγνωσμένο)" msgstr[1] "%s (%d μη αναγνωσμένα)" -#: ../src/empathy-chat-window.c:449 +#: ../src/empathy-chat-window.c:448 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" -msgstr[0] "%s (και %u άλλος/η)" -msgstr[1] "%s (και %u άλλοι/ες)" +msgstr[0] "%s (και %u άλλο)" +msgstr[1] "%s (και %u άλλα)" -#: ../src/empathy-chat-window.c:465 +#: ../src/empathy-chat-window.c:464 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s (%d μη αναγνωσμένο από άλλους)" +msgstr[1] "%s (%d μη αναγνωσμένα από άλλους)" -#: ../src/empathy-chat-window.c:474 +#: ../src/empathy-chat-window.c:473 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s (%d μη αναγνωσμένο από κανένα)" +msgstr[1] "%s (%d μη αναγνωσμένα από κανένα)" -#: ../src/empathy-chat-window.c:685 +#: ../src/empathy-chat-window.c:684 msgid "Typing a message." msgstr "Γράφει μήνυμα." @@ -2652,7 +2659,7 @@ msgstr "_Εισαγωγή χαμόγελου" #: ../src/empathy-chat-window.ui.h:5 msgid "Invite _Participant…" -msgstr "" +msgstr "Πρόσκληση _μέλους..." #: ../src/empathy-chat-window.ui.h:6 msgid "Move Tab _Left" @@ -2674,8 +2681,11 @@ msgstr "_Συζήτηση" msgid "_Detach Tab" msgstr "Από_σπαση καρτέλας" +#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19 +msgid "_Edit" +msgstr "_Επεξεργασία" + #: ../src/empathy-chat-window.ui.h:12 -#, fuzzy msgid "_Favorite Chat Room" msgstr "_Αγαπημένο δωμάτιο συζήτησης" @@ -2716,23 +2726,22 @@ msgid "Manage Favorite Rooms" msgstr "Διαχείριση αγαπημένων δωματίων" #: ../src/empathy-event-manager.c:339 -#, fuzzy msgid "Incoming video call" -msgstr "Εισερχόμενη φωνητική κλήση" +msgstr "Εισερχόμενη βιντεοκλήση" #: ../src/empathy-event-manager.c:339 msgid "Incoming call" msgstr "Εισερχόμενη κλήση" #: ../src/empathy-event-manager.c:343 -#, fuzzy, c-format +#, c-format msgid "%s is video calling you. Do you want to answer?" -msgstr "Ο/Η %s σας καλεί, θέλετε να απαντήσετε;" +msgstr "Ο/Η %s σας καλεί για βιντεοκλήση. Θέλετε να απαντήσετε;" #: ../src/empathy-event-manager.c:344 -#, fuzzy, c-format +#, c-format msgid "%s is calling you. Do you want to answer?" -msgstr "Ο/Η %s σας καλεί, θέλετε να απαντήσετε;" +msgstr "Ο/Η %s σας καλεί. Θέλετε να απαντήσετε;" #: ../src/empathy-event-manager.c:366 msgid "_Reject" @@ -2743,9 +2752,9 @@ msgid "_Answer" msgstr "_Απάντηση" #: ../src/empathy-event-manager.c:489 -#, fuzzy, c-format +#, c-format msgid "Incoming video call from %s" -msgstr "Εισερχόμενη κλήση από: %s" +msgstr "Εισερχόμενη βιντεοκλήση από: %s" #: ../src/empathy-event-manager.c:489 #, c-format @@ -2948,26 +2957,23 @@ msgstr "Πηγή" msgid "%s account" msgstr "Λογαριασμός %s" -#: ../src/empathy-main-window.c:430 -#, fuzzy +#: ../src/empathy-main-window.c:433 msgid "Reconnect" -msgstr "Εκτός σύνδεσης" +msgstr "Επανασύνδεση" -#: ../src/empathy-main-window.c:436 -#, fuzzy +#: ../src/empathy-main-window.c:439 msgid "Edit Account" -msgstr "_Επεξεργασία λογαριασμού" +msgstr "Επεξεργασία λογαριασμού" -#: ../src/empathy-main-window.c:442 -#, fuzzy +#: ../src/empathy-main-window.c:445 msgid "Close" -msgstr "Καθαρό" +msgstr "Κλείσιμο" -#: ../src/empathy-main-window.c:1025 +#: ../src/empathy-main-window.c:1028 msgid "Contact" msgstr "Επαφή" -#: ../src/empathy-main-window.c:1363 +#: ../src/empathy-main-window.c:1369 msgid "Show and edit accounts" msgstr "Εμφάνιση και επεξεργασία λογαριασμών" @@ -3008,9 +3014,8 @@ msgid "P_references" msgstr "_Προτιμήσεις" #: ../src/empathy-main-window.ui.h:10 -#, fuzzy msgid "Show P_rotocols" -msgstr "Πρωτόκολλο" +msgstr "Εμφάνιση πρ_ωτοκόλλων" #: ../src/empathy-main-window.ui.h:11 msgid "Sort by _Name" @@ -3067,7 +3072,7 @@ msgstr "Μέλη" #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, #. yes/no, yes/no and a number. #: ../src/empathy-new-chatroom-dialog.c:539 -#, fuzzy, c-format +#, c-format msgid "" "<b>%s</b>\n" "Invite required: %s\n" @@ -3289,7 +3294,7 @@ msgstr "_Δημοσίευση της τοποθεσίας μου στις επα msgid "_Reduce location accuracy" msgstr "_Μείωση της ακρίβειας της τοποθεσίας μου" -#: ../src/empathy-status-icon.c:175 +#: ../src/empathy-status-icon.c:176 msgid "Respond" msgstr "Απάντηση" @@ -3305,63 +3310,63 @@ msgstr "Έ_ξοδος" msgid "Contact Map View" msgstr "Προβολή χάρτη επαφών" -#: ../src/empathy-debug-window.c:1063 +#: ../src/empathy-debug-window.c:1066 msgid "Save" msgstr "Αποθήκευση" -#: ../src/empathy-debug-window.c:1185 +#: ../src/empathy-debug-window.c:1219 msgid "Debug Window" msgstr "Παράθυρο αποσφαλμάτωσης" -#: ../src/empathy-debug-window.c:1265 +#: ../src/empathy-debug-window.c:1299 msgid "Pause" msgstr "Παύση" -#: ../src/empathy-debug-window.c:1277 +#: ../src/empathy-debug-window.c:1311 msgid "Level " msgstr "Επίπεδο" -#: ../src/empathy-debug-window.c:1297 +#: ../src/empathy-debug-window.c:1331 msgid "Debug" msgstr "Αποσφαλμάτωση" -#: ../src/empathy-debug-window.c:1303 +#: ../src/empathy-debug-window.c:1337 msgid "Info" msgstr "Πληροφορίες" -#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358 +#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392 msgid "Message" msgstr "Μήνυμα" -#: ../src/empathy-debug-window.c:1315 +#: ../src/empathy-debug-window.c:1349 msgid "Warning" msgstr "Προειδοποίηση" -#: ../src/empathy-debug-window.c:1321 +#: ../src/empathy-debug-window.c:1355 msgid "Critical" msgstr "Κρίσιμο" -#: ../src/empathy-debug-window.c:1327 +#: ../src/empathy-debug-window.c:1361 msgid "Error" msgstr "Σφάλμα" -#: ../src/empathy-debug-window.c:1346 +#: ../src/empathy-debug-window.c:1380 msgid "Time" -msgstr "'Ωρα" +msgstr "Ώρα" -#: ../src/empathy-debug-window.c:1349 +#: ../src/empathy-debug-window.c:1383 msgid "Domain" msgstr "Τομέας" -#: ../src/empathy-debug-window.c:1351 +#: ../src/empathy-debug-window.c:1385 msgid "Category" msgstr "Κατηγορία" -#: ../src/empathy-debug-window.c:1353 +#: ../src/empathy-debug-window.c:1387 msgid "Level" msgstr "Επίπεδο" -#: ../src/empathy-debug-window.c:1385 +#: ../src/empathy-debug-window.c:1424 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -3376,7 +3381,41 @@ msgstr "Πρόσκληση μέλους" #: ../src/empathy-invite-participant-dialog.c:35 msgid "Choose a contact to invite into the conversation:" +msgstr "Επιλέξτε ποια επαφή θα προσκαλέσετε στη συζήτηση:" + +#: ../src/empathy-accounts.c:196 +msgid "" +"Try to import any recognized accounts and display an assistant if that fails" +msgstr "" +"Προσπάθεια εισαγωγής λογαριασμών και εμφάνιση βοηθού σε περίπτωση αποτυχίας" + +#: ../src/empathy-accounts.c:201 +msgid "Don't display any dialogs; do any work (eg, importing) and exit" +msgstr "" +"Να μην εμφανιστούν διάλογοι. Εκτέλεση των εργασιών (π.χ. εισαγωγή) κα έξοδος" + +#: ../src/empathy-accounts.c:205 +msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" +"Αρχικά, επιλογή δοσμένου λογαριασμού (π.χ., gabble/jabber/bla_40bla_2bla0)" + +#: ../src/empathy-accounts.c:207 +#| msgid "account" +msgid "<account-id>" +msgstr "<όνομα χρήστη λογαριασμού>" + +#: ../src/empathy-accounts.c:215 +#| msgid "Import Accounts" +msgid "- Empathy Accounts" +msgstr "- λογαριασμοί Empathy" + +#: ../src/empathy-accounts.c:231 +#| msgid "Accounts" +msgid " Accounts" +msgstr "Λογαριασμοί" + +#~ msgid "Show the accounts dialog" +#~ msgstr "Εμφάνιση του διαλόγου λογαριασμών" #~ msgid "Can't set an empty display name" #~ msgstr "Δεν επιτρέπεται η χρήση κενού ονόματος" @@ -3384,9 +3423,6 @@ msgstr "" #~ msgid "Hidden" #~ msgstr "Αόρατος/η" -#~ msgid "What is your Windows Live user name?" -#~ msgstr "Ποιο είναι το όνομα χρήστη σας στο Windows Live;" - #~ msgid "Unsupported command" #~ msgstr "Μη υποστηριζόμενη εντολή" @@ -3484,9 +3520,6 @@ msgstr "" #~ msgid "_Reuse an existing account" #~ msgstr "Χρήση _υπάρχοντος λογαριασμού" -#~ msgid "account" -#~ msgstr "λογαριασμός" - #~ msgid "Conversations (%d)" #~ msgstr "Συζητήσεις (%d)" @@ -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" @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&component=general\n" -"POT-Creation-Date: 2009-11-23 16:04+0000\n" -"PO-Revision-Date: 2009-10-03 17:54+0200\n" -"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" +"POT-Creation-Date: 2010-02-27 18:54+0000\n" +"PO-Revision-Date: 2010-02-18 20:14+0200\n" +"Last-Translator: Omri Strumza <blueomega@gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,9 +51,9 @@ msgstr "Chat window theme" #: ../data/empathy.schemas.in.h:4 msgid "" -"Comma separated list of spell checker languages to use (e.g. en, fr, nl)." +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "" -"Comma separated list of spell checker languages to use (e.g. en, fr, nl)." +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." #: ../data/empathy.schemas.in.h:5 msgid "Compact contact list" @@ -152,12 +152,12 @@ msgid "Open new chats in separate windows" msgstr "Open new chats in separate windows" #: ../data/empathy.schemas.in.h:29 -msgid "Path of the adium theme to use" -msgstr "Path of the adium theme to use" +msgid "Path of the Adium theme to use" +msgstr "Path of the Adium theme to use" #: ../data/empathy.schemas.in.h:30 -msgid "Path of the adium theme to use if the theme used for chat is adium." -msgstr "Path of the adium theme to use if the theme used for chat is adium." +msgid "Path of the Adium theme to use if the theme used for chat is Adium." +msgstr "Path of the Adium theme to use if the theme used for chat is Adium." #: ../data/empathy.schemas.in.h:31 msgid "Play a sound for incoming messages" @@ -188,16 +188,16 @@ msgid "Play a sound when we log out" msgstr "Play a sound when we log out" #: ../data/empathy.schemas.in.h:38 -msgid "Popup notifications if the chat isn't focused" -msgstr "Popup notifications if the chat isn't focused" +msgid "Pop up notifications if the chat isn't focused" +msgstr "Pop up notifications if the chat isn't focused" #: ../data/empathy.schemas.in.h:39 -msgid "Popup notifications when a contact sign in" -msgstr "Popup notifications when a contact sign in" +msgid "Pop up notifications when a contact logs in" +msgstr "Pop up notifications when a contact logs in" #: ../data/empathy.schemas.in.h:40 -msgid "Popup notifications when a contact sign out" -msgstr "Popup notifications when a contact sign out" +msgid "Pop up notifications when a contact logs out" +msgstr "Pop up notifications when a contact logs out" #: ../data/empathy.schemas.in.h:41 msgid "Salut account is created" @@ -220,254 +220,240 @@ msgid "Show offline contacts" msgstr "Show offline contacts" #: ../data/empathy.schemas.in.h:46 +msgid "Show protocols" +msgstr "Show protocols" + +#: ../data/empathy.schemas.in.h:47 msgid "Spell checking languages" msgstr "Spell checking languages" -#: ../data/empathy.schemas.in.h:47 +#: ../data/empathy.schemas.in.h:48 msgid "The default folder to save file transfers in." msgstr "The default folder to save file transfers in." -#: ../data/empathy.schemas.in.h:48 +#: ../data/empathy.schemas.in.h:49 msgid "The last directory that an avatar image was chosen from." msgstr "The last directory that an avatar image was chosen from." -#: ../data/empathy.schemas.in.h:49 +#: ../data/empathy.schemas.in.h:50 msgid "The theme that is used to display the conversation in chat windows." msgstr "The theme that is used to display the conversation in chat windows." -#: ../data/empathy.schemas.in.h:50 +#: ../data/empathy.schemas.in.h:51 msgid "Use graphical smileys" msgstr "Use graphical smileys" -#: ../data/empathy.schemas.in.h:51 +#: ../data/empathy.schemas.in.h:52 msgid "Use notification sounds" msgstr "Use notification sounds" -#: ../data/empathy.schemas.in.h:52 +#: ../data/empathy.schemas.in.h:53 msgid "Use theme for chat rooms" msgstr "Use theme for chat rooms" -#: ../data/empathy.schemas.in.h:53 -msgid "" -"Whether WebKit developer tools, such as the Web Inspector, should be enabled." -msgstr "" -"Whether WebKit developer tools, such as the Web Inspector, should be enabled." - #: ../data/empathy.schemas.in.h:54 -msgid "Whether or not Empathy can publish the user's location to his contacts." -msgstr "" -"Whether or not Empathy can publish the user's location to his contacts." +msgid "Whether Empathy can publish the user's location to their contacts." +msgstr "Whether Empathy can publish the user's location to their contacts." #: ../data/empathy.schemas.in.h:55 -msgid "Whether or not Empathy can use the GPS to guess the location." -msgstr "Whether or not Empathy can use the GPS to guess the location." +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "Whether Empathy can use the GPS to guess the location." #: ../data/empathy.schemas.in.h:56 -msgid "" -"Whether or not Empathy can use the cellular network to guess the location." -msgstr "" -"Whether or not Empathy can use the cellular network to guess the location." +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "Whether Empathy can use the cellular network to guess the location." #: ../data/empathy.schemas.in.h:57 -msgid "Whether or not Empathy can use the network to guess the location." -msgstr "Whether or not Empathy can use the network to guess the location." +msgid "Whether Empathy can use the network to guess the location." +msgstr "Whether Empathy can use the network to guess the location." #: ../data/empathy.schemas.in.h:58 -msgid "" -"Whether or not Empathy has asked about importing accounts from other " -"programs." -msgstr "" -"Whether or not Empathy has asked about importing accounts from other " -"programs." +msgid "Whether Empathy has asked about importing accounts from other programs." +msgstr "Whether Empathy has asked about importing accounts from other programs." #: ../data/empathy.schemas.in.h:59 -msgid "" -"Whether or not Empathy should automatically log in to your accounts on " -"startup." -msgstr "" -"Whether or not Empathy should automatically log in to your accounts on " -"startup." +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "Whether Empathy should automatically log into your accounts on startup." #: ../data/empathy.schemas.in.h:60 msgid "" -"Whether or not Empathy should reduce the location's accuracy for privacy " -"reasons." +"Whether Empathy should reduce the location's accuracy for privacy reasons." msgstr "" -"Whether or not Empathy should reduce the location's accuracy for privacy " -"reasons." +"Whether Empathy should reduce the location's accuracy for privacy reasons." #: ../data/empathy.schemas.in.h:61 msgid "" -"Whether or not Empathy should use the avatar of the contact as the chat " -"window icon." +"Whether Empathy should use the avatar of the contact as the chat window icon." msgstr "" -"Whether or not Empathy should use the avatar of the contact as the chat " -"window icon." +"Whether Empathy should use the avatar of the contact as the chat window icon." #: ../data/empathy.schemas.in.h:62 msgid "" -"Whether or not connectivity managers should be used to automatically " -"disconnect/reconnect." +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "" -"Whether or not connectivity managers should be used to automatically " -"disconnect/reconnect." +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." #: ../data/empathy.schemas.in.h:63 msgid "" -"Whether or not the Salut account has been created on the first Empathy run." +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." msgstr "" -"Whether or not the Salut account has been created on the first Empathy run." +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." #: ../data/empathy.schemas.in.h:64 -msgid "" -"Whether or not to check words typed against the languages you want to check " -"with." -msgstr "" -"Whether or not to check words typed against the languages you want to check " -"with." +msgid "Whether the Salut account has been created on the first Empathy run." +msgstr "Whether the Salut account has been created on the first Empathy run." #: ../data/empathy.schemas.in.h:65 msgid "" -"Whether or not to convert smileys into graphical images in conversations." +"Whether to check words typed against the languages you want to check with." msgstr "" -"Whether or not to convert smileys into graphical images in conversations." +"Whether to check words typed against the languages you want to check with." #: ../data/empathy.schemas.in.h:66 -msgid "" -"Whether or not to play a sound to notify for contacts logging in the network." -msgstr "" -"Whether or not to play a sound to notify for contacts logging in the network." +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "Whether to convert smileys into graphical images in conversations." #: ../data/empathy.schemas.in.h:67 -msgid "" -"Whether or not to play a sound to notify for contacts logging off the " -"network." -msgstr "" -"Whether or not to play a sound to notify for contacts logging off the " -"network." +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "Whether to play a sound to notify of contacts logging into the network." #: ../data/empathy.schemas.in.h:68 -msgid "Whether or not to play a sound to notify for events." -msgstr "Whether or not to play a sound to notify for events." +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "" +"Whether to play a sound to notify of contacts logging out of the network." #: ../data/empathy.schemas.in.h:69 -msgid "Whether or not to play a sound to notify for incoming messages." -msgstr "Whether or not to play a sound to notify for incoming messages." +msgid "Whether to play a sound to notify of events." +msgstr "Whether to play a sound to notify of events." #: ../data/empathy.schemas.in.h:70 -msgid "Whether or not to play a sound to notify for new conversations." -msgstr "Whether or not to play a sound to notify for new conversations." +msgid "Whether to play a sound to notify of incoming messages." +msgstr "Whether to play a sound to notify of incoming messages." #: ../data/empathy.schemas.in.h:71 -msgid "Whether or not to play a sound to notify for outgoing messages." -msgstr "Whether or not to play a sound to notify for outgoing messages." +msgid "Whether to play a sound to notify of new conversations." +msgstr "Whether to play a sound to notify of new conversations." #: ../data/empathy.schemas.in.h:72 -msgid "Whether or not to play a sound when logging in a network." -msgstr "Whether or not to play a sound when logging in a network." +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "Whether to play a sound to notify of outgoing messages." #: ../data/empathy.schemas.in.h:73 -msgid "Whether or not to play a sound when logging off a network." -msgstr "Whether or not to play a sound when logging off a network." +msgid "Whether to play a sound when logging into a network." +msgstr "Whether to play a sound when logging into a network." #: ../data/empathy.schemas.in.h:74 -msgid "Whether or not to play sound notifications when away or busy." -msgstr "Whether or not to play sound notifications when away or busy." +msgid "Whether to play a sound when logging out of a network." +msgstr "Whether to play a sound when logging out of a network." #: ../data/empathy.schemas.in.h:75 -msgid "" -"Whether or not to show a popup notification when a contact goes offline." -msgstr "" -"Whether or not to show a popup notification when a contact goes offline." +msgid "Whether to play sound notifications when away or busy." +msgstr "Whether to play sound notifications when away or busy." #: ../data/empathy.schemas.in.h:76 -msgid "Whether or not to show a popup notification when a contact goes online." -msgstr "" -"Whether or not to show a popup notification when a contact goes online." +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "Whether to show a popup notification when a contact goes offline." #: ../data/empathy.schemas.in.h:77 -msgid "" -"Whether or not to show a popup notification when receiving a new message " -"even if the chat is already opened, but not focused." -msgstr "" -"Whether or not to show a popup notification when receiving a new message " -"even if the chat is already opened, but not focused." +msgid "Whether to show a popup notification when a contact goes online." +msgstr "Whether to show a popup notification when a contact goes online." #: ../data/empathy.schemas.in.h:78 msgid "" -"Whether or not to show a popup notification when receiving a new message." +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." msgstr "" -"Whether or not to show a popup notification when receiving a new message." +"Whether to show a popup notification when receiving a new message even if " +"the chat is already opened, but not focused." #: ../data/empathy.schemas.in.h:79 -msgid "" -"Whether or not to show avatars for contacts in the contact list and chat " -"windows." -msgstr "" -"Whether or not to show avatars for contacts in the contact list and chat " -"windows." +msgid "Whether to show a popup notification when receiving a new message." +msgstr "Whether to show a popup notification when receiving a new message." #: ../data/empathy.schemas.in.h:80 -msgid "Whether or not to show contacts that are offline in the contact list." -msgstr "Whether or not to show contacts that are offline in the contact list." +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "" +"Whether to show avatars for contacts in the contact list and chat windows." #: ../data/empathy.schemas.in.h:81 -msgid "Whether or not to show popup notifications when away or busy." -msgstr "Whether or not to show popup notifications when away or busy." +msgid "Whether to show contacts that are offline in the contact list." +msgstr "Whether to show contacts that are offline in the contact list." #: ../data/empathy.schemas.in.h:82 -msgid "Whether or not to show the contact list in chat rooms." -msgstr "Whether or not to show the contact list in chat rooms." +msgid "Whether to show popup notifications when away or busy." +msgstr "Whether to show popup notifications when away or busy." #: ../data/empathy.schemas.in.h:83 -msgid "" -"Whether or not to show the message dialog about closing the main window with " -"the 'x' button in the title bar." -msgstr "" -"Whether or not to show the message dialog about closing the main window with " -"the 'x' button in the title bar." +msgid "Whether to show protocols for contacts in the contact list." +msgstr "Whether to show protocols for contacts in the contact list." #: ../data/empathy.schemas.in.h:84 -msgid "Whether to show the contact list in compact mode or not." -msgstr "Whether to show the contact list in compact mode or not." +msgid "Whether to show the contact list in chat rooms." +msgstr "Whether to show the contact list in chat rooms." #: ../data/empathy.schemas.in.h:85 -msgid "Whether to use the theme for chat rooms or not." -msgstr "Whether to use the theme for chat rooms or not." +msgid "Whether to show the contact list in compact mode." +msgstr "Whether to show the contact list in compact mode." #: ../data/empathy.schemas.in.h:86 msgid "" -"Which criterion to use when sorting the contact list. Default is to use sort " -"by the contact's name with the value \"name\". A value of \"state\" will " -"sort the contact list by state." +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." msgstr "" -"Which criterion to use when sorting the contact list. Default is to use sort " -"by the contact's name with the value \"name\". A value of \"state\" will " -"sort the contact list by state." +"Whether to show the message dialog about closing the main window with the " +"'x' button in the title bar." -#: ../libempathy/empathy-ft-handler.c:839 +#: ../data/empathy.schemas.in.h:87 +msgid "Whether to use the theme for chat rooms." +msgstr "Whether to use the theme for chat rooms." + +#: ../data/empathy.schemas.in.h:88 +msgid "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's name with the value \"name\". A value of \"state\" will sort " +"the contact list by state." +msgstr "" +"Which criterion to use when sorting the contact list. Default is to sort by " +"the contact's name with the value \"name\". A value of \"state\" will sort " +"the contact list by state." + +#: ../data/empathy-accounts.desktop.in.in.h:1 +msgid "Manage Messaging and VoIP accounts" +msgstr "" + +#: ../data/empathy-accounts.desktop.in.in.h:2 +#: ../src/cc-empathy-accounts-page.c:201 ../src/cc-empathy-accounts-panel.c:70 +msgid "Messaging and VoIP Accounts" +msgstr "" + +#: ../libempathy/empathy-ft-handler.c:842 msgid "The hash of the received file and the sent one do not match" msgstr "סכום גיבוב של הקובץ הנשלח והקובץ שהתקבל אינו תואם" -#: ../libempathy/empathy-ft-handler.c:1099 +#: ../libempathy/empathy-ft-handler.c:1102 msgid "File transfer not supported by remote contact" msgstr "העברת קבצים לא נתמכת על ידי איש הקשר המרוחק" -#: ../libempathy/empathy-ft-handler.c:1157 +#: ../libempathy/empathy-ft-handler.c:1160 msgid "The selected file is not a regular file" msgstr "הקובץ הנבחר אינו קובץ רגיל" -#: ../libempathy/empathy-ft-handler.c:1166 +#: ../libempathy/empathy-ft-handler.c:1169 msgid "The selected file is empty" msgstr "הקובץ הנבחר ריק" -#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:293 +#: ../libempathy/empathy-tp-contact-list.c:834 +#: ../src/empathy-auto-salut-account-helper.c:96 msgid "People nearby" msgstr "אנשים קרובים" #: ../libempathy/empathy-tp-file.c:280 msgid "Socket type not supported" -msgstr "Socket type not supported" +msgstr "סוג שקע אינו נתמך" #: ../libempathy/empathy-tp-file.c:399 msgid "No reason was specified" @@ -493,7 +479,7 @@ msgstr "התרחשה שגיאה בזמן ניסיון העברת הקובץ" msgid "The other participant is unable to transfer the file" msgstr "המשתתף האחר לא יכול להעביר את הקובץ" -#: ../libempathy/empathy-tp-file.c:417 +#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314 msgid "Unknown reason" msgstr "סיבה לא ידועה" @@ -510,22 +496,78 @@ msgid "Away" msgstr "מרוחק" #: ../libempathy/empathy-utils.c:245 -msgid "Hidden" -msgstr "מוסתר" +msgid "Invisible" +msgstr "בלתי נראה" #: ../libempathy/empathy-utils.c:247 msgid "Offline" msgstr "לא מחובר" -#: ../libempathy/empathy-utils.c:383 ../src/empathy-import-mc4-accounts.c:104 +#: ../libempathy/empathy-utils.c:286 +msgid "No reason specified" +msgstr "לא צויינה סיבה" + +#: ../libempathy/empathy-utils.c:288 +msgid "Status is set to offline" +msgstr "המצב מוגדר כמנותק" + +#: ../libempathy/empathy-utils.c:290 +msgid "Network error" +msgstr "שגיאת רשת" + +#: ../libempathy/empathy-utils.c:292 +msgid "Authentication failed" +msgstr "האימות נכשל" + +#: ../libempathy/empathy-utils.c:294 +msgid "Encryption error" +msgstr "שגיאת הצפנה" + +#: ../libempathy/empathy-utils.c:296 +msgid "Name in use" +msgstr "השם בשימוש" + +#: ../libempathy/empathy-utils.c:298 +msgid "Certificate not provided" +msgstr "לא סופקה תעודה" + +#: ../libempathy/empathy-utils.c:300 +msgid "Certificate untrusted" +msgstr "התעודה אינה מאובטחת" + +#: ../libempathy/empathy-utils.c:302 +msgid "Certificate expired" +msgstr "התעודה לא תקפה" + +#: ../libempathy/empathy-utils.c:304 +msgid "Certificate not activated" +msgstr "התעודה אינה פעילה" + +#: ../libempathy/empathy-utils.c:306 +msgid "Certificate hostname mismatch" +msgstr "שם המארח בתעודה לא תואם" + +#: ../libempathy/empathy-utils.c:308 +msgid "Certificate fingerprint mismatch" +msgstr "טביעת האצבע של התעודה אינה תואמת" + +#: ../libempathy/empathy-utils.c:310 +msgid "Certificate self-signed" +msgstr "תעודה בחתימה עצמית" + +#: ../libempathy/empathy-utils.c:312 +msgid "Certificate error" +msgstr "שגיאת תעודה" + +#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104 msgid "People Nearby" msgstr "אנשים קרובים" -#: ../libempathy/empathy-utils.c:388 +#: ../libempathy/empathy-utils.c:434 msgid "Yahoo! Japan" msgstr "Yahoo! יפן" -#: ../libempathy/empathy-utils.c:389 +#: ../libempathy/empathy-utils.c:435 msgid "Facebook Chat" msgstr "צ'ט Facebook" @@ -575,56 +617,67 @@ msgstr[1] "לפני %d חודשים" msgid "in the future" msgstr "בעתיד" -#: ../libempathy-gtk/empathy-account-chooser.c:450 +#: ../libempathy-gtk/empathy-account-chooser.c:462 msgid "All" msgstr "הכל" -#: ../libempathy-gtk/empathy-account-widget.c:513 -#: ../libempathy-gtk/empathy-account-widget.c:569 +#: ../libempathy-gtk/empathy-account-widget.c:527 +#: ../libempathy-gtk/empathy-account-widget.c:583 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1245 +#: ../libempathy-gtk/empathy-account-widget.c:1117 +msgid "Username:" +msgstr "ש_ם משתמש:" + +#: ../libempathy-gtk/empathy-account-widget.c:1446 msgid "L_og in" msgstr "_כניסה" -#: ../libempathy-gtk/empathy-account-widget.c:1452 -msgid "Enabled" -msgstr "מופעל" - -#. Translators: this is used only when built on a moblin platform -#: ../libempathy-gtk/empathy-account-widget.c:1458 +#: ../libempathy-gtk/empathy-account-widget.c:1514 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" msgstr "חשבון:" +#: ../libempathy-gtk/empathy-account-widget.c:1525 +msgid "Enabled" +msgstr "מופעל" + +#: ../libempathy-gtk/empathy-account-widget.c:1590 +msgid "This account already exists on the server" +msgstr "חשבון זה כבר קיים על השרת" + +#: ../libempathy-gtk/empathy-account-widget.c:1593 +msgid "Create a new account on the server" +msgstr "צור חשבון חדש על השרת" + #. To translators: The first parameter is the login id and the #. * second one is the server. The resulting string will be something #. * like: "MyUserName on chat.freenode.net". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:1722 +#: ../libempathy-gtk/empathy-account-widget.c:1968 #, c-format msgid "%1$s on %2$s" msgstr "%1$s על גבי %2$s" #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:1740 +#: ../libempathy-gtk/empathy-account-widget.c:1994 #, c-format msgid "%s Account" msgstr "%s" -#: ../libempathy-gtk/empathy-account-widget.c:1744 +#: ../libempathy-gtk/empathy-account-widget.c:1998 msgid "New account" msgstr "חשבון חדש" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 -msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>" +msgid "<b>Example:</b> MyScreenName" msgstr "<span size=\"small\"><b>דוגמה:</b> MyScreenName</span>" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 @@ -634,7 +687,7 @@ msgstr "<span size=\"small\"><b>דוגמה:</b> MyScreenName</span>" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 msgid "Advanced" msgstr "מתקדם" @@ -644,7 +697,7 @@ msgstr "מתקדם" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 msgid "Pass_word:" msgstr "סיסמ_ה:" @@ -664,7 +717,7 @@ msgstr "שם לתצוגה בחשבון ה־AIM שלך?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "_Port:" @@ -673,7 +726,7 @@ msgstr "_שער:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9 -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12 #: ../src/empathy-new-chatroom-dialog.ui.h:9 @@ -682,8 +735,8 @@ msgstr "_שרת:" #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1 -msgid "<span size=\"small\"><b>Example:</b> username</span>" -msgstr "<span size=\"small\"><b>לדוגמה:</b> username</span>" +msgid "<b>Example:</b> username" +msgstr "<span size=\"small\"><b>דוגמה:</b> username</span>" #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 @@ -700,8 +753,8 @@ msgid "What is your GroupWise password?" msgstr "סיסמת ה־GroupWise שלך?" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 -msgid "<span size=\"small\"><b>Example:</b> 123456789</span>" -msgstr "<span size=\"small\"><b>לדוגמה:</b> 123456789</span>" +msgid "<b>Example:</b> 123456789" +msgstr "<span size=\"small\"><b>דוגמה:</b> 123456789</span>" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "ICQ _UIN:" @@ -717,15 +770,48 @@ msgstr "סיסמת ה־ICQ שלך?" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 -msgid "_Charset:" +msgid "_Character set:" msgstr "קידוד _תווים:" #: ../libempathy-gtk/empathy-account-widget-irc.c:244 msgid "New Network" msgstr "רשת חדשה" +#: ../libempathy-gtk/empathy-account-widget-sip.c:184 +#: ../libempathy-gtk/empathy-account-widget-sip.c:217 +msgid "Auto" +msgstr "אוטומטי" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:187 +msgid "UDP" +msgstr "UDP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:190 +msgid "TCP" +msgstr "TCP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:193 +msgid "TLS" +msgstr "TLS" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:222 +msgid "Register" +msgstr "הרשם" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:227 +msgid "Options" +msgstr "אפשרויות" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:230 +msgid "None" +msgstr "ללא" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -msgid "Charset:" +msgid "Character set:" msgstr "קידוד תווים:" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 @@ -757,12 +843,12 @@ msgid "Servers" msgstr "שרתים" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>" -msgstr "<span size=\"small\"><b>לדוגמה:</b> user@gmail.com</span>" +msgid "<b>Example:</b> user@gmail.com" +msgstr "<span size=\"small\"><b>דוגמה:</b> user@gmail.com</span>" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>" -msgstr "<span size=\"small\"><b>לדוגמה:</b> user@jabber.org</span>" +msgid "<b>Example:</b> user@jabber.org" +msgstr "<span size=\"small\"><b>דוגמה:</b> user@jabber.org</span>" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 msgid "Override server settings" @@ -777,56 +863,76 @@ msgid "Reso_urce:" msgstr "_משאב:" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +msgid "" +"This is your username, not your normal Facebook login.\n" +"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n" +"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a " +"Facebook username if you don't have one." +msgstr "" +"זהו שם המשתמש שלך, לא פרטי החיבור הרגלים שלך לפייסבוק.\n" +"אם אתה facebook.com/<b>badger</b>, הכנס <b>badger</b>.\n" +"<a href=\"http://www.facebook.com/username/\">this page</a> to choose a " +"Facebook username if you don't have one." + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 msgid "Use old SS_L" msgstr "השתמש ב־SS_L ישן" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +msgid "What is your Facebook password?" +msgstr "מהי סיסמת חשבון ה־Facebook שלך?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +msgid "What is your Facebook username?" +msgstr "שם משתמש שלך ב־ Facebook?" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 msgid "What is your Google ID?" msgstr "מזהה משתמש שלך ב־Google?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 msgid "What is your Google password?" msgstr "סיסמת ה־Google שלך?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 msgid "What is your Jabber ID?" msgstr "מזהה משתמש ה־Jabber שלך?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 msgid "What is your Jabber password?" msgstr "סיסמת ה־Jabber שלך?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 msgid "What is your desired Jabber ID?" msgstr "מהי כתובת ה־Jabber המועדפת עליך?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 msgid "What is your desired Jabber password?" msgstr "מהי סיסמת ה־Jabber המועדפת עליך?" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 msgid "_Encryption required (TLS/SSL)" msgstr "_נדרשת הצפנה (TLS/SSL)" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 msgid "_Ignore SSL certificate errors" msgstr "ה_תעלם משגיאות בתעודות SSL" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 -msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>" -msgstr "<span size=\"small\"><b>לדוגמה:</b> user@hotmail.com</span>" +msgid "<b>Example:</b> user@hotmail.com" +msgstr "<span size=\"small\"><b>דוגמה:</b> user@hotmail.com</span>" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -msgid "What is your Windows Live password?" -msgstr "סיסמת ה־Windows Live שלך?" +msgid "What is your Windows Live ID?" +msgstr "שם המשתמש שלך ב- Windows Live?" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -msgid "What is your Windows Live user name?" -msgstr "שם משתמש שלך ב־Windows Live?" +msgid "What is your Windows Live password?" +msgstr "סיסמת ה־Windows Live שלך?" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "_Email:" -msgstr "_דוא\"ל:" +msgid "_E-mail address:" +msgstr "_כתובת דוא\"ל:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 msgid "_First Name:" @@ -849,100 +955,111 @@ msgid "_Published Name:" msgstr "שם _ציבורי:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 -msgid "<b>Keep-Alive Options</b>" -msgstr "" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#| msgid "<b>Location</b>" -msgid "<b>Miscellaneous Options</b>" -msgstr "<b>אפשרויות כלליות</b>" +msgid "<b>Example:</b> user@my.sip.server" +msgstr "<span size=\"small\"><b>דוגמה:</b> user@my.sip.server</span>" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "<b>NAT Traversal Options</b>" -msgstr "" +msgid "Authentication username:" +msgstr "שם משתמש עבור אימות:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -#| msgid "<b>Location</b>" -msgid "<b>Proxy Options</b>" -msgstr "<b>אפשרויות מתווך</b>" +msgid "Discover Binding" +msgstr "גילוי קישור" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>" -msgstr "<span size=\"small\"><b>לדוגמה:</b> user@my.sip.server</span>" +msgid "Discover the STUN server automatically" +msgstr "גלה את שרת ה-STUN אוטומטית" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 +msgid "Hostname of the proxy for outbound requests." +msgstr "" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -#, fuzzy -#| msgid "Authentication failed" -msgid "Authentication username:" -msgstr "האימות נכשל" +msgid "Interval (seconds)" +msgstr "מרווח (שניות)" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -#, fuzzy -#| msgid "Discover STUN" -msgid "Discover Binding" -msgstr "גילוי STUN" +msgid "Keep-Alive Options" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 +msgid "" +"Look up the DNS SRV record at the service's domain for the host name of a " +"STUN server." +msgstr "" -#. look up the DNS SRV record at the service's domain for the host name of a STUN server. #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 -msgid "Discover the STUN server automatically" -msgstr "גלה את שרת ה-STUN אוטומטית" +msgid "Loose Routing" +msgstr "" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 -msgid "Hostname of the proxy for outbound requests." +msgid "Mechanism:" msgstr "" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 -msgid "Interval (seconds)" -msgstr "מרווח (שניות)" +msgid "Miscellaneous Options" +msgstr "אפשרויות אחרות" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 -msgid "Loose Routing" +msgid "NAT Traversal Options" msgstr "" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 -msgid "Mechanism:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 +msgid "Port of the proxy for outbound requests." msgstr "" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -#| msgid "_Port:" msgid "Port:" msgstr "_פתחה::" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Proxy Options" +msgstr "אפשרויות מתווך" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 msgid "STUN Server:" msgstr "שרת STUN:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -#| msgid "_Server:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 msgid "Server:" msgstr "שרת:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 msgid "" "The username for SIP authentication, if different from the SIP URI\n" "username." msgstr "" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -#, fuzzy -#| msgid "STUN port:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 msgid "Transport:" -msgstr "שער STUN:" +msgstr "תעבורה:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "" +"Update the registration binding if the external address for the client is " +"discovered to be different from the local binding." +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "" +"Use the loose routing behavior and the Route header as recommended in RFC " +"3261." +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 msgid "What is your SIP account password?" msgstr "מהי סיסמת חשבון ה־SIP שלך?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26 msgid "What is your SIP login ID?" msgstr "מהו מזהה ההתחברות של חשבון ה־SIP שלך?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27 msgid "_Username:" msgstr "ש_ם משתמש:" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 -msgid "Use _Yahoo Japan" +msgid "Use _Yahoo! Japan" msgstr "השתמש ב־_Yahoo יפן" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 @@ -954,12 +1071,12 @@ msgid "What is your Yahoo! password?" msgstr "מהי סיסמת חשבון ה־Yahoo! שלך?" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 -msgid "Yahoo I_D:" -msgstr "חש_בון Yahoo:" +msgid "Yahoo! I_D:" +msgstr "מז_הה Yahoo!:" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "_Ignore conference and chatroom invitations" -msgstr "ה_תעלם מהזמנות לשיחות ועידה וחדרי שיחה" +msgid "_Ignore conference and chat room invitations" +msgstr "_התעלם מהזמנות לשיחות ועידה וחדרי שיחה" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "_Room List locale:" @@ -971,7 +1088,7 @@ msgid "Couldn't convert image" msgstr "לא ניתן להמיר תמונה" #: ../libempathy-gtk/empathy-avatar-chooser.c:450 -msgid "None of the accepted image formats is supported on your system" +msgid "None of the accepted image formats are supported on your system" msgstr "אף אחד מסוגי התמונות המקובלים אינם נתמכים על ידי המערכת שלך" #: ../libempathy-gtk/empathy-avatar-chooser.c:915 @@ -994,150 +1111,147 @@ msgstr "כל הקבצים" msgid "Click to enlarge" msgstr "לחץ כדי להגדיל" -#: ../libempathy-gtk/empathy-chat.c:194 +#: ../libempathy-gtk/empathy-chat.c:232 msgid "Failed to reconnect this chat" msgstr "נכשל בהתחברות לשיחה" -#: ../libempathy-gtk/empathy-chat.c:592 -#, fuzzy -#| msgid "_Invite to chatroom" -msgid "Failed to join chatroom" -msgstr "_הזמן לחדר שיחה" +#: ../libempathy-gtk/empathy-chat.c:654 +msgid "Failed to join chat room" +msgstr "נכשל בהצטרפות לחדר שיחה" -#: ../libempathy-gtk/empathy-chat.c:610 -#, fuzzy -#| msgid "Failed to reconnect this chat" +#: ../libempathy-gtk/empathy-chat.c:672 msgid "Failed to open private chat" -msgstr "נכשל בהתחברות לשיחה" +msgstr "נכשל בפתיחת שיחה פרטית" -#: ../libempathy-gtk/empathy-chat.c:649 +#: ../libempathy-gtk/empathy-chat.c:711 msgid "Topic not supported on this conversation" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:655 +#: ../libempathy-gtk/empathy-chat.c:717 msgid "You are not allowed to change the topic" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:773 -msgid "/clear, clear all messages from the current conversation" +#: ../libempathy-gtk/empathy-chat.c:846 +msgid "/clear: clear all messages from the current conversation" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:776 -msgid "/topic <topic>, set the topic of the current conversation" +#: ../libempathy-gtk/empathy-chat.c:849 +msgid "/topic <topic>: set the topic of the current conversation" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:779 -msgid "/join <chatroom id>, join a new chatroom" +#: ../libempathy-gtk/empathy-chat.c:852 +msgid "/join <chat room ID>: join a new chat room" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:782 -msgid "/j <chatroom id>, join a new chatroom" +#: ../libempathy-gtk/empathy-chat.c:855 +msgid "/j <chat room ID>: join a new chat room" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:785 -msgid "/query <contact id> [<message>], open a private chat" +#: ../libempathy-gtk/empathy-chat.c:858 +msgid "/query <contact ID> [<message>]: open a private chat" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:788 -msgid "/msg <contact id> <message>, open a private chat" +#: ../libempathy-gtk/empathy-chat.c:861 +msgid "/msg <contact ID> <message>: open a private chat" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:791 -msgid "/nick <nickname>, change your nickname on current server" +#: ../libempathy-gtk/empathy-chat.c:864 +msgid "/nick <nickname>: change your nickname on the current server" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:794 -msgid "/me <message>, send an ACTION message to the current conversation" +#: ../libempathy-gtk/empathy-chat.c:867 +msgid "/me <message>: send an ACTION message to the current conversation" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:797 +#: ../libempathy-gtk/empathy-chat.c:870 msgid "" -"/say <message>, send <message> to the current conversation. This is used to " +"/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 chatroom\"" +"join a new chat room\"" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:802 +#: ../libempathy-gtk/empathy-chat.c:875 msgid "" -"/help [<command>], show all supported commands. If <command> is defined, " +"/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." msgstr "" -#: ../libempathy-gtk/empathy-chat.c:812 +#: ../libempathy-gtk/empathy-chat.c:885 #, c-format -#| msgid "" -#| "\n" -#| "Message: %s" msgid "Usage: %s" -msgstr "" -"שימוש: %s" +msgstr "שימוש: %s" -#: ../libempathy-gtk/empathy-chat.c:841 -#| msgid "Unknown reason" +#: ../libempathy-gtk/empathy-chat.c:914 msgid "Unknown command" msgstr "פקודה לא ידועה" -#: ../libempathy-gtk/empathy-chat.c:962 -msgid "Unknown command, see /help for the available commands" +#: ../libempathy-gtk/empathy-chat.c:1035 +msgid "Unknown command; see /help for the available commands" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1173 msgid "offline" msgstr "לא מחובר" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1176 msgid "invalid contact" msgstr "איש קשר לא תקין" -#: ../libempathy-gtk/empathy-chat.c:1106 +#: ../libempathy-gtk/empathy-chat.c:1179 msgid "permission denied" msgstr "איש קשר לא תקין" -#: ../libempathy-gtk/empathy-chat.c:1109 +#: ../libempathy-gtk/empathy-chat.c:1182 msgid "too long message" msgstr "הודעה ארוכה מדי" -#: ../libempathy-gtk/empathy-chat.c:1112 +#: ../libempathy-gtk/empathy-chat.c:1185 msgid "not implemented" msgstr "לא ממומש" -#: ../libempathy-gtk/empathy-chat.c:1115 +#: ../libempathy-gtk/empathy-chat.c:1188 msgid "unknown" msgstr "לא ידוע" -#: ../libempathy-gtk/empathy-chat.c:1119 +#: ../libempathy-gtk/empathy-chat.c:1192 #, c-format msgid "Error sending message '%s': %s" msgstr "שגיאה בשליחת ההודעה '%s': %s" -#: ../libempathy-gtk/empathy-chat.c:1149 +#: ../libempathy-gtk/empathy-chat.c:1222 #, c-format msgid "Topic set to: %s" msgstr "הנושא נקבע ל: %s" -#: ../libempathy-gtk/empathy-chat.c:1151 +#: ../libempathy-gtk/empathy-chat.c:1224 msgid "No topic defined" msgstr "לא נקבע נושא" -#: ../libempathy-gtk/empathy-chat.c:1524 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "(No Suggestions)" msgstr "(אין הצעות)" -#: ../libempathy-gtk/empathy-chat.c:1578 +#: ../libempathy-gtk/empathy-chat.c:1677 msgid "Insert Smiley" msgstr "הכנס סמיילי" #. send button -#: ../libempathy-gtk/empathy-chat.c:1596 -#: ../libempathy-gtk/empathy-ui-utils.c:1492 +#: ../libempathy-gtk/empathy-chat.c:1695 +#: ../libempathy-gtk/empathy-ui-utils.c:1658 msgid "_Send" msgstr "_שלח" -#: ../libempathy-gtk/empathy-chat.c:1630 +#: ../libempathy-gtk/empathy-chat.c:1729 msgid "_Spelling Suggestions" msgstr "הצעות _איות" -#: ../libempathy-gtk/empathy-chat.c:1745 +#: ../libempathy-gtk/empathy-chat.c:1823 +#, fuzzy +#| msgid "Failed to reconnect this chat" +msgid "Failed to retrieve recent logs" +msgstr "נכשל בהתחברות לשיחה" + +#: ../libempathy-gtk/empathy-chat.c:1954 #, c-format msgid "%s has disconnected" msgstr "%s התנתק" @@ -1145,12 +1259,12 @@ msgstr "%s התנתק" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1752 +#: ../libempathy-gtk/empathy-chat.c:1961 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s סולק על ידי %2$s" -#: ../libempathy-gtk/empathy-chat.c:1755 +#: ../libempathy-gtk/empathy-chat.c:1964 #, c-format msgid "%s was kicked" msgstr "%s סולק" @@ -1158,17 +1272,17 @@ msgstr "%s סולק" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1763 +#: ../libempathy-gtk/empathy-chat.c:1972 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s נחסם על ידי %2$s" -#: ../libempathy-gtk/empathy-chat.c:1766 +#: ../libempathy-gtk/empathy-chat.c:1975 #, c-format msgid "%s was banned" msgstr "%s נחסם" -#: ../libempathy-gtk/empathy-chat.c:1770 +#: ../libempathy-gtk/empathy-chat.c:1979 #, c-format msgid "%s has left the room" msgstr "%s עזב את החדר" @@ -1178,83 +1292,81 @@ msgstr "%s עזב את החדר" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1779 +#: ../libempathy-gtk/empathy-chat.c:1988 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:1804 +#: ../libempathy-gtk/empathy-chat.c:2013 #, c-format msgid "%s has joined the room" msgstr "%s הצטרף לחדר" -#: ../libempathy-gtk/empathy-chat.c:1829 -#, fuzzy, c-format -#| msgid "%s is now online." +#: ../libempathy-gtk/empathy-chat.c:2038 +#, c-format msgid "%s is now known as %s" -msgstr "%s עכשיו מחובר." +msgstr "%s ידוע כעת כ-%s" -#: ../libempathy-gtk/empathy-chat.c:1962 ../src/empathy-call-window.c:1297 +#: ../libempathy-gtk/empathy-chat.c:2173 ../src/empathy-call-window.c:1531 msgid "Disconnected" msgstr "מנותק" -#: ../libempathy-gtk/empathy-chat.c:2452 +#: ../libempathy-gtk/empathy-chat.c:2695 msgid "Wrong password; please try again:" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:2453 +#: ../libempathy-gtk/empathy-chat.c:2696 msgid "Retry" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:2458 +#: ../libempathy-gtk/empathy-chat.c:2701 msgid "This room is protected by a password:" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:2459 -#| msgid "_Join" +#: ../libempathy-gtk/empathy-chat.c:2702 msgid "Join" msgstr "הצטרף" -#: ../libempathy-gtk/empathy-chat.c:2599 +#: ../libempathy-gtk/empathy-chat.c:2842 msgid "Connected" msgstr "מחובר" -#: ../libempathy-gtk/empathy-chat.c:2652 -#: ../libempathy-gtk/empathy-log-window.c:546 +#: ../libempathy-gtk/empathy-chat.c:2895 +#: ../libempathy-gtk/empathy-log-window.c:707 msgid "Conversation" msgstr "שיחה" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:556 +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680 msgid "Topic:" msgstr "נושא:" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:315 -#: ../libempathy-gtk/empathy-theme-adium.c:808 +#: ../libempathy-gtk/empathy-chat-text-view.c:317 +#: ../libempathy-gtk/empathy-theme-adium.c:823 msgid "_Copy Link Address" msgstr "העתק _מיקום קישור" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:322 -#: ../libempathy-gtk/empathy-theme-adium.c:815 +#: ../libempathy-gtk/empathy-chat-text-view.c:324 +#: ../libempathy-gtk/empathy-theme-adium.c:830 msgid "_Open Link" msgstr "_פתח קישור" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:420 +#: ../libempathy-gtk/empathy-chat-text-view.c:422 msgid "%A %B %d %Y" msgstr "%A %d %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:238 +#: ../libempathy-gtk/empathy-contact-dialogs.c:249 msgid "Edit Contact Information" msgstr "ערוך מידע איש קשר" -#: ../libempathy-gtk/empathy-contact-dialogs.c:289 +#: ../libempathy-gtk/empathy-contact-dialogs.c:300 msgid "Personal Information" msgstr "מידע אישי" -#: ../libempathy-gtk/empathy-contact-dialogs.c:394 +#: ../libempathy-gtk/empathy-contact-dialogs.c:405 msgid "New Contact" msgstr "איש קשר חדש" @@ -1266,209 +1378,212 @@ msgstr "ה_חלט מאוחר יותר" msgid "Subscription Request" msgstr "בקשת הצטרפות" -#: ../libempathy-gtk/empathy-contact-list-view.c:1416 +#: ../libempathy-gtk/empathy-contact-list-view.c:1516 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "להסיר את הקבוצה '%s'?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1418 +#: ../libempathy-gtk/empathy-contact-list-view.c:1518 msgid "Removing group" msgstr "מסיר קבוצה" #. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1465 -#: ../libempathy-gtk/empathy-contact-list-view.c:1542 +#: ../libempathy-gtk/empathy-contact-list-view.c:1565 +#: ../libempathy-gtk/empathy-contact-list-view.c:1642 +#: ../src/empathy-accounts-dialog.ui.h:6 msgid "_Remove" msgstr "_הסר" -#: ../libempathy-gtk/empathy-contact-list-view.c:1495 +#: ../libempathy-gtk/empathy-contact-list-view.c:1595 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "להסיר את איש הקשר '%s'?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1497 +#: ../libempathy-gtk/empathy-contact-list-view.c:1597 msgid "Removing contact" msgstr "מסיר איש קשר" -#: ../libempathy-gtk/empathy-contact-menu.c:195 -#: ../src/empathy-main-window.ui.h:12 -msgid "_Add Contact..." +#: ../libempathy-gtk/empathy-contact-menu.c:199 +#: ../src/empathy-main-window.ui.h:14 +msgid "_Add Contact…" msgstr "_הוסף איש קשר..." -#: ../libempathy-gtk/empathy-contact-menu.c:222 -#: ../src/empathy-main-window.ui.h:13 +#: ../libempathy-gtk/empathy-contact-menu.c:226 +#: ../src/empathy-main-window.ui.h:15 msgid "_Chat" msgstr "_שיחה" -#: ../libempathy-gtk/empathy-contact-menu.c:253 +#: ../libempathy-gtk/empathy-contact-menu.c:257 msgctxt "menu item" msgid "_Audio Call" msgstr "שיחה _קולית" -#: ../libempathy-gtk/empathy-contact-menu.c:285 +#: ../libempathy-gtk/empathy-contact-menu.c:289 msgctxt "menu item" msgid "_Video Call" msgstr "שיחת _וידאו" -#: ../libempathy-gtk/empathy-contact-menu.c:324 -#: ../src/empathy-main-window.ui.h:24 +#: ../libempathy-gtk/empathy-contact-menu.c:340 +#: ../src/empathy-main-window.ui.h:26 msgid "_Previous Conversations" msgstr "שיחות _קודמות" -#: ../libempathy-gtk/empathy-contact-menu.c:346 +#: ../libempathy-gtk/empathy-contact-menu.c:362 msgid "Send file" msgstr "שלח קובץ" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:385 msgid "Share my desktop" msgstr "שתף את שולחן העבודה שלי" -#: ../libempathy-gtk/empathy-contact-menu.c:397 +#: ../libempathy-gtk/empathy-contact-menu.c:413 msgid "Infor_mation" msgstr "_מידע" -#: ../libempathy-gtk/empathy-contact-menu.c:441 -#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:17 +#: ../libempathy-gtk/empathy-contact-menu.c:459 +msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "_עריכה" -#: ../libempathy-gtk/empathy-contact-menu.c:501 -msgid "Inviting to this room" -msgstr "הזמן לחדר שיחה זה" +#: ../libempathy-gtk/empathy-contact-menu.c:513 +#: ../src/empathy-chat-window.c:865 +msgid "Inviting you to this room" +msgstr "מזמין אותך לחדר זה" -#: ../libempathy-gtk/empathy-contact-menu.c:532 -msgid "_Invite to chatroom" +#: ../libempathy-gtk/empathy-contact-menu.c:544 +msgid "_Invite to chat room" msgstr "_הזמן לחדר שיחה" #: ../libempathy-gtk/empathy-contact-selector.c:129 msgid "Select a contact" msgstr "בחר איש קשר" -#: ../libempathy-gtk/empathy-contact-widget.c:447 -msgid "Save Avatar" -msgstr "שמור תמונה אישית" - -#: ../libempathy-gtk/empathy-contact-widget.c:503 -msgid "Unable to save avatar" -msgstr "לא ניתן לשמור תמונה אישית" - -#: ../libempathy-gtk/empathy-contact-widget.c:1000 +#: ../libempathy-gtk/empathy-contact-widget.c:235 msgid "Select" msgstr "בחר" -#: ../libempathy-gtk/empathy-contact-widget.c:1009 -#: ../src/empathy-main-window.c:1026 +#: ../libempathy-gtk/empathy-contact-widget.c:244 +#: ../src/empathy-main-window.c:1045 msgid "Group" msgstr "קבוצה" -#: ../libempathy-gtk/empathy-contact-widget.c:1260 +#: ../libempathy-gtk/empathy-contact-widget.c:476 msgid "Country ISO Code:" msgstr "קוד תקן ISO של המדינה:" -#: ../libempathy-gtk/empathy-contact-widget.c:1262 +#: ../libempathy-gtk/empathy-contact-widget.c:478 msgid "Country:" msgstr "ארץ:" -#: ../libempathy-gtk/empathy-contact-widget.c:1264 +#: ../libempathy-gtk/empathy-contact-widget.c:480 msgid "State:" msgstr "מדינה:" -#: ../libempathy-gtk/empathy-contact-widget.c:1266 +#: ../libempathy-gtk/empathy-contact-widget.c:482 msgid "City:" msgstr "עיר:" -#: ../libempathy-gtk/empathy-contact-widget.c:1268 +#: ../libempathy-gtk/empathy-contact-widget.c:484 msgid "Area:" msgstr "אזור:" -#: ../libempathy-gtk/empathy-contact-widget.c:1270 +#: ../libempathy-gtk/empathy-contact-widget.c:486 msgid "Postal Code:" msgstr "מיקוד:" -#: ../libempathy-gtk/empathy-contact-widget.c:1272 +#: ../libempathy-gtk/empathy-contact-widget.c:488 msgid "Street:" msgstr "רחוב:" -#: ../libempathy-gtk/empathy-contact-widget.c:1274 +#: ../libempathy-gtk/empathy-contact-widget.c:490 msgid "Building:" msgstr "מבנה:" -#: ../libempathy-gtk/empathy-contact-widget.c:1276 +#: ../libempathy-gtk/empathy-contact-widget.c:492 msgid "Floor:" msgstr "קומה:" -#: ../libempathy-gtk/empathy-contact-widget.c:1278 +#: ../libempathy-gtk/empathy-contact-widget.c:494 msgid "Room:" msgstr "חדר:" -#: ../libempathy-gtk/empathy-contact-widget.c:1280 +#: ../libempathy-gtk/empathy-contact-widget.c:496 msgid "Text:" msgstr "טקסט:" -#: ../libempathy-gtk/empathy-contact-widget.c:1282 +#: ../libempathy-gtk/empathy-contact-widget.c:498 msgid "Description:" msgstr "תיאור:" -#: ../libempathy-gtk/empathy-contact-widget.c:1284 +#: ../libempathy-gtk/empathy-contact-widget.c:500 msgid "URI:" msgstr "URI:" -#: ../libempathy-gtk/empathy-contact-widget.c:1286 +#: ../libempathy-gtk/empathy-contact-widget.c:502 msgid "Accuracy Level:" msgstr "רמת דיוק:" -#: ../libempathy-gtk/empathy-contact-widget.c:1288 +#: ../libempathy-gtk/empathy-contact-widget.c:504 msgid "Error:" msgstr "שגיאה:" -#: ../libempathy-gtk/empathy-contact-widget.c:1290 +#: ../libempathy-gtk/empathy-contact-widget.c:506 msgid "Vertical Error (meters):" msgstr "סטייה אנכית (מטרים):" -#: ../libempathy-gtk/empathy-contact-widget.c:1292 +#: ../libempathy-gtk/empathy-contact-widget.c:508 msgid "Horizontal Error (meters):" msgstr "סטייה אופקית (מטרים):" -#: ../libempathy-gtk/empathy-contact-widget.c:1294 +#: ../libempathy-gtk/empathy-contact-widget.c:510 msgid "Speed:" msgstr "מהירות:" -#: ../libempathy-gtk/empathy-contact-widget.c:1296 +#: ../libempathy-gtk/empathy-contact-widget.c:512 msgid "Bearing:" msgstr "אזימוט:" -#: ../libempathy-gtk/empathy-contact-widget.c:1298 +#: ../libempathy-gtk/empathy-contact-widget.c:514 msgid "Climb Speed:" msgstr "מהירות הטיפוס:" -#: ../libempathy-gtk/empathy-contact-widget.c:1300 +#: ../libempathy-gtk/empathy-contact-widget.c:516 msgid "Last Updated on:" msgstr "עדכון אחרון ב:" -#: ../libempathy-gtk/empathy-contact-widget.c:1302 +#: ../libempathy-gtk/empathy-contact-widget.c:518 msgid "Longitude:" msgstr "קו אורך:" -#: ../libempathy-gtk/empathy-contact-widget.c:1304 +#: ../libempathy-gtk/empathy-contact-widget.c:520 msgid "Latitude:" msgstr "קו רוחב:" -#: ../libempathy-gtk/empathy-contact-widget.c:1306 +#: ../libempathy-gtk/empathy-contact-widget.c:522 msgid "Altitude:" msgstr "גובה:" -#: ../libempathy-gtk/empathy-contact-widget.c:1367 -msgid "<b>Location</b>" -msgstr "<b>מיקום</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:585 +#: ../src/empathy-preferences.ui.h:12 +msgid "Location" +msgstr "מיקום" -#: ../libempathy-gtk/empathy-contact-widget.c:1380 +#: ../libempathy-gtk/empathy-contact-widget.c:601 msgid "<b>Location</b>, " msgstr "<b>מיקום</b>, " -#: ../libempathy-gtk/empathy-contact-widget.c:1430 +#: ../libempathy-gtk/empathy-contact-widget.c:651 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y ב־%R UTC" +#: ../libempathy-gtk/empathy-contact-widget.c:734 +msgid "Save Avatar" +msgstr "שמור תמונה אישית" + +#: ../libempathy-gtk/empathy-contact-widget.c:790 +msgid "Unable to save avatar" +msgstr "לא ניתן לשמור תמונה אישית" + #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 msgid "<b>Location</b> at (date)\t" msgstr "<b>מיקום</b> ב(תאריך)\t" @@ -1490,40 +1605,35 @@ msgid "Client:" msgstr "לקוח:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:7 -#: ../src/empathy-main-window.c:1009 -msgid "Contact" -msgstr "איש קשר" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 msgid "Contact Details" msgstr "פרטי איש קשר" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -msgid "Email:" -msgstr "דוא\"ל:" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "E-mail address:" +msgstr "" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 -msgid "Fullname:" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 +msgid "Full name:" msgstr "שם מלא:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Groups" msgstr "קבוצות" #. Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:13 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:12 msgid "Identifier:" msgstr "מזהה:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:14 -msgid "Information requested..." -msgstr "התבקש מידע" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:13 +msgid "Information requested…" +msgstr "התבקש מידע…" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:15 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:14 msgid "OS:" msgstr "מערכת הפעלה:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:16 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:15 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." @@ -1531,15 +1641,15 @@ msgstr "" "בחר את הקבוצות בהן אתה מעוניין שאיש קשר זה יופיע. ניתן לבחור ביותר מקבוצה " "אחת או לא לבחור קבוצות בכלל." -#: ../libempathy-gtk/empathy-contact-widget.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:16 msgid "Version:" msgstr "גרסה:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:18 -msgid "Web site:" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:17 +msgid "Website:" msgstr "אתר אינטרנט:" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:19 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:18 msgid "_Add Group" msgstr "_הוסף קבוצה" @@ -1559,12 +1669,12 @@ msgstr "שער" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:539 +#: ../libempathy-gtk/empathy-log-window.c:700 #: ../src/empathy-import-widget.c:310 msgid "Account" msgstr "חשבון" -#: ../libempathy-gtk/empathy-log-window.c:556 +#: ../libempathy-gtk/empathy-log-window.c:717 msgid "Date" msgstr "תאריך" @@ -1584,22 +1694,36 @@ msgstr "חיפוש" msgid "_For:" msgstr "_ערך:" -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2 -msgid "C_all" -msgstr "ה_תקשר" +#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 +msgid "Contact ID:" +msgstr "מזהה איש הקשר:" -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3 +#. add chat button +#: ../libempathy-gtk/empathy-new-message-dialog.c:144 msgid "C_hat" msgstr "שי_חה" -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4 -msgid "Contact ID:" -msgstr "מזהה איש הקשר:" - -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5 +#. Tweak the dialog +#: ../libempathy-gtk/empathy-new-message-dialog.c:154 msgid "New Conversation" msgstr "שיחה חדשה" +#. add video toggle +#: ../libempathy-gtk/empathy-new-call-dialog.c:188 +msgid "Send _Video" +msgstr "שלח _וידאו" + +#. add chat button +#: ../libempathy-gtk/empathy-new-call-dialog.c:196 +#: ../src/empathy-call-window.ui.h:17 +msgid "_Call" +msgstr "_שיחה" + +#. Tweak the dialog +#: ../libempathy-gtk/empathy-new-call-dialog.c:206 +msgid "New Call" +msgstr "שיחה חדשה" + #. COL_STATUS_TEXT #. COL_STATE_ICON_NAME #. COL_STATE @@ -1608,13 +1732,13 @@ msgstr "שיחה חדשה" #. COL_TYPE #: ../libempathy-gtk/empathy-presence-chooser.c:167 #: ../libempathy-gtk/empathy-presence-chooser.c:203 -msgid "Custom Message..." +msgid "Custom Message…" msgstr "הודעה מותאמת אישית..." #: ../libempathy-gtk/empathy-presence-chooser.c:220 #: ../libempathy-gtk/empathy-presence-chooser.c:222 -msgid "Edit Custom Messages..." -msgstr "ערוך הודעה מותאמת אישית..." +msgid "Edit Custom Messages…" +msgstr "ערוך את ההודעות המותאמות אישית..." #: ../libempathy-gtk/empathy-presence-chooser.c:344 msgid "Click to remove this status as a favorite" @@ -1628,15 +1752,27 @@ msgstr "לחץ כדי להוסיף מצב זה למועדפים" msgid "Set status" msgstr "קבע מצב" -#: ../libempathy-gtk/empathy-presence-chooser.c:895 +#: ../libempathy-gtk/empathy-presence-chooser.c:896 msgid "Set your presence and current status" msgstr "הגדרת הנוכחות והמצב הנוכחיים שלך" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1082 -msgid "Custom messages..." +#: ../libempathy-gtk/empathy-presence-chooser.c:1083 +msgid "Custom messages…" msgstr "הודעות מותאמות אישית..." +#: ../libempathy-gtk/empathy-search-bar.ui.h:1 +msgid "Find:" +msgstr "חפש:" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:2 +msgid "Match case" +msgstr "" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:3 +msgid "Phrase not found" +msgstr "" + #: ../libempathy-gtk/empathy-sound.c:51 msgid "Received an instant message" msgstr "התקבלה הודעה מידית." @@ -1677,11 +1813,11 @@ msgstr "שיחה קולית פעילה" msgid "Voice call ended" msgstr "שיחה קולית הסתיימה" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:362 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:364 msgid "Enter Custom Message" msgstr "הכנס הודעה מותאמת" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:521 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:523 msgid "Edit Custom Messages" msgstr "ערוך הודעה מותאמת" @@ -1709,15 +1845,15 @@ msgstr "נקי" msgid "Blue" msgstr "כחול" -#: ../libempathy-gtk/empathy-ui-utils.c:1394 +#: ../libempathy-gtk/empathy-ui-utils.c:1520 msgid "Unable to open URI" msgstr "לא נית לפתוח את הכתובת" -#: ../libempathy-gtk/empathy-ui-utils.c:1484 +#: ../libempathy-gtk/empathy-ui-utils.c:1650 msgid "Select a file" msgstr "בחר קובץ" -#: ../libempathy-gtk/empathy-ui-utils.c:1544 +#: ../libempathy-gtk/empathy-ui-utils.c:1710 msgid "Select a destination" msgstr "בחר יעד" @@ -1889,11 +2025,11 @@ msgid "Vietnamese" msgstr "ויאטנמית" #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 -msgid "The contact selected cannot receive files." +msgid "The selected contact cannot receive files." msgstr "איש הקשר שנבחר לא יכול לקבל קבצים." #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 -msgid "The contact selected is offline." +msgid "The selected contact is offline." msgstr "איש קשר הנבחר מנותק." #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 @@ -1904,25 +2040,19 @@ msgstr "אין הודעת שגיאה" msgid "Instant Message (Empathy)" msgstr "הודעה מיידית (Empathy)" -#: ../src/empathy.c:893 +#: ../src/empathy.c:580 msgid "Don't connect on startup" msgstr "אל תתחבר בהפעלה" -#: ../src/empathy.c:897 -#, fuzzy -#| msgid "Don't show the contact list on startup" +#: ../src/empathy.c:584 msgid "Don't display the contact list or any other dialogs on startup" -msgstr "אל תציג את רשימת אנשי הקשר בהפעלה" +msgstr "אל תציג את רשימת אנשי הקשר או כל דו-שיח אחר בהפעלה" -#: ../src/empathy.c:901 -msgid "Show the accounts dialog" -msgstr "הצג חלון החשבונות" - -#: ../src/empathy.c:913 +#: ../src/empathy.c:596 msgid "- Empathy IM Client" msgstr "- Empathy IM Client" -#: ../src/empathy-about-dialog.c:83 +#: ../src/empathy-about-dialog.c:85 msgid "" "Empathy is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -1934,7 +2064,7 @@ msgstr "" "Foundation; either version 2 of the License, or (at your option) any later " "version." -#: ../src/empathy-about-dialog.c:87 +#: ../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 " @@ -1946,7 +2076,7 @@ msgstr "" "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." -#: ../src/empathy-about-dialog.c:91 +#: ../src/empathy-about-dialog.c:93 msgid "" "You should have received a copy of the GNU General Public License along with " "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " @@ -1956,11 +2086,11 @@ msgstr "" "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-130159 USA" -#: ../src/empathy-about-dialog.c:119 +#: ../src/empathy-about-dialog.c:121 msgid "An Instant Messaging client for GNOME" msgstr "לקוח מסרים מיידיים עבור GNOME" -#: ../src/empathy-about-dialog.c:125 +#: ../src/empathy-about-dialog.c:127 msgid "translator-credits" msgstr "" "מארק קרפיבנר <mark125@gmail.com>\n" @@ -1968,28 +2098,28 @@ msgstr "" "פרוייקט תרגום GNOME לעברית:\n" "http://gnome-il.berlios.de" -#: ../src/empathy-account-assistant.c:118 -msgid "There has been an error while importing the accounts." -msgstr "התרחשה שגיאה ביבוא החשבונות." +#: ../src/empathy-account-assistant.c:167 +msgid "There was an error while importing the accounts." +msgstr "התרחשה שגיאה בזמן יבוא החשבונות." -#: ../src/empathy-account-assistant.c:121 -msgid "There has been an error while parsing the account details." +#: ../src/empathy-account-assistant.c:170 +msgid "There was an error while parsing the account details." msgstr "התרחשה שגיאה בעת ניתוח נתוני החשבון." -#: ../src/empathy-account-assistant.c:124 -msgid "There has been an error while creating the account." +#: ../src/empathy-account-assistant.c:173 +msgid "There was an error while creating the account." msgstr "התרחשה שגיאה במהלך יצירת החשבון." -#: ../src/empathy-account-assistant.c:126 -msgid "There has been an error." +#: ../src/empathy-account-assistant.c:175 +msgid "There was an error." msgstr "התרחשה שגיאה." -#: ../src/empathy-account-assistant.c:141 +#: ../src/empathy-account-assistant.c:179 #, c-format -msgid "The error message was: <span style=\"italic\">%s</span>" -msgstr "הודעת השגיאה היא: <span style=\"italic\">%s</span>" +msgid "The error message was: %s" +msgstr "הודעת השגיאה הייתה: %s" -#: ../src/empathy-account-assistant.c:149 +#: ../src/empathy-account-assistant.c:183 msgid "" "You can either go back and try to enter your accounts' details again or quit " "this assistant and add accounts later from the Edit menu." @@ -1997,47 +2127,46 @@ msgstr "" "ניתן לחזור אחורה ולנסות להקליד את פרטי החשבון שוב או לצאת ממסייע זה ולהוסיף " "חשבונות מאוחר יותר מתפריט העריכה." -#: ../src/empathy-account-assistant.c:184 +#: ../src/empathy-account-assistant.c:220 +#: ../src/empathy-account-assistant.c:1294 msgid "An error occurred" msgstr "התרחשה שגיאה." -#. Create account #. To translator: %s is the protocol name #. Create account #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../src/empathy-account-assistant.c:331 -#: ../src/empathy-accounts-dialog.c:1339 +#: ../src/empathy-account-assistant.c:415 ../src/empathy-accounts-dialog.c:564 #, c-format msgid "New %s account" msgstr "חשבון %s חדש" -#: ../src/empathy-account-assistant.c:403 +#: ../src/empathy-account-assistant.c:502 msgid "What kind of chat account do you have?" msgstr "אילו חשבונות יש לך?" -#: ../src/empathy-account-assistant.c:409 +#: ../src/empathy-account-assistant.c:508 msgid "Do you have any other chat accounts you want to set up?" msgstr "האם יש לך חשבונות נוספים שברצונך להגדיר?" -#: ../src/empathy-account-assistant.c:415 +#: ../src/empathy-account-assistant.c:514 msgid "Enter your account details" msgstr "הכנס את פרטי החשבון שלך" -#: ../src/empathy-account-assistant.c:420 +#: ../src/empathy-account-assistant.c:519 msgid "What kind of chat account do you want to create?" msgstr "איזה חשבון שיחות ברצונך ליצור?" -#: ../src/empathy-account-assistant.c:426 +#: ../src/empathy-account-assistant.c:525 msgid "Do you want to create other chat accounts?" msgstr "האם ברצונך ליצור חשבונות שיחה אחרים?" -#: ../src/empathy-account-assistant.c:433 +#: ../src/empathy-account-assistant.c:532 msgid "Enter the details for the new account" msgstr "הכנס את הפרטים עבור החשבון החדש" -#: ../src/empathy-account-assistant.c:519 +#: ../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 " @@ -2048,62 +2177,121 @@ msgstr "" "לעבודה המשתמשים ב־Google Talk, AIM, Windows Live ועוד תוכנות דומות רבות. " "בעזרת המיקרופון ומצלמת הרשת שלך ניתן גם לנהל שיחות קול ווידאו." -#: ../src/empathy-account-assistant.c:536 +#: ../src/empathy-account-assistant.c:664 msgid "Do you have an account you've been using with another chat program?" msgstr "יש לך חשבון שהשתמשת בו עם תוכנת שיחה אחרת?" -#: ../src/empathy-account-assistant.c:559 +#: ../src/empathy-account-assistant.c:687 msgid "Yes, import my account details from " msgstr "כן, לייבא את פרטי החשבון מ" -#: ../src/empathy-account-assistant.c:580 +#: ../src/empathy-account-assistant.c:708 msgid "Yes, I'll enter my account details now" msgstr "כן, אני אזין את פרטי החשבון עכשיו" -#: ../src/empathy-account-assistant.c:602 +#: ../src/empathy-account-assistant.c:730 msgid "No, I want a new account" msgstr "לא אני רוצה חשבון חדש" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:740 msgid "No, I just want to see people online nearby for now" msgstr "לא, אני רק רוצה לראות אנשים המחוברים בקרבת מקום לעת עתה" -#: ../src/empathy-account-assistant.c:633 +#: ../src/empathy-account-assistant.c:761 msgid "Select the accounts you want to import:" msgstr "בחר את החשבון שברצונך לייבא:" -#: ../src/empathy-account-assistant.c:720 -#: ../src/empathy-new-chatroom-dialog.c:496 -#: ../src/empathy-new-chatroom-dialog.c:497 +#: ../src/empathy-account-assistant.c:845 +#: ../src/empathy-new-chatroom-dialog.c:541 +#: ../src/empathy-new-chatroom-dialog.c:542 msgid "Yes" msgstr "כן" -#: ../src/empathy-account-assistant.c:727 +#: ../src/empathy-account-assistant.c:852 msgid "No, that's all for now" msgstr "לא, זה הכל לעכשיו" -#: ../src/empathy-account-assistant.c:920 +#: ../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 "" + +#: ../src/empathy-account-assistant.c:1117 +#: ../src/empathy-account-assistant.c:1173 +msgid "Edit->Accounts" +msgstr "עריכה->חשבון" + +#: ../src/empathy-account-assistant.c:1133 +msgid "I don't want to enable this feature for now" +msgstr "אני לא רוצה לאפשר את התכונה הזו כעת" + +#: ../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 "" + +#: ../src/empathy-account-assistant.c:1175 +msgid "telepathy-salut not installed" +msgstr "" + +#: ../src/empathy-account-assistant.c:1252 msgid "Welcome to Empathy" msgstr "ברוך הבא אל Empathy" -#: ../src/empathy-account-assistant.c:929 +#: ../src/empathy-account-assistant.c:1261 msgid "Import your existing accounts" msgstr "יבוא חשבונות קיימים" +#: ../src/empathy-account-assistant.c:1279 +msgid "Please enter personal details" +msgstr "" + #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:63 +#: ../src/empathy-accounts-dialog.c:66 #, c-format -msgid "There are unsaved modification regarding your %s account." -msgstr "ישנם שינויים שלא נשמרו בנוגע לחשבון ה־%s שלך." +msgid "There are unsaved modifications to your %s account." +msgstr "ישנם שינויים שלא נשמרו בחשבון ה־%s שלך." #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:67 +#: ../src/empathy-accounts-dialog.c:70 msgid "Your new account has not been saved yet." msgstr "" -#: ../src/empathy-accounts-dialog.c:484 +#: ../src/empathy-accounts-dialog.c:265 ../src/empathy-call-window.c:729 +msgid "Connecting…" +msgstr "מתחבר..." + +#: ../src/empathy-accounts-dialog.c:292 +#, c-format +msgid "Disconnected — %s" +msgstr "מנותק — %s" + +#: ../src/empathy-accounts-dialog.c:297 +#, c-format +msgid "Offline — %s" +msgstr "לא מחובר — %s" + +#: ../src/empathy-accounts-dialog.c:310 +msgid "Offline — No Network Connection" +msgstr "" + +#: ../src/empathy-accounts-dialog.c:318 +msgid "Unknown Status" +msgstr "מצב לא ידוע" + +#: ../src/empathy-accounts-dialog.c:329 +msgid "Offline — Account Disabled" +msgstr "" + +#: ../src/empathy-accounts-dialog.c:735 msgid "" "You are about to create a new account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2111,16 +2299,16 @@ msgstr "" "אתה עומד ליצור חשבון חדש, מה שיבטל\n" "את השינויים שלך. האת אתה בטוח שברצונך להמשיך?" -#: ../src/empathy-accounts-dialog.c:774 +#: ../src/empathy-accounts-dialog.c:1082 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "האם להסיר את הקבוצה '%s' ממחשבך?" -#: ../src/empathy-accounts-dialog.c:778 +#: ../src/empathy-accounts-dialog.c:1086 msgid "This will not remove your account on the server." msgstr "פעולה זו לא תסיר את חשבונך מהשרת." -#: ../src/empathy-accounts-dialog.c:960 +#: ../src/empathy-accounts-dialog.c:1316 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2128,7 +2316,7 @@ msgstr "" "אתה עומד לבחור חשבון חדש, מה שיבטל\n" "את השינויים שלך. האת אתה בטוח שברצונך להמשיך?" -#: ../src/empathy-accounts-dialog.c:1425 +#: ../src/empathy-accounts-dialog.c:1863 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2136,198 +2324,241 @@ msgstr "" "אתה עומד לסגור את החלון, מה שיבטל\n" "את השינויים שלך. האת אתה בטוח שברצונך להמשיך?" -#. Translators: this is used only when built on a moblin platform -#: ../src/empathy-accounts-dialog.c:1596 -msgid "_Next" -msgstr "ה_בא" - -#: ../src/empathy-accounts-dialog.ui.h:1 +#. Tweak the dialog +#: ../src/empathy-accounts-dialog.c:1996 msgid "Accounts" msgstr "חשבונות" -#: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Add new" -msgstr "הוסף חדש" - -#: ../src/empathy-accounts-dialog.ui.h:3 -msgid "Cr_eate" -msgstr "_צור" - -#: ../src/empathy-accounts-dialog.ui.h:4 +#: ../src/empathy-accounts-dialog.ui.h:1 msgid "No protocol installed" msgstr "אין פרוטוקולים מותקנים" -#: ../src/empathy-accounts-dialog.ui.h:5 +#: ../src/empathy-accounts-dialog.ui.h:2 +msgid "Protocol:" +msgstr "פרוטוקול:" + +#: ../src/empathy-accounts-dialog.ui.h:3 msgid "" "To add a new account, you first have to install a backend for each protocol " "you want to use." msgstr "" "על מנת להוסיף חשבון חדש עליך להתקין מנוע לכל פרוטוקול שבו ברצונך להשתמש." -#: ../src/empathy-accounts-dialog.ui.h:6 -msgid "_Add..." -msgstr "_הוסף..." - -#: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Create a new account" -msgstr "_צור חשבון חדש" - -#: ../src/empathy-accounts-dialog.ui.h:8 -msgid "_Import..." -msgstr "יי_בוא..." - -#: ../src/empathy-accounts-dialog.ui.h:9 -msgid "_Reuse an existing account" -msgstr "_שימוש חוזר בחשבון קיים" +#: ../src/empathy-accounts-dialog.ui.h:4 +msgid "_Add…" +msgstr "" -#: ../src/empathy-accounts-dialog.ui.h:10 -msgid "account" -msgstr "חשבון" +#: ../src/empathy-accounts-dialog.ui.h:5 +msgid "_Import…" +msgstr "" -#: ../src/empathy-call-window.c:428 +#: ../src/empathy-call-window.c:453 msgid "Contrast" msgstr "ניגוד" -#: ../src/empathy-call-window.c:431 +#: ../src/empathy-call-window.c:456 msgid "Brightness" msgstr "בהירות" -#: ../src/empathy-call-window.c:434 +#: ../src/empathy-call-window.c:459 msgid "Gamma" msgstr "גאמה" -#: ../src/empathy-call-window.c:542 +#: ../src/empathy-call-window.c:567 msgid "Volume" msgstr "עוצמה" -#: ../src/empathy-call-window.c:676 -msgid "Connecting..." -msgstr "מתחבר..." - -#: ../src/empathy-call-window.c:784 +#: ../src/empathy-call-window.c:1022 msgid "_Sidebar" msgstr "_סרגל צד" -#: ../src/empathy-call-window.c:803 +#: ../src/empathy-call-window.c:1041 msgid "Dialpad" msgstr "מקשי חיוג" -#: ../src/empathy-call-window.c:809 +#: ../src/empathy-call-window.c:1047 msgid "Audio input" msgstr "קלט שמע" -#: ../src/empathy-call-window.c:813 +#: ../src/empathy-call-window.c:1051 msgid "Video input" msgstr "קלט וידאו" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:876 +#: ../src/empathy-call-window.c:1116 #, c-format msgid "Call with %s" msgstr "שיחה עם %s" #. translators: Call is a noun. This string is used in the window #. * title -#: ../src/empathy-call-window.c:957 +#: ../src/empathy-call-window.c:1197 msgid "Call" msgstr "שיחה" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1457 +#: ../src/empathy-call-window.c:1694 #, c-format msgid "Connected — %d:%02dm" msgstr "מחובר — %d:%02dד'" -#: ../src/empathy-call-window.c:1518 -#| msgid "Contact Details" +#: ../src/empathy-call-window.c:1755 msgid "Technical Details" msgstr "פרטים טכניים" -#: ../src/empathy-call-window.c:1556 +#: ../src/empathy-call-window.c:1793 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " "computer" msgstr "" -#: ../src/empathy-call-window.c:1561 +#: ../src/empathy-call-window.c:1798 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " "computer" msgstr "" -#: ../src/empathy-call-window.c:1567 +#: ../src/empathy-call-window.c:1804 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " "does not allow direct connections." msgstr "" -#: ../src/empathy-call-window.c:1573 +#: ../src/empathy-call-window.c:1810 msgid "There was a failure on the network" msgstr "" -#: ../src/empathy-call-window.c:1577 +#: ../src/empathy-call-window.c:1814 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" -#: ../src/empathy-call-window.c:1580 +#: ../src/empathy-call-window.c:1817 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" -#: ../src/empathy-call-window.c:1590 +#: ../src/empathy-call-window.c:1827 #, c-format msgid "" -"Something not expected happened in a Telepathy component. Please <a href=\"%s" +"Something unexpected happened in a Telepathy component. Please <a href=\"%s" "\">report this bug</a> and attach logs gathered from the 'Debug' window in " "the Help menu." msgstr "" -#: ../src/empathy-call-window.c:1598 +#: ../src/empathy-call-window.c:1835 msgid "There was a failure in the call engine" msgstr "" -#: ../src/empathy-call-window.c:1637 +#: ../src/empathy-call-window.c:1874 msgid "Can't establish audio stream" msgstr "" -#: ../src/empathy-call-window.c:1647 +#: ../src/empathy-call-window.c:1884 msgid "Can't establish video stream" msgstr "" #: ../src/empathy-call-window.ui.h:1 +msgid "Call the contact again" +msgstr "התקשר לאיש הקשר שוב" + +#: ../src/empathy-call-window.ui.h:2 +msgid "Camera Off" +msgstr "" + +#: ../src/empathy-call-window.ui.h:3 +msgid "Camera On" +msgstr "" + +#: ../src/empathy-call-window.ui.h:4 +msgid "Disable camera and stop sending video" +msgstr "" + +#: ../src/empathy-call-window.ui.h:5 +msgid "Enable camera and send video" +msgstr "" + +#: ../src/empathy-call-window.ui.h:6 +msgid "Enable camera but don't send video" +msgstr "" + +#: ../src/empathy-call-window.ui.h:7 msgid "Hang up" msgstr "ניתוק" -#: ../src/empathy-call-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:8 +msgid "Hang up current call" +msgstr "" + +#: ../src/empathy-call-window.ui.h:9 +msgid "Preview" +msgstr "תצוגה מקדימה" + +#: ../src/empathy-call-window.ui.h:10 msgid "Redial" msgstr "חיוג חוזר" -#: ../src/empathy-call-window.ui.h:3 +#: ../src/empathy-call-window.ui.h:11 msgid "Send Audio" msgstr "שלח צליל" -#: ../src/empathy-call-window.ui.h:4 -msgid "Send video" -msgstr "שלח וידאו" +#: ../src/empathy-call-window.ui.h:12 +msgid "Toggle audio transmission" +msgstr "" -#: ../src/empathy-call-window.ui.h:5 -msgid "Video preview" -msgstr "תצוגה מקדימה לווידאו" +#: ../src/empathy-call-window.ui.h:13 +msgid "V_ideo" +msgstr "" -#: ../src/empathy-call-window.ui.h:6 -msgid "_Call" -msgstr "_שיחה" +#: ../src/empathy-call-window.ui.h:14 +msgid "Video Off" +msgstr "וידאו מכובה" + +#: ../src/empathy-call-window.ui.h:15 +msgid "Video On" +msgstr "וידאו מופעל" + +#: ../src/empathy-call-window.ui.h:16 +msgid "Video Preview" +msgstr "תצוגה מקדימה לווידאו" -#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26 +#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28 msgid "_View" msgstr "_תצוגה" -#: ../src/empathy-chat-window.c:560 +#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456 +#, c-format +msgid "%s (%d unread)" +msgid_plural "%s (%d unread)" +msgstr[0] "" +msgstr[1] "" + +#: ../src/empathy-chat-window.c:448 +#, c-format +msgid "%s (and %u other)" +msgid_plural "%s (and %u others)" +msgstr[0] "" +msgstr[1] "" + +#: ../src/empathy-chat-window.c:464 +#, c-format +msgid "%s (%d unread from others)" +msgid_plural "%s (%d unread from others)" +msgstr[0] "" +msgstr[1] "" + +#: ../src/empathy-chat-window.c:473 +#, c-format +msgid "%s (%d unread from all)" +msgid_plural "%s (%d unread from all)" +msgstr[0] "" +msgstr[1] "" + +#: ../src/empathy-chat-window.c:684 msgid "Typing a message." msgstr "מקליד הודעה." @@ -2336,7 +2567,6 @@ msgid "C_lear" msgstr "נ_קה" #: ../src/empathy-chat-window.ui.h:2 -#| msgid "Contact" msgid "C_ontact" msgstr "איש _קשר" @@ -2349,58 +2579,66 @@ msgid "Insert _Smiley" msgstr "הכנס _סמיילי" #: ../src/empathy-chat-window.ui.h:5 +msgid "Invite _Participant…" +msgstr "" + +#: ../src/empathy-chat-window.ui.h:6 msgid "Move Tab _Left" msgstr "הזז לשונית _שמאלה" -#: ../src/empathy-chat-window.ui.h:6 +#: ../src/empathy-chat-window.ui.h:7 msgid "Move Tab _Right" msgstr "הזז לשונית _ימינה" -#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:15 +#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17 msgid "_Contents" msgstr "_תכנים" -#: ../src/empathy-chat-window.ui.h:8 +#: ../src/empathy-chat-window.ui.h:9 msgid "_Conversation" msgstr "_שיחה" -#: ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-chat-window.ui.h:10 msgid "_Detach Tab" msgstr "_נתק לשונית" -#: ../src/empathy-chat-window.ui.h:11 -msgid "_Favorite Chatroom" -msgstr "_הזמן לחדר שיחה" +#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19 +msgid "_Edit" +msgstr "_עריכה" + +#: ../src/empathy-chat-window.ui.h:12 +msgid "_Favorite Chat Room" +msgstr "_הוסף את חדר השיחה למועדפים" -#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19 +#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21 msgid "_Help" msgstr "_עזרה" -#: ../src/empathy-chat-window.ui.h:13 +#: ../src/empathy-chat-window.ui.h:14 msgid "_Next Tab" msgstr "_לשונית הבאה" -#: ../src/empathy-chat-window.ui.h:14 +#: ../src/empathy-chat-window.ui.h:15 msgid "_Previous Tab" msgstr "_לשונית קודמת" -#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4 +#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5 msgid "_Show Contact List" msgstr "_הצג רשימת אנשי קשר" -#: ../src/empathy-chat-window.ui.h:16 +#: ../src/empathy-chat-window.ui.h:17 msgid "_Tabs" msgstr "_לשוניות" -#: ../src/empathy-chatrooms-window.c:258 +#: ../src/empathy-chatrooms-window.c:256 msgid "Name" msgstr "שם" -#: ../src/empathy-chatrooms-window.c:276 +#: ../src/empathy-chatrooms-window.c:274 msgid "Room" msgstr "חדר" -#: ../src/empathy-chatrooms-window.c:285 +#: ../src/empathy-chatrooms-window.c:282 msgid "Auto-Connect" msgstr "חיבור אוטומטי" @@ -2408,75 +2646,76 @@ msgstr "חיבור אוטומטי" msgid "Manage Favorite Rooms" msgstr "ניהול חדרי שיחה מועדפים" -#: ../src/empathy-event-manager.c:330 +#: ../src/empathy-event-manager.c:339 +msgid "Incoming video call" +msgstr "שיחה קולית נכנסת" + +#: ../src/empathy-event-manager.c:339 msgid "Incoming call" msgstr "שיחה נכנסת" -#: ../src/empathy-event-manager.c:333 +#: ../src/empathy-event-manager.c:343 +#, c-format +msgid "%s is video calling you. Do you want to answer?" +msgstr "%s מתקשר אליך בוידאו, האם ברצונך לענות?" + +#: ../src/empathy-event-manager.c:344 #, c-format -msgid "%s is calling you, do you want to answer?" +msgid "%s is calling you. Do you want to answer?" msgstr "%s מתקשר אליך, האם ברצונך לענות?" -#: ../src/empathy-event-manager.c:340 +#: ../src/empathy-event-manager.c:366 msgid "_Reject" msgstr "_דחה" -#: ../src/empathy-event-manager.c:346 +#: ../src/empathy-event-manager.c:372 msgid "_Answer" msgstr "_השב" -#: ../src/empathy-event-manager.c:455 +#: ../src/empathy-event-manager.c:489 #, c-format -msgid "Incoming call from %s" -msgstr "שיחה נכנסת מ־%s" +msgid "Incoming video call from %s" +msgstr "שיחת וידאו נכנסת מ־%s" -#: ../src/empathy-event-manager.c:499 +#: ../src/empathy-event-manager.c:489 #, c-format -msgid "%s is offering you an invitation" -msgstr "%s שולח לך הזמנה" - -#: ../src/empathy-event-manager.c:505 -msgid "An external application will be started to handle it." -msgstr "יישום חיצוני יופעל כדי לטפל בזה." - -#: ../src/empathy-event-manager.c:510 -msgid "You don't have the needed external application to handle it." -msgstr "אין צורך ביישום חיצוני כדי לטפל בזה." +msgid "Incoming call from %s" +msgstr "שיחה נכנסת מ־%s" -#: ../src/empathy-event-manager.c:638 +#: ../src/empathy-event-manager.c:579 msgid "Room invitation" msgstr "הזמנה לחדר" -#: ../src/empathy-event-manager.c:641 +#: ../src/empathy-event-manager.c:582 #, c-format msgid "%s is inviting you to join %s" msgstr "%s מזמין אותך להצטרף אל %s" -#: ../src/empathy-event-manager.c:649 +#: ../src/empathy-event-manager.c:590 msgid "_Decline" msgstr "_סרב" -#: ../src/empathy-event-manager.c:654 +#: ../src/empathy-event-manager.c:595 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_הצטרף" -#: ../src/empathy-event-manager.c:693 +#: ../src/empathy-event-manager.c:634 #, c-format msgid "%s invited you to join %s" msgstr "%s הזמין אותך להצטרף אל %s" -#: ../src/empathy-event-manager.c:719 +#: ../src/empathy-event-manager.c:660 #, c-format msgid "Incoming file transfer from %s" msgstr "העברת קבצים נכנסת מ־%s" -#: ../src/empathy-event-manager.c:899 +#: ../src/empathy-event-manager.c:818 #, c-format msgid "Subscription requested by %s" msgstr "בקשת ההצטרפות התבקשה על ידי %s" -#: ../src/empathy-event-manager.c:903 +#: ../src/empathy-event-manager.c:822 #, c-format msgid "" "\n" @@ -2486,13 +2725,13 @@ msgstr "" "הודעה: %s" #. someone is logging off -#: ../src/empathy-event-manager.c:943 +#: ../src/empathy-event-manager.c:862 #, c-format msgid "%s is now offline." msgstr "%s עכשיו מנותק." #. someone is logging in -#: ../src/empathy-event-manager.c:959 +#: ../src/empathy-event-manager.c:878 #, c-format msgid "%s is now online." msgstr "%s עכשיו מחובר." @@ -2637,79 +2876,23 @@ msgstr "מקור" msgid "%s account" msgstr "חשבון %s" -#: ../src/empathy-main-window.c:410 -#, fuzzy -#| msgid "Disconnected" +#: ../src/empathy-main-window.c:433 msgid "Reconnect" -msgstr "מנותק" +msgstr "התחבר מחדש" -#: ../src/empathy-main-window.c:417 -#| msgid "_Edit account" +#: ../src/empathy-main-window.c:439 msgid "Edit Account" msgstr "ערוך חשבון" -#: ../src/empathy-main-window.c:424 -#| msgid "Closed" +#: ../src/empathy-main-window.c:445 msgid "Close" msgstr "סגור" -#: ../src/empathy-main-window.c:512 -msgid "No error specified" -msgstr "לא צוינה שגיאה" - -#: ../src/empathy-main-window.c:515 -msgid "Network error" -msgstr "שגיאת רשת" - -#: ../src/empathy-main-window.c:518 -msgid "Authentication failed" -msgstr "האימות נכשל" - -#: ../src/empathy-main-window.c:521 -msgid "Encryption error" -msgstr "שגיאת הצפנה" - -#: ../src/empathy-main-window.c:524 -msgid "Name in use" -msgstr "השם בשימוש" - -#: ../src/empathy-main-window.c:527 -msgid "Certificate not provided" -msgstr "לא סופקה תעודה" - -#: ../src/empathy-main-window.c:530 -msgid "Certificate untrusted" -msgstr "התעודה אינה מאובטחת" - -#: ../src/empathy-main-window.c:533 -msgid "Certificate expired" -msgstr "התעודה לא תקפה" - -#: ../src/empathy-main-window.c:536 -msgid "Certificate not activated" -msgstr "התעודה אינה פעילה" - -#: ../src/empathy-main-window.c:539 -msgid "Certificate hostname mismatch" -msgstr "שם המארח בתעודה לא תואם" - -#: ../src/empathy-main-window.c:542 -msgid "Certificate fingerprint mismatch" -msgstr "טביעת האצבע של התעודה אינה תואמת" - -#: ../src/empathy-main-window.c:545 -msgid "Certificate self-signed" -msgstr "תעודה בחתימה עצמית" - -#: ../src/empathy-main-window.c:548 -msgid "Certificate error" -msgstr "שגיאת תעודה" - -#: ../src/empathy-main-window.c:551 -msgid "Unknown error" -msgstr "שגיאה לא ידועה" +#: ../src/empathy-main-window.c:1028 +msgid "Contact" +msgstr "איש קשר" -#: ../src/empathy-main-window.c:1328 +#: ../src/empathy-main-window.c:1369 msgid "Show and edit accounts" msgstr "הצג וערוך חשבונות" @@ -2737,72 +2920,78 @@ msgstr "נהל מועדפים" msgid "N_ormal Size" msgstr "גודל נ_ורמלי" -#: ../src/empathy-main-window.ui.h:7 +#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1 +msgid "New _Call…" +msgstr "" + +#: ../src/empathy-main-window.ui.h:8 msgid "Normal Size With _Avatars" msgstr "גודל נורמלי עם _תמונות אישיות" -#: ../src/empathy-main-window.ui.h:8 -#| msgid "Preferences" +#: ../src/empathy-main-window.ui.h:9 msgid "P_references" msgstr "העד_פות" -#: ../src/empathy-main-window.ui.h:9 +#: ../src/empathy-main-window.ui.h:10 +msgid "Show P_rotocols" +msgstr "הצג פ_רוטוקולים" + +#: ../src/empathy-main-window.ui.h:11 msgid "Sort by _Name" msgstr "מיין לפי _שם" -#: ../src/empathy-main-window.ui.h:10 +#: ../src/empathy-main-window.ui.h:12 msgid "Sort by _Status" msgstr "מיין לפי _מצב" -#: ../src/empathy-main-window.ui.h:11 +#: ../src/empathy-main-window.ui.h:13 msgid "_Accounts" msgstr "_חשבונות" -#: ../src/empathy-main-window.ui.h:14 +#: ../src/empathy-main-window.ui.h:16 msgid "_Compact Size" msgstr "גודל _קומפקטי" -#: ../src/empathy-main-window.ui.h:16 +#: ../src/empathy-main-window.ui.h:18 msgid "_Debug" msgstr "_ניפוי שגיאות" -#: ../src/empathy-main-window.ui.h:18 +#: ../src/empathy-main-window.ui.h:20 msgid "_File Transfers" msgstr "העברות _קבצים" -#: ../src/empathy-main-window.ui.h:20 -msgid "_Join..." +#: ../src/empathy-main-window.ui.h:22 +msgid "_Join…" msgstr "_הצטרף..." -#: ../src/empathy-main-window.ui.h:21 ../src/empathy-status-icon.ui.h:2 -msgid "_New Conversation..." +#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3 +msgid "_New Conversation…" msgstr "_שיחה חדשה..." -#: ../src/empathy-main-window.ui.h:22 +#: ../src/empathy-main-window.ui.h:24 msgid "_Offline Contacts" msgstr "אנשי קשר _לא מחוברים" -#: ../src/empathy-main-window.ui.h:23 +#: ../src/empathy-main-window.ui.h:25 msgid "_Personal Information" msgstr "מידע _אישי" -#: ../src/empathy-main-window.ui.h:25 +#: ../src/empathy-main-window.ui.h:27 msgid "_Room" msgstr "_חדר" -#: ../src/empathy-new-chatroom-dialog.c:328 +#: ../src/empathy-new-chatroom-dialog.c:338 msgid "Chat Room" msgstr "חדר שיחה" -#: ../src/empathy-new-chatroom-dialog.c:344 +#: ../src/empathy-new-chatroom-dialog.c:354 msgid "Members" msgstr "חברים" -#: ../src/empathy-new-chatroom-dialog.c:494 +#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name, +#. yes/no, yes/no and a number. +#: ../src/empathy-new-chatroom-dialog.c:539 #, c-format -msgctxt "" -"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no " -"and a number." msgid "" "<b>%s</b>\n" "Invite required: %s\n" @@ -2814,16 +3003,16 @@ msgstr "" "נדרשת סיסמה: %s\n" "חברים: %s" -#: ../src/empathy-new-chatroom-dialog.c:496 -#: ../src/empathy-new-chatroom-dialog.c:497 +#: ../src/empathy-new-chatroom-dialog.c:541 +#: ../src/empathy-new-chatroom-dialog.c:542 msgid "No" msgstr "לא" -#: ../src/empathy-new-chatroom-dialog.c:524 +#: ../src/empathy-new-chatroom-dialog.c:569 msgid "Could not start room listing" msgstr "לא ניתן להתחיל את רשימת החדרים" -#: ../src/empathy-new-chatroom-dialog.c:534 +#: ../src/empathy-new-chatroom-dialog.c:579 msgid "Could not stop room listing" msgstr "לא ניתן לעצור את הצגת החדרים" @@ -2932,10 +3121,6 @@ msgstr "הפעל בדיקת איות עבור השפות:" msgid "General" msgstr "כללי" -#: ../src/empathy-preferences.ui.h:12 -msgid "Location" -msgstr "מיקום" - #: ../src/empathy-preferences.ui.h:13 msgid "Location sources:" msgstr "מקורות המיקומים:" @@ -3008,7 +3193,7 @@ msgid "_GPS" msgstr "_GPS" #: ../src/empathy-preferences.ui.h:29 -msgid "_Network (IP, Wifi)" +msgid "_Network (IP, Wi-Fi)" msgstr "_רשת (IP, אלחוטית)" #: ../src/empathy-preferences.ui.h:30 @@ -3023,96 +3208,187 @@ msgstr "_פרסם את המיקום שלי לאנשי הקשר שלי" msgid "_Reduce location accuracy" msgstr "_הפחת את דיוק המיקום" -#: ../src/empathy-status-icon.c:178 +#: ../src/empathy-status-icon.c:176 msgid "Respond" msgstr "תגובה" -#: ../src/empathy-status-icon.ui.h:1 +#: ../src/empathy-status-icon.ui.h:2 msgid "Status" msgstr "מצב" -#: ../src/empathy-status-icon.ui.h:3 +#: ../src/empathy-status-icon.ui.h:4 msgid "_Quit" msgstr "יצי_אה" -#: ../src/empathy-tube-dispatch.c:376 -#, c-format -msgid "Unable to start application for service %s: %s" -msgstr "לא ניתן להפעיל את היישום עבור השירות %s: %s" - -#: ../src/empathy-tube-dispatch.c:447 -#, c-format -msgid "" -"An invitation was offered for service %s, but you don't have the needed " -"application to handle it" -msgstr "התקבלה הזמנה לשימוש בשירות %s, אך אין לך את היישום הנדרש כדי לטפל בו" - #: ../src/empathy-map-view.ui.h:1 msgid "Contact Map View" msgstr "מפת אנשי קשר" -#: ../src/empathy-debug-window.c:1042 +#: ../src/empathy-debug-window.c:1066 msgid "Save" msgstr "שמור" -#: ../src/empathy-debug-window.c:1164 +#: ../src/empathy-debug-window.c:1219 msgid "Debug Window" msgstr "חלון ניפוי שגיאות" -#: ../src/empathy-debug-window.c:1243 +#: ../src/empathy-debug-window.c:1299 msgid "Pause" msgstr "עצור" -#: ../src/empathy-debug-window.c:1255 +#: ../src/empathy-debug-window.c:1311 msgid "Level " msgstr "רמה" -#: ../src/empathy-debug-window.c:1275 +#: ../src/empathy-debug-window.c:1331 msgid "Debug" msgstr "ניפוי שגיאות" -#: ../src/empathy-debug-window.c:1281 +#: ../src/empathy-debug-window.c:1337 msgid "Info" msgstr "מידע" -#: ../src/empathy-debug-window.c:1287 ../src/empathy-debug-window.c:1336 +#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392 msgid "Message" msgstr "הודעה" -#: ../src/empathy-debug-window.c:1293 +#: ../src/empathy-debug-window.c:1349 msgid "Warning" msgstr "אזהרה" -#: ../src/empathy-debug-window.c:1299 +#: ../src/empathy-debug-window.c:1355 msgid "Critical" msgstr "קריטי" -#: ../src/empathy-debug-window.c:1305 +#: ../src/empathy-debug-window.c:1361 msgid "Error" msgstr "שגיאה" -#: ../src/empathy-debug-window.c:1324 +#: ../src/empathy-debug-window.c:1380 msgid "Time" msgstr "זמן" -#: ../src/empathy-debug-window.c:1327 +#: ../src/empathy-debug-window.c:1383 msgid "Domain" msgstr "תחום" -#: ../src/empathy-debug-window.c:1329 +#: ../src/empathy-debug-window.c:1385 msgid "Category" msgstr "קטגוריה" -#: ../src/empathy-debug-window.c:1331 +#: ../src/empathy-debug-window.c:1387 msgid "Level" msgstr "רמה" -#: ../src/empathy-debug-window.c:1363 +#: ../src/empathy-debug-window.c:1424 msgid "" "The selected connection manager does not support the remote debugging " "extension." msgstr "מנהל החיבורים שנבחר אינו תומך בהרחבת ניפוי שגיאות מרחוק." +#: ../src/empathy-invite-participant-dialog.c:34 +#: ../src/empathy-invite-participant-dialog.c:48 +msgid "Invite Participant" +msgstr "" + +#: ../src/empathy-invite-participant-dialog.c:35 +msgid "Choose a contact to invite into the conversation:" +msgstr "" + +#: ../src/empathy-accounts.c:196 +msgid "" +"Try to import any recognized accounts and display an assistant if that fails" +msgstr "" + +#: ../src/empathy-accounts.c:201 +msgid "Don't display any dialogs; do any work (eg, importing) and exit" +msgstr "" + +#: ../src/empathy-accounts.c:205 +msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" +msgstr "" + +#: ../src/empathy-accounts.c:207 +msgid "<account-id>" +msgstr "<account-id>" + +#: ../src/empathy-accounts.c:215 +msgid "- Empathy Accounts" +msgstr "- חשבונות Empathy" + +#: ../src/empathy-accounts.c:231 +msgid " Accounts" +msgstr "חשבונות" + +#~ msgid "Hidden" +#~ msgstr "מוסתר" + +#~ msgid "<b>Location</b>" +#~ msgstr "<b>מיקום</b>" + +#~ msgid "Email:" +#~ msgstr "דוא\"ל:" + +#~ msgid "C_all" +#~ msgstr "ה_תקשר" + +#~ msgid "Edit Custom Messages..." +#~ msgstr "ערוך הודעה מותאמת אישית..." + +#~ msgid "Show the accounts dialog" +#~ msgstr "הצג חלון החשבונות" + +#~ msgid "The error message was: <span style=\"italic\">%s</span>" +#~ msgstr "הודעת השגיאה היא: <span style=\"italic\">%s</span>" + +#~ msgid "_Next" +#~ msgstr "ה_בא" + +#~ msgid "Add new" +#~ msgstr "הוסף חדש" + +#~ msgid "Cr_eate" +#~ msgstr "_צור" + +#~ msgid "_Add..." +#~ msgstr "_הוסף..." + +#~ msgid "_Import..." +#~ msgstr "יי_בוא..." + +#~ msgid "_Reuse an existing account" +#~ msgstr "_שימוש חוזר בחשבון קיים" + +#~ msgid "%s is offering you an invitation" +#~ msgstr "%s שולח לך הזמנה" + +#~ msgid "An external application will be started to handle it." +#~ msgstr "יישום חיצוני יופעל כדי לטפל בזה." + +#~ msgid "You don't have the needed external application to handle it." +#~ msgstr "אין צורך ביישום חיצוני כדי לטפל בזה." + +#~ msgid "No error specified" +#~ msgstr "לא צוינה שגיאה" + +#~ msgid "Unknown error" +#~ msgstr "שגיאה לא ידועה" + +#~ msgid "_Join..." +#~ msgstr "_הצטרף..." + +#~ msgid "_New Conversation..." +#~ msgstr "_שיחה חדשה..." + +#~ msgid "Unable to start application for service %s: %s" +#~ msgstr "לא ניתן להפעיל את היישום עבור השירות %s: %s" + +#~ msgid "" +#~ "An invitation was offered for service %s, but you don't have the needed " +#~ "application to handle it" +#~ msgstr "" +#~ "התקבלה הזמנה לשימוש בשירות %s, אך אין לך את היישום הנדרש כדי לטפל בו" + #~ msgid "Can't set an empty display name" #~ msgstr "לא ניתן להגדיר שם לתצוגה ריק" @@ -3133,9 +3409,6 @@ msgstr "מנהל החיבורים שנבחר אינו תומך בהרחבת ני #~ msgid "Talk!" #~ msgstr "דבר!" -#~ msgid "_About" -#~ msgstr "_אודות" - #~ msgid "_Information" #~ msgstr "_מידע" @@ -3346,9 +3619,6 @@ msgstr "מנהל החיבורים שנבחר אינו תומך בהרחבת ני #~ msgid "Invitation _message:" #~ msgstr "הודעת הזמ_נה:" -#~ msgid "Invite" -#~ msgstr "הזמן" - #~ msgid "Edit Favorite Room" #~ msgstr "ערוך חדר מועדף" @@ -3451,9 +3721,6 @@ msgstr "מנהל החיבורים שנבחר אינו תומך בהרחבת ני #~ msgid "_Copy" #~ msgstr "_העתק" -#~ msgid "_Show Contacts" -#~ msgstr "_הצג אנשי קשר" - #~ msgid "Re_name" #~ msgstr "שנה _שם" @@ -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-03-02 18:55+0100\n" +"PO-Revision-Date: 2010-03-02 19:07+0100\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "MIME-Version: 1.0\n" @@ -22,7 +21,7 @@ msgstr "" #: ../data/empathy.desktop.in.in.h:1 msgid "Empathy" -msgstr "Empathy" +msgstr "Empathyso" # (ndt) tentiamo così per il futuro GNOME 3.0? #: ../data/empathy.desktop.in.in.h:2 @@ -480,26 +479,26 @@ msgid "Manage Messaging and VoIP accounts" msgstr "Gestisce account di messaggistica e VoIP" #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/cc-empathy-accounts-page.c:201 ../src/cc-empathy-accounts-panel.c:70 +#: ../src/cc-empathy-accounts-page.c:203 ../src/cc-empathy-accounts-panel.c:70 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" @@ -685,16 +684,16 @@ msgstr "Tutti" msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1117 +#: ../libempathy-gtk/empathy-account-widget.c:1097 msgid "Username:" msgstr "Nome utente:" # (ndt) pulsante -#: ../libempathy-gtk/empathy-account-widget.c:1446 +#: ../libempathy-gtk/empathy-account-widget.c:1426 msgid "L_og in" msgstr "Acce_di" -#: ../libempathy-gtk/empathy-account-widget.c:1514 +#: ../libempathy-gtk/empathy-account-widget.c:1494 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 #: ../src/empathy-chatrooms-window.ui.h:1 @@ -702,15 +701,15 @@ msgstr "Acce_di" msgid "Account:" msgstr "Account:" -#: ../libempathy-gtk/empathy-account-widget.c:1525 +#: ../libempathy-gtk/empathy-account-widget.c:1505 msgid "Enabled" msgstr "Abilitato" -#: ../libempathy-gtk/empathy-account-widget.c:1590 +#: ../libempathy-gtk/empathy-account-widget.c:1570 msgid "This account already exists on the server" msgstr "Questo account esiste già sul server" -#: ../libempathy-gtk/empathy-account-widget.c:1593 +#: ../libempathy-gtk/empathy-account-widget.c:1573 msgid "Create a new account on the server" msgstr "Creare un nuovo account sul server" @@ -719,7 +718,7 @@ msgstr "Creare un nuovo account sul server" #. * like: "MyUserName on chat.freenode.net". #. * You should reverse the order of these arguments if the #. * server should come before the login id in your locale. -#: ../libempathy-gtk/empathy-account-widget.c:1968 +#: ../libempathy-gtk/empathy-account-widget.c:1948 #, c-format msgid "%1$s on %2$s" msgstr "%1$s su %2$s" @@ -727,12 +726,12 @@ msgstr "%1$s su %2$s" # (ndt) il %s pare sia il protocollo #. To translators: The parameter is the protocol name. The resulting #. * string will be something like: "Jabber Account" -#: ../libempathy-gtk/empathy-account-widget.c:1994 +#: ../libempathy-gtk/empathy-account-widget.c:1974 #, c-format msgid "%s Account" msgstr "Account %s" -#: ../libempathy-gtk/empathy-account-widget.c:1998 +#: ../libempathy-gtk/empathy-account-widget.c:1978 msgid "New account" msgstr "Nuovo account" @@ -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" @@ -1475,7 +1478,7 @@ msgstr "_Decidi successivamente" # (ndt) titolo dialogo #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2 msgid "Subscription Request" -msgstr "Richiesta di sottoscrizione" +msgstr "Richiesta di approvazione" #: ../libempathy-gtk/empathy-contact-list-view.c:1516 #, c-format @@ -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" @@ -1801,7 +1804,7 @@ msgstr "Cerca" # in cui inserire il criterio di ricerca #: ../libempathy-gtk/empathy-log-window.ui.h:4 msgid "_For:" -msgstr "_Per:" +msgstr "_Frase:" #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 msgid "Contact ID:" @@ -1841,36 +1844,36 @@ msgstr "Nuova chiamata" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:167 -#: ../libempathy-gtk/empathy-presence-chooser.c:203 +#: ../libempathy-gtk/empathy-presence-chooser.c:168 +#: ../libempathy-gtk/empathy-presence-chooser.c:204 msgid "Custom Message…" msgstr "Messaggio personalizzato..." -#: ../libempathy-gtk/empathy-presence-chooser.c:220 -#: ../libempathy-gtk/empathy-presence-chooser.c:222 +#: ../libempathy-gtk/empathy-presence-chooser.c:221 +#: ../libempathy-gtk/empathy-presence-chooser.c:223 msgid "Edit Custom Messages…" msgstr "Modifica messaggio personalizzato..." # (ndt) sono dei suggerimenti, ma indicano l'azione da compiere -#: ../libempathy-gtk/empathy-presence-chooser.c:344 +#: ../libempathy-gtk/empathy-presence-chooser.c:346 msgid "Click to remove this status as a favorite" msgstr "Fare clic per rimuovere questo stato dai preferiti" -#: ../libempathy-gtk/empathy-presence-chooser.c:353 +#: ../libempathy-gtk/empathy-presence-chooser.c:355 msgid "Click to make this status a favorite" msgstr "Fare clic per aggiungere questo stato tra i preferiti" -#: ../libempathy-gtk/empathy-presence-chooser.c:387 +#: ../libempathy-gtk/empathy-presence-chooser.c:389 msgid "Set status" msgstr "Imposta lo stato" # (ndt) come c'è scritto nel codice: this string sucks -#: ../libempathy-gtk/empathy-presence-chooser.c:896 +#: ../libempathy-gtk/empathy-presence-chooser.c:936 msgid "Set your presence and current status" msgstr "Imposta la presenza e lo stato" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1083 +#: ../libempathy-gtk/empathy-presence-chooser.c:1124 msgid "Custom messages…" msgstr "Messaggi personalizzati..." @@ -2157,16 +2160,16 @@ msgid "Instant Message (Empathy)" msgstr "Messaggio istantaneo (Empathy)" # (ndt) opzione -#: ../src/empathy.c:569 +#: ../src/empathy.c:596 msgid "Don't connect on startup" msgstr "Non connettere all'avvio" # (ndt) opzione -#: ../src/empathy.c:573 +#: ../src/empathy.c:600 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:612 msgid "- Empathy IM Client" msgstr "- Messaggistica istantanea Empathy" @@ -2247,7 +2250,7 @@ msgstr "" "secondo momento dal menù «Modifica»." #: ../src/empathy-account-assistant.c:220 -#: ../src/empathy-account-assistant.c:1294 +#: ../src/empathy-account-assistant.c:1296 msgid "An error occurred" msgstr "Si è verificato un errore" @@ -2256,37 +2259,37 @@ msgstr "Si è verificato un errore" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../src/empathy-account-assistant.c:415 ../src/empathy-accounts-dialog.c:564 +#: ../src/empathy-account-assistant.c:417 ../src/empathy-accounts-dialog.c:564 #, c-format msgid "New %s account" msgstr "Nuovo account %s" -#: ../src/empathy-account-assistant.c:502 +#: ../src/empathy-account-assistant.c:504 msgid "What kind of chat account do you have?" msgstr "Che tipo di account è disponibile?" -#: ../src/empathy-account-assistant.c:508 +#: ../src/empathy-account-assistant.c:510 msgid "Do you have any other chat accounts you want to set up?" msgstr "Sono disponibili altri account da configurare?" -#: ../src/empathy-account-assistant.c:514 +#: ../src/empathy-account-assistant.c:516 msgid "Enter your account details" msgstr "Inserire i dettagli dell'account" # (ndt) tolto chat volutamente -#: ../src/empathy-account-assistant.c:519 +#: ../src/empathy-account-assistant.c:521 msgid "What kind of chat account do you want to create?" msgstr "Che tipo di account creare?" -#: ../src/empathy-account-assistant.c:525 +#: ../src/empathy-account-assistant.c:527 msgid "Do you want to create other chat accounts?" msgstr "Creare altri account?" -#: ../src/empathy-account-assistant.c:532 +#: ../src/empathy-account-assistant.c:534 msgid "Enter the details for the new account" msgstr "Inserire i dettagli del nuovo account" -#: ../src/empathy-account-assistant.c:647 +#: ../src/empathy-account-assistant.c:649 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 " @@ -2299,43 +2302,43 @@ msgstr "" "possibile effettuare chiamate audio o video." # (ndt) non so perché si ostinano a usare chat... -#: ../src/empathy-account-assistant.c:664 +#: ../src/empathy-account-assistant.c:666 msgid "Do you have an account you've been using with another chat program?" msgstr "" "È disponibile un account usato con un altro programma di messaggistica?" # (ndt) dopo di questa c'è un elenco a discesa... -#: ../src/empathy-account-assistant.c:687 +#: ../src/empathy-account-assistant.c:689 msgid "Yes, import my account details from " msgstr "Sì, importare gli account da " -#: ../src/empathy-account-assistant.c:708 +#: ../src/empathy-account-assistant.c:710 msgid "Yes, I'll enter my account details now" msgstr "Sì, inserire i dettagli dell'account ora" -#: ../src/empathy-account-assistant.c:730 +#: ../src/empathy-account-assistant.c:732 msgid "No, I want a new account" msgstr "No, creare un nuovo account" -#: ../src/empathy-account-assistant.c:740 +#: ../src/empathy-account-assistant.c:742 msgid "No, I just want to see people online nearby for now" msgstr "No, visualizzare solo le persone nelle vicinanze" -#: ../src/empathy-account-assistant.c:761 +#: ../src/empathy-account-assistant.c:763 msgid "Select the accounts you want to import:" msgstr "Selezionare gli account da importare:" -#: ../src/empathy-account-assistant.c:845 +#: ../src/empathy-account-assistant.c:847 #: ../src/empathy-new-chatroom-dialog.c:541 #: ../src/empathy-new-chatroom-dialog.c:542 msgid "Yes" msgstr "Sì" -#: ../src/empathy-account-assistant.c:852 +#: ../src/empathy-account-assistant.c:854 msgid "No, that's all for now" msgstr "No, per ora è tutto" -#: ../src/empathy-account-assistant.c:1111 +#: ../src/empathy-account-assistant.c:1113 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 " @@ -2348,17 +2351,17 @@ msgstr "" "comunque possibile modificare in seguito questi dettagli o disabilitare " "questa funzionalità attraverso il dialogo «Account»." -#: ../src/empathy-account-assistant.c:1117 -#: ../src/empathy-account-assistant.c:1173 +#: ../src/empathy-account-assistant.c:1119 +#: ../src/empathy-account-assistant.c:1175 msgid "Edit->Accounts" msgstr "Modifica → Account" # (ndt) checkbutton -#: ../src/empathy-account-assistant.c:1133 +#: ../src/empathy-account-assistant.c:1135 msgid "I don't want to enable this feature for now" msgstr "Non abilitare ora questa funzionalità" -#: ../src/empathy-account-assistant.c:1169 +#: ../src/empathy-account-assistant.c:1171 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 " @@ -2371,20 +2374,20 @@ msgstr "" "e creare\n" "un account «Persone nelle vicinanze» attraverso il dialogo «Account»." -#: ../src/empathy-account-assistant.c:1175 +#: ../src/empathy-account-assistant.c:1177 msgid "telepathy-salut not installed" msgstr "Il pacchetto «telepathy-salut» non è installato" -#: ../src/empathy-account-assistant.c:1252 +#: ../src/empathy-account-assistant.c:1254 msgid "Welcome to Empathy" msgstr "Benvenuti in Empathy" # (ndt) titolo dialogo assistente -#: ../src/empathy-account-assistant.c:1261 +#: ../src/empathy-account-assistant.c:1263 msgid "Import your existing accounts" msgstr "Importazione account" -#: ../src/empathy-account-assistant.c:1279 +#: ../src/empathy-account-assistant.c:1281 msgid "Please enter personal details" msgstr "Inserire i dettagli personali" @@ -2456,7 +2459,7 @@ msgstr "" "effettuate verranno scartate. Procedere veramente?" # (ndt) messo scartate perché il pulsante nella finestra è "Scarta" -#: ../src/empathy-accounts-dialog.c:1863 +#: ../src/empathy-accounts-dialog.c:1862 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2465,7 +2468,7 @@ msgstr "" "effettuate verranno scartate. Procedere veramente?" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:1996 +#: ../src/empathy-accounts-dialog.c:1995 msgid "Accounts" msgstr "Account" @@ -2636,7 +2639,7 @@ msgstr "Disabilita la videocamera e non invia più video" #: ../src/empathy-call-window.ui.h:5 msgid "Enable camera and send video" -msgstr "Abilita la videocamere e invia video" +msgstr "Abilita la videocamera e invia video" #: ../src/empathy-call-window.ui.h:6 msgid "Enable camera but don't send video" @@ -3087,14 +3090,15 @@ msgstr "Contatti sulla _mappa" msgid "Context" msgstr "Contesto" -# (ndt) voce di menù +# (ndt) voce di menù, stanze #: ../src/empathy-main-window.ui.h:4 msgid "Join _Favorites" -msgstr "Entra nei pre_feriti" +msgstr "Entra nelle pre_ferite" +# (ndt) stanze #: ../src/empathy-main-window.ui.h:5 msgid "Manage Favorites" -msgstr "Gestisci preferiti" +msgstr "Gestisci preferite" #: ../src/empathy-main-window.ui.h:6 msgid "N_ormal Size" @@ -3434,59 +3438,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." @@ -3501,35 +3505,33 @@ msgstr "Invita partecipante" #: ../src/empathy-invite-participant-dialog.c:35 msgid "Choose a contact to invite into the conversation:" -msgstr "Scegliere un contatto da invitare nella conversazione" +msgstr "Scegliere un contatto da invitare nella conversazione:" -#: ../src/empathy-accounts.c:196 -msgid "" -"Try to import any recognized accounts and display an assistant if that fails" -msgstr "" -"Prova a importare qualsiasi account riconosciuto e in caso di errori " -"visualizza l'assistente" - -#: ../src/empathy-accounts.c:201 +#: ../src/empathy-accounts.c:213 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "" -"Non visualizza alcun dialogo, eseguie qualsiasi operazione (come " +"Non visualizza alcun dialogo, esegue qualsiasi operazione (come " "l'importazione) ed esce" +#: ../src/empathy-accounts.c:217 +msgid "Don't display any dialogs if there are any non-salut accounts" +msgstr "" +"Non visualizza alcun dialogo se non c'è alcun account diverso da \"salut\"" + # (ndt) spero che una cosa così non si veda mai... -#: ../src/empathy-accounts.c:205 +#: ../src/empathy-accounts.c:221 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "" "Seleziona l'account fornito (per esempio gabble/jabber/foo_40example_2eorg0)" -#: ../src/empathy-accounts.c:207 +#: ../src/empathy-accounts.c:223 msgid "<account-id>" msgstr "<account-id>" -#: ../src/empathy-accounts.c:215 +#: ../src/empathy-accounts.c:231 msgid "- Empathy Accounts" msgstr "- Empathy account" -#: ../src/empathy-accounts.c:231 +#: ../src/empathy-accounts.c:247 msgid " Accounts" msgstr "Account" @@ -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-03-02 11:39+0000\n" +"PO-Revision-Date: 2010-03-02 13:53+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." @@ -394,24 +394,24 @@ msgid "Manage Messaging and VoIP accounts" msgstr "Upravljanje s sporočanjem in VoIP računi" #: ../data/empathy-accounts.desktop.in.in.h:2 -#: ../src/cc-empathy-accounts-page.c:201 +#: ../src/cc-empathy-accounts-page.c:203 #: ../src/cc-empathy-accounts-panel.c:70 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" @@ -1694,34 +1698,34 @@ msgstr "Nov klic" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:167 -#: ../libempathy-gtk/empathy-presence-chooser.c:203 +#: ../libempathy-gtk/empathy-presence-chooser.c:168 +#: ../libempathy-gtk/empathy-presence-chooser.c:204 msgid "Custom Message…" msgstr "Sporočilo po meri ..." -#: ../libempathy-gtk/empathy-presence-chooser.c:220 -#: ../libempathy-gtk/empathy-presence-chooser.c:222 +#: ../libempathy-gtk/empathy-presence-chooser.c:221 +#: ../libempathy-gtk/empathy-presence-chooser.c:223 msgid "Edit Custom Messages…" msgstr "Uredi sporočilo po meri ..." -#: ../libempathy-gtk/empathy-presence-chooser.c:344 +#: ../libempathy-gtk/empathy-presence-chooser.c:346 msgid "Click to remove this status as a favorite" msgstr "S klikom se odstrani oznaka stanja kot priljubljenega" -#: ../libempathy-gtk/empathy-presence-chooser.c:353 +#: ../libempathy-gtk/empathy-presence-chooser.c:355 msgid "Click to make this status a favorite" msgstr "S klikom se določi oznaka stanja kot priljubljenega" -#: ../libempathy-gtk/empathy-presence-chooser.c:387 +#: ../libempathy-gtk/empathy-presence-chooser.c:389 msgid "Set status" msgstr "Določitev stanja" -#: ../libempathy-gtk/empathy-presence-chooser.c:896 +#: ../libempathy-gtk/empathy-presence-chooser.c:936 msgid "Set your presence and current status" msgstr "Nastavitev navzočnosti in trenutnega stanja" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1083 +#: ../libempathy-gtk/empathy-presence-chooser.c:1124 msgid "Custom messages…" msgstr "Sporočila po meri ..." @@ -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:596 msgid "Don't connect on startup" msgstr "Brez samodejne povezave ob zagonu" -#: ../src/empathy.c:587 +#: ../src/empathy.c:600 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:612 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" @@ -2241,7 +2241,7 @@ msgstr "" "Izbran bo nov račun, trenutne spremembe pa bodo izgubljene\n" "Ali ste prepričani, da želite nadaljevati?" -#: ../src/empathy-accounts-dialog.c:1863 +#: ../src/empathy-accounts-dialog.c:1862 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2250,7 +2250,7 @@ msgstr "" "Ali ste prepričani, da želite nadaljevati?" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:1996 +#: ../src/empathy-accounts-dialog.c:1995 msgid "Accounts" msgstr "Računi" @@ -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." @@ -3209,30 +3209,38 @@ msgstr "Povabi udeležence" msgid "Choose a contact to invite into the conversation:" msgstr "Izbor stika za povabilo v pogovor:" -#: ../src/empathy-accounts.c:196 -msgid "Try to import any recognized accounts and display an assistant if that fails" -msgstr "Poskusite uvoziti prepoznane račune, v primeru težav pa uporabiti pomočnika" - -#: ../src/empathy-accounts.c:201 +#: ../src/empathy-accounts.c:214 msgid "Don't display any dialogs; do any work (eg, importing) and exit" msgstr "Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in končaj" -#: ../src/empathy-accounts.c:205 +#: ../src/empathy-accounts.c:218 +msgid "Don't display any dialogs if there are any non-salut accounts" +msgstr "Ne prikaži pogovornega okna, če so na voljo tudi ne-salut računi" + +#: ../src/empathy-accounts.c:222 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" msgstr "Predhodno izberite račun (na primer: gabble/jabber/foo_40primer_2eorg0)" -#: ../src/empathy-accounts.c:207 +#: ../src/empathy-accounts.c:224 msgid "<account-id>" msgstr "<id-računa>" -#: ../src/empathy-accounts.c:215 +#: ../src/empathy-accounts.c:232 msgid "- Empathy Accounts" msgstr "- Empathy računi" -#: ../src/empathy-accounts.c:231 +#: ../src/empathy-accounts.c:248 msgid " Accounts" msgstr "Računi" +#~ msgid "" +#~ "Try to import any recognized accounts and display an assistant if that " +#~ "fails" +#~ msgstr "" +#~ "Poskusite uvoziti prepoznane račune, v primeru težav pa uporabiti " +#~ "pomočnika" +#~ msgid "Show the accounts dialog" +#~ msgstr "Pokaži pogovorno okno računov" #~ msgid "Hidden" #~ msgstr "Skrito" #~ msgid "User requested disconnect" @@ -3366,9 +3374,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." @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-22 22:37+0100\n" -"PO-Revision-Date: 2010-02-22 22:42+0100\n" +"POT-Creation-Date: 2010-02-28 20:50+0100\n" +"PO-Revision-Date: 2010-02-28 21:03+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "Sorteringskriteria för kontaktlista" #: ../data/empathy.schemas.in.h:8 msgid "Default directory to select an avatar image from" -msgstr "Standardkatalog att välja avatarbild från" +msgstr "Standardkatalog att välja en profilbild från" #: ../data/empathy.schemas.in.h:9 msgid "Disable popup notifications when away" @@ -109,7 +109,7 @@ msgstr "Empathy bör minska precisionen för platsen" #: ../data/empathy.schemas.in.h:19 msgid "Empathy should use the avatar of the contact as the chat window icon" -msgstr "Empathy ska använda avataren för kontakten som chattfönsterikon" +msgstr "Empathy ska använda profilbilden för kontakten som ikon i chattfönstret" #: ../data/empathy.schemas.in.h:20 msgid "Enable WebKit Developer Tools" @@ -188,17 +188,14 @@ msgid "Play a sound when we log out" msgstr "Spela upp ljud när vi loggar ut" #: ../data/empathy.schemas.in.h:38 -#, fuzzy msgid "Pop up notifications if the chat isn't focused" msgstr "Visa popupnotifieringar om chatten inte är fokuserad" #: ../data/empathy.schemas.in.h:39 -#, fuzzy msgid "Pop up notifications when a contact logs in" msgstr "Visa popupnotifieringar när en kontakt loggar in" #: ../data/empathy.schemas.in.h:40 -#, fuzzy msgid "Pop up notifications when a contact logs out" msgstr "Visa popupnotifieringar när en kontakt loggar ut" @@ -208,7 +205,7 @@ msgstr "Salut-konto har skapats" #: ../data/empathy.schemas.in.h:42 msgid "Show avatars" -msgstr "Visa avatarer" +msgstr "Visa profilbilder" #: ../data/empathy.schemas.in.h:43 msgid "Show contact list in rooms" @@ -236,7 +233,7 @@ msgstr "Standardmappen att spara filöverföringar i." #: ../data/empathy.schemas.in.h:49 msgid "The last directory that an avatar image was chosen from." -msgstr "Den senaste katalogen som en avatarbild valdes från." +msgstr "Den senaste katalogen som en profilbild valdes från." #: ../data/empathy.schemas.in.h:50 msgid "The theme that is used to display the conversation in chat windows." @@ -255,204 +252,168 @@ msgid "Use theme for chat rooms" msgstr "Använd tema för chattrum" #: ../data/empathy.schemas.in.h:54 -#, fuzzy msgid "Whether Empathy can publish the user's location to their contacts." -msgstr "Huruvida Empathy kan publicera användarens plats till kontakter eller inte." +msgstr "Huruvida Empathy kan publicera användarens plats till sina kontakter." #: ../data/empathy.schemas.in.h:55 -#, fuzzy msgid "Whether Empathy can use the GPS to guess the location." -msgstr "Huruvida Empathy kan använda GPS:en för att gissa platsen eller inte." +msgstr "Huruvida Empathy kan använda GPS för att gissa platsen." #: ../data/empathy.schemas.in.h:56 -#, fuzzy msgid "Whether Empathy can use the cellular network to guess the location." -msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen eller inte." +msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen." #: ../data/empathy.schemas.in.h:57 -#, fuzzy msgid "Whether Empathy can use the network to guess the location." -msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen eller inte." +msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen." #: ../data/empathy.schemas.in.h:58 -#, fuzzy msgid "Whether Empathy has asked about importing accounts from other programs." -msgstr "Huruvida Empathy har frågat om att importera konton från andra program eller inte." +msgstr "Huruvida Empathy har frågat om att importera konton från andra program." #: ../data/empathy.schemas.in.h:59 -#, fuzzy msgid "Whether Empathy should automatically log into your accounts on startup." -msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart eller inte." +msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart." #: ../data/empathy.schemas.in.h:60 -#, fuzzy msgid "Whether Empathy should reduce the location's accuracy for privacy reasons." -msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl eller inte." +msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl." #: ../data/empathy.schemas.in.h:61 -#, fuzzy msgid "Whether Empathy should use the avatar of the contact as the chat window icon." -msgstr "Huruvida Empathy ska använda avataren för kontakten som chattfönsterikon eller inte." +msgstr "Huruvida Empathy ska använda profilbilden för kontakten som ikon i chattfönstret." #: ../data/empathy.schemas.in.h:62 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled." msgstr "Huruvida utvecklingsverktyg för WebKit, såsom Webbinspekteraren, ska aktiveras." #: ../data/empathy.schemas.in.h:63 -#, fuzzy msgid "Whether connectivity managers should be used to automatically disconnect/reconnect." -msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta eller inte." +msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta." #: ../data/empathy.schemas.in.h:64 -#, fuzzy msgid "Whether the Salut account has been created on the first Empathy run." -msgstr "Huruvida Salut-kontot har skapats eller inte vid första starten av Empathy." +msgstr "Huruvida Salut-kontot har skapats vid första starten av Empathy." #: ../data/empathy.schemas.in.h:65 -#, fuzzy msgid "Whether to check words typed against the languages you want to check with." -msgstr "Huruvida ord som skrivs ska kontrolleras mot språken du valt." +msgstr "Huruvida ord som matas in ska kontrolleras mot de språk som du vill kontrollera med." #: ../data/empathy.schemas.in.h:66 -#, fuzzy msgid "Whether to convert smileys into graphical images in conversations." -msgstr "Huruvida smilisar ska omvandlas till grafiska bilder eller inte i samtal." +msgstr "Huruvida smilisar ska omvandlas till grafiska bilder i samtal." #: ../data/empathy.schemas.in.h:67 -#, fuzzy msgid "Whether to play a sound to notify of contacts logging into the network." -msgstr "Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar in i nätverket." +msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar in i nätverket." #: ../data/empathy.schemas.in.h:68 -#, fuzzy msgid "Whether to play a sound to notify of contacts logging out of the network." -msgstr "Huruvida ett ljud ska spelas upp eller inte för kontakter som loggar ut från nätverket." +msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar ut från nätverket." #: ../data/empathy.schemas.in.h:69 -#, fuzzy msgid "Whether to play a sound to notify of events." -msgstr "Huruvida ett ljud ska spelas upp eller inte för att notifiera om händelser." +msgstr "Huruvida ett ljud ska spelas upp för att notifiera om händelser." #: ../data/empathy.schemas.in.h:70 -#, fuzzy msgid "Whether to play a sound to notify of incoming messages." -msgstr "Huruvida ett ljud ska spelas upp eller inte för inkommande meddelanden." +msgstr "Huruvida ett ljud ska spelas upp för inkommande meddelanden." #: ../data/empathy.schemas.in.h:71 -#, fuzzy msgid "Whether to play a sound to notify of new conversations." -msgstr "Huruvida ett ljud ska spelas upp eller inte för nya samtal." +msgstr "Huruvida ett ljud ska spelas upp för nya samtal." #: ../data/empathy.schemas.in.h:72 -#, fuzzy msgid "Whether to play a sound to notify of outgoing messages." -msgstr "Huruvida ett ljud ska spelas upp eller inte för utgående meddelanden." +msgstr "Huruvida ett ljud ska spelas upp för utgående meddelanden." #: ../data/empathy.schemas.in.h:73 -#, fuzzy msgid "Whether to play a sound when logging into a network." -msgstr "Huruvida ett ljud ska spelas upp eller inte vid inloggning i ett nätverk." +msgstr "Huruvida ett ljud ska spelas upp vid inloggning i ett nätverk." #: ../data/empathy.schemas.in.h:74 -#, fuzzy msgid "Whether to play a sound when logging out of a network." -msgstr "Huruvida ett ljud ska spelas upp eller inte vid utloggning från ett nätverk." +msgstr "Huruvida ett ljud ska spelas upp vid utloggning från ett nätverk." #: ../data/empathy.schemas.in.h:75 -#, fuzzy msgid "Whether to play sound notifications when away or busy." -msgstr "Huruvida ljudnotifieringar ska spelas upp eller inte vid frånvaro eller upptagen." +msgstr "Huruvida ljudnotifieringar ska spelas upp vid frånvaro eller upptagen." #: ../data/empathy.schemas.in.h:76 -#, fuzzy msgid "Whether to show a popup notification when a contact goes offline." -msgstr "Huruvida popupnotifieringar ska visas eller inte när en kontakt kopplar från." +msgstr "Huruvida popupnotifieringar ska visas när en kontakt kopplar från." #: ../data/empathy.schemas.in.h:77 -#, fuzzy msgid "Whether to show a popup notification when a contact goes online." -msgstr "Huruvida popupnotifieringar ska visas eller inte när en kontakt ansluter." +msgstr "Huruvida popupnotifieringar ska visas när en kontakt ansluter." #: ../data/empathy.schemas.in.h:78 -#, fuzzy msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused." msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad." #: ../data/empathy.schemas.in.h:79 -#, fuzzy msgid "Whether to show a popup notification when receiving a new message." -msgstr "Huruvida en popupnotifiering ska visas eller inte när ett nytt meddelande tas emot." +msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot." #: ../data/empathy.schemas.in.h:80 -#, fuzzy msgid "Whether to show avatars for contacts in the contact list and chat windows." -msgstr "Huruvida avatarer ska visas i kontaktlistan och chattfönster eller inte." +msgstr "Huruvida profilbilder ska visas för kontakter i kontaktlistan och chattfönster." #: ../data/empathy.schemas.in.h:81 -#, fuzzy msgid "Whether to show contacts that are offline in the contact list." -msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan eller inte." +msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan." #: ../data/empathy.schemas.in.h:82 -#, fuzzy msgid "Whether to show popup notifications when away or busy." -msgstr "Huruvida popupnotifieringar ska visas eller inte under frånvaro eller upptagen." +msgstr "Huruvida popupnotifieringar ska visas vid frånvaro eller upptagen." #: ../data/empathy.schemas.in.h:83 -#, fuzzy msgid "Whether to show protocols for contacts in the contact list." -msgstr "Huruvida avatarer ska visas i kontaktlistan och chattfönster eller inte." +msgstr "Huruvida protokoll för kontakter ska visas i kontaktlistan." #: ../data/empathy.schemas.in.h:84 -#, fuzzy msgid "Whether to show the contact list in chat rooms." -msgstr "Huruvida kontaktlistan ska visas i chattrum eller inte." +msgstr "Huruvida kontaktlistan ska visas i chattrum." #: ../data/empathy.schemas.in.h:85 -#, fuzzy msgid "Whether to show the contact list in compact mode." -msgstr "Huruvida kontaktlistan ska visas i kompakt läge eller inte." +msgstr "Huruvida kontaktlistan ska visas i kompakt läge." #: ../data/empathy.schemas.in.h:86 -#, fuzzy msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar." -msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas eller inte när man klickar på \"x\"-knappen i titelraden." +msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas när man klickar på \"x\"-knappen i titelraden." #: ../data/empathy.schemas.in.h:87 -#, fuzzy msgid "Whether to use the theme for chat rooms." -msgstr "Huruvida tema ska användas för chattrum eller inte." +msgstr "Huruvida temat för chattrum ska användas." #: ../data/empathy.schemas.in.h:88 -#, fuzzy msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state." msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd." #: ../data/empathy-accounts.desktop.in.in.h:1 -#, fuzzy msgid "Manage Messaging and VoIP accounts" -msgstr "Loggar in mot kontot \"%s\"" +msgstr "Hantera konton för meddelanden och VoIP" #: ../data/empathy-accounts.desktop.in.in.h:2 #: ../src/cc-empathy-accounts-page.c:201 #: ../src/cc-empathy-accounts-panel.c:70 -#, fuzzy msgid "Messaging and VoIP Accounts" -msgstr "Loggar in mot kontot \"%s\"" +msgstr "Meddelande och VoIP-konton" -#: ../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 "Hashsumman för den mottagna filen och den som skickades stämmer inte överens" -#: ../libempathy/empathy-ft-handler.c:1100 +#: ../libempathy/empathy-ft-handler.c:1102 msgid "File transfer not supported by remote contact" msgstr "Filöverföringar stöds inte fjärrkontakten" -#: ../libempathy/empathy-ft-handler.c:1158 +#: ../libempathy/empathy-ft-handler.c:1160 msgid "The selected file is not a regular file" msgstr "Den valda filen är inte en vanlig fil" -#: ../libempathy/empathy-ft-handler.c:1167 +#: ../libempathy/empathy-ft-handler.c:1169 msgid "The selected file is empty" msgstr "Den valda filen är tom" @@ -1093,13 +1054,12 @@ msgid "Couldn't convert image" msgstr "Kunde inte konvertera bild" #: ../libempathy-gtk/empathy-avatar-chooser.c:450 -#, fuzzy msgid "None of the accepted image formats are supported on your system" -msgstr "Inga av de accepterade bildformaten stöds på ditt system" +msgstr "Inget av de accepterade bildformaten stöds på ditt system" #: ../libempathy-gtk/empathy-avatar-chooser.c:915 msgid "Select Your Avatar Image" -msgstr "Välj din avatarbild" +msgstr "Välj din profilbild" #: ../libempathy-gtk/empathy-avatar-chooser.c:918 msgid "No Image" @@ -1117,137 +1077,140 @@ msgstr "Alla filer" msgid "Click to enlarge" msgstr "Klicka för att förstora" -#: ../libempathy-gtk/empathy-chat.c:201 +#: ../libempathy-gtk/empathy-chat.c:232 msgid "Failed to reconnect this chat" msgstr "Misslyckades med att återansluta till denna chatt" -#: ../libempathy-gtk/empathy-chat.c:623 +#: ../libempathy-gtk/empathy-chat.c:654 msgid "Failed to join chat room" msgstr "Misslyckades med att gå in i chattrummet" -#: ../libempathy-gtk/empathy-chat.c:641 +#: ../libempathy-gtk/empathy-chat.c:672 msgid "Failed to open private chat" msgstr "Misslyckades med att öppna privat chatt" -#: ../libempathy-gtk/empathy-chat.c:680 -#, fuzzy +#: ../libempathy-gtk/empathy-chat.c:711 msgid "Topic not supported on this conversation" -msgstr "Du prenumererar inte på denna kontakt." +msgstr "Ämne stöds inte för detta samtal" -#: ../libempathy-gtk/empathy-chat.c:686 +#: ../libempathy-gtk/empathy-chat.c:717 msgid "You are not allowed to change the topic" msgstr "Du tillåts inte att ändra ämnet" -#: ../libempathy-gtk/empathy-chat.c:815 +#: ../libempathy-gtk/empathy-chat.c:846 msgid "/clear: clear all messages from the current conversation" -msgstr "" +msgstr "/clear: töm alla meddelanden från det aktuella samtalet" -#: ../libempathy-gtk/empathy-chat.c:818 +#: ../libempathy-gtk/empathy-chat.c:849 msgid "/topic <topic>: set the topic of the current conversation" -msgstr "" +msgstr "/topic <ämne>: ställ in ämnet för det aktuella samtalet" -#: ../libempathy-gtk/empathy-chat.c:821 +#: ../libempathy-gtk/empathy-chat.c:852 msgid "/join <chat room ID>: join a new chat room" -msgstr "" +msgstr "/join <chattrummets ID>: gå in i ett nytt chattrum" -#: ../libempathy-gtk/empathy-chat.c:824 +#: ../libempathy-gtk/empathy-chat.c:855 msgid "/j <chat room ID>: join a new chat room" -msgstr "" +msgstr "/j <chattrummets ID>: gå in i ett nytt chattrum" -#: ../libempathy-gtk/empathy-chat.c:827 +#: ../libempathy-gtk/empathy-chat.c:858 msgid "/query <contact ID> [<message>]: open a private chat" -msgstr "" +msgstr "/query <kontaktens ID> [<meddelande>]: öppna en privat chatt" -#: ../libempathy-gtk/empathy-chat.c:830 +#: ../libempathy-gtk/empathy-chat.c:861 msgid "/msg <contact ID> <message>: open a private chat" -msgstr "" +msgstr "/msg <kontaktens ID> <meddelande>: öppna en privat chatt" -#: ../libempathy-gtk/empathy-chat.c:833 +#: ../libempathy-gtk/empathy-chat.c:864 msgid "/nick <nickname>: change your nickname on the current server" -msgstr "" +msgstr "/nick <smeknamn>: ändra ditt smeknamn på aktuell server" -#: ../libempathy-gtk/empathy-chat.c:836 +#: ../libempathy-gtk/empathy-chat.c:867 msgid "/me <message>: send an ACTION message to the current conversation" msgstr "" -#: ../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 "" -#: ../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 "" +msgstr "/help [<kommando>]: visa alla kommandon som stöds. Om <kommando> har definierats, visa dess användning." -#: ../libempathy-gtk/empathy-chat.c:854 +#: ../libempathy-gtk/empathy-chat.c:885 #, c-format msgid "Usage: %s" msgstr "Användning: %s" -#: ../libempathy-gtk/empathy-chat.c:883 +#: ../libempathy-gtk/empathy-chat.c:914 msgid "Unknown command" msgstr "Okänt kommando" -#: ../libempathy-gtk/empathy-chat.c:1004 +#: ../libempathy-gtk/empathy-chat.c:1035 msgid "Unknown command; see /help for the available commands" msgstr "Okänt kommando; se /help för tillgängliga kommandon" -#: ../libempathy-gtk/empathy-chat.c:1142 +#: ../libempathy-gtk/empathy-chat.c:1173 msgid "offline" msgstr "frånkopplad" -#: ../libempathy-gtk/empathy-chat.c:1145 +#: ../libempathy-gtk/empathy-chat.c:1176 msgid "invalid contact" msgstr "ogiltig kontakt" -#: ../libempathy-gtk/empathy-chat.c:1148 +#: ../libempathy-gtk/empathy-chat.c:1179 msgid "permission denied" msgstr "åtkomst nekad" -#: ../libempathy-gtk/empathy-chat.c:1151 +#: ../libempathy-gtk/empathy-chat.c:1182 msgid "too long message" msgstr "för långt meddelande" -#: ../libempathy-gtk/empathy-chat.c:1154 +#: ../libempathy-gtk/empathy-chat.c:1185 msgid "not implemented" msgstr "inte implementerat" -#: ../libempathy-gtk/empathy-chat.c:1157 +#: ../libempathy-gtk/empathy-chat.c:1188 msgid "unknown" msgstr "okänt" -#: ../libempathy-gtk/empathy-chat.c:1161 +#: ../libempathy-gtk/empathy-chat.c:1192 #, c-format msgid "Error sending message '%s': %s" msgstr "Fel vid sändning av meddelandet \"%s\": %s" -#: ../libempathy-gtk/empathy-chat.c:1191 +#: ../libempathy-gtk/empathy-chat.c:1222 #, c-format msgid "Topic set to: %s" msgstr "Ämnet inställt till: %s" -#: ../libempathy-gtk/empathy-chat.c:1193 +#: ../libempathy-gtk/empathy-chat.c:1224 msgid "No topic defined" msgstr "Inget ämne definierat" -#: ../libempathy-gtk/empathy-chat.c:1592 +#: ../libempathy-gtk/empathy-chat.c:1623 msgid "(No Suggestions)" msgstr "(Inga förslag)" -#: ../libempathy-gtk/empathy-chat.c:1646 +#: ../libempathy-gtk/empathy-chat.c:1677 msgid "Insert Smiley" msgstr "Infoga smilis" #. send button -#: ../libempathy-gtk/empathy-chat.c:1664 +#: ../libempathy-gtk/empathy-chat.c:1695 #: ../libempathy-gtk/empathy-ui-utils.c:1658 msgid "_Send" msgstr "_Skicka" -#: ../libempathy-gtk/empathy-chat.c:1698 +#: ../libempathy-gtk/empathy-chat.c:1729 msgid "_Spelling Suggestions" msgstr "Sta_vningsförslag" -#: ../libempathy-gtk/empathy-chat.c:1813 +#: ../libempathy-gtk/empathy-chat.c:1823 +msgid "Failed to retrieve recent logs" +msgstr "Misslyckades med att hämta senaste loggar" + +#: ../libempathy-gtk/empathy-chat.c:1954 #, c-format msgid "%s has disconnected" msgstr "%s har kopplat från" @@ -1255,12 +1218,12 @@ msgstr "%s har kopplat från" #. 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 sparkades ut av %2$s" -#: ../libempathy-gtk/empathy-chat.c:1823 +#: ../libempathy-gtk/empathy-chat.c:1964 #, c-format msgid "%s was kicked" msgstr "%s sparkades ut" @@ -1268,17 +1231,17 @@ msgstr "%s sparkades ut" #. 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 blev bannlyst av %2$s" -#: ../libempathy-gtk/empathy-chat.c:1834 +#: ../libempathy-gtk/empathy-chat.c:1975 #, c-format msgid "%s was banned" msgstr "%s blev bannlyst" -#: ../libempathy-gtk/empathy-chat.c:1838 +#: ../libempathy-gtk/empathy-chat.c:1979 #, c-format msgid "%s has left the room" msgstr "%s har lämnat rummet" @@ -1288,48 +1251,48 @@ msgstr "%s har lämnat rummet" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c: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 har gått in i rummet" -#: ../libempathy-gtk/empathy-chat.c:1897 +#: ../libempathy-gtk/empathy-chat.c:2038 #, c-format msgid "%s is now known as %s" msgstr "%s är nu känd som %s" -#: ../libempathy-gtk/empathy-chat.c:2032 +#: ../libempathy-gtk/empathy-chat.c:2173 #: ../src/empathy-call-window.c:1531 msgid "Disconnected" msgstr "Frånkopplad" -#: ../libempathy-gtk/empathy-chat.c:2566 +#: ../libempathy-gtk/empathy-chat.c:2695 msgid "Wrong password; please try again:" msgstr "Felaktigt lösenord. Försök igen:" -#: ../libempathy-gtk/empathy-chat.c:2567 +#: ../libempathy-gtk/empathy-chat.c:2696 msgid "Retry" msgstr "Försök igen" -#: ../libempathy-gtk/empathy-chat.c:2572 +#: ../libempathy-gtk/empathy-chat.c:2701 msgid "This room is protected by a password:" msgstr "Detta rum är skyddat med ett lösenord:" -#: ../libempathy-gtk/empathy-chat.c:2573 +#: ../libempathy-gtk/empathy-chat.c:2702 msgid "Join" msgstr "Gå in" -#: ../libempathy-gtk/empathy-chat.c:2713 +#: ../libempathy-gtk/empathy-chat.c:2842 msgid "Connected" msgstr "Ansluten" -#: ../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 "Samtal" @@ -1401,54 +1364,54 @@ msgstr "Vill du verkligen ta bort kontakten \"%s\"?" msgid "Removing contact" msgstr "Tar bort kontakt" -#: ../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 "_Lägg till kontakt..." -#: ../libempathy-gtk/empathy-contact-menu.c:222 +#: ../libempathy-gtk/empathy-contact-menu.c:226 #: ../src/empathy-main-window.ui.h:15 msgid "_Chat" msgstr "_Chatt" -#: ../libempathy-gtk/empathy-contact-menu.c:253 +#: ../libempathy-gtk/empathy-contact-menu.c:257 msgctxt "menu item" msgid "_Audio Call" msgstr "_Ljudsamtal" -#: ../libempathy-gtk/empathy-contact-menu.c:285 +#: ../libempathy-gtk/empathy-contact-menu.c:289 msgctxt "menu item" msgid "_Video Call" msgstr "_Videosamtal" -#: ../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 "Ti_digare samtal" -#: ../libempathy-gtk/empathy-contact-menu.c:346 +#: ../libempathy-gtk/empathy-contact-menu.c:362 msgid "Send file" msgstr "Skicka fil" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:385 msgid "Share my desktop" msgstr "Dela ut mitt skrivbord" -#: ../libempathy-gtk/empathy-contact-menu.c:397 +#: ../libempathy-gtk/empathy-contact-menu.c:413 msgid "Infor_mation" msgstr "Infor_mation" -#: ../libempathy-gtk/empathy-contact-menu.c:443 +#: ../libempathy-gtk/empathy-contact-menu.c:459 msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "R_edigera" -#: ../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 "Bjuder in dig till detta rum" -#: ../libempathy-gtk/empathy-contact-menu.c:528 +#: ../libempathy-gtk/empathy-contact-menu.c:544 msgid "_Invite to chat room" msgstr "_Bjud in till chattrum" @@ -1561,26 +1524,26 @@ msgstr "Latitud:" msgid "Altitude:" msgstr "Höjd:" -#: ../libempathy-gtk/empathy-contact-widget.c:584 +#: ../libempathy-gtk/empathy-contact-widget.c:585 #: ../src/empathy-preferences.ui.h:12 msgid "Location" msgstr "Plats" -#: ../libempathy-gtk/empathy-contact-widget.c:600 +#: ../libempathy-gtk/empathy-contact-widget.c:601 msgid "<b>Location</b>, " msgstr "<b>Plats</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 klockan %H.%M UTC" -#: ../libempathy-gtk/empathy-contact-widget.c:721 +#: ../libempathy-gtk/empathy-contact-widget.c:734 msgid "Save Avatar" -msgstr "Spara avatar" +msgstr "Spara profilbild" -#: ../libempathy-gtk/empathy-contact-widget.c:777 +#: ../libempathy-gtk/empathy-contact-widget.c:790 msgid "Unable to save avatar" -msgstr "Kunde inte spara avatar" +msgstr "Kunde inte spara profilbild" #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 msgid "<b>Location</b> at (date)\t" @@ -1664,12 +1627,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" @@ -1725,34 +1688,34 @@ msgstr "Nytt samtal" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:167 -#: ../libempathy-gtk/empathy-presence-chooser.c:203 +#: ../libempathy-gtk/empathy-presence-chooser.c:168 +#: ../libempathy-gtk/empathy-presence-chooser.c:204 msgid "Custom Message…" msgstr "Anpassat meddelande..." -#: ../libempathy-gtk/empathy-presence-chooser.c:220 -#: ../libempathy-gtk/empathy-presence-chooser.c:222 +#: ../libempathy-gtk/empathy-presence-chooser.c:221 +#: ../libempathy-gtk/empathy-presence-chooser.c:223 msgid "Edit Custom Messages…" msgstr "Redigera anpassade meddelanden..." -#: ../libempathy-gtk/empathy-presence-chooser.c:344 +#: ../libempathy-gtk/empathy-presence-chooser.c:346 msgid "Click to remove this status as a favorite" msgstr "Klicka för att ta bort denna status som favorit" -#: ../libempathy-gtk/empathy-presence-chooser.c:353 +#: ../libempathy-gtk/empathy-presence-chooser.c:355 msgid "Click to make this status a favorite" msgstr "Klicka för att göra denna status till favorit" -#: ../libempathy-gtk/empathy-presence-chooser.c:387 +#: ../libempathy-gtk/empathy-presence-chooser.c:389 msgid "Set status" msgstr "Ange status" -#: ../libempathy-gtk/empathy-presence-chooser.c:896 +#: ../libempathy-gtk/empathy-presence-chooser.c:936 msgid "Set your presence and current status" msgstr "Ange din närvaro och aktuell status" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1083 +#: ../libempathy-gtk/empathy-presence-chooser.c:1124 msgid "Custom messages…" msgstr "Anpassade meddelanden..." @@ -2036,16 +1999,15 @@ msgstr "Inget felmeddelande" msgid "Instant Message (Empathy)" msgstr "Snabbmeddelanden (Empathy)" -#: ../src/empathy.c:569 +#: ../src/empathy.c:580 msgid "Don't connect on startup" msgstr "Anslut inte vid uppstart" -#: ../src/empathy.c:573 -#, fuzzy +#: ../src/empathy.c:584 msgid "Don't display the contact list or any other dialogs on startup" -msgstr "Visa inte kontaktlistan vid uppstart" +msgstr "Visa inte kontaktlistan eller några andra dialogrutor vid uppstart" -#: ../src/empathy.c:585 +#: ../src/empathy.c:596 msgid "- Empathy IM Client" msgstr "- Empathy snabbmeddelandeklient" @@ -2276,7 +2238,7 @@ msgstr "" "Du är på väg att välja ett annat konto vilket kommer att\n" "förkasta dina ändringar. Är du säker att du vill fortsätta?" -#: ../src/empathy-accounts-dialog.c:1863 +#: ../src/empathy-accounts-dialog.c:1862 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2285,7 +2247,7 @@ msgstr "" "förkasta dina ändringar. Är du säker att du vill fortsätta?" #. Tweak the dialog -#: ../src/empathy-accounts-dialog.c:1996 +#: ../src/empathy-accounts-dialog.c:1995 msgid "Accounts" msgstr "Konton" @@ -2377,7 +2339,7 @@ msgstr "" #: ../src/empathy-call-window.c:1804 #, c-format msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections." -msgstr "" +msgstr "Kan inte etablera en anslutning till %s. Någon av er kanske befinner er på ett nätverk som inte tillåter direktanslutningar." #: ../src/empathy-call-window.c:1810 msgid "There was a failure on the network" @@ -2880,7 +2842,7 @@ msgstr "Nytt sa_mtal…" #: ../src/empathy-main-window.ui.h:8 msgid "Normal Size With _Avatars" -msgstr "Normal storlek med _avatarer" +msgstr "Normal storlek med _profilbilder" #: ../src/empathy-main-window.ui.h:9 msgid "P_references" @@ -3171,60 +3133,60 @@ msgstr "Kartvy för kontakter" msgid "Save" msgstr "Spara" -#: ../src/empathy-debug-window.c:1188 +#: ../src/empathy-debug-window.c:1219 msgid "Debug Window" msgstr "Felsökningsfönster" -#: ../src/empathy-debug-window.c:1268 +#: ../src/empathy-debug-window.c:1299 msgid "Pause" msgstr "Gör paus" -#: ../src/empathy-debug-window.c:1280 +#: ../src/empathy-debug-window.c:1311 msgid "Level " msgstr "Nivå " -#: ../src/empathy-debug-window.c:1300 +#: ../src/empathy-debug-window.c:1331 msgid "Debug" msgstr "Felsökning" -#: ../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 "Meddelande" -#: ../src/empathy-debug-window.c:1318 +#: ../src/empathy-debug-window.c:1349 msgid "Warning" msgstr "Varning" -#: ../src/empathy-debug-window.c:1324 +#: ../src/empathy-debug-window.c:1355 msgid "Critical" msgstr "Kritiskt" -#: ../src/empathy-debug-window.c:1330 +#: ../src/empathy-debug-window.c:1361 msgid "Error" msgstr "Fel" -#: ../src/empathy-debug-window.c:1349 +#: ../src/empathy-debug-window.c:1380 msgid "Time" msgstr "Tid" -#: ../src/empathy-debug-window.c:1352 +#: ../src/empathy-debug-window.c:1383 msgid "Domain" msgstr "Domän" -#: ../src/empathy-debug-window.c:1354 +#: ../src/empathy-debug-window.c:1385 msgid "Category" msgstr "Kategori" -#: ../src/empathy-debug-window.c:1356 +#: ../src/empathy-debug-window.c:1387 msgid "Level" msgstr "Nivå" -#: ../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 "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfelsökning." 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/cc-empathy-accounts-page.c b/src/cc-empathy-accounts-page.c index 10c333ff3..ef9b17557 100644 --- a/src/cc-empathy-accounts-page.c +++ b/src/cc-empathy-accounts-page.c @@ -93,7 +93,9 @@ connection_managers_prepare (GObject *source, page_pack_with_accounts_dialog (page); - if (empathy_accounts_import (account_mgr, cm_mgr)) + empathy_accounts_import (account_mgr, cm_mgr); + + if (!empathy_accounts_has_non_salut_accounts (account_mgr)) empathy_account_assistant_show (NULL, cm_mgr); out: diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c index cfaea67b4..288a32d8f 100644 --- a/src/empathy-account-assistant.c +++ b/src/empathy-account-assistant.c @@ -300,6 +300,8 @@ account_assistant_account_enabled_cb (GObject *source, salut_created = TRUE; } + empathy_connect_new_account (account, priv->account_mgr); + current_idx = gtk_assistant_get_current_page (GTK_ASSISTANT (self)); if (current_idx == PAGE_SALUT && !salut_created) /* We are on the Salut page and aren't creating the salut account so don't diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c index cf730fab2..334f3cba8 100644 --- a/src/empathy-accounts-common.c +++ b/src/empathy-accounts-common.c @@ -71,29 +71,16 @@ empathy_accounts_has_non_salut_accounts (TpAccountManager *manager) return ret; } -/* Try to import accounts from MC4 and returns TRUE if we should display the - * accounts assistant. */ -gboolean +void empathy_accounts_import (TpAccountManager *account_mgr, EmpathyConnectionManagers *cm_mgr) { - g_return_val_if_fail (tp_account_manager_is_prepared (account_mgr, - TP_ACCOUNT_MANAGER_FEATURE_CORE), FALSE); - g_return_val_if_fail (empathy_connection_managers_is_ready (cm_mgr), FALSE); - - if (empathy_import_mc4_has_imported ()) - return FALSE; - - if (empathy_import_mc4_accounts (cm_mgr)) - return FALSE; - - if (empathy_accounts_has_non_salut_accounts (account_mgr)) - return FALSE; + g_return_if_fail (tp_account_manager_is_prepared (account_mgr, + TP_ACCOUNT_MANAGER_FEATURE_CORE)); + g_return_if_fail (empathy_connection_managers_is_ready (cm_mgr)); - if (!should_create_salut_account (account_mgr)) - return FALSE; - - return TRUE; + if (!empathy_import_mc4_has_imported ()) + empathy_import_mc4_accounts (cm_mgr); } static void @@ -111,7 +98,7 @@ do_show_accounts_ui (TpAccountManager *manager, gtk_window_present (GTK_WINDOW (accounts_window)); } -static GtkWidget* +static GtkWidget * show_account_assistant (EmpathyConnectionManagers *connection_mgrs, GCallback assistant_destroy_cb) { @@ -125,60 +112,6 @@ show_account_assistant (EmpathyConnectionManagers *connection_mgrs, } static void -connection_managers_prepare_cb ( - EmpathyConnectionManagers *cm_mgr, - GAsyncResult *result, - gpointer user_data) -{ - GCallback assistant_destroy_cb = g_object_get_data (G_OBJECT (cm_mgr), - "assistant-destroy-callback"); - TpAccountManager *account_mgr = g_object_get_data (G_OBJECT (cm_mgr), - "account-manager"); - gboolean hidden = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (cm_mgr), - "hidden")); - - if (!empathy_connection_managers_prepare_finish (cm_mgr, result, NULL)) - goto out; - - if (empathy_accounts_import (account_mgr, cm_mgr) && - !hidden) - { - show_account_assistant (cm_mgr, assistant_destroy_cb); - } - else if (!empathy_accounts_has_non_salut_accounts (account_mgr)) - { - show_account_assistant (cm_mgr, assistant_destroy_cb); - } - else - { - if (assistant_destroy_cb) - assistant_destroy_cb (); - } - -out: - g_object_unref (cm_mgr); -} - -void -empathy_accounts_manager_ready_for_show_assistant ( - TpAccountManager *account_mgr, - gboolean hidden) -{ - EmpathyConnectionManagers *cm_mgr; - - cm_mgr = empathy_connection_managers_dup_singleton (); - - g_object_set_data (G_OBJECT (cm_mgr), "assistant-destroy-callback", - g_object_get_data (G_OBJECT (account_mgr), "assistant-destroy-callback")); - g_object_set_data_full (G_OBJECT (cm_mgr), "account-manager", - g_object_ref (account_mgr), g_object_unref); - g_object_set_data (G_OBJECT (cm_mgr), "hidden", GUINT_TO_POINTER (hidden)); - - empathy_connection_managers_prepare_async (cm_mgr, - (GAsyncReadyCallback) connection_managers_prepare_cb, NULL); -} - -static void connection_managers_prepare_for_accounts (GObject *source, GAsyncResult *result, gpointer user_data) @@ -190,7 +123,7 @@ connection_managers_prepare_for_accounts (GObject *source, goto out; show_account_assistant (cm_mgr, assistant_destroy_cb); - g_debug ("would show the account assistant"); + DEBUG ("would show the account assistant"); out: g_object_unref (cm_mgr); diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h index 6782d77e2..2bd51bf0d 100644 --- a/src/empathy-accounts-common.h +++ b/src/empathy-accounts-common.h @@ -28,11 +28,7 @@ void empathy_accounts_show_accounts_ui (TpAccountManager *manager, TpAccount *account, GCallback window_destroyed_cb); -void empathy_accounts_manager_ready_for_show_assistant ( - TpAccountManager *account_mgr, - gboolean hidden); - -gboolean empathy_accounts_import (TpAccountManager *account_mgr, +void empathy_accounts_import (TpAccountManager *account_mgr, EmpathyConnectionManagers *cm_mgr); diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 18f976b35..5843c0d74 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -1756,9 +1756,8 @@ enable_or_disable_account (EmpathyAccountsDialog *dialog, /* Update the status in the model */ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview)); - /* Update the status-infobar in the details view when disabling */ - if (!enabled) - accounts_dialog_update_status_infobar (dialog, account); + /* Update the status-infobar in the details view */ + accounts_dialog_update_status_infobar (dialog, account); DEBUG ("Account %s is now %s", tp_account_get_display_name (account), @@ -2290,7 +2289,7 @@ empathy_accounts_dialog_show_application (GdkScreen *screen, GChildWatchFunc application_exit_cb, gpointer user_data, TpAccount *selected_account, - gboolean try_import, + gboolean if_needed, gboolean hidden) { gint command_pid; @@ -2326,12 +2325,17 @@ empathy_accounts_dialog_show_application (GdkScreen *screen, argv[i++] = account_option; } - if (try_import) - argv[i++] = "--import"; + if (if_needed) + argv[i++] = "--if-needed"; if (hidden) argv[i++] = "--hidden"; + DEBUG ("Launching empathy-accounts (if_needed: %d, hidden: %d, account: %s)", + if_needed, hidden, + selected_account == NULL ? "<none selected>" : + tp_proxy_get_object_path (TP_PROXY (selected_account))); + gdk_spawn_on_screen (screen, NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &command_pid, &error); diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h index dd9cd7d55..c171e3d24 100644 --- a/src/empathy-accounts-dialog.h +++ b/src/empathy-accounts-dialog.h @@ -60,7 +60,7 @@ void empathy_accounts_dialog_show_application (GdkScreen *screen, GChildWatchFunc application_exit_cb, gpointer user_data, TpAccount *selected_account, - gboolean try_import, + gboolean if_needed, gboolean hidden); G_END_DECLS diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 942f6a475..187bdf56b 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -53,50 +53,58 @@ #define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts" -static gboolean try_import = FALSE; +static gboolean only_if_needed = FALSE; static gboolean hidden = FALSE; static gchar *selected_account_name = NULL; static void -account_manager_ready_for_assistant_cb (GObject *source_object, +account_prepare_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) { - TpAccountManager *account_mgr = TP_ACCOUNT_MANAGER (source_object); + TpAccountManager *manager = TP_ACCOUNT_MANAGER (user_data); + TpAccount *account = TP_ACCOUNT (source_object); GError *error = NULL; - if (!tp_account_manager_prepare_finish (account_mgr, result, &error)) + if (!tp_account_prepare_finish (account, result, &error)) { - DEBUG ("Failed to prepare account manager: %s", error->message); + DEBUG ("Failed to prepare account: %s", error->message); g_error_free (error); - return; + + account = NULL; } - g_object_set_data (G_OBJECT (account_mgr), "assistant-destroy-callback", + empathy_accounts_show_accounts_ui (manager, account, G_CALLBACK (gtk_main_quit)); +} - empathy_accounts_manager_ready_for_show_assistant (account_mgr, hidden); +static void +maybe_show_accounts_ui (TpAccountManager *manager) +{ + if (hidden || + (only_if_needed && empathy_accounts_has_non_salut_accounts (manager))) + gtk_main_quit (); + else + empathy_accounts_show_accounts_ui (manager, NULL, gtk_main_quit); } static void -account_prepare_cb (GObject *source_object, +cm_manager_prepared_cb (GObject *source, GAsyncResult *result, gpointer user_data) { - TpAccountManager *manager = TP_ACCOUNT_MANAGER (user_data); - TpAccount *account = TP_ACCOUNT (source_object); - GError *error = NULL; - - if (!tp_account_prepare_finish (account, result, &error)) + if (!empathy_connection_managers_prepare_finish ( + EMPATHY_CONNECTION_MANAGERS (source), result, NULL)) { - DEBUG ("Failed to prepare account: %s", error->message); - g_error_free (error); - - account = NULL; + g_warning ("Failed to prepare connection managers singleton"); + gtk_main_quit (); + return; } - empathy_accounts_show_accounts_ui (manager, account, - G_CALLBACK (gtk_main_quit)); + empathy_accounts_import (TP_ACCOUNT_MANAGER (user_data), + EMPATHY_CONNECTION_MANAGERS (source)); + + maybe_show_accounts_ui (TP_ACCOUNT_MANAGER (user_data)); } static void @@ -115,7 +123,7 @@ account_manager_ready_for_accounts_cb (GObject *source_object, return; } - if (account_id) + if (account_id != NULL) { gchar *account_path; TpAccount *account = NULL; @@ -143,8 +151,18 @@ account_manager_ready_for_accounts_cb (GObject *source_object, } else { - empathy_accounts_show_accounts_ui (manager, NULL, - G_CALLBACK (gtk_main_quit)); + if (empathy_import_mc4_has_imported ()) + { + maybe_show_accounts_ui (manager); + } + else + { + EmpathyConnectionManagers *cm_mgr = + empathy_connection_managers_dup_singleton (); + + empathy_connection_managers_prepare_async ( + cm_mgr, cm_manager_prepared_cb, manager); + } } } @@ -186,20 +204,18 @@ main (int argc, char *argv[]) { TpAccountManager *account_manager; GError *error = NULL; - TpDBusDaemon *dbus_daemon; UniqueApp *unique_app; GOptionContext *optcontext; GOptionEntry options[] = { - { "import", 'i', - G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &try_import, - N_("Try to import any recognized accounts and display an assistant if " - "that fails"), - NULL }, { "hidden", 'h', 0, G_OPTION_ARG_NONE, &hidden, N_("Don't display any dialogs; do any work (eg, importing) and exit"), NULL }, + { "if-needed", 'n', + 0, G_OPTION_ARG_NONE, &only_if_needed, + N_("Don't display any dialogs if there are any non-salut accounts"), + NULL }, { "select-account", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &selected_account_name, N_("Initially select given account (eg, " @@ -242,38 +258,10 @@ main (int argc, char *argv[]) return EXIT_SUCCESS; } - /* Take well-known name */ - dbus_daemon = tp_dbus_daemon_dup (&error); - if (error == NULL) - { - if (!tp_dbus_daemon_request_name (dbus_daemon, - EMPATHY_ACCOUNTS_DBUS_NAME, TRUE, &error)) - { - DEBUG ("Failed to request well-known name: %s", - error ? error->message : "no message"); - g_clear_error (&error); - } - g_object_unref (dbus_daemon); - } - else - { - DEBUG ("Failed to dup dbus daemon: %s", - error ? error->message : "no message"); - g_clear_error (&error); - } - account_manager = tp_account_manager_dup (); - if (try_import) - { - tp_account_manager_prepare_async (account_manager, NULL, - account_manager_ready_for_assistant_cb, NULL); - } - else - { - tp_account_manager_prepare_async (account_manager, NULL, - account_manager_ready_for_accounts_cb, selected_account_name); - } + tp_account_manager_prepare_async (account_manager, NULL, + account_manager_ready_for_accounts_cb, selected_account_name); g_signal_connect (unique_app, "message-received", G_CALLBACK (unique_app_message_cb), NULL); 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..2dc62943e 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> @@ -63,6 +69,8 @@ #include <libempathy-gtk/empathy-location-manager.h> #include "empathy-main-window.h" +#include "empathy-import-mc4-accounts.h" +#include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" #include "empathy-status-icon.h" #include "empathy-call-window.h" @@ -79,6 +87,10 @@ static gboolean start_hidden = FALSE; static gboolean no_connect = FALSE; +static void account_manager_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data); + static void dispatch_cb (EmpathyDispatcher *dispatcher, EmpathyDispatchOperation *operation, @@ -242,10 +254,10 @@ accounts_application_exited_cb (GPid pid, static void show_accounts_ui (GdkScreen *screen, - gboolean try_import) + gboolean if_needed) { empathy_accounts_dialog_show_application (screen, - accounts_application_exited_cb, NULL, NULL, try_import, start_hidden); + accounts_application_exited_cb, NULL, NULL, if_needed, start_hidden); } static UniqueResponse @@ -256,6 +268,7 @@ unique_app_message_cb (UniqueApp *unique_app, gpointer user_data) { GtkWindow *window = user_data; + TpAccountManager *account_manager; DEBUG ("Other instance launched, presenting the main window. " "Command=%d, timestamp %u", command, timestamp); @@ -273,6 +286,12 @@ 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); + + account_manager = tp_account_manager_dup (); + tp_account_manager_prepare_async (account_manager, NULL, + account_manager_ready_cb, NULL); + g_object_unref (account_manager); return UNIQUE_RESPONSE_OK; } @@ -363,7 +382,11 @@ account_manager_ready_cb (GObject *source_object, /* if current state is Offline, then put it online */ empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_AVAILABLE); - show_accounts_ui (gdk_screen_get_default (), TRUE); + /* Pop up the accounts dialog if it's needed (either when we don't have any + * non-salut accounts yet or when we haven't imported mc4 accounts yet */ + if (!empathy_accounts_has_non_salut_accounts (manager) + || !empathy_import_mc4_has_imported ()) + show_accounts_ui (gdk_screen_get_default (), TRUE); g_object_unref (idle); g_object_unref (connectivity); @@ -547,7 +570,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 +587,7 @@ main (int argc, char *argv[]) #ifdef ENABLE_DEBUG TpDebugSender *debug_sender; -#endif +#endif /* ENABLE_TPL */ GOptionContext *optcontext; GOptionEntry options[] = { @@ -654,8 +681,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); |
