From f883baa51e3ede7e0eb6db5612a0db5f4e2f20a2 Mon Sep 17 00:00:00 2001 From: paramat Date: Tue, 13 Mar 2018 01:59:01 +0000 Subject: [PATCH] Rename 'subgame' to 'game' --- builtin/mainmenu/dlg_create_world.lua | 4 ++-- builtin/mainmenu/textures.lua | 2 +- builtin/settingtypes.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index 13061ee..134eeeb 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -85,12 +85,12 @@ local function create_world_formspec(dialogdata) if #gamemgr.games == 0 then retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" .. - fgettext("You have no subgames installed.") .. "]label[2.25,4.4;" .. + fgettext("You have no games installed.") .. "]label[2.25,4.4;" .. fgettext("Download one from minetest.net") .. "]" elseif #gamemgr.games == 1 and gamemgr.games[1].id == "minimal" then retval = retval .. "box[1.75,4;8.7,1;#ff8800]label[2,4;" .. fgettext("Warning: The minimal development test is meant for developers.") .. "]label[2,4.4;" .. - fgettext("Download a subgame, such as minetest_game, from minetest.net") .. "]" + fgettext("Download a game, such as minetest_game, from minetest.net") .. "]" end return retval diff --git a/builtin/mainmenu/textures.lua b/builtin/mainmenu/textures.lua index 9ba4ade..68b05dc 100644 --- a/builtin/mainmenu/textures.lua +++ b/builtin/mainmenu/textures.lua @@ -143,7 +143,7 @@ function mm_texture.set_game(identifier, gamedetails) end end - -- Find out how many randomized textures the subgame provides + -- Find out how many randomized textures the game provides local n = 0 local filename local menu_files = core.get_dir_list(gamedetails.path .. DIR_DELIM .. "menu", false) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 08e5117..ff08a20 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1235,8 +1235,8 @@ curl_file_download_timeout (cURL file download timeout) int 300000 high_precision_fpu (High-precision FPU) bool true # Changes the main menu UI: -# - Full: Multple singleplayer worlds, subgame choice, texture pack chooser, etc. -# - Simple: One singleplayer world, no subgame or texture pack choosers. May be necessary for smaller screens. +# - Full: Multple singleplayer worlds, game choice, texture pack chooser, etc. +# - Simple: One singleplayer world, no game or texture pack choosers. May be necessary for smaller screens. # - Auto: Simple on Android, full on everything else. main_menu_style (Main menu style) enum auto auto,full,simple