From 035326e37026f0c0bdc50d0dafc2a2b78a585d3c Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 5 Jul 2015 14:36:04 +0200 Subject: [PATCH] Update links (HTTPSify and drop code.google.com) Signed-off-by: Sven Strickroth --- .tgitconfig | 2 +- Languages/LanguagePack.wxs | 2 +- Languages/Tortoise.pot | 2 +- Languages/TortoisePotHeader.txt | 2 +- doc/source/en/TortoiseGit/tgit_app_admins.xml | 2 +- doc/source/en/TortoiseGit/tgit_app_faq.xml | 4 ++-- doc/source/en/TortoiseGit/tgit_dug/dug_bugtracker.xml | 2 +- doc/source/en/TortoiseGit/tgit_dug/dug_rebase.xml | 2 +- .../en/TortoiseGit/tgit_dug/dug_settings_general.xml | 4 ++-- .../en/TortoiseGit/tgit_dug/dug_settings_network.xml | 5 +---- doc/source/en/TortoiseGit/tgit_introduction.xml | 6 +++--- doc/source/en/TortoiseGit/tgit_preface.xml | 4 ++-- doc/source/en/TortoiseMerge/tme_preface.xml | 4 ++-- doc/source/en/wishlist.xml | 2 +- ext/gitdll/gitdll.rc2 | 4 ++-- src/Changelog-pre1.8.txt | 2 +- src/Resources/TortoiseMerge.rc2 | 4 ++-- src/Resources/TortoiseProc.rc2 | 4 ++-- src/Resources/TortoiseShell.rc2 | 2 +- src/SshAskPass/SshAskPass.rc2 | 4 ++-- src/TGitCache/TGITCache.rc2 | 2 +- src/TortoiseGitBlame/res/TortoiseGitBlame.rc2 | 2 +- src/TortoiseGitSetup/CustomActions/CustomActions.cpp | 2 +- src/TortoiseGitSetup/Includes.wxi | 2 +- src/TortoiseGitSetup/include/TGIT_eula.rtf | 2 +- src/TortoiseIDiff/TortoiseIDiff.rc2 | 2 +- src/TortoiseMerge/AboutDlg.cpp | 2 +- src/TortoiseProc/AboutDlg.cpp | 4 ++-- src/TortoiseProc/CheckForUpdatesDlg.cpp | 4 ++-- src/TortoiseProc/CommitDlg.cpp | 4 ++-- src/TortoiseShell/TortoiseStub.rc | 2 +- .../TortoiseIDiff.rc2 => TortoiseUDiff/TortoiseUDiff.rc2} | 14 +++++++------- src/touch/touch.rc2 | 2 +- 33 files changed, 52 insertions(+), 55 deletions(-) copy src/{TortoiseIDiff/TortoiseIDiff.rc2 => TortoiseUDiff/TortoiseUDiff.rc2} (69%) diff --git a/.tgitconfig b/.tgitconfig index c8f1913b6..f71de00ac 100644 --- a/.tgitconfig +++ b/.tgitconfig @@ -1,5 +1,5 @@ [bugtraq] - url = https://code.google.com/p/tortoisegit/issues/detail?id=%BUGID% + url = https://tortoisegit.org/issue/%BUGID% logregex = "[Ii]ssues?:?(\\s*(,|and)?\\s*#?\\d+)+\n(\\d+)" warnifnoissue = false diff --git a/Languages/LanguagePack.wxs b/Languages/LanguagePack.wxs index ded07dc8e..62de2135e 100644 --- a/Languages/LanguagePack.wxs +++ b/Languages/LanguagePack.wxs @@ -13,7 +13,7 @@ \n" diff --git a/Languages/TortoisePotHeader.txt b/Languages/TortoisePotHeader.txt index 3e99f099d..5cf29dcb7 100644 --- a/Languages/TortoisePotHeader.txt +++ b/Languages/TortoisePotHeader.txt @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" diff --git a/doc/source/en/TortoiseGit/tgit_app_admins.xml b/doc/source/en/TortoiseGit/tgit_app_admins.xml index d34978d4f..df6356a5f 100644 --- a/doc/source/en/TortoiseGit/tgit_app_admins.xml +++ b/doc/source/en/TortoiseGit/tgit_app_admins.xml @@ -118,7 +118,7 @@ langs="1031;de" The filenames are generated as follows: TortoiseGit-(version)-(32|64)bit.msi for the main installer (if not overridden by mainfilename=TortoiseGit-%1!s!-%2!s!bit.msi) and TortoiseGit-LanguagePack-(version)-(32|64)bit-(cs|de|...).msi for the language packs (if not overridden by languagepackfilename=TortoiseGit-LanguagePack-%1!s!-%2!s!bit-%3!s!.msi; %4!d! is the four digit country code). Using langs lines, one can advertise language packs (Syntax of one line: Four digit country code;ISO Country code). - Using a issuesurl line, it is possible to control the URL to which the issues are linked to (default is https://code.google.com/p/tortoisegit/issues/detail?id=%BUGID%; can also be empty to disable linking), + Using a issuesurl line, it is possible to control the URL to which the issues are linked to (default is https://tortoisegit.org/issue/%BUGID%; can also be empty to disable linking), Clicking on Download downloads the selected files as well as their digital signature files (filename.asc) to FOLDERID_Downloads (Vista or later) or diff --git a/doc/source/en/TortoiseGit/tgit_app_faq.xml b/doc/source/en/TortoiseGit/tgit_app_faq.xml index 36cadcfd5..003a66bb3 100644 --- a/doc/source/en/TortoiseGit/tgit_app_faq.xml +++ b/doc/source/en/TortoiseGit/tgit_app_faq.xml @@ -11,7 +11,7 @@ it is sometimes hard to keep the documentation completely up to date. - + online FAQ @@ -22,7 +22,7 @@ We also maintain a project - + Issue Tracker which tells you about some of the things we have on our To-Do list, diff --git a/doc/source/en/TortoiseGit/tgit_dug/dug_bugtracker.xml b/doc/source/en/TortoiseGit/tgit_dug/dug_bugtracker.xml index aea5dfb54..c8c7cf4f6 100644 --- a/doc/source/en/TortoiseGit/tgit_dug/dug_bugtracker.xml +++ b/doc/source/en/TortoiseGit/tgit_dug/dug_bugtracker.xml @@ -79,7 +79,7 @@ TortoiseGit shows only the issue number and not the link to it. e.g the TortoiseGit project is using - https://code.google.com/p/tortoisegit/issues/detail?id=%BUGID% + https://tortoisegit.org/issue/%BUGID% diff --git a/doc/source/en/TortoiseGit/tgit_dug/dug_rebase.xml b/doc/source/en/TortoiseGit/tgit_dug/dug_rebase.xml index 7eb6dd303..6d92a38ec 100644 --- a/doc/source/en/TortoiseGit/tgit_dug/dug_rebase.xml +++ b/doc/source/en/TortoiseGit/tgit_dug/dug_rebase.xml @@ -45,7 +45,7 @@ - TortoiseGit currently cannot rebase merge commits (issue #2314). + TortoiseGit currently cannot rebase merge commits (issue #2314). \ No newline at end of file diff --git a/doc/source/en/TortoiseGit/tgit_dug/dug_settings_general.xml b/doc/source/en/TortoiseGit/tgit_dug/dug_settings_general.xml index f4c1eb3ca..5be8c3d27 100644 --- a/doc/source/en/TortoiseGit/tgit_dug/dug_settings_general.xml +++ b/doc/source/en/TortoiseGit/tgit_dug/dug_settings_general.xml @@ -30,8 +30,8 @@ Selects your user interface language. What else did you expect? Only languages of installed LanguagePacks are listed. - You can download language packs on the TortoiseGit download page - or help translating. + You can download language packs on the TortoiseGit download page + or help translating. diff --git a/doc/source/en/TortoiseGit/tgit_dug/dug_settings_network.xml b/doc/source/en/TortoiseGit/tgit_dug/dug_settings_network.xml index 942795bd4..f9f478d68 100644 --- a/doc/source/en/TortoiseGit/tgit_dug/dug_settings_network.xml +++ b/doc/source/en/TortoiseGit/tgit_dug/dug_settings_network.xml @@ -72,10 +72,7 @@ Finally, setting up SSH on clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under - or the latest version - - Git/TortoiseGit SSH How-To - . + . diff --git a/doc/source/en/TortoiseGit/tgit_introduction.xml b/doc/source/en/TortoiseGit/tgit_introduction.xml index 895dfbbf6..1adca857c 100644 --- a/doc/source/en/TortoiseGit/tgit_introduction.xml +++ b/doc/source/en/TortoiseGit/tgit_introduction.xml @@ -74,7 +74,7 @@ who also started using TortoiseGit as their Git client. - For more information what changed over the releases check out the latest release notes or inspect our git commit history. + For more information what changed over the releases check out the latest release notes or inspect our git commit history. @@ -277,11 +277,11 @@ different languages, so you may be able to download a language pack to suit your needs. You can find the language packs on our - + translation status page . And if there is no language pack available yet, why not join - the team and submit your own translation ;-) + the team and submit your own translation ;-) Each language pack is packaged as a .msi installer. diff --git a/doc/source/en/TortoiseGit/tgit_preface.xml b/doc/source/en/TortoiseGit/tgit_preface.xml index 9b6c76cd6..16806dc03 100644 --- a/doc/source/en/TortoiseGit/tgit_preface.xml +++ b/doc/source/en/TortoiseGit/tgit_preface.xml @@ -128,8 +128,8 @@ and TortoiseGit is an Open Source project. That means you have full read access to the source code of this program. Project Home is - - http://tortoisegit.org/ + + https://tortoisegit.org/ diff --git a/doc/source/en/TortoiseMerge/tme_preface.xml b/doc/source/en/TortoiseMerge/tme_preface.xml index a71e44e27..0de3982da 100644 --- a/doc/source/en/TortoiseMerge/tme_preface.xml +++ b/doc/source/en/TortoiseMerge/tme_preface.xml @@ -48,8 +48,8 @@ TortoiseGitMerge is an Open Source project. That means you have full read access to the source code of this program. You can browse it on this link - - https://code.google.com/p/tortoisegit/source/browse/ + + https://tortoisegit.org/sourcecode . diff --git a/doc/source/en/wishlist.xml b/doc/source/en/wishlist.xml index 51b678d2e..ff12ce7d5 100644 --- a/doc/source/en/wishlist.xml +++ b/doc/source/en/wishlist.xml @@ -7,7 +7,7 @@ not pretty but it works. --> - <ulink url="http://redir.tortoisegit.org/donate"> + <ulink url="https://tortoisegit.org/donate"> <citetitle>Donate!</citetitle> </ulink> diff --git a/ext/gitdll/gitdll.rc2 b/ext/gitdll/gitdll.rc2 index 04fb1ddc4..bb5f5fe25 100644 --- a/ext/gitdll/gitdll.rc2 +++ b/ext/gitdll/gitdll.rc2 @@ -31,11 +31,11 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org/\0" + VALUE "CompanyName", "https://tortoisegit.org/\0" VALUE "FileDescription", "libgit (based on git version " GIT_VERSION ") implementation for TortoiseGit\0" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "gitdll.dll\0" - VALUE "LegalCopyright", "Copyright (C) 2008-2014 - TortoiseGit, Copyright (C) 2005-2013 - Git developers\0" + VALUE "LegalCopyright", "Copyright (C) 2008-2015 - TortoiseGit, Copyright (C) 2005-2013 - Git developers\0" VALUE "OriginalFilename", "gitdll.dll\0" VALUE "ProductName", "TortoiseGit\0" VALUE "ProductVersion", STRPRODUCTVER diff --git a/src/Changelog-pre1.8.txt b/src/Changelog-pre1.8.txt index 8d18a078c..10995651a 100644 --- a/src/Changelog-pre1.8.txt +++ b/src/Changelog-pre1.8.txt @@ -219,7 +219,7 @@ Released: 2012-06-03 * Synced TortoiseIDiff with TortoiseSVN * Synced TortoiseUDiff with TortoiseSVN * Fixed issue #1150: Add support for ANSI Color Codes in log Outputs - * Fixed issue #969: Support for localization (you can download/create language packs for TortoiseGit, see http://redir.tortoisegit.org/translate) + * Fixed issue #969: Support for localization (you can download/create language packs for TortoiseGit, see https://tortoisegit.org/translate) * Added Repository Browser * Updated shipped libgit2 to version 0.17.0 * Fixed issue #1169: Show Branch for Commits diff --git a/src/Resources/TortoiseMerge.rc2 b/src/Resources/TortoiseMerge.rc2 index f2d88045f..8f030bb3c 100644 --- a/src/Resources/TortoiseMerge.rc2 +++ b/src/Resources/TortoiseMerge.rc2 @@ -31,11 +31,11 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org/" + VALUE "CompanyName", "https://tortoisegit.org/" VALUE "FileDescription", "TortoiseGitMerge" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "TortoiseGitMerge.exe" - VALUE "LegalCopyright", "Copyright (C) 2011-2015 - TortoiseGit and Copyright (C) 2003-2014 - TortoiseSVN" + VALUE "LegalCopyright", "Copyright (C) 2011-2015 - TortoiseGit and Copyright (C) 2003-2015 - TortoiseSVN" VALUE "OriginalFilename", "TortoiseGitMerge.exe" VALUE "ProductName", "TortoiseGitMerge" VALUE "ProductVersion", STRPRODUCTVER diff --git a/src/Resources/TortoiseProc.rc2 b/src/Resources/TortoiseProc.rc2 index fa9808e3c..b849faeb2 100644 --- a/src/Resources/TortoiseProc.rc2 +++ b/src/Resources/TortoiseProc.rc2 @@ -31,11 +31,11 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org/\0" + VALUE "CompanyName", "https://tortoisegit.org/\0" VALUE "FileDescription", "TortoiseGit client\0" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "TortoiseGitProc.exe\0" - VALUE "LegalCopyright", "Copyright (C) 2008-2015 - TortoiseGit and Copyright (C) 2003-2014 - TortoiseSVN\0" + VALUE "LegalCopyright", "Copyright (C) 2008-2015 - TortoiseGit and Copyright (C) 2003-2015 - TortoiseSVN\0" VALUE "OriginalFilename", "TortoiseGitProc.exe\0" VALUE "ProductName", "TortoiseGit\0" VALUE "ProductVersion", STRPRODUCTVER diff --git a/src/Resources/TortoiseShell.rc2 b/src/Resources/TortoiseShell.rc2 index 146ac5be7..0ba4652bd 100644 --- a/src/Resources/TortoiseShell.rc2 +++ b/src/Resources/TortoiseShell.rc2 @@ -31,7 +31,7 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org/\0" + VALUE "CompanyName", "https://tortoisegit.org/\0" VALUE "FileDescription", "TortoiseGit shell extension client\0" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "TortoiseGit.dll\0" diff --git a/src/SshAskPass/SshAskPass.rc2 b/src/SshAskPass/SshAskPass.rc2 index e094edcfd..f6d70a9e2 100644 --- a/src/SshAskPass/SshAskPass.rc2 +++ b/src/SshAskPass/SshAskPass.rc2 @@ -38,11 +38,11 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org/\0" + VALUE "CompanyName", "https://tortoisegit.org/\0" VALUE "FileDescription", "TortoiseGit - git CLI stdin wrapper\0" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "SshAskPass.exe\0" - VALUE "LegalCopyright", "Copyright (C) 2009-2014 - TortoiseGit\0" + VALUE "LegalCopyright", "Copyright (C) 2009-2015 - TortoiseGit\0" VALUE "OriginalFilename", "SshAskPass.exe\0" VALUE "ProductName", "SSHAskPass\0" VALUE "ProductVersion", STRPRODUCTVER diff --git a/src/TGitCache/TGITCache.rc2 b/src/TGitCache/TGITCache.rc2 index c13112a8e..9cdcbc684 100644 --- a/src/TGitCache/TGITCache.rc2 +++ b/src/TGitCache/TGITCache.rc2 @@ -31,7 +31,7 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org/\0" + VALUE "CompanyName", "https://tortoisegit.org/\0" VALUE "FileDescription", "TortoiseGit status cache\0" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "TGitCache.exe\0" diff --git a/src/TortoiseGitBlame/res/TortoiseGitBlame.rc2 b/src/TortoiseGitBlame/res/TortoiseGitBlame.rc2 index 32d6587a8..8a27dd887 100644 --- a/src/TortoiseGitBlame/res/TortoiseGitBlame.rc2 +++ b/src/TortoiseGitBlame/res/TortoiseGitBlame.rc2 @@ -40,7 +40,7 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org/\0" + VALUE "CompanyName", "https://tortoisegit.org/\0" VALUE "FileDescription", "TortoiseGitBlame\0" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "TortoiseGitBlame.exe\0" diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.cpp b/src/TortoiseGitSetup/CustomActions/CustomActions.cpp index 4586e5a3c..bf25b0c64 100644 --- a/src/TortoiseGitSetup/CustomActions/CustomActions.cpp +++ b/src/TortoiseGitSetup/CustomActions/CustomActions.cpp @@ -64,7 +64,7 @@ UINT __stdcall TerminateCache(MSIHANDLE /*hModule*/) UINT __stdcall OpenDonatePage(MSIHANDLE /*hModule*/) { - ShellExecute(NULL, _T("open"), _T("http://redir.tortoisegit.org/donate"), NULL,NULL, SW_SHOW); + ShellExecute(NULL, _T("open"), _T("https://tortoisegit.org/donate"), NULL,NULL, SW_SHOW); return ERROR_SUCCESS; } diff --git a/src/TortoiseGitSetup/Includes.wxi b/src/TortoiseGitSetup/Includes.wxi index d09ebd762..0aeba1251 100644 --- a/src/TortoiseGitSetup/Includes.wxi +++ b/src/TortoiseGitSetup/Includes.wxi @@ -11,7 +11,7 @@ - + diff --git a/src/TortoiseGitSetup/include/TGIT_eula.rtf b/src/TortoiseGitSetup/include/TGIT_eula.rtf index 71d1eccfd..73d678e3c 100644 --- a/src/TortoiseGitSetup/include/TGIT_eula.rtf +++ b/src/TortoiseGitSetup/include/TGIT_eula.rtf @@ -1,6 +1,6 @@ {\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe2052{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}{\f1\froman\fprq2\fcharset0 Times New Roman;}} {\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\nowidctlpar\sa100\f0\fs18 Copyright (C) 2008-2015 \endash Frank Li, Sven Strickroth & contributors\par -TortoiseGit is free. You don't have to pay for it, and you can use it any way you want. It is developed as an Open Source project under the GNU General Public License (GPL). That means you have full access to the source code of this program. You can find it on our website at http://tortoisegit.org/\par +TortoiseGit is free. You don't have to pay for it, and you can use it any way you want. It is developed as an Open Source project under the GNU General Public License (GPL). That means you have full access to the source code of this program. You can find it on our website at https://tortoisegit.org/\par Should you wish to modify or redistribute this program, or any part of it, you should read the full terms and conditions set out in the license agreement before doing so. A copy of the license is available on our website.\par If you simply wish to install and use this software, you need only be aware of the disclaimer conditions in the license, which are set out below.\par \b NO WARRANTY\par diff --git a/src/TortoiseIDiff/TortoiseIDiff.rc2 b/src/TortoiseIDiff/TortoiseIDiff.rc2 index 3cdbc67c7..5a239ec2c 100644 --- a/src/TortoiseIDiff/TortoiseIDiff.rc2 +++ b/src/TortoiseIDiff/TortoiseIDiff.rc2 @@ -31,7 +31,7 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org\0" + VALUE "CompanyName", "https://tortoisegit.org\0" VALUE "FileDescription", "TortoiseGitIDiff\0" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "TortoiseGitIDiff.exe\0" diff --git a/src/TortoiseMerge/AboutDlg.cpp b/src/TortoiseMerge/AboutDlg.cpp index f5267cd91..31f82468b 100644 --- a/src/TortoiseMerge/AboutDlg.cpp +++ b/src/TortoiseMerge/AboutDlg.cpp @@ -77,7 +77,7 @@ BOOL CAboutDlg::OnInitDialog() SetTimer(ID_EFFECTTIMER, 40, NULL); SetTimer(ID_DROPTIMER, 300, NULL); - m_cWebLink.SetURL(_T("http://tortoisegit.org/")); + m_cWebLink.SetURL(_T("https://tortoisegit.org/")); m_cSupportLink.SetURL(_T("http://tortoisesvn.tigris.org/contributors.html")); return TRUE; // return TRUE unless you set the focus to a control diff --git a/src/TortoiseProc/AboutDlg.cpp b/src/TortoiseProc/AboutDlg.cpp index 28f88fd24..ec8043065 100644 --- a/src/TortoiseProc/AboutDlg.cpp +++ b/src/TortoiseProc/AboutDlg.cpp @@ -111,8 +111,8 @@ BOOL CAboutDlg::OnInitDialog() SetTimer(ID_EFFECTTIMER, 40, NULL); SetTimer(ID_DROPTIMER, 1500, NULL); - m_cWebLink.SetURL(_T("http://tortoisegit.org/")); - m_cSupportLink.SetURL(_T("http://redir.tortoisegit.org/donate")); + m_cWebLink.SetURL(_T("https://tortoisegit.org/")); + m_cSupportLink.SetURL(_T("https://tortoisegit.org/donate")); CenterWindow(CWnd::FromHandle(hWndExplorer)); GetDlgItem(IDOK)->SetFocus(); diff --git a/src/TortoiseProc/CheckForUpdatesDlg.cpp b/src/TortoiseProc/CheckForUpdatesDlg.cpp index 3a5ed31ad..563a69d79 100644 --- a/src/TortoiseProc/CheckForUpdatesDlg.cpp +++ b/src/TortoiseProc/CheckForUpdatesDlg.cpp @@ -51,7 +51,7 @@ CCheckForUpdatesDlg::CCheckForUpdatesDlg(CWnd* pParent /*=NULL*/) , m_bThreadRunning(FALSE) , m_updateDownloader(nullptr) { - m_sUpdateDownloadLink = _T("http://redir.tortoisegit.org/download"); + m_sUpdateDownloadLink = _T("https://tortoisegit.org/download"); } CCheckForUpdatesDlg::~CCheckForUpdatesDlg() @@ -493,7 +493,7 @@ void CCheckForUpdatesDlg::FillChangelog(CAutoConfig& versioncheck, bool official ProjectProperties pp; pp.lProjectLanguage = -1; if (versioncheck.GetString(_T("tortoisegit.issuesurl"), pp.sUrl)) - pp.sUrl = _T("https://code.google.com/p/tortoisegit/issues/detail?id=%BUGID%"); + pp.sUrl = _T("https://tortoisegit.org/issue/%BUGID%"); if (!pp.sUrl.IsEmpty()) { pp.SetCheckRe(_T("[Ii]ssues?:?(\\s*(,|and)?\\s*#?\\d+)+")); diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp index 447348ef2..d5564a517 100644 --- a/src/TortoiseProc/CommitDlg.cpp +++ b/src/TortoiseProc/CommitDlg.cpp @@ -670,8 +670,8 @@ void CCommitDlg::OnOK() { /* Do not use the libgit2 implementation right now, since it has several flaws: - * https://code.google.com/p/tortoisegit/issues/detail?id=1690: possible access denied problem - * https://code.google.com/p/tortoisegit/issues/detail?id=2224: filters not correctly applied + * https://tortoisegit.org/issue/1690: possible access denied problem + * https://tortoisegit.org/issue/2224: filters not correctly applied * changes to x-bit are not correctly committed, since we reset the index */ bAddSuccess = false; diff --git a/src/TortoiseShell/TortoiseStub.rc b/src/TortoiseShell/TortoiseStub.rc index 51abd2e2c..033c1d0e5 100644 --- a/src/TortoiseShell/TortoiseStub.rc +++ b/src/TortoiseShell/TortoiseStub.rc @@ -26,7 +26,7 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org/" + VALUE "CompanyName", "https://tortoisegit.org/" VALUE "FileDescription", "TortoiseGit shell extension client" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "TortoiseStub.dll" diff --git a/src/TortoiseIDiff/TortoiseIDiff.rc2 b/src/TortoiseUDiff/TortoiseUDiff.rc2 similarity index 69% copy from src/TortoiseIDiff/TortoiseIDiff.rc2 copy to src/TortoiseUDiff/TortoiseUDiff.rc2 index 3cdbc67c7..95a5c3f28 100644 --- a/src/TortoiseIDiff/TortoiseIDiff.rc2 +++ b/src/TortoiseUDiff/TortoiseUDiff.rc2 @@ -1,5 +1,5 @@ // -// TortoiseIDiff.RC2 - resources Microsoft Visual C++ does not edit directly +// TortoiseUDiff.RC2 - resources Microsoft Visual C++ does not edit directly // #ifdef APSTUDIO_INVOKED @@ -31,13 +31,13 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org\0" - VALUE "FileDescription", "TortoiseGitIDiff\0" + VALUE "CompanyName", "https://tortoisegit.org\0" + VALUE "FileDescription", "TortoiseGitUDiff\0" VALUE "FileVersion", STRFILEVER - VALUE "InternalName", "TortoiseGitIDiff.exe\0" - VALUE "LegalCopyright", "Copyright (C) 2009-2015 - TortoiseGit and Copyright (C) 2006-2014 - TortoiseSVN\0" - VALUE "OriginalFilename", "TortoiseGitIDiff.exe\0" - VALUE "ProductName", "TortoiseGitIDiff\0" + VALUE "InternalName", "TortoiseGitUDiff.exe\0" + VALUE "LegalCopyright", "Copyright (C) 2009-2015 - TortoiseGit and Copyright (C) 2007-2014 - TortoiseSVN\0" + VALUE "OriginalFilename", "TortoiseGitUDiff.exe\0" + VALUE "ProductName", "TortoiseGitUDiff\0" VALUE "ProductVersion", STRPRODUCTVER END END diff --git a/src/touch/touch.rc2 b/src/touch/touch.rc2 index 2caa7d482..8b46218b1 100644 --- a/src/touch/touch.rc2 +++ b/src/touch/touch.rc2 @@ -38,7 +38,7 @@ BEGIN BEGIN BLOCK "040004e4" BEGIN - VALUE "CompanyName", "http://tortoisegit.org/\0" + VALUE "CompanyName", "https://tortoisegit.org/\0" VALUE "FileDescription", "Creates a file.\0" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "tgittouch.exe\0" -- 2.11.4.GIT