diff options
| author | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2007-06-15 04:27:08 +0000 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@pidgin.im> | 2007-06-15 04:27:08 +0000 |
| commit | 8adec68b57d9f61062cbd24560db1671cb436ef7 (patch) | |
| tree | 790d790c49b811cec43167b482f2a5d8f3361d5f | |
| parent | 980e7b67c3f5befa4375aba9709c267375f6bc06 (diff) | |
| parent | ae0cc48b47dbfe170421476e971a9ff373a9e0f8 (diff) | |
| download | pidgin-8adec68b57d9f61062cbd24560db1671cb436ef7.tar.gz | |
merge of '2d325551db9eb4dc4223cab402ef5201c92f29ab'
and '2e65bc9fa310ba118c5f3ceb6426ae05bbbf232c'
| -rw-r--r-- | libpurple/protocols/msn/switchboard.c | 2 | ||||
| -rw-r--r-- | libpurple/protocols/silc/ft.c | 2 | ||||
| -rw-r--r-- | pidgin/plugins/relnot.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libpurple/protocols/msn/switchboard.c b/libpurple/protocols/msn/switchboard.c index 09884c052c..debe4cc309 100644 --- a/libpurple/protocols/msn/switchboard.c +++ b/libpurple/protocols/msn/switchboard.c @@ -422,7 +422,7 @@ msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error) 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:"); diff --git a/libpurple/protocols/silc/ft.c b/libpurple/protocols/silc/ft.c index 05fa942305..32d0b72c63 100644 --- a/libpurple/protocols/silc/ft.c +++ b/libpurple/protocols/silc/ft.c @@ -111,7 +111,7 @@ silcpurple_ftp_monitor(SilcClient client, } 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"), diff --git a/pidgin/plugins/relnot.c b/pidgin/plugins/relnot.c index b8011a7f0b..1ded39109e 100644 --- a/pidgin/plugins/relnot.c +++ b/pidgin/plugins/relnot.c @@ -70,8 +70,9 @@ version_fetch_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, 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); |