diff -Nuar gaim-2.0.0+beta3.1.orig/doc/PERL-HOWTO.dox gaim-2.0.0+beta3.1/doc/PERL-HOWTO.dox --- gaim-2.0.0+beta3.1.orig/doc/PERL-HOWTO.dox 2006-08-20 06:06:11.000000000 +0930 +++ gaim-2.0.0+beta3.1/doc/PERL-HOWTO.dox 2006-10-07 11:19:19.000000000 +0930 @@ -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); diff -Nuar gaim-2.0.0+beta3.1.orig/plugins/musicmessaging/musicmessaging.c gaim-2.0.0+beta3.1/plugins/musicmessaging/musicmessaging.c --- gaim-2.0.0+beta3.1.orig/plugins/musicmessaging/musicmessaging.c 2006-08-20 06:06:29.000000000 +0930 +++ gaim-2.0.0+beta3.1/plugins/musicmessaging/musicmessaging.c 2006-10-07 11:20:45.000000000 +0930 @@ -521,7 +521,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 diff -Nuar gaim-2.0.0+beta3.1.orig/src/protocols/gg/gg.c gaim-2.0.0+beta3.1/src/protocols/gg/gg.c --- gaim-2.0.0+beta3.1.orig/src/protocols/gg/gg.c 2006-08-20 06:05:57.000000000 +0930 +++ gaim-2.0.0+beta3.1/src/protocols/gg/gg.c 2006-10-07 11:18:14.000000000 +0930 @@ -696,7 +696,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; } diff -Nuar gaim-2.0.0+beta3.1.orig/src/protocols/sametime/sametime.c gaim-2.0.0+beta3.1/src/protocols/sametime/sametime.c --- gaim-2.0.0+beta3.1.orig/src/protocols/sametime/sametime.c 2006-08-20 06:05:57.000000000 +0930 +++ gaim-2.0.0+beta3.1/src/protocols/sametime/sametime.c 2006-10-07 11:17:41.000000000 +0930 @@ -1644,7 +1644,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) {