diff options
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/cdrom.cc | 8 | ||||
| -rw-r--r-- | methods/ftp.cc | 4 | ||||
| -rw-r--r-- | methods/http.cc | 14 | ||||
| -rw-r--r-- | methods/rsh.cc | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc index d8bb9522e..7cc036814 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -119,15 +119,15 @@ bool CDROMMethod::Fetch(FetchItem *Itm) // All non IMS queries for package files fail. if (Itm->IndexFile == true || GetID(Get.Host).empty() == true) { - Fail(_("Please use apt-cdrom to make this CD recognized by APT." - " apt-get update cannot be used to add new CDs")); + Fail(_("Please use apt-cdrom to make this CD-ROM recognized by APT." + " apt-get update cannot be used to add new CD-ROMs")); return true; } // We already have a CD inserted, but it is the wrong one if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host) { - Fail(_("Wrong CD"),true); + Fail(_("Wrong CD-ROM"),true); return true; } @@ -165,7 +165,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) if (MediaFail(Get.Host,CDROM) == false) { CurrentID = "FAIL"; - Fail(_("Wrong CD"),true); + Fail(_("Wrong CD-ROM"),true); return true; } } diff --git a/methods/ftp.cc b/methods/ftp.cc index fafa10534..b744d9882 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) @@ -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; } diff --git a/methods/http.cc b/methods/http.cc index f9358990c..81a64d7a3 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -514,14 +514,14 @@ bool ServerState::HeaderLine(string Line) { if (sscanf(Line.c_str(),"HTTP/%u.%u %u %[^\n]",&Major,&Minor, &Result,Code) != 4) - return _error->Error(_("The http server sent an invalid reply header")); + return _error->Error(_("The HTTP server sent an invalid reply header")); } else { Major = 0; Minor = 9; if (sscanf(Line.c_str(),"HTTP %u %[^\n]",&Result,Code) != 2) - return _error->Error(_("The http server sent an invalid reply header")); + return _error->Error(_("The HTTP server sent an invalid reply header")); } /* Check the HTTP response header to get the default persistance @@ -550,7 +550,7 @@ bool ServerState::HeaderLine(string Line) return true; if (sscanf(Val.c_str(),"%lu",&Size) != 1) - return _error->Error(_("The http server sent an invalid Content-Length header")); + return _error->Error(_("The HTTP server sent an invalid Content-Length header")); return true; } @@ -565,9 +565,9 @@ bool ServerState::HeaderLine(string Line) HaveContent = true; if (sscanf(Val.c_str(),"bytes %lu-%*u/%lu",&StartPos,&Size) != 2) - return _error->Error(_("The http server sent an invalid Content-Range header")); + return _error->Error(_("The HTTP server sent an invalid Content-Range header")); if ((unsigned)StartPos > Size) - return _error->Error(_("This http server has broken range support")); + return _error->Error(_("This HTTP server has broken range support")); return true; } @@ -829,7 +829,7 @@ bool HttpMethod::ServerDie(ServerState *Srv) { Srv->Close(); if (LErrno == 0) - return _error->Error(_("Error reading from server Remote end closed connection")); + return _error->Error(_("Error reading from server. Remote end closed connection")); errno = LErrno; return _error->Errno("read",_("Error reading from server")); } @@ -1062,7 +1062,7 @@ int HttpMethod::Loop() // The header data is bad case 2: { - _error->Error(_("Bad header Data")); + _error->Error(_("Bad header data")); Fail(true); RotateDNS(); continue; diff --git a/methods/rsh.cc b/methods/rsh.cc index ffd2b7dbd..f0ccfc42d 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -229,7 +229,7 @@ bool RSHConn::WriteMsg(string &Text,bool Sync,const char *Fmt,...) int Res = write(WriteFd,S + Start,Len); if (Res <= 0) { - _error->Errno("write",_("Write Error")); + _error->Errno("write",_("Write error")); Close(); return false; } @@ -261,7 +261,7 @@ bool RSHConn::Size(const char *Path,unsigned long &Size) char *End; Size = strtoul(Msg.c_str(),&End,10); if (End == Msg.c_str()) - return _error->Error(_("File Not Found")); + return _error->Error(_("File not found")); return true; } /*}}}*/ @@ -430,7 +430,7 @@ bool RSHMethod::Fetch(FetchItem *Itm) Server->ModTime(File,FailTime) == false) { //Fail(true); - //_error->Error(_("File Not Found")); // Will be handled by Size + //_error->Error(_("File not found")); // Will be handled by Size return false; } Res.Size = Size; |