diff --git a/openvpn-gui-res.h b/openvpn-gui-res.h
index f253cba..90410f5 100644
--- a/openvpn-gui-res.h
+++ b/openvpn-gui-res.h
@@ -61,6 +61,7 @@
 #define ID_TXT_AUTH_CHALLENGE            184
 #define ID_EDT_AUTH_CHALLENGE            185
 #define ID_CHK_SAVE_PASS                 186
+#define ID_TXT_WARNING                   187
 
 /* Challenege Response Dialog */
 #define ID_DLG_CHALLENGE_RESPONSE        190
@@ -305,8 +306,11 @@
 #define IDS_NFO_TOKEN_PASSWORD_CAPTION  2100
 #define IDS_NFO_TOKEN_PASSWORD_REQUEST  2101
 
+/* Password retry messages */
+#define IDS_NFO_AUTH_PASS_RETRY         2150
+#define IDS_NFO_KEY_PASS_RETRY          2151
+
 /* Timer IDs */
 #define IDT_STOP_TIMER                  2500  /* Timer used to trigger force termination */
 
-
 #endif
diff --git a/openvpn.c b/openvpn.c
index d3592e7..d044d95 100644
--- a/openvpn.c
+++ b/openvpn.c
@@ -220,6 +220,7 @@ OnStateChange(connection_t *c, char *data)
         /* Save time when we got connected. */
         c->connected_since = atoi(data);
         c->failed_psw_attempts = 0;
+        c->failed_auth_attempts = 0;
         c->state = connected;
 
         SetMenuStatus(c, connected);
@@ -235,7 +236,9 @@ OnStateChange(connection_t *c, char *data)
     {
         if (!c->dynamic_cr)
         {
-            if (strcmp(message, "auth-failure") == 0 || strcmp(message, "private-key-password-failure") == 0)
+            if (strcmp(message, "auth-failure") == 0)
+                c->failed_auth_attempts++;
+            else if (strcmp(message, "private-key-password-failure") == 0)
                 c->failed_psw_attempts++;
 
             if (strcmp(message, "auth-failure") == 0 && (c->flags & FLAG_SAVE_AUTH_PASS))
@@ -304,6 +307,8 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
             Button_SetCheck(GetDlgItem (hwndDlg, ID_CHK_SAVE_PASS), BST_CHECKED);
 
         AppendTextToCaption (hwndDlg, param->c->config_name);
+        if (param->c->failed_auth_attempts > 0)
+            SetDlgItemTextW(hwndDlg, ID_TXT_WARNING, LoadLocalizedString(IDS_NFO_AUTH_PASS_RETRY));
 
         if (param->c->state == resuming)
             ForceForegroundWindow(hwndDlg);
@@ -362,6 +367,15 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
         }
         break;
 
+    case WM_CTLCOLORSTATIC:
+        if (GetDlgCtrlID((HWND) lParam) == ID_TXT_WARNING)
+        {
+            HBRUSH br = (HBRUSH) DefWindowProc(hwndDlg, msg, wParam, lParam);
+            SetTextColor((HDC) wParam, o.clr_warning);
+            return (INT_PTR) br;
+        }
+        break;
+
     case WM_CLOSE:
         EndDialog(hwndDlg, LOWORD(wParam));
         return TRUE;
@@ -527,6 +541,8 @@ PrivKeyPassDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
             ShowWindow(GetDlgItem (hwndDlg, ID_CHK_SAVE_PASS), SW_HIDE);
         else if (c->flags & FLAG_SAVE_KEY_PASS)
             Button_SetCheck (GetDlgItem (hwndDlg, ID_CHK_SAVE_PASS), BST_CHECKED);
+        if (c->failed_psw_attempts > 0)
+            SetDlgItemTextW(hwndDlg, ID_TXT_WARNING, LoadLocalizedString(IDS_NFO_KEY_PASS_RETRY));
         if (c->state == resuming)
             ForceForegroundWindow(hwndDlg);
         else
@@ -567,6 +583,15 @@ PrivKeyPassDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
         }
         break;
 
