Mercurial > pidgin
changeset 27818:6ef1f49d6b6c
merge of '4687f2ad1aa97d621e389533af53704e6066f35a'
and 'de6bbf227459900b7451907360f092dfb33df8d6'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 04 Aug 2009 03:52:57 +0000 (2009-08-04) |
| parents | bf7039a638b7 (current diff) 1e02e65ce301 (diff) |
| children | 2d7931a8ee84 769142e728ec |
| files | |
| diffstat | 10 files changed, 1403 insertions(+), 1307 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Aug 04 03:51:30 2009 +0000 +++ b/ChangeLog Tue Aug 04 03:52:57 2009 +0000 @@ -175,6 +175,9 @@ conversation window is now linked to the file. * Fix a crash when closing a conversation tab that has unread messages when the Message Notification plugin is loaded. + * Fix a crash when closing the New Mail dialog if an account with new + mail was previously disconnected while the dialog was open. + * Fix incorrect unread message counts for the new mail notifications. Finch: * The hardware cursor is updated correctly. This will be useful
--- a/finch/gntblist.c Tue Aug 04 03:51:30 2009 +0000 +++ b/finch/gntblist.c Tue Aug 04 03:52:57 2009 +0000 @@ -589,6 +589,16 @@ ggblist->manager = &default_manager; } +static void destroy_list(PurpleBuddyList *list) +{ + if (ggblist == NULL) + return; + + gnt_widget_destroy(ggblist->window); + g_free(ggblist); + ggblist = NULL; +} + static gboolean remove_new_empty_group(gpointer data) { @@ -849,7 +859,7 @@ blist_show, node_update, node_remove, - NULL, + destroy_list, NULL, finch_request_add_buddy, finch_request_add_chat, @@ -3184,12 +3194,6 @@ void finch_blist_uninit() { - if (ggblist == NULL) - return; - - gnt_widget_destroy(ggblist->window); - g_free(ggblist); - ggblist = NULL; } gboolean finch_blist_get_position(int *x, int *y)
--- a/libpurple/connection.c Tue Aug 04 03:51:30 2009 +0000 +++ b/libpurple/connection.c Tue Aug 04 03:52:57 2009 +0000 @@ -578,6 +578,9 @@ gc->wants_to_die = purple_connection_error_is_fatal (reason); + purple_debug_info("connection", "Connection error on %p (reason: %u description: %s)\n", + gc, reason, description); + ops = purple_connections_get_ui_ops(); if (ops != NULL)
--- a/libpurple/protocols/yahoo/util.c Tue Aug 04 03:51:30 2009 +0000 +++ b/libpurple/protocols/yahoo/util.c Tue Aug 04 03:52:57 2009 +0000 @@ -184,148 +184,165 @@ } /* + * The values in this hash table should probably be lowercase, since that's + * what xhtml expects. Also because yahoo_codes_to_html() does + * case-sensitive comparisons. + * * I found these on some website but i don't know that they actually * work (or are supposed to work). I didn't implement them yet. * - * [0;30m ---black - * [1;37m ---white - * [0;37m ---tan - * [0;38m ---light black - * [1;39m ---dark blue - * [0;32m ---green - * [0;33m ---yellow - * [0;35m ---pink - * [1;35m ---purple - * [1;30m ---light blue - * [0;31m ---red - * [0;34m ---blue - * [0;36m ---aqua - * (shift+comma)lyellow(shift+period) ---light yellow - * (shift+comma)lgreen(shift+period) ---light green -[2;30m <--white out -*/ + * [0;30m ---black + * [1;37m ---white + * [0;37m ---tan + * [0;38m ---light black + * [1;39m ---dark blue + * [0;32m ---green + * [0;33m ---yellow + * [0;35m ---pink + * [1;35m ---purple + * [1;30m ---light blue + * [0;31m ---red + * [0;34m ---blue + * [0;36m ---aqua + * (shift+comma)lyellow(shift+period) ---light yellow + * (shift+comma)lgreen(shift+period) ---light green + * [2;30m <--white out + */ -static GHashTable *ht = NULL; +static GHashTable *esc_codes_ht = NULL; +static GHashTable *tags_ht = NULL; void yahoo_init_colorht() { - if (ht != NULL) + if (esc_codes_ht != NULL) /* Hash table has already been initialized */ return; - ht = g_hash_table_new(g_str_hash, g_str_equal); + /* Key is the escape code string. Value is the HTML that should be + * inserted in place of the escape code. */ + esc_codes_ht = g_hash_table_new(g_str_hash, g_str_equal); + + /* Key is the name of the HTML tag, for example "font" or "/font" + * value is the HTML that should be inserted in place of the old tag */ + tags_ht = g_hash_table_new(g_str_hash, g_str_equal); + /* the numbers in comments are what gyach uses, but i think they're incorrect */ #ifdef USE_CSS_FORMATTING - g_hash_table_insert(ht, "30", "<span style=\"color: #000000\">"); /* black */ - g_hash_table_insert(ht, "31", "<span style=\"color: #0000FF\">"); /* blue */ - g_hash_table_insert(ht, "32", "<span style=\"color: #008080\">"); /* cyan */ /* 00b2b2 */ - g_hash_table_insert(ht, "33", "<span style=\"color: #808080\">"); /* gray */ /* 808080 */ - g_hash_table_insert(ht, "34", "<span style=\"color: #008000\">"); /* green */ /* 00c200 */ - g_hash_table_insert(ht, "35", "<span style=\"color: #FF0080\">"); /* pink */ /* ffafaf */ - g_hash_table_insert(ht, "36", "<span style=\"color: #800080\">"); /* purple */ /* b200b2 */ - g_hash_table_insert(ht, "37", "<span style=\"color: #FF8000\">"); /* orange */ /* ffff00 */ - g_hash_table_insert(ht, "38", "<span style=\"color: #FF0000\">"); /* red */ - g_hash_table_insert(ht, "39", "<span style=\"color: #808000\">"); /* olive */ /* 546b50 */ + g_hash_table_insert(esc_codes_ht, "30", "<span style=\"color: #000000\">"); /* black */ + g_hash_table_insert(esc_codes_ht, "31", "<span style=\"color: #0000FF\">"); /* blue */ + g_hash_table_insert(esc_codes_ht, "32", "<span style=\"color: #008080\">"); /* cyan */ /* 00b2b2 */ + g_hash_table_insert(esc_codes_ht, "33", "<span style=\"color: #808080\">"); /* gray */ /* 808080 */ + g_hash_table_insert(esc_codes_ht, "34", "<span style=\"color: #008000\">"); /* green */ /* 00c200 */ + g_hash_table_insert(esc_codes_ht, "35", "<span style=\"color: #FF0080\">"); /* pink */ /* ffafaf */ + g_hash_table_insert(esc_codes_ht, "36", "<span style=\"color: #800080\">"); /* purple */ /* b200b2 */ + g_hash_table_insert(esc_codes_ht, "37", "<span style=\"color: #FF8000\">"); /* orange */ /* ffff00 */ + g_hash_table_insert(esc_codes_ht, "38", "<span style=\"color: #FF0000\">"); /* red */ + g_hash_table_insert(esc_codes_ht, "39", "<span style=\"color: #808000\">"); /* olive */ /* 546b50 */ #else - g_hash_table_insert(ht, "30", "<font color=\"#000000\">"); /* black */ - g_hash_table_insert(ht, "31", "<font color=\"#0000FF\">"); /* blue */ - g_hash_table_insert(ht, "32", "<font color=\"#008080\">"); /* cyan */ /* 00b2b2 */ - g_hash_table_insert(ht, "33", "<font color=\"#808080\">"); /* gray */ /* 808080 */ - g_hash_table_insert(ht, "34", "<font color=\"#008000\">"); /* green */ /* 00c200 */ - g_hash_table_insert(ht, "35", "<font color=\"#FF0080\">"); /* pink */ /* ffafaf */ - g_hash_table_insert(ht, "36", "<font color=\"#800080\">"); /* purple */ /* b200b2 */ - g_hash_table_insert(ht, "37", "<font color=\"#FF8000\">"); /* orange */ /* ffff00 */ - g_hash_table_insert(ht, "38", "<font color=\"#FF0000\">"); /* red */ - g_hash_table_insert(ht, "39", "<font color=\"#808000\">"); /* olive */ /* 546b50 */ + g_hash_table_insert(esc_codes_ht, "30", "<font color=\"#000000\">"); /* black */ + g_hash_table_insert(esc_codes_ht, "31", "<font color=\"#0000FF\">"); /* blue */ + g_hash_table_insert(esc_codes_ht, "32", "<font color=\"#008080\">"); /* cyan */ /* 00b2b2 */ + g_hash_table_insert(esc_codes_ht, "33", "<font color=\"#808080\">"); /* gray */ /* 808080 */ + g_hash_table_insert(esc_codes_ht, "34", "<font color=\"#008000\">"); /* green */ /* 00c200 */ + g_hash_table_insert(esc_codes_ht, "35", "<font color=\"#FF0080\">"); /* pink */ /* ffafaf */ + g_hash_table_insert(esc_codes_ht, "36", "<font color=\"#800080\">"); /* purple */ /* b200b2 */ + g_hash_table_insert(esc_codes_ht, "37", "<font color=\"#FF8000\">"); /* orange */ /* ffff00 */ + g_hash_table_insert(esc_codes_ht, "38", "<font color=\"#FF0000\">"); /* red */ + g_hash_table_insert(esc_codes_ht, "39", "<font color=\"#808000\">"); /* olive */ /* 546b50 */ #endif /* !USE_CSS_FORMATTING */ - g_hash_table_insert(ht, "1", "<b>"); - g_hash_table_insert(ht, "x1", "</b>"); - g_hash_table_insert(ht, "2", "<i>"); - g_hash_table_insert(ht, "x2", "</i>"); - g_hash_table_insert(ht, "4", "<u>"); - g_hash_table_insert(ht, "x4", "</u>"); + g_hash_table_insert(esc_codes_ht, "1", "<b>"); + g_hash_table_insert(esc_codes_ht, "x1", "</b>"); + g_hash_table_insert(esc_codes_ht, "2", "<i>"); + g_hash_table_insert(esc_codes_ht, "x2", "</i>"); + g_hash_table_insert(esc_codes_ht, "4", "<u>"); + g_hash_table_insert(esc_codes_ht, "x4", "</u>"); /* these just tell us the text they surround is supposed * to be a link. purple figures that out on its own so we * just ignore it. */ - g_hash_table_insert(ht, "l", ""); /* link start */ - g_hash_table_insert(ht, "xl", ""); /* link end */ + g_hash_table_insert(esc_codes_ht, "l", ""); /* link start */ + g_hash_table_insert(esc_codes_ht, "xl", ""); /* link end */ #ifdef USE_CSS_FORMATTING - g_hash_table_insert(ht, "<black>", "<span style=\"color: #000000\">"); - g_hash_table_insert(ht, "<blue>", "<span style=\"color: #0000FF\">"); - g_hash_table_insert(ht, "<cyan>", "<span style=\"color: #008284\">"); - g_hash_table_insert(ht, "<gray>", "<span style=\"color: #848284\">"); - g_hash_table_insert(ht, "<green>", "<span style=\"color: #008200\">"); - g_hash_table_insert(ht, "<pink>", "<span style=\"color: #FF0084\">"); - g_hash_table_insert(ht, "<purple>", "<span style=\"color: #840084\">"); - g_hash_table_insert(ht, "<orange>", "<span style=\"color: #FF8000\">"); - g_hash_table_insert(ht, "<red>", "<span style=\"color: #FF0000\">"); - g_hash_table_insert(ht, "<yellow>", "<span style=\"color: #848200\">"); + g_hash_table_insert(tags_ht, "black", "<span style=\"color: #000000\">"); + g_hash_table_insert(tags_ht, "blue", "<span style=\"color: #0000FF\">"); + g_hash_table_insert(tags_ht, "cyan", "<span style=\"color: #008284\">"); + g_hash_table_insert(tags_ht, "gray", "<span style=\"color: #848284\">"); + g_hash_table_insert(tags_ht, "green", "<span style=\"color: #008200\">"); + g_hash_table_insert(tags_ht, "pink", "<span style=\"color: #FF0084\">"); + g_hash_table_insert(tags_ht, "purple", "<span style=\"color: #840084\">"); + g_hash_table_insert(tags_ht, "orange", "<span style=\"color: #FF8000\">"); + g_hash_table_insert(tags_ht, "red", "<span style=\"color: #FF0000\">"); + g_hash_table_insert(tags_ht, "yellow", "<span style=\"color: #848200\">"); - g_hash_table_insert(ht, "</black>", "</span>"); - g_hash_table_insert(ht, "</blue>", "</span>"); - g_hash_table_insert(ht, "</cyan>", "</span>"); - g_hash_table_insert(ht, "</gray>", "</span>"); - g_hash_table_insert(ht, "</green>", "</span>"); - g_hash_table_insert(ht, "</pink>", "</span>"); - g_hash_table_insert(ht, "</purple>", "</span>"); - g_hash_table_insert(ht, "</orange>", "</span>"); - g_hash_table_insert(ht, "</red>", "</span>"); - g_hash_table_insert(ht, "</yellow>", "</span>"); + g_hash_table_insert(tags_ht, "/black", "</span>"); + g_hash_table_insert(tags_ht, "/blue", "</span>"); + g_hash_table_insert(tags_ht, "/cyan", "</span>"); + g_hash_table_insert(tags_ht, "/gray", "</span>"); + g_hash_table_insert(tags_ht, "/green", "</span>"); + g_hash_table_insert(tags_ht, "/pink", "</span>"); + g_hash_table_insert(tags_ht, "/purple", "</span>"); + g_hash_table_insert(tags_ht, "/orange", "</span>"); + g_hash_table_insert(tags_ht, "/red", "</span>"); + g_hash_table_insert(tags_ht, "/yellow", "</span>"); #else - g_hash_table_insert(ht, "<black>", "<font color=\"#000000\">"); - g_hash_table_insert(ht, "<blue>", "<font color=\"#0000FF\">"); - g_hash_table_insert(ht, "<cyan>", "<font color=\"#008284\">"); - g_hash_table_insert(ht, "<gray>", "<font color=\"#848284\">"); - g_hash_table_insert(ht, "<green>", "<font color=\"#008200\">"); - g_hash_table_insert(ht, "<pink>", "<font color=\"#FF0084\">"); - g_hash_table_insert(ht, "<purple>", "<font color=\"#840084\">"); - g_hash_table_insert(ht, "<orange>", "<font color=\"#FF8000\">"); - g_hash_table_insert(ht, "<red>", "<font color=\"#FF0000\">"); - g_hash_table_insert(ht, "<yellow>", "<font color=\"#848200\">"); + g_hash_table_insert(tags_ht, "black", "<font color=\"#000000\">"); + g_hash_table_insert(tags_ht, "blue", "<font color=\"#0000FF\">"); + g_hash_table_insert(tags_ht, "cyan", "<font color=\"#008284\">"); + g_hash_table_insert(tags_ht, "gray", "<font color=\"#848284\">"); + g_hash_table_insert(tags_ht, "green", "<font color=\"#008200\">"); + g_hash_table_insert(tags_ht, "pink", "<font color=\"#FF0084\">"); + g_hash_table_insert(tags_ht, "purple", "<font color=\"#840084\">"); + g_hash_table_insert(tags_ht, "orange", "<font color=\"#FF8000\">"); + g_hash_table_insert(tags_ht, "red", "<font color=\"#FF0000\">"); + g_hash_table_insert(tags_ht, "yellow", "<font color=\"#848200\">"); - g_hash_table_insert(ht, "</black>", "</font>"); - g_hash_table_insert(ht, "</blue>", "</font>"); - g_hash_table_insert(ht, "</cyan>", "</font>"); - g_hash_table_insert(ht, "</gray>", "</font>"); - g_hash_table_insert(ht, "</green>", "</font>"); - g_hash_table_insert(ht, "</pink>", "</font>"); - g_hash_table_insert(ht, "</purple>", "</font>"); - g_hash_table_insert(ht, "</orange>", "</font>"); - g_hash_table_insert(ht, "</red>", "</font>"); - g_hash_table_insert(ht, "</yellow>", "</font>"); + g_hash_table_insert(tags_ht, "/black", "</font>"); + g_hash_table_insert(tags_ht, "/blue", "</font>"); + g_hash_table_insert(tags_ht, "/cyan", "</font>"); + g_hash_table_insert(tags_ht, "/gray", "</font>"); + g_hash_table_insert(tags_ht, "/green", "</font>"); + g_hash_table_insert(tags_ht, "/pink", "</font>"); + g_hash_table_insert(tags_ht, "/purple", "</font>"); + g_hash_table_insert(tags_ht, "/orange", "</font>"); + g_hash_table_insert(tags_ht, "/red", "</font>"); + g_hash_table_insert(tags_ht, "/yellow", "</font>"); #endif /* !USE_CSS_FORMATTING */ - /* remove these once we have proper support for <FADE> and <ALT> */ - g_hash_table_insert(ht, "</fade>", ""); - g_hash_table_insert(ht, "</alt>", ""); + /* We don't support these tags, so discard them */ + g_hash_table_insert(tags_ht, "alt", ""); + g_hash_table_insert(tags_ht, "fade", ""); + g_hash_table_insert(tags_ht, "snd", ""); + g_hash_table_insert(tags_ht, "/alt", ""); + g_hash_table_insert(tags_ht, "/fade", ""); - /* these are the normal html yahoo sends (besides <font>). - * anything else will get turned into <tag>, so if I forgot - * about something, please add it. Why Yahoo! has to send unescaped - * <'s and >'s that aren't supposed to be html is beyond me. - */ - g_hash_table_insert(ht, "<b>", "<b>"); - g_hash_table_insert(ht, "<i>", "<i>"); - g_hash_table_insert(ht, "<u>", "<u>"); + /* Official clients don't seem to send b, i or u tags. They use + * the escape codes listed above. Official clients definitely send + * font tags, though. I wonder if we can remove the opening and + * closing b, i and u tags from here? */ + g_hash_table_insert(tags_ht, "b", "<b>"); + g_hash_table_insert(tags_ht, "i", "<i>"); + g_hash_table_insert(tags_ht, "u", "<u>"); + g_hash_table_insert(tags_ht, "font", "<font>"); - g_hash_table_insert(ht, "</b>", "</b>"); - g_hash_table_insert(ht, "</i>", "</i>"); - g_hash_table_insert(ht, "</u>", "</u>"); - g_hash_table_insert(ht, "</font>", "</font>"); + g_hash_table_insert(tags_ht, "/b", "</b>"); + g_hash_table_insert(tags_ht, "/i", "</i>"); + g_hash_table_insert(tags_ht, "/u", "</u>"); + g_hash_table_insert(tags_ht, "/font", "</font>"); } void yahoo_dest_colorht() { - if (ht == NULL) + if (esc_codes_ht == NULL) /* Hash table has already been destroyed */ return; - g_hash_table_destroy(ht); - ht = NULL; + g_hash_table_destroy(esc_codes_ht); + esc_codes_ht = NULL; + g_hash_table_destroy(tags_ht); + tags_ht = NULL; } #ifndef USE_CSS_FORMATTING @@ -347,60 +364,161 @@ } #endif /* !USE_CSS_FORMATTING */ -/* - * The Yahoo font size value is given in pt, even thougth the HTML - * standard for <font size="x"> treats the size as a number on a - * scale between 1 and 7. Let's get rid of this shoddyness and - * convert it to CSS. - */ -static void _font_tags_fix_size(const char *tag, GString *dest) +static void append_attrs_datalist_foreach_cb(GQuark key_id, gpointer data, gpointer user_data) { - char *x, *end; - int size; + const char *key; + const char *value; + xmlnode *cur; + + key = g_quark_to_string(key_id); + value = data; + cur = user_data; + + xmlnode_set_attrib(cur, key, value); +} - if (((x = strstr(tag, "size"))) && ((x = strchr(x, '=')))) { - while (*x && !g_ascii_isdigit(*x)) - x++; - if (*x) { -#ifndef USE_CSS_FORMATTING - int htmlsize; -#endif /* !USE_CSS_FORMATTING */ - - size = strtol(x, &end, 10); +/** + * @param cur A pointer to the position in the XML tree that we're + * currently building. This will be modified when opening a tag + * or closing an existing tag. + */ +static void yahoo_codes_to_html_add_tag(xmlnode **cur, const char *tag, gboolean is_closing_tag, const gchar *tag_name, gboolean is_font_tag) +{ + if (is_closing_tag) { + xmlnode *tmp; + GSList *dangling_tags = NULL; -#ifdef USE_CSS_FORMATTING - g_string_append_len(dest, tag, x - tag - 7); - g_string_append(dest, end + 1); - g_string_append_printf(dest, "<span style=\"font-size: %dpt\">", size); -#else - htmlsize = point_to_html(size); - g_string_append_len(dest, tag, x - tag); - g_string_append_printf(dest, "%d", htmlsize); - g_string_append_printf(dest, "\" absz=\"%d", size); - g_string_append(dest, end); -#endif /* !USE_CSS_FORMATTING */ - } else { - g_string_append(dest, tag); + /* Move up the DOM until we find the opening tag */ + for (tmp = *cur; tmp != NULL; tmp = xmlnode_get_parent(tmp)) { + /* Add one to tag_name when doing this comparison because it starts with a / */ + if (g_str_equal(tmp->name, tag_name + 1)) + /* Found */ + break; + dangling_tags = g_slist_prepend(dangling_tags, tmp); + } + if (tmp == NULL) { + /* This is a closing tag with no opening tag. Useless. */ + purple_debug_error("yahoo", "Ignoring unmatched tag %s", tag); + g_slist_free(dangling_tags); return; } + + /* Move our current position up, now that we've closed a tag */ + *cur = xmlnode_get_parent(tmp); + + /* Re-open any tags that were nested below the tag we just closed */ + while (dangling_tags != NULL) { + tmp = dangling_tags->data; + dangling_tags = g_slist_delete_link(dangling_tags, dangling_tags); + + /* Create a copy of this tag+attributes (but not child tags or + * data) at our new location */ + *cur = xmlnode_new_child(*cur, tmp->name); + for (tmp = tmp->child; tmp != NULL; tmp = tmp->next) + if (tmp->type == XMLNODE_TYPE_ATTRIB) + xmlnode_set_attrib_full(*cur, tmp->name, + tmp->xmlns, tmp->prefix, tmp->data); + } } else { - g_string_append(dest, tag); - return; + const char *start; + const char *end; + GData *attributes; + char *fontsize = NULL; + + purple_markup_find_tag(tag_name, tag, &start, &end, &attributes); + *cur = xmlnode_new_child(*cur, tag_name); + + if (is_font_tag) { + /* Special case for the font size attribute */ + fontsize = g_strdup(g_datalist_get_data(&attributes, "size")); + if (fontsize != NULL) + g_datalist_remove_data(&attributes, "size"); + } + + /* Add all font tag attributes */ + g_datalist_foreach(&attributes, append_attrs_datalist_foreach_cb, *cur); + g_datalist_clear(&attributes); + + if (fontsize != NULL) { +#ifdef USE_CSS_FORMATTING + /* + * The Yahoo font size value is given in pt, even though the HTML + * standard for <font size="x"> treats the size as a number on a + * scale between 1 and 7. So we insert the font size as a CSS + * style on a span tag. + */ + gchar *tmp = g_strdup_printf("font-size: %spt", fontsize); + *cur = xmlnode_new_child(*cur, "span"); + xmlnode_set_attrib(*cur, "style", tmp); + g_free(tmp); +#else + /* + * The Yahoo font size value is given in pt, even though the HTML + * standard for <font size="x"> treats the size as a number on a + * scale between 1 and 7. So we convert it to an appropriate + * value. This loses precision, which is why CSS formatting is + * preferred. The "absz" attribute remains here for backward + * compatibility with UIs that might use it, but it is totally + * not standard at all. + */ + int size, htmlsize; + gchar tmp[11]; + size = strtol(fontsize, NULL, 10); + htmlsize = point_to_html(size); + sprintf(tmp, "%u", htmlsize); + xmlnode_set_attrib(*cur, "size", tmp); + xmlnode_set_attrib(*cur, "absz", fontsize); +#endif /* !USE_CSS_FORMATTING */ + g_free(fontsize); + } } } +/** + * Similar to purple_markup_get_tag_name(), but works with closing tags. + * + * @return The lowercase name of the tag. If this is a closing tag then + * this value starts with a forward slash. The caller must free + * this string with g_free. + */ +static gchar *yahoo_markup_get_tag_name(const char *tag, gboolean *is_closing_tag) +{ + size_t len; + + *is_closing_tag = (tag[1] == '/'); + if (*is_closing_tag) + len = strcspn(tag + 1, "> "); + else + len = strcspn(tag + 1, "> /"); + + return g_utf8_strdown(tag + 1, len); +} + +/* + * Yahoo! messages generally aren't well-formed. Their markup is + * more of a flow from start to finish rather than a hierarchy from + * outer to inner. They tend to open tags and close them only when + * necessary. + * + * Example: <font size="8">size 8 <font size="16">size 16 <font size="8">size 8 again + * + * But we want to send well-formed HTML to the core, so we step through + * the input string and build an xmlnode tree containing sanitized HTML. + */ char *yahoo_codes_to_html(const char *x) { size_t x_len; - GString *s; + xmlnode *html, *cur; + GString *cdata = g_string_new(NULL); int i, j; - gchar *tmp; gboolean no_more_gt_brackets = FALSE; const char *match; + gchar *xmlstr1, *xmlstr2; x_len = strlen(x); - s = g_string_sized_new(x_len); + html = xmlnode_new("html"); + cur = html; for (i = 0; i < x_len; i++) { if ((x[i] == 0x1b) && (x[i+1] == '[')) { /* This escape sequence signifies the beginning of some @@ -408,90 +526,129 @@ j = i + 1; while (j++ < x_len) { + gchar *code; + if (x[j] != 'm') + /* Keep looking for the end of this sequence */ continue; - else { - /* We've reached the end of the formatting code, yay */ - tmp = g_strndup(x + i + 2, j - i - 2); - if (tmp[0] == '#') + + /* We've reached the end of the formatting sequence, yay */ + + /* Append any character data that belongs in the current node */ + if (cdata->len > 0) { + xmlnode_insert_data(cur, cdata->str, cdata->len); + g_string_truncate(cdata, 0); + } + + code = g_strndup(x + i + 2, j - i - 2); + if (code[0] == '#') { #ifdef USE_CSS_FORMATTING - g_string_append_printf(s, "<span style=\"color: %s\">", tmp); + gchar *tmp = g_strdup_printf("color: %s", code); + cur = xmlnode_new_child(cur, "span"); + xmlnode_set_attrib(cur, "style", tmp); + g_free(tmp); #else - g_string_append_printf(s, "<font color=\"%s\">", tmp); + cur = xmlnode_new_child(cur, "font"); + xmlnode_set_attrib(cur, "color", code); #endif /* !USE_CSS_FORMATTING */ - else if ((match = g_hash_table_lookup(ht, tmp))) - g_string_append(s, match); - else { - purple_debug_error("yahoo", - "Unknown ansi code 'ESC[%sm'.\n", tmp); - g_free(tmp); - break; - } + + } else if ((match = g_hash_table_lookup(esc_codes_ht, code))) { + gboolean is_closing_tag; + gchar *tag_name; + + tag_name = yahoo_markup_get_tag_name(match, &is_closing_tag); + yahoo_codes_to_html_add_tag(&cur, match, is_closing_tag, tag_name, FALSE); + g_free(tag_name); - i = j; - g_free(tmp); - break; + } else { + purple_debug_error("yahoo", + "Ignoring unknown ansi code 'ESC[%sm'.\n", code); } + + g_free(code); + i = j; + break; } - } else if (!no_more_gt_brackets && (x[i] == '<')) { + } else if (x[i] == '<' && !no_more_gt_brackets) { /* The start of an HTML tag */ j = i; while (j++ < x_len) { - if (x[j] != '>') - if (j == x_len) { - g_string_append(s, "<"); - no_more_gt_brackets = TRUE; - } - else + gchar *tag; + gboolean is_closing_tag; + gchar *tag_name; + + if (x[j] != '>') { + if (j != x_len) + /* Keep looking for the end of this tag */ + /* TODO: Should maybe use purple_markup_find_tag() + * for this... what happens if there is a > inside + * a quoted attribute. */ continue; - else { - tmp = g_strndup(x + i, j - i + 1); - g_ascii_strdown(tmp, -1); - if ((match = g_hash_table_lookup(ht, tmp))) - g_string_append(s, match); - else if (!strncmp(tmp, "<fade ", 6) || - !strncmp(tmp, "<alt ", 5) || - !strncmp(tmp, "<snd ", 5)) { - - /* remove this if gtkimhtml ever supports any of these */ - i = j; - g_free(tmp); - break; + /* This < has no corresponding > */ + g_string_append_c(cdata, x[i]); + no_more_gt_brackets = TRUE; + break; + } - } else if (!strncmp(tmp, "<font ", 6)) { - _font_tags_fix_size(tmp, s); - } else { - g_string_append(s, "<"); - g_free(tmp); - break; - } + tag = g_strndup(x + i, j - i + 1); + tag_name = yahoo_markup_get_tag_name(tag, &is_closing_tag); - i = j; - g_free(tmp); + match = g_hash_table_lookup(tags_ht, tag_name); + if (match == NULL) { + /* Unknown tag. The user probably typed a less-than sign */ + g_string_append_c(cdata, x[i]); + no_more_gt_brackets = TRUE; + g_free(tag); + g_free(tag_name); break; } + /* Some tags are in the hash table only because we + * want to ignore them */ + if (match[0] != '\0') { + /* Append any character data that belongs in the current node */ + if (cdata->len > 0) { + xmlnode_insert_data(cur, cdata->str, cdata->len); + g_string_truncate(cdata, 0); + } + if (g_str_equal(tag_name, "font")) + /* Font tags are a special case. We don't + * necessarily want to replace the whole thing-- + * we just want to fix the size attribute. */ + yahoo_codes_to_html_add_tag(&cur, tag, is_closing_tag, tag_name, TRUE); + else + yahoo_codes_to_html_add_tag(&cur, match, is_closing_tag, tag_name, FALSE); + } + + i = j; + g_free(tag); + g_free(tag_name); + break; } } else { - if (x[i] == '<') - g_string_append(s, "<"); - else if (x[i] == '>') - g_string_append(s, ">"); - else if (x[i] == '&') - g_string_append(s, "&"); - else if (x[i] == '"') - g_string_append(s, """); - else - g_string_append_c(s, x[i]); + g_string_append_c(cdata, x[i]); } } - purple_debug_misc("yahoo", "yahoo_codes_to_html: Returning string: '%s'.\n", s->str); - return g_string_free(s, FALSE); + /* Append any remaining character data */ + if (cdata->len > 0) + xmlnode_insert_data(cur, cdata->str, cdata->len); + g_string_free(cdata, TRUE); + + /* Serialize our HTML */ + xmlstr1 = xmlnode_to_str(html, NULL); + xmlnode_free(html); + + /* Strip off the outter HTML node */ + xmlstr2 = g_strndup(xmlstr1 + 6, strlen(xmlstr1) - 13); + g_free(xmlstr1); + + purple_debug_misc("yahoo", "yahoo_codes_to_html: Returning string: '%s'.\n", xmlstr2); + return xmlstr2; } /* borrowed from gtkimhtml */
--- a/libpurple/tests/test_yahoo_util.c Tue Aug 04 03:51:30 2009 +0000 +++ b/libpurple/tests/test_yahoo_util.c Tue Aug 04 03:52:57 2009 +0000 @@ -17,49 +17,81 @@ { assert_string_equal_free("plain", yahoo_codes_to_html("plain")); + assert_string_equal_free("unknown ansi code", + yahoo_codes_to_html("unknown \x1B[12345m ansi code")); + assert_string_equal_free("plain <peanut>", + yahoo_codes_to_html("plain <peanut>")); + assert_string_equal_free("plain <peanut", + yahoo_codes_to_html("plain <peanut")); + assert_string_equal_free("plain> peanut", + yahoo_codes_to_html("plain> peanut")); /* bold/italic/underline */ - assert_string_equal_free("<b>bold", + assert_string_equal_free("<b>bold</b>", yahoo_codes_to_html("\x1B[1mbold")); - assert_string_equal_free("<i>italic", + assert_string_equal_free("<i>italic</i>", yahoo_codes_to_html("\x1B[2mitalic")); - assert_string_equal_free("<u>underline", + assert_string_equal_free("<u>underline</u>", yahoo_codes_to_html("\x1B[4munderline")); - assert_string_equal_free("<b>bold</b> <i>italic</i> <u>underline", + assert_string_equal_free("no markup", + yahoo_codes_to_html("no\x1B[x4m markup")); + assert_string_equal_free("<b>bold</b> <i>italic</i> <u>underline</u>", yahoo_codes_to_html("\x1B[1mbold\x1B[x1m \x1B[2mitalic\x1B[x2m \x1B[4munderline")); + assert_string_equal_free("<b>bold <i>bolditalic</i></b><i> italic</i>", + yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic\x1B[x1m italic")); + assert_string_equal_free("<b>bold <i>bolditalic</i></b><i> <u>italicunderline</u></i>", + yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic\x1B[x1m \x1B[4mitalicunderline")); + assert_string_equal_free("<b>bold <i>bolditalic <u>bolditalicunderline</u></i><u> boldunderline</u></b>", + yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic \x1B[4mbolditalicunderline\x1B[x2m boldunderline")); + assert_string_equal_free("<b>bold <i>bolditalic <u>bolditalicunderline</u></i></b><i><u> italicunderline</u></i>", + yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic \x1B[4mbolditalicunderline\x1B[x1m italicunderline")); #ifdef USE_CSS_FORMATTING /* font color */ - assert_string_equal_free("<span style=\"color: #0000FF\">blue", + assert_string_equal_free("<span style='color: #0000FF'>blue</span>", yahoo_codes_to_html("\x1B[31mblue")); - assert_string_equal_free("<span style=\"color: #70ea15\">custom color", + assert_string_equal_free("<span style='color: #70ea15'>custom color</span>", yahoo_codes_to_html("\x1B[#70ea15mcustom color")); + /* font face */ + assert_string_equal_free("<font face='Georgia'>test</font>", + yahoo_codes_to_html("<font face='Georgia'>test</font>")); + /* font size */ - assert_string_equal_free("<font><span style=\"font-size: 15pt\">test", - yahoo_codes_to_html("<font size=\"15\">test")); - assert_string_equal_free("<font><span style=\"font-size: 32pt\">size 32", - yahoo_codes_to_html("<font size=\"32\">size 32")); + assert_string_equal_free("<font><span style='font-size: 15pt'>test</span></font>", + yahoo_codes_to_html("<font size='15'>test")); + assert_string_equal_free("<font><span style='font-size: 32pt'>size 32</span></font>", + yahoo_codes_to_html("<font size='32'>size 32")); /* combinations */ - assert_string_equal_free("<span style=\"color: #FF0080\"><font><span style=\"font-size: 15pt\">test", - yahoo_codes_to_html("\x1B[35m<font size=\"15\">test")); + assert_string_equal_free("<font face='Georgia'><span style='font-size: 32pt'>test</span></font>", + yahoo_codes_to_html("<font face='Georgia' size='32'>test")); + assert_string_equal_free("<span style='color: #FF0080'><font><span style='font-size: 15pt'>test</span></font></span>", + yahoo_codes_to_html("\x1B[35m<font size='15'>test")); #else /* font color */ - assert_string_equal_free("<font color=\"#0000FF\">blue", + assert_string_equal_free("<font color='#0000FF'>blue</font>", yahoo_codes_to_html("\x1B[31mblue")); - assert_string_equal_free("<font color=\"#70ea15\">custom color", + assert_string_equal_free("<font color='#70ea15'>custom color</font>", yahoo_codes_to_html("\x1B[#70ea15mcustom color")); + assert_string_equal_free("test", + yahoo_codes_to_html("<ALT #ff0000,#00ff00,#0000ff>test</ALT>")); + + /* font face */ + assert_string_equal_free("<font face='Georgia'>test</font>", + yahoo_codes_to_html("<font face='Georgia'>test")); /* font size */ - assert_string_equal_free("<font size=\"4\" absz=\"15\">test", - yahoo_codes_to_html("<font size=\"15\">test")); - assert_string_equal_free("<font size=\"6\" absz=\"32\">size 32", - yahoo_codes_to_html("<font size=\"32\">size 32")); + assert_string_equal_free("<font size='4' absz='15'>test</font>", + yahoo_codes_to_html("<font size='15'>test")); + assert_string_equal_free("<font size='6' absz='32'>size 32</font>", + yahoo_codes_to_html("<font size='32'>size 32")); /* combinations */ - assert_string_equal_free("<font color=\"#FF0080\"><font size=\"4\" absz=\"15\">test", - yahoo_codes_to_html("\x1B[35m<font size=\"15\">test")); + assert_string_equal_free("<font face='Georgia' size='6' absz='32'>test</font>", + yahoo_codes_to_html("<font face='Georgia' size='32'>test")); + assert_string_equal_free("<font color='#FF0080'><font size='4' absz='15'>test</font></font>", + yahoo_codes_to_html("\x1B[35m<font size='15'>test")); #endif /* !USE_CSS_FORMATTING */ } END_TEST
--- a/libpurple/xmlnode.h Tue Aug 04 03:51:30 2009 +0000 +++ b/libpurple/xmlnode.h Tue Aug 04 03:52:57 2009 +0000 @@ -53,10 +53,10 @@ XMLNodeType type; /**< The type of the node. */ char *data; /**< The data for the node. */ size_t data_sz; /**< The size of the data. */ - struct _xmlnode *parent; /**< The parent node or @c NULL.*/ - struct _xmlnode *child; /**< The child node or @c NULL.*/ - struct _xmlnode *lastchild; /**< The last child node or @c NULL.*/ - struct _xmlnode *next; /**< The next node or @c NULL. */ + xmlnode *parent; /**< The parent node or @c NULL.*/ + xmlnode *child; /**< The child node or @c NULL.*/ + xmlnode *lastchild; /**< The last child node or @c NULL.*/ + xmlnode *next; /**< The next node or @c NULL. */ char *prefix; /**< The namespace prefix if any. */ GHashTable *namespace_map; /**< The namespace map. */ };
--- a/pidgin/gtkstatusbox.c Tue Aug 04 03:51:30 2009 +0000 +++ b/pidgin/gtkstatusbox.c Tue Aug 04 03:52:57 2009 +0000 @@ -466,7 +466,7 @@ const char *filename = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"); PurpleStoredImage *img = NULL; - if (filename != NULL) + if (filename && *filename) img = purple_imgstore_new_from_file(filename); pidgin_status_box_set_buddy_icon(status_box, img);
--- a/po/ChangeLog Tue Aug 04 03:51:30 2009 +0000 +++ b/po/ChangeLog Tue Aug 04 03:52:57 2009 +0000 @@ -27,6 +27,7 @@ * Russian translation updated (�仆�仂仆 弌舒仄仂�于舒仍仂于) * Slovak translation updated (loptosko) * Slovenian translation updated (Martin Srebotnjak) + * Spanish translation updated (Javier Fern叩ndez-Sanguino) * Swahili translation added (Paul Msegeya) * Swedish translation updated (Peter Hjalmarsson)
--- a/po/es.po Tue Aug 04 03:51:30 2009 +0000 +++ b/po/es.po Tue Aug 04 03:52:57 2009 +0000 @@ -6,7 +6,7 @@ # Copyright (c) December 2003, Francisco Javier F. Serrador # <franciscojavier.fernandez.serrador@hispalinux.es>, 2003. # Copyright (C) June 2002, April 2003, January 2004, March 2004, September 2004, -# January 2005, 2006-2008 +# January 2005, 2006-2008, July 2009 # Javier Fern叩ndez-Sanguino Pe単a <jfs@debian.org> # # Agradecemos la ayuda de revisi坦n realizada por: @@ -52,8 +52,8 @@ msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-06 15:04-0700\n" -"PO-Revision-Date: 2009-01-05 00:05+0100\n" +"POT-Creation-Date: 2009-08-03 10:04-0700\n" +"PO-Revision-Date: 2009-08-03 12:52+0200\n" "Last-Translator: Javier Fern叩ndez-Sanguino <jfs@debian.org>\n" "Language-Team: Spanish team <es@li.org>\n" "MIME-Version: 1.0\n" @@ -70,7 +70,7 @@ msgid "%s. Try `%s -h' for more information.\n" msgstr "%s. Intente `%s -h' para m叩s informaci坦n.\n" -#, fuzzy, c-format +#, c-format msgid "" "%s\n" "Usage: %s [OPTION]...\n" @@ -86,8 +86,8 @@ "\n" " -c, --config=DIR utilizar el directorio DIR para los ficheros de " "configuraci坦n\n" -" -d, --debug imprimir mensajes de depuraci坦n en la salida " -"est叩ndar\n" +" -d, --debug imprimir mensajes de depuraci坦n en la salida est叩ndar " +"de error\n" " -h, --help mostrar este mensaje y salir\n" " -n, --nologin no conectarse de forma autom叩tica\n" " -v, --version mostrar la versi坦n actual y salir\n" @@ -921,12 +921,11 @@ msgid "System Log" msgstr "Registro del Sistema" -#, fuzzy msgid "Calling ... " -msgstr "Calculando..." +msgstr "Llamando..." msgid "Hangup" -msgstr "" +msgstr "Colgar" #. Number of actions msgid "Accept" @@ -936,25 +935,24 @@ msgstr "Rechazar" msgid "Call in progress." -msgstr "" +msgstr "Llamada en curso." msgid "The call has been terminated." -msgstr "" +msgstr "La llamada se ha cancelado." #, c-format msgid "%s wishes to start an audio session with you." -msgstr "" +msgstr "%s desea empezar una sesi坦n de audio contigo." #, c-format msgid "%s is trying to start an unsupported media session type with you." msgstr "" -#, fuzzy msgid "You have rejected the call." -msgstr "Ha abandonado el canal %s%s" +msgstr "Ha rechazado la llamada." msgid "call: Make an audio call." -msgstr "" +msgstr "llamar: Hacer una llamada de audio." msgid "Emails" msgstr "Correos" @@ -1612,6 +1610,8 @@ "\n" "Fetching TinyURL..." msgstr "" +"\n" +"Obteniendo TinyURL..." msgid "Only create TinyURL for urls of this length or greater" msgstr "" @@ -1619,12 +1619,11 @@ msgid "TinyURL (or other) address prefix" msgstr "" -#, fuzzy msgid "TinyURL" -msgstr "URL de m炭sica" +msgstr "TiniyURL" msgid "TinyURL plugin" -msgstr "" +msgstr "Complemento TinyURL" msgid "When receiving a message with URL(s), TinyURL for easier copying" msgstr "" @@ -1734,6 +1733,45 @@ msgid "_View Certificate..." msgstr "_Ver certificado..." +#, c-format +msgid "" +"The certificate presented by \"%s\" claims to be from \"%s\" instead. This " +"could mean that you are not connecting to the service you believe you are." +msgstr "" +"El certificado presentado por 束%s損 dice que pertenece a 束%s損 en lugar de a " +"aquel. Esto puede significar que no se est叩 conectando al servicio al que " +"piensa que se est叩 conectado." + +#. Had no CA pool, so couldn't verify the chain *and* +#. * the subject name isn't valid. +#. * I think this is bad enough to warrant a fatal error. It's +#. * not likely anyway... +#. +#. TODO: Probably wrong. +#. TODO: Make this error either block the ensuing SSL +#. connection error until the user dismisses this one, or +#. stifle it. +#. TODO: Probably wrong. +#. TODO: Probably wrong +#. TODO: Probably wrong. +msgid "SSL Certificate Error" +msgstr "Error de certificado SSL" + +msgid "Invalid certificate chain" +msgstr "Cadena de certificado inv叩lida" + +#. The subject name is correct, but we weren't able to verify the +#. * chain because there was no pool of root CAs found. Prompt the user +#. * to validate it. +#. +#. vrq will be completed by user_auth +msgid "" +"You have no database of root certificates, so this certificate cannot be " +"validated." +msgstr "" +"No tiene una base de datos de certificados ra鱈z por lo que no se puede " +"validar este certificado." + #. Prompt the user to authenticate the certificate #. vrq will be completed by user_auth #, c-format @@ -1744,29 +1782,11 @@ "El certificado presentado por 束%s損 es autofirmado. No puede comprobarse de " "forma autom叩tica." +#. FIXME 2.6.1 #, c-format msgid "The certificate chain presented for %s is not valid." msgstr "La cadena de certificados presentada por %s no es v叩lida." -#. TODO: Make this error either block the ensuing SSL -#. connection error until the user dismisses this one, or -#. stifle it. -#. TODO: Probably wrong. -#. TODO: Probably wrong -msgid "SSL Certificate Error" -msgstr "Error de certificado SSL" - -msgid "Invalid certificate chain" -msgstr "Cadena de certificado inv叩lida" - -#. vrq will be completed by user_auth -msgid "" -"You have no database of root certificates, so this certificate cannot be " -"validated." -msgstr "" -"No tiene una base de datos de certificados ra鱈z por lo que no se puede " -"validar este certificado." - #. vrq will be completed by user_auth msgid "" "The root certificate this one claims to be issued by is unknown to Pidgin." @@ -1786,19 +1806,6 @@ msgid "Invalid certificate authority signature" msgstr "Firma de autoridad de certificaci坦n inv叩lida" -#. Prompt the user to authenticate the certificate -#. TODO: Provide the user with more guidance about why he is -#. being prompted -#. vrq will be completed by user_auth -#, c-format -msgid "" -"The certificate presented by \"%s\" claims to be from \"%s\" instead. This " -"could mean that you are not connecting to the service you believe you are." -msgstr "" -"El certificado presentado por 束%s損 dice que pertenece a 束%s損 en lugar de a " -"aquel. Esto puede significar que no se est叩 conectando al servicio al que " -"piensa que se est叩 conectado." - #. Make messages #, c-format msgid "" @@ -1835,7 +1842,7 @@ msgstr "+++ %s se ha desconectado" #. Unknown error -#. Unknown error! +#, c-format msgid "Unknown error" msgstr "Error desconocido" @@ -1882,9 +1889,8 @@ msgid "%s left the room (%s)." msgstr "%s ha salido de la sala (%s)." -#, fuzzy msgid "Invite to chat" -msgstr "Invitar a conferencia" +msgstr "Invitar a un chat" #. Put our happy label in it. msgid "" @@ -2027,6 +2033,10 @@ msgstr "Comienza la transferencia de %s de %s" #, c-format +msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete" +msgstr "Se ha completado la transferencia de <A HREF=\"file://%s\">%s</A>" + +#, c-format msgid "Transfer of file %s complete" msgstr "Se ha completado la transferencia de %s" @@ -2241,9 +2251,8 @@ msgid "(%s) %s <AUTO-REPLY>: %s\n" msgstr "(%s) %s <RESPUESTA AUTOM�TICA>: %s\n" -#, fuzzy msgid "Error creating conference." -msgstr "Error al crear la conexi坦n" +msgstr "Error al crear la conferencia." #, c-format msgid "You are using %s, but this plugin requires %s." @@ -2654,7 +2663,6 @@ msgstr "Incluir otros registros de clientes de MI en el visor de registro." #. * description -#, fuzzy msgid "" "When viewing logs, this plugin will include logs from other IM clients. " "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n" @@ -2663,11 +2671,11 @@ "at your own risk!" msgstr "" "Cuando consulte los registros este complemento incluir叩 registros de otros " -"clientes de IM. Actualmente, esto incluye a Adium, MSN Messenger y " +"clientes de IM. Actualmente, esto incluye a Adium, MSN Messenger, aMSN y " "Trillian.\n" "\n" -"AVISO: Este complemento a炭n es c坦digo en 束alpha損 y puede bloquearse con " -"frecuencia. 臓Uselo bajo su propia responsabilidad!" +"AVISO: Este complemento a炭n es c坦digo en estado 束alpha損 y puede bloquearse " +"con frecuencia. 臓Uselo bajo su propia responsabilidad!" msgid "Mono Plugin Loader" msgstr "Cargador de complementos Mono" @@ -2713,12 +2721,11 @@ msgid "Save messages sent to an offline user as pounce." msgstr "Guardar los mensajes enviados como un aviso." -#, fuzzy msgid "" "The rest of the messages will be saved as pounces. You can edit/delete the " "pounce from the `Buddy Pounce' dialog." msgstr "" -"El resto de los mensajes se guardar叩n como un aviso. Puede editar y eliminar " +"El resto de los mensajes se guardar叩n como avisos. Puede editar y eliminar " "los avisos en el di叩logo 束Aviso de amigo損." #, c-format @@ -2747,9 +2754,8 @@ msgid "Do not ask. Always save in pounce." msgstr "No preguntar. Siempre guardar como un aviso." -#, fuzzy msgid "One Time Password" -msgstr "Introduzca la contrase単a" +msgstr "Contrase単a de un solo uso" #. *< type #. *< ui_requirement @@ -2758,7 +2764,7 @@ #. *< priority #. *< id msgid "One Time Password Support" -msgstr "" +msgstr "Soporte de contrase単as de un solo uso" #. *< name #. *< version @@ -2967,18 +2973,15 @@ "No se pudo detectar la instalaci坦n de ActiveTCL. Debe instalar ActiveTCL de " "http://www.activestate.com si desea utilizar los complementos TCL\n" -#, fuzzy msgid "" "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin." "im/BonjourWindows for more information." msgstr "" -"No se encontr坦 el conjunto de herramientas Apple Bonjour para Windows. Para " -"m叩s informaci坦n consulte las preguntas frecuentas (FAQ) en http://d.pidgin." -"im/wiki/BonjourWindows." - -#, fuzzy +"No se encontr坦 el conjunto de herramientas Apple 束Bonjour para Windows損. Para " +"m叩s informaci坦n consulte en http://d.pidgin.im/wiki/BonjourWindows." + msgid "Unable to listen for incoming IM connections" -msgstr "No se pudieron escuchar las conexiones MI entrantes\n" +msgstr "No se pudieron escuchar las conexiones MI entrantes" msgid "" "Unable to establish connection with the local mDNS server. Is it running?" @@ -3018,9 +3021,8 @@ msgstr "Persona morada" #. Creating the options for the protocol -#, fuzzy msgid "Local Port" -msgstr "Localidad" +msgstr "Puerto local" msgid "Bonjour" msgstr "Bonjour" @@ -3032,21 +3034,17 @@ msgid "Unable to send the message, the conversation couldn't be started." msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversaci坦n." -#, fuzzy, c-format +#, c-format msgid "Unable to create socket: %s" -msgstr "" -"No se pudo crear el socket:\n" -"%s" - -#, fuzzy, c-format +msgstr "No se pudo crear el socket: %s" + +#, c-format msgid "Unable to bind socket to port: %s" -msgstr "No se pudo vincular el socket al puerto" - -#, fuzzy, c-format +msgstr "No se pudo vincular el socket al puerto: %s" + +#, c-format msgid "Unable to listen on socket: %s" -msgstr "" -"No se pudo crear el socket:\n" -"%s" +msgstr "No se pudo escuchar el socket: %s" msgid "Error communicating with local mDNSResponder." msgstr "Error comunic叩ndose con el servicio 束mDNSResponder損 local." @@ -3096,17 +3094,14 @@ msgid "Load buddylist from file..." msgstr "Cargar la lista de amigos desde archivo..." -#, fuzzy msgid "You must fill in all registration fields" -msgstr "Rellene los campos de registro." - -#, fuzzy +msgstr "Debe rellenar todos los campos de registro." + msgid "Passwords do not match" -msgstr "Las contrase単as no coinciden." - -#, fuzzy +msgstr "Las contrase単as no coinciden" + msgid "Unable to register new account. An unknown error occurred." -msgstr "No se pudo registrar la cuenta nueva. Se produjo un error.\n" +msgstr "No se pudo registrar la nueva cuenta. Se produjo un error desconocido." msgid "New Gadu-Gadu Account Registered" msgstr "Se ha registrado una nueva cuenta Gadu-Gadu" @@ -3121,11 +3116,10 @@ msgstr "Contrase単a (de nuevo)" msgid "Enter captcha text" -msgstr "" - -#, fuzzy +msgstr "Introducir texto del captcha" + msgid "Captcha" -msgstr "Guardar imagen" +msgstr "Captcha" msgid "Register New Gadu-Gadu Account" msgstr "Registrando cuenta nueva de Gadu-Gadu" @@ -3264,9 +3258,9 @@ msgid "Chat _name:" msgstr "_Nombre de chat:" -#, fuzzy, c-format +#, c-format msgid "Unable to resolve hostname '%s': %s" -msgstr "No se pudo resolver el nombre del servidor." +msgstr "No se pudo resolver el nombre del servidor '%s': %s" #. 1. connect to server #. connect to the server @@ -3279,9 +3273,8 @@ msgid "This chat name is already in use" msgstr "Ya existe un chat con ese nombre" -#, fuzzy msgid "Not connected to the server" -msgstr "No est叩 conectado al servidor." +msgstr "No est叩 conectado al servidor" msgid "Find buddies..." msgstr "Encontrar amigos... " @@ -3322,9 +3315,8 @@ msgid "Gadu-Gadu User" msgstr "Usuario de Gadu-Gadu" -#, fuzzy msgid "GG server" -msgstr "Obteniendo el servidor" +msgstr "Servidor GG" #, c-format msgid "Unknown command: %s" @@ -3340,9 +3332,8 @@ msgid "File Transfer Failed" msgstr "Fall坦 la transferencia de archivos" -#, fuzzy msgid "Unable to open a listening port." -msgstr "No se pudo abrir un puerto de escucha." +msgstr "No se pudo abrir un puerto para la escucha." msgid "Error displaying MOTD" msgstr "Error al mostrar el MOTD" @@ -3364,11 +3355,9 @@ #. #. TODO: what to do here - do we really have to disconnect? #. TODO: do we really want to disconnect on a failure to write? -#, fuzzy, c-format +#, c-format msgid "Lost connection with server: %s" -msgstr "" -"Se perdi坦 la conexi坦n con el servidor:\n" -"%s" +msgstr "Se perdi坦 la conexi坦n con el servidor: %s" msgid "View MOTD" msgstr "Ver MOTD" @@ -3379,9 +3368,8 @@ msgid "_Password:" msgstr "Contra_se単a:" -#, fuzzy msgid "IRC nick and server may not contain whitespace" -msgstr "Los apodos de IRC no pueden tener espacios en blanco" +msgstr "Los apodos y servidores de IRC no pueden tener espacios en blanco" msgid "SSL support unavailable" msgstr "Soporte SSL no disponible" @@ -3390,13 +3378,13 @@ msgstr "No se pudo conectar" #. this is a regular connect, error out -#, fuzzy, c-format +#, c-format msgid "Unable to connect: %s" -msgstr "No se pudo conectar a %s" - -#, fuzzy, c-format +msgstr "No se pudo conectar: %s" + +#, c-format msgid "Server closed the connection" -msgstr "El servidor ha cerrado la conexi坦n." +msgstr "El servidor ha cerrado la conexi坦n" msgid "Users" msgstr "Usuarios" @@ -3568,7 +3556,7 @@ "Your selected nickname was rejected by the server. It probably contains " "invalid characters." msgstr "" -"El servidor rechaz坦 el nombre que escogi坦 para su cuenta. Es posible que " +"El servidor rechaz坦 el apodo que escogi坦 para su cuenta. Es posible que " "incluya caracteres inv叩lidos." msgid "" @@ -3581,13 +3569,12 @@ #. We only want to do the following dance if the connection #. has not been successfully completed. If it has, just #. notify the user that their /nick command didn't go. -#, fuzzy, c-format +#, c-format msgid "The nickname \"%s\" is already being used." -msgstr "Ya existe un chat con ese nombre" - -#, fuzzy +msgstr "Ya se est叩 utilizando el apodo \"%s\"." + msgid "Nickname in use" -msgstr "Apodo: %s\n" +msgstr "Apodo en uso" msgid "Cannot change nick" msgstr "No se puede cambiar el alias" @@ -3829,12 +3816,10 @@ msgid "execute" msgstr "ejecutar" -#, fuzzy msgid "Server requires TLS/SSL, but no TLS/SSL support was found." msgstr "" -"El servidor requiere SSL para conectarse. No se dispone de soporte TLS/SSL." - -#, fuzzy +"El servidor requiere TLS/SSL, pero no se ha encontrado soporte para TLS/SSL." + msgid "You require encryption, but no TLS/SSL support was found." msgstr "Vd. solicita cifrado, pero no se dispone de soporte TLS/SSL." @@ -3852,13 +3837,11 @@ msgid "Plaintext Authentication" msgstr "Autenticaci坦n en claro" -#, fuzzy msgid "SASL authentication failed" -msgstr "Fall坦 la autenticaci坦n" - -#, fuzzy +msgstr "Fall坦 la autenticaci坦n SASL" + msgid "Invalid response from server" -msgstr "Respuesta inv叩lida del servidor." +msgstr "Respuesta inv叩lida del servidor" msgid "Server does not use any supported authentication method" msgstr "El servidor no usa un m辿todo de autenticaci坦n conocido" @@ -3869,36 +3852,28 @@ msgid "Invalid challenge from server" msgstr "Desaf鱈o inv叩lido del servidor" -#, fuzzy, c-format +#, c-format msgid "SASL error: %s" -msgstr "Error de SASL" +msgstr "Error de SASL: %s" msgid "The BOSH connection manager terminated your session." -msgstr "" - -#, fuzzy +msgstr "El gestor de conexiones BOSH termin坦 su sesi坦n." + msgid "No session ID given" -msgstr "No se indic坦 una raz坦n" - -#, fuzzy +msgstr "No se ha obtenido un ID de sesi坦n" + msgid "Unsupported version of BOSH protocol" -msgstr "Versi坦n no soportada" - -#, fuzzy +msgstr "Versi坦n del protocolo BOSH no soportada" + msgid "Unable to establish a connection with the server" -msgstr "" -"No se pudo establecer una conexi坦n con el servidor:\n" -"%s" - -#, fuzzy, c-format +msgstr "No se pudo establecer una conexi坦n con el servidor" + +#, c-format msgid "Unable to establish a connection with the server: %s" -msgstr "" -"No se pudo establecer una conexi坦n con el servidor:\n" -"%s" - -#, fuzzy +msgstr "No se pudo establecer una conexi坦n con el servidor: %s" + msgid "Unable to establish SSL connection" -msgstr "No se pudo inicializar la conexi坦n" +msgstr "No se pudo establecer una conexi坦n SSL" msgid "Full Name" msgstr "Nombre completo" @@ -3915,6 +3890,11 @@ msgid "Street Address" msgstr "Calle" +#. +#. * EXTADD is correct, EXTADR is generated by other +#. * clients. The next time someone reads this, remove +#. * EXTADR. +#. msgid "Extended Address" msgstr "Direcci坦n extendida" @@ -3966,9 +3946,8 @@ msgid "Operating System" msgstr "Sistema operativo" -#, fuzzy msgid "Local Time" -msgstr "Archivo local:" +msgstr "Hora local:" msgid "Priority" msgstr "Prioridad" @@ -3978,11 +3957,10 @@ #, c-format msgid "%s ago" -msgstr "" - -#, fuzzy +msgstr "hace %s" + msgid "Logged Off" -msgstr "Conectado" +msgstr "Desconectado" msgid "Middle Name" msgstr "Nombre medio" @@ -4005,14 +3983,12 @@ msgid "Temporarily Hide From" msgstr "Ocultarse temporalmente de" -#. && NOT ME msgid "Cancel Presence Notification" msgstr "Cancelar notificaci坦n de presencia" msgid "(Re-)Request authorization" msgstr "Volver a pedir autorizaci坦n" -#. if(NOT ME) #. shouldn't this just happen automatically when the buddy is #. removed? msgid "Unsubscribe" @@ -4152,21 +4128,17 @@ msgid "Find Rooms" msgstr "Buscar salas" -#, fuzzy msgid "Affiliations:" -msgstr "Apodo:" - -#, fuzzy +msgstr "Afiliaciones:" + msgid "No users found" -msgstr "No se encontraron usuarios que coincidan" - -#, fuzzy +msgstr "No se encontraron usuarios" + msgid "Roles:" -msgstr "Rol" - -#, fuzzy +msgstr "Roles:" + msgid "Ping timed out" -msgstr "Tiempo de expiraci坦n del ping" +msgstr "Expir坦 el 束ping損" msgid "" "Unable to find alternative XMPP connection methods after failing to connect " @@ -4179,9 +4151,8 @@ msgid "Invalid XMPP ID. Domain must be set." msgstr "XMPP ID inv叩lido. Debe establecerse el dominio." -#, fuzzy msgid "Malformed BOSH URL" -msgstr "No se pudo conectar al servidor." +msgstr "URL BOSH malformada" #, c-format msgid "Registration of %s@%s successful" @@ -4253,10 +4224,6 @@ msgid "Change Registration" msgstr "Cambiar registro" -#, fuzzy -msgid "Malformed BOSH Connect Server" -msgstr "No se pudo conectar al servidor." - msgid "Error unregistering account" msgstr "Error al deregistrar la cuenta" @@ -4542,21 +4509,21 @@ msgid "Unable to ping user %s" msgstr "No puede hacer un ping al usuario %s" -#, fuzzy, c-format +#, c-format msgid "Unable to buzz, because there is nothing known about %s." -msgstr "No se pudo dar el codazo porque no se sabe nada del usuario %s." - -#, fuzzy, c-format +msgstr "No se pudo dar el codazo, porque no se sabe nada de %s." + +#, c-format msgid "Unable to buzz, because %s might be offline." -msgstr "" -"No se pudo dar el codazo porque puede que el usuario %s est辿 desconectado." - -#, fuzzy, c-format +msgstr "No se pudo dar el codazo, puede que %s est辿 desconectado." + +#, c-format msgid "" "Unable to buzz, because %s does not support it or does not wish to receive " "buzzes now." msgstr "" -"No se pudo dar un codazo porque el usuario %s no tiene soporte para ello." +"No se pudo dar un codazo, puede que %s no tenga soporte para ello o no desea " +"recibir codazos ahora." #, c-format msgid "Buzzing %s..." @@ -4571,36 +4538,34 @@ msgid "%s has buzzed you!" msgstr "臓%s le ha dado un codazo!" -#, fuzzy, c-format +#, c-format msgid "Unable to initiate media with %s: invalid JID" -msgstr "No se pudo enviar el archivo a %s, JID inv叩lido" - -#, fuzzy, c-format +msgstr "No se pudo enviar el medio a %s: JID inv叩lido" + +#, c-format msgid "Unable to initiate media with %s: user is not online" -msgstr "No se pudo enviar el archivo a %s, el usuario no est叩 conectado" - -#, fuzzy, c-format +msgstr "No se pudo enviar el medio a %s: el usuario no est叩 conectado" + +#, c-format msgid "Unable to initiate media with %s: not subscribed to user presence" msgstr "" -"No se pudo enviar el archivo a %s, no est叩 suscrito a la presencia del " -"usuario" - -#, fuzzy +"No se pudo enviar el medio a %s: no est叩 suscrito a la presencia del usuario" + msgid "Media Initiation Failed" -msgstr "Fall坦 el registro" - -#, fuzzy, c-format +msgstr "Fall坦 la inicializaci坦n del medio" + +#, c-format msgid "" "Please select the resource of %s with which you would like to start a media " "session." -msgstr "Elija el recurso de %s al que quiera enviar un archivo" +msgstr "" +"Elija el recurso de %s con el que quiere comenzar un intercambio de medio" msgid "Select a Resource" msgstr "Seleccione un recurso" -#, fuzzy msgid "Initiate Media" -msgstr "Iniciar _chat" +msgstr "Iniciar medio" msgid "config: Configure a chat room." msgstr "config: Configurar una sala de chat." @@ -4620,21 +4585,20 @@ msgid "ban <user> [reason]: Ban a user from the room." msgstr "ban <usuario> [raz坦n]: Echar a un usuario de la sala." -#, fuzzy msgid "" "affiliate <owner|admin|member|outcast|none> [nick1] [nick2] ...: Get " "the users with an affiliation or set users' affiliation with the room." msgstr "" -"affiliate <usuario> <owner|admin|member|outcast|none>: definir " -"la afiliaci坦n de un usuario a la sala." - -#, fuzzy +"affiliate <owner|admin|member|outcast|none> [alias1] [alias2] ...: " +"Obtener los usuarios con una afiliaci坦n o fijar la afiliaci坦n de un usuario " +"a la sala." + msgid "" "role <moderator|participant|visitor|none> [nick1] [nick2] ...: Get the " "users with an role or set users' role with the room." msgstr "" -"rol <usuario> <moderator|participant|visitor|none>: Definir el " -"rol de un usuario en la sala." +"role <moderator|participant|visitor|none> [alias1] [alias2] ...: " +"Obtener los usuarios con un rol o definir el rol de un usuario en la sala." msgid "invite <user> [message]: Invite a user to the room." msgstr "invite <usuario> [mensaje]: Invitar a un usuario a la sala." @@ -4676,10 +4640,10 @@ msgstr "Dominio" msgid "Require SSL/TLS" -msgstr "Requiere SSL/TLS" +msgstr "Requerir cifrado SSL/TLS" msgid "Force old (port 5223) SSL" -msgstr "Forzar SSL antiguo (puerto 5323)" +msgstr "Forzar el uso de cifrado SSL antiguo (puerto 5223)" msgid "Allow plaintext auth over unencrypted streams" msgstr "Permitir autenticaci坦n en claro sobre canales no cifrados" @@ -4697,7 +4661,7 @@ msgstr "Pasarelas de transferencia de archivos" msgid "BOSH URL" -msgstr "" +msgstr "URL BOSH" #. this should probably be part of global smiley theme settings later on, #. shared with MSN @@ -4761,29 +4725,25 @@ msgid "_Accept Defaults" msgstr "_Aceptar valores por omisi坦n" -#, fuzzy msgid "No reason" -msgstr "No se indic坦 una raz坦n" - -#, fuzzy, c-format +msgstr "No hay raz坦n" + +#, c-format msgid "You have been kicked: (%s)" -msgstr "Ha sido expulsado por %s: (%s)" - -#, fuzzy, c-format +msgstr "Ha sido expulsado: (%s)" + +#, c-format msgid "Kicked (%s)" -msgstr "Expulsado por %s (%s)" - -#, fuzzy +msgstr "Expulsado (%s)" + msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "Se produjo un error al abrir el archivo." - -#, fuzzy +msgstr "Se produjo un error en la transferencia de flujos de bytes en banda\n" + msgid "Transfer was closed." -msgstr "Fall坦 la transferencia de archivos" - -#, fuzzy +msgstr "Se cerr坦 la transferencia." + msgid "Failed to open the file" -msgstr "No se pudo abrir el archivo 束%s損: %s" +msgstr "No se pudo abrir el archivo" msgid "Failed to open in-band bytestream" msgstr "" @@ -5115,6 +5075,24 @@ msgid "Non-IM Contacts" msgstr "Contacto no MI" +#, c-format +msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>" +msgstr "" + +#, c-format +msgid "%s sent a wink, but it could not be saved" +msgstr "" + +#, c-format +msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>" +msgstr "" + +#, fuzzy, c-format +msgid "%s sent a voice clip, but it could not be saved" +msgstr "" +"%s le ha enviado una invitaci坦n para utilizar la webcam, algo a炭n no " +"soportado." + #, fuzzy, c-format msgid "%s sent you a voice chat invite, which is not yet supported." msgstr "" @@ -5275,6 +5253,30 @@ "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL " "soportada." +#, fuzzy, c-format +msgid "" +"Unable to add the buddy %s because the username is invalid. Usernames must " +"be a valid email address." +msgstr "" +"No se pudo a単adir al amigo %s porque el nombre de usuario no es v叩lido. Los " +"nombres de usuario deben ser direcciones de correo v叩lidas o empezar con una " +"letra y contener s坦lo letras, n炭meros y espacios, o contener s坦lo n炭meros." + +msgid "Unable to Add" +msgstr "No se pudo a単adir" + +msgid "Authorization Request Message:" +msgstr "Mensaje de solicitud de autorizaci坦n:" + +msgid "Please authorize me!" +msgstr "臓Por favor, autor鱈ceme!" + +#. * +#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. +#. +msgid "_OK" +msgstr "_Aceptar" + msgid "Error retrieving profile" msgstr "Error al obtener el perfil" @@ -5476,6 +5478,7 @@ msgid "Unable to add user" msgstr "No puede a単adir al usuario" +#. Unknown error! #, c-format msgid "Unknown error (%d)" msgstr "Error desconocido (%d)" @@ -6359,7 +6362,7 @@ msgstr "Error al solicitar un testigo de conexi坦n" msgid "AOL does not allow your screen name to authenticate here" -msgstr "" +msgstr "AOL no permite que su nombre de usuario se autentique aqu鱈" msgid "Could not join chat room" msgstr "No se pudo conectar a la sala de chat" @@ -6680,6 +6683,7 @@ msgstr "" "El servicio de Mensajer鱈a Instant叩neo AOL est叩 temporalmente no disponible." +#. client too old #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "" @@ -6706,12 +6710,6 @@ msgid "Enter the 6 digit number from the digital display." msgstr "Introduzca el d鱈gito de seis n炭meros que aparece en la pantalla." -#. * -#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. -#. -msgid "_OK" -msgstr "_Aceptar" - msgid "Password sent" msgstr "Contrase単a enviada" @@ -6721,12 +6719,6 @@ msgid "Please authorize me so I can add you to my buddy list." msgstr "Por favor, autor鱈ceme para que pueda a単adirle a mi lista de amigos." -msgid "Authorization Request Message:" -msgstr "Mensaje de solicitud de autorizaci坦n:" - -msgid "Please authorize me!" -msgstr "臓Por favor, autor鱈ceme!" - msgid "No reason given." msgstr "No se indic坦 una raz坦n." @@ -7066,9 +7058,6 @@ "nombres de usuario deben ser direcciones de correo v叩lidas o empezar con una " "letra y contener s坦lo letras, n炭meros y espacios, o contener s坦lo n炭meros." -msgid "Unable to Add" -msgstr "No se pudo a単adir" - msgid "Unable to Retrieve Buddy List" msgstr "No se ha podido obtener la lista de amigos" @@ -7465,26 +7454,26 @@ msgid "Buddy Memo" msgstr "Icono de amigo" +#, fuzzy msgid "Change his/her memo as you like" -msgstr "" - -#, fuzzy +msgstr "Cambiar su memo como desee" + msgid "_Modify" -msgstr "Modificar" +msgstr "_Modificar" #, fuzzy msgid "Memo Modify" -msgstr "Modificar" +msgstr "Modificar Memo" #, fuzzy msgid "Server says:" msgstr "Servidor ocupado" msgid "Your request was accepted." -msgstr "" +msgstr "Su solicitud fu辿 aceptada." msgid "Your request was rejected." -msgstr "" +msgstr "Su solicitud fu辿 rechazada." #, c-format msgid "%u requires verification" @@ -7800,7 +7789,7 @@ msgstr "<p><b>Autor original</b>:<br>\n" msgid "and more, please let me know... thank you!))" -msgstr "" +msgstr "y m叩s, por favor, h叩ganoslo saber.. 臓gracias!))" msgid "<p><i>And, all the boys in the backroom...</i><br>\n" msgstr "<p><i>Y, todos los chicos entre bastidores...</i><br>\n" @@ -7869,7 +7858,7 @@ msgstr "Mostrar noticas del servidor" msgid "Show chat room when msg comes" -msgstr "" +msgstr "Mostrar la sala de chat cuando venga un mensaje" msgid "Keep alive interval (seconds)" msgstr "Intervalo de comprobaci坦n de conexi坦n (segundos)" @@ -7913,7 +7902,7 @@ msgstr "臓Fall坦 la autenticaci坦n del 束captcha損!" msgid "Captcha Image" -msgstr "Guardar imagen" +msgstr "Imagen captcha" msgid "Enter code" msgstr "Introduzca el c坦digo" @@ -9017,10 +9006,6 @@ msgid "Connecting to SILC Server" msgstr "Conectando con el servidor SILC" -#, fuzzy -msgid "Unable to not load SILC key pair" -msgstr "No se pudo cargar la clave p炭blica SILC" - msgid "Out of memory" msgstr "Sin memoria" @@ -9601,7 +9586,7 @@ msgstr "Complemento de protocolo Yahoo" msgid "Your SMS was not delivered" -msgstr "" +msgstr "Se ha enviado su SMS" msgid "Your Yahoo! message did not get sent." msgstr "Su mensaje Yahoo! no se envi坦." @@ -9765,7 +9750,7 @@ msgstr "Comenzar una sesi坦n de Doodle" msgid "Select the ID you want to activate" -msgstr "" +msgstr "Seleccione el ID que quiere activar" msgid "Join whom in chat?" msgstr "多Con qui辿n quiere juntarse en un chat?" @@ -9865,12 +9850,9 @@ msgid "The user's profile is empty." msgstr "El perfil del usuario est叩 vac鱈o." -#, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "%s ha declinado su invitaci坦n de conferencia en la sala 束%s損 por 束%s損." - -msgid "Invitation Rejected" -msgstr "Invitaci坦n rechazada" +#, fuzzy, c-format +msgid "%s has declined to join." +msgstr "%s se ha conectado." msgid "Failed to join chat" msgstr "No se pudo unir al chat" @@ -10359,7 +10341,8 @@ msgid "Use this buddy _icon for this account:" msgstr "Utilizar este _icono de amigo para esta cuenta:" -msgid "_Advanced" +#, fuzzy +msgid "Ad_vanced" msgstr "_Avanzadas" msgid "Use GNOME Proxy Settings" @@ -10423,7 +10406,7 @@ msgstr "Crear es_ta nueva cuenta en el servidor" #, fuzzy -msgid "_Proxy" +msgid "P_roxy" msgstr "Proxy" msgid "Enabled" @@ -10505,11 +10488,10 @@ msgstr "Terminar llamada" msgid "Audio/_Video Call" -msgstr "" - -#, fuzzy +msgstr "Audio/_Videollamada" + msgid "_Video Call" -msgstr "Video chat" +msgstr "_Videollamada" msgid "_Send File..." msgstr "_Enviar archivo..." @@ -10520,11 +10502,9 @@ msgid "View _Log" msgstr "Ver _registro" -#, fuzzy msgid "Hide When Offline" -msgstr "Ocultar cuando se est辿 desconectado" - -#, fuzzy +msgstr "Ocultar cuando se est叩 desconectado" + msgid "Show When Offline" msgstr "Mostrar cuando se est辿 desconectado" @@ -10781,7 +10761,7 @@ msgstr "Por estado" msgid "By recent log activity" -msgstr "" +msgstr "Por actividad de registro reciente" #, c-format msgid "%s disconnected" @@ -10798,7 +10778,7 @@ msgstr "Reactivar" msgid "SSL FAQs" -msgstr "" +msgstr "PUFs de SSL" msgid "Welcome back!" msgstr "臓Bienvenido!" @@ -10934,28 +10914,26 @@ msgid "The background color for the buddy list" msgstr "Se ha a単adido este grupo a su lista de amigos." -#, fuzzy msgid "Layout" -msgstr "Laosiano" +msgstr "Distribuci坦n" msgid "The layout of icons, name, and status of the blist" -msgstr "" +msgstr "La distribuci坦n de iconos, nombres y estados en la blist" #. Group -#, fuzzy msgid "Expanded Background Color" -msgstr "Color del fondo" +msgstr "Color del fondo expandido" #, fuzzy msgid "The background color of an expanded group" -msgstr "Nombre del color de fondo" +msgstr "El color de fondo de un grupo expandido" #, fuzzy msgid "Expanded Text" msgstr "_Expandir" msgid "The text information for when a group is expanded" -msgstr "" +msgstr "La informaci坦n de texto para un grupo cuando se expande" #, fuzzy msgid "Collapsed Background Color" @@ -10965,12 +10943,11 @@ msgid "The background color of a collapsed group" msgstr "Color de fondo como un GdkColor" -#, fuzzy msgid "Collapsed Text" -msgstr "_Contraer" +msgstr "Texto contraido" msgid "The text information for when a group is collapsed" -msgstr "" +msgstr "La informaci坦n de texto para cuando un grupo se contrae" #. Buddy #, fuzzy @@ -10986,7 +10963,7 @@ msgstr "Atajo de teclado" msgid "The text information for when a contact is expanded" -msgstr "" +msgstr "La informaci坦n de texto cuando se expande un contacto" #, fuzzy msgid "On-line Text" @@ -11024,7 +11001,7 @@ msgstr "Texto de los mensajes" msgid "The text information for when a buddy has an unread message" -msgstr "" +msgstr "La informaci坦n de texto cuando un amigo tiene mensajes sin leer" #, fuzzy msgid "Message (Nick Said) Text" @@ -11420,7 +11397,7 @@ msgstr "Ka-Hing Cheung" msgid "voice and video" -msgstr "" +msgstr "voz y v鱈deo" msgid "support" msgstr "soporte" @@ -11718,12 +11695,16 @@ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ" "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>" msgstr "" +"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ" +"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>" #, c-format msgid "" "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im" "\">support@pidgin.im</A><BR/><BR/>" msgstr "" +"<FONT SIZE=\"4\">Ayuda por correo:</FONT> <A HREF=\"mailto:support@pidgin.im" +"\">support@pidgin.im</A><BR/><BR/>" #, fuzzy, c-format msgid "" @@ -11957,14 +11938,6 @@ msgid "File transfer _details" msgstr "_Detalles de la transferencia de archivos" -#. Pause button -msgid "_Pause" -msgstr "_Pausar" - -#. Resume button -msgid "_Resume" -msgstr "_Continuar" - msgid "Paste as Plain _Text" msgstr "Pe_gar como texto en claro" @@ -12399,14 +12372,13 @@ msgstr "" msgid "/_Media" -msgstr "" +msgstr "/_Media" msgid "/Media/_Hangup" -msgstr "" - -#, fuzzy +msgstr "/Media/_Colgar" + msgid "Calling..." -msgstr "Calculando..." +msgstr "Llamando..." #, c-format msgid "%s wishes to start an audio/video session with you." @@ -12414,7 +12386,7 @@ #, c-format msgid "%s wishes to start a video session with you." -msgstr "" +msgstr "%s desea comenzor una sesi坦n de v鱈deo con vd." #, c-format msgid "%s has %d new message." @@ -12445,9 +12417,8 @@ "Se ha definido un navegador 束Manual損, pero no se ha definido ning炭n comando " "para ejecutarlo." -#, fuzzy msgid "No message" -msgstr "(1 mensaje)" +msgstr "No hay mensajes" msgid "Open All Messages" msgstr "Abrir todos los mensajes" @@ -12460,7 +12431,7 @@ msgstr "Nuevo aviso de amigo" msgid "Dismiss" -msgstr "" +msgstr "Descartar" #, fuzzy msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>" @@ -12514,9 +12485,8 @@ msgid "Select a file" msgstr "Seleccione un archivo" -#, fuzzy msgid "Modify Buddy Pounce" -msgstr "Editar aviso de amigo" +msgstr "Modificar aviso de amigo" #. Create the "Pounce on Whom" frame. msgid "Pounce on Whom" @@ -12593,9 +12563,9 @@ msgid "Pounce Target" msgstr "Objetivo a avisar" -#, fuzzy, c-format +#, c-format msgid "Started typing" -msgstr "Empieza a escribir" +msgstr "Empez坦 a escribir" #, fuzzy, c-format msgid "Paused while typing" @@ -12607,47 +12577,44 @@ #, fuzzy, c-format msgid "Returned from being idle" -msgstr "Dejar de estar i_nactivo" +msgstr "Deje de estar i_nactivo" #, fuzzy, c-format msgid "Returned from being away" -msgstr "Deja de estar ausente" +msgstr "Deje de estar ausente" #, fuzzy, c-format msgid "Stopped typing" -msgstr "Deja de escribi_r" - -#, fuzzy, c-format +msgstr "Deje de escribi_r" + +#, c-format msgid "Signed off" -msgstr "Se desconecta" - -#, fuzzy, c-format +msgstr "Se desconecte" + +#, c-format msgid "Became idle" -msgstr "Est叩 inactivo" +msgstr "Paso a estar inactivo" #, fuzzy, c-format msgid "Went away" -msgstr "Cuando estoy fuera" - -#, fuzzy, c-format +msgstr "Est辿 fuera" + +#, c-format msgid "Sent a message" -msgstr "Enviar un mensaje" - -#, fuzzy, c-format +msgstr "Env鱈e un mensaje" + +#, c-format msgid "Unknown.... Please report this!" -msgstr "Evento de aviso desconocido. 臓Por favor, informe de esto! " - -#, fuzzy +msgstr "Desconocido..... 臓Por favor, informe de esto! " + msgid "Theme failed to unpack." -msgstr "Fall坦 el desempaque de tema de emoticonos" - -#, fuzzy +msgstr "No se pudo desempaquetar el tema." + msgid "Theme failed to load." -msgstr "Fall坦 el desempaque de tema de emoticonos" - -#, fuzzy +msgstr "No se pudo cargar el tema." + msgid "Theme failed to copy." -msgstr "Fall坦 el desempaque de tema de emoticonos" +msgstr "No se pudo copiar el tema." msgid "Install Theme" msgstr "Instalar tema" @@ -12669,9 +12636,8 @@ msgstr "C_errrar las conversaciones con la tecla Esc" #. Buddy List Themes -#, fuzzy msgid "Buddy List Theme" -msgstr "Lista de amigos" +msgstr "Tema de la lista de amigos" #. System Tray msgid "System Tray Icon" @@ -12683,9 +12649,8 @@ msgid "On unread messages" msgstr "Si hay mensajes sin leer" -#, fuzzy msgid "Conversation Window" -msgstr "Ventanas de conversaci坦n de MI" +msgstr "Ventana de conversaci坦n" msgid "_Hide new IM conversations:" msgstr "_Ocultar nuevas conversaciones MI:" @@ -12788,9 +12753,9 @@ msgid "<span style=\"italic\">Example: stunserver.org</span>" msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>" -#, fuzzy, c-format +#, c-format msgid "Use _automatically detected IP address: %s" -msgstr "_Auto detectar la direcci坦n IP" +msgstr "Utilizar la direcci坦n IP detectada _autom叩ticamente: %s" msgid "Public _IP:" msgstr "_IP p炭blica:" @@ -13160,12 +13125,11 @@ msgid "Status for %s" msgstr "Estado de %s" -#, fuzzy, c-format +#, c-format msgid "" "A custom smiley for '%s' already exists. Please use a different shortcut." msgstr "" -"Ya existe un emoticono a medida para el atajo de teclado seleccionado. " -"Especifique un atajo distinto." +"Ya existe un emoticono a medida para '%s'. Especifique un atajo distinto." # No estoy muy seguro de usar emoticono, quiz叩s 束smiley損 ser鱈a m叩s apropiado msgid "Custom Smiley" @@ -13181,28 +13145,24 @@ msgid "Add Smiley" msgstr "A単adir emoticono" -#, fuzzy msgid "_Image:" -msgstr "_Imagen" +msgstr "_Imagen:" #. Shortcut text -#, fuzzy msgid "S_hortcut text:" -msgstr "Atajo de teclado" +msgstr "Ata_jo de teclado" msgid "Smiley" msgstr "Emoticono" -#, fuzzy msgid "Shortcut Text" msgstr "Atajo de teclado" msgid "Custom Smiley Manager" msgstr "Gestor de emoticonos a medida" -#, fuzzy msgid "Select Buddy Icon" -msgstr "Seleccionar amigo" +msgstr "Seleccionar icono de amigo" msgid "Click to change your buddyicon for this account." msgstr "Pulse para cambiar el icono de amigo para esta cuenta." @@ -13329,9 +13289,8 @@ "Se produjo un fallo al cargar la imagen 束%s損: raz坦n desconocida, posiblemente " "se trata de un archivo de imagen da単ado" -#, fuzzy msgid "_Open Link" -msgstr "_Abrir enlace en:" +msgstr "_Abrir enlace" msgid "_Copy Link Location" msgstr "_Copiar destino del enlace" @@ -13339,9 +13298,21 @@ msgid "_Copy Email Address" msgstr "_Copiar direcci坦n de correo electr坦nico" +msgid "_Open File" +msgstr "_Abrir archivo" + +msgid "Open _Containing Directory" +msgstr "Abrir _contenido del directorio " + msgid "Save File" msgstr "Guardar archivo" +msgid "_Play Sound" +msgstr "Reproducir un sonido" + +msgid "_Save File" +msgstr "_Guardar archivo" + msgid "Select color" msgstr "Seleccionar el color" @@ -13366,6 +13337,9 @@ msgid "_Open Mail" msgstr "_Abrir correo" +msgid "_Pause" +msgstr "_Pausar" + msgid "_Edit" msgstr "_Editar" @@ -13433,74 +13407,63 @@ msgid "Server name request" msgstr "Direcci坦n del servidor" -#, fuzzy msgid "Enter an XMPP Server" -msgstr "Introducir un servidor de conferencias" +msgstr "Introducir un servidor XMPP" #, fuzzy msgid "Select an XMPP server to query" -msgstr "Selecciona un servidor de conferencias al que consultar" - -#, fuzzy +msgstr "Selecciona un servidor XMPP al que consultar" + msgid "Find Services" -msgstr "Servicios en l鱈nea" - -#, fuzzy +msgstr "Encontrar servicios" + msgid "Add to Buddy List" -msgstr "Enviar lista de amigos" - -#, fuzzy +msgstr "A単adir a la lista de amigos" + msgid "Gateway" -msgstr "Se ausenta" - -#, fuzzy +msgstr "Pasarela" + msgid "Directory" -msgstr "Directorio de registro" - -#, fuzzy +msgstr "Directorio" + msgid "PubSub Collection" -msgstr "Completado con el tabulador" - -#, fuzzy +msgstr "Collecci坦n PubSub" + msgid "PubSub Leaf" -msgstr "Servicio PubSub" - -#, fuzzy +msgstr "Rama PubSub" + msgid "" "\n" "<b>Description:</b> " msgstr "" "\n" -"<b>Descripci坦n:</b> Terror鱈fica" +"<b>Descripci坦n:</b>" #. Create the window. -#, fuzzy msgid "Service Discovery" -msgstr "Informaci坦n de descubrimiento de servicio" +msgstr "Descubrimiento de servicios" msgid "_Browse" msgstr "_Navegador" -#, fuzzy msgid "Server does not exist" -msgstr "El usuario no existe" - -#, fuzzy +msgstr "El servidor no existe" + msgid "Server does not support service discovery" -msgstr "El servidor no soporta bloqueos" - -#, fuzzy +msgstr "El servidor no ofrece soporte para el descubrimiento de servicios" + msgid "XMPP Service Discovery" -msgstr "Informaci坦n de descubrimiento de servicio" +msgstr "Descubrimiento de servicios XMPP" msgid "Allows browsing and registering services." -msgstr "" - -#, fuzzy +msgstr "Permite buscar y registrar servicios." + msgid "" "This plugin is useful for registering with legacy transports or other XMPP " "services." -msgstr "Este complemento es 炭til para depurar clientes o servidores XMPP." +msgstr "" +"Este complemento es 炭til para registrarse con transportes antiguos o con " +"otros servicios XMPP." msgid "Buddy is idle" msgstr "El amigo est叩 inactivo" @@ -14030,7 +13993,6 @@ msgid "Highlighted Message Name Color" msgstr "Color para mensajes resaltados por nombre" -#, fuzzy msgid "Typing Notification Color" msgstr "Color de notificaci坦n de tecleo" @@ -14063,24 +14025,20 @@ msgid "GTK+ Text Shortcut Theme" msgstr "Tema de atajos de teclado GTK+" -#, fuzzy msgid "Disable Typing Notification Text" -msgstr "Activar la notificaci坦n de tecleo" - -#, fuzzy +msgstr "Desactivar el texto de la notificaci坦n de tecleo" + msgid "GTK+ Theme Control Settings" -msgstr "Control de tema GTK+ de Pidgin" - -#, fuzzy +msgstr "Configuraci坦n del tema GTK+" + msgid "Colors" -msgstr "Color" +msgstr "Colores" msgid "Fonts" msgstr "Tipograf鱈a" -#, fuzzy msgid "Miscellaneous" -msgstr "Error miscel叩neo" +msgstr "Miscel叩nea" msgid "Gtkrc File Tools" msgstr "Herramientas de ficheros Gtkrc" @@ -14228,64 +14186,55 @@ "Reemplaza el texto de los mensajes salientes seg炭n las reglas definidas por " "el usuario." -#, fuzzy msgid "Just logged in" -msgstr "No ha iniciado sesi坦n" - -#, fuzzy +msgstr "Acaba de conectarse" + msgid "Just logged out" -msgstr "%s se ha desconectado." +msgstr "Se acaba de desconectar" msgid "" "Icon for Contact/\n" "Icon for Unknown person" msgstr "" -#, fuzzy msgid "Icon for Chat" -msgstr "Unirse a un chat" - -#, fuzzy +msgstr "Icono para el chat" + msgid "Ignored" -msgstr "Ignorar" - -#, fuzzy +msgstr "Ignorado" + msgid "Founder" -msgstr "M叩s ruidoso" - -#, fuzzy +msgstr "Fundador" + +#. A user in a chat room who has special privileges. msgid "Operator" -msgstr "Operador IRC" - -#, fuzzy +msgstr "Operador" + +#. A half operator is someone who has a subset of the privileges +#. that an operator has. msgid "Half Operator" -msgstr "Operador IRC" - -#, fuzzy +msgstr "Semi-Operador" + msgid "Authorization dialog" -msgstr "Autorizaci坦n otorgada" - -#, fuzzy +msgstr "Di叩logo de autorizaci坦n" + msgid "Error dialog" -msgstr "Error " - -#, fuzzy +msgstr "Di叩logo de error " + msgid "Information dialog" -msgstr "Informaci坦n" +msgstr "Di叩logo de informaci坦n" msgid "Mail dialog" -msgstr "" - -#, fuzzy +msgstr "Di叩logo de correo" + msgid "Question dialog" -msgstr "Di叩logo de solicitud" - -#, fuzzy +msgstr "Di叩logo de pregunta" + msgid "Warning dialog" -msgstr "Niveles de aviso" +msgstr "Di叩logo de aviso" msgid "What kind of dialog is this?" -msgstr "" +msgstr "多Qu辿 tipo de di叩logo es 辿ste?" #, fuzzy msgid "Status Icons" @@ -14332,9 +14281,8 @@ #. *< name #. *< version #. * summary -#, fuzzy msgid "Pidgin Theme Editor." -msgstr "Control de tema GTK+ de Pidgin" +msgstr "Editor de temas de Pidgin" #. *< type #. *< ui_requirement @@ -14506,12 +14454,11 @@ msgid "Options specific to Pidgin for Windows." msgstr "Opciones espec鱈ficas de %s para Windows." -#, fuzzy msgid "" "Provides options specific to Pidgin for Windows, such as buddy list docking." msgstr "" -"Contiene las opciones espec鱈ficas al Pidgin de Windows como el apilado de la " -"lista de amigos." +"Contiene las opciones espec鱈ficas a Pidgin para Windows, como por ejemplo el " +"apilado de la lista de amigos." msgid "<font color='#777777'>Logged out.</font>" msgstr "<font color='#777777'>Desconectado.</font>" @@ -14550,6 +14497,29 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "Este complemento es 炭til para depurar clientes o servidores XMPP." +#~ msgid "_Resume" +#~ msgstr "_Continuar" + +#, fuzzy +#~ msgid "Malformed BOSH Connect Server" +#~ msgstr "No se pudo conectar al servidor." + +#, fuzzy +#~ msgid "Unable to not load SILC key pair" +#~ msgstr "No se pudo cargar la clave p炭blica SILC" + +#~ msgid "" +#~ "%s declined your conference invitation to room \"%s\" because \"%s\"." +#~ msgstr "" +#~ "%s ha declinado su invitaci坦n de conferencia en la sala 束%s損 por 束%s損." + +#~ msgid "Invitation Rejected" +#~ msgstr "Invitaci坦n rechazada" + +#, fuzzy +#~ msgid "_Proxy" +#~ msgstr "Proxy" + #~ msgid "Cannot open socket" #~ msgstr "No se pudo abrir el socket"
--- a/po/sl.po Tue Aug 04 03:51:30 2009 +0000 +++ b/po/sl.po Tue Aug 04 03:52:57 2009 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Pidgin 2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-06 15:04-0700\n" -"PO-Revision-Date: 2009-05-02 16:54+0100\n" +"POT-Creation-Date: 2009-08-03 10:04-0700\n" +"PO-Revision-Date: 2009-07-30 12:54+0100\n" "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n" "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n" "MIME-Version: 1.0\n" @@ -1685,6 +1685,44 @@ msgid "_View Certificate..." msgstr "_Poka転i digitalno potrdilo ..." +#, c-format +msgid "" +"The certificate presented by \"%s\" claims to be from \"%s\" instead. This " +"could mean that you are not connecting to the service you believe you are." +msgstr "" +"Predstavljeno digitalno potrdilo \"%s\" pri�a, da dejansko pripada \"%s\". " +"To pomeni, da se ne povezujete s storitvijo, kot ste mislili." + +#. Had no CA pool, so couldn't verify the chain *and* +#. * the subject name isn't valid. +#. * I think this is bad enough to warrant a fatal error. It's +#. * not likely anyway... +#. +#. TODO: Probably wrong. +#. TODO: Make this error either block the ensuing SSL +#. connection error until the user dismisses this one, or +#. stifle it. +#. TODO: Probably wrong. +#. TODO: Probably wrong +#. TODO: Probably wrong. +msgid "SSL Certificate Error" +msgstr "Napaka digitalnega potrdila SSL" + +msgid "Invalid certificate chain" +msgstr "Neveljavna veriga digitalnih potrdil" + +#. The subject name is correct, but we weren't able to verify the +#. * chain because there was no pool of root CAs found. Prompt the user +#. * to validate it. +#. +#. vrq will be completed by user_auth +msgid "" +"You have no database of root certificates, so this certificate cannot be " +"validated." +msgstr "" +"Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega " +"potrdila ni mogo�e preveriti." + #. Prompt the user to authenticate the certificate #. vrq will be completed by user_auth #, c-format @@ -1695,29 +1733,11 @@ "Predstavljeno digitalno potrdilo \"%s\" je samo-podpisano. Samodejno ga ni " "mogo�e preveriti." +#. FIXME 2.6.1 #, c-format msgid "The certificate chain presented for %s is not valid." msgstr "Ponujena veriga digitalnih potrdil za %s ni veljavna." -#. TODO: Make this error either block the ensuing SSL -#. connection error until the user dismisses this one, or -#. stifle it. -#. TODO: Probably wrong. -#. TODO: Probably wrong -msgid "SSL Certificate Error" -msgstr "Napaka digitalnega potrdila SSL" - -msgid "Invalid certificate chain" -msgstr "Neveljavna veriga digitalnih potrdil" - -#. vrq will be completed by user_auth -msgid "" -"You have no database of root certificates, so this certificate cannot be " -"validated." -msgstr "" -"Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega " -"potrdila ni mogo�e preveriti." - #. vrq will be completed by user_auth msgid "" "The root certificate this one claims to be issued by is unknown to Pidgin." @@ -1737,18 +1757,6 @@ msgid "Invalid certificate authority signature" msgstr "Neveljaven podpis izdajatelja digitalnega potrdila" -#. Prompt the user to authenticate the certificate -#. TODO: Provide the user with more guidance about why he is -#. being prompted -#. vrq will be completed by user_auth -#, c-format -msgid "" -"The certificate presented by \"%s\" claims to be from \"%s\" instead. This " -"could mean that you are not connecting to the service you believe you are." -msgstr "" -"Predstavljeno digitalno potrdilo \"%s\" pri�a, da dejansko pripada \"%s\". " -"To pomeni, da se ne povezujete s storitvijo, kot ste mislili." - #. Make messages #, c-format msgid "" @@ -1785,7 +1793,7 @@ msgstr "+++ %s se je odjavil(a)" #. Unknown error -#. Unknown error! +#, c-format msgid "Unknown error" msgstr "Neznana napaka" @@ -1974,6 +1982,10 @@ msgstr "Za�etek prenosa %s od %s" #, c-format +msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete" +msgstr "Prenos datoteke <A HREF=\"file://%s\">%s</A> je dokon�an" + +#, c-format msgid "Transfer of file %s complete" msgstr "Prenos datoteke %s je dokon�an." @@ -2185,9 +2197,8 @@ msgid "(%s) %s <AUTO-REPLY>: %s\n" msgstr "(%s) %s <AUTO-REPLY>: %s\n" -#, fuzzy msgid "Error creating conference." -msgstr "Napaka pri ustvarjanju povezave" +msgstr "Napaka pri ustvarjanju konference." #, c-format msgid "You are using %s, but this plugin requires %s." @@ -2611,7 +2622,6 @@ "dnevnika." #. * description -#, fuzzy msgid "" "When viewing logs, this plugin will include logs from other IM clients. " "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n" @@ -2620,7 +2630,8 @@ "at your own risk!" msgstr "" "Pri ogledovanju dnevnikov bo ta vti�nik vklju�il dnevnike drugih odjemalcev " -"neposrednih sporo�il. To trenutno obsega Adium, MSN Messenger in Trillian.\n" +"neposrednih sporo�il. To trenutno obsega Adium, MSN Messenger, aMSN in " +"Trillian.\n" "\n" "OPOZORILO: Ta vti�nik je 邸e vedno v fazi alfa in se lahko pogosto sesuje. " "Uporaba na lastno odgovornost!" @@ -2668,12 +2679,11 @@ msgid "Save messages sent to an offline user as pounce." msgstr "Shrani sporo�ila, poslana neprijavljenemu uporabniku, kot opozorilo." -#, fuzzy msgid "" "The rest of the messages will be saved as pounces. You can edit/delete the " "pounce from the `Buddy Pounce' dialog." msgstr "" -"Preostanek sporo�ila bo shranjen kot opozorilo. Opozorilo lahko uredite/" +"Preostanek sporo�il bo shranjen kot opozorila. Opozorilo lahko uredite/" "izbri邸ete s pogovornim oknom `Opozorilo prijatelja'." #, c-format @@ -2921,18 +2931,16 @@ "Namestitve ActiveTCL ni mogo�e najti. �e 転elite uporabljati vti�nike TCL, " "namestite ActiveTCL z naslova http://www.activestate.com\n" -#, fuzzy msgid "" "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin." "im/BonjourWindows for more information." msgstr "" -"Paketa orodij Apple Bonjour za Windows ni mogo�e najti, oglejte si pogosto " -"zastavljena vpra邸anja na naslovu: http://d.pidgin.im/BonjourWindows za ve� " -"podrobnosti." - -#, fuzzy +"Paketa orodij podjetja Apple \"Bonjour for Windows\" ni mogo�e najti, " +"oglejte si zapis na naslovu http://d.pidgin.im/BonjourWindows - kjer najdete " +"ve� podrobnosti." + msgid "Unable to listen for incoming IM connections" -msgstr "Dohodnim povezavam IM ni mogo�e prisluhniti\n" +msgstr "Dohodnim povezavam IM ni mogo�e prisluhniti" msgid "" "Unable to establish connection with the local mDNS server. Is it running?" @@ -2985,21 +2993,17 @@ msgid "Unable to send the message, the conversation couldn't be started." msgstr "Sporo�ila ni mogo�e poslati, pogovora ni mogo�e za�eti." -#, fuzzy, c-format +#, c-format msgid "Unable to create socket: %s" -msgstr "" -"Ni mogo�e ustvariti vti�nice:\n" -"%s" - -#, fuzzy, c-format +msgstr "Vti�nice ni mogo�e ustvariti: %s" + +#, c-format msgid "Unable to bind socket to port: %s" -msgstr "Povezava vti�nice z vrati ni uspela" - -#, fuzzy, c-format +msgstr "Vti�nice z vrati ni mogo�e povezati: %s" + +#, c-format msgid "Unable to listen on socket: %s" -msgstr "" -"Ni mogo�e ustvariti vti�nice:\n" -"%s" +msgstr "Na vti�nici ni mogo�e prisluhniti: %s" msgid "Error communicating with local mDNSResponder." msgstr "Napaka pri komunikaciji s krajevnim mDNSReponderjem." @@ -3048,17 +3052,15 @@ msgid "Load buddylist from file..." msgstr "Uvozi seznam prijateljev iz datoteke ..." -#, fuzzy msgid "You must fill in all registration fields" -msgstr "Izpolnite polja za registracijo." - -#, fuzzy +msgstr "Izpolniti morate vsa polja za registracijo" + msgid "Passwords do not match" -msgstr "Gesli se ne ujemata." - -#, fuzzy +msgstr "Gesli se ne ujemata" + msgid "Unable to register new account. An unknown error occurred." -msgstr "Novega ra�una ni bilo mogo�e registrirati. Pri邸lo je do napake.\n" +msgstr "" +"Novega ra�una ni bilo mogo�e registrirati. Pri邸lo je do neznane napake." msgid "New Gadu-Gadu Account Registered" msgstr "Nov ra�un Gadu-Gadu je registriran" @@ -3073,9 +3075,8 @@ msgstr "Novo geslo (ponovno)" msgid "Enter captcha text" -msgstr "" - -#, fuzzy +msgstr "Vnesite besedilo za sliko z besedilom" + msgid "Captcha" msgstr "Slika z napisom" @@ -3216,9 +3217,9 @@ msgid "Chat _name:" msgstr "_Ime za klepet:" -#, fuzzy, c-format +#, c-format msgid "Unable to resolve hostname '%s': %s" -msgstr "Ni se bilo mogo�e povezati na stre転nik." +msgstr "Imena stre転nika '%s' ni mogo�e razlo�iti: %s" #. 1. connect to server #. connect to the server @@ -3231,9 +3232,8 @@ msgid "This chat name is already in use" msgstr "Ime za pomenek 転e obstaja" -#, fuzzy msgid "Not connected to the server" -msgstr "S stre転nikom niste povezani." +msgstr "S stre転nikom niste povezani" msgid "Find buddies..." msgstr "Poi邸�i prijatelje ..." @@ -3274,9 +3274,8 @@ msgid "Gadu-Gadu User" msgstr "Uporabnik Gadu-Gadu" -#, fuzzy msgid "GG server" -msgstr "Pridobivanje stre転nika" +msgstr "Stre転nik GG" #, c-format msgid "Unknown command: %s" @@ -3292,7 +3291,6 @@ msgid "File Transfer Failed" msgstr "Prenos datoteke ni uspel" -#, fuzzy msgid "Unable to open a listening port." msgstr "Vrat za poslu邸anje ni mogo�e odpreti." @@ -3316,11 +3314,9 @@ #. #. TODO: what to do here - do we really have to disconnect? #. TODO: do we really want to disconnect on a failure to write? -#, fuzzy, c-format +#, c-format msgid "Lost connection with server: %s" -msgstr "" -"Izgubljena povezava s stre転nikom:\n" -"%s" +msgstr "Izgubljena povezava s stre転nikom: %s" msgid "View MOTD" msgstr "Ogled MOTD" @@ -3331,9 +3327,8 @@ msgid "_Password:" msgstr "_Geslo:" -#, fuzzy msgid "IRC nick and server may not contain whitespace" -msgstr "IRC vzdevki ne smejo vsebovati presledka" +msgstr "IRC vzdevek in stre転nik ne smejo vsebovati presledka" msgid "SSL support unavailable" msgstr "Podpora SSL ni na voljo" @@ -3342,13 +3337,13 @@ msgstr "Ni se mogo�e povezati" #. this is a regular connect, error out -#, fuzzy, c-format +#, c-format msgid "Unable to connect: %s" -msgstr "Ni se mogo�e povezati z %s." - -#, fuzzy, c-format +msgstr "Ni se mogo�e povezati: %s" + +#, c-format msgid "Server closed the connection" -msgstr "Stre転nik je zaprl povezavo." +msgstr "Stre転nik je zaprl povezavo" msgid "Users" msgstr "Uporabniki" @@ -3777,12 +3772,11 @@ msgid "execute" msgstr "izvedi" -#, fuzzy msgid "Server requires TLS/SSL, but no TLS/SSL support was found." msgstr "" -"Stre転nik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogo�e najti." - -#, fuzzy +"Stre転nik zahteva TLS/SSL za prijavo, vendar odpore za TLS/SSL ni mogo�e " +"najti." + msgid "You require encryption, but no TLS/SSL support was found." msgstr "Vi zahtevate 邸ifriranje, podpore za TLS/SSL pa ni mogo�e najti." @@ -3801,13 +3795,11 @@ msgid "Plaintext Authentication" msgstr "Overovitev z navadnim besedilom" -#, fuzzy msgid "SASL authentication failed" -msgstr "Overovitev ni uspela" - -#, fuzzy +msgstr "Overovitev SASL ni uspela" + msgid "Invalid response from server" -msgstr "Neveljaven odgovor stre転nika." +msgstr "Neveljaven odgovor stre転nika" msgid "Server does not use any supported authentication method" msgstr "Stre転nik ne uporablja nobene podprte metode overovitve" @@ -3818,9 +3810,9 @@ msgid "Invalid challenge from server" msgstr "Neveljaven poziv stre転nika" -#, fuzzy, c-format +#, c-format msgid "SASL error: %s" -msgstr "Napaka SASL" +msgstr "Napaka SASL: %s" msgid "The BOSH connection manager terminated your session." msgstr "Upravitelj povezave BOSH je zaklju�il va邸o sejo." @@ -3834,9 +3826,9 @@ msgid "Unable to establish a connection with the server" msgstr "Povezave s stre転nikom ni mogo�e vzpostaviti" -#, fuzzy, c-format +#, c-format msgid "Unable to establish a connection with the server: %s" -msgstr "Povezave s stre転nikom ni mogo�e vzpostaviti" +msgstr "Povezave s stre転nikom ni mogo�e vzpostaviti: %s" msgid "Unable to establish SSL connection" msgstr "Povezave SSL ni mogo�e vzpostaviti" @@ -3856,6 +3848,11 @@ msgid "Street Address" msgstr "Naslov" +#. +#. * EXTADD is correct, EXTADR is generated by other +#. * clients. The next time someone reads this, remove +#. * EXTADR. +#. msgid "Extended Address" msgstr "Naslov (dodatno)" @@ -3916,11 +3913,10 @@ #, c-format msgid "%s ago" -msgstr "" - -#, fuzzy +msgstr "pred %s" + msgid "Logged Off" -msgstr "Prijavljeni" +msgstr "Se je odjavil" msgid "Middle Name" msgstr "Drugo ime" @@ -3943,14 +3939,12 @@ msgid "Temporarily Hide From" msgstr "Za�asno skrij pred" -#. && NOT ME msgid "Cancel Presence Notification" msgstr "Prekli�i obvestilo o prisotnosti" msgid "(Re-)Request authorization" msgstr "Ponovno zahtevaj pooblastitev" -#. if(NOT ME) #. shouldn't this just happen automatically when the buddy is #. removed? msgid "Unsubscribe" @@ -4088,29 +4082,24 @@ msgid "Find Rooms" msgstr "Najdi sobe" -#, fuzzy msgid "Affiliations:" -msgstr "Psevdonim:" - -#, fuzzy +msgstr "Navezave:" + msgid "No users found" msgstr "Ni najdenih uporabnikov" -#, fuzzy msgid "Roles:" -msgstr "Funkcija" - -#, fuzzy +msgstr "Vloge:" + msgid "Ping timed out" msgstr "�asovna prekora�itev pinga" -#, fuzzy msgid "" "Unable to find alternative XMPP connection methods after failing to connect " "directly." msgstr "" "Po neuspehu neposredne povezave ni bilo mogo�e najti drugih povezovalnih " -"metod XMPP.\n" +"metod XMPP." msgid "Invalid XMPP ID" msgstr "Neveljaven ID za XMPP" @@ -4118,9 +4107,8 @@ msgid "Invalid XMPP ID. Domain must be set." msgstr "Neveljaven ID za XMPP. Domena mora biti dolo�ena." -#, fuzzy msgid "Malformed BOSH URL" -msgstr "Nepravilno oblikovan povezovalni stre転nik BOSH" +msgstr "Nepravilno oblikovan URL BOSH" #, c-format msgid "Registration of %s@%s successful" @@ -4189,9 +4177,6 @@ msgid "Change Registration" msgstr "Spremeni registracijo" -msgid "Malformed BOSH Connect Server" -msgstr "Nepravilno oblikovan povezovalni stre転nik BOSH" - msgid "Error unregistering account" msgstr "Napaka pri odregistraciji ra�una" @@ -4553,24 +4538,22 @@ msgid "ban <user> [reason]: Ban a user from the room." msgstr "ban <uporabnik> [razlog]: Prepovej uporabnika v sobi." -#, fuzzy msgid "" "affiliate <owner|admin|member|outcast|none> [nick1] [nick2] ...: Get " "the users with an affiliation or set users' affiliation with the room." msgstr "" -"affiliate <uporabnik> <lastnik|skrbnik|�lan|izlo�enec|nih�e>: " -"Nastavitev uporabnikovega statusa v sobi." - -#, fuzzy +"affiliate <owner|admin|member|outcast|none> [vzdevek1] [vzdevek2] ...: " +"Pridobi navezavo uporabnikov ali nastavi navezavo uporabnikov na sobo." + msgid "" "role <moderator|participant|visitor|none> [nick1] [nick2] ...: Get the " "users with an role or set users' role with the room." msgstr "" -"role <uporabnik> <moderator|participant|visitor|none>: " -"Nastavitev uporabnikove vloge v sobi." +"role <moderator|participant|visitor|none> [vzdevek1] [vzdevek2] ...: " +"Pridobi uporabnike z vlogo ali nastavi vlogo uporabnikov v sobi." msgid "invite <user> [message]: Invite a user to the room." -msgstr "invite <uporabnik> [soba]: Povabite uporabnika v sobo." +msgstr "invite <uporabnik> [sporo�ilo]: Povabite uporabnika v sobo." msgid "join: <room> [password]: Join a chat on this server." msgstr "join: <soba> [geslo]: Pridru転i se pomenku na tem stre転niku." @@ -4629,7 +4612,7 @@ msgstr "Posredovalni stre転niki za prenos datotek" msgid "BOSH URL" -msgstr "" +msgstr "URL BOSH" #. this should probably be part of global smiley theme settings later on, #. shared with MSN @@ -4693,21 +4676,19 @@ msgid "_Accept Defaults" msgstr "_Sprejmi privzeto" -#, fuzzy msgid "No reason" -msgstr "Ni podanega razloga" - -#, fuzzy, c-format +msgstr "Ni razloga" + +#, c-format msgid "You have been kicked: (%s)" -msgstr "Brcnil vas je %s: (%s)" - -#, fuzzy, c-format +msgstr "Brcnjeni ste bili: (%s)" + +#, c-format msgid "Kicked (%s)" -msgstr "Brcnil vas je %s (%s)" - -#, fuzzy +msgstr "Brcnjeni (%s)" + msgid "An error occurred on the in-band bytestream transfer\n" -msgstr "V notranje pasovnem zlogovnem pretoku je pri邸lo do napake\n" +msgstr "Pri prenosu v znotraj pasovnem zlogovnem pretoku je pri邸lo do napake\n" msgid "Transfer was closed." msgstr "Prenos je bil zaprt." @@ -5040,9 +5021,29 @@ msgid "Non-IM Contacts" msgstr "Stiki, s katerimi ne klepetate" -#, fuzzy, c-format +#, c-format +msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>" +msgstr "" +"%s vam je poslal me転ik. <a href='msn-wink://%s'>Kliknite tukaj za " +"predvajanje</a>" + +#, c-format +msgid "%s sent a wink, but it could not be saved" +msgstr "%s vam je poslal me転ik, ki pa ga ni mogo�e shraniti." + +#, c-format +msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>" +msgstr "" +"%s vam je poslal zvo�ni posnetek. <a href='audio://%s'>Kliknite tukaj za " +"predvajanje</a>" + +#, c-format +msgid "%s sent a voice clip, but it could not be saved" +msgstr "%s vam je poslal glasovni posnetek, ki pa ga ni mogo�e shraniti." + +#, c-format msgid "%s sent you a voice chat invite, which is not yet supported." -msgstr "%s vam je poslal povabilo s spletno kamero, kar 邸e ni podprto." +msgstr "%s vam je poslal glasovno povabilo h klepetu, kar 邸e ni podprto." msgid "Nudge" msgstr "Pome転ikni" @@ -5195,6 +5196,29 @@ msgstr "" "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knji転nico SSL." +#, c-format +msgid "" +"Unable to add the buddy %s because the username is invalid. Usernames must " +"be a valid email address." +msgstr "" +"Ni mogo�e dodati prijatelja %s, ker uporabni邸ko ime ni veljavno. Imena so " +"lahko le veljavni e-po邸tni naslovi." + +msgid "Unable to Add" +msgstr "Nemogo�e dodati" + +msgid "Authorization Request Message:" +msgstr "Sporo�ilo o zahtevi po pooblastilu:" + +msgid "Please authorize me!" +msgstr "Prosim za pooblastilo!" + +#. * +#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. +#. +msgid "_OK" +msgstr "V _redu" + msgid "Error retrieving profile" msgstr "Napaka pri pridobivanju profila" @@ -5393,13 +5417,14 @@ msgid "%s just sent you a Nudge!" msgstr "Uporabnik %s vam je ravnokar pome転iknil!" -#, fuzzy, c-format +#, c-format msgid "Unknown error (%d): %s" -msgstr "Neznana napaka (%d)" +msgstr "Neznana napaka (%d): %s" msgid "Unable to add user" msgstr "Ni mogo�e dodati uporabnika" +#. Unknown error! #, c-format msgid "Unknown error (%d)" msgstr "Neznana napaka (%d)" @@ -5476,25 +5501,21 @@ "Napaka povezave s stre転nika %s:\n" "%s" -#, fuzzy msgid "Our protocol is not supported by the server" -msgstr "Stre転nik ne podpira tega protokola." - -#, fuzzy +msgstr "Stre転nik ne podpira na邸ega protokola" + msgid "Error parsing HTTP" -msgstr "Napaka pri parsanju HTTP." - -#, fuzzy +msgstr "Napaka pri raz�lenjevanju HTTP" + msgid "You have signed on from another location" -msgstr "Prijavili ste se z druge lokacije." +msgstr "Prijavili ste se z drugega mesta" msgid "The MSN servers are temporarily unavailable. Please wait and try again." msgstr "" "Stre転niki MSN so trenutno nedostopni. Prosimo po�akajte in poskusite znova." -#, fuzzy msgid "The MSN servers are going down temporarily" -msgstr "Stre転niki MSN se bodo za�asno zaustavili." +msgstr "Stre転niki MSN se bodo za�asno zaustavili" # Data is assumed to be the destination sn #, c-format @@ -5525,9 +5546,9 @@ msgid "Retrieving buddy list" msgstr "Prejemanje seznama prijateljev" -#, fuzzy, c-format +#, c-format msgid "%s requests to view your webcam, but this request is not yet supported." -msgstr "%s vam je poslal povabilo s spletno kamero, kar 邸e ni podprto." +msgstr "%s 転eli gledati va邸o spletno kamero, kar 邸e ni podprto." #, c-format msgid "%s has sent you a webcam invite, which is not yet supported." @@ -5728,14 +5749,14 @@ msgid "Protocol error, code %d: %s" msgstr "Napaka protokola, koda %d: %s" -#, fuzzy, c-format +#, c-format msgid "" "%s Your password is %zu characters, which is longer than the maximum length " "of %d. Please shorten your password at http://profileedit.myspace.com/index." "cfm?fuseaction=accountSettings.changePassword and try again." msgstr "" -"%s Va邸e geslo ima %d znakov, ve� kot je dovoljenih %d znakov za MySpaceIM. " -"Skraj邸ajte svoje geslo na naslovu http://profileedit.myspace.com/index.cfm?" +"%s Va邸e geslo ima %zu znakov, ve� kot je dovoljenih %d znakov. Skraj邸ajte " +"svoje geslo na naslovu http://profileedit.myspace.com/index.cfm?" "fuseaction=accountSettings.changePassword in poskusite znova." msgid "Incorrect username or password" @@ -5831,14 +5852,14 @@ msgid "Client Version" msgstr "Razli�ica odjemalca" -#, fuzzy msgid "" "An error occurred while trying to set the username. Please try again, or " "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username " "to set your username." msgstr "" -"Obi邸�ite http://editprofile.myspace.com/index.cfm?fuseaction=profile." -"username in izberite uporabni邸ko ime ter se znova poskusite prijaviti." +"Pri nastavljanju uporabni邸kega imena je pri邸lo do napake. Poskusite znova " +"ali obi邸�ite http://editprofile.myspace.com/index.cfm?fuseaction=profile." +"username in nastavite svoje uporabni邸ko ime." msgid "MySpaceIM - Username Available" msgstr "MySpaceIM - Uporabni邸ko ime je na voljo" @@ -6096,9 +6117,9 @@ msgid "Unknown error: 0x%X" msgstr "Neznana napaka: 0x%X" -#, fuzzy, c-format +#, c-format msgid "Unable to login: %s" -msgstr "Prijava ni uspela" +msgstr "Prijava ni uspela: %s" #, c-format msgid "Unable to send message. Could not get details for user (%s)." @@ -6229,7 +6250,6 @@ "%s appears to be offline and did not receive the message that you just sent." msgstr "%s ni na zvezi in ni sprejel sporo�ila, ki ste ga pravkar poslali." -#, fuzzy msgid "" "Unable to connect to server. Please enter the address of the server to which " "you wish to connect." @@ -6259,9 +6279,8 @@ msgid "Server port" msgstr "Vrata stre転nika" -#, fuzzy msgid "Received unexpected response from " -msgstr "Prejet neveljaven odgovor HTTP stre転nika." +msgstr "Prejet neveljaven odgovor - " #. username connecting too frequently msgid "" @@ -6271,12 +6290,14 @@ "Povezava ste preve�krat vzpostavili in prekinili. Po�akajte deset minut in " "poskusite ponovno. �e ne po�akate sedaj, boste �akali 邸e dalj." -#, fuzzy, c-format +#, c-format msgid "Error requesting " -msgstr "Napaka pri zahtevanju prijavnega 転etona" +msgstr "Napaka pri zahtevanju - " msgid "AOL does not allow your screen name to authenticate here" msgstr "" +"AOL ne dovoljuje, da bi se va邸e pojavno ime overjalo prek tega spletnega " +"mesta" msgid "Could not join chat room" msgstr "Pogovorni sobi se ni mogo�e pridru転iti" @@ -6284,9 +6305,8 @@ msgid "Invalid chat room name" msgstr "Neveljavno ime sobe" -#, fuzzy msgid "Received invalid data on connection with server" -msgstr "Na povezavi s stre転nikom prejeti neveljavni podatki." +msgstr "Na povezavi s stre転nikom prejeti neveljavni podatki" #. *< type #. *< ui_requirement @@ -6333,7 +6353,6 @@ msgid "Received invalid data on connection with remote user." msgstr "Pri povezavi z oddaljenim uporabnikom prejeti neveljavni podatki." -#, fuzzy msgid "Unable to establish a connection with the remote user." msgstr "Povezave z oddaljenim uporabnikom ni mogo�e vzpostaviti." @@ -6535,15 +6554,13 @@ msgid "Buddy Comment" msgstr "Komentar prijatelja" -#, fuzzy, c-format +#, c-format msgid "Unable to connect to authentication server: %s" -msgstr "" -"Povezava z overovitvenim stre転nikom ni uspela:\n" -"%s" - -#, fuzzy, c-format +msgstr "Povezava z overovitvenim stre転nikom ni uspela: %s" + +#, c-format msgid "Unable to connect to BOS server: %s" -msgstr "Povezava s stre転nikom OIM ni uspela." +msgstr "Povezava s stre転nikom BOS ni uspela: %s" msgid "Username sent" msgstr "Uporabni邸ko ime poslano" @@ -6555,7 +6572,7 @@ msgid "Finalizing connection" msgstr "Dokon�ujem povezavo" -#, fuzzy, c-format +#, c-format msgid "" "Unable to sign on as %s because the username is invalid. Usernames must be " "a valid email address, or start with a letter and contain only letters, " @@ -6584,19 +6601,18 @@ #. Unregistered username #. uid is not exist #. the username does not exist -#, fuzzy msgid "Username does not exist" -msgstr "Uporabnik ne obstaja" +msgstr "Uporabni邸ko ime ne obstaja" #. Suspended account -#, fuzzy msgid "Your account is currently suspended" -msgstr "Va邸 ra�un je trenutno zamrznjen." +msgstr "Va邸 ra�un je trenutno zamrznjen" #. service temporarily unavailable msgid "The AOL Instant Messenger service is temporarily unavailable." msgstr "Storitev AOL neposrednih sporo�il je trenuno nedosegljiva." +#. client too old #, c-format msgid "The client version you are using is too old. Please upgrade at %s" msgstr "" @@ -6604,17 +6620,15 @@ "pri %s" #. IP address connecting too frequently -#, fuzzy msgid "" "You have been connecting and disconnecting too frequently. Wait a minute and " "try again. If you continue to try, you will need to wait even longer." msgstr "" -"Povezava ste preve�krat vzpostavili in prekinili. Po�akajte deset minut in " -"poskusite ponovno. �e ne po�akate sedaj, boste �akali 邸e dalj." - -#, fuzzy +"Povezava ste preve�krat vzpostavili in prekinili. Po�akajte minutko in " +"poskusite znova. �e ne po�akate sedaj, boste �akali 邸e dlje." + msgid "The SecurID key entered is invalid" -msgstr "Vne邸eni klju� SecurID ni veljaven." +msgstr "Vne邸eni klju� SecurID ni veljaven" msgid "Enter SecurID" msgstr "Vnesite SecurID" @@ -6622,12 +6636,6 @@ msgid "Enter the 6 digit number from the digital display." msgstr "Vnesite 邸tevilo s 6 ciframi iz digitalnega prikazovalnika." -#. * -#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons. -#. -msgid "_OK" -msgstr "V _redu" - msgid "Password sent" msgstr "Geslo poslano" @@ -6637,12 +6645,6 @@ msgid "Please authorize me so I can add you to my buddy list." msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev." -msgid "Authorization Request Message:" -msgstr "Sporo�ilo o zahtevi po pooblastilu:" - -msgid "Please authorize me!" -msgstr "Prosim za pooblastilo!" - msgid "No reason given." msgstr "Ni podanega razloga." @@ -7001,18 +7003,16 @@ msgid "Away message too long." msgstr "Spo_ro�ilo o odsotnosti:" -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because the username is invalid. Usernames must " "be a valid email address, or start with a letter and contain only letters, " "numbers and spaces, or contain only numbers." msgstr "" "Ni mogo�e dodati prijatelja %s, ker uporabni邸ko ime ni veljavno. Imena so " -"lahko veljavni e-po邸tni naslovi, se morajo za�eti s �rko, vsebujejo lahko le " -"�rke, 邸tevilke in presledke, lahko pa so tudi sestavljena iz samih 邸tevil." - -msgid "Unable to Add" -msgstr "Nemogo�e dodati" +"lahko veljavni e-po邸tni naslovi ali pa se morajo za�eti s �rko, vsebujejo " +"lahko le �rke, 邸tevilke in presledke, lahko pa so tudi sestavljena iz samih " +"邸tevil." msgid "Unable to Retrieve Buddy List" msgstr "Seznama prijateljev ni bilo mogo�e pridobiti" @@ -7028,18 +7028,18 @@ msgid "Orphans" msgstr "Sirote" -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because you have too many buddies in your buddy " "list. Please remove one and try again." msgstr "" "Prijatelja %s ni bilo mogo�e dodati, ker imate na seznamu preve� " -"prijateljev. Prosim odstranite enega in poskusite ponovno." +"prijateljev. Prosimo, odstranite enega in poskusite ponovno." msgid "(no name)" msgstr "(brez imena)" -#, fuzzy, c-format +#, c-format msgid "Unable to add the buddy %s for an unknown reason." msgstr "Iz neznanega razloga prijatelja %s ni mogo�e dodati." @@ -7202,9 +7202,8 @@ msgid "Search for Buddy by Information" msgstr "I邸�i prijatelja po informaciji" -#, fuzzy msgid "Use clientLogin" -msgstr "Uporabnik ni prijavljen" +msgstr "Uporabi prijavo clientLogin" msgid "" "Always use AIM/ICQ proxy server for\n" @@ -7811,7 +7810,6 @@ msgid "Update interval (seconds)" msgstr "Interval posodabljanja (s)" -#, fuzzy msgid "Unable to decrypt server reply" msgstr "Odgovora stre転nika ni mogo�e de邸ifrirati" @@ -7879,9 +7877,8 @@ msgid "Requesting token" msgstr "Zahtevanje 転etona" -#, fuzzy msgid "Unable to resolve hostname" -msgstr "Ni se bilo mogo�e povezati na stre転nik." +msgstr "Imena stre転nika ni mogo�e razlo�iti" msgid "Invalid server or port" msgstr "Neveljaven stre転nik ali vrata" @@ -7934,7 +7931,6 @@ msgid "QQ Qun Command" msgstr "Ukaz QQ Qun" -#, fuzzy msgid "Unable to decrypt login reply" msgstr "Odgovora na prijavo ni mogo�e de邸ifrirati" @@ -8910,7 +8906,6 @@ msgid "Disconnected by server" msgstr "Stre転nik je prekinil povezavo" -#, fuzzy msgid "Error connecting to SILC Server" msgstr "Napaka pri povezovanju s stre転nikom SILC" @@ -8926,7 +8921,6 @@ msgid "Performing key exchange" msgstr "Izvajanje izmenjave klju�ev" -#, fuzzy msgid "Unable to load SILC key pair" msgstr "Para klju�ev SILC ni mogo�e nalo転iti" @@ -8934,14 +8928,9 @@ msgid "Connecting to SILC Server" msgstr "Povezovanjes stre転nikom SILC" -#, fuzzy -msgid "Unable to not load SILC key pair" -msgstr "Para klju�ev SILC ni mogo�e nalo転iti" - msgid "Out of memory" msgstr "Zmanjkalo je pomnilnika" -#, fuzzy msgid "Unable to initialize SILC protocol" msgstr "Protokola SILC ni mogo�e inicializirati" @@ -9239,9 +9228,8 @@ msgid "Creating SILC key pair..." msgstr "Ustvarjanje para klju�ev SILC ..." -#, fuzzy msgid "Unable to create SILC key pair" -msgstr "Ustvarjanje para klju�ev SILC ni mogo�e\n" +msgstr "Para klju�ev SILC ni mogo�e ustvariti" #. Hint for translators: Please check the tabulator width here and in #. the next strings (short strings: 2 tabs, longer strings 1 tab, @@ -9377,27 +9365,24 @@ msgid "Failure: Authentication failed" msgstr "Napaka: Overovitev ni uspela" -#, fuzzy msgid "Unable to initialize SILC Client connection" -msgstr "Ni mo� za�eti povezave odjemalca SILC" +msgstr "Povezave odjemalca SILC ni mogo�e inicializirati" msgid "John Noname" msgstr "Janez Neimenovani" -#, fuzzy, c-format +#, c-format msgid "Unable to load SILC key pair: %s" -msgstr "Ni mogo�e nalo転iti para klju�ev SILC: %s" +msgstr "Para klju�ev SILC ni mogo�e nalo転iti: %s" msgid "Unable to create connection" msgstr "Ni bilo mogo�e ustvariti povezave" -#, fuzzy msgid "Unknown server response" -msgstr "Neznan odgovor stre転nika." - -#, fuzzy +msgstr "Neznan odgovor stre転nika" + msgid "Unable to create listen socket" -msgstr "Ni mogo�e ustvariti vti�nice" +msgstr "Ni mogo�e ustvariti vti�nice za poslu邸anje" msgid "SIP usernames may not contain whitespaces or @ symbols" msgstr "Uporabni邸ka imena SIP ne smejo vsebovati presledka ali simbola @" @@ -9460,9 +9445,8 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! Protocol Plugin" -msgstr "Vti�nik za protokol Yahoo" +msgstr "Vti�nik za protokol Yahoo!" msgid "Pager server" msgstr "Stre転nik pozivnika" @@ -9491,9 +9475,8 @@ msgid "Yahoo Chat port" msgstr "Vrata klepeta Yahoo" -#, fuzzy msgid "Yahoo JAPAN ID..." -msgstr "Yahoo-ID ..." +msgstr "ID za Yahoo JAPAN ..." #. *< type #. *< ui_requirement @@ -9505,9 +9488,8 @@ #. *< version #. * summary #. * description -#, fuzzy msgid "Yahoo! JAPAN Protocol Plugin" -msgstr "Vti�nik za protokol Yahoo" +msgstr "Vti�nik za protokol Yahoo! JAPAN" msgid "Your SMS was not delivered" msgstr "Va邸 SMS ni bil dostavljen" @@ -9536,32 +9518,28 @@ msgstr "Dodajanje prijatelja zavrnjeno" #. Some error in the received stream -#, fuzzy msgid "Received invalid data" -msgstr "Na povezavi s stre転nikom prejeti neveljavni podatki." +msgstr "Prejeti neveljavni podatki" #. security lock from too many failed login attempts -#, fuzzy msgid "" "Account locked: Too many failed login attempts. Logging into the Yahoo! " "website may fix this." msgstr "" -"Neznana 邸tevilka napake %d. Prijavljanje v spletno stran Yahoo! lahko to " -"odpravi." +"Ra�un zaklenjen: Preve� neuspelih poskusov prijave. Prijavljanje v spletno " +"stran Yahoo! lahko to odpravi." #. indicates a lock of some description -#, fuzzy msgid "" "Account locked: Unknown reason. Logging into the Yahoo! website may fix " "this." msgstr "" -"Neznana 邸tevilka napake %d. Prijavljanje v spletno stran Yahoo! lahko to " -"odpravi." +"Ra�un zaklenjen: Razlog ni znan. Prijavljanje v spletno stran Yahoo! lahko " +"to odpravi." #. username or password missing -#, fuzzy msgid "Username or password missing" -msgstr "Neveljavno uporabni邸ko ime ali geslo" +msgstr "Manjka uporabni邸ko ime ali geslo" #, c-format msgid "" @@ -9595,13 +9573,12 @@ "Neznana 邸tevilka napake %d. Prijavljanje v spletno stran Yahoo! lahko to " "odpravi." -#, fuzzy, c-format +#, c-format msgid "Unable to add buddy %s to group %s to the server list on account %s." msgstr "" -"Ni mogo�e dodati prijatelja %s v skupino %s na seznamu stre転nikov za ra�un %" +"Prijatelja %s ni mogo�e dodati v skupino %s na seznamu stre転nikov za ra�un %" "s." -#, fuzzy msgid "Unable to add buddy to server list" msgstr "Prijatelja ni mogo�e dodati ne seznam stre転nikov" @@ -9609,19 +9586,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s" msgstr "[ Sli邸ni %s/%s/%s.swf ] %s" -#, fuzzy msgid "Received unexpected HTTP response from server" -msgstr "Prejet neveljaven odgovor HTTP stre転nika." - -#, fuzzy, c-format +msgstr "Prejet neveljaven odgovor HTTP s stre転nika" + +#, c-format msgid "Lost connection with %s: %s" -msgstr "" -"Izgubljena povezava s stre転nikom %s:\n" -"%s" - -#, fuzzy, c-format +msgstr "Izgubljena povezava s stre転nikom %s: %s" + +#, c-format msgid "Unable to establish a connection with %s: %s" -msgstr "Povezave s stre転nikom ni mogo�e vzpostaviti" +msgstr "Povezave s stre転nikom %s ni mogo�e vzpostaviti: %s" msgid "Not at Home" msgstr "Nisem doma" @@ -9669,7 +9643,7 @@ msgstr "Za�ni Doodlati" msgid "Select the ID you want to activate" -msgstr "" +msgstr "Izberite ID, ki ga 転elite aktivirati" msgid "Join whom in chat?" msgstr "Komu se 転elite pridru転iti v pomenku?" @@ -9769,11 +9743,8 @@ msgstr "Uporabnikov profil je prazen." #, c-format -msgid "%s declined your conference invitation to room \"%s\" because \"%s\"." -msgstr "%s je zavrnil va邸e povabilo za pogovor v sobi \"%s\", ker \"%s\"." - -msgid "Invitation Rejected" -msgstr "Povabilo zavrnjeno" +msgid "%s has declined to join." +msgstr "%s se ne 転eli pridru転iti." msgid "Failed to join chat" msgstr "Pomenku se ni mogo�e pridru転iti" @@ -9825,9 +9796,8 @@ msgid "User Rooms" msgstr "Sobe uporabnikov" -#, fuzzy msgid "Connection problem with the YCHT server" -msgstr "Te転ava s povezavo s stre転nikom YCHT." +msgstr "Te転ava s povezavo s stre転nikom YCHT" msgid "" "(There was an error converting this message.\t Check the 'Encoding' option " @@ -9963,19 +9933,19 @@ msgstr "Izpostavljanje" # Data is assumed to be the destination sn -#, fuzzy, c-format +#, c-format msgid "Unable to parse response from HTTP proxy: %s" -msgstr "Ni mo� raz�leniti odziva posredovalnega stre転nika HTTP: %s\n" +msgstr "Ni mo� raz�leniti odziva posredovalnega stre転nika HTTP: %s" #, c-format msgid "HTTP proxy connection error %d" msgstr "Napaka pri povezavi na posredovalni stre転nik HTTP %d" -#, fuzzy, c-format +#, c-format msgid "Access denied: HTTP proxy server forbids port %d tunneling" msgstr "" "Dostop zavrnjen: posredovalni stre転nik HTTP ne dovoljuje preusmerjanja vrat %" -"d." +"d" #, c-format msgid "Error resolving %s" @@ -10281,8 +10251,8 @@ msgid "Use this buddy _icon for this account:" msgstr "Za ta ra�un uporabi to _ikono prijatelja:" -msgid "_Advanced" -msgstr "N_apredno" +msgid "Ad_vanced" +msgstr "Nap_redno" msgid "Use GNOME Proxy Settings" msgstr "Uporabi nastavitve posredovalnih stre転nikov GNOME" @@ -10344,8 +10314,8 @@ msgid "Create _this new account on the server" msgstr "_Ustvari ta nov ra�un na stre転niku" -msgid "_Proxy" -msgstr "_Posredovalni stre転nik" +msgid "P_roxy" +msgstr "Posre_dovalni stre転nik" msgid "Enabled" msgstr "Omogo�en" @@ -10396,9 +10366,8 @@ msgid "Please update the necessary fields." msgstr "Prosimo, posodobite potrebna polja." -#, fuzzy msgid "A_ccount" -msgstr "Ra_�un:" +msgstr "Ra_�un" msgid "" "Please enter the appropriate information about the chat you would like to " @@ -10441,11 +10410,9 @@ msgid "View _Log" msgstr "Poka転i _dnevnik" -#, fuzzy msgid "Hide When Offline" msgstr "Skrij, �e nepovezan" -#, fuzzy msgid "Show When Offline" msgstr "Poka転i, �e nepovezan" @@ -10855,111 +10822,98 @@ msgid "Background Color" msgstr "Barva ozadja" -#, fuzzy msgid "The background color for the buddy list" -msgstr "Skupina je bila dodana na va邸 seznam prijateljev." - -#, fuzzy +msgstr "Barva ozadja seznama prijateljev" + msgid "Layout" -msgstr "lao邸ko" +msgstr "Postavitev" msgid "The layout of icons, name, and status of the blist" -msgstr "" +msgstr "Postavitev ikon, imen in stanj na seznamu prijateljev" #. Group -#, fuzzy msgid "Expanded Background Color" -msgstr "Barva ozadja" +msgstr "Barva raz邸irjenega ozadja" msgid "The background color of an expanded group" -msgstr "" - -#, fuzzy +msgstr "Barva ozadja razpostrte skupine" + msgid "Expanded Text" -msgstr "_Raz邸iri" +msgstr "Raz邸irjeno besedilo" msgid "The text information for when a group is expanded" -msgstr "" - -#, fuzzy +msgstr "Besedilna informacija, ko je skupina razpostrta" + msgid "Collapsed Background Color" -msgstr "Nastavi barvo ozadja" +msgstr "Barva strnjenega ozadja" msgid "The background color of a collapsed group" -msgstr "" - -#, fuzzy +msgstr "Barva ozadja strnjene skupine" + msgid "Collapsed Text" -msgstr "_Strni" +msgstr "Strnjeno besedilo" msgid "The text information for when a group is collapsed" -msgstr "" +msgstr "Besedilna informacija, ko je skupina strnjena" #. Buddy -#, fuzzy msgid "Contact/Chat Background Color" -msgstr "Nastavi barvo ozadja" +msgstr "Barva ozadja stika/klepeta" msgid "The background color of a contact or chat" -msgstr "" - -#, fuzzy +msgstr "Barva ozadja stika ali klepeta" + msgid "Contact Text" -msgstr "Besedilo za bli転njico" +msgstr "Besedilo za stik" msgid "The text information for when a contact is expanded" -msgstr "" - -#, fuzzy +msgstr "Besedilna informacija, ko je stik razpostrt" + msgid "On-line Text" -msgstr "Prisoten" +msgstr "Besedilo ob prisotnosti" msgid "The text information for when a buddy is online" -msgstr "" - -#, fuzzy +msgstr "Besedilna informacija, ko je prijatelj povezan" + msgid "Away Text" -msgstr "Odsoten" +msgstr "Besedilo ob odsotnosti" msgid "The text information for when a buddy is away" -msgstr "" - -#, fuzzy +msgstr "Besedilna informacija, ko je prijatelj nepovezan" + msgid "Off-line Text" -msgstr "Brez povezave" +msgstr "Besedilo ob nepovezanosti" msgid "The text information for when a buddy is off-line" -msgstr "" - -#, fuzzy +msgstr "Besedilna informacija, ko je prijatelj nepovezan" + msgid "Idle Text" -msgstr "Besedilo razpolo転enja" +msgstr "Besedilo ob nedejavnosti" msgid "The text information for when a buddy is idle" -msgstr "" - -#, fuzzy +msgstr "Besedilna informacija, ko je prijatelj nedejaven" + msgid "Message Text" -msgstr "Sporo�ilo poslano" +msgstr "Besedilo sporo�ila" msgid "The text information for when a buddy has an unread message" -msgstr "" +msgstr "Besedilna informacija, ko ima prijatelj neprebrano sporo�ilo" msgid "Message (Nick Said) Text" -msgstr "" +msgstr "Besedilo sporo�ila (je rekel vzdevek)" msgid "" "The text information for when a chat has an unread message that mentions " "your nick" msgstr "" - -#, fuzzy +"Besedilna informacija, ko je v pomenku neprebrano sporo�ilo, ki omenja va邸 " +"vzdevek" + msgid "The text information for a buddy's status" -msgstr "Spremeni podatke za uporabika %s" - -#, fuzzy +msgstr "Besedilni podatki o stanju uporabika" + msgid "Type the host name for this certificate." -msgstr "Vnesite ime gostitelja, kateremu je namenjeno to digitalno potrdilo." +msgstr "Vnesite ime gostitelja za to digitalno potrdilo." #. Widget creation function msgid "SSL Servers" @@ -11007,7 +10961,6 @@ msgid "Get Away Message" msgstr "Sporo�ilo o odsotnosti" -#, fuzzy msgid "Last Said" msgstr "Nazadnje re�eno" @@ -11458,9 +11411,8 @@ msgid "Hungarian" msgstr "mad転arsko" -#, fuzzy msgid "Armenian" -msgstr "romunsko" +msgstr "armensko" msgid "Indonesian" msgstr "indonezijsko" @@ -11559,7 +11511,7 @@ msgstr "邸vedsko" msgid "Swahili" -msgstr "" +msgstr "svahili" msgid "Tamil" msgstr "tamilsko" @@ -11871,14 +11823,6 @@ msgid "File transfer _details" msgstr "Po_drobnosti o prenosu" -#. Pause button -msgid "_Pause" -msgstr "_Premor" - -#. Resume button -msgid "_Resume" -msgstr "_Nadaljuj" - msgid "Paste as Plain _Text" msgstr "Prilepi kot navadno be_sedilo" @@ -11897,9 +11841,8 @@ msgid "Hyperlink visited color" msgstr "Barva obiskane povezave" -#, fuzzy msgid "Color to draw hyperlink after it has been visited (or activated)." -msgstr "Barva za izpis hiperpovezav, ki ste jih 転e obiskali (ali aktivirali)." +msgstr "Barva za izpis hiperpovezav, ko ste jih 転e obiskali (ali aktivirali)." msgid "Hyperlink prelight color" msgstr "Barva presvetljene povezave" @@ -11935,21 +11878,18 @@ msgid "Action Message Name Color for Whispered Message" msgstr "Ime barve sporo�ila dejanja za 邸epetano sporo�ilo" -#, fuzzy msgid "Color to draw the name of a whispered action message." -msgstr "Barva izrisa imena na sporo�ilo dejanja." +msgstr "Barva izrisa imena za 邸epetano sporo�ilo dejanja." msgid "Whisper Message Name Color" msgstr "Barva imena 邸epetanega sporo�ila" -#, fuzzy msgid "Color to draw the name of a whispered message." -msgstr "Barva izrisa imena na sporo�ilo dejanja." +msgstr "Barva izrisa imena za 邸epetano sporo�ilo." msgid "Typing notification color" msgstr "Barva obvestila o tipkanju" -#, fuzzy msgid "The color to use for the typing notification" msgstr "Barva pisave za obvestilo o tipkanju" @@ -12537,17 +12477,14 @@ msgid "Unknown.... Please report this!" msgstr "Neznano ... Poro�ajte o tem!" -#, fuzzy msgid "Theme failed to unpack." -msgstr "Teme smej�kov ni mogo�e razpakirati." - -#, fuzzy +msgstr "Teme ni mogo�e razpakirati." + msgid "Theme failed to load." -msgstr "Teme smej�kov ni mogo�e razpakirati." - -#, fuzzy +msgstr "Tema se ni nalo転ila." + msgid "Theme failed to copy." -msgstr "Teme smej�kov ni mogo�e razpakirati." +msgstr "Teme ni mogo�e kopirati." msgid "Install Theme" msgstr "Namesti temo" @@ -12582,9 +12519,8 @@ msgid "On unread messages" msgstr "ob neprebranih sporo�ilih" -#, fuzzy msgid "Conversation Window" -msgstr "Pogovorna okna" +msgstr "Okno pogovora" msgid "_Hide new IM conversations:" msgstr "Skrij nove po_govore IM:" @@ -12687,9 +12623,9 @@ msgid "<span style=\"italic\">Example: stunserver.org</span>" msgstr "<span style=\"italic\">Primer: stunserver.org</span>" -#, fuzzy, c-format +#, c-format msgid "Use _automatically detected IP address: %s" -msgstr "_Samozaznaj naslov IP" +msgstr "Uporabi _samozaznani naslov IP: %s" msgid "Public _IP:" msgstr "Javni _IP:" @@ -13091,9 +13027,8 @@ msgid "Custom Smiley Manager" msgstr "Upravitelj smej�kov po meri" -#, fuzzy msgid "Select Buddy Icon" -msgstr "Izberi prijatelja" +msgstr "Izberite ikono prijatelja" msgid "Click to change your buddyicon for this account." msgstr "Kliknite, �e 転elite za ta ra�un spremeniti ikono prijatelja." @@ -13177,7 +13112,6 @@ msgid "Cannot send launcher" msgstr "Ni mogo�e poslati zaganjalnika" -#, fuzzy msgid "" "You dragged a desktop launcher. Most likely you wanted to send the target of " "this launcher instead of this launcher itself." @@ -13225,9 +13159,21 @@ msgid "_Copy Email Address" msgstr "_Kopiraj naslov e-po邸te" +msgid "_Open File" +msgstr "_Odpri datoteko" + +msgid "Open _Containing Directory" +msgstr "Odpri v_sebujo�o mapo" + msgid "Save File" msgstr "Shrani datoteko" +msgid "_Play Sound" +msgstr "_Predvajaj zvok" + +msgid "_Save File" +msgstr "_Shrani datoteko" + msgid "Select color" msgstr "Izberite barvo" @@ -13252,6 +13198,9 @@ msgid "_Open Mail" msgstr "_Odpri po邸to" +msgid "_Pause" +msgstr "_Premor" + msgid "_Edit" msgstr "_Uredi" @@ -13315,78 +13264,65 @@ msgid "Displays statistical information about your buddies' availability" msgstr "Prika転e statisti�ne podatke o dostopnosti va邸ega prijatelja" -#, fuzzy msgid "Server name request" -msgstr "Naslov stre転nika" - -#, fuzzy +msgstr "Zahteva po imenu stre転nika" + msgid "Enter an XMPP Server" -msgstr "Vnesite konferen�ni stre転nik" - -#, fuzzy +msgstr "Vnesite stre転nik XMPP" + msgid "Select an XMPP server to query" -msgstr "Izberite konferen�ni stre転nik za pogovor" - -#, fuzzy +msgstr "Izberite stre転nik XMPP za poizvedbo" + msgid "Find Services" -msgstr "Storitve na zvezi" - -#, fuzzy +msgstr "Najdi storitve" + msgid "Add to Buddy List" -msgstr "Po邸lji seznam prijateljev" - -#, fuzzy +msgstr "Dodaj na seznam prijateljev" + msgid "Gateway" -msgstr "postane odsoten" - -#, fuzzy +msgstr "Prehod" + msgid "Directory" -msgstr "Mapa dnevnika" - -#, fuzzy +msgstr "Imenik" + msgid "PubSub Collection" -msgstr "Izbira zvoka" - -#, fuzzy +msgstr "Zbirka PubSub" + msgid "PubSub Leaf" -msgstr "Storitev PubSub" - -#, fuzzy +msgstr "List PubSub" + msgid "" "\n" "<b>Description:</b> " -msgstr "Opis" +msgstr "" +"\n" +"<b>Opis:</b> " #. Create the window. -#, fuzzy msgid "Service Discovery" -msgstr "Podatki iskanja storitev" - -#, fuzzy +msgstr "Odkrivanje storitev" + msgid "_Browse" -msgstr "_Brskalnik:" - -#, fuzzy +msgstr "Pre_brskaj" + msgid "Server does not exist" -msgstr "Uporabnik ne obstaja" - -#, fuzzy +msgstr "Stre転nik ne obstaja" + msgid "Server does not support service discovery" -msgstr "Stre転nik ne podpira blokiranja" - -#, fuzzy +msgstr "Stre転nik ne podpira odkrivanja storitev" + msgid "XMPP Service Discovery" -msgstr "Podatki iskanja storitev" +msgstr "Odkrivanje storitev XMPP" msgid "Allows browsing and registering services." -msgstr "" - -#, fuzzy +msgstr "Dovoljuje brskanje in registracijo storitev." + msgid "" "This plugin is useful for registering with legacy transports or other XMPP " "services." msgstr "" -"Ta vti�nik je uporaben za razhro邸�evanje stre転nikov ali odjemalcev XMPP." +"Ta vti�nik je uporaben za registriranje z opu邸�enimi prenosi ali drugimi " +"storitvami XMPP." msgid "Buddy is idle" msgstr "Prijatelj je nedejaven" @@ -13775,12 +13711,11 @@ msgstr "Vti�nik za glasbeno sporo�anje - za skupinsko skladanje." #. * summary -#, fuzzy msgid "" "The Music Messaging Plugin allows a number of users to simultaneously work " "on a piece of music by editing a common score in real-time." msgstr "" -"Vti�nik za glasbeno sporo�anje omogo�a ve� uporabnikom hkratno sodelovanju " +"Vti�nik za glasbeno sporo�anje omogo�a ve� uporabnikom hkratno sodelovanje " "pri glasbenem ustvarjanju kompozicije v resni�nem �asu." #. ---------- "Notify For" ---------- @@ -13907,7 +13842,6 @@ msgid "Highlighted Message Name Color" msgstr "Ime barve poudarjenih sporo�il" -#, fuzzy msgid "Typing Notification Color" msgstr "Barva obvestila o tipkanju" @@ -13940,23 +13874,20 @@ msgid "GTK+ Text Shortcut Theme" msgstr "Tema bli転njic besedila GTK+" -#, fuzzy msgid "Disable Typing Notification Text" -msgstr "Omogo�i obve邸�anje o tipkanju" - -#, fuzzy +msgstr "Onemogo�i obve邸�anje o tipkanju" + msgid "GTK+ Theme Control Settings" -msgstr "Nadzor teme Pidgin GTK+ v Pidginu" - -#, fuzzy +msgstr "Nadzorne nastavitve teme GTK+" + msgid "Colors" -msgstr "Zapri" +msgstr "Barve" msgid "Fonts" msgstr "Pisave" msgid "Miscellaneous" -msgstr "" +msgstr "Razno" msgid "Gtkrc File Tools" msgstr "Datote�na orodja Gtkrc" @@ -14041,13 +13972,12 @@ msgstr "Gumb Po邸lji okna pogovora" #. *< summary -#, fuzzy msgid "" "Adds a Send button to the entry area of the conversation window. Intended " "for use when no physical keyboard is present." msgstr "" "Doda gumb Po邸lji v vnosno obmo�je pogovornega okna. Namenjeno za primere, ko " -"fizi�na tipkovnica ni prisotna." +"tipkovnica ni fizi�no prisotna." msgid "Duplicate Correction" msgstr "Popravek dvojnikov" @@ -14100,94 +14030,81 @@ msgstr "" "Zamenja besedilo v odhodnih sporo�ilih po uporabni邸ko dolo�enih pravilih." -#, fuzzy msgid "Just logged in" -msgstr "Neprijavljen" - -#, fuzzy +msgstr "Ravnokar prijavljen" + msgid "Just logged out" -msgstr "Neprijavljen" +msgstr "Ravnokar odjavljen" msgid "" "Icon for Contact/\n" "Icon for Unknown person" msgstr "" - -#, fuzzy +"Ikona stika/\n" +"Ikona neznane osebe" + msgid "Icon for Chat" -msgstr "Pridru転i se pomenku" - -#, fuzzy +msgstr "Ikona pomenka" + msgid "Ignored" -msgstr "Prezri" - -#, fuzzy +msgstr "Prezrt" + msgid "Founder" -msgstr "glasneje" - -#, fuzzy +msgstr "Ustanovitelj" + +#. A user in a chat room who has special privileges. msgid "Operator" -msgstr "Opera" - +msgstr "Operater" + +#. A half operator is someone who has a subset of the privileges +#. that an operator has. msgid "Half Operator" -msgstr "" - -#, fuzzy +msgstr "Pol-operater" + msgid "Authorization dialog" -msgstr "Pooblastilo odobreno" - -#, fuzzy +msgstr "Pogovorno okno overjanja" + msgid "Error dialog" -msgstr "Napaka" - -#, fuzzy +msgstr "Pogovorno okno napake" + msgid "Information dialog" -msgstr "Podatki" +msgstr "Informativno pogovorno okno" msgid "Mail dialog" -msgstr "" - -#, fuzzy +msgstr "Po邸tno pogovorno okno" + msgid "Question dialog" -msgstr "Pogovorno okno zahteve" - -#, fuzzy +msgstr "Vpra邸alno pogovorno okno" + msgid "Warning dialog" -msgstr "Stopnja opozoril" +msgstr "Opozorilno pogovorno okno" msgid "What kind of dialog is this?" -msgstr "" - -#, fuzzy +msgstr "Kak邸ne vrste pogovorno okno je to?" + msgid "Status Icons" -msgstr "Stanje za %s" - -#, fuzzy +msgstr "Ikone stanja" + msgid "Chatroom Emblems" -msgstr "Razpored tipk sobe pomenkov" - -#, fuzzy +msgstr "Emblemi sobe pomenkov" + msgid "Dialog Icons" -msgstr "Spremeni ikono" - -#, fuzzy +msgstr "Ikone pogovora" + msgid "Pidgin Icon Theme Editor" -msgstr "Nadzor teme Pidgin GTK+ v Pidginu" - -#, fuzzy +msgstr "Urejevalnik tem ikon Pidgin" + msgid "Contact" -msgstr "Podatki o stiku" - -#, fuzzy +msgstr "Stik" + msgid "Pidgin Buddylist Theme Editor" -msgstr "Tema seznama prijateljev" - -#, fuzzy +msgstr "Urejevalnik tem seznama prijateljev Pidgin" + msgid "Edit Buddylist Theme" -msgstr "Tema seznama prijateljev" +msgstr "Uredi temo seznama prijateljev" msgid "Edit Icon Theme" -msgstr "" +msgstr "Uredi temo ikon" #. *< type #. *< ui_requirement @@ -14196,16 +14113,14 @@ #. *< priority #. *< id #. * description -#, fuzzy msgid "Pidgin Theme Editor" -msgstr "Nadzor teme Pidgin GTK+ v Pidginu" +msgstr "Urejevalnik tem Pidgin" #. *< name #. *< version #. * summary -#, fuzzy msgid "Pidgin Theme Editor." -msgstr "Nadzor teme Pidgin GTK+ v Pidginu" +msgstr "Urejevalnik tem Pidgin." #. *< type #. *< ui_requirement @@ -14374,11 +14289,10 @@ msgid "Options specific to Pidgin for Windows." msgstr "Nastavitve, specifi�ne za %s v okolju Windows." -#, fuzzy msgid "" "Provides options specific to Pidgin for Windows, such as buddy list docking." msgstr "" -"Ponuja nastavitve, specifi�ne za %s v okolju Windows, kot je sidranje " +"Ponuja nastavitve, specifi�ne za Pidgin v okolju Windows, kot je sidranje " "seznama prijateljev." msgid "<font color='#777777'>Logged out.</font>" @@ -14419,6 +14333,22 @@ msgstr "" "Ta vti�nik je uporaben za razhro邸�evanje stre転nikov ali odjemalcev XMPP." +#~ msgid "Malformed BOSH Connect Server" +#~ msgstr "Nepravilno oblikovan povezovalni stre転nik BOSH" + +#~ msgid "Unable to not load SILC key pair" +#~ msgstr "Para klju�ev SILC ni mogo�e nalo転iti" + +#~ msgid "" +#~ "%s declined your conference invitation to room \"%s\" because \"%s\"." +#~ msgstr "%s je zavrnil va邸e povabilo za pogovor v sobi \"%s\", ker \"%s\"." + +#~ msgid "Invitation Rejected" +#~ msgstr "Povabilo zavrnjeno" + +#~ msgid "_Resume" +#~ msgstr "_Nadaljuj" + #~ msgid "Cannot open socket" #~ msgstr "Vti�nice ni mogo�e odpreti" @@ -14453,12 +14383,132 @@ #~ msgid "Write error" #~ msgstr "Napaka pri pisanju" +#~ msgid "Read Error" +#~ msgstr "Napaka pri branju" + +#~ msgid "Failed to connect to server." +#~ msgstr "Povezava na stre転nik neuspe邸na." + +#~ msgid "Read buffer full (2)" +#~ msgstr "Bralni predpomnilnik je poln (2)" + +#~ msgid "Unparseable message" +#~ msgstr "Sporo�ila ni mogo�e raz�leniti" + +#~ msgid "Couldn't connect to host: %s (%d)" +#~ msgstr "Povezava z gostiteljem ni uspela: %s (%d)" + +#~ msgid "Login failed (%s)." +#~ msgstr "Prijava spodletela (%s)." + +#~ msgid "Unable to connect to server." +#~ msgstr "Ni se bilo mogo�e povezati na stre転nik." + +#~ msgid "" +#~ "You have been logged out because you logged in at another workstation." +#~ msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni." + +#~ msgid "Error. SSL support is not installed." +#~ msgstr "Napaka. Podpora SSL ni name邸�ena." + +#~ msgid "Incorrect password." +#~ msgstr "Neveljavno geslo." + +#~ msgid "" +#~ "Could not connect to BOS server:\n" +#~ "%s" +#~ msgstr "" +#~ "Povezava na stre転nik BOS ni uspela:\n" +#~ "%s" + +#~ msgid "You may be disconnected shortly. Check %s for updates." +#~ msgstr "" +#~ "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve." + +#~ msgid "Could Not Connect" +#~ msgstr "Povezava ni uspela" + +#~ msgid "Could not decrypt server reply" +#~ msgstr "Odgovora stre転nika ni mogo�e de邸ifrirati" + +#~ msgid "Invalid username." +#~ msgstr "Neveljavno uporabni邸ko ime." + +#~ msgid "Connection lost" +#~ msgstr "Povezava izgubljena" + +#~ msgid "Couldn't resolve host" +#~ msgstr "Gostitelja ni mogo�e razbrati" + +#~ msgid "Connection closed (writing)" +#~ msgstr "Povezava zaprta (pisanje)" + +#~ msgid "Connection reset" +#~ msgstr "Povezava ponovno nastavljena" + +#~ msgid "Error reading from socket: %s" +#~ msgstr "Napaka pri branju iz vti�nice: %s" + +#~ msgid "Unable to connect to host" +#~ msgstr "Ni se bilo mogo�e povezati na stre転nik." + +#~ msgid "Could not write" +#~ msgstr "Ni mogo�e pisati" + +#~ msgid "Could not connect" +#~ msgstr "Povezava ni uspela" + +#~ msgid "Could not create listen socket" +#~ msgstr "Vti�nice ni bilo mogo�e ustvariti" + +#~ msgid "Could not resolve hostname" +#~ msgstr "Imena stre転nika ni mogo�e razlo�iti" + +#~ msgid "Incorrect Password" +#~ msgstr "Nepravilno geslo" + +#~ msgid "" +#~ "Could not establish a connection with %s:\n" +#~ "%s" +#~ msgstr "" +#~ "Povezave s stre転nikom %s ni mogo�e vzpostaviti:\n" +#~ "%s" + +#~ msgid "Yahoo Japan" +#~ msgstr "Yahoo Japonska" + +#~ msgid "Japan Pager server" +#~ msgstr "Japonski stre転nik pozivnika" + +#~ msgid "Japan file transfer server" +#~ msgstr "Japonski stre転nik prenosa datotek" + +#~ msgid "" +#~ "Lost connection with server\n" +#~ "%s" +#~ msgstr "" +#~ "Izgubljena povezava s stre転nikom\n" +#~ "%s" + +#~ msgid "Could not resolve host name" +#~ msgstr "Imena stre転nika ni mo転no razlo�iti" + +#~ msgid "" +#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support " +#~ "was found." +#~ msgstr "" +#~ "Povezava z %s ni uspela: stre転nik zahteva TLS/SSL za prijavo, vendar " +#~ "podpore za TLS/SSL ni mogo�e najti." + +#~ msgid "_Proxy" +#~ msgstr "_Posredovalni stre転nik" + +#~ msgid "Conversation Window Hiding" +#~ msgstr "Skrivanje okna pogovora" + #~ msgid "Last Activity" #~ msgstr "Zadnja dejavnost" -#~ msgid "Service Discovery Info" -#~ msgstr "Podatki iskanja storitev" - #~ msgid "Service Discovery Items" #~ msgstr "Elementi razpoznave storitev" @@ -14477,9 +14527,6 @@ #~ msgid "Ad-Hoc Commands" #~ msgstr "Improvizirani ukazi" -#~ msgid "PubSub Service" -#~ msgstr "Storitev PubSub" - #~ msgid "SOCKS5 Bytestreams" #~ msgstr "Bajtni tokovi SOCKS5" @@ -14597,127 +14644,6 @@ #~ msgid "Hop Check" #~ msgstr "Preveri hop" -#~ msgid "Read Error" -#~ msgstr "Napaka pri branju" - -#~ msgid "Failed to connect to server." -#~ msgstr "Povezava na stre転nik neuspe邸na." - -#~ msgid "Read buffer full (2)" -#~ msgstr "Bralni predpomnilnik je poln (2)" - -#~ msgid "Unparseable message" -#~ msgstr "Sporo�ila ni mogo�e raz�leniti" - -#~ msgid "Couldn't connect to host: %s (%d)" -#~ msgstr "Povezava z gostiteljem ni uspela: %s (%d)" - -#~ msgid "Login failed (%s)." -#~ msgstr "Prijava spodletela (%s)." - -#~ msgid "Unable to connect to server." -#~ msgstr "Ni se bilo mogo�e povezati na stre転nik." - -#~ msgid "" -#~ "You have been logged out because you logged in at another workstation." -#~ msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni." - -#~ msgid "Error. SSL support is not installed." -#~ msgstr "Napaka. Podpora SSL ni name邸�ena." - -#~ msgid "Incorrect password." -#~ msgstr "Neveljavno geslo." - -#~ msgid "" -#~ "Could not connect to BOS server:\n" -#~ "%s" -#~ msgstr "" -#~ "Povezava na stre転nik BOS ni uspela:\n" -#~ "%s" - -#~ msgid "You may be disconnected shortly. Check %s for updates." -#~ msgstr "" -#~ "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve." - -#~ msgid "Could Not Connect" -#~ msgstr "Povezava ni uspela" - -#~ msgid "Could not decrypt server reply" -#~ msgstr "Odgovora stre転nika ni mogo�e de邸ifrirati" - -#~ msgid "Invalid username." -#~ msgstr "Neveljavno uporabni邸ko ime." - -#~ msgid "Connection lost" -#~ msgstr "Povezava izgubljena" - -#~ msgid "Couldn't resolve host" -#~ msgstr "Gostitelja ni mogo�e razbrati" - -#~ msgid "Connection closed (writing)" -#~ msgstr "Povezava zaprta (pisanje)" - -#~ msgid "Connection reset" -#~ msgstr "Povezava ponovno nastavljena" - -#~ msgid "Error reading from socket: %s" -#~ msgstr "Napaka pri branju iz vti�nice: %s" - -#~ msgid "Unable to connect to host" -#~ msgstr "Ni se bilo mogo�e povezati na stre転nik." - -#~ msgid "Could not write" -#~ msgstr "Ni mogo�e pisati" - -#~ msgid "Could not connect" -#~ msgstr "Povezava ni uspela" - -#~ msgid "Could not create listen socket" -#~ msgstr "Vti�nice ni bilo mogo�e ustvariti" - -#~ msgid "Could not resolve hostname" -#~ msgstr "Imena stre転nika ni mogo�e razlo�iti" - -#, fuzzy -#~ msgid "Incorrect Password" -#~ msgstr "Neveljavno geslo" - -#~ msgid "" -#~ "Could not establish a connection with %s:\n" -#~ "%s" -#~ msgstr "" -#~ "Povezave s stre転nikom %s ni mogo�e vzpostaviti:\n" -#~ "%s" - -#~ msgid "Yahoo Japan" -#~ msgstr "Yahoo Japonska" - -#~ msgid "Japan Pager server" -#~ msgstr "Japonski stre転nik pozivnika" - -#~ msgid "Japan file transfer server" -#~ msgstr "Japonski stre転nik prenosa datotek" - -#~ msgid "" -#~ "Lost connection with server\n" -#~ "%s" -#~ msgstr "" -#~ "Izgubljena povezava s stre転nikom\n" -#~ "%s" - -#~ msgid "Could not resolve host name" -#~ msgstr "Imena stre転nika ni mo転no razlo�iti" - -#~ msgid "" -#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support " -#~ "was found." -#~ msgstr "" -#~ "Povezava z %s ni uspela: stre転nik zahteva TLS/SSL za prijavo, vendar " -#~ "podpore za TLS/SSL ni mogo�e najti." - -#~ msgid "Conversation Window Hiding" -#~ msgstr "Skrivanje okna pogovora" - #~ msgid "Activate which ID?" #~ msgstr "Kateri ID naj bo aktiviran?"