More translateable strings (#1354)

This commit is contained in:
Alexey Sokolov
2018-03-31 22:29:09 +01:00
parent d8327977ca
commit 1eceb5a5c7
7 changed files with 129 additions and 123 deletions

View File

@@ -233,7 +233,8 @@ void CIRCNetwork::Clone(const CIRCNetwork& Network, bool bCloneName) {
if (pSock) {
PutStatus(
"Jumping servers because this server is no longer in the list");
t_s("Jumping servers because this server is no longer in the "
"list"));
pSock->Quit();
}
}
@@ -468,7 +469,9 @@ bool CIRCNetwork::ParseConfig(CConfig* pConfig, CString& sError,
}
if (!bFound) {
sNotice =
"Loading network module [simple_away] instead";
"NOTICE: awaynick was retired, loading network "
"module [simple_away] instead; if you still need "
"awaynick, install it as an external module";
sModName = "simple_away";
// not a fatal error if simple_away is not available
LoadModule(sModName, sArgs, sNotice, sModRet);
@@ -635,7 +638,7 @@ void CIRCNetwork::ClientConnected(CClient* pClient) {
if (m_RawBuffer.IsEmpty()) {
pClient->PutClient(":irc.znc.in 001 " + pClient->GetNick() +
" :- Welcome to ZNC -");
" :" + t_s("Welcome to ZNC"));
} else {
const CString& sClientNick = pClient->GetNick(false);
MCString msParams;
@@ -723,12 +726,13 @@ void CIRCNetwork::ClientConnected(CClient* pClient) {
// Tell them why they won't connect
if (!GetIRCConnectEnabled())
pClient->PutStatus(
"You are currently disconnected from IRC. "
"Use 'connect' to reconnect.");
t_s("You are currently disconnected from IRC. Use 'connect' to "
"reconnect."));
if (CDebug::Debug()) {
pClient->PutStatus("ZNC is presently running in DEBUG mode. Sensitive"
" data during your current session may be exposed to the host.");
pClient->PutStatus(
t_s("ZNC is presently running in DEBUG mode. Sensitive data during "
"your current session may be exposed to the host."));
}
}
@@ -758,7 +762,7 @@ std::vector<CClient*> CIRCNetwork::FindClients(
void CIRCNetwork::SetUser(CUser* pUser) {
for (CClient* pClient : m_vClients) {
pClient->PutStatus(
"This network is being deleted or moved to another user.");
t_s("This network is being deleted or moved to another user."));
pClient->SetNetwork(nullptr);
}
@@ -987,8 +991,8 @@ bool CIRCNetwork::JoinChan(CChan* pChan) {
if (m_pUser->JoinTries() != 0 &&
pChan->GetJoinTries() >= m_pUser->JoinTries()) {
PutStatus("The channel " + pChan->GetName() +
" could not be joined, disabling it.");
PutStatus(t_f("The channel {1} could not be joined, disabling it.")(
pChan->GetName()));
pChan->Disable();
} else {
pChan->IncJoinTries();
@@ -1116,7 +1120,7 @@ bool CIRCNetwork::DelServer(const CString& sName, unsigned short uPort,
if (pIRCSock) {
pIRCSock->Quit();
PutStatus("Your current server was removed, jumping...");
PutStatus(t_s("Your current server was removed, jumping..."));
}
} else if (!bSawCurrentServer) {
// Our current server comes after the server which we
@@ -1278,8 +1282,9 @@ bool CIRCNetwork::Connect() {
bool bSSL = pServer->IsSSL();
#ifndef HAVE_LIBSSL
if (bSSL) {
PutStatus("Cannot connect to [" + pServer->GetString(false) +
"], ZNC is not compiled with SSL.");
PutStatus(
t_f("Cannot connect to {1}, because ZNC is not compiled with SSL "
"support.")(pServer->GetString(false)));
CZNC::Get().AddNetworkToQueue(this);
return false;
}
@@ -1299,7 +1304,7 @@ bool CIRCNetwork::Connect() {
&bAbort);
if (bAbort) {
DEBUG("Some module aborted the connection attempt");
PutStatus("Some module aborted the connection attempt");
PutStatus(t_s("Some module aborted the connection attempt"));
delete pIRCSock;
CZNC::Get().AddNetworkToQueue(this);
return false;