From 1be5ab20e5eae00d06b9bf072eaa93742227670e Mon Sep 17 00:00:00 2001 From: Yue Lin Ho Date: Fri, 16 Jun 2017 07:18:18 +0800 Subject: [PATCH] Delete duplicate string resources The duplicates: IDS_LOG_POPUP_GNUDIFF vs. IDS_LOG_POPUP_GNUDIFF_CH IDS_LOG_POPUP_MERGEREV vs. IDS_LOG_POPUP_MERGEREVS Signed-off-by: Yue Lin Ho --- Languages/Tortoise.pot | 4 ++-- src/Resources/LoglistCommonResource.h | 2 -- src/Resources/TortoiseLoglistCommon.rc2 | 2 -- src/TortoiseProc/GitLogListBase.cpp | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 37e947b9b..47bb3cd90 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -5852,7 +5852,7 @@ msgstr "" msgid "Merge between original branch, working tree contents, and the branch to switch to" msgstr "" -#. Resource IDs: (IDS_LOG_POPUP_MERGEREV, IDS_LOG_POPUP_MERGEREVS) +#. Resource IDs: (IDS_LOG_POPUP_MERGEREV) #, c-format msgid "Merge to \"%s\"..." msgstr "" @@ -8174,7 +8174,7 @@ msgstr "" msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (IDS_LOG_POPUP_GNUDIFF, IDS_LOG_POPUP_GNUDIFF_CH) +#. Resource IDs: (IDS_LOG_POPUP_GNUDIFF) msgid "Show changes as &unified diff" msgstr "" diff --git a/src/Resources/LoglistCommonResource.h b/src/Resources/LoglistCommonResource.h index bcd515d08..a95f2e265 100644 --- a/src/Resources/LoglistCommonResource.h +++ b/src/Resources/LoglistCommonResource.h @@ -24,7 +24,6 @@ #define IDS_LOG_HASH 20008 #define IDS_LOG_POPUP_COMPARE 20009 #define IDS_LOG_POPUP_SHOWBRANCHES 20010 -#define IDS_LOG_POPUP_GNUDIFF_CH 20011 #define IDS_LOG_POPUP_COMPAREWITHPREVIOUS 20012 #define IDS_LOG_BROWSEREPO 20013 #define IDS_LOG_POPUP_OPEN 20014 @@ -39,7 +38,6 @@ #define IDS_LOG_POPUP_BLAMEREVS 20025 #define IDS_LOG_POPUP_GNUDIFF 20026 #define IDS_LOG_POPUP_REVERTREVS 20027 -#define IDS_LOG_POPUP_MERGEREVS 20028 #define IDS_LOG_POPUP_EDITAUTHOR 20029 #define IDS_REPOBROWSE_SHOWREVPROP 20030 #define IDS_LOG_POPUP_COPYTOCLIPBOARD 20031 diff --git a/src/Resources/TortoiseLoglistCommon.rc2 b/src/Resources/TortoiseLoglistCommon.rc2 index bb50f344c..211613867 100644 --- a/src/Resources/TortoiseLoglistCommon.rc2 +++ b/src/Resources/TortoiseLoglistCommon.rc2 @@ -60,11 +60,9 @@ BEGIN IDS_LOG_POPUP_COMPAREWITHPREVIOUS "Compare with previous revision" IDS_LOG_POPUP_BLAMEPREVIOUS "Blame previous revision" IDS_LOG_POPUP_BLAME "Blame" - IDS_LOG_POPUP_GNUDIFF_CH "Show changes as &unified diff" IDS_LOG_POPUP_GNUDIFF_PARENT "&Unified diff with" IDS_LOG_POPUP_GETMERGELOGS "Get merge logs" IDS_LOG_POPUP_MERGEREV "Merge to ""%s""..." - IDS_LOG_POPUP_MERGEREVS "Merge to ""%s""..." END STRINGTABLE diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index 146ca8f5a..2dffea177 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -1881,7 +1881,7 @@ void CGitLogListBase::OnContextMenu(CWnd* pWnd, CPoint point) { if (parentHash.size() == 1) { - popup.AppendMenuIcon(ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF_CH, IDI_DIFF); + popup.AppendMenuIcon(ID_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF); requiresSeparator = true; } else if (parentHash.size() > 1) -- 2.11.4.GIT