From 1f123424b30d1a629fd1576a49523e529bebc0b3 Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Thu, 30 Nov 2006 07:28:25 +0000
Subject: [PATCH] Finish localizations for dutch, german, and french

---
 win32/FireflyShell/AboutPage.cpp              |   2 +-
 win32/FireflyShell/FireflyShell.DEU.rc        | Bin 21464 -> 21160 bytes
 win32/FireflyShell/FireflyShell.cpp           |  20 +++++++++
 win32/FireflyShell/FireflyShell.h             |   1 +
 win32/FireflyShell/FireflyShell.rc            |  40 ++++++++---------
 win32/FireflyShell/FireflyShellDEU.vcproj     |   4 +-
 win32/FireflyShell/FireflyShellFRA.rc         | Bin 22004 -> 21696 bytes
 win32/FireflyShell/FireflyShellFRA.vcproj     |   4 +-
 win32/FireflyShell/FireflyShellNLD.rc         | Bin 21244 -> 21004 bytes
 win32/FireflyShell/FireflyShellNLD.vcproj     |   4 +-
 .../localizations/dutch/dutch.ini             | Bin 7188 -> 7038 bytes
 .../localizations/french/french.ini           | Bin 7948 -> 7730 bytes
 .../localizations/german/german.ini           | Bin 7408 -> 7194 bytes
 .../localizations/german/german.lws           | Bin 250 -> 250 bytes
 win32/nsi/localizations/French.nsh            | Bin 4098 -> 2043 bytes
 win32/nsi/mt-daapd.nsi.templ                  |  42 +++++++++---------
 16 files changed, 68 insertions(+), 49 deletions(-)

diff --git a/win32/FireflyShell/AboutPage.cpp b/win32/FireflyShell/AboutPage.cpp
index 0af0820e..db4c5fe1 100644
--- a/win32/FireflyShell/AboutPage.cpp
+++ b/win32/FireflyShell/AboutPage.cpp
@@ -23,7 +23,7 @@
 LRESULT CAboutPage::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
     m_firefly_link.SubclassWindow(GetDlgItem(IDC_FIREFLYLINK));
-    m_firefly_link.SetHyperLink(_T("http://www.fireflymediaserver.org"));
+    m_firefly_link.SetHyperLink(_T("http://forums.fireflymediaserver.org"));
     
     m_roku_link.SetHyperLink(_T("http://www.rokulabs.com"));
     m_roku_link.SubclassWindow(GetDlgItem(IDC_ROKULINK));
