Mercurial > pidgin.yaz
changeset 23376:85fc34efe733
Fix occurred to be spelled correctly. Thanks to bruce89 for noticing. Fixes #6096.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 16 Jun 2008 15:19:11 +0000 |
| parents | 53db7393829e |
| children | b175f6441bba 1c6918e48104 d65150b5622f f9f3d8bae136 a5bb767b8644 |
| 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 |
| diffstat | 7 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/connection.h Mon Jun 16 01:03:23 2008 +0000 +++ b/libpurple/connection.h Mon Jun 16 15:19:11 2008 +0000 @@ -122,7 +122,7 @@ */ 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
--- a/libpurple/protocols/gg/search.h Mon Jun 16 01:03:23 2008 +0000 +++ b/libpurple/protocols/gg/search.h Mon Jun 16 15:19:11 2008 +0000 @@ -130,7 +130,7 @@ * @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);
--- a/libpurple/protocols/jabber/pep.h Mon Jun 16 01:03:23 2008 +0000 +++ b/libpurple/protocols/jabber/pep.h Mon Jun 16 15:19:11 2008 +0000 @@ -57,7 +57,7 @@ * @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);
--- a/libpurple/protocols/myspace/user.c Mon Jun 16 01:03:23 2008 +0000 +++ b/libpurple/protocols/myspace/user.c Mon Jun 16 15:19:11 2008 +0000 @@ -635,7 +635,7 @@ 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 @@ 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.");
--- a/libpurple/protocols/qq/send_file.c Mon Jun 16 01:03:23 2008 +0000 +++ b/libpurple/protocols/qq/send_file.c Mon Jun 16 15:19:11 2008 +0000 @@ -155,7 +155,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/plugins/cap/cap.c Mon Jun 16 01:03:23 2008 +0000 +++ b/pidgin/plugins/cap/cap.c Mon Jun 16 15:19:11 2008 +0000 @@ -333,7 +333,7 @@ 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;
--- a/po/en_GB.po Mon Jun 16 01:03:23 2008 +0000 +++ b/po/en_GB.po Mon Jun 16 15:19:11 2008 +0000 @@ -2911,7 +2911,7 @@ 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 @@ 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:"