translation improvements

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

11 files changed, 26 insertions, 26 deletions

diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index c300136881..f7f8affed1 100644
--- a/protocols/JabberG/src/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
@@ -398,7 +398,7 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc(HWND hwndDlg, UINT msg, WPARA
 				dat->proto->AdHoc_RequestListOfCommands(pStartupParams->m_szJid, hwndDlg);

 

 				TCHAR Caption[512];

-				mir_sntprintf(Caption, SIZEOF(Caption), _T("%s %s"), TranslateT("Jabber Ad-Hoc commands at"), dat->ResponderJID);

+				mir_sntprintf(Caption, SIZEOF(Caption), TranslateT("Jabber Ad-Hoc commands at %s"), dat->ResponderJID);

 				SetWindowText(hwndDlg, Caption);

 			}

 			else

@@ -414,7 +414,7 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc(HWND hwndDlg, UINT msg, WPARA
 				SetDlgItemText(hwndDlg, IDC_SUBMIT, TranslateT("OK"));

 

 				TCHAR Caption[512];

-				mir_sntprintf(Caption, SIZEOF(Caption), _T("%s %s"), TranslateT("Sending Ad-Hoc command to"), dat->ResponderJID);

+				mir_sntprintf(Caption, SIZEOF(Caption), TranslateT("Sending Ad-Hoc command to %s"), dat->ResponderJID);

 				SetWindowText(hwndDlg, Caption);

 			}

 

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 9b65682856..fddece3ed7 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -203,7 +203,7 @@ void CJabberProto::GcLogShowInformation(JABBER_LIST_ITEM *item, JABBER_RESOURCE_
 	switch (type) {

 	case INFO_BAN:

 		if (m_options.GcLogBans)

-			mir_sntprintf(buf, SIZEOF(buf), TranslateT("User %s in now banned."), user->resourceName);

+			mir_sntprintf(buf, SIZEOF(buf), TranslateT("User %s is now banned."), user->resourceName);

 		break;

 

 	case INFO_STATUS:

@@ -749,7 +749,7 @@ public:
 		CSuper::OnInitDialog();

 

 		TCHAR buf[256];

-		mir_sntprintf(buf, SIZEOF(buf), _T("%s\n%s"), m_room, TranslateT("Send groupchat invitation."));

+		mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s\nSend groupchat invitation."), m_room);

 		SetDlgItemText(m_hwnd, IDC_HEADERBAR, buf);

 		WindowSetIcon(m_hwnd, m_proto, "group");

 

@@ -787,7 +787,7 @@ public:
 		CLCINFOITEM cii = {0};

 		cii.cbSize = sizeof(cii);

 		cii.flags = CLCIIF_CHECKBOX;

-		mir_sntprintf(buf, SIZEOF(buf), _T("%s (%s)"), jidData->jid, TranslateT("not on roster"));

+		mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s (not on roster)"), jidData->jid);

 		cii.pszText = buf;

 		jidData->hItem = SendDlgItemMessage(m_hwnd,IDC_CLIST,CLM_ADDINFOITEM,0,(LPARAM)&cii);

 		SendDlgItemMessage(m_hwnd, IDC_CLIST, CLM_SETCHECKMARK, jidData->hItem, 1);

@@ -888,10 +888,10 @@ static INT_PTR CALLBACK sttUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 

 			SendDlgItemMessage(hwndDlg, IDC_ICO_STATUS, STM_SETICON, (WPARAM)LoadSkinnedProtoIcon(dat->ppro->m_szModuleName, dat->him->status), 0);

 

-			mir_sntprintf(buf, SIZEOF(buf), _T("%s %s"), TranslateT("Member Info:"), dat->him->resourceName);

+			mir_sntprintf(buf, SIZEOF(buf), TranslateT("Member Info: %s"), dat->him->resourceName);

 			SetWindowText(hwndDlg, buf);

 

-			mir_sntprintf(buf, SIZEOF(buf), _T("%s\n%s %s %s"), TranslateT("Member Information"), dat->him->resourceName, TranslateT("from"), dat->item->jid);

+			mir_sntprintf(buf, SIZEOF(buf), TranslateT("Member Information\n%s from %s"), dat->him->resourceName, dat->item->jid);

 			SetDlgItemText(hwndDlg, IDC_HEADERBAR, buf);

 

 			SetDlgItemText(hwndDlg, IDC_TXT_NICK, dat->him->resourceName);

@@ -1102,7 +1102,7 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 		if ((GetTickCount() - dwLastBanKickTime) > BAN_KICK_INTERVAL) {

 			dwLastBanKickTime = GetTickCount();

 			mir_sntprintf(szBuffer, SIZEOF(szBuffer), _T("%s: "), me->resourceName);

-			mir_sntprintf(szTitle, SIZEOF(szTitle), _T("%s %s"), TranslateT("Reason to kick"), him->resourceName);

+			mir_sntprintf(szTitle, SIZEOF(szTitle), TranslateT("Reason to kick %s"), him->resourceName);

 			TCHAR *resourceName_copy = mir_tstrdup(him->resourceName); // copy resource name to prevent possible crash if user list rebuilds

 			if (ppro->EnterString(szBuffer, SIZEOF(szBuffer), szTitle, JES_MULTINE, "gcReason_"))

 				ppro->m_ThreadInfo->send(

@@ -1181,7 +1181,7 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 				JabberStripJid(him->szRealJid, szVictimBareJid, SIZEOF(szVictimBareJid));

 

 				mir_sntprintf(szBuffer, SIZEOF(szBuffer), _T("%s: "), me->resourceName);

-				mir_sntprintf(szTitle, SIZEOF(szTitle), _T("%s %s"), TranslateT("Reason to ban"), him->resourceName);

+				mir_sntprintf(szTitle, SIZEOF(szTitle), TranslateT("Reason to ban %s"), him->resourceName);

 

 				if (ppro->EnterString(szBuffer, SIZEOF(szBuffer), szTitle, JES_MULTINE, "gcReason_")) {

 					ppro->m_ThreadInfo->send(

@@ -1310,7 +1310,7 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* g
 		break;

 

 	case IDM_TOPIC:

-		mir_sntprintf(szCaption, SIZEOF(szCaption), _T("%s %s"), TranslateT("Set topic for"), gch->pDest->ptszID);

+		mir_sntprintf(szCaption, SIZEOF(szCaption), TranslateT("Set topic for %s"), gch->pDest->ptszID);

 		{	

 			size_t cbLen = 2048 + lstrlen(item->itemResource.statusMessage)*2;

 			ptrT ptszBuf((TCHAR*)mir_alloc( sizeof(TCHAR) * cbLen));

@@ -1338,7 +1338,7 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* g
 		break;

 

 	case IDM_NICK:

-		mir_sntprintf(szCaption, SIZEOF(szCaption), _T("%s %s"), TranslateT("Change nickname in"), gch->pDest->ptszID);

+		mir_sntprintf(szCaption, SIZEOF(szCaption), TranslateT("Change nickname in %s"), gch->pDest->ptszID);

 		if (item->nick)

 			mir_sntprintf(szBuffer, SIZEOF(szBuffer), _T("%s"), item->nick);

 		if (ppro->EnterString(szBuffer, SIZEOF(szBuffer), szCaption, JES_COMBO, "gcNick_")) {

@@ -1382,7 +1382,7 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* g
 		break;

 	}

 	case IDM_DESTROY:

-		mir_sntprintf(szBuffer, SIZEOF(szBuffer), _T("%s %s"), TranslateT("Reason to destroy"), gch->pDest->ptszID);

+		mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("Reason to destroy %s"), gch->pDest->ptszID);

 		if ( !ppro->EnterString(szBuffer, SIZEOF(szBuffer), NULL, JES_MULTINE, "gcReason_"))

 			break;

 

diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 9a7efeed41..4e5da67049 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -830,7 +830,7 @@ static VOID CALLBACK JabberGroupchatChangeNickname(void* arg)
 		szBuffer[ 0 ] = _T('\0');

 

 		TCHAR *roomName = item->name ? item->name : item->jid;

-		mir_sntprintf(szCaption, SIZEOF(szCaption), _T("%s <%s>"), TranslateT("Change nickname in"), roomName);

+		mir_sntprintf(szCaption, SIZEOF(szCaption), TranslateT("Change nickname in <%s>"), roomName);

 		if (item->nick)

 			mir_sntprintf(szBuffer, SIZEOF(szBuffer), _T("%s"), item->nick);

 

@@ -1254,7 +1254,7 @@ public:
 		CSuper::OnInitDialog();

 

 		TCHAR buf[256];

-		mir_sntprintf(buf, SIZEOF(buf), _T("%s\n%s"), m_info->roomJid, TranslateT("Incoming groupchat invitation."));

+		mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s\nIncoming groupchat invitation."), m_info->roomJid);

 		SetDlgItemText(m_hwnd, IDC_HEADERBAR, buf);

 

 		SetDlgItemText(m_hwnd, IDC_FROM, m_info->from);

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index db937bee8c..17c070d9fd 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -260,7 +260,7 @@ void CJabberProto::OnIqResultGetAuth(HXML iqNode)
  		m_ThreadInfo->send("</stream:stream>");

 

 		TCHAR text[128];

-		mir_sntprintf(text, SIZEOF(text), _T("%s %s."), TranslateT("Authentication failed for"), m_ThreadInfo->username);

+		mir_sntprintf(text, SIZEOF(text), TranslateT("Authentication failed for %s."), m_ThreadInfo->username);

 		MsgPopup(NULL, text, TranslateT("Jabber Authentication"));

 		JLoginFailed(LOGINERR_WRONGPASSWORD);

 		m_ThreadInfo = NULL;	// To disallow auto reconnect

@@ -289,7 +289,7 @@ void CJabberProto::OnIqResultSetAuth(HXML iqNode)
 		TCHAR text[128];

 

 		m_ThreadInfo->send("</stream:stream>");

-		mir_sntprintf(text, SIZEOF(text), _T("%s %s."), TranslateT("Authentication failed for"), m_ThreadInfo->username);

+		mir_sntprintf(text, SIZEOF(text), TranslateT("Authentication failed for %s."), m_ThreadInfo->username);

 		MsgPopup(NULL, text, TranslateT("Jabber Authentication"));

 		JLoginFailed(LOGINERR_WRONGPASSWORD);

 		m_ThreadInfo = NULL;	// To disallow auto reconnect

diff --git a/protocols/JabberG/src/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp
index 49cc776320..a1fc165af9 100644
--- a/protocols/JabberG/src/jabber_iqid_muc.cpp
+++ b/protocols/JabberG/src/jabber_iqid_muc.cpp
@@ -348,7 +348,7 @@ static INT_PTR CALLBACK JabberMucJidListDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 						//delete

 						TCHAR msgText[128];

 

-						mir_sntprintf(msgText, SIZEOF(msgText), _T("%s %s?"), TranslateT("Removing"), text);

+						mir_sntprintf(msgText, SIZEOF(msgText), TranslateT("Removing %s?"), text);

 						if (MessageBox(hwndDlg, msgText, dat->type2str(), MB_YESNO|MB_SETFOREGROUND) == IDYES) {

 							dat->ppro->DeleteMucListItem(dat, (TCHAR*)lvi.lParam);

 							mir_free((void *)lvi.lParam);

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 15e49613df..466f1aea62 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -1091,7 +1091,7 @@ int CJabberProto::OnProcessSrmmIconClick(WPARAM wParam, LPARAM lParam)
 	HMENU hMenu = CreatePopupMenu();

 	TCHAR buf[256];

 

-	mir_sntprintf(buf, SIZEOF(buf), _T("%s (%s)"), TranslateT("Last active"),

+	mir_sntprintf(buf, SIZEOF(buf), TranslateT("Last active (%s)"),

 		LI->pLastSeenResource ? LI->pLastSeenResource->resourceName : TranslateT("No activity yet, use server's choice"));

 	AppendMenu(hMenu, MF_STRING, MENUITEM_LASTSEEN, buf);

 

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 90817831b1..cebbf8646c 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -609,7 +609,7 @@ private:
 	void btnUnregister_OnClick(CCtrlButton *)

 	{

 		int res = MessageBox(NULL,

-			TranslateT("This operation will kill your account, roster and all another information stored at the server. Are you ready to do that?"),

+			TranslateT("This operation will kill your account, roster and all other information stored at the server. Are you ready to do that?"),

 			TranslateT("Account removal warning"), MB_YESNOCANCEL);

 

 		if (res == IDYES)

diff --git a/protocols/JabberG/src/jabber_password.cpp b/protocols/JabberG/src/jabber_password.cpp
index 8712c00950..cda5158227 100644
--- a/protocols/JabberG/src/jabber_password.cpp
+++ b/protocols/JabberG/src/jabber_password.cpp
@@ -49,7 +49,7 @@ static INT_PTR CALLBACK JabberChangePasswordDlgProc(HWND hwndDlg, UINT msg, WPAR
 		TranslateDialogDefault(hwndDlg);

 		if (ppro->m_bJabberOnline && ppro->m_ThreadInfo != NULL) {

 			TCHAR text[1024];

-			mir_sntprintf(text, SIZEOF(text), _T("%s %s@%S"), TranslateT("Set New Password for"), ppro->m_ThreadInfo->username, ppro->m_ThreadInfo->server);

+			mir_sntprintf(text, SIZEOF(text), TranslateT("Set New Password for %s@%S"), ppro->m_ThreadInfo->username, ppro->m_ThreadInfo->server);

 			SetWindowText(hwndDlg, text);

 		}

 		return TRUE;

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 4de6540b5b..859f6d2c57 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -76,7 +76,7 @@ static INT_PTR CALLBACK JabberPasswordDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

 			TCHAR text[512];

-			mir_sntprintf(text, SIZEOF(text), _T("%s %s"), TranslateT("Enter password for"), (TCHAR*)param->ptszJid);

+			mir_sntprintf(text, SIZEOF(text), TranslateT("Enter password for %s"), param->ptszJid);

 			SetDlgItemText(hwndDlg, IDC_JID, text);

 

 			int bSavePassword = param->pro->getByte("SaveSessionPassword", 0);

@@ -735,7 +735,7 @@ void CJabberProto::PerformAuthentication(ThreadData* info)
 		}

 

 		TCHAR text[1024];

-		mir_sntprintf(text, SIZEOF(text), _T("%s %s@%S."), TranslateT("Authentication failed for"), info->username, info->server);

+		mir_sntprintf(text, SIZEOF(text), TranslateT("Authentication failed for %s@%S."), info->username, info->server);

 		MsgPopup(NULL, text, TranslateT("Jabber Authentication"));

 		JLoginFailed(LOGINERR_WRONGPASSWORD);

 		info->send("</stream:stream>");

diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index 7b00dfd63d..a3ec3000c6 100644
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -1272,7 +1272,7 @@ static INT_PTR CALLBACK sttEnterStringDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 		{

 			SetTimer(hwndDlg, 1001, 1000, NULL);

 			TCHAR buf[128];

-			mir_sntprintf(buf, SIZEOF(buf), _T("%s (%d)"), TranslateT("OK"), params->timeout);

+			mir_sntprintf(buf, SIZEOF(buf), TranslateT("OK (%d)"), params->timeout);

 			SetDlgItemText(hwndDlg, IDOK, buf);

 		}

 

@@ -1293,7 +1293,7 @@ static INT_PTR CALLBACK sttEnterStringDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 			case 1001:

 			{

 				TCHAR buf[128];

-				mir_sntprintf(buf, SIZEOF(buf), _T("%s (%d)"), TranslateT("OK"), --params->timeout);

+				mir_sntprintf(buf, SIZEOF(buf), TranslateT("OK (%d)"), --params->timeout);

 				SetDlgItemText(hwndDlg, IDOK, buf);

 

 				if (params->timeout < 0)

diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index f95a3d9d8e..e610fa4f7b 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -67,7 +67,7 @@ void CJabberDlgPepBase::OnInitDialog()
 	SetTimer(m_hwnd, 1, 1000, NULL);

 

 	TCHAR buf[128];

-	mir_sntprintf(buf, SIZEOF(buf), _T("%s (%d)"), TranslateT("OK"), m_time);

+	mir_sntprintf(buf, SIZEOF(buf), TranslateT("OK (%d)"), m_time);

 	m_btnOk.SetText(buf);

 }

 

@@ -88,7 +88,7 @@ INT_PTR CJabberDlgPepBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 	case WM_TIMER:

 		if (wParam == 1) {

 			TCHAR buf[128];

-			mir_sntprintf(buf, SIZEOF(buf), _T("%s (%d)"), TranslateT("OK"), --m_time);

+			mir_sntprintf(buf, SIZEOF(buf), TranslateT("OK (%d)"), --m_time);

 			m_btnOk.SetText(buf);

 

 			if (m_time < 0) {