Rename 'subgame' to 'game'

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 468ba051433c67c25c7b8fa6325a5a45bd7e08e0..ed2d94d40ca08421e347e573a1a3b3bb1a5b4a17 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ If you experience an issue, we would like to know the details - especially when
      - Error logs (check the bottom of the `debug.txt` file)
      - Screenshots
      - Ways you have tried to solve the issue, and whether they worked or not
-     - Your Minetest version and the content (subgames, mods or texture packs) you have installed
+     - Your Minetest version and the content (games, mods or texture packs) you have installed
      - Your platform (e.g. Windows 10 or Ubuntu 15.04 x64)
 
 After reporting you should aim to answer questions or clarifications as this helps pinpoint the cause of the issue (if you don't do this your issue may be closed after 1 month).

diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua
index 13061ee40d67903990865928b86d4b8c2cc9f9cb..134eeebc185456dff67231ecdbe7e884f4378a70 100644 (file)
--- 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 9ba4ade7e539f86a260fb4fb813bf0bf05ade2ba..68b05dc1895181304fbd7b0ddc0a307877442337 100644 (file)
--- 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 08e51171f98b09f6aca0bb5d55d97300d6e1e424..ff08a20697cf7f3657d7b1e846f9efb423b5e707 100644 (file)
--- 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
 

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index fe23fbe64de6b6e613c3cb61cb3394a61a2dd95e..1f9401453deb29e36c5b3b63c04d640b85b33041 100644 (file)
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -67,8 +67,8 @@ The game directory can contain the following files:
   In the same format as the one in builtin.
   This settingtypes.txt will be parsed by the menu and the settings will be
   displayed in the "Games" category in the advanced settings tab.
-* If the subgame contains a folder called `textures` the server will load it
-  as a texturepack, overriding mod textures.
+* If the game contains a folder called `textures` the server will load it as a
+  texturepack, overriding mod textures.
   Any server texturepack will override mod textures and the game texturepack.
 
 ### Menu images

diff --git a/doc/minetest.6 b/doc/minetest.6
index a135e541cfbc4bc7fcd4dccefdeb8140685c3d88..50b085de0faf60f5313d900ddf2c906178f6e689 100644 (file)
--- a/doc/minetest.6
+++ b/doc/minetest.6
@@ -96,7 +96,7 @@ Display an interactive terminal over ncurses during execution.
 .SH ENVIRONMENT
 .TP
 .B MINETEST_SUBGAME_PATH
-Colon delimited list of directories to search for subgames.
+Colon delimited list of directories to search for games.
 
 .SH BUGS
 Please report all bugs to Perttu Ahola <celeron55@gmail.com>.