Mercurial > pidgin
changeset 27287:f24a8b9d1be3
merge of '7f396ae5ae1a07562f3822bfdf32a5b71b737970'
and 'b5c22753df947a633375026b7e424152cb435539'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 04 Jul 2009 07:54:50 +0000 |
| parents | 2a5c906e1104 (current diff) 73c8e1964eef (diff) |
| children | 9aea1eb8aa66 28fd0ca5c693 |
| files | |
| diffstat | 13 files changed, 25 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/connection-signals.dox Sat Jul 04 05:56:22 2009 +0000 +++ b/doc/connection-signals.dox Sat Jul 04 07:54:50 2009 +0000 @@ -54,8 +54,8 @@ @endsignalproto @signaldesc Emitted when a connection error occurs, before @ref signed-off. - @param gc The connection on which the error has occured - @param err The error that occured + @param gc The connection on which the error has occurred + @param err The error that occurred @param desc A description of the error, giving more information. @endsignaldef
--- a/libpurple/plugins/log_reader.c Sat Jul 04 05:56:22 2009 +0000 +++ b/libpurple/plugins/log_reader.c Sat Jul 04 07:54:50 2009 +0000 @@ -2941,7 +2941,8 @@ /** description */ N_("When viewing logs, this plugin will include " "logs from other IM clients. Currently, this " - "includes Adium, MSN Messenger, and Trillian.\n\n" + "includes Adium, MSN Messenger, aMSN, and " + "Trillian.\n\n" "WARNING: This plugin is still alpha code and " "may crash frequently. Use it at your own risk!"),
--- a/libpurple/plugins/offlinemsg.c Sat Jul 04 05:56:22 2009 +0000 +++ b/libpurple/plugins/offlinemsg.c Sat Jul 04 07:54:50 2009 +0000 @@ -93,7 +93,7 @@ conv = offline->conv; if (!purple_conversation_get_data(conv, "plugin_pack:offlinemsg")) purple_conversation_write(conv, NULL, _("The rest of the messages will be saved " - "as pounce. You can edit/delete the pounce from the `Buddy " + "as pounces. You can edit/delete the pounce from the `Buddy " "Pounce' dialog."), PURPLE_MESSAGE_SYSTEM, time(NULL)); purple_conversation_set_data(conv, "plugin_pack:offlinemsg",
--- a/libpurple/protocols/jabber/jabber.c Sat Jul 04 05:56:22 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat Jul 04 07:54:50 2009 +0000 @@ -907,7 +907,7 @@ if (type == JABBER_IQ_RESULT) { if(js->registration) { - buf = g_strdup_printf(_("Registration of %s@%s successful"), + buf = g_strdup_printf(_("Registration of %s@%s successful"), js->user->node, js->user->domain); if(account->registration_cb) (account->registration_cb)(account, TRUE, account->registration_cb_user_data);
--- a/libpurple/protocols/jabber/si.c Sat Jul 04 05:56:22 2009 +0000 +++ b/libpurple/protocols/jabber/si.c Sat Jul 04 07:54:50 2009 +0000 @@ -976,10 +976,10 @@ PurpleConnection *gc = js->gc; PurpleAccount *account = purple_connection_get_account(gc); - purple_debug_error("jabber", "an error occured during IBB file transfer\n"); + purple_debug_error("jabber", "an error occurred during IBB file transfer\n"); purple_xfer_error(purple_xfer_get_type(xfer), account, jabber_ibb_session_get_who(sess), - _("An error occured on the in-band bytestream transfer\n")); + _("An error occurred on the in-band bytestream transfer\n")); purple_xfer_cancel_remote(xfer); }
--- a/libpurple/protocols/novell/novell.c Sat Jul 04 05:56:22 2009 +0000 +++ b/libpurple/protocols/novell/novell.c Sat Jul 04 07:54:50 2009 +0000 @@ -2187,7 +2187,7 @@ purple_connection_error_reason (gc, PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, _("Unable to connect to server. Please enter the " - "address of the server you wish to connect to.")); + "address of the server to which you wish to connect.")); return; }
--- a/libpurple/protocols/qq/send_file.c Sat Jul 04 05:56:22 2009 +0000 +++ b/libpurple/protocols/qq/send_file.c Sat Jul 04 07:54:50 2009 +0000 @@ -152,7 +152,7 @@ gint size; /* FIXME: It seems that the transfer never use a packet * larger than 1500 bytes, so if it happened to be a - * larger packet, either error occured or protocol should + * larger packet, either error occurred or protocol should * be modified */ ft_info *info;
--- a/pidgin/gtkcertmgr.c Sat Jul 04 05:56:22 2009 +0000 +++ b/pidgin/gtkcertmgr.c Sat Jul 04 07:54:50 2009 +0000 @@ -187,7 +187,7 @@ purple_request_input(tpm_dat, _("Certificate Import"), _("Specify a hostname"), - _("Type the host name this certificate is for."), + _("Type the host name for this certificate."), default_hostname, FALSE, /* Not multiline */ FALSE, /* Not masked? */
--- a/pidgin/gtkimhtml.c Sat Jul 04 05:56:22 2009 +0000 +++ b/pidgin/gtkimhtml.c Sat Jul 04 07:54:50 2009 +0000 @@ -1549,7 +1549,7 @@ GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-visited-color", _("Hyperlink visited color"), - _("Color to draw hyperlinks after it has been visited (or activated)."), + _("Color to draw hyperlink after it has been visited (or activated)."), GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-prelight-color", _("Hyperlink prelight color"), @@ -1573,11 +1573,11 @@ GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("whisper-action-name-color", _("Action Message Name Color for Whispered Message"), - _("Color to draw the name of an action message."), + _("Color to draw the name of a whispered action message."), GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("whisper-name-color", _("Whisper Message Name Color"), - _("Color to draw the name of an action message."), + _("Color to draw the name of a whispered message."), GDK_TYPE_COLOR, G_PARAM_READABLE)); /* Customizable typing notification ... sort of. Example: @@ -1587,7 +1587,7 @@ */ gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("typing-notification-color", _("Typing notification color"), - _("The color to use for the typing notification font"), + _("The color to use for the typing notification"), GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property(widget_class, g_param_spec_string("typing-notification-font", _("Typing notification font"),
--- a/pidgin/gtkutils.c Sat Jul 04 05:56:22 2009 +0000 +++ b/pidgin/gtkutils.c Sat Jul 04 07:54:50 2009 +0000 @@ -1677,9 +1677,11 @@ * send. The only logical one is "Application," but do we really want to send a binary and nothing else? * Probably not. I'll just give an error and return. */ /* The original patch sent the icon used by the launcher. That's probably wrong */ - purple_notify_error(NULL, NULL, _("Cannot send launcher"), _("You dragged a desktop launcher. " - "Most likely you wanted to send whatever this launcher points to instead of this launcher" - " itself.")); + purple_notify_error(NULL, NULL, _("Cannot send launcher"), + _("You dragged a desktop launcher. Most " + "likely you wanted to send the target " + "of this launcher instead of this " + "launcher itself.")); break; } purple_desktop_item_unref(item);
--- a/pidgin/plugins/musicmessaging/musicmessaging.c Sat Jul 04 05:56:22 2009 +0000 +++ b/pidgin/plugins/musicmessaging/musicmessaging.c Sat Jul 04 07:54:50 2009 +0000 @@ -684,7 +684,8 @@ DISPLAY_VERSION, /**< version */ N_("Music Messaging Plugin for collaborative composition."), /** summary */ - N_("The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."), + N_("The Music Messaging Plugin allows a number of users to simultaneously " + "work on a piece of music by editing a common score in real-time."), /** description */ "Christian Muise <christian.muise@gmail.com>", /**< author */ PURPLE_WEBSITE, /**< homepage */
--- a/pidgin/plugins/sendbutton.c Sat Jul 04 05:56:22 2009 +0000 +++ b/pidgin/plugins/sendbutton.c Sat Jul 04 07:54:50 2009 +0000 @@ -177,8 +177,8 @@ DISPLAY_VERSION, /**< version */ N_("Conversation Window Send Button."), /**< summary */ N_("Adds a Send button to the entry area of " - "the conversation window. Intended for when " - "no physical keyboard is present."), /**< description */ + "the conversation window. Intended for use " + "when no physical keyboard is present."), /**< description */ "Etan Reisner <deryni@pidgin.im>", /**< author */ PURPLE_WEBSITE, /**< homepage */ plugin_load, /**< load */
--- a/pidgin/plugins/win32/winprefs/winprefs.c Sat Jul 04 05:56:22 2009 +0000 +++ b/pidgin/plugins/win32/winprefs/winprefs.c Sat Jul 04 07:54:50 2009 +0000 @@ -350,7 +350,7 @@ N_("Windows Pidgin Options"), DISPLAY_VERSION, N_("Options specific to Pidgin for Windows."), - N_("Provides options specific to Pidgin for Windows , such as buddy list docking."), + N_("Provides options specific to Pidgin for Windows, such as buddy list docking."), "Herman Bloggs <hermanator12002@yahoo.com>", PURPLE_WEBSITE, plugin_load,