diff options
28 files changed, 3364 insertions, 1893 deletions
diff --git a/configure.ac b/configure.ac index a72c6f7ad..241fedfdc 100644 --- a/configure.ac +++ b/configure.ac @@ -233,6 +233,16 @@ else if test "x$have_nm" = "xyes"; then AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib]) have_connman=no + else + PKG_CHECK_MODULES(NETWORK_MANAGER, + [ + libnm-glib >= $NETWORK_MANAGER_REQUIRED + ], have_nm="yes", have_nm="no") + + if test "x$have_nm" = "xyes"; then + AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib]) + have_connman=no + fi fi fi diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c index de777f2fb..4f38865f6 100644 --- a/libempathy-gtk/empathy-chat-text-view.c +++ b/libempathy-gtk/empathy-chat-text-view.c @@ -73,6 +73,8 @@ typedef struct { static void chat_text_view_iface_init (EmpathyChatViewIface *iface); +static void chat_text_view_copy_clipboard (EmpathyChatView *view); + G_DEFINE_TYPE_WITH_CODE (EmpathyChatTextView, empathy_chat_text_view, GTK_TYPE_TEXT_VIEW, G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CHAT_VIEW, @@ -580,10 +582,17 @@ chat_text_view_finalize (GObject *object) } static void +text_view_copy_clipboard (GtkTextView *text_view) +{ + chat_text_view_copy_clipboard (EMPATHY_CHAT_VIEW (text_view)); +} + +static void empathy_chat_text_view_class_init (EmpathyChatTextViewClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + GtkTextViewClass *text_view_class = GTK_TEXT_VIEW_CLASS (klass); object_class->finalize = chat_text_view_finalize; object_class->get_property = chat_text_view_get_property; @@ -592,6 +601,8 @@ empathy_chat_text_view_class_init (EmpathyChatTextViewClass *klass) widget_class->size_allocate = chat_text_view_size_allocate; widget_class->drag_motion = chat_text_view_drag_motion; + text_view_class->copy_clipboard = text_view_copy_clipboard; + g_object_class_install_property (object_class, PROP_LAST_CONTACT, g_param_spec_object ("last-contact", @@ -1256,109 +1267,99 @@ empathy_chat_text_view_set_only_if_date (EmpathyChatTextView *view, } static void -chat_text_view_insert_text_with_emoticons (EmpathyChatTextView *view, - GtkTextIter *iter, - const gchar *str) +chat_text_view_replace_link (const gchar *text, + gssize len, + gpointer match_data, + gpointer user_data) { - EmpathyChatTextViewPriv *priv = GET_PRIV (view); - gboolean use_smileys = FALSE; - GSList *smileys, *l; + GtkTextBuffer *buffer = GTK_TEXT_BUFFER (user_data); + GtkTextIter iter; - empathy_conf_get_bool (empathy_conf_get (), - EMPATHY_PREFS_CHAT_SHOW_SMILEYS, - &use_smileys); + gtk_text_buffer_get_end_iter (buffer, &iter); + gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, + text, len, + EMPATHY_CHAT_TEXT_VIEW_TAG_LINK, + NULL); +} - if (!use_smileys) { - gtk_text_buffer_insert (priv->buffer, iter, str, -1); - return; - } +static void +chat_text_view_replace_smiley (const gchar *text, + gssize len, + gpointer match_data, + gpointer user_data) +{ + EmpathySmileyHit *hit = match_data; + GtkTextBuffer *buffer = GTK_TEXT_BUFFER (user_data); + GtkTextIter iter; - smileys = empathy_smiley_manager_parse (priv->smiley_manager, str); - for (l = smileys; l; l = l->next) { - EmpathySmiley *smiley; + gtk_text_buffer_get_end_iter (buffer, &iter); + gtk_text_buffer_insert_pixbuf (buffer, &iter, hit->pixbuf); +} - smiley = l->data; - if (smiley->pixbuf) { - gtk_text_buffer_insert_pixbuf (priv->buffer, iter, smiley->pixbuf); - } else { - gtk_text_buffer_insert (priv->buffer, iter, smiley->str, -1); - } - empathy_smiley_free (smiley); - } - g_slist_free (smileys); +static void +chat_text_view_replace_verbatim (const gchar *text, + gssize len, + gpointer match_data, + gpointer user_data) +{ + GtkTextBuffer *buffer = GTK_TEXT_BUFFER (user_data); + GtkTextIter iter; + + gtk_text_buffer_get_end_iter (buffer, &iter); + gtk_text_buffer_insert (buffer, &iter, text, len); } +static EmpathyStringParser string_parsers[] = { + {empathy_string_match_link, chat_text_view_replace_link}, + {empathy_string_match_all, chat_text_view_replace_verbatim}, + {NULL, NULL} +}; + +static EmpathyStringParser string_parsers_with_smiley[] = { + {empathy_string_match_link, chat_text_view_replace_link}, + {empathy_string_match_smiley, chat_text_view_replace_smiley}, + {empathy_string_match_all, chat_text_view_replace_verbatim}, + {NULL, NULL} +}; + void empathy_chat_text_view_append_body (EmpathyChatTextView *view, const gchar *body, const gchar *tag) { EmpathyChatTextViewPriv *priv = GET_PRIV (view); - GtkTextIter start_iter, end_iter; - GtkTextMark *mark; + EmpathyStringParser *parsers; + gboolean use_smileys; + GtkTextIter start_iter; GtkTextIter iter; - GRegex *uri_regex; - GMatchInfo *match_info; - gboolean match; - gint last = 0; - gint s = 0, e = 0; - gchar *tmp; + GtkTextMark *mark; - priv = GET_PRIV (view); + /* Check if we have to parse smileys */ + empathy_conf_get_bool (empathy_conf_get (), + EMPATHY_PREFS_CHAT_SHOW_SMILEYS, + &use_smileys); + if (use_smileys) + parsers = string_parsers_with_smiley; + else + parsers = string_parsers; + /* Create a mark at the place we'll start inserting */ gtk_text_buffer_get_end_iter (priv->buffer, &start_iter); mark = gtk_text_buffer_create_mark (priv->buffer, NULL, &start_iter, TRUE); - uri_regex = empathy_uri_regex_dup_singleton (); - for (match = g_regex_match (uri_regex, body, 0, &match_info); match; - match = g_match_info_next (match_info, NULL)) { - if (!g_match_info_fetch_pos (match_info, 0, &s, &e)) - continue; - - if (s > last) { - tmp = empathy_substring (body, last, s); - - gtk_text_buffer_get_end_iter (priv->buffer, &iter); - chat_text_view_insert_text_with_emoticons (view, - &iter, - tmp); - g_free (tmp); - } - - tmp = empathy_substring (body, s, e); - - gtk_text_buffer_get_end_iter (priv->buffer, &iter); - gtk_text_buffer_insert_with_tags_by_name (priv->buffer, - &iter, - tmp, - -1, - EMPATHY_CHAT_TEXT_VIEW_TAG_LINK, - NULL); - - g_free (tmp); - last = e; - } - g_match_info_free (match_info); - g_regex_unref (uri_regex); - - if (last < (gint) strlen (body)) { - gtk_text_buffer_get_end_iter (priv->buffer, &iter); - chat_text_view_insert_text_with_emoticons (view, - &iter, - body + last); - } + /* Parse text for links/smileys and insert in the buffer */ + empathy_string_parser_substr (body, -1, parsers, priv->buffer); + /* Insert a newline after the text inserted */ gtk_text_buffer_get_end_iter (priv->buffer, &iter); gtk_text_buffer_insert (priv->buffer, &iter, "\n", 1); /* Apply the style to the inserted text. */ gtk_text_buffer_get_iter_at_mark (priv->buffer, &start_iter, mark); - gtk_text_buffer_get_end_iter (priv->buffer, &end_iter); - - gtk_text_buffer_apply_tag_by_name (priv->buffer, - tag, + gtk_text_buffer_get_end_iter (priv->buffer, &iter); + gtk_text_buffer_apply_tag_by_name (priv->buffer, tag, &start_iter, - &end_iter); + &iter); gtk_text_buffer_delete_mark (priv->buffer, mark); } diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 52806e07c..9d8b89c26 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -93,6 +93,8 @@ typedef struct { GtkWidget *label_topic; GtkWidget *contact_list_view; GtkWidget *info_bar_vbox; + + guint unread_messages; } EmpathyChatPriv; typedef struct { @@ -1074,6 +1076,7 @@ chat_message_received (EmpathyChat *chat, EmpathyMessage *message) TP_CHANNEL_CHAT_STATE_ACTIVE, chat); + priv->unread_messages++; g_signal_emit (chat, signals[NEW_MESSAGE], 0, message); } @@ -2807,3 +2810,23 @@ empathy_chat_is_room (EmpathyChat *chat) return (priv->handle_type == TP_HANDLE_TYPE_ROOM); } +guint +empathy_chat_get_nb_unread_messages (EmpathyChat *self) +{ + EmpathyChatPriv *priv = GET_PRIV (self); + + g_return_val_if_fail (EMPATHY_IS_CHAT (self), FALSE); + + return priv->unread_messages; +} + +/* called when the messages have been read by user */ +void +empathy_chat_messages_read (EmpathyChat *self) +{ + EmpathyChatPriv *priv = GET_PRIV (self); + + g_return_if_fail (EMPATHY_IS_CHAT (self)); + + priv->unread_messages = 0; +} diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h index 9123d11dd..9e0985040 100644 --- a/libempathy-gtk/empathy-chat.h +++ b/libempathy-gtk/empathy-chat.h @@ -84,6 +84,9 @@ void empathy_chat_correct_word (EmpathyChat *chat, gboolean empathy_chat_is_room (EmpathyChat *chat); void empathy_chat_set_show_contacts (EmpathyChat *chat, gboolean show); +guint empathy_chat_get_nb_unread_messages (EmpathyChat *chat); + +void empathy_chat_messages_read (EmpathyChat *self); G_END_DECLS #endif /* __EMPATHY_CHAT_H__ */ diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c index cf7a70ada..71cb5065f 100644 --- a/libempathy-gtk/empathy-smiley-manager.c +++ b/libempathy-gtk/empathy-smiley-manager.c @@ -81,32 +81,22 @@ smiley_manager_tree_free (SmileyManagerTree *tree) g_slice_free (SmileyManagerTree, tree); } -/* Note: This function takes the ownership of str */ static EmpathySmiley * -smiley_new (GdkPixbuf *pixbuf, gchar *str, const gchar *path) +smiley_new (GdkPixbuf *pixbuf, const gchar *str) { EmpathySmiley *smiley; smiley = g_slice_new0 (EmpathySmiley); - if (pixbuf) { - smiley->pixbuf = g_object_ref (pixbuf); - } - smiley->str = str; - smiley->path = path; + smiley->pixbuf = g_object_ref (pixbuf); + smiley->str = g_strdup (str); return smiley; } -void -empathy_smiley_free (EmpathySmiley *smiley) +static void +smiley_free (EmpathySmiley *smiley) { - if (!smiley) { - return; - } - - if (smiley->pixbuf) { - g_object_unref (smiley->pixbuf); - } + g_object_unref (smiley->pixbuf); g_free (smiley->str); g_slice_free (EmpathySmiley, smiley); } @@ -115,16 +105,9 @@ static void smiley_manager_finalize (GObject *object) { EmpathySmileyManagerPriv *priv = GET_PRIV (object); - GSList *l; smiley_manager_tree_free (priv->tree); - for (l = priv->smileys; l; l = l->next) { - EmpathySmiley *smiley = l->data; - - /* The smiley got the ownership of the path */ - g_free ((gchar *) smiley->path); - empathy_smiley_free (smiley); - } + g_slist_foreach (priv->smileys, (GFunc) smiley_free, NULL); g_slist_free (priv->smileys); } @@ -247,7 +230,7 @@ smiley_manager_add_valist (EmpathySmileyManager *manager, /* We give the ownership of path to the smiley */ g_object_set_data_full (G_OBJECT (pixbuf), "smiley_str", g_strdup (first_str), g_free); - smiley = smiley_new (pixbuf, g_strdup (first_str), path); + smiley = smiley_new (pixbuf, first_str); priv->smileys = g_slist_prepend (priv->smileys, smiley); } @@ -305,70 +288,119 @@ empathy_smiley_manager_load (EmpathySmileyManager *manager) empathy_smiley_manager_add (manager, "face-worried", ":-S", ":S", ":-s", ":s", NULL); } +static EmpathySmileyHit * +smiley_hit_new (SmileyManagerTree *tree, + guint start, + guint end) +{ + EmpathySmileyHit *hit; + + hit = g_slice_new (EmpathySmileyHit); + hit->pixbuf = tree->pixbuf; + hit->path = tree->path; + hit->start = start; + hit->end = end; + + return hit; +} + +void +empathy_smiley_hit_free (EmpathySmileyHit *hit) +{ + g_return_if_fail (hit != NULL); + + g_slice_free (EmpathySmileyHit, hit); +} + GSList * -empathy_smiley_manager_parse (EmpathySmileyManager *manager, - const gchar *text) +empathy_smiley_manager_parse_len (EmpathySmileyManager *manager, + const gchar *text, + gssize len) { EmpathySmileyManagerPriv *priv = GET_PRIV (manager); - EmpathySmiley *smiley; + EmpathySmileyHit *hit; + GSList *hits = NULL; SmileyManagerTree *cur_tree = priv->tree; - const gchar *t; - const gchar *cur_str = text; - GSList *smileys = NULL; + const gchar *cur_str; + const gchar *start = NULL; g_return_val_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager), NULL); g_return_val_if_fail (text != NULL, NULL); - for (t = text; *t; t = g_utf8_next_char (t)) { + /* If len is negative, parse the string until we find '\0' */ + if (len < 0) { + len = G_MAXSSIZE; + } + + /* Parse the len first bytes of text to find smileys. Each time a smiley + * is detected, append a EmpathySmileyHit struct to the returned list, + * containing the smiley pixbuf and the position of the text to be + * replaced by it. + * cur_str is a pointer in the text showing the current position + * of the parsing. It is always at the begining of an UTF-8 character, + * because we support unicode smileys! For example we could want to + * replace ™ by an image. */ + + for (cur_str = text; + *cur_str != '\0' && cur_str - text < len; + cur_str = g_utf8_next_char (cur_str)) { SmileyManagerTree *child; gunichar c; - c = g_utf8_get_char (t); + c = g_utf8_get_char (cur_str); child = smiley_manager_tree_find_child (cur_tree, c); - if (cur_tree == priv->tree) { - if (child) { - if (t > cur_str) { - smiley = smiley_new (NULL, - g_strndup (cur_str, t - cur_str), - NULL); - smileys = g_slist_prepend (smileys, smiley); - } - cur_str = t; - cur_tree = child; - } - - continue; - } - + /* If we have a child it means c is part of a smiley */ if (child) { + if (cur_tree == priv->tree) { + /* c is the first char of some smileys, keep + * the begining position */ + start = cur_str; + } cur_tree = child; continue; } - smiley = smiley_new (cur_tree->pixbuf, - g_strndup (cur_str, t - cur_str), - cur_tree->path); - smileys = g_slist_prepend (smileys, smiley); - if (cur_tree->pixbuf) { - cur_str = t; - cur_tree = smiley_manager_tree_find_child (priv->tree, c); + /* c is not part of a smiley. let's check if we found a smiley + * before it. */ + if (cur_tree->pixbuf != NULL) { + /* found! */ + hit = smiley_hit_new (cur_tree, start - text, + cur_str - text); + hits = g_slist_prepend (hits, hit); - if (!cur_tree) { + /* c was not part of this smiley, check if a new smiley + * start with it. */ + cur_tree = smiley_manager_tree_find_child (priv->tree, c); + if (cur_tree) { + start = cur_str; + } else { cur_tree = priv->tree; } - } else { - cur_str = t; + } else if (cur_tree != priv->tree) { + /* We searched a smiley starting at 'start' but we ended + * with no smiley. Look again starting from next char. + * + * For example ">:)" and ":(" are both valid smileys, + * when parsing text ">:(" we first see '>' which could + * be the start of a smiley. 'start' variable is set to + * that position and we parse next char which is ':' and + * is still potential smiley. Then we see '(' which is + * NOT part of the smiley, ">:(" does not exist, so we + * have to start again from ':' to find ":(" which is + * correct smiley. */ + cur_str = start; cur_tree = priv->tree; } } - smiley = smiley_new (cur_tree->pixbuf, - g_strndup (cur_str, t - cur_str), - cur_tree->path); - smileys = g_slist_prepend (smileys, smiley); + /* Check if last char of the text was the end of a smiley */ + if (cur_tree->pixbuf != NULL) { + hit = smiley_hit_new (cur_tree, start - text, cur_str - text); + hits = g_slist_prepend (hits, hit); + } - return g_slist_reverse (smileys); + return g_slist_reverse (hits); } GSList * diff --git a/libempathy-gtk/empathy-smiley-manager.h b/libempathy-gtk/empathy-smiley-manager.h index dc7428c3b..1d6eaac54 100644 --- a/libempathy-gtk/empathy-smiley-manager.h +++ b/libempathy-gtk/empathy-smiley-manager.h @@ -50,9 +50,15 @@ struct _EmpathySmileyManagerClass { typedef struct { GdkPixbuf *pixbuf; gchar *str; - const gchar *path; } EmpathySmiley; +typedef struct { + GdkPixbuf *pixbuf; /* Pixbuf of the smiley */ + const gchar *path; /* Filename of the smiley image */ + guint start; /* text[start:end] should be replaced by pixbuf */ + guint end; +} EmpathySmileyHit; + typedef void (*EmpathySmileyMenuFunc) (EmpathySmileyManager *manager, EmpathySmiley *smiley, gpointer user_data); @@ -65,12 +71,13 @@ void empathy_smiley_manager_add (EmpathySmileyManag const gchar *first_str, ...); GSList * empathy_smiley_manager_get_all (EmpathySmileyManager *manager); -GSList * empathy_smiley_manager_parse (EmpathySmileyManager *manager, - const gchar *text); +GSList * empathy_smiley_manager_parse_len (EmpathySmileyManager *manager, + const gchar *text, + gssize len); GtkWidget * empathy_smiley_menu_new (EmpathySmileyManager *manager, EmpathySmileyMenuFunc func, gpointer user_data); -void empathy_smiley_free (EmpathySmiley *smiley); +void empathy_smiley_hit_free (EmpathySmileyHit *hit); G_END_DECLS diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index a41cbd6c0..0a9fb9830 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -191,122 +191,126 @@ theme_adium_open_address_cb (GtkMenuItem *menuitem, g_free (uri); } -static gchar * -theme_adium_parse_body (EmpathyThemeAdium *theme, - const gchar *text) +static void +theme_adium_match_newline (const gchar *text, + gssize len, + EmpathyStringReplace replace_func, + EmpathyStringParser *sub_parsers, + gpointer user_data) { - EmpathyThemeAdiumPriv *priv = GET_PRIV (theme); - gboolean use_smileys = FALSE; - GSList *smileys, *l; - GString *string; - gint i; - GRegex *uri_regex; - GMatchInfo *match_info; - gboolean match; - gchar *ret = NULL; - gint prev; - - empathy_conf_get_bool (empathy_conf_get (), - EMPATHY_PREFS_CHAT_SHOW_SMILEYS, - &use_smileys); - - /* Add <a href></a> arround links */ - uri_regex = empathy_uri_regex_dup_singleton (); - match = g_regex_match (uri_regex, text, 0, &match_info); - if (match) { - gint last = 0; - gint s = 0, e = 0; - - string = g_string_sized_new (strlen (text)); - do { - gchar *real_url; - - g_match_info_fetch_pos (match_info, 0, &s, &e); - - if (s > last) { - /* Append the text between last link (or the - * start of the message) and this link */ - gchar *str; - str = g_markup_escape_text (text + last, s - last); - g_string_append (string, str); - g_free (str); - } - - /* Append the link inside <a href=""></a> tag */ - real_url = empathy_make_absolute_url_len (text + s, e - s); - - g_string_append (string, "<a href=\""); - g_string_append (string, real_url); - g_string_append (string, "\">"); - g_string_append_len (string, text + s, e - s); - g_string_append (string, "</a>"); - - g_free (real_url); - last = e; - } while (g_match_info_next (match_info, NULL)); - - if (e < (gint) strlen (text)) { - /* Append the text after the last link */ - gchar *str; - str = g_markup_escape_text (text + e, strlen (text) - e); - g_string_append (string, str); - g_free (str); - } + GString *string = user_data; + gint i; + gint prev = 0; - g_free (ret); - text = ret = g_string_free (string, FALSE); - } else if (use_smileys) { - /* Replace smileys by a <img/> tag */ - string = g_string_sized_new (strlen (text)); - smileys = empathy_smiley_manager_parse (priv->smiley_manager, text); - for (l = smileys; l; l = l->next) { - EmpathySmiley *smiley; - - smiley = l->data; - if (smiley->path) { - g_string_append_printf (string, - "<abbr title='%s'><img src=\"%s\"/ alt=\"%s\"/></abbr>", - smiley->str, smiley->path, smiley->str); - } else { - gchar *str; - - str = g_markup_escape_text (smiley->str, -1); - g_string_append (string, str); - g_free (str); - } - empathy_smiley_free (smiley); - } - g_slist_free (smileys); - - g_free (ret); - text = ret = g_string_free (string, FALSE); - } else { - text = ret = g_markup_escape_text (text, -1); + if (len < 0) { + len = G_MAXSSIZE; } - g_match_info_free (match_info); - g_regex_unref (uri_regex); - /* Replace \n by <br/> */ - string = NULL; - prev = 0; - for (i = 0; text[i] != '\0'; i++) { + for (i = 0; i < len && text[i] != '\0'; i++) { if (text[i] == '\n') { - if (!string ) { - string = g_string_sized_new (strlen (text)); - } - g_string_append_len (string, text + prev, i - prev); + empathy_string_parser_substr (text + prev, + i - prev, sub_parsers, + user_data); g_string_append (string, "<br/>"); prev = i + 1; } } - if (string) { - g_string_append (string, text + prev); - g_free (ret); - text = ret = g_string_free (string, FALSE); - } + empathy_string_parser_substr (text + prev, i - prev, + sub_parsers, user_data); +} - return ret; +static void +theme_adium_replace_link (const gchar *text, + gssize len, + gpointer match_data, + gpointer user_data) +{ + GString *string = user_data; + gchar *real_url; + gchar *escaped; + + real_url = empathy_make_absolute_url_len (text, len); + + /* The thing we are making a link of may contain + * characters which need escaping */ + escaped = g_markup_escape_text (text, len); + + /* Append the link inside <a href=""></a> tag */ + g_string_append_printf (string, "<a href=\"%s\">%s</a>", + real_url, escaped); + + g_free (real_url); + g_free (escaped); +} + +static void +theme_adium_replace_smiley (const gchar *text, + gssize len, + gpointer match_data, + gpointer user_data) +{ + EmpathySmileyHit *hit = match_data; + GString *string = user_data; + + /* Replace smiley by a <img/> tag */ + g_string_append_printf (string, + "<img src=\"%s\" alt=\"%.*s\" title=\"%.*s\"/>", + hit->path, (int)len, text, (int)len, text); +} + +static void +theme_adium_replace_escaped (const gchar *text, + gssize len, + gpointer match_data, + gpointer user_data) +{ + GString *string = user_data; + gchar *escaped; + + escaped = g_markup_escape_text (text, len); + g_string_append (string, escaped); + g_free (escaped); +} + +static EmpathyStringParser string_parsers[] = { + {empathy_string_match_link, theme_adium_replace_link}, + {theme_adium_match_newline, NULL}, + {empathy_string_match_all, theme_adium_replace_escaped}, + {NULL, NULL} +}; + +static EmpathyStringParser string_parsers_with_smiley[] = { + {empathy_string_match_link, theme_adium_replace_link}, + {empathy_string_match_smiley, theme_adium_replace_smiley}, + {theme_adium_match_newline, NULL}, + {empathy_string_match_all, theme_adium_replace_escaped}, + {NULL, NULL} +}; + +static gchar * +theme_adium_parse_body (const gchar *text) +{ + EmpathyStringParser *parsers; + GString *string; + gboolean use_smileys; + + /* Check if we have to parse smileys */ + empathy_conf_get_bool (empathy_conf_get (), + EMPATHY_PREFS_CHAT_SHOW_SMILEYS, + &use_smileys); + if (use_smileys) + parsers = string_parsers_with_smiley; + else + parsers = string_parsers; + + /* Parse text and construct string with links and smileys replaced + * by html tags. Also escape text to make sure html code is + * displayed verbatim. */ + string = g_string_sized_new (strlen (text)); + empathy_string_parser_substr (text, -1, parsers, string); + + return g_string_free (string, FALSE); } static void @@ -435,6 +439,28 @@ theme_adium_append_html (EmpathyThemeAdium *theme, } static void +theme_adium_append_event_escaped (EmpathyChatView *view, + const gchar *escaped) +{ + EmpathyThemeAdium *theme = EMPATHY_THEME_ADIUM (view); + EmpathyThemeAdiumPriv *priv = GET_PRIV (theme); + + if (priv->data->status_html) { + theme_adium_append_html (theme, "appendMessage", + priv->data->status_html, + priv->data->status_len, + escaped, NULL, NULL, NULL, NULL, + "event", empathy_time_get_current ()); + } + + /* There is no last contact */ + if (priv->last_contact) { + g_object_unref (priv->last_contact); + priv->last_contact = NULL; + } +} + +static void theme_adium_append_message (EmpathyChatView *view, EmpathyMessage *msg) { @@ -442,7 +468,7 @@ theme_adium_append_message (EmpathyChatView *view, EmpathyThemeAdiumPriv *priv = GET_PRIV (theme); EmpathyContact *sender; TpAccount *account; - gchar *dup_body = NULL; + gchar *body_escaped; const gchar *body; const gchar *name; const gchar *contact_id; @@ -472,10 +498,7 @@ theme_adium_append_message (EmpathyChatView *view, service_name = tp_account_get_protocol (account); timestamp = empathy_message_get_timestamp (msg); body = empathy_message_get_body (msg); - dup_body = theme_adium_parse_body (theme, body); - if (dup_body) { - body = dup_body; - } + body_escaped = theme_adium_parse_body (body); name = empathy_contact_get_name (sender); contact_id = empathy_contact_get_id (sender); @@ -483,10 +506,11 @@ theme_adium_append_message (EmpathyChatView *view, if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) { gchar *str; - str = g_strdup_printf ("%s %s", name, body); - empathy_chat_view_append_event (view, str); + str = g_strdup_printf ("%s %s", name, body_escaped); + theme_adium_append_event_escaped (view, str); + g_free (str); - g_free (dup_body); + g_free (body_escaped); return; } @@ -607,7 +631,7 @@ theme_adium_append_message (EmpathyChatView *view, } if (html != NULL) { - theme_adium_append_html (theme, func, html, len, body, + theme_adium_append_html (theme, func, html, len, body_escaped, avatar_filename, name, contact_id, service_name, message_classes->str, timestamp); @@ -623,7 +647,7 @@ theme_adium_append_message (EmpathyChatView *view, priv->last_timestamp = timestamp; priv->last_is_backlog = is_backlog; - g_free (dup_body); + g_free (body_escaped); g_string_free (message_classes, TRUE); } @@ -631,26 +655,11 @@ static void theme_adium_append_event (EmpathyChatView *view, const gchar *str) { - EmpathyThemeAdium *theme = EMPATHY_THEME_ADIUM (view); - EmpathyThemeAdiumPriv *priv = GET_PRIV (theme); + gchar *str_escaped; - if (priv->data->status_html) { - gchar *str_escaped; - - str_escaped = g_markup_escape_text (str, -1); - theme_adium_append_html (theme, "appendMessage", - priv->data->status_html, - priv->data->status_len, - str_escaped, NULL, NULL, NULL, NULL, - "event", empathy_time_get_current ()); - g_free (str_escaped); - } - - /* There is no last contact */ - if (priv->last_contact) { - g_object_unref (priv->last_contact); - priv->last_contact = NULL; - } + str_escaped = g_markup_escape_text (str, -1); + theme_adium_append_event_escaped (view, str_escaped); + g_free (str_escaped); } static void diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 9f4182ce1..6906d8228 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -40,6 +40,7 @@ #include "empathy-ui-utils.h" #include "empathy-images.h" +#include "empathy-smiley-manager.h" #include "empathy-conf.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER @@ -49,13 +50,15 @@ #include <libempathy/empathy-idle.h> #include <libempathy/empathy-ft-factory.h> -#define SCHEMES "(https?|s?ftps?|nntp|news|javascript|about|ghelp|apt|telnet|"\ - "file|webcal|mailto)" -#define BODY "([^\\ \\n\"]+)" -#define END_BODY "([^\\ \\n\"]*[^,;\?><()\\ \"\\.\\n])" -#define URI_REGEX "("SCHEMES"://"END_BODY")" \ - "|((mailto:)?"BODY"@"BODY"\\."END_BODY")"\ - "|((www|ftp)\\."END_BODY")" +#define SCHEMES "([a-zA-Z\\+]+)" +#define INVALID_CHARS " \n\"'" +#define INVALID_CHARS_EXT INVALID_CHARS "\\[\\]<>(){},;:?" +#define BODY "([^"INVALID_CHARS"]+)" +#define BODY_END "([^"INVALID_CHARS"]*)[^"INVALID_CHARS_EXT".]" +#define BODY_STRICT "([^"INVALID_CHARS_EXT"]+)" +#define URI_REGEX "("SCHEMES"://"BODY_END")" \ + "|((www|ftp)\\."BODY_END")" \ + "|((mailto:)?"BODY_STRICT"@"BODY"\\."BODY_END")" void empathy_gtk_init (void) @@ -1609,3 +1612,108 @@ empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler) gtk_widget_show (widget); } + +void +empathy_string_parser_substr (const gchar *text, + gssize len, + EmpathyStringParser *parsers, + gpointer user_data) +{ + if (parsers != NULL && parsers[0].match_func != NULL) { + parsers[0].match_func (text, len, + parsers[0].replace_func, parsers + 1, + user_data); + } +} + +void +empathy_string_match_link (const gchar *text, + gssize len, + EmpathyStringReplace replace_func, + EmpathyStringParser *sub_parsers, + gpointer user_data) +{ + GRegex *uri_regex; + GMatchInfo *match_info; + gboolean match; + gint last = 0; + + uri_regex = empathy_uri_regex_dup_singleton (); + match = g_regex_match_full (uri_regex, text, len, 0, 0, &match_info, NULL); + if (match) { + gint s = 0, e = 0; + + do { + g_match_info_fetch_pos (match_info, 0, &s, &e); + + if (s > last) { + /* Append the text between last link (or the + * start of the message) and this link */ + empathy_string_parser_substr (text + last, + s - last, + sub_parsers, + user_data); + } + + replace_func (text + s, e - s, NULL, user_data); + + last = e; + } while (g_match_info_next (match_info, NULL)); + } + + empathy_string_parser_substr (text + last, len - last, + sub_parsers, user_data); + + g_match_info_free (match_info); + g_regex_unref (uri_regex); +} + +void +empathy_string_match_smiley (const gchar *text, + gssize len, + EmpathyStringReplace replace_func, + EmpathyStringParser *sub_parsers, + gpointer user_data) +{ + guint last = 0; + EmpathySmileyManager *smiley_manager; + GSList *hits, *l; + + smiley_manager = empathy_smiley_manager_dup_singleton (); + hits = empathy_smiley_manager_parse_len (smiley_manager, text, len); + + for (l = hits; l; l = l->next) { + EmpathySmileyHit *hit = l->data; + + if (hit->start > last) { + /* Append the text between last smiley (or the + * start of the message) and this smiley */ + empathy_string_parser_substr (text + last, + hit->start - last, + sub_parsers, user_data); + } + + replace_func (text + hit->start, hit->end - hit->start, + hit, user_data); + + last = hit->end; + + empathy_smiley_hit_free (hit); + } + g_slist_free (hits); + g_object_unref (smiley_manager); + + empathy_string_parser_substr (text + last, len - last, + sub_parsers, user_data); +} + +void +empathy_string_match_all (const gchar *text, + gssize len, + EmpathyStringReplace replace_func, + EmpathyStringParser *sub_parsers, + gpointer user_data) +{ + replace_func (text, len, NULL, user_data); +} + diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index e0c0904b0..0eacd49b8 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -121,6 +121,51 @@ gchar * empathy_make_absolute_url (const gchar *url); gchar * empathy_make_absolute_url_len (const gchar *url, guint len); +/* String parser */ +typedef struct _EmpathyStringParser EmpathyStringParser; + +typedef void (*EmpathyStringReplace) (const gchar *text, + gssize len, + gpointer match_data, + gpointer user_data); +typedef void (*EmpathyStringMatch) (const gchar *text, + gssize len, + EmpathyStringReplace replace_func, + EmpathyStringParser *sub_parsers, + gpointer user_data); + +struct _EmpathyStringParser { + EmpathyStringMatch match_func; + EmpathyStringReplace replace_func; +}; + +void +empathy_string_parser_substr (const gchar *text, + gssize len, + EmpathyStringParser *parsers, + gpointer user_data); + +void +empathy_string_match_link (const gchar *text, + gssize len, + EmpathyStringReplace replace_func, + EmpathyStringParser *sub_parsers, + gpointer user_data); + +void +empathy_string_match_smiley (const gchar *text, + gssize len, + EmpathyStringReplace replace_func, + EmpathyStringParser *sub_parsers, + gpointer user_data); + +void +empathy_string_match_all (const gchar *text, + gssize len, + EmpathyStringReplace replace_func, + EmpathyStringParser *sub_parsers, + gpointer user_data); + G_END_DECLS #endif /* __EMPATHY_UI_UTILS_H__ */ diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index 53ccfbd63..ce77d273b 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -144,6 +144,10 @@ contact_manager_status_changed_cb (TpAccount *account, EmpathyTpContactList *list; TpConnection *connection; + if (new_status == TP_CONNECTION_STATUS_DISCONNECTED) + /* No point to start tracking a connection which is about to die */ + return; + connection = tp_account_get_connection (account); if (connection == NULL || g_hash_table_lookup (priv->lists, connection)) { diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c index 141340024..487827791 100644 --- a/libempathy/empathy-debug.c +++ b/libempathy/empathy-debug.c @@ -51,6 +51,8 @@ static GDebugKey keys[] = { { "Other", EMPATHY_DEBUG_OTHER }, { "Connectivity", EMPATHY_DEBUG_CONNECTIVITY }, { "ImportMc4Accounts", EMPATHY_DEBUG_IMPORT_MC4_ACCOUNTS }, + { "Tests", EMPATHY_DEBUG_TESTS }, + { "Voip", EMPATHY_DEBUG_VOIP }, { 0, } }; diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h index cc8eca0a3..0a5c3f697 100644 --- a/libempathy/empathy-debug.h +++ b/libempathy/empathy-debug.h @@ -44,6 +44,8 @@ typedef enum EMPATHY_DEBUG_SHARE_DESKTOP = 1 << 10, EMPATHY_DEBUG_CONNECTIVITY = 1 << 11, EMPATHY_DEBUG_IMPORT_MC4_ACCOUNTS = 1 << 11, + EMPATHY_DEBUG_TESTS = 1 << 12, + EMPATHY_DEBUG_VOIP = 1 << 13, } EmpathyDebugFlags; gboolean empathy_debug_flag_is_set (EmpathyDebugFlags flag); diff --git a/po/ChangeLog b/po/ChangeLog index f82d41389..6036e5f8c 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-11-27 Adi Roiban <adi@roiban.ro> + + * ro.po: Updated Romanian translation + 2009-08-13 Baris Cicek <baris@teamforce.name.tr> * tr.po: Updated Turkish translation @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: empathy.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&component=general\n" -"POT-Creation-Date: 2009-11-24 11:39+0000\n" -"PO-Revision-Date: 2009-11-24 17:56+0100\n" +"POT-Creation-Date: 2009-11-27 16:38+0000\n" +"PO-Revision-Date: 2009-11-28 10:50+0100\n" "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "MIME-Version: 1.0\n" @@ -747,7 +747,6 @@ msgstr "Red nueva" #: ../libempathy-gtk/empathy-account-widget-sip.c:184 #: ../libempathy-gtk/empathy-account-widget-sip.c:217 -#| msgid "_About" msgid "Auto" msgstr "Auto" @@ -766,7 +765,6 @@ msgstr "TLS" #. translators: this string is very specific to SIP's internal; maybe #. * best to keep the English version. #: ../libempathy-gtk/empathy-account-widget-sip.c:222 -#| msgid "Western" msgid "Register" msgstr "Registrador" @@ -777,7 +775,6 @@ msgid "Options" msgstr "Opciones" #: ../libempathy-gtk/empathy-account-widget-sip.c:230 -#| msgid "No" msgid "None" msgstr "Ninguno" @@ -910,7 +907,6 @@ msgid "<b>Keep-Alive Options</b>" msgstr "<b>Opciones de «keepalive»</b>" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -#| msgid "<b>Location</b>" msgid "<b>Miscellaneous Options</b>" msgstr "<b>Opciones de miscelánea</b>" @@ -919,7 +915,6 @@ msgid "<b>NAT Traversal Options</b>" msgstr "<b>Opciones de NAT transversal</b>" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -#| msgid "<b>Location</b>" msgid "<b>Proxy Options</b>" msgstr "<b>Opciones del proxy</b>" @@ -928,12 +923,10 @@ msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>" msgstr "<span size=\"small\"><b>Ejemplo:</b> usuario@mi.servidor.sip</span>" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -#| msgid "Authentication failed" msgid "Authentication username:" msgstr "Usuario para la autenticación:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 -#| msgid "Discover STUN" msgid "Discover Binding" msgstr "Descubrir vinculación" @@ -959,7 +952,6 @@ msgid "Mechanism:" msgstr "Mecanismo:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 -#| msgid "_Port:" msgid "Port:" msgstr "Puerto:" @@ -968,7 +960,6 @@ msgid "STUN Server:" msgstr "Servidor STUN:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 -#| msgid "_Server:" msgid "Server:" msgstr "Servidor:" @@ -981,7 +972,6 @@ msgstr "" "nombre de usuario para el URI SIP." #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 -#| msgid "STUN port:" msgid "Transport:" msgstr "Transporte:" @@ -1050,59 +1040,59 @@ msgstr "Todos los archivos" msgid "Click to enlarge" msgstr "Pulse para agrandar" -#: ../libempathy-gtk/empathy-chat.c:194 +#: ../libempathy-gtk/empathy-chat.c:196 msgid "Failed to reconnect this chat" msgstr "Falló al reconectar a este chat" -#: ../libempathy-gtk/empathy-chat.c:592 +#: ../libempathy-gtk/empathy-chat.c:594 msgid "Failed to join chatroom" msgstr "Falló al unirse a la sala" -#: ../libempathy-gtk/empathy-chat.c:610 +#: ../libempathy-gtk/empathy-chat.c:612 msgid "Failed to open private chat" msgstr "Falló al abrir el chat privado" -#: ../libempathy-gtk/empathy-chat.c:649 +#: ../libempathy-gtk/empathy-chat.c:651 msgid "Topic not supported on this conversation" msgstr "El tema no está soportado en esta conversación" -#: ../libempathy-gtk/empathy-chat.c:655 +#: ../libempathy-gtk/empathy-chat.c:657 msgid "You are not allowed to change the topic" msgstr "No le está permitido cambiar el tema" -#: ../libempathy-gtk/empathy-chat.c:773 +#: ../libempathy-gtk/empathy-chat.c:775 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:776 +#: ../libempathy-gtk/empathy-chat.c:778 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:779 +#: ../libempathy-gtk/empathy-chat.c:781 msgid "/join <chatroom id>, join a new chatroom" msgstr "/join <id de sala de chat>, unirse a una sala de chat nueva" -#: ../libempathy-gtk/empathy-chat.c:782 +#: ../libempathy-gtk/empathy-chat.c:784 msgid "/j <chatroom id>, join a new chatroom" msgstr "/j <id de sala de chat>, unirse a una sala de chat nueva" -#: ../libempathy-gtk/empathy-chat.c:785 +#: ../libempathy-gtk/empathy-chat.c:787 msgid "/query <contact id> [<message>], open a private chat" msgstr "/query <id del contacto> [<mensaje>], abrir un chat privado" -#: ../libempathy-gtk/empathy-chat.c:788 +#: ../libempathy-gtk/empathy-chat.c:790 msgid "/msg <contact id> <message>, open a private chat" msgstr "/msg <id del contacto> <mensaje>, abrir un chat privado" -#: ../libempathy-gtk/empathy-chat.c:791 +#: ../libempathy-gtk/empathy-chat.c:793 msgid "/nick <nickname>, change your nickname on current server" msgstr "/nick <apodo>, cambiar su apodo en el servidor actual" -#: ../libempathy-gtk/empathy-chat.c:794 +#: ../libempathy-gtk/empathy-chat.c:796 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:797 +#: ../libempathy-gtk/empathy-chat.c:799 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 " @@ -1112,7 +1102,7 @@ msgstr "" "para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa " "para unirse a una sala de chat nueva»" -#: ../libempathy-gtk/empathy-chat.c:802 +#: ../libempathy-gtk/empathy-chat.c:804 msgid "" "/help [<command>], show all supported commands. If <command> is defined, " "show its usage." @@ -1120,76 +1110,76 @@ msgstr "" "/help [<comando>], mostrar todos los comandos soportados. Si <comando> está " "definido, muestra su uso." -#: ../libempathy-gtk/empathy-chat.c:812 +#: ../libempathy-gtk/empathy-chat.c:814 #, c-format msgid "Usage: %s" msgstr "Uso: %s" -#: ../libempathy-gtk/empathy-chat.c:841 +#: ../libempathy-gtk/empathy-chat.c:843 msgid "Unknown command" msgstr "Comando desconocido" -#: ../libempathy-gtk/empathy-chat.c:962 +#: ../libempathy-gtk/empathy-chat.c:964 msgid "Unknown command, see /help for the available commands" msgstr "Comando desconocido, consulte /help para ver los comandos disponibles" -#: ../libempathy-gtk/empathy-chat.c:1100 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "offline" msgstr "desconectado" -#: ../libempathy-gtk/empathy-chat.c:1103 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "invalid contact" msgstr "contacto no válido" -#: ../libempathy-gtk/empathy-chat.c:1106 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "permission denied" msgstr "permiso denegado" -#: ../libempathy-gtk/empathy-chat.c:1109 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "too long message" msgstr "mensaje demasiado largo" -#: ../libempathy-gtk/empathy-chat.c:1112 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "not implemented" msgstr "no implementado" -#: ../libempathy-gtk/empathy-chat.c:1115 +#: ../libempathy-gtk/empathy-chat.c:1118 msgid "unknown" msgstr "desconocido" -#: ../libempathy-gtk/empathy-chat.c:1119 +#: ../libempathy-gtk/empathy-chat.c:1122 #, c-format msgid "Error sending message '%s': %s" msgstr "Error al enviar el mensaje «%s»: %s" -#: ../libempathy-gtk/empathy-chat.c:1149 +#: ../libempathy-gtk/empathy-chat.c:1152 #, c-format msgid "Topic set to: %s" msgstr "El tema se ha establecido a: %s" -#: ../libempathy-gtk/empathy-chat.c:1151 +#: ../libempathy-gtk/empathy-chat.c:1154 msgid "No topic defined" msgstr "No se ha definido el tema" -#: ../libempathy-gtk/empathy-chat.c:1524 +#: ../libempathy-gtk/empathy-chat.c:1527 msgid "(No Suggestions)" msgstr "(Sin sugerencias)" -#: ../libempathy-gtk/empathy-chat.c:1578 +#: ../libempathy-gtk/empathy-chat.c:1581 msgid "Insert Smiley" msgstr "Insertar emoticono" #. send button -#: ../libempathy-gtk/empathy-chat.c:1596 -#: ../libempathy-gtk/empathy-ui-utils.c:1502 +#: ../libempathy-gtk/empathy-chat.c:1599 +#: ../libempathy-gtk/empathy-ui-utils.c:1505 msgid "_Send" msgstr "E_nviar" -#: ../libempathy-gtk/empathy-chat.c:1630 +#: ../libempathy-gtk/empathy-chat.c:1633 msgid "_Spelling Suggestions" msgstr "_Sugerencias ortográficas" -#: ../libempathy-gtk/empathy-chat.c:1745 +#: ../libempathy-gtk/empathy-chat.c:1748 #, c-format msgid "%s has disconnected" msgstr "%s se ha desconectado" @@ -1197,12 +1187,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:1752 +#: ../libempathy-gtk/empathy-chat.c:1755 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s expulsó a %1$s" -#: ../libempathy-gtk/empathy-chat.c:1755 +#: ../libempathy-gtk/empathy-chat.c:1758 #, c-format msgid "%s was kicked" msgstr "%s fue expulsado" @@ -1210,17 +1200,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:1763 +#: ../libempathy-gtk/empathy-chat.c:1766 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s vetó a %1$s" -#: ../libempathy-gtk/empathy-chat.c:1766 +#: ../libempathy-gtk/empathy-chat.c:1769 #, c-format msgid "%s was banned" msgstr "%s fue vetado" -#: ../libempathy-gtk/empathy-chat.c:1770 +#: ../libempathy-gtk/empathy-chat.c:1773 #, c-format msgid "%s has left the room" msgstr "%s ha dejado la sala" @@ -1230,69 +1220,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:1779 +#: ../libempathy-gtk/empathy-chat.c:1782 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:1804 +#: ../libempathy-gtk/empathy-chat.c:1807 #, c-format msgid "%s has joined the room" msgstr "%s ha entrado en la sala" -#: ../libempathy-gtk/empathy-chat.c:1829 +#: ../libempathy-gtk/empathy-chat.c:1832 #, c-format msgid "%s is now known as %s" msgstr "Ahora %s se llama %s" -#: ../libempathy-gtk/empathy-chat.c:1962 ../src/empathy-call-window.c:1297 +#: ../libempathy-gtk/empathy-chat.c:1965 ../src/empathy-call-window.c:1534 msgid "Disconnected" msgstr "Desconectado" -#: ../libempathy-gtk/empathy-chat.c:2452 +#: ../libempathy-gtk/empathy-chat.c:2455 msgid "Wrong password; please try again:" msgstr "Contraseña incorrecta; inténtelo de nuevo:" -#: ../libempathy-gtk/empathy-chat.c:2453 +#: ../libempathy-gtk/empathy-chat.c:2456 msgid "Retry" msgstr "Volver a intentarlo" -#: ../libempathy-gtk/empathy-chat.c:2458 +#: ../libempathy-gtk/empathy-chat.c:2461 msgid "This room is protected by a password:" msgstr "Esta sala está protegida por contraseña:" -#: ../libempathy-gtk/empathy-chat.c:2459 +#: ../libempathy-gtk/empathy-chat.c:2462 msgid "Join" msgstr "Unirse" -#: ../libempathy-gtk/empathy-chat.c:2599 +#: ../libempathy-gtk/empathy-chat.c:2602 msgid "Connected" msgstr "Conectado" -#: ../libempathy-gtk/empathy-chat.c:2652 +#: ../libempathy-gtk/empathy-chat.c:2655 #: ../libempathy-gtk/empathy-log-window.c:546 msgid "Conversation" msgstr "Conversación" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:556 +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:637 msgid "Topic:" msgstr "Tema:" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:315 -#: ../libempathy-gtk/empathy-theme-adium.c:808 +#: ../libempathy-gtk/empathy-chat-text-view.c:317 +#: ../libempathy-gtk/empathy-theme-adium.c:817 msgid "_Copy Link Address" msgstr "_Copiar la dirección del enlace" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:322 -#: ../libempathy-gtk/empathy-theme-adium.c:815 +#: ../libempathy-gtk/empathy-chat-text-view.c:324 +#: ../libempathy-gtk/empathy-theme-adium.c:824 msgid "_Open Link" msgstr "_Abrir enlace" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:420 +#: ../libempathy-gtk/empathy-chat-text-view.c:422 msgid "%A %B %d %Y" msgstr "%A %d %B %Y" @@ -1759,15 +1749,15 @@ msgstr "Limpio" msgid "Blue" msgstr "Azul" -#: ../libempathy-gtk/empathy-ui-utils.c:1404 +#: ../libempathy-gtk/empathy-ui-utils.c:1407 msgid "Unable to open URI" msgstr "No se pudo abrir el URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1494 +#: ../libempathy-gtk/empathy-ui-utils.c:1497 msgid "Select a file" msgstr "Seleccionar un archivo" -#: ../libempathy-gtk/empathy-ui-utils.c:1554 +#: ../libempathy-gtk/empathy-ui-utils.c:1557 msgid "Select a destination" msgstr "Seleccionar un destino" @@ -2230,66 +2220,66 @@ msgstr "_Usar una cuenta ya existente" msgid "account" msgstr "cuenta" -#: ../src/empathy-call-window.c:428 +#: ../src/empathy-call-window.c:452 msgid "Contrast" msgstr "Contraste" -#: ../src/empathy-call-window.c:431 +#: ../src/empathy-call-window.c:455 msgid "Brightness" msgstr "Brillo" -#: ../src/empathy-call-window.c:434 +#: ../src/empathy-call-window.c:458 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-call-window.c:542 +#: ../src/empathy-call-window.c:566 msgid "Volume" msgstr "Volumen" -#: ../src/empathy-call-window.c:676 +#: ../src/empathy-call-window.c:728 msgid "Connecting..." msgstr "Conectando…" -#: ../src/empathy-call-window.c:784 +#: ../src/empathy-call-window.c:1021 msgid "_Sidebar" msgstr "Barra _lateral" -#: ../src/empathy-call-window.c:803 +#: ../src/empathy-call-window.c:1040 msgid "Dialpad" msgstr "Teclado de llamada" -#: ../src/empathy-call-window.c:809 +#: ../src/empathy-call-window.c:1046 msgid "Audio input" msgstr "Entrada de sonido" -#: ../src/empathy-call-window.c:813 +#: ../src/empathy-call-window.c:1050 msgid "Video input" msgstr "Entrada de vídeo" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:876 +#: ../src/empathy-call-window.c:1113 #, c-format msgid "Call with %s" msgstr "Llamar con %s" #. translators: Call is a noun. This string is used in the window #. * title -#: ../src/empathy-call-window.c:957 +#: ../src/empathy-call-window.c:1194 msgid "Call" msgstr "Llamar" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1457 +#: ../src/empathy-call-window.c:1697 #, c-format msgid "Connected — %d:%02dm" msgstr "Conectado — %d:%02dm" -#: ../src/empathy-call-window.c:1518 +#: ../src/empathy-call-window.c:1758 msgid "Technical Details" msgstr "Detalles técnicos" -#: ../src/empathy-call-window.c:1556 +#: ../src/empathy-call-window.c:1796 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " @@ -2298,7 +2288,7 @@ msgstr "" "El software de «%s» no entiende ninguno de los formatos de vídeo soportados " "por su equipo" -#: ../src/empathy-call-window.c:1561 +#: ../src/empathy-call-window.c:1801 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " @@ -2307,7 +2297,7 @@ msgstr "" "El software de «%s» no entiende ninguno de los formatos de vídeo soportados " "por su equipo" -#: ../src/empathy-call-window.c:1567 +#: ../src/empathy-call-window.c:1807 #, c-format msgid "" "Can't establish a connection to %s. One of you might be on a network that " @@ -2316,25 +2306,25 @@ msgstr "" "No se puede establecer una conexión con %s. Uno de los dos puede estar en " "una red que no acepta conexiones directas." -#: ../src/empathy-call-window.c:1573 +#: ../src/empathy-call-window.c:1813 msgid "There was a failure on the network" msgstr "Hubo un fallo en la red" -#: ../src/empathy-call-window.c:1577 +#: ../src/empathy-call-window.c:1817 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "" "No están instalados en su equipo los formatos de sonido necesarios para esta " "llamada" -#: ../src/empathy-call-window.c:1580 +#: ../src/empathy-call-window.c:1820 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "" "No están instalados en su equipo los formatos de vídeo necesarios para esta " "llamada" -#: ../src/empathy-call-window.c:1590 +#: ../src/empathy-call-window.c:1830 #, c-format msgid "" "Something not expected happened in a Telepathy component. Please <a href=\"%s" @@ -2345,47 +2335,99 @@ msgstr "" "\">Informe de este error</a> y añada los registros obtenidos de la ventana " "de «Depuración» en el menú de Ayuda." -#: ../src/empathy-call-window.c:1598 +#: ../src/empathy-call-window.c:1838 msgid "There was a failure in the call engine" msgstr "Hubo un fallo en el motor de llamadas" -#: ../src/empathy-call-window.c:1637 +#: ../src/empathy-call-window.c:1877 msgid "Can't establish audio stream" msgstr "No se puede establecer el flujo de sonido" -#: ../src/empathy-call-window.c:1647 +#: ../src/empathy-call-window.c:1887 msgid "Can't establish video stream" msgstr "No se puede establecer el flujo de vídeo" #: ../src/empathy-call-window.ui.h:1 +msgid "Camera Off" +msgstr "Cámara apagada" + +#: ../src/empathy-call-window.ui.h:2 +msgid "Camera On" +msgstr "Cámara encendida" + +#: ../src/empathy-call-window.ui.h:3 msgid "Hang up" msgstr "Colgar" -#: ../src/empathy-call-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:4 +#| msgid "Video preview" +msgid "Preview" +msgstr "Vista previa" + +#: ../src/empathy-call-window.ui.h:5 msgid "Redial" msgstr "Volver a llamar" -#: ../src/empathy-call-window.ui.h:3 +#: ../src/empathy-call-window.ui.h:6 msgid "Send Audio" msgstr "Enviar sonido" -#: ../src/empathy-call-window.ui.h:4 -msgid "Send video" -msgstr "Enviar vídeo" +#: ../src/empathy-call-window.ui.h:7 +msgid "V_ideo" +msgstr "Ví_deo" -#: ../src/empathy-call-window.ui.h:5 -msgid "Video preview" -msgstr "Vista preliminar de vídeo" +#: ../src/empathy-call-window.ui.h:8 +#| msgid "Video input" +msgid "Video Off" +msgstr "Vídeo apagado" -#: ../src/empathy-call-window.ui.h:6 +#: ../src/empathy-call-window.ui.h:9 +#| msgid "Video input" +msgid "Video On" +msgstr "Vídeo encendido" + +#: ../src/empathy-call-window.ui.h:10 +#| msgid "Video preview" +msgid "Video Preview" +msgstr "Vista preliminar del vídeo" + +#: ../src/empathy-call-window.ui.h:11 msgid "_Call" msgstr "_Llamar" -#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26 +#: ../src/empathy-call-window.ui.h:12 ../src/empathy-main-window.ui.h:26 msgid "_View" msgstr "_Ver" -#: ../src/empathy-chat-window.c:560 +#: ../src/empathy-chat-window.c:395 ../src/empathy-chat-window.c:415 +#, c-format +msgid "%s (%d unread)" +msgid_plural "%s (%d unread)" +msgstr[0] "%s (%d sin leer)" +msgstr[1] "%s (%d sin leer)" + +#: ../src/empathy-chat-window.c:407 +#, c-format +msgid "%s (and %u other)" +msgid_plural "%s (and %u others)" +msgstr[0] "%s (y otro)" +msgstr[1] "%s (y otros %u)" + +#: ../src/empathy-chat-window.c:423 +#, c-format +msgid "%s (%d unread from others)" +msgid_plural "%s (%d unread from others)" +msgstr[0] "%s (%d sin leer de otros)" +msgstr[1] "%s (%d sin leer de otros)" + +#: ../src/empathy-chat-window.c:432 +#, c-format +msgid "%s (%d unread from all)" +msgid_plural "%s (%d unread from all)" +msgstr[0] "%s (%d sin leer de todos)" +msgstr[1] "%s (%d sin leer de todos)" + +#: ../src/empathy-chat-window.c:641 msgid "Typing a message." msgstr "Tecleando un mensaje." @@ -2449,15 +2491,15 @@ msgstr "_Mostrar lista de contactos" msgid "_Tabs" msgstr "_Solapas" -#: ../src/empathy-chatrooms-window.c:258 +#: ../src/empathy-chatrooms-window.c:256 msgid "Name" msgstr "Nombre" -#: ../src/empathy-chatrooms-window.c:276 +#: ../src/empathy-chatrooms-window.c:274 msgid "Room" msgstr "Sala" -#: ../src/empathy-chatrooms-window.c:285 +#: ../src/empathy-chatrooms-window.c:282 msgid "Auto-Connect" msgstr "Autoconectar" @@ -3113,63 +3155,63 @@ msgstr "" msgid "Contact Map View" msgstr "Vista del mapa de contactos" -#: ../src/empathy-debug-window.c:1042 +#: ../src/empathy-debug-window.c:1043 msgid "Save" msgstr "Guardar" -#: ../src/empathy-debug-window.c:1164 +#: ../src/empathy-debug-window.c:1165 msgid "Debug Window" msgstr "Depurar ventana" -#: ../src/empathy-debug-window.c:1243 +#: ../src/empathy-debug-window.c:1245 msgid "Pause" msgstr "Pausar" -#: ../src/empathy-debug-window.c:1255 +#: ../src/empathy-debug-window.c:1257 msgid "Level " msgstr "Nivel " -#: ../src/empathy-debug-window.c:1275 +#: ../src/empathy-debug-window.c:1277 msgid "Debug" msgstr "Depurar" -#: ../src/empathy-debug-window.c:1281 +#: ../src/empathy-debug-window.c:1283 msgid "Info" msgstr "Información" -#: ../src/empathy-debug-window.c:1287 ../src/empathy-debug-window.c:1336 +#: ../src/empathy-debug-window.c:1289 ../src/empathy-debug-window.c:1338 msgid "Message" msgstr "Mensaje" -#: ../src/empathy-debug-window.c:1293 +#: ../src/empathy-debug-window.c:1295 msgid "Warning" msgstr "Advertencia" -#: ../src/empathy-debug-window.c:1299 +#: ../src/empathy-debug-window.c:1301 msgid "Critical" msgstr "Crítico" -#: ../src/empathy-debug-window.c:1305 +#: ../src/empathy-debug-window.c:1307 msgid "Error" msgstr "Error" -#: ../src/empathy-debug-window.c:1324 +#: ../src/empathy-debug-window.c:1326 msgid "Time" msgstr "Hora" -#: ../src/empathy-debug-window.c:1327 +#: ../src/empathy-debug-window.c:1329 msgid "Domain" msgstr "Dominio" -#: ../src/empathy-debug-window.c:1329 +#: ../src/empathy-debug-window.c:1331 msgid "Category" msgstr "Categoría" -#: ../src/empathy-debug-window.c:1331 +#: ../src/empathy-debug-window.c:1333 msgid "Level" msgstr "Nivel" -#: ../src/empathy-debug-window.c:1363 +#: ../src/empathy-debug-window.c:1365 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -3177,6 +3219,9 @@ msgstr "" "El gestor de conexiones seleccionado no soporta la extensión de depuración " "remota." +#~ msgid "Send video" +#~ msgstr "Enviar vídeo" + #~ msgid "_Contact" #~ msgstr "Con_tacto" @@ -1,19 +1,19 @@ -# translation of empathy.gnome-2-28.po to Galician +# translation of empathy-master-po-gl-57278.po to Galician # This file is distributed under the same license as the EMPATHY package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # # Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun.org>, 2009. -# Suso Baleato <suso.baleato@xunta.es>, 2009. # Fran Diéguez <fran.dieguez@glug.es>,2009. # Antón Méixome <meixome@mancomun.org>, 2009. +# Fran Dieguez <fran.dieguez@glug.es>, 2009. msgid "" msgstr "" -"Project-Id-Version: empathy.gnome-2-28\n" +"Project-Id-Version: empathy-master-po-gl-57278\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-16 14:48+0200\n" -"PO-Revision-Date: 2009-09-15 12:11+0200\n" +"POT-Creation-Date: 2009-11-26 14:41+0100\n" +"PO-Revision-Date: 2009-11-09 13:36+0100\n" "Last-Translator: Antón Méixome <meixome@mancomun.org>\n" -"Language-Team: Galician <gnome@mancomun.org>\n" +"Language-Team: Galician <gnome@g11n.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,7 +31,7 @@ msgstr "Cliente de mensaxaría Empathy" #: ../data/empathy.desktop.in.in.h:3 msgid "IM Client" -msgstr "Cliente IM" +msgstr "Cliente de MI" # rever #: ../data/empathy.desktop.in.in.h:4 @@ -73,17 +73,17 @@ msgstr "Lista de contactos compacta" # rever #: ../data/empathy.schemas.in.h:6 msgid "Connection managers should be used" -msgstr "Deberían usarse os xestores de conectividade" +msgstr "Se se deberían usar xestores de conexión" # rever #: ../data/empathy.schemas.in.h:7 -msgid "Contact list sort criterium" +msgid "Contact list sort criterion" msgstr "Criterio de ordenación da lista de contactos" # rever #: ../data/empathy.schemas.in.h:8 msgid "Default directory to select an avatar image from" -msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar" +msgstr "O cartafol predefinido desde o que seleccionar unha imaxe de avatar" # rever #: ../data/empathy.schemas.in.h:9 @@ -114,7 +114,7 @@ msgstr "Empathy pode usar a rede para seguir a localización" # rever #: ../data/empathy.schemas.in.h:15 msgid "Empathy default download folder" -msgstr "Cartafol de descargas predeterminado do Empathy" +msgstr "Cartafol de descargas predefinido do Empathy" # rever #: ../data/empathy.schemas.in.h:16 @@ -267,13 +267,12 @@ msgstr "Mostrar os contactos desconectados" # rever #: ../data/empathy.schemas.in.h:46 msgid "Spell checking languages" -msgstr "Idiomas para a verificación ortográfica" +msgstr "Idiomas para a corrección ortográfica" # rever #: ../data/empathy.schemas.in.h:47 msgid "The default folder to save file transfers in." -msgstr "" -"O cartafol predeterminado en que gardar as transferencias de ficheiros." +msgstr "O cartafol predefinido en que gardar as transferencias de ficheiros." # rever #: ../data/empathy.schemas.in.h:48 @@ -375,8 +374,8 @@ msgid "" "Whether or not connectivity managers should be used to automatically " "disconnect/reconnect." msgstr "" -"Indica se os xestores de conectividade deberían de se usar para conectarse " -"automaticamente ou non." +"Indica se deberían usarse xestores de conectividade para conectarse ou " +"desconectarse automaticamente ou non." # rever #: ../data/empathy.schemas.in.h:63 @@ -400,7 +399,7 @@ msgstr "" msgid "" "Whether or not to convert smileys into graphical images in conversations." msgstr "" -"Indica see converter ou non as emoticonas en imaxes gráficas nas conversas." +"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas." # rever #: ../data/empathy.schemas.in.h:66 @@ -540,21 +539,17 @@ msgstr "Indica se usar ou non o tema para as salas de conversa." # rever #: ../data/empathy.schemas.in.h:86 msgid "" -"Which criterium to use when sorting the contact list. Default is to use sort " +"Which criterion to use when sorting the contact list. Default is to use sort " "by the contact's name with the value \"name\". A value of \"state\" will " "sort the contact list by state." msgstr "" -"Que criterio usará ao ordenar a lista de contactos. O predeterminado é usar " -"a ordenación polo nome do contacto co valor \"name\". Un valor de \"estado" -"\" ordenará a lista de contactos por estado." - -#: ../libempathy/empathy-account.c:1158 -msgid "Can't set an empty display name" -msgstr "Non se pode estabelecer un nome de presentación baleiro" +"Que criterio usará ao ordenar a lista de contactos. O predefinido é usar a " +"ordenación polo nome do contacto co valor \"name\". Un valor de \"estado\" " +"ordenará a lista de contactos por estado." #: ../libempathy/empathy-ft-handler.c:839 msgid "The hash of the received file and the sent one do not match" -msgstr "O hash do ficheiro recibido e o enviado non coinciden" +msgstr "O hash do ficheiro recibido e o do enviado non coinciden" #: ../libempathy/empathy-ft-handler.c:1099 msgid "File transfer not supported by remote contact" @@ -569,7 +564,7 @@ msgid "The selected file is empty" msgstr "O ficheiro seleccionado está baleiro" # rever -#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285 +#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:293 msgid "People nearby" msgstr "Persoas próximas" @@ -611,37 +606,37 @@ msgstr "O outro participante non pode transferir o ficheiro" msgid "Unknown reason" msgstr "Motivo descoñecido" -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:238 msgid "Available" msgstr "Dispoñíbel" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:240 msgid "Busy" msgstr "Ocupado" -#: ../libempathy/empathy-utils.c:240 +#: ../libempathy/empathy-utils.c:243 msgid "Away" msgstr "Ausente" -#: ../libempathy/empathy-utils.c:242 +#: ../libempathy/empathy-utils.c:245 msgid "Hidden" msgstr "Oculto" -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:247 msgid "Offline" msgstr "Desconectado" # rever -#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104 +#: ../libempathy/empathy-utils.c:383 ../src/empathy-import-mc4-accounts.c:104 msgid "People Nearby" msgstr "Persoas próximas" # rever -#: ../libempathy/empathy-utils.c:385 +#: ../libempathy/empathy-utils.c:388 msgid "Yahoo! Japan" -msgstr "Usar _Yahoo Japan" +msgstr "Yahoo! Japan" -#: ../libempathy/empathy-utils.c:386 +#: ../libempathy/empathy-utils.c:389 msgid "Facebook Chat" msgstr "Chat de Facebook" @@ -691,23 +686,59 @@ msgstr[1] "Hai %d meses" msgid "in the future" msgstr "no futuro" -#: ../libempathy-gtk/empathy-account-chooser.c:424 +#: ../libempathy-gtk/empathy-account-chooser.c:450 msgid "All" msgstr "Todo" -#: ../libempathy-gtk/empathy-account-widget.c:430 -#: ../libempathy-gtk/empathy-account-widget.c:486 +#: ../libempathy-gtk/empathy-account-widget.c:513 +#: ../libempathy-gtk/empathy-account-widget.c:569 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1264 +#: ../libempathy-gtk/empathy-account-widget.c:1245 +msgid "L_og in" +msgstr "Iniciar sesi_ón" + +#: ../libempathy-gtk/empathy-account-widget.c:1452 msgid "Enabled" msgstr "Activado" +#. Translators: this is used only when built on a moblin platform +#: ../libempathy-gtk/empathy-account-widget.c:1458 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 +#: ../src/empathy-chatrooms-window.ui.h:1 +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Account:" +msgstr "Conta:" + +# rever +#. To translators: The first parameter is the login id and the +#. * second one is the server. The resulting string will be something +#. * like: "MyUserName on chat.freenode.net". +#. * You should reverse the order of these arguments if the +#. * server should come before the login id in your locale. +#: ../libempathy-gtk/empathy-account-widget.c:1722 +#, c-format +msgid "%1$s on %2$s" +msgstr "%1$s sobre %2$s" + +#. To translators: The parameter is the protocol name. The resulting +#. * string will be something like: "Jabber Account" +#: ../libempathy-gtk/empathy-account-widget.c:1740 +#, c-format +msgid "%s Account" +msgstr "Conta %s" + +# rever +#: ../libempathy-gtk/empathy-account-widget.c:1744 +msgid "New account" +msgstr "Conta nova" + #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>" -msgstr "<span size=\"small\"><b>Exemplo:</b> MeuNomeUsuarioPersoal</span>" +msgstr "<span size=\"small\"><b>Exemplo:</b> MeuNomeEnPantalla</span>" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 @@ -716,7 +747,7 @@ msgstr "<span size=\"small\"><b>Exemplo:</b> MeuNomeUsuarioPersoal</span>" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 msgid "Advanced" msgstr "Avanzado" @@ -726,7 +757,7 @@ msgstr "Avanzado" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 msgid "Pass_word:" msgstr "Con_trasinal:" @@ -734,15 +765,15 @@ msgstr "Con_trasinal:" # rever #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4 msgid "Screen _Name:" -msgstr "_Nome de usuario persoal:" +msgstr "_Nome en pantalla:" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5 msgid "What is your AIM password?" -msgstr "Cal é o seu contrasinal en AIM?" +msgstr "Cal e o seu contrasinal para AIM?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6 msgid "What is your AIM screen name?" -msgstr "Cal é o seu nome de usuario persoal?" +msgstr "Cal é o seu nome en patalla para AIM?" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7 @@ -794,11 +825,11 @@ msgstr "_UIN ICQ:" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5 msgid "What is your ICQ UIN?" -msgstr "Cal é o seu UIN ICQ?" +msgstr "Cal é o seu UIN para ICQ?" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6 msgid "What is your ICQ password?" -msgstr "Cal é o seu contrasinal ICQ?" +msgstr "Cal é o seu contrasinal pra ICQ?" # rever #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 @@ -810,6 +841,41 @@ msgstr "_Codificación de caracteres:" msgid "New Network" msgstr "Rede nova" +#: ../libempathy-gtk/empathy-account-widget-sip.c:184 +#: ../libempathy-gtk/empathy-account-widget-sip.c:217 +msgid "Auto" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:187 +msgid "UDP" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:190 +msgid "TCP" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:193 +msgid "TLS" +msgstr "" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:222 +#, fuzzy +msgid "Register" +msgstr "Occidental" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:227 +msgid "Options" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:230 +#, fuzzy +msgid "None" +msgstr "Non" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 msgid "Charset:" msgstr "Codificación de caracteres:" @@ -845,11 +911,11 @@ msgstr "Servidores" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>" -msgstr "<span size=\"small\"><b>Exemplo:</b> usuario@gmail.com</span>" +msgstr "<span size=\"small\"><b>Examplo:</b> user@gmail.com</span>" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>" -msgstr "<span size=\"small\"><b>Exemplo:</b> usuario@jabber.org</span>" +msgstr "<span size=\"small\"><b>Exemplo:</b> user@jabber.org</span>" # rever #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 @@ -871,19 +937,19 @@ msgstr "Usar o SS_L antigo" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 msgid "What is your Google ID?" -msgstr "Cal é o seu ID en Google?" +msgstr "Cal é o seu ID de Google?" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 msgid "What is your Google password?" -msgstr "Cal é o seu contrasinal en Google?" +msgstr "Cal é o seu contrasinal de Google?" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 msgid "What is your Jabber ID?" -msgstr "Cal é o seu ID en Jabber?" +msgstr "Cal é o seu identificador de Jabber?" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 msgid "What is your Jabber password?" -msgstr "Cal é o seu contrasinal en Jabber?" +msgstr "Cal é o seu contrasinal de Jabber?" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 msgid "What is your desired Jabber ID?" @@ -891,7 +957,7 @@ msgstr "Cal é o ID de Jabber que desexa?" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 msgid "What is your desired Jabber password?" -msgstr "Cal é o contrasinal que desexa en Jabber?" +msgstr "Cal é o contrasinal de Jabber que desexa?" # rever #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 @@ -901,19 +967,19 @@ msgstr "Requírese un c_ifrado (TLS/SSL)" # rever #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 msgid "_Ignore SSL certificate errors" -msgstr "_Ignorar os erros do certificado SSL" +msgstr "_Ignorar os erros de certificado SSL" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>" -msgstr "<span size=\"small\"><b>Exemplo:</b> usuario@hotmail.com</span>" +msgstr "<span size=\"small\"><b>Exemplo:</b> user@hotmail.com</span>" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 msgid "What is your Windows Live password?" -msgstr "Cal é o seu contrasinal en Windows Live?" +msgstr "Cal é o seu contrasinal para Windows Live?" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 msgid "What is your Windows Live user name?" -msgstr "Cal é o seu nome de usaurio en Windows Live?" +msgstr "Cal é o seu nome de usuario para Windows Live?" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 msgid "_Email:" @@ -925,7 +991,7 @@ msgstr "_Nome:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4 msgid "_Jabber ID:" -msgstr "ID do _Jabber:" +msgstr "ID para _Jabber:" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5 msgid "_Last Name:" @@ -941,32 +1007,93 @@ msgid "_Published Name:" msgstr "Nome _publicado:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +msgid "<b>Keep-Alive Options</b>" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +#, fuzzy +msgid "<b>Miscellaneous Options</b>" +msgstr "<b>Localización</b>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 +msgid "<b>NAT Traversal Options</b>" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +#, fuzzy +msgid "<b>Proxy Options</b>" +msgstr "<b>Localización</b>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>" -msgstr "<span size=\"small\"><b>Exemplo:</b> usuario@my.sip.server</span>" +msgstr "<span size=\"small\"><b>Exemplo:</b> user@my.sip.server</span>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 +#, fuzzy +msgid "Authentication username:" +msgstr "Fallou a autenticación" # rever -#. look up the DNS SRV record at the service's domain for the host name of a STUN server. -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover STUN" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +#, fuzzy +msgid "Discover Binding" msgstr "Descubrir STUN" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 +#. look up the DNS SRV record at the service's domain for the host name of a STUN server. +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +msgid "Discover the STUN server automatically" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 +msgid "Hostname of the proxy for outbound requests." +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 +msgid "Interval (seconds)" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Loose Routing" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 +msgid "Mechanism:" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +#, fuzzy +msgid "Port:" +msgstr "_Porto:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 msgid "STUN Server:" msgstr "Servidor STUN:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "STUN port:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 +#, fuzzy +msgid "Server:" +msgstr "_Servidor:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +msgid "" +"The username for SIP authentication, if different from the SIP URI\n" +"username." +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#, fuzzy +msgid "Transport:" msgstr "Porto STUN:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 msgid "What is your SIP account password?" -msgstr "Cal é o seu contrasinal de conta en SIP?" +msgstr "Cal é o contrasinal da súa conta SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" -msgstr "Cal é o seu ID de sessión en SIP?" +msgstr "Cal é o seu ID de inicio de sesión SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "_Username:" msgstr "Nome de _usuario:" @@ -977,16 +1104,16 @@ msgstr "Usar o _Yahoo Japan" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 msgid "What is your Yahoo! ID?" -msgstr "Cal é o seu ID en Yahoo! ?" +msgstr "Cal é o seu ID para Yahoo!?" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6 msgid "What is your Yahoo! password?" -msgstr "Cal é o seu contrasinal en Yahoo! ?" +msgstr "Cal é o seu contrasinal para Yahoo!?" # rever #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 msgid "Yahoo I_D:" -msgstr "I_D do Yahoo:" +msgstr "I_D para Yahoo:" # rever #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 @@ -1010,97 +1137,173 @@ msgid "None of the accepted image formats is supported on your system" msgstr "Ningún dos formatos aceptados de imaxe é compatíbel co seu sistema" # rever -#: ../libempathy-gtk/empathy-avatar-chooser.c:933 +#: ../libempathy-gtk/empathy-avatar-chooser.c:915 msgid "Select Your Avatar Image" -msgstr "Seleccione a imaxe de avatar para si" +msgstr "Seleccione a súa imaxe de avatar" -#: ../libempathy-gtk/empathy-avatar-chooser.c:936 +#: ../libempathy-gtk/empathy-avatar-chooser.c:918 msgid "No Image" msgstr "Sen imaxe" -#: ../libempathy-gtk/empathy-avatar-chooser.c:998 +#: ../libempathy-gtk/empathy-avatar-chooser.c:980 msgid "Images" msgstr "Imaxes" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1002 +#: ../libempathy-gtk/empathy-avatar-chooser.c:984 msgid "All Files" msgstr "Todos os ficheiros" # rever -#: ../libempathy-gtk/empathy-avatar-image.c:324 +#: ../libempathy-gtk/empathy-avatar-image.c:327 msgid "Click to enlarge" msgstr "Prema para ampliar" -#: ../libempathy-gtk/empathy-chat.c:186 +#: ../libempathy-gtk/empathy-chat.c:194 msgid "Failed to reconnect this chat" msgstr "Ocorreu un fallo ao reconectar á conversa" -#: ../libempathy-gtk/empathy-chat.c:403 -msgid "Unsupported command" -msgstr "Orde non compatíbel" +# rever +#: ../libempathy-gtk/empathy-chat.c:592 +msgid "Failed to join chatroom" +msgstr "Produciuse un erro ao unirse á sala de conversa" + +#: ../libempathy-gtk/empathy-chat.c:610 +msgid "Failed to open private chat" +msgstr "Ocorreu un fallo ao abrir un chat privado" + +#: ../libempathy-gtk/empathy-chat.c:649 +msgid "Topic not supported on this conversation" +msgstr "Ese asunto non se admite nesta conversación" + +#: ../libempathy-gtk/empathy-chat.c:655 +msgid "You are not allowed to change the topic" +msgstr "Non se lle permite cambiar o asunto" + +#: ../libempathy-gtk/empathy-chat.c:773 +msgid "/clear, clear all messages from the current conversation" +msgstr "/clear, limpa todas as mensaxes da conversa actual" -#: ../libempathy-gtk/empathy-chat.c:535 +#: ../libempathy-gtk/empathy-chat.c:776 +msgid "/topic <topic>, set the topic of the current conversation" +msgstr "/topic <topic>, estabelece o asunto da conversa actual" + +#: ../libempathy-gtk/empathy-chat.c:779 +msgid "/join <chatroom id>, join a new chatroom" +msgstr "/join <chatroom id>, unirse a unha nova sala de conversa" + +#: ../libempathy-gtk/empathy-chat.c:782 +msgid "/j <chatroom id>, join a new chatroom" +msgstr "/j <chatroom id>, unirse a unha nova sala de conversa" + +#: ../libempathy-gtk/empathy-chat.c:785 +msgid "/query <contact id> [<message>], open a private chat" +msgstr "/query <contact id> [<message>], abre un chat privado" + +#: ../libempathy-gtk/empathy-chat.c:788 +msgid "/msg <contact id> <message>, open a private chat" +msgstr "/msg <contact id> <message>, abre un chat privado" + +#: ../libempathy-gtk/empathy-chat.c:791 +msgid "/nick <nickname>, change your nickname on current server" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:794 +msgid "/me <message>, send an ACTION message to the current conversation" +msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual" + +#: ../libempathy-gtk/empathy-chat.c:797 +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 chatroom\"" +msgstr "" +"/say <message>, enviar <message> á conversa actual. Isto úsase para enviar " +"unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para " +"unirse a unha nova sala de conversa\"" + +#: ../libempathy-gtk/empathy-chat.c:802 +msgid "" +"/help [<command>], show all supported commands. If <command> is defined, " +"show its usage." +msgstr "" +"/help [<command>], mostra todas as ordes admitidas. Se <command> está " +"definida, mostra o seu uso." + +#: ../libempathy-gtk/empathy-chat.c:812 +#, c-format +msgid "Usage: %s" +msgstr "Uso: %s" + +#: ../libempathy-gtk/empathy-chat.c:841 +msgid "Unknown command" +msgstr "Orde descoñecida" + +#: ../libempathy-gtk/empathy-chat.c:962 +msgid "Unknown command, see /help for the available commands" +msgstr "Orde descoñecida, vexa /help sobre as ordes dispoñíbeis" + +#: ../libempathy-gtk/empathy-chat.c:1100 msgid "offline" msgstr "desconectado" -#: ../libempathy-gtk/empathy-chat.c:538 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "invalid contact" -msgstr "contacto non válido" +msgstr "contacto incorrecto" -#: ../libempathy-gtk/empathy-chat.c:541 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "permission denied" msgstr "permiso denegado" # rever -#: ../libempathy-gtk/empathy-chat.c:544 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "too long message" msgstr "a mensaxe é demasiado longa" -#: ../libempathy-gtk/empathy-chat.c:547 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "not implemented" msgstr "non implementado" -#: ../libempathy-gtk/empathy-chat.c:550 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "unknown" msgstr "descoñecido" # rever -#: ../libempathy-gtk/empathy-chat.c:554 +#: ../libempathy-gtk/empathy-chat.c:1119 #, c-format msgid "Error sending message '%s': %s" msgstr "Erro ao enviar a mensaxe '%s': %s" # rever -#: ../libempathy-gtk/empathy-chat.c:584 +#: ../libempathy-gtk/empathy-chat.c:1149 #, c-format msgid "Topic set to: %s" msgstr "Cambiouse o asunto a: %s" # rever -#: ../libempathy-gtk/empathy-chat.c:586 +#: ../libempathy-gtk/empathy-chat.c:1151 msgid "No topic defined" msgstr "Non se definiu un asunto" -#: ../libempathy-gtk/empathy-chat.c:956 +#: ../libempathy-gtk/empathy-chat.c:1524 msgid "(No Suggestions)" msgstr "(Sen suxestións)" -#: ../libempathy-gtk/empathy-chat.c:1010 +#: ../libempathy-gtk/empathy-chat.c:1578 msgid "Insert Smiley" msgstr "Inserir unha emoticona" #. send button -#: ../libempathy-gtk/empathy-chat.c:1028 -#: ../libempathy-gtk/empathy-ui-utils.c:1492 +#: ../libempathy-gtk/empathy-chat.c:1596 +#: ../libempathy-gtk/empathy-ui-utils.c:1505 msgid "_Send" msgstr "_Enviar" -#: ../libempathy-gtk/empathy-chat.c:1062 +#: ../libempathy-gtk/empathy-chat.c:1630 msgid "_Spelling Suggestions" msgstr "Suxestións de _ortografía" # rever -#: ../libempathy-gtk/empathy-chat.c:1177 +#: ../libempathy-gtk/empathy-chat.c:1745 #, c-format msgid "%s has disconnected" msgstr "%s desconectou" @@ -1108,12 +1311,12 @@ msgstr "%s desconectou" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1184 +#: ../libempathy-gtk/empathy-chat.c:1752 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s foi expulsado por %2$s" -#: ../libempathy-gtk/empathy-chat.c:1187 +#: ../libempathy-gtk/empathy-chat.c:1755 #, c-format msgid "%s was kicked" msgstr "%s foi expulsado" @@ -1121,17 +1324,17 @@ msgstr "%s foi expulsado" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1195 +#: ../libempathy-gtk/empathy-chat.c:1763 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s foi vetado por %2$s" -#: ../libempathy-gtk/empathy-chat.c:1198 +#: ../libempathy-gtk/empathy-chat.c:1766 #, c-format msgid "%s was banned" msgstr "%s foi excluído" -#: ../libempathy-gtk/empathy-chat.c:1202 +#: ../libempathy-gtk/empathy-chat.c:1770 #, c-format msgid "%s has left the room" msgstr "%s deixou a sala" @@ -1141,62 +1344,83 @@ msgstr "%s deixou a sala" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1211 +#: ../libempathy-gtk/empathy-chat.c:1779 #, c-format msgid " (%s)" msgstr " (%s)" # rever -#: ../libempathy-gtk/empathy-chat.c:1234 +#: ../libempathy-gtk/empathy-chat.c:1804 #, c-format msgid "%s has joined the room" msgstr "%s uniuse á sala" -#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1285 +#: ../libempathy-gtk/empathy-chat.c:1829 +#, fuzzy, c-format +msgid "%s is now known as %s" +msgstr "%s está agora conectado." + +#: ../libempathy-gtk/empathy-chat.c:1962 ../src/empathy-call-window.c:1297 msgid "Disconnected" msgstr "Desconectado" -#: ../libempathy-gtk/empathy-chat.c:1803 +#: ../libempathy-gtk/empathy-chat.c:2452 +msgid "Wrong password; please try again:" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:2453 +msgid "Retry" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:2458 +msgid "This room is protected by a password:" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:2459 +#, fuzzy +msgid "Join" +msgstr "_Unirse" + +#: ../libempathy-gtk/empathy-chat.c:2599 msgid "Connected" msgstr "Conectado" -#: ../libempathy-gtk/empathy-chat.c:1853 -#: ../libempathy-gtk/empathy-log-window.c:502 +#: ../libempathy-gtk/empathy-chat.c:2652 +#: ../libempathy-gtk/empathy-log-window.c:546 msgid "Conversation" msgstr "Conversa" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:477 +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:556 msgid "Topic:" msgstr "Asunto:" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:316 -#: ../libempathy-gtk/empathy-theme-adium.c:276 +#: ../libempathy-gtk/empathy-chat-text-view.c:315 +#: ../libempathy-gtk/empathy-theme-adium.c:817 msgid "_Copy Link Address" msgstr "_Copiar o enderezo da ligazón" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:323 -#: ../libempathy-gtk/empathy-theme-adium.c:284 +#: ../libempathy-gtk/empathy-chat-text-view.c:322 +#: ../libempathy-gtk/empathy-theme-adium.c:824 msgid "_Open Link" -msgstr "_Abrir ligazón" +msgstr "_Abrir a ligazón" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:421 +#: ../libempathy-gtk/empathy-chat-text-view.c:420 msgid "%A %B %d %Y" msgstr "%A, %d de %B de %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:177 -#: ../libempathy-gtk/empathy-contact-dialogs.c:236 +#: ../libempathy-gtk/empathy-contact-dialogs.c:238 msgid "Edit Contact Information" msgstr "Editar a información de contacto" -#: ../libempathy-gtk/empathy-contact-dialogs.c:287 +#: ../libempathy-gtk/empathy-contact-dialogs.c:289 msgid "Personal Information" msgstr "Información persoal" -#: ../libempathy-gtk/empathy-contact-dialogs.c:392 +#: ../libempathy-gtk/empathy-contact-dialogs.c:394 msgid "New Contact" msgstr "Contacto novo" @@ -1211,40 +1435,40 @@ msgid "Subscription Request" msgstr "Solicitude de subscrición" # rever -#: ../libempathy-gtk/empathy-contact-list-view.c:1414 +#: ../libempathy-gtk/empathy-contact-list-view.c:1416 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "Está seguro de que quere eliminar o grupo '%s'?" # rever -#: ../libempathy-gtk/empathy-contact-list-view.c:1416 +#: ../libempathy-gtk/empathy-contact-list-view.c:1418 msgid "Removing group" msgstr "Eliminando o grupo" #. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1463 -#: ../libempathy-gtk/empathy-contact-list-view.c:1540 +#: ../libempathy-gtk/empathy-contact-list-view.c:1465 +#: ../libempathy-gtk/empathy-contact-list-view.c:1542 msgid "_Remove" msgstr "_Eliminar" # rever -#: ../libempathy-gtk/empathy-contact-list-view.c:1493 +#: ../libempathy-gtk/empathy-contact-list-view.c:1495 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "Está seguro de quere eliminar o contacto '%s'?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1495 +#: ../libempathy-gtk/empathy-contact-list-view.c:1497 msgid "Removing contact" msgstr "Eliminando o contacto" # rever #: ../libempathy-gtk/empathy-contact-menu.c:195 -#: ../src/empathy-main-window.ui.h:11 +#: ../src/empathy-main-window.ui.h:12 msgid "_Add Contact..." msgstr "Eng_adir un contacto..." #: ../libempathy-gtk/empathy-contact-menu.c:222 -#: ../src/empathy-main-window.ui.h:12 +#: ../src/empathy-main-window.ui.h:13 msgid "_Chat" msgstr "_Conversa" @@ -1260,12 +1484,13 @@ msgstr "_Videochamada" # rever #: ../libempathy-gtk/empathy-contact-menu.c:324 -msgid "_View Previous Conversations" -msgstr "_Ver as conversas previas" +#: ../src/empathy-main-window.ui.h:24 +msgid "_Previous Conversations" +msgstr "Conversas _previas" #: ../libempathy-gtk/empathy-contact-menu.c:346 msgid "Send file" -msgstr "Enviar ficheiro" +msgstr "Enviar o ficheiro" #: ../libempathy-gtk/empathy-contact-menu.c:369 msgid "Share my desktop" @@ -1276,7 +1501,7 @@ msgid "Infor_mation" msgstr "Infor_mación" #: ../libempathy-gtk/empathy-contact-menu.c:441 -#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16 +#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:17 msgid "_Edit" msgstr "_Editar" @@ -1310,7 +1535,7 @@ msgid "Select" msgstr "Seleccionar" #: ../libempathy-gtk/empathy-contact-widget.c:1009 -#: ../src/empathy-main-window.c:1019 +#: ../src/empathy-main-window.c:1026 msgid "Group" msgstr "Grupo" @@ -1411,15 +1636,15 @@ msgstr "Latitude:" msgid "Altitude:" msgstr "Altitude:" -#: ../libempathy-gtk/empathy-contact-widget.c:1353 +#: ../libempathy-gtk/empathy-contact-widget.c:1367 msgid "<b>Location</b>" msgstr "<b>Localización</b>" -#: ../libempathy-gtk/empathy-contact-widget.c:1366 +#: ../libempathy-gtk/empathy-contact-widget.c:1380 msgid "<b>Location</b>, " msgstr "<b>Localización</b>, " -#: ../libempathy-gtk/empathy-contact-widget.c:1416 +#: ../libempathy-gtk/empathy-contact-widget.c:1430 msgid "%B %e, %Y at %R UTC" msgstr "%B %e, %Y de %R UTC" @@ -1427,13 +1652,6 @@ msgstr "%B %e, %Y de %R UTC" msgid "<b>Location</b> at (date)\t" msgstr "<b>Localización</b> o (date)\t" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 -msgid "Account:" -msgstr "Conta:" - #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 msgid "Alias:" msgstr "Alias:" @@ -1452,7 +1670,7 @@ msgid "Client:" msgstr "Cliente:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:7 -#: ../src/empathy-main-window.c:1002 +#: ../src/empathy-main-window.c:1009 msgid "Contact" msgstr "Contacto" @@ -1508,28 +1726,28 @@ msgid "_Add Group" msgstr "Eng_adir grupo" # rever -#: ../libempathy-gtk/empathy-irc-network-dialog.c:281 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 msgid "new server" msgstr "servidor novo" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:508 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Servidor" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:523 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Porto" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:536 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:535 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:495 -#: ../src/empathy-import-widget.c:302 +#: ../libempathy-gtk/empathy-log-window.c:539 +#: ../src/empathy-import-widget.c:310 msgid "Account" msgstr "Conta" -#: ../libempathy-gtk/empathy-log-window.c:512 +#: ../libempathy-gtk/empathy-log-window.c:556 msgid "Date" msgstr "Data" @@ -1574,34 +1792,34 @@ msgstr "Conversa nova" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:176 -#: ../libempathy-gtk/empathy-presence-chooser.c:212 +#: ../libempathy-gtk/empathy-presence-chooser.c:167 +#: ../libempathy-gtk/empathy-presence-chooser.c:203 msgid "Custom Message..." msgstr "Mensaxe personalizada..." -#: ../libempathy-gtk/empathy-presence-chooser.c:229 -#: ../libempathy-gtk/empathy-presence-chooser.c:231 +#: ../libempathy-gtk/empathy-presence-chooser.c:220 +#: ../libempathy-gtk/empathy-presence-chooser.c:222 msgid "Edit Custom Messages..." -msgstr "Editar mensaxe personalizada..." +msgstr "Editar a mensaxe personalizada..." -#: ../libempathy-gtk/empathy-presence-chooser.c:330 +#: ../libempathy-gtk/empathy-presence-chooser.c:344 msgid "Click to remove this status as a favorite" msgstr "Faga clic para eliminar este estado como favorito" -#: ../libempathy-gtk/empathy-presence-chooser.c:339 +#: ../libempathy-gtk/empathy-presence-chooser.c:353 msgid "Click to make this status a favorite" msgstr "Faga clic para facer este estado un dos favoritos" -#: ../libempathy-gtk/empathy-presence-chooser.c:373 +#: ../libempathy-gtk/empathy-presence-chooser.c:387 msgid "Set status" -msgstr "Establecer status" +msgstr "Estabelecer status" -#: ../libempathy-gtk/empathy-presence-chooser.c:794 +#: ../libempathy-gtk/empathy-presence-chooser.c:895 msgid "Set your presence and current status" -msgstr "Estableza a súa presenza e estado actual" +msgstr "Estabeleza a súa presenza e estado actual" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1043 +#: ../libempathy-gtk/empathy-presence-chooser.c:1082 msgid "Custom messages..." msgstr "Mensaxes personalizadas..." @@ -1664,7 +1882,7 @@ msgstr "Editar mensaxes personalizadas" #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1 msgid "Add _New Preset" -msgstr "Engada _nova configuración preestablecida" +msgstr "Engada a _nova configuración preestabelecida" #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2 msgid "Saved Presets" @@ -1686,16 +1904,16 @@ msgstr "Limpo" msgid "Blue" msgstr "Azul" -#: ../libempathy-gtk/empathy-ui-utils.c:1394 +#: ../libempathy-gtk/empathy-ui-utils.c:1407 msgid "Unable to open URI" msgstr "Non foi posíbel abrir o URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1484 +#: ../libempathy-gtk/empathy-ui-utils.c:1497 msgid "Select a file" msgstr "Seleccione un ficheiro" # rever -#: ../libempathy-gtk/empathy-ui-utils.c:1544 +#: ../libempathy-gtk/empathy-ui-utils.c:1557 msgid "Select a destination" msgstr "Seleccione un destinatario" @@ -1866,86 +2084,41 @@ msgstr "Occidental" msgid "Vietnamese" msgstr "Vietnamita" -# rever -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1 -msgid "" -"The contact to display in the applet. Empty means no contact is displayed." -msgstr "" -"O contacto para mostrar no miniaplicativo. Baleiro significa que non se " -"mostra ningún contacto." - -# rever -#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2 -msgid "The contact's avatar token. Empty means contact has no avatar." -msgstr "" -"O token do avatar do contacto. Baleiro significa que o contacto non ten un " -"avatar." +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 +msgid "The contact selected cannot receive files." +msgstr "O contacto seleccionado non pode recibir ficheiros." # rever -#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1 -msgid "Megaphone" -msgstr "Megáfono" +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 +msgid "The contact selected is offline." +msgstr "O contacto seleccionado desconectouse" # rever -#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2 -#: ../megaphone/src/megaphone-applet.c:522 -msgid "Talk!" -msgstr "Fale!" - -#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1 -#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1 -msgid "_About" -msgstr "_Acerca de" +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 +msgid "No error message" +msgstr "Non hai mensaxe de erro" -#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2 -msgid "_Information" -msgstr "_Información" - -#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3 -#: ../src/empathy-main-window.ui.h:23 -msgid "_Preferences" -msgstr "_Preferencias" +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 +msgid "Instant Message (Empathy)" +msgstr "Mensaxe instantáneo (Empathy)" # rever -#: ../megaphone/src/megaphone-applet.c:166 -msgid "Please configure a contact." -msgstr "Configure un contacto." - -# rever -#: ../megaphone/src/megaphone-applet.c:256 -msgid "Select contact..." -msgstr "Seleccionar un contacto..." - -#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1 -msgid "Presence" -msgstr "Presenza" - -# rever -#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2 -#: ../nothere/src/nothere-applet.c:105 -msgid "Set your own presence" -msgstr "Defina a súa propia presenza" - -# rever -#: ../src/empathy.c:742 +#: ../src/empathy.c:893 msgid "Don't connect on startup" msgstr "Non se conectar ao inicio" # rever -#: ../src/empathy.c:746 -msgid "Don't show the contact list on startup" -msgstr "Non mostrar a lista de contactos ao inicio" +#: ../src/empathy.c:897 +msgid "Don't display the contact list or any other dialogs on startup" +msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio" # rever -#: ../src/empathy.c:750 +#: ../src/empathy.c:901 msgid "Show the accounts dialog" msgstr "Mostra o diálogo de conta" # rever -#: ../src/empathy.c:762 +#: ../src/empathy.c:913 msgid "- Empathy IM Client" msgstr "- Cliente de mensaxaría instantánea Empathy" @@ -1993,22 +2166,21 @@ msgstr "Un cliente de mensaxería instantánea para o Gnome" #: ../src/empathy-about-dialog.c:125 msgid "translator-credits" msgstr "" -"Suso Baleato <suso.baleato@xunta.es>, 2009;\n" "Fran Diéguez <fran.dieguez@glug.es>, 2009;\n" -"Antón Méixome <meixome@mancomun.org>,2009." +"Antón Méixome <meixome@mancomun.org>,2009. " # rever #: ../src/empathy-account-assistant.c:118 msgid "There has been an error while importing the accounts." -msgstr "Produciuse un erro ao se importaren as contas." +msgstr "Produciuse un erro ao importar as contas." #: ../src/empathy-account-assistant.c:121 msgid "There has been an error while parsing the account details." -msgstr "Produciuse un erro mentres se procesaban os detalles da conta." +msgstr "Produciuse un erro ao procesar os detalles da conta." #: ../src/empathy-account-assistant.c:124 msgid "There has been an error while creating the account." -msgstr "Produciuse un erro mentres se creaba a conta." +msgstr "Prodiciuse un erro ao crear a conta." #: ../src/empathy-account-assistant.c:126 msgid "There has been an error." @@ -2017,15 +2189,15 @@ msgstr "Produciuse un erro." #: ../src/empathy-account-assistant.c:141 #, c-format msgid "The error message was: <span style=\"italic\">%s</span>" -msgstr "O erro foi : <span style=\"italic\">%s</span>" +msgstr "A mensaxe de erro foi : <span style=\"italic\">%s</span>" #: ../src/empathy-account-assistant.c:149 msgid "" "You can either go back and try to enter your accounts' details again or quit " "this assistant and add accounts later from the Edit menu." msgstr "" -"Pode volver atrás e probar a introducir os detalles da súa conta outra vez " -"ou saír deste asistente e engadir as contas logo desde o menu Editar." +"Pode ben volver atrás e tentar introducir outra vez os detalles ou saír " +"deste asistente e engadir as contas máis tarde desde o menú Editar." #: ../src/empathy-account-assistant.c:184 msgid "An error occurred" @@ -2038,173 +2210,146 @@ msgstr "Produciuse un erro" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../src/empathy-account-assistant.c:321 -#: ../src/empathy-accounts-dialog.c:1400 +#: ../src/empathy-account-assistant.c:331 +#: ../src/empathy-accounts-dialog.c:1339 #, c-format msgid "New %s account" msgstr "Conta nova de %s" -#: ../src/empathy-account-assistant.c:393 +#: ../src/empathy-account-assistant.c:403 msgid "What kind of chat account do you have?" msgstr "Que clase de conta de chat ten?" -#: ../src/empathy-account-assistant.c:399 +#: ../src/empathy-account-assistant.c:409 msgid "Do you have any other chat accounts you want to set up?" -msgstr "Ten algunha outra clase de contas de chat que queira configurar?" +msgstr "Ten algunha outra conta de chat que queira estabelecer?" -#: ../src/empathy-account-assistant.c:405 +#: ../src/empathy-account-assistant.c:415 msgid "Enter your account details" -msgstr "Introduza os detalles da conta" +msgstr "Introduza os seus detalles de conta" # rever -#: ../src/empathy-account-assistant.c:410 +#: ../src/empathy-account-assistant.c:420 msgid "What kind of chat account do you want to create?" msgstr "Que clase de conta de chat quere crear?" # rever -#: ../src/empathy-account-assistant.c:416 +#: ../src/empathy-account-assistant.c:426 msgid "Do you want to create other chat accounts?" -msgstr "Está seguro de quere crear outras contas de chat?" +msgstr "Quere crear outras contas de chat?" -#: ../src/empathy-account-assistant.c:423 +#: ../src/empathy-account-assistant.c:433 msgid "Enter the details for the new account" msgstr "Introduza os detalles para a nova conta" -#: ../src/empathy-account-assistant.c:509 +#: ../src/empathy-account-assistant.c:519 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " "programs. With a microphone or a webcam you can also have audio or video " "calls." msgstr "" -"Con Empathy pode conversar con xente conectada próxima e con amigos e " -"colegas que usan Google Talk, AIM, Windows Live e moitos outros programas de " -"chat. Cun micrófono ou unha webcam tamén pode ter chamadas de audio ou video." +"Con Empathy pode falar en liña con xente próxima e con amigos e colegas que " +"usen Google Talk, AIM, Windows Live e calquera outro programa de chat. Cun " +"micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo." -#: ../src/empathy-account-assistant.c:526 +#: ../src/empathy-account-assistant.c:536 msgid "Do you have an account you've been using with another chat program?" -msgstr "Ten unha conta que xa estivese usando con outro programa de chat?" +msgstr "Ten algunha outra conta que estea usando con outro programa de chat?" -#: ../src/empathy-account-assistant.c:549 +#: ../src/empathy-account-assistant.c:559 msgid "Yes, import my account details from " -msgstr "Si, importar os detalles da miña conta de " +msgstr "Si, importar os detalles da miña conta desde " -#: ../src/empathy-account-assistant.c:570 +#: ../src/empathy-account-assistant.c:580 msgid "Yes, I'll enter my account details now" -msgstr "Si, introducirei os detalles da miña conta agora" +msgstr "Si, introducirei os meus detalles de conta agora" -#: ../src/empathy-account-assistant.c:592 +#: ../src/empathy-account-assistant.c:602 msgid "No, I want a new account" msgstr "Non, quero crear unha conta nova" -#: ../src/empathy-account-assistant.c:602 +#: ../src/empathy-account-assistant.c:612 msgid "No, I just want to see people online nearby for now" -msgstr "Non, só quero ver xente conectada próxima por agora" +msgstr "Non, só quero ver á xente conectada que estea próxima por agora" -#: ../src/empathy-account-assistant.c:623 +#: ../src/empathy-account-assistant.c:633 msgid "Select the accounts you want to import:" msgstr "Seleccione as contas que quere importar:" -#: ../src/empathy-account-assistant.c:710 +#: ../src/empathy-account-assistant.c:720 #: ../src/empathy-new-chatroom-dialog.c:496 #: ../src/empathy-new-chatroom-dialog.c:497 msgid "Yes" msgstr "Si" -#: ../src/empathy-account-assistant.c:717 +#: ../src/empathy-account-assistant.c:727 msgid "No, that's all for now" -msgstr "Non, máis nada por agora" +msgstr "Non, isto é todo por agora" -#: ../src/empathy-account-assistant.c:910 +#: ../src/empathy-account-assistant.c:920 msgid "Welcome to Empathy" -msgstr "Benvido/a a Empathy" +msgstr "Sexa benvido/a ao Empathy" # rever -#: ../src/empathy-account-assistant.c:919 +#: ../src/empathy-account-assistant.c:929 msgid "Import your existing accounts" -msgstr "_Importar as súas contas" +msgstr "_Importar as súas contas existentes" #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes #: ../src/empathy-accounts-dialog.c:63 #, c-format msgid "There are unsaved modification regarding your %s account." -msgstr "Hai unha modificación sen gardar respecto da súa conta %s." - -# rever -#. To translators: The first parameter is the login id and the -#. * second one is the server. The resulting string will be something -#. * like: "MyUserName on chat.freenode.net". -#. * You should reverse the order of these arguments if the -#. * server should come before the login id in your locale. -#: ../src/empathy-accounts-dialog.c:236 -#, c-format -msgid "%1$s on %2$s" -msgstr "%1$s en %2$s" - -#. To translators: The parameter is the protocol name. The resulting -#. * string will be something like: "Jabber Account" -#: ../src/empathy-accounts-dialog.c:248 -#, c-format -msgid "%s Account" -msgstr "Conta %s" +msgstr "Hai modificacións sen gardar respecto da súa conta %s." -# rever -#: ../src/empathy-accounts-dialog.c:252 -msgid "New account" -msgstr "Conta nova" +#. The primary text of the dialog shown to the user when he is about to lose +#. * an unsaved new account +#: ../src/empathy-accounts-dialog.c:67 +msgid "Your new account has not been saved yet." +msgstr "A súa nova conta aínda non foi gardada." # rever -#: ../src/empathy-accounts-dialog.c:502 +#: ../src/empathy-accounts-dialog.c:484 msgid "" "You are about to create a new account, which will discard\n" "your changes. Are you sure you want to proceed?" msgstr "" -"Está a piques de crear unha conta nova, o que descartará\n" -"os seus cambios. Está seguro de que quere proceder?" +"Vai crear unha conta nova, e descartaranse os seus cambios \n" +"Está seguro de que quere proceder?" # rever -#: ../src/empathy-accounts-dialog.c:787 +#: ../src/empathy-accounts-dialog.c:774 #, c-format -msgid "" -"You are about to remove your %s account!\n" -"Are you sure you want to proceed?" -msgstr "" -"Vai eliminar a súa conta %s!\n" -"Está seguro de que quere proceder?" +msgid "Do you want to remove %s from your computer?" +msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?" -# rever -#: ../src/empathy-accounts-dialog.c:792 -msgid "" -"Any associated conversations and chat rooms will NOT be removed if you " -"decide to proceed.\n" -"\n" -"Should you decide to add the account back at a later time, they will still " -"be available." -msgstr "" -"Calquera conversa asociada e salas de conversa NON serán eliminadas se " -"decide proceder.\n" -"\n" -"Vostede podería decidir engadir a conta de novo máis adiante e elas estarán " -"aínda dispoñíbeis." +#: ../src/empathy-accounts-dialog.c:778 +msgid "This will not remove your account on the server." +msgstr "Isto non eliminará a súa conta no servidor." # rever -#: ../src/empathy-accounts-dialog.c:980 +#: ../src/empathy-accounts-dialog.c:960 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" msgstr "" -"Está a piques de seleccionar outra conta, o que descartará\n" -"os seus cambios. Está seguro de que quere proceder?" +"Vai seleccionar outra conta, e descartaranse os seus cambios\n" +"Está seguro de que quere proceder?" # rever -#: ../src/empathy-accounts-dialog.c:1475 +#: ../src/empathy-accounts-dialog.c:1425 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" msgstr "" -"Está a piques de pechar a xanela, o que descartará\n" -"os seus cambios. Está seguro de que quere proceder?" +"Vai cerrar a xanela, e descartaranse os cambios que realizou.\n" +"Está seguro de que quere proceder?" + +#. Translators: this is used only when built on a moblin platform +#: ../src/empathy-accounts-dialog.c:1596 +msgid "_Next" +msgstr "_Seguinte" #: ../src/empathy-accounts-dialog.ui.h:1 msgid "Accounts" @@ -2212,7 +2357,7 @@ msgstr "Contas" #: ../src/empathy-accounts-dialog.ui.h:2 msgid "Add new" -msgstr "Engadir nova" +msgstr "Engadir unha nova" #: ../src/empathy-accounts-dialog.ui.h:3 msgid "Cr_eate" @@ -2229,8 +2374,8 @@ msgid "" "To add a new account, you first have to install a backend for each protocol " "you want to use." msgstr "" -"Para engadir unha conta nova primeiro ten que instalar un backend para cada " -"protocolo que quere usar." +"Para engadir unha conta nova primeiro ten que instalar unha infraestrutura " +"para cada protocolo que quere usar." # rever #: ../src/empathy-accounts-dialog.ui.h:6 @@ -2241,73 +2386,143 @@ msgstr "Eng_adir..." msgid "_Create a new account" msgstr "_Crear unha nova conta" -# rever #: ../src/empathy-accounts-dialog.ui.h:8 +msgid "_Import..." +msgstr "_Importar..." + +# rever +#: ../src/empathy-accounts-dialog.ui.h:9 msgid "_Reuse an existing account" msgstr "_Reusar unha conta existente" -#: ../src/empathy-accounts-dialog.ui.h:9 +#: ../src/empathy-accounts-dialog.ui.h:10 msgid "account" msgstr "conta" -#: ../src/empathy-call-window.c:427 +#: ../src/empathy-call-window.c:428 msgid "Contrast" msgstr "Contraste" -#: ../src/empathy-call-window.c:430 +#: ../src/empathy-call-window.c:431 msgid "Brightness" msgstr "Brillo" -#: ../src/empathy-call-window.c:433 +#: ../src/empathy-call-window.c:434 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-call-window.c:541 +#: ../src/empathy-call-window.c:542 msgid "Volume" msgstr "Volume" -#: ../src/empathy-call-window.c:674 +#: ../src/empathy-call-window.c:676 msgid "Connecting..." msgstr "Conectando..." -#: ../src/empathy-call-window.c:781 +#: ../src/empathy-call-window.c:784 msgid "_Sidebar" msgstr "Barra _lateral" -#: ../src/empathy-call-window.c:800 +#: ../src/empathy-call-window.c:803 msgid "Dialpad" msgstr "Marcador" # rever -#: ../src/empathy-call-window.c:806 +#: ../src/empathy-call-window.c:809 msgid "Audio input" msgstr "Entrada de audio" # rever -#: ../src/empathy-call-window.c:810 +#: ../src/empathy-call-window.c:813 msgid "Video input" msgstr "Entrada de vídeo" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:873 +#: ../src/empathy-call-window.c:876 #, c-format msgid "Call with %s" msgstr "Chamar con %s" #. translators: Call is a noun. This string is used in the window #. * title -#: ../src/empathy-call-window.c:944 +#: ../src/empathy-call-window.c:957 msgid "Call" msgstr "Chamar" # rever #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1445 +#: ../src/empathy-call-window.c:1457 #, c-format msgid "Connected — %d:%02dm" msgstr "Conectado — %d:%02dm" +# rever +#: ../src/empathy-call-window.c:1518 +msgid "Technical Details" +msgstr "Detalles técnicos" + +#: ../src/empathy-call-window.c:1556 +#, c-format +msgid "" +"%s's software does not understand any of the audio formats supported by your " +"computer" +msgstr "" +"O software de %s non entende algúns dos formatos de video admitidos polo seu " +"computador" + +#: ../src/empathy-call-window.c:1561 +#, c-format +msgid "" +"%s's software does not understand any of the video formats supported by your " +"computer" +msgstr "" +"O software de %s non entende algúns dos formatos de vídeo admitidos polo seu " +"computador" + +#: ../src/empathy-call-window.c:1567 +#, 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 "" +"Non se pode estabelecer unha conexión a %s. Un deles pode estar nunha rede " +"que non permite conexións directas." + +#: ../src/empathy-call-window.c:1573 +msgid "There was a failure on the network" +msgstr "" + +#: ../src/empathy-call-window.c:1577 +msgid "" +"The audio formats necessary for this call are not installed on your computer" +msgstr "" + +#: ../src/empathy-call-window.c:1580 +msgid "" +"The video formats necessary for this call are not installed on your computer" +msgstr "" + +#: ../src/empathy-call-window.c:1590 +#, c-format +msgid "" +"Something not expected happened in a Telepathy component. Please <a href=\"%s" +"\">report this bug</a> and attach logs gathered from the 'Debug' window in " +"the Help menu." +msgstr "" + +#: ../src/empathy-call-window.c:1598 +msgid "There was a failure in the call engine" +msgstr "" + +#: ../src/empathy-call-window.c:1637 +msgid "Can't establish audio stream" +msgstr "Non se pode estabelecer un fluxo de video" + +#: ../src/empathy-call-window.c:1647 +msgid "Can't establish video stream" +msgstr "Non se pode estabelecer un fluxo de vídeo" + #: ../src/empathy-call-window.ui.h:1 msgid "Hang up" msgstr "Colgar" @@ -2339,13 +2554,7 @@ msgid "_View" msgstr "_Ver" # rever -#: ../src/empathy-chat-window.c:349 -#, c-format -msgid "Conversations (%d)" -msgstr "Conversas (%d)" - -# rever -#: ../src/empathy-chat-window.c:481 +#: ../src/empathy-chat-window.c:560 msgid "Typing a message." msgstr "Escribindo unha mensaxe." @@ -2354,26 +2563,27 @@ msgid "C_lear" msgstr "_Limpo" #: ../src/empathy-chat-window.ui.h:2 +#, fuzzy +msgid "C_ontact" +msgstr "Contacto" + +#: ../src/empathy-chat-window.ui.h:3 msgid "Chat" msgstr "Conversa" -#: ../src/empathy-chat-window.ui.h:3 +#: ../src/empathy-chat-window.ui.h:4 msgid "Insert _Smiley" msgstr "Inse_rir unha emoticona" -#: ../src/empathy-chat-window.ui.h:4 +#: ../src/empathy-chat-window.ui.h:5 msgid "Move Tab _Left" msgstr "Mover o separador _Esquerda" -#: ../src/empathy-chat-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:6 msgid "Move Tab _Right" msgstr "Mover o separador _Dereita" -#: ../src/empathy-chat-window.ui.h:6 -msgid "_Contact" -msgstr "_Contacto" - -#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14 +#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:15 msgid "_Contents" msgstr "_Contidos" @@ -2390,7 +2600,7 @@ msgstr "Se_parar o separador" msgid "_Favorite Chatroom" msgstr "Sala de conversa _favorita" -#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18 +#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19 msgid "_Help" msgstr "A_xuda" @@ -2412,16 +2622,16 @@ msgstr "Mo_strar a lista de contactos" msgid "_Tabs" msgstr "_Separadores" -#: ../src/empathy-chatrooms-window.c:258 +#: ../src/empathy-chatrooms-window.c:256 msgid "Name" msgstr "Nome" -#: ../src/empathy-chatrooms-window.c:276 +#: ../src/empathy-chatrooms-window.c:274 msgid "Room" msgstr "Sala" # rever -#: ../src/empathy-chatrooms-window.c:285 +#: ../src/empathy-chatrooms-window.c:282 msgid "Auto-Connect" msgstr "Conectar automaticamente" @@ -2431,84 +2641,84 @@ msgid "Manage Favorite Rooms" msgstr "Xestionar as salas preferidas" # rever -#: ../src/empathy-event-manager.c:322 +#: ../src/empathy-event-manager.c:330 msgid "Incoming call" msgstr "Chamada entrante" # rever -#: ../src/empathy-event-manager.c:325 +#: ../src/empathy-event-manager.c:333 #, c-format msgid "%s is calling you, do you want to answer?" msgstr "%s estao chamando. Quérelle responder?" -#: ../src/empathy-event-manager.c:332 +#: ../src/empathy-event-manager.c:340 msgid "_Reject" msgstr "_Rexeitar" # rever -#: ../src/empathy-event-manager.c:338 +#: ../src/empathy-event-manager.c:346 msgid "_Answer" msgstr "_Responder" -#: ../src/empathy-event-manager.c:453 +#: ../src/empathy-event-manager.c:455 #, c-format msgid "Incoming call from %s" msgstr "Chamada entrante de %s" # rever -#: ../src/empathy-event-manager.c:497 +#: ../src/empathy-event-manager.c:499 #, c-format msgid "%s is offering you an invitation" msgstr "%s estalle a ofrecer un convite" # rever -#: ../src/empathy-event-manager.c:503 +#: ../src/empathy-event-manager.c:505 msgid "An external application will be started to handle it." msgstr "Un aplicativo externo será iniciado para manipulalo." -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:510 msgid "You don't have the needed external application to handle it." msgstr "Non precisa dun aplicativo externo para manipulalo." # rever -#: ../src/empathy-event-manager.c:635 +#: ../src/empathy-event-manager.c:638 msgid "Room invitation" msgstr "Convite para unha sala" # rever -#: ../src/empathy-event-manager.c:638 +#: ../src/empathy-event-manager.c:641 #, c-format msgid "%s is inviting you to join %s" msgstr "%s estao convidando a unirse a %s" -#: ../src/empathy-event-manager.c:646 +#: ../src/empathy-event-manager.c:649 msgid "_Decline" msgstr "_Declinar" -#: ../src/empathy-event-manager.c:651 +#: ../src/empathy-event-manager.c:654 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Unirse" # rever -#: ../src/empathy-event-manager.c:690 +#: ../src/empathy-event-manager.c:693 #, c-format msgid "%s invited you to join %s" msgstr "%s convidouno a unirse a %s" # rever -#: ../src/empathy-event-manager.c:716 +#: ../src/empathy-event-manager.c:719 #, c-format msgid "Incoming file transfer from %s" msgstr "Transferencia de ficheiro entrante de %s" # rever -#: ../src/empathy-event-manager.c:896 +#: ../src/empathy-event-manager.c:899 #, c-format msgid "Subscription requested by %s" msgstr "Subscrición solicitada por %s" -#: ../src/empathy-event-manager.c:900 +#: ../src/empathy-event-manager.c:903 #, c-format msgid "" "\n" @@ -2518,56 +2728,56 @@ msgstr "" "Mensaxe: %s" #. someone is logging off -#: ../src/empathy-event-manager.c:936 +#: ../src/empathy-event-manager.c:943 #, c-format msgid "%s is now offline." msgstr "%s está agora desconectado." #. someone is logging in -#: ../src/empathy-event-manager.c:952 +#: ../src/empathy-event-manager.c:959 #, c-format msgid "%s is now online." msgstr "%s está agora conectado." #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:101 +#: ../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:104 +#: ../src/empathy-ft-manager.c:103 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:180 +#: ../src/empathy-ft-manager.c:179 msgctxt "file transfer percent" msgid "Unknown" msgstr "Descoñecido" # rever -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s at %s/s" msgstr "%s de %s en %s/s" # rever -#: ../src/empathy-ft-manager.c:276 +#: ../src/empathy-ft-manager.c:275 #, c-format msgid "%s of %s" msgstr "%s de %s" # rever #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:307 +#: ../src/empathy-ft-manager.c:306 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Recibindo \"%s\" de %s" # rever #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:310 +#: ../src/empathy-ft-manager.c:309 #, c-format msgid "Sending \"%s\" to %s" msgstr "Enviando \"%s\" a %s" @@ -2575,30 +2785,30 @@ msgstr "Enviando \"%s\" a %s" # rever #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:340 +#: ../src/empathy-ft-manager.c:339 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Produciuse un erro ao recibir \"%s\" de %s" -#: ../src/empathy-ft-manager.c:343 +#: ../src/empathy-ft-manager.c:342 msgid "Error receiving a file" msgstr "Erro ao recibir un ficheiro" # rever -#: ../src/empathy-ft-manager.c:348 +#: ../src/empathy-ft-manager.c:347 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Erro ao enviar \"%s\" a %s" # rever -#: ../src/empathy-ft-manager.c:351 +#: ../src/empathy-ft-manager.c:350 msgid "Error sending a file" msgstr "Erro ao enviar un ficheiro" # rever #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:490 +#: ../src/empathy-ft-manager.c:489 #, c-format msgid "\"%s\" received from %s" msgstr "recibiuse \"%s\" de %s" @@ -2606,39 +2816,39 @@ msgstr "recibiuse \"%s\" de %s" # rever #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:495 +#: ../src/empathy-ft-manager.c:494 #, c-format msgid "\"%s\" sent to %s" msgstr "enviado \"%s\" a %s" -#: ../src/empathy-ft-manager.c:498 +#: ../src/empathy-ft-manager.c:497 msgid "File transfer completed" msgstr "Transferencia de ficheiros terminada" # rever -#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784 +#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783 msgid "Waiting for the other participant's response" msgstr "Agardando pola resposta do outro participante" -#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681 +#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Verificando a integridade de \"%s\"" -#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684 +#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 #, c-format msgid "Hashing \"%s\"" -msgstr "Hashing \"%s\"" +msgstr "Aplicando o hash \"%s\"" -#: ../src/empathy-ft-manager.c:1024 +#: ../src/empathy-ft-manager.c:991 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1036 +#: ../src/empathy-ft-manager.c:1003 msgid "File" msgstr "Ficheiro" -#: ../src/empathy-ft-manager.c:1058 +#: ../src/empathy-ft-manager.c:1025 msgid "Remaining" msgstr "Restantes" @@ -2668,15 +2878,15 @@ msgid "Import Accounts" msgstr "Importar contas" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:282 +#: ../src/empathy-import-widget.c:290 msgid "Import" msgstr "Importar" -#: ../src/empathy-import-widget.c:291 +#: ../src/empathy-import-widget.c:299 msgid "Protocol" msgstr "Protocolo" -#: ../src/empathy-import-widget.c:315 +#: ../src/empathy-import-widget.c:323 msgid "Source" msgstr "Orixe" @@ -2684,81 +2894,92 @@ msgstr "Orixe" #: ../src/empathy-import-mc4-accounts.c:106 #, c-format msgid "%s account" -msgstr "conta %s" +msgstr "Conta %s" -#: ../src/empathy-main-window.c:399 -msgid "_Edit account" +#: ../src/empathy-main-window.c:410 +#, fuzzy +msgid "Reconnect" +msgstr "Desconectado" + +#: ../src/empathy-main-window.c:417 +#, fuzzy +msgid "Edit Account" msgstr "_Editar a conta" +#: ../src/empathy-main-window.c:424 +#, fuzzy +msgid "Close" +msgstr "Limpo" + # rever -#: ../src/empathy-main-window.c:502 +#: ../src/empathy-main-window.c:512 msgid "No error specified" msgstr "Non se especificou ningún erro" # rever -#: ../src/empathy-main-window.c:505 +#: ../src/empathy-main-window.c:515 msgid "Network error" msgstr "Erro de rede" -#: ../src/empathy-main-window.c:508 +#: ../src/empathy-main-window.c:518 msgid "Authentication failed" msgstr "Fallou a autenticación" # rever -#: ../src/empathy-main-window.c:511 +#: ../src/empathy-main-window.c:521 msgid "Encryption error" msgstr "Erro de cifrado" # rever -#: ../src/empathy-main-window.c:514 +#: ../src/empathy-main-window.c:524 msgid "Name in use" msgstr "Nome en uso" # rever -#: ../src/empathy-main-window.c:517 +#: ../src/empathy-main-window.c:527 msgid "Certificate not provided" msgstr "Non se proporcionou o certificado" -#: ../src/empathy-main-window.c:520 +#: ../src/empathy-main-window.c:530 msgid "Certificate untrusted" msgstr "Certificado non fiábel" # rever -#: ../src/empathy-main-window.c:523 +#: ../src/empathy-main-window.c:533 msgid "Certificate expired" msgstr "O certificado caducou" # rever -#: ../src/empathy-main-window.c:526 +#: ../src/empathy-main-window.c:536 msgid "Certificate not activated" msgstr "O certificado non está activado" # rever -#: ../src/empathy-main-window.c:529 +#: ../src/empathy-main-window.c:539 msgid "Certificate hostname mismatch" msgstr "O nome do host do certificado non coincide" # rever -#: ../src/empathy-main-window.c:532 +#: ../src/empathy-main-window.c:542 msgid "Certificate fingerprint mismatch" msgstr "A impresión dixital do certificado non coincide" # rever -#: ../src/empathy-main-window.c:535 +#: ../src/empathy-main-window.c:545 msgid "Certificate self-signed" msgstr "Certificado autoasinado" # rever -#: ../src/empathy-main-window.c:538 +#: ../src/empathy-main-window.c:548 msgid "Certificate error" msgstr "Erro de certificado" -#: ../src/empathy-main-window.c:541 +#: ../src/empathy-main-window.c:551 msgid "Unknown error" msgstr "Erro descoñecido" # rever -#: ../src/empathy-main-window.c:1288 +#: ../src/empathy-main-window.c:1312 msgid "Show and edit accounts" msgstr "Mostrar e editar contas" @@ -2777,7 +2998,7 @@ msgstr "Contexto" # rever #: ../src/empathy-main-window.ui.h:4 msgid "Join _Favorites" -msgstr "Unirse a pre_feridas" +msgstr "Unirse a pre_feridos" #: ../src/empathy-main-window.ui.h:5 msgid "Manage Favorites" @@ -2791,55 +3012,55 @@ msgstr "Tamañ_o normal" msgid "Normal Size With _Avatars" msgstr "Tamaño normal con _avatares" -# rever #: ../src/empathy-main-window.ui.h:8 +#, fuzzy +msgid "P_references" +msgstr "Preferencias" + +# rever +#: ../src/empathy-main-window.ui.h:9 msgid "Sort by _Name" msgstr "Ordenar por _nome" # rever -#: ../src/empathy-main-window.ui.h:9 +#: ../src/empathy-main-window.ui.h:10 msgid "Sort by _Status" msgstr "Ordenar por es_tado" -#: ../src/empathy-main-window.ui.h:10 +#: ../src/empathy-main-window.ui.h:11 msgid "_Accounts" msgstr "_Contas" -#: ../src/empathy-main-window.ui.h:13 +#: ../src/empathy-main-window.ui.h:14 msgid "_Compact Size" msgstr "Ta_maño compacto" -#: ../src/empathy-main-window.ui.h:15 +#: ../src/empathy-main-window.ui.h:16 msgid "_Debug" msgstr "_Depuración" -#: ../src/empathy-main-window.ui.h:17 +#: ../src/empathy-main-window.ui.h:18 msgid "_File Transfers" msgstr "Trans_ferencias de ficheiros" -#: ../src/empathy-main-window.ui.h:19 +#: ../src/empathy-main-window.ui.h:20 msgid "_Join..." msgstr "_Unirse..." # rever -#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2 +#: ../src/empathy-main-window.ui.h:21 ../src/empathy-status-icon.ui.h:2 msgid "_New Conversation..." msgstr "Conversa _nova..." # rever -#: ../src/empathy-main-window.ui.h:21 +#: ../src/empathy-main-window.ui.h:22 msgid "_Offline Contacts" msgstr "Mostrar os contactos _desconectados" -#: ../src/empathy-main-window.ui.h:22 +#: ../src/empathy-main-window.ui.h:23 msgid "_Personal Information" msgstr "Información _persoal" -# rever -#: ../src/empathy-main-window.ui.h:24 -msgid "_Previous Conversations" -msgstr "Conversas _previas" - #: ../src/empathy-main-window.ui.h:25 msgid "_Room" msgstr "Sa_la" @@ -2953,95 +3174,83 @@ msgid "Language" msgstr "Idioma" #: ../src/empathy-preferences.ui.h:1 -msgid "Allow _GPS usage" -msgstr "Permitir o uso de _GPS" - -#: ../src/empathy-preferences.ui.h:2 -msgid "Allow _cellphone usage" -msgstr "Permitir o uso de _móbiles" - -#: ../src/empathy-preferences.ui.h:3 -msgid "Allow _network usage" -msgstr "Permitir o uso da _rede" - -#: ../src/empathy-preferences.ui.h:4 msgid "Appearance" msgstr "Aparencia" # rever -#: ../src/empathy-preferences.ui.h:5 +#: ../src/empathy-preferences.ui.h:2 msgid "Automatically _connect on startup " msgstr "_Conectar automaticamente ao iniciar " -#: ../src/empathy-preferences.ui.h:6 +#: ../src/empathy-preferences.ui.h:3 msgid "Behavior" msgstr "Comportamento" # rever -#: ../src/empathy-preferences.ui.h:7 +#: ../src/empathy-preferences.ui.h:4 msgid "Chat Th_eme:" msgstr "T_ema da conversa:" # rever -#: ../src/empathy-preferences.ui.h:8 +#: ../src/empathy-preferences.ui.h:5 msgid "Disable notifications when _away or busy" msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado" # rever -#: ../src/empathy-preferences.ui.h:9 +#: ../src/empathy-preferences.ui.h:6 msgid "Disable sounds when _away or busy" msgstr "Desactivar os sons cando se estea _ausente ou ocupado" # rever -#: ../src/empathy-preferences.ui.h:10 +#: ../src/empathy-preferences.ui.h:7 msgid "Enable notifications when a contact comes online" msgstr "Activar as notificacións cando un contacto está conectado" # rever -#: ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-preferences.ui.h:8 msgid "Enable notifications when a contact goes offline" msgstr "Activar as notificacións cando un contacto está desconectado" # rever -#: ../src/empathy-preferences.ui.h:12 +#: ../src/empathy-preferences.ui.h:9 msgid "Enable notifications when the _chat is not focused" msgstr "Activar as notificacións cando a _conversa non está enfocada" # rever -#: ../src/empathy-preferences.ui.h:13 +#: ../src/empathy-preferences.ui.h:10 msgid "Enable spell checking for languages:" msgstr "Activar a verificación ortográfica para os idiomas:" -#: ../src/empathy-preferences.ui.h:14 +#: ../src/empathy-preferences.ui.h:11 msgid "General" msgstr "Xeral" -#: ../src/empathy-preferences.ui.h:15 -msgid "Geoclue Settings" -msgstr "Configuración de Geoclue" - -#: ../src/empathy-preferences.ui.h:16 +#: ../src/empathy-preferences.ui.h:12 msgid "Location" msgstr "Localización" -#: ../src/empathy-preferences.ui.h:17 +#: ../src/empathy-preferences.ui.h:13 +msgid "Location sources:" +msgstr "Fontes de localización:" + +#: ../src/empathy-preferences.ui.h:14 msgid "Notifications" msgstr "Notificacións" # rever -#: ../src/empathy-preferences.ui.h:18 +#: ../src/empathy-preferences.ui.h:15 msgid "Play sound for events" msgstr "Reproducir un son para os eventos" -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:16 msgid "Preferences" msgstr "Preferencias" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:17 msgid "Privacy" msgstr "Privacidade" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:18 msgid "" "Reduced location accuracy means that nothing more precise than your city, " "state and country will be published. GPS coordinates will be accurate to 1 " @@ -3052,25 +3261,25 @@ msgstr "" "aproximadas a 1 valor decimal." # rever -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:19 msgid "Show _smileys as images" msgstr "Mostrar as _emoticonas como imaxes" # rever -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:20 msgid "Show contact _list in rooms" msgstr "Mostrar a _lista de contactos nas salas" -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:21 msgid "Sounds" msgstr "Sons" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:22 msgid "Spell Checking" msgstr "Verificación ortográfica" # rever -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:23 msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." @@ -3078,20 +3287,33 @@ msgstr "" "A lista de idiomas reflicte só aqueles idiomas para os que ten un dicionario " "instalado." -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:24 msgid "Themes" msgstr "Temas" # rever -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:25 +msgid "_Cellphone" +msgstr "_Teléfono móbil" + +# rever +#: ../src/empathy-preferences.ui.h:26 msgid "_Enable bubble notifications" msgstr "_Activar as burbullas de notificación" # rever -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:27 msgid "_Enable sound notifications" msgstr "_Activar as notificacións de son" +#: ../src/empathy-preferences.ui.h:28 +msgid "_GPS" +msgstr "_GPS" + +#: ../src/empathy-preferences.ui.h:29 +msgid "_Network (IP, Wifi)" +msgstr "_Rede (IP, Wifi)" + # rever #: ../src/empathy-preferences.ui.h:30 msgid "_Open new chats in separate windows" @@ -3099,15 +3321,19 @@ msgstr "A_brir as conversas novas en xanelas separadas" #: ../src/empathy-preferences.ui.h:31 msgid "_Publish location to my contacts" -msgstr "_Publicar localización aos meus contactos" +msgstr "_Publicar a miña localización aos meus contactos" #: ../src/empathy-preferences.ui.h:32 msgid "_Reduce location accuracy" msgstr "_Reducir a precisión de localización" +#: ../src/empathy-status-icon.c:178 +msgid "Respond" +msgstr "Responder" + #: ../src/empathy-status-icon.ui.h:1 msgid "Status" -msgstr "Status" +msgstr "Estado" #: ../src/empathy-status-icon.ui.h:3 msgid "_Quit" @@ -3132,67 +3358,72 @@ msgstr "" msgid "Contact Map View" msgstr "Vista de mapa de contactos" -#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081 -msgid "Error" -msgstr "Erro" - -#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075 -msgid "Critical" -msgstr "Crítico" - -#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069 -msgid "Warning" -msgstr "Aviso" - -#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063 -#: ../src/empathy-debug-window.c:1111 -msgid "Message" -msgstr "Mensaxe" - -#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057 -msgid "Info" -msgstr "Info" - -#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051 -msgid "Debug" -msgstr "Depuración" - -#: ../src/empathy-debug-window.c:841 +#: ../src/empathy-debug-window.c:1043 msgid "Save" msgstr "Gardar" -#: ../src/empathy-debug-window.c:944 +#: ../src/empathy-debug-window.c:1165 msgid "Debug Window" msgstr "Depurar xanela" -#: ../src/empathy-debug-window.c:1019 +#: ../src/empathy-debug-window.c:1245 msgid "Pause" msgstr "Pausa" -#: ../src/empathy-debug-window.c:1031 +#: ../src/empathy-debug-window.c:1257 msgid "Level " msgstr "Nivel" -#: ../src/empathy-debug-window.c:1100 +#: ../src/empathy-debug-window.c:1277 +msgid "Debug" +msgstr "Depuración" + +#: ../src/empathy-debug-window.c:1283 +msgid "Info" +msgstr "Info" + +#: ../src/empathy-debug-window.c:1289 ../src/empathy-debug-window.c:1338 +msgid "Message" +msgstr "Mensaxe" + +#: ../src/empathy-debug-window.c:1295 +msgid "Warning" +msgstr "Aviso" + +#: ../src/empathy-debug-window.c:1301 +msgid "Critical" +msgstr "Crítico" + +#: ../src/empathy-debug-window.c:1307 +msgid "Error" +msgstr "Erro" + +#: ../src/empathy-debug-window.c:1326 msgid "Time" msgstr "Tempo" -#: ../src/empathy-debug-window.c:1102 +#: ../src/empathy-debug-window.c:1329 msgid "Domain" msgstr "Dominio" -#: ../src/empathy-debug-window.c:1104 +#: ../src/empathy-debug-window.c:1331 msgid "Category" msgstr "Categoría" -#: ../src/empathy-debug-window.c:1106 +#: ../src/empathy-debug-window.c:1333 msgid "Level" msgstr "Nivel" -#: ../src/empathy-debug-window.c:1138 +#: ../src/empathy-debug-window.c:1365 msgid "" "The selected connection manager does not support the remote debugging " "extension." msgstr "" "O xestor de conexión seleccionado non é compatíbel coa extensión de " "depuración remota." + +#~ msgid "_Contact" +#~ msgstr "_Contacto" + +#~ msgid "_Preferences" +#~ msgstr "_Preferencias" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: empathy master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-03 19:54+0100\n" -"PO-Revision-Date: 2009-11-03 19:55+0100\n" +"POT-Creation-Date: 2009-11-28 09:53+0100\n" +"PO-Revision-Date: 2009-11-28 12:08+0100\n" "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n" "Language-Team: Hungarian <gnome at fsf dot hu>\n" "MIME-Version: 1.0\n" @@ -432,7 +432,7 @@ msgstr "A kiválasztott fájl nem szabályos fájl" msgid "The selected file is empty" msgstr "A kiválasztott fájl üres" -#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:292 +#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:293 msgid "People nearby" msgstr "Közeli emberek" @@ -546,26 +546,26 @@ msgstr[1] "%d hónapja" msgid "in the future" msgstr "a jövőben" -#: ../libempathy-gtk/empathy-account-chooser.c:432 +#: ../libempathy-gtk/empathy-account-chooser.c:450 msgid "All" msgstr "Minden" -#: ../libempathy-gtk/empathy-account-widget.c:439 -#: ../libempathy-gtk/empathy-account-widget.c:495 +#: ../libempathy-gtk/empathy-account-widget.c:513 +#: ../libempathy-gtk/empathy-account-widget.c:569 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1308 +#: ../libempathy-gtk/empathy-account-widget.c:1245 msgid "L_og in" msgstr "Bejele_ntkezés" -#: ../libempathy-gtk/empathy-account-widget.c:1358 +#: ../libempathy-gtk/empathy-account-widget.c:1452 msgid "Enabled" msgstr "Engedélyezve" #. Translators: this is used only when built on a moblin platform -#: ../libempathy-gtk/empathy-account-widget.c:1364 +#: ../libempathy-gtk/empathy-account-widget.c:1458 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 #: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 #: ../src/empathy-chatrooms-window.ui.h:1 @@ -573,6 +573,27 @@ msgstr "Engedélyezve" msgid "Account:" msgstr "Felhasználói fiók:" +#. To translators: The first parameter is the login id and the +#. * second one is the server. The resulting string will be something +#. * like: "MyUserName on chat.freenode.net". +#. * You should reverse the order of these arguments if the +#. * server should come before the login id in your locale. +#: ../libempathy-gtk/empathy-account-widget.c:1722 +#, c-format +msgid "%1$s on %2$s" +msgstr "%1$s ezen: %2$s" + +#. To translators: The parameter is the protocol name. The resulting +#. * string will be something like: "Jabber Account" +#: ../libempathy-gtk/empathy-account-widget.c:1740 +#, c-format +msgid "%s Account" +msgstr "%s fiók" + +#: ../libempathy-gtk/empathy-account-widget.c:1744 +msgid "New account" +msgstr "Új fiók" + #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>" msgstr "<span size=\"small\"><b>Például:</b> Sajátnevem</span>" @@ -584,7 +605,7 @@ msgstr "<span size=\"small\"><b>Például:</b> Sajátnevem</span>" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 msgid "Advanced" msgstr "Speciális" @@ -594,7 +615,7 @@ msgstr "Speciális" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 msgid "Pass_word:" msgstr "_Jelszó:" @@ -674,6 +695,39 @@ msgstr "_Karakterkészlet:" msgid "New Network" msgstr "Új hálózat" +#: ../libempathy-gtk/empathy-account-widget-sip.c:184 +#: ../libempathy-gtk/empathy-account-widget-sip.c:217 +msgid "Auto" +msgstr "Auto" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:187 +msgid "UDP" +msgstr "UDP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:190 +msgid "TCP" +msgstr "TCP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:193 +msgid "TLS" +msgstr "TLS" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:222 +msgid "Register" +msgstr "Regisztrálás" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:227 +msgid "Options" +msgstr "Beállítások" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:230 +msgid "None" +msgstr "Nincs" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 msgid "Charset:" msgstr "Karakterkészlet:" @@ -799,31 +853,85 @@ msgid "_Published Name:" msgstr "_Közzétett név:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +msgid "<b>Keep-Alive Options</b>" +msgstr "<b>Kapcsolatfenntartás beállításai</b>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "<b>Miscellaneous Options</b>" +msgstr "<b>Egyéb beállítások</b>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 +msgid "<b>NAT Traversal Options</b>" +msgstr "<b>NAT-bejárás beállításai</b>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +msgid "<b>Proxy Options</b>" +msgstr "<b>Proxy beállításai</b>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>" msgstr "<span size=\"small\"><b>Például:</b> felhasznalo@sajat.sip.kiszolgalo</span>" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 +msgid "Authentication username:" +msgstr "Hitelesítési felhasználónév:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +msgid "Discover Binding" +msgstr "Kapcsolat feltérképezése" + #. look up the DNS SRV record at the service's domain for the host name of a STUN server. -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover STUN" -msgstr "STUN feltérképezése" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +msgid "Discover the STUN server automatically" +msgstr "A STUN-kiszolgáló automatikus feltérképezése" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 +msgid "Hostname of the proxy for outbound requests." +msgstr "Proxy gépneve a kimenő kérésekhez." + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 +msgid "Interval (seconds)" +msgstr "Időköz (másodperc)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Loose Routing" +msgstr "Laza útválasztás" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 +msgid "Mechanism:" +msgstr "Mechanizmus:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Port:" +msgstr "Port:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 msgid "STUN Server:" msgstr "STUN kiszolgáló:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "STUN port:" -msgstr "Stun port:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 +msgid "Server:" +msgstr "Kiszolgáló:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +msgid "" +"The username for SIP authentication, if different from the SIP URI\n" +"username." +msgstr "A SIP hitelesítéshez használandó felhasználónév, eltér a SIP URI felhasználónévtől" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +msgid "Transport:" +msgstr "Szállítás:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 msgid "What is your SIP account password?" msgstr "Mi az Ön SIP fiókjának jelszava?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Mi az Ön SIP felhasználói azonosítója?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "_Username:" msgstr "_Felhasználónév:" @@ -876,146 +984,145 @@ msgstr "Képek" msgid "All Files" msgstr "Minden fájl" -#: ../libempathy-gtk/empathy-avatar-image.c:325 +#: ../libempathy-gtk/empathy-avatar-image.c:327 msgid "Click to enlarge" msgstr "Kattintson ide a nagyításhoz" -#: ../libempathy-gtk/empathy-chat.c:193 +#: ../libempathy-gtk/empathy-chat.c:196 msgid "Failed to reconnect this chat" msgstr "Nem sikerült újracsatlakozni ehhez a csevegéshez" -#: ../libempathy-gtk/empathy-chat.c:591 -#, fuzzy +#: ../libempathy-gtk/empathy-chat.c:594 msgid "Failed to join chatroom" -msgstr "_Meghívás csevegőszobába" +msgstr "A csevegőszobához csatlakozás meghiúsult" -#: ../libempathy-gtk/empathy-chat.c:609 -#, fuzzy +#: ../libempathy-gtk/empathy-chat.c:612 msgid "Failed to open private chat" -msgstr "Nem sikerült újracsatlakozni ehhez a csevegéshez" +msgstr "Nem sikerült privát csevegést nyitni" -#: ../libempathy-gtk/empathy-chat.c:648 +#: ../libempathy-gtk/empathy-chat.c:651 msgid "Topic not supported on this conversation" -msgstr "" +msgstr "A téma nem támogatott ebben a csevegésben" -#: ../libempathy-gtk/empathy-chat.c:654 +#: ../libempathy-gtk/empathy-chat.c:657 msgid "You are not allowed to change the topic" -msgstr "" +msgstr "A téma megváltoztatása nem engedélyezett" -#: ../libempathy-gtk/empathy-chat.c:752 +#: ../libempathy-gtk/empathy-chat.c:775 msgid "/clear, clear all messages from the current conversation" -msgstr "" +msgstr "/clear – az aktuális társalgás összes üzenetének törlése" -#: ../libempathy-gtk/empathy-chat.c:755 +#: ../libempathy-gtk/empathy-chat.c:778 msgid "/topic <topic>, set the topic of the current conversation" -msgstr "" +msgstr "/topic <téma> – az aktuális társalgás témájának beállítása" -#: ../libempathy-gtk/empathy-chat.c:758 +#: ../libempathy-gtk/empathy-chat.c:781 msgid "/join <chatroom id>, join a new chatroom" -msgstr "" +msgstr "/join <szobaazonosító> – csatlakozás új csevegőszobához" -#: ../libempathy-gtk/empathy-chat.c:761 +#: ../libempathy-gtk/empathy-chat.c:784 msgid "/j <chatroom id>, join a new chatroom" -msgstr "" +msgstr "/j <szobaazonosító> – csatlakozás új csevegőszobához" -#: ../libempathy-gtk/empathy-chat.c:764 +#: ../libempathy-gtk/empathy-chat.c:787 msgid "/query <contact id> [<message>], open a private chat" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:767 +#: ../libempathy-gtk/empathy-chat.c:790 msgid "/msg <contact id> <message>, open a private chat" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:770 +#: ../libempathy-gtk/empathy-chat.c:793 +msgid "/nick <nickname>, change your nickname on current server" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:796 msgid "/me <message>, send an ACTION message to the current conversation" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:773 +#: ../libempathy-gtk/empathy-chat.c:799 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 chatroom\"" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:778 +#: ../libempathy-gtk/empathy-chat.c:804 msgid "" "/help [<command>], show all supported commands. If <command> is defined, " "show its usage." msgstr "" -#: ../libempathy-gtk/empathy-chat.c:788 -#, fuzzy, c-format +#: ../libempathy-gtk/empathy-chat.c:814 +#, c-format msgid "Usage: %s" -msgstr "" -"\n" -"Üzenet: %s" +msgstr "Használat: %s" -#: ../libempathy-gtk/empathy-chat.c:817 -#, fuzzy +#: ../libempathy-gtk/empathy-chat.c:843 msgid "Unknown command" -msgstr "Ismeretlen ok" +msgstr "Ismeretlen parancs" -#: ../libempathy-gtk/empathy-chat.c:938 +#: ../libempathy-gtk/empathy-chat.c:964 msgid "Unknown command, see /help for the available commands" msgstr "" -#: ../libempathy-gtk/empathy-chat.c:1076 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "offline" msgstr "kilépett" -#: ../libempathy-gtk/empathy-chat.c:1079 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "invalid contact" msgstr "érvénytelen partner" -#: ../libempathy-gtk/empathy-chat.c:1082 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "permission denied" msgstr "hozzáférés megtagadva" -#: ../libempathy-gtk/empathy-chat.c:1085 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "too long message" msgstr "túl hosszú üzenet" -#: ../libempathy-gtk/empathy-chat.c:1088 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "not implemented" msgstr "nincs megvalósítva" -#: ../libempathy-gtk/empathy-chat.c:1091 +#: ../libempathy-gtk/empathy-chat.c:1118 msgid "unknown" msgstr "ismeretlen" -#: ../libempathy-gtk/empathy-chat.c:1095 +#: ../libempathy-gtk/empathy-chat.c:1122 #, c-format msgid "Error sending message '%s': %s" msgstr "hiba a(z) „%s” üzenet elküldésekor: %s" -#: ../libempathy-gtk/empathy-chat.c:1125 +#: ../libempathy-gtk/empathy-chat.c:1152 #, c-format msgid "Topic set to: %s" msgstr "Téma beállítva: %s" -#: ../libempathy-gtk/empathy-chat.c:1127 +#: ../libempathy-gtk/empathy-chat.c:1154 msgid "No topic defined" msgstr "Nincs megadva témakör" -#: ../libempathy-gtk/empathy-chat.c:1498 +#: ../libempathy-gtk/empathy-chat.c:1527 msgid "(No Suggestions)" msgstr "(Nincs javaslat)" -#: ../libempathy-gtk/empathy-chat.c:1552 +#: ../libempathy-gtk/empathy-chat.c:1581 msgid "Insert Smiley" msgstr "Hangulatjel beszúrása" #. send button -#: ../libempathy-gtk/empathy-chat.c:1570 -#: ../libempathy-gtk/empathy-ui-utils.c:1492 +#: ../libempathy-gtk/empathy-chat.c:1599 +#: ../libempathy-gtk/empathy-ui-utils.c:1505 msgid "_Send" msgstr "_Küldés" -#: ../libempathy-gtk/empathy-chat.c:1604 +#: ../libempathy-gtk/empathy-chat.c:1633 msgid "_Spelling Suggestions" msgstr "_Helyesírási javaslatok" -#: ../libempathy-gtk/empathy-chat.c:1719 +#: ../libempathy-gtk/empathy-chat.c:1748 #, c-format msgid "%s has disconnected" msgstr "%s kilépett" @@ -1023,12 +1130,12 @@ msgstr "%s kilépett" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1726 +#: ../libempathy-gtk/empathy-chat.c:1755 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%2$s kirúgta a következőt: %1$s" -#: ../libempathy-gtk/empathy-chat.c:1729 +#: ../libempathy-gtk/empathy-chat.c:1758 #, c-format msgid "%s was kicked" msgstr "%s kirúgva" @@ -1036,17 +1143,17 @@ msgstr "%s kirúgva" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1737 +#: ../libempathy-gtk/empathy-chat.c:1766 #, c-format msgid "%1$s was banned by %2$s" msgstr "%2$s kitiltotta a következőt: %1$s" -#: ../libempathy-gtk/empathy-chat.c:1740 +#: ../libempathy-gtk/empathy-chat.c:1769 #, c-format msgid "%s was banned" msgstr "%s kitiltva" -#: ../libempathy-gtk/empathy-chat.c:1744 +#: ../libempathy-gtk/empathy-chat.c:1773 #, c-format msgid "%s has left the room" msgstr "%s elhagyta a szobát" @@ -1056,48 +1163,69 @@ msgstr "%s elhagyta a szobát" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1753 +#: ../libempathy-gtk/empathy-chat.c:1782 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:1776 +#: ../libempathy-gtk/empathy-chat.c:1807 #, c-format msgid "%s has joined the room" msgstr "%s belépett a szobába" -#: ../libempathy-gtk/empathy-chat.c:1908 ../src/empathy-call-window.c:1295 +#: ../libempathy-gtk/empathy-chat.c:1832 +#, c-format +msgid "%s is now known as %s" +msgstr "%s mostantól %s néven ismert" + +#: ../libempathy-gtk/empathy-chat.c:1965 ../src/empathy-call-window.c:1534 msgid "Disconnected" msgstr "Kapcsolat bontva" -#: ../libempathy-gtk/empathy-chat.c:2382 +#: ../libempathy-gtk/empathy-chat.c:2455 +msgid "Wrong password; please try again:" +msgstr "" + +#: ../libempathy-gtk/empathy-chat.c:2456 +msgid "Retry" +msgstr "Újra" + +#: ../libempathy-gtk/empathy-chat.c:2461 +msgid "This room is protected by a password:" +msgstr "Ezt a szobát jelszó védi:" + +#: ../libempathy-gtk/empathy-chat.c:2462 +msgid "Join" +msgstr "Csatlakozás" + +#: ../libempathy-gtk/empathy-chat.c:2602 msgid "Connected" msgstr "Kapcsolódva" -#: ../libempathy-gtk/empathy-chat.c:2432 -#: ../libempathy-gtk/empathy-log-window.c:525 +#: ../libempathy-gtk/empathy-chat.c:2655 +#: ../libempathy-gtk/empathy-log-window.c:546 msgid "Conversation" msgstr "Társalgás" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:512 +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:637 msgid "Topic:" msgstr "Téma:" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:315 -#: ../libempathy-gtk/empathy-theme-adium.c:808 +#: ../libempathy-gtk/empathy-chat-text-view.c:317 +#: ../libempathy-gtk/empathy-theme-adium.c:817 msgid "_Copy Link Address" msgstr "Hivatkozás cí_mének másolása" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:322 -#: ../libempathy-gtk/empathy-theme-adium.c:815 +#: ../libempathy-gtk/empathy-chat-text-view.c:324 +#: ../libempathy-gtk/empathy-theme-adium.c:824 msgid "_Open Link" msgstr "_Hivatkozás megnyitása" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:420 +#: ../libempathy-gtk/empathy-chat-text-view.c:422 msgid "%A %B %d %Y" msgstr "%Y. %B %e %A" @@ -1146,12 +1274,12 @@ msgid "Removing contact" msgstr "Partner eltávolítása" #: ../libempathy-gtk/empathy-contact-menu.c:195 -#: ../src/empathy-main-window.ui.h:11 +#: ../src/empathy-main-window.ui.h:12 msgid "_Add Contact..." msgstr "Partner _felvétele…" #: ../libempathy-gtk/empathy-contact-menu.c:222 -#: ../src/empathy-main-window.ui.h:12 +#: ../src/empathy-main-window.ui.h:13 msgid "_Chat" msgstr "_Csevegés" @@ -1166,8 +1294,9 @@ msgid "_Video Call" msgstr "_Videohívás" #: ../libempathy-gtk/empathy-contact-menu.c:324 -msgid "_View Previous Conversations" -msgstr "K_orábbi társalgások megjelenítése" +#: ../src/empathy-main-window.ui.h:24 +msgid "_Previous Conversations" +msgstr "K_orábbi társalgások" #: ../libempathy-gtk/empathy-contact-menu.c:346 msgid "Send file" @@ -1182,7 +1311,7 @@ msgid "Infor_mation" msgstr "_Információk" #: ../libempathy-gtk/empathy-contact-menu.c:441 -#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16 +#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:17 msgid "_Edit" msgstr "S_zerkesztés" @@ -1211,7 +1340,7 @@ msgid "Select" msgstr "Kijelölés" #: ../libempathy-gtk/empathy-contact-widget.c:1009 -#: ../src/empathy-main-window.c:1020 +#: ../src/empathy-main-window.c:1026 msgid "Group" msgstr "Csoport" @@ -1311,15 +1440,15 @@ msgstr "Szélesség:" msgid "Altitude:" msgstr "Magasság:" -#: ../libempathy-gtk/empathy-contact-widget.c:1353 +#: ../libempathy-gtk/empathy-contact-widget.c:1367 msgid "<b>Location</b>" msgstr "<b>Hely</b>" -#: ../libempathy-gtk/empathy-contact-widget.c:1366 +#: ../libempathy-gtk/empathy-contact-widget.c:1380 msgid "<b>Location</b>, " msgstr "<b>Hely</b>, " -#: ../libempathy-gtk/empathy-contact-widget.c:1416 +#: ../libempathy-gtk/empathy-contact-widget.c:1430 msgid "%B %e, %Y at %R UTC" msgstr "%Y. %B %e, %R UTC" @@ -1344,7 +1473,7 @@ msgid "Client:" msgstr "Kliens:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:7 -#: ../src/empathy-main-window.c:1003 +#: ../src/empathy-main-window.c:1009 msgid "Contact" msgstr "Partner" @@ -1413,12 +1542,12 @@ msgstr "Port" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:518 +#: ../libempathy-gtk/empathy-log-window.c:539 #: ../src/empathy-import-widget.c:310 msgid "Account" msgstr "Fiók" -#: ../libempathy-gtk/empathy-log-window.c:535 +#: ../libempathy-gtk/empathy-log-window.c:556 msgid "Date" msgstr "Dátum" @@ -1460,34 +1589,34 @@ msgstr "Új társalgás" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:177 -#: ../libempathy-gtk/empathy-presence-chooser.c:213 +#: ../libempathy-gtk/empathy-presence-chooser.c:167 +#: ../libempathy-gtk/empathy-presence-chooser.c:203 msgid "Custom Message..." msgstr "Egyéni üzenet…" -#: ../libempathy-gtk/empathy-presence-chooser.c:230 -#: ../libempathy-gtk/empathy-presence-chooser.c:232 +#: ../libempathy-gtk/empathy-presence-chooser.c:220 +#: ../libempathy-gtk/empathy-presence-chooser.c:222 msgid "Edit Custom Messages..." msgstr "Egyéni üzenetek szerkesztése…" -#: ../libempathy-gtk/empathy-presence-chooser.c:331 +#: ../libempathy-gtk/empathy-presence-chooser.c:344 msgid "Click to remove this status as a favorite" msgstr "Kattintson ezen kedvenc állapot eltávolításához" -#: ../libempathy-gtk/empathy-presence-chooser.c:340 +#: ../libempathy-gtk/empathy-presence-chooser.c:353 msgid "Click to make this status a favorite" msgstr "Kattintson ezen állapot kedvenccé tételéhez" -#: ../libempathy-gtk/empathy-presence-chooser.c:374 +#: ../libempathy-gtk/empathy-presence-chooser.c:387 msgid "Set status" msgstr "Állapot beállítása" -#: ../libempathy-gtk/empathy-presence-chooser.c:876 +#: ../libempathy-gtk/empathy-presence-chooser.c:895 msgid "Set your presence and current status" msgstr "Jelenlét és aktuális állapot megadása" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1129 +#: ../libempathy-gtk/empathy-presence-chooser.c:1082 msgid "Custom messages..." msgstr "Egyéni üzenetek…" @@ -1563,15 +1692,15 @@ msgstr "Tiszta" msgid "Blue" msgstr "Kék" -#: ../libempathy-gtk/empathy-ui-utils.c:1394 +#: ../libempathy-gtk/empathy-ui-utils.c:1407 msgid "Unable to open URI" msgstr "Az URI nem nyitható meg" -#: ../libempathy-gtk/empathy-ui-utils.c:1484 +#: ../libempathy-gtk/empathy-ui-utils.c:1497 msgid "Select a file" msgstr "Válasszon ki egy fájlt" -#: ../libempathy-gtk/empathy-ui-utils.c:1544 +#: ../libempathy-gtk/empathy-ui-utils.c:1557 msgid "Select a destination" msgstr "Válasszon helyet" @@ -1742,36 +1871,35 @@ msgstr "Nyugati" msgid "Vietnamese" msgstr "Vietnami" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:141 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 msgid "The contact selected cannot receive files." msgstr "A kiválasztott partner nem képes fájlok fogadására." -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:147 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 msgid "The contact selected is offline." msgstr "A kiválasztott partner kilépett." -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 msgid "No error message" msgstr "Nincs hibaüzenet" -#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:278 +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 msgid "Instant Message (Empathy)" msgstr "Azonnali üzenet (Empathy)" -#: ../src/empathy.c:871 +#: ../src/empathy.c:893 msgid "Don't connect on startup" msgstr "Ne kapcsolódjon indításkor" -#: ../src/empathy.c:875 -#, fuzzy +#: ../src/empathy.c:897 msgid "Don't display the contact list or any other dialogs on startup" -msgstr "Ne jelenjen meg a partnerlista indításkor" +msgstr "Ne jelenjen meg a partnerlista vagy más ablak indításkor" -#: ../src/empathy.c:879 +#: ../src/empathy.c:901 msgid "Show the accounts dialog" msgstr "A fiókok ablak megjelenítése" -#: ../src/empathy.c:891 +#: ../src/empathy.c:913 msgid "- Empathy IM Client" msgstr "– Empathy üzenetküldő-kliens" @@ -1856,37 +1984,37 @@ msgstr "Hiba történt" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../src/empathy-account-assistant.c:321 -#: ../src/empathy-accounts-dialog.c:1388 +#: ../src/empathy-account-assistant.c:331 +#: ../src/empathy-accounts-dialog.c:1339 #, c-format msgid "New %s account" msgstr "Új %s fiók" -#: ../src/empathy-account-assistant.c:393 +#: ../src/empathy-account-assistant.c:403 msgid "What kind of chat account do you have?" msgstr "Milyen típusú csevegőfiókja van?" -#: ../src/empathy-account-assistant.c:399 +#: ../src/empathy-account-assistant.c:409 msgid "Do you have any other chat accounts you want to set up?" msgstr "Van más fiókja, amit be szeretne állítani?" -#: ../src/empathy-account-assistant.c:405 +#: ../src/empathy-account-assistant.c:415 msgid "Enter your account details" msgstr "Adja meg fiókjának adatait" -#: ../src/empathy-account-assistant.c:410 +#: ../src/empathy-account-assistant.c:420 msgid "What kind of chat account do you want to create?" msgstr "Milyen típusú csevegőfiókot szeretne létrehozni?" -#: ../src/empathy-account-assistant.c:416 +#: ../src/empathy-account-assistant.c:426 msgid "Do you want to create other chat accounts?" msgstr "Szeretne létrehozni más csevegőfiókokat?" -#: ../src/empathy-account-assistant.c:423 +#: ../src/empathy-account-assistant.c:433 msgid "Enter the details for the new account" msgstr "Adja meg az új fiók részleteit" -#: ../src/empathy-account-assistant.c:509 +#: ../src/empathy-account-assistant.c:519 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -1898,45 +2026,45 @@ msgstr "" "barátaival és kollégáival. Ha rendelkezik mikrofonnal és webkamerával, akkor " "hang- és videohívásokat is bonyolíthat." -#: ../src/empathy-account-assistant.c:526 +#: ../src/empathy-account-assistant.c:536 msgid "Do you have an account you've been using with another chat program?" msgstr "Rendelkezik más csevegőprogramokban már használt fiókkal?" -#: ../src/empathy-account-assistant.c:549 +#: ../src/empathy-account-assistant.c:559 msgid "Yes, import my account details from " msgstr "Igen, fiókadatok importálása ebből: " -#: ../src/empathy-account-assistant.c:570 +#: ../src/empathy-account-assistant.c:580 msgid "Yes, I'll enter my account details now" msgstr "Igen, megadom a fiókom adatait" -#: ../src/empathy-account-assistant.c:592 +#: ../src/empathy-account-assistant.c:602 msgid "No, I want a new account" msgstr "Nem, új fiókot szeretnék készíteni" -#: ../src/empathy-account-assistant.c:602 +#: ../src/empathy-account-assistant.c:612 msgid "No, I just want to see people online nearby for now" msgstr "Nem, csak a környezetemben épp elérhető embereket szeretném látni" -#: ../src/empathy-account-assistant.c:623 +#: ../src/empathy-account-assistant.c:633 msgid "Select the accounts you want to import:" msgstr "Válassza ki az importálandó fiókot:" -#: ../src/empathy-account-assistant.c:710 +#: ../src/empathy-account-assistant.c:720 #: ../src/empathy-new-chatroom-dialog.c:496 #: ../src/empathy-new-chatroom-dialog.c:497 msgid "Yes" msgstr "Igen" -#: ../src/empathy-account-assistant.c:717 +#: ../src/empathy-account-assistant.c:727 msgid "No, that's all for now" msgstr "Nem, most csak ennyit akartam" -#: ../src/empathy-account-assistant.c:910 +#: ../src/empathy-account-assistant.c:920 msgid "Welcome to Empathy" msgstr "Üdvözöljük az Empathyban" -#: ../src/empathy-account-assistant.c:919 +#: ../src/empathy-account-assistant.c:929 msgid "Import your existing accounts" msgstr "Meglévő fiókok importálása" @@ -1953,28 +2081,7 @@ msgstr "Az Ön %s fiókjának módosításai nincsenek elmentve." msgid "Your new account has not been saved yet." msgstr "" -#. To translators: The first parameter is the login id and the -#. * second one is the server. The resulting string will be something -#. * like: "MyUserName on chat.freenode.net". -#. * You should reverse the order of these arguments if the -#. * server should come before the login id in your locale. -#: ../src/empathy-accounts-dialog.c:233 -#, c-format -msgid "%1$s on %2$s" -msgstr "%1$s ezen: %2$s" - -#. To translators: The parameter is the protocol name. The resulting -#. * string will be something like: "Jabber Account" -#: ../src/empathy-accounts-dialog.c:251 -#, c-format -msgid "%s Account" -msgstr "%s fiók" - -#: ../src/empathy-accounts-dialog.c:255 -msgid "New account" -msgstr "Új fiók" - -#: ../src/empathy-accounts-dialog.c:533 +#: ../src/empathy-accounts-dialog.c:484 msgid "" "You are about to create a new account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -1982,40 +2089,16 @@ msgstr "" "Új fiók létrehozására készül, ezzel törölni fogja a módosításokat.\n" "Biztosan folytatni akarja?" -#: ../src/empathy-accounts-dialog.c:824 -#, c-format -msgid "" -"You are about to remove your %s account!\n" -"Are you sure you want to proceed?" -msgstr "" -"A(z) %s fiókjának eltávolítására készül!\n" -"Biztosan folytatni akarja?" - -#. Translators: this is used only when built on a moblin platform -#: ../src/empathy-accounts-dialog.c:828 +#: ../src/empathy-accounts-dialog.c:774 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "Valóban el kívánja távolítani a(z) %s fiókot a számítógépről?" -#: ../src/empathy-accounts-dialog.c:834 -msgid "" -"Any associated conversations and chat rooms will NOT be removed if you " -"decide to proceed.\n" -"\n" -"Should you decide to add the account back at a later time, they will still " -"be available." -msgstr "" -"A társított társalgások és csevegőszobák NEM kerülnek törlésre ha a " -"folytatást választja.\n" -"\n" -"Ha később a fiók visszaállítása mellett dönt, akkor ezek elérhetővé válnak." - -#. Translators: this is used only when built on a moblin platform -#: ../src/empathy-accounts-dialog.c:841 +#: ../src/empathy-accounts-dialog.c:778 msgid "This will not remove your account on the server." msgstr "Ez nem távolítja el a kiszolgálón lévő fiókot." -#: ../src/empathy-accounts-dialog.c:1028 +#: ../src/empathy-accounts-dialog.c:960 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2023,7 +2106,7 @@ msgstr "" "Másik fiók kiválasztására készül, ezzel törölni fogja a módosításokat.\n" "Biztosan folytatni akarja?" -#: ../src/empathy-accounts-dialog.c:1474 +#: ../src/empathy-accounts-dialog.c:1425 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2032,7 +2115,7 @@ msgstr "" "Biztosan folytatni akarja?" #. Translators: this is used only when built on a moblin platform -#: ../src/empathy-accounts-dialog.c:1645 +#: ../src/empathy-accounts-dialog.c:1596 msgid "_Next" msgstr "_Tovább" @@ -2081,95 +2164,195 @@ msgstr "_Meglévő fiók használata" msgid "account" msgstr "fiók hozzáadása" -#: ../src/empathy-call-window.c:427 +#: ../src/empathy-call-window.c:452 msgid "Contrast" msgstr "Kontraszt" -#: ../src/empathy-call-window.c:430 +#: ../src/empathy-call-window.c:455 msgid "Brightness" msgstr "Fényerő" -#: ../src/empathy-call-window.c:433 +#: ../src/empathy-call-window.c:458 msgid "Gamma" msgstr "Gamma" -#: ../src/empathy-call-window.c:541 +#: ../src/empathy-call-window.c:566 msgid "Volume" msgstr "Hangerő" -#: ../src/empathy-call-window.c:675 +#: ../src/empathy-call-window.c:728 msgid "Connecting..." msgstr "Kapcsolódás…" -#: ../src/empathy-call-window.c:782 +#: ../src/empathy-call-window.c:1021 msgid "_Sidebar" msgstr "_Oldalsáv" -#: ../src/empathy-call-window.c:801 +#: ../src/empathy-call-window.c:1040 msgid "Dialpad" msgstr "Tárcsázókészülék" -#: ../src/empathy-call-window.c:807 +#: ../src/empathy-call-window.c:1046 msgid "Audio input" msgstr "Hangbemenet" -#: ../src/empathy-call-window.c:811 +#: ../src/empathy-call-window.c:1050 msgid "Video input" msgstr "Videobemenet" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:874 +#: ../src/empathy-call-window.c:1113 #, c-format msgid "Call with %s" msgstr "%s hívása" #. translators: Call is a noun. This string is used in the window #. * title -#: ../src/empathy-call-window.c:955 +#: ../src/empathy-call-window.c:1194 msgid "Call" msgstr "Hívás" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1455 +#: ../src/empathy-call-window.c:1697 #, c-format msgid "Connected — %d:%02dm" msgstr "Kapcsolódva – %d.%02dp" +#: ../src/empathy-call-window.c:1758 +msgid "Technical Details" +msgstr "Technikai részletek" + +#: ../src/empathy-call-window.c:1796 +#, c-format +msgid "" +"%s's software does not understand any of the audio formats supported by your " +"computer" +msgstr "" + +#: ../src/empathy-call-window.c:1801 +#, c-format +msgid "" +"%s's software does not understand any of the video formats supported by your " +"computer" +msgstr "" + +#: ../src/empathy-call-window.c:1807 +#, 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:1813 +msgid "There was a failure on the network" +msgstr "" + +#: ../src/empathy-call-window.c:1817 +msgid "The audio formats necessary for this call are not installed on your computer" +msgstr "" + +#: ../src/empathy-call-window.c:1820 +msgid "The video formats necessary for this call are not installed on your computer" +msgstr "" + +#: ../src/empathy-call-window.c:1830 +#, c-format +msgid "" +"Something not expected happened in a Telepathy component. Please <a href=\"%s" +"\">report this bug</a> and attach logs gathered from the 'Debug' window in " +"the Help menu." +msgstr "" + +#: ../src/empathy-call-window.c:1838 +msgid "There was a failure in the call engine" +msgstr "" + +#: ../src/empathy-call-window.c:1877 +msgid "Can't establish audio stream" +msgstr "" + +#: ../src/empathy-call-window.c:1887 +msgid "Can't establish video stream" +msgstr "" + #: ../src/empathy-call-window.ui.h:1 +msgid "Camera Off" +msgstr "" + +#: ../src/empathy-call-window.ui.h:2 +msgid "Camera On" +msgstr "" + +#: ../src/empathy-call-window.ui.h:3 msgid "Hang up" msgstr "Befejezés" -#: ../src/empathy-call-window.ui.h:2 +#: ../src/empathy-call-window.ui.h:4 +msgid "Preview" +msgstr "Előnézet" + +#: ../src/empathy-call-window.ui.h:5 msgid "Redial" msgstr "Újratárcsázás" -#: ../src/empathy-call-window.ui.h:3 +#: ../src/empathy-call-window.ui.h:6 msgid "Send Audio" msgstr "Hang küldése" -#: ../src/empathy-call-window.ui.h:4 -msgid "Send video" -msgstr "Videó küldése" +#: ../src/empathy-call-window.ui.h:7 +msgid "V_ideo" +msgstr "Vi_deó" -#: ../src/empathy-call-window.ui.h:5 -msgid "Video preview" -msgstr "Video előnézet" +#: ../src/empathy-call-window.ui.h:8 +msgid "Video Off" +msgstr "Videó ki" -#: ../src/empathy-call-window.ui.h:6 +#: ../src/empathy-call-window.ui.h:9 +msgid "Video On" +msgstr "Videó be" + +#: ../src/empathy-call-window.ui.h:10 +msgid "Video Preview" +msgstr "Videoelőnézet" + +#: ../src/empathy-call-window.ui.h:11 msgid "_Call" msgstr "_Hívás" -#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26 +#: ../src/empathy-call-window.ui.h:12 ../src/empathy-main-window.ui.h:26 msgid "_View" msgstr "_Nézet" -#: ../src/empathy-chat-window.c:370 +#: ../src/empathy-chat-window.c:395 ../src/empathy-chat-window.c:415 +#, c-format +msgid "%s (%d unread)" +msgid_plural "%s (%d unread)" +msgstr[0] "" +msgstr[1] "" + +#: ../src/empathy-chat-window.c:407 +#, c-format +msgid "%s (and %u other)" +msgid_plural "%s (and %u others)" +msgstr[0] "" +msgstr[1] "" + +#: ../src/empathy-chat-window.c:423 #, c-format -msgid "Conversations (%d)" -msgstr "Társalgások (%d)" +msgid "%s (%d unread from others)" +msgid_plural "%s (%d unread from others)" +msgstr[0] "" +msgstr[1] "" -#: ../src/empathy-chat-window.c:516 +#: ../src/empathy-chat-window.c:432 +#, c-format +msgid "%s (%d unread from all)" +msgid_plural "%s (%d unread from all)" +msgstr[0] "" +msgstr[1] "" + +#: ../src/empathy-chat-window.c:641 msgid "Typing a message." msgstr "Üzenet írása." @@ -2178,26 +2361,26 @@ msgid "C_lear" msgstr "_Törlés" #: ../src/empathy-chat-window.ui.h:2 +msgid "C_ontact" +msgstr "_Partner" + +#: ../src/empathy-chat-window.ui.h:3 msgid "Chat" msgstr "Csevegés" -#: ../src/empathy-chat-window.ui.h:3 +#: ../src/empathy-chat-window.ui.h:4 msgid "Insert _Smiley" msgstr "Ha_ngulatjel beszúrása" -#: ../src/empathy-chat-window.ui.h:4 +#: ../src/empathy-chat-window.ui.h:5 msgid "Move Tab _Left" msgstr "Lap _balra" -#: ../src/empathy-chat-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:6 msgid "Move Tab _Right" msgstr "Lap j_obbra" -#: ../src/empathy-chat-window.ui.h:6 -msgid "_Contact" -msgstr "_Partner" - -#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14 +#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:15 msgid "_Contents" msgstr "_Tartalom" @@ -2213,7 +2396,7 @@ msgstr "_Lap leválasztása" msgid "_Favorite Chatroom" msgstr "_Kedvenc csevegőszoba" -#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18 +#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19 msgid "_Help" msgstr "_Súgó" @@ -2233,15 +2416,15 @@ msgstr "Partnerlista m_utatása" msgid "_Tabs" msgstr "_Lapok" -#: ../src/empathy-chatrooms-window.c:258 +#: ../src/empathy-chatrooms-window.c:256 msgid "Name" msgstr "Név" -#: ../src/empathy-chatrooms-window.c:276 +#: ../src/empathy-chatrooms-window.c:274 msgid "Room" msgstr "Szoba" -#: ../src/empathy-chatrooms-window.c:285 +#: ../src/empathy-chatrooms-window.c:282 msgid "Auto-Connect" msgstr "Automatikus kapcsolódás" @@ -2339,105 +2522,105 @@ msgid "%s is now online." msgstr "%s elérhető." #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:102 +#: ../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:105 +#: ../src/empathy-ft-manager.c:103 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:181 +#: ../src/empathy-ft-manager.c:179 msgctxt "file transfer percent" msgid "Unknown" msgstr "Ismeretlen" -#: ../src/empathy-ft-manager.c:276 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s at %s/s" -msgstr "%s, összesen %s; %s/mp" +msgstr "%s, összesen %s; %s/s" -#: ../src/empathy-ft-manager.c:277 +#: ../src/empathy-ft-manager.c:275 #, c-format msgid "%s of %s" msgstr "%s / %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:308 +#: ../src/empathy-ft-manager.c:306 #, c-format msgid "Receiving \"%s\" from %s" msgstr "„%s” fogadása %s partnertől" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:311 +#: ../src/empathy-ft-manager.c:309 #, c-format msgid "Sending \"%s\" to %s" msgstr "„%s” küldése %s partnernek" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:341 +#: ../src/empathy-ft-manager.c:339 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Hiba „%s” fogadásakor %s partnertől" -#: ../src/empathy-ft-manager.c:344 +#: ../src/empathy-ft-manager.c:342 msgid "Error receiving a file" msgstr "Hiba a fájl fogadásakor" -#: ../src/empathy-ft-manager.c:349 +#: ../src/empathy-ft-manager.c:347 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Hiba „%s” küldésekor %s partnernek" -#: ../src/empathy-ft-manager.c:352 +#: ../src/empathy-ft-manager.c:350 msgid "Error sending a file" msgstr "Hiba a fájl küldésekor" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:491 +#: ../src/empathy-ft-manager.c:489 #, c-format msgid "\"%s\" received from %s" msgstr "„%s” érkezett %s partnertől" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:496 +#: ../src/empathy-ft-manager.c:494 #, c-format msgid "\"%s\" sent to %s" msgstr "„%s” elküldve %s partnernek" -#: ../src/empathy-ft-manager.c:499 +#: ../src/empathy-ft-manager.c:497 msgid "File transfer completed" msgstr "A fájlátvitel befejeződött" -#: ../src/empathy-ft-manager.c:618 ../src/empathy-ft-manager.c:785 +#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783 msgid "Waiting for the other participant's response" msgstr "Várakozás a partner válaszára" -#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682 +#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 #, c-format msgid "Checking integrity of \"%s\"" msgstr "„%s” integritásának ellenőrzése" -#: ../src/empathy-ft-manager.c:647 ../src/empathy-ft-manager.c:685 +#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 #, c-format msgid "Hashing \"%s\"" msgstr "„%s” ellenőrzése" -#: ../src/empathy-ft-manager.c:1041 +#: ../src/empathy-ft-manager.c:991 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1053 +#: ../src/empathy-ft-manager.c:1003 msgid "File" msgstr "Fájl" -#: ../src/empathy-ft-manager.c:1075 +#: ../src/empathy-ft-manager.c:1025 msgid "Remaining" msgstr "Hátralévő" @@ -2479,67 +2662,75 @@ msgstr "Forrás" msgid "%s account" msgstr "%s fiók" -#: ../src/empathy-main-window.c:401 -msgid "_Edit account" -msgstr "_Fiók szerkesztése" +#: ../src/empathy-main-window.c:410 +msgid "Reconnect" +msgstr "Újracsatlakozás" + +#: ../src/empathy-main-window.c:417 +msgid "Edit Account" +msgstr "Fiók szerkesztése" -#: ../src/empathy-main-window.c:502 +#: ../src/empathy-main-window.c:424 +msgid "Close" +msgstr "Bezárás" + +#: ../src/empathy-main-window.c:512 msgid "No error specified" msgstr "Nincs megadva hiba" -#: ../src/empathy-main-window.c:505 +#: ../src/empathy-main-window.c:515 msgid "Network error" msgstr "Hálózati hiba" -#: ../src/empathy-main-window.c:508 +#: ../src/empathy-main-window.c:518 msgid "Authentication failed" msgstr "A hitelesítés meghiúsult" -#: ../src/empathy-main-window.c:511 +#: ../src/empathy-main-window.c:521 msgid "Encryption error" msgstr "Titkosítási hiba" -#: ../src/empathy-main-window.c:514 +#: ../src/empathy-main-window.c:524 msgid "Name in use" msgstr "A név használatban" -#: ../src/empathy-main-window.c:517 +#: ../src/empathy-main-window.c:527 msgid "Certificate not provided" msgstr "Nincs megadva tanúsítvány" -#: ../src/empathy-main-window.c:520 +#: ../src/empathy-main-window.c:530 msgid "Certificate untrusted" msgstr "A tanúsítvány nem megbízható" -#: ../src/empathy-main-window.c:523 +#: ../src/empathy-main-window.c:533 msgid "Certificate expired" msgstr "A tanúsítvány lejárt" -#: ../src/empathy-main-window.c:526 +#: ../src/empathy-main-window.c:536 msgid "Certificate not activated" msgstr "A tanúsítvány nincs aktiválva" -#: ../src/empathy-main-window.c:529 +#: ../src/empathy-main-window.c:539 msgid "Certificate hostname mismatch" msgstr "A tanúsítvány gépneve eltér" -#: ../src/empathy-main-window.c:532 +#: ../src/empathy-main-window.c:542 msgid "Certificate fingerprint mismatch" msgstr "A tanúsítvány ujjlenyomata eltér" -#: ../src/empathy-main-window.c:535 +#: ../src/empathy-main-window.c:545 msgid "Certificate self-signed" msgstr "A tanúsítvány saját aláírású" -#: ../src/empathy-main-window.c:538 +#: ../src/empathy-main-window.c:548 msgid "Certificate error" msgstr "Tanúsítványhiba" -#: ../src/empathy-main-window.c:541 +#: ../src/empathy-main-window.c:551 msgid "Unknown error" msgstr "Ismeretlen hiba" -#: ../src/empathy-main-window.c:1332 +#: ../src/empathy-main-window.c:1312 msgid "Show and edit accounts" msgstr "Fiókok megjelenítése és szerkesztése" @@ -2572,53 +2763,49 @@ msgid "Normal Size With _Avatars" msgstr "Normál méret _avatarokkal" #: ../src/empathy-main-window.ui.h:8 +msgid "P_references" +msgstr "B_eállítások" + +#: ../src/empathy-main-window.ui.h:9 msgid "Sort by _Name" msgstr "Rendezés _név szerint" -#: ../src/empathy-main-window.ui.h:9 +#: ../src/empathy-main-window.ui.h:10 msgid "Sort by _Status" msgstr "Rendezés álla_pot szerint" -#: ../src/empathy-main-window.ui.h:10 +#: ../src/empathy-main-window.ui.h:11 msgid "_Accounts" msgstr "_Fiókok" -#: ../src/empathy-main-window.ui.h:13 +#: ../src/empathy-main-window.ui.h:14 msgid "_Compact Size" msgstr "_Tömör méret" -#: ../src/empathy-main-window.ui.h:15 +#: ../src/empathy-main-window.ui.h:16 msgid "_Debug" msgstr "_Hibakeresés" -#: ../src/empathy-main-window.ui.h:17 +#: ../src/empathy-main-window.ui.h:18 msgid "_File Transfers" msgstr "_Fájlátvitelek" -#: ../src/empathy-main-window.ui.h:19 +#: ../src/empathy-main-window.ui.h:20 msgid "_Join..." msgstr "_Csatlakozás…" -#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2 +#: ../src/empathy-main-window.ui.h:21 ../src/empathy-status-icon.ui.h:2 msgid "_New Conversation..." msgstr "Új _társalgás…" -#: ../src/empathy-main-window.ui.h:21 +#: ../src/empathy-main-window.ui.h:22 msgid "_Offline Contacts" msgstr "Kilé_pett partnerek" -#: ../src/empathy-main-window.ui.h:22 +#: ../src/empathy-main-window.ui.h:23 msgid "_Personal Information" msgstr "S_zemélyes információk" -#: ../src/empathy-main-window.ui.h:23 -msgid "_Preferences" -msgstr "_Beállítások" - -#: ../src/empathy-main-window.ui.h:24 -msgid "_Previous Conversations" -msgstr "K_orábbi társalgások" - #: ../src/empathy-main-window.ui.h:25 msgid "_Room" msgstr "Sz_oba" @@ -2860,7 +3047,7 @@ msgstr "_Hely közzététele a partnereimnek" msgid "_Reduce location accuracy" msgstr "Hely pontosságának _csökkentése" -#: ../src/empathy-status-icon.c:179 +#: ../src/empathy-status-icon.c:178 msgid "Respond" msgstr "Válasz" @@ -2890,64 +3077,63 @@ msgstr "" msgid "Contact Map View" msgstr "Partner térképnézete" -#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1255 -msgid "Error" -msgstr "Hiba" - -#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1249 -msgid "Critical" -msgstr "Kritikus" - -#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1243 -msgid "Warning" -msgstr "Figyelmeztetés" - -#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1237 -#: ../src/empathy-debug-window.c:1285 -msgid "Message" -msgstr "Üzenet" - -#: ../src/empathy-debug-window.c:129 ../src/empathy-debug-window.c:1231 -msgid "Info" -msgstr "Információ" - -#: ../src/empathy-debug-window.c:132 ../src/empathy-debug-window.c:1225 -msgid "Debug" -msgstr "Hibakeresés" - -#: ../src/empathy-debug-window.c:996 +#: ../src/empathy-debug-window.c:1043 msgid "Save" msgstr "Mentés" -#: ../src/empathy-debug-window.c:1114 +#: ../src/empathy-debug-window.c:1165 msgid "Debug Window" msgstr "Hibakeresési ablak" -#: ../src/empathy-debug-window.c:1193 +#: ../src/empathy-debug-window.c:1245 msgid "Pause" msgstr "Szünet" -#: ../src/empathy-debug-window.c:1205 +#: ../src/empathy-debug-window.c:1257 msgid "Level " msgstr "Szint " -#: ../src/empathy-debug-window.c:1274 +#: ../src/empathy-debug-window.c:1277 +msgid "Debug" +msgstr "Hibakeresés" + +#: ../src/empathy-debug-window.c:1283 +msgid "Info" +msgstr "Információ" + +#: ../src/empathy-debug-window.c:1289 ../src/empathy-debug-window.c:1338 +msgid "Message" +msgstr "Üzenet" + +#: ../src/empathy-debug-window.c:1295 +msgid "Warning" +msgstr "Figyelmeztetés" + +#: ../src/empathy-debug-window.c:1301 +msgid "Critical" +msgstr "Kritikus" + +#: ../src/empathy-debug-window.c:1307 +msgid "Error" +msgstr "Hiba" + +#: ../src/empathy-debug-window.c:1326 msgid "Time" msgstr "Idő" -#: ../src/empathy-debug-window.c:1276 +#: ../src/empathy-debug-window.c:1329 msgid "Domain" msgstr "Tartomány" -#: ../src/empathy-debug-window.c:1278 +#: ../src/empathy-debug-window.c:1331 msgid "Category" msgstr "Kategória" -#: ../src/empathy-debug-window.c:1280 +#: ../src/empathy-debug-window.c:1333 msgid "Level" msgstr "Szint" -#: ../src/empathy-debug-window.c:1312 +#: ../src/empathy-debug-window.c:1365 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -7,16 +7,17 @@ msgstr "" "Project-Id-Version: Empathy\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=empathy&component=general\n" -"POT-Creation-Date: 2009-09-14 22:32+0000\n" -"PO-Revision-Date: 2009-09-17 22:23+0300\n" -"Last-Translator: Adi Roiban <adi@roiban.ro>\n" -"Language-Team: Gnome Romanian Team <gnomero-list@lists.sourceforge.net>\n" +"POT-Creation-Date: 2009-11-26 14:39+0000\n" +"PO-Revision-Date: 2009-11-27 03:49+0300\n" +"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n" +"Language-Team: Romanian GNOME Team <gnomero-list@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" +"X-Generator: Virtaal 0.4.0\n" #: ../data/empathy.desktop.in.in.h:1 msgid "Empathy" @@ -59,15 +60,15 @@ msgstr "" #: ../data/empathy.schemas.in.h:5 msgid "Compact contact list" -msgstr "Listă compactă de contacte" +msgstr "Listă de contacte compactă" #: ../data/empathy.schemas.in.h:6 msgid "Connection managers should be used" msgstr "Ar trebui folosiți administratori de conexiune" #: ../data/empathy.schemas.in.h:7 -msgid "Contact list sort criterium" -msgstr "Criteriu sortare listă contacte" +msgid "Contact list sort criterion" +msgstr "Criteriu de sortare a listei de contacte" #: ../data/empathy.schemas.in.h:8 msgid "Default directory to select an avatar image from" @@ -75,11 +76,11 @@ msgstr "Dosarul implicit de unde se alege avatarul" #: ../data/empathy.schemas.in.h:9 msgid "Disable popup notifications when away" -msgstr "Dezactivează notificările de tip popup când sunt în absență" +msgstr "Dezactivează notificările de tip popup când sunt plecat" #: ../data/empathy.schemas.in.h:10 msgid "Disable sounds when away" -msgstr "Dezactivează sunetele când sunt în absență" +msgstr "Dezactivează sunetele când sunt plecat" #: ../data/empathy.schemas.in.h:11 msgid "Empathy can publish the user's location" @@ -91,7 +92,8 @@ msgstr "Empathy poate folosi GPS-ul pentru a estima locația" #: ../data/empathy.schemas.in.h:13 msgid "Empathy can use the cellular network to guess the location" -msgstr "Empathy poate folosi rețeaua celulară pentru a estima locația" +msgstr "" +"Empathy poate folosi rețeaua de telefonie mobilă pentru a estima locația" #: ../data/empathy.schemas.in.h:14 msgid "Empathy can use the network to guess the location" @@ -187,11 +189,11 @@ msgstr "Redă un sunet la deconectarea unui contact" #: ../data/empathy.schemas.in.h:36 msgid "Play a sound when we log in" -msgstr "Redă un sunet când s-a conectat" +msgstr "Redă un sunet când la conectarea Empathy" #: ../data/empathy.schemas.in.h:37 msgid "Play a sound when we log out" -msgstr "Redă un sunet când s-a deconectăt" +msgstr "Redă un sunet la conectarea Empathy" #: ../data/empathy.schemas.in.h:38 msgid "Popup notifications if the chat isn't focused" @@ -244,7 +246,7 @@ msgstr "" #: ../data/empathy.schemas.in.h:50 msgid "Use graphical smileys" -msgstr "Folosește iconițe simbolice" +msgstr "Folosește emoticonuri grafice" #: ../data/empathy.schemas.in.h:51 msgid "Use notification sounds" @@ -252,7 +254,7 @@ msgstr "Folosește sunete de notificare" #: ../data/empathy.schemas.in.h:52 msgid "Use theme for chat rooms" -msgstr "Folosește tema pentru camere de discuții" +msgstr "Folosește tema pentru camerele de discuții" #: ../data/empathy.schemas.in.h:53 msgid "" @@ -294,7 +296,7 @@ msgid "" "Whether or not Empathy should automatically log in to your accounts on " "startup." msgstr "" -"Dacă Empathy ar trebui sau nu să se conecteze automat la conturi la pornire." +"Dacă Empathy ar trebui sau nu să conecteze automat conturile la pornire." #: ../data/empathy.schemas.in.h:60 msgid "" @@ -337,7 +339,8 @@ msgstr "" msgid "" "Whether or not to convert smileys into graphical images in conversations." msgstr "" -"Dacă să se convertească sau nu în conversații iconițe simbolice în imagini." +"Dacă să se convertească sau nu în cadrul conversațiilor emoticonurile în " +"imagini." #: ../data/empathy.schemas.in.h:66 msgid "" @@ -379,8 +382,7 @@ msgstr "Dacă să se redea sau nu un sunet, la deconectarea de la o rețea." #: ../data/empathy.schemas.in.h:74 msgid "Whether or not to play sound notifications when away or busy." msgstr "" -"Dacă să se redea sau nu notificări sonore în absență sau când sunteți ocupat" -"(ă)." +"Dacă să se redea sau nu notificări sonore când sunteți plecat sau ocupat." #: ../data/empathy.schemas.in.h:75 msgid "" @@ -418,13 +420,12 @@ msgstr "" #: ../data/empathy.schemas.in.h:80 msgid "Whether or not to show contacts that are offline in the contact list." -msgstr "Dacă să se arate sau nu în lista de contacte, contactele deconectate." +msgstr "Dacă să se arate sau nu contactele deconectate în lista de contacte." #: ../data/empathy.schemas.in.h:81 msgid "Whether or not to show popup notifications when away or busy." msgstr "" -"Dacă să fie afișate sau nu notificări popup când sunteți în absență sau " -"ocupat(ă)." +"Dacă să fie afișate sau nu notificări popup când sunteți plecat sau ocupat." #: ../data/empathy.schemas.in.h:82 msgid "Whether or not to show the contact list in chat rooms." @@ -448,7 +449,7 @@ msgstr "Dacă să se folosească sau nu tema pentru camere de discuții." #: ../data/empathy.schemas.in.h:86 msgid "" -"Which criterium to use when sorting the contact list. Default is to use sort " +"Which criterion to use when sorting the contact list. Default is to use sort " "by the contact's name with the value \"name\". A value of \"state\" will " "sort the contact list by state." msgstr "" @@ -456,10 +457,6 @@ msgstr "" "sortate după nume, cu valoarea „name”. O valoare „state” va sorta lista de " "contacte după starea lor." -#: ../libempathy/empathy-account.c:1158 -msgid "Can't set an empty display name" -msgstr "Nu se poate defini un nume gol" - #: ../libempathy/empathy-ft-handler.c:839 msgid "The hash of the received file and the sent one do not match" msgstr "" @@ -478,7 +475,7 @@ msgstr "Fișierul ales nu este unul obișnuit" msgid "The selected file is empty" msgstr "Fișierul selectat este gol" -#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285 +#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:293 msgid "People nearby" msgstr "Persoane din apropiere" @@ -514,35 +511,35 @@ msgstr "Celălalt participant nu poate transfera fișierul" msgid "Unknown reason" msgstr "Motiv necunoscut" -#: ../libempathy/empathy-utils.c:235 +#: ../libempathy/empathy-utils.c:238 msgid "Available" msgstr "Disponibil" -#: ../libempathy/empathy-utils.c:237 +#: ../libempathy/empathy-utils.c:240 msgid "Busy" msgstr "Ocupat" -#: ../libempathy/empathy-utils.c:240 +#: ../libempathy/empathy-utils.c:243 msgid "Away" -msgstr "Absent" +msgstr "Plecat" -#: ../libempathy/empathy-utils.c:242 +#: ../libempathy/empathy-utils.c:245 msgid "Hidden" msgstr "Ascuns" -#: ../libempathy/empathy-utils.c:244 +#: ../libempathy/empathy-utils.c:247 msgid "Offline" msgstr "Deconectat" -#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104 +#: ../libempathy/empathy-utils.c:383 ../src/empathy-import-mc4-accounts.c:104 msgid "People Nearby" msgstr "Persoane din apropiere" -#: ../libempathy/empathy-utils.c:385 +#: ../libempathy/empathy-utils.c:388 msgid "Yahoo! Japan" msgstr "Yahoo! Japonia" -#: ../libempathy/empathy-utils.c:386 +#: ../libempathy/empathy-utils.c:389 msgid "Facebook Chat" msgstr "Facebook Chat" @@ -598,19 +595,53 @@ msgstr[2] "acum %d de luni" msgid "in the future" msgstr "în viitor" -#: ../libempathy-gtk/empathy-account-chooser.c:424 +#: ../libempathy-gtk/empathy-account-chooser.c:450 msgid "All" msgstr "Toate" -#: ../libempathy-gtk/empathy-account-widget.c:430 -#: ../libempathy-gtk/empathy-account-widget.c:486 +#: ../libempathy-gtk/empathy-account-widget.c:513 +#: ../libempathy-gtk/empathy-account-widget.c:569 #, c-format msgid "%s:" msgstr "%s:" -#: ../libempathy-gtk/empathy-account-widget.c:1264 +#: ../libempathy-gtk/empathy-account-widget.c:1245 +msgid "L_og in" +msgstr "Autent_ificare" + +#: ../libempathy-gtk/empathy-account-widget.c:1452 msgid "Enabled" -msgstr "Activ" +msgstr "Activat" + +#. Translators: this is used only when built on a moblin platform +#: ../libempathy-gtk/empathy-account-widget.c:1458 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 +#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 +#: ../src/empathy-chatrooms-window.ui.h:1 +#: ../src/empathy-new-chatroom-dialog.ui.h:1 +msgid "Account:" +msgstr "Cont:" + +#. To translators: The first parameter is the login id and the +#. * second one is the server. The resulting string will be something +#. * like: "MyUserName on chat.freenode.net". +#. * You should reverse the order of these arguments if the +#. * server should come before the login id in your locale. +#: ../libempathy-gtk/empathy-account-widget.c:1722 +#, c-format +msgid "%1$s on %2$s" +msgstr "%1$s pe %2$s" + +#. To translators: The parameter is the protocol name. The resulting +#. * string will be something like: "Jabber Account" +#: ../libempathy-gtk/empathy-account-widget.c:1740 +#, c-format +msgid "%s Account" +msgstr "Cont %s" + +#: ../libempathy-gtk/empathy-account-widget.c:1744 +msgid "New account" +msgstr "Cont nou" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>" @@ -623,7 +654,7 @@ msgstr "<span size=\"small\"><b>Exemplu:</b> NumeleMeu</span>" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 msgid "Advanced" msgstr "Avansat" @@ -633,7 +664,7 @@ msgstr "Avansat" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 msgid "Pass_word:" msgstr "_Parolă:" @@ -713,6 +744,39 @@ msgstr "Set _caractere:" msgid "New Network" msgstr "Rețea nouă" +#: ../libempathy-gtk/empathy-account-widget-sip.c:184 +#: ../libempathy-gtk/empathy-account-widget-sip.c:217 +msgid "Auto" +msgstr "Auto" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:187 +msgid "UDP" +msgstr "UDP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:190 +msgid "TCP" +msgstr "TCP" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:193 +msgid "TLS" +msgstr "TLS" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:222 +msgid "Register" +msgstr "" + +#. translators: this string is very specific to SIP's internal; maybe +#. * best to keep the English version. +#: ../libempathy-gtk/empathy-account-widget-sip.c:227 +msgid "Options" +msgstr "Opțiuni" + +#: ../libempathy-gtk/empathy-account-widget-sip.c:230 +msgid "None" +msgstr "" + #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 msgid "Charset:" msgstr "Set caractere:" @@ -799,7 +863,7 @@ msgstr "Criptar_e necesară (TLS/SSL)" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 msgid "_Ignore SSL certificate errors" -msgstr "_Ignoră erorile de certificat SSL" +msgstr "_Ignoră erorile certificatelor SSL" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>" @@ -838,31 +902,87 @@ msgid "_Published Name:" msgstr "Nume _publicat:" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 +msgid "<b>Keep-Alive Options</b>" +msgstr "<b>Opțiuni Keep-Alive (menținere în viață a conexiunii)</b>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 +msgid "<b>Miscellaneous Options</b>" +msgstr "<b>Opțiuni diverse</b>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 +msgid "<b>NAT Traversal Options</b>" +msgstr "<b>Opțiuni de traversare a NAT-ului</b>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 +msgid "<b>Proxy Options</b>" +msgstr "<b>Opțiuni proxy</b>" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>" msgstr "<span size=\"small\"><b>Exemplu:</b> utilizator@server.sip</span>" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 +msgid "Authentication username:" +msgstr "Nume utilizator pentru autentificare:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +msgid "Discover Binding" +msgstr "" + #. look up the DNS SRV record at the service's domain for the host name of a STUN server. -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "Discover STUN" -msgstr "Descoperire STUN" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +msgid "Discover the STUN server automatically" +msgstr "Descoperă serverul STUN automat" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 +msgid "Hostname of the proxy for outbound requests." +msgstr "Numele proxy-ului pentru conexiuni către exterior." + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 +msgid "Interval (seconds)" +msgstr "Interval (secunde)" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "Loose Routing" +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 +msgid "Mechanism:" +msgstr "Mecanism:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 +msgid "Port:" +msgstr "Port:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 msgid "STUN Server:" msgstr "Server STUN:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 -msgid "STUN port:" -msgstr "Port STUN:" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 +msgid "Server:" +msgstr "Server:" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +msgid "" +"The username for SIP authentication, if different from the SIP URI\n" +"username." +msgstr "" +"Numele de utilizator pentru autentificare SIP, dacă este diferit\n" +"de URI-ul numele utilizator SIP." + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +msgid "Transport:" +msgstr "Transport:" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 msgid "What is your SIP account password?" msgstr "Care este parola contului SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 msgid "What is your SIP login ID?" msgstr "Care este ID-ul de autentificare SIP?" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 msgid "_Username:" msgstr "_Utilizator:" @@ -884,7 +1004,7 @@ msgstr "I_D Yahoo:" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 msgid "_Ignore conference and chatroom invitations" -msgstr "_Ignoră invitații la conferință și camere de discuții" +msgstr "_Ignoră invitații la conferințe și camere de discuții" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 msgid "_Room List locale:" @@ -897,93 +1017,170 @@ msgstr "Nu s-a putut converti imaginea" #: ../libempathy-gtk/empathy-avatar-chooser.c:450 msgid "None of the accepted image formats is supported on your system" -msgstr "Sistemul nu suportă niciunul din formatele de imagine acceptate" +msgstr "" +"Sistemul dumneavoastră nu suportă niciunul din formatele de imagine acceptate" -#: ../libempathy-gtk/empathy-avatar-chooser.c:933 +#: ../libempathy-gtk/empathy-avatar-chooser.c:915 msgid "Select Your Avatar Image" msgstr "Alegeți avatarul" -#: ../libempathy-gtk/empathy-avatar-chooser.c:936 +#: ../libempathy-gtk/empathy-avatar-chooser.c:918 msgid "No Image" msgstr "Nicio imagine" -#: ../libempathy-gtk/empathy-avatar-chooser.c:998 +#: ../libempathy-gtk/empathy-avatar-chooser.c:980 msgid "Images" msgstr "Imagini" -#: ../libempathy-gtk/empathy-avatar-chooser.c:1002 +#: ../libempathy-gtk/empathy-avatar-chooser.c:984 msgid "All Files" msgstr "Toate fișierele" -#: ../libempathy-gtk/empathy-avatar-image.c:324 +#: ../libempathy-gtk/empathy-avatar-image.c:327 msgid "Click to enlarge" msgstr "Clic pentru mărire" -#: ../libempathy-gtk/empathy-chat.c:186 +#: ../libempathy-gtk/empathy-chat.c:194 msgid "Failed to reconnect this chat" msgstr "Reconectarea la această conversație a eșuat" -#: ../libempathy-gtk/empathy-chat.c:403 -msgid "Unsupported command" -msgstr "Comandă nesuportată" +#: ../libempathy-gtk/empathy-chat.c:592 +msgid "Failed to join chatroom" +msgstr "Intrarea în camera de discuții a eșuat" + +#: ../libempathy-gtk/empathy-chat.c:610 +msgid "Failed to open private chat" +msgstr "Nu s-a putut deschide conversația privată" + +#: ../libempathy-gtk/empathy-chat.c:649 +msgid "Topic not supported on this conversation" +msgstr "Subiectul nu este suportat în această conversație" + +#: ../libempathy-gtk/empathy-chat.c:655 +msgid "You are not allowed to change the topic" +msgstr "Nu aveți dreptul să modificați subiectul" + +#: ../libempathy-gtk/empathy-chat.c:773 +msgid "/clear, clear all messages from the current conversation" +msgstr "/clear, curăță toate mesajele din conversația curentă" + +#: ../libempathy-gtk/empathy-chat.c:776 +msgid "/topic <topic>, set the topic of the current conversation" +msgstr "/topic <topic>, modifică subiectul conversației curente" + +#: ../libempathy-gtk/empathy-chat.c:779 +msgid "/join <chatroom id>, join a new chatroom" +msgstr "/join <identificator cameră>, intră într-o nouă cameră de discuții" + +#: ../libempathy-gtk/empathy-chat.c:782 +msgid "/j <chatroom id>, join a new chatroom" +msgstr "/j <identificator cameră>, intră într-o nouă cameră de discuții" + +#: ../libempathy-gtk/empathy-chat.c:785 +msgid "/query <contact id> [<message>], open a private chat" +msgstr "/query <id contact> [<message>], deschide o conversație privată" + +#: ../libempathy-gtk/empathy-chat.c:788 +msgid "/msg <contact id> <message>, open a private chat" +msgstr "/msg <id contact> <message>, deschide o conversație privată" + +#: ../libempathy-gtk/empathy-chat.c:791 +msgid "/nick <nickname>, change your nickname on current server" +msgstr "/nick <pseudonim>, modifică pseudonimul pe serverul curent" + +#: ../libempathy-gtk/empathy-chat.c:794 +msgid "/me <message>, send an ACTION message to the current conversation" +msgstr "/me <mesaj>, trimite un mesaj de tip ACTION conversației curente" + +#: ../libempathy-gtk/empathy-chat.c:797 +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 chatroom\"" +msgstr "" +"/say <mesaj>, trimite <mesaj> conversației curente. Această comandă vă " +"permite să trimiteți un mesaj ce începe cu „/”. De exemplu: \"/say /join " +"este folosit pentru a intra într-o cameră de discuții nouă\"" + +#: ../libempathy-gtk/empathy-chat.c:802 +msgid "" +"/help [<command>], show all supported commands. If <command> is defined, " +"show its usage." +msgstr "" +"/help [<comanda>], afișează toate comenzile suportate. Dacă <comanda> este " +"definită, se va afișa un ghid de utilizare pentru aceasta." + +#: ../libempathy-gtk/empathy-chat.c:812 +#, c-format +msgid "Usage: %s" +msgstr "Utlizare: %s" + +#: ../libempathy-gtk/empathy-chat.c:841 +msgid "Unknown command" +msgstr "Comandă necunoscută" -#: ../libempathy-gtk/empathy-chat.c:535 +#: ../libempathy-gtk/empathy-chat.c:962 +msgid "Unknown command, see /help for the available commands" +msgstr "" +"Comandă necunoscută, utilizați /help pentru a vedea comenzile disponibile" + +#: ../libempathy-gtk/empathy-chat.c:1100 msgid "offline" msgstr "deconectat" -#: ../libempathy-gtk/empathy-chat.c:538 +#: ../libempathy-gtk/empathy-chat.c:1103 msgid "invalid contact" msgstr "contact nevalid" -#: ../libempathy-gtk/empathy-chat.c:541 +#: ../libempathy-gtk/empathy-chat.c:1106 msgid "permission denied" msgstr "permisiune respinsă" -#: ../libempathy-gtk/empathy-chat.c:544 +#: ../libempathy-gtk/empathy-chat.c:1109 msgid "too long message" msgstr "mesaj prea lung" -#: ../libempathy-gtk/empathy-chat.c:547 +#: ../libempathy-gtk/empathy-chat.c:1112 msgid "not implemented" msgstr "neimplementat" -#: ../libempathy-gtk/empathy-chat.c:550 +#: ../libempathy-gtk/empathy-chat.c:1115 msgid "unknown" msgstr "necunoscut" -#: ../libempathy-gtk/empathy-chat.c:554 +#: ../libempathy-gtk/empathy-chat.c:1119 #, c-format msgid "Error sending message '%s': %s" msgstr "Eroare la trimiterea mesajului „%s”: %s" -#: ../libempathy-gtk/empathy-chat.c:584 +#: ../libempathy-gtk/empathy-chat.c:1149 #, c-format msgid "Topic set to: %s" msgstr "Subiect definit la: %s" -#: ../libempathy-gtk/empathy-chat.c:586 +#: ../libempathy-gtk/empathy-chat.c:1151 msgid "No topic defined" msgstr "Niciun subiect definit" -#: ../libempathy-gtk/empathy-chat.c:956 +#: ../libempathy-gtk/empathy-chat.c:1524 msgid "(No Suggestions)" msgstr "(Nicio sugestie)" -#: ../libempathy-gtk/empathy-chat.c:1010 +#: ../libempathy-gtk/empathy-chat.c:1578 msgid "Insert Smiley" -msgstr "Inserează o iconiță simbolică" +msgstr "Inserează un emoticon" #. send button -#: ../libempathy-gtk/empathy-chat.c:1028 -#: ../libempathy-gtk/empathy-ui-utils.c:1492 +#: ../libempathy-gtk/empathy-chat.c:1596 +#: ../libempathy-gtk/empathy-ui-utils.c:1505 msgid "_Send" msgstr "_Trimite" -#: ../libempathy-gtk/empathy-chat.c:1062 +#: ../libempathy-gtk/empathy-chat.c:1630 msgid "_Spelling Suggestions" msgstr "_Sugestii corectare ortografică" -#: ../libempathy-gtk/empathy-chat.c:1177 +#: ../libempathy-gtk/empathy-chat.c:1745 #, c-format msgid "%s has disconnected" msgstr "%s s-a deconectat" @@ -991,12 +1188,12 @@ msgstr "%s s-a deconectat" #. translators: reverse the order of these arguments #. * if the kicked should come before the kicker in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1184 +#: ../libempathy-gtk/empathy-chat.c:1752 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s a fost dat afară de %2$s" -#: ../libempathy-gtk/empathy-chat.c:1187 +#: ../libempathy-gtk/empathy-chat.c:1755 #, c-format msgid "%s was kicked" msgstr "%s a fost dat afară" @@ -1004,17 +1201,17 @@ msgstr "%s a fost dat afară" #. translators: reverse the order of these arguments #. * if the banned should come before the banner in your locale. #. -#: ../libempathy-gtk/empathy-chat.c:1195 +#: ../libempathy-gtk/empathy-chat.c:1763 #, c-format msgid "%1$s was banned by %2$s" msgstr "%1$s a fost blocat definitiv de %2$s" -#: ../libempathy-gtk/empathy-chat.c:1198 +#: ../libempathy-gtk/empathy-chat.c:1766 #, c-format msgid "%s was banned" msgstr "%s a fost blocat" -#: ../libempathy-gtk/empathy-chat.c:1202 +#: ../libempathy-gtk/empathy-chat.c:1770 #, c-format msgid "%s has left the room" msgstr "%s a ieșit din cameră" @@ -1024,61 +1221,81 @@ msgstr "%s a ieșit din cameră" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1211 +#: ../libempathy-gtk/empathy-chat.c:1779 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:1234 +#: ../libempathy-gtk/empathy-chat.c:1804 #, c-format msgid "%s has joined the room" msgstr "%s a intrat în cameră" -#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1285 +#: ../libempathy-gtk/empathy-chat.c:1829 +#, c-format +msgid "%s is now known as %s" +msgstr "%s este acum cunoscut ca %s" + +#: ../libempathy-gtk/empathy-chat.c:1962 ../src/empathy-call-window.c:1297 msgid "Disconnected" msgstr "Deconectat" -#: ../libempathy-gtk/empathy-chat.c:1803 +#: ../libempathy-gtk/empathy-chat.c:2452 +msgid "Wrong password; please try again:" +msgstr "Parolă incorectă; încercați din nou:" + +#: ../libempathy-gtk/empathy-chat.c:2453 +msgid "Retry" +msgstr "Încearcă din nou" + +#: ../libempathy-gtk/empathy-chat.c:2458 +msgid "This room is protected by a password:" +msgstr "Această cameră este protejată de o parolă:" + +#: ../libempathy-gtk/empathy-chat.c:2459 +msgid "Join" +msgstr "Intră" + +#: ../libempathy-gtk/empathy-chat.c:2599 msgid "Connected" msgstr "Conectat" -#: ../libempathy-gtk/empathy-chat.c:1853 -#: ../libempathy-gtk/empathy-log-window.c:502 +#: ../libempathy-gtk/empathy-chat.c:2652 +#: ../libempathy-gtk/empathy-log-window.c:546 msgid "Conversation" msgstr "Conversație" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:477 +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:556 msgid "Topic:" msgstr "Subiect:" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:316 -#: ../libempathy-gtk/empathy-theme-adium.c:276 +#: ../libempathy-gtk/empathy-chat-text-view.c:317 +#: ../libempathy-gtk/empathy-theme-adium.c:817 msgid "_Copy Link Address" msgstr "_Copiază adresa legăturii" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:323 -#: ../libempathy-gtk/empathy-theme-adium.c:284 +#: ../libempathy-gtk/empathy-chat-text-view.c:324 +#: ../libempathy-gtk/empathy-theme-adium.c:824 msgid "_Open Link" msgstr "_Deschide legătura" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:421 +#: ../libempathy-gtk/empathy-chat-text-view.c:422 msgid "%A %B %d %Y" -msgstr "%A %B %d %Y" +msgstr "%A, %d %B %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:177 -#: ../libempathy-gtk/empathy-contact-dialogs.c:236 +#: ../libempathy-gtk/empathy-contact-dialogs.c:238 msgid "Edit Contact Information" msgstr "Modifică informațiile contactului" -#: ../libempathy-gtk/empathy-contact-dialogs.c:287 +#: ../libempathy-gtk/empathy-contact-dialogs.c:289 msgid "Personal Information" msgstr "Informații personale" -#: ../libempathy-gtk/empathy-contact-dialogs.c:392 +#: ../libempathy-gtk/empathy-contact-dialogs.c:394 msgid "New Contact" msgstr "Contact nou" @@ -1090,37 +1307,37 @@ msgstr "_Decide mai târziu" msgid "Subscription Request" msgstr "Cerere de abonare" -#: ../libempathy-gtk/empathy-contact-list-view.c:1414 +#: ../libempathy-gtk/empathy-contact-list-view.c:1416 #, c-format msgid "Do you really want to remove the group '%s'?" -msgstr "Doriți să ștergeți grupul „%s”?" +msgstr "Sigur doriți să ștergeți grupul „%s”?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1416 +#: ../libempathy-gtk/empathy-contact-list-view.c:1418 msgid "Removing group" msgstr "Ștergere grup" #. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1463 -#: ../libempathy-gtk/empathy-contact-list-view.c:1540 +#: ../libempathy-gtk/empathy-contact-list-view.c:1465 +#: ../libempathy-gtk/empathy-contact-list-view.c:1542 msgid "_Remove" msgstr "Ște_rge" -#: ../libempathy-gtk/empathy-contact-list-view.c:1493 +#: ../libempathy-gtk/empathy-contact-list-view.c:1495 #, c-format msgid "Do you really want to remove the contact '%s'?" -msgstr "Doriți să ștergeți contactul „%s”?" +msgstr "Sigur doriți să ștergeți contactul „%s”?" -#: ../libempathy-gtk/empathy-contact-list-view.c:1495 +#: ../libempathy-gtk/empathy-contact-list-view.c:1497 msgid "Removing contact" msgstr "Ștergere contact" #: ../libempathy-gtk/empathy-contact-menu.c:195 -#: ../src/empathy-main-window.ui.h:11 +#: ../src/empathy-main-window.ui.h:12 msgid "_Add Contact..." msgstr "_Adaugă contact..." #: ../libempathy-gtk/empathy-contact-menu.c:222 -#: ../src/empathy-main-window.ui.h:12 +#: ../src/empathy-main-window.ui.h:13 msgid "_Chat" msgstr "Dis_cuție" @@ -1135,8 +1352,9 @@ msgid "_Video Call" msgstr "Apel _video" #: ../libempathy-gtk/empathy-contact-menu.c:324 -msgid "_View Previous Conversations" -msgstr "_Vezi conversațiile anterioare" +#: ../src/empathy-main-window.ui.h:24 +msgid "_Previous Conversations" +msgstr "Conversații an_terioare" #: ../libempathy-gtk/empathy-contact-menu.c:346 msgid "Send file" @@ -1151,7 +1369,7 @@ msgid "Infor_mation" msgstr "Infor_mații" #: ../libempathy-gtk/empathy-contact-menu.c:441 -#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16 +#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:17 msgid "_Edit" msgstr "_Editare" @@ -1180,7 +1398,7 @@ msgid "Select" msgstr "Selectează" #: ../libempathy-gtk/empathy-contact-widget.c:1009 -#: ../src/empathy-main-window.c:1019 +#: ../src/empathy-main-window.c:1026 msgid "Group" msgstr "Grup" @@ -1280,36 +1498,29 @@ msgstr "Latitudine:" msgid "Altitude:" msgstr "Altitudine:" -#: ../libempathy-gtk/empathy-contact-widget.c:1353 +#: ../libempathy-gtk/empathy-contact-widget.c:1367 msgid "<b>Location</b>" msgstr "<b>Locație</b>" -#: ../libempathy-gtk/empathy-contact-widget.c:1366 +#: ../libempathy-gtk/empathy-contact-widget.c:1380 msgid "<b>Location</b>, " msgstr "<b>Locație</b>, " -#: ../libempathy-gtk/empathy-contact-widget.c:1416 +#: ../libempathy-gtk/empathy-contact-widget.c:1430 msgid "%B %e, %Y at %R UTC" -msgstr "%B %e, %Y la %R UTC" +msgstr "%e %B %Y la ora %R UTC" #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 msgid "<b>Location</b> at (date)\t" msgstr "<b>Locație</b> la (data)\t" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 -#: ../src/empathy-chatrooms-window.ui.h:1 -#: ../src/empathy-new-chatroom-dialog.ui.h:1 -msgid "Account:" -msgstr "Cont:" - #: ../libempathy-gtk/empathy-contact-widget.ui.h:3 msgid "Alias:" msgstr "Alias:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:4 msgid "Birthday:" -msgstr "Aniversare:" +msgstr "Zi de naștere:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:5 msgid "Client Information" @@ -1320,7 +1531,7 @@ msgid "Client:" msgstr "Client:" #: ../libempathy-gtk/empathy-contact-widget.ui.h:7 -#: ../src/empathy-main-window.c:1002 +#: ../src/empathy-main-window.c:1009 msgid "Contact" msgstr "Contact" @@ -1373,28 +1584,28 @@ msgstr "Pagină web:" msgid "_Add Group" msgstr "_Adaugă grup" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:281 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:280 msgid "new server" msgstr "server nou" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:508 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:507 msgid "Server" msgstr "Server" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:523 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:522 msgid "Port" msgstr "Port" -#: ../libempathy-gtk/empathy-irc-network-dialog.c:536 +#: ../libempathy-gtk/empathy-irc-network-dialog.c:535 msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:495 -#: ../src/empathy-import-widget.c:302 +#: ../libempathy-gtk/empathy-log-window.c:539 +#: ../src/empathy-import-widget.c:310 msgid "Account" msgstr "Cont" -#: ../libempathy-gtk/empathy-log-window.c:512 +#: ../libempathy-gtk/empathy-log-window.c:556 msgid "Date" msgstr "Dată" @@ -1436,34 +1647,34 @@ msgstr "Conversație nouă" #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:176 -#: ../libempathy-gtk/empathy-presence-chooser.c:212 +#: ../libempathy-gtk/empathy-presence-chooser.c:167 +#: ../libempathy-gtk/empathy-presence-chooser.c:203 msgid "Custom Message..." msgstr "Mesaj personalizat..." -#: ../libempathy-gtk/empathy-presence-chooser.c:229 -#: ../libempathy-gtk/empathy-presence-chooser.c:231 +#: ../libempathy-gtk/empathy-presence-chooser.c:220 +#: ../libempathy-gtk/empathy-presence-chooser.c:222 msgid "Edit Custom Messages..." msgstr "Modifică mesajul personalizat..." -#: ../libempathy-gtk/empathy-presence-chooser.c:330 +#: ../libempathy-gtk/empathy-presence-chooser.c:344 msgid "Click to remove this status as a favorite" msgstr "Apăsați pentru a șterge acest mesaj de stare din lista de favorite" -#: ../libempathy-gtk/empathy-presence-chooser.c:339 +#: ../libempathy-gtk/empathy-presence-chooser.c:353 msgid "Click to make this status a favorite" msgstr "Apăsați pentru a adăuga acest mesaj de stare în lista de favorite" -#: ../libempathy-gtk/empathy-presence-chooser.c:373 +#: ../libempathy-gtk/empathy-presence-chooser.c:387 msgid "Set status" msgstr "Definește starea" -#: ../libempathy-gtk/empathy-presence-chooser.c:794 +#: ../libempathy-gtk/empathy-presence-chooser.c:895 msgid "Set your presence and current status" msgstr "Definiți preferințele și mesajul de stare curent" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1043 +#: ../libempathy-gtk/empathy-presence-chooser.c:1082 msgid "Custom messages..." msgstr "Mesaje personalizate..." @@ -1497,7 +1708,7 @@ msgstr "Deconectat de la server" #: ../libempathy-gtk/empathy-sound.c:65 msgid "Incoming voice call" -msgstr "Primiți un apel vocal" +msgstr "Ați primit un apel vocal" #: ../libempathy-gtk/empathy-sound.c:67 msgid "Outgoing voice call" @@ -1539,15 +1750,15 @@ msgstr "Curat" msgid "Blue" msgstr "Albastru" -#: ../libempathy-gtk/empathy-ui-utils.c:1394 +#: ../libempathy-gtk/empathy-ui-utils.c:1407 msgid "Unable to open URI" msgstr "Nu se poate deschide URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1484 +#: ../libempathy-gtk/empathy-ui-utils.c:1497 msgid "Select a file" msgstr "Alegeți un fișier" -#: ../libempathy-gtk/empathy-ui-utils.c:1544 +#: ../libempathy-gtk/empathy-ui-utils.c:1557 msgid "Select a destination" msgstr "Alegeți o destinație" @@ -1718,72 +1929,35 @@ msgstr "Occidentală" msgid "Vietnamese" msgstr "Vietnameză" -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1 -msgid "" -"The contact to display in the applet. Empty means no contact is displayed." -msgstr "" -"Contactul de afișat în miniaplicație. Gol înseamnă niciun contact afișat." - -#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2 -msgid "The contact's avatar token. Empty means contact has no avatar." -msgstr "Avatarul contactului. Gol înseamnă că nu are niciun avatar." - -#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1 -msgid "Megaphone" -msgstr "Megafon" - -#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2 -#: ../megaphone/src/megaphone-applet.c:522 -msgid "Talk!" -msgstr "Discutăți!" - -#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1 -#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1 -msgid "_About" -msgstr "_Despre" - -#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2 -msgid "_Information" -msgstr "_Informații" - -#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3 -#: ../src/empathy-main-window.ui.h:23 -msgid "_Preferences" -msgstr "_Preferințe" - -#: ../megaphone/src/megaphone-applet.c:166 -msgid "Please configure a contact." -msgstr "Configurați un contact." +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 +msgid "The contact selected cannot receive files." +msgstr "Contactul selectat nu poate primi fișiere." -#: ../megaphone/src/megaphone-applet.c:256 -msgid "Select contact..." -msgstr "Alegere contact..." +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 +msgid "The contact selected is offline." +msgstr "Contactul selectat este deconectat." -#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1 -msgid "Presence" -msgstr "Prezență" +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 +msgid "No error message" +msgstr "Niciun mesaj de eroare" -#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2 -#: ../nothere/src/nothere-applet.c:105 -msgid "Set your own presence" -msgstr "Definiți prezența" +#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242 +msgid "Instant Message (Empathy)" +msgstr "Mesaj instant (Empathy)" -#: ../src/empathy.c:742 +#: ../src/empathy.c:893 msgid "Don't connect on startup" msgstr "Nu conecta la pornire" -#: ../src/empathy.c:746 -msgid "Don't show the contact list on startup" -msgstr "Nu arăta lista de contacte la pornire" +#: ../src/empathy.c:897 +msgid "Don't display the contact list or any other dialogs on startup" +msgstr "Nu arăta lista de contacte sau orice alt dialog la pornire" -#: ../src/empathy.c:750 +#: ../src/empathy.c:901 msgid "Show the accounts dialog" msgstr "Arată dialoguri cu conturile" -#: ../src/empathy.c:762 +#: ../src/empathy.c:913 msgid "- Empathy IM Client" msgstr "- Mesagerie instant Empathy" @@ -1880,37 +2054,37 @@ msgstr "S-a produs o eroare" #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../src/empathy-account-assistant.c:321 -#: ../src/empathy-accounts-dialog.c:1400 +#: ../src/empathy-account-assistant.c:331 +#: ../src/empathy-accounts-dialog.c:1339 #, c-format msgid "New %s account" msgstr "Cont %s nou" -#: ../src/empathy-account-assistant.c:393 +#: ../src/empathy-account-assistant.c:403 msgid "What kind of chat account do you have?" msgstr "Ce fel de cont aveți?" -#: ../src/empathy-account-assistant.c:399 +#: ../src/empathy-account-assistant.c:409 msgid "Do you have any other chat accounts you want to set up?" msgstr "Aveți alte conturi pe care doriți să le configurați?" -#: ../src/empathy-account-assistant.c:405 +#: ../src/empathy-account-assistant.c:415 msgid "Enter your account details" msgstr "Introduceți detaliile contului" -#: ../src/empathy-account-assistant.c:410 +#: ../src/empathy-account-assistant.c:420 msgid "What kind of chat account do you want to create?" msgstr "Ce fel de cont doriți să creați?" -#: ../src/empathy-account-assistant.c:416 +#: ../src/empathy-account-assistant.c:426 msgid "Do you want to create other chat accounts?" msgstr "Doriți să creați alte conturi?" -#: ../src/empathy-account-assistant.c:423 +#: ../src/empathy-account-assistant.c:433 msgid "Enter the details for the new account" msgstr "Introduceți detaliile noului cont" -#: ../src/empathy-account-assistant.c:509 +#: ../src/empathy-account-assistant.c:519 msgid "" "With Empathy you can chat with people online nearby and with friends and " "colleagues who use Google Talk, AIM, Windows Live and many other chat " @@ -1922,46 +2096,46 @@ msgstr "" "programe. Cu un microfon sau o cameră web puteți efectua și apeluri audio " "sau video." -#: ../src/empathy-account-assistant.c:526 +#: ../src/empathy-account-assistant.c:536 msgid "Do you have an account you've been using with another chat program?" msgstr "" "Aveți un cont pe care l-ați folosit din alt program de mesagerie instant?" -#: ../src/empathy-account-assistant.c:549 +#: ../src/empathy-account-assistant.c:559 msgid "Yes, import my account details from " msgstr "Da, importă detaliile contului din " -#: ../src/empathy-account-assistant.c:570 +#: ../src/empathy-account-assistant.c:580 msgid "Yes, I'll enter my account details now" msgstr "Da, voi introduce acum detaliile contului" -#: ../src/empathy-account-assistant.c:592 +#: ../src/empathy-account-assistant.c:602 msgid "No, I want a new account" msgstr "Nu, doresc un cont nou" -#: ../src/empathy-account-assistant.c:602 +#: ../src/empathy-account-assistant.c:612 msgid "No, I just want to see people online nearby for now" msgstr "Nu, pentru moment vreau doar să descopăr persoane din vecinătate" -#: ../src/empathy-account-assistant.c:623 +#: ../src/empathy-account-assistant.c:633 msgid "Select the accounts you want to import:" msgstr "Alegeți conturile pe care doriți să le importați:" -#: ../src/empathy-account-assistant.c:710 +#: ../src/empathy-account-assistant.c:720 #: ../src/empathy-new-chatroom-dialog.c:496 #: ../src/empathy-new-chatroom-dialog.c:497 msgid "Yes" msgstr "Da" -#: ../src/empathy-account-assistant.c:717 +#: ../src/empathy-account-assistant.c:727 msgid "No, that's all for now" msgstr "Nu, atât pentru acum" -#: ../src/empathy-account-assistant.c:910 +#: ../src/empathy-account-assistant.c:920 msgid "Welcome to Empathy" msgstr "Bun venit la Empathy" -#: ../src/empathy-account-assistant.c:919 +#: ../src/empathy-account-assistant.c:929 msgid "Import your existing accounts" msgstr "Importă conturile existente" @@ -1972,28 +2146,13 @@ msgstr "Importă conturile existente" msgid "There are unsaved modification regarding your %s account." msgstr "Există modificări nesalvate pentru contul %s." -#. To translators: The first parameter is the login id and the -#. * second one is the server. The resulting string will be something -#. * like: "MyUserName on chat.freenode.net". -#. * You should reverse the order of these arguments if the -#. * server should come before the login id in your locale. -#: ../src/empathy-accounts-dialog.c:236 -#, c-format -msgid "%1$s on %2$s" -msgstr "%s pe %s" - -#. To translators: The parameter is the protocol name. The resulting -#. * string will be something like: "Jabber Account" -#: ../src/empathy-accounts-dialog.c:248 -#, c-format -msgid "%s Account" -msgstr "Cont %s" - -#: ../src/empathy-accounts-dialog.c:252 -msgid "New account" -msgstr "Cont nou" +#. The primary text of the dialog shown to the user when he is about to lose +#. * an unsaved new account +#: ../src/empathy-accounts-dialog.c:67 +msgid "Your new account has not been saved yet." +msgstr "Contul nou nu a fost încă salvat." -#: ../src/empathy-accounts-dialog.c:502 +#: ../src/empathy-accounts-dialog.c:484 msgid "" "You are about to create a new account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2001,29 +2160,16 @@ msgstr "" "Sunteți pe cale să creați un nou cont, ceea ce va duce\n" "la pierderea modificărilor curente. Doriți să continuați?" -#: ../src/empathy-accounts-dialog.c:787 +#: ../src/empathy-accounts-dialog.c:774 #, c-format -msgid "" -"You are about to remove your %s account!\n" -"Are you sure you want to proceed?" -msgstr "" -"Sunteți pe cale să eliminați contul %s!\n" -"Doriți să continuați?" +msgid "Do you want to remove %s from your computer?" +msgstr "Doriți să ștergeți %s de pe calculatorul dumneavoastră?" -#: ../src/empathy-accounts-dialog.c:792 -msgid "" -"Any associated conversations and chat rooms will NOT be removed if you " -"decide to proceed.\n" -"\n" -"Should you decide to add the account back at a later time, they will still " -"be available." -msgstr "" -"Dacă decideți să continuați, orice conversații asociate sau camere de " -"discuții NU vor fi șterse.\n" -"\n" -"Dacă decideți să adăugați contul din nou, ele vor fi încă disponibile." +#: ../src/empathy-accounts-dialog.c:778 +msgid "This will not remove your account on the server." +msgstr "Această acțiune nu va șterge contul de pe server." -#: ../src/empathy-accounts-dialog.c:980 +#: ../src/empathy-accounts-dialog.c:960 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2031,7 +2177,7 @@ msgstr "" "Sunteți pe cale să alegeți un alt cont, ceea ce va duce\n" "la pierderea modificărilor curente. Doriți să continuați?" -#: ../src/empathy-accounts-dialog.c:1475 +#: ../src/empathy-accounts-dialog.c:1425 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" @@ -2039,6 +2185,11 @@ msgstr "" "Sunteți pe cale să închideți fereastra, ceea ce va duce\n" "la pierderea modificărilor curente. Doriți să continuați?" +#. Translators: this is used only when built on a moblin platform +#: ../src/empathy-accounts-dialog.c:1596 +msgid "_Next" +msgstr "Î_nainte" + #: ../src/empathy-accounts-dialog.ui.h:1 msgid "Accounts" msgstr "Conturi" @@ -2072,68 +2223,145 @@ msgid "_Create a new account" msgstr "_Crează un cont nou" #: ../src/empathy-accounts-dialog.ui.h:8 +msgid "_Import..." +msgstr "_Importă..." + +#: ../src/empathy-accounts-dialog.ui.h:9 msgid "_Reuse an existing account" msgstr "_Refolosește un cont existent" -#: ../src/empathy-accounts-dialog.ui.h:9 +#: ../src/empathy-accounts-dialog.ui.h:10 msgid "account" msgstr "cont" -#: ../src/empathy-call-window.c:427 +#: ../src/empathy-call-window.c:428 msgid "Contrast" msgstr "Contast" -#: ../src/empathy-call-window.c:430 +#: ../src/empathy-call-window.c:431 msgid "Brightness" msgstr "Luminozitate" -#: ../src/empathy-call-window.c:433 +#: ../src/empathy-call-window.c:434 msgid "Gamma" msgstr "Gamă" -#: ../src/empathy-call-window.c:541 +#: ../src/empathy-call-window.c:542 msgid "Volume" msgstr "Volum" -#: ../src/empathy-call-window.c:674 +#: ../src/empathy-call-window.c:676 msgid "Connecting..." msgstr "Se conectează..." -#: ../src/empathy-call-window.c:781 +#: ../src/empathy-call-window.c:784 msgid "_Sidebar" msgstr "Bară _laterală" -#: ../src/empathy-call-window.c:800 +#: ../src/empathy-call-window.c:803 msgid "Dialpad" msgstr "Tastatură" -#: ../src/empathy-call-window.c:806 +#: ../src/empathy-call-window.c:809 msgid "Audio input" msgstr "Intrare audio" -#: ../src/empathy-call-window.c:810 +#: ../src/empathy-call-window.c:813 msgid "Video input" msgstr "Intrare video" #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:873 +#: ../src/empathy-call-window.c:876 #, c-format msgid "Call with %s" msgstr "Apelează cu %s" #. translators: Call is a noun. This string is used in the window #. * title -#: ../src/empathy-call-window.c:944 +#: ../src/empathy-call-window.c:957 msgid "Call" msgstr "Apelează" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1445 +#: ../src/empathy-call-window.c:1457 #, c-format msgid "Connected — %d:%02dm" msgstr "Conectat — %d:%02dm" +#: ../src/empathy-call-window.c:1518 +msgid "Technical Details" +msgstr "Detalii tehnice" + +#: ../src/empathy-call-window.c:1556 +#, c-format +msgid "" +"%s's software does not understand any of the audio formats supported by your " +"computer" +msgstr "" +"Software-ul %s nu înțelege niciunul dintre formatele audio suportate de " +"calculatorul dumneavoastră" + +#: ../src/empathy-call-window.c:1561 +#, c-format +msgid "" +"%s's software does not understand any of the video formats supported by your " +"computer" +msgstr "" +"Software-ul %s nu înțelege niciunul dintre formatele video suportate de " +"calculatorul dumneavoastră" + +#: ../src/empathy-call-window.c:1567 +#, 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 "" +"Nu s-a putut realiza o conexiune către %s. Sau calculatorul dumneavoastră " +"sau calculatorul la care încercați să vă conectați se află într-o rețea ce " +"nu permite conexiuni directe." + +#: ../src/empathy-call-window.c:1573 +msgid "There was a failure on the network" +msgstr "A apărut un eșec pe rețea" + +#: ../src/empathy-call-window.c:1577 +msgid "" +"The audio formats necessary for this call are not installed on your computer" +msgstr "" +"Formatele audio necesare pentru acest apel nu sunt instalate pe calculatorul " +"dumneavoastră" + +#: ../src/empathy-call-window.c:1580 +msgid "" +"The video formats necessary for this call are not installed on your computer" +msgstr "" +"Formatele video necesare pentru acest apel nu sunt instalate pe calculatorul " +"dumneavoastră" + +#: ../src/empathy-call-window.c:1590 +#, c-format +msgid "" +"Something not expected happened in a Telepathy component. Please <a href=\"%s" +"\">report this bug</a> and attach logs gathered from the 'Debug' window in " +"the Help menu." +msgstr "" +"Ceva neașteptat a avut loc într-o componentă Telepathy. <a href=\"%s" +"\">Trimiteți un raport al erorii</a> și atașați mesajele din fereastra " +"„Depanare” din meniul Ajutor." + +#: ../src/empathy-call-window.c:1598 +msgid "There was a failure in the call engine" +msgstr "A apărut un eșec în motorul apelurilor" + +#: ../src/empathy-call-window.c:1637 +msgid "Can't establish audio stream" +msgstr "Nu s-a putut realiza fluxul audio" + +#: ../src/empathy-call-window.c:1647 +msgid "Can't establish video stream" +msgstr "Nu s-a putut realiza fluxul video" + #: ../src/empathy-call-window.ui.h:1 msgid "Hang up" msgstr "Închide" @@ -2162,12 +2390,7 @@ msgstr "_Apelează" msgid "_View" msgstr "_Vizualizare" -#: ../src/empathy-chat-window.c:349 -#, c-format -msgid "Conversations (%d)" -msgstr "Conversații (%d)" - -#: ../src/empathy-chat-window.c:481 +#: ../src/empathy-chat-window.c:560 msgid "Typing a message." msgstr "Scrie un mesaj." @@ -2176,26 +2399,26 @@ msgid "C_lear" msgstr "_Curăță" #: ../src/empathy-chat-window.ui.h:2 +msgid "C_ontact" +msgstr "C_ontact" + +#: ../src/empathy-chat-window.ui.h:3 msgid "Chat" msgstr "Discută" -#: ../src/empathy-chat-window.ui.h:3 +#: ../src/empathy-chat-window.ui.h:4 msgid "Insert _Smiley" -msgstr "Introdu o iconiță _simbolică" +msgstr "Inserează un e_moticon" -#: ../src/empathy-chat-window.ui.h:4 +#: ../src/empathy-chat-window.ui.h:5 msgid "Move Tab _Left" msgstr "Mută tabu_l în stânga" -#: ../src/empathy-chat-window.ui.h:5 +#: ../src/empathy-chat-window.ui.h:6 msgid "Move Tab _Right" msgstr "Mută tabul în d_reapta" -#: ../src/empathy-chat-window.ui.h:6 -msgid "_Contact" -msgstr "_Contact" - -#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14 +#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:15 msgid "_Contents" msgstr "_Conținut" @@ -2211,7 +2434,7 @@ msgstr "_Detașează tab" msgid "_Favorite Chatroom" msgstr "Cameră de discuții _favorită" -#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18 +#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19 msgid "_Help" msgstr "_Ajutor" @@ -2231,15 +2454,15 @@ msgstr "Arată li_sta de contacte" msgid "_Tabs" msgstr "_Taburi" -#: ../src/empathy-chatrooms-window.c:258 +#: ../src/empathy-chatrooms-window.c:256 msgid "Name" msgstr "Nume" -#: ../src/empathy-chatrooms-window.c:276 +#: ../src/empathy-chatrooms-window.c:274 msgid "Room" msgstr "Cameră" -#: ../src/empathy-chatrooms-window.c:285 +#: ../src/empathy-chatrooms-window.c:282 msgid "Auto-Connect" msgstr "Conectare automată" @@ -2247,75 +2470,75 @@ msgstr "Conectare automată" msgid "Manage Favorite Rooms" msgstr "Gestionează camerele favorite" -#: ../src/empathy-event-manager.c:322 +#: ../src/empathy-event-manager.c:330 msgid "Incoming call" msgstr "Apel primit" -#: ../src/empathy-event-manager.c:325 +#: ../src/empathy-event-manager.c:333 #, c-format msgid "%s is calling you, do you want to answer?" msgstr "%s vă sună, doriți să răspundeți?" -#: ../src/empathy-event-manager.c:332 +#: ../src/empathy-event-manager.c:340 msgid "_Reject" msgstr "_Respinge" -#: ../src/empathy-event-manager.c:338 +#: ../src/empathy-event-manager.c:346 msgid "_Answer" msgstr "Ră_spunde" -#: ../src/empathy-event-manager.c:453 +#: ../src/empathy-event-manager.c:455 #, c-format msgid "Incoming call from %s" msgstr "Apel primit de la %s" -#: ../src/empathy-event-manager.c:497 +#: ../src/empathy-event-manager.c:499 #, c-format msgid "%s is offering you an invitation" msgstr "%s vă oferă o invitație" -#: ../src/empathy-event-manager.c:503 +#: ../src/empathy-event-manager.c:505 msgid "An external application will be started to handle it." msgstr "Se va porni o aplicație externă pentru gestionarea ei." -#: ../src/empathy-event-manager.c:508 +#: ../src/empathy-event-manager.c:510 msgid "You don't have the needed external application to handle it." msgstr "Nu aveți aplicația externă necesară gestionării ei." -#: ../src/empathy-event-manager.c:635 +#: ../src/empathy-event-manager.c:638 msgid "Room invitation" msgstr "Invitație cameră" -#: ../src/empathy-event-manager.c:638 +#: ../src/empathy-event-manager.c:641 #, c-format msgid "%s is inviting you to join %s" msgstr "%s vă invită să vă alăturați %s" -#: ../src/empathy-event-manager.c:646 +#: ../src/empathy-event-manager.c:649 msgid "_Decline" msgstr "_Refuză" -#: ../src/empathy-event-manager.c:651 +#: ../src/empathy-event-manager.c:654 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "_Intră" -#: ../src/empathy-event-manager.c:690 +#: ../src/empathy-event-manager.c:693 #, c-format msgid "%s invited you to join %s" msgstr "%s v-a invitat să vă alăturați %s" -#: ../src/empathy-event-manager.c:716 +#: ../src/empathy-event-manager.c:719 #, c-format msgid "Incoming file transfer from %s" msgstr "Transfer de fișiere primit de la %s" -#: ../src/empathy-event-manager.c:896 +#: ../src/empathy-event-manager.c:899 #, c-format msgid "Subscription requested by %s" msgstr "Abonare cerută de %s" -#: ../src/empathy-event-manager.c:900 +#: ../src/empathy-event-manager.c:903 #, c-format msgid "" "\n" @@ -2325,117 +2548,117 @@ msgstr "" "Mesaj: %s" #. someone is logging off -#: ../src/empathy-event-manager.c:936 +#: ../src/empathy-event-manager.c:943 #, c-format msgid "%s is now offline." msgstr "%s s-a deconectat." #. someone is logging in -#: ../src/empathy-event-manager.c:952 +#: ../src/empathy-event-manager.c:959 #, c-format msgid "%s is now online." msgstr "%s s-a conectat." #. Translators: time left, when it is more than one hour -#: ../src/empathy-ft-manager.c:101 +#: ../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:104 +#: ../src/empathy-ft-manager.c:103 #, c-format msgid "%02u.%02u" msgstr "%02u.%02u" -#: ../src/empathy-ft-manager.c:180 +#: ../src/empathy-ft-manager.c:179 msgctxt "file transfer percent" msgid "Unknown" msgstr "Necunoscut" -#: ../src/empathy-ft-manager.c:275 +#: ../src/empathy-ft-manager.c:274 #, c-format msgid "%s of %s at %s/s" msgstr "%s din %s cu %s/s" -#: ../src/empathy-ft-manager.c:276 +#: ../src/empathy-ft-manager.c:275 #, c-format msgid "%s of %s" msgstr "%s din %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:307 +#: ../src/empathy-ft-manager.c:306 #, c-format msgid "Receiving \"%s\" from %s" msgstr "Se primește „%s” de la %s" #. translators: first %s is filename, second %s is the contact name -#: ../src/empathy-ft-manager.c:310 +#: ../src/empathy-ft-manager.c:309 #, c-format msgid "Sending \"%s\" to %s" msgstr "Se trimite „%s” la %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:340 +#: ../src/empathy-ft-manager.c:339 #, c-format msgid "Error receiving \"%s\" from %s" msgstr "Eroare la recepționarea „%s” de la %s" -#: ../src/empathy-ft-manager.c:343 +#: ../src/empathy-ft-manager.c:342 msgid "Error receiving a file" msgstr "Eroare la primirea unui fișier" -#: ../src/empathy-ft-manager.c:348 +#: ../src/empathy-ft-manager.c:347 #, c-format msgid "Error sending \"%s\" to %s" msgstr "Eroare la trimiterea „%s” către %s" -#: ../src/empathy-ft-manager.c:351 +#: ../src/empathy-ft-manager.c:350 msgid "Error sending a file" msgstr "Eroare la trimiterea unui fișier" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:490 +#: ../src/empathy-ft-manager.c:489 #, c-format msgid "\"%s\" received from %s" msgstr "„%s” primit de la %s" #. translators: first %s is filename, second %s #. * is the contact name -#: ../src/empathy-ft-manager.c:495 +#: ../src/empathy-ft-manager.c:494 #, c-format msgid "\"%s\" sent to %s" msgstr "„%s” trimis către %s" -#: ../src/empathy-ft-manager.c:498 +#: ../src/empathy-ft-manager.c:497 msgid "File transfer completed" msgstr "Transfer de fișiere încheiat" -#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784 +#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783 msgid "Waiting for the other participant's response" msgstr "Se așteaptă răspunsul celuilalt participant" -#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681 +#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680 #, c-format msgid "Checking integrity of \"%s\"" msgstr "Se verifică integritatea „%s”" -#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684 +#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683 #, c-format msgid "Hashing \"%s\"" msgstr "Se calculează valoarea de dispersie pentru „%s”" -#: ../src/empathy-ft-manager.c:1024 +#: ../src/empathy-ft-manager.c:991 msgid "%" msgstr "%" -#: ../src/empathy-ft-manager.c:1036 +#: ../src/empathy-ft-manager.c:1003 msgid "File" msgstr "Fișier" -#: ../src/empathy-ft-manager.c:1058 +#: ../src/empathy-ft-manager.c:1025 msgid "Remaining" msgstr "Încă" @@ -2461,15 +2684,15 @@ msgid "Import Accounts" msgstr "Importă conturi" #. Translators: this is the header of a treeview column -#: ../src/empathy-import-widget.c:282 +#: ../src/empathy-import-widget.c:290 msgid "Import" msgstr "Import" -#: ../src/empathy-import-widget.c:291 +#: ../src/empathy-import-widget.c:299 msgid "Protocol" msgstr "Protocol" -#: ../src/empathy-import-widget.c:315 +#: ../src/empathy-import-widget.c:323 msgid "Source" msgstr "Sursă" @@ -2478,67 +2701,75 @@ msgstr "Sursă" msgid "%s account" msgstr "Cont %s" -#: ../src/empathy-main-window.c:399 -msgid "_Edit account" -msgstr "_Editare cont" +#: ../src/empathy-main-window.c:410 +msgid "Reconnect" +msgstr "Reconectează" + +#: ../src/empathy-main-window.c:417 +msgid "Edit Account" +msgstr "Editare cont" -#: ../src/empathy-main-window.c:502 +#: ../src/empathy-main-window.c:424 +msgid "Close" +msgstr "Închide" + +#: ../src/empathy-main-window.c:512 msgid "No error specified" msgstr "Nicio eroare specificată" -#: ../src/empathy-main-window.c:505 +#: ../src/empathy-main-window.c:515 msgid "Network error" msgstr "Eroare de rețea" -#: ../src/empathy-main-window.c:508 +#: ../src/empathy-main-window.c:518 msgid "Authentication failed" msgstr "Autentificare eșuată" -#: ../src/empathy-main-window.c:511 +#: ../src/empathy-main-window.c:521 msgid "Encryption error" msgstr "Eroare de criptare" -#: ../src/empathy-main-window.c:514 +#: ../src/empathy-main-window.c:524 msgid "Name in use" msgstr "Nume în uz" -#: ../src/empathy-main-window.c:517 +#: ../src/empathy-main-window.c:527 msgid "Certificate not provided" msgstr "Nu s-a furnizat un certificat" -#: ../src/empathy-main-window.c:520 +#: ../src/empathy-main-window.c:530 msgid "Certificate untrusted" msgstr "Certificatul nu e de încredere" -#: ../src/empathy-main-window.c:523 +#: ../src/empathy-main-window.c:533 msgid "Certificate expired" msgstr "Certificat expirat" -#: ../src/empathy-main-window.c:526 +#: ../src/empathy-main-window.c:536 msgid "Certificate not activated" msgstr "Certificat inactiv" -#: ../src/empathy-main-window.c:529 +#: ../src/empathy-main-window.c:539 msgid "Certificate hostname mismatch" msgstr "Nepotrivire de nume de gazdă în certificat" -#: ../src/empathy-main-window.c:532 +#: ../src/empathy-main-window.c:542 msgid "Certificate fingerprint mismatch" msgstr "Nepotrivire de amprentă în certificat" -#: ../src/empathy-main-window.c:535 +#: ../src/empathy-main-window.c:545 msgid "Certificate self-signed" msgstr "Certificat semnat de el însuși" -#: ../src/empathy-main-window.c:538 +#: ../src/empathy-main-window.c:548 msgid "Certificate error" msgstr "Eroare de certificat" -#: ../src/empathy-main-window.c:541 +#: ../src/empathy-main-window.c:551 msgid "Unknown error" msgstr "Eroare necunoscută" -#: ../src/empathy-main-window.c:1288 +#: ../src/empathy-main-window.c:1312 msgid "Show and edit accounts" msgstr "Arată și modifică conturile" @@ -2571,49 +2802,49 @@ msgid "Normal Size With _Avatars" msgstr "Dimensiune normală cu _avataruri" #: ../src/empathy-main-window.ui.h:8 +msgid "P_references" +msgstr "P_referințe" + +#: ../src/empathy-main-window.ui.h:9 msgid "Sort by _Name" msgstr "Sortare după _nume" -#: ../src/empathy-main-window.ui.h:9 +#: ../src/empathy-main-window.ui.h:10 msgid "Sort by _Status" msgstr "Sortează după mesajul de _stare" -#: ../src/empathy-main-window.ui.h:10 +#: ../src/empathy-main-window.ui.h:11 msgid "_Accounts" msgstr "_Conturi" -#: ../src/empathy-main-window.ui.h:13 +#: ../src/empathy-main-window.ui.h:14 msgid "_Compact Size" msgstr "Dimensiune _compactă" -#: ../src/empathy-main-window.ui.h:15 +#: ../src/empathy-main-window.ui.h:16 msgid "_Debug" msgstr "_Depanare" -#: ../src/empathy-main-window.ui.h:17 +#: ../src/empathy-main-window.ui.h:18 msgid "_File Transfers" msgstr "Transfer de _fișiere" -#: ../src/empathy-main-window.ui.h:19 +#: ../src/empathy-main-window.ui.h:20 msgid "_Join..." msgstr "_Intră..." -#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2 +#: ../src/empathy-main-window.ui.h:21 ../src/empathy-status-icon.ui.h:2 msgid "_New Conversation..." msgstr "Co_nversație nouă..." -#: ../src/empathy-main-window.ui.h:21 +#: ../src/empathy-main-window.ui.h:22 msgid "_Offline Contacts" msgstr "C_ontacte deconectate" -#: ../src/empathy-main-window.ui.h:22 +#: ../src/empathy-main-window.ui.h:23 msgid "_Personal Information" msgstr "Informații _personale" -#: ../src/empathy-main-window.ui.h:24 -msgid "_Previous Conversations" -msgstr "Conversații _trecute" - #: ../src/empathy-main-window.ui.h:25 msgid "_Room" msgstr "Came_ră" @@ -2719,86 +2950,74 @@ msgid "Language" msgstr "Limbă" #: ../src/empathy-preferences.ui.h:1 -msgid "Allow _GPS usage" -msgstr "Permite utilizarea _GPS-ului" - -#: ../src/empathy-preferences.ui.h:2 -msgid "Allow _cellphone usage" -msgstr "Permite utilizarea telefonului _celular" - -#: ../src/empathy-preferences.ui.h:3 -msgid "Allow _network usage" -msgstr "Permite utilizarea _rețelei" - -#: ../src/empathy-preferences.ui.h:4 msgid "Appearance" msgstr "Aspect" -#: ../src/empathy-preferences.ui.h:5 +#: ../src/empathy-preferences.ui.h:2 msgid "Automatically _connect on startup " msgstr "_Conectare automată la pornire " -#: ../src/empathy-preferences.ui.h:6 +#: ../src/empathy-preferences.ui.h:3 msgid "Behavior" msgstr "Comportament" -#: ../src/empathy-preferences.ui.h:7 +#: ../src/empathy-preferences.ui.h:4 msgid "Chat Th_eme:" msgstr "T_ema conversații:" -#: ../src/empathy-preferences.ui.h:8 +#: ../src/empathy-preferences.ui.h:5 msgid "Disable notifications when _away or busy" -msgstr "Dez_activează notificările în absență sau când sunt ocupat(ă)" +msgstr "Dez_activează notificările când sunt plecat sau ocupat" -#: ../src/empathy-preferences.ui.h:9 +#: ../src/empathy-preferences.ui.h:6 msgid "Disable sounds when _away or busy" -msgstr "Dez_activează sunetele în absență sau când sunt ocupat(ă)" +msgstr "Dez_activează sunetele când sunt plecat sau ocupat" -#: ../src/empathy-preferences.ui.h:10 +#: ../src/empathy-preferences.ui.h:7 msgid "Enable notifications when a contact comes online" msgstr "Activează notificările când un contact se conectează" -#: ../src/empathy-preferences.ui.h:11 +#: ../src/empathy-preferences.ui.h:8 msgid "Enable notifications when a contact goes offline" msgstr "Activează notificările când un contact se deconectează" -#: ../src/empathy-preferences.ui.h:12 +#: ../src/empathy-preferences.ui.h:9 msgid "Enable notifications when the _chat is not focused" msgstr "Activează notificările când dis_cuția nu este în prim plan" -#: ../src/empathy-preferences.ui.h:13 +#: ../src/empathy-preferences.ui.h:10 msgid "Enable spell checking for languages:" msgstr "Activează verificarea ortografică pentru aceste limbi:" -#: ../src/empathy-preferences.ui.h:14 +#: ../src/empathy-preferences.ui.h:11 msgid "General" msgstr "Generale" -#: ../src/empathy-preferences.ui.h:15 -msgid "Geoclue Settings" -msgstr "Preferințe Geoclue" - -#: ../src/empathy-preferences.ui.h:16 +#: ../src/empathy-preferences.ui.h:12 msgid "Location" msgstr "Locație" -#: ../src/empathy-preferences.ui.h:17 +#: ../src/empathy-preferences.ui.h:13 +msgid "Location sources:" +msgstr "Surse locații" + +#: ../src/empathy-preferences.ui.h:14 msgid "Notifications" msgstr "Notificări" -#: ../src/empathy-preferences.ui.h:18 +#: ../src/empathy-preferences.ui.h:15 msgid "Play sound for events" msgstr "Redă sunete pentru evenimente" -#: ../src/empathy-preferences.ui.h:19 +#: ../src/empathy-preferences.ui.h:16 msgid "Preferences" msgstr "Preferințe" -#: ../src/empathy-preferences.ui.h:20 +#: ../src/empathy-preferences.ui.h:17 msgid "Privacy" msgstr "Intimitate" -#: ../src/empathy-preferences.ui.h:21 +#: ../src/empathy-preferences.ui.h:18 msgid "" "Reduced location accuracy means that nothing more precise than your city, " "state and country will be published. GPS coordinates will be accurate to 1 " @@ -2808,41 +3027,53 @@ msgstr "" "statul și țara dumneavoastră nu vor fi publicate. Coordonatele GPS vor avea " "o prezicie de o cifră zecimală." -#: ../src/empathy-preferences.ui.h:22 +#: ../src/empathy-preferences.ui.h:19 msgid "Show _smileys as images" -msgstr "Arată iconițe _simbolice ca imagini" +msgstr "Arată e_moticonurile ca imagini" -#: ../src/empathy-preferences.ui.h:23 +#: ../src/empathy-preferences.ui.h:20 msgid "Show contact _list in rooms" msgstr "Afișează _lista de contacte în camerele de discuții" -#: ../src/empathy-preferences.ui.h:24 +#: ../src/empathy-preferences.ui.h:21 msgid "Sounds" msgstr "Sunete" -#: ../src/empathy-preferences.ui.h:25 +#: ../src/empathy-preferences.ui.h:22 msgid "Spell Checking" msgstr "Verificare ortografică" -#: ../src/empathy-preferences.ui.h:26 +#: ../src/empathy-preferences.ui.h:23 msgid "" "The list of languages reflects only the languages for which you have a " "dictionary installed." msgstr "" "Lista limbilor reflectă doar limbile pentru care aveți instalat un dicționar." -#: ../src/empathy-preferences.ui.h:27 +#: ../src/empathy-preferences.ui.h:24 msgid "Themes" msgstr "Teme" -#: ../src/empathy-preferences.ui.h:28 +#: ../src/empathy-preferences.ui.h:25 +msgid "_Cellphone" +msgstr "Telefon mobi_l" + +#: ../src/empathy-preferences.ui.h:26 msgid "_Enable bubble notifications" msgstr "Activar_e notificări balon" -#: ../src/empathy-preferences.ui.h:29 +#: ../src/empathy-preferences.ui.h:27 msgid "_Enable sound notifications" msgstr "Activ_ează notificările sonore" +#: ../src/empathy-preferences.ui.h:28 +msgid "_GPS" +msgstr "_GPS" + +#: ../src/empathy-preferences.ui.h:29 +msgid "_Network (IP, Wifi)" +msgstr "Rețea (IP, _Wifi)" + #: ../src/empathy-preferences.ui.h:30 msgid "_Open new chats in separate windows" msgstr "Deschide discuțiile n_oi în ferestre separate" @@ -2855,6 +3086,10 @@ msgstr "_Publică contactelor locația mea" msgid "_Reduce location accuracy" msgstr "_Redu acuratețea locației" +#: ../src/empathy-status-icon.c:178 +msgid "Respond" +msgstr "Răspunde" + #: ../src/empathy-status-icon.ui.h:1 msgid "Status" msgstr "Stare" @@ -2881,64 +3116,63 @@ msgstr "" msgid "Contact Map View" msgstr "Vizualizare hartă de contacte" -#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081 -msgid "Error" -msgstr "Eroare" - -#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075 -msgid "Critical" -msgstr "Critic" - -#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069 -msgid "Warning" -msgstr "Avertisment" - -#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063 -#: ../src/empathy-debug-window.c:1111 -msgid "Message" -msgstr "Mesaj" - -#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057 -msgid "Info" -msgstr "Informativ" - -#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051 -msgid "Debug" -msgstr "Depanare" - -#: ../src/empathy-debug-window.c:841 +#: ../src/empathy-debug-window.c:1043 msgid "Save" msgstr "Salvează" -#: ../src/empathy-debug-window.c:944 +#: ../src/empathy-debug-window.c:1165 msgid "Debug Window" msgstr "Fereastră de depanare" -#: ../src/empathy-debug-window.c:1019 +#: ../src/empathy-debug-window.c:1245 msgid "Pause" msgstr "Pauză" -#: ../src/empathy-debug-window.c:1031 +#: ../src/empathy-debug-window.c:1257 msgid "Level " msgstr "Nivel " -#: ../src/empathy-debug-window.c:1100 +#: ../src/empathy-debug-window.c:1277 +msgid "Debug" +msgstr "Depanare" + +#: ../src/empathy-debug-window.c:1283 +msgid "Info" +msgstr "Informativ" + +#: ../src/empathy-debug-window.c:1289 ../src/empathy-debug-window.c:1338 +msgid "Message" +msgstr "Mesaj" + +#: ../src/empathy-debug-window.c:1295 +msgid "Warning" +msgstr "Avertisment" + +#: ../src/empathy-debug-window.c:1301 +msgid "Critical" +msgstr "Critic" + +#: ../src/empathy-debug-window.c:1307 +msgid "Error" +msgstr "Eroare" + +#: ../src/empathy-debug-window.c:1326 msgid "Time" msgstr "Timp" -#: ../src/empathy-debug-window.c:1102 +#: ../src/empathy-debug-window.c:1329 msgid "Domain" msgstr "Domeniu" -#: ../src/empathy-debug-window.c:1104 +#: ../src/empathy-debug-window.c:1331 msgid "Category" msgstr "Categorie" -#: ../src/empathy-debug-window.c:1106 +#: ../src/empathy-debug-window.c:1333 msgid "Level" msgstr "Nivel" -#: ../src/empathy-debug-window.c:1138 +#: ../src/empathy-debug-window.c:1365 msgid "" "The selected connection manager does not support the remote debugging " "extension." @@ -2946,3 +3180,77 @@ msgstr "" "Administratorul de conexiuni ales nu suportă extensia de depanare de la " "distanță." +#~ msgid "Can't set an empty display name" +#~ msgstr "Nu se poate defini un nume gol" + +#~ msgid "Unsupported command" +#~ msgstr "Comandă nesuportată" + +#~ msgid "_View Previous Conversations" +#~ msgstr "_Vezi conversațiile anterioare" + +#~ msgid "" +#~ "The contact to display in the applet. Empty means no contact is displayed." +#~ msgstr "" +#~ "Contactul de afișat în miniaplicație. Gol înseamnă niciun contact afișat." + +#~ msgid "The contact's avatar token. Empty means contact has no avatar." +#~ msgstr "Avatarul contactului. Gol înseamnă că nu are niciun avatar." + +#~ msgid "Talk!" +#~ msgstr "Discutăți!" + +#~ msgid "_Information" +#~ msgstr "_Informații" + +#~ msgid "_Preferences" +#~ msgstr "_Preferințe" + +#~ msgid "Please configure a contact." +#~ msgstr "Configurați un contact." + +#~ msgid "Select contact..." +#~ msgstr "Alegere contact..." + +#~ msgid "Presence" +#~ msgstr "Prezență" + +#~ msgid "Set your own presence" +#~ msgstr "Definiți prezența" + +#~ msgid "" +#~ "You are about to remove your %s account!\n" +#~ "Are you sure you want to proceed?" +#~ msgstr "" +#~ "Sunteți pe cale să eliminați contul %s!\n" +#~ "Doriți să continuați?" + +#~ msgid "" +#~ "Any associated conversations and chat rooms will NOT be removed if you " +#~ "decide to proceed.\n" +#~ "\n" +#~ "Should you decide to add the account back at a later time, they will " +#~ "still be available." +#~ msgstr "" +#~ "Dacă decideți să continuați, orice conversații asociate sau camere de " +#~ "discuții NU vor fi șterse.\n" +#~ "\n" +#~ "Dacă decideți să adăugați contul din nou, ele vor fi încă disponibile." + +#~ msgid "Conversations (%d)" +#~ msgstr "Conversații (%d)" + +#~ msgid "_Contact" +#~ msgstr "_Contact" + +#~ msgid "Allow _GPS usage" +#~ msgstr "Permite utilizarea _GPS-ului" + +#~ msgid "Allow _cellphone usage" +#~ msgstr "Permite utilizarea telefonului _celular" + +#~ msgid "Allow _network usage" +#~ msgstr "Permite utilizarea _rețelei" + +#~ msgid "Geoclue Settings" +#~ msgstr "Preferințe Geoclue" diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index daae3d874..ec410050b 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -1224,7 +1224,7 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog, accounts_dialog_connection_changed_cb (account, 0, status, - TP_CONNECTION_STATUS_DISCONNECTED, + TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED, NULL, NULL, dialog); diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index e1f8cd268..6cd437553 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -44,6 +44,9 @@ #include <libempathy-gtk/empathy-ui-utils.h> #include <libempathy-gtk/empathy-sound.h> +#define DEBUG_FLAG EMPATHY_DEBUG_VOIP +#include <libempathy/empathy-debug.h> + #include "empathy-call-window.h" #include "empathy-call-window-fullscreen.h" #include "empathy-sidebar.h" @@ -92,6 +95,12 @@ typedef enum { REDIALING } CallState; +typedef enum { + CAMERA_STATE_OFF = 0, + CAMERA_STATE_PREVIEW, + CAMERA_STATE_ON, +} CameraState; + /* private structure */ typedef struct _EmpathyCallWindowPriv EmpathyCallWindowPriv; @@ -116,13 +125,15 @@ struct _EmpathyCallWindowPriv GtkWidget *volume_button; GtkWidget *redial_button; GtkWidget *mic_button; - GtkWidget *camera_button; GtkWidget *toolbar; GtkWidget *pane; - GtkAction *show_preview; - GtkAction *send_video; GtkAction *redial; GtkAction *menu_fullscreen; + GtkAction *action_camera; + GtkAction *action_camera_preview; + GtkWidget *tool_button_camera_off; + GtkWidget *tool_button_camera_preview; + GtkWidget *tool_button_camera_on; /* The frames and boxes that contain self and remote avatar and video input/output. When we redial, we destroy and re-create the boxes */ @@ -173,6 +184,7 @@ struct _EmpathyCallWindowPriv GMutex *lock; gboolean call_started; gboolean sending_video; + CameraState camera_state; EmpathyCallWindowFullscreen *fullscreen; gboolean is_fullscreen; @@ -200,18 +212,9 @@ static gboolean empathy_call_window_state_event_cb (GtkWidget *widget, static void empathy_call_window_sidebar_toggled_cb (GtkToggleButton *toggle, EmpathyCallWindow *window); -static void empathy_call_window_camera_toggled_cb (GtkToggleToolButton *toggle, - EmpathyCallWindow *window); - static void empathy_call_window_set_send_video (EmpathyCallWindow *window, gboolean send); -static void empathy_call_window_send_video_toggled_cb (GtkToggleAction *toggle, - EmpathyCallWindow *window); - -static void empathy_call_window_show_preview_toggled_cb ( - GtkToggleAction *toggle, EmpathyCallWindow *window); - static void empathy_call_window_mic_toggled_cb ( GtkToggleToolButton *toggle, EmpathyCallWindow *window); @@ -259,11 +262,32 @@ static void empathy_call_window_volume_changed_cb (GtkScaleButton *button, gdouble value, EmpathyCallWindow *window); +static void block_camera_control_signals (EmpathyCallWindow *self); +static void unblock_camera_control_signals (EmpathyCallWindow *self); + static void empathy_call_window_setup_toolbar (EmpathyCallWindow *self) { EmpathyCallWindowPriv *priv = GET_PRIV (self); GtkToolItem *tool_item; + GtkWidget *camera_off_icon; + GdkPixbuf *pixbuf, *modded_pixbuf; + + /* set the icon of the 'camera off' button by greying off the webcam icon */ + pixbuf = empathy_pixbuf_from_icon_name ("camera-web", + GTK_ICON_SIZE_SMALL_TOOLBAR); + + modded_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, + gdk_pixbuf_get_width (pixbuf), + gdk_pixbuf_get_height (pixbuf)); + + gdk_pixbuf_saturate_and_pixelate (pixbuf, modded_pixbuf, 1.0, TRUE); + g_object_unref (pixbuf); + + camera_off_icon = gtk_image_new_from_pixbuf (modded_pixbuf); + g_object_unref (modded_pixbuf); + gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON ( + priv->tool_button_camera_off), camera_off_icon); /* Add an empty expanded GtkToolItem so the volume button is at the end of * the toolbar. */ @@ -642,6 +666,7 @@ empathy_call_window_setup_video_preview (EmpathyCallWindow *window) return; } + DEBUG ("Create video preview"); g_assert (priv->video_tee == NULL); priv->video_tee = gst_element_factory_make ("tee", NULL); @@ -669,6 +694,33 @@ empathy_call_window_setup_video_preview (EmpathyCallWindow *window) } static void +display_video_preview (EmpathyCallWindow *self, + gboolean display) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + if (display) + { + /* Display the preview and hide the self avatar */ + DEBUG ("Show video preview"); + + if (priv->video_preview == NULL) + empathy_call_window_setup_video_preview (self); + gtk_widget_show (priv->video_preview); + gtk_widget_hide (priv->self_user_avatar_widget); + } + else + { + /* Display the self avatar and hide the preview */ + DEBUG ("Show self avatar"); + + if (priv->video_preview != NULL) + gtk_widget_hide (priv->video_preview); + gtk_widget_show (priv->self_user_avatar_widget); + } +} + +static void empathy_call_window_set_state_connecting (EmpathyCallWindow *window) { EmpathyCallWindowPriv *priv = GET_PRIV (window); @@ -682,6 +734,188 @@ empathy_call_window_set_state_connecting (EmpathyCallWindow *window) } static void +disable_camera (EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + if (priv->camera_state == CAMERA_STATE_OFF) + return; + + DEBUG ("Disable camera"); + + display_video_preview (self, FALSE); + + if (priv->camera_state == CAMERA_STATE_ON) + empathy_call_window_set_send_video (self, FALSE); + + block_camera_control_signals (self); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_on), FALSE); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_preview), FALSE); + + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_off), TRUE); + gtk_radio_action_set_current_value (GTK_RADIO_ACTION (priv->action_camera), + CAMERA_STATE_OFF); + unblock_camera_control_signals (self); + + priv->camera_state = CAMERA_STATE_OFF; +} + +static void +tool_button_camera_off_toggled_cb (GtkToggleToolButton *toggle, + EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + if (!gtk_toggle_tool_button_get_active (toggle)) + { + if (priv->camera_state == CAMERA_STATE_OFF) + { + /* We can't change the state by disabling the button */ + block_camera_control_signals (self); + gtk_toggle_tool_button_set_active (toggle, TRUE); + unblock_camera_control_signals (self); + } + + return; + } + + disable_camera (self); +} + +static void +enable_preview (EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + if (priv->camera_state == CAMERA_STATE_PREVIEW) + return; + + DEBUG ("Enable preview"); + + if (priv->camera_state == CAMERA_STATE_ON) + /* preview is already displayed so we just have to stop sending */ + empathy_call_window_set_send_video (self, FALSE); + + display_video_preview (self, TRUE); + + block_camera_control_signals (self); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_off), FALSE); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_on), FALSE); + + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_preview), TRUE); + gtk_radio_action_set_current_value (GTK_RADIO_ACTION (priv->action_camera), + CAMERA_STATE_PREVIEW); + unblock_camera_control_signals (self); + + priv->camera_state = CAMERA_STATE_PREVIEW; +} + +static void +tool_button_camera_preview_toggled_cb (GtkToggleToolButton *toggle, + EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + if (!gtk_toggle_tool_button_get_active (toggle)) + { + if (priv->camera_state == CAMERA_STATE_PREVIEW) + { + /* We can't change the state by disabling the button */ + block_camera_control_signals (self); + gtk_toggle_tool_button_set_active (toggle, TRUE); + unblock_camera_control_signals (self); + } + + return; + } + + enable_preview (self); +} + +static void +enable_camera (EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + if (priv->camera_state == CAMERA_STATE_ON) + return; + + DEBUG ("Enable camera"); + + empathy_call_window_set_send_video (self, TRUE); + + block_camera_control_signals (self); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_off), FALSE); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_preview), FALSE); + + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON ( + priv->tool_button_camera_on), TRUE); + gtk_radio_action_set_current_value (GTK_RADIO_ACTION (priv->action_camera), + CAMERA_STATE_ON); + unblock_camera_control_signals (self); + + priv->camera_state = CAMERA_STATE_ON; +} + +static void +tool_button_camera_on_toggled_cb (GtkToggleToolButton *toggle, + EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + if (!gtk_toggle_tool_button_get_active (toggle)) + { + if (priv->camera_state == CAMERA_STATE_ON) + { + /* We can't change the state by disabling the button */ + block_camera_control_signals (self); + gtk_toggle_tool_button_set_active (toggle, TRUE); + unblock_camera_control_signals (self); + } + + return; + } + + enable_camera (self); +} + +static void +action_camera_change_cb (GtkRadioAction *action, + GtkRadioAction *current, + EmpathyCallWindow *self) +{ + CameraState state; + + state = gtk_radio_action_get_current_value (current); + + switch (state) + { + case CAMERA_STATE_OFF: + disable_camera (self); + break; + + case CAMERA_STATE_PREVIEW: + enable_preview (self); + break; + + case CAMERA_STATE_ON: + enable_camera (self); + break; + + default: + g_assert_not_reached (); + } +} + +static void empathy_call_window_init (EmpathyCallWindow *self) { EmpathyCallWindowPriv *priv = GET_PRIV (self); @@ -703,13 +937,15 @@ empathy_call_window_init (EmpathyCallWindow *self) "statusbar", &priv->statusbar, "redial", &priv->redial_button, "microphone", &priv->mic_button, - "camera", &priv->camera_button, "toolbar", &priv->toolbar, - "send_video", &priv->send_video, "menuredial", &priv->redial, - "show_preview", &priv->show_preview, "ui_manager", &priv->ui_manager, "menufullscreen", &priv->menu_fullscreen, + "camera_off", &priv->tool_button_camera_off, + "camera_preview", &priv->tool_button_camera_preview, + "camera_on", &priv->tool_button_camera_on, + "action_camera_off", &priv->action_camera, + "action_camera_preview", &priv->action_camera_preview, NULL); g_free (filename); @@ -719,10 +955,11 @@ empathy_call_window_init (EmpathyCallWindow *self) "menuredial", "activate", empathy_call_window_redial_cb, "redial", "clicked", empathy_call_window_redial_cb, "microphone", "toggled", empathy_call_window_mic_toggled_cb, - "camera", "toggled", empathy_call_window_camera_toggled_cb, - "send_video", "toggled", empathy_call_window_send_video_toggled_cb, - "show_preview", "toggled", empathy_call_window_show_preview_toggled_cb, "menufullscreen", "activate", empathy_call_window_fullscreen_cb, + "camera_off", "toggled", tool_button_camera_off_toggled_cb, + "camera_preview", "toggled", tool_button_camera_preview_toggled_cb, + "camera_on", "toggled", tool_button_camera_on_toggled_cb, + "action_camera_off", "changed", action_camera_change_cb, NULL); priv->lock = g_mutex_new (); @@ -975,18 +1212,6 @@ empathy_call_window_setup_avatars (EmpathyCallWindow *self, } static void -empathy_call_window_setup_video_preview_visibility (EmpathyCallWindow *self, - EmpathyCallHandler *handler) -{ - EmpathyCallWindowPriv *priv = GET_PRIV (self); - gboolean initial_video = - empathy_call_handler_has_initial_video (priv->handler); - - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->show_preview), - initial_video); -} - -static void empathy_call_window_constructed (GObject *object) { EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object); @@ -1001,8 +1226,21 @@ empathy_call_window_constructed (GObject *object) g_object_unref (call); empathy_call_window_setup_avatars (self, priv->handler); - empathy_call_window_setup_video_preview_visibility (self, priv->handler); empathy_call_window_set_state_connecting (self); + + if (empathy_call_handler_has_initial_video (priv->handler)) + { + /* Enable 'send video' buttons and display the preview */ + gtk_toggle_tool_button_set_active ( + GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_on), TRUE); + + display_video_preview (self, TRUE); + } + else + { + gtk_toggle_tool_button_set_active ( + GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_off), TRUE); + } } static void empathy_call_window_dispose (GObject *object); @@ -1069,6 +1307,7 @@ static void empathy_call_window_video_stream_changed_cb (EmpathyTpCall *call, GParamSpec *property, EmpathyCallWindow *self) { + DEBUG ("video stream changed"); empathy_call_window_update_avatars_visibility (call, self); } @@ -1282,8 +1521,6 @@ empathy_call_window_disconnected (EmpathyCallWindow *self) if (could_reset_pipeline) { - gboolean initial_video = empathy_call_handler_has_initial_video ( - priv->handler); g_mutex_lock (priv->lock); g_timer_stop (priv->timer); @@ -1301,19 +1538,19 @@ empathy_call_window_disconnected (EmpathyCallWindow *self) /* Reseting the send_video, camera_buton and mic_button to their initial state */ - gtk_widget_set_sensitive (priv->camera_button, FALSE); + gtk_widget_set_sensitive (priv->tool_button_camera_on, FALSE); gtk_widget_set_sensitive (priv->mic_button, FALSE); - gtk_action_set_sensitive (priv->send_video, FALSE); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->send_video), - initial_video); gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), initial_video); + GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_off), TRUE); gtk_toggle_tool_button_set_active ( GTK_TOGGLE_TOOL_BUTTON (priv->mic_button), TRUE); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->show_preview), - FALSE); - gtk_action_set_sensitive (priv->show_preview, FALSE); + /* FIXME: This is to workaround the fact that the pipeline has been + * destroyed and so we can't display preview until a new call (and so a + * new pipeline) is created. We should fix this properly by refactoring + * the code managing the pipeline. This is bug #602937 */ + gtk_widget_set_sensitive (priv->tool_button_camera_preview, FALSE); + gtk_action_set_sensitive (priv->action_camera_preview, FALSE); gtk_progress_bar_set_fraction ( GTK_PROGRESS_BAR (priv->volume_progress_bar), 0); @@ -1325,6 +1562,9 @@ empathy_call_window_disconnected (EmpathyCallWindow *self) priv->call_started = FALSE; could_disconnect = TRUE; + + /* TODO: display the self avatar of the preview (depends if the "Always + * Show Video Preview" is enabled or not) */ } return could_disconnect; @@ -1674,24 +1914,21 @@ empathy_call_window_connected (gpointer user_data) priv->sending_video = can_send_video ? empathy_tp_call_is_sending_video (call) : FALSE; - gtk_action_set_sensitive (priv->show_preview, TRUE); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->show_preview), - priv->sending_video - || gtk_toggle_action_get_active (GTK_TOGGLE_ACTION ( - priv->show_preview))); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->send_video), - priv->sending_video && priv->video_input != NULL); gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), + GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_on), priv->sending_video && priv->video_input != NULL); - gtk_widget_set_sensitive (priv->camera_button, can_send_video); - gtk_action_set_sensitive (priv->send_video, can_send_video); + gtk_widget_set_sensitive (priv->tool_button_camera_on, can_send_video); gtk_action_set_sensitive (priv->redial, FALSE); gtk_widget_set_sensitive (priv->redial_button, FALSE); gtk_widget_set_sensitive (priv->mic_button, TRUE); + /* FIXME: this should won't be needed once bug #602937 is fixed + * (see empathy_call_window_disconnected for details) */ + gtk_widget_set_sensitive (priv->tool_button_camera_preview, TRUE); + gtk_action_set_sensitive (priv->action_camera_preview, TRUE); + empathy_call_window_update_avatars_visibility (call, self); g_object_unref (call); @@ -1770,23 +2007,6 @@ empathy_call_window_sink_added_cb (EmpathyCallHandler *handler, case TP_MEDIA_STREAM_TYPE_VIDEO: if (priv->video_input != NULL) { - EmpathyTpCall *call; - g_object_get (priv->handler, "tp-call", &call, NULL); - - if (empathy_tp_call_is_sending_video (call)) - { - empathy_call_window_setup_video_preview (self); - - gtk_toggle_action_set_active ( - GTK_TOGGLE_ACTION (priv->show_preview), TRUE); - - if (priv->video_preview != NULL) - gtk_widget_show (priv->video_preview); - gtk_widget_hide (priv->self_user_avatar_widget); - } - - g_object_unref (call); - if (priv->video_tee != NULL) { pad = gst_element_get_request_pad (priv->video_tee, "src%d"); @@ -1806,6 +2026,7 @@ empathy_call_window_remove_video_input (EmpathyCallWindow *self) EmpathyCallWindowPriv *priv = GET_PRIV (self); GstElement *preview; + DEBUG ("remove video input"); preview = empathy_video_widget_get_element ( EMPATHY_VIDEO_WIDGET (priv->video_preview)); @@ -1823,11 +2044,9 @@ empathy_call_window_remove_video_input (EmpathyCallWindow *self) gtk_widget_destroy (priv->video_preview); priv->video_preview = NULL; - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->send_video), FALSE); gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), FALSE); - gtk_widget_set_sensitive (priv->camera_button, FALSE); - gtk_action_set_sensitive (priv->send_video, FALSE); + GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_on), FALSE); + gtk_widget_set_sensitive (priv->tool_button_camera_on, FALSE); gtk_widget_show (priv->self_user_avatar_widget); } @@ -1898,28 +2117,6 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message, } static void -empathy_call_window_update_self_avatar_visibility (EmpathyCallWindow *window) -{ - EmpathyCallWindowPriv *priv = GET_PRIV (window); - - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (priv->show_preview))) - { - if (priv->video_preview != NULL) - { - gtk_widget_hide (priv->self_user_avatar_widget); - gtk_widget_show (priv->video_preview); - } - else - { - if (priv->video_preview != NULL) - gtk_widget_hide (priv->video_preview); - - gtk_widget_show (priv->self_user_avatar_widget); - } - } -} - -static void empathy_call_window_update_avatars_visibility (EmpathyTpCall *call, EmpathyCallWindow *window) { @@ -1935,8 +2132,6 @@ empathy_call_window_update_avatars_visibility (EmpathyTpCall *call, gtk_widget_hide (priv->video_output); gtk_widget_show (priv->remote_user_avatar_widget); } - - empathy_call_window_update_self_avatar_visibility (window); } static void @@ -2176,76 +2371,15 @@ empathy_call_window_set_send_video (EmpathyCallWindow *window, /* When we start sending video, we want to show the video preview by default. */ - if (send) - { - empathy_call_window_setup_video_preview (window); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->show_preview), - TRUE); - } - - g_object_get (priv->handler, "tp-call", &call, NULL); - empathy_tp_call_request_video_stream_direction (call, send); - g_object_unref (call); -} - -static void -empathy_call_window_camera_toggled_cb (GtkToggleToolButton *toggle, - EmpathyCallWindow *window) -{ - EmpathyCallWindowPriv *priv = GET_PRIV (window); - gboolean active; + display_video_preview (window, send); if (priv->call_state != CONNECTED) return; - active = (gtk_toggle_tool_button_get_active (toggle)); - - if (priv->sending_video == active) - return; - - empathy_call_window_set_send_video (window, active); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->send_video), active); -} - -static void -empathy_call_window_send_video_toggled_cb (GtkToggleAction *toggle, - EmpathyCallWindow *window) -{ - EmpathyCallWindowPriv *priv = GET_PRIV (window); - gboolean active; - - if (priv->call_state != CONNECTED) - return; - - active = (gtk_toggle_action_get_active (toggle)); - - if (priv->sending_video == active) - return; - - empathy_call_window_set_send_video (window, active); - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), active); -} - -static void -empathy_call_window_show_preview_toggled_cb (GtkToggleAction *toggle, - EmpathyCallWindow *window) -{ - gboolean show_preview_toggled; - EmpathyCallWindowPriv *priv = GET_PRIV (window); - - show_preview_toggled = gtk_toggle_action_get_active (toggle); - - if (show_preview_toggled) - { - empathy_call_window_setup_video_preview (window); - gtk_widget_show (priv->self_user_output_frame); - empathy_call_window_update_self_avatar_visibility (window); - } - else - { - gtk_widget_hide (priv->self_user_output_frame); - } + g_object_get (priv->handler, "tp-call", &call, NULL); + DEBUG ("%s sending video", send ? "start": "stop"); + empathy_tp_call_request_video_stream_direction (call, send); + g_object_unref (call); } static void @@ -2336,9 +2470,6 @@ empathy_call_window_restart_call (EmpathyCallWindow *window) gtk_widget_show_all (priv->content_hbox); - if (!empathy_call_handler_has_initial_video (priv->handler)) - gtk_widget_hide (priv->self_user_output_frame); - priv->outgoing = TRUE; empathy_call_window_set_state_connecting (window); @@ -2474,3 +2605,36 @@ empathy_call_window_volume_changed_cb (GtkScaleButton *button, empathy_audio_sink_set_volume (EMPATHY_GST_AUDIO_SINK (priv->audio_output), value); } + +/* block all the signals related to camera control widgets. This is useful + * when we are manually updating the UI and so don't want to fire the + * callbacks */ +static void +block_camera_control_signals (EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + g_signal_handlers_block_by_func (priv->tool_button_camera_off, + tool_button_camera_off_toggled_cb, self); + g_signal_handlers_block_by_func (priv->tool_button_camera_preview, + tool_button_camera_preview_toggled_cb, self); + g_signal_handlers_block_by_func (priv->tool_button_camera_on, + tool_button_camera_on_toggled_cb, self); + g_signal_handlers_block_by_func (priv->action_camera, + tool_button_camera_on_toggled_cb, self); +} + +static void +unblock_camera_control_signals (EmpathyCallWindow *self) +{ + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + g_signal_handlers_unblock_by_func (priv->tool_button_camera_off, + tool_button_camera_off_toggled_cb, self); + g_signal_handlers_unblock_by_func (priv->tool_button_camera_preview, + tool_button_camera_preview_toggled_cb, self); + g_signal_handlers_unblock_by_func (priv->tool_button_camera_on, + tool_button_camera_on_toggled_cb, self); + g_signal_handlers_unblock_by_func (priv->action_camera, + tool_button_camera_on_toggled_cb, self); +} diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui index 64e87e040..94d2fba83 100644 --- a/src/empathy-call-window.ui +++ b/src/empathy-call-window.ui @@ -11,13 +11,6 @@ </object> </child> <child> - <object class="GtkToggleAction" id="send_video"> - <property name="name">send_video</property> - <property name="label" translatable="yes">Send video</property> - <property name="sensitive">False</property> - </object> - </child> - <child> <object class="GtkAction" id="menuhangup"> <property name="icon_name">call-stop</property> <property name="name">menuhangup</property> @@ -33,16 +26,45 @@ </object> </child> <child> - <object class="GtkAction" id="view"> - <property name="name">view</property> - <property name="label" translatable="yes">_View</property> + <object class="GtkAction" id="camera"> + <property name="name">camera</property> + <property name="label" translatable="yes">V_ideo</property> + </object> + </child> + <child> + <object class="GtkRadioAction" id="action_camera_off"> + <property name="name">action_camera_off</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Video Off</property> + <property name="draw_as_radio">True</property> + <property name="value">0</property> + <property name="current-value">0</property> </object> </child> <child> - <object class="GtkToggleAction" id="show_preview"> - <property name="name">show_preview</property> - <property name="label" translatable="yes">Video preview</property> - <property name="active">True</property> + <object class="GtkRadioAction" id="action_camera_preview"> + <property name="name">action_camera_preview</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Video Preview</property> + <property name="draw_as_radio">True</property> + <property name="group">action_camera_off</property> + <property name="value">1</property> + </object> + </child> + <child> + <object class="GtkRadioAction" id="action_camera_on"> + <property name="name">action_camera_on</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Video On</property> + <property name="draw_as_radio">True</property> + <property name="group">action_camera_off</property> + <property name="value">2</property> + </object> + </child> + <child> + <object class="GtkAction" id="view"> + <property name="name">view</property> + <property name="label" translatable="yes">_View</property> </object> </child> <child> @@ -57,12 +79,15 @@ <ui> <menubar name="menubar1"> <menu action="call"> - <menuitem action="send_video"/> <menuitem action="menuhangup"/> <menuitem action="menuredial"/> </menu> + <menu action="camera"> + <menuitem action="action_camera_off"/> + <menuitem action="action_camera_preview"/> + <menuitem action="action_camera_on"/> + </menu> <menu action="view"> - <menuitem action="show_preview"/> <menuitem action="menufullscreen"/> </menu> </menubar> @@ -127,11 +152,43 @@ </packing> </child> <child> - <object class="GtkToggleToolButton" id="camera"> + <object class="GtkSeparatorToolItem" id="camera_separator"> + <property name="visible">True</property> + </object> + <packing> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToggleToolButton" id="camera_off"> + <property name="visible">True</property> + <property name="label" translatable="yes">Camera Off</property> + <property name="sensitive">True</property> + <property name="tooltip_text" translatable="yes">Disable camera and stop sending video</property> + </object> + <packing> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToggleToolButton" id="camera_preview"> + <property name="visible">True</property> + <property name="label" translatable="yes">Preview</property> + <property name="icon_name">stock_person</property> + <property name="sensitive">True</property> + <property name="tooltip_text" translatable="yes">Enable camera but don't send video</property> + </object> + <packing> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToggleToolButton" id="camera_on"> <property name="visible">True</property> - <property name="label" translatable="yes">Send video</property> + <property name="label" translatable="yes">Camera On</property> <property name="icon_name">camera-web</property> <property name="sensitive">False</property> + <property name="tooltip_text" translatable="yes">Enable camera and send video</property> </object> <packing> <property name="homogeneous">True</property> diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index fb04e7c3e..ea63f29aa 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -369,16 +369,97 @@ chat_window_contact_menu_update (EmpathyChatWindowPriv *priv, } } +static guint +get_all_unread_messages (EmpathyChatWindowPriv *priv) +{ + GList *l; + guint nb = 0; + + for (l = priv->chats_new_msg; l != NULL; l = g_list_next (l)) { + EmpathyChat *chat = l->data; + + nb += empathy_chat_get_nb_unread_messages (chat); + } + + return nb; +} + +static gchar * +get_window_title_name (EmpathyChatWindowPriv *priv) +{ + const gchar *active_name; + guint nb_chats; + guint current_unread_msgs; + + nb_chats = g_list_length (priv->chats); + g_assert (nb_chats > 0); + + active_name = empathy_chat_get_name (priv->current_chat); + + current_unread_msgs = empathy_chat_get_nb_unread_messages ( + priv->current_chat); + + if (nb_chats == 1) { + /* only one tab */ + if (current_unread_msgs == 0) + return g_strdup (active_name); + else + return g_strdup_printf (ngettext ( + "%s (%d unread)", + "%s (%d unread)", current_unread_msgs), + active_name, current_unread_msgs); + } else { + guint nb_others = nb_chats - 1; + guint all_unread_msgs; + + all_unread_msgs = get_all_unread_messages (priv); + + if (all_unread_msgs == 0) { + /* no unread message */ + return g_strdup_printf (ngettext ( + "%s (and %u other)", + "%s (and %u others)", nb_others), + active_name, nb_others); + } + + else if (all_unread_msgs == current_unread_msgs) { + /* unread messages are in the current tab */ + return g_strdup_printf (ngettext ( + "%s (%d unread)", + "%s (%d unread)", current_unread_msgs), + active_name, current_unread_msgs); + } + + else if (current_unread_msgs == 0) { + /* unread messages are in other tabs */ + return g_strdup_printf (ngettext ( + "%s (%d unread from others)", + "%s (%d unread from others)", + all_unread_msgs), + active_name, all_unread_msgs); + } + + else { + /* unread messages are in all the tabs */ + return g_strdup_printf (ngettext ( + "%s (%d unread from all)", + "%s (%d unread from all)", + all_unread_msgs), + active_name, all_unread_msgs); + } + } +} + static void chat_window_title_update (EmpathyChatWindowPriv *priv) { - const gchar *name; - - name = empathy_chat_get_name (priv->current_chat); + gchar *name; DEBUG ("Update window : Title"); + name = get_window_title_name (priv); gtk_window_set_title (GTK_WINDOW (priv->dialog), name); + g_free (name); } static void @@ -1127,6 +1208,8 @@ chat_window_new_message_cb (EmpathyChat *chat, } if (has_focus && priv->current_chat == chat) { + /* window and tab are focused so consider the message to be read */ + empathy_chat_messages_read (chat); return; } @@ -1157,6 +1240,9 @@ chat_window_new_message_cb (EmpathyChat *chat, EMPATHY_SOUND_MESSAGE_INCOMING); chat_window_show_or_update_notification (window, message, chat); } + + /* update the number of unread messages */ + chat_window_title_update (priv); } static GtkNotebook * @@ -1213,6 +1299,7 @@ chat_window_page_switched_cb (GtkNotebook *notebook, priv->current_chat = chat; priv->chats_new_msg = g_list_remove (priv->chats_new_msg, chat); + empathy_chat_messages_read (chat); chat_window_update_chat_tab (chat); } @@ -1304,6 +1391,7 @@ chat_window_page_removed_cb (GtkNotebook *notebook, /* Keep list of chats up to date */ priv->chats = g_list_remove (priv->chats, chat); priv->chats_new_msg = g_list_remove (priv->chats_new_msg, chat); + empathy_chat_messages_read (chat); priv->chats_composing = g_list_remove (priv->chats_composing, chat); if (priv->chats == NULL) { @@ -1325,6 +1413,7 @@ chat_window_focus_in_event_cb (GtkWidget *widget, priv = GET_PRIV (window); priv->chats_new_msg = g_list_remove (priv->chats_new_msg, priv->current_chat); + empathy_chat_messages_read (priv->current_chat); chat_window_set_urgency_hint (window, FALSE); diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c index 6f2c8c24c..aae8aac32 100644 --- a/src/empathy-chatrooms-window.c +++ b/src/empathy-chatrooms-window.c @@ -52,8 +52,6 @@ typedef struct { GtkWidget *button_remove; GtkWidget *button_edit; GtkWidget *button_close; - - gint room_column; } EmpathyChatroomsWindow; static void chatrooms_window_destroy_cb (GtkWidget *widget, @@ -278,7 +276,6 @@ chatrooms_window_model_add_columns (EmpathyChatroomsWindow *window) NULL); count = gtk_tree_view_append_column (view, column); gtk_tree_view_column_set_sort_column_id (column, count - 1); - window->room_column = count - 1; /* Chatroom auto connect */ cell = gtk_cell_renderer_toggle_new (); @@ -306,7 +303,6 @@ chatrooms_window_model_refresh_data (EmpathyChatroomsWindow *window, GtkTreeModel *model; GtkListStore *store; GtkTreeIter iter; - GtkTreeViewColumn *column; EmpathyAccountChooser *account_chooser; TpAccount *account; GList *chatrooms, *l; @@ -322,17 +318,6 @@ chatrooms_window_model_refresh_data (EmpathyChatroomsWindow *window, chatrooms = empathy_chatroom_manager_get_chatrooms (window->manager, account); - /* Sort out columns, we only show the server column for - * selected protocol types, such as Jabber. - */ - if (account) { - column = gtk_tree_view_get_column (view, window->room_column); - gtk_tree_view_column_set_visible (column, TRUE); - } else { - column = gtk_tree_view_get_column (view, window->room_column); - gtk_tree_view_column_set_visible (column, FALSE); - } - /* Clean out the store */ gtk_list_store_clear (store); diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index e4c1445e6..4c34e6808 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -31,6 +31,7 @@ #include <libempathy/empathy-utils.h> #include <libempathy-gtk/empathy-account-chooser.h> +#include <libempathy-gtk/empathy-geometry.h> #include <telepathy-glib/dbus.h> #include <telepathy-glib/util.h> @@ -1163,6 +1164,7 @@ debug_window_constructor (GType type, gtk_window_set_title (GTK_WINDOW (object), _("Debug Window")); gtk_window_set_default_size (GTK_WINDOW (object), 800, 400); + empathy_geometry_bind (GTK_WINDOW (object), "debug-window"); g_signal_connect (object, "key-press-event", G_CALLBACK (debug_window_key_press_event_cb), NULL); diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 0992dd243..86956e7f9 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -944,7 +944,7 @@ event_manager_presence_changed_cb (EmpathyContactMonitor *monitor, empathy_contact_get_name (contact)); event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE, - GTK_STOCK_DIALOG_INFO, header, NULL, NULL, NULL, NULL); + "stock_person", header, NULL, NULL, NULL, NULL); } } else @@ -960,7 +960,7 @@ event_manager_presence_changed_cb (EmpathyContactMonitor *monitor, empathy_contact_get_name (contact)); event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE, - GTK_STOCK_DIALOG_INFO, header, NULL, NULL, NULL, NULL); + "stock_person", header, NULL, NULL, NULL, NULL); } } g_free (header); diff --git a/tests/.gitignore b/tests/.gitignore index 73a19245d..f3af9c7fe 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -5,4 +5,5 @@ empathy-irc-network-test empathy-irc-network-manager-test empathy-chatroom-test empathy-chatroom-manager-test +empathy-parser-test test-report.xml diff --git a/tests/Makefile.am b/tests/Makefile.am index 25e399406..936761533 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,7 +27,8 @@ TEST_PROGS = \ empathy-irc-network-test \ empathy-irc-network-manager-test \ empathy-chatroom-test \ - empathy-chatroom-manager-test + empathy-chatroom-manager-test \ + empathy-parser-test empathy_utils_test_SOURCES = empathy-utils-test.c \ test-helper.c test-helper.h @@ -50,6 +51,9 @@ empathy_chatroom_test_SOURCES = empathy-chatroom-test.c \ empathy_chatroom_manager_test_SOURCES = empathy-chatroom-manager-test.c \ test-helper.c test-helper.h +empathy_parser_test_SOURCES = empathy-parser-test.c \ + test-helper.c test-helper.h + check_PROGRAMS = $(TEST_PROGS) TESTS_ENVIRONMENT = EMPATHY_SRCDIR=@abs_top_srcdir@ \ diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c new file mode 100644 index 000000000..001882863 --- /dev/null +++ b/tests/empathy-parser-test.c @@ -0,0 +1,145 @@ +#include <stdlib.h> +#include <stdio.h> +#include <string.h> + +#include "test-helper.h" + +#include <telepathy-glib/util.h> + +#define DEBUG_FLAG EMPATHY_DEBUG_TESTS +#include <libempathy/empathy-debug.h> + +#include <libempathy-gtk/empathy-ui-utils.h> + +static void +test_replace_match (const gchar *text, + gssize len, + gpointer match_data, + gpointer user_data) +{ + GString *string = user_data; + + g_string_append_c (string, '['); + g_string_append_len (string, text, len); + g_string_append_c (string, ']'); +} + +static void +test_replace_verbatim (const gchar *text, + gssize len, + gpointer match_data, + gpointer user_data) +{ + GString *string = user_data; + + g_string_append_len (string, text, len); +} + +static void +test_parsers (void) +{ + gchar *tests[] = + { + /* Basic link matches */ + "http://foo.com", "[http://foo.com]", + "http://foo.com\nhttp://bar.com", "[http://foo.com]\n[http://bar.com]", + "http://foo.com/test?id=bar?", "[http://foo.com/test?id=bar]?", + "git://foo.com", "[git://foo.com]", + "git+ssh://foo.com", "[git+ssh://foo.com]", + "mailto:user@server.com", "[mailto:user@server.com]", + "www.foo.com", "[www.foo.com]", + "ftp.foo.com", "[ftp.foo.com]", + "user@server.com", "[user@server.com]", + "first.last@server.com", "[first.last@server.com]", + "http://foo.com. bar", "[http://foo.com]. bar", + "http://foo.com; bar", "[http://foo.com]; bar", + "http://foo.com: bar", "[http://foo.com]: bar", + "http://foo.com:bar", "[http://foo.com:bar]", + + /* They are not links! */ + "http://", "http[:/]/", /* Hm... */ + "www.", "www.", + "w.foo.com", "w.foo.com", + "@server.com", "@server.com", + "mailto:user@", "mailto:user@", + "mailto:user@.com", "mailto:user@.com", + "user@.com", "user@.com", + + /* Links inside (), {}, [], <> or "" */ + /* FIXME: How to test if the ending ] is matched or not? */ + "Foo (www.foo.com)", "Foo ([www.foo.com])", + "Foo {www.foo.com}", "Foo {[www.foo.com]}", + "Foo [www.foo.com]", "Foo [[www.foo.com]]", + "Foo <www.foo.com>", "Foo <[www.foo.com]>", + "Foo \"www.foo.com\"", "Foo \"[www.foo.com]\"", + "Foo (www.foo.com/bar(123)baz)", "Foo ([www.foo.com/bar(123)baz])", + "<a href=\"http://foo.com\">bar</a>", "<a href=\"[http://foo.com]\">bar</a>", + "Foo (user@server.com)", "Foo ([user@server.com])", + "Foo {user@server.com}", "Foo {[user@server.com]}", + "Foo [user@server.com]", "Foo [[user@server.com]]", + "Foo <user@server.com>", "Foo <[user@server.com]>", + "Foo \"user@server.com\"", "Foo \"[user@server.com]\"", + + /* Basic smileys */ + "a:)b", "a[:)]b", + ">:)", "[>:)]", + ">:(", ">[:(]", + + /* Smileys and links mixed */ + ":)http://foo.com", "[:)][http://foo.com]", + "a :) b http://foo.com c :( d www.test.com e", "a [:)] b [http://foo.com] c [:(] d [www.test.com] e", + + /* FIXME: Known issue: Brackets should be counted by the parser */ + //"Foo www.bar.com/test(123)", "Foo [www.bar.com/test(123)]", + //"Foo (www.bar.com/test(123))", "Foo ([www.bar.com/test(123)])", + //"Foo www.bar.com/test{123}", "Foo [www.bar.com/test{123}]", + //"Foo (:))", "Foo ([:)])", + //"Foo <a href=\"http://foo.com\">:)</a>", "Foo <a href=\"[http://foo.com]\">[:)]</a>", + + NULL, NULL + }; + EmpathyStringParser parsers[] = + { + {empathy_string_match_link, test_replace_match}, + {empathy_string_match_smiley, test_replace_match}, + {empathy_string_match_all, test_replace_verbatim}, + {NULL, NULL} + }; + guint i; + gboolean failed = FALSE; + + DEBUG ("Started"); + for (i = 0; tests[i] != NULL; i += 2) + { + GString *string; + gboolean ok; + + string = g_string_new (NULL); + empathy_string_parser_substr (tests[i], -1, parsers, string); + + ok = !tp_strdiff (tests[i + 1], string->str); + DEBUG ("'%s' => '%s': %s", tests[i], string->str, ok ? "OK" : "FAILED"); + if (!ok) + failed = TRUE; + + g_string_free (string, TRUE); + } + + g_assert (!failed); +} + +int +main (int argc, + char **argv) +{ + int result; + + test_init (argc, argv); + + g_test_add_func ("/parsers", test_parsers); + + result = g_test_run (); + test_deinit (); + + return result; +} diff --git a/tests/test-helper.c b/tests/test-helper.c index 8b6cc2937..d51d22a52 100644 --- a/tests/test-helper.c +++ b/tests/test-helper.c @@ -20,6 +20,9 @@ #include <stdlib.h> #include <glib.h> #include <glib-object.h> +#include <gtk/gtk.h> + +#include <libempathy-gtk/empathy-ui-utils.h> #include "test-helper.h" @@ -28,7 +31,8 @@ test_init (int argc, char **argv) { g_test_init (&argc, &argv, NULL); - g_type_init (); + gtk_init (&argc, &argv); + empathy_gtk_init (); } void |