Browse Source

Fix some misspellings (#8104)

Paul Ouellette 5 years ago
parent
commit
3fce27ece5
4 changed files with 6 additions and 6 deletions
  1. 2 2
      builtin/fstk/ui.lua
  2. 1 1
      builtin/mainmenu/dlg_config_world.lua
  3. 1 1
      src/debug.cpp
  4. 2 2
      src/serverenvironment.cpp

+ 2 - 2
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 ..

+ 1 - 1
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

+ 1 - 1
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();
 }

+ 2 - 2
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;
 	}