poikilos
/
EnlivenMinetest
mirror of https://github.com/poikilos/EnlivenMinetest
1
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity
This is an experimental copy for testing Poikilos' issue mirroring system. Note that Gitea's migration tool can import issues, but the "Issues" checkbox is disabled when "This repository will be a mirror" is enabled (it is for this repo).
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
939 Commits
1 Branch
1 Tag
83 MiB
Tree: 962ae89339
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '962ae89339'
${ noResults }
EnlivenMinetest/patches/deprecated/merged-in-poikilos-forks/travelnet-english-correctio...

400 lines
17 KiB
Raw Normal View History

make travelnet patches separate
6 years ago
diff --git a/elevator.lua b/elevator.lua
index a428845..b4f7a22 100644
--- a/elevator.lua
+++ b/elevator.lua
@@ -20,8 +20,8 @@ travelnet.show_nearest_elevator = function( pos, owner_name, param2 )
if( travelnet.targets[ owner_name ][ network_name ]
-- does the network have any members at all?
and next( travelnet.targets[ owner_name ][ network_name ], nil )) then
- minetest.chat_send_player( owner_name, S("This elevator will automaticly connect to the "..
- "other elevators you have placed at diffrent heights. Just enter a station name "..
+ minetest.chat_send_player( owner_name, S("This elevator will automatically connect to the "..
+ "other elevators you have placed at different heights. Just enter a station name "..
"and click on \"store\" to set it up. Or just punch it to set the height as station "..
"name."));
return;
@@ -106,11 +106,11 @@ minetest.register_node("travelnet:elevator", {
fixed = {
{ 0.48, -0.5,-0.5, 0.5, 0.5, 0.5},
- {-0.5 , -0.5, 0.48, 0.48, 0.5, 0.5},
+ {-0.5 , -0.5, 0.48, 0.48, 0.5, 0.5},
{-0.5, -0.5,-0.5 ,-0.48, 0.5, 0.5},
--groundplate to stand on
- { -0.5,-0.5,-0.5,0.5,-0.48, 0.5},
+ { -0.5,-0.5,-0.5,0.5,-0.48, 0.5},
},
},
@@ -128,7 +128,7 @@ minetest.register_node("travelnet:elevator", {
meta:set_string("station_network","");
meta:set_string("owner", placer:get_player_name() );
-- request initial data
- meta:set_string("formspec",
+ meta:set_string("formspec",
"size[12,10]"..
"field[0.3,5.6;6,0.7;station_name;"..S("Name of this station:")..";]"..
-- "field[0.3,6.6;6,0.7;station_network;Assign to Network:;]"..
@@ -140,7 +140,7 @@ minetest.register_node("travelnet:elevator", {
minetest.add_node(p, {name="travelnet:elevator_top", paramtype2="facedir", param2=p2})
travelnet.show_nearest_elevator( pos, placer:get_player_name(), p2 );
end,
-
+
on_receive_fields = travelnet.on_receive_fields,
on_punch = function(pos, node, puncher)
travelnet.update_formspec(pos, puncher:get_player_name())
@@ -164,7 +164,7 @@ minetest.register_node("travelnet:elevator", {
local node = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z});
-- leftover elevator_top nodes can be removed by placing a new elevator underneath
if( node ~= nil and node.name ~= "air" and node.name ~= 'travelnet:elevator_top') then
- minetest.chat_send_player( placer:get_player_name(), S('Not enough vertical space to place the travelnet box!'))
+ minetest.chat_send_player( placer:get_player_name(), S('There is not enough vertical space to place the travelnet box!'))
return;
end
return minetest.item_place(itemstack, placer, pointed_thing);
diff --git a/init.lua b/init.lua
index 46279bd..523333d 100644
--- a/init.lua
+++ b/init.lua
@@ -64,7 +64,7 @@
- removed nodes that are not intended for manual use from creative inventory
- improved naming of station levels for the elevator
21.06.13 - elevator stations are sorted by height instead of date of creation as is the case with travelnet boxes
- - elevator stations are named automaticly
+ - elevator stations are named automatically
20.06.13 - doors can be opened and closed from inside the travelnet box/elevator
- the elevator can only move vertically; the network name is defined by its x and z coordinate
13.06.13 - bugfix
@@ -78,7 +78,7 @@
- beam effect is disabled by default
20.03.13 - added inventory image provided by VanessaE
- fixed bug that made it impossible to remove stations from the net
- - if the station a player beamed to no longer exists, the station will be removed automaticly
+ - if the station a player beamed to no longer exists, the station will be removed automatically
- with the travelnet_attach priv, you can now attach your box to the nets of other players
- in newer versions of Minetest, the players yaw is set so that he/she looks out of the receiving box
- target list is now centered if there are less than 9 targets
@@ -100,8 +100,8 @@ local S = dofile(travelnet.path .. "/intllib.lua")
travelnet.S = S
-minetest.register_privilege("travelnet_attach", { description = S("allows to attach travelnet boxes to travelnets of other players"), give_to_singleplayer = false});
-minetest.register_privilege("travelnet_remove", { description = S("allows to dig travelnet boxes which belog to nets of other players"), give_to_singleplayer = false});
+minetest.register_privilege("travelnet_attach", { description = S("allows attaching travelnet boxes to travelnets of other players"), give_to_singleplayer = false});
+minetest.register_privilege("travelnet_remove", { description = S("allows breaking travelnet boxes which belong to networks of other players"), give_to_singleplayer = false});
-- read the configuration
dofile(travelnet.path.."/config.lua"); -- the normal, default travelnet
@@ -126,7 +126,7 @@ travelnet.restore_data = function()
local file = io.open( travelnet.mod_data_path, "r" );
if( not file ) then
- print(S("[Mod travelnet] Error: Savefile '%s' not found.")
+ print(S("[Mod travelnet] Error: Savefile '%s' was not found.")
:format(travelnet.mod_data_path));
return;
end
@@ -244,7 +244,7 @@ travelnet.reset_formspec = function( meta )
"button_exit[8.0,0.0;2.2,0.7;station_dig;"..S("Remove station").."]"..
"field[0.3,1.2;9,0.9;station_name;"..S("Name of this station")..":;"..
minetest.formspec_escape(station_name or "").."]"..
- "label[0.3,1.5;"..S("How do you call this place here? Example: \"my first house\", \"mine\", \"shop\"...").."]"..
+ "label[0.3,1.5;"..S("Name of this location (Example: \"my first house\", \"mine\", \"shop\"):").."]"..
"field[0.3,2.8;9,0.9;station_network;"..S("Assign to Network:")..";"..
minetest.formspec_escape(station_network or "").."]"..
@@ -292,7 +292,7 @@ travelnet.update_formspec = function( pos, puncher_name, fields )
travelnet.reset_formspec( meta );
- travelnet.show_message( pos, puncher_name, "Error", S("Update failed! Resetting this box on the travelnet."));
+ travelnet.show_message( pos, puncher_name, "Error", S("Update failed! Resetting...."));
return;
end
@@ -490,7 +490,7 @@ travelnet.update_formspec = function( pos, puncher_name, fields )
meta:set_string( "infotext", S("Station '%s'"):format(tostring( station_name )).." "..
S("on travelnet '%s'"):format(tostring( station_network )).." "..
S("(owned by %s)"):format(tostring( owner_name )).." "..
- S("ready for usage. Right-click to travel, punch to update."));
+ S("is ready. Right-click to travel, punch to update."));
-- show the player the updated formspec
travelnet.show_current_formspec( pos, meta, puncher_name );
@@ -521,7 +521,7 @@ travelnet.add_target = function( station_name, network_name, pos, player_name, m
if( network_name == "" or not( network_name )) then
travelnet.show_message( pos, player_name, S("Error"),
- S("Please provide the name of the network this station ought to be connected to."));
+ S("Please provide a new or existing network to which this station should connect."));
return;
end
@@ -534,15 +534,15 @@ travelnet.add_target = function( station_name, network_name, pos, player_name, m
elseif( not( minetest.check_player_privs(player_name, {interact=true}))) then
travelnet.show_message( pos, player_name, S("Error"),
- S("There is no player with interact privilege named '%s'. Aborting."):format(tostring( player_name )));
+ S("Access has been denied. There is no player with interact privilege named '%s'."):format(tostring( player_name )));
return;
elseif( not( minetest.check_player_privs(player_name, {travelnet_attach=true}))
and not( travelnet.allow_attach( player_name, owner_name, network_name ))) then
travelnet.show_message( pos, player_name, S("Error"),
- S("You do not have the travelnet_attach priv which is required to attach your box to "..
- "the network of someone else. Aborting."));
+ S("Access has been denied. You do not have the travelnet_attach priv which is required to attach your box to "..
+ "the network of someone else."));
return;
end
@@ -562,7 +562,7 @@ travelnet.add_target = function( station_name, network_name, pos, player_name, m
if( k == station_name ) then
travelnet.show_message( pos, player_name, S("Error"),
- S("A station named '%s' already exists on this network. Please choose a diffrent name!"):format(station_name));
+ S("A station named '%s' already exists on this network. Please choose a different name!"):format(station_name));
return;
end
@@ -574,7 +574,7 @@ travelnet.add_target = function( station_name, network_name, pos, player_name, m
travelnet.show_message( pos, player_name, S("Error"),
S("Network '%s',"):format(network_name).." "..
S("already contains the maximum number (=%s) of allowed stations per network. "..
- "Please choose a diffrent/new network name."):format(travelnet.MAX_STATIONS_PER_NETWORK));
+ "Please choose a different/new network name."):format(travelnet.MAX_STATIONS_PER_NETWORK));
return;
end
@@ -752,7 +752,7 @@ travelnet.on_receive_fields = function(pos, formname, fields, player)
end
if( not( fields.target )) then
- minetest.chat_send_player(name, S("Please click on the target you want to travel to."));
+ minetest.chat_send_player(name, S("Choose a destination."));
return;
end
@@ -912,7 +912,7 @@ travelnet.remove_box = function( pos, oldnode, oldmetadata, digger )
if( not( oldmetadata ) or oldmetadata=="nil" or not(oldmetadata.fields)) then
minetest.chat_send_player( digger:get_player_name(), S("Error")..": "..
- S("Could not find information about the station that is to be removed."));
+ S("Travelnet could not find information about the station that is to be removed."));
return;
end
@@ -928,7 +928,7 @@ travelnet.remove_box = function( pos, oldnode, oldmetadata, digger )
or not( travelnet.targets[ owner_name ][ station_network ] )) then
minetest.chat_send_player( digger:get_player_name(), S("Error")..": "..
- S("Could not find the station that is to be removed."));
+ S("Travelnet could not find the station that is to be removed."));
return;
end
@@ -979,7 +979,7 @@ travelnet.can_dig_old = function( pos, player, description )
end
if( not( meta ) or not( owner) or owner=='') then
- minetest.chat_send_player(name, S("This %s has not been configured yet. Please set it up first to claim it. Afterwards you can remove it because you are then the owner."):format(description));
+ minetest.chat_send_player(name, S("This %s has not been configured yet. Please set it up first to claim it. You can only remove stations you own."):format(description));
return false;
elseif( owner ~= name ) then
@@ -1033,7 +1033,7 @@ if( travelnet.enable_elevator ) then
dofile(travelnet.path.."/elevator.lua"); -- allows up/down transfers only
end
if( travelnet.enable_doors ) then
- dofile(travelnet.path.."/doors.lua"); -- doors that open and close automaticly when the travelnet or elevator is used
+ dofile(travelnet.path.."/doors.lua"); -- doors that open and close automatically when the travelnet or elevator is used
end
if( travelnet.enable_abm ) then
diff --git a/locale/template.pot b/locale/template.pot
index 86e0e5c..f9052c9 100644
--- a/locale/template.pot
+++ b/locale/template.pot
@@ -34,8 +34,8 @@ msgstr ""
#: elevator.lua
msgid ""
-"This elevator will automaticly connect to the other elevators you have "
-"placed at diffrent heights. Just enter a station name and click on \"store\" "
+"This elevator will automatically connect to the other elevators you have "
+"placed at different heights. Just enter a station name and click on \"store\" "
"to set it up. Or just punch it to set the height as station name."
msgstr ""
@@ -96,15 +96,15 @@ msgid "Store"
msgstr ""
#: elevator.lua travelnet.lua
-msgid "Not enough vertical space to place the travelnet box!"
+msgid "There is not enough vertical space to place the travelnet box!"
msgstr ""
#: init.lua
-msgid "allows to attach travelnet boxes to travelnets of other players"
+msgid "allows attaching travelnet boxes to travelnets of other players"
msgstr ""
#: init.lua
-msgid "allows to dig travelnet boxes which belog to nets of other players"
+msgid "allows breaking travelnet boxes which belong to networks of other players"
msgstr ""
#: init.lua
@@ -114,7 +114,7 @@ msgstr ""
#: init.lua
#, lua-format
-msgid "[Mod travelnet] Error: Savefile '%s' not found."
+msgid "[Mod travelnet] Error: Savefile '%s' was not found."
msgstr ""
#: init.lua
@@ -139,8 +139,8 @@ msgstr ""
#: init.lua
msgid ""
-"How do you call this place here? Example: \"my first house\", \"mine\", "
-"\"shop\"..."
+"Name of this location (Example: \"my first house\", \"mine\", "
+"\"shop\"):"
msgstr ""
#: init.lua
@@ -169,7 +169,7 @@ msgid "Save"
msgstr ""
#: init.lua
-msgid "Update failed! Resetting this box on the travelnet."
+msgid "Update failed! Resetting...."
msgstr ""
#: init.lua
@@ -237,7 +237,7 @@ msgid "(owned by %s)"
msgstr ""
#: init.lua
-msgid "ready for usage. Right-click to travel, punch to update."
+msgid "is ready. Right-click to travel, punch to update."
msgstr ""
#: init.lua
@@ -255,25 +255,25 @@ msgstr ""
#: init.lua
msgid ""
-"Please provide the name of the network this station ought to be connected to."
+"Please provide a new or existing network to which this station should connect."
msgstr ""
#: init.lua
#, lua-format
-msgid "There is no player with interact privilege named '%s'. Aborting."
+msgid "Access has been denied. There is no player with interact privilege named '%s'."
msgstr ""
#: init.lua
msgid ""
-"You do not have the travelnet_attach priv which is required to attach your "
-"box to the network of someone else. Aborting."
+"Access has been denied. You do not have the travelnet_attach priv which is required to attach your "
+"box to the network of someone else."
msgstr ""
#: init.lua
#, lua-format
msgid ""
"A station named '%s' already exists on this network. Please choose a "
-"diffrent name!"
+"different name!"
msgstr ""
#: init.lua
@@ -285,7 +285,7 @@ msgstr ""
#, lua-format
msgid ""
"already contains the maximum number (=%s) of allowed stations per network. "
-"Please choose a diffrent/new network name."
+"Please choose a different/new network name."
msgstr ""
#: init.lua
@@ -311,7 +311,7 @@ msgid "No help available yet."
msgstr ""
#: init.lua
-msgid "Please click on the target you want to travel to."
+msgid "Choose a destination."
msgstr ""
#: init.lua
@@ -332,11 +332,11 @@ msgid "Initiating transfer to station '%s'."
msgstr ""
#: init.lua
-msgid "Could not find information about the station that is to be removed."
+msgid "Travelnet could not find information about the station that is to be removed."
msgstr ""
#: init.lua
-msgid "Could not find the station that is to be removed."
+msgid "Travelnet could not find the station that is to be removed."
msgstr ""
#: init.lua
@@ -348,7 +348,7 @@ msgstr ""
#, lua-format
msgid ""
"This %s has not been configured yet. Please set it up first to claim it. "
-"Afterwards you can remove it because you are then the owner."
+"You can only remove stations you own."
msgstr ""
#: init.lua
diff --git a/travelnet.lua b/travelnet.lua
index 9fba7fe..4319d3e 100644
--- a/travelnet.lua
+++ b/travelnet.lua
@@ -25,13 +25,13 @@ minetest.register_node("travelnet:travelnet", {
fixed = {
{ 0.45, -0.5,-0.5, 0.5, 1.45, 0.5},
- {-0.5 , -0.5, 0.45, 0.45, 1.45, 0.5},
+ {-0.5 , -0.5, 0.45, 0.45, 1.45, 0.5},
{-0.5, -0.5,-0.5 ,-0.45, 1.45, 0.5},
--groundplate to stand on
- { -0.5,-0.5,-0.5,0.5,-0.45, 0.5},
+ { -0.5,-0.5,-0.5,0.5,-0.45, 0.5},
--roof
- { -0.5, 1.45,-0.5,0.5, 1.5, 0.5},
+ { -0.5, 1.45,-0.5,0.5, 1.5, 0.5},
-- control panel
-- { -0.2, 0.6, 0.3, 0.2, 1.1, 0.5},
@@ -52,7 +52,7 @@ minetest.register_node("travelnet:travelnet", {
travelnet.reset_formspec( meta );
meta:set_string("owner", placer:get_player_name() );
end,
-
+
on_receive_fields = travelnet.on_receive_fields,
on_punch = function(pos, node, puncher)
travelnet.update_formspec(pos, puncher:get_player_name(), nil)
@@ -78,7 +78,7 @@ minetest.register_node("travelnet:travelnet", {
minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name]
if not def or not def.buildable_to then
- minetest.chat_send_player( placer:get_player_name(), S('Not enough vertical space to place the travelnet box!'))
+ minetest.chat_send_player( placer:get_player_name(), S('There is not enough vertical space to place the travelnet box!'))
return;
end
return minetest.item_place(itemstack, placer, pointed_thing);