Index: src/ch/OptionsDlg.cpp
===================================================================
diff -u -r50ad2dc9f0b42ba432bb54e4a042582277410773 -rbe569bc86280887eeebb8d3e9489f6fc17c570e6
--- src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 50ad2dc9f0b42ba432bb54e4a042582277410773)
+++ src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision be569bc86280887eeebb8d3e9489f6fc17c570e6)
@@ -40,23 +40,16 @@
 COptionsDlg::COptionsDlg(CWnd* pParent /*=NULL*/)
 	:ictranslate::CLanguageDialog(COptionsDlg::IDD, pParent, &m_bLock)
 {
-	//{{AFX_DATA_INIT(COptionsDlg)
-		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
 }
 
 void COptionsDlg::DoDataExchange(CDataExchange* pDX)
 {
 	CLanguageDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptionsDlg)
 	DDX_Control(pDX, IDC_PROPERTIES_LIST, m_ctlProperties);
-	//}}AFX_DATA_MAP
 }
 
-BEGIN_MESSAGE_MAP(COptionsDlg,ictranslate::CLanguageDialog)
-	//{{AFX_MSG_MAP(COptionsDlg)
+BEGIN_MESSAGE_MAP(COptionsDlg, ictranslate::CLanguageDialog)
 	ON_BN_CLICKED(IDC_APPLY_BUTTON, OnApplyButton)
-	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -70,7 +63,7 @@
 	m_ctlProperties.AddString(text, ID_PROPERTY_COMBO_LIST, IDS_BOOLTEXT_STRING, (value))
 
 #define PROP_UINT(text, value)\
-	m_ctlProperties.AddString(text, ID_PROPERTY_TEXT, _itot(boost::numeric_cast<int>((value)), m_szBuffer, 10), 0)
+	m_ctlProperties.AddString(text, ID_PROPERTY_TEXT, boost::lexical_cast<std::wstring>((value)).c_str(), 0)
 
 #define PROP_COMBO(text, prop_text, value)\
 	m_ctlProperties.AddString(text, ID_PROPERTY_COMBO_LIST, prop_text, boost::numeric_cast<int>((value)))
@@ -82,7 +75,7 @@
 	m_ctlProperties.AddString(text, ID_PROPERTY_PATH, (value)+CString(GetResManager().LoadString(prop_text)), 0)
 
 #define PROP_CUSTOM_UINT(text, value, callback, param)\
-	m_ctlProperties.AddString(text, ID_PROPERTY_CUSTOM, CString(_itot(boost::numeric_cast<int>((value)), m_szBuffer, 10)), callback, this, param, 0)
+	m_ctlProperties.AddString(text, ID_PROPERTY_CUSTOM, CString(boost::lexical_cast<std::wstring>((value)).c_str()), callback, this, param, 0)
 
 #define SKIP_SEPARATOR(pos)\
 	pos++
@@ -110,11 +103,8 @@
 	m_cvShortcuts.clear();
 	GetPropValue<PP_SHORTCUTS>(rConfig, m_cvShortcuts);
 
-	_tcscpy(m_szLangPath, _T("<PROGRAM>\\Langs\\"));
-	GetApp().ExpandPath(m_szLangPath);
+	GetResManager().Scan(GetApp().ExpandPath(_T("<PROGRAM>\\Langs\\")), &m_vld);
 
-	GetResManager().Scan(m_szLangPath, &m_vld);
-
 	// some attributes
 	m_ctlProperties.SetBkColor(RGB(255, 255, 255));
 	m_ctlProperties.SetTextColor(RGB(80, 80, 80));
@@ -237,7 +227,7 @@
 	// lang
 	CString strLangs;
 	size_t stIndex=0;
-	for (vector<ictranslate::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).GetLangName();
 		strLangs+=_T("!");
@@ -293,6 +283,7 @@
 	PROP_BOOL(IDS_PROTECTROFILES_STRING, GetPropValue<PP_CMPROTECTROFILES>(GetConfig()));
 	PROP_UINT(IDS_LIMITOPERATIONS_STRING, GetPropValue<PP_CMLIMITMAXOPERATIONS>(GetConfig()));
 	PROP_BOOL(IDS_READSIZEBEFOREBLOCK_STRING, GetPropValue<PP_CMREADSIZEBEFOREBLOCKING>(GetConfig()));
