From 43badbe973646335de45c880345f7bc32afc5ee9 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 19 Aug 2015 00:04:13 +0200 Subject: [PATCH] Replace msysgit.github.io with git-for-windows.github.io Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 4 ++-- src/Resources/TortoiseProcENG.rc | 4 ++-- src/TortoiseProc/TortoiseProc.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 53c06f354..74e88d16e 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -5014,7 +5014,7 @@ msgid "Git for Windows" msgstr "" #. Resource IDs: (1335) -msgid "Git for Windows (https://msysgit.github.io/) not found." +msgid "Git for Windows (https://git-for-windows.github.io/) not found." msgstr "" #. Resource IDs: (1258) @@ -10520,7 +10520,7 @@ msgid "You cannot change the type of this ref with a rename." msgstr "" #. Resource IDs: (1338) -msgid "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n\nYou should consider an upgrade to 1.9.5+." +msgid "You have an old version of Git for Windows (https://git-for-windows.github.io/) installed which contains security issues.\n\nYou should consider an upgrade to 1.9.5+." msgstr "" #. Resource IDs: (1373) diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 0942b2039..6755cb4cd 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -4486,10 +4486,10 @@ BEGIN "Warning: It has not been checked if these branches have been fully merged into HEAD." IDS_PROC_BROWSEREFS_WARNINGDELETEREMOTEBRANCHES "Warning: This action will remove the branches on the remote." - IDS_PROC_NOMSYSGIT "Git for Windows (https://msysgit.github.io/) not found." + IDS_PROC_NOMSYSGIT "Git for Windows (https://git-for-windows.github.io/) not found." IDS_PROC_SETMSYSGITPATH "&Set Git path" IDS_PROC_GOTOMSYSGITWEBSITE "&Open Git for Windows WebSite" - IDS_PROC_OLDMSYSGIT "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n\nYou should consider an upgrade to 1.9.5+." + IDS_PROC_OLDMSYSGIT "You have an old version of Git for Windows (https://git-for-windows.github.io/) installed which contains security issues.\n\nYou should consider an upgrade to 1.9.5+." IDS_PROC_NOTSHOWAGAINIGNORE "Do ¬ show me this warning again (if Ignore is selected)" IDS_PROC_EDITLOCALGITCONFIG "&Edit .git/config" diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp index 98168fe2c..3444621ce 100644 --- a/src/TortoiseProc/TortoiseProc.cpp +++ b/src/TortoiseProc/TortoiseProc.cpp @@ -208,7 +208,7 @@ BOOL CTortoiseProcApp::InitInstance() UINT ret = CMessageBox::Show(NULL, IDS_PROC_NOMSYSGIT, IDS_APPNAME, 3, IDI_HAND, IDS_PROC_SETMSYSGITPATH, IDS_PROC_GOTOMSYSGITWEBSITE, IDS_ABORTBUTTON); if(ret == 2) { - ShellExecute(NULL, _T("open"), _T("https://msysgit.github.io/"), NULL, NULL, SW_SHOW); + ShellExecute(nullptr, _T("open"), _T("https://git-for-windows.github.io/"), nullptr, nullptr, SW_SHOW); } else if(ret == 1) { @@ -223,7 +223,7 @@ BOOL CTortoiseProcApp::InitInstance() if (ret == 1) { CMessageBox::RemoveRegistryKey(_T("OldMsysgitVersionWarning")); // only store answer if it is "Ignore" - ShellExecute(NULL, _T("open"), _T("https://msysgit.github.io/"), NULL, NULL, SW_SHOW); + ShellExecute(nullptr, _T("open"), _T("https://git-for-windows.github.io/"), nullptr, nullptr, SW_SHOW); return FALSE; } else if (ret == 2) -- 2.11.4.GIT