From 6f658eb3ddc90977799eb2920aa721d2cfb8cbd1 Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Tue, 28 Nov 2006 07:38:07 +0000
Subject: [PATCH] Add German internationalization for firefly shell, courtesy
 of Helmut Wieser.  Start localizations for win32 installer.

---
 win32/FireflyShell/FireflyShell.DEU.rc        | Bin 0 -> 21464 bytes
 win32/FireflyShell/FireflyShellDEU.vcproj     | 136 ++++++++++++++++++
 .../localizations/german/german.ini           | Bin 7104 -> 7408 bytes
 .../localizations/german/german.lws           | Bin 222 -> 250 bytes
 win32/mt-daapd.sln                            |  24 ++++
 win32/nsi/localizations/Dutch.nsh             |  29 ++++
 win32/nsi/localizations/English.nsh           |  29 ++++
 win32/nsi/localizations/French.nsh            |  29 ++++
 win32/nsi/localizations/German.nsh            |  29 ++++
 win32/nsi/mt-daapd.nsi.templ                  |  88 +++++++++---
 10 files changed, 343 insertions(+), 21 deletions(-)
 create mode 100644 win32/FireflyShell/FireflyShell.DEU.rc
 create mode 100644 win32/FireflyShell/FireflyShellDEU.vcproj
 create mode 100644 win32/nsi/localizations/Dutch.nsh
 create mode 100644 win32/nsi/localizations/English.nsh
 create mode 100644 win32/nsi/localizations/French.nsh
 create mode 100644 win32/nsi/localizations/German.nsh

