Finish localizations for dutch, german, and french

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));

win32/FireflyShell/FireflyShell.cpp

@@ -15,6 +15,9 @@
 */
 
 #include "stdafx.h"
+
+#include <winnls.h>
+
 #include "resource.h"
 #include "FireflyShell.h"
 #include "DosPath.h"
@@ -38,9 +41,26 @@ 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 */

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;

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 ",
+    CTEXT           "For help, tips and troubleshooting advice...",
-                    IDC_STATIC,12,92,156,9,NOT WS_GROUP
+                    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,
+    CTEXT           "For information on Firefly compatible music players...",
-                    9,NOT WS_GROUP
+                    IDC_ROKULINK,12,106,276,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
 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
+    LTEXT           "Library &Name",IDC_STATIC,12,24,74,8
-    EDITTEXT        IDC_SERVERNAME,67,21,227,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_SERVERNAME,86,21,202,14,ES_AUTOHSCROLL
-    LTEXT           "Media &Location",IDC_STATIC,12,61,48,8
+    LTEXT           "Media &Location",IDC_STATIC,12,61,74,8
-    EDITTEXT        IDC_PATH,66,57,222,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_PATH,86,57,202,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "&Browse...",IDC_BROWSE,238,76,50,14
+    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
+                    276,10
-    EDITTEXT        IDC_PASSWORD,174,132,114,14,ES_PASSWORD | ES_AUTOHSCROLL
+    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
+                    12,28,199,25
-    PUSHBUTTON      "&Stop Server",IDC_STOPSERVICE,238,28,50,14
+    PUSHBUTTON      "&Stop Server",IDC_STOPSERVICE,218,28,70,14
-    PUSHBUTTON      "&Start Server",IDC_STARTSERVICE,238,28,50,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
+                    IDC_STATIC,12,177,198,20
-    PUSHBUTTON      "&Open",IDC_WEBADMIN,238,177,50,14
+    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

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"

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"

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"

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}\FireflyShell-0c.dll"
-  File "${CONFIG_SOURCE}\FireflyShellFRA.dll"
+  File "${CONFIG_SOURCE}\FireflyShell-07.dll"
-  File "${CONFIG_SOURCE}\FireflyShellNLD.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 ""
-  Push ${LANG_ENGLISH}
+;  Push ${LANG_ENGLISH}
-  Push English
+;  Push English
-  Push ${LANG_FRENCH}
+;  Push ${LANG_FRENCH}
-  Push French
+;  Push French
-  Push ${LANG_DUTCH}
+;  Push ${LANG_DUTCH}
-  Push Dutch
+;  Push Dutch
-  Push ${LANG_GERMAN}
+;  Push ${LANG_GERMAN}
-  Push German
+;  Push German
-  ; more
+;  ; more
-  Push A
+;  Push A
-  LangDLL::LangDialog "Installer Language" "Please select the language of the installer"
+;  LangDLL::LangDialog "Installer Language" "Please select the language of the installer"
-  Pop $LANGUAGE
+;  Pop $LANGUAGE
-  StrCmp $LANGUAGE "cancel" 0 +2
+;  StrCmp $LANGUAGE "cancel" 0 +2
-  Abort
+;  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\FireflyShell-0c.dll"
-  Delete "$INSTDIR\FireflyShellFRA.dll"
+  Delete "$INSTDIR\FireflyShell-07.dll"
-  Delete "$INSTDIR\FireflyShellNLD.dll"
+  Delete "$INSTDIR\FireflyShell-13.dll"
   
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"