+	PROP_BOOL(IDS_FASTMOVEBEFOREBLOCK_STRING, GetPropValue<PP_CMFASTMOVEBEFOREBLOCKING>(GetConfig()));
 	PROP_COMBO(IDS_DEFAULTPRIORITY_STRING, MakeCompoundString(IDS_PRIORITY0_STRING, 7, _T("!")), PriorityToIndex(boost::numeric_cast<int>(GetPropValue<PP_CMDEFAULTPRIORITY>(GetConfig()))));
 	PROP_BOOL(IDS_CFGDISABLEPRIORITYBOOST_STRING, GetPropValue<PP_CMDISABLEPRIORITYBOOST>(GetConfig()));
 	PROP_BOOL(IDS_DELETEAFTERFINISHED_STRING, GetPropValue<PP_CMDELETEAFTERFINISHED>(GetConfig()));
@@ -402,6 +393,7 @@
 	SetPropValue<PP_CMPROTECTROFILES>(rConfig, GetBoolProp(iPosition++));
 	SetPropValue<PP_CMLIMITMAXOPERATIONS>(rConfig, GetUintProp(iPosition++));
 	SetPropValue<PP_CMREADSIZEBEFOREBLOCKING>(rConfig, GetBoolProp(iPosition++));
+	SetPropValue<PP_CMFASTMOVEBEFOREBLOCKING>(rConfig, GetBoolProp(iPosition++));
 	SetPropValue<PP_CMDEFAULTPRIORITY>(rConfig, IndexToPriority(GetIndexProp(iPosition++)));
 	SetPropValue<PP_CMDISABLEPRIORITYBOOST>(rConfig, GetBoolProp(iPosition++));
 	SetPropValue<PP_CMDELETEAFTERFINISHED>(rConfig, GetBoolProp(iPosition++));
@@ -458,38 +450,43 @@
 	assert(lpszSeparator);
 	if(!lpszSeparator)
 		return _T("");
-	_tcscpy(m_szBuffer, GetResManager().LoadString(uiBase+0));
-	for (int i=1;i<iCount;i++)
+
+	CString strText = GetResManager().LoadString(uiBase + 0);
+	for(int i = 1; i < iCount; i++)
 	{
-		_tcscat(m_szBuffer, lpszSeparator);
-		_tcscat(m_szBuffer, GetResManager().LoadString(uiBase+i));
+		strText += lpszSeparator;
+		strText += GetResManager().LoadString(uiBase + i);
 	}
 
-	return CString((PCTSTR)m_szBuffer);
+	return strText;
 }
 
 bool COptionsDlg::GetBoolProp(int iPosition)
 {
-	m_ctlProperties.GetProperty(iPosition, &m_iSel);
-	return m_iSel != 0;
+	int iSel = 0;
+	m_ctlProperties.GetProperty(iPosition, &iSel);
+	return iSel != 0;
 }
 
 UINT COptionsDlg::GetUintProp(int iPosition)
 {
-	m_ctlProperties.GetProperty(iPosition, &m_strTemp);
-	return _ttoi(m_strTemp);
+	CString strValue;
+	m_ctlProperties.GetProperty(iPosition, &strValue);
+	return _ttoi(strValue);
 }
 
 CString COptionsDlg::GetStringProp(int iPosition)
 {
-	m_ctlProperties.GetProperty(iPosition, &m_strTemp);
-	return m_strTemp;
+	CString strValue;
+	m_ctlProperties.GetProperty(iPosition, &strValue);
+	return strValue;
 }
 
 int COptionsDlg::GetIndexProp(int iPosition)
 {
-	m_ctlProperties.GetProperty(iPosition, &m_iSel);
-	return m_iSel;
+	int iSel = 0;
+	m_ctlProperties.GetProperty(iPosition, &iSel);
+	return iSel;
 }
 
 void COptionsDlg::OnApplyButton()