Index: src/ch/AboutDlg.cpp
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r3921d82d9605d98b2281f3f42d9f9c8385b89a3e
--- src/ch/AboutDlg.cpp	(.../AboutDlg.cpp)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/ch/AboutDlg.cpp	(.../AboutDlg.cpp)	(revision 3921d82d9605d98b2281f3f42d9f9c8385b89a3e)
@@ -29,7 +29,7 @@
 
 bool CAboutDlg::m_bLock=false;
 
-CAboutDlg::CAboutDlg() :ictranslate::CLanguageDialog(CAboutDlg::IDD, NULL, &m_bLock)
+CAboutDlg::CAboutDlg() :ictranslate::CLanguageDialog(IDD_ABOUTBOX, nullptr, &m_bLock)
 {
 	//{{AFX_DATA_INIT(CAboutDlg)
 	//}}AFX_DATA_INIT
@@ -58,33 +58,30 @@
 		return;
 
 	// Readable version
-	pCtl->SetWindowText(GetApp()->GetAppNameVer());
+	pCtl->SetWindowText(GetApp().GetAppNameVer());
 
 	// full version
 	CString strText;
-	strText.Format(_T("%s: %ld.%ld.%ld.%ld"), GetResManager()->LoadString(IDS_ABOUTVERSION_STRING),
+	strText.Format(_T("%s: %ld.%ld.%ld.%ld"), GetResManager().LoadString(IDS_ABOUTVERSION_STRING),
 		PRODUCT_VERSION1, PRODUCT_VERSION2, PRODUCT_VERSION3, PRODUCT_VERSION4);
 	pCtl2->SetWindowText(strText);
 	// Copyright information
 	pWndCopyright->SetWindowText(_T(COPYRIGHT_INFO));
 
 	// web page link
 	pctlSite->SetWindowText(_T(PRODUCT_SITE) _T("|") _T(PRODUCT_SITE));
-	pctlContact->SetWindowText(_T(CONTACT_INFO) _T("|mailto:") _T(CONTACT_INFO));
+	pctlContact->SetWindowText(_T(CONTACT_INFO) _T("|") _T(CONTACT_INFO));
 
 	// language information
-	ictranslate::CResourceManager* pResManager = GetResManager();
-	if(pResManager)
+	ictranslate::CResourceManager& rResManager = GetResManager();
+	const ictranslate::CLangData* pLangData = rResManager.GetLanguageData();
+	if(pLangData)
 	{
-		const ictranslate::CLangData* pLangData = pResManager->GetLanguageData();
-		if(pLangData)
-		{
-			ictranslate::CFormat fmt(pResManager->LoadString(IDS_ABOUT_LANGUAGE_STRING));
-			fmt.SetParam(_t("%langname"), pLangData->GetLangName());
-			fmt.SetParam(_t("%authors"), pLangData->GetAuthor());
+		ictranslate::CFormat fmt(rResManager.LoadString(IDS_ABOUT_LANGUAGE_STRING));
+		fmt.SetParam(_T("%langname"), pLangData->GetLangName());
+		fmt.SetParam(_T("%authors"), pLangData->GetAuthor());
 
-			pctlLanguage->SetWindowText(fmt);
-		}
+		pctlLanguage->SetWindowText(fmt.ToString());
 	}
 }