Menu
▾
▴
pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(106) |
Oct
(334) |
Nov
(246) |
Dec
(145) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(42) |
Feb
(53) |
Mar
(232) |
Apr
(109) |
May
(137) |
Jun
(63) |
Jul
(26) |
Aug
(263) |
Sep
(193) |
Oct
(507) |
Nov
(440) |
Dec
(241) |
| 2003 |
Jan
(567) |
Feb
(195) |
Mar
(504) |
Apr
(481) |
May
(524) |
Jun
(522) |
Jul
(594) |
Aug
(502) |
Sep
(643) |
Oct
(508) |
Nov
(430) |
Dec
(377) |
| 2004 |
Jan
(361) |
Feb
(251) |
Mar
(219) |
Apr
(499) |
May
(461) |
Jun
(419) |
Jul
(314) |
Aug
(519) |
Sep
(416) |
Oct
(247) |
Nov
(305) |
Dec
(382) |
| 2005 |
Jan
(267) |
Feb
(282) |
Mar
(327) |
Apr
(338) |
May
(189) |
Jun
(400) |
Jul
(462) |
Aug
(530) |
Sep
(316) |
Oct
(523) |
Nov
(481) |
Dec
(650) |
| 2006 |
Jan
(536) |
Feb
(361) |
Mar
(287) |
Apr
(146) |
May
(101) |
Jun
(169) |
Jul
(221) |
Aug
(498) |
Sep
(300) |
Oct
(236) |
Nov
(209) |
Dec
(205) |
| 2007 |
Jan
(30) |
Feb
(23) |
Mar
(26) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <rl...@us...> - 2006-06-06 01:49:34
|
Revision: 16213 Author: rlaager Date: 2006-06-03 23:34:30 -0700 (Sat, 03 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16213&view=rev Log Message: ----------- SF Patch #1499284 from Ka-Hing Cheung "Set available message was broken some while ago (didn't bother to check the exact checkin), I think because of a misplaced else block. Attached is a patch that fixes the problem." Modified Paths: -------------- trunk/src/protocols/oscar/oscar.c Modified: trunk/src/protocols/oscar/oscar.c =================================================================== --- trunk/src/protocols/oscar/oscar.c 2006-06-03 16:47:58 UTC (rev 16212) +++ trunk/src/protocols/oscar/oscar.c 2006-06-04 06:34:30 UTC (rev 16213) @@ -4370,7 +4370,7 @@ else if (primitive == GAIM_STATUS_AVAILABLE) { const char *status_html; - char *status_text; + char *status_text = NULL; status_html = gaim_status_get_attr_string(status, "message"); if (status_html != NULL) @@ -4382,15 +4382,11 @@ char *tmp = g_utf8_find_prev_char(status_text, &status_text[58]); strcpy(tmp, "..."); } - else - { - /* User did not specify an available message */ - status_text = NULL; - } - aim_srv_setstatusmsg(od, status_text); - g_free(status_text); } + aim_srv_setstatusmsg(od, status_text); + g_free(status_text); + /* This is needed for us to un-set any previous away message. */ away = g_strdup(""); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sea...@us...> - 2006-06-06 00:50:52
|
Revision: 16223 Author: seanegan Date: 2006-06-05 17:50:46 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16223&view=rev Log Message: ----------- bug fix Modified Paths: -------------- trunk/src/protocols/jabber/jabber.c Modified: trunk/src/protocols/jabber/jabber.c =================================================================== --- trunk/src/protocols/jabber/jabber.c 2006-06-05 23:16:19 UTC (rev 16222) +++ trunk/src/protocols/jabber/jabber.c 2006-06-06 00:50:46 UTC (rev 16223) @@ -1457,21 +1457,21 @@ if(xmlnode_get_child(packet, "aborted")) { js->gc->wants_to_die = TRUE; text = _("Authorization Aborted"); - } else if(xmlnode_get_child(error, "incorrect-encoding")) { + } else if(xmlnode_get_child(packet, "incorrect-encoding")) { text = _("Incorrect encoding in authorization"); - } else if(xmlnode_get_child(error, "invalid-authzid")) { + } else if(xmlnode_get_child(packet, "invalid-authzid")) { js->gc->wants_to_die = TRUE; text = _("Invalid authzid"); - } else if(xmlnode_get_child(error, "invalid-mechanism")) { + } else if(xmlnode_get_child(packet, "invalid-mechanism")) { js->gc->wants_to_die = TRUE; text = _("Invalid Authorization Mechanism"); - } else if(xmlnode_get_child(error, "mechanism-too-weak")) { + } else if(xmlnode_get_child(packet, "mechanism-too-weak")) { js->gc->wants_to_die = TRUE; text = _("Authorization mechanism too weak"); - } else if(xmlnode_get_child(error, "not-authorized")) { + } else if(xmlnode_get_child(packet, "not-authorized")) { js->gc->wants_to_die = TRUE; text = _("Not Authorized"); - } else if(xmlnode_get_child(error, "temporary-auth-failure")) { + } else if(xmlnode_get_child(packet, "temporary-auth-failure")) { text = _("Temporary Authentication Failure"); } else { js->gc->wants_to_die = TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <aar...@us...> - 2006-06-05 23:16:30
|
Revision: 16220 Author: aaronsheldon Date: 2006-06-05 16:07:14 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16220&view=rev Log Message: ----------- Added Paths: ----------- branches/soc-2006-efficiency/ Copied: branches/soc-2006-efficiency (from rev 16219, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <aar...@us...> - 2006-06-05 23:16:27
|
Revision: 16222 Author: aaronsheldon Date: 2006-06-05 16:16:19 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16222&view=rev Log Message: ----------- Modified Paths: -------------- branches/soc-2006-blist-efficiency/src/gtkblist.c Modified: branches/soc-2006-blist-efficiency/src/gtkblist.c =================================================================== --- branches/soc-2006-blist-efficiency/src/gtkblist.c 2006-06-05 23:11:49 UTC (rev 16221) +++ branches/soc-2006-blist-efficiency/src/gtkblist.c 2006-06-05 23:16:19 UTC (rev 16222) @@ -4076,16 +4076,26 @@ return TRUE; } +/*This version of gaim_gtk_blist_update_group can take the original buddy +or a group, but has much better algorithmic performance with a pre-known buddy*/ static void gaim_gtk_blist_update_group(GaimBuddyList *list, GaimBlistNode *node) { GaimGroup *group; int count; gboolean show = FALSE; + gboolean buddy_node_true = FALSE; + GaimBlistNode* bnode; + + + buddy_node_true = GAIM_BLIST_NODE_IS_BUDDY(node); + if (GAIM_BLIST_NODE_IS_GROUP(node)) + bnode = node; + else if (buddy_node_true) + bnode = node->parent->parent; + g_return_if_fail(GAIM_BLIST_NODE_IS_GROUP(bnode)); + + group = (GaimGroup*)bnode; - g_return_if_fail(GAIM_BLIST_NODE_IS_GROUP(node)); - - group = (GaimGroup*)node; - if(gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")) count = gaim_blist_get_group_size(group, FALSE); else @@ -4093,9 +4103,13 @@ if (count > 0 || gaim_prefs_get_bool("/gaim/gtk/blist/show_empty_groups")) show = TRUE; + else if (buddy_node_true) + if (buddy_is_displayable((GaimBuddy*)node)) + show = TRUE; + /* Fallback loop */ else { GaimBlistNode *n; - n = node->child; + n = bnode->child; while (n && !GAIM_BLIST_NODE_IS_GROUP(n)) { if (GAIM_BLIST_NODE_IS_BUDDY(n)) { if (buddy_is_displayable((GaimBuddy*)n)) { @@ -4105,13 +4119,13 @@ } n = gaim_blist_node_next(n, FALSE); } - } - + } + if (show) { char *mark, *esc; GtkTreeIter iter; - if(!insert_node(list, node, &iter)) + if(!insert_node(list, bnode, &iter)) return; esc = g_markup_escape_text(group->name, -1); @@ -4128,7 +4142,7 @@ -1); g_free(mark); } else { - gaim_gtk_blist_hide_node(list, node); + gaim_gtk_blist_hide_node(list, bnode); } } @@ -4195,35 +4209,45 @@ g_object_unref(avatar); } - +/* This is a variation on the original gtk_blist_update_contact. Here we + can know in advance which buddy has changed so we can just update that */ static void gaim_gtk_blist_update_contact(GaimBuddyList *list, GaimBlistNode *node) { + GaimBlistNode *bnode; GaimContact *contact; GaimBuddy *buddy; struct _gaim_gtk_blist_node *gtknode; - g_return_if_fail(GAIM_BLIST_NODE_IS_CONTACT(node)); + if (GAIM_BLIST_NODE_IS_BUDDY(node)) + bnode = node->parent; + else + bnode = node; + + g_return_if_fail(GAIM_BLIST_NODE_IS_CONTACT(bnode)); /* First things first, update the group */ - gaim_gtk_blist_update_group(list, node->parent); + if (GAIM_BLIST_NODE_IS_BUDDY(node)) + gaim_gtk_blist_update_group(list, node); + else + gaim_gtk_blist_update_group(list, bnode->parent); - contact = (GaimContact*)node; + contact = (GaimContact*)bnode; buddy = gaim_contact_get_priority_buddy(contact); - + if (buddy_is_displayable(buddy)) { GtkTreeIter iter; - if(!insert_node(list, node, &iter)) + if(!insert_node(list, bnode, &iter)) return; - gtknode = (struct _gaim_gtk_blist_node *)node->ui_data; + gtknode = (struct _gaim_gtk_blist_node *)bnode->ui_data; if(gtknode->contact_expanded) { GdkPixbuf *status; char *mark; - status = gaim_gtk_blist_get_status_icon(node, + status = gaim_gtk_blist_get_status_icon(bnode, (gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons") ? GAIM_STATUS_ICON_LARGE : GAIM_STATUS_ICON_SMALL)); @@ -4240,29 +4264,29 @@ if(status) g_object_unref(status); } else { - buddy_node(buddy, &iter, node); + buddy_node(buddy, &iter, bnode); } } else { - gaim_gtk_blist_hide_node(list, node); + gaim_gtk_blist_hide_node(list, bnode); } } + + static void gaim_gtk_blist_update_buddy(GaimBuddyList *list, GaimBlistNode *node) { - GaimContact *contact; GaimBuddy *buddy; struct _gaim_gtk_blist_node *gtkparentnode; g_return_if_fail(GAIM_BLIST_NODE_IS_BUDDY(node)); + if (node->parent == NULL) + return; + buddy = (GaimBuddy*)node; - contact = (GaimContact*)node->parent; - - if (contact == NULL) - return; - + /* First things first, update the contact */ - gaim_gtk_blist_update_contact(list, node->parent); + gaim_gtk_blist_update_contact(list, node); gtkparentnode = (struct _gaim_gtk_blist_node *)node->parent->ui_data; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <aar...@us...> - 2006-06-05 23:16:27
|
Revision: 16221 Author: aaronsheldon Date: 2006-06-05 16:11:49 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16221&view=rev Log Message: ----------- Added Paths: ----------- branches/soc-2006-blist-efficiency/ Removed Paths: ------------- branches/soc-2006-efficiency/ Copied: branches/soc-2006-blist-efficiency (from rev 16220, branches/soc-2006-efficiency) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <fac...@us...> - 2006-06-03 16:48:09
|
Revision: 16212 Author: faceprint Date: 2006-06-03 09:47:58 -0700 (Sat, 03 Jun 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16212&view=rev Log Message: ----------- ???-be-gone Modified Paths: -------------- trunk/po/stats.pl Modified: trunk/po/stats.pl =================================================================== --- trunk/po/stats.pl 2006-06-01 05:22:10 UTC (rev 16211) +++ trunk/po/stats.pl 2006-06-03 16:47:58 UTC (rev 16212) @@ -25,6 +25,7 @@ use Locale::Language; +$lang{'ca@valencia'} = "Catalan (Valencian)"; $lang{en_AU} = "English (Australian)"; $lang{en_CA} = "English (Canadian)"; $lang{en_GB} = "English (British)"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <amc...@us...> - 2006-06-01 05:22:16
|
Revision: 16211 Author: amc_grim Date: 2006-05-31 22:22:10 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16211&view=rev Log Message: ----------- these have been bugging me.. Property Changed: ---------------- trunk/ trunk/plugins/perl/common/ Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - config.h libtool config.status intl ABOUT-NLS compile config.guess config.sub Doxyfile ltconfig ltmain.sh install-sh missing aclocal.m4 configure config.h.in stamp-h.in Makefile.in config.log config.cache Makefile stamp-h gaim.spec depcomp stamp-h1 autom4te*.cache configure.2.1x confdefs.h *.swp win32-install-dir .temp-gettextize gaim.pc gaim.service *.apspec intltool-extract intltool-extract.in intltool-merge intltool-merge.in intltool-update intltool-update.in gaim.desktop + ABOUT-NLS aclocal.m4 autom4te.cache compile confdefs.h config.cache config.guess config.h config.h.in config.h.in~ config.log config.status config.sub configure configure.2.1x depcomp Doxyfile gaim.apspec gaim.desktop gaim.pc gaim.service gaim.spec install-sh intl intltool-extract intltool-extract.in intltool-merge intltool-merge.in intltool-update intltool-update.in libtool ltconfig ltmain.sh Makefile Makefile.in missing stamp-h stamp-h1 stamp-h.in *.swp .temp-gettextize win32-install-dir Property changes on: trunk/plugins/perl/common ___________________________________________________________________ Name: svn:ignore - *.bs *.o Makefile.PL Makefile blib lib const-c.inc const-xs.inc pm_to_blib *.c *.dll + *.bs *.o Makefile.PL Makefile Makefile.old blib lib const-c.inc const-xs.inc pm_to_blib *.c *.dll This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rl...@us...> - 2006-05-30 22:22:57
|
Revision: 16210 Author: rlaager Date: 2006-05-30 15:22:52 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16210&view=rev Log Message: ----------- Brian Chu suggested that we print to stdout instead of stderr to make redirection cleaner because the gaim_debug stuff prints to stdout. I swear I committed this before, but I guess I didn't. Modified Paths: -------------- trunk/src/proxy.c Modified: trunk/src/proxy.c =================================================================== --- trunk/src/proxy.c 2006-05-30 22:21:00 UTC (rev 16209) +++ trunk/src/proxy.c 2006-05-30 22:22:52 UTC (rev 16210) @@ -386,7 +386,7 @@ rc = select(child_in + 1, &fds, NULL, NULL, &tv); if (!rc) { if (show_debug) - fprintf(stderr,"dns[%d]: nobody needs me... =(\n", getpid()); + printf("dns[%d]: nobody needs me... =(\n", getpid()); break; } rc = read(child_in, &dns_params, sizeof(dns_params_t)); @@ -396,11 +396,11 @@ } if (rc == 0) { if (show_debug) - fprintf(stderr,"dns[%d]: Oops, father has gone, wait for me, wait...!\n", getpid()); + printf("dns[%d]: Oops, father has gone, wait for me, wait...!\n", getpid()); _exit(0); } if (dns_params.hostname[0] == '\0') { - fprintf(stderr, "dns[%d]: hostname = \"\" (port = %d)!!!\n", getpid(), dns_params.port); + printf("dns[%d]: hostname = \"\" (port = %d)!!!\n", getpid(), dns_params.port); _exit(1); } /* Tell our parent that we read the data successfully */ @@ -424,7 +424,7 @@ if (rc != 0) { close(child_out); if (show_debug) - fprintf(stderr,"dns[%d] Error: getaddrinfo returned %d\n", + printf("dns[%d] Error: getaddrinfo returned %d\n", getpid(), rc); dns_params.hostname[0] = '\0'; continue; @@ -445,7 +445,7 @@ write(child_out, &h_errno, sizeof(int)); close(child_out); if (show_debug) - fprintf(stderr,"DNS Error: %d\n", h_errno); + printf("DNS Error: %d\n", h_errno); _exit(0); } memset(&sin, 0, sizeof(struct sockaddr_in)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rl...@us...> - 2006-05-30 22:21:12
|
Revision: 16209 Author: rlaager Date: 2006-05-30 15:21:00 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16209&view=rev Log Message: ----------- SimGuy pointed out that the gaim_debug functions take format strings. Modified Paths: -------------- trunk/src/gtksound.c Modified: trunk/src/gtksound.c =================================================================== --- trunk/src/gtksound.c 2006-05-30 19:42:16 UTC (rev 16208) +++ trunk/src/gtksound.c 2006-05-30 22:21:00 UTC (rev 16209) @@ -393,9 +393,7 @@ } if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { - char *tmp = g_strdup_printf("sound file (%s) does not exist.\n", filename); - gaim_debug_error("gtksound", tmp); - g_free(tmp); + gaim_debug_error("gtksound", "sound file (%s) does not exist.\n", filename); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lsc...@us...> - 2006-05-30 19:42:46
|
Revision: 16208 Author: lschiere Date: 2006-05-30 12:42:16 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16208&view=rev Log Message: ----------- some translation updates Modified Paths: -------------- trunk/po/ChangeLog trunk/po/ca@valencia.po trunk/po/en_GB.po trunk/po/eu.po trunk/po/fi.po trunk/po/ru.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-05-30 18:17:34 UTC (rev 16207) +++ trunk/po/ChangeLog 2006-05-30 19:42:16 UTC (rev 16208) @@ -47,7 +47,8 @@ * Thai translation added (Isriya Paireepairit) * Turkish translation updated (Ahmet Alp BALKAN) * Ukrainian translation updated (Maxim V. Dziumanenko) - * Valencian-Catalan translation added (Toni Hermoso, Josep Puigdemont) + * Valencian-Catalan translation added (Toni Hermoso Pulido, + Josep Puigdemont) version 1.5.1: * Catalan win32 installer translation updated (Bernat López) @@ -588,7 +589,7 @@ * Russian translation updated (Alexandre Prokoudine) * Serbian translation updated (Danilo Segan) * Serbian Latin translation updated (Danilo Segan) - * Spanish translation updated (Javier Fern\xE1ndez-Sanguino Pe\xF1a) + * Spanish translation updated (Javier Fern?ndez-Sanguino Pe?a) * Swedish translation updated (Tore Lundqvist (luntor)) version 0.68 (09/01/2003): Modified: trunk/po/ca@valencia.po =================================================================== --- trunk/po/ca@valencia.po 2006-05-30 18:17:34 UTC (rev 16207) +++ trunk/po/ca@valencia.po 2006-05-30 19:42:16 UTC (rev 16208) @@ -76,15 +76,15 @@ #: ../plugins/contact_priority.c:61 msgid "Buddy is idle" -msgstr "L'amic és inactiu" +msgstr "L'amic està inactiu" #: ../plugins/contact_priority.c:62 msgid "Buddy is away" -msgstr "L'amic és absent" +msgstr "L'amic està absent" #: ../plugins/contact_priority.c:63 msgid "Buddy is \"extended\" away" -msgstr "L'amic és absent «de fa temps»" +msgstr "L'amic està absent «de fa temps»" #. Not used yet. #: ../plugins/contact_priority.c:66 @@ -895,7 +895,7 @@ #. *< id #: ../plugins/iconaway.c:82 msgid "Iconify on Away" -msgstr "Iconifica si s'és absent" +msgstr "Iconifica si s'està absent" #. *< name #. *< version @@ -938,7 +938,7 @@ #: ../plugins/idle.c:180 msgid "None of your accounts are idle." -msgstr "Cap dels vostres comptes és inactiu." +msgstr "Cap dels vostres comptes està inactiu." # FIXME #: ../plugins/idle.c:196 @@ -1011,7 +1011,7 @@ #: ../plugins/log_reader.c:1405 msgid "User is offline." -msgstr "L'usuari és fora de línia." +msgstr "L'usuari està fora de línia." #: ../plugins/log_reader.c:1411 msgid "Auto-response sent:" @@ -1312,7 +1312,7 @@ #: ../plugins/perl/perl.c:585 #: ../plugins/perl/perl.c:586 msgid "Provides support for loading perl plugins." -msgstr "Proporciona suport per a carregar connectors en Perl." +msgstr "Permet carregar connectors en Perl." #: ../plugins/psychic.c:19 msgid "Psychic Mode" @@ -1342,7 +1342,7 @@ #: ../plugins/psychic.c:87 msgid "Disable when away" -msgstr "Inhabilita-ho quan siga absent" +msgstr "Inhabilita-ho quan estiga absent" #: ../plugins/psychic.c:91 msgid "Display notification message in conversations" @@ -1527,7 +1527,7 @@ #: ../plugins/ssl/ssl-gnutls.c:254 #: ../plugins/ssl/ssl-gnutls.c:256 msgid "Provides SSL support through GNUTLS." -msgstr "Proporciona suport per a SSL a través de la biblioteca GNUTLS." +msgstr "Permet l'ús d'SSL a través de la biblioteca GNUTLS." #. *< type #. *< ui_requirement @@ -1546,7 +1546,7 @@ #: ../plugins/ssl/ssl-nss.c:415 #: ../plugins/ssl/ssl-nss.c:417 msgid "Provides SSL support through Mozilla NSS." -msgstr "Proporciona suport per a SSL a través de la biblioteca NSS de Mozilla." +msgstr "Permet l'ús d'SSL a través de la biblioteca NSS de Mozilla." #. *< type #. *< ui_requirement @@ -1565,12 +1565,12 @@ #: ../plugins/ssl/ssl.c:97 #: ../plugins/ssl/ssl.c:99 msgid "Provides a wrapper around SSL support libraries." -msgstr "Proporciona una interfície per a les biblioteques de suport d'SSL." +msgstr "Proporciona una interfície per a les biblioteques per a SSL." #: ../plugins/statenotify.c:50 #, c-format msgid "%s is no longer away." -msgstr "%s ja no és absent." +msgstr "%s ja no està absent." #: ../plugins/statenotify.c:52 #, c-format @@ -1585,7 +1585,7 @@ #: ../plugins/statenotify.c:64 #, c-format msgid "%s is no longer idle." -msgstr "%s ja no és inactiu." +msgstr "%s ja no està inactiu." #: ../plugins/statenotify.c:73 #, c-format @@ -1634,7 +1634,7 @@ #: ../plugins/tcl/tcl.c:371 #: ../plugins/tcl/tcl.c:372 msgid "Provides support for loading Tcl plugins" -msgstr "Proporciona suport per a carregar els connectors en Tcl" +msgstr "Permet carregar els connectors en Tcl" # FIXME (josep) #. *< type @@ -2992,7 +2992,7 @@ "The following commands are available in this context:\n" msgstr "" "Feu servir «/help <ordre>» per a obtindre ajuda sobre una ordre.\n" -"Les següents ordres són disponibles en este context:\n" +"Hi ha les següents ordres disponibles en este context:\n" #: ../src/gtkconv.c:482 msgid "No such command." @@ -3355,7 +3355,7 @@ #: ../src/gtkconv.c:6521 msgid "say <message>: Send a message normally as if you weren't using a command." -msgstr "say <missatge>: Envia un missatge normalment com si no féssiu servir cap ordre." +msgstr "say <missatge>: Envia un missatge normalment com si no féreu servir cap ordre." #: ../src/gtkconv.c:6524 msgid "me <action>: Send an IRC style action to a buddy or chat." @@ -4180,7 +4180,7 @@ #. show everything #: ../src/gtkimhtmltoolbar.c:735 msgid "Smile!" -msgstr "Somrigueu!" +msgstr "Somrieu!" #: ../src/gtkimhtmltoolbar.c:923 msgid "Bold" @@ -4520,7 +4520,7 @@ #: ../src/gtkpounce.c:591 msgid "Is no longer i_dle" -msgstr "Ja no siga i_nactiu" +msgstr "Ja no estiga i_nactiu" #: ../src/gtkpounce.c:593 msgid "Starts _typing" @@ -4578,7 +4578,7 @@ #: ../src/gtkpounce.c:773 msgid "P_ounce only when my status is not available" -msgstr "Avisa n_omés quan el meu estat no siga disponible" +msgstr "Avisa n_omés quan el meu estat no estiga disponible" #: ../src/gtkpounce.c:778 msgid "_Recurring" @@ -5032,7 +5032,7 @@ #: ../src/gtkprefs.c:1788 msgid "Change status when _idle" -msgstr "Canvia l'estat quan siga _inactiu" +msgstr "Canvia l'estat quan estiga _inactiu" #: ../src/gtkprefs.c:1792 msgid "_Minutes before changing status:" @@ -6158,7 +6158,7 @@ #: ../src/protocols/irc/irc.c:78 msgid "No MOTD available" -msgstr "La frase del dia no és disponible" +msgstr "La frase del dia no està disponible" #: ../src/protocols/irc/irc.c:79 msgid "There is no MOTD associated with this connection." @@ -6198,7 +6198,7 @@ #: ../src/protocols/jabber/jabber.c:550 #: ../src/protocols/jabber/jabber.c:890 msgid "SSL support unavailable" -msgstr "El suport per a SSL no és disponible" +msgstr "La implementació d'SSL no està disponible" #: ../src/protocols/irc/irc.c:333 #: ../src/protocols/simple/simple.c:452 @@ -6319,7 +6319,7 @@ #: ../src/protocols/irc/msgs.c:136 #, c-format msgid "Cannot ban %s: banlist is full" -msgstr "No es pot bandejar %s: la llista de bandejats és plena" +msgstr "No es pot bandejar %s: la llista de bandejats està plena" #: ../src/protocols/irc/msgs.c:215 #: ../src/protocols/irc/msgs.c:235 @@ -6664,11 +6664,11 @@ #: ../src/protocols/jabber/auth.c:51 msgid "Server requires TLS/SSL for login. Select \"Use TLS if available\" in account properties" -msgstr "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Utilitza TLS si és disponible» en les propietats del compte" +msgstr "El servidor requereix TLS/SSL per a entrar. Seleccioneu «Utilitza TLS si està disponible» en les propietats del compte" #: ../src/protocols/jabber/auth.c:53 msgid "Server requires TLS/SSL for login. No TLS/SSL support found." -msgstr "El servidor requereix TLS/SSL per a entrar. No s'ha trobat suport per a TLS/SSL." +msgstr "El servidor requereix TLS/SSL per a entrar. No es pot fer funcionar TLS/SSL." #: ../src/protocols/jabber/auth.c:114 msgid "Server requires plaintext authentication over an unencrypted stream" @@ -7276,7 +7276,7 @@ #: ../src/protocols/jabber/jabber.c:1438 msgid "Recipient Unavailable" -msgstr "El destinatari no és disponible" +msgstr "El destinatari no està disponible" #: ../src/protocols/jabber/jabber.c:1442 msgid "Registration Required" @@ -7296,7 +7296,7 @@ #: ../src/protocols/jabber/jabber.c:1450 msgid "Service Unavailable" -msgstr "El servei no és disponible" +msgstr "El servei no està disponible" #: ../src/protocols/jabber/jabber.c:1452 msgid "Subscription Required" @@ -7523,7 +7523,7 @@ #: ../src/protocols/jabber/jabber.c:1911 msgid "Use TLS if available" -msgstr "Utilitza TLS si és disponible" +msgstr "Utilitza TLS si està disponible" #: ../src/protocols/jabber/jabber.c:1916 msgid "Require TLS" @@ -7702,7 +7702,7 @@ #: ../src/protocols/msn/error.c:70 #: ../src/protocols/zephyr/zephyr.c:705 msgid "User is offline" -msgstr "L'usuari és fora de línia" +msgstr "L'usuari està fora de línia" #: ../src/protocols/msn/error.c:73 msgid "Already in the mode" @@ -7759,7 +7759,7 @@ #: ../src/protocols/msn/error.c:116 msgid "Service Temporarily Unavailable" -msgstr "El servei és temporalment fora de servei." +msgstr "El servei està temporalment fora de servei." #: ../src/protocols/msn/error.c:119 msgid "Database server error" @@ -7789,7 +7789,7 @@ #: ../src/protocols/msn/error.c:151 #: ../src/protocols/msn/error.c:206 msgid "Server unavailable" -msgstr "El servidor no és disponible" +msgstr "El servidor no està disponible" #: ../src/protocols/msn/error.c:141 msgid "Peer Notification server down" @@ -8684,7 +8684,7 @@ #: ../src/protocols/novell/nmuser.c:1913 msgid "The server is unavailable; try again later" -msgstr "El servidor no és disponible, proveu-ho més tard" +msgstr "El servidor no està disponible, proveu-ho més tard" #: ../src/protocols/novell/nmuser.c:1916 msgid "Cannot add a contact to the same folder twice" @@ -8915,7 +8915,7 @@ #: ../src/protocols/novell/novell.c:2070 #, c-format msgid "%s appears to be offline and did not receive the message that you just sent." -msgstr "És possible que %s no siga en línia, i no haja rebut el missatge que li acabeu d'enviar." +msgstr "És possible que %s no estiga en línia, i no haja rebut el missatge que li acabeu d'enviar." #. TODO: Would be nice to prompt if not set! #. * gaim_request_fields(gc, _("Server Address"),...); @@ -8927,7 +8927,7 @@ #: ../src/protocols/novell/novell.c:2190 msgid "Error. SSL support is not installed." -msgstr "Error. El suport per a SLL no està instal·lat." +msgstr "S'ha produït un error. La funcionalitat per a SSL no està instal·lada." #: ../src/protocols/novell/novell.c:2499 msgid "This conference has been closed. No more messages can be sent." @@ -9030,7 +9030,7 @@ #: ../src/protocols/oscar/oscar.c:163 msgid "User temporarily unavailable" -msgstr "Usuari no disponible temporalment" +msgstr "L'usuari no està disponible temporalment" #: ../src/protocols/oscar/oscar.c:164 msgid "No match" @@ -9217,7 +9217,7 @@ #. service temporarily unavailable #: ../src/protocols/oscar/oscar.c:1317 msgid "The AOL Instant Messenger service is temporarily unavailable." -msgstr "El servei de missatges instantanis d'AOL no és disponible temporalment." +msgstr "El servei de missatges instantanis d'AOL no està disponible temporalment." #: ../src/protocols/oscar/oscar.c:1322 msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer." @@ -9469,12 +9469,12 @@ #: ../src/protocols/oscar/oscar.c:2799 #, c-format msgid "User information not available: %s" -msgstr "La informació de l'usuari no és disponible: %s" +msgstr "La informació de l'usuari no està disponible: %s" #: ../src/protocols/oscar/oscar.c:2802 #, c-format msgid "User information for %s unavailable:" -msgstr "La informació de %s no és disponible:" +msgstr "La informació de %s no està disponible:" #: ../src/protocols/oscar/oscar.c:2828 msgid "Online Since" @@ -11211,7 +11211,7 @@ #: ../src/protocols/silc/ops.c:1941 msgid "Failure: Remote does not trust/support your public key" -msgstr "Fallida: El remot no se'n refia o no suporta la vostra clau pública" +msgstr "Fallida: El remot no se'n refia o no funciona amb la vostra clau pública" #: ../src/protocols/silc/ops.c:1944 msgid "Failure: Remote does not support proposed KE group" @@ -11882,7 +11882,7 @@ #: ../src/protocols/toc/toc.c:500 #, c-format msgid "Chat in %s is not available." -msgstr "El xat a %s no és disponible." +msgstr "El xat a %s no està disponible." #: ../src/protocols/toc/toc.c:503 #, c-format @@ -11933,7 +11933,7 @@ #: ../src/protocols/toc/toc.c:537 msgid "Country not supported." -msgstr "País no suportat." +msgstr "País no implementat." #: ../src/protocols/toc/toc.c:540 #, c-format @@ -11942,7 +11942,7 @@ #: ../src/protocols/toc/toc.c:546 msgid "The service is temporarily unavailable." -msgstr "El servei és temporalment no disponible." +msgstr "El servei està temporalment no disponible." #: ../src/protocols/toc/toc.c:549 msgid "Your warning level is currently too high to log in." @@ -11988,7 +11988,7 @@ #: ../src/protocols/toc/toc.c:994 msgid "When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient." -msgstr "Quan açò succeeix, TOC ignora els missatges que se li envien, i vos pot fer fora si envieu un missatge. Gaim evitarà que res d'això passe. Només éstemporalment. Si vos plau, tingueu paciència." +msgstr "Quan açò succeeix, TOC ignora els missatges que se li envien, i vos pot fer fora si envieu un missatge. Gaim evitarà que res d'això passe. Només és temporalment. Si vos plau, tingueu paciència." #: ../src/protocols/toc/toc.c:1549 msgid "Get Dir Info" @@ -12411,7 +12411,7 @@ #: ../src/protocols/yahoo/yahoo_profile.c:1170 #, c-format msgid "User information for %s unavailable" -msgstr "Dades de l'usuari %s no disponibles" +msgstr "Les dades de l'usuari %s no estan disponibles" #: ../src/protocols/yahoo/yahoo_profile.c:1176 msgid "Sorry, this profile seems to be in a language or format that is not supported at this time." @@ -12450,7 +12450,7 @@ #. -15 #: ../src/protocols/yahoo/yahoochat.c:367 msgid "Maybe the room is full" -msgstr "Pot ser que la sala siga plena" +msgstr "Pot ser que la sala estiga plena" #. -35 #: ../src/protocols/yahoo/yahoochat.c:370 @@ -12722,12 +12722,12 @@ #: ../src/status.c:632 #, c-format msgid "%s is now %s" -msgstr "%s es ara %s" +msgstr "%s està ara %s" #: ../src/status.c:637 #, c-format msgid "%s is no longer %s" -msgstr "%s ja no és %s" +msgstr "%s ja no està %s" #: ../src/status.c:1311 #, c-format @@ -12737,7 +12737,7 @@ #: ../src/status.c:1328 #, c-format msgid "%s became unidle" -msgstr "%s ja no és inactiu" +msgstr "%s ja no està inactiu" #: ../src/status.c:1394 #, c-format @@ -12747,7 +12747,7 @@ #: ../src/status.c:1396 #, c-format msgid "+++ %s became unidle" -msgstr "+++ %s ja no és inactiu" +msgstr "+++ %s ja no està inactiu" #: ../src/util.c:679 #, c-format @@ -12855,7 +12855,7 @@ #~ msgid "Active item" #~ msgstr "Element actiu" #~ msgid "The item which is currently active" -#~ msgstr "L'element que és actualment actiu" +#~ msgstr "L'element que està actualment actiu" #~ msgid "Appears as list" #~ msgstr "Apareix com una llista" #~ msgid "Whether combobox dropdowns should look like lists rather than menus" @@ -12890,7 +12890,7 @@ #~ msgid "You have lost your connection to chat room %s." #~ msgstr "Heu perdut la connexió a la sala de xat %s." #~ msgid "Chat is currently unavailable" -#~ msgstr "El xat no és actualment disponible" +#~ msgstr "El xat no està actualment disponible" #~ msgid "Unable to login to AIM" #~ msgstr "No s'ha pogut connectar a l'AIM" #~ msgid "Attempting connection redirect..." @@ -13126,7 +13126,7 @@ #~ msgid "Remove Buddy Pounce" #~ msgstr "Suprimeix l'avís d'un amic" #~ msgid "_Queue new messages when away" -#~ msgstr "Posa els missatges en una cua _quan siga absent" +#~ msgstr "Posa els missatges en una cua _quan estiga absent" #~ msgid "Could't open file" #~ msgstr "No s'ha pogut obrir el fitxer" #~ msgid "Change password" Modified: trunk/po/en_GB.po =================================================================== --- trunk/po/en_GB.po 2006-05-30 18:17:34 UTC (rev 16207) +++ trunk/po/en_GB.po 2006-05-30 19:42:16 UTC (rev 16208) @@ -1651,7 +1651,7 @@ "This plugin allows the user to customize conversation and logging message " "timestamp formats." msgstr "" -"This plugin allows the user to customize conversation and logging message " +"This plug-in allows the user to customize conversation and logging message " "timestamp formats." #: ../plugins/win32/transparency/win2ktrans.c:183 @@ -2472,7 +2472,7 @@ #: ../src/gtkblist.c:2453 msgid "/Tools/Plu_gins" -msgstr "/Tools/Plu_gins" +msgstr "/Tools/Plu_g-ins" #: ../src/gtkblist.c:2454 msgid "/Tools/Pr_eferences" Modified: trunk/po/eu.po =================================================================== --- trunk/po/eu.po 2006-05-30 18:17:34 UTC (rev 16207) +++ trunk/po/eu.po 2006-05-30 19:42:16 UTC (rev 16208) @@ -1,6 +1,246 @@ # translation of eu.po to +# translation of eu.po to +# translation of eu.po to +# translation of eu.po to +# translation of eu.po to +# translation of eu.po to +# translation of eu.po to +# translation of gaim-2.0_eu.po to +# translation of gaim-2.0_eu.po to +# translation of gaim-2.0_eu.po to +# translation of gaim-2.0_eu.po to # translation of gaim-2.0_eu.po to Basque # translation of gaim.po to Basque +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. +# tamax, 2006. # Hizkuntza Politikarako Sailburuordetza <hi...@ej...>, 2005. # Iñaki Larrañaga Murgoitio <do...@zu...>, 2006. # tamax, 2006. @@ -10,7 +250,7 @@ "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-04-11 16:20+0000\n" -"PO-Revision-Date: 2006-05-05 04:20+0200\n" +"PO-Revision-Date: 2006-05-25 23:48+0200\n" "Last-Translator: tamax\n" "Language-Team: <en...@li...>\n" "MIME-Version: 1.0\n" @@ -106,9 +346,8 @@ #. *< priority #. *< id #: ../plugins/dbus-example.c:152 -#, fuzzy msgid "DBus" -msgstr "Lanpetuta" +msgstr "DBus" #. *< name #. *< version @@ -120,7 +359,7 @@ #: ../plugins/docklet/docklet.c:154 msgid "Right-click for more unread messages...\n" -msgstr "" +msgstr "Eskubiko botoiaz klik egin irakurri gabeko mezu gehiagorentzat...\n" #: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3230 #, c-format @@ -173,9 +412,8 @@ msgstr "Berria..." #: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682 -#, fuzzy msgid "Saved..." -msgstr "Gorde fitxategia..." +msgstr "Gordeta..." #: ../plugins/docklet/docklet.c:484 msgid "Show Buddy List" @@ -233,9 +471,8 @@ #: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694 #: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48 #: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825 -#, fuzzy msgid "Always" -msgstr "Kanpoan" +msgstr "Beti" #: ../plugins/docklet/docklet.c:690 msgid "C_hat Messages:" @@ -307,7 +544,7 @@ #. *< id #: ../plugins/extplacement.c:135 msgid "ExtPlacement" -msgstr "" +msgstr "ExtPlacement " #. *< name #. *< version @@ -380,9 +617,8 @@ msgstr "Bigarrengo Kurtsore kolorea" #: ../plugins/gaimrc.c:43 -#, fuzzy msgid "Hyperlink Color" -msgstr "Hiperestekaren kolorea" +msgstr "Hiperestekaren kolorea " #: ../plugins/gaimrc.c:56 msgid "GtkTreeView Expander Size" @@ -413,8 +649,9 @@ msgstr "Jakinarazpenak elkarrizketa" #: ../plugins/gaimrc.c:91 +# , fuzzy msgid "GtkTreeView Indent Expanders" -msgstr "" +msgstr "GtkTreeView zabaltzailea" #: ../plugins/gaimrc.c:287 #, c-format @@ -422,9 +659,8 @@ msgstr "Hautatu testu-kolorea honentzako %s" #: ../plugins/gaimrc.c:289 -#, fuzzy msgid "Select Color" -msgstr "Hautatu testu-kolorea" +msgstr "Hautatu kolorea" #: ../plugins/gaimrc.c:324 #, c-format @@ -432,9 +668,8 @@ msgstr "Hautatu letra-tipoa honentzako %s" #: ../plugins/gaimrc.c:362 -#, fuzzy msgid "Select Interface Font" -msgstr "Hautatu letra-tipoa" +msgstr "Hautatu letra-tipoa " #: ../plugins/gaimrc.c:415 msgid "General" @@ -806,9 +1041,8 @@ msgstr "Kendu kontuaren ez-aktibo-denbora" #: ../plugins/idle.c:196 -#, fuzzy msgid "_Unset" -msgstr "_Erabili" +msgstr "_Ezarpena kendu" #: ../plugins/idle.c:218 ../plugins/idle.c:257 msgid "Set Idle Time for All Accounts" @@ -944,15 +1178,17 @@ #. *< name #. *< version #: ../plugins/musicmessaging/musicmessaging.c:663 +# , fuzzy msgid "Music Messaging Plugin for collaborative composition." -msgstr "" +msgstr "Musika mezuen Plugin-a kolaborazio bitarteko osaketarako." #. * summary #: ../plugins/musicmessaging/musicmessaging.c:665 +# , fuzzy msgid "" "The Music Messaging Plugin allows a number of users to simultaneously work " "on a piece of music by editting a common score in real-time." -msgstr "" +msgstr "Musika mezuen plugin-a hainbat erabiltzaile momentu berean musika zati batean amankumeko \"score\"-a editatzen lan egiteko aukera eskeintzen du benetazko denboran." #. ---------- "Notify For" ---------- #: ../plugins/notify.c:638 @@ -1067,11 +1303,11 @@ #: ../plugins/psychic.c:22 msgid "Psychic Mode" -msgstr "" +msgstr "Modu psikikoa " #: ../plugins/psychic.c:23 msgid "Psychic mode for incoming conversation" -msgstr "" +msgstr "Modu psikikoa datorren elkarrizketerako " #: ../plugins/psychic.c:24 msgid "" @@ -1082,8 +1318,9 @@ "Honek funtzionatzen du AIM,ICQ,Jabber,Sametime eta Yahoo!" #: ../plugins/psychic.c:60 +# , fuzzy msgid "You feel a disturbance in the force..." -msgstr "" +msgstr "Ikanbila sentitu duzu indarrean" #: ../plugins/psychic.c:79 msgid "Only enable for users on the buddy list" @@ -1205,7 +1442,7 @@ #: ../plugins/spellchk.c:1918 msgid "Duplicate Correction" -msgstr "" +msgstr "Bikoiztutako zuzenketa" #: ../plugins/spellchk.c:1919 msgid "The specified word already exists in the correction list." @@ -1229,7 +1466,7 @@ #: ../plugins/spellchk.c:2191 msgid "Case sensitive" -msgstr "" +msgstr "Maiuskulak bereizi" #: ../plugins/spellchk.c:2217 msgid "Add a new text replacement" @@ -1245,8 +1482,9 @@ #. Created here so it can be passed to whole_words_button_toggled. #: ../plugins/spellchk.c:2262 +# , fuzzy msgid "_Exact case match (uncheck for automatic case handling)" -msgstr "" +msgstr "Kasuarko topaketa zehatza (ez-gaitu kasu automatikorako)" #: ../plugins/spellchk.c:2264 msgid "Only replace _whole words" @@ -1450,7 +1688,7 @@ #: ../plugins/timestamp_format.c:22 msgid "Timestamp Format Options" -msgstr "" +msgstr "Timestamp-en formatu ezarpenak" #: ../plugins/timestamp_format.c:27 msgid "_Force (traditional Gaim) 24-hour time format" @@ -1465,13 +1703,12 @@ msgstr "So_lasaldiak" #: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46 -#, fuzzy msgid "For delayed messages" -msgstr "Bidali mezua" +msgstr "Berandu datozen mezuentzat" #: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47 msgid "For delayed messages and in chats" -msgstr "" +msgstr "Atzeratutako mezuentzat eta berriketentzat" #: ../plugins/timestamp_format.c:44 msgid "_Message Logs:" @@ -1485,14 +1722,14 @@ #. *< id #: ../plugins/timestamp_format.c:150 msgid "Message Timestamp Formats" -msgstr "" +msgstr "Mezuen Timestamp formatuak" #. *< name #. *< version #. * summary #: ../plugins/timestamp_format.c:153 msgid "Customizes the message timestamp formats." -msgstr "" +msgstr "Pertsonalizatu mezuen timestamp formatuak." #. * description #: ../plugins/timestamp_format.c:155 @@ -1500,6 +1737,8 @@ "This plugin allows the user to customize conversation and logging message " "timestamp formats." msgstr "" +"Plugin honek erabiltzaileak elkarrizketak eta egunkari " +"mezuen timestamp formatuak pertsonalizatzea ahalbidetzen du." #: ../plugins/win32/transparency/win2ktrans.c:183 #: ../plugins/win32/transparency/win2ktrans.c:569 @@ -1602,7 +1841,7 @@ #. XXX: Did this ever work? #: ../plugins/win32/winprefs/winprefs.c:427 msgid "Only when docked" -msgstr "" +msgstr "Bakarrik geldiunean" #. Conversations #: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819 @@ -1611,7 +1850,6 @@ msgstr "Solasaldiak" #: ../plugins/win32/winprefs/winprefs.c:432 -#, fuzzy msgid "_Flash window when messages are received" msgstr "_Erakutsi leihoa keinuka mezuak jasotzean" @@ -1627,7 +1865,7 @@ msgid "" "Provides options specific to Windows Gaim, such as buddy list docking and " "conversation flashing." -msgstr "" +msgstr "Gaim Windows-en ezarpenak zehazteko aukera eskeintzen du, hala nola lagunen-zerrenda gelditzea eta elkarrizketa kinuak." #: ../src/account.c:773 msgid "accounts" @@ -2444,13 +2682,12 @@ "<b>Egoera:</b> Txundigarria " #: ../src/gtkblist.c:2662 -#, fuzzy msgid "" "\n" "<b>Status:</b> Rockin'" msgstr "" "\n" -"<b>Egoera</b>: Rockin'" +"<b>Egoera:</b> Rockin'" #: ../src/gtkblist.c:2951 #, c-format @@ -2647,7 +2884,7 @@ "%s was disconnected due to an error: %s\n" "Gaim will not attempt to reconnect the account until you correct the error " "and re-enable the account." -msgstr "" +msgstr "%s deskonektatua izan da errorea baten ondorioz: %s\n Gaim ez da saiatuko kontua berriz konektatzen errorea konpondu eta kontua ahalbidetu arte." #: ../src/gtkconv.c:373 msgid "Supported debug options are: version" @@ -2690,9 +2927,8 @@ msgstr "Komando horrek ez du protokolo honekin lanik egiten" #: ../src/gtkconv.c:744 ../src/gtkconv.c:770 -#, fuzzy msgid "That buddy is not on the same protocol as this chat." -msgstr "Lagun hori ez dago berriketa honek darabilen protokoloarekin" +msgstr "Lagun hori ez dago berriketa honek darabilen protokoloarekin." #: ../src/gtkconv.c:764 msgid "You are not currently signed on with an account that can invite that buddy." @@ -3061,7 +3297,7 @@ #: ../src/gtkconv.c:7286 msgid "Detach this tab" -msgstr "" +msgstr "Banatu betilea" #: ../src/gtkconv.c:7292 msgid "Close this tab" @@ -3177,11 +3413,11 @@ #: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:112 msgid "Bengali" -msgstr "" +msgstr "bengalera" #: ../src/gtkdialogs.c:113 msgid "Bosnian" -msgstr "Bosniera" +msgstr "Bosniarra" #: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:168 ../src/gtkdialogs.c:169 msgid "Catalan" @@ -3189,7 +3425,7 @@ #: ../src/gtkdialogs.c:115 msgid "Valencian" -msgstr "Balentzianoa" +msgstr "Balentziera" #: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:170 msgid "Czech" @@ -3205,7 +3441,7 @@ #: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121 msgid "Greek" -msgstr "Greziar" +msgstr "Gerkera" #: ../src/gtkdialogs.c:122 msgid "Australian English" @@ -3226,7 +3462,7 @@ #: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:127 msgid "Persian" -msgstr "" +msgstr "pertsiera" #: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177 msgid "Finnish" @@ -3271,9 +3507,8 @@ msgstr "Koreera" #: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:139 -#, fuzzy msgid "Kurdish" -msgstr "Turkiera" +msgstr "Turkiera " #: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:188 ../src/gtkdialogs.c:189 msgid "Lithuanian" @@ -3325,13 +3560,12 @@ msgstr "Suediera" #: ../src/gtkdialogs.c:154 -#, fuzzy msgid "Tamil" -msgstr "Terminala" +msgstr "Tamil" #: ../src/gtkdialogs.c:155 msgid "Telugu" -msgstr "" +msgstr "Telugu" #: ../src/gtkdialogs.c:156 msgid "Turkish" @@ -3376,6 +3610,8 @@ "file for the complete list of contributors. We provide no warranty for this " "program.<BR><BR>" msgstr "" +"Gaim berehalako mezuen bezero modularra da AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, " +"eta Gadu-Gadu momentu berean erabiltzeko gaitasuna duena. GTK+ erabiliz idatzi izan da .<BR><BR> Programa hau aldatu eta ber-banatu dezakezu GPL terminopean (2 bertsioa edo beranduagokoa). GPL -ren kopia COPYING izeneko fitxategi baten dago gaim distribuzioarekin batera. Gaim \"copyright\"-a du bere laguntzaileen eskutik. Ikusi ezazy COPYRIGHT fitxategia laguntzaileen zerrenda osoa ikusteko. Ez dugu programa honen bermea zihurtatzen.<BR><BR>" #: ../src/gtkdialogs.c:275 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>" @@ -3675,9 +3911,8 @@ msgstr "Itsatsi _testu gisa" #: ../src/gtkimhtml.c:833 -#, fuzzy msgid "_Reset formatting" -msgstr "_Garbitu estiloa" +msgstr "_Garbitu estiloa " #: ../src/gtkimhtml.c:1327 msgid "Hyperlink color" @@ -3849,9 +4084,8 @@ msgstr "Atzeko planoko kolorea" #: ../src/gtkimhtmltoolbar.c:1030 -#, fuzzy msgid "Reset formatting" -msgstr "Estilo lehenetsia" +msgstr "Formateoa beregin" #: ../src/gtkimhtmltoolbar.c:1045 msgid "Insert link" @@ -3938,6 +4172,16 @@ " account(s) to use, separated by commas)\n" " -v, --version display the current version and exit\n" msgstr "" +"Gaim %s\n" +"Erabiltzeko era: %s [Aukerak]...\n" +"\n" +" -c, --config=DIR erabili DIR konfigurazio fitxategientzat\n" +" -d, --debug idatzi \"debugging\"mezuak stdout -en\n" +" -h, --help Erakutsi laguntza eta irten\n" +" -n, --nologin Automatikoki ez konexio hasi\n" +" -l, --login[=IZENA] Automatikoki konexioa hasi (IZENA aukerazko argumentu espesifikazioa\n" +" kontua(k) erabiltzeko, koma batez bereiztu)\n" +" -v, --version Erakutsi egungo bertsioa eta irten\n" #: ../src/gtkmain.c:493 #, c-format @@ -3974,9 +4218,8 @@ msgstr "Nork" #: ../src/gtknotify.c:418 -#, fuzzy msgid "Subject" -msgstr "Ezarri" +msgstr "Gaia" #: ../src/gtknotify.c:427 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>" @@ -4187,8 +4430,9 @@ msgstr "Aukerak" #: ../src/gtkpounce.c:773 +# , fuzzy msgid "P_ounce only when my status is not available" -msgstr "" +msgstr "P_ounce bakarrik nire egoera eskuragarri ez nagoenean" #: ../src/gtkpounce.c:778 msgid "_Recurring" @@ -4196,8 +4440,9 @@ #: ../src/gtkpounce.c:1092 #, c-format +# , fuzzy msgid "Are you sure you want to delete the pounce on %s for %s?" -msgstr "" +msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?" #: ../src/gtkpounce.c:1240 #, fuzzy @@ -4318,7 +4563,7 @@ #: ../src/gtkprefs.c:849 msgid "Use smooth-scrolling" -msgstr "" +msgstr "Erabili mugimendu leuna norantza bertikalean" #: ../src/gtkprefs.c:865 msgid "" @@ -4534,9 +4779,8 @@ msgstr "Normala" #: ../src/gtkprefs.c:1470 -# ,fuzzy msgid "Loud" -msgstr "Altu esan" +msgstr "Altu esan " #: ../src/gtkprefs.c:1472 #, fuzzy @@ -4626,13 +4870,12 @@ msgstr "Ezagutarazi _inaktibotasun-denborak" #: ../src/gtkprefs.c:1750 -#,fuzzy msgid "From last sent message" -msgstr "Hem" +msgstr "Bidalitako azkeneko mezutik" #: ../src/gtkprefs.c:1752 msgid "Based on keyboard or mouse use" -msgstr "" +msgstr "Teklatu edo saguaren erabilpenean oinarrituta" #: ../src/gtkprefs.c:1761 msgid "_Auto-reply:" @@ -4665,14 +4908,12 @@ msgstr "Hasierako egoera" #: ../src/gtkprefs.c:1808 -#, fuzzy msgid "Use status from last _exit at startup" -msgstr "Erabili azkeneko egoera hasieratzeko" +msgstr "Erabili azkeneko irteteerako egoera hasieratzeko" #: ../src/gtkprefs.c:1814 -# , fuzzy msgid "Status to a_pply at startup:" -msgstr "Ezartzeko egoera" +msgstr "Haserako egoera ezartzeko:" #: ../src/gtkprefs.c:1865 msgid "Smiley Themes" @@ -4859,9 +5100,8 @@ msgstr "Lanpostua" #: ../src/gtksavedstatuses.c:448 -#, fuzzy msgid "Type" -msgstr "Mota" +msgstr "Mota " #. Available status messages are plain text #: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920 @@ -4897,9 +5137,8 @@ msgstr "_Erabili" #: ../src/gtksavedstatuses.c:695 -# , fuzzy msgid "Title already in use. You must choose a unique title." -msgstr "Titulua erabiltzen ari da. Titulu bakarra" +msgstr "Titulua erabilia dago. Berria aukeratu." #: ../src/gtksavedstatuses.c:879 msgid "Different" @@ -4921,9 +5160,8 @@ msgstr "_Titulua:" #: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413 -#, fuzzy msgid "_Status:" -msgstr "Egoera:" +msgstr "_Egoera:" #. Different status message expander #: ../src/gtksavedstatuses.c:1124 @@ -4937,9 +5175,8 @@ #: ../src/gtksavedstatuses.c:1394 #, c-format -# , fuzzy msgid "Status for %s" -msgstr "Egoera : %s" +msgstr "Egoera : %s rako." #: ../src/gtksound.c:61 msgid "Buddy logs in" @@ -5059,9 +5296,8 @@ msgstr "Gaim -ek ezin du karpeta bidali. Fitxategiak banan-bana bidali beharko dituzu." #: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452 -#, fuzzy msgid "You have dragged an image" -msgstr "Herrestan eraman duzu irudia" +msgstr "Herrestan eraman duzu irudia " #: ../src/gtkutils.c:1439 msgid "" @@ -5109,15 +5345,15 @@ #. * Probably not. I'll just give an error and return. #. The original patch sent the icon used by the launcher. That's probably wrong #: ../src/gtkutils.c:1509 -# , fuzzy + msgid "Cannot send launcher" -msgstr "Ezinezkoa " +msgstr "Ezinezkoa jaurtitzailea bidaltzea" #: ../src/gtkutils.c:1509 msgid "" "You dragged a desktop launcher. Most likely you wanted to send whatever this " "launcher points to instead of this launcher itself." -msgstr "" +msgstr "Mahaingain-eko jaurtigailua herrestan eraman duzu. Seguraski beste zeozer bidali nahiko zenuen. " #: ../src/gtkwhiteboard.c:756 ../src/gtkwhiteboard.c:775 msgid "Save File" @@ -5191,12 +5427,12 @@ #: ../src/plugin.c:424 #, c-format msgid "Plugin magic mismatch %d (need %d)" -msgstr "" +msgstr "Plugin magikoa gaizki elkartua %d (%d beharrezkoa) " #: ../src/plugin.c:441 #, c-format msgid "ABI version mismatch %d.%d.x (need %d.%d.x)" -msgstr "" +msgstr "ABI bertsio gaizki elkartua %d.%d.x (%d.%d.x beharrezkoa)" #: ../src/plugin.c:458 msgid "Plugin does not implement all required functions" @@ -5239,9 +5475,8 @@ msgstr "Datozen BM konexio berriak entzutea ezinezkoa gertatu da\n" #: ../src/protocols/bonjour/bonjour.c:146 -# , fuzzy msgid "Unable to establish connection with the local mDNS server. Is it running?" -msgstr "Ezinezkoa izan da konexioa ematea mDNS zerbitzari lokalarekin , martxan al dago ?" +msgstr "Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al dago ?" #: ../src/protocols/bonjour/bonjour.c:337 #: ../src/protocols/sametime/sametime.c:3251 @@ -5286,7 +5521,7 @@ #. Creating the user splits #: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935 msgid "Hostname" -msgstr "" +msgstr "Ostalari-Izena" #. Creating the options for the protocol #. port to connect to @@ -5355,9 +5590,8 @@ #: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137 #: ../src/protocols/gg/gg.c:180 -#, fuzzy msgid "Token Error" -msgstr "Lekukoarekin errorea" +msgstr "Testigu errorea" #: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138 #: ../src/protocols/gg/gg.c:181 @@ -5398,7 +5632,6 @@ msgstr "Gorde lagunen-zerrenda..." #: ../src/protocols/gg/gg.c:380 - msgid "Fill in the registration fields." msgstr "Bete harpidetzarako eremuak" @@ -5428,19 +5661,18 @@ msgstr "Pasahitza (beridatzi)" #: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:757 -#, fuzzy +# , fuzzy msgid "Enter current token" -msgstr "%s ez dago une honetan konektatuta." +msgstr "Sartu momentuko lekukoa" #: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:763 -#, fuzzy +# , fuzzy msgid "Current token" -msgstr "Orain konektatuta" +msgstr "Momentuko lekukoa" #: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494 -#, fuzzy msgid "Register New Gadu-Gadu Account" -msgstr "Erregistratu Jabber kontu berria" +msgstr "Erregistratu Gadu-Gadu kontu berria" #: ../src/protocols/gg/gg.c:495 msgid "Please, fill in the following fields" @@ -5511,9 +5743,8 @@ msgstr "Bete eremuak" #: ../src/protocols/gg/gg.c:685 -# , fuzzy msgid "Your current password is different from the one that you specified." -msgstr "Zure egungo pasahitza ezberdina da zuk adierazi dezunaren aldean." +msgstr "Zure egungo pasahitza ezberdina da zuk adierazi dezunaren aldean. " #: ../src/protocols/gg/gg.c:699 msgid "Unable to change password. Error occured.\n" @@ -5541,9 +5772,8 @@ #: ../src/protocols/gg/gg.c:846 #, c-format -# , fuzzy msgid "Select a chat for buddy: %s" -msgstr "Aukeratu berriketak lagun batentzat:%s" +msgstr "Aukeratu berriketak lagun batentzat:%s " #: ../src/protocols/gg/gg.c:849 ../src/protocols/gg/gg.c:850 msgid "Add to chat..." @@ -5686,7 +5916,7 @@ #. summary #: ../src/protocols/gg/gg.c:2001 msgid "Polish popular IM" -msgstr "" +msgstr "Poloniar IM ospetsua" #: ../src/protocols/gg/gg.c:2049 msgid "Gadu-Gadu User" @@ -5914,9 +6144,8 @@ #: ../src/protocols/irc/msgs.c:328 #, c-format -#,fuzzy msgid "%s has cleared the topic." -msgstr "%s(e)k gaia garbitu du: %s" +msgstr "%s(e)k gaia garbitu du." #: ../src/protocols/irc/msgs.c:336 #, c-format @@ -6487,7 +6716,7 @@ #: ../src/protocols/jabber/buddy.c:1253 msgid "JID" -msgstr "" +msgstr "JID" #: ../src/protocols/jabber/buddy.c:1257 ../src/protocols/jabber/buddy.c:1401 #: ../src/protocols/oscar/oscar.c:6176 @@ -6504,9 +6733,8 @@ msgstr "Zerbitzariaren aginduak:%s" #: ../src/protocols/jabber/buddy.c:1392 -#,fuzzy msgid "Fill in one or more fields to search for any matching Jabber users." -msgstr "Bete ezazu bat edo eremu gehiago edozein Jabber erabiltzaileren topaketarako." +msgstr "Bete ezazu bat edo eremu gehiago edozein Jabber erabiltzaileren topaketarako. " #: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/novell/novell.c:1490 #: ../src/protocols/oscar/oscar.c:6178 ../src/protocols/oscar/oscar.c:6185 @@ -6982,14 +7210,14 @@ msgstr "Ezin da erabiltzailea %s kide bihurtu \"%s\"" #: ../src/protocols/jabber/jabber.c:1644 -#, fuzzy, c-format +#, c-format msgid "Unknown role: \"%s\"" -msgstr "Komando ezezaguna: %s" +msgstr "Rol ezezaguna:\" %s\"" #: ../src/protocols/jabber/jabber.c:1651 -#, fuzzy, c-format +#, c-format msgid "Unable to set role \"%s\" for user: %s" -msgstr "Ezin da mezua bidali: %s" +msgstr "%s erabiltzaileari ezin zaio %s rola ezarri" #: ../src/protocols/jabber/jabber.c:1704 #, c-format @@ -7024,13 +7252,13 @@ msgid "" "affiliate <user> <owner|admin|member|outcast|none>: Set a user's " "affiliation with the room." -msgstr "" +msgstr "Afiliatu &It; erabiltzaile>&It;jabea| administratzailea|kidea| paria | ezer ez>: Erabiltzailearen afiliazioa ezarri gelarekiko." #: ../src/protocols/jabber/jabber.c:1777 msgid "" "role <user> <moderator|participant|visitor|none>: Set a user's " "role in the room." -msgstr "" +msgstr "Zeregin &It;erabiltzaile;&It;moderatzailea| partehartzailea | bisitari | ezer ez>: Ezarri erabiltzailearen zeregina gelarekiko." #: ../src/protocols/jabber/jabber.c:1783 msgid "invite <user> [message]: Invite a user to the room." @@ -7433,9 +7661,8 @@ msgstr "MSN Errorea: %s\n" #: ../src/protocols/msn/msn.c:113 -# ,fuzzy msgid "You have just sent a Nudge!" -msgstr "Bidali berri duzu Nudge-a !" +msgstr "Harreta eskaera bidali berri duzu !" #: ../src/protocols/msn/msn.c:138 msgid "Your new MSN friendly name is too long." @@ -7555,7 +7782,6 @@ msgstr "Baimendu/Ukatu mugikorraren orriak..." #: ../src/protocols/msn/msn.c:657 -#, fuzzy msgid "Open Hotmail Inbox" msgstr "Ireki Hotmail posta" @@ -7637,9 +7863,8 @@ msgstr "Egoera zibila" #: ../src/protocols/msn/msn.c:1566 -# , fuzzy msgid "Interests" -msgstr "Interesak" +msgstr "Intereresak" #: ../src/protocols/msn/msn.c:1567 msgid "Pets" @@ -7654,9 +7879,9 @@ msgstr "Bizilekua" #: ../src/protocols/msn/msn.c:1570 -# ,fuzzy +# , fuzzy msgid "Fashion" -msgstr "Era" +msgstr "Fashion" #: ../src/protocols/msn/msn.c:1571 msgid "Humor" @@ -7754,9 +7979,9 @@ msgstr "Laneko segapotoa" #: ../src/protocols/msn/msn.c:1615 -#, fuzzy +# , fuzzy msgid "Work Pager" -msgstr "Web orria" +msgstr "Lan orrigilea" #: ../src/protocols/msn/msn.c:1616 msgid "Work Fax" @@ -7771,9 +7996,8 @@ msgstr "Laneko IM" #: ../src/protocols/msn/msn.c:1619 -#,fuzzy msgid "Start Date" -msgstr "Hasteko data" +msgstr "Hasteko data " #: ../src/protocols/msn/msn.c:1624 #, c-format @@ -7857,9 +8081,8 @@ msgstr "Erakutsi _aurpegiera grafikoak " #: ../src/protocols/msn/msn.c:2071 -#, fuzzy msgid "nudge: nudge a user to get their attention" -msgstr "buzz: eman abisu kontaktu bati bere harreta lortzeko" +msgstr "Harreta ematen: harreta eman kontaktu bati atentzioa lortzeko" #: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133 #: ../src/protocols/yahoo/yahoochat.c:1345 @@ -8068,7 +8291,7 @@ #: ../src/protocols/msn/switchboard.c:959 #, c-format msgid "%s just sent you a Nudge!" -msgstr "%s berriki Nugde bidali dizute !" +msgstr "%s berriki harreta eskaera bidali dizute !" #: ../src/protocols/msn/userlist.c:96 #, c-format @@ -8865,14 +9088,12 @@ #: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590 #: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614 -#, fuzzy msgid "Unable to log into file transfer proxy." -msgstr "Ezin da %s fitxategian idatzi" +msgstr "Ezin da egunkarian gorde proxy-aren transferentzia fitxategia. " #: ../src/protocols/oscar/oscar.c:2668 -#, fuzzy msgid "Unable to establish listener socket or no AOL proxy connection present." -msgstr "Ezin da entzuteko socket-a ezarri." +msgstr "Ezin da entzuteko socket-a ezarri edo AOL proxy konexioa dago." #: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543 msgid "Incorrect nickname or password." @@ -8984,9 +9205,8 @@ msgstr "Eskatu baimena" #: ../src/protocols/oscar/oscar.c:4643 -#, fuzzy msgid "_Request Authorization" -msgstr "Eskatu baimena" +msgstr "_Baimena eskatu" #: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687 #: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815 @@ -8999,7 +9219,7 @@ msgstr "Baimena ezesteko mezua:" #: ../src/protocols/oscar/oscar.c:4793 -#, fuzzy, c-format +#c-format msgid "" "The user %u wants to add %s to their buddy list for the following reason:\n" "%s" @@ -9059,7 +9279,7 @@ "%s" #: ../src/protocols/oscar/oscar.c:4847 -#, fuzzy, c-format +# c-format msgid "" "You have received an ICQ e-mail from %s [%s]\n" "\n" @@ -9081,9 +9301,8 @@ msgstr "Lagun hori zure lagunen zerrendan gehitu nahi duzu?" #: ../src/protocols/oscar/oscar.c:4878 -#, fuzzy msgid "_Decline" -msgstr "Ukatu" +msgstr "_Ukatu" #: ../src/protocols/oscar/oscar.c:4962 #, c-format @@ -9186,9 +9405,8 @@ msgstr "Gaitasunak" #: ../src/protocols/oscar/oscar.c:5285 -#, fuzzy msgid "Available Message" -msgstr "Mezu erabilgarria:" +msgstr "Mezua eskuragarri:" #: ../src/protocols/oscar/oscar.c:5402 msgid "Your AIM connection may be lost." @@ -9266,21 +9484,21 @@ msgstr "Pop-up mezua" #: ../src/protocols/oscar/oscar.c:6335 -#, fuzzy, c-format +#, c-format msgid "The following screen name is associated with %s" msgid_plural "The following screen names are associated with %s" -msgstr[0] "Ondoko pantaila-izenak %s erabiltzailearekin asoziatuta daude" -msgstr[1] "Ondoko pantaila-izenak %s erabiltzailearekin asoziatuta daude" +msgstr[0] "Ondoko pantaila-izenak %s erabiltzailearekin erlazionatuak daude" +msgstr[1] "Ondoko pantaila-izenak %s erabiltzailearekin erlazionatuak daude" #: ../src/protocols/oscar/oscar.c:6366 -#, fuzzy, c-format +#, c-format msgid "No results found for e-mail address %s" -msgstr "Emaitzarik ez %s helbide elektronikoarentzat" +msgstr "Emaitzarik ez %s helbide elektronikoarentzat " #: ../src/protocols/oscar/oscar.c:6387 -#, fuzzy, c-format +#, c-format msgid "You should receive an e-mail asking to confirm %s." -msgstr "%s berrestea eskatzeko mezu bat jaso beharko zenuke." +msgstr "%s berrestea eskatzeko posta-mezu bat jaso beharko zenuke. " #: ../src/protocols/oscar/oscar.c:6389 msgid "Account Confirmation Requested" @@ -9300,11 +9518,11 @@ "eta jatorrizkoa bat ez datozelako." #: ../src/protocols/oscar/oscar.c:6426 -#, fuzzy, c-format +#, c-format msgid "Error 0x%04x: Unable to format screen name because it is invalid." msgstr "" "0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena " -"luzeegia delako." +"Balio okerra du." #: ../src/protocols/oscar/oscar.c:6429 #, c-format @@ -9316,31 +9534,31 @@ "luzeegia delako." #: ../src/protocols/oscar/oscar.c:6432 -#, fuzzy, c-format +#, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because there is already a " "request pending for this screen name." msgstr "" -"0x%04x errorea: ezin da helbide elektronikoa aldatu, badagoelako lehendik " +"0x%04x errorea: ezin da helbide elektronikoa aldatu, lehendik badagoelak" "eskaera bat zain pantaila-izen honekin." #: ../src/protocols/oscar/oscar.c:6435 -#, fuzzy, c-format +#, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address has " "too many screen names associated with it." msgstr "" "0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbideak " -"pantaila-izen gehiegi dituelako asoziatuta." +"pantaila-izen gehiegi dituelako erlazionatuak." #: ../src/protocols/oscar/oscar.c:6438 -#, fuzzy, c-format +#, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address is " "invalid." msgstr "" "0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbidea ez " -"delako baliozkoa." +"delako baliozkoa. " #: ../src/protocols/oscar/oscar.c:6441 #, c-format @@ -9361,14 +9579,14 @@ msgstr "Kontuari buruzko informazioa" #: ../src/protocols/oscar/oscar.c:6457 -#, fuzzy, c-format +#, c-format msgid "The e-mail address for %s is %s" -msgstr "%s erabiltzailearen helbide elektronikoa %s da" +msgstr "%s erabiltzailearen helbide elektronikoa %s da " #: ../src/protocols/oscar/oscar.c:6535 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images." msgstr "" -"Zure IM irudia ez da bidali. 'Zuzenean Konektatuta' egon behar zara IM " +"Zure BM irudia ez da bidali. 'Zuzeneko Konexioa' behar duzu BM " "irudiak bidaltzeko." #: ../src/protocols/oscar/oscar.c:6775 @@ -9492,13 +9710,11 @@ msgstr "Baimena eman da" #: ../src/protocols/oscar/oscar.c:7471 -#, fuzzy, c-format +#, c-format msgid "" "The user %s wants to add %s to their buddy list for the following reason:\n" "%s" -msgstr "" -"%s erabiltzaileak bere lagunen zerrendan gehitu nahi zaitu. Arrazoia:\n" -"%s" +msgstr "%s erabiltzaileak bere lagunen zerrendan %s gehitu nahi du bere lagunen zerrendan honako arrazoiagatik:\n %s" #. Granted #: ../src/protocols/oscar/oscar.c:7516 @@ -9569,18 +9785,16 @@ msgstr "Eskatu baimena berriro" #: ../src/protocols/oscar/oscar.c:8243 -#, fuzzy msgid "Require authorization" -msgstr "Eskatu baimena" +msgstr "Baimena beharrezkoa" #: ../src/protocols/oscar/oscar.c:8246 msgid "Web aware (enabling this will cause you to receive SPAM!)" -msgstr "" +msgstr "Web kontuan izan ( hau ahalbidetzen baduzu Zaborra jasotzea gerta daiteke) " #: ../src/protocols/oscar/oscar.c:8251 -#, fuzzy msgid "ICQ Privacy Options" -msgstr "Proxy aukerak" +msgstr "ICQ pribatisasun ezarpenak" #: ../src/protocols/oscar/oscar.c:8268 msgid "The new formatting is invalid." @@ -9617,9 +9831,8 @@ "gainean, eta hautatu \"Eskatu baimena berriro.\"" #: ../src/protocols/oscar/oscar.c:8394 -#, fuzzy msgid "Find Buddy by E-Mail" -msgstr "Bilatu laguna helbide elektronikoaren arabera" +msgstr "Bilatu laguna helbide elektronikoaren arabera " #: ../src/protocols/oscar/oscar.c:8395 msgid "Search for a buddy by e-mail address" @@ -9643,9 +9856,8 @@ #. ICQ actions #: ../src/protocols/oscar/oscar.c:8514 -#, fuzzy msgid "Set Privacy Options..." -msgstr "Ezarri pribatutasuna:" +msgstr "Ezarri pribatitasun aukerak:" #. AIM actions #: ../src/protocols/oscar/oscar.c:8521 @@ -9669,9 +9881,8 @@ msgstr "Bistaratu baimenaren zain dauden lagunak" #: ../src/protocols/oscar/oscar.c:8546 -#, fuzzy msgid "Search for Buddy by E-Mail..." -msgstr "Bilatu laguna helbide elektronikoaren arabera..." +msgstr "Bilatu laguna helbide elektronikoaren arabera... " #: ../src/protocols/oscar/oscar.c:8551 msgid "Search for Buddy by Information" @@ -9708,202 +9919,183 @@ "Use AIM/ICQ proxy server\n" "(slower, but usually works)" msgstr "" +"Erabili AIM/ICQ proxy zerbitzaria\n" +"(motelagoa, baina normalean funtzionatzen du)" #: ../src/protocols/sametime/sametime.c:415 -#, fuzzy msgid "Connection closed (writing)" -msgstr "Konexioa itxi da" +msgstr "Konexioa itxi da (idazten)" #: ../src/protocols/sametime/sametime.c:1267 -#, fuzzy, c-format +#, c-format msgid "<b>Group Title:</b> %s<br>" -msgstr "<b>Erabiltzailea:</b> %s<br>" +msgstr "<b>Taldearen titulua:</b> %s<br>" #: ../src/protocols/sametime/sametime.c:1268 -#, fuzzy, c-format +#, c-format msgid "<b>Notes Group ID:</b> %s<br>" -msgstr "<b>Erabiltzailea:</b> %s<br>" +msgstr "<b>Talde ID oharra:</b> %s<br> " #: ../src/protocols/sametime/sametime.c:1270 -#, fuzzy, c-format +#, c-format msgid "Info for Group %s" -msgstr "%s(r)en inf." +msgstr "%s Taldearentzako informazioa" #: ../src/protocols/sametime/sametime.c:1272 -#, fuzzy msgid "Notes Address Book Information" -msgstr "Laneko datuak" +msgstr "Helbide agenda-ren informazioa" #: ../src/protocols/sametime/sametime.c:1304 -#, fuzzy msgid "Invite Group to Conference..." -msgstr "Hasi konferentzia" +msgstr "Konferentziara taldea gonbidatu" #: ../src/protocols/sametime/sametime.c:1314 -#, fuzzy msgid "Get Notes Address Book Info" -msgstr "Gehitu helbide-liburuan" +msgstr "Gehitu helbide-liburuan oharraren informazioa" #: ../src/protocols/sametime/sametime.c:1467 -#, fuzzy msgid "Sending Handshake" -msgstr "Cookie bidaltzen" +msgstr "Bostekoa bidaltzen" #: ../src/protocols/sametime/sametime.c:1472 -#, fuzzy +# , fuzzy msgid "Waiting for Handshake Acknowledgement" -msgstr "Transferentziaren zain hasteko" +msgstr "Bosteko ezagupenaren zain" #: ../src/protocols/sametime/sametime.c:1477 msgid "Handshake Acknowledged, Sending Login" -msgstr "" +msgstr "Bostekoa ezagutua, Konexio informazioa bidaltzen" #: ../src/protocols/sametime/sametime.c:1482 +# , fuzzy msgid "Waiting for Login Acknowledgement" -msgstr "" +msgstr "Konexio ikuskapenaren zain" #: ../src/protocols/sametime/sametime.c:1487 -#, fuzzy msgid "Login Redirected" -msgstr "Saioa hasteko zerbitzaria" +msgstr "Konexio berbideratua" #: ../src/protocols/sametime/sametime.c:1493 -#, fuzzy msgid "Forcing Login" -msgstr "Konektatzea" +msgstr "Konektatzea behartzen" #: ../src/protocols/sametime/sametime.c:1497 +# ,fuzzy msgid "Login Acknowledged" -msgstr "" +msgstr "Konexio ikuskapena" #: ../src/protocols/sametime/sametime.c:1502 -#, fuzzy msgid "Starting Services" -msgstr "Zerbitzuak linean" +msgstr "Zerbitzuak hasten" #: ../src/protocols/sametime/sametime.c:1507 -#, fuzzy msgid "Connected" -msgstr "Konektatu" +msgstr "Konektatua" #: ../src/protocols/sametime/sametime.c:1605 #, c-format msgid "A Sametime administrator has issued the following announcement on server %s" -msgstr "" +msgstr "Sametime-eko administratzaileak hurrengo oharra argitaratu du zerbitzarian: %s" #: ../src/protocols/sametime/sametime.c:1610 msgid "Sametime Administrator Announcement" -msgstr "" +msgstr "Sametime-eko administratzailearen oharra" #: ../src/protocols/sametime/sametime.c:1662 -#, fuzzy msgid "Connection reset" -msgstr "Konexioa itxi da" +msgstr "Konexioa berabierazten " #: ../src/protocols/sametime/sametime.c:1669 -#, fuzzy, c-format +#, c-format msgid "Error reading from socket: %s" -msgstr "Errorea socket-etik irakurtzean." +msgstr "Errorea socket-etik irakurtzean:%s." #. this is a regular connect, error out #: ../src/protocols/sametime/sametime.c:1698 #: ../src/protocols/sametime/sametime.c:3696 -#, fuzzy msgid "Unable to connect to host" -msgstr "Ezin da zerbitzariarekin konektatu" +msgstr "Ezin da ostalariarekin konektatu" #: ../src/protocols/sametime/sametime.c:1736 #, c-format msgid "Announcement from %s" -msgstr "" +msgstr "Oharra %s -tik" #: ../src/protocols/sametime/sametime.c:1910 -#, fuzzy msgid "Conference Closed" -msgstr "Konexioa itxi da" +msgstr "Konferentzia itxi da" #: ../src/protocols/sametime/sametime.c:2367 -#, fuzzy msgid "Unable to send message: " -msgstr "Ezin da mezua bidali: %s" +msgstr "Ezin da mezua bidali: %s." #: ../src/protocols/sametime/sametime.c:2926 -#, fuzzy msgid "Place Closed" -msgstr "Bertan behera utzi da" +msgstr "Place itxita" #: ../src/protocols/sametime/sametime.c:3217 msgid "Microphone" -msgstr "" +msgstr "Mikrofonoa" #: ../src/protocols/sametime/sametime.c:3218 msgid "Speakers" -msgstr "" +msgstr "Bozgorailuak" #: ../src/protocols/sametime/sametime.c:3219 -#, fuzzy msgid "Video Camera" -msgstr "Bideo-berriketa" +msgstr "Bideo-kamera" #: ../src/protocols/sametime/sametime.c:3223 -#, fuzzy msgid "File Transfer" -msgstr "Fitxategi-transferentziak" +msgstr "Fitxategi-transferentzia" #: ../src/protocols/sametime/sametime.c:3257 -#, fuzzy, c-format +#, c-format msgid "" "\n" "<b>Supports:</b> %s" msgstr "" "\n" -"<b>%s:</b> %s" +"<b>Bermatua:</b> %s" #: ../src/protocols/sametime/sametime.c:3262 -#, fuzzy msgid "" "\n" "<b>External User</b>" msgstr "" "\n" -"<b>Abisatuta:</b>" +"<b>Kanpoko erabiltzailea:</b>" #: ../src/protocols/sametime/sametime.c:3368 -#, fuzzy msgid "Create conference with user" -msgstr "Hautatu konferentzia-zerbitzari bat kontsulta egiteko" +msgstr "Erabiltzailerarekin konferentzia sortu" #: ../src/protocols/sametime/sametime.c:3369 #, c-format msgid "" "Please enter a topic for the new conference, and an invitation message to be " "sent to %s" -msgstr "" +msgstr "Gehitu ezazu topiko berria konferentziarako, eta mezua idatzi inbitazion moduan bidaltzeko %s" #: ../src/protocols/sametime/sametime.c:3373 -#, fuzzy msgid "New Conference" -msgstr "Hasi konferentzia" +msgstr "Konferentzia berria" #: ../src/protocols/sametime/sametime.c:3375 -#, fuzzy msgid "Create" -msgstr "Berriketa" +msgstr "Sortu" #: ../src/protocols/sametime/sametime.c:3439 -#, fuzzy msgid "Available Conferences" -msgstr "Hasi konferentzia" +msgstr "Konferentzia erabilgarri" #: ../src/protocols/sametime/sametime.c:3445 -#, fuzzy msgid "Create New Conference..." -msgstr "Hasi konferentzia" +msgstr "Sortu konferentzia berria..." #: ../src/protocols/sametime/sametime.c:3452 -#, fuzzy msgid "Invite user to a conference" -msgstr "Hasi konferentzia" +msgstr "Erabiltzailea konferentziara gonbidatu" #: ../src/protocols/sametime/sametime.c:3453 #, c-format @@ -9911,74 +10103,70 @@ "Select a conference from the list below to send an invite to user %s. Select " "\"Create New Conference\" if you'd like to create a new conference to invite " "this user to." -msgstr "" +msgstr "Beheko zerrendatik aukeratu konferentzia %s erabiltzaileari gonbitea bidaltzeko. Aukeratu \"Konferentzia berria sortu\" konferentzia berria sortu nahi baduzu aurreko erabiltzailea gonbidatzeko." #: ../src/protocols/sametime/sametime.c:3458 -#, fuzzy msgid "Invite to Conference" -msgstr "Hasi konferentzia" +msgstr "Konferentziara gonbidatu" #: ../src/protocols/sametime/sametime.c:3460 msgid "Invite" msgstr "Gonbidatu" #: ../src/protocols/sametime/sametime.c:3548 -#, fuzzy msgid "Invite to Conference..." -msgstr "Hasi konferentzia" +msgstr "Konferentziara gonbidatu..." #: ../src/protocols/sametime/sametime.c:3553 msgid "Send TEST Announcement" -msgstr "" +msgstr "Bidali FROGA oharra" #: ../src/protocols/sametime/sametime.c:3600 msgid "No Sametime Community Server specified" -msgstr "" +msgstr "Ez dago Sametime komunitatearen espezifikaziorik zerbitzarian " #: ../src/protocols/sametime/sametime.c:3622 #, c-format msgid "" "No host or IP address has been configured for the Meanwhile account %s. " "Please enter one below to continue logging in." -msgstr "" +msgstr "Ez da inongo stalari edo IP helbide konfiguratu izan %s konturako. Sartu ezazu behean konexioa ezartzen jarraitzeko." #: ../src/protocols/sametime/sametime.c:3627 -#, fuzzy msgid "Meanwhile Connection Setup" -msgstr "Urruneko konexioak huts egin du" +msgstr "Konexio ezarpena bitartean" #: ../src/protocols/sametime/sametime.c:3628 msgid "No Sametime Community Server Specified" -msgstr "" +msgstr "Ez dago Sametime komunitatearen espezifikaziorik ze... [truncated message content] |
|
From: <sea...@us...> - 2006-05-30 18:26:06
|
Revision: 16207 Author: seanegan Date: 2006-05-30 11:17:34 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16207&view=rev Log Message: ----------- Actually, stick it in Debug Modified Paths: -------------- trunk/src/gtksound.c Modified: trunk/src/gtksound.c =================================================================== --- trunk/src/gtksound.c 2006-05-30 17:02:27 UTC (rev 16206) +++ trunk/src/gtksound.c 2006-05-30 18:17:34 UTC (rev 16207) @@ -392,8 +392,12 @@ return; } - if (!g_file_test(filename, G_FILE_TEST_EXISTS)) + if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { + char *tmp = g_strdup_printf("sound file (%s) does not exist.\n", filename); + gaim_debug_error("gtksound", tmp); + g_free(tmp); return; + } #ifndef _WIN32 if (!strcmp(method, "custom")) { @@ -404,10 +408,9 @@ sound_cmd = gaim_prefs_get_string("/gaim/gtk/sound/command"); if (!sound_cmd || *sound_cmd == '\0') { - gaim_notify_error(NULL, NULL, - _("Unable to play sound because the " - "'Command' sound method has been chosen, " - "but no command has been set."), NULL); + gaim_debug_error("gtksound", + "'Command' sound method has been chosen, " + "but no command has been set."); return; } @@ -417,8 +420,8 @@ command = g_strdup_printf("%s %s", sound_cmd, filename); if(!g_spawn_command_line_async(command, &error)) { - char *tmp = g_strdup_printf(_("Unable to play sound because the configured sound command could not be launched: %s"), error->message); - gaim_notify_error(NULL, NULL, tmp, NULL); + char *tmp = g_strdup_printf("sound command could not be launched: %s\n", error->message); + gaim_debug_error("gtksound", tmp); g_free(tmp); g_error_free(error); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sea...@us...> - 2006-05-30 17:18:58
|
Revision: 16206 Author: seanegan Date: 2006-05-30 10:02:27 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16206&view=rev Log Message: ----------- We don't really need to pop up an error if the sound file doesn't exist Modified Paths: -------------- trunk/src/gtksound.c Modified: trunk/src/gtksound.c =================================================================== --- trunk/src/gtksound.c 2006-05-30 01:31:13 UTC (rev 16205) +++ trunk/src/gtksound.c 2006-05-30 17:02:27 UTC (rev 16206) @@ -392,12 +392,8 @@ return; } - if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { - char *tmp = g_strdup_printf(_("Unable to play sound because the chosen file (%s) does not exist."), filename); - gaim_notify_error(NULL, NULL, tmp, NULL); - g_free(tmp); + if (!g_file_test(filename, G_FILE_TEST_EXISTS)) return; - } #ifndef _WIN32 if (!strcmp(method, "custom")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <fac...@us...> - 2006-05-30 01:31:19
|
Revision: 16205 Author: faceprint Date: 2006-05-29 18:31:13 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16205&view=rev Log Message: ----------- forgot this Modified Paths: -------------- trunk/COPYRIGHT Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-05-30 01:30:18 UTC (rev 16204) +++ trunk/COPYRIGHT 2006-05-30 01:31:13 UTC (rev 16205) @@ -239,6 +239,7 @@ Tom Samstag Neil Sanchala Laurent Sansonetti +Andrew Sayman Alceste Scalas Carsten Schaar Colin Seymour This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <fac...@us...> - 2006-05-30 01:30:25
|
Revision: 16204 Author: faceprint Date: 2006-05-29 18:30:18 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16204&view=rev Log Message: ----------- jabber get info now fetches and displays idle time and version info this is based largely on the work of Andrew Sayman. He submitted a patch back in 2004, and I hacked it all to hell, changed how some things were done. If it works, credit him. If it breaks, blame me. Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c trunk/src/protocols/jabber/iq.c trunk/src/protocols/jabber/iq.h Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-05-29 23:27:30 UTC (rev 16203) +++ trunk/src/protocols/jabber/buddy.c 2006-05-30 01:30:18 UTC (rev 16204) @@ -35,6 +35,21 @@ #include "presence.h" #include "xdata.h" +typedef struct { + long idle_seconds; +} JabberBuddyInfoResource; + +typedef struct { + JabberStream *js; + JabberBuddy *jb; + char *jid; + GSList *ids; + GHashTable *resources; + int timeout_handle; + char *vcard_text; + GSList *vcard_imgids; +} JabberBuddyInfo; + void jabber_buddy_free(JabberBuddy *jb) { g_return_if_fail(jb != NULL); @@ -125,10 +140,11 @@ jbr->jb->resources = g_list_remove(jbr->jb->resources, jbr); g_free(jbr->name); - if(jbr->status) - g_free(jbr->status); - if(jbr->thread_id) - g_free(jbr->thread_id); + g_free(jbr->status); + g_free(jbr->thread_id); + g_free(jbr->client.name); + g_free(jbr->client.version); + g_free(jbr->client.os); g_free(jbr); } @@ -587,39 +603,24 @@ * end of that ancient crap that needs to die ******/ - -static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data) +static void jabber_buddy_info_show_if_ready(JabberBuddyInfo *jbi) { - GList *resources; - const char *from = xmlnode_get_attrib(packet, "from"); - JabberBuddy *jb; - JabberBuddyResource *jbr; GString *info_text; char *resource_name; - char *bare_jid; - char *text; - xmlnode *vcard; - GaimBuddy *b; - GSList *imgids = NULL; + JabberBuddyResource *jbr; + JabberBuddyInfoResource *jbir; + GList *resources; - if(!from) + /* not yet */ + if(jbi->ids) return; - if(!(jb = jabber_buddy_find(js, from, TRUE))) - return; - - /* XXX: handle the error case */ - - resource_name = jabber_get_resource(from); - bare_jid = jabber_get_bare_jid(from); - - b = gaim_find_buddy(js->gc->account, bare_jid); - - info_text = g_string_new(""); + resource_name = jabber_get_resource(jbi->jid); if(resource_name) { - jbr = jabber_buddy_find_resource(jb, resource_name); + jbr = jabber_buddy_find_resource(jbi->jb, resource_name); + jbir = g_hash_table_lookup(jbi->resources, resource_name); if(jbr) { char *purdy = NULL; if(jbr->status) @@ -634,25 +635,127 @@ g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", _("Status"), _("Unknown")); } + if(jbir) { + if(jbir->idle_seconds > 0) { + g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", + _("Idle"), gaim_str_seconds_to_string(jbir->idle_seconds)); + } + } + if(jbr && jbr->client.name) { + g_string_append_printf(info_text, "<b>%s:</b> %s %s<br/>", + _("Client:"), jbr->client.name, + jbr->client.version ? jbr->client.version : ""); + if(jbr->client.os) { + g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", + _("Operating System"), jbr->client.os); + } + } } else { - for(resources = jb->resources; resources; resources = resources->next) { + for(resources = jbi->jb->resources; resources; resources = resources->next) { char *purdy = NULL; jbr = resources->data; if(jbr->status) purdy = gaim_strdup_withhtml(jbr->status); g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", _("Resource"), jbr->name); - g_string_append_printf(info_text, "<b>%s:</b> %s%s%s<br/><br/>", + g_string_append_printf(info_text, "<b>%s:</b> %s%s%s<br/>", _("Status"), jabber_buddy_state_get_name(jbr->state), purdy ? ": " : "", purdy ? purdy : ""); if(purdy) g_free(purdy); + + jbir = g_hash_table_lookup(jbi->resources, jbr->name); + if(jbir) { + if(jbir->idle_seconds > 0) { + g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", + _("Idle"), gaim_str_seconds_to_string(jbir->idle_seconds)); + } + } + if(jbr->client.name) { + g_string_append_printf(info_text, "<b>%s:</b> %s %s<br/>", + _("Client:"), jbr->client.name, + jbr->client.version ? jbr->client.version : ""); + if(jbr->client.os) { + g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", + _("Operating System"), jbr->client.os); + } + } + + g_string_append_printf(info_text, "<br/>"); } } g_free(resource_name); + info_text = g_string_append(info_text, jbi->vcard_text); + + gaim_notify_userinfo(jbi->js->gc, jbi->jid, info_text->str, NULL, NULL); + + while(jbi->vcard_imgids) { + gaim_imgstore_unref(GPOINTER_TO_INT(jbi->vcard_imgids->data)); + jbi->vcard_imgids = g_slist_delete_link(jbi->vcard_imgids, jbi->vcard_imgids); + } + + g_string_free(info_text, TRUE); + + gaim_timeout_remove(jbi->timeout_handle); + g_free(jbi->jid); + g_hash_table_destroy(jbi->resources); + g_free(jbi->vcard_text); + g_free(jbi); +} + +static void jabber_buddy_info_remove_id(JabberBuddyInfo *jbi, const char *id) +{ + GSList *l = jbi->ids; + + if(!id) + return; + + while(l) { + if(!strcmp(id, l->data)) { + jbi->ids = g_slist_remove(jbi->ids, l->data); + return; + } + l = l->next; + } +} + +static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data) +{ + const char *type, *id, *from; + JabberBuddy *jb; + GString *info_text; + char *bare_jid; + char *text; + xmlnode *vcard; + GaimBuddy *b; + JabberBuddyInfo *jbi = data; + + from = xmlnode_get_attrib(packet, "from"); + type = xmlnode_get_attrib(packet, "type"); + id = xmlnode_get_attrib(packet, "id"); + + jabber_buddy_info_remove_id(jbi, id); + + if(!jbi) + return; + + if(!from) + return; + + if(!(jb = jabber_buddy_find(js, from, TRUE))) + return; + + /* XXX: handle the error case */ + + bare_jid = jabber_get_bare_jid(from); + + b = gaim_find_buddy(js->gc->account, bare_jid); + + info_text = g_string_new(""); + if((vcard = xmlnode_get_child(packet, "vCard")) || (vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp"))) { xmlnode *child; @@ -838,11 +941,11 @@ data = gaim_base64_decode(bintext, &size); - imgids = g_slist_prepend(imgids, GINT_TO_POINTER(gaim_imgstore_add(data, size, "logo.png"))); + jbi->vcard_imgids = g_slist_prepend(jbi->vcard_imgids, GINT_TO_POINTER(gaim_imgstore_add(data, size, "logo.png"))); g_string_append_printf(info_text, "<b>%s:</b> <img id='%d'><br/>", photo ? _("Photo") : _("Logo"), - GPOINTER_TO_INT(imgids->data)); + GPOINTER_TO_INT(jbi->vcard_imgids->data)); gaim_buddy_icons_set_for_user(js->gc->account, bare_jid, data, size); @@ -862,33 +965,187 @@ } } - text = gaim_strdup_withhtml(info_text->str); + jbi->vcard_text = gaim_strdup_withhtml(info_text->str); + g_string_free(info_text, TRUE); + g_free(bare_jid); - gaim_notify_userinfo(js->gc, from, text, NULL, NULL); + jabber_buddy_info_show_if_ready(jbi); +} - while(imgids) { - gaim_imgstore_unref(GPOINTER_TO_INT(imgids->data)); - imgids = g_slist_delete_link(imgids, imgids); + +static void jabber_buddy_info_resource_free(gpointer data) +{ + JabberBuddyInfoResource *jbri = data; + g_free(jbri); +} + +static void jabber_version_parse(JabberStream *js, xmlnode *packet, gpointer data) +{ + JabberBuddyInfo *jbi = data; + const char *type, *id, *from; + xmlnode *query; + char *resource_name; + + g_return_if_fail(jbi != NULL); + + type = xmlnode_get_attrib(packet, "type"); + id = xmlnode_get_attrib(packet, "id"); + from = xmlnode_get_attrib(packet, "from"); + + jabber_buddy_info_remove_id(jbi, id); + + if(!from) + return; + + resource_name = jabber_get_resource(from); + + if(resource_name) { + if(type && !strcmp(type, "result")) { + if((query = xmlnode_get_child(packet, "query"))) { + JabberBuddyResource *jbr = jabber_buddy_find_resource(jbi->jb, resource_name); + if(jbr) { + xmlnode *node; + if((node = xmlnode_get_child(query, "name"))) { + jbr->client.name = xmlnode_get_data(node); + } + if((node = xmlnode_get_child(query, "version"))) { + jbr->client.version = xmlnode_get_data(node); + } + if((node = xmlnode_get_child(query, "os"))) { + jbr->client.os = xmlnode_get_data(node); + } + } + } + } + g_free(resource_name); } - g_string_free(info_text, TRUE); - g_free(text); - g_free(bare_jid); + + jabber_buddy_info_show_if_ready(jbi); } -static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *full_jid) +static void jabber_last_parse(JabberStream *js, xmlnode *packet, gpointer data) { + JabberBuddyInfo *jbi = data; + xmlnode *query; + char *resource_name; + const char *type, *id, *from, *seconds; + + g_return_if_fail(jbi != NULL); + + type = xmlnode_get_attrib(packet, "type"); + id = xmlnode_get_attrib(packet, "id"); + from = xmlnode_get_attrib(packet, "from"); + + jabber_buddy_info_remove_id(jbi, id); + + if(!from) + return; + + resource_name = jabber_get_resource(from); + + if(resource_name) { + if(type && !strcmp(type, "result")) { + if((query = xmlnode_get_child(packet, "query"))) { + seconds = xmlnode_get_attrib(query, "seconds"); + if(seconds) { + char *end = NULL; + long sec = strtol(seconds, &end, 10); + if(end != seconds) { + JabberBuddyInfoResource *jbir = g_hash_table_lookup(jbi->resources, resource_name); + if(jbir) { + jbir->idle_seconds = sec; + } + } + } + } + } + g_free(resource_name); + } + + jabber_buddy_info_show_if_ready(jbi); +} + +static gboolean jabber_buddy_get_info_timeout(gpointer data) +{ + JabberBuddyInfo *jbi = data; + + /* remove the pending callbacks */ + while(jbi->ids) { + char *id = jbi->ids->data; + jabber_iq_remove_callback_by_id(jbi->js, id); + g_free(id); + jbi->ids = g_slist_remove(jbi->ids, id); + } + + jbi->timeout_handle = 0; + + jabber_buddy_info_show_if_ready(jbi); + + return FALSE; +} + +static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid) +{ JabberIq *iq; xmlnode *vcard; + GList *resources; + JabberBuddy *jb; + JabberBuddyInfo *jbi; + jb = jabber_buddy_find(js, jid, TRUE); + + /* invalid JID */ + if(!jb) + return; + + jbi = g_new0(JabberBuddyInfo, 1); + jbi->jid = g_strdup(jid); + jbi->js = js; + jbi->jb = jb; + jbi->resources = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_buddy_info_resource_free); + iq = jabber_iq_new(js, JABBER_IQ_GET); - xmlnode_set_attrib(iq->node, "to", full_jid); + xmlnode_set_attrib(iq->node, "to", jid); vcard = xmlnode_new_child(iq->node, "vCard"); xmlnode_set_attrib(vcard, "xmlns", "vcard-temp"); - jabber_iq_set_callback(iq, jabber_vcard_parse, NULL); + jabber_iq_set_callback(iq, jabber_vcard_parse, jbi); + jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id)); jabber_iq_send(iq); + + for(resources = jb->resources; resources; resources = resources->next) + { + JabberBuddyResource *jbr = resources->data; + JabberBuddyInfoResource *jbir = g_new0(JabberBuddyInfoResource, 1); + char *full_jid; + if(strrchr(jid, '/')) { + full_jid = g_strdup(jid); + } else { + full_jid = g_strdup_printf("%s/%s", jid, jbr->name); + } + + g_hash_table_insert(jbi->resources, g_strdup(jbr->name), jbir); + + if(!jbr->client.name) { + iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:version"); + xmlnode_set_attrib(iq->node, "to", full_jid); + jabber_iq_set_callback(iq, jabber_version_parse, jbi); + jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id)); + jabber_iq_send(iq); + } + + iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:last"); + xmlnode_set_attrib(iq->node, "to", full_jid); + jabber_iq_set_callback(iq, jabber_last_parse, jbi); + jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id)); + jabber_iq_send(iq); + + g_free(full_jid); + } + + jbi->timeout_handle = gaim_timeout_add(30000, jabber_buddy_get_info_timeout, jbi); } void jabber_buddy_get_info(GaimConnection *gc, const char *who) @@ -1383,7 +1640,7 @@ if(!(type = xmlnode_get_attrib(packet, "type")) || !strcmp(type, "error")) { char *msg = jabber_parse_error(js, packet); - + if(!msg) msg = g_strdup(_("Unknown error")); @@ -1417,16 +1674,16 @@ if((instnode = xmlnode_get_child(query, "instructions"))) { char *tmp = xmlnode_get_data(instnode); - + if(tmp) { - /* Try to translate the message (see static message + /* Try to translate the message (see static message list in jabber_user_dir_comments[]) */ instructions = g_strdup_printf(_("Server Instructions: %s"), _(tmp)); g_free(tmp); } } - + if(!instructions) { instructions = g_strdup(_("Fill in one or more fields to search " @@ -1497,3 +1754,6 @@ _("Search Directory"), GAIM_CALLBACK(jabber_user_search_ok), _("Cancel"), NULL, js); } + + + Modified: trunk/src/protocols/jabber/iq.c =================================================================== --- trunk/src/protocols/jabber/iq.c 2006-05-29 23:27:30 UTC (rev 16203) +++ trunk/src/protocols/jabber/iq.c 2006-05-30 01:30:18 UTC (rev 16204) @@ -239,6 +239,11 @@ } } +void jabber_iq_remove_callback_by_id(JabberStream *js, const char *id) +{ + g_hash_table_remove(js->iq_callbacks, id); +} + void jabber_iq_parse(JabberStream *js, xmlnode *packet) { JabberCallbackData *jcd; @@ -256,7 +261,7 @@ if(type && (!strcmp(type, "result") || !strcmp(type, "error"))) { if(id && *id && (jcd = g_hash_table_lookup(js->iq_callbacks, id))) { jcd->callback(js, packet, jcd->data); - g_hash_table_remove(js->iq_callbacks, id); + jabber_iq_remove_callback_by_id(js, id); return; } } Modified: trunk/src/protocols/jabber/iq.h =================================================================== --- trunk/src/protocols/jabber/iq.h 2006-05-29 23:27:30 UTC (rev 16203) +++ trunk/src/protocols/jabber/iq.h 2006-05-30 01:30:18 UTC (rev 16204) @@ -53,6 +53,7 @@ void jabber_iq_parse(JabberStream *js, xmlnode *packet); +void jabber_iq_remove_callback_by_id(JabberStream *js, const char *id); void jabber_iq_set_callback(JabberIq *iq, JabberIqCallback *cb, gpointer data); void jabber_iq_set_id(JabberIq *iq, const char *id); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <fac...@us...> - 2006-05-29 23:27:36
|
Revision: 16203 Author: faceprint Date: 2006-05-29 16:27:30 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16203&view=rev Log Message: ----------- g_assert killage Modified Paths: -------------- trunk/src/upnp.c Modified: trunk/src/upnp.c =================================================================== --- trunk/src/upnp.c 2006-05-29 17:53:50 UTC (rev 16202) +++ trunk/src/upnp.c 2006-05-29 23:27:30 UTC (rev 16203) @@ -187,10 +187,16 @@ static gboolean gaim_upnp_compare_service(const xmlnode* service, const gchar* serviceType) { - xmlnode* serviceTypeNode = xmlnode_get_child(service, "serviceType"); + xmlnode* serviceTypeNode; char *tmp; gboolean ret; + if(service == NULL) { + return FALSE; + } + + serviceTypeNode = xmlnode_get_child(service, "serviceType"); + if(serviceTypeNode == NULL) { return FALSE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rl...@us...> - 2006-05-29 17:54:33
|
Revision: 16202 Author: rlaager Date: 2006-05-29 10:53:50 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16202&view=rev Log Message: ----------- SF Patch #1496688 from coweater "Gaim wasn't removing carriage returns on a yahoo account's away message causing a rather large buddy list entry. The stripping was being done in the code for pre-gtk 2.6.0 but not newer versions. This patch adds that strip for the newer version too." Modified Paths: -------------- trunk/src/gtkblist.c Modified: trunk/src/gtkblist.c =================================================================== --- trunk/src/gtkblist.c 2006-05-29 17:18:17 UTC (rev 16201) +++ trunk/src/gtkblist.c 2006-05-29 17:53:50 UTC (rev 16202) @@ -2938,8 +2938,10 @@ g_free(tmp); } #else - if(tmp) + if(tmp) { g_strdelimit(tmp, "\n", ' '); + gaim_str_strip_char(tmp, '\r'); + } statustext = tmp; #endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rl...@us...> - 2006-05-29 17:18:31
|
Revision: 16201 Author: rlaager Date: 2006-05-29 10:18:17 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16201&view=rev Log Message: ----------- Prepend last_auto_response structs to the list, instead of appending them. This probably won't make a significant difference. Modified Paths: -------------- trunk/src/server.c Modified: trunk/src/server.c =================================================================== --- trunk/src/server.c 2006-05-29 17:11:53 UTC (rev 16200) +++ trunk/src/server.c 2006-05-29 17:18:17 UTC (rev 16201) @@ -108,7 +108,7 @@ g_snprintf(lar->name, sizeof(lar->name), "%s", name); lar->gc = gc; lar->sent = 0; - last_auto_responses = g_slist_append(last_auto_responses, lar); + last_auto_responses = g_slist_prepend(last_auto_responses, lar); return lar; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rl...@us...> - 2006-05-29 17:12:10
|
Revision: 16200 Author: rlaager Date: 2006-05-29 10:11:53 -0700 (Mon, 29 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16200&view=rev Log Message: ----------- Reverting the tab close button code from Epiphany. It clearly isn't working properly either, though I thought it was before. Perhaps the Ubuntu folks changed the icon again? Anyway, clearly this code isn't any better, so, out it goes. It's sounding like the Ubuntu folks might revert the change and then figure out how to fix these things for real for the next release. Modified Paths: -------------- trunk/src/gtkconv.c Modified: trunk/src/gtkconv.c =================================================================== --- trunk/src/gtkconv.c 2006-05-27 06:38:06 UTC (rev 16199) +++ trunk/src/gtkconv.c 2006-05-29 17:11:53 UTC (rev 16200) @@ -7533,7 +7533,7 @@ GtkWidget *close_image; GaimConversationType conv_type; const gchar *tmp_lab; - GtkRcStyle *rcstyle; + gint close_button_width, close_button_height, focus_width, focus_pad; gboolean tabs_side = FALSE; gint angle = 0; @@ -7559,15 +7559,20 @@ /* Close button. */ gtkconv->close = gtk_button_new(); + gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &close_button_width, &close_button_height); + if (gtk_check_version(2, 4, 2) == NULL) { + /* Need to account for extra padding around the gtkbutton */ + gtk_widget_style_get(GTK_WIDGET(gtkconv->close), + "focus-line-width", &focus_width, + "focus-padding", &focus_pad, + NULL); + close_button_width += (focus_width + focus_pad) * 2; + close_button_height += (focus_width + focus_pad) * 2; + } + gtk_widget_set_size_request(GTK_WIDGET(gtkconv->close), + close_button_width, close_button_height); - gtk_button_set_focus_on_click(GTK_BUTTON(gtkconv->close), FALSE); gtk_button_set_relief(GTK_BUTTON(gtkconv->close), GTK_RELIEF_NONE); - - rcstyle = gtk_rc_style_new (); - rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style(gtkconv->close, rcstyle); - gtk_rc_style_unref(rcstyle); - close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); gtk_widget_show(close_image); gtk_container_add(GTK_CONTAINER(gtkconv->close), close_image); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rl...@us...> - 2006-05-27 06:38:13
|
Revision: 16199 Author: rlaager Date: 2006-05-26 23:38:06 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16199&view=rev Log Message: ----------- Fix Launchpad Bug #46863 https://launchpad.net/bugs/46863 Ubuntu's default theme has a larger close icon than GNOME. This causes the tab close button to cut off part of the icon. This resolves it. It's from Epiphany, so I didn't test it extensively. I don't know how it behaves on older GTK+ versions. Modified Paths: -------------- trunk/src/gtkconv.c Modified: trunk/src/gtkconv.c =================================================================== --- trunk/src/gtkconv.c 2006-05-26 03:26:03 UTC (rev 16198) +++ trunk/src/gtkconv.c 2006-05-27 06:38:06 UTC (rev 16199) @@ -7533,7 +7533,7 @@ GtkWidget *close_image; GaimConversationType conv_type; const gchar *tmp_lab; - gint close_button_width, close_button_height, focus_width, focus_pad; + GtkRcStyle *rcstyle; gboolean tabs_side = FALSE; gint angle = 0; @@ -7559,20 +7559,15 @@ /* Close button. */ gtkconv->close = gtk_button_new(); - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &close_button_width, &close_button_height); - if (gtk_check_version(2, 4, 2) == NULL) { - /* Need to account for extra padding around the gtkbutton */ - gtk_widget_style_get(GTK_WIDGET(gtkconv->close), - "focus-line-width", &focus_width, - "focus-padding", &focus_pad, - NULL); - close_button_width += (focus_width + focus_pad) * 2; - close_button_height += (focus_width + focus_pad) * 2; - } - gtk_widget_set_size_request(GTK_WIDGET(gtkconv->close), - close_button_width, close_button_height); + gtk_button_set_focus_on_click(GTK_BUTTON(gtkconv->close), FALSE); gtk_button_set_relief(GTK_BUTTON(gtkconv->close), GTK_RELIEF_NONE); + + rcstyle = gtk_rc_style_new (); + rcstyle->xthickness = rcstyle->ythickness = 0; + gtk_widget_modify_style(gtkconv->close, rcstyle); + gtk_rc_style_unref(rcstyle); + close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); gtk_widget_show(close_image); gtk_container_add(GTK_CONTAINER(gtkconv->close), close_image); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dat...@us...> - 2006-05-26 03:26:19
|
Revision: 16198 Author: datallah Date: 2006-05-25 20:26:03 -0700 (Thu, 25 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16198&view=rev Log Message: ----------- Fix some places where a closed socket isn't being dealt with correctly. This may be the cause of the high CPU usage that some people have noticed. Most of these were reported by Eduardo P?\195?\169rez. Modified Paths: -------------- trunk/src/ft.c trunk/src/protocols/irc/dcc_send.c trunk/src/protocols/jabber/si.c trunk/src/proxy.c Modified: trunk/src/ft.c =================================================================== --- trunk/src/ft.c 2006-05-24 17:38:42 UTC (rev 16197) +++ trunk/src/ft.c 2006-05-26 03:26:03 UTC (rev 16198) @@ -794,6 +794,8 @@ else if ((gaim_xfer_get_size(xfer) > 0) && ((gaim_xfer_get_bytes_sent(xfer)+r) >= gaim_xfer_get_size(xfer))) gaim_xfer_set_completed(xfer, TRUE); + else if (r == 0) + r = -1; } return r; @@ -835,7 +837,7 @@ r = gaim_xfer_read(xfer, &buffer); if (r > 0) { fwrite(buffer, 1, r, xfer->dest_fp); - } else if(r < 0) { + } else if(r <= 0) { gaim_xfer_cancel_remote(xfer); return; } Modified: trunk/src/protocols/irc/dcc_send.c =================================================================== --- trunk/src/protocols/irc/dcc_send.c 2006-05-24 17:38:42 UTC (rev 16197) +++ trunk/src/protocols/irc/dcc_send.c 2006-05-26 03:26:03 UTC (rev 16198) @@ -178,7 +178,7 @@ if (len < 0 && errno == EAGAIN) return; - else if (len < 0) { + else if (len <= 0) { /* XXX: Shouldn't this be canceling the transfer? */ gaim_input_remove(xd->inpa); xd->inpa = 0; Modified: trunk/src/protocols/jabber/si.c =================================================================== --- trunk/src/protocols/jabber/si.c 2006-05-24 17:38:42 UTC (rev 16197) +++ trunk/src/protocols/jabber/si.c 2006-05-26 03:26:03 UTC (rev 16198) @@ -273,7 +273,7 @@ len = read(source, buffer, 5 - jsx->rxlen); if(len < 0 && errno == EAGAIN) return; - else if(len < 0) { + else if(len <= 0) { gaim_input_remove(xfer->watcher); xfer->watcher = 0; close(source); @@ -297,7 +297,7 @@ len = read(source, buffer, jsx->rxqueue[4] + 5 + 2 - jsx->rxlen); if(len < 0 && errno == EAGAIN) return; - else if(len < 0) { + else if(len <= 0) { gaim_input_remove(xfer->watcher); xfer->watcher = 0; close(source); @@ -415,7 +415,7 @@ len = read(source, buffer, 2 - jsx->rxlen); if(len < 0 && errno == EAGAIN) return; - else if(len < 0) { + else if(len <= 0) { gaim_input_remove(xfer->watcher); xfer->watcher = 0; close(source); @@ -431,7 +431,7 @@ len = read(source, buffer, jsx->rxqueue[1] + 2 - jsx->rxlen); if(len < 0 && errno == EAGAIN) return; - else if(len < 0) { + else if(len <= 0) { gaim_input_remove(xfer->watcher); xfer->watcher = 0; close(source); Modified: trunk/src/proxy.c =================================================================== --- trunk/src/proxy.c 2006-05-24 17:38:42 UTC (rev 16197) +++ trunk/src/proxy.c 2006-05-26 03:26:03 UTC (rev 16198) @@ -1119,7 +1119,7 @@ len = read(source, p, max_read); if(len < 0 && errno == EAGAIN) return; - else if(len < 0) { + else if(len <= 0) { close(source); source = -1; g_free(phb->read_buffer); @@ -1508,7 +1508,7 @@ len = read(source, buf, max_read); - if ((len < 0 && errno == EAGAIN) || len + phb->read_len < 4) + if ((len < 0 && errno == EAGAIN) || (len > 0 && len + phb->read_len < 4)) return; else if (len + phb->read_len >= 4) { if (phb->read_buffer[1] == 90) { @@ -1663,7 +1663,7 @@ len = read(source, dest, (phb->read_buf_len - phb->read_len)); if(len < 0 && errno == EAGAIN) return; - else if(len < 0) { + else if(len <= 0) { gaim_debug_warning("socks5 proxy", "or not...\n"); close(source); gaim_input_remove(phb->inpa); @@ -1775,7 +1775,7 @@ phb->read_buf_len - phb->read_len); if(len < 0 && errno == EAGAIN) return; - else if(len < 0) { + else if(len <= 0) { close(source); gaim_input_remove(phb->inpa); g_free(phb->read_buffer); @@ -1867,7 +1867,7 @@ if(len < 0 && errno == EAGAIN) return; - else if(len < 0) { + else if(len <= 0) { close(source); gaim_input_remove(phb->inpa); g_free(phb->read_buffer); @@ -1994,7 +1994,7 @@ phb->read_buf_len - phb->read_len); if(len < 0 && errno == EAGAIN) return; - else if(len < 0) { + else if(len <= 0) { close(source); gaim_input_remove(phb->inpa); g_free(phb->read_buffer); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sea...@us...> - 2006-05-24 17:38:46
|
Revision: 16197 Author: seanegan Date: 2006-05-24 10:38:42 -0700 (Wed, 24 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16197&view=rev Log Message: ----------- more jabber status message escape goodness Modified Paths: -------------- trunk/src/protocols/jabber/buddy.c Modified: trunk/src/protocols/jabber/buddy.c =================================================================== --- trunk/src/protocols/jabber/buddy.c 2006-05-24 00:39:15 UTC (rev 16196) +++ trunk/src/protocols/jabber/buddy.c 2006-05-24 17:38:42 UTC (rev 16197) @@ -110,7 +110,10 @@ jbr->state = state; if(jbr->status) g_free(jbr->status); - jbr->status = g_markup_escape_text(status, -1); + if (status) + jbr->status = g_markup_escape_text(status, -1); + else + jbr->status = NULL; return jbr; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dat...@us...> - 2006-05-24 00:39:30
|
Revision: 16196 Author: datallah Date: 2006-05-23 17:39:15 -0700 (Tue, 23 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16196&view=rev Log Message: ----------- Show the channel name instead of "End of NAMES list" Modified Paths: -------------- trunk/src/protocols/irc/msgs.c Modified: trunk/src/protocols/irc/msgs.c =================================================================== --- trunk/src/protocols/irc/msgs.c 2006-05-21 03:10:46 UTC (rev 16195) +++ trunk/src/protocols/irc/msgs.c 2006-05-24 00:39:15 UTC (rev 16196) @@ -1,10 +1,10 @@ /** * @file msgs.c - * + * * gaim * * Copyright (C) 2003, Ethan Blanton <ebl...@cs...> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -367,7 +367,7 @@ if (!strcmp(name, "366")) { convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, irc->nameconv ? irc->nameconv : args[1], irc->account); if (!convo) { - gaim_debug(GAIM_DEBUG_ERROR, "irc", "Got a NAMES list for %s, which doesn't exist\n", args[2]); + gaim_debug(GAIM_DEBUG_ERROR, "irc", "Got a NAMES list for %s, which doesn't exist\n", args[1]); g_string_free(irc->names, TRUE); irc->names = NULL; g_free(irc->nameconv); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rl...@us...> - 2006-05-21 03:10:53
|
Revision: 16195 Author: rlaager Date: 2006-05-20 20:10:46 -0700 (Sat, 20 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16195&view=rev Log Message: ----------- Rest of SF Patch #1492122 from Sadrul Some typo fixes and doc cleanups. Modified Paths: -------------- trunk/src/dbus-server.h trunk/src/gtkutils.h trunk/src/ntlm.h trunk/src/pounce.h trunk/src/util.h Modified: trunk/src/dbus-server.h =================================================================== --- trunk/src/dbus-server.h 2006-05-21 02:58:03 UTC (rev 16194) +++ trunk/src/dbus-server.h 2006-05-21 03:10:46 UTC (rev 16195) @@ -50,7 +50,7 @@ GaimDBusType *parent; }; -/* By convesion, the GaimDBusType variable representing each structure +/* By convention, the GaimDBusType variable representing each structure GaimSomeStructure has the name GAIM_DBUS_TYPE_GaimSomeStructure. The following macros facilitate defining such variables Modified: trunk/src/gtkutils.h =================================================================== --- trunk/src/gtkutils.h 2006-05-21 02:58:03 UTC (rev 16194) +++ trunk/src/gtkutils.h 2006-05-21 03:10:46 UTC (rev 16195) @@ -409,7 +409,7 @@ * Create a Gaim running-man icon with the status emblem overlayed * in the lower right corner. * - * @param status_type The status type to set the emblem for. + * @param primitive The status type to set the emblem for. * @param scale_factor The amount to scale to the original image. * The default size is 32x32 pixels. A scale * factor of 1 means no scaling will be done. @@ -423,15 +423,15 @@ * allocate the image buffer, or the image file contained * invalid data. */ -GdkPixbuf *gaim_gtk_create_gaim_icon_with_status(GaimStatusPrimitive primitve, double scale_factor); +GdkPixbuf *gaim_gtk_create_gaim_icon_with_status(GaimStatusPrimitive primitive, double scale_factor); /** * Append a GaimMenuAction to a menu. * - * @param menu The menu to append to. - * @param act The GaimMenuAction to append. - * @param object The object to be passed to the action callback. + * @param menu The menu to append to. + * @param act The GaimMenuAction to append. + * @param gobject The object to be passed to the action callback. * * @return The menu. */ Modified: trunk/src/ntlm.h =================================================================== --- trunk/src/ntlm.h 2006-05-21 02:58:03 UTC (rev 16194) +++ trunk/src/ntlm.h 2006-05-21 03:10:46 UTC (rev 16195) @@ -40,6 +40,8 @@ * Parses the ntlm type 2 message * * @param type2 String containing the base64 encoded type2 message + * @param flags If not @c NULL, this will store the flags for the message + * * @return The nonce for use in message type3. This is a statically * allocated 8 byte binary string. */ Modified: trunk/src/pounce.h =================================================================== --- trunk/src/pounce.h 2006-05-21 02:58:03 UTC (rev 16194) +++ trunk/src/pounce.h 2006-05-21 03:10:46 UTC (rev 16195) @@ -98,6 +98,7 @@ * @param pouncer The account that will pounce. * @param pouncee The buddy to pounce on. * @param event The event(s) to pounce on. + * @param option Pounce options. * * @return The new buddy pounce structure. */ Modified: trunk/src/util.h =================================================================== --- trunk/src/util.h 2006-05-21 02:58:03 UTC (rev 16194) +++ trunk/src/util.h 2006-05-21 03:10:46 UTC (rev 16195) @@ -244,7 +244,7 @@ * The returned string is stored in a static buffer, so the result * should be g_strdup()'d if it's going to be kept. * - * @param time The time to format, or @c NULL to use the current local time + * @param tm The time to format, or @c NULL to use the current local time * * @return The date, formatted as per the user's settings. */ @@ -256,7 +256,7 @@ * The returned string is stored in a static buffer, so the result * should be g_strdup()'d if it's going to be kept. * - * @param time The time to format, or @c NULL to use the current local time + * @param tm The time to format, or @c NULL to use the current local time * * @return The timestamp, formatted as per the user's settings. */ @@ -268,7 +268,7 @@ * The returned string is stored in a static buffer, so the result * should be g_strdup()'d if it's going to be kept. * - * @param time The time to format, or @c NULL to use the current local time + * @param tm The time to format, or @c NULL to use the current local time * * @return The date and time, formatted as per the user's settings. */ @@ -280,8 +280,7 @@ * The returned string is stored in a static buffer, so the result * should be g_strdup()'d if it's going to be kept. * - * @param time The time value to format. - * @param time The time to format, or @c NULL to use the current local time + * @param tm The time to format, or @c NULL to use the current local time * * @return The time, formatted as per the user's settings. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rl...@us...> - 2006-05-21 02:58:12
|
Revision: 16194 Author: rlaager Date: 2006-05-20 19:58:03 -0700 (Sat, 20 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16194&view=rev Log Message: ----------- Part of SF Patch #1492122 from Sadrul Fix a small memory leak. Modified Paths: -------------- trunk/src/gtkconv.c Modified: trunk/src/gtkconv.c =================================================================== --- trunk/src/gtkconv.c 2006-05-18 20:53:03 UTC (rev 16193) +++ trunk/src/gtkconv.c 2006-05-21 02:58:03 UTC (rev 16194) @@ -544,6 +544,7 @@ gtk_widget_grab_focus(gtkconv->entry); if (strlen(clean) == 0) { + g_free(buf); g_free(clean); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rl...@us...> - 2006-05-18 20:53:11
|
Revision: 16193 Author: rlaager Date: 2006-05-18 13:53:03 -0700 (Thu, 18 May 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16193&view=rev Log Message: ----------- SF Patch #1461027 from Sadrul "This patch: - adds a Conversation->More menu with a list of plugin-actions which now show up in the context-menu for a buddy in the buddy-list. - adds the same actions in the context-menu of the buddies in the chat-list. ... I find this somewhat useful to start a conference or start a doodle-session from the conv. window rather than having to do what from the buddy list." It seems useful to me, but I won't cry if people object and want it removed. If you don't like it, let me know. Modified Paths: -------------- trunk/src/gtkconv.c trunk/src/gtkutils.c Modified: trunk/src/gtkconv.c =================================================================== --- trunk/src/gtkconv.c 2006-05-18 15:44:02 UTC (rev 16192) +++ trunk/src/gtkconv.c 2006-05-18 20:53:03 UTC (rev 16193) @@ -1540,6 +1540,7 @@ GaimConvChat *chat = GAIM_CONV_CHAT(conv); gboolean is_me = FALSE; GtkWidget *button; + GaimBuddy *buddy = NULL; if (gc != NULL) prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); @@ -1616,7 +1617,7 @@ } if (!is_me && prpl_info && !(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { - if (gaim_find_buddy(conv->account, who)) + if ((buddy = gaim_find_buddy(conv->account, who)) != NULL) button = gaim_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE, G_CALLBACK(menu_chat_add_remove_cb), GAIM_GTK_CONVERSATION(conv), 0, 0, NULL); else @@ -1635,6 +1636,15 @@ if (!get_mark_for_user(GAIM_GTK_CONVERSATION(conv), who)) gtk_widget_set_sensitive(button, FALSE); + if (buddy != NULL) + { + if (gaim_account_is_connected(conv->account)) + gaim_gtk_append_blist_node_proto_menu(menu, conv->account->gc, + (GaimBlistNode *)buddy); + gaim_gtk_append_blist_node_extended_menu(menu, (GaimBlistNode *)buddy); + gtk_widget_show_all(menu); + } + return menu; } @@ -2611,6 +2621,7 @@ "<StockItem>", GAIM_STOCK_INFO }, { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, "<StockItem>", GAIM_STOCK_INVITE }, + { N_("/Conversation/M_ore"), NULL, NULL, 0, "<Branch>", NULL }, { "/Conversation/sep2", NULL, NULL, 0, "<Separator>", NULL }, @@ -2704,12 +2715,67 @@ } } +static void +regenerate_options_items(GaimGtkWindow *win) +{ + GtkWidget *menu; + GList *list; + GaimGtkConversation *gtkconv; + GaimConversation *conv; + GaimBuddy *buddy; + gtkconv = gaim_gtk_conv_window_get_active_gtkconv(win); + conv = gtkconv->active_conv; + buddy = gaim_find_buddy(conv->account, conv->name); + + menu = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/More")); + + /* Remove the previous entries */ + for (list = gtk_container_get_children(GTK_CONTAINER(menu)); list; ) + { + GtkWidget *w = list->data; + list = list->next; + gtk_widget_destroy(w); + } + + /* Now add the stuff */ + if (buddy) + { + if (gaim_account_is_connected(conv->account)) + gaim_gtk_append_blist_node_proto_menu(menu, conv->account->gc, + (GaimBlistNode *)buddy); + gaim_gtk_append_blist_node_extended_menu(menu, (GaimBlistNode *)buddy); + } + + if ((list = gtk_container_get_children(GTK_CONTAINER(menu))) == NULL) + { + GtkWidget *item = gtk_menu_item_new_with_label(_("No actions available")); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); + gtk_widget_set_sensitive(item, FALSE); + } + + gtk_widget_show_all(menu); +} + +static void menubar_activated(GtkWidget *item, gpointer data) +{ + regenerate_options_items(data); + g_signal_handlers_block_by_func(G_OBJECT(item), G_CALLBACK(menubar_activated), data); +} + +static void +focus_out_from_menubar(GtkWidget *wid, GaimGtkWindow *win) +{ + GtkWidget *menuitem = gtk_item_factory_get_item(win->menu.item_factory, N_("/Conversation")); + g_signal_handlers_unblock_by_func(G_OBJECT(menuitem), G_CALLBACK(menubar_activated), win); +} + static GtkWidget * setup_menubar(GaimGtkWindow *win) { GtkAccelGroup *accel_group; const char *method; + GtkWidget *menuitem; accel_group = gtk_accel_group_new (); gtk_window_add_accel_group(GTK_WINDOW(win->window), accel_group); @@ -2727,10 +2793,13 @@ g_signal_connect(G_OBJECT(accel_group), "accel-changed", G_CALLBACK(gaim_gtk_save_accels_cb), NULL); + menuitem = gtk_item_factory_get_item(win->menu.item_factory, N_("/Conversation")); + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(menubar_activated), win); win->menu.menubar = gtk_item_factory_get_widget(win->menu.item_factory, "<main>"); + g_signal_connect(G_OBJECT(win->menu.menubar), "deactivate", G_CALLBACK(focus_out_from_menubar), win); win->menu.view_log = gtk_item_factory_get_widget(win->menu.item_factory, Modified: trunk/src/gtkutils.c =================================================================== --- trunk/src/gtkutils.c 2006-05-18 15:44:02 UTC (rev 16192) +++ trunk/src/gtkutils.c 2006-05-18 20:53:03 UTC (rev 16193) @@ -1687,16 +1687,10 @@ if (act == NULL) { gaim_separator(menu); } else { - GtkWidget *menuitem, *label; + GtkWidget *menuitem; if (act->children == NULL) { - menuitem = gtk_menu_item_new(); - label = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_label_set_pattern(GTK_LABEL(label), "_"); - gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), - act->label); - gtk_container_add(GTK_CONTAINER(menuitem), label); + menuitem = gtk_menu_item_new_with_mnemonic(act->label); if (act->callback != NULL) { g_object_set_data(G_OBJECT(menuitem), @@ -1716,6 +1710,7 @@ } else { GList *l = NULL; GtkWidget *submenu = NULL; + GtkAccelGroup *group; menuitem = gtk_menu_item_new_with_mnemonic(act->label); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); @@ -1723,6 +1718,14 @@ submenu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu); + group = gtk_menu_get_accel_group(GTK_MENU(menu)); + if (group) { + char *path = g_strdup_printf("%s/%s", GTK_MENU_ITEM(menuitem)->accel_path, act->label); + gtk_menu_set_accel_path(GTK_MENU(submenu), path); + g_free(path); + gtk_menu_set_accel_group(GTK_MENU(submenu), group); + } + for (l = act->children; l; l = l->next) { GaimMenuAction *act = (GaimMenuAction *)l->data; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
6 messages has been excluded from this view by a project administrator.
