diff --git a/main.c b/main.c
index 6f6bb10..cf55dff 100644
--- a/main.c
+++ b/main.c
@@ -47,7 +47,6 @@
 
 /*  Declare Windows procedure  */
 LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM);
-INT_PTR CALLBACK AboutDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 static void ShowSettingsDialog();
 void CloseApplication(HWND hwnd);
 
@@ -325,9 +324,6 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
       if (LOWORD(wParam) == IDM_SETTINGS) {
         ShowSettingsDialog();
       }
-      if (LOWORD(wParam) == IDM_ABOUT) {
-        LocalizedDialogBox(ID_DLG_ABOUT, AboutDialogFunc);
-      }
       if (LOWORD(wParam) == IDM_CLOSE) {
         CloseApplication(hwnd);
       }
@@ -406,34 +402,9 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 }
 
 
-INT_PTR CALLBACK AboutDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UNUSED LPARAM lParam)
+static INT_PTR CALLBACK
+AboutDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-  HICON hIcon;
-
-  switch (msg) {
-
-    case WM_INITDIALOG:
-      hIcon = LoadLocalizedIcon(ID_ICO_APP);
-      if (hIcon) {
-        SendMessage(hwndDlg, WM_SETICON, (WPARAM) (ICON_SMALL), (LPARAM) (hIcon));
-        SendMessage(hwndDlg, WM_SETICON, (WPARAM) (ICON_BIG), (LPARAM) (hIcon));
-      }
-      break;
-
-    case WM_COMMAND:
-      switch (LOWORD(wParam)) {
-
-        case IDOK:			// button
-          EndDialog(hwndDlg, LOWORD(wParam));
-          return TRUE;
-      }
-      break;
-
-    case WM_CLOSE:
-      EndDialog(hwndDlg, LOWORD(wParam));
-      return TRUE;
-     
-  }
   return FALSE;
 }
 
