diff --git a/locale/en.mo b/locale/en.mo index 2bc6ddd..6a9abef 100644 Binary files a/locale/en.mo and b/locale/en.mo differ diff --git a/locale/en.po b/locale/en.po index 55cf1dc..a887484 100644 --- a/locale/en.po +++ b/locale/en.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-05 03:01-0300\n" -"PO-Revision-Date: 2020-04-05 02:47-0300\n" +"POT-Creation-Date: 2020-04-05 14:42-0300\n" +"PO-Revision-Date: 2020-04-05 14:43-0300\n" "Last-Translator: \n" "Language-Team: \n" "Language: en\n" @@ -191,8 +191,8 @@ msgid "Diamante VI" msgstr "Diamond VI" #: ranking.lua shop.lua -msgid "Voltar" -msgstr "Return" +msgid "Fechar" +msgstr "Close" #: ranking.lua msgid "Pontos" @@ -299,13 +299,15 @@ msgid "Valor não numérico '@1'." msgstr "non-numerical value '@1'." #: comandos.lua -#, fuzzy msgid "XP subtraído. Novo montante é @1." -msgstr "XP subtracted. New amount is @1." +msgstr "Subtracted XP. New amount is @1." #: comandos.lua msgid "XP adicionado. Novo montante é @1." -msgstr "XP added. New amount is @1." +msgstr "Added XP. New amount is @1." + +#~ msgid "Voltar" +#~ msgstr "Return" #~ msgid "XP" #~ msgstr "XP" diff --git a/locale/en.po~ b/locale/en.po~ index 6bca088..55cf1dc 100644 --- a/locale/en.po~ +++ b/locale/en.po~ @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-05 02:41-0300\n" +"POT-Creation-Date: 2020-04-05 03:01-0300\n" "PO-Revision-Date: 2020-04-05 02:47-0300\n" "Last-Translator: \n" "Language-Team: \n" @@ -299,7 +299,8 @@ msgid "Valor não numérico '@1'." msgstr "non-numerical value '@1'." #: comandos.lua -msgid "XP subtraido. Novo montante é @1." +#, fuzzy +msgid "XP subtraído. Novo montante é @1." msgstr "XP subtracted. New amount is @1." #: comandos.lua diff --git a/locale/pt.mo b/locale/pt.mo index 305cdb1..4f7cd51 100644 Binary files a/locale/pt.mo and b/locale/pt.mo differ diff --git a/locale/pt.po b/locale/pt.po index d8a846d..ed38eb1 100644 --- a/locale/pt.po +++ b/locale/pt.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-05 03:01-0300\n" -"PO-Revision-Date: 2020-04-05 02:59-0300\n" +"POT-Creation-Date: 2020-04-05 14:42-0300\n" +"PO-Revision-Date: 2020-04-05 14:47-0300\n" "Last-Translator: \n" "Language-Team: \n" "Language: pt\n" @@ -191,8 +191,8 @@ msgid "Diamante VI" msgstr "Diamante VI" #: ranking.lua shop.lua -msgid "Voltar" -msgstr "Voltar" +msgid "Fechar" +msgstr "Fechar" #: ranking.lua msgid "Pontos" @@ -299,14 +299,16 @@ msgid "Valor não numérico '@1'." msgstr "Valor não numérico '@1'." #: comandos.lua -#, fuzzy msgid "XP subtraído. Novo montante é @1." -msgstr "XP subtraido. Novo montante é @1." +msgstr "XP subtraído. Novo montante é @1." #: comandos.lua msgid "XP adicionado. Novo montante é @1." msgstr "XP adicionado. Novo montante é @1." +#~ msgid "Voltar" +#~ msgstr "Voltar" + #~ msgid "XP" #~ msgstr "XP" diff --git a/locale/pt.po~ b/locale/pt.po~ index e7d779f..d8a846d 100644 --- a/locale/pt.po~ +++ b/locale/pt.po~ @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-05 02:41-0300\n" +"POT-Creation-Date: 2020-04-05 03:01-0300\n" "PO-Revision-Date: 2020-04-05 02:59-0300\n" "Last-Translator: \n" "Language-Team: \n" @@ -299,7 +299,8 @@ msgid "Valor não numérico '@1'." msgstr "Valor não numérico '@1'." #: comandos.lua -msgid "XP subtraido. Novo montante é @1." +#, fuzzy +msgid "XP subtraído. Novo montante é @1." msgstr "XP subtraido. Novo montante é @1." #: comandos.lua diff --git a/locale/template.pot b/locale/template.pot index cd6562f..9931f61 100644 --- a/locale/template.pot +++ b/locale/template.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-05 03:01-0300\n" +"POT-Creation-Date: 2020-04-05 14:42-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -190,7 +190,7 @@ msgid "Diamante VI" msgstr "" #: ranking.lua shop.lua -msgid "Voltar" +msgid "Fechar" msgstr "" #: ranking.lua diff --git a/locale/xpro..tr b/locale/xpro..tr index 288b5cc..a154dd9 100644 --- a/locale/xpro..tr +++ b/locale/xpro..tr @@ -10,21 +10,19 @@ Full inventory=Full inventory Diamond VI=Diamond VI Stone V=Stone V Cost: @1 XPCash=Cost: @1 XPCash -Diamond V=Diamond V -XP subtracted. New amount is @1.=XP subtracted. New amount is @1. +Stone I=Stone I Bronze V=Bronze V Stone VI=Stone VI Steel III=Steel III Buy=Buy Score=Score -Player does not exist.=Player does not exist. +Novice II=Novice II Wood VII=Wood VII [ | ]=[ | ] Wood III=Wood III Diamond I=Diamond I Steel I=Steel I Stone IV=Stone IV -XP added. New amount is @1.=XP added. New amount is @1. Acquired=Acquired Wood II=Wood II Steel VI=Steel VI @@ -41,11 +39,13 @@ Awards Store=Awards Store Novice III=Novice III Mese V=Mese V -@1XP=-@1XP +Added XP. New amount is @1.=Added XP. New amount is @1. Bronze VI=Bronze VI Diamond IV=Diamond IV Manage player XP=Manage player XP Minimum level: @1=Minimum level: @1 Mese III=Mese III +Subtracted XP. New amount is @1.=Subtracted XP. New amount is @1. Progress=Progress XP Cash: @1=XP Cash: @1 Insufficient XPCash=Insufficient XPCash @@ -58,16 +58,16 @@ Bronze III=Bronze III Wood VI=Wood VI Score: @1=Score: @1 Bronze II=Bronze II -Return=Return -Novice II=Novice II -Stone I=Stone I -Mese II=Mese II +Wood IV=Wood IV +Player does not exist.=Player does not exist. League @1=League @1 Stone III=Stone III +Mese II=Mese II +Diamond V=Diamond V Player=Player -Wood IV=Wood IV -Steel II=Steel II League: @1=League: @1 +Steel II=Steel II +Close=Close Level @1=Level @1 Choose an item=Choose an item Stone II=Stone II diff --git a/locale/xpro.en.tr b/locale/xpro.en.tr index 288b5cc..a154dd9 100644 --- a/locale/xpro.en.tr +++ b/locale/xpro.en.tr @@ -10,21 +10,19 @@ Full inventory=Full inventory Diamond VI=Diamond VI Stone V=Stone V Cost: @1 XPCash=Cost: @1 XPCash -Diamond V=Diamond V -XP subtracted. New amount is @1.=XP subtracted. New amount is @1. +Stone I=Stone I Bronze V=Bronze V Stone VI=Stone VI Steel III=Steel III Buy=Buy Score=Score -Player does not exist.=Player does not exist. +Novice II=Novice II Wood VII=Wood VII [ | ]=[ | ] Wood III=Wood III Diamond I=Diamond I Steel I=Steel I Stone IV=Stone IV -XP added. New amount is @1.=XP added. New amount is @1. Acquired=Acquired Wood II=Wood II Steel VI=Steel VI @@ -41,11 +39,13 @@ Awards Store=Awards Store Novice III=Novice III Mese V=Mese V -@1XP=-@1XP +Added XP. New amount is @1.=Added XP. New amount is @1. Bronze VI=Bronze VI Diamond IV=Diamond IV Manage player XP=Manage player XP Minimum level: @1=Minimum level: @1 Mese III=Mese III +Subtracted XP. New amount is @1.=Subtracted XP. New amount is @1. Progress=Progress XP Cash: @1=XP Cash: @1 Insufficient XPCash=Insufficient XPCash @@ -58,16 +58,16 @@ Bronze III=Bronze III Wood VI=Wood VI Score: @1=Score: @1 Bronze II=Bronze II -Return=Return -Novice II=Novice II -Stone I=Stone I -Mese II=Mese II +Wood IV=Wood IV +Player does not exist.=Player does not exist. League @1=League @1 Stone III=Stone III +Mese II=Mese II +Diamond V=Diamond V Player=Player -Wood IV=Wood IV -Steel II=Steel II League: @1=League: @1 +Steel II=Steel II +Close=Close Level @1=Level @1 Choose an item=Choose an item Stone II=Stone II diff --git a/locale/xpro.pt.tr b/locale/xpro.pt.tr index 3046b10..0bb14b9 100644 --- a/locale/xpro.pt.tr +++ b/locale/xpro.pt.tr @@ -10,21 +10,19 @@ Full inventory=Inventario lotado Diamond VI=Diamante VI Stone V=Pedra V Cost: @1 XPCash=Custo: @1 CashXP -Diamond V=Diamante V -XP subtracted. New amount is @1.=XP subtraido. Novo montante é @1. +Stone I=Pedra I Bronze V=Bronze V Stone VI=Pedra VI Steel III=Ferro III Buy=Comprar Score=Pontos -Player does not exist.=Jogador inexistente. +Novice II=Novato II Wood VII=Madeira VII [ | ]=[ | ] Wood III=Madeira III Diamond I=Diamante I Steel I=Ferro I Stone IV=Pedra IV -XP added. New amount is @1.=XP adicionado. Novo montante é @1. Acquired=Adiquirido Wood II=Madeira II Steel VI=Ferro VI @@ -41,11 +39,13 @@ Awards Store=Loja de Itens por XP Novice III=Novato III Mese V=Mese V -@1XP=-@1XP +Added XP. New amount is @1.=XP adicionado. Novo montante é @1. Bronze VI=Bronze VI Diamond IV=Diamante IV Manage player XP=Administrar XP dos jogadores Minimum level: @1=Nivel mínimo: @1 Mese III=Mese III +Subtracted XP. New amount is @1.=XP subtraído. Novo montante é @1. Progress=Progresso XP Cash: @1=Cash XP: @1 Insufficient XPCash=Cash XP insuficiente @@ -58,16 +58,16 @@ Bronze III=Bronze III Wood VI=Madeira VI Score: @1=Pontos: @1 Bronze II=Bronze II -Return=Voltar -Novice II=Novato II -Stone I=Pedra I -Mese II=Mese II +Wood IV=Madeira IV +Player does not exist.=Jogador inexistente. League @1=Liga @1 Stone III=Pedra III +Mese II=Mese II +Diamond V=Diamante V Player=Jogador -Wood IV=Madeira IV -Steel II=Ferro II League: @1=Liga: @1 +Steel II=Ferro II +Close=Fechar Level @1=Nivel @1 Choose an item=Escolha um Item Stone II=Pedra II diff --git a/ranking.lua b/ranking.lua index 34ff445..905be40 100644 --- a/ranking.lua +++ b/ranking.lua @@ -120,7 +120,7 @@ local update_formspec = function() xpro.ranking_formspec = "size[7,7]" ..default.gui_bg ..default.gui_bg_img - .."button[5,-0.2;2,1;back;"..S("Voltar").."]" + .."button_exit[5,-0.2;2,1;close;"..S("Fechar").."]" .."label[0.6,0.4;"..S("Pontos").."]" .."label[2.4,0.4;"..S("Jogador").."]" @@ -143,13 +143,6 @@ local update_formspec = function() end update_formspec() -minetest.register_on_player_receive_fields(function(player, formname, fields) - if formname == "xpro:ranking" then - if fields.back then - xpro.show_inventory_formspec(player) - end - end -end) xpro.register_on_add_xp(function(name, xp_added) --if xpro.ranking diff --git a/sfinv.lua b/sfinv.lua index 5add929..eb8285a 100644 --- a/sfinv.lua +++ b/sfinv.lua @@ -76,7 +76,7 @@ xpro.update_inventory_formspec = function(player) sfinv.set_player_inventory_formspec(player) end --- Abrir inventario na aba de niveis +-- Abrir inventario na aba de niveis [Não funciona pois o exibir formspec não significa abrir o inventario, os botões sfinv não funcionarão assim] xpro.show_inventory_formspec = function(player) minetest.show_formspec(player:get_player_name(), "", player:get_inventory_formspec()) end diff --git a/shop.lua b/shop.lua index e8d140c..bdbe82f 100644 --- a/shop.lua +++ b/shop.lua @@ -58,7 +58,7 @@ xpro.acessar_shop = function(name, aviso) local formspec = "size[8,6]" ..default.gui_bg ..default.gui_bg_img - .."button[6,0;2,1;back;"..S("Voltar").."]" + .."button_exit[6,0;2,1;close;"..S("Fechar").."]" .."label[0,0;"..S("Loja de Itens por XP").."]" .."label[0,0.5;"..S("Cash XP: @1", xp_disp).."]" .."textlist[3.2,1;4.5,5;menu;"..string_menu_shop.."]" @@ -121,11 +121,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) xpro.update_inventory_formspec(minetest.get_player_by_name(name)) end end - - -- Retornar ao inventario - -- Return to inventory - elseif fields.back then - xpro.show_inventory_formspec(player) end end end)