+    case WM_CTLCOLORSTATIC:
+        if (GetDlgCtrlID((HWND) lParam) == ID_TXT_WARNING)
+        {
+            HBRUSH br = (HBRUSH) DefWindowProc(hwndDlg, msg, wParam, lParam);
+            SetTextColor((HDC) wParam, o.clr_warning);
+            return (INT_PTR) br;
+        }
+        break;
+
     case WM_CLOSE:
         EndDialog(hwndDlg, LOWORD(wParam));
         return TRUE;
@@ -848,6 +873,7 @@ OnStop(connection_t *c, UNUSED char *msg)
     case connected:
         /* OpenVPN process ended unexpectedly */
         c->failed_psw_attempts = 0;
+        c->failed_auth_attempts = 0;
         c->state = disconnected;
         CheckAndSetTrayIcon();
         SetDlgItemText(c->hwndStatus, ID_TXT_STATUS, LoadLocalizedString(IDS_NFO_STATE_DISCONNECTED));
@@ -909,6 +935,7 @@ OnStop(connection_t *c, UNUSED char *msg)
 //     }
         /* Shutdown was initiated by us */
         c->failed_psw_attempts = 0;
+        c->failed_auth_attempts = 0;
         c->state = disconnected;
         CheckAndSetTrayIcon();
         SendMessage(c->hwndStatus, WM_CLOSE, 0, 0);
diff --git a/options.c b/options.c
index f8fa1b7..cf3cf15 100644
--- a/options.c
+++ b/options.c
@@ -254,6 +254,8 @@ InitOptions(options_t *opt)
     CLEAR(*opt);
     opt->netcmd_semaphore = InitSemaphore ();
     opt->version = MakeVersion (PACKAGE_VERSION_RESOURCE);
+    opt->clr_warning = RGB(0xff, 0, 0);
+    opt->clr_error = RGB(0xff, 0, 0);
 }
 
 
