Index: src/ch/OptionsDlg.cpp
===================================================================
diff -u -N -r025757ce5252abbb6dfd81f8f254e419f9520a09 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf
--- src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 025757ce5252abbb6dfd81f8f254e419f9520a09)
+++ src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf)
@@ -39,7 +39,7 @@
 // COptionsDlg dialog
 
 COptionsDlg::COptionsDlg(CWnd* pParent /*=NULL*/)
-	: CHLanguageDialog(COptionsDlg::IDD, pParent, &m_bLock)
+	:ictranslate::CLanguageDialog(COptionsDlg::IDD, pParent, &m_bLock)
 {
 	//{{AFX_DATA_INIT(COptionsDlg)
 		// NOTE: the ClassWizard will add member initialization here
@@ -48,13 +48,13 @@
 
 void COptionsDlg::DoDataExchange(CDataExchange* pDX)
 {
-	CHLanguageDialog::DoDataExchange(pDX);
+	CLanguageDialog::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(COptionsDlg)
 	DDX_Control(pDX, IDC_PROPERTIES_LIST, m_ctlProperties);
 	//}}AFX_DATA_MAP
 }
 
-BEGIN_MESSAGE_MAP(COptionsDlg, CHLanguageDialog)
+BEGIN_MESSAGE_MAP(COptionsDlg,ictranslate::CLanguageDialog)
 	//{{AFX_MSG_MAP(COptionsDlg)
 	ON_BN_CLICKED(IDC_APPLY_BUTTON, OnApplyButton)
 	//}}AFX_MSG_MAP
@@ -90,7 +90,7 @@
 
 BOOL COptionsDlg::OnInitDialog() 
 {
-	CHLanguageDialog::OnInitDialog();
+	CLanguageDialog::OnInitDialog();
 	
 	m_ctlProperties.Init();
 
@@ -220,7 +220,7 @@
 	ApplyProperties();
 
 	SendClosingNotify();
-	CHLanguageDialog::OnOK();
+	CLanguageDialog::OnOK();
 }
 
 void COptionsDlg::FillPropertyList()
@@ -254,7 +254,7 @@
 	// lang
 	CString strLangs;
 	UINT uiIndex=0;
-	for (vector<CLangData>::iterator it=m_vld.begin();it != m_vld.end();it++)
+	for (vector<ictranslate::CLangData>::iterator it=m_vld.begin();it != m_vld.end();it++)
 	{
 		strLangs+=(*it).m_pszLngName;
 		strLangs+=_T("!");
@@ -489,7 +489,7 @@
 void COptionsDlg::OnCancel() 
 {
 	SendClosingNotify();
-	CHLanguageDialog::OnCancel();
+	CLanguageDialog::OnCancel();
 }
 
 void COptionsDlg::SendClosingNotify()