@@ -441,7 +412,7 @@ INT_PTR CALLBACK AboutDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UNUSED
 static void
 ShowSettingsDialog()
 {
-  PROPSHEETPAGE psp[2];
+  PROPSHEETPAGE psp[3];
   int page_number = 0;
 
   /* Proxy tab */
@@ -466,6 +437,16 @@ ShowSettingsDialog()
   psp[page_number].pfnCallback = NULL;
   ++page_number;
 
+  /* About tab */
+  psp[page_number].dwSize = sizeof(PROPSHEETPAGE);
+  psp[page_number].dwFlags = PSP_DLGINDIRECT;
+  psp[page_number].hInstance = o.hInstance;
+  psp[page_number].pResource = LocalizedDialogResource(ID_DLG_ABOUT);
+  psp[page_number].pfnDlgProc = AboutDialogFunc;
+  psp[page_number].lParam = 0;
+  psp[page_number].pfnCallback = NULL;
+  ++page_number;
+
   PROPSHEETHEADER psh;
   psh.dwSize = sizeof(PROPSHEETHEADER);
   psh.dwFlags = PSH_USEHICON | PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW | PSH_NOCONTEXTHELP;
diff --git a/openvpn-gui-res.h b/openvpn-gui-res.h
index 8a94c67..2c828f3 100644
--- a/openvpn-gui-res.h
+++ b/openvpn-gui-res.h
@@ -93,7 +93,6 @@
 /* Tray Icon Context Menu */
 #define IDS_MENU_SERVICE                1006
 #define IDS_MENU_SETTINGS               1007
-#define IDS_MENU_ABOUT                  1008
 #define IDS_MENU_CLOSE                  1009
 #define IDS_MENU_CONNECT                1010
 #define IDS_MENU_DISCONNECT             1011
diff --git a/res/openvpn-gui-res-de.rc b/res/openvpn-gui-res-de.rc
index e24ae3c..b712114 100644
--- a/res/openvpn-gui-res-de.rc
+++ b/res/openvpn-gui-res-de.rc
@@ -20,28 +20,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 145
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "Über OpenVPN - Eine GUI für Windows"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "Ok", IDOK, 99, 125, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Eine grafische Oberfläche für OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - Eine Applikation zum sicheren tunneln eines IP " \
-          "Netzwerks über einen einzelnen UDP Port, mit Unterstützung " \
-          "von SSL/TLS-basierten  Session-Authentisierung und Schlüssel- " \
-          "austausch, Paket-Verschlüsselung, Paket-Authentisierung, und " \
-          "Paket-Kompression.",
-          104, 11, 51, 235, 44
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 97, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 108, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -136,6 +114,27 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 51, 23, 177, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Über"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Eine grafische Oberfläche für OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - Eine Applikation zum sicheren tunneln eines IP " \
+          "Netzwerks über einen einzelnen UDP Port, mit Unterstützung " \
+          "von SSL/TLS-basierten  Session-Authentisierung und Schlüssel- " \
+          "austausch, Paket-Verschlüsselung, Paket-Authentisierung, und " \
+          "Paket-Kompression.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -163,7 +162,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nZugewiesene IP: %s"
     IDS_MENU_SERVICE "OpenVPN Dienst"
     IDS_MENU_SETTINGS "Einstellungen..."
-    IDS_MENU_ABOUT "Über..."
     IDS_MENU_CLOSE "Beenden"
     IDS_MENU_CONNECT "Verbinden"
     IDS_MENU_DISCONNECT "Trennen"
diff --git a/res/openvpn-gui-res-dk.rc b/res/openvpn-gui-res-dk.rc
index 9a0c7b9..407c219 100644
--- a/res/openvpn-gui-res-dk.rc
+++ b/res/openvpn-gui-res-dk.rc
@@ -21,27 +21,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "Om - OpenVPN GUI for Windows"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Et Windows-brugerprogram til OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - Et program til sikker overførsel af IP netværk " \
-          "over en enkelt UDP port, med støtte til SSL/TLS-baseret " \
-          "sessions autentisering og nøgle håndtering, pakke- " \
-          "kryptering, -autentisering og -komprimering.",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC  <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOG 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -136,6 +115,26 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 57, 23, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Om"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_DANISH, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Et Windows-brugerprogram til OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - Et program til sikker overførsel af IP netværk " \
+          "over en enkelt UDP port, med støtte til SSL/TLS-baseret " \
+          "sessions autentisering og nøgle håndtering, pakke- " \
+          "kryptering, -autentisering og -komprimering.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC  <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 170, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -163,7 +162,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nTildelt IP: %s"
     IDS_MENU_SERVICE "OpenVPN Service"
     IDS_MENU_SETTINGS "Indstillinger..."
-    IDS_MENU_ABOUT "Om..."
     IDS_MENU_CLOSE "Afslut"
     IDS_MENU_CONNECT "Tilslut"
     IDS_MENU_DISCONNECT "Afbryde"
diff --git a/res/openvpn-gui-res-en.rc b/res/openvpn-gui-res-en.rc
index 1e6569a..e526c69 100644
--- a/res/openvpn-gui-res-en.rc
+++ b/res/openvpn-gui-res-en.rc
@@ -20,27 +20,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT 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_ENGLISH, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - A Windows GUI for OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - An application to securely tunnel IP networks " \
-          "over a single UDP port, with support for SSL/TLS-based " \
-          "session authentication and key exchange, packet " \
-          "encryption, packet authentication, and packet compression.",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -135,6 +114,26 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 57, 23, 171, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "About"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - A Windows GUI for OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - An application to securely tunnel IP networks " \
+          "over a single UDP port, with support for SSL/TLS-based " \
+          "session authentication and key exchange, packet " \
+          "encryption, packet authentication, and packet compression.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -162,7 +161,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nAssigned IP: %s"
     IDS_MENU_SERVICE "OpenVPN Service"
     IDS_MENU_SETTINGS "Settings..."
-    IDS_MENU_ABOUT "About..."
     IDS_MENU_CLOSE "Exit"
     IDS_MENU_CONNECT "Connect"
     IDS_MENU_DISCONNECT "Disconnect"
diff --git a/res/openvpn-gui-res-es.rc b/res/openvpn-gui-res-es.rc
index e7baf80..8f85a1e 100644
--- a/res/openvpn-gui-res-es.rc
+++ b/res/openvpn-gui-res-es.rc
@@ -19,27 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "Acerca de - OpenVPN GUI para Windows"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Un frontend de Windows para OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - Una aplicación para tunelizar de forma segura redes IP " \
-          "contra un puerto UDP, con soporte para autenticación de sesión basada " \
-          "en SSL/TLS e intercambio de claves, encriptación de paquetes, con " \
-          "encriptación de paquetes y compresión de paquetes opcional.",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -134,6 +113,26 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 45, 23, 183, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Acerca de"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Un frontend de Windows para OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - Una aplicación para tunelizar de forma segura redes IP " \
+          "contra un puerto UDP, con soporte para autenticación de sesión basada " \
+          "en SSL/TLS e intercambio de claves, encriptación de paquetes, con " \
+          "encriptación de paquetes y compresión de paquetes opcional.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -161,7 +160,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nIP asignada: %s"
     IDS_MENU_SERVICE "Servicio OpenVPN"
     IDS_MENU_SETTINGS "Opciones..."
-    IDS_MENU_ABOUT "Acerca de..."
     IDS_MENU_CLOSE "Salir"
     IDS_MENU_CONNECT "Conectar"
     IDS_MENU_DISCONNECT "Desconectar"
diff --git a/res/openvpn-gui-res-fi.rc b/res/openvpn-gui-res-fi.rc
index 41267da..360729c 100644
--- a/res/openvpn-gui-res-fi.rc
+++ b/res/openvpn-gui-res-fi.rc
@@ -21,27 +21,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "Tietoja OpenVPN GUI -sovelluksesta"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Graafinen Windows-käyttöliittymä OpenVPN:lle", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN mahdollistaa IP-verkkojen yhdistämisen toisiinsa " \
-          "suojatulla UDP-yhteydellä. Se tukee mm. SSL/TLS" \
-          "-pohjaista istuntojen todennusta ja avainten vaihtoa " \
-          "sekä pakettien salausta, todennusta ja pakkausta.",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -136,6 +115,26 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 37, 23, 191, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Tietoja"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Graafinen käyttöliittymä OpenVPN:lle\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN mahdollistaa IP-verkkojen yhdistämisen toisiinsa " \
+          "suojatulla UDP-yhteydellä. Se tukee mm. SSL/TLS" \
+          "-pohjaista istuntojen todennusta ja avainten vaihtoa " \
+          "sekä pakettien salausta, todennusta ja pakkausta.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -163,7 +162,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nIP-osoite: %s"
     IDS_MENU_SERVICE "OpenVPN-palvelu"
     IDS_MENU_SETTINGS "Asetukset..."
-    IDS_MENU_ABOUT "Tietoja..."
     IDS_MENU_CLOSE "Poistu"
     IDS_MENU_CONNECT "Yhdistä"
     IDS_MENU_DISCONNECT "Katkaise yhteys"
diff --git a/res/openvpn-gui-res-fr.rc b/res/openvpn-gui-res-fr.rc
index d8c5092..6133f91 100644
--- a/res/openvpn-gui-res-fr.rc
+++ b/res/openvpn-gui-res-fr.rc
@@ -19,26 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "A Propos - OpenVPN GUI pour Windows"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - A Windows GUI for OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - Une application permettant d'ouvrir un tunnel IP sécurisé " \
-          "sur un simple port UDP avec un support SSL/TLS pour l'authentification de " \
-          "session, échange de clés, cryptage de paquets, authentification des " \
-          "paquets, et compression de paquets.", 104, 11, 43, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -133,6 +113,26 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 47, 23, 181, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "A Propos"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - A Windows GUI for OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - Une application permettant d'ouvrir un tunnel IP sécurisé " \
+          "sur un simple port UDP avec un support SSL/TLS pour l'authentification de " \
+          "session, échange de clés, cryptage de paquets, authentification des " \
+          "paquets, et compression de paquets.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -160,7 +160,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nAdresse IP assignée: %s"
     IDS_MENU_SERVICE "OpenVPN Service"
     IDS_MENU_SETTINGS "Configuration..."
-    IDS_MENU_ABOUT "A Propos..."
     IDS_MENU_CLOSE "Quitter"
     IDS_MENU_CONNECT "Connecter"
     IDS_MENU_DISCONNECT "Déconnecter"
diff --git a/res/openvpn-gui-res-it.rc b/res/openvpn-gui-res-it.rc
index 27febb3..5708987 100644
--- a/res/openvpn-gui-res-it.rc
+++ b/res/openvpn-gui-res-it.rc
@@ -19,26 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "Informazioni - OpenVPN GUI per Windows"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Interfaccia per Windows di OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - Un'applicazione che permette di creare tunnel sicuri su reti IP " \
-          "con una singola porta UDP, con il supporto basato sull'autenticazione e lo scambio " \
-          "di chiavi SSL/TLS, cifratura, autenticazione e compressione dei pacchetti. ",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -133,6 +113,25 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 43, 23, 185, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Informazioni"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Interfaccia per Windows di OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - Un'applicazione che permette di creare tunnel sicuri su reti IP " \
+          "con una singola porta UDP, con il supporto basato sull'autenticazione e lo scambio " \
+          "di chiavi SSL/TLS, cifratura, autenticazione e compressione dei pacchetti.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -160,7 +159,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nIP assegnato: %s"
     IDS_MENU_SERVICE "Servizio di OpenVPN"
     IDS_MENU_SETTINGS "Configurazione..."
-    IDS_MENU_ABOUT "Informazioni..."
     IDS_MENU_CLOSE "Esci"
     IDS_MENU_CONNECT "Connetti"
     IDS_MENU_DISCONNECT "Disconnetti"
diff --git a/res/openvpn-gui-res-jp.rc b/res/openvpn-gui-res-jp.rc
index 5da2bb7..6685daf 100644
--- a/res/openvpn-gui-res-jp.rc
+++ b/res/openvpn-gui-res-jp.rc
@@ -22,27 +22,6 @@
  *
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "OpenVPN GUI for Windows について"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - A Windows GUI for OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - An application to securely tunnel IP networks " \
-          "over a single UDP port, with support for SSL/TLS-based " \
-          "session authentication and key exchange, packet " \
-          "encryption, packet authentication, and packet compression.",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -137,6 +116,26 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 39, 23, 189, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "について"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - A Windows GUI for OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - An application to securely tunnel IP networks " \
+          "over a single UDP port, with support for SSL/TLS-based " \
+          "session authentication and key exchange, packet " \
+          "encryption, packet authentication, and packet compression.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -164,7 +163,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\n割り当てられたIP: %s"
     IDS_MENU_SERVICE "OpenVPNサービス"
     IDS_MENU_SETTINGS "設定..."
-    IDS_MENU_ABOUT "OpenVPN GUIについて..."
     IDS_MENU_CLOSE "終了"
     IDS_MENU_CONNECT "接続"
     IDS_MENU_DISCONNECT "切断"
diff --git a/res/openvpn-gui-res-nl.rc b/res/openvpn-gui-res-nl.rc
index e6f4862..dd2df04 100644
--- a/res/openvpn-gui-res-nl.rc
+++ b/res/openvpn-gui-res-nl.rc
@@ -19,26 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT 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_DUTCH, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Een Windows GUI voor OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - Een programma om veilig netwerken te tunnellen " \
-          "over een enkele UDP poort. SSL/TLS-gebasseerde authenticatie " \
-          "key exchange, packet encryptie, packet authenticatie en compressie.",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -133,6 +113,25 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 37, 23, 191, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Info"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Een Windows GUI voor OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - Een programma om veilig netwerken te tunnellen " \
+          "over een enkele UDP poort. SSL/TLS-gebasseerde authenticatie " \
+          "key exchange, packet encryptie, packet authenticatie en compressie.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -160,7 +159,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nToegewezen IP: %s"
     IDS_MENU_SERVICE "OpenVPN Service"
     IDS_MENU_SETTINGS "Instellingen..."
-    IDS_MENU_ABOUT "Info..."
     IDS_MENU_CLOSE "Afsluiten"
     IDS_MENU_CONNECT "Verbind"
     IDS_MENU_DISCONNECT "Verbreek Verbinding"
diff --git a/res/openvpn-gui-res-no.rc b/res/openvpn-gui-res-no.rc
index 68f96ae..6bc9358 100644
--- a/res/openvpn-gui-res-no.rc
+++ b/res/openvpn-gui-res-no.rc
@@ -20,27 +20,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "Om - OpenVPN GUI for Windows"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Ett Windows-Grensesnitt mot OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - En applikasjon for sikker overføring av IP nett " \
-          "over en enkel UDP port, med støtte for SSL/TLS-basert " \
-          "sessjons autentisering og nøkkel håndtering, pakke- " \
-          "kryptering, -autentisering og -komprimering.",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC  <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOG 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -123,6 +102,26 @@ BEGIN
     EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Om"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Ett Windows-Grensesnitt mot OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - En applikasjon for sikker overføring av IP nett " \
+          "over en enkel UDP port, med støtte for SSL/TLS-basert " \
+          "sessjons autentisering og nøkkel håndtering, pakkekryptering, " \
+          "-autentisering og -komprimering.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC  <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 170, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -150,7 +149,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nTildelt IP: %s"
     IDS_MENU_SERVICE "OpenVPN Service"
     IDS_MENU_SETTINGS "Innstillinger..."
-    IDS_MENU_ABOUT "Om..."
     IDS_MENU_CLOSE "Avslutte"
     IDS_MENU_CONNECT "Koble til"
     IDS_MENU_DISCONNECT "Koble fra"
diff --git a/res/openvpn-gui-res-pl.rc b/res/openvpn-gui-res-pl.rc
index 23b00b1..1e05c99 100644
--- a/res/openvpn-gui-res-pl.rc
+++ b/res/openvpn-gui-res-pl.rc
@@ -21,27 +21,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "O programie - OpenVPN GUI dla systemu Windows"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Windows GUI dla OpenVPN-a", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-	LTEXT "OpenVPN - Aplikacja do bezpiecznego tunelowania sieci IP" \
-		  "przy pomocy pojedynczego portu UDP, z autentykacją sesji," \
-	      "wymianą klucza, szyfrowaniem, kompresją i autentykacją" \
-	      "pakietów opartą na protokole SSL/TLS",
-	      104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -136,6 +115,26 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 42, 23, 186, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "O Programie"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Windows GUI dla OpenVPN-a\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - Aplikacja do bezpiecznego tunelowania sieci IP" \
+          "przy pomocy pojedynczego portu UDP, z autentykacją sesji," \
+          "wymianą klucza, szyfrowaniem, kompresją i autentykacją" \
+          "pakietów opartą na protokole SSL/TLS\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -163,7 +162,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nPrzyznane IP: %s"
     IDS_MENU_SERVICE "Usługa OpenVPN"
     IDS_MENU_SETTINGS "Ustawienia..."
-    IDS_MENU_ABOUT "O Programie..."
     IDS_MENU_CLOSE "Zakończ"
     IDS_MENU_CONNECT "Połącz"
     IDS_MENU_DISCONNECT "Rozłącz"
diff --git a/res/openvpn-gui-res-pt.rc b/res/openvpn-gui-res-pt.rc
index b33fe99..3335f0e 100644
--- a/res/openvpn-gui-res-pt.rc
+++ b/res/openvpn-gui-res-pt.rc
@@ -19,27 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "Sobre - OpenVPN GUI para Windows"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Uma GUI Windows para OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - An application to securely tunnel IP networks " \
-          "over a single UDP port, with support for SSL/TLS-based " \
-          "session authentication and key exchange, packet " \
-          "encryption, packet authentication, and packet compression.",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -122,6 +101,26 @@ BEGIN
     EDITTEXT ID_EDT_PROXY_PORT, 196, 75, 30, 12, ES_AUTOHSCROLL
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Sobre"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Uma GUI Windows para OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - An application to securely tunnel IP networks " \
+          "over a single UDP port, with support for SSL/TLS-based " \
+          "session authentication and key exchange, packet " \
+          "encryption, packet authentication, and packet compression.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -149,7 +148,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nIP atribuído: %s"
     IDS_MENU_SERVICE "Serviço OpenVPN"
     IDS_MENU_SETTINGS "Configurações..."
-    IDS_MENU_ABOUT "Sobre..."
     IDS_MENU_CLOSE "Sair"
     IDS_MENU_CONNECT "Conectar"
     IDS_MENU_DISCONNECT "Desconectar"
diff --git a/res/openvpn-gui-res-se.rc b/res/openvpn-gui-res-se.rc
index 055a300..fc7e058 100644
--- a/res/openvpn-gui-res-se.rc
+++ b/res/openvpn-gui-res-se.rc
@@ -19,27 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "Om - OpenVPN GUI för Windows"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Ett Windows GUI för OpenVPN", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - En applikation för säker överföring av IP nät " \
-          "över en enda UDP port, med support för SSL/TLS-baserad " \
-          "session autentisering och nyckel hantering, paket " \
-          "kryptering, paket autentisering, and paket komprimering.",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC  <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOG 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -134,6 +113,26 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 42, 23, 186, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Om"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - Ett Windows GUI för OpenVPN\n" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>\n" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - En applikation för säker överföring av IP nät " \
+          "över en enda UDP port, med support för SSL/TLS-baserad " \
+          "session autentisering och nyckel hantering, paket " \
+          "kryptering, paket autentisering, and paket komprimering.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC  <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 170, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -161,7 +160,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nTilldelad IP: %s"
     IDS_MENU_SERVICE "OpenVPN Service"
     IDS_MENU_SETTINGS "Inställningar..."
-    IDS_MENU_ABOUT "Om..."
     IDS_MENU_CLOSE "Avsluta"
     IDS_MENU_CONNECT "Anslut"
     IDS_MENU_DISCONNECT "Koppla ner"
diff --git a/res/openvpn-gui-res-tr.rc b/res/openvpn-gui-res-tr.rc
index e1395d6..533b941 100644
--- a/res/openvpn-gui-res-tr.rc
+++ b/res/openvpn-gui-res-tr.rc
@@ -21,27 +21,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* About Dialog */
-ID_DLG_ABOUT DIALOG 0, 0, 260, 135
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
-CAPTION "Hakkında - Windows için OpenVPN GUI"
-FONT 8, "Microsoft Sans Serif"
-LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
-BEGIN
-    PUSHBUTTON "OK", IDOK, 99, 115, 63, 14
-    ICON ID_ICO_CONNECTED, 204, 11, 8, 21, 20
-    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - OpenVPN için Windows Arayüzü", 101, 40, 5, 215, 8
-    LTEXT "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>", 102, 40, 15, 215, 8
-    LTEXT "http://openvpn.se/", 103, 40, 25, 215, 8
-    LTEXT "OpenVPN - SSL/TLS tabanlı güvenli oturumlar, anahtar doğrulama " \
-          "paket şifreleme, paket sıkıştırma ve paket doğrulama işlemlerini " \
-          "tek bir UDP portu üzerinden güvenli IP tünelleri oluşturarak " \
-          "yapabilen bir uygulamadır.",
-          104, 11, 51, 235, 34
-    LTEXT "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>", 105, 11, 87, 235, 11
-    LTEXT "http://openvpn.net/", 106, 11, 98, 235, 10
-END
-
 /* Passphrase Dialog */
 ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 51
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
@@ -136,6 +115,26 @@ BEGIN
     COMBOBOX ID_CMB_LANGUAGE, 31, 23, 197, 400, CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
+/* About Dialog */
+ID_DLG_ABOUT DIALOG 6, 18, 249, 104
+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CENTER
+CAPTION "Hakkında"
+FONT 8, "Microsoft Sans Serif"
+LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
+BEGIN
+    ICON ID_ICO_APP, 0, 8, 16, 21, 20
+    LTEXT "OpenVPN GUI v" PACKAGE_VERSION " - OpenVPN için Windows Arayüzü" \
+          "Copyright (C) 2004-2005 Mathias Sundman <info@openvpn.se>" \
+          "http://openvpn.se/", 0, 36, 15, 206, 26
+    LTEXT "OpenVPN - SSL/TLS tabanlı güvenli oturumlar, anahtar doğrulama " \
+          "paket şifreleme, paket sıkıştırma ve paket doğrulama işlemlerini " \
+          "tek bir UDP portu üzerinden güvenli IP tünelleri oluşturarak " \
+          "yapabilen bir uygulamadır.\n" \
+          "\n" \
+          "Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>\n" \
+          "http://openvpn.net/", 0, 8, 45, 235, 56
+END
+
 /* Proxy Authentication Dialog */
 ID_DLG_PROXY_AUTH DIALOG 29, 23, 154, 65
 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER
@@ -163,7 +162,6 @@ BEGIN
     IDS_TIP_ASSIGNED_IP "\nBağlanılan IP: %s"
     IDS_MENU_SERVICE "OpenVPN Servisi"
     IDS_MENU_SETTINGS "Ayarlar..."
-    IDS_MENU_ABOUT "Hakkında..."
     IDS_MENU_CLOSE "Çıkış"
     IDS_MENU_CONNECT "Bağlan"
     IDS_MENU_DISCONNECT "Bağlantıyı Kes"
diff --git a/tray.c b/tray.c
index 4db34d4..4af56b5 100644
--- a/tray.c
+++ b/tray.c
@@ -91,7 +91,6 @@ CreatePopupMenus()
         }
 
         AppendMenu(hMenu, MF_STRING ,IDM_SETTINGS, LoadLocalizedString(IDS_MENU_SETTINGS));
