# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1160245157 0
# Node ID dd0c43d423948eb9231d33a590abdc344d6330a2
# Parent  dbcdef1ab5af5bc99985e267e98cc1b99f9e65c1
[gaim-migrate @ 17444]
Patch from launchpad bug #64445, from Paul Schulz
Fix some typos

committer: Tailor Script <tailor@pidgin.im>

diff -r dbcdef1ab5af -r dd0c43d42394 doc/PERL-HOWTO.dox
--- 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); 
diff -r dbcdef1ab5af -r dd0c43d42394 gtk/plugins/musicmessaging/musicmessaging.c
--- 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
diff -r dbcdef1ab5af -r dd0c43d42394 libgaim/protocols/gg/gg.c
--- 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;
 	}
diff -r dbcdef1ab5af -r dd0c43d42394 libgaim/protocols/sametime/sametime.c
--- 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) {