Mercurial > pidgin.yaz
changeset 18101:5cff2b8bfb08
merge of '42eba34c013784379084cfe8e5899cc7e9e7dde2'
and 'c9b5a303a7b8dc0a0741ecef936ccf9082f18974'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Fri, 15 Jun 2007 04:27:08 +0000 |
| parents | 55ff2a39244e (diff) f63b3a23280d (current diff) |
| children | 74842d0ac1a7 |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/switchboard.c Fri Jun 15 03:36:54 2007 +0000 +++ b/libpurple/protocols/msn/switchboard.c Fri Jun 15 04:27:08 2007 +0000 @@ -422,7 +422,7 @@ break; case MSN_SB_ERROR_AUTHFAILED: str_reason = _("Message could not be sent " - "because we wer unable to establish a " + "because we were unable to establish a " "session with the server. This is " "likely a server problem, try again in " "a few minutes:");
--- a/libpurple/protocols/silc/ft.c Fri Jun 15 03:36:54 2007 +0000 +++ b/libpurple/protocols/silc/ft.c Fri Jun 15 04:27:08 2007 +0000 @@ -111,7 +111,7 @@ } else if (error == SILC_CLIENT_FILE_TIMEOUT) { purple_notify_error(gc, _("Secure File Transfer"), _("Error during file transfer"), - _("Connection timedout")); + _("Connection timed out")); } else if (error == SILC_CLIENT_FILE_CONNECT_FAILED) { purple_notify_error(gc, _("Secure File Transfer"), _("Error during file transfer"),
--- a/pidgin/plugins/relnot.c Fri Jun 15 03:36:54 2007 +0000 +++ b/pidgin/plugins/relnot.c Fri Jun 15 04:27:08 2007 +0000 @@ -70,8 +70,9 @@ message = g_string_new(""); g_string_append_printf(message, _("You are using %s version %s. The " "current version is %s. You can get it from " - "<a href=\"" PURPLE_WEBSITE "\">" PURPLE_WEBSITE "</a><hr>"), - PIDGIN_NAME, purple_core_get_version(), cur_ver); + "<a href=\"%s\">%s</a><hr>"), + PIDGIN_NAME, purple_core_get_version(), cur_ver, + PURPLE_WEBSITE, PURPLE_WEBSITE); if(*changelog) { formatted = purple_strdup_withhtml(changelog);