diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-10-11 12:53:20 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-10-11 12:53:20 -0300 |
| commit | 10f0a57ab4f47e73a3d248087ee54f805b4d7367 (patch) | |
| tree | 84053913a36d1e294aa8730b74feeb1854129776 /etc/inc/authgui.inc | |
| parent | e857eff69bd89af17d4e39170c481efbd3c64ed3 (diff) | |
| parent | d60f510a2c4ddc298e024b5b0d1a969f710c4249 (diff) | |
| download | pfsense-10f0a57ab4f47e73a3d248087ee54f805b4d7367.zip pfsense-10f0a57ab4f47e73a3d248087ee54f805b4d7367.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/authgui.inc
Diffstat (limited to 'etc/inc/authgui.inc')
| -rw-r--r-- | etc/inc/authgui.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc index a42b9f9..44fcb1c 100644 --- a/etc/inc/authgui.inc +++ b/etc/inc/authgui.inc @@ -157,7 +157,7 @@ function display_login_form() { if (file_exists("{$g['tmp_path']}/webconfigurator.lock")) { // TODO: add the IP from the user who did lock the device $whom = file_get_contents("{$g['tmp_path']}/webconfigurator.lock"); - printf(gettext("showajaxmessage('This device is currently beeing maintained by: %s.');"), $whom); + printf(gettext("showajaxmessage('This device is currently being maintained by: %s.');"), $whom); } } exit; |
