prepared infrastructure for multilingual binary

Makefile.in

@@ -1,6 +1,5 @@
-GUI_VERSION = 1.0.3
+GUI_VERSION = @PACKAGE_VERSION@
-RES_LANG = en
+BASENAME = openvpn-gui-$(GUI_VERSION)
-BASENAME = openvpn-gui-$(GUI_VERSION)-$(RES_LANG)
 EXE = $(BASENAME).exe
 
 CC = @CC@
@@ -19,7 +18,7 @@ CFLAGS += -W -Wall -Wfloat-equal -Wundef -Wshadow -Wpointer-arith -Wbad-function
 
 OBJS = main.o tray.o openvpn.o openvpn_monitor_process.o viewlog.o \
        service.o options.o passphrase.o proxy.o ieproxy.o registry.o \
-       openvpn_config.o scripts.o openvpn-gui-$(RES_LANG).res
+       openvpn_config.o scripts.o openvpn-gui-res.o
 
 SOURCES = main.c main.h openvpn.c openvpn.h \
           openvpn_monitor_process.c openvpn_monitor_process.h \
@@ -27,7 +26,7 @@ SOURCES = main.c main.h openvpn.c openvpn.h \
           options.c options.h passphrase.c passphrase.h proxy.c proxy.h \
           ieproxy.c ieproxy.h registry.c registry.h scripts.c scripts.h \
           openvpn_config.c openvpn_config.h openvpn-gui.exe.manifest \
-          chartable.h openvpn-gui-res.h openvpn-gui-$(RES_LANG).rc
+          chartable.h openvpn-gui-res.h openvpn-gui-res*.rc
 
 EXTRA = connected.ico connecting.ico disconnected.ico reconnecting.ico openvpn-gui.ico \
         acinclude.m4 Makefile.in aclocal.m4 config.h.in configure configure.ac \
@@ -39,8 +38,8 @@ all : ${OBJS}
 %.o : %.c %.h
 	$(CC) $(CFLAGS) -c $<
 
-openvpn-gui-$(RES_LANG).res : openvpn-gui-$(RES_LANG).rc openvpn-gui-res.h
+openvpn-gui-res.o : openvpn-gui-res.rc openvpn-gui-res.h openvpn-gui-res-*.rc
-	$(WINDRES) -i openvpn-gui-$(RES_LANG).rc -J rc -o openvpn-gui-$(RES_LANG).res -O coff 
+	$(WINDRES) -i openvpn-gui-res.rc -o openvpn-gui-res.o
 
 dist:
 	@test -x "$(ZIP)" || { \
@@ -55,4 +54,4 @@ dist:
 	rm -rf $(BASENAME)
 
 clean :
-	rm -f *.o *.exe *.res
+	rm -f *.o *.exe

openvpn-gui-res-en.rc

@@ -20,23 +20,12 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <windows.h>
-#include "openvpn-gui-res.h"
-
-/* Manifest for XP visual styles */
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "openvpn-gui.exe.manifest" 
-
-/* Application Icons */
-APP_ICON               ICON  DISCARDABLE  "openvpn-gui.ico"
-APP_ICON_CONNECTED     ICON  DISCARDABLE  "connected.ico"
-APP_ICON_CONNECTING    ICON  DISCARDABLE  "connecting.ico"
-APP_ICON_DISCONNECTED  ICON  DISCARDABLE  "disconnected.ico"
-
 /* About Dialog - designed with lcc-win32 resource editor */
 IDD_ABOUTDIALOG DIALOG 0, 0, 260, 135
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "About - OpenVPN GUI for Windows"
 FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 BEGIN
     PUSHBUTTON      "OK", IDOK, 99, 115, 63, 14
     ICON            APP_ICON_CONNECTED, 204, 11, 8, 21, 20
@@ -58,6 +47,7 @@ STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
 FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 BEGIN
     LTEXT           "Enter Password:", 201, 6, 6, 100, 10
     EDITTEXT        EDIT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
@@ -70,6 +60,7 @@ IDD_AUTH_PASSWORD DIALOG 6, 18, 160, 62
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 BEGIN
     LTEXT           "Username:", 0, 6, 9, 50, 10
     LTEXT           "Password:", 0, 6, 26, 50, 10
@@ -84,6 +75,7 @@ IDD_STATUS DIALOG 6, 18, 380, 210
 STYLE WS_SIZEBOX | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | DS_CENTER
 CAPTION "OpenVPN"
 FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 BEGIN
     LTEXT           "Connecting...", TEXT_STATUS, 20, 5, 200, 10
     PUSHBUTTON      "Disconnect", ID_DISCONNECT, 50, 190, 50, 14
@@ -97,6 +89,7 @@ IDD_CHANGEPSW DIALOG 6, 18, 193, 82
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "OpenVPN - Change Passphrase"
 FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 BEGIN
     LTEXT           "Old Password:", 171, 6, 9, 85, 10
     LTEXT           "New Password:", 172, 6, 26, 85, 10
@@ -115,6 +108,7 @@ IDD_PROXY DIALOG 6, 18, 269, 228
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
 CAPTION "OpenVPN - Proxy Settings"
 FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 BEGIN
     GROUPBOX        "", 201, 13, 62, 243, 137
     AUTORADIOBUTTON "Use OpenVPN Config-file Settings", RB_PROXY_USE_OPENVPN, \
@@ -144,6 +138,7 @@ IDD_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
 CAPTION "OpenVPN - Proxy Authentication"
 FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 BEGIN
     LTEXT           "Username:", 201, 9, 8, 38, 10
     EDITTEXT        EDIT_PROXY_USERNAME, 49, 5, 94, 12, ES_AUTOHSCROLL
@@ -153,6 +148,7 @@ BEGIN
 END
 
 STRINGTABLE
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 BEGIN
    /* About Dialog */
    TEXT_ABOUT_OPENVPNGUI    "OpenVPN GUI v%s - A Windows GUI for OpenVPN"

openvpn-gui-res.rc

@@ -0,0 +1,34 @@
+/*
+ *  OpenVPN-GUI -- A Windows GUI for OpenVPN.
+ *
+ *  Copyright (C) 2009 Heiko Hund <heikoh@users.sf.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program (see the file COPYING included with this
+ *  distribution); if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <windows.h>
+#include "openvpn-gui-res.h"
+
+/* Manifest for XP visual styles */
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "openvpn-gui.exe.manifest" 
+
+/* Application Icons */
+APP_ICON               ICON  DISCARDABLE  "openvpn-gui.ico"
+APP_ICON_CONNECTED     ICON  DISCARDABLE  "connected.ico"
+APP_ICON_CONNECTING    ICON  DISCARDABLE  "connecting.ico"
+APP_ICON_DISCONNECTED  ICON  DISCARDABLE  "disconnected.ico"
+
+#include "openvpn-gui-res-en.rc"