aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin/fstk/ui.lua4
-rw-r--r--builtin/mainmenu/dlg_config_world.lua2
-rw-r--r--src/debug.cpp2
-rw-r--r--src/serverenvironment.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/builtin/fstk/ui.lua b/builtin/fstk/ui.lua
index 3ac0386ca..a3e3a092a 100644
--- a/builtin/fstk/ui.lua
+++ b/builtin/fstk/ui.lua
@@ -92,9 +92,9 @@ function ui.update()
formspec = wordwrap_quickhack(gamedata.errormessage)
local error_title
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
- error_title = fgettext("An error occured:")
+ error_title = fgettext("An error occurred:")
end
formspec = "size[12,5]" ..
"label[0.5,0;" .. error_title ..
diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua
index 3e766aa78..daa8099c4 100644
--- a/builtin/mainmenu/dlg_config_world.lua
+++ b/builtin/mainmenu/dlg_config_world.lua
@@ -142,7 +142,7 @@ local function handle_buttons(this, fields)
elseif mod.enabled then
gamedata.errormessage = fgettext_ne("Failed to enable mo" ..
"d \"$1\" as it contains disallowed characters. " ..
- "Only chararacters [a-z0-9_] are allowed.",
+ "Only characters [a-z0-9_] are allowed.",
mod.name)
end
mods["load_mod_" .. mod.name] = nil
diff --git a/src/debug.cpp b/src/debug.cpp
index 1a467265c..3c82ed9e1 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -69,7 +69,7 @@ void fatal_error_fn(const char *msg, const char *file,
errorstream << std::endl << "In thread " << std::hex
<< std::this_thread::get_id() << ":" << std::endl;
errorstream << file << ":" << line << ": " << function
- << ": A fatal error occured: " << msg << std::endl;
+ << ": A fatal error occurred: " << msg << std::endl;
abort();
}
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index 4e75a7c80..076a1e28f 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -2149,7 +2149,7 @@ bool ServerEnvironment::migratePlayersDatabase(const GameParams &game_params,
delete dstdb;
} 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 true;
@@ -2236,7 +2236,7 @@ bool ServerEnvironment::migrateAuthDatabase(
}
} catch (BaseException &e) {
- errorstream << "An error occured during migration: " << e.what()
+ errorstream << "An error occurred during migration: " << e.what()
<< std::endl;
return false;
}