[i18n] update strings and translation file

Signed-off-by: R4SAS <r4sas@i2pmail.org>

daemon/HTTPServer.cpp

@@ -150,7 +150,7 @@ namespace http {
 		else stateText = tr("unknown");
 
 		s << "<span class=\"tunnel " << state << "\"> " << stateText << ((explr) ? " (" + tr("exploratory") + ")" : "") << "</span>, ";
-		s << " " << tr(/* tr: Kibibit */ "%.2f KiB", (double) bytes / 1024) << "\r\n";
+		s << " " << tr(/* tr: Kibibyte */ "%.2f KiB", (double) bytes / 1024) << "\r\n";
 	}
 
 	static void SetLogLevel (const std::string& level)
@@ -290,13 +290,13 @@ namespace http {
 		s << "<b>" << tr("Tunnel creation success rate") << ":</b> " << i2p::tunnel::tunnels.GetTunnelCreationSuccessRate () << "%<br>\r\n";
 		s << "<b>" << tr("Received") << ":</b> ";
 		ShowTraffic (s, i2p::transport::transports.GetTotalReceivedBytes ());
-		s << " (" << tr(/* tr: Kibibit/s */ "%.2f KiB/s", (double) i2p::transport::transports.GetInBandwidth15s () / 1024) << ")<br>\r\n";
+		s << " (" << tr(/* tr: Kibibyte/s */ "%.2f KiB/s", (double) i2p::transport::transports.GetInBandwidth15s () / 1024) << ")<br>\r\n";
 		s << "<b>" << tr("Sent") << ":</b> ";
 		ShowTraffic (s, i2p::transport::transports.GetTotalSentBytes ());
-		s << " (" << tr(/* tr: Kibibit/s */ "%.2f KiB/s", (double) i2p::transport::transports.GetOutBandwidth15s () / 1024) << ")<br>\r\n";
+		s << " (" << tr(/* tr: Kibibyte/s */ "%.2f KiB/s", (double) i2p::transport::transports.GetOutBandwidth15s () / 1024) << ")<br>\r\n";
 		s << "<b>" << tr("Transit") << ":</b> ";
 		ShowTraffic (s, i2p::transport::transports.GetTotalTransitTransmittedBytes ());
-		s << " (" << tr(/* tr: Kibibit/s */ "%.2f KiB/s", (double) i2p::transport::transports.GetTransitBandwidth15s () / 1024) << ")<br>\r\n";
+		s << " (" << tr(/* tr: Kibibyte/s */ "%.2f KiB/s", (double) i2p::transport::transports.GetTransitBandwidth15s () / 1024) << ")<br>\r\n";
 		s << "<b>" << tr("Data path") << ":</b> " << i2p::fs::GetUTF8DataDir() << "<br>\r\n";
 		s << "<div class='slide'>";
 		if ((outputFormat == OutputFormatEnum::forWebConsole) || !includeHiddenContent) {
@@ -649,7 +649,7 @@ namespace http {
 		}
 		else if (!i2p::context.IsFloodfill ())
 		{
-			s << "<b>" << tr("LeaseSets") << ":</b> " << tr("not floodfill") << ".<br>\r\n";
+			s << "<b>" << tr("LeaseSets") << ":</b> " << tr(/* Message on LeaseSets page */ "floodfill mode is disabled") << ".<br>\r\n";
 		}
 		else
 		{
@@ -794,7 +794,7 @@ namespace http {
 		}
 		else
 		{
-			s << "<b>" << tr("Transit Tunnels") << ":</b> " << tr("no transit tunnels currently built") << ".<br>\r\n";
+			s << "<b>" << tr("Transit Tunnels") << ":</b> " << tr(/* Message on transit tunnels page */ "no transit tunnels currently built") << ".<br>\r\n";
 		}
 	}
 
@@ -891,7 +891,7 @@ namespace http {
 			s << "</div>\r\n";
 		}
 		else
-			s << "<b>" << tr("SAM sessions") << ":</b> " << tr("no sessions currently running") << ".<br>\r\n";
+			s << "<b>" << tr("SAM sessions") << ":</b> " << tr(/* Message on SAM sessions page */ "no sessions currently running") << ".<br>\r\n";
 	}
 
 	void ShowSAMSession (std::stringstream& s, const std::string& id)
@@ -1210,7 +1210,7 @@ namespace http {
 		url.parse_query(params);
 
 		std::string webroot; i2p::config::GetOption("http.webroot", webroot);
-		std::string redirect = "5; url=" + webroot + "?page=commands";
+		std::string redirect = COMMAND_REDIRECT_TIMEOUT + "; url=" + webroot + "?page=commands";
 		std::string token = params["token"];
 
 		if (token.empty () || m_Tokens.find (std::stoi (token)) == m_Tokens.end ())
@@ -1284,20 +1284,20 @@ namespace http {
 				s << "<b>" << tr("ERROR") << "</b>:&nbsp;" << tr("StreamID can't be null") << "<br>\r\n<br>\r\n";
 
 			s << "<a href=\"" << webroot << "?page=local_destination&b32=" << b32 << "\">" << tr("Return to destination page") << "</a><br>\r\n";
-			s << "<p>" << tr("You will be redirected in 5 seconds") << "</b>";
-			redirect = "5; url=" + webroot + "?page=local_destination&b32=" + b32;
+			s << "<p>" << tr("You will be redirected in %d seconds", COMMAND_REDIRECT_TIMEOUT) << "</b>";
+			redirect = COMMAND_REDIRECT_TIMEOUT + "; url=" + webroot + "?page=local_destination&b32=" + b32;
 			res.add_header("Refresh", redirect.c_str());
 			return;
 		}
 		else if (cmd == HTTP_COMMAND_LIMITTRANSIT)
 		{
 			uint32_t limit = std::stoul(params["limit"], nullptr);
-			if (limit > 0 && limit <= 65535)
+			if (limit > 0 && limit <= TRANSIT_TUNNELS_LIMIT)
 				SetMaxNumTransitTunnels (limit);
 			else {
-				s << "<b>" << tr("ERROR") << "</b>:&nbsp;" << tr("Transit tunnels count must not exceed 65535") << "\r\n<br>\r\n<br>\r\n";
+				s << "<b>" << tr("ERROR") << "</b>:&nbsp;" << tr("Transit tunnels count must not exceed %d", TRANSIT_TUNNELS_LIMIT) << "\r\n<br>\r\n<br>\r\n";
 				s << "<a href=\"" << webroot << "?page=commands\">" << tr("Back to commands list") << "</a>\r\n<br>\r\n";
-				s << "<p>" << tr("You will be redirected in 5 seconds") << "</b>";
+				s << "<p>" << tr("You will be redirected in %d seconds", COMMAND_REDIRECT_TIMEOUT) << "</b>";
 				res.add_header("Refresh", redirect.c_str());
 				return;
 			}
@@ -1372,7 +1372,7 @@ namespace http {
 
 		s << "<b>" << tr("SUCCESS") << "</b>:&nbsp;" << tr("Command accepted") << "<br><br>\r\n";
 		s << "<a href=\"" << webroot << "?page=commands\">" << tr("Back to commands list") << "</a><br>\r\n";
-		s << "<p>" << tr("You will be redirected in 5 seconds") << "</b>";
+		s << "<p>" << tr("You will be redirected in %d seconds", COMMAND_REDIRECT_TIMEOUT) << "</b>";
 		res.add_header("Refresh", redirect.c_str());
 	}
 

daemon/HTTPServer.h

@@ -24,6 +24,8 @@ namespace http
 {
 	const size_t HTTP_CONNECTION_BUFFER_SIZE = 8192;
 	const int TOKEN_EXPIRATION_TIMEOUT = 30; // in seconds
+	const int COMMAND_REDIRECT_TIMEOUT = 5; // in seconds
+	const int TRANSIT_TUNNELS_LIMIT = 65535;
 
 	class HTTPConnection: public std::enable_shared_from_this<HTTPConnection>
 	{

libi2pd_client/HTTPProxy.cpp

@@ -321,7 +321,7 @@ namespace proxy {
 			if (!m_Addresshelper)
 			{
 				LogPrint(eLogWarning, "HTTPProxy: Addresshelper request rejected");
-				GenericProxyError(tr("Invalid request"), tr("addresshelper is not supported"));
+				GenericProxyError(tr("Invalid request"), tr("Addresshelper is not supported"));
 				return true;
 			}
 
@@ -341,28 +341,22 @@ namespace proxy {
 				}
 				if (m_RequestURL.host != referer_url.host)
 				{
-					// Attempt to forced overwriting by link with "&update=true" from harmful URL
-					if (m_Confirm)
+					if (m_Confirm) // Attempt to forced overwriting by link with "&update=true" from harmful URL
 					{
 						LogPrint (eLogWarning, "HTTPProxy: Address update from addresshelper rejected for ", m_RequestURL.host, " (referer is ", m_RequestURL.host.empty() ? "empty" : "harmful", ")");
 						std::string full_url = m_RequestURL.to_string();
 						std::stringstream ss;
-						ss << tr("Host") << " " << m_RequestURL.host << " <font color=red>" << tr("already in router's addressbook") << "</font>. ";
-						ss << "<b>" << tr( /* Trying to overwrite an existing domain in the address book by direct link with "&update=true" is seems like an attack */ "Be careful: source of this URL may be harmful") << "!</b> ";
-						ss << tr(/* tr: The "record" means addressbook's record. That message appears when domain was already added to addressbook, but helper link is opened for it. */ "Click here to update record:" );
-						ss << " <a href=\"" << full_url << (full_url.find('?') != std::string::npos ? "&i2paddresshelper=" : "?i2paddresshelper=");
-						ss << jump << "&update=true\">" << tr("Continue") << "</a>.";
+						ss << tr("Host %s is <font color=red>already in router's addressbook</font>. <b>Be careful: source of this URL may be harmful!</b> Click here to update record: <a href=\"%s%s%s&update=true\">Continue</a>.",
+							m_RequestURL.host, full_url, (full_url.find('?') != std::string::npos ? "&i2paddresshelper=" : "?i2paddresshelper="), jump);
 						GenericProxyInfo(tr("Addresshelper forced update rejected"), ss.str());
 					}
-					// Preventing unauthorized additions to the address book
-					else
+					else // Preventing unauthorized additions to the address book
 					{
 						LogPrint (eLogDebug, "HTTPProxy: Adding address from addresshelper for ", m_RequestURL.host, " (generate refer-base page)");
 						std::string full_url = m_RequestURL.to_string();
 						std::stringstream ss;
-						ss << tr("To add host" /*... in router's addressbook, click here */ ) << " <b>" << m_RequestURL.host << "</b> " << tr( /* To add host SOMESHORT.i2p ... */ "in router's addressbook, click here") << ":";
-						ss << " <a href=\"" << full_url << (full_url.find('?') != std::string::npos ? "&i2paddresshelper=" : "?i2paddresshelper=");
-						ss << jump << "\">" << tr("Continue") << "</a>.";
+						ss << tr("To add host <b>%s</b> in router's addressbook, click here: <a href=\"%s%s%s\">Continue</a>.",
+							m_RequestURL.host, full_url, (full_url.find('?') != std::string::npos ? "&i2paddresshelper=" : "?i2paddresshelper="), jump);
 						GenericProxyInfo(tr("Addresshelper request"), ss.str());
 					}
 					return true; /* request processed */
@@ -372,8 +366,7 @@ namespace proxy {
 				LogPrint (eLogInfo, "HTTPProxy: Added address from addresshelper for ", m_RequestURL.host);
 				std::string full_url = m_RequestURL.to_string();
 				std::stringstream ss;
-				ss << tr("Host") <<" " << m_RequestURL.host << " " << tr("added to router's addressbook from helper") << ". ";
-				ss << tr("Click here to proceed:") << " <a href=\"" << full_url << "\">" << tr("Continue") << "</a>.";
+				ss << tr("Host %s added to router's addressbook from helper. Click here to proceed: <a href=\"%s\">Continue</a>.", m_RequestURL.host, full_url);
 				GenericProxyInfo(tr("Addresshelper adding"), ss.str());
 				return true; /* request processed */
 			}
@@ -381,10 +374,8 @@ namespace proxy {
 			{
 				std::string full_url = m_RequestURL.to_string();
 				std::stringstream ss;
-				ss << tr("Host") << " " << m_RequestURL.host << " <font color=red>" << tr("already in router's addressbook") << "</font>. ";
-				ss << tr(/* tr: The "record" means addressbook's record. That message appears when domain was already added to addressbook, but helper link is opened for it. */ "Click here to update record:" );
-				ss << " <a href=\"" << full_url << (full_url.find('?') != std::string::npos ? "&i2paddresshelper=" : "?i2paddresshelper=");
-				ss << jump << "&update=true\">" << tr("Continue") << "</a>.";
+				ss << tr("Host %s is <font color=red>already in router's addressbook</font>. Click here to update record: <a href=\"%s%s%s&update=true\">Continue</a>.",
+					m_RequestURL.host, full_url, (full_url.find('?') != std::string::npos ? "&i2paddresshelper=" : "?i2paddresshelper="), jump);
 				GenericProxyInfo(tr("Addresshelper update"), ss.str());
 				return true; /* request processed */
 			}
@@ -398,7 +389,7 @@ namespace proxy {
 			auto pos = uri.find(":");
 			if(pos == std::string::npos || pos == uri.size() - 1)
 			{
-				GenericProxyError(tr("Invalid request"), tr("invalid request uri"));
+				GenericProxyError(tr("Invalid request"), tr("Invalid request URI"));
 				return true;
 			}
 			else
@@ -458,10 +449,10 @@ namespace proxy {
 				if(m_ProxyURL.parse(m_OutproxyUrl))
 					ForwardToUpstreamProxy();
 				else
-					GenericProxyError(tr("Outproxy failure"), tr("bad outproxy settings"));
+					GenericProxyError(tr("Outproxy failure"), tr("Bad outproxy settings"));
 			} else {
 				LogPrint (eLogWarning, "HTTPProxy: Outproxy failure for ", dest_host, ": no outproxy enabled");
-				std::stringstream ss; ss << tr("Host") << " " << dest_host << " " << tr("not inside I2P network, but outproxy is not enabled");
+				std::stringstream ss; ss << tr("Host %s is not inside I2P network, but outproxy is not enabled", dest_host);
 				GenericProxyError(tr("Outproxy failure"), ss.str());
 			}
 			return true;
@@ -550,13 +541,13 @@ namespace proxy {
 		else
 		{
 			/* unknown type, complain */
-			GenericProxyError(tr("unknown outproxy url"), m_ProxyURL.to_string());
+			GenericProxyError(tr("Unknown outproxy URL"), m_ProxyURL.to_string());
 		}
 	}
 
 	void HTTPReqHandler::HandleUpstreamProxyResolved(const boost::system::error_code & ec, boost::asio::ip::tcp::resolver::iterator it, ProxyResolvedHandler handler)
 	{
-		if(ec) GenericProxyError(tr("cannot resolve upstream proxy"), ec.message());
+		if(ec) GenericProxyError(tr("Cannot resolve upstream proxy"), ec.message());
 		else handler(*it);
 	}
 
@@ -564,7 +555,7 @@ namespace proxy {
 	{
 		if(!ec) {
 			if(m_RequestURL.host.size() > 255) {
-				GenericProxyError(tr("hostname too long"), m_RequestURL.host);
+				GenericProxyError(tr("Hostname is too long"), m_RequestURL.host);
 				return;
 			}
 			uint16_t port = m_RequestURL.port;
@@ -591,13 +582,13 @@ namespace proxy {
 			reqsize += host.size();
 			m_socks_buf[++reqsize] = 0;
 			boost::asio::async_write(*m_proxysock, boost::asio::buffer(m_socks_buf, reqsize), boost::asio::transfer_all(), std::bind(&HTTPReqHandler::HandleSocksProxySendHandshake, this, std::placeholders::_1, std::placeholders::_2));
-		} else GenericProxyError(tr("cannot connect to upstream socks proxy"), ec.message());
+		} else GenericProxyError(tr("Cannot connect to upstream SOCKS proxy"), ec.message());
 	}
 
 	void HTTPReqHandler::HandleSocksProxySendHandshake(const boost::system::error_code & ec, std::size_t bytes_transferred)
 	{
 		LogPrint(eLogDebug, "HTTPProxy: Upstream SOCKS handshake sent");
-		if(ec) GenericProxyError(tr("Cannot negotiate with socks proxy"), ec.message());
+		if(ec) GenericProxyError(tr("Cannot negotiate with SOCKS proxy"), ec.message());
 		else m_proxysock->async_read_some(boost::asio::buffer(m_socks_buf, 8), std::bind(&HTTPReqHandler::HandleSocksProxyReply, this, std::placeholders::_1, std::placeholders::_2));
 	}
 
@@ -639,7 +630,7 @@ namespace proxy {
 		}
 		else
 		{
-			GenericProxyError(tr("CONNECT error"), tr("Failed to Connect"));
+			GenericProxyError(tr("CONNECT error"), tr("Failed to connect"));
 		}
 	}
 
@@ -650,7 +641,7 @@ namespace proxy {
 			m_send_buf = m_ClientResponse.to_string();
 			boost::asio::async_write(*m_sock, boost::asio::buffer(m_send_buf), boost::asio::transfer_all(), [&] (const boost::system::error_code & ec, std::size_t transferred)
 				{
-					if(ec) GenericProxyError(tr("socks proxy error"), ec.message());
+					if(ec) GenericProxyError(tr("SOCKS proxy error"), ec.message());
 					else HandoverToUpstreamProxy();
 				});
 		} else {
@@ -658,7 +649,7 @@ namespace proxy {
 			LogPrint(eLogDebug, "HTTPProxy: Send ", m_send_buf.size(), " bytes");
 			boost::asio::async_write(*m_proxysock, boost::asio::buffer(m_send_buf), boost::asio::transfer_all(), [&](const boost::system::error_code & ec, std::size_t transferred)
 				{
-					if(ec) GenericProxyError(tr("failed to send request to upstream"), ec.message());
+					if(ec) GenericProxyError(tr("Failed to send request to upstream"), ec.message());
 					else HandoverToUpstreamProxy();
 				});
 		}
@@ -676,18 +667,18 @@ namespace proxy {
 				ss << "error code: ";
 				ss << (int) m_socks_buf[1];
 				std::string msg = ss.str();
-				GenericProxyError(tr("socks proxy error"), msg);
+				GenericProxyError(tr("SOCKS proxy error"), msg);
 			}
 		}
-		else GenericProxyError(tr("No Reply From socks proxy"), ec.message());
+		else GenericProxyError(tr("No reply from SOCKS proxy"), ec.message());
 	}
 
 	void HTTPReqHandler::HandleUpstreamHTTPProxyConnect(const boost::system::error_code & ec)
 	{
 		if(!ec) {
 			LogPrint(eLogDebug, "HTTPProxy: Connected to http upstream");
-			GenericProxyError(tr("cannot connect"), tr("http out proxy not implemented"));
-		} else GenericProxyError(tr("cannot connect to upstream http proxy"), ec.message());
+			GenericProxyError(tr("Cannot connect"), tr("HTTP out proxy not implemented"));
+		} else GenericProxyError(tr("Cannot connect to upstream HTTP proxy"), ec.message());
 	}
 
 	/* will be called after some data received from client */