-        AppendMenu(hMenu, MF_STRING ,IDM_ABOUT, LoadLocalizedString(IDS_MENU_ABOUT));
         AppendMenu(hMenu, MF_STRING ,IDM_CLOSE, LoadLocalizedString(IDS_MENU_CLOSE));
 
         SetMenuStatus(&o.conn[0],  o.conn[0].state);
@@ -117,7 +116,6 @@ CreatePopupMenus()
         }
 
         AppendMenu(hMenu, MF_STRING, IDM_SETTINGS, LoadLocalizedString(IDS_MENU_SETTINGS));
-        AppendMenu(hMenu, MF_STRING, IDM_ABOUT, LoadLocalizedString(IDS_MENU_ABOUT));
         AppendMenu(hMenu, MF_STRING, IDM_CLOSE, LoadLocalizedString(IDS_MENU_CLOSE));
 
 
diff --git a/tray.h b/tray.h
index e2aa560..fc15b4d 100644
--- a/tray.h
+++ b/tray.h
@@ -28,7 +28,6 @@
 #define WM_NOTIFYICONTRAY (WM_APP + 1)
 
 #define IDM_SETTINGS            221
-#define IDM_ABOUT               222
 #define IDM_CLOSE               223
 
 #define IDM_CONNECTMENU         300