pidgin: 420b7154: Fix occurred to be spelled correctly. Th...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 420b71541a7786d593759ead8d775f487291fb97
Ancestor: 5209711a57354bb80c0bca86b13e1e819530ac58
Author: datallah at pidgin.im
Date: 2008-06-16T15:19:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/420b71541a7786d593759ead8d775f487291fb97

Modified files:
        libpurple/connection.h libpurple/protocols/gg/search.h
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/qq/send_file.c pidgin/plugins/cap/cap.c
        po/en_GB.po

ChangeLog: 

Fix occurred to be spelled correctly. Thanks to bruce89 for noticing. Fixes #6096.

-------------- next part --------------
============================================================
--- libpurple/connection.h	2ebaef2d11e2bc093d5eafed9f0bd9a79bb9f961
+++ libpurple/connection.h	1bedab3e80682d43f51c28e7c6893169e597662a
@@ -122,7 +122,7 @@ typedef enum
 	 */
 	PURPLE_CONNECTION_ERROR_CERT_OTHER_ERROR = 15,
 
-	/** Some other error occured which fits into none of the other
+	/** Some other error occurred which fits into none of the other
 	 *  categories.
 	 */
 	/* purple_connection_error_reason() in connection.c uses the fact that
============================================================
--- libpurple/protocols/gg/search.h	7fa863cde2fe4eeac75c408ad1abd61d2743acb7
+++ libpurple/protocols/gg/search.h	f183193d99ae257b1e93223b2e19b35759f0929e
@@ -130,7 +130,7 @@ ggp_search_destroy(GGPSearches *searches
  * @param gc   PurpleConnection.
  * @param form Filled in GGPSearchForm.
  *
- * @return Sequence number of a search or 0 if an error occured.
+ * @return Sequence number of a search or 0 if an error occurred.
  */
 guint32
 ggp_search_start(PurpleConnection *gc, GGPSearchForm *form);
============================================================
--- libpurple/protocols/jabber/pep.h	9d0e2298f38126dcf5e549482a0d09672e195498
+++ libpurple/protocols/jabber/pep.h	4f339e49eb6b796b29106616bc73723d7ce0878f
@@ -57,7 +57,7 @@ void jabber_pep_register_handler(const c
  * @parameter id	The item id of the requested item (may be NULL)
  * @parameter cb	The callback to be used when this item is received
  *
- * The items element passed to the callback will be NULL if any error occured (like a permission error, node doesn't exist etc.)
+ * The items element passed to the callback will be NULL if any error occurred (like a permission error, node doesn't exist etc.)
  */
 void jabber_pep_request_item(JabberStream *js, const char *to, const char *node, const char *id, JabberPEPHandler cb);
 
============================================================
--- libpurple/protocols/myspace/user.c	54ff806ca1396bc3558e638400430dc2c2b37571
+++ libpurple/protocols/myspace/user.c	7d4e32a3eea84ba8adaf25b7df39ecd355a5aa12
@@ -635,7 +635,7 @@ static void msim_username_is_available_c
 	if (!body) {
 		purple_debug_info("msim_username_is_available_cb", "No body for %s?!\n", username);
 		purple_connection_error_reason(session->gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, 
-				"An error occured while trying to set the username.\n"
+				"An error occurred while trying to set the username.\n"
 				"Please try again, or visit http://editprofile.myspace.com/index.cfm?"
 				"fuseaction=profile.username to set your username.");
 		return;
@@ -778,7 +778,7 @@ static void msim_username_is_set_cb(Msim
 	uid = msim_msg_get_integer(userinfo, "uid");
 	lid = msim_msg_get_integer(userinfo, "lid");
 	body = msim_msg_get_dictionary(userinfo, "body");
-	errmsg = g_strdup("An error occured while trying to set the username.\n"
+	errmsg = g_strdup("An error occurred while trying to set the username.\n"
 			"Please try again, or visit http://editprofile.myspace.com/index.cfm?"
 			"fuseaction=profile.username to set your username.");
 	
============================================================
--- libpurple/protocols/qq/send_file.c	eaace369ae80103dc17967d6cf0947b3a405992e
+++ libpurple/protocols/qq/send_file.c	45d208987c60fea48e6a94f872afc262deaf58b5
@@ -155,7 +155,7 @@ static void _qq_xfer_recv_packet(gpointe
 	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;
============================================================
--- pidgin/plugins/cap/cap.c	cae577cbacecb1e6eb30d92ecfd22e268432c5e6
+++ pidgin/plugins/cap/cap.c	38235d764da257742a1ea4fe0b989acd6f04b5de
@@ -333,7 +333,7 @@ static gboolean max_message_difference_c
 
 static gboolean max_message_difference_cb(gpointer data) {
 	CapStatistics *stats = data;
-	purple_debug_info("cap", "Max Message Difference timeout occured\n");
+	purple_debug_info("cap", "Max Message Difference timeout occurred\n");
 	insert_cap_failure(stats);
 	stats->timeout_source_id = 0;
 	return FALSE;
============================================================
--- po/en_GB.po	a0e6cdbada496c5dc4033599c710f45b24b8b05a
+++ po/en_GB.po	df103fc9b38e320c1c368da3f0e96fd0e5f62a11
@@ -2911,7 +2911,7 @@ msgid "Unable to change password. Error 
 msgstr "Your current password is different from the one that you specified."
 
 msgid "Unable to change password. Error occurred.\n"
-msgstr "Unable to change password. An error occured.\n"
+msgstr "Unable to change password. An error occurred.\n"
 
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Change password for the Gadu-Gadu account"
@@ -5270,7 +5270,7 @@ msgid "Message could not be sent because
 msgstr "Message could not be sent because the user is offline:"
 
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "Message could not be sent because a connection error occured:"
+msgstr "Message could not be sent because a connection error occurred:"
 
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Message could not be sent because we are sending too quickly:"