Fixes #2997

15 files changed, 15 insertions, 15 deletions

diff --git a/protocols/CurrencyRates/src/HTTPSession.cpp b/protocols/CurrencyRates/src/HTTPSession.cpp
index 3c20328623..74f3a32e25 100644
--- a/protocols/CurrencyRates/src/HTTPSession.cpp
+++ b/protocols/CurrencyRates/src/HTTPSession.cpp
@@ -82,7 +82,7 @@ bool CHTTPSession::Init()
 	NETLIBUSER nlu = {};
 	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE;
 	nlu.szSettingsModule = MODULENAME;
-	nlu.szDescriptiveName.w = TranslateT("CurrencyRates HTTP connections");
+	nlu.szDescriptiveName.w = TranslateT("CurrencyRates");
 	g_hNetLib = Netlib_RegisterUser(&nlu);
 	return (nullptr != g_hNetLib);
 }
diff --git a/protocols/Facebook/src/proto.cpp b/protocols/Facebook/src/proto.cpp
index 0cadfa02f6..b6e841a703 100644
--- a/protocols/Facebook/src/proto.cpp
+++ b/protocols/Facebook/src/proto.cpp
@@ -89,7 +89,7 @@ FacebookProto::FacebookProto(const char *proto_name, const wchar_t *username) :
 
 	// Create standard network connection
 	wchar_t descr[512];
-	mir_snwprintf(descr, TranslateT("%s server connection"), m_tszUserName);
+	mir_snwprintf(descr, TranslateT("%s (server)"), m_tszUserName);
 
 	NETLIBUSER nlu = {};
 	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;
diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index 09e03f38a6..3858be5c8e 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -41,7 +41,7 @@ GaduProto::GaduProto(const char *pszProtoName, const wchar_t *tszUserName) :
 

 	// Register m_hNetlibUser user

 	wchar_t name[128];

-	mir_snwprintf(name, TranslateT("%s connection"), m_tszUserName);

+	mir_snwprintf(name, TranslateT("%s"), m_tszUserName);

 

 	NETLIBUSER nlu = {};

 	nlu.flags = NUF_UNICODE | NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS;

diff --git a/protocols/GmailNotifier/src/main.cpp b/protocols/GmailNotifier/src/main.cpp
index 42158bd826..0efc236c6d 100644
--- a/protocols/GmailNotifier/src/main.cpp
+++ b/protocols/GmailNotifier/src/main.cpp
@@ -91,7 +91,7 @@ int CMPlugin::Load()
 	NETLIBUSER nlu = {};
 	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE;
 	nlu.szSettingsModule = MODULENAME;
-	nlu.szDescriptiveName.w = TranslateT("Gmail Notifier connection");
+	nlu.szDescriptiveName.w = TranslateT("Gmail Notifier");
 	hNetlibUser = Netlib_RegisterUser(&nlu);
 
 	CreateProtoServiceFunction(MODULENAME, PS_GETCAPS, GetCaps);
diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp
index 67e5c4f394..7098cd8492 100644
--- a/protocols/ICQ-WIM/src/proto.cpp
+++ b/protocols/ICQ-WIM/src/proto.cpp
@@ -89,7 +89,7 @@ CIcqProto::CIcqProto(const char *aProtoName, const wchar_t *aUserName) :
 	Chat_Register(&gcr);
 
 	// netlib handle
-	CMStringW descr(FORMAT, TranslateT("%s server connection"), m_tszUserName);
+	CMStringW descr(FORMAT, TranslateT("%s (server)"), m_tszUserName);
 
 	NETLIBUSER nlu = {};
 	nlu.szSettingsModule = m_szModuleName;
