fixes for the options page translation

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

3 files changed, 9 insertions, 9 deletions

diff --git a/protocols/GTalkExt/notifications.cpp b/protocols/GTalkExt/notifications.cpp
index 59bb956308..8a8d8a618e 100644
--- a/protocols/GTalkExt/notifications.cpp
+++ b/protocols/GTalkExt/notifications.cpp
@@ -241,7 +241,7 @@ HANDLE SetupPseudocontact(LPCTSTR jid, LPCTSTR unreadCount, LPCSTR acc, LPCTSTR
 		if (allocateName) free((PVOID)displayName);

 	}

 

-	DBWriteContactSettingTString(result, CLIST_MODULE_NAME, STATUS_MSG_SETTING, TranslateT(MAIL_NOTIFICATIONS));

+	DBWriteContactSettingTString(result, CLIST_MODULE_NAME, STATUS_MSG_SETTING, TranslateTS(MAIL_NOTIFICATIONS));

 	DBWriteContactSettingTString(result, SHORT_PLUGIN_NAME, UNREAD_THREADS_SETTING, unreadCount);

 

 	return result;

@@ -352,9 +352,9 @@ void UnreadThreadNotification(LPCSTR acc, LPCTSTR jid, LPCTSTR url, LPCTSTR unre
 		}

 

 		if (ReadCheckbox(0, IDC_ADDSNIP, (DWORD)TlsGetValue(itlsSettings)))

-			wsprintf(&data.lptzText[0], TranslateT(FULL_NOTIFICATION_FORMAT), mtn->subj, senders, mtn->snip);

+			wsprintf(&data.lptzText[0], TranslateTS(FULL_NOTIFICATION_FORMAT), mtn->subj, senders, mtn->snip);

 		else

-			wsprintf(&data.lptzText[0], TranslateT(SHORT_NOTIFICATION_FORMAT), mtn->subj, senders);

+			wsprintf(&data.lptzText[0], TranslateTS(SHORT_NOTIFICATION_FORMAT), mtn->subj, senders);

 	}

 	__finally {

 		free(senders);

diff --git a/protocols/GTalkExt/options.cpp b/protocols/GTalkExt/options.cpp
index 4232054a2c..e64e23679c 100644
--- a/protocols/GTalkExt/options.cpp
+++ b/protocols/GTalkExt/options.cpp
@@ -158,7 +158,7 @@ void ShowTestPopup(HWND wnd)
 {

 	POPUPDATAT data = {0};

 	wsprintf(&data.lptzContactName[0], TEST_LETTER_INBOX);

-	wsprintf(&data.lptzText[0], TranslateT(FULL_NOTIFICATION_FORMAT),

+	wsprintf(&data.lptzText[0], TranslateTS(FULL_NOTIFICATION_FORMAT),

 		TEST_LETTER_SUBJECT, TEST_LETTER_SENDER, TEST_LETTER_SNIP);

 

 	int len = SendMessage(GetDlgItem(wnd, IDC_TIMEOUTEDIT), WM_GETTEXTLENGTH, 0, 0) + 1;

@@ -245,7 +245,7 @@ void AddPopupsPage(WPARAM wParam)
 {

 	OPTIONSDIALOGPAGE odp = {0};

 	odp.cbSize = sizeof(odp);

-	odp.ptszTitle = _T(MAIL_NOTIFICATIONS);

+	odp.ptszTitle = MAIL_NOTIFICATIONS;

 	odp.pfnDlgProc = PopupsOptionsDlgProc;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPSETTINGS);

 	odp.hInstance = hInst;

@@ -265,7 +265,7 @@ void AddAccPage(LPCTSTR acc, LPCSTR mod, WPARAM wParam)
 	odp.hInstance = hInst;

 	odp.ptszGroup = NETWORK_OPTIONS_GROUP;

 	odp.flags = ODPF_UNICODE | ODPF_USERINFOTAB;

-	odp.ptszTab =_T(MAIL_NOTIFICATIONS);

+	odp.ptszTab = MAIL_NOTIFICATIONS;

 	odp.dwInitParam = (LPARAM)mod;

 

 	Options_AddPage(wParam, &odp);

diff --git a/protocols/GTalkExt/options.h b/protocols/GTalkExt/options.h
index d213bcbb47..bc720e22ed 100644
--- a/protocols/GTalkExt/options.h
+++ b/protocols/GTalkExt/options.h
@@ -23,9 +23,9 @@
 

 #include "resources.h"

 

-static const LPTSTR _T(MAIL_NOTIFICATIONS) = _T("GMail notifications");

-static const LPTSTR _T(FULL_NOTIFICATION_FORMAT) = _T("subject\n    %s\nfrom\n%s\n%s\n");

-static const LPTSTR _T(SHORT_NOTIFICATION_FORMAT) = _T("subject\n    %s\nfrom\n%s");

+static const LPTSTR MAIL_NOTIFICATIONS = _T("GMail notifications");

+static const LPTSTR FULL_NOTIFICATION_FORMAT = _T("subject\n    %s\nfrom\n%s\n%s\n");

+static const LPTSTR SHORT_NOTIFICATION_FORMAT = _T("subject\n    %s\nfrom\n%s");

 

 static const LPSTR PSEUDOCONTACT_LINK = "GTalkExtNotifyContact";

 static const LPSTR PSEUDOCONTACT_FLAG = "IsNotifyContact";