Mercurial > pidgin
changeset 14692:dd0c43d42394
[gaim-migrate @ 17444]
Patch from launchpad bug #64445, from Paul Schulz
Fix some typos
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 07 Oct 2006 18:19:17 +0000 |
| parents | dbcdef1ab5af |
| children | ae0136b0a3ae |
| files | doc/PERL-HOWTO.dox gtk/plugins/musicmessaging/musicmessaging.c libgaim/protocols/gg/gg.c libgaim/protocols/sametime/sametime.c |
| diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/PERL-HOWTO.dox Sat Oct 07 17:25:21 2006 +0000 +++ b/doc/PERL-HOWTO.dox Sat Oct 07 18:19:17 2006 +0000 @@ -518,7 +518,7 @@ @code sub timeout_cb { my $plugin = shift; - print "Timeout occured."; + print "Timeout occurred."; # Reschedule timeout Gaim::timeout_add($plugin, 10, \&timeout_cb, $plugin);
--- a/gtk/plugins/musicmessaging/musicmessaging.c Sat Oct 07 17:25:21 2006 +0000 +++ b/gtk/plugins/musicmessaging/musicmessaging.c Sat Oct 07 18:19:17 2006 +0000 @@ -523,7 +523,7 @@ if (!(g_spawn_async (".", args, NULL, 4, NULL, NULL, &(mmconv->pid), &spawn_error))) { gaim_notify_error(plugin_pointer, _("Error Running Editor"), - _("The following error has occured:"), spawn_error->message); + _("The following error has occurred:"), spawn_error->message); mmconv->started = FALSE; } else
--- a/libgaim/protocols/gg/gg.c Sat Oct 07 17:25:21 2006 +0000 +++ b/libgaim/protocols/gg/gg.c Sat Oct 07 18:19:17 2006 +0000 @@ -713,7 +713,7 @@ if (h == NULL) { gaim_notify_error(account, NULL, - _("Unable to change password. Error occured.\n"), + _("Unable to change password. Error occurred.\n"), NULL); goto exit_err; }
--- a/libgaim/protocols/sametime/sametime.c Sat Oct 07 17:25:21 2006 +0000 +++ b/libgaim/protocols/sametime/sametime.c Sat Oct 07 18:19:17 2006 +0000 @@ -1638,7 +1638,7 @@ /* fetch the global error value */ err = errno; - /* read problem occured if we're here, so we'll need to take care of + /* read problem occurred if we're here, so we'll need to take care of it and clean up internal state */ if(pd->socket) {