diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-03-26 17:51:15 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-03-26 17:51:15 +0000 |
| commit | b81af2c2bb8a4b41b8adbb1c351fbd0964542558 (patch) | |
| tree | 43d27059095daf9a1534b26a3b6b8cdb9761796a /methods/ftp.cc | |
| parent | d73e594e888fbc099bba84726df72eedcee5272c (diff) | |
| parent | f71d29c87b24b470fc2ae6b051ceaa8c9faa8358 (diff) | |
Merge bubulle@debian.org--2005/apt--main--0
Patches applied:
* bubulle@debian.org--2005/apt--main--0--patch-58
Correct file permissions
* bubulle@debian.org--2005/apt--main--0--patch-59
Bring consistency to the use of capitals in programs messages
* bubulle@debian.org--2005/apt--main--0--patch-60
Correct the permission change on configure.in
* bubulle@debian.org--2005/apt--main--0--patch-61
Complete unfuzzification of PO files after the capitalization fixes
* bubulle@debian.org--2005/apt--main--0--patch-62
Final work of capitalization cleaning and translation unfuzzyfication
* bubulle@debian.org--2005/apt--main--0--patch-63
Correct the "arbitary" typo in apt-ftparchive
* bubulle@debian.org--2005/apt--main--0--patch-64
Italian translation update
* bubulle@debian.org--2005/apt--main--0--patch-65
Italian translation update
Diffstat (limited to 'methods/ftp.cc')
| -rw-r--r-- | methods/ftp.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc index fafa10534..8bf8a2ee6 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -201,7 +201,7 @@ bool FTPConn::Login() if (ReadResp(Tag,Msg) == false) return false; if (Tag >= 400) - return _error->Error(_("Server refused our connection and said: %s"),Msg.c_str()); + return _error->Error(_("The server refused the connection and said: %s"),Msg.c_str()); // Send the user if (WriteMsg(Tag,Msg,"USER %s",User.c_str()) == false) @@ -229,7 +229,7 @@ bool FTPConn::Login() if (ReadResp(Tag,Msg) == false) return false; if (Tag >= 400) - return _error->Error(_("Server refused our connection and said: %s"),Msg.c_str()); + return _error->Error(_("The server refused the connection and said: %s"),Msg.c_str()); // Perform proxy script execution Configuration::Item const *Opts = _config->Tree("Acquire::ftp::ProxyLogin"); @@ -443,7 +443,7 @@ bool FTPConn::WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...) int Res = write(ServerFd,S + Start,Len); if (Res <= 0) { - _error->Errno("write",_("Write Error")); + _error->Errno("write",_("Write error")); Close(); return false; } |