mirror of
https://github.com/znc/znc.git
synced 2026-03-28 17:42:41 +01:00
Some grammar and capitalization fixes.
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2233 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
@@ -128,7 +128,7 @@ void CClient::ReadLine(const CString& sData) {
|
||||
HandleCap(sLine);
|
||||
|
||||
// Don't let the client talk to the server directly about CAP,
|
||||
// we don't want anything enabled that znc does not support.
|
||||
// we don't want anything enabled that ZNC does not support.
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -988,7 +988,7 @@ void CIRCSock::SockError(int iErrno) {
|
||||
if (GetBindHost().empty())
|
||||
sError += " (Is your IRC server's host name valid?)";
|
||||
else
|
||||
sError += " (Is your IRC server's host name and znc bind host valid?)";
|
||||
sError += " (Is your IRC server's host name and ZNC bind host valid?)";
|
||||
} else {
|
||||
sError = strerror(iErrno);
|
||||
}
|
||||
|
||||
6
main.cpp
6
main.cpp
@@ -40,7 +40,7 @@ static void GenerateHelp(const char *appname) {
|
||||
#ifdef HAVE_LIBSSL
|
||||
CUtils::PrintMessage("\t-p, --makepem Generates a pemfile for use with SSL");
|
||||
#endif /* HAVE_LIBSSL */
|
||||
CUtils::PrintMessage("\t-d, --datadir Set a different znc repository (default is ~/.znc)");
|
||||
CUtils::PrintMessage("\t-d, --datadir Set a different ZNC repository (default is ~/.znc)");
|
||||
}
|
||||
|
||||
static void die(int sig) {
|
||||
@@ -189,7 +189,7 @@ int main(int argc, char** argv) {
|
||||
|
||||
#ifndef RUN_FROM_SOURCE
|
||||
if (CFile::Exists(pZNC->GetCurPath() + "/znc-uninstalled.pc")) {
|
||||
CUtils::PrintError("It looks like you are running znc without installing it first.");
|
||||
CUtils::PrintError("It looks like you are running ZNC without installing it first.");
|
||||
CUtils::PrintError("Recompile with --enable-run-from-source if you intend to do that.");
|
||||
}
|
||||
#endif
|
||||
@@ -331,7 +331,7 @@ int main(int argc, char** argv) {
|
||||
|
||||
delete pZNC;
|
||||
execvp(args[0], args);
|
||||
CUtils::PrintError("Unable to restart znc [" + CString(strerror(errno)) + "]");
|
||||
CUtils::PrintError("Unable to restart ZNC [" + CString(strerror(errno)) + "]");
|
||||
} /* Fall through */
|
||||
default:
|
||||
iRet = 1;
|
||||
|
||||
16
znc.cpp
16
znc.cpp
@@ -659,7 +659,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
|
||||
CUtils::PrintMessage("Building new config");
|
||||
|
||||
CUtils::PrintMessage("");
|
||||
CUtils::PrintMessage("First lets start with some global settings...");
|
||||
CUtils::PrintMessage("First let's start with some global settings...");
|
||||
CUtils::PrintMessage("");
|
||||
|
||||
// Listen
|
||||
@@ -767,7 +767,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
|
||||
|
||||
// User
|
||||
CUtils::PrintMessage("");
|
||||
CUtils::PrintMessage("Now we need to setup a user...");
|
||||
CUtils::PrintMessage("Now we need to set up a user...");
|
||||
CUtils::PrintMessage("ZNC needs one user per IRC network.");
|
||||
CUtils::PrintMessage("");
|
||||
|
||||
@@ -877,7 +877,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
|
||||
CUtils::PrintMessage("");
|
||||
CUtils::PrintMessage("-- IRC Servers --");
|
||||
CUtils::PrintMessage("Only add servers from the same IRC network.");
|
||||
CUtils::PrintMessage("If a server somehow doesn't work, another server will be used.");
|
||||
CUtils::PrintMessage("If a server from the list can't be reached, another server will be used.");
|
||||
CUtils::PrintMessage("");
|
||||
|
||||
do {
|
||||
@@ -920,7 +920,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
|
||||
|
||||
CUtils::PrintMessage("");
|
||||
bFirstUser = false;
|
||||
} while (CUtils::GetBoolInput("Would you like to setup another user (e.g. for connecting to another network)?", false));
|
||||
} while (CUtils::GetBoolInput("Would you like to set up another user (e.g. for connecting to another network)?", false));
|
||||
// !User
|
||||
|
||||
CFile File;
|
||||
@@ -985,9 +985,9 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
|
||||
|
||||
const CString sProtocol(sSSL.empty() ? "http" : "https");
|
||||
CUtils::PrintMessage("");
|
||||
CUtils::PrintMessage("To connect to this znc you need to connect to it as your irc server", true);
|
||||
CUtils::PrintMessage("To connect to this ZNC you need to connect to it as your IRC server", true);
|
||||
CUtils::PrintMessage("using the port that you supplied. You have to supply your login info", true);
|
||||
CUtils::PrintMessage("as the irc server password like so... user:pass.", true);
|
||||
CUtils::PrintMessage("as the IRC server password like this: user:pass.", true);
|
||||
CUtils::PrintMessage("");
|
||||
CUtils::PrintMessage("Try something like this in your IRC client...", true);
|
||||
CUtils::PrintMessage("/server <znc_server_ip> " + sSSL + CString(uListenPort) + " " + sUser + ":<pass>", true);
|
||||
@@ -996,7 +996,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
|
||||
CUtils::PrintMessage("");
|
||||
|
||||
m_LockFile.UnLock();
|
||||
return bFileOpen && CUtils::GetBoolInput("Launch znc now?", true);
|
||||
return bFileOpen && CUtils::GetBoolInput("Launch ZNC now?", true);
|
||||
}
|
||||
|
||||
size_t CZNC::FilterUncommonModules(set<CModInfo>& ssModules) {
|
||||
@@ -1064,7 +1064,7 @@ bool CZNC::DoRehash(CString& sError)
|
||||
if (!CFile::Exists(m_sConfigFile)) {
|
||||
sError = "No such file";
|
||||
CUtils::PrintStatus(false, sError);
|
||||
CUtils::PrintMessage("Restart znc with the --makeconf option if you wish to create this config.");
|
||||
CUtils::PrintMessage("Restart ZNC with the --makeconf option if you wish to create this config.");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user