diff --git a/win32/FireflyShell/FireflyShell.DEU.rc b/win32/FireflyShell/FireflyShell.DEU.rc
new file mode 100644
index 0000000000000000000000000000000000000000..207d93c6c556e5b5f7686638384d1802375cef44
GIT binary patch
literal 21464
zcmd^{+io1k5r+FZK;B`zLgW~sDU-59=_=sajCcyUB4tAWp#wz{A}N8S?AXZT<r#97
zOFx6Jj3ocpwZ-Y4o!OnC>0qs3u{%36J>AuHuIlRf&%f`5d!Yy$;Uv5Y7vWvF)b~xe
z(zQKZy9^(~i*Ty5#qcM6if|MT!@0f}x_+hOYhAn0k>@_>-z)tubVhF{;l0{Shu??a
zX_R~Mct=;yb@x=QU&pq+q35T=ap=X?Jb5R!dlR3d@A<GDc0)fr4NGAyY=wic6P9&#
zN&h#)diYvbcJ;dv7IbA@|9yO5n7ofe=f@(f3NKY0zY&(+g)`0nO4tDpea-rre%CbX
zMa>g@EbIELzEz5hrvcPF9XyxgfATQq5E*xT5U${)H=6g&c*8O8{Z7`=p({k)bIIRn
zl*?ny_K%|ZwD@~Ed{#sA%S3`sB6dE>B<Z!DpAReIA(Nn8Ny}5o(xS#W5HGFkL%)C5
zr)Ye#uReCfu?Ko;Q_p{PE#+^nsd5nZBbVM6Z!(*8J+rB2p6a+7dDgF3FRN;?rg?o8
zrZn=d+AUl^Q*CjeyC&gxq;1ejN0O2kdhV6v1->}Yb*>(2zB7X0LHObtO62Ud@Colg
z^(v&sVcc)#FywDfxO<|REdAzmO}!Rzp5w@OM);|3S;YGbn)_;`F|CWir(Ux^7yeDV
z!!d?2o<eWkWQ;nC(u>w9*Jr)(T>SA|6t5fo{x2B)%}5QD^G6OtiK+Tod@HWKkTpFK
zFP}@!v9CRSntQ2obP+z0lvOQe6{dQM+|lTzd>E`qNu8d}dvw0xI9b{>g~p-tV<8Sk
zYn)$8vCqS1?RSgtohX7GE~Jg$=?wn|pJ`3}T!e4MefT$6>G%5gLcN-&gck!nX?vw7
zi-=*oEG%}Rmha;ecw<;(qkExa4wqSY^c>#QrJl6=a0<OcH^yKt^m?ifUfK79yJtF@
zPXNR_(t8`?5@@)hvw5B2Nz{GTWFPRe>h9HDa~<$pJi8+3nCBZo^S!h-ehiRJ59Vib
z2}Emx2>rh-y}z#iJJRx-`T*f-W$a%9(d9J^7ox$rKH&4H1w?qDTav5osP*%i-ws63
z@m=Hxcqhk^b8O1Zlk?x9^J5{3o<uHuC*1l~j(nl_l4!g=@CFWa#B+Zt4D;lg&ewI0
zr|?WyzKC9d{odD^{hO8jcoh4CGGFTnICx211Sc))+DhbG`oy2HI~%&T6#Gy4p8Nap
z$!*==79`t)r|jyYp4e88L?1{(*`By#H%bq_5VNbc?S+4Zm*V@2ffXvDdKBl?)6=`^
zb65B>$=;2v@j-gY%pD7V)BG8y-U6=+N{bS54)wF1u=2BDDFiJV!>rAfu3d#6qC_0U
zG5ew)nh8x~{&pb@5Rtr;{2t2VIt@SRF83@#EaEJ=@+!(0dT3X@9L8AyvBNO#2!AX_
zD&lK`^+myiCpQ%y$KM(GbPwa%l<2XgHcr1)X%0APJL1SkDzCz4@KpZk$)8K@E?V_m
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

literal 0
HcmV?d00001

diff --git a/win32/FireflyShell/FireflyShellDEU.vcproj b/win32/FireflyShell/FireflyShellDEU.vcproj
new file mode 100644
index 00000000..4755f5c1
--- /dev/null
+++ b/win32/FireflyShell/FireflyShellDEU.vcproj
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="FireflyShellDEU"
+	ProjectGUID="{9B035724-EAD7-48C5-BBAF-91FFAA3CA55F}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFLYSHELLDEU_EXPORTS"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/FireflyShellDEU.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/FireflyShellDEU.pdb"
+				SubSystem="2"
+				ResourceOnlyDLL="TRUE"
+				ImportLibrary="$(OutDir)/FireflyShellDEU.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFLYSHELLDEU_EXPORTS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/FireflyShellDEU.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ResourceOnlyDLL="TRUE"
+				ImportLibrary="$(OutDir)/FireflyShellDEU.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			<File
+				RelativePath=".\FireflyShell.DEU.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32/FireflyShell/localizations/german/german.ini b/win32/FireflyShell/localizations/german/german.ini
index b941dfe8486f66cc2758e9e642423b0efa70c273..0421847c8eecb0109e0cd6ce9ac4e938998b4d47 100644
GIT binary patch
literal 7408
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

delta 577
zcmY*WL2DCX5S`5?>F&m)>zB>$c6X^zN`%rw6GB^8th&TfN-?FB6huU;k?kcdF-99i
zM2ZJbl_y1tCx3#ucnYDQryg?<^w@)V>RC{nrYqFL@V)mwX6DVz@ul9(?vGSJ4ceq9
z^oVM2eqTmL8h6vA(HP~aLR(a$I^!$<I5wnBw4^&I$41jD{QHp8Yn&XSAY1rq==czu
z#7=A;B{>gY_RyBc@j`acl}+_Jt#h--)WkRW0*+*XOuPyszJz{a3P0noIc_tqBc9Z;
zl5F8tGK4?$62VXt3rZe074PDyza`q>Y7M%_u^oB*Ps3-Wf@8%-Nqvy6(S7dQ;G8CH
z<EoZJSDi#pwGn6nLfgYL&B1{-4Lvd1F;cIjj+bgnD7!km%q~P`53S)k_J`+D)J^pU
z@8{`Bwa%KpCgF>Igy&)mJHp0C!$Dv8=!wMvc9_4<nm7;wr&y2lg-8n!W*r<Fa|3>8
z%;IjYI>7DRG-Czd6M4*<Y|^|IooAT`Z&DZy9x=>V6$I8Ce5;6GR+aGtzsu;`>(VL;
y=PkUG&f$+;!rPJXjM5$PQFgY@D0L^0dC@4iSxmW~u;}iylQ??bM6yUHC-@6T>Z8U0

diff --git a/win32/FireflyShell/localizations/german/german.lws b/win32/FireflyShell/localizations/german/german.lws
index 2ae08ff7f2103eec9bdf1e3d0cb0fe14ea96361a..61200c99aeab7ef9f929f1e04f853c86bcbe6697 100644
GIT binary patch
delta 18
Zcmcb|_=|Bu!$c7kRu=|WhR}(<fdD@{1_l5C

delta 23
ecmeyxc#m;H18)pNIzuW$5koFRB17K9m4N_U$Ol;f

diff --git a/win32/mt-daapd.sln b/win32/mt-daapd.sln
index 7043c6c7..0fd4ae62 100644
--- a/win32/mt-daapd.sln
+++ b/win32/mt-daapd.sln
@@ -27,6 +27,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "out-daap", "out-daap\out-da
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FireflyShellFRA", "FireflyShell\FireflyShellFRA.vcproj", "{819028A4-ED43-4A51-9E32-DC8559ADEBB6}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FireflyShellNLD", "FireflyShell\FireflyShellNLD.vcproj", "{5D6F19F6-6A71-4960-BFB3-BF545D02ACBD}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FireflyShellDEU", "FireflyShell\FireflyShellDEU.vcproj", "{9B035724-EAD7-48C5-BBAF-91FFAA3CA55F}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -61,6 +73,18 @@ Global
 		{C1EF5133-DFB3-4FEC-B999-3655DBB14786}.Debug.Build.0 = Debug|Win32
 		{C1EF5133-DFB3-4FEC-B999-3655DBB14786}.Release.ActiveCfg = Release|Win32
 		{C1EF5133-DFB3-4FEC-B999-3655DBB14786}.Release.Build.0 = Release|Win32
+		{819028A4-ED43-4A51-9E32-DC8559ADEBB6}.Debug.ActiveCfg = Debug|Win32
+		{819028A4-ED43-4A51-9E32-DC8559ADEBB6}.Debug.Build.0 = Debug|Win32
+		{819028A4-ED43-4A51-9E32-DC8559ADEBB6}.Release.ActiveCfg = Release|Win32
+		{819028A4-ED43-4A51-9E32-DC8559ADEBB6}.Release.Build.0 = Release|Win32
+		{5D6F19F6-6A71-4960-BFB3-BF545D02ACBD}.Debug.ActiveCfg = Debug|Win32
+		{5D6F19F6-6A71-4960-BFB3-BF545D02ACBD}.Debug.Build.0 = Debug|Win32
+		{5D6F19F6-6A71-4960-BFB3-BF545D02ACBD}.Release.ActiveCfg = Release|Win32
+		{5D6F19F6-6A71-4960-BFB3-BF545D02ACBD}.Release.Build.0 = Release|Win32
+		{9B035724-EAD7-48C5-BBAF-91FFAA3CA55F}.Debug.ActiveCfg = Debug|Win32
+		{9B035724-EAD7-48C5-BBAF-91FFAA3CA55F}.Debug.Build.0 = Debug|Win32
+		{9B035724-EAD7-48C5-BBAF-91FFAA3CA55F}.Release.ActiveCfg = Release|Win32
+		{9B035724-EAD7-48C5-BBAF-91FFAA3CA55F}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/win32/nsi/localizations/Dutch.nsh b/win32/nsi/localizations/Dutch.nsh
new file mode 100644
index 00000000..4fb898ec
--- /dev/null
+++ b/win32/nsi/localizations/Dutch.nsh
@@ -0,0 +1,29 @@
+!define LANG "DUTCH"
+
+!insertmacro LANG_STRING PRODUCT_NAME "Firefly Media Server"
+
+; Install strings
+!insertmacro LANG_STRING STRING_BONJOUR_ERROR "Bonjour for Windows service not found.  Please install Apple's Bonjour for Windows."
+!insertmacro LANG_STRING STRING_STOPPING_SERVICE "Stopping Service..."
+!insertmacro LANG_STRING STRING_WAITING_FOR_STOP "Waiting for service stop ($9)"
+
+; Strings for the application install directory panel
+!insertmacro LANG_STRING STRING_DESTFOLDER "Destination Folder"
+!insertmacro LANG_STRING STRING_DESTDETAIL "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
+
+; Strings for the music path directory panel
+!insertmacro LANG_STRING STRING_MUSICTITLE "Choose Music Location"
+!insertmacro LANG_STRING STRING_MUSICHEADER "Choose the folder containing music to share."
+!insertmacro LANG_STRING STRING_MUSICFOLDER "Music Folder"
+!insertmacro LANG_STRING STRING_MUSICDETAIL "Setup will share the music in the following folder.$\r$\n$\r$\nTo share a different folder, click Browse and select another folder. Click Install to start the installation."
+
+; These are for the startmenu shortcuts
+!insertmacro LANG_BOTHSTRING STRING_WEBSITE "Website"
+!insertmacro LANG_BOTHSTRING STRING_UNINSTALL "Uninstall"
+!insertmacro LANG_BOTHSTRING STRING_DEBUG_MODE "Debug Mode"
+!insertmacro LANG_BOTHSTRING STRING_FF_CONFIGURATION "Firefly Configuration"
+!insertmacro LANG_BOTHSTRING STRING_ADV_CONFIG "Advanced Configuration"
+
+; Uninstall Strings
+!insertmacro LANG_UNSTRING STRING_UNINSTALLED "$(^Name) was successfully removed from your computer."
+!insertmacro LANG_UNSTRING STRING_AREYOUSURE "Are you sure you want to completely remove $(^Name) and all of its components?"
diff --git a/win32/nsi/localizations/English.nsh b/win32/nsi/localizations/English.nsh
new file mode 100644
index 00000000..25d61534
--- /dev/null
+++ b/win32/nsi/localizations/English.nsh
@@ -0,0 +1,29 @@
+!define LANG "ENGLISH"
+
+!insertmacro LANG_STRING PRODUCT_NAME "Firefly Media Server"
+
+; Install strings
+!insertmacro LANG_STRING STRING_BONJOUR_ERROR "Bonjour for Windows service not found.  Please install Apple's Bonjour for Windows."
+!insertmacro LANG_STRING STRING_STOPPING_SERVICE "Stopping Service..."
+!insertmacro LANG_STRING STRING_WAITING_FOR_STOP "Waiting for service stop ($9)"
+
+; Strings for the application install directory panel
+!insertmacro LANG_STRING STRING_DESTFOLDER "Destination Folder"
+!insertmacro LANG_STRING STRING_DESTDETAIL "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
+
+; Strings for the music path directory panel
+!insertmacro LANG_STRING STRING_MUSICTITLE "Choose Music Location"
+!insertmacro LANG_STRING STRING_MUSICHEADER "Choose the folder containing music to share."
+!insertmacro LANG_STRING STRING_MUSICFOLDER "Music Folder"
+!insertmacro LANG_STRING STRING_MUSICDETAIL "Setup will share the music in the following folder.$\r$\n$\r$\nTo share a different folder, click Browse and select another folder. Click Install to start the installation."
+
+; These are for the startmenu shortcuts
+!insertmacro LANG_BOTHSTRING STRING_WEBSITE "Website"
+!insertmacro LANG_BOTHSTRING STRING_UNINSTALL "Uninstall"
+!insertmacro LANG_BOTHSTRING STRING_DEBUG_MODE "Debug Mode"
+!insertmacro LANG_BOTHSTRING STRING_FF_CONFIGURATION "Firefly Configuration"
+!insertmacro LANG_BOTHSTRING STRING_ADV_CONFIG "Advanced Configuration"
+
+; Uninstall Strings
+!insertmacro LANG_UNSTRING STRING_UNINSTALLED "$(^Name) was successfully removed from your computer."
+!insertmacro LANG_UNSTRING STRING_AREYOUSURE "Are you sure you want to completely remove $(^Name) and all of its components?"
diff --git a/win32/nsi/localizations/French.nsh b/win32/nsi/localizations/French.nsh
new file mode 100644
index 00000000..454da1b9
--- /dev/null
+++ b/win32/nsi/localizations/French.nsh
@@ -0,0 +1,29 @@
+!define LANG "FRENCH"
+
+!insertmacro LANG_STRING PRODUCT_NAME "Firefly Media Server"
+
+; Install strings
+!insertmacro LANG_STRING STRING_BONJOUR_ERROR "Bonjour for Windows service not found.  Please install Apple's Bonjour for Windows."
+!insertmacro LANG_STRING STRING_STOPPING_SERVICE "Stopping Service..."
+!insertmacro LANG_STRING STRING_WAITING_FOR_STOP "Waiting for service stop ($9)"
+
+; Strings for the application install directory panel
+!insertmacro LANG_STRING STRING_DESTFOLDER "Destination Folder"
+!insertmacro LANG_STRING STRING_DESTDETAIL "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
+
+; Strings for the music path directory panel
+!insertmacro LANG_STRING STRING_MUSICTITLE "Choose Music Location"
+!insertmacro LANG_STRING STRING_MUSICHEADER "Choose the folder containing music to share."
+!insertmacro LANG_STRING STRING_MUSICFOLDER "Music Folder"
+!insertmacro LANG_STRING STRING_MUSICDETAIL "Setup will share the music in the following folder.$\r$\n$\r$\nTo share a different folder, click Browse and select another folder. Click Install to start the installation."
+
+; These are for the startmenu shortcuts
+!insertmacro LANG_BOTHSTRING STRING_WEBSITE "Website"
+!insertmacro LANG_BOTHSTRING STRING_UNINSTALL "Uninstall"
+!insertmacro LANG_BOTHSTRING STRING_DEBUG_MODE "Debug Mode"
+!insertmacro LANG_BOTHSTRING STRING_FF_CONFIGURATION "Firefly Configuration"
+!insertmacro LANG_BOTHSTRING STRING_ADV_CONFIG "Advanced Configuration"
+
+; Uninstall Strings
+!insertmacro LANG_UNSTRING STRING_UNINSTALLED "$(^Name) was successfully removed from your computer."
+!insertmacro LANG_UNSTRING STRING_AREYOUSURE "Are you sure you want to completely remove $(^Name) and all of its components?"
diff --git a/win32/nsi/localizations/German.nsh b/win32/nsi/localizations/German.nsh
new file mode 100644
index 00000000..3713fabb
--- /dev/null
+++ b/win32/nsi/localizations/German.nsh
@@ -0,0 +1,29 @@
+!define LANG "GERMAN"
+
+!insertmacro LANG_STRING PRODUCT_NAME "Firefly Media Server"
+
+; Install strings
+!insertmacro LANG_STRING STRING_BONJOUR_ERROR "Bonjour for Windows service not found.  Please install Apple's Bonjour for Windows."
+!insertmacro LANG_STRING STRING_STOPPING_SERVICE "Stopping Service..."
+!insertmacro LANG_STRING STRING_WAITING_FOR_STOP "Waiting for service stop ($9)"
+
+; Strings for the application install directory panel
+!insertmacro LANG_STRING STRING_DESTFOLDER "Destination Folder"
+!insertmacro LANG_STRING STRING_DESTDETAIL "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
+
+; Strings for the music path directory panel
+!insertmacro LANG_STRING STRING_MUSICTITLE "Choose Music Location"
+!insertmacro LANG_STRING STRING_MUSICHEADER "Choose the folder containing music to share."
+!insertmacro LANG_STRING STRING_MUSICFOLDER "Music Folder"
+!insertmacro LANG_STRING STRING_MUSICDETAIL "Setup will share the music in the following folder.$\r$\n$\r$\nTo share a different folder, click Browse and select another folder. Click Install to start the installation."
+
+; These are for the startmenu shortcuts
+!insertmacro LANG_BOTHSTRING STRING_WEBSITE "Website"
+!insertmacro LANG_BOTHSTRING STRING_UNINSTALL "Uninstall"
+!insertmacro LANG_BOTHSTRING STRING_DEBUG_MODE "Debug Mode"
+!insertmacro LANG_BOTHSTRING STRING_FF_CONFIGURATION "Firefly Configuration"
+!insertmacro LANG_BOTHSTRING STRING_ADV_CONFIG "Advanced Configuration"
+
+; Uninstall Strings
+!insertmacro LANG_UNSTRING STRING_UNINSTALLED "$(^Name) was successfully removed from your computer."
+!insertmacro LANG_UNSTRING STRING_AREYOUSURE "Are you sure you want to completely remove $(^Name) and all of its components?"
diff --git a/win32/nsi/mt-daapd.nsi.templ b/win32/nsi/mt-daapd.nsi.templ
index bf46d2e3..2bd26ad8 100644
--- a/win32/nsi/mt-daapd.nsi.templ
+++ b/win32/nsi/mt-daapd.nsi.templ
@@ -53,10 +53,34 @@
 ; Uninstaller pages
 !insertmacro MUI_UNPAGE_INSTFILES
 
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-
 ; MUI end ------
+!macro LANG_LOAD LANGLOAD
+  !insertmacro MUI_LANGUAGE "${LANGLOAD}"
+;  !verbose 
+  !include "localizations\${LANGLOAD}.nsh"
+;  !verbose on
+  !undef LANG
+!macroend
+
+!macro LANG_STRING NAME VALUE
+  LangString "${NAME}" "${LANG_${LANG}}" "${VALUE}"
+!macroend
+
+!macro LANG_UNSTRING NAME VALUE
+  !insertmacro LANG_STRING "un.${NAME}" "${VALUE}"
+!macroend
+
+!macro LANG_BOTHSTRING NAME VALUE
+  !insertmacro LANG_STRING "${NAME}" "${VALUE}"
+  !insertmacro LANG_UNSTRING "${NAME}" "${VALUE}"
+!macroend
+
+
+;!insertmacro MUI_LANGUAGE "English"
+!insertmacro LANG_LOAD "English"
+!insertmacro LANG_LOAD "French"
+!insertmacro LANG_LOAD "Dutch"
+!insertmacro LANG_LOAD "German"
 
 Name "${PRODUCT_NAME}"
 Icon "..\ff.ico"
@@ -77,7 +101,7 @@ Section -Pre
   Pop $1
 
   StrCmp $0 "success" lbl_got_bonjour
-  MessageBox MB_OK "Bonjour for Windows service not found.  Please install Apple's Bonjour for Windows."
+  MessageBox MB_OK "$(STRING_BONJOUR_ERROR)"
   Quit
 
   lbl_got_bonjour:
@@ -92,16 +116,16 @@ Section -Pre
   goto lbl_continue
   
   lbl_stop_service:
-  DetailPrint "Stopping Service..."
-  nsSCM::Stop "${PRODUCT_NAME}"
+  DetailPrint "$(STRING_STOPPING_SERVICE)"
+  nsSCM::Stop "$(PRODUCT_NAME)"
 
   lbl_wait_stop:
   Sleep 1000
-  nsSCM::QueryStatus "${PRODUCT_NAME}"
+  nsSCM::QueryStatus "$(PRODUCT_NAME)"
   Pop $0
   Pop $1
 
-  DetailPrint $0
+;  DetailPrint $0
   StrCmp $0 "success" lbl_check_status
   goto lbl_continue
   
@@ -110,7 +134,7 @@ Section -Pre
 
   lbl_continue:
   ; should really loop until service stops...
-  DetailPrint "Waiting for service stop ($9)"
+  DetailPrint "$(STRING_WAITING_FOR_STOP)"
    
   IntOp $9 $9 + 1
   IntCmp $9 10 +1 +1 lbl_done_pre
@@ -128,6 +152,9 @@ Section "MainSection" SEC01
   SetOverwrite on
   File /oname=firefly.exe "${MTD_SOURCE}\mt-daapd.exe"
   File "${CONFIG_SOURCE}\FireflyShell.exe" 
+  File "${CONFIG_SOURCE}\FireflyShellDEU.dll"
+  File "${CONFIG_SOURCE}\FireflyShellFRA.dll"
+  File "${CONFIG_SOURCE}\FireflyShellNLD.dll"
   File "${CONFIG_SOURCE}\..\FireflyShell.exe.manifest"
   File "${DLL_SOURCE}\gnu_regex.dll"
   File "${DLL_SOURCE}\pthreadVC2.dll"
@@ -245,11 +272,11 @@ SectionEnd
 Section -AdditionalIcons
   WriteIniStr "$2\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
   CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$2\${PRODUCT_NAME}.url"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$2\uninst.exe"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Debug Mode.lnk" "$2\firefly.exe" "-d9 -f"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Firefly Configuration.lnk" "$2\FireflyShell.exe"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Advanced Configuration.lnk" "notepad.exe" "$2\mt-daapd.conf"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\$(STRING_WEBSITE).lnk" "$2\${PRODUCT_NAME}.url"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\$(STRING_UNINSTALL).lnk" "$2\uninst.exe"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\$(STRING_DEBUG_MODE).lnk" "$2\firefly.exe" "-d9 -f"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\$(STRING_FF_CONFIGURATION).lnk" "$2\FireflyShell.exe"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\$(STRING_ADV_CONFIG).lnk" "notepad.exe" "$2\mt-daapd.conf"
 
   Delete "$SMPROGRAMS\Startup\Firefly Configuration.lnk"
   
@@ -286,11 +313,11 @@ SectionEnd
 
 Function un.onUninstSuccess
   HideWindow
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+  MessageBox MB_ICONINFORMATION|MB_OK "$(un.STRING_UNINSTALLED)"
 FunctionEnd
 
 Function un.onInit
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "$(un.STRING_AREYOUSURE)" IDYES +2
   Abort
 FunctionEnd
 
@@ -300,6 +327,22 @@ Function .onInit
   StrCpy $INSTDIR "$PROGRAMFILES\${PRODUCT_NAME}"
   StrCpy $2 "$PROGRAMFILES\${PRODUCT_NAME}"
   StrCpy $3 "$DOCUMENTS\My Music"
+  
+  Push ""
+  Push ${LANG_ENGLISH}
+  Push English
+  Push ${LANG_FRENCH}
+  Push French
+  Push ${LANG_DUTCH}
+  Push Dutch
+  Push ${LANG_GERMAN}
+  Push German
+  ; more
+  Push A
+  LangDLL::LangDialog "Installer Language" "Please select the language of the installer"
+  Pop $LANGUAGE
+  StrCmp $LANGUAGE "cancel" 0 +2
+  Abort
 FunctionEnd
 
 Function LicensePost
@@ -321,17 +364,17 @@ Function DirectoryShow
 
 AppDirectoryPage:
   StrCpy $9 "1"
-  !insertmacro MUI_INNERDIALOG_TEXT 1041 "Destination Folder"
+  !insertmacro MUI_INNERDIALOG_TEXT 1041 "$(STRING_DESTFOLDER)"
   !insertmacro MUI_INNERDIALOG_TEXT 1019 "$PROGRAMFILES\${PRODUCT_NAME}\"
-  !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will install ${PRODUCT_NAME} in the following folder.$\r$\n$\r$\nTo install in a different folder, click Browse and select another folder. Click Next to continue."
+  !insertmacro MUI_INNERDIALOG_TEXT 1006 "$(STRING_DESTDETAIL)"
   Goto EndDirectoryShow
 
 MusicDirectoryPage:
   StrCpy $9 "2"
-  !insertmacro MUI_HEADER_TEXT "Choose Music Location" "Choose the folder containing music to share."
-  !insertmacro MUI_INNERDIALOG_TEXT 1041 "Music Folder"
+  !insertmacro MUI_HEADER_TEXT "$(STRING_MUSICTITLE)" "$(STRING_MUSICHEADER)"
+  !insertmacro MUI_INNERDIALOG_TEXT 1041 "$(STRING_MUSICFOLDER)"
   !insertmacro MUI_INNERDIALOG_TEXT 1019 "$DOCUMENTS\My Music"
-  !insertmacro MUI_INNERDIALOG_TEXT 1006 "Setup will share the music in the following folder.$\r$\n$\r$\nTo share a different folder, click Browse and select another folder. Click Install to start the installation."
+  !insertmacro MUI_INNERDIALOG_TEXT 1006 "$(STRING_MUSICDETAIL)"
 EndDirectoryShow:
 FunctionEnd
 
@@ -537,6 +580,9 @@ Section Uninstall
   Delete "$INSTDIR\firefly.exe"
   Delete "$INSTDIR\FireflyShell.exe"
   Delete "$INSTDIR\FireflyShell.exe.manifest"
+  Delete "$INSTDIR\FireflyShellDEU.dll"
+  Delete "$INSTDIR\FireflyShellFRA.dll"
+  Delete "$INSTDIR\FireflyShellNLD.dll"
   
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"