Use resources instead of fixed strings
authorSven Strickroth <email@cs-ware.de>
Thu, 7 Feb 2013 23:11:22 +0000 (8 00:11 +0100)
committerSven Strickroth <email@cs-ware.de>
Thu, 7 Feb 2013 23:27:34 +0000 (8 00:27 +0100)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/TortoiseProc/GitProgressDlg.cpp

index 44273d7..465bee4 100644 (file)
@@ -2221,7 +2221,7 @@ bool CGitProgressDlg::CmdResolve(CString& sWindowTitle, bool& localoperation)
 #endif\r
        CShellUpdater::Instance().AddPathsForUpdate(m_targetPathList);\r
 \r
-       this->GetDlgItem(IDC_LOGBUTTON)->SetWindowText(_T("Commit ..."));\r
+       this->GetDlgItem(IDC_LOGBUTTON)->SetWindowText(CString(MAKEINTRESOURCE(IDS_COMMITBUTTON)));\r
        this->GetDlgItem(IDC_LOGBUTTON)->ShowWindow(SW_SHOW);\r
 \r
        return true;\r
@@ -2420,7 +2420,8 @@ bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation*
                        Sleep(2000);\r
                        if(m_bCancelled)\r
                        {\r
-                               CString str(_T("User Canceled"));\r
+                               CString str;\r
+                               str.LoadString(IDS_SVN_USERCANCELLED);\r
                                Notify(path,git_wc_notify_sendmail_error,ret,&str);\r
                                return false;\r
                        }\r
@@ -2456,7 +2457,8 @@ bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation*
                                Sleep(2000);\r
                                if(m_bCancelled)\r
                                {\r
-                                       CString str(_T("User Canceled"));\r
+                                       CString str;\r
+                                       str.LoadString(IDS_SVN_USERCANCELLED);\r
                                        Notify(m_targetPathList[i],git_wc_notify_sendmail_error,ret,&str);\r
                                        return false;\r
                                }\r