From 54dec7a74c313ee61437386bd667f9a7653351fd Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 19 Jun 2012 14:52:53 +0000
Subject: fixes for the options page translation

git-svn-id: http://svn.miranda-ng.org/main/trunk@479 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MRA/MraPopUp.cpp    |  7 +++--
 protocols/MRA/Mra_options.cpp | 63 +++++++++++++++++++++----------------------
 2 files changed, 34 insertions(+), 36 deletions(-)

(limited to 'protocols/MRA')

diff --git a/protocols/MRA/MraPopUp.cpp b/protocols/MRA/MraPopUp.cpp
index 67cf3ad263..ec3893aea5 100644
--- a/protocols/MRA/MraPopUp.cpp
+++ b/protocols/MRA/MraPopUp.cpp
@@ -27,15 +27,14 @@ int MraPopupOptInit(WPARAM wParam,LPARAM lParam)
 {
 	if (ServiceExists(MS_POPUP_ADDPOPUP)) {
 		OPTIONSDIALOGPAGE odp = {0};
-
 		odp.cbSize = sizeof(odp);
 		odp.position = 100000000;
 		odp.hInstance = masMraSettings.hInstance;
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS);
-		odp.ptszTitle = PROTOCOL_NAMEW;
-		odp.ptszGroup = TranslateW(L"Popups");
+		odp.pszTitle = PROTOCOL_NAMEA;
+		odp.pszGroup = LPGEN("Popups");
 		odp.groupPosition = 900000000;
-		odp.flags = (ODPF_BOLDGROUPS | ODPF_UNICODE);
+		odp.flags = ODPF_BOLDGROUPS;
 		odp.nIDBottomSimpleControl = IDC_GROUPMAIN;
 		odp.pfnDlgProc = MraPopupDlgProcOpts;
 		Options_AddPage(wParam, &odp);
diff --git a/protocols/MRA/Mra_options.cpp b/protocols/MRA/Mra_options.cpp
index 664a9ce8a6..97e1aa1b91 100644
--- a/protocols/MRA/Mra_options.cpp
+++ b/protocols/MRA/Mra_options.cpp
@@ -10,40 +10,39 @@ INT_PTR CALLBACK	DlgProcOptsConnections	(HWND hWndDlg, UINT msg, WPARAM wParam,
 int OptInit(WPARAM wParam,LPARAM lParam)
 {
 	OPTIONSDIALOGPAGE odp={0};
-
-	odp.cbSize=sizeof(odp);
-	odp.hInstance=masMraSettings.hInstance;
-	odp.pszTitle=PROTOCOL_NAMEA;
-	odp.pszGroup="Network";
-	odp.flags=ODPF_BOLDGROUPS;
-
-	odp.pszTab="Account";
-	odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_ACCOUNT);
-	odp.pfnDlgProc=DlgProcOptsAccount;
-	Options_AddPage(wParam,&odp);
-
-	odp.pszTab="Connections";
-	odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS);
-	odp.pfnDlgProc=DlgProcOptsConnections;
-	Options_AddPage(wParam,&odp);
-
-	odp.pszTab="Anti spam";
-	odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_ANTISPAM);
-	odp.pfnDlgProc=MraAntiSpamDlgProcOpts;
-	Options_AddPage(wParam,&odp);
-
-	odp.pszTab="Files";
-	odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_FILES);
-	odp.pfnDlgProc=MraFilesQueueDlgProcOpts;
-	Options_AddPage(wParam,&odp);
-
-	odp.pszTab="Avatars";
-	odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_AVATRS);
-	odp.pfnDlgProc=MraAvatarsQueueDlgProcOpts;
-	Options_AddPage(wParam,&odp);
+	odp.cbSize = sizeof(odp);
+	odp.hInstance = masMraSettings.hInstance;
+	odp.pszTitle = PROTOCOL_NAMEA;
+	odp.pszGroup = LPGEN("Network");
+	odp.flags = ODPF_BOLDGROUPS;
+
+	odp.pszTab = LPGEN("Account");
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACCOUNT);
+	odp.pfnDlgProc = DlgProcOptsAccount;
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTab = LPGEN("Connections");
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS);
+	odp.pfnDlgProc = DlgProcOptsConnections;
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTab = LPGEN("Anti spam");
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ANTISPAM);
+	odp.pfnDlgProc = MraAntiSpamDlgProcOpts;
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTab = LPGEN("Files");
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILES);
+	odp.pfnDlgProc = MraFilesQueueDlgProcOpts;
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTab = LPGEN("Avatars");
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AVATRS);
+	odp.pfnDlgProc = MraAvatarsQueueDlgProcOpts;
+	Options_AddPage(wParam, &odp);
 
 	MraPopupOptInit(wParam,lParam);
-return(0);
+	return 0;
 }
 
 
-- 
cgit v1.2.3