diff --git a/win32/FireflyShell/FireflyShell.DEU.rc b/win32/FireflyShell/FireflyShell.DEU.rc
index 207d93c6c556e5b5f7686638384d1802375cef44..bbbd2ef5b1cd31f2b1c9c4d05937d94611757c05 100644
GIT binary patch
delta 424
zcmcbyoN>ic#tjd68J#CT<gH}ZW6+!YP{w+4k&qOx5rYncB?E{wVldx)l24vV*bpvY
zz+eoPHk<rVLwIt7io#?)!FymsG$+dlXTS_n4r1_U@MZ{Q@L}*|@B^}R7!1Ki8ZsC#
zm_dx5e3DOf^EMFyCU$cM6QGdA<cD&mlkceUOy(2k;<tb*GXyI(m@F${JefyGX>yIY
z53+j600u{f5C#vBey|Qx26MQMexP40fIM@s4A9BSqMOf2Twvq|dJHTCbj{@dg8JM6
z42cZIKv>R@Kl!7o{NxF09K5Dr706DzCndxUvBZ$Ul)+^4U#UnAR#4DbPL5Wt<TV7_
z1+@`qS1pE!=;j6$FLtmNi^=D;lldW941ulzIof=)qmCyFGti33h6cKucNxej0{{Zm
BTaEw#

delta 508
zcmaKoze@rE6vw}(M1|dz))^+{ac4yS;Pmu7B?ux~f+7m~F-3}y1Qk?7Lqcm14sXvX
zYA`Sk8jZ$=_J)xDj;7w-xe0BL_xOIk-|u^R5WXIT_K!#%StXye8&Ob36=%3W1&2Hx
zL%|kmsM5YvqIzOtxC8?!WMSHGQp_hBJQjIjAcGt|s}b7J6p9DCF0wP92<|YZ%*Yzf
zc~X(0hNO)aV6n=Bm5`wWNvGeCLa%ay;-S-MijDt|5)NcgaHCi-=v_)Wj<HRg;E3bT
zv7>^^KJSmvbg<add3w`TYxdOmm`^Y%9bTZ;>_~JSOIX7S8+cKjqE1Z%7Tw8Be;!5B
z!^>R631PZ*_)0h7hM03-VtE&OQDy2XaeI5RB?S0!$h)aCl$A|tM?zwj#ojIl!~Try
z4GlQ&EKpLt>ah%$Xfo@%ZzJ0q+Uj6W(o9qWp1ni0NRP$nez9$TC+mJcXC*;T+qe3R
F_6K4{Y{mcp

diff --git a/win32/FireflyShell/FireflyShell.cpp b/win32/FireflyShell/FireflyShell.cpp
index b7303293..4bccd6b3 100644
--- a/win32/FireflyShell/FireflyShell.cpp
+++ b/win32/FireflyShell/FireflyShell.cpp
@@ -15,6 +15,9 @@
 */
 
 #include "stdafx.h"
+
+#include <winnls.h>
+
 #include "resource.h"
 #include "FireflyShell.h"
 #include "DosPath.h"
@@ -38,10 +41,27 @@ Application::Application()
     m_config_path = filename.GetPath();
     ATLTRACE("Config path: %s\n", (const TCHAR *)m_config_path);
 
+
     // Dump an ini file with drive mappings
     CDosPath mapfile(_T("mapping.ini"));
     mapfile |= path;
+    m_ini_path = mapfile.GetPath();
 
+    /* Load the proper language dll, if possible */
+    LANGID lidDefault = GetUserDefaultLangID();
+    int iBaseLanguage = lidDefault & 0xFF;
+    iBaseLanguage = GetPrivateProfileInt(_T("shell"),_T("lang_id"),iBaseLanguage,m_ini_path);
+
+    TCHAR tempPath[24];
+    wsprintf(tempPath,_T("FireflyShell-%02x.dll"),iBaseLanguage);
+    CDosPath langlib(tempPath);
+    langlib |= path;
+
+    HMODULE hLangDLL;
+    if((hLangDLL=LoadLibrary(langlib.GetPath())) != NULL) {
+        _AtlBaseModule.SetResourceInstance(hLangDLL);
+    }
+   
     TCHAR inbuffer[4];
     TCHAR outbuffer[2048]; /* as max_path is unreliable */
     DWORD size;
diff --git a/win32/FireflyShell/FireflyShell.h b/win32/FireflyShell/FireflyShell.h
index f5e5d186..f714abb5 100644
--- a/win32/FireflyShell/FireflyShell.h
+++ b/win32/FireflyShell/FireflyShell.h
@@ -32,6 +32,7 @@ class Application : public Singleton<Application>
 	CNotifyIcon m_icon;
 	CMainDlg *m_dlg;
 	CString m_config_path;
+        CString m_ini_path;
 	Service m_service;
 	ServiceStatusMonitor m_service_monitor;
 	ServerEvents m_server_events;
diff --git a/win32/FireflyShell/FireflyShell.rc b/win32/FireflyShell/FireflyShell.rc
index 5a1176c2..a93d8356 100644
--- a/win32/FireflyShell/FireflyShell.rc
+++ b/win32/FireflyShell/FireflyShell.rc
@@ -68,19 +68,16 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    LTEXT           "For help, tips and troubleshooting advice visit the ",
-                    IDC_STATIC,12,92,156,9,NOT WS_GROUP
+    CTEXT           "For help, tips and troubleshooting advice...",
+                    IDC_FIREFLYLINK,12,92,276,9,NOT WS_GROUP
     GROUPBOX        "Version information",IDC_STATIC,6,121,288,100
     CONTROL         "",IDC_VERSIONLIST,"SysListView32",LVS_REPORT | 
                     LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,12,132,276,68
-    PUSHBUTTON      "&Copy to Clipboard",IDC_COPY,218,203,70,14
+    PUSHBUTTON      "&Copy to Clipboard",IDC_COPY,192,203,96,14
     CONTROL         208,IDC_LOGO,"Static",SS_BITMAP | SS_CENTERIMAGE | 
                     SS_SUNKEN | WS_BORDER,6,7,288,73
-    LTEXT           "Firefly Media Server website",IDC_FIREFLYLINK,167,92,90,
-                    9,NOT WS_GROUP
-    LTEXT           "For information on Firefly compatible music players, visit",
-                    IDC_STATIC,12,106,172,9,NOT WS_GROUP
-    LTEXT           "Roku's website",IDC_ROKULINK,186,106,52,9,NOT WS_GROUP
+    CTEXT           "For information on Firefly compatible music players...",
+                    IDC_ROKULINK,12,106,276,9,NOT WS_GROUP
 END
 
 IDD_PAGE_BASIC DIALOGEX 0, 0, 300, 230
@@ -89,16 +86,17 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
 CAPTION "Library"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    LTEXT           "Library &Name",IDC_STATIC,12,24,54,8
-    EDITTEXT        IDC_SERVERNAME,67,21,227,14,ES_AUTOHSCROLL
-    LTEXT           "Media &Location",IDC_STATIC,12,61,48,8
-    EDITTEXT        IDC_PATH,66,57,222,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_BROWSE,238,76,50,14
+    LTEXT           "Library &Name",IDC_STATIC,12,24,74,8
+    EDITTEXT        IDC_SERVERNAME,86,21,202,14,ES_AUTOHSCROLL
+    LTEXT           "Media &Location",IDC_STATIC,12,61,74,8
+    EDITTEXT        IDC_PATH,86,57,202,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse...",IDC_BROWSE,228,76,60,14
     GROUPBOX        "Security",IDC_STATIC,7,113,287,103
     CONTROL         "&Protect Firefly media library with a password",
                     IDC_PROTECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,135,
-                    154,10
-    EDITTEXT        IDC_PASSWORD,174,132,114,14,ES_PASSWORD | ES_AUTOHSCROLL
+                    276,10
+    LTEXT           "Pass&word",IDC_STATIC,12,156,74,8
+    EDITTEXT        IDC_PASSWORD,86,154,114,14,ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT           "You can limit access to your music library by assigning a password.  If a password is assigned, only clients that provide the correct password will be able to play music from your library.",
                     IDC_STATIC,12,180,276,26,SS_NOPREFIX
 END
@@ -122,9 +120,9 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     GROUPBOX        "Server Status",IDC_STATIC,6,7,288,82
     LTEXT           "Current state of the server goes here",IDC_SERVERSTATE,
-                    12,28,206,25
-    PUSHBUTTON      "&Stop Server",IDC_STOPSERVICE,238,28,50,14
-    PUSHBUTTON      "&Start Server",IDC_STARTSERVICE,238,28,50,14
+                    12,28,199,25
+    PUSHBUTTON      "&Stop Server",IDC_STOPSERVICE,218,28,70,14
+    PUSHBUTTON      "&Start Server",IDC_STARTSERVICE,218,28,70,14
     CONTROL         "&Start Firefly when Windows starts",IDC_AUTOSTART,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,63,276,10
     GROUPBOX        "Advanced",IDC_STATIC,6,93,288,61
@@ -137,8 +135,8 @@ BEGIN
                     IDC_STATIC,12,129,276,23
     GROUPBOX        "Web administration",IDC_STATIC,6,159,288,54
     LTEXT           "Firefly Media Server also provides a web administration interface.",
-                    IDC_STATIC,12,177,206,20
-    PUSHBUTTON      "&Open",IDC_WEBADMIN,238,177,50,14
+                    IDC_STATIC,12,177,198,20
+    PUSHBUTTON      "&Open",IDC_WEBADMIN,218,177,70,14
 END
 
 
@@ -167,7 +165,7 @@ BEGIN
         LEFTMARGIN, 6
         RIGHTMARGIN, 294
         VERTGUIDE, 12
-        VERTGUIDE, 66
+        VERTGUIDE, 86
         VERTGUIDE, 131
         VERTGUIDE, 218
         VERTGUIDE, 288
diff --git a/win32/FireflyShell/FireflyShellDEU.vcproj b/win32/FireflyShell/FireflyShellDEU.vcproj
index 4755f5c1..fab88eac 100644
--- a/win32/FireflyShell/FireflyShellDEU.vcproj
+++ b/win32/FireflyShell/FireflyShellDEU.vcproj
@@ -31,7 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/FireflyShellDEU.dll"
+				OutputFile="$(OutDir)/FireflyShell-07.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/FireflyShellDEU.pdb"
@@ -78,7 +78,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/FireflyShellDEU.dll"
+				OutputFile="$(OutDir)/FireflyShell-07.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
diff --git a/win32/FireflyShell/FireflyShellFRA.rc b/win32/FireflyShell/FireflyShellFRA.rc
index 8c5cadf3a876308646ebe17f6afca2eb10fed2f1..d5a6efe3b5320040645d6347f1f91cea28028763 100644
GIT binary patch
delta 449
zcmYk1y-or_6ou~)0S(G#A^hzon}DK0R(57#VK-=jT8KZO20J@@qlvXIV0n9`H8v#E
zSy31pE8fBfFt$1~3uq>p+}v~WopZll$oQFzK3B*dc2Y&WOeZm)+>O>iJiJW?_?j|w
z7i<VX{w}nj2{!8K3f8J6p4DQJG@FYQ>dM;Wj;@nA^YM?jaSnYrf(tl?F7(7?15;!M
zRFeNC6#06_h>#X`a%Y-96`8V7e9G5xd9#Gyxq))D3#ZV50UQWD^m?MI#7XZ%#uZyT
zEH6k@%nTY>tUCO<@J<rbyTp>>PsJf8*f&fpSytRr!Lmdf@61#pgfsA<!O@&7Cgk;j
zO7d`GGaRlRW|&HwWzN#1O3S^axr!A%;Nx;E9+eOuKkO?l6q%?h>$mvMR(FB;s5?2l
UVObnHZ@Aqw@Sa+H<nFKj0+9V#&;S4c

delta 506
zcmZXQy-LGS6vt1jMca~;G^U}2LTEyfG{y9$X&P`4opka8Q94-s8pMEu+QFgt2DO|)
zL=ZO-9fUkU^$~o5&f@GMB6x3-MIA2pa_>FA|L>gVd+y_bdwS!sXOuB5EGsH>;Q)^5
zI)QyS0~LI_tJo1dd@oF;JRo2~9h_h&tdH@89$WN+fCV-VwF3IOifwVkfZ4SeqrwJ-
z?4Vdy@OGh+D1(W8LCZG5rL_^#0}Ho>8QhXo>>38Pb2p+%<A3SI8u^R`%}~Pyf-gdq
zrD=cCXzd<ThgCR&LpTMNT9Zm*E3S<gPDs##o>Uy;9K4cO#7K*^#u_8w;+K4vXg~|E
zWe-RBG!<v@PN+|R;HPY(p=|PYI1D#>4f@JAm!zYD1`Y}mKFZTLU(E4!TGj~dZ6HCX
z_&S+k<6}eu4wjTU`r1;=A|cViz9Q2E9WV483i|B-*TB~+6Uh*Sm(|^Dq{6b;jGZ85
PE{=0e9FSUYZq4aGmkn&e

diff --git a/win32/FireflyShell/FireflyShellFRA.vcproj b/win32/FireflyShell/FireflyShellFRA.vcproj
index 6d648cca..623c6b56 100644
--- a/win32/FireflyShell/FireflyShellFRA.vcproj
+++ b/win32/FireflyShell/FireflyShellFRA.vcproj
@@ -31,7 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/FireflyShellFRA.dll"
+				OutputFile="$(OutDir)/FireflyShell-0c.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/FireflyShellFRA.pdb"
@@ -78,7 +78,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/FireflyShellFRA.dll"
+				OutputFile="$(OutDir)/FireflyShell-0c.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
diff --git a/win32/FireflyShell/FireflyShellNLD.rc b/win32/FireflyShell/FireflyShellNLD.rc
index 6fb2ffcc1d0dc0c2057af624f22a31cfd73a8aac..e3b94caab20088ad9313fdbc4fbeee2724012ff6 100644
GIT binary patch
delta 546
zcmeyfl(A<C<Aw*kjLwrE^5!z@G3ZTRt!X{EN=Qo3h(U+Jk^w{-F_<%$G3ZRbD5N=A
zMoDQi2mcF3VMDm20fRAEsoCUw730Zfg7?6NX-`%YPJkPjA|fITGRly_0Av)Bk&2tw
zi10A6n=_aIg)JseRCAmp&c$y5Rb>cPYcTn(n)+l1@gjsWDNE511`m)Huu4;)6G5iJ
zRPsy~P*9m1Ct<{E1XQ5|@c@I_WJW<zuotdKY+{_;qbf1kPfUq1eDXpW;mMQ46!;Ap
zOu@#%T_fer4Y2?uW3u_F)IvtalFjWhx7oNs0bmKX)O7NDWz)%vlr1<7!IlB7ocvcn
za`GSL6ciE5$ucSelb6^DY(AuN4q^bvZ6H^_S2mn{Mq2~u0Fa0w(7ho4m`^TLklrk(
zqsPJwbj4&v1MSUK26cjy6C6d@^B6K2QW;7n7djeGmQ!Y%Y~d8doXJo;S<u;Z@*bxM
zD0?nv5>QnYP;L5TMQ8QRcbpSg7*i%UI*L!0@Kl*x<>4@SpO@C;dmdY$8Z;;Sd2viW
O;F-plyjk7rDhB{AZiZU`

delta 600
zcmZutzfTik7=Di`7D|hEq}LQ8z1*dt!AkG0y<RU43Jn6$DkV-14x|wE1|yUx3@kbt
zjXZ;!35h!B()j%gE>8YPNJvZ!qi*g>;(On9(8T3?zwiCt=g0dzeyRL^rSy){m>f4@
zYr`1H%w-K)r8U~2yL^UZP=~95XQkFqKrWTZArHT_qBzWG18J9^4Q{$*Qxz>MfUSO$
zbgwUz#tgd8;8ohB+tlToNo73DSfh3F857e5WMf~e?2Q@F$EVrFozXI@{^fzSucd6N
zOKqQA9BWoITUcR_A#KqV3;a*&qjpAZ^l>rXBUc=2l>x=Wz5IE+DUM8BrCDmxJd?++
zqK%?`T=MZW`#e#j1}fPgzsz&jX;IEaRy?@_&*5`%3g0Jfe9_%>Ri@!fQBSD3A4-bz
zq8bAnUi6$EpqJ029R|m}Dm(g+-&d4v5l(y^JQ)R9$7OS~PvuHN4{9!pBeU~wSF|nb
zR7ygmXHHUg(3>u$Vjq!=k9MJeE47|@cXl_S)P+-dtK#RyJ-lDg@nW_s>&)Dvp$=_u
zm?6!eeJKZ{so_CW$F7;g6KhZmHybAsUAiSdZ!B~ecG#yljhjnJd|F&rLg6nRB>w<}
CuZ$4@

diff --git a/win32/FireflyShell/FireflyShellNLD.vcproj b/win32/FireflyShell/FireflyShellNLD.vcproj
index d80d0bcc..340613fe 100644
--- a/win32/FireflyShell/FireflyShellNLD.vcproj
+++ b/win32/FireflyShell/FireflyShellNLD.vcproj
@@ -31,7 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/FireflyShellNLD.dll"
+				OutputFile="$(OutDir)/FireflyShell-13.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/FireflyShellNLD.pdb"
@@ -78,7 +78,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/FireflyShellNLD.dll"
+				OutputFile="$(OutDir)/FireflyShell-13.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
diff --git a/win32/FireflyShell/localizations/dutch/dutch.ini b/win32/FireflyShell/localizations/dutch/dutch.ini
index 186c747b6eb6436d5a9994f05527df44ce9ad26d..ec1e63b1df8e7f00f64abd8f02baf34caccd1d3f 100644
GIT binary patch
delta 189
zcmbPY@y~3-7S_o|Yyqr#3_v(}I$JQ5^`9*t%Bp5BgtC6Kztj$3NMtAmLN$hRhJ1!1
zh7<-R23sHw2Z|>%WH6L~#lbS06*>J`7)v%6@~W~iXEGE|ek-Cs*+N)q@*UwKDBpN;
zok-E-K1q(rpG4+?=*^QvxfmIfC(jkrW=z?9T1=jaGl?OUp^71sA${{liCo6X*Ca$X
J$4PBt1OSd*H7o!C

delta 279
zcmexoHpODY7S_p2STqF78B!UN7>XG(8A^aGB?jBc^I3FxQA8)NWQ`V8U?>Bsfv8ge
zs?7kZR+!Am77Ub00<x<Z@_}SFg91YeSSFDzpH~OSgX@}nm93B;B!Z-RvN!un+aRFM
zY=%+>b)e}A3@A2(+ylgTRBVpt@MmGH+`OJgm2I+vh|Xj-;T|AuF!_XV5s+R0#8Q()
qKQU%c{w%7^40QHpc`<n=_7sL9ppDs+d&R>y&yx^i+<ZcE8zTVfQber)

diff --git a/win32/FireflyShell/localizations/french/french.ini b/win32/FireflyShell/localizations/french/french.ini
index 609de42c915958b324c6b543b244fc6864f9d3aa..2579760ee35ece4319a7ae4102b5b426e56d3f87 100644
GIT binary patch
delta 91
zcmeCN+hnsri*52Awg6T=1|XcQ$Q}-5^|R;0#Y877a7=*kHXr0*XOs+JNMtAmLN$hR
ahJ1!1h7<-R23sKZoy^ZCzL|@QNfZFUuoB1s

delta 234
zcmdmF(_^<mi*52R77fjEhE#?mhGK?Hh7ur4iNO|#gP}YHhH$W~0z(Qz>10I#^T|@;
zT$8of0z?%U%7AJhx)gvqGl1$8CfBotizCaVGE^}rFyw&cZnNd{>Hv9geUts!mkOeY
r0M%7Z_U90vEWq)>F^D0bA)BF;K^<s|0t2zG1iFF&s&lhGC$lI3ZT~RQ

diff --git a/win32/FireflyShell/localizations/german/german.ini b/win32/FireflyShell/localizations/german/german.ini
index 0421847c8eecb0109e0cd6ce9ac4e938998b4d47..13781a917bd49e746c44a734e399a50adca1138b 100644
GIT binary patch
delta 96
zcmexhIm=?h9oETFYyqr#3_v(}KU+MMWzL=tWo>3Jhq7EbzN!Z>Br+5Op&COuLq0<h
VLkfcugDnul#37<3o69*Xg#o9^7T*8>

delta 224
zcmbPb@xgM#9oES<qH6pK4CM@|3`q>d44Dii45^b7MfHJV;V5DkS))Z27|MVuAgUCA
zDl>p86eb(8#Y-vxb*BPlN*R*DqInDo48cIPsgtL&<@4$Qd2pSRIoZplK_a+xw6cG-
e4PwY=$Of9G4m1<Zbqq=jwm^(W#pZ<^mBIjqk}(zl

diff --git a/win32/FireflyShell/localizations/german/german.lws b/win32/FireflyShell/localizations/german/german.lws
index 61200c99aeab7ef9f929f1e04f853c86bcbe6697..862089bb2b4bca40600d4cf53d5796083975c56e 100644
GIT binary patch
delta 11
Scmeyx_=|DE14hG%4<!L1ECnP0

delta 11
Scmeyx_=|DE14e_14<!L1C<P+`

diff --git a/win32/nsi/localizations/French.nsh b/win32/nsi/localizations/French.nsh
index 0fac5320fad085f4675c61cbb5b982840f3e7c73..0b05b756334421efa7593f47db773ee984278a8a 100644
GIT binary patch
literal 2043
zcmbVNO>fgc5WQFGf0$O0S|rFF^?;n%X^j#)@<%HqM6}qOWRbmVcGpHN;t%pGIAZ<+
z7iQOv71}}rmne}lZ{ECl^L&!iHRBZKPH+jQv&ajkSEt8E$44iOD=KwKGAZoSRh&dV
z{%IM7ZaPg?fwS<if=RkAZec-lMj)oLq0-i0fX|gCMFC1n#y9FOkR9@B5(clsG+KF4
z6h?45r+^F^mQk1p{z23dD)Vu}crHFE;AaFXqM+3+XesKZ9m6%PSy9kCK=!6Nl~6o{
z$tgHhg%6f{cw?mf$Dw<MaS|?<D8efCqHBMO^E*=h(7$yVj}Jk*as0#p&B6$U4VQ?d
zHRYNDk}J-LfrY#t6gVHfeAeq4cY4BFNYGmf1V>>R(M<5&*pTB|GA-mSD#U5=^kl9V
zC$n(wdMLarlwvp&GI6QWj9csj<S`(wmpK01Zm*JJBS~4}OlSQ*I+hLD5ydW}&-;%0
z0y*KzEG_R@sG2o|>+$HV9KGe;r`=nz12t4lQO$><oUPZbL_MEFR<MsXIzpj!mPBT_
zawdUlP;G%4p=ulfu$I(X4sFLU-K&c`4xRrp!BLZ%O0(zVqYJpdkg`@RL*e!I-}kUc
zV}F|X$sD~k-3q3dQb@iyqh(c)jFvc)wFrR)w!z5`*oy_d@*KO}ebixGFhfy}IzvIg
z41mb+4Tq4LY`RgOIu6_A5fA+%&jSs#W46y1@8wC?40ZqSmb)k1(gz>9%H~zxmUzzi
zYcQ<6f}MMkEme5LXuaJ*V{&2eQjXWZ6;fxlel$EMVRF@Havx7O-X!)DbWY4LNN(u+
zN4@c|E)D!3PMkTOt=p<0IuERNy-9kxT7)h(UI-f+@9WKh#k1LJ8U{1}GL4+X4+C_)
z;A^(2Wfv6)*S}&81a#c%9`QbugE5k|=3dOvro5kXcfOBhWQwxbmtHUMAe86A>FE4j
zKuY=yh<ydAx~e2ATObY1Fm1BzyE2#B2oozp<|apJZBygnDc$enMBbY)jnfE4{i>;Y
v(TG}s`e{=czZU{StZ!-Zuf?}G)2!(NVxWdGr)?osc;aOx6rQ+xWi|K(V9>ZA

literal 4098
zcmc(i(M}UV6o${WiSMuy5;alojTdI2fHi=G7Kn+lDcb^TpkNCaG`^ru;idQrChGUk
z*>$&D8rD!XO?P*8c4q!_&VT+n^Yh0&>sjCSEwusn$kr^j4O``D&Q@&8mT4{7b6R)p
zPWayo-;VftXlHh8T}ya6DUIz|%i4@>W;1Q_{L&h>%}j0U@HVz}X4V=l=DFa1&KwbM
z&+Uj=Q|7$_S<37YI8u6r^2jbrNS@Ny1owy$UHXn_>v<Ru9`G#8e~!0|zGI7E->?^4
zx3QxG?yX?Y7OTzSFL}+qalyJtXfNWAfxYGGcAfry+6~xxwBIu-;;Z|?##63pUxELM
zyR6XY3t9`bcY=@7U}fJv@J10UELSuldh4K3#3N#G%Fjn^PQka3dHc3Llt*9MCO_wd
z7$QIJ&|b=z5M#m6zG3-vTNd!etT653fhM?eL@OXvd~>XdZVVdX8H8&Taz$QN%yP7P
zdyYS=9C%>!_QW1m_}XHof}atbKB296ABL!Ov#5wkUEZej59l9{w$}8VNccuGT=I=L
zq%1y~3GW-kMZS<<*2rGPOFn6^-iTkC#mU*!pd~g6XMx*Q<F@R{k?7tIQCka0Joiqq
z{=^Qrc2SMv;Kd#h8uwU%DI%w&D&zgmxq15tN3U0_PmJjW4=YbSZ<NPnUyNWv8s-;c
z7GS_@aOpZ2doJ=#T)GZPvC?^ne|06rf1lqK^E*Eufhqx4YVSbd8X-Jl*Cx1!^tv92
zIT2r+aUC&(Y!Q!~YhsZ4ecdj1F;<E(jzOxlG-bUOqY6KWnYj`QgM1^Kg>v{ipQY7O
z^qVr|m~moX!nb0)GUs39!#euk3VJ2YXp<AmtUHGf4zVc>n8XG5yyDu2jZ#?ckb3qw
z39G!R_rBxF8jsm*@})rf9E@=(cc)>UjIOxkkrHa@irC_q^9VTR$iC2{NT?p@l8NQ0
z-Zu9OTk7eMDu}=5&)F(a)o0WE>-)=i_9=7AIaWt&CfEBP+M?R!HrmpJi`BZP(3c*1
zrkYf{v+LNT!WMf$UQ6WK(+<0^aySZe=w98SeQmFOl^eeIO9S*Sp?wCvx|OG@%Qp3O
zx#pAx7WH$-cFE$!pgrwOb6O~d>XL}QzU^f-Mx9)%v)(rKuBsxTh|xLUZ5w!2nN{_E
zea)(~wlZuHrCp^GTgNwQOJ&#bZ&7LN;pKxFTfIW1(?QKu?XO_}YN+>Pe9#Q<T<fKY
zIxQW5Kov*6Yv!tc-C1Q;agmbmR50FzD$c5rgy{7%kL7IN#+LDTR(IdJEEZ$RoUJl=
zl2OapBJA__z}_%gwOgNRS$S8Sf~0XerKn=oiBP>dEhapvFX8u<r`-D&uq3Zml#i;C
zydL!vW}feLB65>WF?Hgyy@DI63v@PgrhX2YIkLwfRn;SOBl`}TGD@9uRW<1CxRtJ2
o(lI}kE7Mg=l`DuzuX#16vp~M0>T%!2RfVWd^<8{q&q_S_1^c4B&j0`b

diff --git a/win32/nsi/mt-daapd.nsi.templ b/win32/nsi/mt-daapd.nsi.templ
index 2bd26ad8..ceb40d49 100644
--- a/win32/nsi/mt-daapd.nsi.templ
+++ b/win32/nsi/mt-daapd.nsi.templ
@@ -152,9 +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-0c.dll"
+  File "${CONFIG_SOURCE}\FireflyShell-07.dll"
+  File "${CONFIG_SOURCE}\FireflyShell-13.dll"
   File "${CONFIG_SOURCE}\..\FireflyShell.exe.manifest"
   File "${DLL_SOURCE}\gnu_regex.dll"
   File "${DLL_SOURCE}\pthreadVC2.dll"
@@ -328,21 +328,21 @@ 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
+;  ; 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
@@ -580,9 +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 "$INSTDIR\FireflyShell-0c.dll"
+  Delete "$INSTDIR\FireflyShell-07.dll"
+  Delete "$INSTDIR\FireflyShell-13.dll"
   
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"