From bad319d0a181e628272f548b1474bb4e79e42127 Mon Sep 17 00:00:00 2001 From: Yue Lin Ho Date: Thu, 25 Jun 2015 18:10:55 +0800 Subject: [PATCH] Delete duplicate string Signed-off-by: Yue Lin Ho --- Languages/Tortoise.pot | 2 +- src/Resources/TortoiseProcENG.rc | 3 +-- src/TortoiseProc/Settings/SettingGitCredential.cpp | 2 +- src/TortoiseProc/Settings/SettingGitRemote.cpp | 2 +- src/TortoiseProc/resource.h | 3 +-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 67245c10b..585cf0516 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -3849,7 +3849,7 @@ msgstr "" msgid "Do you really want to permanently delete the %d selected refs? It can NOT be recovered!" msgstr "" -#. Resource IDs: (1128, 1421) +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "" diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index fe9625bdf..68be1db75 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -3503,7 +3503,6 @@ BEGIN "The credential helper URL ""%s"" already exists.\nDo you want to overwrite it?" IDS_GITCREDENTIAL_SAVEHELPER "The credential helper was changed.\nDo you want to save now or discard changes?" - IDS_GITCREDENTIAL_DELETEHELPER "Do you really want to remove ""%s""?" IDS_RESET_MIXED "Mixed" IDS_RESET_HARD "Hard" END @@ -3703,7 +3702,7 @@ BEGIN 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_WARN_REMOVE "Do you really want to remove ""%s""?" IDS_PROC_GITCONFIG_EDITLOCALGONCFIG "Edit local git config" IDS_PROC_GITCONFIG_NOMSYSGIT "Git directory not set (see ""General"" settings page)." diff --git a/src/TortoiseProc/Settings/SettingGitCredential.cpp b/src/TortoiseProc/Settings/SettingGitCredential.cpp index fb515b0e0..a435dcba2 100644 --- a/src/TortoiseProc/Settings/SettingGitCredential.cpp +++ b/src/TortoiseProc/Settings/SettingGitCredential.cpp @@ -743,7 +743,7 @@ void CSettingGitCredential::OnBnClickedButtonRemove() CString str; m_ctrlUrlList.GetText(index, str); CString msg; - msg.Format(IDS_GITCREDENTIAL_DELETEHELPER, str); + msg.Format(IDS_WARN_REMOVE, str); if (CMessageBox::Show(NULL, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES) { CAutoConfig config(true); diff --git a/src/TortoiseProc/Settings/SettingGitRemote.cpp b/src/TortoiseProc/Settings/SettingGitRemote.cpp index 8efdd5f98..6d4f672e6 100644 --- a/src/TortoiseProc/Settings/SettingGitRemote.cpp +++ b/src/TortoiseProc/Settings/SettingGitRemote.cpp @@ -589,7 +589,7 @@ void CSettingGitRemote::OnBnClickedButtonRemove() CString str; m_ctrlRemoteList.GetText(index,str); CString msg; - msg.Format(IDS_PROC_GITCONFIG_DELETEREMOTE, str); + msg.Format(IDS_WARN_REMOVE, str); if(CMessageBox::Show(NULL, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES) { CString cmd,out; diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 7eefd262a..b683afd32 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -409,7 +409,7 @@ #define IDS_DISCARDBUTTON 1126 #define IDC_DIFFBYDOUBLECLICK 1127 #define IDS_PROC_SAVECONFIGFAILED 1127 -#define IDS_PROC_GITCONFIG_DELETEREMOTE 1128 +#define IDS_WARN_REMOVE 1128 #define IDC_ABBREVIATERENAMINGS 1128 #define IDS_PROC_GITCONFIG_EDITLOCALGONCFIG 1129 #define IDC_CHECK_UNTRACKED 1130 @@ -919,7 +919,6 @@ #define IDS_GITCREDENTIAL_HELPEREMPTY 1418 #define IDS_GITCREDENTIAL_OVERWRITEHELPER 1419 #define IDS_GITCREDENTIAL_SAVEHELPER 1420 -#define IDS_GITCREDENTIAL_DELETEHELPER 1421 #define IDS_RESET_MIXED 1422 #define IDS_RESET_HARD 1423 #define IDS_CHERRYPICKFAILEDSKIP 1424 -- 2.11.4.GIT