From 032a6df109938905228c5c2f4b0ddb48da6a5497 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 10 May 2012 19:43:19 +0200 Subject: [PATCH] Moved some more strings to resources Signed-off-by: Sven Strickroth --- src/Resources/TortoiseGitBlameENG.rc | 3 + src/Resources/TortoiseProcENG.rc | 58 +++++++++++++++++- src/TortoiseGitBlame/Resource.h | 5 +- src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp | 11 ++-- src/TortoiseProc/AppUtils.cpp | 19 +++--- src/TortoiseProc/BranchCombox.h | 6 +- src/TortoiseProc/CloneDlg.cpp | 10 +-- src/TortoiseProc/CommitDlg.cpp | 8 +-- src/TortoiseProc/CommitDlg.h | 4 +- src/TortoiseProc/GitLogListAction.cpp | 85 ++++++++++++++------------ src/TortoiseProc/RebaseDlg.cpp | 6 +- src/TortoiseProc/Settings/SettingGitConfig.cpp | 8 ++- src/TortoiseProc/Settings/SettingGitRemote.cpp | 40 +++++++----- src/TortoiseProc/resource.h | 40 +++++++++++- 14 files changed, 215 insertions(+), 88 deletions(-) diff --git a/src/Resources/TortoiseGitBlameENG.rc b/src/Resources/TortoiseGitBlameENG.rc index eb8e29a6e..12dc34c08 100644 --- a/src/Resources/TortoiseGitBlameENG.rc +++ b/src/Resources/TortoiseGitBlameENG.rc @@ -423,6 +423,9 @@ BEGIN "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" IDS_VERSION "TortoiseGitBlame, Version %d.%d.%d.%d" IDS_APPNAME "TortoiseGitBlame" + IDS_CANNOTBLAMENOGIT "Cannot show blame. ""%s"" is not under version control by git." + IDS_BLAMEERROR "Blame error" + IDS_CHECKOUTFAILED "Failed to checkout file ""%s""" END STRINGTABLE diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 6b859125c..8408ac05f 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -2714,8 +2714,11 @@ BEGIN IDS_STATUSLIST_FILESREVERTED "%d files reverted to %s." IDS_REFBROWSE "RefBrowse" IDS_REFLOG "RefLog" + IDS_PROGS_TITLE_REVERTCOMMIT "Revert commit" IDS_AUTH_USERNAME "Username:" IDS_AUTH_PASSWORD "Password:" + IDS_PROC_REVERTCOMMIT "Revert commit %s" + IDS_PROC_PICK "Pick up %s" END STRINGTABLE @@ -3275,7 +3278,26 @@ END STRINGTABLE BEGIN + IDS_PROC_CHERRYPICKFAILED "Cherry Pick failed" + IDS_PROC_NOPARENT "Parent %d does not exist" + IDS_PROC_NOPREVIOUSVERSION "No previous version." + IDS_PROC_CANNOTCOMBINE "Cannot combine commits now.\r\nMake sure you are viewing the log of your current branch and no filters are applied." + IDS_PROC_COMBINE_ERRORSTEP1 + "Could not reset to first commit (first step). Aborting..." + IDS_PROC_COMBINE_ERRORSTEP2 + "Could not reset to last commit (second step). Aborting..." IDS_REG_ERROR "Error while reading/writing the registry key %s\n%s" + IDS_PROC_COMBINE_ERRORRESETHEAD "Could not reset to original HEAD." + IDS_PROC_DELETENREFS """Do you really want to permanently delete the %d selected refs? It can NOT be recovered!" + IDS_PROC_DELETEREF "Warning: ""%s"" will be permanently deleted. It can NOT be recovered!\r\n\r\nDo you really want to continue?" + IDS_DELETEBUTTON "&Delete" + IDS_PROC_DELETEREMOTEBRANCH + "The branch ""%s"" is a remote branch.\n\nDo you really want to delete it?" + IDS_PROC_DELETEREMOTEBRANCH_LOCALREMOTE "&Delete remote && local" + IDS_PROC_DELETEREMOTEBRANCH_LOCAL "Delete &local" + IDS_PROC_DELETEALLSTASH "Do you really want to delete ALL stash?" + IDS_PROC_DELETEBRANCHTAG + "Do you really want to delete %s?" END STRINGTABLE @@ -3589,7 +3611,7 @@ BEGIN IDS_CLONE_DEPTH_TT "Create a shallow clone with a history truncated to the specified number of revisions. A shallow repository has a number of limitations (you cannot clone or fetch from it, nor push from nor into it), but is adequate if you are only interested in the recent history of a large project with a long history, and would want to send in fixes as patches." IDS_HOOKTYPE_PREPUSH "Pre-Push Hook" IDS_HOOKTYPE_POSTPUSH "Post-Push Hook" - IDS_DCOMMIT_STASH_POP "You stash change before DCommit,\r\n Do you want to stash pop now?\r\n" + IDS_DCOMMIT_STASH_POP "You need to stash changes before you can use DCommit.\r\n Do you want to stash pop now?\r\n" IDS_HASH "Hash" IDS_REF "Ref" IDS_ACTION "Action" @@ -3656,7 +3678,7 @@ BEGIN IDS_PROGS_TITLE_CHERRYPICK "Cherry Pick" IDS_PROC_REVISIONFILES "Revision Files" IDS_PROC_NOTHINGTOREBASE "Nothing to Rebase" - IDS_PROC_REVISIONTOOLTIP "CommitHash: %s\nCommit by: %s %s\n%s\n%s" + IDS_PROC_NOCLEAN "This task requires a clean working copy." IDS_PROC_NOHEAD "No HEAD found" IDS_PROC_REBASE_STARTCHERRYPICK "Start Cherry Pick" IDS_PROC_REBASE_STARTREBASE "Start Rebase" @@ -3695,6 +3717,38 @@ BEGIN IDS_PROC_COMMIT_RESTOREFILES_KEEP "&Keep current state" END +STRINGTABLE +BEGIN + IDS_PUTTYKEYFILEFILTER "Putty Private Key(*.ppk)|*.ppk|All Files(*.*)|*.*||" + IDS_PROC_GITCONFIG_REMOTEEMPTY "Remote name must not be empty." + IDS_PROC_GITCONFIG_URLEMPTY "Remote URL must not be empty." + IDS_PROC_GITCONFIG_OVERWRITEREMOTE + "The remote ""%s"" already exists.\nDo you want to overwrite it?" + IDS_PROC_GITCONFIG_SAVEREMOTE + "The Remote Config was changed.\nDo you want to save now or discard changes?" + IDS_SAVEBUTTON "&Save" + IDS_DISCARDBUTTON "&Discard" + IDS_PROC_SAVECONFIGFAILED + "Saving config failed (key: ""%s"", value: ""%s"")." + IDS_PROC_GITCONFIG_DELETEREMOTE "Do you really want to remove ""%s""?" + IDS_PROC_GITCONFIG_EDITLOCALGONCFIG "Edit local git config" + IDS_PROC_GITCONFIG_NOMSYSGIT + "MSysGit directory not set (see ""General"" settings page)." + IDS_PROC_CLONE_DIR "Dir..." + IDS_PROC_CLONE_WEB "Web" + IDS_PROC_CLONE_URLDIREMPTY "URL or directory must not be empty." + IDS_PROC_COMMIT_SHOWPATCH "View Patch>>" + IDS_PROC_COMMIT_HIDEPATCH "Hide Patch<<" +END + +STRINGTABLE +BEGIN + IDS_PROC_COMMIT_RECOMMIT "&ReCommit" + IDS_PROC_STASHFAILED "Stash failed!!!" + IDS_PROC_STASHSUCCESS "Stash Success" + IDS_PROC_NOUSERDATA "User name and email must be set before commit.\r\n Do you want to set these now?" +END + #endif // Englisch (USA) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/src/TortoiseGitBlame/Resource.h b/src/TortoiseGitBlame/Resource.h index 404de9d89..a8efdf3be 100644 --- a/src/TortoiseGitBlame/Resource.h +++ b/src/TortoiseGitBlame/Resource.h @@ -1,11 +1,14 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by d:\TortoiseGit\src\Resources\TortoiseGitBlame.rc +// Used by d:\TortoiseGit\src\Resources\TortoiseGitBlameENG.rc // #define IDR_TORTOISE_GIT_BLAME_MAINFRAME 1 #define IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 2 #define IDS_VERSION 2 #define IDS_APPNAME 3 +#define IDS_CANNOTBLAMENOGIT 4 +#define IDS_BLAMEERROR 5 +#define IDS_CHECKOUTFAILED 6 #define IDD_ABOUTBOX 100 #define IDP_OLE_INIT_FAILED 100 #define ID_STATUSBAR_PANE1 120 diff --git a/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp b/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp index 3337ba1bd..e65dddb74 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp +++ b/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp @@ -32,6 +32,7 @@ #include "TGitPath.h" #include "TortoiseGitBlameView.h" #include "CmdLineParser.h" +#include "CommonAppUtils.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -100,7 +101,9 @@ BOOL CTortoiseGitBlameDoc::OnOpenDocument(LPCTSTR lpszPathName,CString Rev) CString topdir; if(!admindir.HasAdminDir(lpszPathName,&topdir)) { - CMessageBox::Show(NULL,CString(lpszPathName)+_T(" is not controled by git\nJust Show File Context"),_T("TortoiseGitBlame"),MB_OK); + CString temp; + temp.Format(IDS_CANNOTBLAMENOGIT, CString(lpszPathName)); + CMessageBox::Show(NULL, temp, _T("TortoiseGitBlame"), MB_OK); } else { @@ -138,7 +141,7 @@ BOOL CTortoiseGitBlameDoc::OnOpenDocument(LPCTSTR lpszPathName,CString Rev) g_Git.StringAppend(&str, &m_BlameData[0], CP_UTF8); if (err.size() > 0) g_Git.StringAppend(&str, &err[0], CP_UTF8); - CMessageBox::Show(NULL,CString(_T("Blame Error:\n\n")) + str,_T("TortoiseGitBlame"),MB_OK); + MessageBox(NULL, CString(MAKEINTRESOURCE(IDS_BLAMEERROR)) + _T("\n\n") + str, _T("TortoiseGitBlame"), MB_OK); } @@ -158,8 +161,8 @@ BOOL CTortoiseGitBlameDoc::OnOpenDocument(LPCTSTR lpszPathName,CString Rev) if(g_Git.RunLogFile(cmd, m_TempFileName)) { CString str; - str.Format(_T("Fail get file %s"), path.GetGitPathString()); - CMessageBox::Show(NULL,CString(_T("Blame Error")) + str,_T("TortoiseGitBlame"),MB_OK); + str.Format(IDS_CHECKOUTFAILED, path.GetGitPathString()); + MessageBox(NULL, CString(MAKEINTRESOURCE(IDS_BLAMEERROR)) + _T("\n\n") + str, _T("TortoiseGitBlame"), MB_OK); } CTortoiseGitBlameView *pView=DYNAMIC_DOWNCAST(CTortoiseGitBlameView,GetMainFrame()->GetActiveView()); diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 3aa8c6f5f..fdaa2f7da 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -90,11 +90,11 @@ bool CAppUtils::StashSave() if (g_Git.Run(cmd, &out, CP_UTF8)) { - CMessageBox::Show(NULL, CString(_T("Stash Fail!!!\n")) + out, _T("TortoiseGit"), MB_OK|MB_ICONERROR); + CMessageBox::Show(NULL, CString(MAKEINTRESOURCE(IDS_PROC_STASHFAILED)) + _T("\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR); } else { - CMessageBox::Show(NULL, CString(_T("Stash Success\n")) + out, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION); + CMessageBox::Show(NULL, CString(MAKEINTRESOURCE(IDS_PROC_STASHSUCCESS)) + _T("\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION); return true; } } @@ -115,7 +115,7 @@ int CAppUtils::StashApply(CString ref, bool showChanges /* true */) bool hasConflicts = (out.Find(_T("CONFLICT")) >= 0); if (ret && !(ret == 1 && hasConflicts)) { - CMessageBox::Show(NULL,CString(_T("Stash Apply Fail!!!\n"))+out,_T("TortoiseGit"),MB_OK|MB_ICONERROR); + CMessageBox::Show(NULL, CString(MAKEINTRESOURCE(IDS_PROC_STASHAPPLYFAILED))+ _T("\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR); } else { @@ -124,7 +124,7 @@ int CAppUtils::StashApply(CString ref, bool showChanges /* true */) withConflicts = _T(" with conflicts"); if (showChanges) { - if(CMessageBox::Show(NULL,CString(_T("Stash Apply Success") + withConflicts + _T("\nDo you want to show change?")) + if(CMessageBox::Show(NULL,CString(_T("Stash Apply successful") + withConflicts + _T("") + CString(MAKEINTRESOURCE(IDS_SEECHANGES)))) ,_T("TortoiseGit"),MB_YESNO|MB_ICONINFORMATION) == IDYES) { CChangedDlg dlg; @@ -135,7 +135,7 @@ int CAppUtils::StashApply(CString ref, bool showChanges /* true */) } else { - CMessageBox::Show(NULL, _T("Stash Apply Success") + withConflicts + _T("") ,_T("TortoiseGit"), MB_OK | MB_ICONINFORMATION); + CMessageBox::Show(NULL, _T("Stash Apply successful") + withConflicts + _T("") ,_T("TortoiseGit"), MB_OK | MB_ICONINFORMATION); return 0; } } @@ -151,16 +151,16 @@ int CAppUtils::StashPop(bool showChanges /* true */) bool hasConflicts = (out.Find(_T("CONFLICT")) >= 0); if (ret && !(ret == 1 && hasConflicts)) { - CMessageBox::Show(NULL,CString(_T("Stash POP Fail!!!\n"))+out,_T("TortoiseGit"),MB_OK|MB_ICONERROR); + CMessageBox::Show(NULL,CString(_T("Stash POP failed!!!\n"))+out,_T("TortoiseGit"),MB_OK|MB_ICONERROR); } else { - CString message = _T("Stash POP Success"); + CString message = _T("Stash POP successful"); if (hasConflicts) message = _T("Stash POP Failed, there are conflicts"); if (showChanges) { - if(CMessageBox::Show(NULL,CString(message + _T("\nDo you want to show change?")) + if(CMessageBox::Show(NULL,CString(message + _T("\n") + CString(MAKEINTRESOURCE(IDS_SEECHANGES)))) ,_T("TortoiseGit"),MB_YESNO|MB_ICONINFORMATION) == IDYES) { CChangedDlg dlg; @@ -2134,8 +2134,7 @@ BOOL CAppUtils::Commit(CString bugid,BOOL bWholeProject,CString &sLogMsg, while(g_Git.GetUserName().IsEmpty() || g_Git.GetUserEmail().IsEmpty()) { - if(CMessageBox::Show(NULL,_T("User name and email must be set before commit.\r\n Do you want to set these now?\r\n"), - _T("TortoiseGit"),MB_YESNO| MB_ICONERROR) == IDYES) + if(CMessageBox::Show(NULL, IDS_PROC_NOUSERDATA, IDS_APPNAME, MB_YESNO| MB_ICONERROR) == IDYES) { CTGitPath path(g_Git.m_CurrentDir); CSettings dlg(IDS_PROC_SETTINGS_TITLE,&path); diff --git a/src/TortoiseProc/BranchCombox.h b/src/TortoiseProc/BranchCombox.h index ce7c091a6..94d979cb4 100644 --- a/src/TortoiseProc/BranchCombox.h +++ b/src/TortoiseProc/BranchCombox.h @@ -156,10 +156,14 @@ protected: return; } - tooltip.Format(IDS_PROC_REVISIONTOOLTIP, + tooltip.Format(_T("%s: %s\n%s: %s\n%s: %s\n%s:\n%s\n%s"), + CString(MAKEINTRESOURCE(IDS_LOG_REVISION)), rev.m_CommitHash.ToString(), + CString(MAKEINTRESOURCE(IDS_LOG_AUTHOR)), rev.GetAuthorName(), + CString(MAKEINTRESOURCE(IDS_LOG_DATE)), CLoglistUtils::FormatDateAndTime(rev.GetAuthorDate(), DATE_LONGDATE), + CString(MAKEINTRESOURCE(IDS_LOG_MESSAGE)), rev.GetSubject(), rev.GetBody()); diff --git a/src/TortoiseProc/CloneDlg.cpp b/src/TortoiseProc/CloneDlg.cpp index 1d7fe77d1..e27f687f9 100644 --- a/src/TortoiseProc/CloneDlg.cpp +++ b/src/TortoiseProc/CloneDlg.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2011 - TortoiseGit +// Copyright (C) 2008-2012 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -131,8 +131,8 @@ BOOL CCloneDlg::OnInitDialog() if(window) SHAutoComplete(window->m_hWnd, SHACF_FILESYSTEM); - this->m_BrowseUrl.AddEntry(CString(_T("Dir..."))); - this->m_BrowseUrl.AddEntry(CString(_T("Web"))); + this->m_BrowseUrl.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_CLONE_DIR))); + this->m_BrowseUrl.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_CLONE_WEB))); m_BrowseUrl.SetCurrentEntry(m_regBrowseUrl); m_PuttyKeyCombo.SetPathHistory(TRUE); @@ -176,7 +176,7 @@ void CCloneDlg::OnOK() UpdateData(TRUE); if(m_URL.IsEmpty() || m_Directory.IsEmpty()) { - CMessageBox::Show(NULL, _T("URL or Directory can't be empty"), _T("TortoiseGit"), MB_OK); + CMessageBox::Show(NULL, IDS_PROC_CLONE_URLDIREMPTY, IDS_APPNAME, MB_OK); return; } @@ -235,7 +235,7 @@ void CCloneDlg::OnBnClickedPuttykeyfileBrowse() CFileDialog dlg(TRUE,NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - _T("Putty Private Key(*.ppk)|*.ppk|All Files(*.*)|*.*||")); + CString(MAKEINTRESOURCE(IDS_PUTTYKEYFILEFILTER))); this->UpdateData(); if(dlg.DoModal()==IDOK) diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp index 16d1e2642..fdb532918 100644 --- a/src/TortoiseProc/CommitDlg.cpp +++ b/src/TortoiseProc/CommitDlg.cpp @@ -678,12 +678,12 @@ void CCommitDlg::OnOK() { if (g_Git.Run(_T("git branch ") + m_sCreateNewBranch, &out, CP_UTF8)) { - MessageBox(_T("Creating branch failed:\n") + out, _T("TortoiseGit"), MB_OK|MB_ICONERROR); + MessageBox(_T("Creating new branch failed:\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR); bAddSuccess = false; } if (g_Git.Run(_T("git checkout ") + m_sCreateNewBranch, &out, CP_UTF8)) { - MessageBox(_T("Switching to new branch failed:\n") + out, _T("TortoiseGit"), MB_OK|MB_ICONERROR); + MessageBox(_T("Switching to new branch failed:\n") + out, _T("TortoiseGit"), MB_OK | MB_ICONERROR); bAddSuccess = false; } } @@ -753,7 +753,7 @@ void CCommitDlg::OnOK() if (!m_bNoPostActions && !m_bAutoClose) { progress.m_PostCmdList.Add( IsGitSVN? CString(MAKEINTRESOURCE(IDS_MENUSVNDCOMMIT)): CString(MAKEINTRESOURCE(IDS_MENUPUSH))); - progress.m_PostCmdList.Add(_T("&ReCommit")); + progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_RECOMMIT))); progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_MENUTAG))); } @@ -1624,7 +1624,7 @@ bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit) CString line; CString status = entry->GetActionName(); if(entry->m_Action & CTGitPath::LOGACTIONS_UNVER) - status = _T("Add"); + status = _T("Add"); // I18N TODO //git_wc_status_kind status = entry->status; WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID()); diff --git a/src/TortoiseProc/CommitDlg.h b/src/TortoiseProc/CommitDlg.h index 6af2feaa2..03cb1afca 100644 --- a/src/TortoiseProc/CommitDlg.h +++ b/src/TortoiseProc/CommitDlg.h @@ -61,9 +61,9 @@ public: void ShowViewPatchText(bool b=true) { if(b) - this->m_ctrlShowPatch.SetWindowText(_T("View Patch>>")); + this->m_ctrlShowPatch.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_SHOWPATCH))); else - this->m_ctrlShowPatch.SetWindowText(_T("Hide Patch<<")); + this->m_ctrlShowPatch.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_COMMIT_HIDEPATCH))); m_ctrlShowPatch.Invalidate(); } diff --git a/src/TortoiseProc/GitLogListAction.cpp b/src/TortoiseProc/GitLogListAction.cpp index c7abb651b..5b836b381 100644 --- a/src/TortoiseProc/GitLogListAction.cpp +++ b/src/TortoiseProc/GitLogListAction.cpp @@ -70,14 +70,14 @@ int CGitLogList::RevertSelectedCommits() #if 0 if(!g_Git.CheckCleanWorkTree()) { - CMessageBox::Show(NULL,_T("Revert requires a clean working tree"),_T("TortoiseGit"),MB_OK); + CMessageBox::Show(NULL, IDS_PROC_NOCLEAN, IDS_APPNAME, MB_OK); } #endif if (progress.IsValid() && (this->GetSelectedCount() > 1) ) { - progress.SetTitle(_T("Revert Commit")); + progress.SetTitle(CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_REVERTCOMMIT))); progress.SetAnimation(IDR_MOVEANI); progress.SetTime(true); progress.ShowModeless(this); @@ -94,9 +94,11 @@ int CGitLogList::RevertSelectedCommits() if (progress.IsValid() && (this->GetSelectedCount() > 1) ) { - progress.FormatPathLine(1, _T("Revert %s"), r1->m_CommitHash.ToString()); - progress.FormatPathLine(2, _T("%s"), r1->GetSubject()); - progress.SetProgress(i, this->GetSelectedCount()); + CString temp; + temp.Format(IDS_PROC_REVERTCOMMIT, r1->m_CommitHash.ToString()); + progress.FormatPathLine(1, temp); + progress.FormatPathLine(2, _T("%s"), r1->GetSubject()); + progress.SetProgress(i, this->GetSelectedCount()); } i++; @@ -108,14 +110,15 @@ int CGitLogList::RevertSelectedCommits() if (g_Git.Run(cmd, &output, CP_UTF8)) { CString str; - str=_T("Revert fail\n"); + str.LoadString(IDS_SVNACTION_FAILEDREVERT); + str += _T("\n"); str+= cmd; str+= _T("\n")+output; if( GetSelectedCount() == 1) - CMessageBox::Show(NULL,str, _T("TortoiseGit"),MB_OK|MB_ICONERROR); + CMessageBox::Show(NULL, str, _T("TortoiseGit"), MB_OK | MB_ICONERROR); else { - if(CMessageBox::Show(NULL, str, _T("TortoiseGit"),2 , IDI_ERROR, _T("&Skip"), _T("&Abort")) == 2) + if(CMessageBox::Show(NULL, str, _T("TortoiseGit"),2 , IDI_ERROR, CString(MAKEINTRESOURCE(IDS_SKIPBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 2) { return ret; } @@ -155,14 +158,15 @@ int CGitLogList::CherryPickFrom(CString from, CString to) { if (progress.IsValid()) { - progress.FormatPathLine(1, _T("Pick up %s"), logs.GetGitRevAt(i).m_CommitHash.ToString()); + CString temp; + temp.Format(IDS_PROC_PICK, logs.GetGitRevAt(i).m_CommitHash.ToString()); + progress.FormatPathLine(1, temp); progress.FormatPathLine(2, _T("%s"), logs.GetGitRevAt(i).GetSubject()); progress.SetProgress(logs.size()-i, logs.size()); } if ((progress.IsValid())&&(progress.HasUserCancelled())) { - //CMessageBox::Show(hwndExplorer, IDS_SVN_USERCANCELLED, IDS_APPNAME, MB_ICONINFORMATION); - throw std::exception(CUnicodeUtils::GetUTF8(_T("User canceled\r\n\r\n"))); + throw std::exception(CUnicodeUtils::GetUTF8(CString(MAKEINTRESOURCE(IDS_SVN_USERCANCELLED)))); return -1; } CString cmd,out; @@ -170,7 +174,7 @@ int CGitLogList::CherryPickFrom(CString from, CString to) out.Empty(); if(g_Git.Run(cmd,&out,CP_UTF8)) { - throw std::exception(CUnicodeUtils::GetUTF8(CString(_T("Cherry Pick Failure\r\n\r\n"))+out)); + throw std::exception(CUnicodeUtils::GetUTF8(CString(MAKEINTRESOURCE(IDS_PROC_CHERRYPICKFAILED)) + _T(":\r\n\r\n") + out)); return -1; } } @@ -226,8 +230,8 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe if(cmd > r1->m_ParentHash.size()) { CString str; - str.Format(_T("Parent %d does not exist"), cmd); - CMessageBox::Show(NULL,str,_T("TortoiseGit"),MB_OK|MB_ICONERROR); + str.Format(IDS_PROC_NOPARENT, cmd); + MessageBox(str, _T("TortoiseGit"), MB_OK | MB_ICONERROR); return; } else @@ -318,7 +322,7 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe } else { - CMessageBox::Show(NULL,_T("No previous version"),_T("TortoiseGit"),MB_OK); + CMessageBox::Show(NULL, IDS_PROC_NOPREVIOUSVERSION, IDS_APPNAME, MB_OK); } //if (PromptShown()) //{ @@ -432,7 +436,7 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe GitRev* pLastEntry = reinterpret_cast(m_arShownList.GetAt(LastSelect)); if(pFirstEntry->m_CommitHash != hashFirst || pLastEntry->m_CommitHash != hashLast) { - CMessageBox::Show(NULL,_T("Cannot combine commits now.\r\nMake sure you are viewing the log of your current branch and no filters are applied."),_T("TortoiseGit"),MB_OK); + CMessageBox::Show(NULL, IDS_PROC_CANNOTCOMBINE, IDS_APPNAME, MB_OK); break; } @@ -440,7 +444,7 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe if(!g_Git.CheckCleanWorkTree()) { - CMessageBox::Show(NULL,_T("Combine needs a clean work tree"),_T("TortoiseGit"),MB_OK); + CMessageBox::Show(NULL, IDS_PROC_NOCLEAN, IDS_APPNAME, MB_OK); break; } CString cmd,out; @@ -452,13 +456,13 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe if(g_Git.Run(cmd,&out,CP_UTF8)) { CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK); - throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not reset to first commit (first step) aborting...\r\n\r\n")+out)); + throw std::exception(CUnicodeUtils::GetUTF8(CString(MAKEINTRESOURCE(IDS_PROC_COMBINE_ERRORSTEP1)) + _T("\r\n\r\n") + out)); } cmd.Format(_T("git.exe reset --mixed %s"),hashLast.ToString()); if(g_Git.Run(cmd,&out,CP_UTF8)) { CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK); - throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not reset to last commit (second step) aborting...\r\n\r\n")+out)); + throw std::exception(CUnicodeUtils::GetUTF8(CString(MAKEINTRESOURCE(IDS_PROC_COMBINE_ERRORSTEP2)) + _T("\r\n\r\n")+out)); } CTGitPathList PathList; @@ -565,16 +569,16 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe } } else - throw std::exception("User aborted the combine process"); + throw std::exception(CUnicodeUtils::GetUTF8(CString(MAKEINTRESOURCE(IDS_SVN_USERCANCELLED)))); } catch(std::exception& e) { - CMessageBox::Show(NULL,CUnicodeUtils::GetUnicode(CStringA(e.what())),_T("TortoiseGit: Combine error"),MB_OK|MB_ICONERROR); + CMessageBox::Show(NULL, CUnicodeUtils::GetUnicode(CStringA(e.what())), _T("TortoiseGit"), MB_OK | MB_ICONERROR); cmd.Format(_T("git.exe reset --hard %s"),headhash.ToString()); out.Empty(); if(g_Git.Run(cmd,&out,CP_UTF8)) { - CMessageBox::Show(NULL,_T("Could not reset to original HEAD\r\n\r\n")+out,_T("TortoiseGit"),MB_OK); + CMessageBox::Show(NULL, CString(MAKEINTRESOURCE(IDS_PROC_COMBINE_ERRORRESETHEAD)) + _T("\r\n\r\n") + out, _T("TortoiseGit"), MB_OK); } } Refresh(); @@ -584,7 +588,7 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe case ID_CHERRY_PICK: if(!g_Git.CheckCleanWorkTree()) { - CMessageBox::Show(NULL,_T("Cherry Pick requires a clean working tree"),_T("TortoiseGit"),MB_OK); + CMessageBox::Show(NULL, IDS_PROC_NOCLEAN, IDS_APPNAME, MB_OK); } else @@ -610,7 +614,7 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe case ID_REBASE_TO_VERSION: if(!g_Git.CheckCleanWorkTree()) { - CMessageBox::Show(NULL,_T("Rebase requires a clean working tree"),_T("TortoiseGit"),MB_OK); + CMessageBox::Show(NULL, IDS_PROC_NOCLEAN, IDS_APPNAME, MB_OK); } else @@ -648,11 +652,11 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe { CString str; if (GetSelectedCount() > 1) - str.Format(_T("Do you really want to permanently delete the %d selected refs? It can NOT be recovered!"), GetSelectedCount()); + str.Format(IDS_PROC_DELETENREFS, GetSelectedCount()); else - str.Format(_T("Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n\r\nDo you really want to continue?"), pSelLogEntry->m_Ref); + str.Format(IDS_PROC_DELETEREF, pSelLogEntry->m_Ref); - if (CMessageBox::Show(NULL, str, _T("TortoiseGit"), 1, IDI_QUESTION, _T("&Delete"), _T("&Abort")) == 2) + if (CMessageBox::Show(NULL, str, _T("TortoiseGit"), 1, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_DELETEBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 2) return; POSITION pos = GetFirstSelectedItemPosition(); @@ -746,9 +750,9 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe CString cmd; if (this->GetShortName(*branch, shortname, _T("refs/remotes/"))) { - CString msg = _T("The branch \"") + *branch + _T("\" is a remote branch.\n\n"); - msg += _T("Do you really want to delete it?"); - int result = CMessageBox::Show(NULL, msg, _T("TortoiseGit"), 3, IDI_QUESTION, _T("&Delete remote && local"), _T("Delete &local"), _T("&Abort")); + CString msg; + msg.Format(IDS_PROC_DELETEREMOTEBRANCH, *branch); + int result = CMessageBox::Show(NULL, msg, _T("TortoiseGit"), 3, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_PROC_DELETEREMOTEBRANCH_LOCALREMOTE)), CString(MAKEINTRESOURCE(IDS_PROC_DELETEREMOTEBRANCH_LOCAL)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))); if (result == 1) { CString remoteName = shortname.Left(shortname.Find('/')); @@ -765,21 +769,26 @@ void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMe } else if (this->GetShortName(*branch, shortname, _T("refs/stash"))) { - if (CMessageBox::Show(NULL, _T("Do you really want to delete ALL stash?"), _T("TortoiseGit"), 2, IDI_QUESTION, _T("&Delete"), _T("&Abort")) == 1) + if (CMessageBox::Show(NULL, IDS_PROC_DELETEALLSTASH, IDS_APPNAME, 2, IDI_QUESTION, IDS_DELETEBUTTON, IDS_ABORTBUTTON) == 1) cmd.Format(_T("git.exe stash clear")); else return; } - else if (CMessageBox::Show(NULL, _T("Do you really want to delete ") + *branch + _T("?"), _T("TortoiseGit"), 2, IDI_QUESTION, _T("&Delete"), _T("&Abort")) == 1) + else { - if(this->GetShortName(*branch,shortname,_T("refs/heads/"))) + CString msg; + msg.Format(IDS_PROC_DELETEBRANCHTAG, *branch); + if (CMessageBox::Show(NULL, msg, _T("TortoiseGit"), 2, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_DELETEBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 1) { - cmd.Format(_T("git.exe branch -D -- %s"),shortname); - } + if(this->GetShortName(*branch,shortname,_T("refs/heads/"))) + { + cmd.Format(_T("git.exe branch -D -- %s"),shortname); + } - if(this->GetShortName(*branch,shortname,_T("refs/tags/"))) - { - cmd.Format(_T("git.exe tag -d -- %s"),shortname); + if(this->GetShortName(*branch,shortname,_T("refs/tags/"))) + { + cmd.Format(_T("git.exe tag -d -- %s"),shortname); + } } } if (!cmd.IsEmpty()) diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index cb5ec4bd7..ebcd8245c 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -599,10 +599,14 @@ void CRebaseDlg::AddBranchToolTips(CHistoryCombo *pBranch) GitRev rev; rev.GetCommit(text); - tooltip.Format(IDS_PROC_REVISIONTOOLTIP, + tooltip.Format(_T("%s: %s\n%s: %s\n%s: %s\n%s:\n%s\n%s"), + CString(MAKEINTRESOURCE(IDS_LOG_REVISION)), rev.m_CommitHash.ToString(), + CString(MAKEINTRESOURCE(IDS_LOG_AUTHOR)), rev.GetAuthorName(), + CString(MAKEINTRESOURCE(IDS_LOG_DATE)), CLoglistUtils::FormatDateAndTime(rev.GetAuthorDate(), DATE_LONGDATE), + CString(MAKEINTRESOURCE(IDS_LOG_MESSAGE)), rev.GetSubject(), rev.GetBody()); diff --git a/src/TortoiseProc/Settings/SettingGitConfig.cpp b/src/TortoiseProc/Settings/SettingGitConfig.cpp index 3ad9df350..3c6617e0f 100644 --- a/src/TortoiseProc/Settings/SettingGitConfig.cpp +++ b/src/TortoiseProc/Settings/SettingGitConfig.cpp @@ -108,7 +108,9 @@ BOOL CSettingGitConfig::OnInitDialog() CString proj; if (g_GitAdminDir.HasAdminDir(str, &proj) || isBareRepo) { - this->SetWindowText(_T("Config - ") + proj); + CString title; + this->GetWindowText(title); + this->SetWindowText(title + _T(" - ") + proj); this->GetDlgItem(IDC_CHECK_GLOBAL)->EnableWindow(TRUE); this->GetDlgItem(IDC_EDITLOCALGITCONFIG)->EnableWindow(TRUE); } @@ -120,7 +122,7 @@ BOOL CSettingGitConfig::OnInitDialog() } if (isBareRepo) - this->GetDlgItem(IDC_EDITLOCALGITCONFIG)->SetWindowText(_T("Edit local git config")); + this->GetDlgItem(IDC_EDITLOCALGITCONFIG)->SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_GITCONFIG_EDITLOCALGONCFIG))); this->UpdateData(FALSE); return TRUE; @@ -246,7 +248,7 @@ void CSettingGitConfig::OnBnClickedEditsystemgitconfig() const char * systemdir = get_msysgit_etc(); if (!systemdir) { - ::MessageBox(NULL, _T("MSysGit directory not set (see \"General\" settings page)."), _T("TortoiseGit"), MB_ICONERROR); + CMessageBox::Show(NULL, IDS_PROC_GITCONFIG_NOMSYSGIT, IDS_APPNAME, MB_ICONERROR); return; } _tcscpy_s(buf, MAX_PATH, CA2CT(systemdir)); diff --git a/src/TortoiseProc/Settings/SettingGitRemote.cpp b/src/TortoiseProc/Settings/SettingGitRemote.cpp index 830fe1091..5a7324afd 100644 --- a/src/TortoiseProc/Settings/SettingGitRemote.cpp +++ b/src/TortoiseProc/Settings/SettingGitRemote.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2011 - TortoiseGit +// Copyright (C) 2008-2012 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -74,7 +74,9 @@ BOOL CSettingGitRemote::OnInitDialog() CString proj; if( g_GitAdminDir.HasAdminDir(m_cmdPath,&proj) ) { - this->SetWindowText(CString(_T("Config - "))+proj); + CString title; + this->GetWindowText(title); + this->SetWindowText(title + _T(" - ") + proj); } CString cmd, out, err; @@ -106,7 +108,7 @@ void CSettingGitRemote::OnBnClickedButtonBrowse() CFileDialog dlg(TRUE,NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - _T("Putty Private Key(*.ppk)|*.ppk|All Files(*.*)|*.*||")); + CString(MAKEINTRESOURCE(IDS_PUTTYKEYFILEFILTER))); this->UpdateData(); if(dlg.DoModal()==IDOK) @@ -123,12 +125,12 @@ void CSettingGitRemote::OnBnClickedButtonAdd() if(m_strRemote.IsEmpty()) { - CMessageBox::Show(NULL, _T("Remote name can't empty"), _T("TortoiseGit"),MB_OK|MB_ICONERROR); + CMessageBox::Show(NULL, IDS_PROC_GITCONFIG_REMOTEEMPTY, IDS_APPNAME, MB_OK | MB_ICONERROR); return; } if(m_strUrl.IsEmpty()) { - CMessageBox::Show(NULL, _T("Remote URL can't empty"),_T("TortoiseGit"), MB_OK|MB_ICONERROR); + CMessageBox::Show(NULL, IDS_PROC_GITCONFIG_URLEMPTY, IDS_APPNAME, MB_OK | MB_ICONERROR); return; } @@ -138,8 +140,9 @@ void CSettingGitRemote::OnBnClickedButtonAdd() m_ChangedMask = REMOTE_NAME |REMOTE_URL |REMOTE_PUTTYKEY; if(IsRemoteExist(m_strRemote)) { - if(CMessageBox::Show(NULL, m_strRemote + _T(" is existed\n Do you want to overwrite it"), - _T("TortoiseGit"), MB_YESNO|MB_ICONQUESTION|MB_DEFBUTTON2) == IDYES) + CString msg; + msg.Format(IDS_PROC_GITCONFIG_OVERWRITEREMOTE, m_strRemote); + if(CMessageBox::Show(NULL, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES) { m_ChangedMask &= ~REMOTE_NAME; } @@ -170,11 +173,8 @@ void CSettingGitRemote::OnLbnSelchangeListRemote() if(m_ChangedMask) { - if(CMessageBox::Show(NULL,_T("Remote Config Changed\nDo you want to save change now or discard change"), - _T("TortoiseGit"),1,NULL,_T("Save"),_T("Discard")) == 1) - { + if(CMessageBox::Show(NULL, IDS_PROC_GITCONFIG_SAVEREMOTE, IDS_APPNAME, 1, IDI_QUESTION, IDS_SAVEBUTTON, IDS_DISCARDBUTTON) == 1) OnApply(); - } } SetModified(FALSE); @@ -248,7 +248,9 @@ void CSettingGitRemote::Save(CString key,CString value) cmd.Format(_T("remote.%s.%s"),this->m_strRemote,key); if (g_Git.SetConfigValue(cmd, value, CONFIG_LOCAL, CP_UTF8, &g_Git.m_CurrentDir)) { - CMessageBox::Show(NULL,_T("Fail to save config"),_T("TortoiseGit"),MB_OK|MB_ICONERROR); + CString msg; + msg.Format(IDS_PROC_SAVECONFIGFAILED, cmd, value); + CMessageBox::Show(NULL, msg, _T("TortoiseGit"), MB_OK | MB_ICONERROR); } } BOOL CSettingGitRemote::OnApply() @@ -258,9 +260,14 @@ BOOL CSettingGitRemote::OnApply() if(m_ChangedMask & REMOTE_NAME) { //Add Remote - if( this->m_strRemote.IsEmpty() || this->m_strUrl.IsEmpty() ) + if(m_strRemote.IsEmpty()) + { + CMessageBox::Show(NULL, IDS_PROC_GITCONFIG_REMOTEEMPTY, IDS_APPNAME, MB_OK | MB_ICONERROR); + return FALSE; + } + if(m_strUrl.IsEmpty()) { - CMessageBox::Show(NULL,_T("Remote Name and URL can't be Empty"),_T("TortoiseGit"),MB_OK|MB_ICONERROR); + CMessageBox::Show(NULL, IDS_PROC_GITCONFIG_URLEMPTY, IDS_APPNAME, MB_OK | MB_ICONERROR); return FALSE; } CString cmd,out; @@ -298,8 +305,9 @@ void CSettingGitRemote::OnBnClickedButtonRemove() { CString str; m_ctrlRemoteList.GetText(index,str); - if(CMessageBox::Show(NULL,str + _T(" will be removed\n Are you sure?"),_T("TortoiseGit"), - MB_YESNO|MB_ICONQUESTION) == IDYES) + CString msg; + msg.Format(IDS_PROC_GITCONFIG_DELETEREMOTE, str); + if(CMessageBox::Show(NULL, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES) { CString cmd,out; cmd.Format(_T("git.exe remote rm %s"),str); diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index eaa52235d..144860930 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -268,7 +268,7 @@ #define IDS_PROC_REVISIONFILES 1057 #define IDS_PROC_NOTHINGTOREBASE 1058 #define IDC_CLEARAUTH 1059 -#define IDS_PROC_REVISIONTOOLTIP 1059 +#define IDS_PROC_NOCLEAN 1059 #define IDS_PROC_NOHEAD 1060 #define IDC_UNKNOWN 1061 #define IDS_PROC_REBASE_STARTCHERRYPICK 1061 @@ -349,46 +349,84 @@ #define IDC_ADDTOOL 1098 #define IDS_REFLOG 1098 #define IDC_EDITTOOL 1099 +#define IDS_PROGS_TITLE_REVERTCOMMIT 1099 #define IDC_REMOVETOOL 1100 #define IDS_AUTH_USERNAME 1100 #define IDS_AUTH_PASSWORD 1101 #define IDC_TOOLLISTCTRL 1101 #define IDC_EXTEDIT 1102 +#define IDS_PROC_REVERTCOMMIT 1102 #define IDC_TOOLEDIT 1103 +#define IDS_PROC_PICK 1103 #define IDC_TOOLBROWSE 1104 +#define IDS_PROC_CHERRYPICKFAILED 1104 #define IDC_SHORTDATEFORMAT 1105 +#define IDS_PROC_NOPARENT 1105 #define IDC_SUMMARYTEXT 1106 +#define IDS_PROC_NOPREVIOUSVERSION 1106 +#define IDS_PROC_CANNOTCOMBINE 1107 #define IDC_STATISTICS 1108 +#define IDS_PROC_COMBINE_ERRORSTEP1 1108 #define IDC_TEXT_INFO 1109 +#define IDS_PROC_COMBINE_ERRORSTEP2 1109 #define IDC_COMMITLABEL 1110 #define IDS_REG_ERROR 1110 #define IDC_PROGRESS 1111 +#define IDS_PROC_COMBINE_ERRORRESETHEAD 1111 #define IDC_YOURVERSION 1112 +#define IDS_PROC_DELETENREFS 1112 #define IDC_CURRENTVERSION 1113 +#define IDS_PROC_DELETEREF 1113 #define IDC_CHECKRESULT 1114 +#define IDS_DELETEBUTTON 1114 +#define IDS_PROC_DELETEREMOTEBRANCH 1115 +#define IDS_PROC_DELETEREMOTEBRANCH_LOCALREMOTE 1116 +#define IDS_PROC_DELETEREMOTEBRANCH_LOCAL 1117 +#define IDS_PROC_DELETEALLSTASH 1118 #define IDC_BUGIDLABEL 1119 +#define IDS_PROC_DELETEBRANCHTAG 1119 +#define IDS_PUTTYKEYFILEFILTER 1120 +#define IDS_PROC_GITCONFIG_REMOTEEMPTY 1121 +#define IDS_PROC_GITCONFIG_URLEMPTY 1122 +#define IDS_PROC_GITCONFIG_OVERWRITEREMOTE 1123 #define IDC_OLDLOGS 1124 #define IDC_ICONSETCOMBO 1124 +#define IDS_PROC_GITCONFIG_SAVEREMOTE 1124 #define IDC_CHIST 1125 +#define IDS_SAVEBUTTON 1125 #define IDC_KEEPLISTS 1126 #define IDC_SHOWEXCLUDEDASNORMAL 1126 #define IDC_LOG_FIRSTPARENT 1126 #define IDC_IGNOREEOL 1126 #define IDC_SORTBYCOMMITCOUNT 1126 +#define IDS_DISCARDBUTTON 1126 #define IDC_DIFFBYDOUBLECLICK 1127 +#define IDS_PROC_SAVECONFIGFAILED 1127 +#define IDS_PROC_GITCONFIG_DELETEREMOTE 1128 +#define IDS_PROC_GITCONFIG_EDITLOCALGONCFIG 1129 #define IDC_CHECK_STOPONCOPY 1130 #define IDC_CHECK_UNTRACKED 1130 +#define IDS_PROC_GITCONFIG_NOMSYSGIT 1130 #define IDC_GRAPH 1131 +#define IDS_PROC_CLONE_DIR 1131 #define IDC_STATBUTTON 1132 #define IDC_PATCH_TO_CLIPBOARD 1132 #define IDC_SELECTOVERLAYSET 1132 #define IDC_LOG 1132 +#define IDS_PROC_CLONE_WEB 1132 #define IDC_GRAPHCOMBO 1133 +#define IDS_PROC_CLONE_URLDIREMPTY 1133 #define IDC_GRAPHTYPELABEL 1134 +#define IDS_PROC_COMMIT_SHOWPATCH 1134 #define IDC_COMMITSEACHWEEK 1135 +#define IDS_PROC_COMMIT_HIDEPATCH 1135 #define IDC_MOSTACTIVEAUTHOR 1136 +#define IDS_PROC_COMMIT_RECOMMIT 1136 #define IDC_LEASTACTIVEAUTHOR 1137 +#define IDS_PROC_STASHFAILED 1137 #define IDC_FILECHANGESEACHWEEK 1138 +#define IDS_PROC_STASHSUCCESS 1138 +#define IDS_PROC_NOUSERDATA 1139 #define IDC_COMMITSEACHWEEKAVG 1140 #define IDC_COMMITSEACHWEEKMIN 1141 #define IDC_COMMITSEACHWEEKMAX 1142 -- 2.11.4.GIT