Fixed some typos and slightly changed dialog layout. Also removed some more warnings

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 45a016e..b9f64a2 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 9428018..a0ebdfd 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -346,15 +346,12 @@ void CCommitDlg::OnOK()
        CDWordArray arDeleted;\r
        //first add all the unversioned files the user selected\r
        //and check if all versioned files are selected\r
-       int nUnchecked = 0;\r
        int nchecked = 0;\r
        m_bRecursive = true;\r
        int nListItems = m_ListCtrl.GetItemCount();\r
 \r
        CTGitPathList itemsToAdd;\r
        CTGitPathList itemsToRemove;\r
-       bool bCheckedInExternal = false;\r
-       bool bHasConflicted = false;\r
        //std::set<CString> checkedLists;\r
        //std::set<CString> uncheckedLists;\r
 \r
@@ -1475,7 +1472,8 @@ void CCommitDlg::OnBnClickedCommitAmend()
        {\r
                GitRev rev;\r
                BYTE_VECTOR vector;\r
-               g_Git.GetLog(vector,CString(_T("HEAD")),NULL,1);\r
+               CString head(_T("HEAD"));\r
+               g_Git.GetLog(vector,head,NULL,1);\r
                rev.ParserFromLog(vector);\r
                m_AmendStr=rev.m_Subject+_T("\n\n")+rev.m_Body;\r
        }\r

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index e289dc5..c167113 100644 (file)
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -1834,7 +1834,7 @@ void CGitLogListBase::OnDestroy()
        }\r
        while(m_LogCache.SaveCache())\r
        {\r
-               if(CMessageBox::Show(NULL,_T("Cannot Save Log Cache to Disk,click yes for retry, click no for give up"),_T("TortoiseGit"),\r
+               if(CMessageBox::Show(NULL,_T("Cannot Save Log Cache to Disk. To retry click yes. To give up click no."),_T("TortoiseGit"),\r
                                                        MB_YESNO) == IDNO)\r
                                                        break;\r
        }\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 4c4fd9e..b6a409b 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