From 089a2d75740a82f3f4daa6282e156440e739c212 Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Wed, 31 Oct 2018 10:41:13 +0100 Subject: [PATCH] Take shorter name 7-Zip ZS instead of 7-Zip Zstandard --- C/7zVersion.rc | 2 +- C/Util/7zipInstall/7zipInstall.c | 2 +- C/Util/7zipInstall/resource.rc | 4 ++-- C/Util/7zipUninstall/7zipUninstall.c | 2 +- C/Util/7zipUninstall/resource.rc | 4 ++-- CPP/7zip/Bundles/Codec_zstd/resource.rc | 2 +- CPP/7zip/Bundles/Codec_zstdF/resource.rc | 2 +- CPP/7zip/UI/Explorer/ContextMenu.cpp | 4 ++-- CPP/7zip/UI/FileManager/MenuPage.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/C/7zVersion.rc b/C/7zVersion.rc index 56c8f993..5c118479 100644 --- a/C/7zVersion.rc +++ b/C/7zVersion.rc @@ -40,7 +40,7 @@ BEGIN \ VALUE "InternalName", intName \ VALUE "LegalCopyright", MY_COPYRIGHT \ VALUE "OriginalFilename", origName \ - VALUE "ProductName", "7-Zip Zstandard" \ + VALUE "ProductName", "7-Zip ZS" \ VALUE "ProductVersion", MY_VERSION \ END \ END \ diff --git a/C/Util/7zipInstall/7zipInstall.c b/C/Util/7zipInstall/7zipInstall.c index f624b31d..519546e9 100644 --- a/C/Util/7zipInstall/7zipInstall.c +++ b/C/Util/7zipInstall/7zipInstall.c @@ -48,7 +48,7 @@ static LPCWSTR const k_Reg_Software_7zip = L"Software\\7-Zip-Zstandard"; #define _64BIT_INSTALLER 1 #endif -#define k_7zip_with_Ver_base L"7-Zip Zstandard " LLL(MY_VERSION) +#define k_7zip_with_Ver_base L"7-Zip ZS " LLL(MY_VERSION) #ifdef _64BIT_INSTALLER #define k_7zip_with_Ver k_7zip_with_Ver_base L" (x64)" diff --git a/C/Util/7zipInstall/resource.rc b/C/Util/7zipInstall/resource.rc index 4c8ac556..9fac35b1 100644 --- a/C/Util/7zipInstall/resource.rc +++ b/C/Util/7zipInstall/resource.rc @@ -6,7 +6,7 @@ #include "../../7zVersion.rc" #include "resource.h" -MY_VERSION_INFO(MY_VFT_APP, "7-Zip Installer Zstandard", "7zipInstall", "7zipInstall.exe") +MY_VERSION_INFO(MY_VFT_APP, "7-Zip Installer ZS", "7zipInstall", "7zipInstall.exe") 1 ICON "7zip.ico" @@ -28,7 +28,7 @@ MY_VERSION_INFO(MY_VFT_APP, "7-Zip Installer Zstandard", "7zipInstall", "7zipIns IDD_INSTALL DIALOG 0, 0, xs, ys STYLE DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Install 7-Zip Zstandard" +CAPTION "Install 7-Zip ZS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Destination folder:", IDT_EXTRACT_EXTRACT_TO, m, m, xc, 8 diff --git a/C/Util/7zipUninstall/7zipUninstall.c b/C/Util/7zipUninstall/7zipUninstall.c index 381a5574..c3973817 100644 --- a/C/Util/7zipUninstall/7zipUninstall.c +++ b/C/Util/7zipUninstall/7zipUninstall.c @@ -28,7 +28,7 @@ #define _64BIT_INSTALLER 1 #endif -#define k_7zip_with_Ver_base L"7-Zip Zstandard " LLL(MY_VERSION) +#define k_7zip_with_Ver_base L"7-Zip ZS " LLL(MY_VERSION) #ifdef _64BIT_INSTALLER #define k_7zip_with_Ver k_7zip_with_Ver_base L" (x64)" diff --git a/C/Util/7zipUninstall/resource.rc b/C/Util/7zipUninstall/resource.rc index e9dd2e32..87fe1dd0 100644 --- a/C/Util/7zipUninstall/resource.rc +++ b/C/Util/7zipUninstall/resource.rc @@ -6,7 +6,7 @@ #include "../../7zVersion.rc" #include "resource.h" -MY_VERSION_INFO(MY_VFT_APP, "7-Zip Uninstaller Zstandard", "Uninstall", "Uninstall.exe") +MY_VERSION_INFO(MY_VFT_APP, "7-Zip Uninstaller ZS", "Uninstall", "Uninstall.exe") 1 ICON "7zipUninstall.ico" @@ -28,7 +28,7 @@ MY_VERSION_INFO(MY_VFT_APP, "7-Zip Uninstaller Zstandard", "Uninstall", "Uninsta IDD_INSTALL DIALOG 0, 0, xs, ys STYLE DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Uninstall 7-Zip Zstandard" +CAPTION "Uninstall 7-Zip ZS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Uninstall from:", IDT_EXTRACT_EXTRACT_TO, m, m, xc, 8 diff --git a/CPP/7zip/Bundles/Codec_zstd/resource.rc b/CPP/7zip/Bundles/Codec_zstd/resource.rc index c11903e8..5d17e2cc 100644 --- a/CPP/7zip/Bundles/Codec_zstd/resource.rc +++ b/CPP/7zip/Bundles/Codec_zstd/resource.rc @@ -1,6 +1,6 @@ #include "../../../../C/7zVersionTr.h" #include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.7", "zstd") +MY_VERSION_INFO_DLL("7-Zip ZS Plugin v1.3.7", "zstd") 101 ICON "../../Archive/Icons/zst.ico" diff --git a/CPP/7zip/Bundles/Codec_zstdF/resource.rc b/CPP/7zip/Bundles/Codec_zstdF/resource.rc index c11903e8..5d17e2cc 100644 --- a/CPP/7zip/Bundles/Codec_zstdF/resource.rc +++ b/CPP/7zip/Bundles/Codec_zstdF/resource.rc @@ -1,6 +1,6 @@ #include "../../../../C/7zVersionTr.h" #include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.7", "zstd") +MY_VERSION_INFO_DLL("7-Zip ZS Plugin v1.3.7", "zstd") 101 ICON "../../Archive/Icons/zst.ico" diff --git a/CPP/7zip/UI/Explorer/ContextMenu.cpp b/CPP/7zip/UI/Explorer/ContextMenu.cpp index 21e79e38..ba62bed7 100644 --- a/CPP/7zip/UI/Explorer/ContextMenu.cpp +++ b/CPP/7zip/UI/Explorer/ContextMenu.cpp @@ -762,7 +762,7 @@ STDMETHODIMP CZipContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, mi.fMask |= MIIM_CHECKMARKS; mi.wID = currentCommandID++; mi.hSubMenu = popupMenu.Detach(); - mi.StringValue = "7-Zip Zstandard"; // LangString(IDS_CONTEXT_POPUP_CAPTION); + mi.StringValue = "7-Zip ZS"; // LangString(IDS_CONTEXT_POPUP_CAPTION); mi.hbmpUnchecked = bitmap; CMenu menu; @@ -798,7 +798,7 @@ STDMETHODIMP CZipContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, mi.fMask |= MIIM_CHECKMARKS; mi.wID = currentCommandID++; mi.hSubMenu = subMenu; - mi.StringValue = "CRC SHA Zstandard"; + mi.StringValue = "7-Zip ZS Hash"; mi.hbmpUnchecked = bitmap; CMenu menu; diff --git a/CPP/7zip/UI/FileManager/MenuPage.cpp b/CPP/7zip/UI/FileManager/MenuPage.cpp index ea85ad78..8e80dc7a 100644 --- a/CPP/7zip/UI/FileManager/MenuPage.cpp +++ b/CPP/7zip/UI/FileManager/MenuPage.cpp @@ -187,7 +187,7 @@ bool CMenuPage::OnInit() UString s = LangString(menuItem.ControlID); if (menuItem.Flag == kCRC) - s = "CRC SHA"; + s = "HASH"; if (menuItem.Flag == kOpenAs || menuItem.Flag == kCRC) s += " >";