From: <the...@us...> - 2006-12-17 05:09:17
|
Revision: 18012 http://svn.sourceforge.net/gaim/?rev=18012&view=rev Author: thekingant Date: 2006-12-16 21:04:23 -0800 (Sat, 16 Dec 2006) Log Message: ----------- * Get rid of an assertion failure that I think was happening when you added a new account without setting a custom icon for it, and you still had the Accounts window open * A little code-reuse in some buddy icon scaling code * An minor memleak that could happen when unable open a new file in $HOME/.gaim/icons/ Modified Paths: -------------- trunk/ChangeLog.API trunk/gtk/gtkaccount.c trunk/gtk/gtkblist.c trunk/gtk/gtkconv.c trunk/gtk/gtkutils.c trunk/libgaim/buddyicon.c Modified: trunk/ChangeLog.API =================================================================== --- trunk/ChangeLog.API 2006-12-17 04:55:12 UTC (rev 18011) +++ trunk/ChangeLog.API 2006-12-17 05:04:23 UTC (rev 18012) @@ -145,8 +145,13 @@ * gaim_gtk_set_custom_buddy_icon() sets custom icon for a user. * Hid the definition of _GaimStringref, which already had a warning to avoid accessing it directly. - * notify_userinfo() UI op is passed a GaimNotifyUserInfo instead of a char* - for the user information + * notify_userinfo() UI op is passed a GaimNotifyUserInfo instead of a char* + for the user information + * gaim_buddy_icon_get_scale_size() and + gaim_gtk_buddy_icon_get_scale_size() were changed to ALWAYS scale + the icon instead of only when icon_spec->scale_rules contains + GAIM_ICON_SCALE_DISPLAY. Callers should be changed to check the + scale_rules before calling this function. Removed: * gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute Modified: trunk/gtk/gtkaccount.c =================================================================== --- trunk/gtk/gtkaccount.c 2006-12-17 04:55:12 UTC (rev 18011) +++ trunk/gtk/gtkaccount.c 2006-12-17 05:04:23 UTC (rev 18012) @@ -218,8 +218,9 @@ int width, height; GdkPixbuf *scale; - gaim_gtk_buddy_icon_get_scale_size(pixbuf, - &dialog->prpl_info->icon_spec, &width, &height); + if (dialog->prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY) + gaim_gtk_buddy_icon_get_scale_size(pixbuf, + &dialog->prpl_info->icon_spec, &width, &height); scale = gdk_pixbuf_scale_simple(pixbuf, width, height, GDK_INTERP_BILINEAR); g_object_unref(G_OBJECT(pixbuf)); @@ -614,7 +615,7 @@ if (!(dialog->prpl_info->options & OPT_PROTO_MAIL_CHECK)) gtk_widget_hide(dialog->new_mail_check); - if (!(dialog->prpl_info->icon_spec.format != NULL)) + if (dialog->prpl_info->icon_spec.format == NULL) gtk_widget_hide(dialog->icon_hbox); } @@ -1974,6 +1975,7 @@ static void set_account(GtkListStore *store, GtkTreeIter *iter, GaimAccount *account) { + const char *path; GdkPixbuf *pixbuf; GdkPixbuf *statusicon_pixbuf; GdkPixbuf *statusicon_pixbuf_scaled; @@ -1982,7 +1984,12 @@ if ((pixbuf != NULL) && gaim_account_is_disconnected(account)) gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); - statusicon_pixbuf = gdk_pixbuf_new_from_file(gaim_account_get_ui_string(account, GAIM_GTK_UI, "non-global-buddyicon-path", NULL), NULL); + path = gaim_account_get_ui_string(account, GAIM_GTK_UI, "non-global-buddyicon-path", NULL); + if (path != NULL) + statusicon_pixbuf = gdk_pixbuf_new_from_file(path, NULL); + else + statusicon_pixbuf = NULL; + if (statusicon_pixbuf) { statusicon_pixbuf_scaled = gdk_pixbuf_scale_simple(statusicon_pixbuf, 16, 16, GDK_INTERP_HYPER); } else { Modified: trunk/gtk/gtkblist.c =================================================================== --- trunk/gtk/gtkblist.c 2006-12-17 04:55:12 UTC (rev 18011) +++ trunk/gtk/gtkblist.c 2006-12-17 05:04:23 UTC (rev 18012) @@ -2068,7 +2068,8 @@ scale_width = orig_width = gdk_pixbuf_get_width(buf); scale_height = orig_height = gdk_pixbuf_get_height(buf); - gaim_buddy_icon_get_scale_size(prpl_info ? &prpl_info->icon_spec : NULL, &scale_width, &scale_height); + if (prpl_info && prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY) + gaim_buddy_icon_get_scale_size(&prpl_info->icon_spec, &scale_width, &scale_height); if (scaled) { if(scale_height > scale_width) { Modified: trunk/gtk/gtkconv.c =================================================================== --- trunk/gtk/gtkconv.c 2006-12-17 04:55:12 UTC (rev 18011) +++ trunk/gtk/gtkconv.c 2006-12-17 05:04:23 UTC (rev 18012) @@ -2308,8 +2308,9 @@ gdk_pixbuf_animation_iter_advance(gtkconv->u.im->iter, NULL); buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter); - gaim_gtk_buddy_icon_get_scale_size(buf, prpl_info ? &prpl_info->icon_spec : - NULL, &scale_width, &scale_height); + if (prpl_info && prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY) + gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec, + &scale_width, &scale_height); /* this code is ugly, and scares me */ scale = gdk_pixbuf_scale_simple(buf, @@ -6024,8 +6025,9 @@ start_anim(NULL, gtkconv); } - gaim_gtk_buddy_icon_get_scale_size(buf, prpl_info ? &prpl_info->icon_spec : - NULL, &scale_width, &scale_height); + if (prpl_info && prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY) + gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec, + &scale_width, &scale_height); scale = gdk_pixbuf_scale_simple(buf, MAX(gdk_pixbuf_get_width(buf) * scale_width / gdk_pixbuf_animation_get_width(gtkconv->u.im->anim), 1), Modified: trunk/gtk/gtkutils.c =================================================================== --- trunk/gtk/gtkutils.c 2006-12-17 04:55:12 UTC (rev 18011) +++ trunk/gtk/gtkutils.c 2006-12-17 05:04:23 UTC (rev 18012) @@ -2455,6 +2455,7 @@ } #endif +/* TODO: Use icon_spec.filesize */ char * gaim_gtk_convert_buddy_icon(GaimPlugin *plugin, const char *path) { @@ -2467,11 +2468,10 @@ GdkPixbuf *pixbuf; #if !GTK_CHECK_VERSION(2,4,0) GdkPixbufLoader *loader; - FILE *file; - struct stat st; - void *data = NULL; #endif #endif + gchar *contents; + gsize length; const char *dirname; char *random; char *filename; @@ -2504,12 +2504,9 @@ format = gdk_pixbuf_get_file_info (path, &width, &height); #else loader = gdk_pixbuf_loader_new(); - if (!g_stat(path, &st) && (file = g_fopen(path, "rb")) != NULL) { - data = g_malloc(st.st_size); - fread(data, 1, st.st_size, file); - fclose(file); - gdk_pixbuf_loader_write(loader, data, st.st_size, NULL); - g_free(data); + if (g_file_get_contents(path, &contents, &length, NULL)) { + gdk_pixbuf_loader_write(loader, contents, length, NULL); + g_free(contents); } gdk_pixbuf_loader_close(loader, NULL); pixbuf = gdk_pixbuf_loader_get_pixbuf(loader); @@ -2530,8 +2527,6 @@ prpl_info->icon_spec.max_height >= height))) /* The icon is the correct size */ #endif { - gchar *contents; - gsize length; FILE *image; #if GTK_CHECK_VERSION(2,2,0) @@ -2539,13 +2534,15 @@ g_strfreev(pixbuf_formats); #endif - /* Copy the image to the cache folder as "filename". */ + /* We don't need to scale the image, so copy it to the cache folder verbatim */ + contents = NULL; if (!g_file_get_contents(path, &contents, &length, NULL) || (image = g_fopen(filename, "wb")) == NULL) { g_free(random); g_free(filename); + g_free(contents); #if GTK_CHECK_VERSION(2,2,0) && !GTK_CHECK_VERSION(2,4,0) g_object_unref(G_OBJECT(pixbuf)); #endif @@ -2592,23 +2589,8 @@ int new_width = width; int new_height = height; - if(new_width > prpl_info->icon_spec.max_width) - new_width = prpl_info->icon_spec.max_width; - else if(new_width < prpl_info->icon_spec.min_width) - new_width = prpl_info->icon_spec.min_width; - if(new_height > prpl_info->icon_spec.max_height) - new_height = prpl_info->icon_spec.max_height; - else if(new_height < prpl_info->icon_spec.min_height) - new_height = prpl_info->icon_spec.min_height; + gaim_buddy_icon_get_scale_size(&prpl_info->icon_spec, &new_width, &new_height); - /* preserve aspect ratio */ - if ((double)height * (double)new_width > - (double)width * (double)new_height) { - new_width = 0.5 + (double)width * (double)new_height / (double)height; - } else { - new_height = 0.5 + (double)height * (double)new_width / (double)width; - } - scale = gdk_pixbuf_scale_simple (pixbuf, new_width, new_height, GDK_INTERP_HYPER); g_object_unref(G_OBJECT(pixbuf)); @@ -2625,10 +2607,9 @@ for (i = 0; prpl_formats[i]; i++) { gaim_debug_info("buddyicon", "Converting buddy icon to %s as %s\n", prpl_formats[i], filename); - /* The gdk-pixbuf documentation is wrong. gdk_pixbuf_save returns TRUE if it was successful, - * FALSE if an error was set. */ - if (gdk_pixbuf_save (pixbuf, filename, prpl_formats[i], &error, NULL) == TRUE) - break; + if (gdk_pixbuf_save(pixbuf, filename, prpl_formats[i], &error, NULL)) + /* Success! */ + break; gaim_debug_warning("buddyicon", "Could not convert to %s: %s\n", prpl_formats[i], error->message); g_error_free(error); error = NULL; Modified: trunk/libgaim/buddyicon.c =================================================================== --- trunk/libgaim/buddyicon.c 2006-12-17 04:55:12 UTC (rev 18011) +++ trunk/libgaim/buddyicon.c 2006-12-17 05:04:23 UTC (rev 18012) @@ -546,32 +546,30 @@ void gaim_buddy_icon_get_scale_size(GaimBuddyIconSpec *spec, int *width, int *height) { - if(spec && spec->scale_rules & GAIM_ICON_SCALE_DISPLAY) { - int new_width, new_height; + int new_width, new_height; - new_width = *width; - new_height = *height; + new_width = *width; + new_height = *height; - if(*width < spec->min_width) - new_width = spec->min_width; - else if(*width > spec->max_width) - new_width = spec->max_width; + if (*width < spec->min_width) + new_width = spec->min_width; + else if (*width > spec->max_width) + new_width = spec->max_width; - if(*height < spec->min_height) - new_height = spec->min_height; - else if(*height > spec->max_height) - new_height = spec->max_height; + if (*height < spec->min_height) + new_height = spec->min_height; + else if (*height > spec->max_height) + new_height = spec->max_height; - /* preserve aspect ratio */ - if ((double)*height * (double)new_width > - (double)*width * (double)new_height) { - new_width = 0.5 + (double)*width * (double)new_height / (double)*height; - } else { - new_height = 0.5 + (double)*height * (double)new_width / (double)*width; - } - - *width = new_width; - *height = new_height; + /* preserve aspect ratio */ + if ((double)*height * (double)new_width > + (double)*width * (double)new_height) { + new_width = 0.5 + (double)*width * (double)new_height / (double)*height; + } else { + new_height = 0.5 + (double)*height * (double)new_width / (double)*width; } + + *width = new_width; + *height = new_height; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-12-20 09:31:18
|
Revision: 18029 http://svn.sourceforge.net/gaim/?rev=18029&view=rev Author: thekingant Date: 2006-12-20 01:31:11 -0800 (Wed, 20 Dec 2006) Log Message: ----------- A better fix for the bugs I introduced in revision 18012, that was partially fixed by sf patch #1618871. Revision Links: -------------- http://svn.sourceforge.net/gaim/?rev=18012&view=rev Modified Paths: -------------- trunk/ChangeLog.API trunk/gtk/gtkaccount.c trunk/gtk/gtkconv.c trunk/gtk/gtkutils.c trunk/gtk/gtkutils.h Modified: trunk/ChangeLog.API =================================================================== --- trunk/ChangeLog.API 2006-12-20 09:28:29 UTC (rev 18028) +++ trunk/ChangeLog.API 2006-12-20 09:31:11 UTC (rev 18029) @@ -147,11 +147,13 @@ avoid accessing it directly. * notify_userinfo() UI op is passed a GaimNotifyUserInfo instead of a char* for the user information - * gaim_buddy_icon_get_scale_size() and - gaim_gtk_buddy_icon_get_scale_size() were changed to ALWAYS scale + * gaim_buddy_icon_get_scale_size() and was changed to ALWAYS scale the icon instead of only when icon_spec->scale_rules contains GAIM_ICON_SCALE_DISPLAY. Callers should be changed to check the scale_rules before calling this function. + * gaim_gtk_buddy_icon_get_scale_size() was changed to accept an + additional parameter which is used to determine what kind of + scaling should be done, if any. Removed: * gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute Modified: trunk/gtk/gtkaccount.c =================================================================== --- trunk/gtk/gtkaccount.c 2006-12-20 09:28:29 UTC (rev 18028) +++ trunk/gtk/gtkaccount.c 2006-12-20 09:31:11 UTC (rev 18029) @@ -218,9 +218,8 @@ int width, height; GdkPixbuf *scale; - if (dialog->prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY) - gaim_gtk_buddy_icon_get_scale_size(pixbuf, - &dialog->prpl_info->icon_spec, &width, &height); + gaim_gtk_buddy_icon_get_scale_size(pixbuf, &dialog->prpl_info->icon_spec, + GAIM_ICON_SCALE_DISPLAY, &width, &height); scale = gdk_pixbuf_scale_simple(pixbuf, width, height, GDK_INTERP_BILINEAR); g_object_unref(G_OBJECT(pixbuf)); Modified: trunk/gtk/gtkconv.c =================================================================== --- trunk/gtk/gtkconv.c 2006-12-20 09:28:29 UTC (rev 18028) +++ trunk/gtk/gtkconv.c 2006-12-20 09:31:11 UTC (rev 18029) @@ -2308,9 +2308,8 @@ gdk_pixbuf_animation_iter_advance(gtkconv->u.im->iter, NULL); buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter); - if (prpl_info && prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY) - gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec, - &scale_width, &scale_height); + gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec, + GAIM_ICON_SCALE_DISPLAY, &scale_width, &scale_height); /* this code is ugly, and scares me */ scale = gdk_pixbuf_scale_simple(buf, @@ -6070,14 +6069,8 @@ start_anim(NULL, gtkconv); } - if (prpl_info && prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY) { - gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec, - &scale_width, &scale_height); - } else { - scale_width = gdk_pixbuf_get_width(buf); - scale_height = gdk_pixbuf_get_height(buf); - } - + gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec, + GAIM_ICON_SCALE_DISPLAY, &scale_width, &scale_height); scale = gdk_pixbuf_scale_simple(buf, MAX(gdk_pixbuf_get_width(buf) * scale_width / gdk_pixbuf_animation_get_width(gtkconv->u.im->anim), 1), Modified: trunk/gtk/gtkutils.c =================================================================== --- trunk/gtk/gtkutils.c 2006-12-20 09:28:29 UTC (rev 18028) +++ trunk/gtk/gtkutils.c 2006-12-20 09:31:11 UTC (rev 18029) @@ -1525,11 +1525,14 @@ g_list_free(files); } -void gaim_gtk_buddy_icon_get_scale_size(GdkPixbuf *buf, GaimBuddyIconSpec *spec, int *width, int *height) +void gaim_gtk_buddy_icon_get_scale_size(GdkPixbuf *buf, GaimBuddyIconSpec *spec, GaimIconScaleRules rules, int *width, int *height) { *width = gdk_pixbuf_get_width(buf); *height = gdk_pixbuf_get_height(buf); + if ((spec == NULL) || !(spec->scale_rules & rules)) + return; + gaim_buddy_icon_get_scale_size(spec, width, height); /* and now for some arbitrary sanity checks */ Modified: trunk/gtk/gtkutils.h =================================================================== --- trunk/gtk/gtkutils.h 2006-12-20 09:28:29 UTC (rev 18028) +++ trunk/gtk/gtkutils.h 2006-12-20 09:31:11 UTC (rev 18029) @@ -362,7 +362,7 @@ /** * Convenience wrapper for gaim_buddy_icon_get_scale_size */ -void gaim_gtk_buddy_icon_get_scale_size(GdkPixbuf *buf, GaimBuddyIconSpec *spec, int *width, int *height); +void gaim_gtk_buddy_icon_get_scale_size(GdkPixbuf *buf, GaimBuddyIconSpec *spec, GaimIconScaleRules rules, int *width, int *height); /** * Returns the base image to represent the account, based on This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ebl...@us...> - 2006-12-21 00:40:29
|
Revision: 18034 http://svn.sourceforge.net/gaim/?rev=18034&view=rev Author: eblanton Date: 2006-12-20 16:40:21 -0800 (Wed, 20 Dec 2006) Log Message: ----------- This patch fixes startup crashes when the blist is manipulated before the Gtk blist is created. Thanks to Geoffrey Antos. Modified Paths: -------------- trunk/COPYRIGHT trunk/gtk/gtkblist.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-12-20 20:38:20 UTC (rev 18033) +++ trunk/COPYRIGHT 2006-12-21 00:40:21 UTC (rev 18034) @@ -7,6 +7,7 @@ Dave Ahlswede Manuel Amador Matt Amato +Geoffrey Antos Daniel Atallah Paul Aurich Patrick Aussems Modified: trunk/gtk/gtkblist.c =================================================================== --- trunk/gtk/gtkblist.c 2006-12-20 20:38:20 UTC (rev 18033) +++ trunk/gtk/gtkblist.c 2006-12-21 00:40:21 UTC (rev 18034) @@ -4371,6 +4371,10 @@ static void redo_buddy_list(GaimBuddyList *list, gboolean remove, gboolean rerender) { + gtkblist = GAIM_GTK_BLIST(list); + if(!gtkblist || !gtkblist->treeview) + return; + GaimBlistNode *node = list->root; while (node) @@ -4863,7 +4867,7 @@ { if (list) gtkblist = GAIM_GTK_BLIST(list); - if(!gtkblist || !node) + if(!gtkblist || !gtkblist->treeview || !node) return; if (node->ui_data == NULL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-12-23 19:32:11
|
Revision: 18050 http://svn.sourceforge.net/gaim/?rev=18050&view=rev Author: thekingant Date: 2006-12-23 11:32:10 -0800 (Sat, 23 Dec 2006) Log Message: ----------- AIM/ICQ file transfer pausing an resuming. This should work, but could use a little more testing. It's a patch from Graham Booker with modifcations by me. Blame me if I broke file transfer for anything. Modified Paths: -------------- trunk/ChangeLog trunk/ChangeLog.API trunk/libgaim/ft.c trunk/libgaim/ft.h trunk/libgaim/protocols/oscar/oft.c trunk/libgaim/protocols/oscar/peer.c trunk/libgaim/protocols/oscar/peer.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-12-23 05:42:41 UTC (rev 18049) +++ trunk/ChangeLog 2006-12-23 19:32:10 UTC (rev 18050) @@ -145,8 +145,10 @@ AIM/ICQ Features: * ICQ file transfer support with newer ICQ clients (Jonathan Clark, Google Summer of Code) - * Many overall improvements to OSCAR file transfers (Jonathan Clark, - Google Summer of Code) + * Many overall improvements to AIM and ICQ file transfers (Jonathan + Clark, Google Summer of Code) + * Support for pausing and resuming AIM and ICQ file transfers + (Graham Booker) * Ability to set ICQ "require authorization" and "web aware" setting (Ettore Simone) * ICQ encoding fix for offline buddies (Ilya Konstantinov) Modified: trunk/ChangeLog.API =================================================================== --- trunk/ChangeLog.API 2006-12-23 05:42:41 UTC (rev 18049) +++ trunk/ChangeLog.API 2006-12-23 19:32:10 UTC (rev 18050) @@ -353,6 +353,8 @@ * gaim_gtk_roomlist_dialog_show_with_account * gaim_gtk_tree_view_search_equal_func to be used with gtk_tree_view_set_search_equal_func + * gaim_xfer_set_bytes_sent(). Sets the offset in the file to + read from or write to. Signals - Changed: (See the Doxygen docs for details on all signals.) * Signal propagation now stops after a handler returns a non-NULL value. Modified: trunk/libgaim/ft.c =================================================================== --- trunk/libgaim/ft.c 2006-12-23 05:42:41 UTC (rev 18049) +++ trunk/libgaim/ft.c 2006-12-23 19:32:10 UTC (rev 18050) @@ -698,12 +698,19 @@ { g_return_if_fail(xfer != NULL); - if (xfer->size == 0) - xfer->bytes_remaining = size - xfer->bytes_sent; - xfer->size = size; + xfer->bytes_remaining = xfer->size - gaim_xfer_get_bytes_sent(xfer); } +void +gaim_xfer_set_bytes_sent(GaimXfer *xfer, size_t bytes_sent) +{ + g_return_if_fail(xfer != NULL); + + xfer->bytes_sent = bytes_sent; + xfer->bytes_remaining = gaim_xfer_get_size(xfer) - bytes_sent; +} + GaimXferUiOps * gaim_xfer_get_ui_ops(const GaimXfer *xfer) { @@ -948,6 +955,8 @@ return; } + fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET); + xfer->watcher = gaim_input_add(xfer->fd, cond, transfer_cb, xfer); xfer->start_time = time(NULL); @@ -978,9 +987,6 @@ type = gaim_xfer_get_type(xfer); - xfer->bytes_remaining = gaim_xfer_get_size(xfer); - xfer->bytes_sent = 0; - gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_STARTED); if (type == GAIM_XFER_RECEIVE) { Modified: trunk/libgaim/ft.h =================================================================== --- trunk/libgaim/ft.h 2006-12-23 05:42:41 UTC (rev 18049) +++ trunk/libgaim/ft.h 2006-12-23 19:32:10 UTC (rev 18050) @@ -376,6 +376,21 @@ void gaim_xfer_set_size(GaimXfer *xfer, size_t size); /** + * Sets the current working position in the active file transfer. This + * can be used to jump backward in the file if the protocol detects + * that some bit of data needs to be resent or has been sent twice. + * + * It's used for pausing and resuming an oscar file transfer. + * + * @param xfer The file transfer. + * @param bytes_sent The new current position in the file. If we're + * sending a file then this is the byte that we will + * send. If we're receiving a file, this is the + * next byte that we expect to receive. + */ +void gaim_xfer_set_bytes_sent(GaimXfer *xfer, size_t bytes_sent); + +/** * Returns the UI operations structure for a file transfer. * * @param xfer The file transfer. Modified: trunk/libgaim/protocols/oscar/oft.c =================================================================== --- trunk/libgaim/protocols/oscar/oft.c 2006-12-23 05:42:41 UTC (rev 18049) +++ trunk/libgaim/protocols/oscar/oft.c 2006-12-23 19:32:10 UTC (rev 18050) @@ -116,16 +116,26 @@ if ((fd = fopen(filename, "rb"))) { int bytes; - guint8 buffer[1024]; + guint8 *buffer = g_malloc(65536); - while ((bytes = fread(buffer, 1, 1024, fd)) != 0) + while ((bytes = fread(buffer, 1, 65536, fd)) != 0) checksum = peer_oft_checksum_chunk(buffer, bytes, checksum); + g_free(buffer); fclose(fd); } return checksum; } +static void +peer_oft_copy_xfer_data(PeerConnection *conn, OftFrame *frame) +{ + g_free(conn->xferdata.name); + + memcpy(&(conn->xferdata), frame, sizeof(OftFrame)); + conn->xferdata.name = g_memdup(frame->name, frame->name_length); +} + /** * Free any OFT related data. */ @@ -219,6 +229,17 @@ } static void +peer_oft_send_resume_accept(PeerConnection *conn) +{ + conn->xferdata.type = PEER_TYPE_RESUMEACCEPT; + + /* Fill in the cookie */ + memcpy(conn->xferdata.cookie, conn->cookie, 8); + + peer_oft_send(conn, &conn->xferdata); +} + +static void peer_oft_send_done(PeerConnection *conn) { conn->xferdata.type = PEER_TYPE_DONE; @@ -288,7 +309,7 @@ peer_oft_recv_frame_prompt(PeerConnection *conn, OftFrame *frame) { /* Record the file information and send an ack */ - memcpy(&conn->xferdata, frame, sizeof(OftFrame)); + peer_oft_copy_xfer_data(conn, frame); peer_oft_send_ack(conn); /* Remove our watchers and use the file transfer watchers in the core */ @@ -305,7 +326,7 @@ static void peer_oft_recv_frame_ack(PeerConnection *conn, OftFrame *frame) { - if (memcmp(conn->cookie, frame->cookie, 8)) + if (memcmp(conn->cookie, frame->cookie, 8) != 0) { gaim_debug_info("oscar", "Received an incorrect cookie. " "Closing connection.\n"); @@ -320,6 +341,36 @@ start_transfer_when_done_sending_data, conn); } +/** + * We are sending a file to someone else. They have just acknowledged our + * prompt and are asking to resume, so we accept their resume and await + * a resume ack. + */ +static void +peer_oft_recv_frame_resume(PeerConnection *conn, OftFrame *frame) +{ + if (memcmp(conn->cookie, frame->cookie, 8) != 0) + { + gaim_debug_info("oscar", "Received an incorrect cookie. " + "Closing connection.\n"); + peer_connection_destroy(conn, OSCAR_DISCONNECT_INVALID_DATA, NULL); + return; + } + + /* + * TODO: Check the checksums here. If they don't match then don't + * copy the data like below. + */ + + /* Copy resume data into internal structure */ + conn->xferdata.recvcsum = frame->recvcsum; + conn->xferdata.rfrcsum = frame->rfrcsum; + conn->xferdata.nrecvd = frame->nrecvd; + + gaim_xfer_set_bytes_sent(conn->xfer, frame->nrecvd); + peer_oft_send_resume_accept(conn); +} + /* * We just sent a file to someone. They said they got it and everything, * so we can close our direct connection and what not. @@ -378,12 +429,24 @@ /* TODOFT: peer_oft_dirconvert_fromstupid(frame->name); */ - if (frame.type == PEER_TYPE_PROMPT) - peer_oft_recv_frame_prompt(conn, &frame); - else if (frame.type == PEER_TYPE_ACK) - peer_oft_recv_frame_ack(conn, &frame); - else if (frame.type == PEER_TYPE_DONE) - peer_oft_recv_frame_done(conn, &frame); + switch(frame.type) + { + case PEER_TYPE_PROMPT: + peer_oft_recv_frame_prompt(conn, &frame); + break; + case PEER_TYPE_ACK: + case PEER_TYPE_RESUMEACK: + peer_oft_recv_frame_ack(conn, &frame); + break; + case PEER_TYPE_RESUME: + peer_oft_recv_frame_resume(conn, &frame); + break; + case PEER_TYPE_DONE: + peer_oft_recv_frame_done(conn, &frame); + break; + default: + break; + } free(frame.name); } Modified: trunk/libgaim/protocols/oscar/peer.c =================================================================== --- trunk/libgaim/protocols/oscar/peer.c 2006-12-23 05:42:41 UTC (rev 18049) +++ trunk/libgaim/protocols/oscar/peer.c 2006-12-23 19:32:10 UTC (rev 18050) @@ -230,6 +230,7 @@ g_free(conn->proxyip); g_free(conn->clientip); g_free(conn->verifiedip); + g_free(conn->xferdata.name); gaim_circ_buffer_destroy(conn->buffer_outgoing); conn->od->peer_connections = g_slist_remove(conn->od->peer_connections, conn); Modified: trunk/libgaim/protocols/oscar/peer.h =================================================================== --- trunk/libgaim/protocols/oscar/peer.h 2006-12-23 05:42:41 UTC (rev 18049) +++ trunk/libgaim/protocols/oscar/peer.h 2006-12-23 19:32:10 UTC (rev 18050) @@ -42,11 +42,11 @@ #define PEER_CONNECTION_FLAG_IS_INCOMING 0x0020 #define PEER_TYPE_PROMPT 0x0101 /* "I am going to send you this file, is that ok?" */ -#define PEER_TYPE_RESUMESOMETHING 0x0106 /* I really don't know */ +#define PEER_TYPE_RESUMEACCEPT 0x0106 /* We are accepting the resume */ #define PEER_TYPE_ACK 0x0202 /* "Yes, it is ok for you to send me that file" */ #define PEER_TYPE_DONE 0x0204 /* "I received that file with no problems, thanks a bunch" */ -#define PEER_TYPE_RESUME 0x0205 /* Resume transferring, sent by whoever paused? */ -#define PEER_TYPE_RESUMEACK 0x0207 /* Not really sure */ +#define PEER_TYPE_RESUME 0x0205 /* Resume transferring, sent by whoever receives */ +#define PEER_TYPE_RESUMEACK 0x0207 /* Our resume accept was ACKed */ #define PEER_TYPE_GETFILE_REQUESTLISTING 0x1108 /* "I have a listing.txt file, do you want it?" */ #define PEER_TYPE_GETFILE_RECEIVELISTING 0x1209 /* "Yes, please send me your listing.txt file" */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2007-01-18 17:41:51
|
Revision: 18156 http://svn.sourceforge.net/gaim/?rev=18156&view=rev Author: datallah Date: 2007-01-18 09:41:47 -0800 (Thu, 18 Jan 2007) Log Message: ----------- Have the wingaim installer read the GTK version to be installed from the installer "source" instead of maintaining the version in the installer script and having to update it. Modified Paths: -------------- trunk/Makefile.mingw trunk/gaim-installer.nsi Modified: trunk/Makefile.mingw =================================================================== --- trunk/Makefile.mingw 2007-01-18 13:30:17 UTC (rev 18155) +++ trunk/Makefile.mingw 2007-01-18 17:41:47 UTC (rev 18156) @@ -31,6 +31,11 @@ exit; \ }' VERSION) +GTK_INSTALL_VERSION = $(shell \ + source ../gtk_installer/version.sh; \ + echo $$gtk_version \ +) + # Any *.dll or *.exe files included in win32-install-dir that we don't compile # should be included in this list so they don't get stripped NON_GAIM_DLLS = \ @@ -70,13 +75,13 @@ -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec strip --strip-unneeded {} ';' installer: create_release_install_dir - $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" gaim-installer.nsi + $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi installer_nogtk: create_release_install_dir - $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" gaim-installer.nsi + $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi installer_debug: install - $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG gaim-installer.nsi + $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi installers: installer installer_nogtk installer_debug Modified: trunk/gaim-installer.nsi =================================================================== --- trunk/gaim-installer.nsi 2007-01-18 13:30:17 UTC (rev 18155) +++ trunk/gaim-installer.nsi 2007-01-18 17:41:47 UTC (rev 18156) @@ -64,7 +64,6 @@ !define GAIM_UNINST_EXE "gaim-uninst.exe" !define GTK_MIN_VERSION "2.6.10" -!define GTK_INSTALL_VERSION "2.10.6" !define GTK_REG_KEY "SOFTWARE\GTK\2.0" !define PERL_REG_KEY "SOFTWARE\Perl" !define PERL_DLL "perl58.dll" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2007-01-19 04:13:58
|
Revision: 18163 http://svn.sourceforge.net/gaim/?rev=18163&view=rev Author: thekingant Date: 2007-01-18 20:13:59 -0800 (Thu, 18 Jan 2007) Log Message: ----------- Include oscarcommon.h in the tarball Include symlinks in the RPMs (liboscar.so and liboscar.so.1) Modified Paths: -------------- trunk/gaim.spec.in trunk/libgaim/protocols/oscar/Makefile.am Modified: trunk/gaim.spec.in =================================================================== --- trunk/gaim.spec.in 2007-01-19 04:13:23 UTC (rev 18162) +++ trunk/gaim.spec.in 2007-01-19 04:13:59 UTC (rev 18163) @@ -244,7 +244,7 @@ %find_lang %{name} -find $RPM_BUILD_ROOT%{_libdir}/gaim -type f -print | \ +find $RPM_BUILD_ROOT%{_libdir}/gaim -xtype f -print | \ sed "s@^$RPM_BUILD_ROOT@@g" | \ grep -v /gntgf.so | \ grep -v /gnthistory.so | \ Modified: trunk/libgaim/protocols/oscar/Makefile.am =================================================================== --- trunk/libgaim/protocols/oscar/Makefile.am 2007-01-19 04:13:23 UTC (rev 18162) +++ trunk/libgaim/protocols/oscar/Makefile.am 2007-01-19 04:13:59 UTC (rev 18163) @@ -34,6 +34,7 @@ oft.c \ oscar.c \ oscar.h \ + oscarcommon.h \ oscar_data.c \ peer.c \ peer.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2007-01-25 07:44:39
|
Revision: 18171 http://svn.sourceforge.net/gaim/?rev=18171&view=rev Author: thekingant Date: 2007-01-24 23:44:39 -0800 (Wed, 24 Jan 2007) Log Message: ----------- sf patch #1640011, from Celso Pinto Patch for gaim.spec that fixes dependencies on SUSE Modified Paths: -------------- trunk/COPYRIGHT trunk/gaim.spec.in Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2007-01-25 07:30:13 UTC (rev 18170) +++ trunk/COPYRIGHT 2007-01-25 07:44:39 UTC (rev 18171) @@ -242,6 +242,7 @@ Havoc Pennington Ted Percival Eduardo Pérez +Celso Pinto Joao Luís Marques Pinto Aleksander Piotrowski Julien Pivotto Modified: trunk/gaim.spec.in =================================================================== --- trunk/gaim.spec.in 2007-01-25 07:30:13 UTC (rev 18170) +++ trunk/gaim.spec.in 2007-01-25 07:44:39 UTC (rev 18171) @@ -6,7 +6,7 @@ # When not doing betas comment this out # NOTE: %defines in spec files are evaluated in comments so the correct # way to comment it out is to replace the % with # -%define beta 6 +#define beta 7 %if 0%{?beta} %define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//') @@ -29,8 +29,6 @@ # Generic build requirements BuildRequires: libtool, pkgconfig, intltool, gettext, libxml2-devel %{?_with_avahi:BuildRequires: avahi-compat-howl-devel} -%{?_with_dbus:BuildRequires: dbus-devel >= 0.35} -%{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10} %{!?_without_gtkspell:BuildRequires: gtkspell-devel} %{?_with_howl:BuildRequires: howl-devel} %{?_with_meanwhile:BuildRequires: meanwhile-devel} @@ -40,6 +38,16 @@ %{?_with_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h} %{!?_without_text:BuildRequires: ncurses-devel} +%if "%{_vendor}" == "suse" +# For SuSE: +BuildRequires: gnutls-devel +%{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35} +%{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10} +%else +%{?_with_dbus:BuildRequires: dbus-devel >= 0.35} +%{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10} +%endif + # Mandrake 10.1 and lower || Mandrake 10.2 (and higher?) %if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva" # For Mandrake/Mandriva: @@ -48,10 +56,7 @@ %else # For SuSE, Red Hat, Fedora and others: BuildRequires: gtk2-devel -%if "%{_vendor}" == "suse" -# For SuSE: -BuildRequires: gnutls-devel -%else +%if "%{_vendor}" != "suse" # For Red Hat, Fedora and others: # let's assume RH & FC1 are the only brain-dead distros missing the # perl-XML-Parser dependency on intltool and that other RH/FC releases This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2007-01-25 08:09:04
|
Revision: 18172 http://svn.sourceforge.net/gaim/?rev=18172&view=rev Author: thekingant Date: 2007-01-25 00:09:04 -0800 (Thu, 25 Jan 2007) Log Message: ----------- sf patch #1639901, from Saleem Abdulrasool Fix the build failure of the Mono example dlls due to the Mono API change Modified Paths: -------------- trunk/COPYRIGHT trunk/libgaim/plugins/mono/GetBuddyBack.cs trunk/libgaim/plugins/mono/MPlugin.cs Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2007-01-25 07:44:39 UTC (rev 18171) +++ trunk/COPYRIGHT 2007-01-25 08:09:04 UTC (rev 18172) @@ -4,6 +4,7 @@ If you have contributed to Gaim, you deserve to be on this list. Contact us (see: AUTHORS) and we'll add you. +Saleem Abdulrasool Dave Ahlswede Manuel Amador Matt Amato Modified: trunk/libgaim/plugins/mono/GetBuddyBack.cs =================================================================== --- trunk/libgaim/plugins/mono/GetBuddyBack.cs 2007-01-25 07:44:39 UTC (rev 18171) +++ trunk/libgaim/plugins/mono/GetBuddyBack.cs 2007-01-25 08:09:04 UTC (rev 18172) @@ -1,7 +1,14 @@ using Gaim; -public class GetBuddyBack : GaimPlugin +public class GetBuddyBack : Plugin { + private static PluginInfo info = new PluginInfo("C# Get Buddy Back", "0.1", "Prints when a Buddy returns", "Longer Description", "Eoin Coffey", "urled"); + + public GetBuddyBack() + : base (info) + { + } + public void HandleSig(object[] args) { Buddy buddy = (Buddy)args[0]; @@ -24,9 +31,4 @@ public override void Destroy() { } - - public override GaimPluginInfo Info() - { - return new GaimPluginInfo("C# Get Buddy Back", "0.1", "Prints when a Buddy returns", "Longer Description", "Eoin Coffey", "urled"); - } } Modified: trunk/libgaim/plugins/mono/MPlugin.cs =================================================================== --- trunk/libgaim/plugins/mono/MPlugin.cs 2007-01-25 07:44:39 UTC (rev 18171) +++ trunk/libgaim/plugins/mono/MPlugin.cs 2007-01-25 08:09:04 UTC (rev 18172) @@ -1,7 +1,14 @@ using Gaim; -public class MPlugin : GaimPlugin +public class MPlugin : Plugin { + private static PluginInfo info = new PluginInfo("C# Plugin", "0.1", "Test C# Plugin", "Longer Description", "Eoin Coffey", "urled"); + + public MPlugin() + : base(info) + { + } + public void HandleSig(object[] args) { Buddy buddy = (Buddy)args[0]; @@ -28,9 +35,4 @@ { Debug.debug(Debug.INFO, "mplug", "destroying...\n"); } - - public override GaimPluginInfo Info() - { - return new GaimPluginInfo("C# Plugin", "0.1", "Test C# Plugin", "Longer Description", "Eoin Coffey", "urled"); - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2007-02-09 17:16:41
|
Revision: 18188 http://svn.sourceforge.net/gaim/?rev=18188&view=rev Author: rlaager Date: 2007-02-09 09:16:32 -0800 (Fri, 09 Feb 2007) Log Message: ----------- SF Patch #1643233 from Brian Cameron "Add uninstalled.pc file for [Gaim]" >From my understanding, this allows you to build Gaim plugins after building Gaim but before installing it. Modified Paths: -------------- trunk/configure.ac Added Paths: ----------- trunk/gaim-uninstalled.pc.in Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-02-09 15:19:15 UTC (rev 18187) +++ trunk/configure.ac 2007-02-09 17:16:32 UTC (rev 18188) @@ -1937,6 +1937,7 @@ console/plugins/Makefile po/Makefile.in gaim.pc + gaim-uninstalled.pc gaim.spec ]) Added: trunk/gaim-uninstalled.pc.in =================================================================== --- trunk/gaim-uninstalled.pc.in (rev 0) +++ trunk/gaim-uninstalled.pc.in 2007-02-09 17:16:32 UTC (rev 18188) @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +datadir=@datadir@ +sysconfdir=@sysconfdir@ + +Name: Gaim +Description: Gaim is a GTK2-based instant messenger application. +Version: @VERSION@ +Requires: glib-2.0 +Cflags: -I${pc_top_builddir}/${pcfiledir}/libgaim -I${pc_top_builddir}/${pcfiledir}/gtk +Libs: ${pc_top_builddir}/${pcfiledir}/libgaim/libgaim.la Property changes on: trunk/gaim-uninstalled.pc.in ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ebl...@us...> - 2007-02-25 03:01:59
|
Revision: 18192 http://svn.sourceforge.net/gaim/?rev=18192&view=rev Author: eblanton Date: 2007-02-24 19:02:00 -0800 (Sat, 24 Feb 2007) Log Message: ----------- gaim::plugin Tcl command, thanks to Dossy Shiobara Modified Paths: -------------- trunk/COPYRIGHT trunk/gtk/gtkconv.c trunk/libgaim/plugins/tcl/signal-test.tcl trunk/libgaim/plugins/tcl/tcl_cmds.c trunk/libgaim/plugins/tcl/tcl_gaim.h Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2007-02-17 00:00:24 UTC (rev 18191) +++ trunk/COPYRIGHT 2007-02-25 03:02:00 UTC (rev 18192) @@ -294,6 +294,7 @@ Jim Seymour Joe Shaw Scott Shedden +Dossy Shiobara Ettore Simone John Silvestri Craig Slusher Modified: trunk/gtk/gtkconv.c =================================================================== --- trunk/gtk/gtkconv.c 2007-02-17 00:00:24 UTC (rev 18191) +++ trunk/gtk/gtkconv.c 2007-02-25 03:02:00 UTC (rev 18192) @@ -4863,7 +4863,7 @@ tag_count++; if (tag_count > 100) { - char *tmp = message; + const char *tmp = message; message = displaying = gaim_markup_strip_html(message); g_free(tmp); } Modified: trunk/libgaim/plugins/tcl/signal-test.tcl =================================================================== --- trunk/libgaim/plugins/tcl/signal-test.tcl 2007-02-17 00:00:24 UTC (rev 18191) +++ trunk/libgaim/plugins/tcl/signal-test.tcl 2007-02-25 03:02:00 UTC (rev 18192) @@ -100,6 +100,14 @@ } } +gaim::signal connect [gaim::plugins handle] plugin-load args { + gaim::debug -info "tcl signal" "plugin-load [list $args]" +} + +gaim::signal connect [gaim::plugins handle] plugin-unload args { + gaim::debug -info "tcl signal" "plugin-unload [list $args]" +} + proc plugin_init { } { list "Tcl Signal Test" \ "$gaim::version" \ Modified: trunk/libgaim/plugins/tcl/tcl_cmds.c =================================================================== --- trunk/libgaim/plugins/tcl/tcl_cmds.c 2007-02-17 00:00:24 UTC (rev 18191) +++ trunk/libgaim/plugins/tcl/tcl_cmds.c 2007-02-25 03:02:00 UTC (rev 18192) @@ -912,6 +912,34 @@ return TCL_OK; } +int tcl_cmd_plugins(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) +{ + Tcl_Obj *result = Tcl_GetObjResult(interp); + const char *cmds[] = { "handle", NULL }; + enum { CMD_PLUGINS_HANDLE } cmd; + int error; + + if (objc < 2) { + Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?"); + return TCL_ERROR; + } + + if ((error = Tcl_GetIndexFromObj(interp, objv[1], cmds, "subcommand", 0, (int *)&cmd)) != TCL_OK) + return error; + + switch (cmd) { + case CMD_PLUGINS_HANDLE: + if (objc != 2) { + Tcl_WrongNumArgs(interp, 2, objv, ""); + return TCL_ERROR; + } + Tcl_SetIntObj(result, (int)gaim_plugins_get_handle()); + break; + } + + return TCL_OK; +} + int tcl_cmd_prefs(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { Tcl_Obj *result, *list, *elem, **elems; Modified: trunk/libgaim/plugins/tcl/tcl_gaim.h =================================================================== --- trunk/libgaim/plugins/tcl/tcl_gaim.h 2007-02-17 00:00:24 UTC (rev 18191) +++ trunk/libgaim/plugins/tcl/tcl_gaim.h 2007-02-25 03:02:00 UTC (rev 18192) @@ -104,6 +104,7 @@ Tcl_ObjCmdProc tcl_cmd_core; Tcl_ObjCmdProc tcl_cmd_debug; Tcl_ObjCmdProc tcl_cmd_notify; +Tcl_ObjCmdProc tcl_cmd_plugins; Tcl_ObjCmdProc tcl_cmd_prefs; Tcl_ObjCmdProc tcl_cmd_presence; Tcl_ObjCmdProc tcl_cmd_send_im; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2007-02-26 04:30:15
|
Revision: 18196 http://svn.sourceforge.net/gaim/?rev=18196&view=rev Author: thekingant Date: 2007-02-25 20:30:15 -0800 (Sun, 25 Feb 2007) Log Message: ----------- sf patch #1655707, from David Everly Fix the bug where quotes and gt/lt are printed as HTML in Sametime Modified Paths: -------------- trunk/COPYRIGHT trunk/libgaim/protocols/sametime/sametime.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2007-02-26 02:38:05 UTC (rev 18195) +++ trunk/COPYRIGHT 2007-02-26 04:30:15 UTC (rev 18196) @@ -104,6 +104,7 @@ Stefan Esser Steffen Eschenbacher Marc Etcheverry +David Everly Larry Ewing Gábor Farkas Jesse Farmer Modified: trunk/libgaim/protocols/sametime/sametime.c =================================================================== --- trunk/libgaim/protocols/sametime/sametime.c 2007-02-26 02:38:05 UTC (rev 18195) +++ trunk/libgaim/protocols/sametime/sametime.c 2007-02-26 04:30:15 UTC (rev 18196) @@ -4831,13 +4831,13 @@ msg = gaim_markup_strip_html(message); if(conf) { - ret = ! mwConference_sendText(conf, message); + ret = ! mwConference_sendText(conf, msg); } else { struct mwPlace *place = ID_TO_PLACE(pd, id); g_return_val_if_fail(place != NULL, 0); - ret = ! mwPlace_sendText(place, message); + ret = ! mwPlace_sendText(place, msg); } g_free(msg); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lsc...@us...> - 2007-03-19 01:17:32
|
Revision: 18209 http://svn.sourceforge.net/gaim/?rev=18209&view=rev Author: lschiere Date: 2007-03-18 09:32:37 -0700 (Sun, 18 Mar 2007) Log Message: ----------- some overly ignored translation updates and additions Modified Paths: -------------- trunk/configure.ac trunk/po/bg.po trunk/po/bn.po trunk/po/ca.po trunk/po/ca@valencia.po trunk/po/da.po trunk/po/fr.po trunk/po/he.po trunk/po/hu.po trunk/po/ku.po trunk/po/pl.po trunk/po/ro.po trunk/po/sk.po trunk/po/sl.po trunk/po/ta.po trunk/po/zh_CN.po trunk/po/zh_TW.po Added Paths: ----------- trunk/po/af.po trunk/po/id.po trunk/po/kn.po trunk/po/ps.po Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-03-16 19:36:37 UTC (rev 18208) +++ trunk/configure.ac 2007-03-18 16:32:37 UTC (rev 18209) @@ -49,7 +49,7 @@ ;; esac -ALL_LINGUAS="am ar az bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr gl gu he hi hu it ja ka ko ku lt mk my_MM nb ne nl nn pa pl pt_BR pt ro ru sk sl sq sr sr@Latn sv ta te th tr uk vi xh zh_CN zh_TW" +ALL_LINGUAS="af am ar az bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr gl gu he hi hu id it ja ka kn ko ku lt mk my_MM nb ne nl nn pa pl ps pt_BR pt ro ru sk sl sq sr sr@Latn sv ta te th tr uk vi xh zh_CN zh_TW" AM_GLIB_GNU_GETTEXT dnl we don't use autobreak on cygwin!! Added: trunk/po/af.po =================================================================== --- trunk/po/af.po (rev 0) +++ trunk/po/af.po 2007-03-18 16:32:37 UTC (rev 18209) @@ -0,0 +1,14675 @@ +# Afrikaans translations for gaim +# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Friedel Wolff <friedel BY translate.org.za>, 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: 2.0.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-25 00:00-0500\n" +"" +"PO-Revision-Date: 2007-01-25 11:16+0200\n" +"Last-Translator: F Wolff <friedel BY translate.org.za>\n" +"Language-Team: <tra...@li...>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 1.0beta\n" + +#: ../gaim.desktop.in.h:1 +msgid "Gaim Internet Messenger" +msgstr "Gaim Internetboodskapper" + +#: ../gaim.desktop.in.h:2 +msgid "Internet Messenger" +msgstr "Internetboodskapper" + +#: ../gaim.desktop.in.h:3 +msgid "Send instant messages over multiple protocols" +msgstr "Stuur kitsboodskappe oor veelvoudige protokolle" + +#: ../console/gntaccount.c:119 ../console/gntblist.c:272 +#: ../console/gntblist.c:390 ../console/gntblist.c:403 +#: ../console/gntplugin.c:154 ../console/gntplugin.c:199 +#: ../console/gntstatus.c:291 ../console/gntstatus.c:299 +#: ../libgaim/protocols/jabber/buddy.c:1399 +#: ../libgaim/protocols/jabber/chat.c:679 +#: ../libgaim/protocols/jabber/chat.c:690 +#: ../libgaim/protocols/jabber/jabber.c:1210 +#: ../libgaim/protocols/qq/group_join.c:324 +#: ../libgaim/protocols/silc/ops.c:1451 +msgid "Error" +msgstr "Fout" + +#: ../console/gntaccount.c:119 +msgid "Account was not added" +msgstr "Rekening is nie bygevoeg nie" + +#: ../console/gntaccount.c:120 +msgid "Screenname of an account must be non-empty." +msgstr "Skermnaam van rekening kan nie leeg wees nie." + +#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567 +msgid "New mail notifications" +msgstr "Kennisgewings vir nuwe pos" + +#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496 +msgid "Remember password" +msgstr "Onthou wagwoord" + +#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868 +msgid "Modify Account" +msgstr "Wysig rekening" + +#: ../console/gntaccount.c:474 +msgid "New Account" +msgstr "Nuwe rekening" + +#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695 +msgid "Protocol:" +msgstr "Protokol:" + +#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229 +#: ../gtk/plugins/gevolution/new_person_dialog.c:295 +msgid "Screen name:" +msgstr "Skermnaam:" + +#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487 +msgid "Password:" +msgstr "Wagwoord:" + +#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613 +msgid "Alias:" +msgstr "Alias:" + +#. Cancel +#: ../console/gntaccount.c:554 ../console/gntaccount.c:615 +#: ../console/gntaccount.c:834 ../console/gntblist.c:313 +#: ../console/gntblist.c:380 ../console/gntblist.c:413 +#: ../console/gntblist.c:737 ../console/gntblist.c:906 +#: ../console/gntblist.c:997 ../console/gntblist.c:2021 +#: ../console/gntprefs.c:224 ../console/gntstatus.c:139 +#: ../console/gntstatus.c:472 ../console/gntstatus.c:597 +#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669 +#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913 +#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974 +#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110 +#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172 +#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286 +#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579 +#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270 +#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961 +#: ../libgaim/account.c:1149 ../libgaim/account.c:1183 +#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51 +#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656 +#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871 +#: ../libgaim/protocols/jabber/buddy.c:588 +#: ../libgaim/protocols/jabber/buddy.c:1761 +#: ../libgaim/protocols/jabber/buddy.c:1795 +#: ../libgaim/protocols/jabber/chat.c:788 +#: ../libgaim/protocols/jabber/jabber.c:861 +#: ../libgaim/protocols/jabber/jabber.c:1365 +#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249 +#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279 +#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311 +#: ../libgaim/protocols/oscar/oscar.c:6043 +#: ../libgaim/protocols/oscar/peer.c:1021 +#: ../libgaim/protocols/qq/buddy_info.c:484 +#: ../libgaim/protocols/qq/buddy_opt.c:212 +#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124 +#: ../libgaim/protocols/qq/group_join.c:138 +#: ../libgaim/protocols/qq/group_join.c:359 +#: ../libgaim/protocols/qq/group_opt.c:142 +#: ../libgaim/protocols/qq/group_opt.c:392 +#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159 +#: ../libgaim/protocols/qq/sys_msg.c:247 +#: ../libgaim/protocols/sametime/sametime.c:3410 +#: ../libgaim/protocols/sametime/sametime.c:3495 +#: ../libgaim/protocols/sametime/sametime.c:3665 +#: ../libgaim/protocols/sametime/sametime.c:5409 +#: ../libgaim/protocols/sametime/sametime.c:5498 +#: ../libgaim/protocols/sametime/sametime.c:5622 +#: ../libgaim/protocols/silc/buddy.c:467 +#: ../libgaim/protocols/silc/buddy.c:1078 +#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597 +#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912 +#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955 +#: ../libgaim/protocols/yahoo/yahoo.c:961 +#: ../libgaim/protocols/yahoo/yahoo.c:3208 +#: ../libgaim/protocols/yahoo/yahoo.c:3217 +msgid "Cancel" +msgstr "Kanselleer" + +#. Save +#: ../console/gntaccount.c:558 ../console/gntprefs.c:224 +#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762 +#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182 +#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587 +msgid "Save" +msgstr "Stoor" + +#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860 +#: ../gtk/gtksavedstatuses.c:328 +#, c-format +msgid "Are you sure you want to delete %s?" +msgstr "Is u seker u wil %s uitvee?" + +#. Close any other opened delete window +#: ../console/gntaccount.c:614 +msgid "Delete Account" +msgstr "Vee rekening uit" + +#: ../console/gntaccount.c:615 ../console/gntaccount.c:681 +#: ../console/gntstatus.c:139 ../console/gntstatus.c:201 +#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273 +#: ../gtk/gtksavedstatuses.c:335 +msgid "Delete" +msgstr "Vee uit" + +#: ../console/gntaccount.c:644 ../console/gntblist.c:1927 +#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543 +msgid "Accounts" +msgstr "Rekeninge" + +#: ../console/gntaccount.c:650 +msgid "You can enable/disable accounts from the following list." +msgstr "U kan rekeninge aktiveer/deaktiveer vanuit die volgende lys." + +#: ../console/gntaccount.c:673 ../console/gntaccount.c:833 +#: ../console/gntblist.c:313 ../console/gntblist.c:380 +#: ../console/gntblist.c:413 ../console/gntnotify.c:309 +#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668 +#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274 +#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104 +#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247 +#: ../libgaim/protocols/sametime/sametime.c:5497 +#: ../libgaim/protocols/silc/chat.c:596 +msgid "Add" +msgstr "Voeg by" + +#: ../console/gntaccount.c:677 +msgid "Modify" +msgstr "Wysig" + +#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379 +#, c-format +msgid "%s%s%s%s has made %s his or her buddy%s%s" +msgstr "%s%s%s%s het %s sy/haar vriend/vriendin gemaak%s%s" + +#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431 +msgid "Add buddy to your list?" +msgstr "Voeg vriend by u lys?" + +#: ../console/gntblist.c:264 +msgid "You must provide a screename for the buddy." +msgstr "U moet 'n skermnaam verskaf vir die vriend." + +#: ../console/gntblist.c:266 +msgid "You must provide a group." +msgstr "U moet 'n groep voorsien." + +#: ../console/gntblist.c:268 +msgid "You must select an account." +msgstr "U moet 'n rekening kies." + +#: ../console/gntblist.c:272 +msgid "Error adding buddy" +msgstr "Fout met byvoeging van vriend" + +#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941 +#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849 +msgid "Screen Name" +msgstr "Skermnaam" + +#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931 +#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277 +#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587 +#: ../libgaim/protocols/yahoo/yahoo_profile.c:680 +#: ../libgaim/protocols/zephyr/zephyr.c:789 +#: ../libgaim/protocols/zephyr/zephyr.c:1207 +msgid "Alias" +msgstr "Alias" + +#: ../console/gntblist.c:303 ../console/gntblist.c:375 +msgid "Group" +msgstr "Groep" + +#: ../console/gntblist.c:306 ../console/gntblist.c:363 +#: ../console/gntblist.c:1166 ../console/gntnotify.c:155 +#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467 +#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444 +#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189 +msgid "Account" +msgstr "Rekening" + +#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183 +#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447 +#: ../libgaim/protocols/silc/buddy.c:736 +#: ../libgaim/protocols/silc/buddy.c:1030 +#: ../libgaim/protocols/silc/buddy.c:1075 +#: ../libgaim/protocols/silc/buddy.c:1174 +#: ../libgaim/protocols/yahoo/yahoo.c:3122 +msgid "Add Buddy" +msgstr "Voeg vriend by" + +#: ../console/gntblist.c:312 +msgid "Please enter buddy information." +msgstr "Gee asb. vriendinligting." + +#: ../console/gntblist.c:335 ../libgaim/blist.c:1195 +msgid "Chats" +msgstr "Geselsies" + +#. Extract their Name and put it in +#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621 +#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132 +#: ../gtk/plugins/gevolution/assoc-buddy.c:123 +#: ../libgaim/protocols/jabber/jabber.c:792 +#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600 +#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44 +msgid "Name" +msgstr "Naam" + +#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559 +msgid "Add Chat" +msgstr "Voeg geselsie by" + +#: ../console/gntblist.c:379 +msgid "You can edit more information from the context menu later." +msgstr "U kan later meer inligting wysig vanaf die kieslys." + +#: ../console/gntblist.c:390 ../console/gntblist.c:403 +msgid "Error adding group" +msgstr "Fout met byvoeg van groep" + +#: ../console/gntblist.c:391 +msgid "You must give a name for the group to add." +msgstr "U moet 'n naam gee vir die nuwe groep." + +#: ../console/gntblist.c:404 +msgid "A group with the name already exists." +msgstr "'n Groep met dié naam bestaan reeds." + +#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665 +#: ../libgaim/protocols/sametime/sametime.c:5408 +#: ../libgaim/protocols/sametime/sametime.c:5495 +msgid "Add Group" +msgstr "Voeg groep by" + +#: ../console/gntblist.c:411 +msgid "Enter the name of the group" +msgstr "Gee die naam van die groep" + +#: ../console/gntblist.c:736 +msgid "Edit Chat" +msgstr "Wysig geselsie" + +#: ../console/gntblist.c:736 +msgid "Please Update the necessary fields." +msgstr "Dateer asb. die nodige velde." + +#: ../console/gntblist.c:737 ../console/gntstatus.c:196 +msgid "Edit" +msgstr "Wysig" + +#: ../console/gntblist.c:751 +msgid "Auto-join" +msgstr "Outoaansluit" + +#: ../console/gntblist.c:760 +msgid "Edit Settings" +msgstr "Wysig instellings" + +#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878 +msgid "Get Info" +msgstr "Kry inligting" + +#: ../console/gntblist.c:811 +msgid "Add Buddy Pounce" +msgstr "" + +#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602 +#: ../libgaim/protocols/oscar/oscar.c:633 +msgid "Send File" +msgstr "Stuur lêer" + +#: ../console/gntblist.c:822 +msgid "View Log" +msgstr "Bekyk joernaal" + +#: ../console/gntblist.c:902 +#, c-format +msgid "Please enter the new name for %s" +msgstr "Gee asb. die nuwe naam vir %s" + +#: ../console/gntblist.c:904 ../console/gntblist.c:905 +#: ../console/gntblist.c:1116 +msgid "Rename" +msgstr "Hernoem" + +#: ../console/gntblist.c:904 +msgid "Enter empty string to reset the name." +msgstr "" + +#: ../console/gntblist.c:977 +msgid "Removing this contact will also remove all the buddies in the contact" +msgstr "" + +#: ../console/gntblist.c:985 +msgid "Removing this group will also remove all the buddies in the group" +msgstr "" + +#: ../console/gntblist.c:990 +#, c-format +msgid "Are you sure you want to remove %s?" +msgstr "Wil u definitief %s verwyder?" + +#. XXX: anything to do with the returned ui-handle? +#: ../console/gntblist.c:993 +msgid "Confirm Remove" +msgstr "Bevestig verwydering" + +#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106 +#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248 +msgid "Remove" +msgstr "Verwyder" + +#. Buddy List +#: ../console/gntblist.c:1093 ../console/gntblist.c:2088 +#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091 +#: ../gtk/plugins/win32/winprefs/winprefs.c:327 +msgid "Buddy List" +msgstr "Vriendelys" + +#: ../console/gntblist.c:1123 +msgid "Place tagged" +msgstr "" + +#: ../console/gntblist.c:1128 +msgid "Toggle Tag" +msgstr "" + +#. General +#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734 +#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035 +#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207 +#: ../libgaim/protocols/jabber/buddy.c:274 +#: ../libgaim/protocols/jabber/buddy.c:814 +#: ../libgaim/protocols/jabber/buddy.c:1562 +#: ../libgaim/protocols/jabber/buddy.c:1744 +#: ../libgaim/protocols/jabber/jabber.c:802 +#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538 +#: ../libgaim/protocols/qq/buddy_info.c:43 +#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036 +#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328 +#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042 +msgid "Nickname" +msgstr "" + +#. Idle stuff +#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307 +#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333 +#: ../libgaim/protocols/jabber/buddy.c:645 +#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548 +#: ../libgaim/protocols/msn/state.c:32 +#: ../libgaim/protocols/novell/novell.c:2860 +#: ../libgaim/protocols/oscar/oscar.c:2873 +#: ../libgaim/protocols/yahoo/yahoo.c:2876 +#: ../libgaim/protocols/yahoo/yahoo_profile.c:686 +msgid "Idle" +msgstr "Ledig" + +#: ../console/gntblist.c:1270 +#, c-format +msgid "" +"Online: %d\n" +"Total: %d" +msgstr "" +"Aanlyn: %d\n" +"Totaal: %d" + +#: ../console/gntblist.c:1279 +#, c-format +msgid "Account: %s (%s)" +msgstr "Rekening: %s (%s)" + +#: ../console/gntblist.c:1291 +#, c-format +msgid "" +"\n" +"Last Seen: %s ago" +msgstr "" +"\n" +"Laas gesien: %s gelede" + +#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491 +#: ../gtk/gtkstatusbox.c:1000 +msgid "New..." +msgstr "Nuwe..." + +#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492 +#: ../gtk/gtkstatusbox.c:1001 +msgid "Saved..." +msgstr "Gestoor..." + +#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73 +#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528 +msgid "Plugins" +msgstr "Inproppe" + +#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803 +#: ../gtk/gtkdialogs.c:883 +msgid "_Name" +msgstr "_Naam" + +#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808 +#: ../gtk/gtkdialogs.c:888 +msgid "_Account" +msgstr "_Rekening" + +#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679 +msgid "New Instant Message" +msgstr "Nuwe kitsboodskap" + +#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681 +msgid "" +"Please enter the screen name or alias of the person you would like to IM." +msgstr "" +"Gee asb. die skermnaam of alias van die persoon om 'n kitsboodskap na te " +"stuur." + +#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867 +#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912 +#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148 +#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655 +#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364 +#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248 +#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278 +#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042 +#: ../libgaim/protocols/silc/buddy.c:466 +#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424 +#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725 +#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911 +#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960 +#: ../libgaim/protocols/yahoo/yahoo.c:3207 +#: ../libgaim/protocols/yahoo/yahoo.c:3216 +msgid "OK" +msgstr "Regso" + +#. Create the "Options" frame. +#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776 +msgid "Options" +msgstr "Keuses" + +#: ../console/gntblist.c:2045 +msgid "Send IM..." +msgstr "Stuur kitsboodskap..." + +#: ../console/gntblist.c:2049 +msgid "Toggle offline buddies" +msgstr "" + +#: ../console/gntblist.c:2053 +msgid "Sort by status" +msgstr "Sorteer volgens status" + +#: ../console/gntblist.c:2057 +msgid "Sort alphabetically" +msgstr "Sorteer alfabeties" + +#: ../console/gntblist.c:2061 +msgid "Sort by log size" +msgstr "Sorteer volgens joernaalgrootte" + +#: ../console/gntconn.c:36 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../console/gntconn.c:39 +#, c-format +msgid "%s disconnected." +msgstr "%s afgesny." + +#: ../console/gntconn.c:40 +#, c-format +msgid "" +"%s was disconnected due to the following error:\n" +"%s" +msgstr "" +"%s is afgesny weens die volgende fout:\n" +"%s" + +#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988 +#: ../libgaim/connection.c:107 +msgid "Connection Error" +msgstr "Verbindingfout" + +#: ../console/gntconv.c:102 +msgid "No such command." +msgstr "" + +#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505 +msgid "Syntax Error: You typed the wrong number of arguments to that command." +msgstr "" +"Sintaksfout: U het die verkeerde aantal argumente vir daardie opdrag getik." + +#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510 +msgid "Your command failed for an unknown reason." +msgstr "Die opdrag het misluk weens 'n onbekende rede." + +#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516 +msgid "That command only works in chats, not IMs." +msgstr "Daardie opdrag werk net in geselsies, nie gesprekke nie." + +#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519 +msgid "That command only works in IMs, not chats." +msgstr "Daardie opdrag werk net in gesprekke, nie geselsies nie." + +#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523 +msgid "That command doesn't work on this protocol." +msgstr "Daardie opdrag werk nie met hierdie protokol nie." + +#: ../console/gntconv.c:130 +msgid "Commands are not supported yet. Message was NOT sent." +msgstr "Opdragte word nog nie ondersteun nie. Boodskap is NIE gestuur nie." + +#: ../console/gntconv.c:232 +#, c-format +msgid "%s (%s -- %s)" +msgstr "%s (%s -- %s)" + +#: ../console/gntconv.c:255 +#, c-format +msgid "%s [%s]" +msgstr "%s [%s]" + +#: ../console/gntconv.c:260 ../console/gntconv.c:432 +#, c-format +msgid "" +"\n" +"%s is typing..." +msgstr "" +"\n" +"%s tik..." + +#: ../console/gntconv.c:399 +msgid "<AUTO-REPLY> " +msgstr "" + +#. Print the list of users in the room +#: ../console/gntconv.c:501 +msgid "List of users:\n" +msgstr "Lys van gebruikers:\n" + +#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386 +msgid "Supported debug options are: version" +msgstr "" + +#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422 +msgid "No such command (in this context)." +msgstr "" + +#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425 +msgid "" +"Use \"/help <command>\" for help on a specific command.\n" +"The following commands are available in this context:\n" +msgstr "" +"Gebruik \"/help <opdrag>\" vir hulp met 'n spesifieke opdrag.\n" +"Die volgende opdragte is in hierdie konteks beskikbaar:\n" + +#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824 +msgid "" +"say <message>: Send a message normally as if you weren't using a " +"command." +msgstr "" +"say <boodskap>: Stuur 'n boodskap gewoonweg net soos sonder 'n opdrag." + +#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827 +msgid "me <action>: Send an IRC style action to a buddy or chat." +msgstr "" + +#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830 +msgid "" +"debug <option>: Send various debug information to the current " +"conversation." +msgstr "" + +#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833 +msgid "clear: Clears the conversation scrollback." +msgstr "" + +#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836 +msgid "help <command>: Help on a specific command." +msgstr "help <opdrag>: Hulp oor 'n spesifieke opdrag." + +#: ../console/gntconv.c:719 +msgid "plugins: Show the plugins window." +msgstr "plugins: Wys die inpropvenster." + +#: ../console/gntconv.c:722 +msgid "buddylist: Show the buddylist." +msgstr "buddylist: Wys die vriendelys." + +#: ../console/gntconv.c:725 +msgid "accounts: Show the accounts window." +msgstr "accounts: Wys die rekeningvenster." + +#: ../console/gntconv.c:728 +msgid "debugwin: Show the debug window." +msgstr "debugwin: Wys die ontfoutvenster." + +#: ../console/gntconv.c:731 +msgid "prefs: Show the preference window." +msgstr "prefs: Wys die voorkeurevenster." + +#: ../console/gntconv.c:734 +msgid "statuses: Show the savedstatuses window." +msgstr "" + +#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708 +msgid "Debug Window" +msgstr "Ontfoutvenster" + +#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now +#. * it's necessary to make the width of the debug window resizable ... like I said, +#. * it doesn't make sense. The bug is likely in the packing in gntbox.c. +#. +#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767 +msgid "Clear" +msgstr "Maak skoon" + +#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776 +msgid "Pause" +msgstr "Pouseer" + +#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784 +msgid "Timestamps" +msgstr "Tydstempels" + +#: ../console/gntgaim.c:227 +#, c-format +msgid "%s. Try `%s -h' for more information.\n" +msgstr "%s. Probeer `%s -h' vir meer inligting.\n" + +#: ../console/gntgaim.c:229 +#, c-format +msgid "" +"%s\n" +"Usage: %s [OPTION]...\n" +"\n" +" -c, --config=DIR use DIR for config files\n" +" -d, --debug print debugging messages to stdout\n" +" -h, --help display this help and exit\n" +" -n, --nologin don't automatically login\n" +" -v, --version display the current version and exit\n" +msgstr "" +"%s\n" +"Gebruik: %s [OPTION]...\n" +"\n" +" -c, --config=DIR gebruik DIR vir konfigurasielêers\n" +" -d, --debug skryf ontfoutboodskappe na stdout\n" +" -h, --help vertoon hierdie hulp en sluit af\n" +" -n, --nologin moenie outomaties anmeld nie\n" +" -v, --version wys die huidige weergawe en sluit af\n" + +#: ../console/gntnotify.c:146 +msgid "Emails" +msgstr "E-posse" + +#: ../console/gntnotify.c:152 ../console/gntnotify.c:206 +msgid "You have mail!" +msgstr "U het pos!" + +#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1155 +msgid "From" +msgstr "Van" + +#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481 +msgid "Subject" +msgstr "Onderwerp" + +#: ../console/gntnotify.c:163 ../console/gntplugin.c:178 +#: ../console/gntplugin.c:259 ../console/gntstatus.c:206 +#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272 +#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377 +msgid "Close" +msgstr "Sluit" + +#: ../console/gntnotify.c:182 +#, c-format +msgid "%s (%s) has %d new message." +msgid_plural "%s (%s) has %d new messages." +msgstr[0] "%s (%s) het %d nuwe boodskap." +msgstr[1] "%s (%s) het %d nuwe boodskappe." + +#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322 +msgid "New Mail" +msgstr "Nuwe pos" + +#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856 +#, c-format +msgid "Info for %s" +msgstr "Inligting vir %s" + +#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858 +#: ../libgaim/protocols/toc/toc.c:476 +msgid "Buddy Information" +msgstr "Vriendinligting" + +#: ../console/gntnotify.c:306 +msgid "Continue" +msgstr "Gaan voort" + +#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862 +msgid "Info" +msgstr "Inligting" + +#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591 +msgid "IM" +msgstr "Kitsklets" + +#: ../console/gntnotify.c:318 +msgid "Join" +msgstr "Sluit aan" + +#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494 +msgid "Invite" +msgstr "Nooi uit" + +#: ../console/gntnotify.c:324 +msgid "(none)" +msgstr "(geen)" + +#: ../console/gntplugin.c:102 +#, c-format +msgid "" +"Name: %s\n" +"Version: %s\n" +"Description: %s\n" +"Author: %s\n" +"Website: %s\n" +"Filename: %s\n" +msgstr "" +"Naam: %s\n" +"Weergawe: %s\n" +"Beskrywing: %s\n" +"Skrywer: %s\n" +"Webwerf: %s\n" +"Lêernaam: %s\n" + +#: ../console/gntplugin.c:155 +msgid "Plugin need to be loaded before you can configure it." +msgstr "Inprop moet gelaai word voordat dit opgestel kan word." + +#: ../console/gntplugin.c:193 +msgid "..." +msgstr "..." + +#: ../console/gntplugin.c:194 +msgid "Still need to do something about this." +msgstr "Moet nog iets hieromtrent doen." + +#: ../console/gntplugin.c:200 +msgid "No configuration options for this plugin." +msgstr "Geen opstelkeuses vir hierdie inprop nie." + +#: ../console/gntplugin.c:221 +msgid "You can (un)load plugins from the following list." +msgstr "U kan inproppe laai / ontlaai vanaf die volgende lys." + +#: ../console/gntplugin.c:264 +msgid "Configure Plugin" +msgstr "Stel inprop op" + +#: ../console/gntprefs.c:122 +msgid "Show Idle Time" +msgstr "Wys ledige tyd" + +#: ../console/gntprefs.c:123 +msgid "Show Offline Buddies" +msgstr "Wys aflynvriende" + +#: ../console/gntprefs.c:129 +msgid "Show Timestamps" +msgstr "Wys tydstempels" + +#: ../console/gntprefs.c:130 +msgid "Notify buddies when you are typing" +msgstr "" + +#: ../console/gntprefs.c:136 +msgid "Log format" +msgstr "Joernaalformaat" + +#: ../console/gntprefs.c:137 +msgid "Log IMs" +msgstr "" + +#: ../console/gntprefs.c:138 +msgid "Log chats" +msgstr "" + +#: ../console/gntprefs.c:139 +msgid "Log status change events" +msgstr "" + +#. Conversations +#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915 +#: ../gtk/plugins/win32/winprefs/winprefs.c:341 +msgid "Conversations" +msgstr "Gesprekke" + +#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926 +msgid "Logging" +msgstr "" + +#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545 +#: ../gtk/gtkprefs.c:1951 +msgid "Preferences" +msgstr "Voorkeure" + +#: ../console/gntrequest.c:495 +msgid "Not implemented yet." +msgstr "Nog nie geïmplementeer nie." + +#: ../console/gntstatus.c:135 +#, c-format +msgid "Are you sure you want to delete \"%s\"" +msgstr "Is u seker u wil \"%s\" uitvee?" + +#: ../console/gntstatus.c:138 +msgid "Delete Status" +msgstr "Verwyder status" + +#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556 +msgid "Saved Statuses" +msgstr "Gestoorde statusse" + +#: ../console/gntstatus.c:174 ../console/gntstatus.c:526 +#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286 +#: ../libgaim/protocols/jabber/buddy.c:931 +#: ../libgaim/protocols/novell/novell.c:1484 +msgid "Title" +msgstr "Titel" + +#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478 +msgid "Type" +msgstr "Tipe" + +#: ../console/gntstatus.c:174 ../console/gntstatus.c:551 +#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489 +#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256 +#: ../libgaim/protocols/bonjour/bonjour.c:263 +#: ../libgaim/protocols/bonjour/bonjour.c:339 +#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591 +#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619 +#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634 +#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244 +#: ../libgaim/protocols/jabber/jabber.c:1227 +#: ../libgaim/protocols/jabber/jabber.c:1237 +#: ../libgaim/protocols/jabber/jabber.c:1247 +#: ../libgaim/protocols/jabber/jabber.c:1257 +#: ../libgaim/protocols/jabber/jabber.c:1267 +#: ../libgaim/protocols/jabber/jabber.c:1279 +#: ../libgaim/protocols/novell/novell.c:2873 +#: ../libgaim/protocols/novell/novell.c:2976 +#: ../libgaim/protocols/novell/novell.c:2982 +#: ../libgaim/protocols/novell/novell.c:2988 +#: ../libgaim/protocols/oscar/oscar.c:5501 +#: ../libgaim/protocols/oscar/oscar.c:5729 +#: ../libgaim/protocols/oscar/oscar.c:5741 +#: ../libgaim/protocols/oscar/oscar.c:5754 +#: ../libgaim/protocols/oscar/oscar.c:5761 +#: ../libgaim/protocols/oscar/oscar.c:5768 +#: ../libgaim/protocols/sametime/sametime.c:3308 +#: ../libgaim/protocols/sametime/sametime.c:3314 +#: ../libgaim/protocols/sametime/sametime.c:3320 +#: ../libgaim/protocols/sametime/sametime.c:3399 +#: ../libgaim/protocols/silc/buddy.c:1544 +#: ../libgaim/protocols/simple/simple.c:246 +#: ../libgaim/protocols/yahoo/yahoo.c:3450 +#: ../libgaim/protocols/yahoo/yahoo.c:3456 +#: ../libgaim/protocols/zephyr/zephyr.c:2337 +msgid "Message" +msgstr "Boodskap" + +#. Use +#: ../console/gntstatus.c:186 ../console/gntstatus.c:580 +msgid "Use" +msgstr "Gebruik" + +#: ../console/gntstatus.c:291 +msgid "Invalid title" +msgstr "Ongeldige titel" + +#: ../console/gntstatus.c:292 +msgid "Please enter a non-empty title for the status." +msgstr "Gee asb. 'n nieleë title vir die status." + +#: ../console/gntstatus.c:299 +msgid "Duplicate title" +msgstr "Duplikaat titel" + +#: ../console/gntstatus.c:300 +msgid "Please enter a different title for the status." +msgstr "Gee asb. 'n ander titel vir die status." + +#: ../console/gntstatus.c:440 +msgid "Substatus" +msgstr "Substatus" + +#. Set up stuff for the account box +#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593 +msgid "Account:" +msgstr "Rekening:" + +#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698 +msgid "Status:" +msgstr "Status:" + +#: ../console/gntstatus.c:466 +msgid "Message:" +msgstr "Boodskap:" + +#: ../console/gntstatus.c:515 +msgid "Edit Status" +msgstr "Wysig status" + +#. XXX: Use of ggp_str_to_uin() is an ugly hack! +#: ../console/gntstatus.c:534 ../console/gntstatus.c:563 +#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813 +#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089 +#: ../libgaim/protocols/bonjour/bonjour.c:337 +#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588 +#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637 +#: ../libgaim/protocols/jabber/buddy.c:641 +#: ../libgaim/protocols/jabber/buddy.c:674 +#: ../libgaim/protocols/jabber/jabber.c:1195 +#: ../libgaim/protocols/msn/msn.c:547 +#: ../libgaim/protocols/novell/novell.c:2870 +#: ../libgaim/protocols/oscar/oscar.c:800 +#: ../libgaim/protocols/oscar/oscar.c:805 +#: ../libgaim/protocols/oscar/oscar.c:807 +#: ../libgaim/protocols/oscar/oscar.c:2655 +#: ../libgaim/protocols/sametime/sametime.c:3285 +#: ../libgaim/protocols/sametime/sametime.c:4170 +#: ../libgaim/protocols/yahoo/yahoo.c:3027 +msgid "Status" +msgstr "Status" + +#: ../console/gntstatus.c:557 +msgid "Use different status for following accounts" +msgstr "Gebruik 'n ander status vir die volgende rekenings" + +#. Save & Use +#: ../console/gntstatus.c:591 +msgid "Save & Use" +msgstr "Stoor en gebruik" + +#: ../console/gntui.c:75 +msgid "Statuses" +msgstr "Statusse" + +#: ../console/plugins/gntgf.c:209 +#, c-format +msgid "%s just signed on" +msgstr "%s het pas aangemeld" + +#: ../console/plugins/gntgf.c:216 +#, c-format +msgid "%s just signed off" +msgstr "%s het pas afgemeld" + +#: ../console/plugins/gntgf.c:224 +#, c-format +msgid "%s sent you a message" +msgstr "%s het u 'n boodskap gestuur" + +#: ../console/plugins/gntgf.c:243 +#, c-format +msgid "%s said your nick in %s" +msgstr "%s het u bynaam gesê in %s" + +#: ../console/plugins/gntgf.c:245 +#, c-format +msgid "%s sent a message in %s" +msgstr "%s het 'n boodskap gestuur in %s" + +#: ../console/plugins/gntgf.c:283 +msgid "Buddy signs on/off" +msgstr "Vriend meld aan/af" + +#: ../console/plugins/gntgf.c:284 +msgid "You receive an IM" +msgstr "U ontvang 'n kitsboodskap" + +#: ../console/plugins/gntgf.c:285 +msgid "Someone speaks in a chat" +msgstr "Iemand praat in 'n geselskap" + +#: ../console/plugins/gntgf.c:286 +msgid "Someone says your name in a chat" +msgstr "Iemand sê u naam in 'n geselskap" + +#: ../console/plugins/gntgf.c:314 +msgid "Notify with a toaster when" +msgstr "" + +#: ../console/plugins/gntgf.c:329 +msgid "Beep too!" +msgstr "" + +#: ../console/plugins/gntgf.c:335 +msgid "Set URGENT for the terminal window." +msgstr "Stel DRINGEND vir die terminaalvenster." + +#: ../console/plugins/gntgf.c:355 +msgid "GntGf" +msgstr "GntGf" + +#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358 +msgid "Toaster plugin for Gaim-Text." +msgstr "" + +#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120 +#, c-format +msgid "<b>Conversation with %s on %s:</b><br>" +msgstr "<b>Gesprek met %s op %s:</b><br>" + +#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147 +msgid "History Plugin Requires Logging" +msgstr "" + +#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148 +msgid "" +"Logging can be enabled from Tools -> Preferences -> Logging.\n" +"\n" +"Enabling logs for instant messages and/or chats will activate history for " +"the same conversation type(s)." +msgstr "" + +#: ../console/plugins/gnthistory.c:179 +msgid "GntHistory" +msgstr "GntHistory" + +#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190 +msgid "Shows recently logged conversations in new conversations." +msgstr "" + +#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191 +msgid "" +"When a new conversation is opened this plugin will insert the last " +"conversation into the current conversation." +msgstr "" +"Wanneer 'n nuwe gesprek begin word, sal hierdie inprop die laaste gesprek in " +"die huidige een invoeg." + +#: ../console/plugins/lastlog.c:69 +msgid "Lastlog" +msgstr "" + +#: ../console/plugins/lastlog.c:99 +msgid "lastlog: Searches for a substring in the backlog." +msgstr "" + +#: ../console/plugins/lastlog.c:121 +msgid "GntLastlog" +msgstr "GntLastlog" + +#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124 +msgid "Lastlog plugin for gaim-text." +msgstr "" + +#: ../gtk/eggtrayicon.c:129 +msgid "Orientation" +msgstr "Oriëntasie" + +#: ../gtk/eggtrayicon.c:130 +msgid "The orientation of the tray." +msgstr "" + +#: ../gtk/gaimstock.c:137 +msgid "_Alias" +msgstr "_Alias" + +#. join button +#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306 +#: ../gtk/gtkroomlist.c:463 +msgid "_Join" +msgstr "_Sluit aan" + +#: ../gtk/gaimstock.c:139 +msgid "Close _tabs" +msgstr "Sluit _oortjies" + +#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069 +msgid "I_M" +msgstr "_Kitsklets" + +#: ../gtk/gaimstock.c:141 +msgid "_Get Info" +msgstr "_Kry info" + +#: ../gtk/gaimstock.c:142 +msgid "_Invite" +msgstr "_Nooi uit" + +#: ../gtk/gaimstock.c:143 +msgid "_Modify" +msgstr "_Wysig" + +#: ../gtk/gaimstock.c:144 +msgid "_Open Mail" +msgstr "_Open pos" + +#. Pause button +#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835 +msgid "_Pause" +msgstr "_Pouseer" + +#. Build the login options frame. +#: ../gtk/gtkaccount.c:390 +msgid "Login Options" +msgstr "Aanmeldkeuses" + +#: ../gtk/gtkaccount.c:492 +msgid "Local alias:" +msgstr "Plaaslike alias:" + +#. Build the user options frame. +#: ../gtk/gtkaccount.c:554 +msgid "User Options" +msgstr "Gebruikerkeuses" + +#. Buddy icon +#: ../gtk/gtkaccount.c:572 +msgid "Use this buddy icon for this account:" +msgstr "" + +#. Build the protocol options frame. +#: ../gtk/gtkaccount.c:684 +#, c-format +msgid "%s Options" +msgstr "%s-keuses" + +#: ../gtk/gtkaccount.c:881 +msgid "Use GNOME Proxy Settings" +msgstr "Gebruik GNOME se instaaninstellings" + +#: ../gtk/gtkaccount.c:882 +msgid "Use Global Proxy Settings" +msgstr "Gebruik globale instaaninstellings" + +#: ../gtk/gtkaccount.c:888 +msgid "No Proxy" +msgstr "Geen instaanbediener" + +#: ../gtk/gtkaccount.c:894 +msgid "HTTP" +msgstr "HTTP" + +#: ../gtk/gtkaccount.c:900 +msgid "SOCKS 4" +msgstr "SOCKS 4" + +#: ../gtk/gtkaccount.c:906 +msgid "SOCKS 5" +msgstr "SOCKS 5" + +#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100 +msgid "Use Environmental Settings" +msgstr "Gebruik omgewinginstellings" + +#. This is an easter egg. +#. It means one of two things, both intended as humourus: +#. A) your network is really slow and you have nothing better to do than +#. look at butterflies. +#. B)You are looking really closely at something that shouldn't matter. +#: ../gtk/gtkaccount.c:951 +msgid "If you look real closely" +msgstr "As mens stip kyk" + +#. This is an easter egg. See the comment on the previous line in the source. +#: ../gtk/gtkaccount.c:954 +msgid "you can see the butterflies mating" +msgstr "kan mens skoenlappers sien paar" + +#: ../gtk/gtkaccount.c:975 +msgid "Proxy Options" +msgstr "Instaankeuses" + +#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094 +msgid "Proxy _type:" +msgstr "Instaan_tipes:" + +#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115 +msgid "_Host:" +msgstr "_Rekenaar:" + +#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133 +msgid "_Port:" +msgstr "_Poort:" + +#: ../gtk/gtkaccount.c:1010 +msgid "_Username:" +msgstr "_Gebruikernaam:" + +#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170 +msgid "Pa_ssword:" +msgstr "_Wagwoord:" + +#: ../gtk/gtkaccount.c:1428 +msgid "Add Account" +msgstr "Voeg rekening by" + +#: ../gtk/gtkaccount.c:1452 +msgid "_Basic" +msgstr "_Eenvoudig" + +#: ../gtk/gtkaccount.c:1463 +msgid "_Advanced" +msgstr "_Gevorderd" + +#. Register button +#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:860 +msgid "Register" +msgstr "Registreer" + +#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566 +msgid "Enabled" +msgstr "Aktiveer" + +#: ../gtk/gtkaccount.c:1961 +msgid "Protocol" +msgstr "Protokol" + +#: ../gtk/gtkaccount.c:2133 +msgid "" +"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n" +"\n" +"You have no IM accounts configured. To start connecting with Gaim press the " +"<b>Add</b> button below and configure your first account. If you want Gaim " +"to connect to multiple IM accounts, press <b>Add</b> again to configure them " +"all.\n" +"\n" +"You can come back to this window to add, edit, or remove accounts from " +"<b>Accounts->Add/Edit</b> in the Buddy List window" +msgstr "" + +#: ../gtk/gtkaccount.c:2483 +#, c-format +msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s" +msgstr "%s%s%s%s wil %s by sy/haar vriendelys voeg%s%s" + +#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512 +msgid "Authorize buddy?" +msgstr "" + +#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513 +msgid "Authorize" +msgstr "" + +#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514 +msgid "Deny" +msgstr "" + +#: ../gtk/gtkblist.c:709 +msgid "Join a Chat" +msgstr "Sluit by gesprek aan" + +#: ../gtk/gtkblist.c:730 +msgid "" +"Please enter the appropriate information about the chat you would like to " +"join.\n" +msgstr "" +"Gee asb. die gepaste inligting vir die geselsie waarby u wil aansluit.\n" + +#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399 +msgid "_Account:" +msgstr "_Rekening:" + +#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614 +msgid "_Block" +msgstr "_Blokkeer" + +#: ../gtk/gtkblist.c:1015 +msgid "Un_block" +msgstr "" + +#: ../gtk/gtkblist.c:1066 +msgid "Get _Info" +msgstr "_Inligting" + +#: ../gtk/gtkblist.c:1075 +msgid "_Send File" +msgstr "_Stuur lêer" + +#: ../gtk/gtkblist.c:1082 +msgid "Add Buddy _Pounce" +msgstr "" + +#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190 +#: ../gtk/gtkblist.c:1213 +msgid "View _Log" +msgstr "Bekyk _joernaal" + +#: ../gtk/gtkblist.c:1103 +msgid "Alias..." +msgstr "Alias..." + +#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219 +msgid "_Alias..." +msgstr "_Alias..." + +#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221 +msgid "_Remove" +msgstr "_Verwyder" + +#: ../gtk/gtkblist.c:1161 +msgid "Add a _Buddy" +msgstr "Voeg 'n _vriend by" + +#: ../gtk/gtkblist.c:1163 +msgid "Add a C_hat" +msgstr "Voeg 'n _gesprek by" + +#: ../gtk/gtkblist.c:1166 +msgid "_Delete Group" +msgstr "_Verwyder groep" + +#: ../gtk/gtkblist.c:1168 +msgid "_Rename" +msgstr "_Hernoem" + +#: ../gtk/gtkblist.c:1188 +msgid "Auto-Join" +msgstr "Outoaansluit" + +#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249 +msgid "_Collapse" +msgstr "" + +#: ../gtk/gtkblist.c:1254 +msgid "_Expand" +msgstr "" + +#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374 +#: ../gtk/gtkblist.c:4384 +msgid "/Tools/Mute Sounds" +msgstr "Demp klanke" + +#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421 +msgid "" +"You are not currently signed on with an account that can add that buddy." +msgstr "U is tans aangemeld met 'n rekening wat daardie vriend kan byvoeg." + +#. Buddies menu +#: ../gtk/gtkblist.c:2567 +msgid "/_Buddies" +msgstr "/_Vriende" + +#: ../gtk/gtkblist.c:2568 +msgid "/Buddies/New Instant _Message..." +msgstr "Nuwe _kitsboodskap..." + +#: ../gtk/gtkblist.c:2569 +msgid "/Buddies/Join a _Chat..." +msgstr "Sluit by _geselsie aan..." + +#: ../gtk/gtkblist.c:2570 +msgid "/Buddies/Get User _Info..." +msgstr "Kry gebruiker_inligting..." + +#: ../gtk/gtkblist.c:2571 +msgid "/Buddies/View User _Log..." +msgstr "Bekyk gebruiker_joernaal..." + +#: ../gtk/gtkblist.c:2573 +msgid "/Buddies/Show _Offline Buddies" +msgstr "Wys a_flynvriende" + +#: ../gtk/gtkblist.c:2574 +msgid "/Buddies/Show _Empty Groups" +msgstr "Wys _leë groepe" + +#: ../gtk/gtkblist.c:2575 +msgid "/Buddies/Show Buddy _Details" +msgstr "Wys vrienddetail" + +#: ../gtk/gtkblist.c:2576 +msgid "/Buddies/Show Idle _Times" +msgstr "Wys ledige _tye" + +#: ../gtk/gtkblist.c:2577 +msgid "/Buddies/_Sort Buddies" +msgstr "_Sorteer vriende" + +#: ../gtk/gtkblist.c:2579 +msgid "/Buddies/_Add Buddy..." +msgstr "Voeg _vriend by..." + +#: ../gtk/gtkblist.c:2580 +msgid "/Buddies/Add C_hat..." +msgstr "Voeg gese_lsie by..." + +#: ../gtk/gtkblist.c:2581 +msgid "/Buddies/Add _Group..." +msgstr "Voeg _groep by..." + +#: ../gtk/gtkblist.c:2583 +msgid "/Buddies/_Quit" +msgstr "_Sluit af" + +#. Accounts menu +#: ../gtk/gtkblist.c:2586 +msgid "/_Accounts" +msgstr "/_Rekeninge" + +#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279 +msgid "/Accounts/Add\\/Edit" +msgstr "Voeg by \\/ redigeer" + +#. Tools +#: ../gtk/gtkblist.c:2590 +msgid "/_Tools" +msgstr "/_Gereedskap" + +#: ../gtk/gtkblist.c:2591 +msgid "/Tools/Buddy _Pounces" +msgstr "" + +#: ../gtk/gtkblist.c:2592 +msgid "/Tools/Plu_gins" +msgstr "/Gereedskap/_Inproppe" + +#: ../gtk/gtkblist.c:2593 +msgid "/Tools/Pr_eferences" +msgstr "/Gereedskap/_Voorkeure" + +#: ../gtk/gtkblist.c:2594 +msgid "/Tools/Pr_ivacy" +msgstr "/Gereedskap/_Privaatheid" + +#: ../gtk/gtkblist.c:2596 +msgid "/Tools/_File Transfers" +msgstr "/Gereedskap/_Lêeroordragte" + +#: ../gtk/gtkblist.c:2597 +msgid "/Tools/R_oom List" +msgstr "/Gereedskap/_Kamerlys" + +#: ../gtk/gtkblist.c:2598 +msgid "/Tools/System _Log" +msgstr "Stelsel_joernaal" + +#: ../gtk/gtkblist.c:2600 +msgid "/Tools/Mute _Sounds" +msgstr "" + +#. Help +#: ../gtk/gtkblist.c:2603 +msgid "/_Help" +msgstr "/_Hulp" + +#: ../gtk/gtkblist.c:2604 +msgid "/Help/Online _Help" +msgstr "/Hulp/Hulp aanlyn" + +#: ../gtk/gtkblist.c:2605 +msgid "/Help/_Debug Window" +msgstr "_Ontfoutvenster" + +#: ../gtk/gtkblist.c:2606 +msgid "/Help/_About" +msgstr "/Hulp/_Aangaande" + +#: ../gtk/gtkblist.c:2638 +#, c-format +msgid "" +"\n" +"<b>Account:</b> %s" +msgstr "" +"\n" +"<b>Rekening:</b> %s" + +#: ../gtk/gtkblist.c:2722 +msgid "Buddy Alias" +msgstr "" + +#: ../gtk/gtkblist.c:2743 +msgid "Logged In" +msgstr "Aangemeld" + +#: ../gtk/gtkblist.c:2789 +msgid "Last Seen" +msgstr "Laas gesien" + +#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471 +#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993 +#: ../libgaim/protocols/jabber/buddy.c:1401 +#: ../libgaim/protocols/novell/novell.c:2863 +#: ../libgaim/protocols/oscar/oscar.c:807 +#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170 +#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878 +#: ../libgaim/status.c:154 +msgid "Offline" +msgstr "Aflyn" + +#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680 +#: ../libgaim/protocols/jabber/buddy.c:289 +#: ../libgaim/protocols/jabber/buddy.c:937 +#: ../libgaim/protocols/jabber/chat.c:777 +msgid "Description" +msgstr "Beskrywing" + +#: ../gtk/gtkblist.c:2809 +msgid "Spooky" +msgstr "" + +#: ../gtk/gtkblist.c:2811 +msgid "Awesome" +msgstr "" + +#: ../gtk/gtkblist.c:2813 +msgid "Rockin'" +msgstr "" + +#: ../gtk/gtkblist.c:3302 +#, c-format +msgid "Idle %dh %02dm" +msgstr "Ledig %dh %02dm" + +#: ../gtk/gtkblist.c:3304 +#, c-format +msgid "Idle %dm" +msgstr "Ledig %dm" + +#: ../gtk/gtkblist.c:3435 +msgid "/Buddies/New Instant Message..." +msgstr "Nuwe kitsboodskap..." + +#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469 +msgid "/Buddies/Join a Chat..." +msgstr "Sluit by geselskap aan..." + +#: ../gtk/gtkblist.c:3437 +msgid "/Buddies/Get User Info..." +msgstr "Kry gebruikerinligting..." + +#: ../gtk/gtkblist.c:3438 +msgid "/Buddies/Add Buddy..." +msgstr "" + +#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472 +msgid "/Buddies/Add Chat..." +msgstr "Voeg geselsie by..." + +#: ../gtk/gtkblist.c:3440 +msgid "/Buddies/Add Group..." +msgstr "Voeg groep by..." + +#: ../gtk/gtkblist.c:3475 +msgid "/Tools/Buddy Pounces" +msgstr "" + +#: ../gtk/gtkblist.c:3478 +msgid "/Tools/Privacy" +msgstr "Privaatheid" + +#: ../gtk/gtkblist.c:3481 +msgid "/Tools/Room List" +msgstr "Kamerlys" + +#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152 +#, c-format +msgid "%d unread message from %s\n" +msgid_plural "%d unread messages from %s\n" +msgstr[0] "%d ongelese boodskap van %s\n" +msgstr[1] "%d ongelese boodskappe van %s\n" + +#: ../gtk/gtkblist.c:3654 +msgid "Manually" +msgstr "Handmatig" + +#: ../gtk/gtkblist.c:3656 +msgid "Alphabetically" +msgstr "Alfabeties" + +#: ../gtk/gtkblist.c:3657 +msgid "By status" +msgstr "Volgens status" + +#: ../gtk/gtkblist.c:3658 +msgid "By log size" +msgstr "Volgens joernaalgrootte" + +#: ../gtk/gtkblist.c:3860 ../gtk/gtkconn.c:178 +#, c-format +msgid "%s disconnected" +msgstr "%s afgesny" + +#: ../gtk/gtkblist.c:3869 ../libgaim/protocols/sametime/sametime.c:3664 +msgid "Connect" +msgstr "Verbind" + +#: ../gtk/gtkblist.c:3869 +msgid "Re-enable Account" +msgstr "Heraktiveer rekening" + +#: ../gtk/gtkblist.c:3890 +#, c-format +msgid "<span color=\"red\">%s disconnected: %s</span>" +msgstr "<span color=\"red\">%s afgesny: %s</span>" + +#: ../gtk/gtkblist.c:4027 +msgid "<b>Username:</b>" +msgstr "<b>Gebruikernaam:</b>" + +#: ../gtk/gtkblist.c:4034 +msgid "<b>Password:</b>" +msgstr "<b>Wagwoord:</b>" + +#: ../gtk/gtkblist.c:4045 +msgid "_Login" +msgstr "_Meld aan" + +#: ../gtk/gtkblist.c:4127 +msgid "/Accounts" +msgstr "/Rekeninge" + +#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy +#: ../gtk/gtkblist.c:4141 +msgid "" +"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n" +"\n" +"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</" +"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be " +"able to sign on, set your status, and talk to your friends." +msgstr "" + +#. set the Show Offline Buddies option. must be done +#. * after the treeview or faceprint gets mad. -Robot101 +#. +#: ../gtk/gtkblist.c:4368 +msgid "/Buddies/Show Offline Buddies" +msgstr "" + +#: ../gtk/gtkblist.c:4371 +msgid "/Buddies/Show Empty Groups" +msgstr "Wys leë groepe" + +#: ../gtk/gtkblist.c:4377 +msgid "/Buddies/Show Buddy Details" +msgstr "" + +#: ../gtk/gtkblist.c:4380 +msgid "/Buddies/Show Idle Times" +msgstr "Wys ledige tye" + +#: ../gtk/gtkblist.c:5073 ../gtk/plugins/gevolution/gevolution.c:97 +#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521 +#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523 +#: ../libgaim/protocols/jabber/roster.c:68 +msgid "Buddies" +msgstr "Vriende" + +#: ../gtk/gtkblist.c:5207 +msgid "" +"Please enter the screen name of the person you would like to add to your " +"buddy list. You may optionally enter an alias, or nickname, for the buddy. " +"The alias will be displayed in place of the screen name whenever possible.\n" +msgstr "" +"Gee asb. die skermnaam van die persoon wat by die vriendelys gevoeg word. U " +"" +"kan 'n alias of bynaam vir die vriend gebruik as u wil. Die alias sal in " +"die " +"plek van die skermnaam gebruik word wanneer moontlik.\n" + +#: ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5628 +#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554 +#: ../gtk/plugins/gevolution/new_person_dialog.c:307 +msgid "Group:" +msgstr "Groep:" + +#: ../gtk/gtkblist.c:5526 +msgid "This protocol does not support chat rooms." +msgstr "Hierdie protokol ondersteun nie gesprekkamers nie." + +#: ../gtk/gtkblist.c:5542 +msgid "" +"You are not currently signed on with any protocols that have the ability to " +"chat." +msgstr "" +"U is nie tans aangemeld met enige protokol met geselskapfasiliteit nie." + +#: ../gtk/gtkblist.c:5583 +msgid "" +"Please enter an alias, and the appropriate information about the chat you " +"would like to add to your buddy list.\n" +msgstr "" + +#: ../gtk/gtkblist.c:5666 +msgid "Please enter the name of the group to be added." +msgstr "Gee asb. die naam van die groep om by te voeg." + +#: ../gtk/gtkblist.c:6299 +msgid "<GaimMain>/Accounts/" +msgstr "<GaimMain>/Rekeninge/" + +#: ../gtk/gtkblist.c:6324 +msgid "_Edit Account" +msgstr "_Wysig rekening" + +#: ../gtk/gtkblist.c:6357 ../gtk/gtkblist.c:6363 ../gtk/gtkconv.c:2858 +msgid "No actions available" +msgstr "" + +#: ../gtk/gtkblist.c:6371 +msgid "_Disable" +msgstr "_Deaktiveer" + +#: ../gtk/gtkblist.c:6383 +msgid "Enable Account" +msgstr "Aktiveer rekening" + +#: ../gtk/gtkblist.c:6389 +msgid "<GaimMain>/Accounts/Enable Account" +msgstr "" + +#: ../gtk/gtkblist.c:6438 +msgid "/Tools" +msgstr "Gereedskap" + +#: ../gtk/gtkblist.c:6508 +msgid "/Buddies/Sort Buddies" +msgstr "Sorteer vriende" + +#: ../gtk/gtkconn.c:179 +#, c-format +msgid "" +"%s\n" +"\n" +"Gaim will not attempt to reconnect the account until you correct the error " +"and re-enable the account." +msgstr "" +"" +"%s\n" +"\n" +"Gaim sal eers weer probeer verbind nadat u die fout reggemaak het en die " +"rekening geheraktiveer het." + +#: ../gtk/gtkconv.c:766 ../gtk/gtkconv.c:792 +msgid "That buddy is not on the same protocol as this chat." +msgstr "" + +#: ../gtk/gtkconv.c:786 +msgid "" +"You are not currently signed on with an account that can invite that buddy." +msgstr "" + +#: ../gtk/gtkconv.c:839 +msgid "Invite Buddy Into Chat Room" +msgstr "" + +#. Put our happy label in it. +#: ../gtk/gtkconv.c:869 +msgid "" +"Please enter the name of the user you wish to invite, along with an optional " +"invite message." +msgstr "" +"Gee asb. die naam van die gebruiker om uit te nooi, saam met 'n opsionele " +"uitnodigingsboodskap." + +#: ../gtk/gtkconv.c:890 +msgid "_Buddy:" +msgstr "_Vriend:" + +#: ../gtk/gtkconv.c:910 ../gtk/gtksavedstatuses.c:1141 +#: ../gtk/gtksavedstatuses.c:1477 +msgid "_Message:" +msgstr "_Boodskap:" + +#: ../gtk/gtkconv.c:967 ../gtk/gtkconv.c:2420 ../gtk/gtkdebug.c:218 +#: ../gtk/gtkft.c:542 +msgid "Unable to open file." +msgstr "Kan nie lêer oopmaak nie." + +#: ../gtk/gtkconv.c:973 +#, c-format +msgid "<h1>Conversation with %s</h1>\n" +msgstr "<h1>Gesprek met %s</h1>\n" + +#: ../gtk/gtkconv.c:997 +msgid "Save Conversation" +msgstr "Stoor gesprek" + +#: ../gtk/gtkconv.c:1144 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756 +msgid "Find" +msgstr "Soek" + +#: ../gtk/gtkconv.c:1170 ../gtk/gtkdebug.c:194 +msgid "_Search for:" +msgstr "_Soek vir:" + +#: ../gtk/gtkconv.c:1341 +msgid "Logging started. Future messages in this conversation will be logged." +msgstr "" + +#: ../gtk/gtkconv.c:1349 +msgid "" +"Logging stopped. Future messages in this conversation will not be logged." +msgstr "" + +#: ../gtk/gtkconv.c:1617 +msgid "Un-Ignore" +msgstr "On-ignoreer" + +#: ../gtk/gtkconv.c:1620 +msgid "Ignore" +msgstr "Ignoreer" + +#: ../gtk/gtkconv.c:1640 +msgid "Get Away Message" +msgstr "Kry Weg-boodskap" + +#: ../gtk/gtkconv.c:1663 +msgid "Last said" +msgstr "Laaste gesê" + +#: ../gtk/gtkconv.c:2428 +msgid "Unable to save icon file to disk." +msgstr "Kan nie ikoonlêer op skyf stoor nie." + +#: ../gtk/gtkconv.c:2498 +msgid "Save Icon" +msgstr "Stoor ikoon" + +#: ../gtk/gtkconv.c:2547 +msgid "Animate" +msgstr "" + +#: ../gtk/gtkconv.c:2552 +msgid "Hide Icon" +msgstr "Versteek ikoon" + +#: ../gtk/gtkconv.c:2555 +msgid "Save Icon As..." +msgstr "Stoor ikoon as..." + +#: ../gtk/gtkconv.c:2559 +msgid "Set Custom Icon..." +msgstr "Stel eie ikoon..." + +#: ../gtk/gtkconv.c:2566 +msgid "Remove Custom Icon" +msgstr "Verwyder eie ikoon" + +#. Conversation menu +#: ../gtk/gtkconv.c:2707 +msgid "/_Conversation" +msgstr "/_Gesprek" + +#: ../gtk/gtkconv.c:2709 +msgid "/Conversation/New Instant _Message..." +msgstr "/Gesprek/Nuwe _kitsboodskap..." + +#: ../gtk/gtkconv.c:2714 +msgid "/Conversation/_Find..." +msgstr "/Gesprek/_Vind..." + +#: ../gtk/gtkconv.c:2716 +msgid "/Conversation/View _Log" +msgstr "Bekyk _joernaal" + +#: ../gtk/gtkconv.c:2717 +msgid "/Conversation/_Save As..." +msgstr "/Gesprek/_Stoor as..." + +#: ../gtk/gtkconv.c:2719 +msgid "/Conversation/Clea_r Scrollback" +msgstr "" + +#: ../gtk/gtkconv.c:2723 +msgid "/Conversation/Se_nd File..." +msgstr "/Gesprek/S_tuur lêer..." + +#: ../gtk/gtkconv.c:2724 +msgid "/Conversation/Add Buddy _Pounce..." +msgstr "" + +#: ../gtk/gtkconv.c:2726 +msgid "/Conversation/_Get Info" +msgstr "/Gesprek/_Kry inligting" + +#: ../gtk/gtkconv.c:2728 +msgid "/Conversation/In_vite..." +msgstr "/Gesprek/_Nooi uit..." + +#: ../gtk/gtkconv.c:2730 +msgid "/Conversation/M_ore" +msgstr "/Gesprek/_Meer" + +#: ../gtk/gtkconv.c:2734 +msgid "/Conversation/Al_ias..." +msgstr "/Gesprek/_Alias..." + +#: ../gtk/gtkconv.c:2736 +msgid "/Conversation/_Block..." +msgstr "_Blokkeer..." + +#: ../gtk/gtkconv.c:2738 +msgid "/Conversation/_Add..." +msgstr "/Gesprek/_Voeg by..." + +#: ../gtk/gtkconv.c:2740 +msgid "/Conversation/_Remove..." +msgstr "/Gesprek/Ve_rwyder..." + +#: ../gtk/gtkconv.c:2745 +msgid "/Conversation/Insert Lin_k..." +msgstr "/Gesprek/Voeg s_kakel in..." + +#: ../gtk/gtkconv.c:2747 +msgid "/Conversation/Insert Imag_e..." +msgstr "/Gesprek/Voeg pr_entjie in..." + +#: ../gtk/gtkconv.c:2752 +msgid "/Conversation/_Close" +msgstr "/Gesprek/Slui_t" + +#. Options +#: ../gtk/gtkconv.c:2756 +msgid "/_Options" +msgstr "/_Keuses" + +#: ../gtk/gtkconv.c:2757 +msgid "/Options/Enable _Logging" +msgstr "" + +#: ../gtk/gtkconv.c:2758 +msgid "/Options/Enable _Sounds" +msgstr "/Keuses/Aktiveer _klanke" + +#: ../gtk/gtkconv.c:2759 +msgid "/Options/Show Buddy _Icon" +msgstr "Wys vriend_ikoon" + +#: ../gtk/gtkconv.c:2761 +msgid "/Options/Show Formatting _Toolbars" +msgstr "/Keuses/Wys _formatteringgereedskap" + +#: ../gtk/gtkconv.c:2762 +msgid "/Options/Show Ti_mestamps" +msgstr "/Keuses/Wys _tydstempels" + +#: ../gtk/gtkconv.c:2837 +msgid "/Conversation/More" +msgstr "/Gesprek/Meer" + +#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time +#. * the 'Conversation' menu pops up. +#. Make sure the 'Conversation -> More' menuitems are regenerated whenever +#. * the 'Conversation' menu pops up because the entries can change after the +#. * conversation is created. +#: ../gtk/gtkconv.c:2882 ../gtk/gtkconv.c:2914 +msgid "/Conversation" +msgstr "/Gesprek" + +#: ../gtk/gtkconv.c:2922 +msgid "/Conversation/View Log" +msgstr "/Gesprek/Bekyk joernaal" + +#: ../gtk/gtkconv.c:2928 +msgid "/Conversation/Send File..." +msgstr "/Gesprek/Stuur lêer..." + +#: ../gtk/gtkconv.c:2932 +msgid "/Conversation/Add Buddy Pounce..." +msgstr "" + +#: ../gtk/gtkconv.c:2938 +msgid "/Conversation/Get Info" +msgstr "/Gesprek/Kry inligting" + +#: ../gtk/gtkconv.c:2942 +msgid "/Conversation/Invite..." +msgstr "/Gesprek/Nooi uit..." + +#: ../gtk/gtkconv.c:2948 +msgid "/Conversation/Alias..." +msgstr "/Gesprek/Alias..." + +#: ../gtk/gtkconv.c:2952 +msgid "/Conversation/Block..." +msgstr "/Gesprek/Blokkeer..." + +#: ../gtk/gtkconv.c:2956 +msgid "/Conversation/Add..." +msgstr "/Gesprek/Voeg by..." + +#: ../gtk/gtkconv.c:2960 +msgid "/Conversation/Remove..." +msgstr "/Gesprek/Verwyder..." + +#: ../gtk/gtkconv.c:2966 +msgid "/Conversation/Insert Link..." +msgstr "/Gesprek/Voeg skakel in..." + +#: ../gtk/gtkconv.c:2970 +msgid "/Conversation/Insert Image..." +msgstr "/Gesprek/Voeg prentjie in..." + +#: ../gtk/gtkconv.c:2976 +msgid "/Options/Enable Logging" +msgstr "" + +#: ../gtk/gtkconv.c:2979 +msgid "/Options/Enable Sounds" +msgstr "/Keuses/Aktiveer klanke" + +#: ../gtk/gtkconv.c:2992 +msgid "/Options/Show Formatting Toolbars" +msgstr "/Keuses/Wys formatteringgereedskap" + +#: ../gtk/gtkconv.c:2995 +msgid "/Options/Show Timestamps" +msgstr "/Keuses/Wys _tydstempels" + +#: ../gtk/gtkconv.c:2998 +msgid "/Options/Show Buddy Icon" +msgstr "" + +#: ../gtk/gtkconv.c:3074 +msgid "User is typing..." +msgstr "Gebruiker tik..." + +#: ../gtk/gtkconv.c:3077 +msgid "User has typed something and stopped" +msgstr "Gebruiker het iets getik en gestop" + +#. Build the Send To menu +#: ../gtk/gtkconv.c:3260 +msgid "_Send To" +msgstr "_Stuur na" + +#: ../gtk/gtkconv.c:3967 +msgid "_Send" +msgstr "_Stuur" + +#: ../gtk/gtkconv.c:4063 ../libgaim/protocols/sametime/sametime.c:3606 +msgid "Topic:" +msgstr "Onderwerp:" + +#. Setup the label telling how many... [truncated message content] |
From: <the...@us...> - 2007-04-01 17:37:40
|
Revision: 18226 http://svn.sourceforge.net/gaim/?rev=18226&view=rev Author: thekingant Date: 2007-04-01 10:37:40 -0700 (Sun, 01 Apr 2007) Log Message: ----------- sf patch #1691784, from William Ehlhardt "Fixes a build-breaker introduced in SVN r18220." It compiled fine for me without including time.h, but I guess his os or distribution might be different. And this change is correct. Modified Paths: -------------- trunk/COPYRIGHT trunk/console/libgnt/gntwm.h Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2007-04-01 17:31:56 UTC (rev 18225) +++ trunk/COPYRIGHT 2007-04-01 17:37:40 UTC (rev 18226) @@ -97,6 +97,7 @@ Andrew Echols John Eckerdal Sean Egan <sea...@gm...> +William Ehlhardt Nelson Elhage Ignacio J. Elia Brian Enigma Modified: trunk/console/libgnt/gntwm.h =================================================================== --- trunk/console/libgnt/gntwm.h 2007-04-01 17:31:56 UTC (rev 18225) +++ trunk/console/libgnt/gntwm.h 2007-04-01 17:37:40 UTC (rev 18226) @@ -3,6 +3,7 @@ #include "gntmenu.h" #include <panel.h> +#include <time.h> #define GNT_TYPE_WM (gnt_wm_get_gtype()) #define GNT_WM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_WM, GntWM)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |