From 9b3efaa6032cc341c2755f7490318e23d25e8b05 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sat, 4 Jan 2014 15:07:36 +0100
Subject: [PATCH] Fix casing and naming of TortoiseGitPlink

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseGitSetup/FeaturesFragment.wxi  |  2 +-
 src/TortoiseGitSetup/StructureFragment.wxi |  8 ++++----
 src/TortoiseGitSetup/UIFragment.wxi        |  2 +-
 src/TortoisePlink/BE_ALL_S.C               |  2 +-
 src/TortoisePlink/Windows/TortoisePlink.rc | 10 +++++-----
 src/TortoisePlink/Windows/WINPLINK.C       |  6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxi b/src/TortoiseGitSetup/FeaturesFragment.wxi
index b864f3602..d49e5dde3 100644
--- a/src/TortoiseGitSetup/FeaturesFragment.wxi
+++ b/src/TortoiseGitSetup/FeaturesFragment.wxi
@@ -116,7 +116,7 @@
 		</Feature>
 		<?endif ?>
 
-		<Feature Id="SSHPlink" Level="1" Title="SSH Plink" Description="SSH PLink" TypicalDefault="install" Display="hidden" InstallDefault="followParent">
+		<Feature Id="SSHPlink" Level="1" Title="SSH Plink" Description="SSH Plink" TypicalDefault="install" Display="hidden" InstallDefault="followParent">
 			<ComponentRef Id="C_SSHCLIENT_PLINK" />
 		</Feature>
 		<Feature Id="SSHOpenSSH" Level="1" Title="SSH OpenSSH" Description="SSH OpenSSH" TypicalDefault="install" Display="hidden" InstallDefault="followParent">
diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index a1f983ba1..a0b7921e9 100644
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -311,7 +311,7 @@
 
 				<Component Id="C_SSHCLIENT_PLINK" Guid="$(var.RegSSHPLINK)" Win64="$(var.Win64YesNo)" Permanent="yes">
 					<Condition>(OLDSSH = "") and (SSHTOOL="Plink")</Condition>
-					<RegistryValue Root="HKCU" Key="Software\[Manufacturer]" Name="SSH" Value="[INSTALLDIR]bin\TortoiseGitPLink.exe" Type="string" />
+					<RegistryValue Root="HKCU" Key="Software\[Manufacturer]" Name="SSH" Value="[INSTALLDIR]bin\TortoiseGitPlink.exe" Type="string" />
 				</Component>
 				<Component Id="C_SSHCLIENT_OPENSSH" Guid="$(var.RegSSHOpen)" Win64="$(var.Win64YesNo)" Permanent="yes">
 					<Condition>(OLDSSH = "") and (SSHTOOL="OpenSSH")</Condition>
@@ -635,12 +635,12 @@
 
 					<Component Id="C__TortoiseGitTools" Guid="$(var.GuidTortoiseGitTools)" Win64="$(var.Win64YesNo)">
             <?if $(var.Platform) = "x86" ?>
-            <File Id="F__TortoisePlinkold" ShortName="TORTPLI.EXE" Name="TortoisePLink.exe" DiskId="1" Source="..\..\ext\putty\TortoisePLink-x86.exe" />
+            <File Id="F__TortoisePlinkold" ShortName="TORTPLI.EXE" Name="TortoisePlink.exe" DiskId="1" Source="..\..\ext\putty\TortoisePlink-x86.exe" />
             <?endif ?>
             <?if $(var.Platform) = "x64" ?>
-            <File Id="F__TortoisePlinkold" ShortName="TORTPLI.EXE" Name="TortoisePLink.exe" DiskId="1" Source="..\..\ext\putty\TortoisePLink-x64.exe" />
+            <File Id="F__TortoisePlinkold" ShortName="TORTPLI.EXE" Name="TortoisePlink.exe" DiskId="1" Source="..\..\ext\putty\TortoisePlink-x64.exe" />
             <?endif ?>
-            <File Id="F__TortoisePlink" ShortName="TGITPLI.EXE" Name="TortoiseGitPLink.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseGitPLink.exe" />
+            <File Id="F__TortoisePlink" ShortName="TGITPLI.EXE" Name="TortoiseGitPlink.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseGitPlink.exe" />
             <File Id="F__PuttyGen" ShortName="puttygen.EXE" Name="puttygen.exe" DiskId="1" Source="..\..\ext\putty\puttygen.exe" />
 						<File Id="F__pageant" ShortName="pageant.EXE" Name="pageant.exe" DiskId="1" Source="..\..\ext\putty\pageant.exe" />
 						<?if $(var.Platform) = "x86" ?>
diff --git a/src/TortoiseGitSetup/UIFragment.wxi b/src/TortoiseGitSetup/UIFragment.wxi
index 8d9e70f94..3cba9e770 100644
--- a/src/TortoiseGitSetup/UIFragment.wxi
+++ b/src/TortoiseGitSetup/UIFragment.wxi
@@ -225,7 +225,7 @@
 		</Dialog>
 
 		<RadioButtonGroup Property="SSHTOOL">
-			<RadioButton Text="{\DlgFont8}TortoiseGitPLink, coming from Putty, integrates with Windows better." Value="Plink" X="5" Y="0" Width="300" Height="30" />
+			<RadioButton Text="{\DlgFont8}TortoiseGitPlink, coming from Putty, integrates with Windows better." Value="Plink" X="5" Y="0" Width="300" Height="30" />
 			<RadioButton Text="{\DlgFont8}OpenSSH, Git default SSH Client" Value="OpenSSH" X="5" Y="60" Width="300" Height="30" />
 		</RadioButtonGroup>
 		<Dialog Id="BrowseDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
diff --git a/src/TortoisePlink/BE_ALL_S.C b/src/TortoisePlink/BE_ALL_S.C
index 61264769d..e25fae7ae 100644
--- a/src/TortoisePlink/BE_ALL_S.C
+++ b/src/TortoisePlink/BE_ALL_S.C
@@ -14,7 +14,7 @@
  * have tiny little source modules containing nothing but
  * declarations of appname, for as long as I can...
  */
-const char *const appname = "TortoiseGitPLink";
+const char *const appname = "TortoiseGitPlink";
 
 #ifdef TELNET_DEFAULT
 const int be_default_protocol = PROT_TELNET;
diff --git a/src/TortoisePlink/Windows/TortoisePlink.rc b/src/TortoisePlink/Windows/TortoisePlink.rc
index 48644c621..3c9bfa029 100644
--- a/src/TortoisePlink/Windows/TortoisePlink.rc
+++ b/src/TortoisePlink/Windows/TortoisePlink.rc
@@ -37,7 +37,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS
 
 IDD_LOGIN DIALOG  0, 0, 200, 70
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "TortoiseGitPLink"
+CAPTION "TortoiseGitPlink"
 FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,40,50,50,14
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Adapted from PuTTY plink (http://www.chiark.greenend.org.uk/~sgtatham/putty/)"
             VALUE "CompanyName", "TortoiseGit team and TortoiseSVN team"
-            VALUE "FileDescription", "TortoiseGitPLink"
+            VALUE "FileDescription", "TortoiseGitPlink"
             VALUE "FileVersion", "Release 0.63"
-            VALUE "InternalName", "TortoiseGitPLink"
+            VALUE "InternalName", "TortoiseGitPlink"
             VALUE "LegalCopyright", "Copyright © 2003-2013"
-            VALUE "OriginalFilename", "TortoiseGitPLink.exe"
-            VALUE "ProductName", "TortoiseGit TortoiseGitPLink"
+            VALUE "OriginalFilename", "TortoiseGitPlink.exe"
+            VALUE "ProductName", "TortoiseGit TortoiseGitPlink"
             VALUE "ProductVersion", "Release 0.63"
         END
     END
diff --git a/src/TortoisePlink/Windows/WINPLINK.C b/src/TortoisePlink/Windows/WINPLINK.C
index f95d69abb..c147122d3 100644
--- a/src/TortoisePlink/Windows/WINPLINK.C
+++ b/src/TortoisePlink/Windows/WINPLINK.C
@@ -197,7 +197,7 @@ static void usage(void)
 	char buf[10000];
 	int j = 0;
 
-	j += sprintf(buf+j, "TortoiseGitPLink: command-line connection utility (based on PuTTY PLink)\n");
+	j += sprintf(buf+j, "TortoiseGitPlink: command-line connection utility (based on PuTTY Plink)\n");
     j += sprintf(buf+j, "%s\n", ver);
     j += sprintf(buf+j, "Usage: tortoisegitplink [options] [user@]host [command]\n");
     j += sprintf(buf+j, "       (\"host\" can also be a PuTTY saved session name)\n");
@@ -351,7 +351,7 @@ int main(int argc, char **argv)
 					    1, conf);
 	    if (ret == -2) {
 		fprintf(stderr,
-			"plink: option \"%s\" requires an argument\n", p);
+			"tortoisegitplink: option \"%s\" requires an argument\n", p);
 		errors = 1;
 	    } else if (ret == 2) {
 		--argc, ++argv;
@@ -370,7 +370,7 @@ int main(int argc, char **argv)
                 pgp_fingerprints();
                 exit(1);
 	    } else {
-		fprintf(stderr, "plink: unknown option \"%s\"\n", p);
+		fprintf(stderr, "tortoisegitplink: unknown option \"%s\"\n", p);
 		errors = 1;
 	    }
 	} else if (*p) {
-- 
2.11.4.GIT