diff --git a/protocols/ICQCorp/src/corp.cpp b/protocols/ICQCorp/src/corp.cpp
index aa7a241ec0..f848fb257c 100644
--- a/protocols/ICQCorp/src/corp.cpp
+++ b/protocols/ICQCorp/src/corp.cpp
@@ -61,7 +61,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC
 

 int CMPlugin::Load()

 {

-	CMStringA szDescr(FORMAT, "%s connection", protoName);

+	CMStringA szDescr(FORMAT, "%s", protoName);

 	NETLIBUSER nlu = {};

 	nlu.flags = NUF_INCOMING | NUF_OUTGOING;

 	nlu.szSettingsModule = protoName;

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 365b3eeb51..d2644eec4c 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -168,7 +168,7 @@ CIrcProto::~CIrcProto()
 void CIrcProto::OnModulesLoaded()

 {

 	wchar_t name[128];

-	mir_snwprintf(name, TranslateT("%s server connection"), m_tszUserName);

+	mir_snwprintf(name, TranslateT("%s (server)"), m_tszUserName);

 

 	db_unset(0, m_szModuleName, "JTemp");

 

diff --git a/protocols/MinecraftDynmap/src/proto.cpp b/protocols/MinecraftDynmap/src/proto.cpp
index 8e62e2e0a3..0ca0852bbe 100644
--- a/protocols/MinecraftDynmap/src/proto.cpp
+++ b/protocols/MinecraftDynmap/src/proto.cpp
@@ -42,7 +42,7 @@ MinecraftDynmapProto::MinecraftDynmapProto(const char* proto_name, const wchar_t
 
 	// Create standard network connection
 	wchar_t descr[512];
-	mir_snwprintf(descr, TranslateT("%s server connection"), m_tszUserName);
+	mir_snwprintf(descr, TranslateT("%s (server)"), m_tszUserName);
 
 	NETLIBUSER nlu = {};
 	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;
diff --git a/protocols/NewsAggregator/Src/Utils.cpp b/protocols/NewsAggregator/Src/Utils.cpp
index 1a78f35be2..f5a0bf17cf 100644
--- a/protocols/NewsAggregator/Src/Utils.cpp
+++ b/protocols/NewsAggregator/Src/Utils.cpp
@@ -33,7 +33,7 @@ void NetlibInit()
 {
 	NETLIBUSER nlu = {};
 	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_UNICODE;
-	nlu.szDescriptiveName.w = TranslateT("NewsAggregator HTTP connections");
+	nlu.szDescriptiveName.w = TranslateT("NewsAggregator");
 	nlu.szSettingsModule = MODULENAME;
 	hNetlibUser = Netlib_RegisterUser(&nlu);
 }
diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp
index a8c17d19d5..7a446f36b8 100644
--- a/protocols/Omegle/src/proto.cpp
+++ b/protocols/Omegle/src/proto.cpp
@@ -46,7 +46,7 @@ OmegleProto::OmegleProto(const char* proto_name, const wchar_t* username) :
 	NETLIBUSER nlu = {};

 	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;

 	nlu.szSettingsModule = m_szModuleName;

-	mir_snwprintf(descr, TranslateT("%s server connection"), m_tszUserName);

+	mir_snwprintf(descr, TranslateT("%s (server)"), m_tszUserName);

 	nlu.szDescriptiveName.w = descr;

 	m_hNetlibUser = Netlib_RegisterUser(&nlu);

 	if (m_hNetlibUser == nullptr) {

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 0b6357714a..4bfdd34c87 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -60,7 +60,7 @@ CTwitterProto::CTwitterProto(const char *proto_name, const wchar_t *username) :
 	nlu.szSettingsModule = m_szModuleName;

 

 	// Create standard network connection

-	mir_snwprintf(descr, TranslateT("%s server connection"), m_tszUserName);

+	mir_snwprintf(descr, TranslateT("%s (server)"), m_tszUserName);

 	nlu.szDescriptiveName.w = descr;

 	m_hNetlibUser = Netlib_RegisterUser(&nlu);

 	if (m_hNetlibUser == nullptr) {

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index fcbcaf59a5..38e632c88e 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -56,7 +56,7 @@ CVkProto::CVkProto(const char *szModuleName, const wchar_t *pwszUserName) :
 	HookProtoEvent(ME_OPT_INITIALISE, &CVkProto::OnOptionsInit);

 

 	wchar_t descr[512];

-	mir_snwprintf(descr, TranslateT("%s server connection"), m_tszUserName);

+	mir_snwprintf(descr, TranslateT("%s (server)"), m_tszUserName);

 

 	NETLIBUSER nlu = {};

 	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;

diff --git a/protocols/Weather/src/weather_http.cpp b/protocols/Weather/src/weather_http.cpp
index 2f09c46acc..f0bf2ccc81 100644
--- a/protocols/Weather/src/weather_http.cpp
+++ b/protocols/Weather/src/weather_http.cpp
@@ -139,6 +139,6 @@ void NetlibInit(void)
 	NETLIBUSER nlu = {};
 	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_NOHTTPSOPTION | NUF_UNICODE;
 	nlu.szSettingsModule = MODULENAME;
-	nlu.szDescriptiveName.w = TranslateT("Weather HTTP connections");
+	nlu.szDescriptiveName.w = TranslateT("Weather");
 	hNetlibUser = Netlib_RegisterUser(&nlu);
 }
diff --git a/protocols/WhatsAppWeb/src/main.cpp b/protocols/WhatsAppWeb/src/main.cpp
index 6affe3fcde..6dc159f077 100644
--- a/protocols/WhatsAppWeb/src/main.cpp
+++ b/protocols/WhatsAppWeb/src/main.cpp
@@ -82,7 +82,7 @@ int CMPlugin::Load()
 	NETLIBUSER nlu = {};
 	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;
 	nlu.szSettingsModule = "WhatsApp";
-	nlu.szDescriptiveName.w = TranslateT("WhatsApp HTTP connection");
+	nlu.szDescriptiveName.w = TranslateT("WhatsApp HTTP connections");
 	hAvatarUser = Netlib_RegisterUser(&nlu);
 
 	//////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/WhatsAppWeb/src/proto.cpp b/protocols/WhatsAppWeb/src/proto.cpp
index 6d45aac7b3..734d1f2ce9 100644
--- a/protocols/WhatsAppWeb/src/proto.cpp
+++ b/protocols/WhatsAppWeb/src/proto.cpp
@@ -65,7 +65,7 @@ WhatsAppProto::WhatsAppProto(const char *proto_name, const wchar_t *username) :
 
 	// Create standard network connection
 	wchar_t descr[512];
-	mir_snwprintf(descr, TranslateT("%s server connection"), m_tszUserName);
+	mir_snwprintf(descr, TranslateT("%s (server)"), m_tszUserName);
 
 	NETLIBUSER nlu = {};
 	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;