diff --git a/win32/FireflyShell/FireflyShellJPN.rc b/win32/FireflyShell/FireflyShellJPN.rc
new file mode 100644
index 00000000..c2a508cc
Binary files /dev/null and b/win32/FireflyShell/FireflyShellJPN.rc differ
diff --git a/win32/FireflyShell/FireflyShellJPN.vcproj b/win32/FireflyShell/FireflyShellJPN.vcproj
new file mode 100644
index 00000000..74153e0b
--- /dev/null
+++ b/win32/FireflyShell/FireflyShellJPN.vcproj
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win32/FireflyShell/FireflyShellSWE.rc b/win32/FireflyShell/FireflyShellSWE.rc
new file mode 100644
index 00000000..fb0f285d
Binary files /dev/null and b/win32/FireflyShell/FireflyShellSWE.rc differ
diff --git a/win32/FireflyShell/FireflyShellSWE.vcproj b/win32/FireflyShell/FireflyShellSWE.vcproj
new file mode 100644
index 00000000..92c6dcb1
--- /dev/null
+++ b/win32/FireflyShell/FireflyShellSWE.vcproj
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/win32/FireflyShell/localizations/japanese/japanese.ini b/win32/FireflyShell/localizations/japanese/japanese.ini
new file mode 100644
index 00000000..18d11f4f
Binary files /dev/null and b/win32/FireflyShell/localizations/japanese/japanese.ini differ
diff --git a/win32/FireflyShell/localizations/japanese/japanese.lws b/win32/FireflyShell/localizations/japanese/japanese.lws
new file mode 100644
index 00000000..7c0b1f30
Binary files /dev/null and b/win32/FireflyShell/localizations/japanese/japanese.lws differ
diff --git a/win32/FireflyShell/localizations/swedish/swedish.ini b/win32/FireflyShell/localizations/swedish/swedish.ini
new file mode 100644
index 00000000..c0cabe5b
Binary files /dev/null and b/win32/FireflyShell/localizations/swedish/swedish.ini differ
diff --git a/win32/FireflyShell/localizations/swedish/swedish.lws b/win32/FireflyShell/localizations/swedish/swedish.lws
new file mode 100644
index 00000000..ec5f9b11
Binary files /dev/null and b/win32/FireflyShell/localizations/swedish/swedish.lws differ
diff --git a/win32/mt-daapd.sln b/win32/mt-daapd.sln
index 0fd4ae62..4b080eab 100644
--- 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
diff --git a/win32/nsi/localizations/Japanese.nsh b/win32/nsi/localizations/Japanese.nsh
new file mode 100644
index 00000000..a4b0e077
--- /dev/null
+++ 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)を完全にアンインストールしてもよろしいですか？"
diff --git a/win32/nsi/localizations/Swedish.nsh b/win32/nsi/localizations/Swedish.nsh
new file mode 100644
index 00000000..8e3208a0
--- /dev/null
+++ 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 fr Windows tj舅sten kan inte hittas. Var v舅lig installera Apple's Bonjour fr Windows."
+!insertmacro LANG_STRING STRING_STOPPING_SERVICE "Stannar tj舅sten..."
+!insertmacro LANG_STRING STRING_WAITING_FOR_STOP "V舅tar p att tj舅sten 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 fljande mapp.$\r$\n$\r$\nFr att installera i en annan map, klicka Bl臈dra och v舁j en annan map. Klicka p N舖ta fr att forts舩ta."
+
+; Strings for the music path directory panel
+!insertmacro LANG_STRING STRING_MUSICTITLE "V舁j musik mapp"
+!insertmacro LANG_STRING STRING_MUSICHEADER "V舁j mappen som inneh虱ler musik att dela ut."
+!insertmacro LANG_STRING STRING_MUSICFOLDER "Musik Mapp"
+!insertmacro LANG_STRING STRING_MUSICDETAIL "Installationen kommer dela ut musiken i fljande mapp.$\r$\n$\r$\nFr att dela ut en annan mapp, klicka Bl臈dra och v舁j en annan mapp. Klicka Installera fr 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臠e"
+!insertmacro LANG_BOTHSTRING STRING_FF_CONFIGURATION "Firefly Konfiguration"
+!insertmacro LANG_BOTHSTRING STRING_ADV_CONFIG "Avancerad Konfiguration"
+
+; Uninstall Strings
+!insertmacro LANG_UNSTRING STRING_UNINSTALLED "$(^Name) 舐 fullst舅digt avinstallerad fr蚣 din dator."
+!insertmacro LANG_UNSTRING STRING_AREYOUSURE "ﾄr du s臾er p att du vill avinstallera $(^Name) och alla dess komponenter?"
diff --git a/win32/nsi/mt-daapd.nsi.templ b/win32/nsi/mt-daapd.nsi.templ
index ceb40d49..a9cd6ebe 100644
--- 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"