aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-chat.c146
-rw-r--r--libempathy-gtk/empathy-chat.h1
-rw-r--r--libempathy-gtk/empathy-contact-list-view.c2
-rw-r--r--libempathy-gtk/empathy-contact-menu.c7
-rw-r--r--libempathy-gtk/empathy-contact-widget.c159
-rw-r--r--libempathy-gtk/empathy-individual-menu.c8
-rw-r--r--libempathy-gtk/empathy-new-call-dialog.c3
-rw-r--r--libempathy-gtk/empathy-new-message-dialog.c4
-rw-r--r--libempathy-gtk/empathy-ui-utils.c6
-rw-r--r--libempathy-gtk/empathy-ui-utils.h2
-rw-r--r--libempathy/empathy-time.c64
-rw-r--r--libempathy/empathy-time.h1
-rw-r--r--libempathy/empathy-tp-chat.c3
-rw-r--r--po/eo.po1739
-rw-r--r--po/es.po320
-rw-r--r--po/he.po176
-rw-r--r--po/sl.po775
-rw-r--r--src/empathy-chat-window.c52
-rw-r--r--src/empathy-event-manager.c3
-rw-r--r--src/empathy-main-window.c4
-rw-r--r--src/empathy-new-chatroom-dialog.c4
-rw-r--r--src/empathy-streamed-media-window.c2
22 files changed, 2140 insertions, 1341 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 09698bc72..e76998065 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -44,10 +44,10 @@
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-request-util.h>
#include <libempathy/empathy-chatroom-manager.h>
-#include <src/empathy-chat-window.h>
#include "empathy-chat.h"
#include "empathy-spell.h"
+#include "empathy-contact-dialogs.h"
#include "empathy-contact-list-store.h"
#include "empathy-contact-list-view.h"
#include "empathy-contact-menu.h"
@@ -159,6 +159,7 @@ typedef struct {
enum {
COMPOSING,
NEW_MESSAGE,
+ PART_COMMAND_ENTERED,
LAST_SIGNAL
};
@@ -704,7 +705,6 @@ nick_command_supported (EmpathyChat *chat)
EMP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING);
}
-#if 0
static gboolean
part_command_supported (EmpathyChat *chat)
{
@@ -715,7 +715,6 @@ part_command_supported (EmpathyChat *chat)
return tp_proxy_has_interface_by_id (channel,
TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP);
}
-#endif
static void
chat_command_clear (EmpathyChat *chat,
@@ -758,7 +757,7 @@ empathy_chat_join_muc (EmpathyChat *chat,
EmpathyChatPriv *priv = GET_PRIV (chat);
empathy_join_muc (priv->account, room,
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
}
static void
@@ -782,35 +781,12 @@ chat_command_join (EmpathyChat *chat,
g_strfreev (rooms);
}
-void
-empathy_chat_leave_chat (EmpathyChat *chat)
-{
- EmpathyChatPriv *priv = GET_PRIV (chat);
-
- empathy_tp_chat_leave (priv->tp_chat, "");
-}
-
-#if 0
static void
chat_command_part (EmpathyChat *chat,
GStrv strv)
{
- EmpathyChatPriv *priv = GET_PRIV (chat);
- EmpathyChat *chat_to_be_parted;
-
- if (strv[1] == NULL) {
- empathy_tp_chat_leave (priv->tp_chat, "");
- return;
- }
- chat_to_be_parted = empathy_chat_window_find_chat (priv->account, strv[1]);
-
- if (chat_to_be_parted != NULL) {
- empathy_tp_chat_leave (empathy_chat_get_tp_chat (chat_to_be_parted), strv[2]);
- } else {
- empathy_tp_chat_leave (priv->tp_chat, strv[1]);
- }
+ g_signal_emit (chat, signals[PART_COMMAND_ENTERED], 0, strv);
}
-#endif
static void
chat_command_msg_internal (EmpathyChat *chat,
@@ -829,7 +805,7 @@ chat_command_msg_internal (EmpathyChat *chat,
NULL);
req = tp_account_channel_request_new (priv->account, request,
- tp_user_action_time_from_x11 (gtk_get_current_event_time ()));
+ empathy_get_current_action_time ());
/* FIXME: We should probably search in members alias. But this
* is enough for IRC */
@@ -935,6 +911,84 @@ chat_command_say (EmpathyChat *chat,
g_object_unref (message);
}
+static void
+whois_got_contact_cb (TpConnection *connection,
+ guint n_contacts,
+ TpContact * const *contacts,
+ const gchar * const *requested_ids,
+ GHashTable *failed_id_errors,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ EmpathyChat *chat = EMPATHY_CHAT (weak_object);
+
+ g_return_if_fail (n_contacts <= 1);
+
+ if (n_contacts == 0) {
+ GHashTableIter iter;
+ gpointer key = NULL, value = NULL;
+ gchar *id;
+ GError *id_error;
+
+ /* tp-glib guarantees that the contacts you requested will be
+ * in failed_id_errors regardless of whether the individual
+ * contact was invalid or the whole operation failed.
+ */
+ g_hash_table_iter_init (&iter, failed_id_errors);
+ g_hash_table_iter_next (&iter, &key, &value);
+ id = key;
+ id_error = value;
+
+ DEBUG ("Error getting TpContact for '%s': %s %u %s",
+ id, g_quark_to_string (id_error->domain),
+ id_error->code, id_error->message);
+
+ if (error == NULL) {
+ /* The specific ID failed. */
+ gchar *event = g_strdup_printf (
+ _("“%s” is not a valid contact ID"), id);
+ empathy_chat_view_append_event (chat->view, event);
+ g_free (event);
+ }
+ /* Otherwise we're disconnected or something; so the window
+ * will already say ‘Disconnected’, so let's not show anything.
+ */
+ } else {
+ EmpathyContact *empathy_contact;
+ GtkWidget *window;
+
+ g_return_if_fail (contacts[0] != NULL);
+ empathy_contact = empathy_contact_dup_from_tp_contact (
+ contacts[0]);
+
+ window = gtk_widget_get_toplevel (GTK_WIDGET (chat));
+ /* If we're alive and this command is running, we'd better be
+ * in a window. */
+ g_return_if_fail (window != NULL);
+ g_return_if_fail (gtk_widget_is_toplevel (window));
+ empathy_contact_information_dialog_show (empathy_contact,
+ GTK_WINDOW (window));
+ g_object_unref (empathy_contact);
+ }
+}
+
+static void
+chat_command_whois (EmpathyChat *chat,
+ GStrv strv)
+{
+ EmpathyChatPriv *priv = GET_PRIV (chat);
+ TpConnection *conn;
+
+ conn = empathy_tp_chat_get_connection (priv->tp_chat);
+ tp_connection_get_contacts_by_id (conn,
+ /* Element 0 of 'strv' is "whois"; element 1 is the contact ID
+ * entered by the user (including spaces, if any). */
+ 1, (const gchar * const *) strv + 1,
+ 0, NULL,
+ whois_got_contact_cb, NULL, NULL, G_OBJECT (chat));
+}
+
static void chat_command_help (EmpathyChat *chat, GStrv strv);
typedef void (*ChatCommandFunc) (EmpathyChat *chat, GStrv strv);
@@ -961,12 +1015,10 @@ static ChatCommandItem commands[] = {
{"j", 2, 2, chat_command_join, NULL,
N_("/j <chat room ID>: join a new chat room")},
-#if 0
/* FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=643295 */
{"part", 1, 3, chat_command_part, part_command_supported,
N_("/part [<chat room ID>] [<reason>]: leave the chat room, "
"by default the current one")},
-#endif
{"query", 2, 3, chat_command_query, NULL,
N_("/query <contact ID> [<message>]: open a private chat")},
@@ -985,6 +1037,9 @@ static ChatCommandItem commands[] = {
"This is used to send a message starting with a '/'. For example: "
"\"/say /join is used to join a new chat room\"")},
+ {"whois", 2, 2, chat_command_whois, NULL,
+ N_("/whois <contact ID>: display information about a contact")},
+
{"help", 1, 2, chat_command_help, NULL,
N_("/help [<command>]: show all supported commands. "
"If <command> is defined, show its usage.")},
@@ -3060,6 +3115,16 @@ empathy_chat_class_init (EmpathyChatClass *klass)
G_TYPE_NONE,
2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
+ signals[PART_COMMAND_ENTERED] =
+ g_signal_new ("part-command-entered",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE,
+ 1, G_TYPE_STRV);
+
g_type_class_add_private (object_class, sizeof (EmpathyChatPriv));
}
@@ -3382,6 +3447,18 @@ password_entry_changed_cb (GtkEditable *entry,
}
static void
+chat_invalidated_cb (TpProxy *proxy,
+ guint domain,
+ gint code,
+ gchar *message,
+ gpointer password_infobar)
+{
+ /* Destroy the password infobar whenever a channel is invalidated
+ * so we don't have multiple infobars when the MUC is rejoined */
+ gtk_widget_destroy (GTK_WIDGET (password_infobar));
+}
+
+static void
display_password_info_bar (EmpathyChat *self)
{
EmpathyChatPriv *priv = GET_PRIV (self);
@@ -3463,12 +3540,19 @@ display_password_info_bar (EmpathyChat *self)
TRUE, TRUE, 3);
gtk_widget_show_all (hbox);
+ tp_g_signal_connect_object (empathy_tp_chat_get_channel (priv->tp_chat),
+ "invalidated", G_CALLBACK (chat_invalidated_cb),
+ info_bar, 0);
+
data->response_id = g_signal_connect (info_bar, "response",
G_CALLBACK (password_infobar_response_cb), data);
gtk_widget_show_all (info_bar);
/* ... but hide the spinner */
gtk_widget_hide (spinner);
+
+ /* prevent the user from typing anything */
+ gtk_widget_set_sensitive (self->input_text_view, FALSE);
}
static void
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index a5c0148a1..47892d6c9 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -85,7 +85,6 @@ void empathy_chat_correct_word (EmpathyChat *chat,
const gchar *new_word);
void empathy_chat_join_muc (EmpathyChat *chat,
const gchar *room);
-void empathy_chat_leave_chat (EmpathyChat *chat);
gboolean empathy_chat_is_room (EmpathyChat *chat);
void empathy_chat_set_show_contacts (EmpathyChat *chat,
gboolean show);
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index dace4f909..03839abbe 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -903,7 +903,7 @@ contact_list_view_row_activated (GtkTreeView *view,
if (contact) {
DEBUG ("Starting a chat");
empathy_chat_with_contact (contact,
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
g_object_unref (contact);
}
}
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 15f47b206..ecdbee1ba 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -314,7 +314,7 @@ static void
empathy_contact_chat_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
{
- empathy_chat_with_contact (contact, gtk_get_current_event_time ());
+ empathy_chat_with_contact (contact, empathy_get_current_action_time ());
}
GtkWidget *
@@ -343,9 +343,8 @@ static void
empathy_contact_audio_call_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
{
-
empathy_call_new_with_streams (contact, TRUE, FALSE,
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
}
GtkWidget *
@@ -376,7 +375,7 @@ empathy_contact_video_call_menu_item_activated (GtkMenuItem *item,
EmpathyContact *contact)
{
empathy_call_new_with_streams (contact, TRUE, TRUE,
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
}
GtkWidget *
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index c4e3748b4..14042bf61 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -40,6 +40,7 @@
#include <libempathy/empathy-contact-manager.h>
#include <libempathy/empathy-contact-list.h>
#include <libempathy/empathy-location.h>
+#include <libempathy/empathy-request-util.h>
#include <libempathy/empathy-time.h>
#include <libempathy/empathy-utils.h>
@@ -283,20 +284,74 @@ contact_widget_bday_changed_cb (GtkCalendar *calendar,
static void contact_widget_details_notify_cb (EmpathyContactWidget *information);
+typedef gchar * (* FieldFormatFunc) (GStrv);
+
typedef struct
{
const gchar *field_name;
const gchar *title;
- gboolean linkify;
+ FieldFormatFunc format;
} InfoFieldData;
+static gchar *
+linkify_first_value (GStrv values)
+{
+ return empathy_add_link_markup (values[0]);
+}
+
+static gchar *
+format_idle_time (GStrv values)
+{
+ const gchar *value = values[0];
+ int duration = strtol (value, NULL, 10);
+
+ if (duration <= 0)
+ return NULL;
+
+ return empathy_duration_to_string (duration);
+}
+
+static gchar *
+format_server (GStrv values)
+{
+ g_assert (values[0] != NULL);
+
+ if (values[1] == NULL)
+ return g_markup_escape_text (values[0], -1);
+ else
+ return g_markup_printf_escaped ("%s (%s)", values[0], values[1]);
+}
+
+static gchar *
+presence_hack (GStrv values)
+{
+ if (tp_str_empty (values[0]))
+ return NULL;
+
+ return g_markup_escape_text (values[0], -1);
+}
+
static InfoFieldData info_field_datas[] =
{
- { "fn", N_("Full name:"), FALSE },
- { "tel", N_("Phone number:"), FALSE },
- { "email", N_("E-mail address:"), TRUE },
- { "url", N_("Website:"), TRUE },
- { "bday", N_("Birthday:"), FALSE },
+ { "fn", N_("Full name:"), NULL },
+ { "tel", N_("Phone number:"), NULL },
+ { "email", N_("E-mail address:"), linkify_first_value },
+ { "url", N_("Website:"), linkify_first_value },
+ { "bday", N_("Birthday:"), NULL },
+
+ /* Note to translators: this is the caption for a string of the form "5
+ * minutes ago", and refers to the time since the contact last interacted
+ * with their IM client.
+ */
+ { "x-idle-time", N_("Last seen:"), format_idle_time },
+ { "x-irc-server", N_("Server:"), format_server },
+ { "x-host", N_("Connected from:"), format_server },
+
+ /* FIXME: once Idle implements SimplePresence using this information, we can
+ * and should bin this.
+ */
+ { "x-presence-status-message", N_("Away message:"), presence_hack },
+
{ NULL, NULL }
};
@@ -526,12 +581,73 @@ contact_widget_details_update_edit (EmpathyContactWidget *information)
return n_rows;
}
+static gboolean
+channel_name_activated_cb (
+ GtkLabel *label,
+ gchar *uri,
+ EmpathyContactWidget *information)
+{
+ TpAccount *account = empathy_contact_get_account (information->contact);
+
+ empathy_join_muc (account, uri, empathy_get_current_action_time ());
+ return TRUE;
+}
+
+static void
+add_channel_list (
+ EmpathyContactWidget *information,
+ GPtrArray *channels,
+ guint row)
+{
+ GtkWidget *w;
+ GString *label_markup = g_string_new ("");
+ guint i;
+
+ w = gtk_label_new (_("Channels:"));
+ gtk_table_attach (GTK_TABLE (information->table_details),
+ w, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+ gtk_widget_show (w);
+
+ for (i = 0; i < channels->len; i++)
+ {
+ const gchar *channel_name = g_ptr_array_index (channels, i);
+ /* We abuse the URI of the link to hold the channel name. It seems to
+ * be okay to just use it essentially verbatim, rather than trying to
+ * ensure it's actually a valid URI. g_string_append_uri_escaped()
+ * escapes way more than we actually need to; so we're just using
+ * g_markup_escape_text directly.
+ */
+ gchar *escaped = g_markup_escape_text (channel_name, -1);
+
+ if (i > 0)
+ g_string_append (label_markup, ", ");
+
+ g_string_append_printf (label_markup, "<a href='%s'>%s</a>",
+ escaped, channel_name);
+ g_free (escaped);
+ }
+
+ w = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (w), label_markup->str);
+ gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
+ g_signal_connect (w, "activate-link",
+ (GCallback) channel_name_activated_cb, information);
+ gtk_table_attach_defaults (GTK_TABLE (information->table_details),
+ w, 1, 2, row, row + 1);
+ gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+ gtk_widget_show (w);
+
+ g_string_free (label_markup, TRUE);
+}
+
static guint
contact_widget_details_update_show (EmpathyContactWidget *information)
{
TpContact *contact;
GList *info, *l;
guint n_rows = 0;
+ GPtrArray *channels = g_ptr_array_new ();
contact = empathy_contact_get_tp_contact (information->contact);
info = tp_contact_get_contact_info (contact);
@@ -541,6 +657,7 @@ contact_widget_details_update_show (EmpathyContactWidget *information)
TpContactInfoField *field = l->data;
InfoFieldData *field_data;
const gchar *value;
+ gchar *markup = NULL;
GtkWidget *w;
if (field->field_value == NULL || field->field_value[0] == NULL)
@@ -548,6 +665,12 @@ contact_widget_details_update_show (EmpathyContactWidget *information)
value = field->field_value[0];
+ if (!tp_strdiff (field->field_name, "x-irc-channel"))
+ {
+ g_ptr_array_add (channels, (gpointer) field->field_value[0]);
+ continue;
+ }
+
field_data = find_info_field_data (field->field_name);
if (field_data == NULL)
{
@@ -555,6 +678,18 @@ contact_widget_details_update_show (EmpathyContactWidget *information)
continue;
}
+ if (field_data->format != NULL)
+ {
+ markup = field_data->format (field->field_value);
+
+ if (markup == NULL)
+ {
+ DEBUG ("Invalid value for field '%s' (first element was '%s')",
+ field->field_name, field->field_value[0]);
+ continue;
+ }
+ }
+
/* Add Title */
w = gtk_label_new (_(field_data->title));
gtk_table_attach (GTK_TABLE (information->table_details),
@@ -564,11 +699,8 @@ contact_widget_details_update_show (EmpathyContactWidget *information)
/* Add Value */
w = gtk_label_new (value);
- if (field_data->linkify)
+ if (markup != NULL)
{
- gchar *markup;
-
- markup = empathy_add_link_markup (value);
gtk_label_set_markup (GTK_LABEL (w), markup);
g_free (markup);
}
@@ -585,6 +717,13 @@ contact_widget_details_update_show (EmpathyContactWidget *information)
}
g_list_free (info);
+ if (channels->len > 0)
+ {
+ add_channel_list (information, channels, n_rows);
+ n_rows++;
+ }
+
+ g_ptr_array_unref (channels);
return n_rows;
}
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 576d3b9fa..4a0b45cab 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -518,7 +518,7 @@ empathy_individual_chat_menu_item_activated (GtkMenuItem *item,
{
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
- empathy_chat_with_contact (contact, gtk_get_current_event_time ());
+ empathy_chat_with_contact (contact, empathy_get_current_action_time ());
}
GtkWidget *
@@ -564,7 +564,7 @@ empathy_individual_sms_menu_item_activated (GtkMenuItem *item,
empathy_sms_contact_id (
empathy_contact_get_account (contact),
empathy_contact_get_id (contact),
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
}
GtkWidget *
@@ -608,7 +608,7 @@ empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item,
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
empathy_call_new_with_streams (contact, TRUE, FALSE,
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
}
GtkWidget *
@@ -650,7 +650,7 @@ empathy_individual_video_call_menu_item_activated (GtkMenuItem *item,
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
empathy_call_new_with_streams (contact, TRUE, TRUE,
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
}
GtkWidget *
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index fbff2770e..86430cd24 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -134,7 +134,8 @@ empathy_new_call_dialog_response (GtkDialog *dialog, int response_id)
* we return from this function. */
video = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->check_video));
- call_contact (account, contact_id, video, gtk_get_current_event_time ());
+ call_contact (account, contact_id, video,
+ empathy_get_current_action_time ());
out:
gtk_widget_destroy (GTK_WIDGET (dialog));
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 3d811abbb..f3186ccf9 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -85,12 +85,12 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id)
{
case EMP_NEW_MESSAGE_TEXT:
empathy_chat_with_contact_id (account, contact_id,
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
break;
case EMP_NEW_MESSAGE_SMS:
empathy_sms_contact_id (account, contact_id,
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
break;
default:
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 89c6c09ae..cc829a894 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1994,3 +1994,9 @@ empathy_context_menu_new (GtkWidget *attach_to)
return menu;
}
+
+gint64
+empathy_get_current_action_time (void)
+{
+ return (tp_user_action_time_from_x11 (gtk_get_current_event_time ()));
+}
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 6dd64ac51..d33b8c987 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -150,6 +150,8 @@ void empathy_make_color_whiter (GdkRGBA *color);
GtkWidget * empathy_context_menu_new (GtkWidget *attach_to);
+gint64 empathy_get_current_action_time (void);
+
G_END_DECLS
#endif /* __EMPATHY_UI_UTILS_H__ */
diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c
index f33152d97..5144fa4d8 100644
--- a/libempathy/empathy-time.c
+++ b/libempathy/empathy-time.c
@@ -81,6 +81,40 @@ empathy_time_to_string_local (gint64 t,
return result;
}
+gchar *
+empathy_duration_to_string (guint seconds)
+{
+ if (seconds < 60) {
+ return g_strdup_printf (ngettext ("%d second ago",
+ "%d seconds ago", seconds), seconds);
+ }
+ else if (seconds < (60 * 60)) {
+ seconds /= 60;
+ return g_strdup_printf (ngettext ("%d minute ago",
+ "%d minutes ago", seconds), seconds);
+ }
+ else if (seconds < (60 * 60 * 24)) {
+ seconds /= 60 * 60;
+ return g_strdup_printf (ngettext ("%d hour ago",
+ "%d hours ago", seconds), seconds);
+ }
+ else if (seconds < (60 * 60 * 24 * 7)) {
+ seconds /= 60 * 60 * 24;
+ return g_strdup_printf (ngettext ("%d day ago",
+ "%d days ago", seconds), seconds);
+ }
+ else if (seconds < (60 * 60 * 24 * 30)) {
+ seconds /= 60 * 60 * 24 * 7;
+ return g_strdup_printf (ngettext ("%d week ago",
+ "%d weeks ago", seconds), seconds);
+ }
+ else {
+ seconds /= 60 * 60 * 24 * 30;
+ return g_strdup_printf (ngettext ("%d month ago",
+ "%d months ago", seconds), seconds);
+ }
+}
+
gchar *
empathy_time_to_string_relative (gint64 t)
{
@@ -96,35 +130,7 @@ empathy_time_to_string_relative (gint64 t)
seconds = delta / G_TIME_SPAN_SECOND;
if (seconds > 0) {
- if (seconds < 60) {
- result = g_strdup_printf (ngettext ("%d second ago",
- "%d seconds ago", seconds), seconds);
- }
- else if (seconds < (60 * 60)) {
- seconds /= 60;
- result = g_strdup_printf (ngettext ("%d minute ago",
- "%d minutes ago", seconds), seconds);
- }
- else if (seconds < (60 * 60 * 24)) {
- seconds /= 60 * 60;
- result = g_strdup_printf (ngettext ("%d hour ago",
- "%d hours ago", seconds), seconds);
- }
- else if (seconds < (60 * 60 * 24 * 7)) {
- seconds /= 60 * 60 * 24;
- result = g_strdup_printf (ngettext ("%d day ago",
- "%d days ago", seconds), seconds);
- }
- else if (seconds < (60 * 60 * 24 * 30)) {
- seconds /= 60 * 60 * 24 * 7;
- result = g_strdup_printf (ngettext ("%d week ago",
- "%d weeks ago", seconds), seconds);
- }
- else {
- seconds /= 60 * 60 * 24 * 30;
- result = g_strdup_printf (ngettext ("%d month ago",
- "%d months ago", seconds), seconds);
- }
+ result = empathy_duration_to_string (seconds);
}
else {
result = g_strdup (_("in the future"));
diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h
index 7fac48221..3a22adeee 100644
--- a/libempathy/empathy-time.h
+++ b/libempathy/empathy-time.h
@@ -45,6 +45,7 @@ gchar *empathy_time_to_string_utc (gint64 t,
gchar *empathy_time_to_string_local (gint64 t,
const gchar *format);
gchar *empathy_time_to_string_relative (gint64 t);
+gchar *empathy_duration_to_string (guint seconds);
G_END_DECLS
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 670ac11af..0541943b9 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1996,6 +1996,9 @@ empathy_tp_chat_leave (EmpathyTpChat *self,
{
EmpathyTpChatPriv *priv = GET_PRIV (self);
+ DEBUG ("Leaving channel %s with message \"%s\"",
+ tp_channel_get_identifier (priv->channel), message);
+
tp_channel_leave_async (priv->channel, TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
message, tp_channel_leave_async_cb, self);
}
diff --git a/po/eo.po b/po/eo.po
index 64b79e6c5..d9db333af 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,26 +1,27 @@
-# Esperanto translation of Empathy
-# Copyright (C) 2004, 2010 Free Software Foundation, Inc.
+# Esperanto translation of Empathy.
+# Copyright (C) 2004-2011 Free Software Foundation, Inc.
# This file is distributed under the same license as the Empathy package.
#
# Brient HESS <brient@brient.net>, 2004.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010.
+# Aisano, Eliovir, ISHII Eiju, Javier Lancha, Kvantumo, Lucas LARSON, Michael MORONI, Petr Adam DOHNÁLEK, Robert BOGENSCHNEIDER, Serge LEBLANC, Shane D, Yamiharu.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: Gossip 0.7.5\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-12-15 21:09+0000\n"
-"PO-Revision-Date: 2010-12-19 14:21+0100\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-05-14 19:07+0000\n"
+"PO-Revision-Date: 2011-05-14 22:22+0200\n"
"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
"Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
-"Language: eo\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Launchpad-Export-Date: 2010-12-17 07:56+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-05-14 18:39+0000\n"
+"X-Generator: Launchpad (build 13037)\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -47,7 +48,7 @@ msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr ""
-"Signo kiu aligatos post kromnomo dum uzado de plenumigoklavo (Tab) en "
+"Signo uzenda post kromnomo, kiam kompletigo de kromnomo estas uzata en "
"grupbabilejo."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
@@ -108,7 +109,7 @@ msgstr "Empatio rajtas uzi la GPS-on por diveni la lokon"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
msgstr ""
-"Empatio rajtas uzi la reton de la portebla telefoneto por diveni la lokon"
+"Empatio rajtas uzi la reton de la portebla telefono por diveni la lokon"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
@@ -120,7 +121,7 @@ msgstr "Defaŭlta elŝutujo de Empatio"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has migrated butterfly logs"
-msgstr ""
+msgstr "Empatio translokis papiliajn spurojn"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy should auto-away when idle"
@@ -128,7 +129,7 @@ msgstr "Kaŝi Empation aŭtomate kiam senokupe"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-connect on startup"
-msgstr "Aŭtomata konekto ĉe startigo de Empatio"
+msgstr "Aŭtomata konekto dum la startigo de Empatio"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should reduce the location's accuracy"
@@ -137,12 +138,12 @@ msgstr "Empatio devas redukti la ekzakton pri la loko"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr ""
-"Empatio devas uzi la uzantobildin de la kontaktulo kiel piktogramo de la "
+"Empatio devas uzi la uzantobildon de la kontaktulo kiel piktogramo de la "
"babilo-fenestro"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
-msgstr "Enŝalti programistiloj de WebKit"
+msgstr "Enŝalti programistilojn de WebKit"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable popup notifications for new messages"
@@ -175,7 +176,7 @@ msgstr "Pado de la uzenda etoso por Adium"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr ""
-"Pado de la uzenda etoso por Adium se la etoso de la babilejo estas Adium"
+"Vojo de la uzenda etoso por Adium se la etoso de la babilejo estas Adium."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Play a sound for incoming messages"
@@ -218,215 +219,223 @@ msgid "Pop up notifications when a contact logs out"
msgstr "Ŝprucfenestri sciigojn kiam kontaktulo elsalutas"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Show Balance in contact list"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
msgstr "Montri avatarojn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show contact list in rooms"
msgstr "Montri kontakto-liston per ĉambroj"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show hint about closing the main window"
msgstr "Montri konsileton pri fermado de la ĉefa fenestro"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show offline contacts"
msgstr "Montri malkonektitulojn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show protocols"
msgstr "Montri protokolojn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Spell checking languages"
msgstr "Literum-kontrolataj lingvoj"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The default folder to save file transfers in."
msgstr "La defaŭlta dosierujo por konservi ricevitajn dosierojn."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "La lasta dosierujo el kie estis elektita avataron."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "The position for the chat window side pane"
msgstr "La loko por la flanka babilfenestro"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
+msgstr "La memorigita loko (en bilderoj) de la flanka panelo de la babilejo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
msgstr ""
"La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use graphical smileys"
msgstr "Uzi grafikajn mienetojn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use notification sounds"
msgstr "Uzi atentig-sonojn"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use theme for chat rooms"
msgstr "Uzi etoson por la babilo-ĉambroj"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr ""
-"Ĉu Empatio rajtas publikigi la pozicion de la uzanto al ties kontaktuloj."
+"Ĉu Empatio rajtas publikigi la pozicion de la uzanto al ties kontaktuloj?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Ĉu Empatio rajtas uzi la GPS-on por diveni la pozicion."
+msgstr "Ĉu Empatio rajtas uzi la GPS-on por diveni la pozicion?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr ""
-"Ĉu Empatio rajtas uzi la reton de la portebla telefoneto por diveni la "
-"pozicion."
+"Ĉu Empatio rajtas uzi la reton de la portebla telefono por diveni la "
+"pozicion?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
-msgstr "Ĉu Empatio rajtas uzi la reton por diveni la pozicion."
+msgstr "Ĉu Empatio rajtas uzi la reton por diveni la pozicion?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has migrated butterfly logs."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Ĉu Empatio aŭtomate konektiĝu al via kontoj dum startigo."
+msgstr "Ĉu Empatio aŭtomate konektiĝu al via kontoj dum startigo?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Ĉu Empatio reduktu la ekzakton de la loko pro privatec-kialoj."
+msgstr "Ĉu Empatio reduktu la ekzakton de la loko pro privatec-kialoj?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether to convert smileys into graphical images in conversations."
-msgstr ""
+msgstr "Ĉu konverti miensimbolojn al grafikaj bildoj en konversacioj?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of events."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of incoming messages."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of new conversations."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of outgoing messages."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound when logging into a network."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound when logging out of a network."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play sound notifications when away or busy."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to show a popup notification when a contact goes offline."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes online."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to show a popup notification when receiving a new message."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Whether to show account balances in the contact list."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show the contact list in compact mode."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr ""
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
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 "
@@ -435,338 +444,324 @@ msgstr ""
#: ../data/empathy-accounts.desktop.in.in.h:1
msgid "Manage Messaging and VoIP accounts"
-msgstr ""
+msgstr "Administri babilaj kaj VoIP-kontojn"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2320
msgid "Messaging and VoIP Accounts"
-msgstr ""
+msgstr "Babilaj kaj VoIP-kontoj"
-#: ../libempathy/empathy-ft-handler.c:830
+#: ../libempathy/empathy-ft-handler.c:825
msgid "File transfer completed, but the file was corrupted"
msgstr ""
-#: ../libempathy/empathy-ft-handler.c:1121
+#: ../libempathy/empathy-ft-handler.c:1113
msgid "File transfer not supported by remote contact"
msgstr ""
-#: ../libempathy/empathy-ft-handler.c:1177
+#: ../libempathy/empathy-ft-handler.c:1169
msgid "The selected file is not a regular file"
msgstr "La elektita dosiero ne estas regula"
-#: ../libempathy/empathy-ft-handler.c:1186
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is empty"
msgstr "La elektita dosiero estas malplena"
-#: ../libempathy/empathy-tp-file.c:283
+#: ../libempathy/empathy-tp-file.c:268
msgid "Socket type not supported"
-msgstr ""
+msgstr "Ingotipo estas nesubtenata"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:387
msgid "No reason was specified"
msgstr "Neniu kialo estis indikita"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:390
msgid "The change in state was requested"
msgstr ""
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:393
msgid "You canceled the file transfer"
msgstr ""
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:396
msgid "The other participant canceled the file transfer"
msgstr ""
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:399
msgid "Error while trying to transfer the file"
msgstr ""
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:402
msgid "The other participant is unable to transfer the file"
msgstr ""
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:384
msgid "Unknown reason"
msgstr "Nekonata kialo"
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:305
msgid "Available"
msgstr "Disponeble"
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:307
msgid "Busy"
-msgstr "Okupita"
+msgstr "Okupite"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:310
msgid "Away"
-msgstr "Fora"
+msgstr "For"
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:312
msgid "Invisible"
msgstr "Nevideble"
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:314
msgid "Offline"
-msgstr "Ne kontaktebla"
+msgstr "Malkonektite"
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
-#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
-#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:317
+msgctxt "presence"
msgid "Unknown"
msgstr "Nekonate"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:356
msgid "No reason specified"
msgstr "Neniu kialo indikita"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:414
msgid "Status is set to offline"
-msgstr "Stato estas agortite al nekonaktite"
+msgstr "Stato estas agortite al nekonektite"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
msgid "Network error"
msgstr "Reta eraro"
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
msgid "Authentication failed"
msgstr "Aŭtentokontrolo fiaskis"
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:364 ../libempathy/empathy-utils.c:398
msgid "Encryption error"
msgstr "Ĉifrad-eraro"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:366
msgid "Name in use"
msgstr "Jam uzata nomo"
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
msgid "Certificate not provided"
-msgstr ""
+msgstr "Neniu prezentigita atestilo"
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
msgid "Certificate untrusted"
-msgstr "Atestilo nekonfida"
+msgstr "Malfida atestilo"
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
msgid "Certificate expired"
msgstr "Atestilo eksvalidiĝis"
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
msgid "Certificate not activated"
-msgstr ""
+msgstr "Ne aktivigita atestilo"
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
msgid "Certificate hostname mismatch"
-msgstr ""
+msgstr "Atestogastnomo malkongruas"
-#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
msgid "Certificate fingerprint mismatch"
-msgstr ""
+msgstr "Atestilo-fingrospuro malkongruas"
-#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:380 ../libempathy/empathy-utils.c:412
msgid "Certificate self-signed"
-msgstr ""
+msgstr "Memkreita atestilo"
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:382
msgid "Certificate error"
msgstr "Atestil-eraro"
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:416
msgid "Encryption is not available"
msgstr "Ĉifrado ne estas diponebla"
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:418
msgid "Certificate is invalid"
msgstr "Atestilo estas nevalida"
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:420
msgid "Connection has been refused"
msgstr ""
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:422
msgid "Connection can't be established"
msgstr ""
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:424
msgid "Connection has been lost"
msgstr "Perdis konekton"
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:426
msgid "This resource is already connected to the server"
msgstr ""
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:428
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr ""
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:431
msgid "The account already exists on the server"
msgstr "La konto jam ekzistas sur la servilo"
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:433
msgid "Server is currently too busy to handle the connection"
msgstr ""
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:435
msgid "Certificate has been revoked"
msgstr ""
-#: ../libempathy/empathy-utils.c:377
+#: ../libempathy/empathy-utils.c:437
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr ""
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:440
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
msgstr ""
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:603
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Proksimaj homoj"
-#: ../libempathy/empathy-utils.c:548
+#: ../libempathy/empathy-utils.c:608
msgid "Yahoo! Japan"
msgstr "Japana Yahoo!"
-#: ../libempathy/empathy-utils.c:577
+#: ../libempathy/empathy-utils.c:637
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:578
+#: ../libempathy/empathy-utils.c:638
msgid "Facebook Chat"
msgstr "Facebook-babilejo"
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:100
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
msgstr[0] "Antaŭ %d sekundo"
msgstr[1] "Antaŭ %d sekundoj"
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:105
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "Antaŭ %d minuto"
msgstr[1] "Antaŭ %d minutoj"
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:110
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "Antaŭ %d horo"
msgstr[1] "Antaŭ %d horoj"
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:115
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "Antaŭ %d tago"
msgstr[1] "Antaŭ %d tagoj"
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:120
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
msgstr[0] "Antaŭ %d semajno"
msgstr[1] "Antaŭ %d semajnoj"
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:125
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "Antaŭ %d monato"
msgstr[1] "Antaŭ %d monatoj"
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:130
msgid "in the future"
msgstr "en la estonteco"
-#: ../libempathy-gtk/empathy-account-chooser.c:493
+#: ../libempathy-gtk/empathy-account-chooser.c:491
msgid "All"
msgstr "Ĉiuj"
-#: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-log-window.c:643
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:679
msgid "Password"
msgstr "Pasvorto"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:680
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "Servilo"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "Pordo"
-#: ../libempathy-gtk/empathy-account-widget.c:754
-#: ../libempathy-gtk/empathy-account-widget.c:811
+#: ../libempathy-gtk/empathy-account-widget.c:753
+#: ../libempathy-gtk/empathy-account-widget.c:810
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1136
+#: ../libempathy-gtk/empathy-account-widget.c:1151
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget.c:1142
+#: ../libempathy-gtk/empathy-account-widget.c:1157
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget.c:1162
+#: ../libempathy-gtk/empathy-account-widget.c:1177
msgid "Launch My Web Accounts"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget.c:1500
+#: ../libempathy-gtk/empathy-account-widget.c:1515
msgid "Username:"
msgstr "Uzantonomo:"
-#: ../libempathy-gtk/empathy-account-widget.c:1868
+#: ../libempathy-gtk/empathy-account-widget.c:1833
msgid "A_pply"
msgstr "A_pliki"
-#: ../libempathy-gtk/empathy-account-widget.c:1898
+#: ../libempathy-gtk/empathy-account-widget.c:1863
msgid "L_og in"
msgstr "E_nsaluti"
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1964
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1486
-#: ../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 "Konto:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1975
-msgid "_Enabled"
-msgstr "_Ebligita"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2040
+#: ../libempathy-gtk/empathy-account-widget.c:1937
msgid "This account already exists on the server"
msgstr "Tiu konto jam ekzistas sur la servilo"
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:1940
msgid "Create a new account on the server"
msgstr "Krei novan konton sur la servilo"
-#: ../libempathy-gtk/empathy-account-widget.c:2235
+#: ../libempathy-gtk/empathy-account-widget.c:2132
msgid "Ca_ncel"
msgstr "_Nuligi"
@@ -775,19 +770,19 @@ msgstr "_Nuligi"
#. * like: "MyUserName on freenode".
#. * 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:2532
+#: ../libempathy-gtk/empathy-account-widget.c:2410
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s ĉe %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:2558
+#: ../libempathy-gtk/empathy-account-widget.c:2436
#, c-format
msgid "%s Account"
msgstr "%s Konto"
-#: ../libempathy-gtk/empathy-account-widget.c:2562
+#: ../libempathy-gtk/empathy-account-widget.c:2440
msgid "New account"
msgstr "Nova konto"
@@ -823,37 +818,47 @@ msgstr "Pas_vorto:"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "Remember Password"
-msgstr "Pasvorto"
+msgstr "Memori pasvorton"
+#. remember password ticky box
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-msgid "Screen _Name:"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "Memori pasvorton"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "What is your AIM password?"
+msgid "Screen _Name:"
msgstr ""
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM screen name?"
-msgstr ""
+msgid "What is your AIM password?"
+msgstr "Kio estas via AIM-pasvorto?"
#: ../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:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Port:"
-msgstr "_Pordo:"
+msgid "What is your AIM screen name?"
+msgstr ""
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "_Port:"
+msgstr "_Pordo:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "_Servilo:"
@@ -869,11 +874,11 @@ msgstr "<b>Ekzemplo:</b> uzantonomo"
msgid "Login I_D:"
msgstr "Ensalut-I_D:"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
msgid "What is your GroupWise User ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
msgid "What is your GroupWise password?"
msgstr ""
@@ -890,13 +895,13 @@ msgstr "Sign_a agordo:"
msgid "ICQ _UIN:"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
msgid "What is your ICQ UIN?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
msgid "What is your ICQ password?"
-msgstr ""
+msgstr "Kio estas via ICQ-pasvorto?"
#: ../libempathy-gtk/empathy-account-widget-sip.c:183
#: ../libempathy-gtk/empathy-account-widget-sip.c:216
@@ -995,12 +1000,12 @@ msgstr ""
msgid "Priori_ty:"
msgstr "Priori_tato:"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid "Reso_urce:"
-msgstr "Res_urso:"
+msgstr "Ris_urco:"
#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1008,39 +1013,39 @@ msgid ""
"Facebook username if you don't have one."
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "Use old SS_L"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Facebook password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Facebook username?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Google ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Google password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your Jabber ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your Jabber password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
msgid "What is your desired Jabber ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
msgid "What is your desired Jabber password?"
msgstr ""
@@ -1048,11 +1053,11 @@ msgstr ""
msgid "<b>Example:</b> user@hotmail.com"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
msgid "What is your Windows Live ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
msgid "What is your Windows Live password?"
msgstr ""
@@ -1066,7 +1071,7 @@ msgstr "_Kromnomo:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
-msgstr ":Persona nomo:"
+msgstr "_Persona nomo:"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
@@ -1128,27 +1133,27 @@ msgstr "Pordo:"
msgid "Proxy Options"
msgstr "Prokuril-agordoj"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "STUN Server:"
msgstr "STUN-servilo:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "Server:"
msgstr "Servilo:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "Transport:"
msgstr "Transporto:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "What is your SIP account password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "What is your SIP login ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "_Username:"
msgstr "_Uzantonomo:"
@@ -1156,25 +1161,19 @@ msgstr "_Uzantonomo:"
msgid "I_gnore conference and chat room invitations"
msgstr ""
-#. remember password ticky box
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-#: ../libempathy-gtk/empathy-password-dialog.c:276
-msgid "Remember password"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! ID?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "What is your Yahoo! password?"
msgstr ""
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
+msgstr "Yahoo!-I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr ""
@@ -1187,188 +1186,209 @@ msgstr ""
msgid "None of the accepted image formats are supported on your system"
msgstr ""
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:930
msgid "Select Your Avatar Image"
msgstr ""
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
msgid "No Image"
msgstr "Sen bildo"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:995
msgid "Images"
msgstr "Bildoj"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:999
msgid "All Files"
-msgstr "Ĉiuj dosieroj"
+msgstr "Ĉiuj dosieroj"
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:322
msgid "Click to enlarge"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:644
+#: ../libempathy-gtk/empathy-chat.c:668
msgid "Failed to open private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:684
+#: ../libempathy-gtk/empathy-chat.c:731
msgid "Topic not supported on this conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:690
+#: ../libempathy-gtk/empathy-chat.c:737
msgid "You are not allowed to change the topic"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:824
+#: ../libempathy-gtk/empathy-chat.c:923
msgid "/clear: clear all messages from the current conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:827
+#: ../libempathy-gtk/empathy-chat.c:926
msgid "/topic <topic>: set the topic of the current conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:830
+#: ../libempathy-gtk/empathy-chat.c:929
msgid "/join <chat room ID>: join a new chat room"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:932
msgid "/j <chat room ID>: join a new chat room"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:838
+#: ../libempathy-gtk/empathy-chat.c:936
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:940
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:841
+#: ../libempathy-gtk/empathy-chat.c:943
msgid "/msg <contact ID> <message>: open a private chat"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:845
+#: ../libempathy-gtk/empathy-chat.c:946
msgid "/nick <nickname>: change your nickname on the current server"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:848
+#: ../libempathy-gtk/empathy-chat.c:949
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:952
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:856
+#: ../libempathy-gtk/empathy-chat.c:957
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:967
#, c-format
msgid "Usage: %s"
msgstr "Uzo: %s"
-#: ../libempathy-gtk/empathy-chat.c:895
+#: ../libempathy-gtk/empathy-chat.c:1006
msgid "Unknown command"
-msgstr "Ne konata komado"
+msgstr "Ne konata komando"
-#: ../libempathy-gtk/empathy-chat.c:1016
+#: ../libempathy-gtk/empathy-chat.c:1132
msgid "Unknown command; see /help for the available commands"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1156
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1272
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1274
+msgid "not capable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1281
msgid "offline"
msgstr "nekonektite"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1284
msgid "invalid contact"
msgstr "nevalida kontakto"
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1287
msgid "permission denied"
-msgstr "aliron malpermesitis"
+msgstr "aliro malpermesita"
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1290
msgid "too long message"
msgstr "tro longa mesaĝo"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1293
msgid "not implemented"
msgstr "ne realigite"
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1297
msgid "unknown"
msgstr "nekonate"
-#: ../libempathy-gtk/empathy-chat.c:1176
+#: ../libempathy-gtk/empathy-chat.c:1303
#, c-format
msgid "Error sending message '%s': %s"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:1307
+#, c-format
+msgid "Error sending message: %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1368 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Temo:"
-#: ../libempathy-gtk/empathy-chat.c:1249
+#: ../libempathy-gtk/empathy-chat.c:1380
#, c-format
msgid "Topic set to: %s"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1251
+#: ../libempathy-gtk/empathy-chat.c:1382
msgid "No topic defined"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1750
+#: ../libempathy-gtk/empathy-chat.c:1889
msgid "(No Suggestions)"
msgstr "(Neniuj proponoj)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1818
+#: ../libempathy-gtk/empathy-chat.c:1957
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Aldoni '%s' al vortaro"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1855
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Aldoni '%s' al %s vortaro"
-#: ../libempathy-gtk/empathy-chat.c:1914
+#: ../libempathy-gtk/empathy-chat.c:2051
msgid "Insert Smiley"
-msgstr ""
+msgstr "Enmeti miensimbolon"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1932
-#: ../libempathy-gtk/empathy-ui-utils.c:1811
+#: ../libempathy-gtk/empathy-chat.c:2069
+#: ../libempathy-gtk/empathy-ui-utils.c:1808
msgid "_Send"
msgstr "_Sendi"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1967
+#: ../libempathy-gtk/empathy-chat.c:2104
msgid "_Spelling Suggestions"
msgstr "_Literumadaj proponoj"
-#: ../libempathy-gtk/empathy-chat.c:2056
+#: ../libempathy-gtk/empathy-chat.c:2193
msgid "Failed to retrieve recent logs"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:2162
+#: ../libempathy-gtk/empathy-chat.c:2304
#, c-format
msgid "%s has disconnected"
-msgstr "%s nekonektiĝis"
+msgstr "%s malkonektiĝis"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2169
+#: ../libempathy-gtk/empathy-chat.c:2311
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s estas forpelita de %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2314
#, c-format
msgid "%s was kicked"
msgstr "%s estas forpelita"
@@ -1376,17 +1396,17 @@ msgstr "%s estas forpelita"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:2180
+#: ../libempathy-gtk/empathy-chat.c:2322
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%1$s estas ekzilita de %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2325
#, c-format
msgid "%s was banned"
msgstr "%s estas ekzilita"
-#: ../libempathy-gtk/empathy-chat.c:2187
+#: ../libempathy-gtk/empathy-chat.c:2329
#, c-format
msgid "%s has left the room"
msgstr "%s forlasis la ĉambron"
@@ -1396,82 +1416,164 @@ msgstr "%s forlasis la ĉambron"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2196
+#: ../libempathy-gtk/empathy-chat.c:2338
#, c-format
msgid " (%s)"
-msgstr " %s"
+msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2221
+#: ../libempathy-gtk/empathy-chat.c:2363
#, c-format
msgid "%s has joined the room"
msgstr "%s aliĝis la ĉambron"
-#: ../libempathy-gtk/empathy-chat.c:2246
+#: ../libempathy-gtk/empathy-chat.c:2388
#, c-format
msgid "%s is now known as %s"
msgstr "%s nun estas konata kiel %s"
-#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
+#: ../libempathy-gtk/empathy-chat.c:2527
+#: ../src/empathy-streamed-media-window.c:1957
+#: ../src/empathy-event-manager.c:1117
msgid "Disconnected"
-msgstr "Malkonektis"
+msgstr "Malkonektite"
-#: ../libempathy-gtk/empathy-chat.c:3016
-msgid "Wrong password; please try again:"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3185
+msgid "Would you like to store this password?"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:3017
+#: ../libempathy-gtk/empathy-chat.c:3191
+msgid "Remember"
+msgstr "Memorigi"
+
+#: ../libempathy-gtk/empathy-chat.c:3201
+msgid "Not now"
+msgstr "Ne nun"
+
+#: ../libempathy-gtk/empathy-chat.c:3245
msgid "Retry"
msgstr "Reprovi"
-#: ../libempathy-gtk/empathy-chat.c:3022
+#: ../libempathy-gtk/empathy-chat.c:3249
+msgid "Wrong password; please try again:"
+msgstr ""
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3378
msgid "This room is protected by a password:"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:3023
+#: ../libempathy-gtk/empathy-chat.c:3405
msgid "Join"
-msgstr "Membriĝi"
+msgstr "Aliĝi"
-#: ../libempathy-gtk/empathy-chat.c:3163
+#: ../libempathy-gtk/empathy-chat.c:3604 ../src/empathy-event-manager.c:1138
msgid "Connected"
msgstr "Konektite"
-#: ../libempathy-gtk/empathy-chat.c:3216
-#: ../libempathy-gtk/empathy-log-window.c:657
+#: ../libempathy-gtk/empathy-chat.c:3659
+#: ../libempathy-gtk/empathy-log-window.c:650
msgid "Conversation"
msgstr "Konversacio"
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3664
+#, c-format
+msgid "%s (SMS)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+msgid "Unknown or invalid identifier"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+msgid "Contact blocking temporarily unavailable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+msgid "Contact blocking unavailable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+msgid "Permission Denied"
+msgstr "Aliro malpermesita"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+msgid "Could not block contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+msgid "Edit Blocked Contacts"
+msgstr ""
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1479
+#: ../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 "Konto:"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-theme-adium.c:1002
msgid "_Copy Link Address"
-msgstr "_Kopii ligiladreson"
+msgstr "_Kopii la ligiladreson"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-theme-adium.c:1009
msgid "_Open Link"
-msgstr "_Malfermi ligilon"
+msgstr "Malfermi la ligil_on"
#. 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:415
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:265
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "Redakti kontakto-informojn"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:316
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
msgid "Personal Information"
msgstr "Personaj informoj"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:425
-#: ../libempathy-gtk/empathy-individual-dialogs.c:115
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
msgid "New Contact"
msgstr "Nova kontakto"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#, c-format
+msgid "Block %s?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+msgid "_Block"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] ""
+msgstr[1] ""
+
#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
msgid "Decide _Later"
msgstr "Decidi _poste"
@@ -1480,6 +1582,10 @@ msgstr "Decidi _poste"
msgid "Subscription Request"
msgstr ""
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr ""
+
#: ../libempathy-gtk/empathy-contact-list-store.h:71
msgid "Ungrouped"
msgstr "Negrupite"
@@ -1488,280 +1594,301 @@ msgstr "Negrupite"
msgid "Favorite People"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-list-view.c:1999
-#: ../libempathy-gtk/empathy-individual-view.c:2262
+#: ../libempathy-gtk/empathy-contact-list-view.c:1987
+#: ../libempathy-gtk/empathy-individual-view.c:2386
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2265
+#: ../libempathy-gtk/empathy-contact-list-view.c:1989
+#: ../libempathy-gtk/empathy-individual-view.c:2389
msgid "Removing group"
msgstr "Forigi grupon"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2050
-#: ../libempathy-gtk/empathy-contact-list-view.c:2127
-#: ../libempathy-gtk/empathy-individual-view.c:2320
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-contact-list-view.c:2038
+#: ../libempathy-gtk/empathy-contact-list-view.c:2115
+#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2637
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
-msgstr "_Forigi"
+msgstr "Fo_rigi"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2080
-#: ../libempathy-gtk/empathy-individual-view.c:2370
+#: ../libempathy-gtk/empathy-contact-list-view.c:2068
+#: ../libempathy-gtk/empathy-individual-view.c:2508
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2386
+#: ../libempathy-gtk/empathy-contact-list-view.c:2070
+#: ../libempathy-gtk/empathy-individual-view.c:2529
msgid "Removing contact"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../libempathy-gtk/empathy-contact-menu.c:219
#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Aldoni kontakton…"
-#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:299
+msgid "_Block Contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:328
+#: ../libempathy-gtk/empathy-individual-menu.c:536
+#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_Babilejo"
-#: ../libempathy-gtk/empathy-contact-menu.c:261
-#: ../libempathy-gtk/empathy-individual-menu.c:559
+#: ../libempathy-gtk/empathy-contact-menu.c:358
+#: ../libempathy-gtk/empathy-individual-menu.c:625
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Sonalvoko"
-#: ../libempathy-gtk/empathy-contact-menu.c:292
-#: ../libempathy-gtk/empathy-individual-menu.c:601
+#: ../libempathy-gtk/empathy-contact-menu.c:389
+#: ../libempathy-gtk/empathy-individual-menu.c:667
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Videoalvoko"
-#: ../libempathy-gtk/empathy-contact-menu.c:333
-#: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:435
+#: ../libempathy-gtk/empathy-individual-menu.c:710
+#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:355
-#: ../libempathy-gtk/empathy-individual-menu.c:685
+#: ../libempathy-gtk/empathy-contact-menu.c:457
+#: ../libempathy-gtk/empathy-individual-menu.c:751
msgid "Send File"
-msgstr "Sendi dosierojn"
+msgstr "Sendi dosieron"
-#: ../libempathy-gtk/empathy-contact-menu.c:378
-#: ../libempathy-gtk/empathy-individual-menu.c:727
+#: ../libempathy-gtk/empathy-contact-menu.c:480
+#: ../libempathy-gtk/empathy-individual-menu.c:793
msgid "Share My Desktop"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:418
-#: ../libempathy-gtk/empathy-contact-widget.c:1630
-#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1377
+#: ../libempathy-gtk/empathy-contact-menu.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:1751
+#: ../libempathy-gtk/empathy-individual-menu.c:828
+#: ../libempathy-gtk/empathy-individual-widget.c:1370
msgid "Favorite"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:447
-#: ../libempathy-gtk/empathy-individual-menu.c:788
+#: ../libempathy-gtk/empathy-contact-menu.c:549
+#: ../libempathy-gtk/empathy-individual-menu.c:856
msgid "Infor_mation"
-msgstr ""
+msgstr "Infor_mo"
-#: ../libempathy-gtk/empathy-contact-menu.c:493
+#: ../libempathy-gtk/empathy-contact-menu.c:595
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "R_edakti"
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:919
+#: ../libempathy-gtk/empathy-contact-menu.c:649
+#: ../libempathy-gtk/empathy-individual-menu.c:1037
+#: ../src/empathy-chat-window.c:986
msgid "Inviting you to this room"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-menu.c:578
-#: ../libempathy-gtk/empathy-individual-menu.c:1016
+#: ../libempathy-gtk/empathy-contact-menu.c:680
+#: ../libempathy-gtk/empathy-individual-menu.c:1084
msgid "_Invite to Chat Room"
msgstr ""
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+msgid "Search contacts"
+msgstr "Serĉi kontaktojn"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+msgid "Search: "
+msgstr "Serĉi: "
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+msgid "_Add Contact"
+msgstr "_Aldoni kontakton"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+msgid "No contacts found"
+msgstr "Ne trovis kontaktojn"
+
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
-msgstr ""
+msgstr "Elekti kontakton"
-#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-contact-widget.c:295
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Tuta nomo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-contact-widget.c:296
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Telefonnumero:"
-#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-contact-widget.c:297
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "Retpoŝtadreso:"
-#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-contact-widget.c:298
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
-msgstr "Retpaĝo:"
+msgstr "Retpaĝaro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-contact-widget.c:299
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Naskiĝtago:"
-#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Country ISO Code:"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Country:"
msgstr "Lando:"
-#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "State:"
msgstr "Ŝtato:"
-#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "City:"
msgstr "Urbo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Area:"
msgstr "Areo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Postal Code:"
msgstr "Poŝtkodo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Street:"
msgstr "Strato:"
-#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Building:"
msgstr "Konstruaĵo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Floor:"
msgstr "Etaĝo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Room:"
msgstr "Ĉambro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Text:"
msgstr "Teksto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Description:"
msgstr "Priskribo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Accuracy Level:"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Error:"
msgstr "Eraro:"
-#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Vertical Error (meters):"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Horizontal Error (meters):"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Speed:"
-msgstr "Rapideco:"
+msgstr "Rapido:"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:524
msgid "Bearing:"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:800
+#: ../libempathy-gtk/empathy-individual-widget.c:526
msgid "Climb Speed:"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:802
+#: ../libempathy-gtk/empathy-individual-widget.c:528
msgid "Last Updated on:"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:804
+#: ../libempathy-gtk/empathy-individual-widget.c:530
msgid "Longitude:"
msgstr "Longitudo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:806
+#: ../libempathy-gtk/empathy-individual-widget.c:532
msgid "Latitude:"
msgstr "Latitudo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:808
+#: ../libempathy-gtk/empathy-individual-widget.c:534
msgid "Altitude:"
msgstr "Altitudo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:779
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:605
-#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-contact-widget.c:876
+#: ../libempathy-gtk/empathy-individual-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:631
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "Loko"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:878
+#: ../libempathy-gtk/empathy-individual-widget.c:633
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:930
+#: ../libempathy-gtk/empathy-individual-widget.c:682
msgid "%B %e, %Y at %R UTC"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:922
+#: ../libempathy-gtk/empathy-contact-widget.c:1012
+#: ../libempathy-gtk/empathy-individual-widget.c:917
msgid "Save Avatar"
msgstr ""
-#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:980
+#: ../libempathy-gtk/empathy-contact-widget.c:1068
+#: ../libempathy-gtk/empathy-individual-widget.c:975
msgid "Unable to save avatar"
msgstr ""
@@ -1771,7 +1898,7 @@ msgstr ""
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1312
+#: ../libempathy-gtk/empathy-individual-widget.c:1305
msgid "Alias:"
msgstr "Kromnomo:"
@@ -1787,19 +1914,19 @@ msgstr "Kliento:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
msgid "Contact Details"
-msgstr ""
+msgstr "Kontaktdetaloj"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1516
+#: ../libempathy-gtk/empathy-individual-widget.c:1509
msgid "Identifier:"
msgstr "Identigilo:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
msgid "Information requested…"
-msgstr ""
+msgstr "Informoj petitaj…"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "OS:"
@@ -1829,10 +1956,22 @@ msgid "Select"
msgstr "Elekti"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1423
+#: ../src/empathy-main-window.c:1770
msgid "Group"
msgstr "Grupo"
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] ""
+msgstr[1] ""
+
#. Translators: the heading at the top of the Information dialogue
#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
@@ -1853,31 +1992,41 @@ msgstr ""
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:132
+#: ../libempathy-gtk/empathy-individual-menu.c:131
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:836
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:582
+#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+msgid "_SMS"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:904
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "R_edakti"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:862
+#: ../libempathy-gtk/empathy-individual-menu.c:930
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr ""
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-individual-view.c:2351
+msgid "Delete and _Block"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-view.c:2517
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
"remove all the contacts which make up this linked contact."
msgstr ""
-#: ../libempathy-gtk/empathy-individual-widget.c:1657
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -1892,15 +2041,19 @@ msgstr ""
msgid "Online from a phone or mobile device"
msgstr ""
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
msgid "New Network"
msgstr "Nova reto"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
msgid "Choose an IRC network"
msgstr ""
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "Elekti"
@@ -1923,7 +2076,7 @@ msgstr ""
#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlink…"
-msgstr ""
+msgstr "_Malligi…"
#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
@@ -1936,7 +2089,7 @@ msgstr ""
#. * meta-contact".
#: ../libempathy-gtk/empathy-linking-dialog.c:136
msgid "_Link"
-msgstr "_Ligilo"
+msgstr "_Ligi"
#: ../libempathy-gtk/empathy-linking-dialog.c:183
#, c-format
@@ -1952,9 +2105,9 @@ msgstr ""
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
-msgstr ""
+msgstr "_Malligi"
-#: ../libempathy-gtk/empathy-log-window.c:667
+#: ../libempathy-gtk/empathy-log-window.c:660
msgid "Date"
msgstr "Dato"
@@ -1966,12 +2119,12 @@ msgstr "Konversacioj"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
#: ../libempathy-gtk/empathy-search-bar.ui.h:1
msgid "Find Next"
-msgstr "Trovi sekvan"
+msgstr "Trovi la sekvan"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
#: ../libempathy-gtk/empathy-search-bar.ui.h:2
msgid "Find Previous"
-msgstr "Trovi antaŭan"
+msgstr "Trovi la antaŭan"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Previous Conversations"
@@ -1980,43 +2133,43 @@ msgstr ""
#. Tab Label
#: ../libempathy-gtk/empathy-log-window.ui.h:7
msgid "Search"
-msgstr "Serĉi"
+msgstr "Serĉi"
#. Searching *for* something
#: ../libempathy-gtk/empathy-log-window.ui.h:9
msgid "_For:"
-msgstr ""
+msgstr "_Por:"
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
-msgstr ""
+msgstr "Kontakt-ID:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:258
msgid "C_hat"
msgstr "_Babilo"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:277
msgid "New Conversation"
msgstr "Nova konversacio"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:254
msgid "Send _Video"
-msgstr ""
+msgstr "Sendi _videon"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:262
msgid "C_all"
-msgstr "V_oki"
+msgstr "_Voki"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:272
msgid "New Call"
msgstr "Nova voko"
-#: ../libempathy-gtk/empathy-password-dialog.c:241
+#: ../libempathy-gtk/empathy-password-dialog.c:274
#, c-format
msgid ""
"Enter your password for account\n"
@@ -2037,7 +2190,7 @@ msgstr ""
#: ../libempathy-gtk/empathy-presence-chooser.c:223
#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messages…"
-msgstr "Redakti kutimajn mesaĝojn..."
+msgstr "Redakti kutimajn mesaĝojn…"
#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
@@ -2051,12 +2204,12 @@ msgstr ""
msgid "Set status"
msgstr "Agordi staton"
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
+#: ../libempathy-gtk/empathy-presence-chooser.c:946
msgid "Set your presence and current status"
msgstr ""
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+#: ../libempathy-gtk/empathy-presence-chooser.c:1134
msgid "Custom messages…"
msgstr ""
@@ -2075,11 +2228,11 @@ msgstr "Trovi:"
#: ../libempathy-gtk/empathy-search-bar.ui.h:4
msgid "Match case"
-msgstr ""
+msgstr "Uskleca kongruo"
#: ../libempathy-gtk/empathy-search-bar.ui.h:5
msgid "Phrase not found"
-msgstr ""
+msgstr "Frazo ne trovita"
#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
@@ -2107,7 +2260,7 @@ msgstr ""
#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Disconnected from server"
-msgstr ""
+msgstr "Malkonektite de la servilo"
#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Incoming voice call"
@@ -2127,7 +2280,7 @@ msgstr ""
#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
msgid "Edit Custom Messages"
-msgstr "Redakti kutimajn mesaĝoj"
+msgstr "Redakti kutimajn mesaĝojn"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
msgid "Save _New Status Message"
@@ -2135,21 +2288,25 @@ msgstr ""
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
msgid "Saved Status Messages"
-msgstr "Redakti kutimajn mesaĝoj"
+msgstr "Konservitaj stat-mesaĝoj"
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-adium.c:1468
+msgid "Normal"
+msgstr "Normale"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
msgid "Classic"
msgstr "Klasike"
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:69
msgid "Simple"
msgstr "Simple"
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:70
msgid "Clean"
msgstr "Vake"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:71
msgid "Blue"
msgstr "Bluo"
@@ -2163,11 +2320,11 @@ msgstr ""
#: ../libempathy-gtk/empathy-tls-dialog.c:161
msgid "The certificate has expired."
-msgstr ""
+msgstr "La atestilo eksvalidiĝis."
#: ../libempathy-gtk/empathy-tls-dialog.c:164
msgid "The certificate hasn't yet been activated."
-msgstr ""
+msgstr "La atestilo nun ne estas aktivigite."
#: ../libempathy-gtk/empathy-tls-dialog.c:167
msgid "The certificate does not have the expected fingerprint."
@@ -2179,7 +2336,7 @@ msgstr ""
#: ../libempathy-gtk/empathy-tls-dialog.c:174
msgid "The certificate is self-signed."
-msgstr ""
+msgstr "La atestilo estas memkreite."
#: ../libempathy-gtk/empathy-tls-dialog.c:177
msgid ""
@@ -2208,31 +2365,42 @@ msgstr ""
msgid "Certificate hostname: %s"
msgstr ""
-#: ../libempathy-gtk/empathy-tls-dialog.c:271
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
msgid "Continue"
msgstr "Daŭrigi"
-#: ../libempathy-gtk/empathy-tls-dialog.c:277
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr ""
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
msgid "Remember this choice for future connections"
msgstr ""
-#: ../libempathy-gtk/empathy-tls-dialog.c:302
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
msgid "Certificate Details"
msgstr ""
-#: ../libempathy-gtk/empathy-ui-utils.c:1708
+#: ../libempathy-gtk/empathy-ui-utils.c:1705
msgid "Unable to open URI"
msgstr ""
-#: ../libempathy-gtk/empathy-ui-utils.c:1803
+#: ../libempathy-gtk/empathy-ui-utils.c:1800
msgid "Select a file"
msgstr "Elekti dosieron"
#: ../libempathy-gtk/empathy-ui-utils.c:1872
+msgid "Insufficient free space to save file"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1924
#, c-format
msgid "Incoming file from %s"
msgstr ""
@@ -2274,7 +2442,7 @@ msgstr "Mezeŭropa"
#: ../libempathy-gtk/totem-subtitle-encoding.c:196
#: ../libempathy-gtk/totem-subtitle-encoding.c:198
msgid "Chinese Simplified"
-msgstr "Ĉina Simpligite"
+msgstr "Ĉina simpligite"
#: ../libempathy-gtk/totem-subtitle-encoding.c:201
#: ../libempathy-gtk/totem-subtitle-encoding.c:203
@@ -2316,7 +2484,7 @@ msgstr "Greka"
#: ../libempathy-gtk/totem-subtitle-encoding.c:242
msgid "Gujarati"
-msgstr "Guĝarata"
+msgstr "Guĝarata"
#: ../libempathy-gtk/totem-subtitle-encoding.c:245
msgid "Gurmukhi"
@@ -2420,23 +2588,23 @@ msgstr "Neniu erarmesaĝo"
msgid "Instant Message (Empathy)"
msgstr "Tujmesaĝo (Empatio)"
-#: ../src/empathy.c:309
+#: ../src/empathy.c:308
msgid "Don't connect on startup"
msgstr "Ne konekti dum lanĉo"
-#: ../src/empathy.c:313
+#: ../src/empathy.c:312
msgid "Don't display the contact list or any other dialogs on startup"
msgstr ""
-#: ../src/empathy.c:321
+#: ../src/empathy.c:320
msgid "- Empathy IM Client"
-msgstr ""
+msgstr "- Tujmesaĝilo 'Empatio'"
-#: ../src/empathy.c:500
+#: ../src/empathy.c:499
msgid "Error contacting the Account Manager"
msgstr ""
-#: ../src/empathy.c:502
+#: ../src/empathy.c:501
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2452,10 +2620,10 @@ msgid ""
"Foundation; either version 2 of the License, or (at your option) any later "
"version."
msgstr ""
-"Empatio estas libera softvaro; vi povas disvastigi ĝin kaj/aŭ modifi ĝin sub "
-"la kondiĉoj de la GNU Ĝenerala Publika Permesilo kiel publikita de la Libera "
-"Softvara Fonduso; ĉu versio 2 de la permesilo, ĉu \n"
-"(laŭ via elekto) iu ajn posta versio."
+"Empatio estas libera programaro; vi povas disvastigi ĝin kaj/aŭ modifi ĝin "
+"sub la kondiĉoj de la Ĝenerala Publika Permesilo de GNU kiel publikita de la "
+"Libera Programara Fonduso; ĉu versio 2 de la permesilo, ĉu (laŭ via volo) iu "
+"ajn posta versio."
#: ../src/empathy-about-dialog.c:85
msgid ""
@@ -2464,9 +2632,9 @@ msgid ""
"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
"details."
msgstr ""
-"Empatio estas distribuata kun la espero ke ĝi estas utila, sed SEN IU "
-"GARANTIO; eĉ sen implicita garantio de NEGOCEBLO aŭ TAŭGECO POR SPECIFA "
-"CELO. Vidu la GNU Ĝeneralan Publikan Permesilon por pli da detaloj."
+"Empatio estas distribuata kun la espero ke ĝi estas utila, sed SEN IU "
+"GARANTIO; eĉ sen implicita garantio de NEGOCEBLO aŭ TAŬGECO POR SPECIFA "
+"CELO. Vidu la Ĝeneralan Publikan Permesilon de GNU por pli da detaloj."
#: ../src/empathy-about-dialog.c:89
msgid ""
@@ -2474,10 +2642,13 @@ msgid ""
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
"Street, Fifth Floor, Boston, MA 02110-130159 USA"
msgstr ""
+"Vi devintus kopion de la Ĝenerala Publika Permesilo de GNU kun Empatio; se "
+"ne, skribu al Free Software Foundation, Inc., 51 Franklin Street, Fifth "
+"Floor, Boston, MA 02110-1301 USA"
#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
-msgstr "Tujmesaĝilo por GNOME"
+msgstr "Tujmesaĝilo por GNOME"
#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
@@ -2491,10 +2662,12 @@ msgstr ""
" Kristjan SCHMIDT https://launchpad.net/~kristjan-eo\n"
" Kvantumo https://launchpad.net/~ordnascrazy\n"
" Lucas Larson https://launchpad.net/~lucaslarson\n"
-" Michael MORONI https://launchpad.net/~haikara90\n"
+" Michael Moroni https://launchpad.net/~airon90\n"
" Petr Adam Dohnálek https://launchpad.net/~dohnp5a1\n"
" Robert BOGENSCHNEIDER https://launchpad.net/~robog\n"
+" Serge Leblanc https://launchpad.net/~serge-leblanc\n"
" Serge Leblanc https://launchpad.net/~serge-leblanc-wanadoo\n"
+" Shane D https://launchpad.net/~dimensional\n"
" Yamiharu https://launchpad.net/~yamiharu84"
#: ../src/empathy-account-assistant.c:167
@@ -2525,7 +2698,7 @@ msgid ""
msgstr ""
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
msgid "An error occurred"
msgstr "Eraro aperis"
@@ -2585,17 +2758,17 @@ msgstr ""
msgid "Select the accounts you want to import:"
msgstr ""
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:636
-#: ../src/empathy-new-chatroom-dialog.c:637
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "Yes"
msgstr "Jes"
-#: ../src/empathy-account-assistant.c:817
+#: ../src/empathy-account-assistant.c:820
msgid "No, that's all for now"
msgstr "Ne, tio sufiĉas nun"
-#: ../src/empathy-account-assistant.c:1082
+#: ../src/empathy-account-assistant.c:1085
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 "
@@ -2603,16 +2776,16 @@ msgid ""
"disable this feature by using the 'Accounts' dialog"
msgstr ""
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
msgid "Edit->Accounts"
msgstr "Redakti->Kontoj"
-#: ../src/empathy-account-assistant.c:1104
-msgid "I don't want to enable this feature for now"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
msgstr ""
-#: ../src/empathy-account-assistant.c:1140
+#: ../src/empathy-account-assistant.c:1143
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 "
@@ -2620,23 +2793,23 @@ msgid ""
"the Accounts dialog"
msgstr ""
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1149
msgid "telepathy-salut not installed"
msgstr ""
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1195
msgid "Messaging and VoIP Accounts Assistant"
msgstr ""
-#: ../src/empathy-account-assistant.c:1226
+#: ../src/empathy-account-assistant.c:1229
msgid "Welcome to Empathy"
msgstr "Bonvenon al Empatio"
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1238
msgid "Import your existing accounts"
msgstr ""
-#: ../src/empathy-account-assistant.c:1253
+#: ../src/empathy-account-assistant.c:1256
msgid "Please enter personal details"
msgstr ""
@@ -2653,54 +2826,64 @@ msgstr ""
msgid "Your new account has not been saved yet."
msgstr ""
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:809
msgid "Connecting…"
-msgstr "Konektante..."
+msgstr "Konektante…"
-#: ../src/empathy-accounts-dialog.c:321
+#: ../src/empathy-accounts-dialog.c:386
#, c-format
msgid "Offline — %s"
msgstr "Nekonektite — %s"
-#: ../src/empathy-accounts-dialog.c:333
+#: ../src/empathy-accounts-dialog.c:398
#, c-format
msgid "Disconnected — %s"
msgstr "Nekonektite — %s"
-#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-accounts-dialog.c:409
msgid "Offline — No Network Connection"
msgstr "Nekonektite — Neniu retkonekto"
-#: ../src/empathy-accounts-dialog.c:351
+#: ../src/empathy-accounts-dialog.c:416
msgid "Unknown Status"
msgstr "Nekonata stato"
-#: ../src/empathy-accounts-dialog.c:363
+#: ../src/empathy-accounts-dialog.c:428
msgid "Offline — Account Disabled"
msgstr "Nekonektite — Konto estas elŝaltite"
-#: ../src/empathy-accounts-dialog.c:759
+#: ../src/empathy-accounts-dialog.c:831
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr ""
-#: ../src/empathy-accounts-dialog.c:1106
+#: ../src/empathy-accounts-dialog.c:1192
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "Ĉu vi volas forigi %s de la komputilo?"
-#: ../src/empathy-accounts-dialog.c:1110
+#: ../src/empathy-accounts-dialog.c:1196
msgid "This will not remove your account on the server."
msgstr ""
-#: ../src/empathy-accounts-dialog.c:1348
+#: ../src/empathy-accounts-dialog.c:1432
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr ""
-#: ../src/empathy-accounts-dialog.c:1951
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1643
+msgid "_Enable"
+msgstr "E_nŝalti"
+
+#: ../src/empathy-accounts-dialog.c:1644
+msgid "_Disable"
+msgstr "E_lŝalti"
+
+#: ../src/empathy-accounts-dialog.c:2154
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2726,17 +2909,17 @@ msgstr ""
#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Add…"
-msgstr "_Aldoni..."
+msgstr "_Aldoni…"
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Import…"
-msgstr "_Importi..."
+msgstr "_Importi…"
-#: ../src/empathy-auth-client.c:237
+#: ../src/empathy-auth-client.c:249
msgid " - Empathy authentication client"
msgstr ""
-#: ../src/empathy-auth-client.c:253
+#: ../src/empathy-auth-client.c:265
msgid "Empathy authentication client"
msgstr ""
@@ -2752,121 +2935,141 @@ msgstr ""
msgid "Empathy Audio/Video Client"
msgstr ""
-#: ../src/empathy-call-window.c:481
+#: ../src/empathy-streamed-media-window.c:479
msgid "Contrast"
msgstr "Kontrasto"
-#: ../src/empathy-call-window.c:484
+#: ../src/empathy-streamed-media-window.c:482
msgid "Brightness"
msgstr "Heleco"
-#: ../src/empathy-call-window.c:487
+#: ../src/empathy-streamed-media-window.c:485
msgid "Gamma"
msgstr "Gamo"
-#: ../src/empathy-call-window.c:592
+#: ../src/empathy-streamed-media-window.c:590
msgid "Volume"
msgstr "Laŭteco"
-#: ../src/empathy-call-window.c:1168
+#: ../src/empathy-streamed-media-window.c:1166
msgid "_Sidebar"
msgstr "_Flanka breto"
-#: ../src/empathy-call-window.c:1188
+#: ../src/empathy-streamed-media-window.c:1186
msgid "Audio input"
msgstr "Sonenigo"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-streamed-media-window.c:1190
msgid "Video input"
msgstr "Videoenigo"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-streamed-media-window.c:1194
msgid "Dialpad"
msgstr ""
-#: ../src/empathy-call-window.c:1201
+#: ../src/empathy-streamed-media-window.c:1205
msgid "Details"
msgstr "Detaloj"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1270
+#: ../src/empathy-streamed-media-window.c:1274
#, c-format
msgid "Call with %s"
msgstr ""
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1349
+#: ../src/empathy-streamed-media-window.c:1353
msgid "Call"
msgstr "Voko"
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-streamed-media-window.c:1507
msgid "The IP address as seen by the machine"
msgstr ""
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-streamed-media-window.c:1509
msgid "The IP address as seen by a server on the Internet"
msgstr ""
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1511
msgid "The IP address of the peer as seen by the other side"
msgstr ""
-#: ../src/empathy-call-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1513
msgid "The IP address of a relay server"
msgstr ""
-#: ../src/empathy-call-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1515
msgid "The IP address of the multicast group"
msgstr ""
+#: ../src/empathy-streamed-media-window.c:1906
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Nekonate"
+
+#: ../src/empathy-streamed-media-window.c:1909
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Nekonate"
+
+#: ../src/empathy-streamed-media-window.c:1912
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Nekonate"
+
+#: ../src/empathy-streamed-media-window.c:1915
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Nekonate"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2274
#, c-format
msgid "Connected — %d:%02dm"
msgstr "Konektite — %d:%02dm"
-#: ../src/empathy-call-window.c:2322
+#: ../src/empathy-streamed-media-window.c:2335
msgid "Technical Details"
msgstr "Teknikaj detaloj"
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-streamed-media-window.c:2373
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr ""
-#: ../src/empathy-call-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2378
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr ""
-#: ../src/empathy-call-window.c:2371
+#: ../src/empathy-streamed-media-window.c:2384
#, 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:2377
+#: ../src/empathy-streamed-media-window.c:2390
msgid "There was a failure on the network"
msgstr "Okazis paneo je la reto"
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-streamed-media-window.c:2394
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr ""
-#: ../src/empathy-call-window.c:2384
+#: ../src/empathy-streamed-media-window.c:2397
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr ""
-#: ../src/empathy-call-window.c:2394
+#: ../src/empathy-streamed-media-window.c:2407
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2874,19 +3077,19 @@ msgid ""
"the Help menu."
msgstr ""
-#: ../src/empathy-call-window.c:2402
+#: ../src/empathy-streamed-media-window.c:2415
msgid "There was a failure in the call engine"
msgstr ""
-#: ../src/empathy-call-window.c:2405
+#: ../src/empathy-streamed-media-window.c:2418
msgid "The end of the stream was reached"
msgstr ""
-#: ../src/empathy-call-window.c:2445
+#: ../src/empathy-streamed-media-window.c:2458
msgid "Can't establish audio stream"
msgstr ""
-#: ../src/empathy-call-window.c:2455
+#: ../src/empathy-streamed-media-window.c:2468
msgid "Can't establish video stream"
msgstr ""
@@ -2952,12 +3155,16 @@ msgstr ""
#: ../src/empathy-call-window.ui.h:16
msgid "Send Audio"
-msgstr ""
+msgstr "Sendi sonon"
#: ../src/empathy-call-window.ui.h:17
msgid "Toggle audio transmission"
msgstr ""
+#: ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "Nekonate"
+
#: ../src/empathy-call-window.ui.h:19
msgid "V_ideo"
msgstr "V_ideo"
@@ -2982,42 +3189,53 @@ msgstr "Videa antaŭvido"
msgid "_Call"
msgstr "_Voko"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:30
msgid "_View"
msgstr "_Vido"
-#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d nelegite)"
msgstr[1] "%s (%d nelegite)"
-#: ../src/empathy-chat-window.c:484
+#: ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (kaj %u alia)"
msgstr[1] "%s (kaj %u aliaj)"
-#: ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:508
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:517
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/empathy-chat-window.c:711
-msgid "Typing a message."
+#: ../src/empathy-chat-window.c:732
+msgid "SMS:"
msgstr ""
+#: ../src/empathy-chat-window.c:742
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Sendante %d mesaĝon"
+msgstr[1] "Sendante %d mesaĝojn"
+
+#: ../src/empathy-chat-window.c:764
+msgid "Typing a message."
+msgstr "Skribante mesaĝon."
+
#: ../src/empathy-chat-window.ui.h:1
msgid "C_lear"
msgstr "_Vakigi"
@@ -3039,20 +3257,18 @@ msgid "Invite _Participant…"
msgstr ""
#: ../src/empathy-chat-window.ui.h:6
-#, fuzzy
msgid "Move Tab _Left"
-msgstr "Movi Tabo _Maldekstre"
+msgstr "Movi la langeton _maldekstren"
#: ../src/empathy-chat-window.ui.h:7
-#, fuzzy
msgid "Move Tab _Right"
-msgstr "Movi Tabo _Dekstre"
+msgstr "Movi la langeton _dekstren"
#: ../src/empathy-chat-window.ui.h:8
msgid "Notify for All Messages"
msgstr "Atentigi pri ciuj mesaĝoj"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
msgid "_Contents"
msgstr "_Enhavoj"
@@ -3061,11 +3277,10 @@ msgid "_Conversation"
msgstr "_Konversacio"
#: ../src/empathy-chat-window.ui.h:11
-#, fuzzy
msgid "_Detach Tab"
-msgstr "_Malligi Tabo"
+msgstr "_Malligi langeton"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
msgid "_Edit"
msgstr "R_edakti"
@@ -3073,7 +3288,7 @@ msgstr "R_edakti"
msgid "_Favorite Chat Room"
msgstr ""
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
msgid "_Help"
msgstr "_Helpo"
@@ -3091,11 +3306,11 @@ msgstr "_Montri kontaktliston"
#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
-msgstr "_Taboj"
+msgstr "_Langetoj"
#: ../src/empathy-chat-window.ui.h:19
msgid "_Undo Close Tab"
-msgstr ""
+msgstr "_Malfari fermon de langeto"
#: ../src/empathy-chatrooms-window.c:241
msgid "Name"
@@ -3103,7 +3318,7 @@ msgstr "Nomo"
#: ../src/empathy-chatrooms-window.c:259
msgid "Room"
-msgstr "Ĉambro"
+msgstr "Ĉambro"
#: ../src/empathy-chatrooms-window.c:267
msgid "Auto-Connect"
@@ -3113,214 +3328,204 @@ msgstr "Aŭtomata konekto"
msgid "Manage Favorite Rooms"
msgstr ""
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:505
msgid "Incoming video call"
msgstr ""
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:505
msgid "Incoming call"
-msgstr "Eniranta telefonvoko"
+msgstr "Venanta telefonvoko"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:509
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr ""
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:510
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr ""
-#: ../src/empathy-event-manager.c:516 ../src/empathy-event-manager.c:661
+#: ../src/empathy-event-manager.c:513 ../src/empathy-event-manager.c:662
#, c-format
msgid "Incoming call from %s"
msgstr ""
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:538
msgid "_Reject"
msgstr "_Rifuzi"
-#: ../src/empathy-event-manager.c:547
+#: ../src/empathy-event-manager.c:544
msgid "_Answer"
msgstr "_Respondo"
-#: ../src/empathy-event-manager.c:661
+#: ../src/empathy-event-manager.c:662
#, c-format
msgid "Incoming video call from %s"
msgstr ""
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:735
msgid "Room invitation"
msgstr ""
-#: ../src/empathy-event-manager.c:740
+#: ../src/empathy-event-manager.c:737
#, c-format
msgid "Invitation to join %s"
msgstr ""
-#: ../src/empathy-event-manager.c:747
+#: ../src/empathy-event-manager.c:744
#, c-format
msgid "%s is inviting you to join %s"
msgstr ""
-#: ../src/empathy-event-manager.c:755
+#: ../src/empathy-event-manager.c:752
msgid "_Decline"
msgstr ""
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:757
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
-msgstr "_Membriĝi"
+msgstr "_Aliĝi"
-#: ../src/empathy-event-manager.c:787
+#: ../src/empathy-event-manager.c:784
#, c-format
msgid "%s invited you to join %s"
msgstr ""
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:790
#, c-format
msgid "You have been invited to join %s"
msgstr ""
-#: ../src/empathy-event-manager.c:844
+#: ../src/empathy-event-manager.c:841
#, c-format
msgid "Incoming file transfer from %s"
msgstr ""
-#: ../src/empathy-event-manager.c:1014 ../src/empathy-main-window.c:367
+#: ../src/empathy-event-manager.c:1011 ../src/empathy-main-window.c:377
msgid "Password required"
-msgstr "Pasvorto"
+msgstr "Pasvorto bezonatas"
-#: ../src/empathy-event-manager.c:1070
+#: ../src/empathy-event-manager.c:1067
#, c-format
-msgid "%s would like permission to see when you are available"
+msgid "%s would like permission to see when you are online"
msgstr ""
-#: ../src/empathy-event-manager.c:1074
+#: ../src/empathy-event-manager.c:1071
#, c-format
msgid ""
"\n"
"Message: %s"
msgstr ""
"\n"
-"Mesaĝo: %s"
-
-#: ../src/empathy-event-manager.c:1118
-#, c-format
-msgid "%s is now offline."
-msgstr "%s estas nun nekonektite."
-
-#: ../src/empathy-event-manager.c:1139
-#, c-format
-msgid "%s is now online."
-msgstr "%s estas nun konektite."
+"Mesaĝo: %s"
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "Nekonate"
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s at %s/s"
-msgstr ""
+msgstr "%s de %s ĉe %s/s"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
#, c-format
msgid "%s of %s"
msgstr "%s de %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "Ricevante \"%s\" de %s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "Sendante \"%s\" al %s"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr ""
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr ""
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr ""
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
msgid "Error sending a file"
msgstr ""
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
#, c-format
msgid "\"%s\" received from %s"
msgstr ""
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr ""
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr ""
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
msgid "Waiting for the other participant's response"
msgstr ""
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
#, c-format
msgid "Checking integrity of \"%s\""
msgstr ""
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
msgstr ""
-#: ../src/empathy-ft-manager.c:996
+#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1008
+#: ../src/empathy-ft-manager.c:1038
msgid "File"
msgstr "Dosiero"
-#: ../src/empathy-ft-manager.c:1030
+#: ../src/empathy-ft-manager.c:1060
msgid "Remaining"
msgstr "Restante"
#: ../src/empathy-ft-manager.ui.h:1
msgid "File Transfers"
-msgstr ""
+msgstr "Dosiertransigoj"
#: ../src/empathy-ft-manager.ui.h:2
msgid "Remove completed, canceled and failed file transfers from the list"
@@ -3334,12 +3539,12 @@ msgstr ""
#: ../src/empathy-import-dialog.c:199
msgid "Import Accounts"
-msgstr ""
+msgstr "Enporti kontojn"
#. Translators: this is the header of a treeview column
#: ../src/empathy-import-widget.c:301
msgid "Import"
-msgstr "Importi"
+msgstr "Enporti"
#: ../src/empathy-import-widget.c:310
msgid "Protocol"
@@ -3349,39 +3554,55 @@ msgstr "Protokolo"
msgid "Source"
msgstr "Fonto"
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:394
msgid "Provide Password"
-msgstr "Pasvorto"
+msgstr ""
-#: ../src/empathy-main-window.c:390
+#: ../src/empathy-main-window.c:400
msgid "Disconnect"
-msgstr "Malkonektis"
+msgstr "Malkonekti"
-#: ../src/empathy-main-window.c:530
+#: ../src/empathy-main-window.c:540
msgid "No match found"
-msgstr ""
+msgstr "Neniu kongruaĵo troviĝis"
-#: ../src/empathy-main-window.c:685
+#: ../src/empathy-main-window.c:695
msgid "Reconnect"
msgstr "Rekonekti"
-#: ../src/empathy-main-window.c:691
+#: ../src/empathy-main-window.c:701
msgid "Edit Account"
msgstr "Redakti konton"
-#: ../src/empathy-main-window.c:697
+#: ../src/empathy-main-window.c:707
msgid "Close"
msgstr "Fermi"
-#: ../src/empathy-main-window.c:1405
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:849
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr ""
+
+#: ../src/empathy-main-window.c:924
+msgid "Top up account credit"
+msgstr ""
+
+#. top up button
+#: ../src/empathy-main-window.c:999
+msgid "Top Up..."
+msgstr ""
+
+#: ../src/empathy-main-window.c:1752
msgid "Contact"
msgstr "Kontakto"
-#: ../src/empathy-main-window.c:1732
+#: ../src/empathy-main-window.c:2101
msgid "Contact List"
msgstr "Kontaktlisto"
-#: ../src/empathy-main-window.c:1845
+#: ../src/empathy-main-window.c:2219
msgid "Show and edit accounts"
msgstr "Montri kaj redakti kontojn"
@@ -3390,12 +3611,12 @@ msgid "Contacts on a _Map"
msgstr ""
#: ../src/empathy-main-window.ui.h:2
-msgid "Context"
-msgstr "Kunteksto"
+msgid "Credit Balance"
+msgstr ""
#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
-msgstr "Kontaktlisto"
+msgstr "Serĉi en kontakt_listo"
#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
@@ -3411,7 +3632,7 @@ msgstr ""
#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
-msgstr "Nova _voko..."
+msgstr "Nova _voko…"
#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
@@ -3437,49 +3658,57 @@ msgstr "Ordigi laŭ _stato"
msgid "_Accounts"
msgstr "_Kontoj"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Blocked Contacts"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:17
msgid "_Compact Size"
msgstr ""
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:19
msgid "_Debug"
msgstr "_Sencimigo"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr ""
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:23
msgid "_Join…"
-msgstr "_Membriĝi..."
+msgstr "_Aliĝi…"
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
-msgstr "_Nova konversacio..."
+msgstr "_Nova konversacio…"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Offline Contacts"
msgstr ""
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Personal Information"
msgstr "_Personaj informoj"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_Room"
-msgstr "Ĉamb_ro"
+msgstr "Ĉamb_ro"
+
+#: ../src/empathy-main-window.ui.h:29
+msgid "_Search for Contacts…"
+msgstr "_Serĉi kontaktojn…"
-#: ../src/empathy-new-chatroom-dialog.c:406
+#: ../src/empathy-new-chatroom-dialog.c:337
msgid "Chat Room"
msgstr "Babilĉambro"
-#: ../src/empathy-new-chatroom-dialog.c:422
+#: ../src/empathy-new-chatroom-dialog.c:353
msgid "Members"
msgstr "Membroj"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:634
+#: ../src/empathy-new-chatroom-dialog.c:553
#, c-format
msgid ""
"%s\n"
@@ -3488,16 +3717,16 @@ msgid ""
"Members: %s"
msgstr ""
-#: ../src/empathy-new-chatroom-dialog.c:636
-#: ../src/empathy-new-chatroom-dialog.c:637
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "No"
msgstr "Ne"
-#: ../src/empathy-new-chatroom-dialog.c:665
+#: ../src/empathy-new-chatroom-dialog.c:584
msgid "Could not start room listing"
msgstr ""
-#: ../src/empathy-new-chatroom-dialog.c:675
+#: ../src/empathy-new-chatroom-dialog.c:594
msgid "Could not stop room listing"
msgstr ""
@@ -3518,7 +3747,7 @@ msgstr ""
#: ../src/empathy-new-chatroom-dialog.ui.h:5
msgid "Join Room"
-msgstr "Aliĝi ĉambron"
+msgstr "Aliĝi al ĉambro"
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Room List"
@@ -3526,41 +3755,81 @@ msgstr "Ĉambrolisto"
#: ../src/empathy-new-chatroom-dialog.ui.h:8
msgid "_Room:"
-msgstr "Ĉamb_ro:"
+msgstr "Ĉamb_ro:"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:147
msgid "Message received"
msgstr "Ricevis mesaĝon"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:148
msgid "Message sent"
-msgstr "Senis mesaĝon"
+msgstr "Sendis mesaĝon"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:149
msgid "New conversation"
-msgstr ""
+msgstr "Nova konversacio"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:150
msgid "Contact goes online"
msgstr ""
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:151
msgid "Contact goes offline"
msgstr ""
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:152
msgid "Account connected"
msgstr ""
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:153
msgid "Account disconnected"
msgstr ""
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:450
msgid "Language"
msgstr "Lingvo"
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:700
+msgid "Juliet"
+msgstr ""
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:707
+msgid "Romeo"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:713
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:716
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:719
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:722
+msgid "And I'll no longer be a Capulet."
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:725
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:728
+msgid "Juliet has disconnected"
+msgstr ""
+
+#: ../src/empathy-preferences.c:962
msgid "Preferences"
msgstr "Agordoj"
@@ -3606,7 +3875,7 @@ msgstr ""
#: ../src/empathy-preferences.ui.h:11
msgid "General"
-msgstr "Ĝenerale"
+msgstr "Ĝenerale"
#: ../src/empathy-preferences.ui.h:13
msgid "Location sources:"
@@ -3658,43 +3927,47 @@ msgid ""
msgstr ""
#: ../src/empathy-preferences.ui.h:24
+msgid "Theme Variant:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:25
msgid "Themes"
msgstr "Etosoj"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
msgid "_Automatically connect on startup"
msgstr ""
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Cellphone"
msgstr "_Poŝtelefono"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable bubble notifications"
msgstr ""
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_Enable sound notifications"
msgstr "Aktivigi sonajn at_entigojn"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Network (IP, Wi-Fi)"
msgstr ""
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Open new chats in separate windows"
-msgstr ""
+msgstr "Malfermi n_ovajn babilojn en propraj fenestroj"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
msgid "_Publish location to my contacts"
msgstr ""
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
msgid "_Reduce location accuracy"
msgstr ""
@@ -3706,67 +3979,67 @@ msgstr "Stato"
msgid "_Quit"
msgstr "Ĉ_esi"
-#: ../src/empathy-map-view.c:452
+#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "Vido de la mapo de kontakoj"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1218
msgid "Save"
msgstr "Konservi"
-#: ../src/empathy-debug-window.c:1395
+#: ../src/empathy-debug-window.c:1394
msgid "Debug Window"
msgstr "Sencimig-fenestro"
-#: ../src/empathy-debug-window.c:1475
+#: ../src/empathy-debug-window.c:1476
msgid "Pause"
msgstr "Paŭzo"
-#: ../src/empathy-debug-window.c:1487
+#: ../src/empathy-debug-window.c:1488
msgid "Level "
msgstr "Nivelo "
-#: ../src/empathy-debug-window.c:1507
+#: ../src/empathy-debug-window.c:1508
msgid "Debug"
msgstr "Sencimigo"
-#: ../src/empathy-debug-window.c:1513
+#: ../src/empathy-debug-window.c:1514
msgid "Info"
msgstr "Informo"
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
msgid "Message"
-msgstr "Mesaĝo"
+msgstr "Mesaĝo"
-#: ../src/empathy-debug-window.c:1525
+#: ../src/empathy-debug-window.c:1526
msgid "Warning"
msgstr "Averto"
-#: ../src/empathy-debug-window.c:1531
+#: ../src/empathy-debug-window.c:1532
msgid "Critical"
-msgstr "Kritika"
+msgstr "Kritike"
-#: ../src/empathy-debug-window.c:1537
+#: ../src/empathy-debug-window.c:1538
msgid "Error"
msgstr "Eraro"
-#: ../src/empathy-debug-window.c:1556
+#: ../src/empathy-debug-window.c:1557
msgid "Time"
msgstr "Tempo"
-#: ../src/empathy-debug-window.c:1559
+#: ../src/empathy-debug-window.c:1560
msgid "Domain"
msgstr "Retregiono"
-#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1562
msgid "Category"
msgstr "Kategorio"
-#: ../src/empathy-debug-window.c:1563
+#: ../src/empathy-debug-window.c:1564
msgid "Level"
msgstr "Nivelo"
-#: ../src/empathy-debug-window.c:1600
+#: ../src/empathy-debug-window.c:1601
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3785,28 +4058,28 @@ msgstr ""
msgid "Invite"
msgstr "Inviti"
-#: ../src/empathy-accounts.c:178
+#: ../src/empathy-accounts.c:183
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr ""
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:187
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr ""
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:191
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr ""
-#: ../src/empathy-accounts.c:188
+#: ../src/empathy-accounts.c:193
msgid "<account-id>"
msgstr "<konto-id>"
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:198
msgid "- Empathy Accounts"
msgstr "- Empatio-kontoj"
-#: ../src/empathy-accounts.c:232
+#: ../src/empathy-accounts.c:237
msgid "Empathy Accounts"
msgstr "Empatio-kontoj"
@@ -3814,13 +4087,13 @@ msgstr "Empatio-kontoj"
msgid "Empathy Debugger"
msgstr "Empatio-sencimigilo"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:107
msgid "- Empathy Chat Client"
-msgstr "- Empatio-kontoj"
+msgstr "- Babililo 'Empatio'"
#: ../src/empathy-notifications-approver.c:184
msgid "Respond"
-msgstr "Repondo"
+msgstr "Respondo"
#: ../src/empathy-notifications-approver.c:190
msgid "Reject"
@@ -3832,14 +4105,64 @@ msgstr "Respondo"
#: ../src/empathy-notifications-approver.c:201
#: ../src/empathy-notifications-approver.c:211
-#, fuzzy
msgid "Decline"
-msgstr "Malakcepti"
+msgstr ""
#: ../src/empathy-notifications-approver.c:205
#: ../src/empathy-notifications-approver.c:216
msgid "Accept"
msgstr "Akcepti"
+#: ../src/empathy-notifications-approver.c:226
+msgid "Provide"
+msgstr ""
+
+#: ../src/empathy-call-observer.c:130
+#, c-format
+msgid "Missed call from %s"
+msgstr ""
+
+#: ../src/empathy-call-observer.c:133
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.c:282
+msgid "_Match case"
+msgstr "_Uskleca kongruo"
+
#~ msgid "Empathy has asked about importing accounts"
-#~ msgstr "Empatio demandis pri gravaj kontoj"
+#~ msgstr "Empatio demandis pri importi kontojn"
+
+#~ msgid "%s is now online."
+#~ msgstr "%s estas nun konektite."
+
+#~ msgid "All accounts"
+#~ msgstr "Ĉiuj kontoj"
+
+#~ msgid "Clear All"
+#~ msgstr "Vakigi ĉion"
+
+#~ msgid "Delete from:"
+#~ msgstr "Forigi de:"
+
+#~ msgid "Delete All History..."
+#~ msgstr "Forigi la tutan historion..."
+
+#~ msgid "_Accept"
+#~ msgstr "_Akcepti"
+
+#~ msgid "_Answer with video"
+#~ msgstr "_Respondi per video"
+
+#~ msgid "Update software..."
+#~ msgstr "Ĝisdatigi programaron..."
+
+#~ msgid "Answer with video"
+#~ msgstr "Respondi per video"
+
+#~ msgid "Context"
+#~ msgstr "Kunteksto"
+
+#~ msgid "%s is now offline."
+#~ msgstr "%s estas nun nekonektite."
diff --git a/po/es.po b/po/es.po
index 3562a04f0..411d76c71 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,23 +1,23 @@
# translation of empathy.master.po to Español
# Copyright (C) 2003 Free Software Foundation
# This file is distributed under the same license as the Gossip package.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-05-09 10:59+0000\n"
-"PO-Revision-Date: 2011-05-09 14:23+0200\n"
-"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
+"POT-Creation-Date: 2011-05-16 13:17+0000\n"
+"PO-Revision-Date: 2011-05-16 17:07+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -700,49 +700,49 @@ msgstr "Google Talk"
msgid "Facebook Chat"
msgstr "Chat de Facebook"
-#: ../libempathy/empathy-time.c:100
+#: ../libempathy/empathy-time.c:88
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
msgstr[0] "hace %d segundo"
msgstr[1] "hace %d segundos"
-#: ../libempathy/empathy-time.c:105
+#: ../libempathy/empathy-time.c:93
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "hace %d minuto"
msgstr[1] "hace %d minutos"
-#: ../libempathy/empathy-time.c:110
+#: ../libempathy/empathy-time.c:98
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "hace %d hora"
msgstr[1] "hace %d horas"
-#: ../libempathy/empathy-time.c:115
+#: ../libempathy/empathy-time.c:103
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "hace %d día"
msgstr[1] "hace %d días"
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:108
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
msgstr[0] "hace %d semana"
msgstr[1] "hace %d semanas"
-#: ../libempathy/empathy-time.c:125
+#: ../libempathy/empathy-time.c:113
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "hace %d mes"
msgstr[1] "hace %d meses"
-#: ../libempathy/empathy-time.c:130
+#: ../libempathy/empathy-time.c:136
msgid "in the future"
msgstr "en el futuro"
@@ -1191,6 +1191,7 @@ msgid "STUN Server:"
msgstr "Servidor STUN:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-contact-widget.c:347
msgid "Server:"
msgstr "Servidor:"
@@ -1259,35 +1260,41 @@ msgstr "Todos los archivos"
msgid "Click to enlarge"
msgstr "Pulse para agrandar"
-#: ../libempathy-gtk/empathy-chat.c:668
+#: ../libempathy-gtk/empathy-chat.c:669
msgid "Failed to open private chat"
msgstr "Falló al abrir el chat privado"
-#: ../libempathy-gtk/empathy-chat.c:733
+#: ../libempathy-gtk/empathy-chat.c:732
msgid "Topic not supported on this conversation"
msgstr "El tema no está soportado en esta conversación"
-#: ../libempathy-gtk/empathy-chat.c:739
+#: ../libempathy-gtk/empathy-chat.c:738
msgid "You are not allowed to change the topic"
msgstr "No le está permitido cambiar el tema"
-#: ../libempathy-gtk/empathy-chat.c:948
+#: ../libempathy-gtk/empathy-chat.c:945
+#, c-format
+#| msgid "invalid contact"
+msgid "“%s” is not a valid contact ID"
+msgstr "%s no es un identificador de contacto válido"
+
+#: ../libempathy-gtk/empathy-chat.c:1002
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:951
+#: ../libempathy-gtk/empathy-chat.c:1005
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:954
+#: ../libempathy-gtk/empathy-chat.c:1008
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:957
+#: ../libempathy-gtk/empathy-chat.c:1011
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:962
+#: ../libempathy-gtk/empathy-chat.c:1015
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
@@ -1295,23 +1302,23 @@ msgstr ""
"/part [<ID de la sala de chat>] [<razón>]: abandonar la sala de chat, la "
"actual de manera predeterminada"
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:1019
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:1022
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:1025
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:976
+#: ../libempathy-gtk/empathy-chat.c:1028
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:979
+#: ../libempathy-gtk/empathy-chat.c:1031
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 "
@@ -1321,7 +1328,11 @@ 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:984
+#: ../libempathy-gtk/empathy-chat.c:1036
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <ID del contacto>: mostrar información sobre un contacto"
+
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
@@ -1329,113 +1340,113 @@ msgstr ""
"/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
"definido, muestra su uso."
-#: ../libempathy-gtk/empathy-chat.c:994
+#: ../libempathy-gtk/empathy-chat.c:1049
#, c-format
msgid "Usage: %s"
msgstr "Uso: %s"
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1088
msgid "Unknown command"
msgstr "Comando desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1214
msgid "Unknown command; see /help for the available commands"
msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1299
+#: ../libempathy-gtk/empathy-chat.c:1354
msgid "insufficient balance to send message"
msgstr "no tiene balance suficiente para enviar el mensaje"
-#: ../libempathy-gtk/empathy-chat.c:1301
+#: ../libempathy-gtk/empathy-chat.c:1356
msgid "not capable"
msgstr "no es posible"
-#: ../libempathy-gtk/empathy-chat.c:1308
+#: ../libempathy-gtk/empathy-chat.c:1363
msgid "offline"
msgstr "desconectado"
-#: ../libempathy-gtk/empathy-chat.c:1311
+#: ../libempathy-gtk/empathy-chat.c:1366
msgid "invalid contact"
msgstr "contacto no válido"
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1369
msgid "permission denied"
msgstr "permiso denegado"
-#: ../libempathy-gtk/empathy-chat.c:1317
+#: ../libempathy-gtk/empathy-chat.c:1372
msgid "too long message"
msgstr "mensaje demasiado largo"
-#: ../libempathy-gtk/empathy-chat.c:1320
+#: ../libempathy-gtk/empathy-chat.c:1375
msgid "not implemented"
msgstr "no implementado"
-#: ../libempathy-gtk/empathy-chat.c:1324
+#: ../libempathy-gtk/empathy-chat.c:1379
msgid "unknown"
msgstr "desconocido"
-#: ../libempathy-gtk/empathy-chat.c:1330
+#: ../libempathy-gtk/empathy-chat.c:1385
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Error al enviar el mensaje «%s»: %s"
-#: ../libempathy-gtk/empathy-chat.c:1334
+#: ../libempathy-gtk/empathy-chat.c:1389
#, c-format
msgid "Error sending message: %s"
msgstr "Error al enviar el mensaje: %s"
-#: ../libempathy-gtk/empathy-chat.c:1395 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1450 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Tema:"
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1462
#, c-format
msgid "Topic set to: %s"
msgstr "El tema se ha establecido a: %s"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1464
msgid "No topic defined"
msgstr "No se ha definido el tema"
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:1971
msgid "(No Suggestions)"
msgstr "(Sin sugerencias)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1984
+#: ../libempathy-gtk/empathy-chat.c:2039
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Añadir «%s» al diccionario"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2021
+#: ../libempathy-gtk/empathy-chat.c:2076
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Añadir «%s» al diccionario de «%s»"
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2133
msgid "Insert Smiley"
msgstr "Insertar emoticono"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2096
+#: ../libempathy-gtk/empathy-chat.c:2151
#: ../libempathy-gtk/empathy-ui-utils.c:1808
msgid "_Send"
msgstr "E_nviar"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2131
+#: ../libempathy-gtk/empathy-chat.c:2186
msgid "_Spelling Suggestions"
msgstr "_Sugerencias ortográficas"
-#: ../libempathy-gtk/empathy-chat.c:2220
+#: ../libempathy-gtk/empathy-chat.c:2275
msgid "Failed to retrieve recent logs"
msgstr "Falló al recibir los registros recientes"
-#: ../libempathy-gtk/empathy-chat.c:2331
+#: ../libempathy-gtk/empathy-chat.c:2386
#, c-format
msgid "%s has disconnected"
msgstr "%s se ha desconectado"
@@ -1443,12 +1454,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:2338
+#: ../libempathy-gtk/empathy-chat.c:2393
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s expulsó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2341
+#: ../libempathy-gtk/empathy-chat.c:2396
#, c-format
msgid "%s was kicked"
msgstr "%s fue expulsado"
@@ -1456,17 +1467,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:2349
+#: ../libempathy-gtk/empathy-chat.c:2404
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s vetó a %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2352
+#: ../libempathy-gtk/empathy-chat.c:2407
#, c-format
msgid "%s was banned"
msgstr "%s fue vetado"
-#: ../libempathy-gtk/empathy-chat.c:2356
+#: ../libempathy-gtk/empathy-chat.c:2411
#, c-format
msgid "%s has left the room"
msgstr "%s ha dejado la sala"
@@ -1476,69 +1487,69 @@ 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:2365
+#: ../libempathy-gtk/empathy-chat.c:2420
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2390
+#: ../libempathy-gtk/empathy-chat.c:2445
#, c-format
msgid "%s has joined the room"
msgstr "%s ha entrado en la sala"
-#: ../libempathy-gtk/empathy-chat.c:2415
+#: ../libempathy-gtk/empathy-chat.c:2470
#, c-format
msgid "%s is now known as %s"
msgstr "Ahora %s se llama %s"
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2609
#: ../src/empathy-streamed-media-window.c:1957
-#: ../src/empathy-event-manager.c:1116
+#: ../src/empathy-event-manager.c:1117
msgid "Disconnected"
msgstr "Desconectado"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3202
+#: ../libempathy-gtk/empathy-chat.c:3267
msgid "Would you like to store this password?"
msgstr "¿Quiere guardar esta contraseña?"
-#: ../libempathy-gtk/empathy-chat.c:3208
+#: ../libempathy-gtk/empathy-chat.c:3273
msgid "Remember"
msgstr "Recordar"
-#: ../libempathy-gtk/empathy-chat.c:3218
+#: ../libempathy-gtk/empathy-chat.c:3283
msgid "Not now"
msgstr "Ahora no"
-#: ../libempathy-gtk/empathy-chat.c:3262
+#: ../libempathy-gtk/empathy-chat.c:3327
msgid "Retry"
msgstr "Volver a intentarlo"
-#: ../libempathy-gtk/empathy-chat.c:3266
+#: ../libempathy-gtk/empathy-chat.c:3331
msgid "Wrong password; please try again:"
msgstr "Contraseña incorrecta; inténtelo de nuevo:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3383
+#: ../libempathy-gtk/empathy-chat.c:3460
msgid "This room is protected by a password:"
msgstr "Esta sala está protegida por contraseña:"
-#: ../libempathy-gtk/empathy-chat.c:3410
+#: ../libempathy-gtk/empathy-chat.c:3487
msgid "Join"
msgstr "Unirse"
-#: ../libempathy-gtk/empathy-chat.c:3602 ../src/empathy-event-manager.c:1137
+#: ../libempathy-gtk/empathy-chat.c:3686 ../src/empathy-event-manager.c:1138
msgid "Connected"
msgstr "Conectado"
-#: ../libempathy-gtk/empathy-chat.c:3657
+#: ../libempathy-gtk/empathy-chat.c:3741
#: ../libempathy-gtk/empathy-log-window.c:650
msgid "Conversation"
msgstr "Conversación"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3662
+#: ../libempathy-gtk/empathy-chat.c:3746
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1580,13 +1591,13 @@ msgstr "Cuenta:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:996
+#: ../libempathy-gtk/empathy-theme-adium.c:1002
msgid "_Copy Link Address"
msgstr "_Copiar la dirección del enlace"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1003
+#: ../libempathy-gtk/empathy-theme-adium.c:1009
msgid "_Open Link"
msgstr "_Abrir enlace"
@@ -1701,58 +1712,58 @@ msgstr "_Bloquear contacto"
msgid "_Chat"
msgstr "_Chat"
-#: ../libempathy-gtk/empathy-contact-menu.c:359
+#: ../libempathy-gtk/empathy-contact-menu.c:358
#: ../libempathy-gtk/empathy-individual-menu.c:625
msgctxt "menu item"
msgid "_Audio Call"
msgstr "Llamada de vo_z"
-#: ../libempathy-gtk/empathy-contact-menu.c:390
+#: ../libempathy-gtk/empathy-contact-menu.c:389
#: ../libempathy-gtk/empathy-individual-menu.c:667
msgctxt "menu item"
msgid "_Video Call"
msgstr "Llamada de _vídeo"
-#: ../libempathy-gtk/empathy-contact-menu.c:436
+#: ../libempathy-gtk/empathy-contact-menu.c:435
#: ../libempathy-gtk/empathy-individual-menu.c:710
#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "Conversaciones an_teriores"
-#: ../libempathy-gtk/empathy-contact-menu.c:458
+#: ../libempathy-gtk/empathy-contact-menu.c:457
#: ../libempathy-gtk/empathy-individual-menu.c:751
msgid "Send File"
msgstr "Enviar archivo"
-#: ../libempathy-gtk/empathy-contact-menu.c:481
+#: ../libempathy-gtk/empathy-contact-menu.c:480
#: ../libempathy-gtk/empathy-individual-menu.c:793
msgid "Share My Desktop"
msgstr "Compartir mi escritorio"
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1751
+#: ../libempathy-gtk/empathy-contact-menu.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:1890
#: ../libempathy-gtk/empathy-individual-menu.c:828
#: ../libempathy-gtk/empathy-individual-widget.c:1370
msgid "Favorite"
msgstr "Favorita"
-#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../libempathy-gtk/empathy-contact-menu.c:549
#: ../libempathy-gtk/empathy-individual-menu.c:856
msgid "Infor_mation"
msgstr "Infor_mación"
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:595
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Editar"
-#: ../libempathy-gtk/empathy-contact-menu.c:650
+#: ../libempathy-gtk/empathy-contact-menu.c:649
#: ../libempathy-gtk/empathy-individual-menu.c:1037
#: ../src/empathy-chat-window.c:986
msgid "Inviting you to this room"
msgstr "Invitándolo a esta sala"
-#: ../libempathy-gtk/empathy-contact-menu.c:681
+#: ../libempathy-gtk/empathy-contact-menu.c:680
#: ../libempathy-gtk/empathy-individual-menu.c:1084
msgid "_Invite to Chat Room"
msgstr "_Invitar a sala de chat"
@@ -1778,153 +1789,180 @@ msgstr "No se encontraron contactos"
msgid "Select a contact"
msgstr "Seleccionar un contacto"
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "Nombre completo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "Número de teléfono:"
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "Dirección de correo-e:"
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "Página web:"
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "Cumpleaños:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+#| msgid "_Last Name:"
+msgid "Last seen:"
+msgstr "Última actividad:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+#| msgid "Connected"
+msgid "Connected from:"
+msgstr "Conectado desde:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+#| msgid "Quit message:"
+msgid "Away message:"
+msgstr "Mensaje de ausencia:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#| msgid "Ca_ncel"
+msgid "Channels:"
+msgstr "Canales:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:901
#: ../libempathy-gtk/empathy-individual-widget.c:488
msgid "Country ISO Code:"
msgstr "Código ISO de país:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-contact-widget.c:903
#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Country:"
msgstr "País:"
-#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-contact-widget.c:905
#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "State:"
msgstr "Estado:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-contact-widget.c:907
#: ../libempathy-gtk/empathy-individual-widget.c:494
msgid "City:"
msgstr "Ciudad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-contact-widget.c:909
#: ../libempathy-gtk/empathy-individual-widget.c:496
msgid "Area:"
msgstr "Área:"
-#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-contact-widget.c:911
#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Postal Code:"
msgstr "Código postal:"
-#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-contact-widget.c:913
#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Street:"
msgstr "Calle:"
-#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-contact-widget.c:915
#: ../libempathy-gtk/empathy-individual-widget.c:502
msgid "Building:"
msgstr "Edificio:"
-#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-contact-widget.c:917
#: ../libempathy-gtk/empathy-individual-widget.c:504
msgid "Floor:"
msgstr "Planta:"
-#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-contact-widget.c:919
#: ../libempathy-gtk/empathy-individual-widget.c:506
msgid "Room:"
msgstr "Habitación:"
-#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-contact-widget.c:921
#: ../libempathy-gtk/empathy-individual-widget.c:508
msgid "Text:"
msgstr "Texto:"
-#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-contact-widget.c:923
#: ../libempathy-gtk/empathy-individual-widget.c:510
msgid "Description:"
msgstr "Descripción:"
-#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-contact-widget.c:925
#: ../libempathy-gtk/empathy-individual-widget.c:512
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-contact-widget.c:927
#: ../libempathy-gtk/empathy-individual-widget.c:514
msgid "Accuracy Level:"
msgstr "Nivel de precisión:"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-contact-widget.c:929
#: ../libempathy-gtk/empathy-individual-widget.c:516
msgid "Error:"
msgstr "Error:"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:931
#: ../libempathy-gtk/empathy-individual-widget.c:518
msgid "Vertical Error (meters):"
msgstr "Error vertical (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-contact-widget.c:933
#: ../libempathy-gtk/empathy-individual-widget.c:520
msgid "Horizontal Error (meters):"
msgstr "Error horizontal (metros):"
-#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-contact-widget.c:935
#: ../libempathy-gtk/empathy-individual-widget.c:522
msgid "Speed:"
msgstr "Velocidad:"
-#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-contact-widget.c:937
#: ../libempathy-gtk/empathy-individual-widget.c:524
msgid "Bearing:"
msgstr "Retardo:"
-#: ../libempathy-gtk/empathy-contact-widget.c:800
+#: ../libempathy-gtk/empathy-contact-widget.c:939
#: ../libempathy-gtk/empathy-individual-widget.c:526
msgid "Climb Speed:"
msgstr "Velocidad de ascenso:"
-#: ../libempathy-gtk/empathy-contact-widget.c:802
+#: ../libempathy-gtk/empathy-contact-widget.c:941
#: ../libempathy-gtk/empathy-individual-widget.c:528
msgid "Last Updated on:"
msgstr "Actualizado por última vez:"
-#: ../libempathy-gtk/empathy-contact-widget.c:804
+#: ../libempathy-gtk/empathy-contact-widget.c:943
#: ../libempathy-gtk/empathy-individual-widget.c:530
msgid "Longitude:"
msgstr "Longitud_"
-#: ../libempathy-gtk/empathy-contact-widget.c:806
+#: ../libempathy-gtk/empathy-contact-widget.c:945
#: ../libempathy-gtk/empathy-individual-widget.c:532
msgid "Latitude:"
msgstr "Latitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:808
+#: ../libempathy-gtk/empathy-contact-widget.c:947
#: ../libempathy-gtk/empathy-individual-widget.c:534
msgid "Altitude:"
msgstr "Altitud:"
-#: ../libempathy-gtk/empathy-contact-widget.c:861
-#: ../libempathy-gtk/empathy-contact-widget.c:876
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1015
#: ../libempathy-gtk/empathy-individual-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:631
#: ../src/empathy-preferences.ui.h:12
@@ -1932,23 +1970,23 @@ msgid "Location"
msgstr "Ubicación geográfica"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:878
+#: ../libempathy-gtk/empathy-contact-widget.c:1017
#: ../libempathy-gtk/empathy-individual-widget.c:633
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:930
+#: ../libempathy-gtk/empathy-contact-widget.c:1069
#: ../libempathy-gtk/empathy-individual-widget.c:682
msgid "%B %e, %Y at %R UTC"
msgstr "%e de %B de %Y a las %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1012
+#: ../libempathy-gtk/empathy-contact-widget.c:1151
#: ../libempathy-gtk/empathy-individual-widget.c:917
msgid "Save Avatar"
msgstr "Guardar avatar"
-#: ../libempathy-gtk/empathy-contact-widget.c:1068
+#: ../libempathy-gtk/empathy-contact-widget.c:1207
#: ../libempathy-gtk/empathy-individual-widget.c:975
msgid "Unable to save avatar"
msgstr "No se pudo guardar el avatar"
@@ -2225,17 +2263,17 @@ msgid "New Conversation"
msgstr "Conversación nueva"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:254
msgid "Send _Video"
msgstr "Enviar _vídeo"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:262
msgid "C_all"
msgstr "_Llamar"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:272
msgid "New Call"
msgstr "Llamada nueva"
@@ -2362,7 +2400,7 @@ msgstr "Guardar mensaje de estado _nuevo"
msgid "Saved Status Messages"
msgstr "Mensajes de estado guardados"
-#: ../libempathy-gtk/empathy-theme-adium.c:1462
+#: ../libempathy-gtk/empathy-theme-adium.c:1468
msgid "Normal"
msgstr "Normal"
@@ -3432,90 +3470,90 @@ msgstr "Autoconectar"
msgid "Manage Favorite Rooms"
msgstr "Gestionar salas favoritas"
-#: ../src/empathy-event-manager.c:504
+#: ../src/empathy-event-manager.c:505
msgid "Incoming video call"
msgstr "Llamada de vídeo entrante"
-#: ../src/empathy-event-manager.c:504
+#: ../src/empathy-event-manager.c:505
msgid "Incoming call"
msgstr "Llamada entrante"
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:509
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s le está llamando con vídeo. ¿Quiere responder?"
-#: ../src/empathy-event-manager.c:509
+#: ../src/empathy-event-manager.c:510
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s le está llamando. ¿Quiere responder?"
-#: ../src/empathy-event-manager.c:512 ../src/empathy-event-manager.c:661
+#: ../src/empathy-event-manager.c:513 ../src/empathy-event-manager.c:662
#, c-format
msgid "Incoming call from %s"
msgstr "Llamada entrante de %s"
-#: ../src/empathy-event-manager.c:537
+#: ../src/empathy-event-manager.c:538
msgid "_Reject"
msgstr "_Rechazar"
-#: ../src/empathy-event-manager.c:543
+#: ../src/empathy-event-manager.c:544
msgid "_Answer"
msgstr "Re_spuesta"
-#: ../src/empathy-event-manager.c:661
+#: ../src/empathy-event-manager.c:662
#, c-format
msgid "Incoming video call from %s"
msgstr "Llamada de vídeo entrante de %s"
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:735
msgid "Room invitation"
msgstr "Invitación a una sala"
-#: ../src/empathy-event-manager.c:736
+#: ../src/empathy-event-manager.c:737
#, c-format
msgid "Invitation to join %s"
msgstr "Invitación para unirse a %s"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:744
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s le está invitando a unirse a %s"
-#: ../src/empathy-event-manager.c:751
+#: ../src/empathy-event-manager.c:752
msgid "_Decline"
msgstr "_Rechazar"
-#: ../src/empathy-event-manager.c:756
+#: ../src/empathy-event-manager.c:757
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Unirse"
-#: ../src/empathy-event-manager.c:783
+#: ../src/empathy-event-manager.c:784
#, c-format
msgid "%s invited you to join %s"
msgstr "%s le ha invitado a unirse a %s"
-#: ../src/empathy-event-manager.c:789
+#: ../src/empathy-event-manager.c:790
#, c-format
msgid "You have been invited to join %s"
msgstr "Le han invitado a unirse a %s"
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:841
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Transferencia de archivo entrante de %s"
-#: ../src/empathy-event-manager.c:1010 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1011 ../src/empathy-main-window.c:377
msgid "Password required"
msgstr "Se requiere una contraseña"
-#: ../src/empathy-event-manager.c:1066
+#: ../src/empathy-event-manager.c:1067
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s quiere permiso para ver cuándo está en línea"
-#: ../src/empathy-event-manager.c:1070
+#: ../src/empathy-event-manager.c:1071
#, c-format
msgid ""
"\n"
diff --git a/po/he.po b/po/he.po
index 3f5403646..ff07c934f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: empathy\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-09 08:50+0300\n"
-"PO-Revision-Date: 2011-05-09 09:21+0200\n"
+"POT-Creation-Date: 2011-05-13 08:30+0300\n"
+"PO-Revision-Date: 2011-05-13 08:35+0200\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: \n"
"Language: \n"
@@ -208,8 +208,8 @@ msgid "Pop up notifications when a contact logs out"
msgstr "Pop up notifications when a contact logs out"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Show Balance in roster"
-msgstr "Show Balance in roster"
+msgid "Show Balance in contact list"
+msgstr "Show Balance in contact list"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
@@ -394,8 +394,8 @@ 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/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to show account balances for in the contact roster."
-msgstr "Whether to show account balances for in the contact roster."
+msgid "Whether to show account balances in the contact list."
+msgstr "Whether to show account balances in the contact list."
#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid ""
@@ -1296,98 +1296,100 @@ msgstr "פקודה לא ידועה"
msgid "Unknown command; see /help for the available commands"
msgstr "פקודה בלתי מוכרת; יש לעיין ב־‎/help לצפייה בפקודות הזמינות"
-#: ../libempathy-gtk/empathy-chat.c:1297
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1299
msgid "insufficient balance to send message"
msgstr "המאזן אינו מאפשר לשלוח הודעה"
-#: ../libempathy-gtk/empathy-chat.c:1299
+#: ../libempathy-gtk/empathy-chat.c:1301
msgid "not capable"
msgstr "ללא יכולת"
-#: ../libempathy-gtk/empathy-chat.c:1306
+#: ../libempathy-gtk/empathy-chat.c:1308
msgid "offline"
msgstr "לא מחובר"
-#: ../libempathy-gtk/empathy-chat.c:1309
+#: ../libempathy-gtk/empathy-chat.c:1311
msgid "invalid contact"
msgstr "איש קשר לא תקין"
-#: ../libempathy-gtk/empathy-chat.c:1312
+#: ../libempathy-gtk/empathy-chat.c:1314
msgid "permission denied"
msgstr "איש קשר לא תקין"
-#: ../libempathy-gtk/empathy-chat.c:1315
+#: ../libempathy-gtk/empathy-chat.c:1317
msgid "too long message"
msgstr "הודעה ארוכה מדי"
-#: ../libempathy-gtk/empathy-chat.c:1318
+#: ../libempathy-gtk/empathy-chat.c:1320
msgid "not implemented"
msgstr "לא ממומש"
-#: ../libempathy-gtk/empathy-chat.c:1322
+#: ../libempathy-gtk/empathy-chat.c:1324
msgid "unknown"
msgstr "לא ידוע"
-#: ../libempathy-gtk/empathy-chat.c:1328
+#: ../libempathy-gtk/empathy-chat.c:1330
#, c-format
msgid "Error sending message '%s': %s"
msgstr "שגיאה בשליחת ההודעה '%s': ‏%s"
-#: ../libempathy-gtk/empathy-chat.c:1332
+#: ../libempathy-gtk/empathy-chat.c:1334
#, c-format
msgid "Error sending message: %s"
msgstr "שגיאה בשליחת ההודעה: ‏%s"
-#: ../libempathy-gtk/empathy-chat.c:1393 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1395 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "נושא:"
-#: ../libempathy-gtk/empathy-chat.c:1405
+#: ../libempathy-gtk/empathy-chat.c:1407
#, c-format
msgid "Topic set to: %s"
msgstr "הנושא הוגדר ל־: %s"
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1409
msgid "No topic defined"
msgstr "לא נקבע נושא"
-#: ../libempathy-gtk/empathy-chat.c:1914
+#: ../libempathy-gtk/empathy-chat.c:1916
msgid "(No Suggestions)"
msgstr "(אין הצעות)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1982
+#: ../libempathy-gtk/empathy-chat.c:1984
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "הוספת '%s' למילון"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2021
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "הוספת '%s' למילון %s"
-#: ../libempathy-gtk/empathy-chat.c:2076
+#: ../libempathy-gtk/empathy-chat.c:2078
msgid "Insert Smiley"
msgstr "הכנס סמיילי"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2094
+#: ../libempathy-gtk/empathy-chat.c:2096
#: ../libempathy-gtk/empathy-ui-utils.c:1808
msgid "_Send"
msgstr "_שלח"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2131
msgid "_Spelling Suggestions"
msgstr "הצעות _איות"
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2220
msgid "Failed to retrieve recent logs"
msgstr "ארע כשל בקבלת הדוחות האחרונים"
-#: ../libempathy-gtk/empathy-chat.c:2329
+#: ../libempathy-gtk/empathy-chat.c:2331
#, c-format
msgid "%s has disconnected"
msgstr "‏%s התנתק"
@@ -1395,12 +1397,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:2336
+#: ../libempathy-gtk/empathy-chat.c:2338
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "‏%1$s סולק על ידי %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2339
+#: ../libempathy-gtk/empathy-chat.c:2341
#, c-format
msgid "%s was kicked"
msgstr "‏%s סולק"
@@ -1408,17 +1410,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:2347
+#: ../libempathy-gtk/empathy-chat.c:2349
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "‏%1$s נחסם על ידי %2$s"
-#: ../libempathy-gtk/empathy-chat.c:2350
+#: ../libempathy-gtk/empathy-chat.c:2352
#, c-format
msgid "%s was banned"
msgstr "‏%s נחסם"
-#: ../libempathy-gtk/empathy-chat.c:2354
+#: ../libempathy-gtk/empathy-chat.c:2356
#, c-format
msgid "%s has left the room"
msgstr "‏%s עזב את החדר"
@@ -1428,69 +1430,69 @@ msgstr "‏%s עזב את החדר"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2363
+#: ../libempathy-gtk/empathy-chat.c:2365
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2388
+#: ../libempathy-gtk/empathy-chat.c:2390
#, c-format
msgid "%s has joined the room"
msgstr "‏%s הצטרף לחדר"
-#: ../libempathy-gtk/empathy-chat.c:2413
+#: ../libempathy-gtk/empathy-chat.c:2415
#, c-format
msgid "%s is now known as %s"
msgstr "‏%s נודע כעת בכינוי %s"
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2554
#: ../src/empathy-streamed-media-window.c:1957
-#: ../src/empathy-event-manager.c:1116
+#: ../src/empathy-event-manager.c:1117
msgid "Disconnected"
msgstr "מנותק"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3200
+#: ../libempathy-gtk/empathy-chat.c:3202
msgid "Would you like to store this password?"
msgstr "האם ברצונך לאחסן ססמה זו?"
-#: ../libempathy-gtk/empathy-chat.c:3206
+#: ../libempathy-gtk/empathy-chat.c:3208
msgid "Remember"
msgstr "שמירה"
-#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-chat.c:3218
msgid "Not now"
msgstr "לא כעת"
-#: ../libempathy-gtk/empathy-chat.c:3260
+#: ../libempathy-gtk/empathy-chat.c:3262
msgid "Retry"
msgstr "ניסיון חוזר"
-#: ../libempathy-gtk/empathy-chat.c:3264
+#: ../libempathy-gtk/empathy-chat.c:3266
msgid "Wrong password; please try again:"
msgstr "ססמה שגויה; נא לנסות שוב:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3381
+#: ../libempathy-gtk/empathy-chat.c:3383
msgid "This room is protected by a password:"
msgstr "חדר זה מוגן בססמה:"
-#: ../libempathy-gtk/empathy-chat.c:3408
+#: ../libempathy-gtk/empathy-chat.c:3410
msgid "Join"
msgstr "הצטרפות"
-#: ../libempathy-gtk/empathy-chat.c:3600 ../src/empathy-event-manager.c:1137
+#: ../libempathy-gtk/empathy-chat.c:3602 ../src/empathy-event-manager.c:1138
msgid "Connected"
msgstr "מחובר"
-#: ../libempathy-gtk/empathy-chat.c:3655
+#: ../libempathy-gtk/empathy-chat.c:3657
#: ../libempathy-gtk/empathy-log-window.c:650
msgid "Conversation"
msgstr "שיחה"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3660
+#: ../libempathy-gtk/empathy-chat.c:3662
#, c-format
msgid "%s (SMS)"
msgstr "%s (SMS)"
@@ -1532,13 +1534,13 @@ msgstr "חשבון:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:996
+#: ../libempathy-gtk/empathy-theme-adium.c:1002
msgid "_Copy Link Address"
msgstr "העתקת _מיקום הקישור"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1003
+#: ../libempathy-gtk/empathy-theme-adium.c:1009
msgid "_Open Link"
msgstr "_פתיחת קישור"
@@ -1652,58 +1654,58 @@ msgstr "ח_סימת איש קשר"
msgid "_Chat"
msgstr "_שיחה"
-#: ../libempathy-gtk/empathy-contact-menu.c:359
+#: ../libempathy-gtk/empathy-contact-menu.c:358
#: ../libempathy-gtk/empathy-individual-menu.c:625
msgctxt "menu item"
msgid "_Audio Call"
msgstr "שיחה _קולית"
-#: ../libempathy-gtk/empathy-contact-menu.c:390
+#: ../libempathy-gtk/empathy-contact-menu.c:389
#: ../libempathy-gtk/empathy-individual-menu.c:667
msgctxt "menu item"
msgid "_Video Call"
msgstr "שיחת _וידאו"
-#: ../libempathy-gtk/empathy-contact-menu.c:436
+#: ../libempathy-gtk/empathy-contact-menu.c:435
#: ../libempathy-gtk/empathy-individual-menu.c:710
#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "שיחות _קודמות"
-#: ../libempathy-gtk/empathy-contact-menu.c:458
+#: ../libempathy-gtk/empathy-contact-menu.c:457
#: ../libempathy-gtk/empathy-individual-menu.c:751
msgid "Send File"
msgstr "שליחת קובץ"
-#: ../libempathy-gtk/empathy-contact-menu.c:481
+#: ../libempathy-gtk/empathy-contact-menu.c:480
#: ../libempathy-gtk/empathy-individual-menu.c:793
msgid "Share My Desktop"
msgstr "שיתוף שולחן העבודה שלי"
-#: ../libempathy-gtk/empathy-contact-menu.c:521
+#: ../libempathy-gtk/empathy-contact-menu.c:520
#: ../libempathy-gtk/empathy-contact-widget.c:1751
#: ../libempathy-gtk/empathy-individual-menu.c:828
#: ../libempathy-gtk/empathy-individual-widget.c:1370
msgid "Favorite"
msgstr "מועדף"
-#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../libempathy-gtk/empathy-contact-menu.c:549
#: ../libempathy-gtk/empathy-individual-menu.c:856
msgid "Infor_mation"
msgstr "_מידע"
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:595
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "ע_ריכה"
-#: ../libempathy-gtk/empathy-contact-menu.c:650
+#: ../libempathy-gtk/empathy-contact-menu.c:649
#: ../libempathy-gtk/empathy-individual-menu.c:1037
#: ../src/empathy-chat-window.c:986
msgid "Inviting you to this room"
msgstr "מזמין/ה אותך לחדר זה"
-#: ../libempathy-gtk/empathy-contact-menu.c:681
+#: ../libempathy-gtk/empathy-contact-menu.c:680
#: ../libempathy-gtk/empathy-individual-menu.c:1084
msgid "_Invite to Chat Room"
msgstr "ה_זמנה לחדר שיחה"
@@ -2172,17 +2174,17 @@ msgid "New Conversation"
msgstr "שיחה חדשה"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:254
msgid "Send _Video"
msgstr "שליחת _וידאו"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:262
msgid "C_all"
msgstr "ה_תקשרות"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:272
msgid "New Call"
msgstr "שיחה חדשה"
@@ -2309,7 +2311,7 @@ msgstr "שמירת הודעת המ_צב החדשה"
msgid "Saved Status Messages"
msgstr "הודעות המצב שנשמרו"
-#: ../libempathy-gtk/empathy-theme-adium.c:1462
+#: ../libempathy-gtk/empathy-theme-adium.c:1468
msgid "Normal"
msgstr "רגיל"
@@ -3364,90 +3366,90 @@ msgstr "חיבור אוטומטי"
msgid "Manage Favorite Rooms"
msgstr "ניהול חדרי שיחה מועדפים"
-#: ../src/empathy-event-manager.c:504
+#: ../src/empathy-event-manager.c:505
msgid "Incoming video call"
msgstr "שיחה קולית נכנסת"
-#: ../src/empathy-event-manager.c:504
+#: ../src/empathy-event-manager.c:505
msgid "Incoming call"
msgstr "שיחה נכנסת"
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:509
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "‏%s מתקשר אליך עם וידאו, האם ברצונך לענות?"
-#: ../src/empathy-event-manager.c:509
+#: ../src/empathy-event-manager.c:510
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "‏%s מתקשר אליך, האם ברצונך לענות?"
-#: ../src/empathy-event-manager.c:512 ../src/empathy-event-manager.c:661
+#: ../src/empathy-event-manager.c:513 ../src/empathy-event-manager.c:662
#, c-format
msgid "Incoming call from %s"
msgstr "שיחה נכנסת מ־%s"
-#: ../src/empathy-event-manager.c:537
+#: ../src/empathy-event-manager.c:538
msgid "_Reject"
msgstr "_דחייה"
-#: ../src/empathy-event-manager.c:543
+#: ../src/empathy-event-manager.c:544
msgid "_Answer"
msgstr "_מענה"
-#: ../src/empathy-event-manager.c:661
+#: ../src/empathy-event-manager.c:662
#, c-format
msgid "Incoming video call from %s"
msgstr "שיחת וידאו נכנסת מ־%s"
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:735
msgid "Room invitation"
msgstr "הזמנה לחדר"
-#: ../src/empathy-event-manager.c:736
+#: ../src/empathy-event-manager.c:737
#, c-format
msgid "Invitation to join %s"
msgstr "הזמנה להצטרף ל־%s"
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:744
#, c-format
msgid "%s is inviting you to join %s"
msgstr "‏%s מזמין/ה אותך להצטרף אל %s"
-#: ../src/empathy-event-manager.c:751
+#: ../src/empathy-event-manager.c:752
msgid "_Decline"
msgstr "_סירוב"
-#: ../src/empathy-event-manager.c:756
+#: ../src/empathy-event-manager.c:757
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "ה_צטרפות"
-#: ../src/empathy-event-manager.c:783
+#: ../src/empathy-event-manager.c:784
#, c-format
msgid "%s invited you to join %s"
msgstr "‏%s הזמין/ה אותך להצטרף אל %s"
-#: ../src/empathy-event-manager.c:789
+#: ../src/empathy-event-manager.c:790
#, c-format
msgid "You have been invited to join %s"
msgstr "הוזמנת להצטרף אל %s"
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:841
#, c-format
msgid "Incoming file transfer from %s"
msgstr "העברת קבצים נכנסת מ־%s"
-#: ../src/empathy-event-manager.c:1010 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1011 ../src/empathy-main-window.c:377
msgid "Password required"
msgstr "נדרשת ססמה"
-#: ../src/empathy-event-manager.c:1066
+#: ../src/empathy-event-manager.c:1067
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s רוצה הרשאות לצפייה מתי המשתמש שלך מחובר"
-#: ../src/empathy-event-manager.c:1070
+#: ../src/empathy-event-manager.c:1071
#, c-format
msgid ""
"\n"
@@ -3851,22 +3853,22 @@ msgstr "הו רומיאו, רומיאו, מן אין שבת רומיאו?"
#. translators: Quote from Romeo & Julier, for chat theme preview
#: ../src/empathy-preferences.c:716
msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "התכחש לאביך וסרב לשמו;"
#. translators: Quote from Romeo & Julier, for chat theme preview
#: ../src/empathy-preferences.c:719
msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "או אם לא תסכים, אשבע לך באהבתי"
#. translators: Quote from Romeo & Julier, for chat theme preview
#: ../src/empathy-preferences.c:722
msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "ולא אהיה עוד בת קפולט."
#. translators: Quote from Romeo & Julier, for chat theme preview
#: ../src/empathy-preferences.c:725
msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "האם דיברתי די או שמא אוסיף לדבר?"
#. translators: Quote from Romeo & Julier, for chat theme preview
#: ../src/empathy-preferences.c:728
@@ -4161,7 +4163,7 @@ msgstr "סירוב"
msgid "Accept"
msgstr "אישור"
-#: ../src/empathy-notifications-approver.c:223
+#: ../src/empathy-notifications-approver.c:226
msgid "Provide"
msgstr "הזנה"
diff --git a/po/sl.po b/po/sl.po
index bb9d0e326..d0e9e82ed 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,9 +9,9 @@
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-27 18:13+0000\n"
-"PO-Revision-Date: 2011-04-28 21:21+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-05-13 14:28+0000\n"
+"PO-Revision-Date: 2011-05-15 13:15+0100\n"
"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
"Language-Team: Slovenščina <gnome-si@googlegroups.com>\n"
"Language: \n"
@@ -204,198 +204,206 @@ msgid "Pop up notifications when a contact logs out"
msgstr "Pokaži pojavna obvestila ob odjavi stikov"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Show Balance in contact list"
+msgstr "Pokaži stanje na računu v seznamu stikov"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
msgstr "Pokaži podobe"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show contact list in rooms"
msgstr "Pokaži seznam stikov v klepetalnicah"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show hint about closing the main window"
msgstr "Pokaži namig ob zapiranju glavnega okna"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show offline contacts"
msgstr "Pokaži tudi nepovezane stike"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show protocols"
msgstr "Pokaži protokole"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Spell checking languages"
msgstr "Jeziki za črkovanje"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The default folder to save file transfers in."
msgstr "Privzeta mapa za shranjevanje prejetih datotek."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "Zadnja mapa iz katere je bila izbrana podoba."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "The position for the chat window side pane"
msgstr "Položaj stranskega pladnja v klepetalnem oknu"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "Shranjen položaj (v točkah) stranskega pladnja v klepetalnem oknu."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
msgstr "Tema uporabljena za prikaz pogovorov v klepetalnih oknih."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use graphical smileys"
msgstr "Uporabi slikovne smeške"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use notification sounds"
msgstr "Uporabi zvoke obvestil"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use theme for chat rooms"
msgstr "Uporabi temo za klepetalnice"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "Ali naj program Empathy za pridobivanje mesta nahajanja uporablja GPS."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega omrežja."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja omrežje."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Ali je program Empathy preselil dnevniške zapise butterfly."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Ali naj se ob zagonu program Empathy samodejno prijavi v vaše račune."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje odsotnosti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "Ali naj program Empathy zaradi zasebnosti zmanjšuje natančnost položaja."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "Ali naj bodo vključena razvijalna orodja WebKit kot je na primer Web Inspector."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
msgstr "Ali naj upravljalnik omrežja samodejno vzpostavi in prekine povezavo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether to check words typed against the languages you want to check with."
msgstr "Ali naj se preverja črkovanje besed v želenih jezikih."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "Ali naj se pri pogovorih smeški pretvorijo v sličice."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "Ali naj se predvaja zvok ob prijavi stika v omrežje."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of contacts logging out of the network."
msgstr "Ali naj se predvaja zvok ob odjavi stika iz omrežja."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of events."
msgstr "Ali naj se predvaja zvok ob dogodkih."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of incoming messages."
msgstr "Ali naj se predvaja zvok ob prejetju novega sporočila."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of new conversations."
msgstr "Ali naj se predvaja zvok ob novih pogovorih."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "Ali naj se predvaja zvok ob pošiljanju sporočil."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound when logging into a network."
msgstr "Ali naj se predvaja zvok ob prijavi v omrežje."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound when logging out of a network."
msgstr "Ali naj se predvaja zvok ob odjavi iz omrežja."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play sound notifications when away or busy."
msgstr "Ali naj se predvaja zvok ob odsotnosti in zaposlenosti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "Ali naj se pojavi obvestilo, ko stik izklopi povezavo."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes online."
msgstr "Ali naj se pojavi obvestilo ob vzpostavitvi povezave stika."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporočila tudi, kadar je klepetalno okno že odprto, vendar ni v žarišču."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to show a popup notification when receiving a new message."
msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporočila."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Whether to show account balances in the contact list."
+msgstr "Ali naj se v seznamu stikov pokaže tudi stanje na računu."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show avatars for contacts in the contact list and chat windows."
msgstr "Ali naj bodo podobe stikov prikazane v seznamih in klepetalnih oknih."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
msgstr "Ali naj bodo na seznamu stikov prikazani tudi nepovezani stiki."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
msgstr "Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
msgstr "Ali naj bodo v seznamih stikov in klepetalnih oknih prikazani protokoli stikov."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
msgstr "Ali naj bo v klepetalnicah prikazan seznam stikov."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show the contact list in compact mode."
msgstr "Ali naj bo v skrčenem pogledu prikazan seznam stikov."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
msgstr "Ali naj bo pogovorno okno sporočila o zapiranju glavnega okna prikazano z gumbom 'x' v nazivni vrstici."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "Ali naj se za klepetalnice uporablja tema."
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
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 "Kateri kriterij naj se uporabi za razvrščanje seznama stikov. Privzeto je razvrščanje po imenu stika z vrednostjo \"ime\". Vrednost \"stanje\" pa razvrsti seznam glede na stanje stikov."
@@ -405,7 +413,7 @@ msgstr "Upravljanje s sporočanjem in računi VoIP"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2340
+#: ../src/empathy-accounts-dialog.c:2320
msgid "Messaging and VoIP Accounts"
msgstr "Sporočanje in računi VoIP"
@@ -454,165 +462,165 @@ msgid "The other participant is unable to transfer the file"
msgstr "Drug uporabnik ne more prenesti datoteke"
#: ../libempathy/empathy-tp-file.c:405
-#: ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-utils.c:384
msgid "Unknown reason"
msgstr "Neznan vzrok"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:305
msgid "Available"
msgstr "Na voljo"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:307
msgid "Busy"
msgstr "Zaposleno"
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:310
msgid "Away"
msgstr "Odsotno"
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:312
msgid "Invisible"
msgstr "Nevidno"
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:314
msgid "Offline"
msgstr "Nepovezano"
#. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:317
msgctxt "presence"
msgid "Unknown"
msgstr "Neznano"
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:356
msgid "No reason specified"
msgstr "Ni določenega razloga"
-#: ../libempathy/empathy-utils.c:357
-#: ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:414
msgid "Status is set to offline"
msgstr "Stanje je nastavljeno na brez povezave"
-#: ../libempathy/empathy-utils.c:359
-#: ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:394
msgid "Network error"
msgstr "Napaka omrežja"
-#: ../libempathy/empathy-utils.c:361
-#: ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:396
msgid "Authentication failed"
msgstr "Overitev ni uspela"
-#: ../libempathy/empathy-utils.c:363
-#: ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:398
msgid "Encryption error"
msgstr "Napaka šifriranja"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
msgid "Name in use"
msgstr "Ime je v uporabi"
-#: ../libempathy/empathy-utils.c:367
-#: ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:400
msgid "Certificate not provided"
msgstr "Potrdilo ni na voljo"
-#: ../libempathy/empathy-utils.c:369
-#: ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:370
+#: ../libempathy/empathy-utils.c:402
msgid "Certificate untrusted"
msgstr "Potrdilo ni overjeno"
-#: ../libempathy/empathy-utils.c:371
-#: ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:404
msgid "Certificate expired"
msgstr "Potrdilo je preteklo"
-#: ../libempathy/empathy-utils.c:373
-#: ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:374
+#: ../libempathy/empathy-utils.c:406
msgid "Certificate not activated"
msgstr "Potrdilo ni potrjeno"
-#: ../libempathy/empathy-utils.c:375
-#: ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:408
msgid "Certificate hostname mismatch"
msgstr "Neustrezno potrdilo gostitelja"
-#: ../libempathy/empathy-utils.c:377
-#: ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:378
+#: ../libempathy/empathy-utils.c:410
msgid "Certificate fingerprint mismatch"
msgstr "Neustrezen prstni odtis potrdila"
-#: ../libempathy/empathy-utils.c:379
-#: ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:412
msgid "Certificate self-signed"
msgstr "Potrdilo je samo-podpisano"
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:382
msgid "Certificate error"
msgstr "Napaka potrdila"
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:416
msgid "Encryption is not available"
msgstr "Šifriranje ni na voljo."
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:418
msgid "Certificate is invalid"
msgstr "Potrdilo je neveljavno."
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:420
msgid "Connection has been refused"
msgstr "Omrežna povezava je zavrnjena."
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:422
msgid "Connection can't be established"
msgstr "Povezave ni mogoče vzpostaviti."
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:424
msgid "Connection has been lost"
msgstr "Povezava je prekinjena."
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:426
msgid "This resource is already connected to the server"
msgstr "Vir je s strežnikom že povezan"
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:428
msgid "Connection has been replaced by a new connection using the same resource"
msgstr "Povezava je zamenjana z novo povezavo, ki uporablja isti vir."
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:431
msgid "The account already exists on the server"
msgstr "Račun na strežniku že obstaja"
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:433
msgid "Server is currently too busy to handle the connection"
msgstr "Strežnik je trenutno preveč zaposlen za upravljanje s povezavo."
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:435
msgid "Certificate has been revoked"
msgstr "Potrdilo je preklicano"
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:437
msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "Potrdilo ne uporablja varnega algoritma ali pa uporablja šibko šifriranje."
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:440
msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
msgstr "Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, ki je določena s šifrirno knjižnico."
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:603
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "Uporabniki v bližini"
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:608
msgid "Yahoo! Japan"
msgstr "Yahoo! Japan"
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:637
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:638
msgid "Facebook Chat"
msgstr "Facebook klepetanje"
@@ -747,19 +755,19 @@ msgstr "_Prekliči"
#. * like: "MyUserName on freenode".
#. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2410
#, c-format
msgid "%1$s on %2$s"
msgstr "%1$s na %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:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2436
#, c-format
msgid "%s Account"
msgstr "%s račun"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2440
msgid "New account"
msgstr "Nov račun"
@@ -1185,75 +1193,85 @@ msgstr "Vse datoteke"
msgid "Click to enlarge"
msgstr "Kliknite za povečavo"
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-chat.c:668
msgid "Failed to open private chat"
msgstr "Napaka med odpiranjem zasebnega klepeta"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:731
msgid "Topic not supported on this conversation"
msgstr "Tema ni podprta pri tem pogovoru"
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:737
msgid "You are not allowed to change the topic"
msgstr "Za spreminjanje teme nimate ustreznih dovoljenj."
-#: ../libempathy-gtk/empathy-chat.c:932
+#: ../libempathy-gtk/empathy-chat.c:923
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear: počisti vsa sporočila trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:935
+#: ../libempathy-gtk/empathy-chat.c:926
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <tema>: določi temo trenutnega pogovora"
-#: ../libempathy-gtk/empathy-chat.c:938
+#: ../libempathy-gtk/empathy-chat.c:929
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:941
+#: ../libempathy-gtk/empathy-chat.c:932
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
-#: ../libempathy-gtk/empathy-chat.c:946
+#: ../libempathy-gtk/empathy-chat.c:936
msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
msgstr "/part [<ID klepetalnice>] [<razlog>]: zapusti klepetalnico, privzeto je to trenutna klepetalnica"
-#: ../libempathy-gtk/empathy-chat.c:951
+#: ../libempathy-gtk/empathy-chat.c:940
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <ID stika> [<sporočilo>]: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:954
+#: ../libempathy-gtk/empathy-chat.c:943
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <ID stika> <sporočilo>: odpre zasebni klepet"
-#: ../libempathy-gtk/empathy-chat.c:957
+#: ../libempathy-gtk/empathy-chat.c:946
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <vzdevek>: spremeni vaš vzdevek na trenutnem strežniku"
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:949
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <sporočilo>: pošlje sporočilo DEJANJA v trenutni pogovor"
-#: ../libempathy-gtk/empathy-chat.c:963
+#: ../libempathy-gtk/empathy-chat.c:952
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>: pošlje <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:968
+#: ../libempathy-gtk/empathy-chat.c:957
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:978
+#: ../libempathy-gtk/empathy-chat.c:967
#, c-format
msgid "Usage: %s"
msgstr "Uporaba: %s"
-#: ../libempathy-gtk/empathy-chat.c:1017
+#: ../libempathy-gtk/empathy-chat.c:1006
msgid "Unknown command"
msgstr "Neznan ukaz"
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1132
msgid "Unknown command; see /help for the available commands"
msgstr "Neznan ukaz, za več si vpišite /help"
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1272
+msgid "insufficient balance to send message"
+msgstr "nezadostno stanje na računu za pošiljanje sporočil"
+
+#: ../libempathy-gtk/empathy-chat.c:1274
+msgid "not capable"
+msgstr "ni mogoče"
+
#: ../libempathy-gtk/empathy-chat.c:1281
msgid "offline"
msgstr "brez povezave"
@@ -1278,67 +1296,67 @@ msgstr "ni del programa"
msgid "unknown"
msgstr "neznano"
-#: ../libempathy-gtk/empathy-chat.c:1302
+#: ../libempathy-gtk/empathy-chat.c:1303
#, c-format
msgid "Error sending message '%s': %s"
msgstr "Napaka med pošiljanjem sporočila '%s': %s"
-#: ../libempathy-gtk/empathy-chat.c:1306
+#: ../libempathy-gtk/empathy-chat.c:1307
#, c-format
msgid "Error sending message: %s"
msgstr "Napaka med pošiljanjem sporočila: %s"
-#: ../libempathy-gtk/empathy-chat.c:1367
-#: ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1368
+#: ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "Tema:"
-#: ../libempathy-gtk/empathy-chat.c:1379
+#: ../libempathy-gtk/empathy-chat.c:1380
#, c-format
msgid "Topic set to: %s"
msgstr "Tema je določena na: %s"
-#: ../libempathy-gtk/empathy-chat.c:1381
+#: ../libempathy-gtk/empathy-chat.c:1382
msgid "No topic defined"
msgstr "Ni določene teme"
-#: ../libempathy-gtk/empathy-chat.c:1888
+#: ../libempathy-gtk/empathy-chat.c:1889
msgid "(No Suggestions)"
msgstr "(Ni predlogov)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1956
+#: ../libempathy-gtk/empathy-chat.c:1957
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "Dodaj '%s' v slovar"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1993
+#: ../libempathy-gtk/empathy-chat.c:1994
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "Dodaj '%s' v slovar %s"
-#: ../libempathy-gtk/empathy-chat.c:2050
+#: ../libempathy-gtk/empathy-chat.c:2051
msgid "Insert Smiley"
msgstr "Vstavi smeška"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2069
#: ../libempathy-gtk/empathy-ui-utils.c:1808
msgid "_Send"
msgstr "_Pošlji"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2103
+#: ../libempathy-gtk/empathy-chat.c:2104
msgid "_Spelling Suggestions"
msgstr "Predlogi čr_kovalnika"
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2193
msgid "Failed to retrieve recent logs"
msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
-#: ../libempathy-gtk/empathy-chat.c:2303
+#: ../libempathy-gtk/empathy-chat.c:2304
#, c-format
msgid "%s has disconnected"
msgstr "%s je prekinil povezavo"
@@ -1346,12 +1364,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:2310
+#: ../libempathy-gtk/empathy-chat.c:2311
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%2$s je izgnal %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2314
#, c-format
msgid "%s was kicked"
msgstr "%s je bil izgnan"
@@ -1359,17 +1377,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:2321
+#: ../libempathy-gtk/empathy-chat.c:2322
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%2$s je izobčil %1$s"
-#: ../libempathy-gtk/empathy-chat.c:2324
+#: ../libempathy-gtk/empathy-chat.c:2325
#, c-format
msgid "%s was banned"
msgstr "%s je izobčen"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2329
#, c-format
msgid "%s has left the room"
msgstr "%s je zapustil klepetalnico"
@@ -1379,94 +1397,101 @@ 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:2337
+#: ../libempathy-gtk/empathy-chat.c:2338
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2362
+#: ../libempathy-gtk/empathy-chat.c:2363
#, c-format
msgid "%s has joined the room"
msgstr "%s je vstopil v klepetalnico"
-#: ../libempathy-gtk/empathy-chat.c:2387
+#: ../libempathy-gtk/empathy-chat.c:2388
#, c-format
msgid "%s is now known as %s"
msgstr "%s je preimenovan v %s"
-#: ../libempathy-gtk/empathy-chat.c:2526
+#: ../libempathy-gtk/empathy-chat.c:2527
#: ../src/empathy-streamed-media-window.c:1957
-#: ../src/empathy-event-manager.c:1126
+#: ../src/empathy-event-manager.c:1117
msgid "Disconnected"
msgstr "Prekinjena povezava"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3158
+#: ../libempathy-gtk/empathy-chat.c:3185
msgid "Would you like to store this password?"
msgstr "Ali želite shraniti geslo?"
-#: ../libempathy-gtk/empathy-chat.c:3164
+#: ../libempathy-gtk/empathy-chat.c:3191
msgid "Remember"
msgstr "Zapomni si"
-#: ../libempathy-gtk/empathy-chat.c:3174
+#: ../libempathy-gtk/empathy-chat.c:3201
msgid "Not now"
msgstr "Ne zdaj"
-#: ../libempathy-gtk/empathy-chat.c:3218
+#: ../libempathy-gtk/empathy-chat.c:3245
msgid "Retry"
msgstr "Poskusi znova"
-#: ../libempathy-gtk/empathy-chat.c:3222
+#: ../libempathy-gtk/empathy-chat.c:3249
msgid "Wrong password; please try again:"
msgstr "Napačno geslo; poskusite znova:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3339
+#: ../libempathy-gtk/empathy-chat.c:3378
msgid "This room is protected by a password:"
msgstr "Klepetalnica je zaščitena z geslom:"
-#: ../libempathy-gtk/empathy-chat.c:3366
+#: ../libempathy-gtk/empathy-chat.c:3405
msgid "Join"
msgstr "Pridruži se"
-#: ../libempathy-gtk/empathy-chat.c:3536
-#: ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3604
+#: ../src/empathy-event-manager.c:1138
msgid "Connected"
msgstr "Povezano"
-#: ../libempathy-gtk/empathy-chat.c:3589
+#: ../libempathy-gtk/empathy-chat.c:3659
#: ../libempathy-gtk/empathy-log-window.c:650
msgid "Conversation"
msgstr "Pogovor"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3664
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
msgid "Unknown or invalid identifier"
msgstr "Neznano ali neveljavno določilo"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
msgid "Contact blocking temporarily unavailable"
msgstr "Blokiranje stikov začasno ni na voljo"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
msgid "Contact blocking unavailable"
msgstr "Blokiranje stika ni na voljo"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
msgid "Permission Denied"
msgstr "Dovoljenje je zavrnjeno"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
msgid "Could not block contact"
msgstr "Stika ni mogoče blokirati"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
msgid "Edit Blocked Contacts"
msgstr "Uredi blokirane stike"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-individual-widget.c:1479
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
@@ -1477,13 +1502,13 @@ msgstr "Račun:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:962
+#: ../libempathy-gtk/empathy-theme-adium.c:1002
msgid "_Copy Link Address"
msgstr "Kopiraj _naslov povezave"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:969
+#: ../libempathy-gtk/empathy-theme-adium.c:1009
msgid "_Open Link"
msgstr "_Odpri povezavo"
@@ -1554,38 +1579,38 @@ msgid "Favorite People"
msgstr "Priljubljene osebe"
#: ../libempathy-gtk/empathy-contact-list-view.c:1987
-#: ../libempathy-gtk/empathy-individual-view.c:2343
+#: ../libempathy-gtk/empathy-individual-view.c:2386
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "Ali zares želite odstraniti skupino '%s'?"
#: ../libempathy-gtk/empathy-contact-list-view.c:1989
-#: ../libempathy-gtk/empathy-individual-view.c:2346
+#: ../libempathy-gtk/empathy-individual-view.c:2389
msgid "Removing group"
msgstr "Odstranjevanje skupine"
#. Remove
#: ../libempathy-gtk/empathy-contact-list-view.c:2038
#: ../libempathy-gtk/empathy-contact-list-view.c:2115
-#: ../libempathy-gtk/empathy-individual-view.c:2401
-#: ../libempathy-gtk/empathy-individual-view.c:2594
+#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2637
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "_Odstrani"
#: ../libempathy-gtk/empathy-contact-list-view.c:2068
-#: ../libempathy-gtk/empathy-individual-view.c:2465
+#: ../libempathy-gtk/empathy-individual-view.c:2508
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "Ali zares želite odstraniti stik '%s'?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2070
-#: ../libempathy-gtk/empathy-individual-view.c:2486
+#: ../libempathy-gtk/empathy-individual-view.c:2529
msgid "Removing contact"
msgstr "Odstranjevanje stika"
#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "_Dodaj stik ..."
@@ -1594,81 +1619,81 @@ msgid "_Block Contact"
msgstr "_Blokiraj stik"
#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-individual-menu.c:536
+#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "_Klepet"
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:358
+#: ../libempathy-gtk/empathy-individual-menu.c:625
msgctxt "menu item"
msgid "_Audio Call"
msgstr "_Zvočni klic"
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:389
+#: ../libempathy-gtk/empathy-individual-menu.c:667
msgctxt "menu item"
msgid "_Video Call"
msgstr "_Video klic"
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:435
+#: ../libempathy-gtk/empathy-individual-menu.c:710
+#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "Predhodni po_govori"
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:457
+#: ../libempathy-gtk/empathy-individual-menu.c:751
msgid "Send File"
msgstr "Pošlji datoteko"
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:480
+#: ../libempathy-gtk/empathy-individual-menu.c:793
msgid "Share My Desktop"
msgstr "Souporaba namizja"
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1761
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:1751
+#: ../libempathy-gtk/empathy-individual-menu.c:828
#: ../libempathy-gtk/empathy-individual-widget.c:1370
msgid "Favorite"
msgstr "Priljubljeno"
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:549
+#: ../libempathy-gtk/empathy-individual-menu.c:856
msgid "Infor_mation"
msgstr "_Podrobnosti"
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:595
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "_Uredi"
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:649
+#: ../libempathy-gtk/empathy-individual-menu.c:1037
+#: ../src/empathy-chat-window.c:986
msgid "Inviting you to this room"
msgstr "Vabila v klepetalnico"
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:680
+#: ../libempathy-gtk/empathy-individual-menu.c:1084
msgid "_Invite to Chat Room"
msgstr "_Povabi v klepetalnico"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
msgid "Search contacts"
msgstr "Iskanje stikov"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
msgid "Search: "
msgstr "Poišči:"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
msgid "_Add Contact"
msgstr "_Dodaj stik"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
msgid "No contacts found"
msgstr "Ni najdenih stikov."
@@ -1821,8 +1846,8 @@ msgstr "Zemljepisna širina:"
msgid "Altitude:"
msgstr "Nadmorska višina:"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:886
+#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-contact-widget.c:876
#: ../libempathy-gtk/empathy-individual-widget.c:616
#: ../libempathy-gtk/empathy-individual-widget.c:631
#: ../src/empathy-preferences.ui.h:12
@@ -1830,23 +1855,23 @@ msgid "Location"
msgstr "Mesto"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:888
+#: ../libempathy-gtk/empathy-contact-widget.c:878
#: ../libempathy-gtk/empathy-individual-widget.c:633
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:940
+#: ../libempathy-gtk/empathy-contact-widget.c:930
#: ../libempathy-gtk/empathy-individual-widget.c:682
msgid "%B %e, %Y at %R UTC"
msgstr "%e.%B.%Y ob %R UTC"
-#: ../libempathy-gtk/empathy-contact-widget.c:1022
+#: ../libempathy-gtk/empathy-contact-widget.c:1012
#: ../libempathy-gtk/empathy-individual-widget.c:917
msgid "Save Avatar"
msgstr "Shrani podobo"
-#: ../libempathy-gtk/empathy-contact-widget.c:1078
+#: ../libempathy-gtk/empathy-contact-widget.c:1068
#: ../libempathy-gtk/empathy-individual-widget.c:975
msgid "Unable to save avatar"
msgstr "Ni mogoče shraniti podobe"
@@ -1912,7 +1937,7 @@ msgid "Select"
msgstr "Izbor"
#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../src/empathy-main-window.c:1770
msgid "Group"
msgstr "Skupina"
@@ -1957,23 +1982,29 @@ msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj."
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:582
+#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:904
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "_Uredi"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:930
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "_Poveži stike ..."
-#: ../libempathy-gtk/empathy-individual-view.c:2308
+#: ../libempathy-gtk/empathy-individual-view.c:2351
msgid "Delete and _Block"
msgstr "Izbriši in _blokiraj"
-#: ../libempathy-gtk/empathy-individual-view.c:2474
+#: ../libempathy-gtk/empathy-individual-view.c:2517
#, c-format
msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
msgstr "Ali res želite odstraniti povezan stik '%s'? S tem bo odstranjeni tudi vsi stiki, ki so opredeljeni kot povezani."
@@ -2096,27 +2127,27 @@ msgid "Contact ID:"
msgstr "ID stika:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:258
msgid "C_hat"
msgstr "Kle_pet"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:277
msgid "New Conversation"
msgstr "Nov pogovor"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:254
msgid "Send _Video"
msgstr "Pošlji _video"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:262
msgid "C_all"
msgstr "_Kliči"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:272
msgid "New Call"
msgstr "Nov klic"
@@ -2243,19 +2274,23 @@ msgstr "Shrani _nova sporočila stanja"
msgid "Saved Status Messages"
msgstr "Shranjena sporočila stanja"
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-adium.c:1468
+msgid "Normal"
+msgstr "Običajno"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
msgid "Classic"
msgstr "Običajna"
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:69
msgid "Simple"
msgstr "Enostavna"
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:70
msgid "Clean"
msgstr "Čista"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:71
msgid "Blue"
msgstr "Modro"
@@ -2663,8 +2698,8 @@ msgid "Select the accounts you want to import:"
msgstr "Izbor račune za uvoz:"
#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "Yes"
msgstr "Da"
@@ -2766,7 +2801,7 @@ msgstr "Ali želite odstraniti %s iz računalnika?"
msgid "This will not remove your account on the server."
msgstr "To ne bo odstranilo vašega računa s strežnika."
-#: ../src/empathy-accounts-dialog.c:1434
+#: ../src/empathy-accounts-dialog.c:1432
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2775,15 +2810,15 @@ msgstr ""
"Ali ste prepričani, da želite nadaljevati?"
#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1652
+#: ../src/empathy-accounts-dialog.c:1643
msgid "_Enable"
msgstr "_Omogoči"
-#: ../src/empathy-accounts-dialog.c:1653
+#: ../src/empathy-accounts-dialog.c:1644
msgid "_Disable"
msgstr "O_nemogoči"
-#: ../src/empathy-accounts-dialog.c:2174
+#: ../src/empathy-accounts-dialog.c:2154
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2815,11 +2850,11 @@ msgstr "_Dodaj ..."
msgid "_Import…"
msgstr "_Uvozi ..."
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
msgid " - Empathy authentication client"
msgstr "- Empathy odjemalec overitve"
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
msgid "Empathy authentication client"
msgstr "Empathy odjemalec overitve"
@@ -3079,12 +3114,12 @@ msgid "_Call"
msgstr "Po_kliči"
#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window.ui.h:30
msgid "_View"
msgstr "_Pogled"
-#: ../src/empathy-chat-window.c:474
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
@@ -3093,7 +3128,7 @@ msgstr[1] "%s (%d neprebrano)"
msgstr[2] "%s (%d neprebrani)"
msgstr[3] "%s (%d neprebrana)"
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
@@ -3102,7 +3137,7 @@ msgstr[1] "%s (in %u drugo)"
msgstr[2] "%s (in %u drugi)"
msgstr[3] "%s (in %u druga)"
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:508
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
@@ -3111,7 +3146,7 @@ msgstr[1] "%s (%d neprebrano od drugih)"
msgstr[2] "%s (%d neprebrani od drugih)"
msgstr[3] "%s (%d neprebrana od drugih)"
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:517
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
@@ -3120,7 +3155,20 @@ msgstr[1] "%s (%d neprebrano od vseh)"
msgstr[2] "%s (%d neprebrani od vseh)"
msgstr[3] "%s (%d neprebrana od vseh)"
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:732
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:742
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Pošiljanje %d sporočil"
+msgstr[1] "Pošiljanje %d sporočila"
+msgstr[2] "Pošiljanje %d sporočil"
+msgstr[3] "Pošiljanje %d sporočil"
+
+#: ../src/empathy-chat-window.c:764
msgid "Typing a message."
msgstr "Pisanje sporočila."
@@ -3157,7 +3205,7 @@ msgid "Notify for All Messages"
msgstr "Obvesti o vseh novih sporočilih"
#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Contents"
msgstr "_Vsebina"
@@ -3170,7 +3218,7 @@ msgid "_Detach Tab"
msgstr "_Odpni zavihek"
#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_Edit"
msgstr "_Uredi"
@@ -3179,7 +3227,7 @@ msgid "_Favorite Chat Room"
msgstr "_Priljubljena klepetalnica"
#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Help"
msgstr "Pomo_č"
@@ -3220,92 +3268,92 @@ msgstr "Samodejno povezovanje"
msgid "Manage Favorite Rooms"
msgstr "Upravljanje priljubljenih klepetalnic"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:505
msgid "Incoming video call"
msgstr "Dohodni video klic"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:505
msgid "Incoming call"
msgstr "Dohodni klic"
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:509
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s vas kliče preko video kanala. Ali se želite javiti?"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:510
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s vas kliče. Ali se želite javiti?"
-#: ../src/empathy-event-manager.c:515
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:662
#, c-format
msgid "Incoming call from %s"
msgstr "Dohodni klic od %s"
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:538
msgid "_Reject"
msgstr "_Zavrni"
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:544
msgid "_Answer"
msgstr "_Odgovori"
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:662
#, c-format
msgid "Incoming video call from %s"
msgstr "Dohodni video klic od %s"
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:735
msgid "Room invitation"
msgstr "Vabilo v klepetalnico"
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:737
#, c-format
msgid "Invitation to join %s"
msgstr "Povabilo v %s"
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:744
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s vas vabi, da se pridružite v %s"
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:752
msgid "_Decline"
msgstr "_Odkloni"
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:757
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "_Pridruži se"
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:784
#, c-format
msgid "%s invited you to join %s"
msgstr "%s vas je povabil v %s"
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:790
#, c-format
msgid "You have been invited to join %s"
msgstr "Povabljeni ste v %s"
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:841
#, c-format
msgid "Incoming file transfer from %s"
msgstr "Prihajajoč prenos datoteke od %s"
-#: ../src/empathy-event-manager.c:1020
-#: ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1011
+#: ../src/empathy-main-window.c:377
msgid "Password required"
msgstr "Zahtevano geslo"
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1067
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s želi dovoljenje za pogled dosegljivosti"
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1071
#, c-format
msgid ""
"\n"
@@ -3392,7 +3440,7 @@ msgid "File transfer completed"
msgstr "Prenos datoteke je končan"
#: ../src/empathy-ft-manager.c:616
-#: ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:780
msgid "Waiting for the other participant's response"
msgstr "Čakanje na odziv drugega udeleženca"
@@ -3408,15 +3456,15 @@ msgstr "Preverjanje celovitosti \"%s\""
msgid "Hashing \"%s\""
msgstr "Ustvarjanje razpršila \"%s\""
-#: ../src/empathy-ft-manager.c:1029
+#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1041
+#: ../src/empathy-ft-manager.c:1038
msgid "File"
msgstr "Datoteka"
-#: ../src/empathy-ft-manager.c:1063
+#: ../src/empathy-ft-manager.c:1060
msgid "Remaining"
msgstr "Preostalo"
@@ -3449,39 +3497,55 @@ msgstr "Protokol"
msgid "Source"
msgstr "Vir"
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:394
msgid "Provide Password"
msgstr "Vpis gesla"
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:400
msgid "Disconnect"
msgstr "Prekini povezavo"
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:540
msgid "No match found"
msgstr "Ni najdenih zadetkov."
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:695
msgid "Reconnect"
msgstr "Ponovno se poveži"
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:701
msgid "Edit Account"
msgstr "Uredi račun"
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:707
msgid "Close"
msgstr "Zapri"
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:849
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Povišaj %s (%s) ..."
+
+#: ../src/empathy-main-window.c:924
+msgid "Top up account credit"
+msgstr "Povišaj znesek na računu"
+
+#. top up button
+#: ../src/empathy-main-window.c:999
+msgid "Top Up..."
+msgstr "Povišaj ..."
+
+#: ../src/empathy-main-window.c:1752
msgid "Contact"
msgstr "Stik"
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2101
msgid "Contact List"
msgstr "Seznam stikov"
-#: ../src/empathy-main-window.c:1881
+#: ../src/empathy-main-window.c:2219
msgid "Show and edit accounts"
msgstr "Pokaži in uredi račune"
@@ -3490,88 +3554,92 @@ msgid "Contacts on a _Map"
msgstr "Stiki na _zemljevidu"
#: ../src/empathy-main-window.ui.h:2
+msgid "Credit Balance"
+msgstr "Stanje na računu"
+
+#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
msgstr "Najdi v _seznamu stikov"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "Pridruži se _priljubljenim"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "Uredi priljubljene"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "_Običajna velikost"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:7
#: ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "Nov _klic ..."
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "Običajna velikost s _podobami"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "_Možnosti"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "Pokaži _protokole"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "Razvrsti po _imenu"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "Razvrsti po _stanju"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "_Računi"
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Blocked Contacts"
msgstr "_Blokirani stiki"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:17
msgid "_Compact Size"
msgstr "_Skrčen pogled"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:19
msgid "_Debug"
msgstr "_Razhroščevanje"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "Prenosi _datotek"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:23
msgid "_Join…"
msgstr "_Pridruži se"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
#: ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "_Nov pogovor ..."
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Offline Contacts"
msgstr "Nepri_sotni stiki"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Personal Information"
msgstr "_Osebni podatki"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_Room"
msgstr "_Klepetalnica"
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window.ui.h:29
msgid "_Search for Contacts…"
msgstr "Iskanje _stikov ..."
@@ -3585,7 +3653,7 @@ msgstr "Člani"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
#, c-format
msgid ""
"%s\n"
@@ -3598,16 +3666,16 @@ msgstr ""
"Zahtevano geslo: %s\n"
"Člani: %s"
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "No"
msgstr "Ne"
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
msgid "Could not start room listing"
msgstr "Seznama klepetalnic ni bilo mogoče začeti"
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
msgid "Could not stop room listing"
msgstr "Seznama klepetalnic ni bilo mogoče dokončati"
@@ -3635,39 +3703,79 @@ msgstr "Seznam klepetalnic"
msgid "_Room:"
msgstr "_Klepetalnica:"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:147
msgid "Message received"
msgstr "Sporočilo je bilo prejeto"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:148
msgid "Message sent"
msgstr "Sporočilo je bilo poslano"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:149
msgid "New conversation"
msgstr "Nov pogovor"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:150
msgid "Contact goes online"
msgstr "Stik se je povezal"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:151
msgid "Contact goes offline"
msgstr "Stik se je odjavil"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:152
msgid "Account connected"
msgstr "Povezava z računom je vzpostavljena"
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:153
msgid "Account disconnected"
msgstr "Povezava z računom je prekinjena"
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:450
msgid "Language"
msgstr "Jezik"
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:700
+msgid "Juliet"
+msgstr "Julija"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:707
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:713
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O, Romeo, Romeo, zakaj li Romeo?!"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:716
+msgid "Deny thy father and refuse thy name;"
+msgstr "Odreci se rodu, odvrzi ime,"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:719
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "če ne, prisezi večno mi ljubezen,"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:722
+msgid "And I'll no longer be a Capulet."
+msgstr "in dlje nisem Kapuletova."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:725
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Al' bi poslušal še, al govoril? "
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:728
+msgid "Juliet has disconnected"
+msgstr "Julija je prekinila povezavo."
+
+#: ../src/empathy-preferences.c:962
msgid "Preferences"
msgstr "Možnosti"
@@ -3760,43 +3868,47 @@ msgid "The list of languages reflects only the languages for which you have a di
msgstr "Na seznamu jezikov so le tisti, za katere imate nameščene slovarje."
#: ../src/empathy-preferences.ui.h:24
+msgid "Theme Variant:"
+msgstr "Različica teme:"
+
+#: ../src/empathy-preferences.ui.h:25
msgid "Themes"
msgstr "Teme"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
msgid "_Automatically connect on startup"
msgstr "Samodejno _poveži ob zagonu "
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Cellphone"
msgstr "_Mobilni telefon"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable bubble notifications"
msgstr "_Omogoči obvestila v oblačkih"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_Enable sound notifications"
msgstr "_Omogoči zvočna obvestila"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Network (IP, Wi-Fi)"
msgstr "_Omrežje (IP, Wifi)"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Open new chats in separate windows"
msgstr "N_ove klepete odpiraj v ločenih oknih"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
msgid "_Publish location to my contacts"
msgstr "O_bjavi mesto mojim stikom"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
msgid "_Reduce location accuracy"
msgstr "_Zmanjšaj natančnost mesta"
@@ -3940,7 +4052,7 @@ msgstr "Odkloni"
msgid "Accept"
msgstr "Sprejmi"
-#: ../src/empathy-notifications-approver.c:223
+#: ../src/empathy-notifications-approver.c:226
msgid "Provide"
msgstr "Zagotovi"
@@ -3954,84 +4066,117 @@ msgstr "Zgrešen klic od %s"
msgid "%s just tried to call you, but you were in another call."
msgstr "%s je klical med drugim pogovorom."
+#: ../libempathy-gtk/empathy-search-bar.c:282
+msgid "_Match case"
+msgstr "_Upoštevaj velikost črk"
+
#~ msgid "_Enabled"
#~ msgstr "_Omogoči"
+
#~ msgid "%s is now offline."
#~ msgstr "%s ni povezan."
+
#~ msgid "%s is now online."
#~ msgstr "%s je povezan."
+
#~ msgid "Context"
#~ msgstr "Vsebina"
+
#~ msgid "Add _New Preset"
#~ msgstr "Dodaj novo _predlogo"
+
#~ msgid "Saved Presets"
#~ msgstr "Shranjene predloge"
+
#~ msgid "The hash of the received file and the sent one do not match"
#~ msgstr "Razpršili prejete in poslane datoteke se ne skladata"
+
#~ msgid "Subscription requested by %s"
#~ msgstr "%s zahteva naročilo"
+
#~ msgid "Empathy has asked about importing accounts"
#~ msgstr "Program Empathy zahteva podrobnosti o uvozu računov"
+
#~ msgid ""
#~ "Whether Empathy has asked about importing accounts from other programs."
#~ msgstr ""
#~ "Ali naj program Empathy zahteva podrobnosti o uvozu računov iz drugih "
#~ "programov."
+
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "Uporabi _Yahoo! Japan"
#~ msgctxt "Link individual (contextual menu)"
+
#~ msgid "_Link…"
#~ msgstr "_Poveži ..."
+
#~ msgid "_Character set:"
#~ msgstr "_Znakovni nabor:"
+
#~ msgid "_E-mail address:"
#~ msgstr "_Elektronski naslov:"
+
#~ msgid "_Nickname:"
#~ msgstr "_Vzdevek:"
+
#~ msgid "<b>Location</b>, "
#~ msgstr "<b>Mesto</b>, "
+
#~ msgid "Your contact list is empty"
#~ msgstr "Seznam stikov je prazen"
+
#~ msgid "Send and receive messages"
#~ msgstr "Pošiljanje in prejemanje hipnih sporočil"
+
#~ msgid "Failed to reconnect this chat"
#~ msgstr "Ponovna povezava s tem klepetom ni bila uspešna"
+
#~ msgid "Failed to join chat room"
#~ msgstr "Napaka med pridruževanjem klepetalnici"
+
#~ msgid "Select a destination"
#~ msgstr "Izbor cilja"
+
#~ msgid "Important Room"
#~ msgstr "Pomembna klepetalnica"
+
#~ msgid "MC 4 accounts have been imported"
#~ msgstr "MC 4 računi so boli uvoženi"
+
#~ msgid "MC 4 accounts have been imported."
#~ msgstr "MC 4 računi so bili uvoženi."
+
#~ msgid "Hostname of the proxy for outbound requests."
#~ msgstr "Ime gostitelja posredniškega strežnika odhodnih zahtev."
+
#~ msgid ""
#~ "Look up the DNS SRV record at the service's domain for the host name of a "
#~ "STUN server."
#~ msgstr ""
#~ "Preglej vpis DNS SRV domene storitve za ime gostitelja strežnika STUN."
+
#~ msgid "Port of the proxy for outbound requests."
#~ msgstr "Ime gostitelja posredniškega strežnika odhodnih zahtev."
+
#~ msgid ""
#~ "The username for SIP authentication, if different from the SIP URI\n"
#~ "username."
#~ msgstr ""
#~ "Uporabniško ime za SIP overitev v kolikor, da je drugačno od SIP URI\n"
#~ "uporabniškega imena."
+
#~ msgid ""
#~ "Update the registration binding if the external address for the client is "
#~ "discovered to be different from the local binding."
#~ msgstr ""
#~ "Posodobi povezavo vpisnika v primeru, da je zunanji naslov odjemalca "
#~ "drugačen od krajevne povezave."
+
#~ msgid ""
#~ "Use the loose routing behavior and the Route header as recommended in RFC "
#~ "3261."
#~ msgstr ""
#~ "Uporabi ohlapno usmerjanje in glavo usmerjevalnika kot priporoča RFC 3261."
+
#~ msgid "%s account"
#~ msgstr "%s račun"
-
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index af94ddc77..d8a75cb0c 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1538,6 +1538,48 @@ chat_window_new_message_cb (EmpathyChat *chat,
chat_window_icon_update (priv, TRUE);
}
+static void
+chat_window_command_part (EmpathyChat *chat,
+ GStrv strv)
+{
+ EmpathyChat *chat_to_be_parted;
+ EmpathyTpChat *tp_chat = NULL;
+
+ if (strv[1] == NULL) {
+ /* No chatroom ID specified */
+ tp_chat = empathy_chat_get_tp_chat (chat);
+ if (tp_chat)
+ empathy_tp_chat_leave (tp_chat, "");
+ return;
+ }
+ chat_to_be_parted = empathy_chat_window_find_chat (
+ empathy_chat_get_account (chat), strv[1], FALSE);
+
+ if (chat_to_be_parted != NULL) {
+ /* Found a chatroom matching the specified ID */
+ tp_chat = empathy_chat_get_tp_chat (chat_to_be_parted);
+ if (tp_chat)
+ empathy_tp_chat_leave (tp_chat, strv[2]);
+ } else {
+ gchar *message;
+
+ /* Going by the syntax of PART command:
+ *
+ * /PART [<chatroom-ID>] [<reason>]
+ *
+ * Chatroom-ID is not a must to specify a reason.
+ * If strv[1] (chatroom-ID) is not a valid identifier for a connected
+ * MUC then the current chatroom should be parted and srtv[1] should
+ * be treated as part of the optional part-message. */
+ message = g_strconcat (strv[1], " ", strv[2], NULL);
+ tp_chat = empathy_chat_get_tp_chat (chat);
+ if (tp_chat)
+ empathy_tp_chat_leave (tp_chat, message);
+
+ g_free (message);
+ }
+}
+
static GtkNotebook *
notebook_create_window_cb (GtkNotebook *source,
GtkWidget *page,
@@ -1623,6 +1665,9 @@ chat_window_page_added_cb (GtkNotebook *notebook,
g_signal_connect (chat, "new-message",
G_CALLBACK (chat_window_new_message_cb),
window);
+ g_signal_connect (chat, "part-command-entered",
+ G_CALLBACK (chat_window_command_part),
+ NULL);
g_signal_connect (chat, "notify::tp-chat",
G_CALLBACK (chat_window_update_chat_tab),
window);
@@ -1832,7 +1877,7 @@ chat_window_drag_data_received (GtkWidget *widget,
if (!chat) {
empathy_chat_with_contact_id (
- account, contact_id, gtk_get_current_event_time ());
+ account, contact_id, empathy_get_current_action_time ());
g_strfreev (strv);
return;
@@ -2441,6 +2486,11 @@ empathy_chat_window_present_chat (EmpathyChat *chat,
window = empathy_chat_window_get_default (empathy_chat_is_room (chat));
if (!window) {
window = empathy_chat_window_new ();
+
+ /* we want to display the newly created window even if we don't present
+ * it */
+ priv = GET_PRIV (window);
+ gtk_widget_show (priv->dialog);
}
empathy_chat_window_add_chat (window, chat);
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 2786e0738..00d2c8ab8 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -43,6 +43,7 @@
#include <libempathy-gtk/empathy-images.h>
#include <libempathy-gtk/empathy-contact-dialogs.h>
#include <libempathy-gtk/empathy-sound-manager.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
#include "empathy-event-manager.h"
#include "empathy-main-window.h"
@@ -316,7 +317,7 @@ event_manager_approval_approve (EventManagerApproval *approval)
}
else
{
- timestamp = tp_user_action_time_from_x11 (gtk_get_current_event_time ());
+ timestamp = empathy_get_current_action_time ();
}
g_assert (approval->operation != NULL);
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 0cef0e10f..0ac08c856 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -1584,7 +1584,7 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
join_fav_account_sig_ctx *ctx;
ctx = join_fav_account_sig_ctx_new (account, chatroom,
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
ctx->sig_id = g_signal_connect_data (account, "status-changed",
G_CALLBACK (account_status_changed_cb), ctx,
@@ -1595,7 +1595,7 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
return;
}
- join_chatroom (chatroom, gtk_get_current_event_time ());
+ join_chatroom (chatroom, empathy_get_current_action_time ());
}
static void
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 388a1e506..a09a5f710 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -683,8 +683,8 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *dialog)
g_strstrip (room_name);
DEBUG ("Requesting channel for '%s'", room_name);
- empathy_join_muc (account, room_name,
- gtk_get_current_event_time ());
+
+ empathy_join_muc (account, room_name, empathy_get_current_action_time ());
g_free (room_name);
}
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c
index 50d3f8ace..100a6b9f1 100644
--- a/src/empathy-streamed-media-window.c
+++ b/src/empathy-streamed-media-window.c
@@ -2713,7 +2713,7 @@ start_call (EmpathyStreamedMediaWindow *self)
priv->call_started = TRUE;
empathy_streamed_media_handler_start_call (priv->handler,
- gtk_get_current_event_time ());
+ empathy_get_current_action_time ());
if (empathy_streamed_media_handler_has_initial_video (priv->handler))
{