diff --git a/options.h b/options.h
index fa30008..5cae976 100644
--- a/options.h
+++ b/options.h
@@ -102,6 +102,7 @@ struct connection {
     BOOL auto_connect;              /* AutoConnect at startup id TRUE */
     conn_state_t state;             /* State the connection currently is in */
     int failed_psw_attempts;        /* # of failed attempts entering password(s) */
+    int failed_auth_attempts;       /* # of failed user-auth attempts */
     time_t connected_since;         /* Time when the connection was established */
     proxy_t proxy_type;             /* Set during querying proxy credentials */
 
@@ -177,6 +178,8 @@ typedef struct {
     version_t version;
     char ovpn_version[16]; /* OpenVPN version string: 2.3.12, 2.4_alpha2 etc.. */
     unsigned int dpi_scale;
+    COLORREF clr_warning;
+    COLORREF clr_error;
 } options_t;
 
 void InitOptions(options_t *);
diff --git a/res/openvpn-gui-res-cs.rc b/res/openvpn-gui-res-cs.rc
index aee57eb..acfd432 100644
--- a/res/openvpn-gui-res-cs.rc
+++ b/res/openvpn-gui-res-cs.rc
@@ -21,7 +21,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Heslo privátního klíče"
@@ -31,12 +31,13 @@ BEGIN
     LTEXT "Zadejte heslo:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Uložit heslo", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Zrušit", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Zrušit", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Ověření uživatele"
 FONT 8, "Microsoft Sans Serif"
@@ -49,10 +50,11 @@ BEGIN
     CHECKBOX "Uložit heslo", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Zrušit", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Ověření uživatele"
 FONT 8, "Microsoft Sans Serif"
@@ -68,6 +70,7 @@ BEGIN
     CHECKBOX "Uložit heslo", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Zrušit", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-de.rc b/res/openvpn-gui-res-de.rc
index f810a14..80960cc 100644
--- a/res/openvpn-gui-res-de.rc
+++ b/res/openvpn-gui-res-de.rc
@@ -21,7 +21,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -31,12 +31,13 @@ BEGIN
     LTEXT "Passwort:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Passwort speichern", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "Ok", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Abbrechen", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "Ok", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Abbrechen", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN – Benutzer-Authentifizierung"
 FONT 8, "Microsoft Sans Serif"
@@ -49,10 +50,11 @@ BEGIN
     CHECKBOX "Passwort speichern", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "Ok", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Abbrechen", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN – Benutzer-Authentifizierung"
 FONT 8, "Microsoft Sans Serif"
@@ -68,6 +70,7 @@ BEGIN
     CHECKBOX "Passwort speichern", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "Ok", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Abbrechen", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-dk.rc b/res/openvpn-gui-res-dk.rc
index 3f16ad1..faf5f73 100644
--- a/res/openvpn-gui-res-dk.rc
+++ b/res/openvpn-gui-res-dk.rc
@@ -22,7 +22,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -32,12 +32,13 @@ BEGIN
     LTEXT "Indtast password:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Annuller", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Annuller", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Brugerkontrol"
 FONT 8, "Microsoft Sans Serif"
@@ -50,10 +51,11 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Annuller", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
@@ -69,6 +71,7 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Annuller", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-en.rc b/res/openvpn-gui-res-en.rc
index 83a7544..4ce0060 100644
--- a/res/openvpn-gui-res-en.rc
+++ b/res/openvpn-gui-res-en.rc
@@ -21,7 +21,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Private Key Password"
@@ -31,12 +31,13 @@ BEGIN
     LTEXT "Enter Password:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Cancel", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
@@ -49,10 +50,11 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Cancel", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
@@ -68,6 +70,7 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Cancel", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
@@ -453,4 +456,7 @@ BEGIN
     IDS_NFO_TOKEN_PASSWORD_CAPTION "OpenVPN - Token Password"
     IDS_NFO_TOKEN_PASSWORD_REQUEST "Input Password/PIN for Token '%S'"
 
+    IDS_NFO_AUTH_PASS_RETRY "Wrong username or password. Try again..."
+    IDS_NFO_KEY_PASS_RETRY  "Wrong password. Try again..."
+
 END
diff --git a/res/openvpn-gui-res-es.rc b/res/openvpn-gui-res-es.rc
index 311220c..da48737 100644
--- a/res/openvpn-gui-res-es.rc
+++ b/res/openvpn-gui-res-es.rc
@@ -20,7 +20,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -30,12 +30,13 @@ BEGIN
     LTEXT "Introduce clave:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Cancelar", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Autenticación de usuario"
 FONT 8, "Microsoft Sans Serif"
@@ -48,10 +49,11 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Cancelar", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
@@ -67,6 +69,7 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Cancelar", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-fi.rc b/res/openvpn-gui-res-fi.rc
index 30ae92f..7c8c973 100644
--- a/res/openvpn-gui-res-fi.rc
+++ b/res/openvpn-gui-res-fi.rc
@@ -21,7 +21,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Yksityisen avaimen salasana"
@@ -31,12 +31,13 @@ BEGIN
     LTEXT "Anna salasana:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Tallenna salasana", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Peruuta", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Peruuta", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Käyttäjän todennus"
 FONT 8, "Microsoft Sans Serif"
@@ -49,10 +50,11 @@ BEGIN
     CHECKBOX "Tallenna salasana", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Peruuta", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Käyttäjän todennus"
 FONT 8, "Microsoft Sans Serif"
@@ -68,6 +70,7 @@ BEGIN
     CHECKBOX "Tallenna salasana", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Peruuta", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-fr.rc b/res/openvpn-gui-res-fr.rc
index 52a1a5c..ee51668 100644
--- a/res/openvpn-gui-res-fr.rc
+++ b/res/openvpn-gui-res-fr.rc
@@ -20,7 +20,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -30,12 +30,13 @@ BEGIN
     LTEXT "Entrez un mot de passe:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Se souvenir du mot de passe", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Annuler", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Annuler", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "Authentification d'utilisateur"
 FONT 8, "Microsoft Sans Serif"
@@ -48,10 +49,11 @@ BEGIN
     CHECKBOX "Se souvenir du mot de passe", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Annuler", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
@@ -67,6 +69,7 @@ BEGIN
     CHECKBOX "Se souvenir du mot de passe", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Annuler", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-it.rc b/res/openvpn-gui-res-it.rc
index fc087dd..0dd22e4 100644
--- a/res/openvpn-gui-res-it.rc
+++ b/res/openvpn-gui-res-it.rc
@@ -20,7 +20,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -30,12 +30,13 @@ BEGIN
     LTEXT "Inserisci la password:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Annulla", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Annulla", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Autenticazione dell'utente"
 FONT 8, "Microsoft Sans Serif"
@@ -48,10 +49,11 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Annulla", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
@@ -67,6 +69,7 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Annulla", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-jp.rc b/res/openvpn-gui-res-jp.rc
index 96cf64c..aaca22a 100644
--- a/res/openvpn-gui-res-jp.rc
+++ b/res/openvpn-gui-res-jp.rc
@@ -23,7 +23,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -33,12 +33,13 @@ BEGIN
     LTEXT "パスワード:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "キャンセル", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "キャンセル", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - ユーザー認証"
 FONT 8, "Microsoft Sans Serif"
@@ -51,10 +52,11 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "キャンセル", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
@@ -70,6 +72,7 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "キャンセル", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 /* Challenge Response Dialog */
 ID_DLG_CHALLENGE_RESPONSE DIALOG 6, 18, 212, 72
diff --git a/res/openvpn-gui-res-kr.rc b/res/openvpn-gui-res-kr.rc
index ecb694d..d9d1a56 100644
--- a/res/openvpn-gui-res-kr.rc
+++ b/res/openvpn-gui-res-kr.rc
@@ -22,7 +22,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - 개인 키 암호"
@@ -32,12 +32,13 @@ BEGIN
     LTEXT "암호:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "암호 저장", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "확인", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "취소", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "확인", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "취소", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - 사용자 인증"
 FONT 9, "맑은 고딕"
@@ -50,10 +51,11 @@ BEGIN
     CHECKBOX "암호 저장", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "확인", IDOK, 25, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "취소", IDCANCEL, 85, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - 사용자 인증"
 FONT 9, "맑은 고딕"
@@ -67,8 +69,9 @@ BEGIN
     LTEXT "", ID_TXT_AUTH_CHALLENGE, 6, 43, 148, 10
     EDITTEXT ID_EDT_AUTH_CHALLENGE, 60, 57, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "암호 저장", ID_CHK_SAVE_PASS, 6, 76, 100, 10
-    PUSHBUTTON "확인", IDOK, 25, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
-    PUSHBUTTON "취소", IDCANCEL, 85, 58, 52, 14
+    PUSHBUTTON "확인", IDOK, 25, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
+    PUSHBUTTON "취소", IDCANCEL, 85, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-nl.rc b/res/openvpn-gui-res-nl.rc
index 3074122..1a36f73 100644
--- a/res/openvpn-gui-res-nl.rc
+++ b/res/openvpn-gui-res-nl.rc
@@ -20,7 +20,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -30,12 +30,13 @@ BEGIN
     LTEXT "Wachtwoord:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Wachtwoord opslaan", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Annuleren", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Annuleren", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Gebruikersauthenticatie"
 FONT 8, "Microsoft Sans Serif"
@@ -48,10 +49,11 @@ BEGIN
     CHECKBOX "Wachtwoord opslaan", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Annuleren", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Gebruikersauthenticatie"
 FONT 8, "Microsoft Sans Serif"
@@ -67,6 +69,7 @@ BEGIN
     CHECKBOX "Wachtwoord opslaan", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Annuleren", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-no.rc b/res/openvpn-gui-res-no.rc
index 1d371a5..6c8fde1 100644
--- a/res/openvpn-gui-res-no.rc
+++ b/res/openvpn-gui-res-no.rc
@@ -21,7 +21,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -31,12 +31,13 @@ BEGIN
     LTEXT "Oppgi passord:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Husk passord", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Avbryt", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Avbryt", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Brukerautentisering"
 FONT 8, "Microsoft Sans Serif"
@@ -49,10 +50,11 @@ BEGIN
     CHECKBOX "Husk passord", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Avbryt", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Brukerautentisering"
 FONT 8, "Microsoft Sans Serif"
@@ -68,6 +70,7 @@ BEGIN
     CHECKBOX "Husk passord", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Avbryt", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-pl.rc b/res/openvpn-gui-res-pl.rc
index 31864cc..340d4a2 100644
--- a/res/openvpn-gui-res-pl.rc
+++ b/res/openvpn-gui-res-pl.rc
@@ -22,7 +22,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -32,12 +32,13 @@ BEGIN
     LTEXT "Hasło:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Anuluj", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Anuluj", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Autentykacja Użytkownika"
 FONT 8, "Microsoft Sans Serif"
@@ -50,10 +51,11 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Anuluj", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
@@ -69,6 +71,7 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Anuluj", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-pt.rc b/res/openvpn-gui-res-pt.rc
index cca09d1..0259359 100644
--- a/res/openvpn-gui-res-pt.rc
+++ b/res/openvpn-gui-res-pt.rc
@@ -20,7 +20,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -30,12 +30,13 @@ BEGIN
     LTEXT "Digite a senha:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Cancelar", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Autenticação de usuário"
 FONT 8, "Microsoft Sans Serif"
@@ -48,10 +49,11 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Cancelar", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Autenticação de usuário"
 FONT 8, "Microsoft Sans Serif"
@@ -67,6 +69,7 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Cancelar", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-ru.rc b/res/openvpn-gui-res-ru.rc
index 9108cc2..f9ed50e 100644
--- a/res/openvpn-gui-res-ru.rc
+++ b/res/openvpn-gui-res-ru.rc
@@ -22,7 +22,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Пароль ключа"
@@ -32,12 +32,13 @@ BEGIN
     LTEXT "Введите пароль:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Запомнить", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Отмена", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Отмена", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 180, 78
+ID_DLG_AUTH DIALOG 6, 18, 180, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Аутентификация пользователя"
 FONT 8, "Microsoft Sans Serif"
@@ -50,10 +51,11 @@ BEGIN
     CHECKBOX "Запомнить", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 30, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Отмена", IDCANCEL, 100, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 180, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Аутентификация пользователя"
 FONT 8, "Microsoft Sans Serif"
@@ -69,6 +71,7 @@ BEGIN
     CHECKBOX "Запомнить", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Отмена", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
@@ -448,4 +451,7 @@ BEGIN
     /* save/delete password */
     IDS_NFO_DELETE_PASS "Подтвердите удаление сохраненных паролей для ""%s"""
 
+    IDS_NFO_AUTH_PASS_RETRY "Неправильное имя пользователя или пароль"
+    IDS_NFO_KEY_PASS_RETRY  "Неправильный пароль"
+
 END
diff --git a/res/openvpn-gui-res-se.rc b/res/openvpn-gui-res-se.rc
index d67a49b..834fdb3 100644
--- a/res/openvpn-gui-res-se.rc
+++ b/res/openvpn-gui-res-se.rc
@@ -20,7 +20,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -30,12 +30,13 @@ BEGIN
     LTEXT "Ange Lösenord:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Avbryt", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Avbryt", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Användar Autentisering"
 FONT 8, "Microsoft Sans Serif"
@@ -48,10 +49,11 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Avbryt", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
@@ -67,6 +69,7 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Avbryt", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-tr.rc b/res/openvpn-gui-res-tr.rc
index 0afa347..ca48e0f 100644
--- a/res/openvpn-gui-res-tr.rc
+++ b/res/openvpn-gui-res-tr.rc
@@ -22,7 +22,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -32,12 +32,13 @@ BEGIN
     LTEXT "Şifreyi Giriniz:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "Tamam", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Çıkış", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "Tamam", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Çıkış", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Oturum Açma"
 FONT 8, "Microsoft Sans Serif"
@@ -50,10 +51,11 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "Tamam", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Çıkış", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - User Authentication"
 FONT 8, "Microsoft Sans Serif"
@@ -69,6 +71,7 @@ BEGIN
     CHECKBOX "Save password", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "Tamam", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Çıkış", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */
diff --git a/res/openvpn-gui-res-ua.rc b/res/openvpn-gui-res-ua.rc
index 0fff9e4..11b3b62 100644
--- a/res/openvpn-gui-res-ua.rc
+++ b/res/openvpn-gui-res-ua.rc
@@ -20,7 +20,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Пароль ключа"
@@ -30,12 +30,13 @@ BEGIN
     LTEXT "Введіть пароль:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "Запам'ятати", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "OK", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "Скасувати", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "OK", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "Скасувати", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 180, 78
+ID_DLG_AUTH DIALOG 6, 18, 180, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Перевірка подлінності користувача"
 FONT 8, "Microsoft Sans Serif"
@@ -48,10 +49,11 @@ BEGIN
     CHECKBOX "Запам'ятати", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "OK", IDOK, 30, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Скасувати", IDCANCEL, 100, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 180, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - Аутентіфикація користувача"
 FONT 8, "Microsoft Sans Serif"
@@ -67,6 +69,7 @@ BEGIN
     CHECKBOX "Запам'ятати", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "Скасувати", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 180, 10
 END
 
 /* Challenge Response Dialog */
@@ -433,4 +436,7 @@ BEGIN
     /* save/delete password */
     IDS_NFO_DELETE_PASS "Підтвердіть видалення збережених паролів для ""%s"""
 
+    IDS_NFO_AUTH_PASS_RETRY "Невірне ім'я користувача або пароль"
+    IDS_NFO_KEY_PASS_RETRY "Невірний пароль"
+
 END
diff --git a/res/openvpn-gui-res-zh-hant.rc b/res/openvpn-gui-res-zh-hant.rc
index 6de3e26..d739492 100644
--- a/res/openvpn-gui-res-zh-hant.rc
+++ b/res/openvpn-gui-res-zh-hant.rc
@@ -23,7 +23,7 @@
  */
 
 /* Passphrase Dialog */
-ID_DLG_PASSPHRASE DIALOGEX 6, 18, 120, 67
+ID_DLG_PASSPHRASE DIALOGEX 6, 18, 160, 83
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN"
@@ -33,12 +33,13 @@ BEGIN
     LTEXT "輸入密碼:", 201, 6, 6, 100, 10
     EDITTEXT ID_EDT_PASSPHRASE, 6, 17, 107, 12, ES_PASSWORD | ES_AUTOHSCROLL
     CHECKBOX "儲存密碼", ID_CHK_SAVE_PASS, 6, 33, 100, 10
-    PUSHBUTTON "確認", IDOK, 6, 49, 50, 14
-    PUSHBUTTON "取消", IDCANCEL, 64, 49, 50, 14
+    PUSHBUTTON "確認", IDOK, 20, 49, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 90, 49, 50, 14
+    LTEXT "", ID_TXT_WARNING, 6, 65, 100, 10
 END
 
 /* Auth Username/Password Dialog */
-ID_DLG_AUTH DIALOG 6, 18, 160, 78
+ID_DLG_AUTH DIALOG 6, 18, 160, 95
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - 使用者驗證"
 FONT 8, "Microsoft Sans Serif"
@@ -51,10 +52,11 @@ BEGIN
     CHECKBOX "儲存密碼", ID_CHK_SAVE_PASS, 6, 42, 100, 10
     PUSHBUTTON "確認", IDOK, 20, 58, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "取消", IDCANCEL, 90, 58, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 74, 150, 10
 END
 
 /* Auth Username/Password/Challenge Dialog */
-ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 112
+ID_DLG_AUTH_CHALLENGE DIALOG 6, 18, 160, 129
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 CAPTION "OpenVPN - 使用者驗證"
 FONT 8, "Microsoft Sans Serif"
@@ -70,6 +72,7 @@ BEGIN
     CHECKBOX "儲存密碼", ID_CHK_SAVE_PASS, 6, 76, 100, 10
     PUSHBUTTON "確認", IDOK, 20, 92, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "取消", IDCANCEL, 90, 92, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 
 /* Challenge Response Dialog */