removed some unneeded translations

git-svn-id: http://svn.miranda-ng.org/main/trunk@8257 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 20 insertions, 33 deletions

diff --git a/plugins/CmdLine/MimCmd/src/commands.cpp b/plugins/CmdLine/MimCmd/src/commands.cpp
index f562e8948b..eba3893763 100644
--- a/plugins/CmdLine/MimCmd/src/commands.cpp
+++ b/plugins/CmdLine/MimCmd/src/commands.cpp
@@ -139,8 +139,7 @@ void HandleHelpCommand(PCommand helpCommand, char *argv[], int argc, PReply repl
 		reply->code = MIMRES_SUCCESS;

 		STRNCPY(reply->message, Translate("Available commands: "), size);

 		

-		int i;

-		for (i = 0; i < cKnownCommands - 1; i++)

+		for (int i = 0; i < cKnownCommands - 1; i++)

 		{

 			strncat(reply->message, knownCommands[i].command, size);

 			strncat(reply->message, ", ", size);

@@ -173,8 +172,7 @@ PReply ParseCommand(char *argv[], int argc)
 

 void FillSharedDataStruct(PCommand command, char *arguments[], int count)

 {

-	int i;

-	for (i = 0; i < count; i++)

+	for (int i = 0; i < count; i++)

 	{

 		STRNCPY(sdCmdLine->arguments[i], arguments[i], ARGUMENT_SIZE);

 	}

diff --git a/plugins/CmdLine/src/hooked_events.cpp b/plugins/CmdLine/src/hooked_events.cpp
index 6ccac9080a..3226b659b4 100644
--- a/plugins/CmdLine/src/hooked_events.cpp
+++ b/plugins/CmdLine/src/hooked_events.cpp
@@ -66,8 +66,7 @@ int OnShutdown(WPARAM wParam, LPARAM lParam)
 

 int QueueAck(ACKDATA *ack)

 {

-	int i;

-	for (i = cAcks - 1; i > 0; i--)

+	for (int i = cAcks - 1; i > 0; i--)

 	{

 		acks[i] = acks[i - 1];

 	}

@@ -86,8 +85,7 @@ int ClearAckQueue()
 

 ACKDATA *GetAck(HANDLE hProcess)

 {

-	int i;

-	for (i = 0; i < cAcks; i++)

+	for (int i = 0; i < cAcks; i++)

 	{

 		if (acks[i].hProcess == hProcess)

 		{

diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp
index 866c319b88..5b4eb32537 100644
--- a/plugins/CmdLine/src/mimcmd_handlers.cpp
+++ b/plugins/CmdLine/src/mimcmd_handlers.cpp
@@ -1355,7 +1355,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r
 							if (ParseDatabaseData(&var, buffer, sizeof(buffer), TRUE))

 							{

 								reply->code = MIMRES_SUCCESS;

-								mir_snprintf(reply->message, reply->cMessage, Translate("'%s/%s' - %s."), module, key, buffer); 

+								mir_snprintf(reply->message, reply->cMessage, "'%s/%s' - %s.", module, key, buffer); 

 							}

 							else{

 								reply->code = MIMRES_FAILURE;

@@ -1397,23 +1397,17 @@ int ParseProxyType(char *type)
 	{

 		proxy = PROXY_SOCKS4;

 	}

-	else{

-		if (strcmp(lower, "socks5") == 0)

-		{

-			proxy = PROXY_SOCKS5;

-		}

-		else{

-			if (strcmp(lower, "http") == 0)

-			{

-				proxy = PROXY_HTTP;

-			}

-			else{

-				if (strcmp(lower, "https") == 0)

-				{

-					proxy = PROXY_HTTPS;

-				}

-			}

-		}

+	else if (strcmp(lower, "socks5") == 0)

+	{

+		proxy = PROXY_SOCKS5;

+	}

+	else if (strcmp(lower, "http") == 0)

+	{

+		proxy = PROXY_HTTP;

+	}

+	else if (strcmp(lower, "https") == 0)

+	{

+		proxy = PROXY_HTTPS;

 	}

 	

 	return proxy;	

@@ -1554,11 +1548,9 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe
 			{

 				case 4:

 				{

-					char host[256];

-					int port;

-					char type[256];

+					char host[256], type[256];

 					GetStringFromDatabase(NULL, module, "NLProxyServer", "<unknown>", host, sizeof(host));

-					port = db_get_w(NULL, module, "NLProxyPort", 0);

+					int port = db_get_w(NULL, module, "NLProxyPort", 0);

 					PrettyProxyType(db_get_b(NULL, module, "NLProxyType", 0), type, sizeof(type));

 					

 					reply->code = MIMRES_SUCCESS;

@@ -1760,8 +1752,7 @@ DWORD WINAPI OpenMessageWindowThread(void *data)
 	MCONTACT hContact = (MCONTACT) data;

 	if (hContact)

 	{

-		CallServiceSync(MS_MSG_SENDMESSAGE, hContact, 0);

-		CallServiceSync("SRMsg/LaunchMessageWindow", hContact, 0);

+		CallServiceSync(MS_MSG_SENDMESSAGET, hContact, 0);

 	}

 	

 	return 0;

@@ -2149,7 +2140,7 @@ void HandleIgnoreCommand(PCommand command, TArgument *argv, int argc, PReply rep
 

 			if (hContact)

 			{

-				CallService(block ? MS_IGNORE_IGNORE : MS_IGNORE_UNIGNORE, hContact, IGNOREEVENT_ALL);

+				CallService(block ? MS_IGNORE_IGNORE : MS_IGNORE_UNIGNORE, (WPARAM) hContact, IGNOREEVENT_ALL);

 			}

 		}