From 580c5afd51466fc300f4d68132b26a68457baa67 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 8 Feb 2013 00:11:22 +0100 Subject: [PATCH] Use resources instead of fixed strings Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitProgressDlg.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/TortoiseProc/GitProgressDlg.cpp b/src/TortoiseProc/GitProgressDlg.cpp index 44273d745..465bee424 100644 --- a/src/TortoiseProc/GitProgressDlg.cpp +++ b/src/TortoiseProc/GitProgressDlg.cpp @@ -2221,7 +2221,7 @@ bool CGitProgressDlg::CmdResolve(CString& sWindowTitle, bool& localoperation) #endif CShellUpdater::Instance().AddPathsForUpdate(m_targetPathList); - this->GetDlgItem(IDC_LOGBUTTON)->SetWindowText(_T("Commit ...")); + this->GetDlgItem(IDC_LOGBUTTON)->SetWindowText(CString(MAKEINTRESOURCE(IDS_COMMITBUTTON))); this->GetDlgItem(IDC_LOGBUTTON)->ShowWindow(SW_SHOW); return true; @@ -2420,7 +2420,8 @@ bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation* Sleep(2000); if(m_bCancelled) { - CString str(_T("User Canceled")); + CString str; + str.LoadString(IDS_SVN_USERCANCELLED); Notify(path,git_wc_notify_sendmail_error,ret,&str); return false; } @@ -2456,7 +2457,8 @@ bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation* Sleep(2000); if(m_bCancelled) { - CString str(_T("User Canceled")); + CString str; + str.LoadString(IDS_SVN_USERCANCELLED); Notify(m_targetPathList[i],git_wc_notify_sendmail_error,ret,&str); return false; } -- 2.11.4.GIT