From 48ce801856bc266940515ce1fe77761303149857 Mon Sep 17 00:00:00 2001 From: Mrchiantos <51173452+Mrchiantos@users.noreply.github.com> Date: Mon, 22 Jul 2019 03:14:15 +0200 Subject: [PATCH] Revert "games -> planets" This reverts commit dc725eb649763704c31a259550787d69fb3c9921. --- build/android/README.md | 2 +- .../main/java/com/multicraft/game/MainActivity.java | 2 +- builtin/mainmenu/dlg_contentstore.lua | 2 +- builtin/mainmenu/dlg_create_world.lua | 6 +++--- builtin/mainmenu/dlg_settings_advanced.lua | 4 ++-- doc/lua_api.txt | 2 +- games/default/files/Menu/inventory_plus/menu.lua | 2 +- po/BlockColor.pot | 2 +- po/be/BlockColor.po | 2 +- po/ca/BlockColor.po | 2 +- po/cs/BlockColor.po | 4 ++-- po/da/BlockColor.po | 2 +- po/de/BlockColor.po | 4 ++-- po/dv/BlockColor.po | 2 +- po/eo/BlockColor.po | 2 +- po/es/BlockColor.po | 2 +- po/et/BlockColor.po | 4 ++-- po/fr/BlockColor.po | 4 ++-- po/he/BlockColor.po | 2 +- po/hu/BlockColor.po | 2 +- po/id/BlockColor.po | 2 +- po/it/BlockColor.po | 4 ++-- po/ja/BlockColor.po | 2 +- po/jbo/BlockColor.po | 2 +- po/ko/BlockColor.po | 2 +- po/ky/BlockColor.po | 2 +- po/lt/BlockColor.po | 4 ++-- po/ms/BlockColor.po | 2 +- po/nb/BlockColor.po | 2 +- po/nl/BlockColor.po | 4 ++-- po/pl/BlockColor.po | 4 ++-- po/pt/BlockColor.po | 4 ++-- po/pt_BR/BlockColor.po | 4 ++-- po/ro/BlockColor.po | 4 ++-- po/ru/BlockColor.po | 4 ++-- po/sl/BlockColor.po | 2 +- po/sr_Cyrl/BlockColor.po | 2 +- po/sv/BlockColor.po | 2 +- po/sw/BlockColor.po | 2 +- po/tr/BlockColor.po | 2 +- po/uk/BlockColor.po | 2 +- po/zh_CN/BlockColor.po | 4 ++-- po/zh_TW/BlockColor.po | 2 +- src/script/lua_api/l_mainmenu.cpp | 4 ++-- src/subgame.cpp | 10 +++++----- 45 files changed, 66 insertions(+), 66 deletions(-) diff --git a/build/android/README.md b/build/android/README.md index 1540043fd..a134a2e84 100644 --- a/build/android/README.md +++ b/build/android/README.md @@ -123,6 +123,6 @@ Other things that may be nice to know After compiling you need to archive files in assets into three zips - Files.zip, games.zip and worlds.zip. -games.zip must contain "planets" folder. +games.zip must contain "games" folder. worlds.zip must contain "worlds" folder and "multicraf.conf" text file. Finally, remaining files must be packed into Files.zip. diff --git a/build/android/src/main/java/com/multicraft/game/MainActivity.java b/build/android/src/main/java/com/multicraft/game/MainActivity.java index 991371a82..8a3354aa0 100644 --- a/build/android/src/main/java/com/multicraft/game/MainActivity.java +++ b/build/android/src/main/java/com/multicraft/game/MainActivity.java @@ -485,7 +485,7 @@ public class MainActivity extends Activity implements WVersionManager.ActivityLi if (isAll) { dt.execute(unzipLocation); } else { - dt.execute(unzipLocation + "builtin", unzipLocation + "planets", unzipLocation + "textures"/*, unzipLocation + "debug.txt"*/); + dt.execute(unzipLocation + "builtin", unzipLocation + "games", unzipLocation + "textures"/*, unzipLocation + "debug.txt"*/); } } diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua index a0c3e2f57..568d37ee6 100644 --- a/builtin/mainmenu/dlg_contentstore.lua +++ b/builtin/mainmenu/dlg_contentstore.lua @@ -31,7 +31,7 @@ local num_per_page = 5 local filter_type = 1 local filter_types_titles = { fgettext("All packages"), - fgettext("planets"), + fgettext("Games"), fgettext("Mods"), fgettext("Texture packs"), } diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index e20624ebd..6e0cf7e2a 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -56,7 +56,7 @@ local function create_world_formspec(dialogdata) "label[2,2;" .. fgettext("Mapgen") .. "]".. "dropdown[4.2,2;6.3;dd_mapgen;" .. mglist .. ";" .. selindex .. "]" .. - "label[2,3;" .. fgettext("files") .. "]".. + "label[2,3;" .. fgettext("Planets") .. "]".. "textlist[4.2,3;5.8,2.3;games;" .. gamemgr.gamelist() .. ";" .. gameidx .. ";true]" .. @@ -83,7 +83,7 @@ local function create_world_buttonhandler(this, fields) fields["key_enter"] then local worldname = fields["te_world_name"] - local gameindex = core.get_textlist_index("planets") + local gameindex = core.get_textlist_index("games") if gameindex ~= nil and worldname ~= "" then @@ -119,7 +119,7 @@ local function create_world_buttonhandler(this, fields) return true end - if fields["planets"] then + if fields["games"] then return true end diff --git a/builtin/mainmenu/dlg_settings_advanced.lua b/builtin/mainmenu/dlg_settings_advanced.lua index 38580a55c..206ce1620 100644 --- a/builtin/mainmenu/dlg_settings_advanced.lua +++ b/builtin/mainmenu/dlg_settings_advanced.lua @@ -286,9 +286,9 @@ local function parse_config_file(read_all, parse_mods) local file = io.open(path, "r") if file then if not games_category_initialized then - local translation = fgettext_ne("planets"), -- not used, but needed for xgettext + local translation = fgettext_ne("Games"), -- not used, but needed for xgettext table.insert(settings, { - name = "planets", + name = "Games", level = 0, type = "category", }) diff --git a/doc/lua_api.txt b/doc/lua_api.txt index a7075d7cd..5d169a811 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -59,7 +59,7 @@ The game directory can contain the file minetest.conf, which will be used to set default settings when running the particular game. It can also contain a settingtypes.txt 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 "planets" category in the settings tab. +in the "Games" category in the settings tab. ### Menu images diff --git a/games/default/files/Menu/inventory_plus/menu.lua b/games/default/files/Menu/inventory_plus/menu.lua index f4ef1472a..4fe422f1a 100644 --- a/games/default/files/Menu/inventory_plus/menu.lua +++ b/games/default/files/Menu/inventory_plus/menu.lua @@ -269,7 +269,7 @@ if page == "furnitures" then end -if page == "files" then +if page == "planets" then local inv = player:get_inventory() or nil diff --git a/po/BlockColor.pot b/po/BlockColor.pot index b356b6cd3..e09de5e9c 100644 --- a/po/BlockColor.pot +++ b/po/BlockColor.pot @@ -205,7 +205,7 @@ msgid "Accept" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/be/BlockColor.po b/po/be/BlockColor.po index 04c6f9967..52e5c1241 100644 --- a/po/be/BlockColor.po +++ b/po/be/BlockColor.po @@ -253,7 +253,7 @@ msgstr "" ", " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Гульні" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/ca/BlockColor.po b/po/ca/BlockColor.po index 64ba5b681..7177e8d53 100644 --- a/po/ca/BlockColor.po +++ b/po/ca/BlockColor.po @@ -259,7 +259,7 @@ msgstr "" ", , " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Jocs" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/cs/BlockColor.po b/po/cs/BlockColor.po index b897b644b..ed88fe844 100644 --- a/po/cs/BlockColor.po +++ b/po/cs/BlockColor.po @@ -254,7 +254,7 @@ msgstr "" ", " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Hry" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -4959,7 +4959,7 @@ msgstr "cURL timeout" #~ msgid "Mods:" #~ msgstr "Mody:" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "HRY" #~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" diff --git a/po/da/BlockColor.po b/po/da/BlockColor.po index 83c884605..848df1026 100644 --- a/po/da/BlockColor.po +++ b/po/da/BlockColor.po @@ -256,7 +256,7 @@ msgstr "" "), , , " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Spil" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/de/BlockColor.po b/po/de/BlockColor.po index c1bd90dc9..f2fef9287 100644 --- a/po/de/BlockColor.po +++ b/po/de/BlockColor.po @@ -257,7 +257,7 @@ msgstr "" ", , " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Spiele" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -5850,7 +5850,7 @@ msgstr "cURL-Zeitüberschreitung" #~ msgid "Mods:" #~ msgstr "Mods:" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "SPIELE" #~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" diff --git a/po/dv/BlockColor.po b/po/dv/BlockColor.po index 820bb5c28..faca3fab6 100644 --- a/po/dv/BlockColor.po +++ b/po/dv/BlockColor.po @@ -254,7 +254,7 @@ msgid "" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/eo/BlockColor.po b/po/eo/BlockColor.po index 9b7474e34..5f3a5ef76 100644 --- a/po/eo/BlockColor.po +++ b/po/eo/BlockColor.po @@ -261,7 +261,7 @@ msgid "" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Ludoj" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/es/BlockColor.po b/po/es/BlockColor.po index 3ac2e31ae..faa762f99 100644 --- a/po/es/BlockColor.po +++ b/po/es/BlockColor.po @@ -257,7 +257,7 @@ msgstr "" ", , " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Juegos" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/et/BlockColor.po b/po/et/BlockColor.po index ffed3647e..e784e6aa2 100644 --- a/po/et/BlockColor.po +++ b/po/et/BlockColor.po @@ -254,7 +254,7 @@ msgid "" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Mängud" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -4917,7 +4917,7 @@ msgstr "" #~ msgid "If enabled, " #~ msgstr "Sisse lülitatud" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "MÄNGUD" #~ msgid "new game" diff --git a/po/fr/BlockColor.po b/po/fr/BlockColor.po index 31522898e..c28b8bc6f 100644 --- a/po/fr/BlockColor.po +++ b/po/fr/BlockColor.po @@ -254,7 +254,7 @@ msgstr "" ", " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Jeux" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -5619,7 +5619,7 @@ msgstr "Délais d'interruption de cURL" #~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" #~ msgstr "Gamemgr : Impossible de copier le mod \"$1\" dans le jeu \"$2\"" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "JEUX" #~ msgid "Mods:" diff --git a/po/he/BlockColor.po b/po/he/BlockColor.po index 16cf81c1f..90c02f29f 100644 --- a/po/he/BlockColor.po +++ b/po/he/BlockColor.po @@ -250,7 +250,7 @@ msgid "" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "משחקים" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/hu/BlockColor.po b/po/hu/BlockColor.po index 87cee54a2..7a50dbb7c 100644 --- a/po/hu/BlockColor.po +++ b/po/hu/BlockColor.po @@ -253,7 +253,7 @@ msgid "" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Játékok" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/id/BlockColor.po b/po/id/BlockColor.po index a4ae98349..01cfff120 100644 --- a/po/id/BlockColor.po +++ b/po/id/BlockColor.po @@ -252,7 +252,7 @@ msgstr "" ", " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Permainan" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/it/BlockColor.po b/po/it/BlockColor.po index 8ff20c1e1..b7831bf95 100644 --- a/po/it/BlockColor.po +++ b/po/it/BlockColor.po @@ -254,7 +254,7 @@ msgstr "" "), , , " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Giochi" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -5676,7 +5676,7 @@ msgstr "Tempo di scadenza cURL" #~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" #~ msgstr "Gestore del gioco: impossibile il modulo \"$1\" nel gioco \"$2\"" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "GIOCHI" #~ msgid "Mods:" diff --git a/po/ja/BlockColor.po b/po/ja/BlockColor.po index 8a8308cd0..d21d78ce6 100644 --- a/po/ja/BlockColor.po +++ b/po/ja/BlockColor.po @@ -247,7 +247,7 @@ msgstr "" ", " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "ゲーム" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/jbo/BlockColor.po b/po/jbo/BlockColor.po index fa0653ec2..230afd069 100644 --- a/po/jbo/BlockColor.po +++ b/po/jbo/BlockColor.po @@ -252,7 +252,7 @@ msgid "" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/ko/BlockColor.po b/po/ko/BlockColor.po index 89be0be67..4cf52fc74 100644 --- a/po/ko/BlockColor.po +++ b/po/ko/BlockColor.po @@ -250,7 +250,7 @@ msgstr "" ", " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "게임" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/ky/BlockColor.po b/po/ky/BlockColor.po index d0bcf11cd..269931b69 100644 --- a/po/ky/BlockColor.po +++ b/po/ky/BlockColor.po @@ -257,7 +257,7 @@ msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua #, fuzzy -msgid "planets" +msgid "Games" msgstr "Оюн" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/lt/BlockColor.po b/po/lt/BlockColor.po index 0d5b74590..88ab1f96e 100644 --- a/po/lt/BlockColor.po +++ b/po/lt/BlockColor.po @@ -255,7 +255,7 @@ msgid "" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Žaidimai" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -4861,7 +4861,7 @@ msgstr "" #~ msgid "If enabled, " #~ msgstr "įjungtas" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "ŽAIDIMAI" #~ msgid "Mods:" diff --git a/po/ms/BlockColor.po b/po/ms/BlockColor.po index a9903cf5c..8971c84e4 100644 --- a/po/ms/BlockColor.po +++ b/po/ms/BlockColor.po @@ -254,7 +254,7 @@ msgstr "" "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Permainan" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/nb/BlockColor.po b/po/nb/BlockColor.po index c334652c9..d98937a9e 100644 --- a/po/nb/BlockColor.po +++ b/po/nb/BlockColor.po @@ -255,7 +255,7 @@ msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua #, fuzzy -msgid "planets" +msgid "Games" msgstr "Spill" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/nl/BlockColor.po b/po/nl/BlockColor.po index d3fbdc1e5..4fb04e73d 100644 --- a/po/nl/BlockColor.po +++ b/po/nl/BlockColor.po @@ -258,7 +258,7 @@ msgstr "" ", , " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Spellen" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -5735,7 +5735,7 @@ msgstr "cURL timeout" #~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" #~ msgstr "Gamemgr: Kan mod \"$1\" niet naar spel \"$2\" kopiëren" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "SPELLEN" #~ msgid "Mods:" diff --git a/po/pl/BlockColor.po b/po/pl/BlockColor.po index c7895f26f..c5833ee82 100644 --- a/po/pl/BlockColor.po +++ b/po/pl/BlockColor.po @@ -256,7 +256,7 @@ msgstr "" ", , " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Gry" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -5351,7 +5351,7 @@ msgstr "Limit czasu cURL" #~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" #~ msgstr "Gamemgr: Kopiowanie moda \"$1\" do gry \"$2\" nie powiodło się" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "GRY" #~ msgid "Mods:" diff --git a/po/pt/BlockColor.po b/po/pt/BlockColor.po index fb61fe2ff..0a4c14f55 100644 --- a/po/pt/BlockColor.po +++ b/po/pt/BlockColor.po @@ -254,7 +254,7 @@ msgstr "" ", , " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Jogos" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -5172,7 +5172,7 @@ msgstr "" #~ "Mensagem de Jogo: Impossível fazer cópia do extra \"$1\" para o jogo " #~ "\"$2\"" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "JOGOS" #~ msgid "Mods:" diff --git a/po/pt_BR/BlockColor.po b/po/pt_BR/BlockColor.po index 036dedcfe..1a2e89e52 100644 --- a/po/pt_BR/BlockColor.po +++ b/po/pt_BR/BlockColor.po @@ -257,7 +257,7 @@ msgstr "" ", " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Jogos" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -5660,7 +5660,7 @@ msgstr "Tempo limite de cURL" #~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" #~ msgstr "Gamemgr: Não foi possível copiar o mod \"$1\" para o jogo \"$2\"" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "JOGOS" #~ msgid "Mods:" diff --git a/po/ro/BlockColor.po b/po/ro/BlockColor.po index be0a4f6b9..7b2e5becd 100644 --- a/po/ro/BlockColor.po +++ b/po/ro/BlockColor.po @@ -254,7 +254,7 @@ msgid "" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Jocuri" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -4959,7 +4959,7 @@ msgstr "" #~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" #~ msgstr "Gamemgr: Nu se poate copia modul \"$1\" în jocul \"$2\"" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "JOCURI" #~ msgid "Mods:" diff --git a/po/ru/BlockColor.po b/po/ru/BlockColor.po index 847a183fc..81336cc46 100644 --- a/po/ru/BlockColor.po +++ b/po/ru/BlockColor.po @@ -245,7 +245,7 @@ msgstr "" "<Октавы>,<Постоянство>" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Игры" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -5332,7 +5332,7 @@ msgstr "cURL тайм-аут" #~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" #~ msgstr "Gamemgr: Не могу скопировать мод \"$1\" в игру \"$2\"" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "ИГРЫ" #~ msgid "Mods:" diff --git a/po/sl/BlockColor.po b/po/sl/BlockColor.po index 3e4aec37c..6bc8f54f0 100644 --- a/po/sl/BlockColor.po +++ b/po/sl/BlockColor.po @@ -213,7 +213,7 @@ msgid "Accept" msgstr "Potrdi" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Igre" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/sr_Cyrl/BlockColor.po b/po/sr_Cyrl/BlockColor.po index 41906846e..a8ce772b5 100644 --- a/po/sr_Cyrl/BlockColor.po +++ b/po/sr_Cyrl/BlockColor.po @@ -255,7 +255,7 @@ msgstr "" "<октаве>, <упорност>" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Игре" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/sv/BlockColor.po b/po/sv/BlockColor.po index 7f2d77559..2eff25c52 100644 --- a/po/sv/BlockColor.po +++ b/po/sv/BlockColor.po @@ -253,7 +253,7 @@ msgstr "" ", , " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Spel" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/sw/BlockColor.po b/po/sw/BlockColor.po index 18968428b..d350d6e72 100644 --- a/po/sw/BlockColor.po +++ b/po/sw/BlockColor.po @@ -245,7 +245,7 @@ msgid "" msgstr "" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Michezo" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/tr/BlockColor.po b/po/tr/BlockColor.po index d2561384a..1efaf4da4 100644 --- a/po/tr/BlockColor.po +++ b/po/tr/BlockColor.po @@ -253,7 +253,7 @@ msgstr "" ", " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Oyunlar" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/uk/BlockColor.po b/po/uk/BlockColor.po index 8a9774b72..04079c213 100644 --- a/po/uk/BlockColor.po +++ b/po/uk/BlockColor.po @@ -253,7 +253,7 @@ msgstr "" ", " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "Ігри" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/po/zh_CN/BlockColor.po b/po/zh_CN/BlockColor.po index c685adcd7..11ac544a9 100644 --- a/po/zh_CN/BlockColor.po +++ b/po/zh_CN/BlockColor.po @@ -249,7 +249,7 @@ msgstr "" ", " #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "游戏" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua @@ -5029,7 +5029,7 @@ msgstr "cURL 超时" #~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\"" #~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”" -#~ msgid "planets" +#~ msgid "GAMES" #~ msgstr "游戏" #~ msgid "Mods:" diff --git a/po/zh_TW/BlockColor.po b/po/zh_TW/BlockColor.po index 0c06b7fd0..4f637297d 100644 --- a/po/zh_TW/BlockColor.po +++ b/po/zh_TW/BlockColor.po @@ -252,7 +252,7 @@ msgstr "" "性>" #: builtin/mainmenu/dlg_settings_advanced.lua -msgid "planets" +msgid "Games" msgstr "遊戲" #: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_mods.lua diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp index 26c0d4084..51741a35e 100644 --- a/src/script/lua_api/l_mainmenu.cpp +++ b/src/script/lua_api/l_mainmenu.cpp @@ -762,7 +762,7 @@ int ModApiMainMenu::l_get_modpath(lua_State *L) int ModApiMainMenu::l_get_gamepath(lua_State *L) { std::string gamepath = fs::RemoveRelativePathComponents( - porting::path_share + DIR_DELIM + "planets" + DIR_DELIM); + porting::path_share + DIR_DELIM + "games" + DIR_DELIM); lua_pushstring(L, gamepath.c_str()); return 1; } @@ -949,7 +949,7 @@ bool ModApiMainMenu::isMinetestPath(std::string path) return true; /* games */ - if (fs::PathStartsWith(path,fs::RemoveRelativePathComponents(porting::path_share + DIR_DELIM + "planets"))) + if (fs::PathStartsWith(path,fs::RemoveRelativePathComponents(porting::path_share + DIR_DELIM + "games"))) return true; /* mods */ diff --git a/src/subgame.cpp b/src/subgame.cpp index e9db54cd1..bda8ccc3c 100644 --- a/src/subgame.cpp +++ b/src/subgame.cpp @@ -87,13 +87,13 @@ SubgameSpec findSubgame(const std::string &id) } find_paths.push_back(GameFindPath( - share + DIR_DELIM + "planets" + DIR_DELIM + id + "_game", true)); + share + DIR_DELIM + "games" + DIR_DELIM + id + "_game", true)); find_paths.push_back(GameFindPath( - share + DIR_DELIM + "planets" + DIR_DELIM + id, true)); + share + DIR_DELIM + "games" + DIR_DELIM + id, true)); find_paths.push_back(GameFindPath( - share + DIR_DELIM + "planets" + DIR_DELIM + id + "_game", false)); + share + DIR_DELIM + "games" + DIR_DELIM + id + "_game", false)); find_paths.push_back(GameFindPath( - share + DIR_DELIM + "planets" + DIR_DELIM + id, false)); + share + DIR_DELIM + "games" + DIR_DELIM + id, false)); // Find game directory std::string game_path; bool user_game = true; // Game is in user's directory @@ -145,7 +145,7 @@ std::set getAvailableGameIds() { std::set gameids; std::set gamespaths; - gamespaths.insert(porting::path_share + DIR_DELIM + "planets"); + gamespaths.insert(porting::path_share + DIR_DELIM + "games"); Strfnd search_paths(getSubgamePathEnv());