sfence
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some misspellings (#8104)

master
Paul Ouellette 2019-01-16 07:39:13 -05:00 committed by Loïc Blot
parent ed1415f78d
commit 3fce27ece5
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/fstk/ui.lua
View File

@ -92,9 +92,9 @@ function ui.update()
formspec = wordwrap_quickhack(gamedata.errormessage) formspec = wordwrap_quickhack(gamedata.errormessage)
local error_title local error_title
if string.find(gamedata.errormessage, "ModError") then if string.find(gamedata.errormessage, "ModError") then
error_title = fgettext("An error occured in a Lua script, such as a mod:") error_title = fgettext("An error occurred in a Lua script, such as a mod:")
else else
error_title = fgettext("An error occured:") error_title = fgettext("An error occurred:")
end end
formspec = "size[12,5]" .. formspec = "size[12,5]" ..
"label[0.5,0;" .. error_title .. "label[0.5,0;" .. error_title ..

2
builtin/mainmenu/dlg_config_world.lua
View File

@ -142,7 +142,7 @@ local function handle_buttons(this, fields)
elseif mod.enabled then elseif mod.enabled then
gamedata.errormessage = fgettext_ne("Failed to enable mo" .. gamedata.errormessage = fgettext_ne("Failed to enable mo" ..
"d \"$1\" as it contains disallowed characters. " .. "d \"$1\" as it contains disallowed characters. " ..
"Only chararacters [a-z0-9_] are allowed.", "Only characters [a-z0-9_] are allowed.",
mod.name) mod.name)
end end
mods["load_mod_" .. mod.name] = nil mods["load_mod_" .. mod.name] = nil

2
src/debug.cpp
View File

@ -69,7 +69,7 @@ void fatal_error_fn(const char *msg, const char *file,
errorstream << std::endl << "In thread " << std::hex errorstream << std::endl << "In thread " << std::hex
<< std::this_thread::get_id() << ":" << std::endl; << std::this_thread::get_id() << ":" << std::endl;
errorstream << file << ":" << line << ": " << function errorstream << file << ":" << line << ": " << function
<< ": A fatal error occured: " << msg << std::endl; << ": A fatal error occurred: " << msg << std::endl;
abort(); abort();
} }

4
src/serverenvironment.cpp
View File

@ -2149,7 +2149,7 @@ bool ServerEnvironment::migratePlayersDatabase(const GameParams &game_params,
delete dstdb; delete dstdb;
} catch (BaseException &e) { } catch (BaseException &e) {
errorstream << "An error occured during migration: " << e.what() << std::endl; errorstream << "An error occurred during migration: " << e.what() << std::endl;
return false; return false;
} }
return true; return true;
@ -2236,7 +2236,7 @@ bool ServerEnvironment::migrateAuthDatabase(
} }
} catch (BaseException &e) { } catch (BaseException &e) {
errorstream << "An error occured during migration: " << e.what() errorstream << "An error occurred during migration: " << e.what()
<< std::endl; << std::endl;
return false; return false;
} }