diff options
| author | Henrik Nord <[email protected]> | 2011-09-20 11:19:21 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-20 11:19:21 +0200 |
| commit | ec36499d7e329b4dc69a1a3be3422eac7907c260 (patch) | |
| tree | 3fae5bd47f85aa8a3ac40519b2328c4451a00c18 /lib/toolbar/src/toolbar_toolconfig.erl | |
| parent | 532c72b3ffeb9219bdb7e6a7f5d21fe26f0f0629 (diff) | |
| parent | 53cf0b70c705e0bf6c09f83f2ce2709d79593ce6 (diff) | |
| download | otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.gz otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.bz2 otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.zip | |
Merge branch 'dev' into major
Conflicts:
erts/aclocal.m4
erts/include/internal/ethread_header_config.h.in
Diffstat (limited to 'lib/toolbar/src/toolbar_toolconfig.erl')
| -rw-r--r-- | lib/toolbar/src/toolbar_toolconfig.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/toolbar/src/toolbar_toolconfig.erl b/lib/toolbar/src/toolbar_toolconfig.erl index 7d8f2b4d21..693a7b4570 100644 --- a/lib/toolbar/src/toolbar_toolconfig.erl +++ b/lib/toolbar/src/toolbar_toolconfig.erl @@ -126,7 +126,7 @@ loop(S,Window) -> show_info(Window,Info), move_focus(Window,file); - %% Erronous version number -- Notify user + %% Erroneous version number -- Notify user {error,version} -> Win = Window#tfwindow.window, tool_utils:notify(Win,[FileName, @@ -136,7 +136,7 @@ loop(S,Window) -> _Error -> Win = Window#tfwindow.window, tool_utils:notify(Win,[FileName, - "File is on erronous format"]) + "File is in erroneous format"]) end; %% The file can not be read, show default values |