Add Japanese and Swedish localizations for Windows, courtesy of Gareth Potter and Anton Johansson respectively.

2024-12-25 14:45:55 -05:00 · 2006-12-06 05:08:24 +00:00 · 2006-12-06 05:08:24 +00:00 · bbe5cba244
commit bbe5cba244
parent 639b22611d
12 changed files with 371 additions and 15 deletions
--- a/win32/FireflyShell/FireflyShellJPN.rc
+++ b/win32/FireflyShell/FireflyShellJPN.rc
--- a/win32/FireflyShell/FireflyShellJPN.vcproj
+++ b/win32/FireflyShell/FireflyShellJPN.vcproj
@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="FireflyShellJPN"
+	ProjectGUID="{59618041-38FA-4D80-B00B-113417259E6D}"
+	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;FIREFLYSHELLJPN_EXPORTS"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/FireflyShell-11.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/FireflyShellJPN.pdb"
+				SubSystem="2"
+				ResourceOnlyDLL="TRUE"
+				ImportLibrary="$(OutDir)/FireflyShellJPN.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;FIREFLYSHELLJPN_EXPORTS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/FireflyShell-11.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ResourceOnlyDLL="TRUE"
+				ImportLibrary="$(OutDir)/FireflyShellJPN.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=".\FireflyShellJPN.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/win32/FireflyShell/FireflyShellSWE.rc
+++ b/win32/FireflyShell/FireflyShellSWE.rc
--- a/win32/FireflyShell/FireflyShellSWE.vcproj
+++ b/win32/FireflyShell/FireflyShellSWE.vcproj
@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="FireflyShellSWE"
+	ProjectGUID="{D8109A27-5CB3-4888-B62A-F83BB3B1D41F}"
+	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;FIREFLYSHELLSWE_EXPORTS"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/FireflyShell-1d.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/FireflyShellSWE.pdb"
+				SubSystem="2"
+				ResourceOnlyDLL="TRUE"
+				ImportLibrary="$(OutDir)/FireflyShellSWE.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;FIREFLYSHELLSWE_EXPORTS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/FireflyShell-1d.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ResourceOnlyDLL="TRUE"
+				ImportLibrary="$(OutDir)/FireflyShellSWE.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=".\FireflyShellSWE.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/win32/FireflyShell/localizations/japanese/japanese.ini
+++ b/win32/FireflyShell/localizations/japanese/japanese.ini
--- a/win32/FireflyShell/localizations/japanese/japanese.lws
+++ b/win32/FireflyShell/localizations/japanese/japanese.lws
--- a/win32/FireflyShell/localizations/swedish/swedish.ini
+++ b/win32/FireflyShell/localizations/swedish/swedish.ini
--- a/win32/FireflyShell/localizations/swedish/swedish.lws
+++ b/win32/FireflyShell/localizations/swedish/swedish.lws
--- a/win32/mt-daapd.sln
+++ b/win32/mt-daapd.sln
@ -39,6 +39,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FireflyShellDEU", "FireflyS
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FireflyShellJPN", "FireflyShell\FireflyShellJPN.vcproj", "{59618041-38FA-4D80-B00B-113417259E6D}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FireflyShellSWE", "FireflyShell\FireflyShellSWE.vcproj", "{D8109A27-5CB3-4888-B62A-F83BB3B1D41F}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@ -85,6 +93,14 @@ Global
 		{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
+		{59618041-38FA-4D80-B00B-113417259E6D}.Debug.ActiveCfg = Debug|Win32
+		{59618041-38FA-4D80-B00B-113417259E6D}.Debug.Build.0 = Debug|Win32
+		{59618041-38FA-4D80-B00B-113417259E6D}.Release.ActiveCfg = Release|Win32
+		{59618041-38FA-4D80-B00B-113417259E6D}.Release.Build.0 = Release|Win32
+		{D8109A27-5CB3-4888-B62A-F83BB3B1D41F}.Debug.ActiveCfg = Debug|Win32
+		{D8109A27-5CB3-4888-B62A-F83BB3B1D41F}.Debug.Build.0 = Debug|Win32
+		{D8109A27-5CB3-4888-B62A-F83BB3B1D41F}.Release.ActiveCfg = Release|Win32
+		{D8109A27-5CB3-4888-B62A-F83BB3B1D41F}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
--- a/win32/nsi/localizations/Japanese.nsh
+++ b/win32/nsi/localizations/Japanese.nsh
@ -0,0 +1,29 @@
+!define LANG "JAPANESE"
+
+!insertmacro LANG_STRING PRODUCT_NAME "Firefly メディアサーバー"
+
+; Install strings
+!insertmacro LANG_STRING STRING_BONJOUR_ERROR "Windows版Bonjourサービスが見つかりません。Apple社のWindows版Bonjourをインストールしてください。"
+!insertmacro LANG_STRING STRING_STOPPING_SERVICE "サービスを停止中..."
+!insertmacro LANG_STRING STRING_WAITING_FOR_STOP "サービスの停止を待機中 ($9)"
+
+; Strings for the application install directory panel
+!insertmacro LANG_STRING STRING_DESTFOLDER "インストール先フォルダ"
+!insertmacro LANG_STRING STRING_DESTDETAIL "セットアップは ${PRODUCT_NAME} を次のフォルダにインストールします。$\r$\n$\r$\n他のフォルダにインストールするには、「参照」ボタンをクリックして、他のフォルダを選択してください。続けるには、「次へ」ボタンをクリックしてください。"
+
+; Strings for the music path directory panel
+!insertmacro LANG_STRING STRING_MUSICTITLE "ミュージックの場所の選択"
+!insertmacro LANG_STRING STRING_MUSICHEADER "共有するミュージックフォルダを選択してください。"
+!insertmacro LANG_STRING STRING_MUSICFOLDER "ミュージックフォルダ"
+!insertmacro LANG_STRING STRING_MUSICDETAIL "セットアップは次のフォルダにあるミュージックを共有します。$\r$\n$\r$\n他のフォルダを共有するには、「参照」ボタンをクリックして、他のフォルダを選択してください。インストールを開始するには、「インストール」ボタンをクリックしてください。"
+
+; These are for the startmenu shortcuts
+!insertmacro LANG_BOTHSTRING STRING_WEBSITE "ウェブサイト"
+!insertmacro LANG_BOTHSTRING STRING_UNINSTALL "アンインストール"
+!insertmacro LANG_BOTHSTRING STRING_DEBUG_MODE "デバッグモード"
+!insertmacro LANG_BOTHSTRING STRING_FF_CONFIGURATION "Firefly設定"
+!insertmacro LANG_BOTHSTRING STRING_ADV_CONFIG "詳細の設定"
+
+; Uninstall Strings
+!insertmacro LANG_UNSTRING STRING_UNINSTALLED "$(^Name)を正常にアンインストールすることができました。"
+!insertmacro LANG_UNSTRING STRING_AREYOUSURE "本当に$(^Name)を完全にアンインストールしてもよろしいですか？"
--- a/win32/nsi/localizations/Swedish.nsh
+++ b/win32/nsi/localizations/Swedish.nsh
@ -0,0 +1,29 @@
+!define LANG "SVENSKA"
+
+!insertmacro LANG_STRING PRODUCT_NAME "Firefly Media Server"
+
+; Install strings
+!insertmacro LANG_STRING STRING_BONJOUR_ERROR "Bonjour för Windows tjänsten kan inte hittas.  Var vänlig installera Apple's Bonjour för Windows."
+!insertmacro LANG_STRING STRING_STOPPING_SERVICE "Stannar tjänsten..."
+!insertmacro LANG_STRING STRING_WAITING_FOR_STOP "Väntar på att tjänsten ska stanna ($9)"
+
+; Strings for the application install directory panel
+!insertmacro LANG_STRING STRING_DESTFOLDER "Destination"
+!insertmacro LANG_STRING STRING_DESTDETAIL "Installations programmet kommer installera ${PRODUCT_NAME} i följande mapp.$\r$\n$\r$\nFör att installera i en annan map, klicka Bläddra och välj en annan map. Klicka på Nästa för att fortsätta."
+
+; Strings for the music path directory panel
+!insertmacro LANG_STRING STRING_MUSICTITLE "Välj musik mapp"
+!insertmacro LANG_STRING STRING_MUSICHEADER "Välj mappen som innehåller musik att dela ut."
+!insertmacro LANG_STRING STRING_MUSICFOLDER "Musik Mapp"
+!insertmacro LANG_STRING STRING_MUSICDETAIL "Installationen kommer dela ut musiken i följande mapp.$\r$\n$\r$\nFör att dela ut en annan mapp, klicka Bläddra och välj en annan mapp. Klicka Installera för att starta installationen."
+
+; These are for the startmenu shortcuts
+!insertmacro LANG_BOTHSTRING STRING_WEBSITE "Websida"
+!insertmacro LANG_BOTHSTRING STRING_UNINSTALL "Avinstallera"
+!insertmacro LANG_BOTHSTRING STRING_DEBUG_MODE "Debug Läge"
+!insertmacro LANG_BOTHSTRING STRING_FF_CONFIGURATION "Firefly Konfiguration"
+!insertmacro LANG_BOTHSTRING STRING_ADV_CONFIG "Avancerad Konfiguration"
+
+; Uninstall Strings
+!insertmacro LANG_UNSTRING STRING_UNINSTALLED "$(^Name) är fullständigt avinstallerad från din dator."
+!insertmacro LANG_UNSTRING STRING_AREYOUSURE "Är du säker på att du vill avinstallera $(^Name) och alla dess komponenter?"
--- a/win32/nsi/mt-daapd.nsi.templ
+++ b/win32/nsi/mt-daapd.nsi.templ
@ -81,6 +81,8 @@
 !insertmacro LANG_LOAD "French"
 !insertmacro LANG_LOAD "Dutch"
 !insertmacro LANG_LOAD "German"
+!insertmacro LANG_LOAD "Japanese"
+!insertmacro LANG_LOAD "Swedish"

 Name "${PRODUCT_NAME}"
 Icon "..\ff.ico"
@ -155,6 +157,8 @@ Section "MainSection" SEC01
  File "${CONFIG_SOURCE}\FireflyShell-0c.dll"
  File "${CONFIG_SOURCE}\FireflyShell-07.dll"
  File "${CONFIG_SOURCE}\FireflyShell-13.dll"
+  File "${CONFIG_SOURCE}\FireflyShell-1d.dll"
+  File "${CONFIG_SOURCE}\FireflyShell-11.dll"
  File "${CONFIG_SOURCE}\..\FireflyShell.exe.manifest"
  File "${DLL_SOURCE}\gnu_regex.dll"
  File "${DLL_SOURCE}\pthreadVC2.dll"
@ -328,21 +332,25 @@ Function .onInit
  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
+  Push ""
+  Push ${LANG_ENGLISH}
+  Push English
+  Push ${LANG_FRENCH}
+  Push French
+  Push ${LANG_DUTCH}
+  Push Dutch
+  Push ${LANG_GERMAN}
+  Push German
+  Push ${LANG_JAPANESE}
+  Push Japanese
+  Push ${LANG_SWEDISH}
+  Push Swedish
+  ; 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
@ -583,6 +591,8 @@ Section Uninstall
  Delete "$INSTDIR\FireflyShell-0c.dll"
  Delete "$INSTDIR\FireflyShell-07.dll"
  Delete "$INSTDIR\FireflyShell-13.dll"
+  Delete "$INSTDIR\FireflyShell-1d.dll"
+  Delete "$INSTDIR\FireflyShell-11.dll"
  
  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"