From 6623dec5674c4738aaa623783bf413a581c74233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= <34514239+appgurueu@users.noreply.github.com> Date: Mon, 17 Jan 2022 21:49:28 +0100 Subject: [PATCH 01/11] Redo player_api (#2745) --- game_api.txt | 26 +++---- mods/beds/functions.lua | 2 - mods/player_api/api.lua | 159 +++++++++++++++++++++++++++------------ mods/player_api/init.lua | 14 +--- mods/player_api/mod.conf | 2 +- 5 files changed, 128 insertions(+), 75 deletions(-) diff --git a/game_api.txt b/game_api.txt index b47b0c5d..6a013224 100644 --- a/game_api.txt +++ b/game_api.txt @@ -449,13 +449,13 @@ The player API can register player models and update the player's appearance. * `player_api.set_model(player, model_name)` * Change a player's model * `player`: PlayerRef - * `model_name`: model registered with player_api.register_model() + * `model_name`: model registered with `player_api.register_model` * `player_api.set_animation(player, anim_name, speed)` - * Applies an animation to a player + * Applies an animation to a player if speed or anim_name differ from the currently playing animation * `player`: PlayerRef * `anim_name`: name of the animation - * `speed`: frames per second. If nil, the default from the model def is used + * `speed`: keyframes per second. If nil, the default from the model def is used * `player_api.set_textures(player, textures)` * Sets player textures @@ -477,18 +477,18 @@ The player API can register player models and update the player's appearance. ### Model Definition { - animation_speed = 30, -- Default animation speed, in FPS - textures = {"character.png", }, -- Default array of textures - visual_size = {x = 1, y = 1}, -- Used to scale the model + animation_speed = 30, -- Default animation speed, in keyframes per second + textures = {"character.png"}, -- Default array of textures animations = { - -- = {x = , y = }, - foo = {x = 0, y = 19}, - bar = {x = 20, y = 39}, - -- ... + -- [anim_name] = {x = , y = , collisionbox = model collisionbox, eye_height = model eye height}, + stand = ..., lay = ..., walk = ..., mine = ..., walk_mine = ..., -- required animations + sit = ... -- used by boats and other MTG mods }, - collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, -- In nodes from feet position - stepheight = 0.6, -- In nodes - eye_height = 1.47, -- In nodes above feet position + -- Default object properties, see lua_api.txt + visual_size = {x = 1, y = 1}, + collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, + stepheight = 0.6, + eye_height = 1.47 } diff --git a/mods/beds/functions.lua b/mods/beds/functions.lua index ddac52be..409aa376 100644 --- a/mods/beds/functions.lua +++ b/mods/beds/functions.lua @@ -116,8 +116,6 @@ local function lay_down(player, pos, bed_pos, state, skip) beds.bed_position[name] = bed_pos beds.player[name] = {physics_override = player:get_physics_override()} - -- physics, eye_offset, etc - player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0}) local yaw, param2 = get_look_yaw(bed_pos) player:set_look_horizontal(yaw) local dir = minetest.facedir_to_dir(param2) diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index 0aee048e..f341e6ea 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -1,54 +1,88 @@ --- Minetest 0.4 mod: player --- See README.txt for licensing and other information. - player_api = {} -- Player animation blending -- Note: This is currently broken due to a bug in Irrlicht, leave at 0 local animation_blend = 0 -player_api.registered_models = { } +player_api.registered_models = {} -- Local for speed. local models = player_api.registered_models +local function collisionbox_equals(collisionbox, other_collisionbox) + if collisionbox == other_collisionbox then + return true + end + for index = 1, 6 do + if collisionbox[index] ~= other_collisionbox[index] then + return false + end + end + return true +end + function player_api.register_model(name, def) models[name] = def + def.visual_size = def.visual_size or {x = 1, y = 1} + def.collisionbox = def.collisionbox or {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3} + def.stepheight = def.stepheight or 0.6 + def.eye_height = def.eye_height or 1.47 + + -- Sort animations into property classes: + -- Animations with same properties have the same _equals value + for animation_name, animation in pairs(def.animations) do + animation.eye_height = animation.eye_height or def.eye_height + animation.collisionbox = animation.collisionbox or def.collisionbox + for _, other_animation in pairs(def.animations) do + if other_animation._equals then + if collisionbox_equals(animation.collisionbox, other_animation.collisionbox) + and animation.eye_height == other_animation.eye_height then + animation._equals = other_animation._equals + break + end + end + end + animation._equals = animation._equals or animation_name + end end -- Player stats and animations -local player_model = {} -local player_textures = {} -local player_anim = {} -local player_sneak = {} +-- model, textures, animation +local players = {} player_api.player_attached = {} +local function get_player_data(player) + return assert(players[player:get_player_name()]) +end + function player_api.get_animation(player) - local name = player:get_player_name() - return { - model = player_model[name], - textures = player_textures[name], - animation = player_anim[name], - } + return get_player_data(player) end -- Called when a player's appearance needs to be updated function player_api.set_model(player, model_name) - local name = player:get_player_name() + local player_data = get_player_data(player) + if player_data.model == model_name then + return + end local model = models[model_name] if model then - if player_model[name] == model_name then - return - end player:set_properties({ mesh = model_name, - textures = player_textures[name] or model.textures, + textures = player_data.textures or model.textures, visual = "mesh", - visual_size = model.visual_size or {x = 1, y = 1}, - collisionbox = model.collisionbox or {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, - stepheight = model.stepheight or 0.6, - eye_height = model.eye_height or 1.47, + visual_size = model.visual_size, + stepheight = model.stepheight }) + local animations = model.animations + player:set_local_animation( + animations.stand, + animations.walk, + animations.mine, + animations.walk_mine, + model.animation_speed or 30 + ) + -- sets collisionbox & eye_height player_api.set_animation(player, "stand") else player:set_properties({ @@ -60,37 +94,61 @@ function player_api.set_model(player, model_name) eye_height = 1.625, }) end - player_model[name] = model_name + player_data.model = model_name +end + +function player_api.get_textures(player) + local player_data = get_player_data(player) + local model = models[player_data.model] + return assert(player_data.textures or (model and model.textures)) end function player_api.set_textures(player, textures) - local name = player:get_player_name() - local model = models[player_model[name]] - local model_textures = model and model.textures or nil - player_textures[name] = textures or model_textures - player:set_properties({textures = textures or model_textures}) + local player_data = get_player_data(player) + local model = models[player_data.model] + local new_textures = assert(textures or (model and model.textures)) + player_data.textures = new_textures + player:set_properties({textures = new_textures}) +end + +function player_api.set_texture(player, index, texture) + local textures = table.copy(player_api.get_textures(player)) + textures[index] = texture + player_api.set_textures(player, textures) end function player_api.set_animation(player, anim_name, speed) - local name = player:get_player_name() - if player_anim[name] == anim_name then - return - end - local model = player_model[name] and models[player_model[name]] + local player_data = get_player_data(player) + local model = models[player_data.model] if not (model and model.animations[anim_name]) then return end + speed = speed or model.animation_speed + if player_data.animation == anim_name and player_data.animation_speed == speed then + return + end + local previous_anim_equals = (model.animations[player_data.animation] or {})._equals local anim = model.animations[anim_name] - player_anim[name] = anim_name - player:set_animation(anim, speed or model.animation_speed, animation_blend) + player_data.animation = anim_name + player_data.animation_speed = speed + player:set_animation(anim, speed, animation_blend) + if anim._equals ~= previous_anim_equals then + player:set_properties({ + collisionbox = anim.collisionbox, + eye_height = anim.eye_height + }) + end end +minetest.register_on_joinplayer(function(player) + local name = player:get_player_name() + players[name] = {} + player_api.player_attached[name] = false +end) + minetest.register_on_leaveplayer(function(player) local name = player:get_player_name() - player_model[name] = nil - player_anim[name] = nil - player_textures[name] = nil - player_sneak[name] = nil + players[name] = nil player_api.player_attached[name] = nil end) @@ -111,8 +169,8 @@ end minetest.register_globalstep(function() for _, player in pairs(minetest.get_connected_players()) do local name = player:get_player_name() - local model_name = player_model[name] - local model = model_name and models[model_name] + local player_data = players[name] + local model = models[player_data.model] if model and not player_attached[name] then local controls = player:get_player_control() local animation_speed_mod = model.animation_speed or 30 @@ -125,12 +183,7 @@ minetest.register_globalstep(function() -- Apply animations based on what the player is doing if player:get_hp() == 0 then player_set_animation(player, "lay") - -- Determine if the player is walking elseif controls.up or controls.down or controls.left or controls.right then - if player_sneak[name] ~= controls.sneak then - player_anim[name] = nil - player_sneak[name] = controls.sneak - end if controls.LMB or controls.RMB then player_set_animation(player, "walk_mine", animation_speed_mod) else @@ -144,3 +197,15 @@ minetest.register_globalstep(function() end end end) + +for _, api_function in pairs({"get_animation", "set_animation", "set_model", "set_textures"}) do + local original_function = player_api[api_function] + player_api[api_function] = function(player, ...) + if not players[player:get_player_name()] then + -- HACK for keeping backwards compatibility + minetest.log("warning", api_function .. " called on offline player") + return + end + original_function(player, ...) + end +end diff --git a/mods/player_api/init.lua b/mods/player_api/init.lua index 1176b0ea..6bc3c821 100644 --- a/mods/player_api/init.lua +++ b/mods/player_api/init.lua @@ -1,5 +1,3 @@ --- player/init.lua - dofile(minetest.get_modpath("player_api") .. "/api.lua") -- Default player appearance @@ -9,11 +7,11 @@ player_api.register_model("character.b3d", { animations = { -- Standard animations. stand = {x = 0, y = 79}, - lay = {x = 162, y = 166}, + lay = {x = 162, y = 166, collisionbox = {-0.6, 0.0, -0.6, 0.6, 0.3, 0.6}, eye_height = 0.3}, walk = {x = 168, y = 187}, mine = {x = 189, y = 198}, walk_mine = {x = 200, y = 219}, - sit = {x = 81, y = 160}, + sit = {x = 81, y = 160, collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.0, 0.3}, eye_height = 0.8} }, collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, stepheight = 0.6, @@ -22,13 +20,5 @@ player_api.register_model("character.b3d", { -- Update appearance when the player joins minetest.register_on_joinplayer(function(player) - player_api.player_attached[player:get_player_name()] = false player_api.set_model(player, "character.b3d") - player:set_local_animation( - {x = 0, y = 79}, - {x = 168, y = 187}, - {x = 189, y = 198}, - {x = 200, y = 219}, - 30 - ) end) diff --git a/mods/player_api/mod.conf b/mods/player_api/mod.conf index 198b86dc..bf62327b 100644 --- a/mods/player_api/mod.conf +++ b/mods/player_api/mod.conf @@ -1,2 +1,2 @@ name = player_api -description = Minetest Game mod: player_api +description = Minetest Game mod: Manages player visuals From acc918436afec1a629891e8d95cf3b3621728a31 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 18 Jan 2022 19:18:44 +0100 Subject: [PATCH 02/11] Override local_animation settings for certain animations This makes the lay/sit animation work on the local client (in third-person). --- game_api.txt | 15 ++++++++++++++- mods/player_api/api.lua | 36 ++++++++++++++++++++++++------------ mods/player_api/init.lua | 6 ++++-- 3 files changed, 42 insertions(+), 15 deletions(-) diff --git a/game_api.txt b/game_api.txt index 6a013224..0495b29b 100644 --- a/game_api.txt +++ b/game_api.txt @@ -462,6 +462,12 @@ The player API can register player models and update the player's appearance. * `player`: PlayerRef * `textures`: array of textures. If nil, the default from the model def is used +* `player_api.set_textures(player, index, texture)` + * Sets one of the player textures + * `player`: PlayerRef + * `index`: Index into array of all textures + * `texture`: the texture string + * `player_api.get_animation(player)` * Returns a table containing fields `model`, `textures` and `animation` * Any of the fields of the returned table may be nil @@ -480,7 +486,14 @@ The player API can register player models and update the player's appearance. animation_speed = 30, -- Default animation speed, in keyframes per second textures = {"character.png"}, -- Default array of textures animations = { - -- [anim_name] = {x = , y = , collisionbox = model collisionbox, eye_height = model eye height}, + -- [anim_name] = { + -- x = , + -- y = , + -- collisionbox = , -- (optional) + -- eye_height = , -- (optional) + -- -- suspend client side animations while this one is active (optional) + -- override_local = + -- }, stand = ..., lay = ..., walk = ..., mine = ..., walk_mine = ..., -- required animations sit = ... -- used by boats and other MTG mods }, diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua index f341e6ea..d7aab4ed 100644 --- a/mods/player_api/api.lua +++ b/mods/player_api/api.lua @@ -33,6 +33,8 @@ function player_api.register_model(name, def) for animation_name, animation in pairs(def.animations) do animation.eye_height = animation.eye_height or def.eye_height animation.collisionbox = animation.collisionbox or def.collisionbox + animation.override_local = animation.override_local or false + for _, other_animation in pairs(def.animations) do if other_animation._equals then if collisionbox_equals(animation.collisionbox, other_animation.collisionbox) @@ -65,6 +67,8 @@ function player_api.set_model(player, model_name) if player_data.model == model_name then return end + player_data.model = model_name + local model = models[model_name] if model then player:set_properties({ @@ -74,15 +78,7 @@ function player_api.set_model(player, model_name) visual_size = model.visual_size, stepheight = model.stepheight }) - local animations = model.animations - player:set_local_animation( - animations.stand, - animations.walk, - animations.mine, - animations.walk_mine, - model.animation_speed or 30 - ) - -- sets collisionbox & eye_height + -- sets local_animation, collisionbox & eye_height player_api.set_animation(player, "stand") else player:set_properties({ @@ -94,7 +90,6 @@ function player_api.set_model(player, model_name) eye_height = 1.625, }) end - player_data.model = model_name end function player_api.get_textures(player) @@ -127,12 +122,29 @@ function player_api.set_animation(player, anim_name, speed) if player_data.animation == anim_name and player_data.animation_speed == speed then return end - local previous_anim_equals = (model.animations[player_data.animation] or {})._equals + local previous_anim = model.animations[player_data.animation] or {} local anim = model.animations[anim_name] player_data.animation = anim_name player_data.animation_speed = speed + -- If necessary change the local animation (only seen by the client of *that* player) + -- `override_local` <=> suspend local animations while this one is active + -- (this is basically a hack, proper engine feature needed...) + if anim.override_local ~= previous_anim.override_local then + if anim.override_local then + local none = {x=0, y=0} + player:set_local_animation(none, none, none, none, 1) + else + local a = model.animations -- (not specific to the animation being set) + player:set_local_animation( + a.stand, a.walk, a.mine, a.walk_mine, + model.animation_speed or 30 + ) + end + end + -- Set the animation seen by everyone else player:set_animation(anim, speed, animation_blend) - if anim._equals ~= previous_anim_equals then + -- Update related properties if they changed + if anim._equals ~= previous_anim._equals then player:set_properties({ collisionbox = anim.collisionbox, eye_height = anim.eye_height diff --git a/mods/player_api/init.lua b/mods/player_api/init.lua index 6bc3c821..f258aea7 100644 --- a/mods/player_api/init.lua +++ b/mods/player_api/init.lua @@ -7,11 +7,13 @@ player_api.register_model("character.b3d", { animations = { -- Standard animations. stand = {x = 0, y = 79}, - lay = {x = 162, y = 166, collisionbox = {-0.6, 0.0, -0.6, 0.6, 0.3, 0.6}, eye_height = 0.3}, + lay = {x = 162, y = 166, eye_height = 0.3, override_local = true, + collisionbox = {-0.6, 0.0, -0.6, 0.6, 0.3, 0.6}}, walk = {x = 168, y = 187}, mine = {x = 189, y = 198}, walk_mine = {x = 200, y = 219}, - sit = {x = 81, y = 160, collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.0, 0.3}, eye_height = 0.8} + sit = {x = 81, y = 160, eye_height = 0.8, override_local = true, + collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.0, 0.3}} }, collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.7, 0.3}, stepheight = 0.6, From 760581b330d82eef16b3b657eb501ad68e275551 Mon Sep 17 00:00:00 2001 From: Yad <97409381+OCRenkist@users.noreply.github.com> Date: Sun, 23 Jan 2022 12:07:10 -0500 Subject: [PATCH 03/11] Copyedit `README.md` & `game.conf` (#2919) --- README.md | 26 ++++++++++++-------------- game.conf | 6 +++--- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index a88d83c7..099a7e03 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,29 @@ # Minetest Game -The default game bundled in the Minetest engine. +The default game bundled in the Minetest engine. -For further information, check -[this forum topic](https://forum.minetest.net/viewtopic.php?f=15&t=9724). -Also see the [Minetest Wiki](https://wiki.minetest.net/Subgames/Minetest_Game) -for more information. +For further information, check [this forum topic](https://forum.minetest.net/viewtopic.php?f=15&t=9724). + +Also see the [Minetest Wiki](https://wiki.minetest.net/Subgames/Minetest_Game) for more information. ## Installation -- Unzip the archive, rename the folder to minetest_game and -place it in .. minetest/games/ +- Unzip the archive, rename the folder to `minetest_game` and +place it in .. `minetest/games/` -- GNU/Linux: If you use a system-wide installation place - it in ~/.minetest/games/. +- GNU/Linux: If you use a system-wide installation place it in `~/.minetest/games/`. The Minetest engine can be found at [GitHub](https://github.com/minetest/minetest). -For further information or help, see: -https://wiki.minetest.net/Installing_Mods +For further information or help, see: [Installing Mods](https://wiki.minetest.net/Installing_Mods). ## Compatibility -The Minetest Game GitHub master HEAD is generally compatible with the GitHub -master HEAD of the Minetest engine. +The Minetest Game GitHub `master` `HEAD` is generally compatible with the GitHub +`master` `HEAD` of the Minetest engine. + Additionally, when the Minetest engine is tagged to be a certain version (e.g. -0.4.10), Minetest Game is tagged with the version too. +`0.4.10`), Minetest Game is tagged with the version, too. When stable releases are made, Minetest Game and the Minetest engine is packaged and made available at [www.minetest.net](https://www.minetest.net/downloads/). diff --git a/game.conf b/game.conf index 7c8ac2c4..02b585cd 100644 --- a/game.conf +++ b/game.conf @@ -1,3 +1,3 @@ -name = Minetest Game -author = Minetest -description = A basic exploration, mining, crafting and building sandbox game with no NPCs, monsters or animals. Minetest Game is usually used with mods added and many mods are available for this game. Reliably maintained by Minetest Engine core developers. +name = Minetest Game +author = Minetest +description = A basic exploration, mining, crafting, and building, sandbox game with no NPCs, monsters, or animals. Minetest Game is usually used with mods added, and many mods are available for this game. Reliably maintained by Minetest Engine core developers. From 0c1252bcf540d6d6582f3cae8fbabbc5845fdf04 Mon Sep 17 00:00:00 2001 From: paramat Date: Sun, 8 Nov 2020 15:43:04 +0000 Subject: [PATCH 04/11] Balance sounds, remove silent water footstep --- mods/default/README.txt | 1 - mods/default/functions.lua | 18 +++++++++++------- mods/default/furnace.lua | 6 +++--- mods/default/item_entity.lua | 1 + .../sounds/default_water_footstep.4.ogg | Bin 3974 -> 0 bytes mods/default/torch.lua | 2 +- mods/farming/api.lua | 2 +- mods/fire/init.lua | 2 +- mods/tnt/init.lua | 4 ++-- 9 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 mods/default/sounds/default_water_footstep.4.ogg diff --git a/mods/default/README.txt b/mods/default/README.txt index 8b215d83..e848f906 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -299,7 +299,6 @@ https://www.freesound.org/people/AGFX/packs/1253/ default_water_footstep.1.ogg default_water_footstep.2.ogg default_water_footstep.3.ogg -(default_water_footstep.4.ogg is silent) blukotek (CC0 1.0): https://www.freesound.org/people/blukotek/sounds/251660/ diff --git a/mods/default/functions.lua b/mods/default/functions.lua index 1e46c45e..4d89a384 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -16,7 +16,7 @@ end function default.node_sound_stone_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_hard_footstep", gain = 0.3} + {name = "default_hard_footstep", gain = 0.2} table.dug = table.dug or {name = "default_hard_footstep", gain = 1.0} default.node_sound_defaults(table) @@ -26,7 +26,9 @@ end function default.node_sound_dirt_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_dirt_footstep", gain = 0.4} + {name = "default_dirt_footstep", gain = 0.25} + table.dig = table.dig or + {name = "default_dig_crumbly", gain = 0.4} table.dug = table.dug or {name = "default_dirt_footstep", gain = 1.0} table.place = table.place or @@ -50,7 +52,7 @@ end function default.node_sound_gravel_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_gravel_footstep", gain = 0.1} + {name = "default_gravel_footstep", gain = 0.25} table.dig = table.dig or {name = "default_gravel_dig", gain = 0.35} table.dug = table.dug or @@ -64,7 +66,9 @@ end function default.node_sound_wood_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_wood_footstep", gain = 0.3} + {name = "default_wood_footstep", gain = 0.15} + table.dig = table.dig or + {name = "default_dig_choppy", gain = 0.4} table.dug = table.dug or {name = "default_wood_footstep", gain = 1.0} default.node_sound_defaults(table) @@ -98,7 +102,7 @@ end function default.node_sound_ice_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_ice_footstep", gain = 0.3} + {name = "default_ice_footstep", gain = 0.15} table.dig = table.dig or {name = "default_ice_dig", gain = 0.5} table.dug = table.dug or @@ -110,7 +114,7 @@ end function default.node_sound_metal_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_metal_footstep", gain = 0.4} + {name = "default_metal_footstep", gain = 0.2} table.dig = table.dig or {name = "default_dig_metal", gain = 0.5} table.dug = table.dug or @@ -155,7 +159,7 @@ default.cool_lava = function(pos, node) minetest.set_node(pos, {name = "default:stone"}) end minetest.sound_play("default_cool_lava", - {pos = pos, max_hear_distance = 16, gain = 0.25}, true) + {pos = pos, max_hear_distance = 16, gain = 0.2}, true) end if minetest.settings:get_bool("enable_lavacooling") ~= false then diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua index b164b8a0..e6b90b82 100644 --- a/mods/default/furnace.lua +++ b/mods/default/furnace.lua @@ -159,7 +159,7 @@ local function furnace_node_timer(pos, elapsed) end -- Play cooling sound minetest.sound_play("default_cool_lava", - {pos = pos, max_hear_distance = 16, gain = 0.1}, true) + {pos = pos, max_hear_distance = 16, gain = 0.07}, true) else -- Item could not be cooked: probably missing fuel update = true @@ -252,9 +252,9 @@ local function furnace_node_timer(pos, elapsed) result = true -- Play sound every 5 seconds while the furnace is active - if timer_elapsed == 0 or (timer_elapsed+1) % 5 == 0 then + if timer_elapsed == 0 or (timer_elapsed + 1) % 5 == 0 then minetest.sound_play("default_furnace_active", - {pos = pos, max_hear_distance = 16, gain = 0.5}, true) + {pos = pos, max_hear_distance = 16, gain = 0.25}, true) end else if fuellist and not fuellist[1]:is_empty() then diff --git a/mods/default/item_entity.lua b/mods/default/item_entity.lua index 25fb8328..3e6cc9db 100644 --- a/mods/default/item_entity.lua +++ b/mods/default/item_entity.lua @@ -19,6 +19,7 @@ local item = { self.object:remove() minetest.sound_play("default_item_smoke", { pos = p, + gain = 1.0, max_hear_distance = 8, }, true) minetest.add_particlespawner({ diff --git a/mods/default/sounds/default_water_footstep.4.ogg b/mods/default/sounds/default_water_footstep.4.ogg deleted file mode 100644 index 6f1eab8245fdc475451e6eb98186bd6db141fbfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3974 zcmai1eN5Er;Uhs42?Z)t=xJ-!1Vltc30m8uRs|JzyIb4ZJ^iCQ??tWK-P7K4b93LF zduQ&<{AS*~%{e(KXbyVPdg7CL)YR7dS^;AzqvS2MB3DB#FmxYNf6(4$(0?Zxo2iq} z8g-JQTweUncFww=|Eryw>tPfQ^liDjcfGP%orC4)D$;27m=udxDPAdtj)kUV?b@N; zsVvmy*;_+W-mg>3+X~xhW2S`-k2nZ7h+JiNOCu=Ig0sIC*PE?PJjP$R$<49 z4pre8E@Uo9pNGIQ(eZ+EE=diFNa^+@1GOxdG~UMBmc7*WwWMvXzM^vu%BD<$vFexM_3hG* zoq1ik&HcNM_ZOV+4LjeM$SL!ovuB8cl{d)sY)Dkwcn4Lf=@t;hZt?!gq-;Jaq!)c7&qEd}k5=99V-4zpReh zs#!OsNtyyvP!{>^wwJ~WC?YtrvoTM{TvfM&Hj56}@>-ee*&a!-p|bT3W*Rp=x*+j0 z-EFaPn=gM}mD(IKU~6ioJ(xchbQ^q$j~sTk93D4m#-wbM)ic}U-|XYCO~6{vjM>i> zv;+3#PMCab*S5jg^l{Vlu>mg3s*KGceFLc;eotUw`?GoMbIC0@QT0W$YJimqvwvrs z|8aput^FE4(crfoS9z`@`>;}jw}LC^5Hu_;KH%5TA|A#qOKT0U6SlG~WKf8;cpt4f zhLD~^qxk7SL)n93OMSIyB=p14i1T68(0OKT?QHiM&U&^OP#hKoD6Z|BeqYliiC0*W=ny$^>fq-h=aiVg9-^r? zEa{O)$90#$pv7@7KJNg8PSvp!=sc24hEI}FlVrFob=_}A3{WQ{lP*VsVGkh`gwS$u zvYu0|u8S>Pw~Z;D4xZO4@oqiK(;wxmVoMe*E3S(PS$DEta)$lrCKu=p%bJtjTZvSCcjI$|7_gjgFUqnpezsl1jd`zla2*{{4F z_}G0?Vs&=Zebi2DCv*`(|BreTrwQQ5pYw-K7aY zO-Z`8NG9u-UHiU3)>wM0SeCg}dF`<*J@CDZsq$Mtl-}Y|oTnzWK;7Y1?)XT1BQ)2P zo7Z;CZVI*AZT9{GdzT}l?Vi2OKGK_G@9G@s{or_4{wz?tj@f&|?DnwZy`4YV!)E)B z*#{jXz1_`S$7lP$nSUm1c5t`7tLu30Ly9`+m~|D+4z7H+13%w!{K24YaIkQ8uxPZu zfZuL^@Tuth>F$xSLE6HtI;%yfH6sfHbSXnKB352+xn^7os^WlWWKSPSUxG4qUF4J-s2CU9e z!f6?In~cEfa9KS;I1bg5qvi&RRhfa1;{EkRBHW4~ddf+8zSwOh^P}Kaz^b0e4|mBk z68p3q`F#3Tj=nTip2G#gg;rhy(bE^GDilw@MC3Xs;WlSrh5>}9sG>UDc@!a|V4d5f zAsp^2WGxV~3O<=Mz4Oge%@uj!F1Nx#2^aMost4iIU&w1D#t8+mswZpUL`MEVM`Iok zOyvH)=`S?-Q9oRfcTzGE;0>WUFz|gEWF6gH6s=<^Tc{L5g>6hFIVR2Js7ECtR_v%G z#HLP+#c|na3{%)QCc$y1Tf!7t0~18y&NLN{gBDOSw$NegomAyy_%29ip$!nlE)4RH zcaW7=HqNtfvpCDFJn)N^n+3MzY5ZbEL0Mxlp}2kvA;QZ!gj8sS64#dx^<4hAaT^~l z8!6<)-0W|WXN;m*3mwY|paBfp|39N2KXVescxNq8|B7mT}Fo4jP^L$YE+{JOL zLwGDvWHzmY4g)jRh%2~?YVnMDJrj2}L55W$x`)44G`eb1q8_qpBl^>!!L!& zFEiHvQNjjw*1|M+Tf2CRnVzcrb$|LXEB{H6-sE|Fu4ezGdjG9ihROkudwxLCpZWTr zpM4gmZCr!DG(U{ek>dx2-kB!2vG)>v1%A(>2luqDCnTXlKnacmd?2EYa^kRtBt=4N zBb7R?$cb>^?IX0h$vlv`S*(J8h}kPx4| ztWF3ZxeBhX3dj50ikd#KKV%5EVtLbc-9;6LEFYe}bd&bA0E+Ec+S=5I z0SUfnq0l1OKme*Jj0p7L2G5$l?%5h=?TiOn0H_(yKI4{H8d}U&Si_e9$U^Cv5N0e- z0Y`&T?+>M%5jcC+jQ${lF7J#ag-9?BMWCTd&sYM=T=Zsv=PXqV0z~IhS$O%q;P#Pa z`H{Cy&)u?Xm_RxAi5&(tT=N{Dzm;9sdYl zw(pQ$Gm$$NarDFNgO%IZ{sH#AZHl#M+Z%5V`{>xUwI}w^zZY?8UgnotOpkd9DxC~& zovtjP@GoC4*nIMH*4j9$AN>h@6QQLD)i1!7Ei*|Beg|Ht;~ZRA@81w$1o$G<&CtDo zbiwl~D=T*z+Rxmc8@wS~Z#jF%OGuNcfywlIs(8_J`V-kJD!@agK9MOgxp%Ub`!GBW I`T9}qKQy`}3;+NC diff --git a/mods/default/torch.lua b/mods/default/torch.lua index a19f5314..e8f734c7 100644 --- a/mods/default/torch.lua +++ b/mods/default/torch.lua @@ -11,7 +11,7 @@ local function on_flood(pos, oldnode, newnode) nodedef.groups.igniter and nodedef.groups.igniter > 0) then minetest.sound_play( "default_cool_lava", - {pos = pos, max_hear_distance = 16, gain = 0.1}, + {pos = pos, max_hear_distance = 16, gain = 0.07}, true ) end diff --git a/mods/farming/api.lua b/mods/farming/api.lua index 17a5fa74..15d126e2 100644 --- a/mods/farming/api.lua +++ b/mods/farming/api.lua @@ -60,7 +60,7 @@ farming.hoe_on_use = function(itemstack, user, pointed_thing, uses) minetest.set_node(pt.under, {name = regN[under.name].soil.dry}) minetest.sound_play("default_dig_crumbly", { pos = pt.under, - gain = 0.5, + gain = 0.3, }, true) if not minetest.is_creative_enabled(player_name) then diff --git a/mods/fire/init.lua b/mods/fire/init.lua index 621e00e4..030b604d 100644 --- a/mods/fire/init.lua +++ b/mods/fire/init.lua @@ -92,7 +92,7 @@ minetest.register_tool("fire:flint_and_steel", { on_use = function(itemstack, user, pointed_thing) local sound_pos = pointed_thing.above or user:get_pos() minetest.sound_play("fire_flint_and_steel", - {pos = sound_pos, gain = 0.5, max_hear_distance = 8}, true) + {pos = sound_pos, gain = 0.2, max_hear_distance = 8}, true) local player_name = user:get_player_name() if pointed_thing.type == "node" then local node_under = minetest.get_node(pointed_thing.under).name diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua index fd1f9e42..19fe330c 100644 --- a/mods/tnt/init.lua +++ b/mods/tnt/init.lua @@ -279,7 +279,7 @@ function tnt.burn(pos, nodename) def.on_ignite(pos) elseif minetest.get_item_group(name, "tnt") > 0 then minetest.swap_node(pos, {name = name .. "_burning"}) - minetest.sound_play("tnt_ignite", {pos = pos}, true) + minetest.sound_play("tnt_ignite", {pos = pos, gain = 1.0}, true) minetest.get_node_timer(pos):start(1) end end @@ -555,7 +555,7 @@ minetest.register_node("tnt:gunpowder_burning", { on_blast = function() end, on_construct = function(pos) minetest.sound_play("tnt_gunpowder_burning", {pos = pos, - gain = 2}, true) + gain = 1.0}, true) minetest.get_node_timer(pos):start(1) end, }) From 40861c9e4f9700d70e202bdad515b0659bc7f766 Mon Sep 17 00:00:00 2001 From: Louis Royer <55180044+louisroyer@users.noreply.github.com> Date: Sun, 12 Jul 2020 14:30:11 +0200 Subject: [PATCH 05/11] Move keys to a separate mod (Fix #1490) --- mods/default/README.txt | 2 - mods/default/craftitems.lua | 75 ------------- mods/default/locale/default.de.tr | 3 - mods/default/locale/default.eo.tr | 3 - mods/default/locale/default.es.tr | 3 - mods/default/locale/default.fr.tr | 3 - mods/default/locale/default.id.tr | 3 - mods/default/locale/default.it.tr | 3 - mods/default/locale/default.jbo.tr | 3 - mods/default/locale/default.ms.tr | 3 - mods/default/locale/default.pt_BR.tr | 3 - mods/default/locale/default.ru.tr | 3 - mods/default/locale/default.se.tr | 3 - mods/default/locale/default.sk.tr | 3 - mods/default/locale/default.zh_CN.tr | 3 - mods/default/locale/default.zh_TW.tr | 3 - mods/default/locale/template.txt | 3 - mods/default/tools.lua | 40 ------- mods/keys/README.txt | 21 ++++ mods/keys/aliases.lua | 6 ++ mods/keys/crafting.lua | 28 +++++ mods/keys/craftitems.lua | 102 ++++++++++++++++++ mods/keys/init.lua | 6 ++ mods/keys/license.txt | 52 +++++++++ mods/keys/locale/keys.de.tr | 5 + mods/keys/locale/keys.eo.tr | 5 + mods/keys/locale/keys.es.tr | 5 + mods/keys/locale/keys.fr.tr | 5 + mods/keys/locale/keys.id.tr | 5 + mods/keys/locale/keys.it.tr | 5 + mods/keys/locale/keys.jbo.tr | 5 + mods/keys/locale/keys.ms.tr | 5 + mods/keys/locale/keys.pt_BR.tr | 5 + mods/keys/locale/keys.ru.tr | 5 + mods/keys/locale/keys.se.tr | 5 + mods/keys/locale/keys.zh_CN.tr | 5 + mods/keys/locale/keys.zh_TW.tr | 5 + mods/keys/locale/template.txt | 5 + mods/keys/mod.conf | 3 + .../textures/keys_key.png} | Bin .../textures/keys_key_skeleton.png} | Bin 41 files changed, 288 insertions(+), 162 deletions(-) create mode 100644 mods/keys/README.txt create mode 100644 mods/keys/aliases.lua create mode 100644 mods/keys/crafting.lua create mode 100644 mods/keys/craftitems.lua create mode 100644 mods/keys/init.lua create mode 100644 mods/keys/license.txt create mode 100644 mods/keys/locale/keys.de.tr create mode 100644 mods/keys/locale/keys.eo.tr create mode 100644 mods/keys/locale/keys.es.tr create mode 100644 mods/keys/locale/keys.fr.tr create mode 100644 mods/keys/locale/keys.id.tr create mode 100644 mods/keys/locale/keys.it.tr create mode 100644 mods/keys/locale/keys.jbo.tr create mode 100644 mods/keys/locale/keys.ms.tr create mode 100644 mods/keys/locale/keys.pt_BR.tr create mode 100644 mods/keys/locale/keys.ru.tr create mode 100644 mods/keys/locale/keys.se.tr create mode 100644 mods/keys/locale/keys.zh_CN.tr create mode 100644 mods/keys/locale/keys.zh_TW.tr create mode 100644 mods/keys/locale/template.txt create mode 100644 mods/keys/mod.conf rename mods/{default/textures/default_key.png => keys/textures/keys_key.png} (100%) rename mods/{default/textures/default_key_skeleton.png => keys/textures/keys_key_skeleton.png} (100%) diff --git a/mods/default/README.txt b/mods/default/README.txt index e848f906..949b9402 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -188,8 +188,6 @@ Gambit (CC BY-SA 3.0): default_snow.png default_snow_side.png default_snowball.png - default_key.png - default_key_skeleton.png default_book.png asl97 (CC BY-SA 3.0): diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index cf2795c3..46d78049 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -196,61 +196,6 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) player:set_wielded_item(stack) end) -minetest.register_craftitem("default:skeleton_key", { - description = S("Skeleton Key"), - inventory_image = "default_key_skeleton.png", - on_use = function(itemstack, user, pointed_thing) - if pointed_thing.type ~= "node" then - return itemstack - end - - local pos = pointed_thing.under - local node = minetest.get_node(pos) - - if not node then - return itemstack - end - - local node_reg = minetest.registered_nodes[node.name] - local on_skeleton_key_use = node_reg and node_reg.on_skeleton_key_use - if not on_skeleton_key_use then - return itemstack - end - - -- make a new key secret in case the node callback needs it - local random = math.random - local newsecret = string.format( - "%04x%04x%04x%04x", - random(2^16) - 1, random(2^16) - 1, - random(2^16) - 1, random(2^16) - 1) - - local secret, _, _ = on_skeleton_key_use(pos, user, newsecret) - - if secret then - local inv = minetest.get_inventory({type="player", name=user:get_player_name()}) - - -- update original itemstack - itemstack:take_item() - - -- finish and return the new key - local new_stack = ItemStack("default:key") - local meta = new_stack:get_meta() - meta:set_string("secret", secret) - meta:set_string("description", S("Key to @1's @2", user:get_player_name(), - minetest.registered_nodes[node.name].description)) - - if itemstack:get_count() == 0 then - itemstack = new_stack - else - if inv:add_item("main", new_stack):get_count() > 0 then - minetest.add_item(user:get_pos(), new_stack) - end -- else: added to inventory successfully - end - - return itemstack - end - end -}) -- -- Craftitem registry @@ -479,13 +424,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "default:skeleton_key", - recipe = { - {"default:gold_ingot"}, - } -}) - minetest.register_craft({ output = "default:steel_ingot 9", recipe = { @@ -529,19 +467,6 @@ minetest.register_craft({ recipe = "default:gold_lump", }) -minetest.register_craft({ - type = "cooking", - output = "default:gold_ingot", - recipe = "default:key", - cooktime = 5, -}) - -minetest.register_craft({ - type = "cooking", - output = "default:gold_ingot", - recipe = "default:skeleton_key", - cooktime = 5, -}) minetest.register_craft({ type = "cooking", diff --git a/mods/default/locale/default.de.tr b/mods/default/locale/default.de.tr index c728008c..1abe24f8 100644 --- a/mods/default/locale/default.de.tr +++ b/mods/default/locale/default.de.tr @@ -12,8 +12,6 @@ Save=Speichern by @1=von @1 Page @1 of @2=Seite @1 von @2 "@1" by @2=„@1“ von @2 -Skeleton Key=Skelettschlüssel -Key to @1's @2=Schlüssel für @2 von @1 Blueberries=Blaubeeren Book=Buch Book with Text=Buch mit Text @@ -212,7 +210,6 @@ Bronze Sword=Bronzeschwert Steel Sword=Stahlschwert Mese Sword=Meseschwert Diamond Sword=Diamantschwert -Key=Schlüssel Torch=Fackel @1 will intersect protection on growth.=@1 wird bei Wachstum mit geschützter Zone überlappen. diff --git a/mods/default/locale/default.eo.tr b/mods/default/locale/default.eo.tr index 7aaa0bb9..83496566 100644 --- a/mods/default/locale/default.eo.tr +++ b/mods/default/locale/default.eo.tr @@ -12,8 +12,6 @@ Save=Konservu by @1=per @1 Page @1 of @2=Paĝo @1 el @2 "@1" by @2="@1" per @2 -Skeleton Key=Skeleta Ŝlosilo -Key to @1's @2=Ŝlosilo por la @2 de @1 Blueberries=Mirteloj Book=Libro Book with Text=Libro kun Teksto @@ -212,7 +210,6 @@ Bronze Sword=Bronza Glavo Steel Sword=Ŝtala Glavo Mese Sword=Mesea Glavo Diamond Sword=Diamanta Glavo -Key=Ŝlosilo Torch=Torĉo @1 will intersect protection on growth.=@1 sekcos protekto ĉe vegeto. diff --git a/mods/default/locale/default.es.tr b/mods/default/locale/default.es.tr index d8b07f50..da160dc3 100644 --- a/mods/default/locale/default.es.tr +++ b/mods/default/locale/default.es.tr @@ -12,8 +12,6 @@ Save=Guardar by @1=por @1 Page @1 of @2=Página @1 de @2 "@1" by @2="@1" por @2 -Skeleton Key=Llave esqueleto -Key to @1's @2=Llave para @2 de @1 Blueberries=Arándanos Book=Libro Book with Text=Libro escrito @@ -212,7 +210,6 @@ Bronze Sword=Espada de bronce Steel Sword=Espada de acero Mese Sword=Espada de mese Diamond Sword=Espada de diamante -Key=Llave Torch=Antorcha @1 will intersect protection on growth.=@1 intersectará con protección cuando crezca. diff --git a/mods/default/locale/default.fr.tr b/mods/default/locale/default.fr.tr index b2288f7e..71887400 100644 --- a/mods/default/locale/default.fr.tr +++ b/mods/default/locale/default.fr.tr @@ -12,8 +12,6 @@ Save=Sauvegarder by @1=de @1 Page @1 of @2=Page @1 sur @2 "@1" by @2=« @1 » de @2 -Skeleton Key=Squelette -Key to @1's @2=Clé pour @2 de @1 Blueberries=Myrtille Book=Livre Book with Text=Livre avec du texte @@ -212,7 +210,6 @@ Bronze Sword=Epée en bronze Steel Sword=Epée en acier Mese Sword=Epée en Mese Diamond Sword=Epée en diamant -Key=Clé Torch=Torche @1 will intersect protection on growth.=@1 chevauchera la zone protégée avec la croissance. diff --git a/mods/default/locale/default.id.tr b/mods/default/locale/default.id.tr index 3c02a050..91a901e6 100644 --- a/mods/default/locale/default.id.tr +++ b/mods/default/locale/default.id.tr @@ -12,8 +12,6 @@ Save=Simpan by @1=oleh @1 Page @1 of @2=Halaman @1 dari @2 "@1" by @2="@1" oleh @2 -Skeleton Key=Kunci Induk -Key to @1's @2=Kunci @2 milik @1 Blueberries=Blueberry Book=Buku Book with Text=Buku Tertulis @@ -212,7 +210,6 @@ Bronze Sword=Pedang Perunggu Steel Sword=Pedang Baja Mese Sword=Pedang Mese Diamond Sword=Pedang Berlian -Key=Kunci Torch=Obor @1 will intersect protection on growth.=@1 akan memotong perlindungan ketika tumbuh. diff --git a/mods/default/locale/default.it.tr b/mods/default/locale/default.it.tr index d134a29f..dcb5fd48 100644 --- a/mods/default/locale/default.it.tr +++ b/mods/default/locale/default.it.tr @@ -12,8 +12,6 @@ Save= by @1= Page @1 of @2= "@1" by @2="@1" di @2 -Skeleton Key=Chiave dello Scheletro -Key to @1's @2=Chiave per @2 di @1 Blueberries=Mirtilli Book=Libro Book with Text=Libro con testo @@ -212,7 +210,6 @@ Bronze Sword=Spada di bronzo Steel Sword=Spada d'acciaio Mese Sword=Spada di mese Diamond Sword=Spada di diamante -Key=Chiave Torch=Torcia @1 will intersect protection on growth.=@1 crescendo attraverserà la protezione. diff --git a/mods/default/locale/default.jbo.tr b/mods/default/locale/default.jbo.tr index 841142c0..22954d3c 100644 --- a/mods/default/locale/default.jbo.tr +++ b/mods/default/locale/default.jbo.tr @@ -12,8 +12,6 @@ Save=rejgau by @1=la'o zo'i.@1.zo'i te cukta Page @1 of @2=meirmoi fe li @1 li @2 le'i papri "@1" by @2=lo cukta be la'o gy.@1.gy. bei la'o zo'i.@2.zo'i -Skeleton Key=lo greku ckiku -Key to @1's @2=lo ckiku be @2 po la'o zo'i.@1.zo'i Blueberries=lo blajba Book=lo cukta Book with Text=lo cukta joi selci'a @@ -212,6 +210,5 @@ Bronze Sword=lo ransu cladakyxa'i Steel Sword=lo gasta cladakyxa'i Mese Sword=lo za'e kunrmese cladakyxa'i Diamond Sword=lo tabjme cladakyxa'i -Key=lo ckiku Torch=lo fagytergu'i @1 will intersect protection on growth.=.i @1 cu ba kruca lo bandu ca lo nu banro diff --git a/mods/default/locale/default.ms.tr b/mods/default/locale/default.ms.tr index 5ddfe9c8..cb0f4d21 100644 --- a/mods/default/locale/default.ms.tr +++ b/mods/default/locale/default.ms.tr @@ -12,8 +12,6 @@ Save=Simpan by @1=oleh @1 Page @1 of @2=Ms. @1 / @2 "@1" by @2="@1" oleh @2 -Skeleton Key=Kunci Induk -Key to @1's @2=Kunci @2 milik @1 Blueberries=Beri Biru Book=Buku Book with Text=Buku Bertulisan @@ -212,7 +210,6 @@ Bronze Sword=Pedang Gangsa Steel Sword=Pedang Keluli Mese Sword=Pedang Mese Diamond Sword=Pedang Intan -Key=Kunci Torch=Obor @1 will intersect protection on growth.=@1 akan masuk kawasan perlindungan lain apabila ia tumbuh. diff --git a/mods/default/locale/default.pt_BR.tr b/mods/default/locale/default.pt_BR.tr index 2aa5dac3..1c2049fd 100644 --- a/mods/default/locale/default.pt_BR.tr +++ b/mods/default/locale/default.pt_BR.tr @@ -12,8 +12,6 @@ Save=Salvar by @1=por @1 Page @1 of @2=Página @1 de @2 "@1" by @2="@1" por @2 -Skeleton Key=Chave de Mestra -Key to @1's @2=Chave para @2 de @1 Blueberries=Mirtilo Book=Livro Book with Text=Livro com Texto @@ -212,6 +210,5 @@ Bronze Sword=Espada de Bronze Steel Sword=Espada de Aço Mese Sword=Espada de Mese Diamond Sword=Espada de Diamante -Key=Chave Torch=Tocha @1 will intersect protection on growth.=@1 cruzará a proteção no crescimento. diff --git a/mods/default/locale/default.ru.tr b/mods/default/locale/default.ru.tr index 3b87dd5e..507841e0 100644 --- a/mods/default/locale/default.ru.tr +++ b/mods/default/locale/default.ru.tr @@ -12,8 +12,6 @@ Save=Сохранить by @1=@1 Page @1 of @2=Страница @1 из @2 "@1" by @2="@1" @2 -Skeleton Key=Ключ Скелета -Key to @1's @2=Ключ к @2 от @1 Blueberries=Черника Book=Книга Book with Text=Книга с Текстом @@ -212,7 +210,6 @@ Bronze Sword=Бронзовый Меч Steel Sword=Стальной Меч Mese Sword=Месе Меч Diamond Sword=Алмазный Меч -Key=Ключ Torch=Факел @1 will intersect protection on growth.=@1 пересечёт защиту по росту. diff --git a/mods/default/locale/default.se.tr b/mods/default/locale/default.se.tr index c6de58b9..b288c378 100644 --- a/mods/default/locale/default.se.tr +++ b/mods/default/locale/default.se.tr @@ -12,8 +12,6 @@ Save=Spara by @1=av @1 Page @1 of @2=Sida @1 av @2 "@1" by @2="@1" av @2 -Skeleton Key=Skelett Nyckel -Key to @1's @2=Nyckel till @1s @2 Blueberries=Blåbär Book=Bok Book with Text=Bok med text @@ -212,7 +210,6 @@ Bronze Sword=Brons Svärd Steel Sword=Stål Svärd Mese Sword=Mese Svärd Diamond Sword=Diamant Svärd -Key=Nyckel Torch=Fakla @1 will intersect protection on growth.=@1 kommer korsa skyddet mot tillväxt. diff --git a/mods/default/locale/default.sk.tr b/mods/default/locale/default.sk.tr index a6f7cbf5..d85f714b 100644 --- a/mods/default/locale/default.sk.tr +++ b/mods/default/locale/default.sk.tr @@ -12,8 +12,6 @@ Save=Uložiť by @1=od @1 Page @1 of @2=Strana @1 z @2 "@1" by @2=„@1“ z @2 -Skeleton Key=Základný kľuč -Key to @1's @2=Kľuč pre @2 hráča @1 Blueberries=Čučoriedky Book=Kniha Book with Text=Kniha s textom @@ -212,7 +210,6 @@ Bronze Sword=Bronzový meč Steel Sword=Oceľový meč Mese Sword=Mese meč Diamond Sword=Diamantový meč -Key=Kľúč Torch=Fakľa @1 will intersect protection on growth.=@1 prekročí pri raste chránenú zónu. diff --git a/mods/default/locale/default.zh_CN.tr b/mods/default/locale/default.zh_CN.tr index dd26fa13..56b1c5e6 100644 --- a/mods/default/locale/default.zh_CN.tr +++ b/mods/default/locale/default.zh_CN.tr @@ -12,8 +12,6 @@ Save=保存 by @1=由@1 Page @1 of @2=第@1页，共@2页。 "@1" by @2="@1" by @2 -Skeleton Key=万能钥匙 -Key to @1's @2=@1的@2的钥匙 Blueberries=蓝莓 Book=书 Book with Text=带文字的书 @@ -212,7 +210,6 @@ Bronze Sword=青铜剑 Steel Sword=铁剑 Mese Sword=黄石剑 Diamond Sword=钻石剑 -Key=钥匙 Torch=火把 @1 will intersect protection on growth.=@1生长时将与保护区域相交。 diff --git a/mods/default/locale/default.zh_TW.tr b/mods/default/locale/default.zh_TW.tr index 9d088d8d..94d5e183 100644 --- a/mods/default/locale/default.zh_TW.tr +++ b/mods/default/locale/default.zh_TW.tr @@ -12,8 +12,6 @@ Save=保存 by @1=由@1 Page @1 of @2=第@1頁，共@2頁。 "@1" by @2="@1" by @2 -Skeleton Key=萬能鑰匙 -Key to @1's @2=@1的@2的鑰匙 Blueberries=藍莓 Book=書 Book with Text=帶文字的書 @@ -212,7 +210,6 @@ Bronze Sword=青銅劍 Steel Sword=鐵劍 Mese Sword=黃石劍 Diamond Sword=鑽石劍 -Key=鑰匙 Torch=火把 @1 will intersect protection on growth.=@1將與增長的保護相交。 diff --git a/mods/default/locale/template.txt b/mods/default/locale/template.txt index 3b7b2979..13808e9d 100644 --- a/mods/default/locale/template.txt +++ b/mods/default/locale/template.txt @@ -12,8 +12,6 @@ Save= by @1= Page @1 of @2= "@1" by @2= -Skeleton Key= -Key to @1's @2= Blueberries= Book= Book with Text= @@ -212,6 +210,5 @@ Bronze Sword= Steel Sword= Mese Sword= Diamond Sword= -Key= Torch= @1 will intersect protection on growth.= diff --git a/mods/default/tools.lua b/mods/default/tools.lua index 44468c56..1a95a50d 100644 --- a/mods/default/tools.lua +++ b/mods/default/tools.lua @@ -452,46 +452,6 @@ for name, mat in pairs(craft_ingreds) do }) end -minetest.register_tool("default:key", { - description = S("Key"), - inventory_image = "default_key.png", - groups = {key = 1, not_in_creative_inventory = 1}, - stack_max = 1, - on_place = function(itemstack, placer, pointed_thing) - local under = pointed_thing.under - local node = minetest.get_node(under) - local def = minetest.registered_nodes[node.name] - if def and def.on_rightclick and - not (placer and placer:is_player() and - placer:get_player_control().sneak) then - return def.on_rightclick(under, node, placer, itemstack, - pointed_thing) or itemstack - end - if pointed_thing.type ~= "node" then - return itemstack - end - - local pos = pointed_thing.under - node = minetest.get_node(pos) - - if not node or node.name == "ignore" then - return itemstack - end - - local ndef = minetest.registered_nodes[node.name] - if not ndef then - return itemstack - end - - local on_key_use = ndef.on_key_use - if on_key_use then - on_key_use(pos, placer) - end - - return nil - end -}) - minetest.register_craft({ type = "fuel", recipe = "default:pick_wood", diff --git a/mods/keys/README.txt b/mods/keys/README.txt new file mode 100644 index 00000000..86591203 --- /dev/null +++ b/mods/keys/README.txt @@ -0,0 +1,21 @@ +Minetest Game mod: keys +========================== +See license.txt for license information. + +Authors of source code +---------------------- +Originally by celeron55, Perttu Ahola (LGPLv2.1+) +Various Minetest developers and contributors (LGPLv2.1+) + +Authors of media (textures, sounds, models and schematics) +---------------------------------------------------------- + +Textures +-------- +Gambit (CC BY-SA 3.0): + keys_key.png + keys_key_skeleton.png + +Features +-------- +This mod uses the key API as defined in game_api.txt section [Key API]. diff --git a/mods/keys/aliases.lua b/mods/keys/aliases.lua new file mode 100644 index 00000000..4297498b --- /dev/null +++ b/mods/keys/aliases.lua @@ -0,0 +1,6 @@ +-- +-- Aliases for backward compatibility +-- + +minetest.register_alias("default:key", "keys:key") +minetest.register_alias("default:skeleton_key", "keys:skeleton_key") diff --git a/mods/keys/crafting.lua b/mods/keys/crafting.lua new file mode 100644 index 00000000..b9b503a5 --- /dev/null +++ b/mods/keys/crafting.lua @@ -0,0 +1,28 @@ +-- +-- Crafting recipes +-- + +minetest.register_craft({ + output = "keys:skeleton_key", + recipe = { + {"default:gold_ingot"}, + } +}) + +-- +-- Cooking recipes +-- + +minetest.register_craft({ + type = "cooking", + output = "default:gold_ingot", + recipe = "keys:key", + cooktime = 5, +}) + +minetest.register_craft({ + type = "cooking", + output = "default:gold_ingot", + recipe = "keys:skeleton_key", + cooktime = 5, +}) diff --git a/mods/keys/craftitems.lua b/mods/keys/craftitems.lua new file mode 100644 index 00000000..e4187586 --- /dev/null +++ b/mods/keys/craftitems.lua @@ -0,0 +1,102 @@ +-- Load support for MT game translation. +local S = minetest.get_translator("keys") + +-- +-- Craftitems +-- + +minetest.register_craftitem("keys:skeleton_key", { + description = S("Skeleton Key"), + inventory_image = "keys_key_skeleton.png", + on_use = function(itemstack, user, pointed_thing) + if pointed_thing.type ~= "node" then + return itemstack + end + + local pos = pointed_thing.under + local node = minetest.get_node(pos) + + if not node then + return itemstack + end + + local node_reg = minetest.registered_nodes[node.name] + local on_skeleton_key_use = node_reg and node_reg.on_skeleton_key_use + if not on_skeleton_key_use then + return itemstack + end + + -- make a new key secret in case the node callback needs it + local random = math.random + local newsecret = string.format( + "%04x%04x%04x%04x", + random(2^16) - 1, random(2^16) - 1, + random(2^16) - 1, random(2^16) - 1) + + local secret, _, _ = on_skeleton_key_use(pos, user, newsecret) + + if secret then + local inv = minetest.get_inventory({type="player", name=user:get_player_name()}) + + -- update original itemstack + itemstack:take_item() + + -- finish and return the new key + local new_stack = ItemStack("keys:key") + local meta = new_stack:get_meta() + meta:set_string("secret", secret) + meta:set_string("description", S("Key to @1's @2", user:get_player_name(), + minetest.registered_nodes[node.name].description)) + + if itemstack:get_count() == 0 then + itemstack = new_stack + else + if inv:add_item("main", new_stack):get_count() > 0 then + minetest.add_item(user:get_pos(), new_stack) + end -- else: added to inventory successfully + end + + return itemstack + end + end +}) + +minetest.register_tool("keys:key", { + description = S("Key"), + inventory_image = "keys_key.png", + groups = {key = 1, not_in_creative_inventory = 1}, + stack_max = 1, + on_place = function(itemstack, placer, pointed_thing) + local under = pointed_thing.under + local node = minetest.get_node(under) + local def = minetest.registered_nodes[node.name] + if def and def.on_rightclick and + not (placer and placer:is_player() and + placer:get_player_control().sneak) then + return def.on_rightclick(under, node, placer, itemstack, + pointed_thing) or itemstack + end + if pointed_thing.type ~= "node" then + return itemstack + end + + local pos = pointed_thing.under + node = minetest.get_node(pos) + + if not node or node.name == "ignore" then + return itemstack + end + + local ndef = minetest.registered_nodes[node.name] + if not ndef then + return itemstack + end + + local on_key_use = ndef.on_key_use + if on_key_use then + on_key_use(pos, placer) + end + + return nil + end +}) diff --git a/mods/keys/init.lua b/mods/keys/init.lua new file mode 100644 index 00000000..6c2ed825 --- /dev/null +++ b/mods/keys/init.lua @@ -0,0 +1,6 @@ +-- Minetest mod: keys +local keys_path = minetest.get_modpath("keys") + +dofile(keys_path.."/craftitems.lua") +dofile(keys_path.."/crafting.lua") +dofile(keys_path.."/aliases.lua") diff --git a/mods/keys/license.txt b/mods/keys/license.txt new file mode 100644 index 00000000..95f02ef9 --- /dev/null +++ b/mods/keys/license.txt @@ -0,0 +1,52 @@ +License of source code +---------------------- + +GNU Lesser General Public License, version 2.1 +Copyright (C) 2011-2018 celeron55, Perttu Ahola +Copyright (C) 2011-2018 Various Minetest developers and contributors + +This program is free software; you can redistribute it and/or modify it under the terms +of the GNU Lesser General Public License as published by the Free Software Foundation; +either version 2.1 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU Lesser General Public License for more details: +https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + + +Licenses of media (textures, models and sounds) +----------------------------------------------- + +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +Copyright (C) 2010-2018: + + Gambit + +You are free to: +Share — copy and redistribute the material in any medium or format. +Adapt — remix, transform, and build upon the material for any purpose, even commercially. +The licensor cannot revoke these freedoms as long as you follow the license terms. + +Under the following terms: + +Attribution — You must give appropriate credit, provide a link to the license, and +indicate if changes were made. You may do so in any reasonable manner, but not in any way +that suggests the licensor endorses you or your use. + +ShareAlike — If you remix, transform, or build upon the material, you must distribute +your contributions under the same license as the original. + +No additional restrictions — You may not apply legal terms or technological measures that +legally restrict others from doing anything the license permits. + +Notices: + +You do not have to comply with the license for elements of the material in the public +domain or where your use is permitted by an applicable exception or limitation. +No warranties are given. The license may not give you all of the permissions necessary +for your intended use. For example, other rights such as publicity, privacy, or moral +rights may limit how you use the material. + +For more details: +http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/mods/keys/locale/keys.de.tr b/mods/keys/locale/keys.de.tr new file mode 100644 index 00000000..499a6ba7 --- /dev/null +++ b/mods/keys/locale/keys.de.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Schlüssel +Key to @1's @2=Schlüssel für @2 von @1 +Skeleton Key=Skelettschlüssel diff --git a/mods/keys/locale/keys.eo.tr b/mods/keys/locale/keys.eo.tr new file mode 100644 index 00000000..e73f6c4e --- /dev/null +++ b/mods/keys/locale/keys.eo.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Ŝlosilo +Key to @1's @2=Ŝlosilo por la @2 de @1 +Skeleton Key=Skeleta Ŝlosilo diff --git a/mods/keys/locale/keys.es.tr b/mods/keys/locale/keys.es.tr new file mode 100644 index 00000000..e408c32a --- /dev/null +++ b/mods/keys/locale/keys.es.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Llave +Key to @1's @2=Llave para @2 de @1 +Skeleton Key=Llave esqueleto diff --git a/mods/keys/locale/keys.fr.tr b/mods/keys/locale/keys.fr.tr new file mode 100644 index 00000000..b1b9e6a8 --- /dev/null +++ b/mods/keys/locale/keys.fr.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Clé +Key to @1's @2=Clé pour @2 de @1 +Skeleton Key=Squelette diff --git a/mods/keys/locale/keys.id.tr b/mods/keys/locale/keys.id.tr new file mode 100644 index 00000000..58f8fc55 --- /dev/null +++ b/mods/keys/locale/keys.id.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Kunci +Key to @1's @2=Kunci @2 milik @1 +Skeleton Key=Kunci Induk diff --git a/mods/keys/locale/keys.it.tr b/mods/keys/locale/keys.it.tr new file mode 100644 index 00000000..ed7bb312 --- /dev/null +++ b/mods/keys/locale/keys.it.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Chiave +Key to @1's @2=Chiave per @2 di @1 +Skeleton Key=Chiave dello Scheletro diff --git a/mods/keys/locale/keys.jbo.tr b/mods/keys/locale/keys.jbo.tr new file mode 100644 index 00000000..bd12f09b --- /dev/null +++ b/mods/keys/locale/keys.jbo.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=lo ckiku +Key to @1's @2=lo ckiku be @2 po la'o zo'i.@1.zo'i +Skeleton Key=lo greku ckiku diff --git a/mods/keys/locale/keys.ms.tr b/mods/keys/locale/keys.ms.tr new file mode 100644 index 00000000..58f8fc55 --- /dev/null +++ b/mods/keys/locale/keys.ms.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Kunci +Key to @1's @2=Kunci @2 milik @1 +Skeleton Key=Kunci Induk diff --git a/mods/keys/locale/keys.pt_BR.tr b/mods/keys/locale/keys.pt_BR.tr new file mode 100644 index 00000000..ef9ca1ee --- /dev/null +++ b/mods/keys/locale/keys.pt_BR.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Chave +Key to @1's @2=Chave para @2 de @1 +Skeleton Key=Chave de Mestra diff --git a/mods/keys/locale/keys.ru.tr b/mods/keys/locale/keys.ru.tr new file mode 100644 index 00000000..00b4e097 --- /dev/null +++ b/mods/keys/locale/keys.ru.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Ключ +Key to @1's @2=Ключ к @2 от @1 +Skeleton Key=Ключ Скелета diff --git a/mods/keys/locale/keys.se.tr b/mods/keys/locale/keys.se.tr new file mode 100644 index 00000000..2d901df9 --- /dev/null +++ b/mods/keys/locale/keys.se.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=Nyckel +Key to @1's @2=Nyckel till @1s @2 +Skeleton Key=Skelett Nyckel diff --git a/mods/keys/locale/keys.zh_CN.tr b/mods/keys/locale/keys.zh_CN.tr new file mode 100644 index 00000000..57f632ae --- /dev/null +++ b/mods/keys/locale/keys.zh_CN.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=钥匙 +Key to @1's @2=@1的@2的钥匙 +Skeleton Key=万能钥匙 diff --git a/mods/keys/locale/keys.zh_TW.tr b/mods/keys/locale/keys.zh_TW.tr new file mode 100644 index 00000000..c97879ca --- /dev/null +++ b/mods/keys/locale/keys.zh_TW.tr @@ -0,0 +1,5 @@ +# textdomain: keys + +Key=鑰匙 +Key to @1's @2=@1的@2的鑰匙 +Skeleton Key=萬能鑰匙 diff --git a/mods/keys/locale/template.txt b/mods/keys/locale/template.txt new file mode 100644 index 00000000..9fbf62fd --- /dev/null +++ b/mods/keys/locale/template.txt @@ -0,0 +1,5 @@ +# textdomain: keys + +Key= +Key to @1's @2= +Skeleton Key= diff --git a/mods/keys/mod.conf b/mods/keys/mod.conf new file mode 100644 index 00000000..8b8d6693 --- /dev/null +++ b/mods/keys/mod.conf @@ -0,0 +1,3 @@ +name = keys +description = Minetest Game mod: keys +depends = default diff --git a/mods/default/textures/default_key.png b/mods/keys/textures/keys_key.png similarity index 100% rename from mods/default/textures/default_key.png rename to mods/keys/textures/keys_key.png diff --git a/mods/default/textures/default_key_skeleton.png b/mods/keys/textures/keys_key_skeleton.png similarity index 100% rename from mods/default/textures/default_key_skeleton.png rename to mods/keys/textures/keys_key_skeleton.png From fff3b98ab0d1f47e2869ea83ec24da7faf41c80c Mon Sep 17 00:00:00 2001 From: Louis Royer <55180044+louisroyer@users.noreply.github.com> Date: Sun, 12 Jul 2020 14:36:49 +0200 Subject: [PATCH 06/11] Make keys stackable if they contain the same secret (Fix #2714) --- mods/keys/craftitems.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mods/keys/craftitems.lua b/mods/keys/craftitems.lua index e4187586..45e0b824 100644 --- a/mods/keys/craftitems.lua +++ b/mods/keys/craftitems.lua @@ -61,11 +61,10 @@ minetest.register_craftitem("keys:skeleton_key", { end }) -minetest.register_tool("keys:key", { +minetest.register_craftitem("keys:key", { description = S("Key"), inventory_image = "keys_key.png", groups = {key = 1, not_in_creative_inventory = 1}, - stack_max = 1, on_place = function(itemstack, placer, pointed_thing) local under = pointed_thing.under local node = minetest.get_node(under) From bcd1ee048e735442c5a43af6f7edfada4b8e834c Mon Sep 17 00:00:00 2001 From: Olivier Dragon Date: Sat, 29 Jan 2022 10:27:19 -0500 Subject: [PATCH 07/11] Update french translations (#2922) * Update french translations for beds, farming and fire * Update french translations for mtg_craftguide * Update french translations for default * Correct typos * Restore new line at end of file * Shorten translation for better display Co-authored-by: Hugo Locurcio --- mods/beds/locale/beds.fr.tr | 4 +- mods/default/locale/default.fr.tr | 44 +++++++++---------- mods/farming/locale/farming.fr.tr | 10 ++--- mods/fire/locale/fire.fr.tr | 4 +- .../locale/mtg_craftguide.fr.tr | 31 ++++++------- 5 files changed, 47 insertions(+), 46 deletions(-) diff --git a/mods/beds/locale/beds.fr.tr b/mods/beds/locale/beds.fr.tr index e1f8e560..43c06e3c 100644 --- a/mods/beds/locale/beds.fr.tr +++ b/mods/beds/locale/beds.fr.tr @@ -1,8 +1,8 @@ # textdomain: beds Fancy Bed=Lit chic Simple Bed=Lit simple -This bed is already occupied!= -You have to stop moving before going to bed!= +This bed is already occupied!=Ce lit est déjà occupé ! +You have to stop moving before going to bed!=Vous devez arrêter de bouger avant de vous coucher ! Good morning.=Bonjour. @1 of @2 players are in bed=@1 joueur(s) sur @2 sont au lit Force night skip=Forcer le passage de la nuit diff --git a/mods/default/locale/default.fr.tr b/mods/default/locale/default.fr.tr index 71887400..8e2cd67b 100644 --- a/mods/default/locale/default.fr.tr +++ b/mods/default/locale/default.fr.tr @@ -4,8 +4,8 @@ Locked Chest (owned by @1)=Coffre verrouillé (possédé par @1) You do not own this chest.=Ce coffre ne vous appartient pas. a locked chest=un coffre verrouillé Chest=Coffre -Write= -Read= +Write=Écrire +Read=Lire Title:=Titre : Contents:=Contenu : Save=Sauvegarder @@ -63,16 +63,16 @@ Silver Sandstone Brick=Brique de grès argenté Silver Sandstone Block=Bloc de grès argenté Obsidian=Obsidienne Obsidian Brick=Brique d'obsidienne -Obsidian Block=Block d'obsidienne +Obsidian Block=Bloc d'obsidienne Dirt=Terre Dirt with Grass=Terre avec de l'herbe Dirt with Grass and Footsteps=Terre avec de l'herbe et des traces de pas -Dirt with Savanna Grass= +Dirt with Savanna Grass=Terre avec de l'herbe de savane Dirt with Snow=Terre avec de la neige Dirt with Rainforest Litter=Terre avec sol de forêt humide Dirt with Coniferous Litter=Terre avec sol de forêt de conifère -Savanna Dirt= -Savanna Dirt with Savanna Grass= +Savanna Dirt=Terre de la savane +Savanna Dirt with Savanna Grass=Terre de la savane avec son herbe Permafrost=Pergélisol Permafrost with Stones=Pergélisol avec de la pierre Permafrost with Moss=Pergélisol avec de la mousse @@ -129,7 +129,7 @@ Papyrus=Papyrus Dry Shrub=Arbuste sec Jungle Grass=Herbe de la jungle Grass=Herbe -Savanna Grass= +Savanna Grass=Herbe de la savane Fern=Fougère Marram Grass=Ammophile Bush Stem=Tige de buisson @@ -152,11 +152,11 @@ Brown Coral=Corail marron Orange Coral=Corail orange Coral Skeleton=Squelette de corail Water Source=Source d'eau -Flowing Water=Ecoulement d'eau +Flowing Water=Écoulement d'eau River Water Source=Source d'eau de rivière -Flowing River Water=Ecoulement d'eau de rivière +Flowing River Water=Écoulement d'eau de rivière Lava Source=Source de lave -Flowing Lava=Ecoulement de lave +Flowing Lava=Écoulement de lave Empty Bookshelf=Bibliothèque vide Bookshelf (@1 written, @2 empty books)=Bibliothèque (@1 écrits, @2 livres vides) Bookshelf=Bibliothèque @@ -164,8 +164,8 @@ Text too long=Texte trop longue "@1"=« @1 » Wooden Sign=Panneau en bois Steel Sign=Panneau en acier -Wooden Ladder=Echelle en bois -Steel Ladder=Echelle en acier +Wooden Ladder=Échelle en bois +Steel Ladder=Échelle en acier Apple Wood Fence=Barrière de bois de pommier Acacia Wood Fence=Barrière de bois d'acacia Jungle Wood Fence=Barrière de bois de la jungle @@ -180,11 +180,11 @@ Glass=Verre Obsidian Glass=Verre d'obsidienne Brick Block=Bloc de brique Mese Lamp=Lampe de Mese -Apple Wood Mese Post Light= -Acacia Wood Mese Post Light= -Jungle Wood Mese Post Light= -Pine Wood Mese Post Light= -Aspen Wood Mese Post Light= +Apple Wood Mese Post Light=Réverbère de Mese en bois de pommier +Acacia Wood Mese Post Light=Réverbère de Mese en bois d'acacia +Jungle Wood Mese Post Light=Réverbère de Mese en bois de la jungle +Pine Wood Mese Post Light=Réverbère de Mese en bois de pin +Aspen Wood Mese Post Light=Réverbère de Mese en bois de tremble Cloud=Nuage Wooden Pickaxe=Pioche en bois Stone Pickaxe=Pioche en pierre @@ -205,11 +205,11 @@ Steel Axe=Hache en acier Mese Axe=Hache en Mese Diamond Axe=Hache en diamant Wooden Sword=Epée en bois -Stone Sword=Epée en pierre -Bronze Sword=Epée en bronze -Steel Sword=Epée en acier -Mese Sword=Epée en Mese -Diamond Sword=Epée en diamant +Stone Sword=Épée en pierre +Bronze Sword=Épée en bronze +Steel Sword=Épée en acier +Mese Sword=Épée en Mese +Diamond Sword=Épée en diamant Torch=Torche @1 will intersect protection on growth.=@1 chevauchera la zone protégée avec la croissance. diff --git a/mods/farming/locale/farming.fr.tr b/mods/farming/locale/farming.fr.tr index 84d52b0a..826949e1 100644 --- a/mods/farming/locale/farming.fr.tr +++ b/mods/farming/locale/farming.fr.tr @@ -1,6 +1,6 @@ # textdomain: farming -Hoe= -Seed= +Hoe=Houe +Seed=Grain Wooden Hoe=Houe en bois Stone Hoe=Houe en pierre Steel Hoe=Houe en acier @@ -16,8 +16,8 @@ Cotton=Coton String=Ficelle Soil=Sol Wet Soil=Sol humide -Savanna Soil= -Wet Savanna Soil= +Savanna Soil=Sol de la savanne +Wet Savanna Soil=Sol de la savanne humide Desert Sand Soil=Sol de sable du désert Wet Desert Sand Soil=Sol de sable du désert humide Straw=Paille @@ -25,7 +25,7 @@ Straw Stair=Escalier de paille Inner Straw Stair=Escalier intérieur en paille Outer Straw Stair=Escalier extérieur en paille Straw Slab=Dalle de paille -Wild Cotton= +Wild Cotton=Coton sauvage ##### not used anymore ##### diff --git a/mods/fire/locale/fire.fr.tr b/mods/fire/locale/fire.fr.tr index a16b4718..4d5d08ac 100644 --- a/mods/fire/locale/fire.fr.tr +++ b/mods/fire/locale/fire.fr.tr @@ -1,6 +1,6 @@ # textdomain: fire -Fire= -Permanent Fire= +Fire=Feu +Permanent Fire=Feu qui brûle en permanence Flint and Steel=Briquet à silex en acier diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr b/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr index 78ab6ebb..afc82249 100644 --- a/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr +++ b/mods/mtg_craftguide/locale/mtg_craftguide.fr.tr @@ -1,4 +1,5 @@ # textdomain: mtg_craftguide + Any coal=Quelconque charbon Any sand=Quelconque sable Any wool=Quelconque laine @@ -30,24 +31,24 @@ Any magenta dye=Quelconque colorant magenta Any dark grey dye=Quelconque colorant gris foncé Any dark green dye=Quelconque colorant vert foncé # Label for group ingredients -G= +G=G Any item belonging to the group(s): @1=Tout item appartenant au(x) groupe(s) : @1 -Unknown Item= -Fuel= +Unknown Item=Object inconnu +Fuel=Combustible Usage @1 of @2=Usage @1 sur @2 Recipe @1 of @2=Recette @1 sur @2 -Previous recipe= -Next recipe= -Recipe is too big to be displayed.= +Previous recipe=Recette précédente +Next recipe=Prochaine recette +Recipe is too big to be displayed.=Recette trop grande pour être affichée. Shapeless=Sans forme Cooking time: @1=Temps de cuisson : @1 -Search= -Reset= -Previous page= -Next page= -No items to show.= -No usages.= -Click again to show recipes.= -No recipes.= -Click again to show usages.= +Search=Recherche +Reset=Réinitialiser +Previous page=Page précédente +Next page=Prochaine page +No items to show.=Aucun item à afficher. +No usages.=Sans utilité. +Click again to show recipes.=Cliquez encore pour afficher la recette. +No recipes.=Aucune recette. +Click again to show usages.=Cliquez encore pour afficher l'usage. Recipes=Recettes From c8a1454e2bdcbdb18ab2a79b1038e4b26b8a010a Mon Sep 17 00:00:00 2001 From: ROllerozxa Date: Sat, 29 Jan 2022 18:35:45 +0100 Subject: [PATCH 08/11] Fix and update Swedish translation (#2920) --- mods/beds/locale/beds.se.tr | 10 - mods/beds/locale/beds.sv.tr | 10 + mods/binoculars/locale/binoculars.se.tr | 3 - mods/binoculars/locale/binoculars.sv.tr | 3 + .../boats/locale/{boats.se.tr => boats.sv.tr} | 0 .../bones/locale/{bones.se.tr => bones.sv.tr} | 0 mods/bucket/locale/bucket.se.tr | 5 - mods/bucket/locale/bucket.sv.tr | 5 + .../{butterflies.se.tr => butterflies.sv.tr} | 0 .../carts/locale/{carts.se.tr => carts.sv.tr} | 2 +- mods/creative/locale/creative.se.tr | 10 - mods/creative/locale/creative.sv.tr | 10 + mods/default/locale/default.se.tr | 223 ------------------ mods/default/locale/default.sv.tr | 217 +++++++++++++++++ mods/doors/locale/doors.se.tr | 18 -- mods/doors/locale/doors.sv.tr | 18 ++ mods/dye/locale/dye.se.tr | 16 -- mods/dye/locale/dye.sv.tr | 16 ++ mods/farming/locale/farming.se.tr | 34 --- mods/farming/locale/farming.sv.tr | 28 +++ mods/fire/locale/fire.se.tr | 10 - mods/fire/locale/fire.sv.tr | 4 + .../{fireflies.se.tr => fireflies.sv.tr} | 4 +- mods/flowers/locale/flowers.se.tr | 12 - mods/flowers/locale/flowers.sv.tr | 12 + ...ame_commands.se.tr => game_commands.sv.tr} | 2 +- mods/keys/locale/{keys.se.tr => keys.sv.tr} | 2 +- mods/map/locale/map.se.tr | 3 - mods/map/locale/map.sv.tr | 3 + .../locale/mtg_craftguide.sv.tr | 53 +++++ .../{screwdriver.se.tr => screwdriver.sv.tr} | 0 .../locale/{sethome.se.tr => sethome.sv.tr} | 4 +- .../sfinv/locale/{sfinv.se.tr => sfinv.sv.tr} | 0 mods/stairs/locale/stairs.se.tr | 145 ------------ mods/stairs/locale/stairs.sv.tr | 145 ++++++++++++ mods/tnt/locale/{tnt.se.tr => tnt.sv.tr} | 0 mods/vessels/locale/vessels.se.tr | 8 - mods/vessels/locale/vessels.sv.tr | 8 + mods/walls/locale/walls.se.tr | 4 - mods/walls/locale/walls.sv.tr | 4 + mods/wool/locale/wool.se.tr | 16 -- mods/wool/locale/wool.sv.tr | 16 ++ mods/xpanes/locale/xpanes.se.tr | 6 - mods/xpanes/locale/xpanes.sv.tr | 6 + 44 files changed, 565 insertions(+), 530 deletions(-) delete mode 100644 mods/beds/locale/beds.se.tr create mode 100644 mods/beds/locale/beds.sv.tr delete mode 100644 mods/binoculars/locale/binoculars.se.tr create mode 100644 mods/binoculars/locale/binoculars.sv.tr rename mods/boats/locale/{boats.se.tr => boats.sv.tr} (100%) rename mods/bones/locale/{bones.se.tr => bones.sv.tr} (100%) delete mode 100644 mods/bucket/locale/bucket.se.tr create mode 100644 mods/bucket/locale/bucket.sv.tr rename mods/butterflies/locale/{butterflies.se.tr => butterflies.sv.tr} (100%) rename mods/carts/locale/{carts.se.tr => carts.sv.tr} (84%) delete mode 100644 mods/creative/locale/creative.se.tr create mode 100644 mods/creative/locale/creative.sv.tr delete mode 100644 mods/default/locale/default.se.tr create mode 100644 mods/default/locale/default.sv.tr delete mode 100644 mods/doors/locale/doors.se.tr create mode 100644 mods/doors/locale/doors.sv.tr delete mode 100644 mods/dye/locale/dye.se.tr create mode 100644 mods/dye/locale/dye.sv.tr delete mode 100644 mods/farming/locale/farming.se.tr create mode 100644 mods/farming/locale/farming.sv.tr delete mode 100644 mods/fire/locale/fire.se.tr create mode 100644 mods/fire/locale/fire.sv.tr rename mods/fireflies/locale/{fireflies.se.tr => fireflies.sv.tr} (62%) delete mode 100644 mods/flowers/locale/flowers.se.tr create mode 100644 mods/flowers/locale/flowers.sv.tr rename mods/game_commands/locale/{game_commands.se.tr => game_commands.sv.tr} (72%) rename mods/keys/locale/{keys.se.tr => keys.sv.tr} (69%) delete mode 100644 mods/map/locale/map.se.tr create mode 100644 mods/map/locale/map.sv.tr create mode 100644 mods/mtg_craftguide/locale/mtg_craftguide.sv.tr rename mods/screwdriver/locale/{screwdriver.se.tr => screwdriver.sv.tr} (100%) rename mods/sethome/locale/{sethome.se.tr => sethome.sv.tr} (71%) rename mods/sfinv/locale/{sfinv.se.tr => sfinv.sv.tr} (100%) delete mode 100644 mods/stairs/locale/stairs.se.tr create mode 100644 mods/stairs/locale/stairs.sv.tr rename mods/tnt/locale/{tnt.se.tr => tnt.sv.tr} (100%) delete mode 100644 mods/vessels/locale/vessels.se.tr create mode 100644 mods/vessels/locale/vessels.sv.tr delete mode 100644 mods/walls/locale/walls.se.tr create mode 100644 mods/walls/locale/walls.sv.tr delete mode 100644 mods/wool/locale/wool.se.tr create mode 100644 mods/wool/locale/wool.sv.tr delete mode 100644 mods/xpanes/locale/xpanes.se.tr create mode 100644 mods/xpanes/locale/xpanes.sv.tr diff --git a/mods/beds/locale/beds.se.tr b/mods/beds/locale/beds.se.tr deleted file mode 100644 index b4d52ba0..00000000 --- a/mods/beds/locale/beds.se.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: beds -Fancy Bed=Fin säng -Simple Bed=Enkel Säng -This bed is already occupied!= -You have to stop moving before going to bed!= -Good morning.= God morgon. -@1 of @2 players are in bed=@1 av @2 spelar försöker sover. -Force night skip=Tvinga över natten -You can only sleep at night.=Du kan bara sova på natten. -Leave Bed=Lämna Säng diff --git a/mods/beds/locale/beds.sv.tr b/mods/beds/locale/beds.sv.tr new file mode 100644 index 00000000..3b737b46 --- /dev/null +++ b/mods/beds/locale/beds.sv.tr @@ -0,0 +1,10 @@ +# textdomain: beds +Fancy Bed=Fin säng +Simple Bed=Enkel säng +This bed is already occupied!=Den här sängen används redan! +You have to stop moving before going to bed!=Du måste stanna innan du kan lägga dig! +Good morning.=God morgon. +@1 of @2 players are in bed=@1 av @2 spelare försöker sova. +Force night skip=Tvinga att hoppa över natt +You can only sleep at night.=Du kan bara sova på natten. +Leave Bed=Lämna säng diff --git a/mods/binoculars/locale/binoculars.se.tr b/mods/binoculars/locale/binoculars.se.tr deleted file mode 100644 index 90326720..00000000 --- a/mods/binoculars/locale/binoculars.se.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: binoculars -Binoculars=Kikare -Use with 'Zoom' key=Används med 'Zoom' knappen diff --git a/mods/binoculars/locale/binoculars.sv.tr b/mods/binoculars/locale/binoculars.sv.tr new file mode 100644 index 00000000..f8a01db2 --- /dev/null +++ b/mods/binoculars/locale/binoculars.sv.tr @@ -0,0 +1,3 @@ +# textdomain: binoculars +Binoculars=Kikare +Use with 'Zoom' key=Använd med 'Zoom'-knappen diff --git a/mods/boats/locale/boats.se.tr b/mods/boats/locale/boats.sv.tr similarity index 100% rename from mods/boats/locale/boats.se.tr rename to mods/boats/locale/boats.sv.tr diff --git a/mods/bones/locale/bones.se.tr b/mods/bones/locale/bones.sv.tr similarity index 100% rename from mods/bones/locale/bones.se.tr rename to mods/bones/locale/bones.sv.tr diff --git a/mods/bucket/locale/bucket.se.tr b/mods/bucket/locale/bucket.se.tr deleted file mode 100644 index 105b5d3e..00000000 --- a/mods/bucket/locale/bucket.se.tr +++ /dev/null @@ -1,5 +0,0 @@ -# textdomain: bucket -Empty Bucket=Tom hink -Water Bucket=Vatten hink -River Water Bucket=Flodvatten hink -Lava Bucket=Lava hink diff --git a/mods/bucket/locale/bucket.sv.tr b/mods/bucket/locale/bucket.sv.tr new file mode 100644 index 00000000..59ee62df --- /dev/null +++ b/mods/bucket/locale/bucket.sv.tr @@ -0,0 +1,5 @@ +# textdomain: bucket +Empty Bucket=Tom hink +Water Bucket=Vattenhink +River Water Bucket=Flodvattenshink +Lava Bucket=Lavahink diff --git a/mods/butterflies/locale/butterflies.se.tr b/mods/butterflies/locale/butterflies.sv.tr similarity index 100% rename from mods/butterflies/locale/butterflies.se.tr rename to mods/butterflies/locale/butterflies.sv.tr diff --git a/mods/carts/locale/carts.se.tr b/mods/carts/locale/carts.sv.tr similarity index 84% rename from mods/carts/locale/carts.se.tr rename to mods/carts/locale/carts.sv.tr index b59871f2..0521ca85 100644 --- a/mods/carts/locale/carts.se.tr +++ b/mods/carts/locale/carts.sv.tr @@ -3,4 +3,4 @@ Cart=Vagn (Sneak+Click to pick up)=(Shift+Klicka för att plocka upp) Rail=Räls Powered Rail=Aktiverad räls -Brake Rail=Broms räls +Brake Rail=Bromsräls diff --git a/mods/creative/locale/creative.se.tr b/mods/creative/locale/creative.se.tr deleted file mode 100644 index 3b5da58f..00000000 --- a/mods/creative/locale/creative.se.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: creative -Allow player to use creative inventory=Tilllåt spelare att används kreativa saker -Search=Sök -Reset=Återställ -Previous page=Förra sidan -Next page=Nästa sidan -All=Alla -Nodes=Noder -Tools=Verktyg -Items=Saker diff --git a/mods/creative/locale/creative.sv.tr b/mods/creative/locale/creative.sv.tr new file mode 100644 index 00000000..a9a741f4 --- /dev/null +++ b/mods/creative/locale/creative.sv.tr @@ -0,0 +1,10 @@ +# textdomain: creative +Allow player to use creative inventory=Tillåt spelare att använda kreativa saker +Search=Sök +Reset=Återställ +Previous page=Förra sida +Next page=Nästa sida +All=Alla +Nodes=Noder +Tools=Verktyg +Items=Saker diff --git a/mods/default/locale/default.se.tr b/mods/default/locale/default.se.tr deleted file mode 100644 index b288c378..00000000 --- a/mods/default/locale/default.se.tr +++ /dev/null @@ -1,223 +0,0 @@ -# textdomain: default -Locked Chest=Låst kista -Locked Chest (owned by @1)=Låst kista (Ägd av @1) -You do not own this chest.=Du äger inte denna kistan. -a locked chest=en låst kista -Chest=Kista -Write= -Read= -Title:=Titel: -Contents:=Innehåll: -Save=Spara -by @1=av @1 -Page @1 of @2=Sida @1 av @2 -"@1" by @2="@1" av @2 -Blueberries=Blåbär -Book=Bok -Book with Text=Bok med text -Bronze Ingot=Brons tacka -Clay Brick=Tegelsten -Clay Lump=Lerklump -Coal Lump=Kol Klumo -Copper Ingot=Koppar tacka -Copper Lump=Koppar Klump -Diamond=Diamant -Flint=Flinta -Gold Ingot=Guld tacka -Gold Lump=Guld Klump -Iron Lump=Järn Klump -Mese Crystal=Mese Kristall -Mese Crystal Fragment=Mese Kristall Fragment -Obsidian Shard=Obsidian Skärva -Paper=Papper -Steel Ingot=Stål tacka -Stick=Pinne -Tin Ingot=Tenn tacka -Tin Lump=Tenn Klump -Furnace is empty=Ugnen är tom -100% (output full)=100% (utgången full) -@1%=@1% -Not cookable=Inte kokbar -Empty=Tom -Furnace active=Ugn aktiv -Furnace inactive=Ugn inaktiv -(Item: @1; Fuel: @2)=(Sak: @1; Bränsle: @2) -Furnace=Ugn -Stone=Sten -Cobblestone=Kullersten -Stone Brick=Stentegel -Stone Block=Sten block -Mossy Cobblestone=Mossig kullersten -Desert Stone=Öken sten -Desert Cobblestone=Öken kullersten -Desert Stone Brick=Öken stentegel -Desert Stone Block=Öken sten block -Sandstone=Sandsten -Sandstone Brick=Sandstenstegel -Sandstone Block=Sandsten block -Desert Sandstone=Öken sandsten -Desert Sandstone Brick=Öken Sandstenstegel -Desert Sandstone Block=Öken sandsten block -Silver Sandstone=Silver sandsten -Silver Sandstone Brick=Silver Sandstenstegel -Silver Sandstone Block=Silver sandsten block -Obsidian=Obsidian -Obsidian Brick=Obsidiantegel -Obsidian Block=Obsidian block -Dirt=Jord -Dirt with Grass=Jord med gräs -Dirt with Grass and Footsteps=Jord med gräs och fotsteg -Dirt with Savanna Grass= -Dirt with Snow=Jord med snö -Dirt with Rainforest Litter=Jord med regnskogströ -Dirt with Coniferous Litter=Jord med Barrträd -Savanna Dirt= -Savanna Dirt with Savanna Grass= -Permafrost=Permafrost -Permafrost with Stones=Permafrost med sten -Permafrost with Moss=Permafrost med mossa -Sand=Sand -Desert Sand=Öken sand -Silver Sand=Silver sand -Gravel=Grus -Clay=Lera -Snow=Snö -Snow Block=Snö block -Ice=Is -Cave Ice=Grott Is -Apple Tree=Äpple Träd -Apple Wood Planks=Äpple Plankor -Apple Tree Sapling=Äpple Planta -Apple Tree Leaves=Äpple Löv -Apple=Äpple -Apple Marker=Äpple Markör -Jungle Tree=Djungel Träd -Jungle Wood Planks=Djungel Plankor -Jungle Tree Leaves=Djungel Löv -Jungle Tree Sapling=Djungel Planta -Emergent Jungle Tree Sapling=Nybliven Djungel Planta -Pine Tree=Tall -Pine Wood Planks= Tall Plankor -Pine Needles=Granbarr -Pine Tree Sapling=Tall Planta -Acacia Tree=Akacia Träd -Acacia Wood Planks=Akacia Plankor -Acacia Tree Leaves=Akacia Löv -Acacia Tree Sapling=Akacia Planta -Aspen Tree=Asp -Aspen Wood Planks=Asp Plankor -Aspen Tree Leaves=Asp Löv -Aspen Tree Sapling=Asp Planta -Coal Ore=Kol Malm -Coal Block=Kol Block -Iron Ore=Järn Malm -Steel Block=Stål Block -Copper Ore=Koppar Malm -Copper Block=Koppar Block -Tin Ore=Tenn Malm -Tin Block=Tenn Block -Bronze Block=Brons Block -Mese Ore=Mese Malm -Mese Block=Mese Block -Gold Ore=Guld Malm -Gold Block=Guld Block -Diamond Ore=Diamant Malm -Diamond Block=Diamant Block -Cactus=Kaktus -Large Cactus Seedling=Stor kaktusplanta -Papyrus=Papyrus -Dry Shrub=Torr Buske -Jungle Grass=Djungel Gräs -Grass=Gräs -Savanna Grass= -Fern=Ormbunke -Marram Grass=Marram Gräs -Bush Stem=Busk Stam -Bush Leaves=Busk Löv -Bush Sapling=Busk Planta -Blueberry Bush Leaves with Berries=Blåbärsbusks Löv med Bär -Blueberry Bush Leaves=Blåbärsbusks Löv -Blueberry Bush Sapling=Blåbärsbusks Plantga -Acacia Bush Stem=Akacia Busks Stam -Acacia Bush Leaves=Akacia Busks Löv -Acacia Bush Sapling=Akacia Busks Planta -Pine Bush Stem=Tall Busks Stam -Pine Bush Needles=Tall Busks Granbarr -Pine Bush Sapling=Tall Busks Planta -Kelp=Brunalg -Green Coral=Grön Korall -Pink Coral=Rosa Korall -Cyan Coral=Cyan Korall -Brown Coral=Brun Korall -Orange Coral=Orange Korall -Coral Skeleton=Korall Skelett -Water Source=Vattenkälla -Flowing Water=Flödande Vatten -River Water Source=Flodvattenkälla -Flowing River Water=Flödande Flodvatten -Lava Source=Lavakälla -Flowing Lava=Flödande Lava -Empty Bookshelf=Tom Bokhylla -Bookshelf (@1 written, @2 empty books)=Bokhylla (@1 skriva, @2 tomma böcker) -Bookshelf=Bokhylla -Text too long=Text för lång -"@1"="@1" -Wooden Sign=Trä Skylt -Steel Sign=Stål Skylt -Wooden Ladder=Trä Stege -Steel Ladder=Stål Stege -Apple Wood Fence=Äpple Trä Staket -Acacia Wood Fence=Akacia Trä Staket -Jungle Wood Fence=Djungel Trä Staket -Pine Wood Fence=Tall Trä Staket -Aspen Wood Fence=Asp Trä Staket -Apple Wood Fence Rail=Äpple Trä Staket Pinne -Acacia Wood Fence Rail=Akacia Trä Staket Pinne -Jungle Wood Fence Rail=Djungel Trä Staket Pinne -Pine Wood Fence Rail=Tall Trä Staket Pinne -Aspen Wood Fence Rail=Asp Trä Staket Pinne -Glass=Glas -Obsidian Glass=Obsidian Glas -Brick Block=Tegelstens Block -Mese Lamp=Mese Lampa -Apple Wood Mese Post Light= -Acacia Wood Mese Post Light= -Jungle Wood Mese Post Light= -Pine Wood Mese Post Light= -Aspen Wood Mese Post Light= -Cloud=Moln -Wooden Pickaxe=Trä Hacka -Stone Pickaxe=Sten Hacka -Bronze Pickaxe=Brons Hacka -Steel Pickaxe=Stål Hacka -Mese Pickaxe=Mese Hacka -Diamond Pickaxe=Diamant Hacka -Wooden Shovel=Trä Spade -Stone Shovel=Sten Spade -Bronze Shovel=Brons Spade -Steel Shovel=Stål Spade -Mese Shovel=Mese Spade -Diamond Shovel=Diamant Spade -Wooden Axe=Trä Yxa -Stone Axe=Sten Yxa -Bronze Axe=Brons Yxa -Steel Axe=Stål Yxa -Mese Axe=Mese Yxa -Diamond Axe=Diamant Yxa -Wooden Sword=Trä Svärd -Stone Sword=Sten Svärd -Bronze Sword=Brons Svärd -Steel Sword=Stål Svärd -Mese Sword=Mese Svärd -Diamond Sword=Diamant Svärd -Torch=Fakla -@1 will intersect protection on growth.=@1 kommer korsa skyddet mot tillväxt. - - -##### not used anymore ##### - -Dirt with Dry Grass=Jord med torrt gräs -Dry Dirt=Torr jord -Dry Dirt with Dry Grass=Torr jord med torrt gräs -Dry Grass=Torrt Gräs -Mese Post Light=Mese Postljus diff --git a/mods/default/locale/default.sv.tr b/mods/default/locale/default.sv.tr new file mode 100644 index 00000000..4cfbde0c --- /dev/null +++ b/mods/default/locale/default.sv.tr @@ -0,0 +1,217 @@ +# textdomain: default +Locked Chest=Låst kista +Locked Chest (owned by @1)=Låst kista (Ägd av @1) +You do not own this chest.=Du äger inte denna kista. +a locked chest=en låst kista +Chest=Kista +Write=Skriva +Read=Läs +Title:=Titel: +Contents:=Innehåll: +Save=Spara +by @1=av @1 +Page @1 of @2=Sida @1 av @2 +"@1" by @2="@1" av @2 +Skeleton Key=Skelettnyckel +Key to @1's @2=Nyckel till @1s @2 +Blueberries=Blåbär +Book=Bok +Book with Text=Bok med text +Bronze Ingot=Bronstacka +Clay Brick=Tegelsten +Clay Lump=Lerklump +Coal Lump=Kolklump +Copper Ingot=Koppartacka +Copper Lump=Kopparklump +Diamond=Diamant +Flint=Flinta +Gold Ingot=Guldtacka +Gold Lump=Guldklump +Iron Lump=Järnklump +Mese Crystal=Mesekristall +Mese Crystal Fragment=Mesekristallfragment +Obsidian Shard=Obsidianskärva +Paper=Papper +Steel Ingot=Ståltacka +Stick=Pinne +Tin Ingot=Tenntacka +Tin Lump=Tennklump +Furnace is empty=Ugnen är tom +100% (output full)=100% (utgången full) +@1%=@1% +Not cookable=Inte kokbar +Empty=Tom +Furnace active=Ugn aktiv +Furnace inactive=Ugn inaktiv +(Item: @1; Fuel: @2)=(Sak: @1; Bränsle: @2) +Furnace=Ugn +Stone=Sten +Cobblestone=Kullersten +Stone Brick=Stentegel +Stone Block=Stenblock +Mossy Cobblestone=Mossig kullersten +Desert Stone=Ökensten +Desert Cobblestone=Ökenkullersten +Desert Stone Brick=Ökenstenstegel +Desert Stone Block=Ökenstensblock +Sandstone=Sandsten +Sandstone Brick=Sandstenstegel +Sandstone Block=Sandstensblock +Desert Sandstone=Ökensandsten +Desert Sandstone Brick=Ökensandstenstegel +Desert Sandstone Block=Ökensandstensblock +Silver Sandstone=Silversandsten +Silver Sandstone Brick=Silversandstenstegel +Silver Sandstone Block=Silversandstensblock +Obsidian=Obsidian +Obsidian Brick=Obsidiantegel +Obsidian Block=Obsidianblock +Dirt=Jord +Dirt with Grass=Jord med gräs +Dirt with Grass and Footsteps=Jord med gräs och fotsteg +Dirt with Savanna Grass=Jord med savanngräs +Dirt with Snow=Jord med snö +Dirt with Rainforest Litter=Jord med regnskogströ +Dirt with Coniferous Litter=Jord med barrträd +Savanna Dirt=Savannjord +Savanna Dirt with Savanna Grass=Savannjord med savanngräs +Permafrost=Permafrost +Permafrost with Stones=Permafrost med sten +Permafrost with Moss=Permafrost med mossa +Sand=Sand +Desert Sand=Ökensand +Silver Sand=Silversand +Gravel=Grus +Clay=Lera +Snow=Snö +Snow Block=Snöblock +Ice=Is +Cave Ice=Grottis +Apple Tree=Äppleträd +Apple Wood Planks=Äppleträdplankor +Apple Tree Sapling=Äppleplanta +Apple Tree Leaves=Äpplelöv +Apple=Äpple +Apple Marker=Äpplemarkör +Jungle Tree=Djungelträd +Jungle Wood Planks=Djungelplankor +Jungle Tree Leaves=Djungellöv +Jungle Tree Sapling=Djungelplanta +Emergent Jungle Tree Sapling=Nybliven djungelplanta +Pine Tree=Tall +Pine Wood Planks=Tallplankor +Pine Needles=Granbarr +Pine Tree Sapling=Tallplanta +Acacia Tree=Akaciaträd +Acacia Wood Planks=Akaciaplankor +Acacia Tree Leaves=Akacialöv +Acacia Tree Sapling=Akaciaplanta +Aspen Tree=Asp +Aspen Wood Planks=Aspplankor +Aspen Tree Leaves=Asplöv +Aspen Tree Sapling=Aspplanta +Coal Ore=Kolmalm +Coal Block=Kolblock +Iron Ore=Järnmalm +Steel Block=Stålblock +Copper Ore=Kopparmalm +Copper Block=Kopparblock +Tin Ore=Tennmalm +Tin Block=Tennblock +Bronze Block=Bronsblock +Mese Ore=Mesemalm +Mese Block=Meseblock +Gold Ore=Guldmalm +Gold Block=Guldblock +Diamond Ore=Diamantmalm +Diamond Block=Diamantblock +Cactus=Kaktus +Large Cactus Seedling=Stor kaktusplanta +Papyrus=Papyrus +Dry Shrub=Torr buske +Jungle Grass=Djungelgräs +Grass=Gräs +Savanna Grass=Savanngräs +Fern=Ormbunke +Marram Grass=Marramgräs +Bush Stem=Buskstam +Bush Leaves=Busklöv +Bush Sapling=Buskplanta +Blueberry Bush Leaves with Berries=Blåbärsbuske med bär +Blueberry Bush Leaves=Blåbärsbuske +Blueberry Bush Sapling=Blåbärsbuskplanta +Acacia Bush Stem=Akaciabuskstam +Acacia Bush Leaves=Akaciabuske +Acacia Bush Sapling=Akaciabuskplanta +Pine Bush Stem=Tallbuskestam +Pine Bush Needles=Tallgranbarr +Pine Bush Sapling=Tallbuskplanta +Kelp=Brunalg +Green Coral=Grön korall +Pink Coral=Rosa korall +Cyan Coral=Cyan korall +Brown Coral=Brun korall +Orange Coral=Orange korall +Coral Skeleton=Korallskelett +Water Source=Vattenkälla +Flowing Water=Flytande vatten +River Water Source=Flodvattenkälla +Flowing River Water=Flytande flodvatten +Lava Source=Lavakälla +Flowing Lava=Flytande lava +Empty Bookshelf=Tom bokhylla +Bookshelf (@1 written, @2 empty books)=Bokhylla (@1 skriva, @2 tomma böcker) +Bookshelf=Bokhylla +Text too long=Texten är för lång +"@1"="@1" +Wooden Sign=Träskylt +Steel Sign=Stålskylt +Wooden Ladder=Trästege +Steel Ladder=Stålstege +Apple Wood Fence=Äppleträstaket +Acacia Wood Fence=Akaciastaket +Jungle Wood Fence=Djungelstaket +Pine Wood Fence=Tallstaket +Aspen Wood Fence=Aspträdstaket +Apple Wood Fence Rail=Äppleträstaketsräls +Acacia Wood Fence Rail=Akaciastaketsräls +Jungle Wood Fence Rail=Djungelstaketsräls +Pine Wood Fence Rail=Tallstaketsräls +Aspen Wood Fence Rail=Aspstaketsräls +Glass=Glas +Obsidian Glass=Obsidianglas +Brick Block=Tegelstensblock +Mese Lamp=Meselampa +Apple Wood Mese Post Light=Äppleträ-meselykta +Acacia Wood Mese Post Light=Acacia-meselykta +Jungle Wood Mese Post Light=Djungel-meselykta +Pine Wood Mese Post Light=Tall-meselykta +Aspen Wood Mese Post Light=Aspträ-meselykta +Cloud=Moln +Wooden Pickaxe=Trähacka +Stone Pickaxe=Stenhacka +Bronze Pickaxe=Bronshacka +Steel Pickaxe=Stålhacka +Mese Pickaxe=Mesehacka +Diamond Pickaxe=Diamanthacka +Wooden Shovel=Träspade +Stone Shovel=Stenspade +Bronze Shovel=Bronsspade +Steel Shovel=Stålspade +Mese Shovel=Mesespade +Diamond Shovel=Diamantspade +Wooden Axe=Träyxa +Stone Axe=Stenyxa +Bronze Axe=Bronsyxa +Steel Axe=Stålyxa +Mese Axe=Meseyxa +Diamond Axe=Diamantyxa +Wooden Sword=Träsvärd +Stone Sword=Stensvärd +Bronze Sword=Bronssvärd +Steel Sword=Stålsvärd +Mese Sword=Mesesvärd +Diamond Sword=Diamantsvärd +Key=Nyckel +Torch=Fackla +@1 will intersect protection on growth.=@1 kommer korsa skyddet mot tillväxt. diff --git a/mods/doors/locale/doors.se.tr b/mods/doors/locale/doors.se.tr deleted file mode 100644 index 1f856ef1..00000000 --- a/mods/doors/locale/doors.se.tr +++ /dev/null @@ -1,18 +0,0 @@ -# textdomain: doors -Hidden Door Segment=Dold dörrsegment -Owned by @1=Ägd av @1 -You do not own this locked door.=Du äger inte denna låsta dörr. -a locked door=en låst dörr -Wooden Door=Trä Dörr -Steel Door=Stål Dörr -Glass Door=Glas Dörr -Obsidian Glass Door=Obsidian Glas Dörr -You do not own this trapdoor.=Du äger inte denna fallucka -a locked trapdoor=en låst fallucka -Wooden Trapdoor=Trä Fallucka -Steel Trapdoor=Stål Fallucka -Apple Wood Fence Gate=Äpple Trä Fallucka -Acacia Wood Fence Gate=Akacia Trä Fallucka -Jungle Wood Fence Gate=Djungel Trä Fallucka -Pine Wood Fence Gate=Tall Trä Fallucka -Aspen Wood Fence Gate=Asp Trä Fallucka diff --git a/mods/doors/locale/doors.sv.tr b/mods/doors/locale/doors.sv.tr new file mode 100644 index 00000000..9f31d9c8 --- /dev/null +++ b/mods/doors/locale/doors.sv.tr @@ -0,0 +1,18 @@ +# textdomain: doors +Hidden Door Segment=Dolt dörrsegment +Owned by @1=Ägd av @1 +You do not own this locked door.=Du äger inte denna låsta dörr. +a locked door=en låst dörr +Wooden Door=Trädörr +Steel Door=Ståldörr +Glass Door=Glasdörr +Obsidian Glass Door=Obsidianglasdörr +You do not own this trapdoor.=Du äger inte denna fallucka +a locked trapdoor=en låst fallucka +Wooden Trapdoor=Träfallucka +Steel Trapdoor=Stålfallucka +Apple Wood Fence Gate=Äppleträfallucka +Acacia Wood Fence Gate=Akaciaträfallucka +Jungle Wood Fence Gate=Djungelträfallucka +Pine Wood Fence Gate=Tallträfallucka +Aspen Wood Fence Gate=Aspträfallucka diff --git a/mods/dye/locale/dye.se.tr b/mods/dye/locale/dye.se.tr deleted file mode 100644 index 936f161e..00000000 --- a/mods/dye/locale/dye.se.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: dye -White Dye=Vit Färg -Grey Dye=Grå Färg -Dark Grey Dye=Mörk Grå Färg -Black Dye=Svart Färg -Violet Dye=Violett Färg -Blue Dye=Blå Färg -Cyan Dye=Cyan Färg -Dark Green Dye=Mörk Grön Färg -Green Dye=Grön Färg -Yellow Dye=Gul Färg -Brown Dye=Brun Färg -Orange Dye=Orange Färg -Red Dye=Röd Färg -Magenta Dye=Magenta Färg -Pink Dye=Rosa Färg diff --git a/mods/dye/locale/dye.sv.tr b/mods/dye/locale/dye.sv.tr new file mode 100644 index 00000000..ecde4433 --- /dev/null +++ b/mods/dye/locale/dye.sv.tr @@ -0,0 +1,16 @@ +# textdomain: dye +White Dye=Vit färg +Grey Dye=Grå färg +Dark Grey Dye=Mörkgrå färg +Black Dye=Svart färg +Violet Dye=Violett färg +Blue Dye=Blå färg +Cyan Dye=Cyan färg +Dark Green Dye=Mörkgrön färg +Green Dye=Grön färg +Yellow Dye=Gul färg +Brown Dye=Brun färg +Orange Dye=Orange färg +Red Dye=Röd färg +Magenta Dye=Magenta färg +Pink Dye=Rosa färg diff --git a/mods/farming/locale/farming.se.tr b/mods/farming/locale/farming.se.tr deleted file mode 100644 index 3b69fba7..00000000 --- a/mods/farming/locale/farming.se.tr +++ /dev/null @@ -1,34 +0,0 @@ -# textdomain: farming -Hoe= -Seed= -Wooden Hoe=Träsko -Stone Hoe=Stensko -Steel Hoe=Stålsko -Bronze Hoe=Bronssko -Mese Hoe=Mesesko -Diamond Hoe=Diamantsko -Wheat Seed=Vetefrö -Wheat=Vete -Flour=Mjöl -Bread=Bröd -Cotton Seed=Bollumsfrö -Cotton=Bomull -String=Snöra -Soil=Odlningsmark -Wet Soil=Våt Odlningsmark -Savanna Soil= -Wet Savanna Soil= -Desert Sand Soil=Öken Sand Odlningsmark -Wet Desert Sand Soil=Våt Öken Sand Odlningsmark -Straw=Halm -Straw Stair=Halmstrappa -Inner Straw Stair=Inre Halmstrappa -Outer Straw Stair=Yttre Halmstrappa -Straw Slab=Halmplatta -Wild Cotton= - - -##### not used anymore ##### - -Dry Soil=Torr Odlningsmark -Wet Dry Soil=Våt Torr Odlningsmark diff --git a/mods/farming/locale/farming.sv.tr b/mods/farming/locale/farming.sv.tr new file mode 100644 index 00000000..e6c9e685 --- /dev/null +++ b/mods/farming/locale/farming.sv.tr @@ -0,0 +1,28 @@ +# textdomain: farming +Hoe=Kratta +Seed=Frö +Wooden Hoe=Träkratta +Stone Hoe=Stenkratta +Steel Hoe=Stålkratta +Bronze Hoe=Bronskratta +Mese Hoe=Mesekratta +Diamond Hoe=Diamantkratta +Wheat Seed=Vetefrö +Wheat=Vete +Flour=Mjöl +Bread=Bröd +Cotton Seed=Bomullfrö +Cotton=Bomull +String=Snöre +Soil=Odlinngsmark +Wet Soil=Våt Odlingsmark +Savanna Soil=Savannodlingsmark +Wet Savanna Soil=Våt savannodlingsmark +Desert Sand Soil=Ökensandsodlingsmark +Wet Desert Sand Soil=Våt ökensandsodlingsmark +Straw=Halm +Straw Stair=Halmtrappa +Inner Straw Stair=Inre halmtrappa +Outer Straw Stair=Yttre halmtrappa +Straw Slab=Halmplatta +Wild Cotton= diff --git a/mods/fire/locale/fire.se.tr b/mods/fire/locale/fire.se.tr deleted file mode 100644 index 9a51aed2..00000000 --- a/mods/fire/locale/fire.se.tr +++ /dev/null @@ -1,10 +0,0 @@ -# textdomain: fire -Fire= -Permanent Fire= -Flint and Steel=Flinta och Stål - - -##### not used anymore ##### - -# textdomain: fire -Permanent Flame=Permanent Eld diff --git a/mods/fire/locale/fire.sv.tr b/mods/fire/locale/fire.sv.tr new file mode 100644 index 00000000..28e9a4a2 --- /dev/null +++ b/mods/fire/locale/fire.sv.tr @@ -0,0 +1,4 @@ +# textdomain: fire +Fire=Eld +Permanent Fire=Permanent eld +Flint and Steel=Flinta och stål diff --git a/mods/fireflies/locale/fireflies.se.tr b/mods/fireflies/locale/fireflies.sv.tr similarity index 62% rename from mods/fireflies/locale/fireflies.se.tr rename to mods/fireflies/locale/fireflies.sv.tr index ebd0cf9e..d8016f99 100644 --- a/mods/fireflies/locale/fireflies.se.tr +++ b/mods/fireflies/locale/fireflies.sv.tr @@ -1,5 +1,5 @@ # textdomain: fireflies Firefly=Eldfluga -Hidden Firefly=Gömd Eldfluga -Bug Net=Buggernät +Hidden Firefly=Gömd eldfluga +Bug Net=Insektshåv Firefly in a Bottle=Eldfluga i en flaska diff --git a/mods/flowers/locale/flowers.se.tr b/mods/flowers/locale/flowers.se.tr deleted file mode 100644 index 018e133b..00000000 --- a/mods/flowers/locale/flowers.se.tr +++ /dev/null @@ -1,12 +0,0 @@ -# textdomain: flowers -Red Rose=Röd ros -Orange Tulip=Orange Tulpan -Yellow Dandelion=Gul Maskros -Green Chrysanthemum=Grön Krysantemum -Blue Geranium=Blå Geranium -Viola=Violett Viola -White Dandelion=Vit Maskros -Black Tulip=Svart Tulpan -Red Mushroom=Röd Svamp -Brown Mushroom=Brun Svamp -Waterlily=Näckros diff --git a/mods/flowers/locale/flowers.sv.tr b/mods/flowers/locale/flowers.sv.tr new file mode 100644 index 00000000..c8a26a3d --- /dev/null +++ b/mods/flowers/locale/flowers.sv.tr @@ -0,0 +1,12 @@ +# textdomain: flowers +Red Rose=Röd ros +Orange Tulip=Orange tulpan +Yellow Dandelion=Gul maskros +Green Chrysanthemum=Grön krysantemum +Blue Geranium=Blå geranium +Viola=Violett viola +White Dandelion=Vit maskros +Black Tulip=Svart tulpan +Red Mushroom=Röd svamp +Brown Mushroom=Brun svamp +Waterlily=Näckros diff --git a/mods/game_commands/locale/game_commands.se.tr b/mods/game_commands/locale/game_commands.sv.tr similarity index 72% rename from mods/game_commands/locale/game_commands.se.tr rename to mods/game_commands/locale/game_commands.sv.tr index afefc9b3..e3110dad 100644 --- a/mods/game_commands/locale/game_commands.se.tr +++ b/mods/game_commands/locale/game_commands.sv.tr @@ -1,4 +1,4 @@ # textdomain: game_commands Kill yourself to respawn=Döda dig själv för att respawna -No static_spawnpoint defined=Ingen static_spawnpoint definierat +No static_spawnpoint defined=Ingen static_spawnpoint definierad You need to be online to be killed!=Du måsta vara online för att bli dödad! diff --git a/mods/keys/locale/keys.se.tr b/mods/keys/locale/keys.sv.tr similarity index 69% rename from mods/keys/locale/keys.se.tr rename to mods/keys/locale/keys.sv.tr index 2d901df9..f666eb3d 100644 --- a/mods/keys/locale/keys.se.tr +++ b/mods/keys/locale/keys.sv.tr @@ -2,4 +2,4 @@ Key=Nyckel Key to @1's @2=Nyckel till @1s @2 -Skeleton Key=Skelett Nyckel +Skeleton Key=Skelettnyckel diff --git a/mods/map/locale/map.se.tr b/mods/map/locale/map.se.tr deleted file mode 100644 index de6ac361..00000000 --- a/mods/map/locale/map.se.tr +++ /dev/null @@ -1,3 +0,0 @@ -# textdomain: map -Mapping Kit=Kartläggningssats -Use with 'Minimap' key=Använd med 'Minimap' tangent diff --git a/mods/map/locale/map.sv.tr b/mods/map/locale/map.sv.tr new file mode 100644 index 00000000..bc79d44e --- /dev/null +++ b/mods/map/locale/map.sv.tr @@ -0,0 +1,3 @@ +# textdomain: map +Mapping Kit=Kartläggningssats +Use with 'Minimap' key=Använd med 'Minimap'-tangent diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.sv.tr b/mods/mtg_craftguide/locale/mtg_craftguide.sv.tr new file mode 100644 index 00000000..00b40564 --- /dev/null +++ b/mods/mtg_craftguide/locale/mtg_craftguide.sv.tr @@ -0,0 +1,53 @@ +# textdomain: mtg_craftguide +Any coal=Någon typ av kol +Any sand=Någon typ av sand +Any wool=Någon typ av ull +Any stick=Någon typ av pinne +Any vessel=Någon typ av fartygshylla +Any wood planks=Någon typ av träplanka +Any kind of stone block=Någon typ av stenblock +Any red flower=Någon typ av röd blomma +Any blue flower=Någon typ av blå blomma +Any black flower=Någon typ av svart blomma +Any green flower=Någon typ av grön blomma +Any white flower=Någon typ av vit blomma +Any orange flower=Någon typ av orange blomma +Any violet flower=Någon typ av violett blomma +Any yellow flower=Någon typ av gul blomma +Any red dye=Någon typ av röd färg +Any blue dye=Någon typ av blå färg +Any cyan dye=Någon typ av cyan färg +Any grey dye=Någon typ av grå färg +Any pink dye=Någon typ av rosa färg +Any black dye=Någon typ av svart färg +Any brown dye=Någon typ av brun färg +Any green dye=Någon typ av grön färg +Any white dye=Någon typ av vit färg +Any orange dye=Någon typ av orange färg +Any violet dye=Någon typ av violett färg +Any yellow dye=Någon typ av gul färg +Any magenta dye=Någon typ av magenta färg +Any dark grey dye=Någon typ av mörkgrå färg +Any dark green dye=Någon typ av mörkgrön färg +# Label for group ingredients +G=G +Any item belonging to the group(s): @1=Vilket föremål som helst som tillhör grupp(erna): @1 +Unknown Item=Okänt föremål +Fuel=Bränsle +Usage @1 of @2=Användning @1 av @2 +Recipe @1 of @2=Recept @1 av @2 +Previous recipe=Föregående recept +Next recipe=Nästa recept +Recipe is too big to be displayed.=Receptet är för stort för att visas. +Shapeless=Formlöst +Cooking time: @1=Tillagningstid: @1 +Search=Sök +Reset=Återställ +Previous page=Föregående sida +Next page=Nästa sida +No items to show.=Inga föremål att visa. +No usages.=Inga användningsområden. +Click again to show recipes.=Tryck igen för att visa recept. +No recipes.=Inga recept. +Click again to show usages.=Tryck igen för att visa användningsområden. +Recipes=Recept diff --git a/mods/screwdriver/locale/screwdriver.se.tr b/mods/screwdriver/locale/screwdriver.sv.tr similarity index 100% rename from mods/screwdriver/locale/screwdriver.se.tr rename to mods/screwdriver/locale/screwdriver.sv.tr diff --git a/mods/sethome/locale/sethome.se.tr b/mods/sethome/locale/sethome.sv.tr similarity index 71% rename from mods/sethome/locale/sethome.se.tr rename to mods/sethome/locale/sethome.sv.tr index 4ae8c528..60673ae5 100644 --- a/mods/sethome/locale/sethome.se.tr +++ b/mods/sethome/locale/sethome.sv.tr @@ -1,8 +1,8 @@ # textdomain: sethome -Can use /sethome and /home=Kan används /sethome och /home +Can use /sethome and /home=Kan använda /sethome och /home Teleport you to your home point=Teleportera dig till din hempunkt Teleported to home!=Teleporterad hem! Set a home using /sethome=Ställ in ett hem med /sethome Set your home point=Ställ in din hempunkt Home set!=Hem inställt! -Player not found!=Spelare inte hittad! +Player not found!=Spelare finns inte! diff --git a/mods/sfinv/locale/sfinv.se.tr b/mods/sfinv/locale/sfinv.sv.tr similarity index 100% rename from mods/sfinv/locale/sfinv.se.tr rename to mods/sfinv/locale/sfinv.sv.tr diff --git a/mods/stairs/locale/stairs.se.tr b/mods/stairs/locale/stairs.se.tr deleted file mode 100644 index 3ace06d0..00000000 --- a/mods/stairs/locale/stairs.se.tr +++ /dev/null @@ -1,145 +0,0 @@ -# textdomain: stairs -Glass Stair=Glastrappa -Glass Slab=Glasplatta -Inner Glass Stair=Inre glasstrappa -Outer Glass Stair=Yttre glasstrappa -Obsidian Glass Stair=Obsidian Glass Trappa -Obsidian Glass Slab=Obsidian glasplatta -Inner Obsidian Glass Stair=Inre Obsidian Glass Trappa -Outer Obsidian Glass Stair=Yttre Obsidian Glass Trappa -Wooden Stair=Trätrappa -Inner Wooden Stair=Inre trätrappa -Outer Wooden Stair=Yttre trätrappa -Wooden Slab=Träplatta -Jungle Wood Stair=Jungle Wood Stair -Inner Jungle Wood Stair=Inre Jungle Wood Stair -Outer Jungle Wood Stair=Ytter Jungle Wood Stair -Jungle Wood Slab=Jungle Wood Platta -Pine Wood Stair=Pine Wood Stair -Inner Pine Wood Stair=Inre tall trä trappa -Outer Pine Wood Stair=Ytter tall Trätrappa -Pine Wood Slab=Tallskiva -Acacia Wood Stair=Acacia Wood Stair -Inner Acacia Wood Stair=Inre Acacia Trätrappa -Outer Acacia Wood Stair=Yttre Acacia Trätrappa -Acacia Wood Slab=Acacia träplatta -Aspen Wood Stair=Asp Trä Stair -Inner Aspen Wood Stair=Inre Aspen Trätrappa -Outer Aspen Wood Stair=Yttre Aspen Trätrappa -Aspen Wood Slab=Asp Trä Platta -Stone Stair=Stentrappa -Inner Stone Stair=Inre stentrappa -Outer Stone Stair=Yttre stentrappa -Stone Slab=Stenplatta -Cobblestone Stair=Kullersten trappa -Inner Cobblestone Stair=Inre kullerstensTrappa -Outer Cobblestone Stair=Yttre kullerstensTrappa -Cobblestone Slab=Kullerstenplatta -Mossy Cobblestone Stair=Mossig kullerstensTrappa -Inner Mossy Cobblestone Stair=Inre mossiga kullerstensTrappa -Outer Mossy Cobblestone Stair=Yttre mossiga kullerstensTrappa -Mossy Cobblestone Slab=Mossig kullerstenplatta -Stone Brick Stair=Sten Brick Trappa -Inner Stone Brick Stair=Inre sten tegel trappa -Outer Stone Brick Stair=Yttre sten tegel trappa -Stone Brick Slab=Sten tegelplatta -Stone Block Stair=Sten Block Trappa -Inner Stone Block Stair=Inre stenblock trappa -Outer Stone Block Stair=Yttre stenblock trappa -Stone Block Slab=Stenblockplatta -Desert Stone Stair=Öken Sten Trappa -Inner Desert Stone Stair=Inre Öken Sten Stair -Outer Desert Stone Stair=Outer Öken Sten Stair -Desert Stone Slab=Öken Sten Platta -Desert Cobblestone Stair=Öken Kullersten Trappa -Inner Desert Cobblestone Stair=Inre Öken Kullersten Trappa -Outer Desert Cobblestone Stair=Outer Öken Kullersten Trappa -Desert Cobblestone Slab=Öken Kullersten Platta -Desert Stone Brick Stair=Öken Sten Brick Trappa -Inner Desert Stone Brick Stair=Inre Öken Sten Brick Trappa -Outer Desert Stone Brick Stair=Outer Öken Sten Brick Trappa -Desert Stone Brick Slab=Öken Sten tegelplatta -Desert Stone Block Stair=Öken Sten Block Trappa -Inner Desert Stone Block Stair=Inre Öken Sten Block Stair -Outer Desert Stone Block Stair=Outer Öken Sten Block Trappa -Desert Stone Block Slab=Öken Sten Block Platta -Sandstone Stair=Sandstenstrappa -Inner Sandstone Stair=Inre Sandstenstrappa -Outer Sandstone Stair=Yttre Sandstenstrappa -Sandstone Slab=Sandstenplatta -Sandstone Brick Stair=Sandsten tegel trappa -Inner Sandstone Brick Stair=Inre Sandsten tegel trappa -Outer Sandstone Brick Stair=Yttre Sandsten tegel trappa -Sandstone Brick Slab=Sandsten tegelplatta -Sandstone Block Stair=Sandsten block trappa -Inner Sandstone Block Stair=Inre Sandsten block trappa -Outer Sandstone Block Stair=Yttre Sandsten block trappa -Sandstone Block Slab=Sandsten Block Platta -Desert Sandstone Stair=Öken Sandsten Trappa -Inner Desert Sandstone Stair=Inre Öken Sandsten Trappa -Outer Desert Sandstone Stair=Outer Öken Sandsten Trappa -Desert Sandstone Slab=Öken Sandsten Platta -Desert Sandstone Brick Stair=Öken Sandsten Brick Trappa -Inner Desert Sandstone Brick Stair=Inre Öken Sandsten Brick Trappa -Outer Desert Sandstone Brick Stair=Outer Öken Sandsten Brick Trappa -Desert Sandstone Brick Slab=Öken Sandsten Tegelplatta -Desert Sandstone Block Stair=Öken Sandsten Block Trappa -Inner Desert Sandstone Block Stair=Inre Öken Sandsten Block Trappa -Outer Desert Sandstone Block Stair=Outer Öken Sandsten Block Trappa -Desert Sandstone Block Slab=Öken Sandsten Block Platta -Silver Sandstone Stair=Silver Sandsten trappa -Inner Silver Sandstone Stair=Inre silver Sandsten trappa -Outer Silver Sandstone Stair=Yttre silver Sandsten trappa -Silver Sandstone Slab=Silver Sandsten platta -Silver Sandstone Brick Stair=Silver Sandsten tegel trappa -Inner Silver Sandstone Brick Stair=Inre silver Sandsten tegel trappa -Outer Silver Sandstone Brick Stair=Yttre silver Sandsten tegel trappa -Silver Sandstone Brick Slab=Silver Sandsten tegelplatta -Silver Sandstone Block Stair=Silver Sandsten block trappa -Inner Silver Sandstone Block Stair=Inre silver Sandsten block trappa -Outer Silver Sandstone Block Stair=Yttre silver Sandsten block trappa -Silver Sandstone Block Slab=Silver Sandsten block platta -Obsidian Stair=Obsidian Trappa -Inner Obsidian Stair=Inre Obsidian Trappa -Outer Obsidian Stair=Yttre Obsidian Trappa -Obsidian Slab=Obsidian Platta -Obsidian Brick Stair=Obsidian Brick Stair -Inner Obsidian Brick Stair=Inre Obsidian Brick Trappa -Outer Obsidian Brick Stair=Yttre Obsidian Brick Trappa -Obsidian Brick Slab=Obsidian tegelplatta -Obsidian Block Stair=Obsidian Block Stair -Inner Obsidian Block Stair=Inre Obsidian Block Trappa -Outer Obsidian Block Stair=Yttre Obsidian Block Trappa -Obsidian Block Slab=Obsidian Block Slab -Brick Stair=Tegel trappa -Inner Brick Stair=Inre tegel trappa -Outer Brick Stair=Yttre tegel trappa -Brick Slab=Tegelplatta -Steel Block Stair=Stålblock trappa -Inner Steel Block Stair=Inre stålblock trappa -Outer Steel Block Stair=Yttre stålblocktrappa -Steel Block Slab=Stålblockplatta -Tin Block Stair=Tinn Block Trappa -Inner Tin Block Stair=Inre tennblock trappa -Outer Tin Block Stair=Yttre tennblock trappa -Tin Block Slab=Tennblockplatta -Copper Block Stair=Kopparblock trappa -Inner Copper Block Stair=Inre kopparblock trappa -Outer Copper Block Stair=Yttre kopparblock trappa -Copper Block Slab=Kopparblockplatta -Bronze Block Stair=Bronze Block Trappa -Inner Bronze Block Stair=Inre bronsblock trappa -Outer Bronze Block Stair=Yttre bronsblock trappa -Bronze Block Slab=Bronsblockplatta -Gold Block Stair=Guldblockstrappa -Inner Gold Block Stair=Inre guldblock trappa -Outer Gold Block Stair=Yttre guldblock trappa -Gold Block Slab=Guldblockplatta -Ice Stair=Ice Stair -Inner Ice Stair=Inre istrappa -Outer Ice Stair=Yttre istrappa -Ice Slab=Isplatta -Snow Block Stair=Snow Block Stair -Inner Snow Block Stair=Inre snöblock trappa -Outer Snow Block Stair=Yttre snöblock trappa -Snow Block Slab= diff --git a/mods/stairs/locale/stairs.sv.tr b/mods/stairs/locale/stairs.sv.tr new file mode 100644 index 00000000..8044af81 --- /dev/null +++ b/mods/stairs/locale/stairs.sv.tr @@ -0,0 +1,145 @@ +# textdomain: stairs +Glass Stair=Glastrappa +Glass Slab=Glasplatta +Inner Glass Stair=Inre glasstrappa +Outer Glass Stair=Yttre glasstrappa +Obsidian Glass Stair=Obsidianglasstrappa +Obsidian Glass Slab=Obsidianglasplatta +Inner Obsidian Glass Stair=Inre obsidianglastrappa +Outer Obsidian Glass Stair=Yttre obsidianglastrappa +Wooden Stair=Trätrappa +Inner Wooden Stair=Inre trätrappa +Outer Wooden Stair=Yttre trätrappa +Wooden Slab=Träplatta +Jungle Wood Stair=Djungelträtrappa +Inner Jungle Wood Stair=Inre djungelträtrappa +Outer Jungle Wood Stair=Ytter djungelträtrappa +Jungle Wood Slab=Djungelträplatta +Pine Wood Stair=Tallträplatta +Inner Pine Wood Stair=Inre tallträplatta +Outer Pine Wood Stair=Ytter tallträplatta +Pine Wood Slab=Tallskiva +Acacia Wood Stair=Acaciatrappa +Inner Acacia Wood Stair=Inre acaciatrappa +Outer Acacia Wood Stair=Yttre acaciatrappa +Acacia Wood Slab=Acaciaplatta +Aspen Wood Stair=Aspträtrappa +Inner Aspen Wood Stair=Inre aspträtrappa +Outer Aspen Wood Stair=Yttre aspträtrappa +Aspen Wood Slab=Aspträplatta +Stone Stair=Stentrappa +Inner Stone Stair=Inre stentrappa +Outer Stone Stair=Yttre stentrappa +Stone Slab=Stenplatta +Cobblestone Stair=Kullerstenstrappa +Inner Cobblestone Stair=Inre kullerstenstrappa +Outer Cobblestone Stair=Yttre kullerstenstrappa +Cobblestone Slab=Kullerstenplatta +Mossy Cobblestone Stair=Mossig kullerstenstrappa +Inner Mossy Cobblestone Stair=Inre mossig kullerstenstrappa +Outer Mossy Cobblestone Stair=Yttre mossig kullerstenstrappa +Mossy Cobblestone Slab=Mossig kullerstenplatta +Stone Brick Stair=Stentegeltrappa +Inner Stone Brick Stair=Inre stentegeltrappa +Outer Stone Brick Stair=Yttre stentegeltrappa +Stone Brick Slab=Stentegelplatta +Stone Block Stair=Stenblockstrappa +Inner Stone Block Stair=Inre stenblockstrappa +Outer Stone Block Stair=Yttre stenblockstrappa +Stone Block Slab=Stenblocksplatta +Desert Stone Stair=Ökenstentrappa +Inner Desert Stone Stair=Inre ökenstentrappa +Outer Desert Stone Stair=Yttre ökenstentrappa +Desert Stone Slab=Ökenstenplatta +Desert Cobblestone Stair=Ökenkullerstenstrappa +Inner Desert Cobblestone Stair=Inre ökenkullerstenstrappa +Outer Desert Cobblestone Stair=Yttre ökenkullerstenstrappa +Desert Cobblestone Slab=Ökenkullerstensplatta +Desert Stone Brick Stair=Ökentegelstenstrappa +Inner Desert Stone Brick Stair=Inre Ökentegelstenstrappa +Outer Desert Stone Brick Stair=Yttre Ökentegelstenstrappa +Desert Stone Brick Slab=Ökentegelstensplatta +Desert Stone Block Stair=Ökenstenblockstrappa +Inner Desert Stone Block Stair=Inre ökenstenblockstrappa +Outer Desert Stone Block Stair=Yttre ökenstenblockstrappa +Desert Stone Block Slab=Ökenstenblocksplatta +Sandstone Stair=Sandstenstrappa +Inner Sandstone Stair=Inre Sandstenstrappa +Outer Sandstone Stair=Yttre Sandstenstrappa +Sandstone Slab=Sandstenplatta +Sandstone Brick Stair=Sandstentegeltrappa +Inner Sandstone Brick Stair=Inre Sandstentegeltrappa +Outer Sandstone Brick Stair=Yttre Sandstentegeltrappa +Sandstone Brick Slab=Sandstentegelplatta +Sandstone Block Stair=Sandstenblockstrappa +Inner Sandstone Block Stair=Inre Sandstenblockstrappa +Outer Sandstone Block Stair=Yttre Sandstenblockstrappa +Sandstone Block Slab=Sandstenblocksplatta +Desert Sandstone Stair=Ökensandstenstrappa +Inner Desert Sandstone Stair=Inre ökensandstenstrappa +Outer Desert Sandstone Stair=Yttre ökensandstenstrappa +Desert Sandstone Slab=Ökensandstensplatta +Desert Sandstone Brick Stair=Ökensandstentegeltrappa +Inner Desert Sandstone Brick Stair=Inre ökensandstentegeltrappa +Outer Desert Sandstone Brick Stair=Yttre ökensandstentegeltrappa +Desert Sandstone Brick Slab=Ökensandstentegelplatta +Desert Sandstone Block Stair=Ökensandstentegeltrappa +Inner Desert Sandstone Block Stair=Inre ökensandstentegeltrappa +Outer Desert Sandstone Block Stair=Yttre ökensandstentegeltrappa +Desert Sandstone Block Slab=Ökensandstentegelplatta +Silver Sandstone Stair=Silversandstenstrappa +Inner Silver Sandstone Stair=Inre silversandstenstrappa +Outer Silver Sandstone Stair=Yttre silversandstenstrappa +Silver Sandstone Slab=Silversandstenstrappa +Silver Sandstone Brick Stair=Silversandstenstegeltrappa +Inner Silver Sandstone Brick Stair=Inre silversandstenstegeltrappa +Outer Silver Sandstone Brick Stair=Yttre silversandstenstegeltrappa +Silver Sandstone Brick Slab=Silversandstenstegelplatta +Silver Sandstone Block Stair=Silversandstenblockstrappa +Inner Silver Sandstone Block Stair=Inre silversandstenblockstrappa +Outer Silver Sandstone Block Stair=Yttre silversandstenblockstrappa +Silver Sandstone Block Slab=Silversandstenblocksplatta +Obsidian Stair=Obsidiantrappa +Inner Obsidian Stair=Inre obsidiantrappa +Outer Obsidian Stair=Yttre obsidiantrappa +Obsidian Slab=Obsidianplatta +Obsidian Brick Stair=Obsidiantegeltrappa +Inner Obsidian Brick Stair=Inre obsidiantegeltrappa +Outer Obsidian Brick Stair=Yttre obsidiantegeltrappa +Obsidian Brick Slab=Obsidiantegelplatta +Obsidian Block Stair=Obsidianblocktrappa +Inner Obsidian Block Stair=Inre Obsidianblocktrappa +Outer Obsidian Block Stair=Yttre Obsidianblocktrappa +Obsidian Block Slab=Obsidianblockplatta +Brick Stair=Tegeltrappa +Inner Brick Stair=Inre tegeltrappa +Outer Brick Stair=Yttre tegeltrappa +Brick Slab=Tegelplatta +Steel Block Stair=Ståltrappa +Inner Steel Block Stair=Inre ståltrappa +Outer Steel Block Stair=Yttre ståltrappa +Steel Block Slab=Stålplatta +Tin Block Stair=Tenntrappa +Inner Tin Block Stair=Inre tenntrappa +Outer Tin Block Stair=Yttre tenntrappa +Tin Block Slab=Tennplatta +Copper Block Stair=Koppartrappa +Inner Copper Block Stair=Inre koppartrappa +Outer Copper Block Stair=Yttre koppartrappa +Copper Block Slab=Kopparplatta +Bronze Block Stair=Bronstrappa +Inner Bronze Block Stair=Inre bronstrappa +Outer Bronze Block Stair=Yttre bronstrappa +Bronze Block Slab=Bronsplatta +Gold Block Stair=Guldtrappa +Inner Gold Block Stair=Inre guldtrappa +Outer Gold Block Stair=Yttre guldtrappa +Gold Block Slab=Guldplatta +Ice Stair=Istrappa +Inner Ice Stair=Inre istrappa +Outer Ice Stair=Yttre istrappa +Ice Slab=Isplatta +Snow Block Stair=Snöblockstrappa +Inner Snow Block Stair=Inre snöblockstrappa +Outer Snow Block Stair=Yttre snöblockstrappa +Snow Block Slab=Snöblocksplatta diff --git a/mods/tnt/locale/tnt.se.tr b/mods/tnt/locale/tnt.sv.tr similarity index 100% rename from mods/tnt/locale/tnt.se.tr rename to mods/tnt/locale/tnt.sv.tr diff --git a/mods/vessels/locale/vessels.se.tr b/mods/vessels/locale/vessels.se.tr deleted file mode 100644 index a7c3a989..00000000 --- a/mods/vessels/locale/vessels.se.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: vessels -Empty Vessels Shelf=Tom Fartygshylla -Vessels Shelf (@1 items)=Fartygshylla (@1 saker) -Vessels Shelf=Fartygshylla -Empty Glass Bottle=Tom Glasflska -Empty Drinking Glass=Tom Drycksflaska -Empty Heavy Steel Bottle=Tom Tung Stål Flaska -Glass Fragments=Glasbitar diff --git a/mods/vessels/locale/vessels.sv.tr b/mods/vessels/locale/vessels.sv.tr new file mode 100644 index 00000000..48e76e29 --- /dev/null +++ b/mods/vessels/locale/vessels.sv.tr @@ -0,0 +1,8 @@ +# textdomain: vessels +Empty Vessels Shelf=Tom kärlhylla +Vessels Shelf (@1 items)=Kärlhylla (@1 saker) +Vessels Shelf=Kärlhylla +Empty Glass Bottle=Tom glasflaska +Empty Drinking Glass=Tom drycksflaska +Empty Heavy Steel Bottle=Tom tungstålsflaska +Glass Fragments=Glasbitar diff --git a/mods/walls/locale/walls.se.tr b/mods/walls/locale/walls.se.tr deleted file mode 100644 index 32589464..00000000 --- a/mods/walls/locale/walls.se.tr +++ /dev/null @@ -1,4 +0,0 @@ -# textdomain: walls -Cobblestone Wall=Kullerstens Vägg -Mossy Cobblestone Wall=Mossig Kullerstens Vägg -Desert Cobblestone Wall=Öken Kullerstens Vägg diff --git a/mods/walls/locale/walls.sv.tr b/mods/walls/locale/walls.sv.tr new file mode 100644 index 00000000..1ad4a29e --- /dev/null +++ b/mods/walls/locale/walls.sv.tr @@ -0,0 +1,4 @@ +# textdomain: walls +Cobblestone Wall=Kullerstensvägg +Mossy Cobblestone Wall=Mossig kullerstensvägg +Desert Cobblestone Wall=Ökenkullerstensvägg diff --git a/mods/wool/locale/wool.se.tr b/mods/wool/locale/wool.se.tr deleted file mode 100644 index e026ac4c..00000000 --- a/mods/wool/locale/wool.se.tr +++ /dev/null @@ -1,16 +0,0 @@ -# textdomain: wool -White Wool=Vit Ull -Grey Wool=Grå Ull -Dark Grey Wool=Mörk Grå Ull -Black Wool=Svart Ull -Violet Wool=Violett Ull -Blue Wool=Blå Ull -Cyan Wool=Cyan Ull -Dark Green Wool=Mörk Grön Ull -Green Wool=Grön Ull -Yellow Wool=Gul Ull -Brown Wool=Brun Ull -Orange Wool=Orange Ull -Red Wool=Röd Ull -Magenta Wool=Magenta Ull -Pink Wool=Rosa Ull diff --git a/mods/wool/locale/wool.sv.tr b/mods/wool/locale/wool.sv.tr new file mode 100644 index 00000000..bfce2140 --- /dev/null +++ b/mods/wool/locale/wool.sv.tr @@ -0,0 +1,16 @@ +# textdomain: wool +White Wool=Vit ull +Grey Wool=Grå ull +Dark Grey Wool=Mörkgrå ull +Black Wool=Svart ull +Violet Wool=Violett ull +Blue Wool=Blå ull +Cyan Wool=Cyan ull +Dark Green Wool=Mörkgrön ull +Green Wool=Grön ull +Yellow Wool=Gul ull +Brown Wool=Brun ull +Orange Wool=Orange ull +Red Wool=Röd ull +Magenta Wool=Magenta ull +Pink Wool=Rosa ull diff --git a/mods/xpanes/locale/xpanes.se.tr b/mods/xpanes/locale/xpanes.se.tr deleted file mode 100644 index ff01d2a4..00000000 --- a/mods/xpanes/locale/xpanes.se.tr +++ /dev/null @@ -1,6 +0,0 @@ -# textdomain: xpanes -Glass Pane=Glasruta -Obsidian Glass Pane=Obsidian Glasruta -Steel Bars=Stålgaller -Steel Bar Door=Stålgallers Dörr -Steel Bar Trapdoor=Stålgallers Fallucka diff --git a/mods/xpanes/locale/xpanes.sv.tr b/mods/xpanes/locale/xpanes.sv.tr new file mode 100644 index 00000000..7b615dd3 --- /dev/null +++ b/mods/xpanes/locale/xpanes.sv.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Glasruta +Obsidian Glass Pane=Obsidianglasruta +Steel Bars=Stålgaller +Steel Bar Door=Stålgallerdörr +Steel Bar Trapdoor=Stålgallerfallucka From a5547a3a7655f03cb8b8a2b286dae263ef1f0edb Mon Sep 17 00:00:00 2001 From: baytuch Date: Sun, 30 Jan 2022 01:35:28 +0200 Subject: [PATCH 09/11] Add ukrainian (uk) translation (#2921) Co-authored-by: sfan5 --- mods/beds/locale/beds.uk.tr | 10 + mods/binoculars/locale/binoculars.uk.tr | 3 + mods/boats/locale/boats.uk.tr | 4 + mods/bones/locale/bones.uk.tr | 8 + mods/bucket/locale/bucket.uk.tr | 5 + mods/butterflies/locale/butterflies.uk.tr | 4 + mods/carts/locale/carts.uk.tr | 6 + mods/creative/locale/creative.uk.tr | 10 + mods/default/locale/default.uk.tr | 214 ++++++++++++++++++ mods/doors/locale/doors.uk.tr | 18 ++ mods/dye/locale/dye.uk.tr | 16 ++ mods/farming/locale/farming.uk.tr | 28 +++ mods/fire/locale/fire.uk.tr | 4 + mods/fireflies/locale/fireflies.uk.tr | 5 + mods/flowers/locale/flowers.uk.tr | 12 + mods/game_commands/locale/game_commands.uk.tr | 4 + mods/keys/locale/keys.uk.tr | 4 + mods/map/locale/map.uk.tr | 3 + .../locale/mtg_craftguide.uk.tr | 53 +++++ mods/screwdriver/locale/screwdriver.uk.tr | 3 + mods/sethome/locale/sethome.uk.tr | 8 + mods/sfinv/locale/sfinv.uk.tr | 2 + mods/stairs/locale/stairs.uk.tr | 145 ++++++++++++ mods/tnt/locale/tnt.uk.tr | 4 + mods/vessels/locale/vessels.uk.tr | 8 + mods/walls/locale/walls.uk.tr | 4 + mods/wool/locale/wool.uk.tr | 16 ++ mods/xpanes/locale/xpanes.uk.tr | 6 + 28 files changed, 607 insertions(+) create mode 100644 mods/beds/locale/beds.uk.tr create mode 100644 mods/binoculars/locale/binoculars.uk.tr create mode 100644 mods/boats/locale/boats.uk.tr create mode 100644 mods/bones/locale/bones.uk.tr create mode 100644 mods/bucket/locale/bucket.uk.tr create mode 100644 mods/butterflies/locale/butterflies.uk.tr create mode 100644 mods/carts/locale/carts.uk.tr create mode 100644 mods/creative/locale/creative.uk.tr create mode 100644 mods/default/locale/default.uk.tr create mode 100644 mods/doors/locale/doors.uk.tr create mode 100644 mods/dye/locale/dye.uk.tr create mode 100644 mods/farming/locale/farming.uk.tr create mode 100644 mods/fire/locale/fire.uk.tr create mode 100644 mods/fireflies/locale/fireflies.uk.tr create mode 100644 mods/flowers/locale/flowers.uk.tr create mode 100644 mods/game_commands/locale/game_commands.uk.tr create mode 100644 mods/keys/locale/keys.uk.tr create mode 100644 mods/map/locale/map.uk.tr create mode 100644 mods/mtg_craftguide/locale/mtg_craftguide.uk.tr create mode 100644 mods/screwdriver/locale/screwdriver.uk.tr create mode 100644 mods/sethome/locale/sethome.uk.tr create mode 100644 mods/sfinv/locale/sfinv.uk.tr create mode 100644 mods/stairs/locale/stairs.uk.tr create mode 100644 mods/tnt/locale/tnt.uk.tr create mode 100644 mods/vessels/locale/vessels.uk.tr create mode 100644 mods/walls/locale/walls.uk.tr create mode 100644 mods/wool/locale/wool.uk.tr create mode 100644 mods/xpanes/locale/xpanes.uk.tr diff --git a/mods/beds/locale/beds.uk.tr b/mods/beds/locale/beds.uk.tr new file mode 100644 index 00000000..f95da70b --- /dev/null +++ b/mods/beds/locale/beds.uk.tr @@ -0,0 +1,10 @@ +# textdomain: beds +Fancy Bed=Деталізована Постіль +Simple Bed=Звичайна Постіль +This bed is already occupied!=Ця постіль вже зайнята! +You have to stop moving before going to bed!=Не можна скористатись постіллю на ходу! +Good morning.=Доброго ранку. +@1 of @2 players are in bed=@1 з @2 гравців в ліжку +Force night skip=Пропустити ніч +You can only sleep at night.=Ви можете спати тільки вночі. +Leave Bed=Встати з ліжка diff --git a/mods/binoculars/locale/binoculars.uk.tr b/mods/binoculars/locale/binoculars.uk.tr new file mode 100644 index 00000000..cb1d0e5b --- /dev/null +++ b/mods/binoculars/locale/binoculars.uk.tr @@ -0,0 +1,3 @@ +# textdomain: binoculars +Binoculars=Бінокль +Use with 'Zoom' key=Використовується з правами 'Zoom' diff --git a/mods/boats/locale/boats.uk.tr b/mods/boats/locale/boats.uk.tr new file mode 100644 index 00000000..662ba6fc --- /dev/null +++ b/mods/boats/locale/boats.uk.tr @@ -0,0 +1,4 @@ +# textdomain: boats +Boat cruise mode on=Режим мандрування на човні увімкнено +Boat cruise mode off=Режим мандрування на човні вимкнено +Boat=Човен diff --git a/mods/bones/locale/bones.uk.tr b/mods/bones/locale/bones.uk.tr new file mode 100644 index 00000000..58ffe77b --- /dev/null +++ b/mods/bones/locale/bones.uk.tr @@ -0,0 +1,8 @@ +# textdomain: bones +Bones=Кістки +@1's old bones=Старі кістки @1 +@1 died at @2.=@1 помер в @2. +@1 died at @2, and dropped their inventory.=@1 помер в @2, та загубив вміст свого інвентарю. +@1 died at @2, and bones were placed.=@1 помер в @2, розміщені кістки. +@1's fresh bones=нові кістки @1 +@1's bones=кістки @1 diff --git a/mods/bucket/locale/bucket.uk.tr b/mods/bucket/locale/bucket.uk.tr new file mode 100644 index 00000000..a5251a5a --- /dev/null +++ b/mods/bucket/locale/bucket.uk.tr @@ -0,0 +1,5 @@ +# textdomain: bucket +Empty Bucket=Пусте Відро +Water Bucket=Відро З Водою +River Water Bucket=Відро З Річною Водою +Lava Bucket=Відро З Лавою diff --git a/mods/butterflies/locale/butterflies.uk.tr b/mods/butterflies/locale/butterflies.uk.tr new file mode 100644 index 00000000..4a5995e8 --- /dev/null +++ b/mods/butterflies/locale/butterflies.uk.tr @@ -0,0 +1,4 @@ +# textdomain: butterflies +White Butterfly=Білий Метелик +Red Butterfly=Червоний Метелик +Violet Butterfly=Фіолетовий Метелик diff --git a/mods/carts/locale/carts.uk.tr b/mods/carts/locale/carts.uk.tr new file mode 100644 index 00000000..2b236c54 --- /dev/null +++ b/mods/carts/locale/carts.uk.tr @@ -0,0 +1,6 @@ +# textdomain: carts +Cart=Вагонетка +(Sneak+Click to pick up)=(Пригніться та клікніть по вагонетці, щоб забрати) +Rail=Рейки +Powered Rail=Задіяні Рейки +Brake Rail=Гальмівні Рейки diff --git a/mods/creative/locale/creative.uk.tr b/mods/creative/locale/creative.uk.tr new file mode 100644 index 00000000..4e68caa2 --- /dev/null +++ b/mods/creative/locale/creative.uk.tr @@ -0,0 +1,10 @@ +# textdomain: creative +Allow player to use creative inventory=Дозволити гравцеві використати творчий інвентар +Search=Пошук +Reset=Скинути +Previous page=Попередня сторінка +Next page=Наступна сторінка +All=Все +Nodes=Ноди +Tools=Інструменти +Items=Предмети diff --git a/mods/default/locale/default.uk.tr b/mods/default/locale/default.uk.tr new file mode 100644 index 00000000..2432cfa6 --- /dev/null +++ b/mods/default/locale/default.uk.tr @@ -0,0 +1,214 @@ +# textdomain: default +Locked Chest=Заблокована Скриня +Locked Chest (owned by @1)=Заблокована Скриня (власник: @1) +You do not own this chest.=Ви не власник цієї скрині. +a locked chest=заблокована скриня +Chest=Скриня +Write=Писати +Read=Читати +Title:=Заголовок: +Contents:=Вміст: +Save=Зберегти +by @1=@1 +Page @1 of @2=Сторінка @1 з @2 +"@1" by @2="@1" @2 +Blueberries=Чорниці +Book=Книга +Book with Text=Книга З Текстом +Bronze Ingot=Бронзовий Злиток +Clay Brick=Глиняна Цегла +Clay Lump=Шматок Глини +Coal Lump=Шматок Вугілля +Copper Ingot=Мідний Злиток +Copper Lump=Шматок Меді +Diamond=Алмаз +Flint=Кремінь +Gold Ingot=Золотий Злиток +Gold Lump=Шматок Золота +Iron Lump=Шматок Заліза +Mese Crystal=Кристал Месе +Mese Crystal Fragment=Уламок Кристалу Месе +Obsidian Shard=Обсидіановий Уламок +Paper=Папір +Steel Ingot=Залізний Злиток +Stick=Палка +Tin Ingot=Шматок Олова +Tin Lump=Уламок Олова +Furnace is empty=Пічка Порожня +100% (output full)=100% (повне приготування) +@1%=@1% +Not cookable=Не може бути приготовлено +Empty=Порожньо +Furnace active=Піч запалена +Furnace inactive=Піч не запалена +(Item: @1; Fuel: @2)=(Предмет: @1; Паливо: @2) +Furnace=Піч +Stone=Камінь +Cobblestone=Кругляк +Stone Brick=Кам'яна Цегла +Stone Block=Кам'яний Блок +Mossy Cobblestone=Моховий Кругляк +Desert Stone=Пустельний Камінь +Desert Cobblestone=Пустельний Камінь +Desert Stone Brick=Пустельна Кам'яна Цегла +Desert Stone Block=Пустельний Кам'яний Блок +Sandstone=Піщаник +Sandstone Brick=Цегла З Піщанику +Sandstone Block=Блок З Піщанику +Desert Sandstone=Пустельний Піщаник +Desert Sandstone Brick=Пустельна Цегла З Піщанику +Desert Sandstone Block=Пустельний Блок З Піщанику +Silver Sandstone=Срібний Піщаник +Silver Sandstone Brick=Цегла Із Срібного Піщанику +Silver Sandstone Block=Блок Із Срібного Піщанику +Obsidian=Обсидіан +Obsidian Brick=Обсидіанова Цегла +Obsidian Block=Обсидіановий Блок +Dirt=Земля +Dirt with Grass=Земля З Травою +Dirt with Grass and Footsteps=Земля З Травою Та Слідами +Dirt with Savanna Grass=Земля Із Саванною Травою +Dirt with Snow=Земля Зі Снігом +Dirt with Rainforest Litter=Земля Із Тропічною Підстилкою +Dirt with Coniferous Litter=Земля Із Сосновою Підстилкою +Savanna Dirt=Саваннова Земля +Savanna Dirt with Savanna Grass=Саваннова Земля Із Травою +Permafrost=Заморожений Ґрунт +Permafrost with Stones=Заморожений Ґрунт Із Камінням +Permafrost with Moss=Заморожена Ґрунт із Мохом +Sand=Пісок +Desert Sand=Пустельний Пісок +Silver Sand=Срібний Пісок +Gravel=Гравій +Clay=Глиняний Блок +Snow=Сніг +Snow Block=Сніговий Блок +Ice=Лід +Cave Ice=Печерний Лід +Apple Tree=Стовбур Яблуні +Apple Wood Planks=Яблуневі Дошки +Apple Tree Sapling=Саджанець Яблуні +Apple Tree Leaves=Яблуневе Листя +Apple=Яблуко +Apple Marker=Яблучна Мітка +Jungle Tree=Стовбур Тропічного Дерева +Jungle Wood Planks=Дошки З Тропічного Дерева +Jungle Tree Leaves=Листя Тропічного Дерева +Jungle Tree Sapling=Саджанець Тропічного Дерева +Emergent Jungle Tree Sapling=Саджанець Тропічного Дерева, Що Виріс +Pine Tree=Сосновий Стовбур +Pine Wood Planks=Соснові Дошки +Pine Needles=Соснова Хвоя +Pine Tree Sapling=Саджанець Сосни +Acacia Tree=Стовбур Акації +Acacia Wood Planks=Дошки Акації +Acacia Tree Leaves=Листя Акації +Acacia Tree Sapling=Саджанець Акації +Aspen Tree=Стовбур Осики +Aspen Wood Planks=Осикові Дошки +Aspen Tree Leaves=Осикове Листя +Aspen Tree Sapling=Саджанець Осики +Coal Ore=Поклади Вугілля +Coal Block=Вугільний Блок +Iron Ore=Залізна Руда +Steel Block=Сталевий Блок +Copper Ore=Мідна Руда +Copper Block=Мідний Блок +Tin Ore=Олов'яна Руда +Tin Block=Олов'яний Блок +Bronze Block=Бронзовий Блок +Mese Ore=Месева Руда +Mese Block=Месевий Блок +Gold Ore=Золота Руда +Gold Block=Золотий Блок +Diamond Ore=Поклади Алмазу +Diamond Block=Алмазний Блок +Cactus=Кактус +Large Cactus Seedling=Саджанець Кактуса +Papyrus=Папірус +Dry Shrub=Сухий Кущ +Jungle Grass=Тропічна Трава +Grass=Трава +Savanna Grass=Саваннова Трава +Fern=Папороть +Marram Grass=Пісколюб +Bush Stem=Стебла Куща +Bush Leaves=Листя Куща +Bush Sapling=Саджанець Куща +Blueberry Bush Leaves with Berries=Кущ Чорниці З Ягодами +Blueberry Bush Leaves=Кущ Чорниці +Blueberry Bush Sapling=Саджанець Куща Чорниці +Acacia Bush Stem=Стебла Куща Акації +Acacia Bush Leaves=Листя Куща Акації +Acacia Bush Sapling=Саджанець Куща Акації +Pine Bush Stem=Стебла Хвойного Куща +Pine Bush Needles=Хвоя Куща +Pine Bush Sapling=Саджанець Хвойного Куща +Kelp=Ламінарія +Green Coral=Зелений Корал +Pink Coral=Рожевий Корал +Cyan Coral=Блакитний Корал +Brown Coral=Коричневий Корал +Orange Coral=Помаранчевий Корал +Coral Skeleton=Кораловий Остов +Water Source=Водне Джерело +Flowing Water=Проточна Вода +River Water Source=Річкове Водне Джерело +Flowing River Water=Проточна Річна Вода +Lava Source=Лавове Джерело +Flowing Lava=Проточна Лава +Empty Bookshelf=Порожня Книжкова Полиця +Bookshelf (@1 written, @2 empty books)=Книжкова полиця (@1 написано, @2 чисті книги) +Bookshelf=Книжкова Полиця +Text too long=Текст надто довгий +"@1"="@1" +Wooden Sign=Дерев'яна Табличка +Steel Sign=Сталева Табличка +Wooden Ladder=Дерев'яна Драбина +Steel Ladder=Сталеві Сходи +Apple Wood Fence=Яблуневий Дерев'яний Паркан +Acacia Wood Fence=Дерев'яний Паркан З Акації +Jungle Wood Fence=Дерев'яний Паркан З Тропічного Дерева +Pine Wood Fence=Сосновий Дерев'яний Паркан +Aspen Wood Fence=Осиковий Дерев'яний Паркан +Apple Wood Fence Rail=Яблуневий Дерев'яний Рейковий Паркан +Acacia Wood Fence Rail=Дерев'яний Рейковий Паркан З Акації +Jungle Wood Fence Rail=Дерев'яний Рейковий Паркан З Тропічного Дерева +Pine Wood Fence Rail=Сосновий Дерев'яний Рейковий Паркан +Aspen Wood Fence Rail=Осиковий Дерев'яний Рейковий Паркан +Glass=Скло +Obsidian Glass=Обсидіанове Скло +Brick Block=Цегляний Блок +Mese Lamp=Месе Лампа +Apple Wood Mese Post Light=Стовповий Месе Світильник З Яблуні +Acacia Wood Mese Post Light=Стовповий Месе Світильник З Акації +Jungle Wood Mese Post Light=Стовповий Месе Світильник Із Тропічного Дерева +Pine Wood Mese Post Light=Стовповий Месе Світильник Із Сосни +Aspen Wood Mese Post Light=Стовповий Месе Світильник З Осики +Cloud=Хмара +Wooden Pickaxe=Дерев'яна Кірка +Stone Pickaxe=Кам'яна Кірка +Bronze Pickaxe=Бронзова Кірка +Steel Pickaxe=Сталева Кірка +Mese Pickaxe=Месе Кірка +Diamond Pickaxe=Алмазна Кірка +Wooden Shovel=Дерев'янна Лопата +Stone Shovel=Кам'яна Лопата +Bronze Shovel=Бронзова Лопата +Steel Shovel=Сталева Лопата +Mese Shovel=Месе Лопата +Diamond Shovel=Алмазна Лопата +Wooden Axe=Дерев'яна Сокира +Stone Axe=Кам'яна Сокира +Bronze Axe=Бронзова Сокира +Steel Axe=Сталева Сокира +Mese Axe=Месе Сокира +Diamond Axe=Алмазна Сокира +Wooden Sword=Дерев'яний Меч +Stone Sword=Кам'яний Меч +Bronze Sword=Бронзовий Меч +Steel Sword=Сталевий Меч +Mese Sword=Месе Меч +Diamond Sword=Алмазний Меч +Torch=Факел +@1 will intersect protection on growth.=@1 перетне захист за зростанням. diff --git a/mods/doors/locale/doors.uk.tr b/mods/doors/locale/doors.uk.tr new file mode 100644 index 00000000..ae2ad14e --- /dev/null +++ b/mods/doors/locale/doors.uk.tr @@ -0,0 +1,18 @@ +# textdomain: doors +Hidden Door Segment=Захована Частина Дверей +Owned by @1=Власник: @1 +You do not own this locked door.=Ви не власник цих заблокованих дверей. +a locked door=заблоковані двері +Wooden Door=Дерев'яні двері +Steel Door=Сталеві Двері +Glass Door=Скляні двері +Obsidian Glass Door=Двері З Обсидіанового Скла +You do not own this trapdoor.=Ви не є власником цього люка. +a locked trapdoor=заблокований люк +Wooden Trapdoor=Дерев'яний Люк +Steel Trapdoor=Сталевий Люк +Apple Wood Fence Gate=Яблунева Дерев'яна Хвіртка +Acacia Wood Fence Gate=Дерев'яна Хвіртка З Акації +Jungle Wood Fence Gate=Дерев'яна Хвіртка З Тропічного Дерева +Pine Wood Fence Gate=Соснова Дерев'яна Хвіртка +Aspen Wood Fence Gate=Осикова Дерев'яна Хвіртка diff --git a/mods/dye/locale/dye.uk.tr b/mods/dye/locale/dye.uk.tr new file mode 100644 index 00000000..e3698b03 --- /dev/null +++ b/mods/dye/locale/dye.uk.tr @@ -0,0 +1,16 @@ +# textdomain: dye +White Dye=Біла Фарба +Grey Dye=Сіра Фарба +Dark Grey Dye=Темно-Сіра фарба +Black Dye=Чорна Фарба +Violet Dye=Фіолетова Фарба +Blue Dye=Синя Фарба +Cyan Dye=Синьо-Зелена Фарба +Dark Green Dye=Темно-Зелена Фарба +Green Dye=Зелена Фарба +Yellow Dye=Жовта Фарба +Brown Dye=Коричнева Фарба +Orange Dye=Помаранчева Фарба +Red Dye=Червона Фарба +Magenta Dye=Пурпурна Фарба +Pink Dye=Рожева Фарба diff --git a/mods/farming/locale/farming.uk.tr b/mods/farming/locale/farming.uk.tr new file mode 100644 index 00000000..61d7147c --- /dev/null +++ b/mods/farming/locale/farming.uk.tr @@ -0,0 +1,28 @@ +# textdomain: farming +Hoe=Мотига +Seed=Насіння +Wooden Hoe=Дерев'яна Мотига +Stone Hoe=Кам'яна Мотига +Steel Hoe=Сталева Мотига +Bronze Hoe=Бронзова Мотига +Mese Hoe=Месе Мотига +Diamond Hoe=Алмазна Мотига +Wheat Seed=Насіння Пшениці +Wheat=Пшениця +Flour=Мука +Bread=Хліб +Cotton Seed=Насіння Бавовни +Cotton=Бавовна +String=Нитка +Soil=Ґрунт +Wet Soil=Вологий Ґрунт +Savanna Soil=Саванновий Ґрунт +Wet Savanna Soil=Вологий Саванновий Ґрунт +Desert Sand Soil=Пустинний Піщаний Ґрунт +Wet Desert Sand Soil=Вологий Пустельний Піщаний Ґрунт +Straw=Солома +Straw Stair=Солом'яна Сходинка +Inner Straw Stair=Кутова Солом'яна Сходинка (Внутрішній Кут) +Outer Straw Stair=Кутова Солом'яна Сходинка (Зовнішній Кут) +Straw Slab=Солом'яна Плита +Wild Cotton=Дика Бавовна diff --git a/mods/fire/locale/fire.uk.tr b/mods/fire/locale/fire.uk.tr new file mode 100644 index 00000000..9da0beb6 --- /dev/null +++ b/mods/fire/locale/fire.uk.tr @@ -0,0 +1,4 @@ +# textdomain: fire +Fire=Вогонь +Permanent Fire=Вічний Вогонь +Flint and Steel=Кремінь і Сталь diff --git a/mods/fireflies/locale/fireflies.uk.tr b/mods/fireflies/locale/fireflies.uk.tr new file mode 100644 index 00000000..f1aa265f --- /dev/null +++ b/mods/fireflies/locale/fireflies.uk.tr @@ -0,0 +1,5 @@ +# textdomain: fireflies +Firefly=Світлячок +Hidden Firefly=Світлячок, що причаївся +Bug Net=Сачок Для Ловлі Комах +Firefly in a Bottle=Світлячок у Пляшці diff --git a/mods/flowers/locale/flowers.uk.tr b/mods/flowers/locale/flowers.uk.tr new file mode 100644 index 00000000..25d8f82a --- /dev/null +++ b/mods/flowers/locale/flowers.uk.tr @@ -0,0 +1,12 @@ +# textdomain: flowers +Red Rose=Червона Троянда +Orange Tulip=Помаранчевий Тюльпан +Yellow Dandelion=Жовта Кульбабка +Green Chrysanthemum=Зелена Хризантема +Blue Geranium=Синій Геран +Viola=Фіалка +White Dandelion=Біла Кульбабка +Black Tulip=Чорний Тюльпан +Red Mushroom=Мухомор +Brown Mushroom=Коричневий Гриб +Waterlily=Водяна Лілія diff --git a/mods/game_commands/locale/game_commands.uk.tr b/mods/game_commands/locale/game_commands.uk.tr new file mode 100644 index 00000000..7e8241e8 --- /dev/null +++ b/mods/game_commands/locale/game_commands.uk.tr @@ -0,0 +1,4 @@ +# textdomain: game_commands +Kill yourself to respawn=Вбийте себе щоб відродися +No static_spawnpoint defined=static_spawnpoint не визначений +You need to be online to be killed!=Ви повинні бути онлайн, щоб вбити себе! diff --git a/mods/keys/locale/keys.uk.tr b/mods/keys/locale/keys.uk.tr new file mode 100644 index 00000000..832d1c70 --- /dev/null +++ b/mods/keys/locale/keys.uk.tr @@ -0,0 +1,4 @@ +# textdomain: keys +Key=Ключ +Key to @1's @2=Ключ до @2 від @1 +Skeleton Key=Ключ Кістяка diff --git a/mods/map/locale/map.uk.tr b/mods/map/locale/map.uk.tr new file mode 100644 index 00000000..3f58b781 --- /dev/null +++ b/mods/map/locale/map.uk.tr @@ -0,0 +1,3 @@ +# textdomain: map +Mapping Kit=Картографічний Комплект +Use with 'Minimap' key=Використовуйте за допомогою ключа 'Minimap' diff --git a/mods/mtg_craftguide/locale/mtg_craftguide.uk.tr b/mods/mtg_craftguide/locale/mtg_craftguide.uk.tr new file mode 100644 index 00000000..52d33a45 --- /dev/null +++ b/mods/mtg_craftguide/locale/mtg_craftguide.uk.tr @@ -0,0 +1,53 @@ +# textdomain: mtg_craftguide +Any coal=Будь-яке вугілля +Any sand=Будь-якій пісок +Any wool=Будь-яка вовна +Any stick=Будь-яка паличка +Any vessel=Будь-який посуд +Any wood planks=Будь-які дерев'яні палички +Any kind of stone block=Будь-який кам'яний блок +Any red flower=Будь-яка червона квітка +Any blue flower=Будь-яка синя квітка +Any black flower=Будь-яка чорна квітка +Any green flower=Будь-яка зелена квітка +Any white flower=Будь-яка біла квітка +Any orange flower=Будь-яка помаранчева квітка +Any violet flower=Будь-яка фіолетова квітка +Any yellow flower=Будь-яка жовта квітка +Any red dye=Будь-яка червона фарба +Any blue dye=Будь-яка синя фарба +Any cyan dye=Будь-яка синьо-зелена фарба +Any grey dye=Будь-яка сіра фарба +Any pink dye=Будь-яка рожева фарба +Any black dye=Будь-яка чорна фарба +Any brown dye=Будь-яка коричнева фарба +Any green dye=Будь-яка зелена фарба +Any white dye=Будь-яка біла фарба +Any orange dye=Будь-яка помаранчева фарба +Any violet dye=Будь-яка фіолетова фарба +Any yellow dye=Будь-яка жовта фарба +Any magenta dye=Будь-який пурпурна фарба +Any dark grey dye=Будь-яка темно-сіра фарба +Any dark green dye=Будь-яка темно-зелена фарба +# Label for group ingredients +G= +Any item belonging to the group(s): @1=Будь-який предмет з груп(и): @1 +Unknown Item=Невідомий предмет +Fuel=Паливо +Usage @1 of @2=Використано @1 з @2 +Recipe @1 of @2=Рецепт @1 з @2 +Previous recipe=Попередній рецепт +Next recipe=Наступний рецепт +Recipe is too big to be displayed.=Рецепт занадто великий для показу. +Shapeless=Безформний +Cooking time: @1=Час виготовлення: @1 +Search=Пошук +Reset=Скинути +Previous page=Попередня сторінка +Next page=Наступна сторінка +No items to show.=Немає елементів для показу. +No usages.=Не використовується. +Click again to show recipes.=Натисніть ще раз, щоб показати рецепти. +No recipes.=Немає рецептів. +Click again to show usages.=Натисніть ще раз, щоб показати використання. +Recipes=Рецепти diff --git a/mods/screwdriver/locale/screwdriver.uk.tr b/mods/screwdriver/locale/screwdriver.uk.tr new file mode 100644 index 00000000..363e4c4c --- /dev/null +++ b/mods/screwdriver/locale/screwdriver.uk.tr @@ -0,0 +1,3 @@ +# textdomain: screwdriver +Screwdriver=Викрутка +(left-click rotates face, right-click rotates axis)=(клік лівою кнопкою миші повертає край, клік правою кнопкою миші - вісь) diff --git a/mods/sethome/locale/sethome.uk.tr b/mods/sethome/locale/sethome.uk.tr new file mode 100644 index 00000000..d8d4a8fc --- /dev/null +++ b/mods/sethome/locale/sethome.uk.tr @@ -0,0 +1,8 @@ +# textdomain: sethome +Can use /sethome and /home=Можливість використання /sethome та /home +Teleport you to your home point=Ви телепортуєтесь у свою домашню точку +Teleported to home!=Ви телепортувались додому! +Set a home using /sethome=Встановіть домашню точку, використовуючи /sethome +Set your home point=Встановіть домашню точку +Home set!=Домашня точка встановлена! +Player not found!=Гравець не визначений! diff --git a/mods/sfinv/locale/sfinv.uk.tr b/mods/sfinv/locale/sfinv.uk.tr new file mode 100644 index 00000000..d7c11b2f --- /dev/null +++ b/mods/sfinv/locale/sfinv.uk.tr @@ -0,0 +1,2 @@ +# textdomain: sfinv +Crafting=Крафтинг diff --git a/mods/stairs/locale/stairs.uk.tr b/mods/stairs/locale/stairs.uk.tr new file mode 100644 index 00000000..fe8a57c3 --- /dev/null +++ b/mods/stairs/locale/stairs.uk.tr @@ -0,0 +1,145 @@ +# textdomain: stairs +Glass Stair=Скляна Сходинка +Glass Slab=Скляна Плита +Inner Glass Stair=Кутова Скляна Сходинка (Внутрішній Кут) +Outer Glass Stair=Кутова Скляна Сходинка (Зовнішній Кут) +Obsidian Glass Stair=Скляна Сходинка З Обсидіану +Obsidian Glass Slab=Скляна Плита З Обсидіану +Inner Obsidian Glass Stair=Кутова Скляна Сходинка З Обсидіану (Внутрішній Кут) +Outer Obsidian Glass Stair=Кутова Скляна Сходинка З Обсидіану (Зовнішній Кут) +Wooden Stair=Яблунева Дерев'яна Сходинка +Inner Wooden Stair=Кутова Яблунева Дерев'яна Сходинка (Внутрішній Кут) +Outer Wooden Stair=Кутова Яблунева Дерев'яна Сходинка (Внутрішній Кут) +Wooden Slab=Яблунева Дерев'яна Плита +Jungle Wood Stair=Дерев'яна Сходинка З Тропічного Дерева +Inner Jungle Wood Stair=Кутова Дерев'яна Сходинка З Тропічного Дерева (Внутрішній Кут) +Outer Jungle Wood Stair=Кутова Дерев'яна Сходинка З Тропічного Дерева (Зовнішній Кут) +Jungle Wood Slab=Дерев'яна Плита З Тропічного Дерева +Pine Wood Stair=Дерев'яна Сходинка З Сосни +Inner Pine Wood Stair=Кутова Дерев'яна Сходинка З Сосни (Внутрішній Кут) +Outer Pine Wood Stair=Кутова Дерев'яна Сходинка З Сосни (Зовнішній Кут) +Pine Wood Slab=Дерев'яна Плита З Сосни +Acacia Wood Stair=Дерев'яна Сходинка З Акації +Inner Acacia Wood Stair=Кутова Дерев'яна Сходинка З Акації (Внутрішній Кут) +Outer Acacia Wood Stair=Кутова Дерев'яна Сходинка З Акації (Зовнішній Кут) +Acacia Wood Slab=Дерев'яна Плита З Акації +Aspen Wood Stair=Дерев'яна Сходинка З Осики +Inner Aspen Wood Stair=Кутова Дерев'яна Сходинка З Осики (Внутрішній Кут) +Outer Aspen Wood Stair=Кутова Дерев'яна Сходинка З Осики (Зовнішній Кут) +Aspen Wood Slab=Дерев'яна Плита З Осики +Stone Stair=Кам'яна Сходинка +Inner Stone Stair=Кутова Кам'яна Сходинка (Внутрішній Кут) +Outer Stone Stair=Кутова Кам'яна Сходинка (Зовнішній Кут) +Stone Slab=Кам'яна Плита +Cobblestone Stair=Сходинка З Кругляку +Inner Cobblestone Stair=Кутова Сходинка З Кругляку (Внутрішній Кут) +Outer Cobblestone Stair=Кутова Сходинка З Кругляку (Зовнішній Кут) +Cobblestone Slab=Плита З Кругляку +Mossy Cobblestone Stair=Мохова Сходинка З Кругляку +Inner Mossy Cobblestone Stair=Кутова Мохова Сходинка З Кругляку (Внутрішній Кут) +Outer Mossy Cobblestone Stair=Кутова Мохова Сходинка З Кругляку (Зовнішній Кут) +Mossy Cobblestone Slab=Мохова Плита З Кругляку +Stone Brick Stair=Сходинка З Кам'яної Цегли +Inner Stone Brick Stair=Кутова Сходинка З Кам'яної Цегли (Внутрішній Кут) +Outer Stone Brick Stair=Кутова Сходинка З Кам'яної Цегли (Зовнішній Кут) +Stone Brick Slab=Плита З Кам'яної Цегли +Stone Block Stair=Сходинка З Кам'яного Блока +Inner Stone Block Stair=Кутова Сходинка З Кам'яного Блока (Внутрішній Кут) +Outer Stone Block Stair=Кутова Сходинка З Кам'яного Блока (Зовнішній Кут) +Stone Block Slab=Плита З Кам'яного Блока +Desert Stone Stair=Сходинка З Пустельного Каменю +Inner Desert Stone Stair=Кутова Сходинка З Пустельного Каменю (Внутрішній Кут) +Outer Desert Stone Stair=Кутова Сходинка З Пустельного Каменю (Зовнішній Кут) +Desert Stone Slab=Плита З Пустельного Каменю +Desert Cobblestone Stair=Сходинка З Пустельного Кругляку +Inner Desert Cobblestone Stair=Кутова Сходинка З Пустельного Кругляку (Внутрішній Кут) +Outer Desert Cobblestone Stair=Кутова Сходинка З Пустельного Кругляку (Зовнішній Кут) +Desert Cobblestone Slab=Плита З Пустельного Каменю +Desert Stone Brick Stair=Сходинка З Цегли Із Пустельного Каменю +Inner Desert Stone Brick Stair=Кутова Сходинка З Цегли Із Пустельного Каменю (Внутрішній Кут) +Outer Desert Stone Brick Stair=Кутова Сходинка З Цегли Із Пустельного Каменю (Зовнішній Кут) +Desert Stone Brick Slab=Плита З Цегли Із Пустельного Каменю +Desert Stone Block Stair=Сходинка З Пустельного Кам'яного Блоку +Inner Desert Stone Block Stair=Кутова Сходинка З Пустельного Кам'яного Блоку (Внутрішній Кут) +Outer Desert Stone Block Stair=Кутова Сходинка З Пустельного Кам'яного Блоку (Зовнішній Кут) +Desert Stone Block Slab=Плита З Пустельного Кам'яного Блоку +Sandstone Stair=Сходинка З Піщанику +Inner Sandstone Stair=Кутова Сходинка З Піщанику (Внутрішній Кут) +Outer Sandstone Stair=Кутова Сходинка З Піщанику (Зовнішній Кут) +Sandstone Slab=Плита З Піщанику +Sandstone Brick Stair=Сходинка З Цегли Із Піщанику +Inner Sandstone Brick Stair=Кутова Сходинка З Цегли Із Піщанику (Внутрішній Кут) +Outer Sandstone Brick Stair=Кутова Сходинка З Цегли Із Піщанику (Зовнішній Кут) +Sandstone Brick Slab=Плита З Цегли Із Піщанику +Sandstone Block Stair=Сходинка З Блоку Із Піщанику +Inner Sandstone Block Stair=Кутова Сходинка З Блоку Із Піщанику (Внутрішній Кут) +Outer Sandstone Block Stair=Кутова Сходинка З Блоку Із Піщанику (Зовнішній Кут) +Sandstone Block Slab=Плита З Блоку Із Піщанику +Desert Sandstone Stair=Сходинка З Пустельного Піщанику +Inner Desert Sandstone Stair=Кутова Сходинка З Пустельного Піщанику (Внутрішній Кут) +Outer Desert Sandstone Stair=Кутова Сходинка З Пустельного Піщанику (Зовнішній Кут) +Desert Sandstone Slab=Плита З Пустельного Піщанику +Desert Sandstone Brick Stair=Сходинка З Пустельного Піщанику +Inner Desert Sandstone Brick Stair=Кутова Сходинка З Пустельного Піщанику (Внутрішній Кут) +Outer Desert Sandstone Brick Stair=Кутова Сходинка З Пустельного Піщанику (Зовнішній Кут) +Desert Sandstone Brick Slab=Плита З Цегли Із Пустельного Піщанику +Desert Sandstone Block Stair=Сходинка З Блоку Із Пустельного Піщанику +Inner Desert Sandstone Block Stair=Кутова Сходинка З Блоку Із Пустельного Піщанику (Внутрішній Кут) +Outer Desert Sandstone Block Stair=Кутова Сходинка З Блоку Із Пустельного Піщанику (Зовнішній Кут) +Desert Sandstone Block Slab=Плита З Блоку Із Пустельного Піщанику +Silver Sandstone Stair=Сходинка З Срібного Піщанику +Inner Silver Sandstone Stair=Кутова Сходинка З Срібного Піщанику (Внутрішній Кут) +Outer Silver Sandstone Stair=Кутова Сходинка З Срібного Піщанику (Зовнішній Кут) +Silver Sandstone Slab=Плита З Срібного Піщанику +Silver Sandstone Brick Stair=Сходинка З Цегли Із Срібного Піщанику +Inner Silver Sandstone Brick Stair=Кутова Сходинка З Цегли Із Срібного Піщанику (Внутрішній Кут) +Outer Silver Sandstone Brick Stair=Кутова Сходинка З Цегли Із Срібного Піщанику (Зовнішній Кут) +Silver Sandstone Brick Slab=Плита З Цегли Із Срібного Піщанику +Silver Sandstone Block Stair=Сходинка З Блоку Із Срібного Піщанику +Inner Silver Sandstone Block Stair=Кутова Сходинка З Блоку Із Срібного Піщанику (Внутрішній Кут) +Outer Silver Sandstone Block Stair=Кутова Сходинка З Блоку Із Срібного Піщанику (Зовнішній Кут) +Silver Sandstone Block Slab=Плита З Блоку Із Срібного Піщанику +Obsidian Stair=Обсидіанова Сходинка +Inner Obsidian Stair=Кутова Обсидіанова Сходинка (Внутрішній Кут) +Outer Obsidian Stair=Кутова Обсидіанова Сходинка (Зовнішній Кут) +Obsidian Slab=Обсидіанова Плита +Obsidian Brick Stair=Сходинка З Обсидіанової Цегли +Inner Obsidian Brick Stair=Кутова Сходинка З Обсидіанової Цегли (Внутрішній Кут) +Outer Obsidian Brick Stair=Кутова Сходинка З Обсидіанової Цегли (Зовнішній Кут) +Obsidian Brick Slab=Плита З Обсидіанової Цегли +Obsidian Block Stair=Сходинка З Обсидіанового Блоку +Inner Obsidian Block Stair=Кутова Сходинка З Обсидіанового Блоку (Внутрішній Кут) +Outer Obsidian Block Stair=Кутова Сходинка З Обсидіанового Блоку (Зовнішній Кут) +Obsidian Block Slab=Плита З Обсидіанового Блоку +Brick Stair=Сходинка З Цегли +Inner Brick Stair=Кутова Сходинка З Цегли (Внутрішній Кут) +Outer Brick Stair=Кутова Сходинка З Цегли (Зовнішній Кут) +Brick Slab=Плита З Цегли +Steel Block Stair=Сходинка Із Сталевого Блоку +Inner Steel Block Stair=Кутова Сходинка Із Сталевого Блоку (Внутрішній Кут) +Outer Steel Block Stair=Кутова Сходинка Із Сталевого Блоку (Зовнішній Кут) +Steel Block Slab=Плита Із Сталевого Блоку +Tin Block Stair=Сходинка З Олов'яного Блоку +Inner Tin Block Stair=Кутова Сходинка З Олов'яного Блоку (Внутрішній Кут) +Outer Tin Block Stair=Кутова Сходинка З Олов'яного Блоку (Зовнішній Кут) +Tin Block Slab=Плита З Олов'яного Блоку +Copper Block Stair=Сходинка З Мідного Блоку +Inner Copper Block Stair=Кутова Сходинка З Мідного Блоку (Внутрішній Кут) +Outer Copper Block Stair=Кутова Сходинка З Мідного Блоку (Зовнішній Кут) +Copper Block Slab=Плита З Мідного Блоку +Bronze Block Stair=Сходинка З Бронзового Блоку +Inner Bronze Block Stair=Кутова Сходинка З Бронзового Блоку (Внутрішній Кут) +Outer Bronze Block Stair=Кутова Сходинка З Бронзового Блоку (Зовнішній Кут) +Bronze Block Slab=Плита З Бронзового Блоку +Gold Block Stair=Сходинка З Золотого Блоку +Inner Gold Block Stair=Сходинка З Золотого Блоку (Внутрішній Кут) +Outer Gold Block Stair=Сходинка З Золотого Блоку (Зовнішній Кут) +Gold Block Slab=Плита З Золотого Блоку +Ice Stair=Крижана Сходинка +Inner Ice Stair=Кутова Крижана Сходинка (Внутрішній Кут) +Outer Ice Stair=Кутова Крижана Сходинка (Зовнішній Кут) +Ice Slab=Крижана Плита +Snow Block Stair=Ступінь З Крижаного Блоку +Inner Snow Block Stair=Кутова Ступінь З Крижаного Блоку (Внутрішній Кут) +Outer Snow Block Stair=Кутова Ступінь З Крижаного Блоку (Зовнішній Кут) +Snow Block Slab=Плита З Крижаного Блоку diff --git a/mods/tnt/locale/tnt.uk.tr b/mods/tnt/locale/tnt.uk.tr new file mode 100644 index 00000000..684466d5 --- /dev/null +++ b/mods/tnt/locale/tnt.uk.tr @@ -0,0 +1,4 @@ +# textdomain: tnt +Gun Powder=Порох +TNT Stick=Тротилова Паличка +TNT=Тротил diff --git a/mods/vessels/locale/vessels.uk.tr b/mods/vessels/locale/vessels.uk.tr new file mode 100644 index 00000000..172e356a --- /dev/null +++ b/mods/vessels/locale/vessels.uk.tr @@ -0,0 +1,8 @@ +# textdomain: vessels +Empty Vessels Shelf=Полиця з Пустим Посудом +Vessels Shelf (@1 items)=Полиця з Посудом (@1 предмета) +Vessels Shelf=Полиця з Посудом +Empty Glass Bottle=Порожня Скляна Пляшка +Empty Drinking Glass=Порожня Питна Пляшка +Empty Heavy Steel Bottle=Порожня Сталева Пляшка +Glass Fragments=Скляні Уламки diff --git a/mods/walls/locale/walls.uk.tr b/mods/walls/locale/walls.uk.tr new file mode 100644 index 00000000..f92d7cc4 --- /dev/null +++ b/mods/walls/locale/walls.uk.tr @@ -0,0 +1,4 @@ +# textdomain: walls +Cobblestone Wall=Паркан З Кругляку +Mossy Cobblestone Wall=Паркан З Мохового Кругляку +Desert Cobblestone Wall=Паркан З Пустельного Кругляку diff --git a/mods/wool/locale/wool.uk.tr b/mods/wool/locale/wool.uk.tr new file mode 100644 index 00000000..b9a3f7a1 --- /dev/null +++ b/mods/wool/locale/wool.uk.tr @@ -0,0 +1,16 @@ +# textdomain: wool +White Wool=Біла Шерсть +Grey Wool=Сіра Шерсть +Dark Grey Wool=Темно-Сіра Шерсть +Black Wool=Чорна Шерсть +Violet Wool=Фіолетова Шерсть +Blue Wool=Синя Шерсть +Cyan Wool=Голуба Шерсть +Dark Green Wool=Темно-Зелена Шерсть +Green Wool=Зелена Шерсть +Yellow Wool=Жовта Шерсть +Brown Wool=Коричнева Шерсть +Orange Wool=Оранжева Шерсть +Red Wool=Червона Шерсть +Magenta Wool=Пурпурна Шерсть +Pink Wool=Рожева Шерсть diff --git a/mods/xpanes/locale/xpanes.uk.tr b/mods/xpanes/locale/xpanes.uk.tr new file mode 100644 index 00000000..d4b4b5c8 --- /dev/null +++ b/mods/xpanes/locale/xpanes.uk.tr @@ -0,0 +1,6 @@ +# textdomain: xpanes +Glass Pane=Скляна Панель +Obsidian Glass Pane=Скляна Панель З Обсидіану +Steel Bars=Сталева Решітка +Steel Bar Door=Сталеві Двері З Решіткою +Steel Bar Trapdoor=Сталевий Люк З Решіткою From 172b62f802114d2330b9ebb5921621a68dfceb5c Mon Sep 17 00:00:00 2001 From: An0n3m0us Date: Sun, 30 Jan 2022 12:54:37 +0000 Subject: [PATCH 10/11] Add trapdoor/door model specification (#2371) --- game_api.txt | 5 +++++ mods/doors/init.lua | 24 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/game_api.txt b/game_api.txt index 0495b29b..ab68aa9a 100644 --- a/game_api.txt +++ b/game_api.txt @@ -218,6 +218,8 @@ The doors mod allows modders to register custom doors and trapdoors. description = "Door description", inventory_image = "mod_door_inv.png", groups = {choppy = 2}, + model = "mod_door", -- (optional) + -- Model name without a suffix ("big_door" not "big_door_a.obj", "big_door_b.obj") tiles = {"mod_door.png"}, -- UV map. -- The front and back of the door must be identical in appearence as they swap on -- open/close. @@ -236,6 +238,9 @@ The doors mod allows modders to register custom doors and trapdoors. description = "Trapdoor description", inventory_image = "mod_trapdoor_inv.png", + nodebox_closed = {} -- Nodebox for closed model + nodebox_opened = {} -- Nodebox for opened model + -- (optional) both nodeboxes must be used, not one only groups = {choppy = 2}, tile_front = "doors_trapdoor.png", -- the texture for the front and back of the trapdoor tile_side = "doors_trapdoor_side.png", diff --git a/mods/doors/init.lua b/mods/doors/init.lua index 6681055a..403ad5ab 100644 --- a/mods/doors/init.lua +++ b/mods/doors/init.lua @@ -670,10 +670,14 @@ function doors.register_trapdoor(name, def) local def_opened = table.copy(def) local def_closed = table.copy(def) - def_closed.node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5} - } + if def.nodebox_closed and def.nodebox_opened then + def_closed.node_box = def.nodebox_closed + else + def_closed.node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5} + } + end def_closed.selection_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -6/16, 0.5} @@ -687,10 +691,14 @@ function doors.register_trapdoor(name, def) def.tile_side } - def_opened.node_box = { - type = "fixed", - fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5} - } + if def.nodebox_opened and def.nodebox_closed then + def_opened.node_box = def.nodebox_opened + else + def_opened.node_box = { + type = "fixed", + fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5} + } + end def_opened.selection_box = { type = "fixed", fixed = {-0.5, -0.5, 6/16, 0.5, 0.5, 0.5} From cc3e7be429845e55eaa6ed8883f778ed46c54449 Mon Sep 17 00:00:00 2001 From: baytuch Date: Sun, 30 Jan 2022 16:20:14 +0200 Subject: [PATCH 11/11] Update Ukranian (uk) translation --- mods/bones/locale/bones.uk.tr | 2 +- mods/default/locale/default.uk.tr | 4 ++-- mods/stairs/locale/stairs.uk.tr | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mods/bones/locale/bones.uk.tr b/mods/bones/locale/bones.uk.tr index 58ffe77b..73b57a76 100644 --- a/mods/bones/locale/bones.uk.tr +++ b/mods/bones/locale/bones.uk.tr @@ -1,6 +1,6 @@ # textdomain: bones Bones=Кістки -@1's old bones=Старі кістки @1 +@1's old bones=старі кістки @1 @1 died at @2.=@1 помер в @2. @1 died at @2, and dropped their inventory.=@1 помер в @2, та загубив вміст свого інвентарю. @1 died at @2, and bones were placed.=@1 помер в @2, розміщені кістки. diff --git a/mods/default/locale/default.uk.tr b/mods/default/locale/default.uk.tr index 2432cfa6..6f8a4890 100644 --- a/mods/default/locale/default.uk.tr +++ b/mods/default/locale/default.uk.tr @@ -75,7 +75,7 @@ Savanna Dirt=Саваннова Земля Savanna Dirt with Savanna Grass=Саваннова Земля Із Травою Permafrost=Заморожений Ґрунт Permafrost with Stones=Заморожений Ґрунт Із Камінням -Permafrost with Moss=Заморожена Ґрунт із Мохом +Permafrost with Moss=Заморожений Ґрунт Із Мохом Sand=Пісок Desert Sand=Пустельний Пісок Silver Sand=Срібний Пісок @@ -158,7 +158,7 @@ Flowing River Water=Проточна Річна Вода Lava Source=Лавове Джерело Flowing Lava=Проточна Лава Empty Bookshelf=Порожня Книжкова Полиця -Bookshelf (@1 written, @2 empty books)=Книжкова полиця (@1 написано, @2 чисті книги) +Bookshelf (@1 written, @2 empty books)=Книжкова Полиця (@1 книг з записами, @2 чисті книги) Bookshelf=Книжкова Полиця Text too long=Текст надто довгий "@1"="@1" diff --git a/mods/stairs/locale/stairs.uk.tr b/mods/stairs/locale/stairs.uk.tr index fe8a57c3..f501b5eb 100644 --- a/mods/stairs/locale/stairs.uk.tr +++ b/mods/stairs/locale/stairs.uk.tr @@ -43,10 +43,10 @@ Stone Brick Stair=Сходинка З Кам'яної Цегли Inner Stone Brick Stair=Кутова Сходинка З Кам'яної Цегли (Внутрішній Кут) Outer Stone Brick Stair=Кутова Сходинка З Кам'яної Цегли (Зовнішній Кут) Stone Brick Slab=Плита З Кам'яної Цегли -Stone Block Stair=Сходинка З Кам'яного Блока -Inner Stone Block Stair=Кутова Сходинка З Кам'яного Блока (Внутрішній Кут) -Outer Stone Block Stair=Кутова Сходинка З Кам'яного Блока (Зовнішній Кут) -Stone Block Slab=Плита З Кам'яного Блока +Stone Block Stair=Сходинка З Кам'яного Блоку +Inner Stone Block Stair=Кутова Сходинка З Кам'яного Блоку (Внутрішній Кут) +Outer Stone Block Stair=Кутова Сходинка З Кам'яного Блоку (Зовнішній Кут) +Stone Block Slab=Плита З Кам'яного Блоку Desert Stone Stair=Сходинка З Пустельного Каменю Inner Desert Stone Stair=Кутова Сходинка З Пустельного Каменю (Внутрішній Кут) Outer Desert Stone Stair=Кутова Сходинка З Пустельного Каменю (Зовнішній Кут) @@ -79,9 +79,9 @@ Desert Sandstone Stair=Сходинка З Пустельного Піщаник Inner Desert Sandstone Stair=Кутова Сходинка З Пустельного Піщанику (Внутрішній Кут) Outer Desert Sandstone Stair=Кутова Сходинка З Пустельного Піщанику (Зовнішній Кут) Desert Sandstone Slab=Плита З Пустельного Піщанику -Desert Sandstone Brick Stair=Сходинка З Пустельного Піщанику -Inner Desert Sandstone Brick Stair=Кутова Сходинка З Пустельного Піщанику (Внутрішній Кут) -Outer Desert Sandstone Brick Stair=Кутова Сходинка З Пустельного Піщанику (Зовнішній Кут) +Desert Sandstone Brick Stair=Сходинка З Цегли Із Пустельного Піщанику +Inner Desert Sandstone Brick Stair=Кутова Сходинка З Цегли Із Пустельного Піщанику (Внутрішній Кут) +Outer Desert Sandstone Brick Stair=Кутова Сходинка З Цегли Із Пустельного Піщанику (Зовнішній Кут) Desert Sandstone Brick Slab=Плита З Цегли Із Пустельного Піщанику Desert Sandstone Block Stair=Сходинка З Блоку Із Пустельного Піщанику Inner Desert Sandstone Block Stair=Кутова Сходинка З Блоку Із Пустельного Піщанику (Внутрішній Кут)