OSDN Git Service

Merge branch 'master' of git://github.com/Jopie64/tortoisegit
authorFrank Li <lznuaa@gmail.com>
Thu, 13 Aug 2009 12:29:42 +0000 (20:29 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 13 Aug 2009 12:29:42 +0000 (20:29 +0800)
ext/igit [deleted submodule]
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/GitLogListAction.cpp

diff --git a/ext/igit b/ext/igit
deleted file mode 160000 (submodule)
index e69fdcf..0000000
--- a/ext/igit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e69fdcf4e25456730c80b6c16bd8768e6820b861
index e4ace23..4e86c99 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ
index 258b197..dfc3a20 100644 (file)
@@ -378,7 +378,7 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
                case ID_CHERRY_PICK:\r
                        if(!g_Git.CheckCleanWorkTree())\r
                        {\r
-                               CMessageBox::Show(NULL,_T("Cherry Pick Require Clean Working Tree"),_T("TortoiseGit"),MB_OK);\r
+                               CMessageBox::Show(NULL,_T("Cherry Pick requires a clean working tree"),_T("TortoiseGit"),MB_OK);\r
                        \r
                        }else\r
                        {\r
@@ -402,7 +402,7 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect)
                case ID_REBASE_TO_VERSION:\r
                        if(!g_Git.CheckCleanWorkTree())\r
                        {\r
-                               CMessageBox::Show(NULL,_T("Rebase Require Clean Working Tree"),_T("TortoiseGit"),MB_OK);\r
+                               CMessageBox::Show(NULL,_T("Rebase requires a clean working tree"),_T("TortoiseGit"),MB_OK);\r
                        \r
                        }else\r
                        {\r