Merge remote-tracking branch 'upstream1/master'

This commit is contained in:
Maksim Gamarnik 2016-04-01 00:33:55 +03:00
commit 292a778b06
34 changed files with 2279 additions and 1849 deletions

106
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,106 @@
# Contributing
Contributions are welcome! Here's how you can help:
- [Contributing code](#code)
- [Reporting issues](#issues)
- [Requesting features](#feature-requests)
- [Translating](#translations)
- [Donating](#donations)
## Code
If you are planning to start some significant coding, you would benefit from asking first on [our IRC channel](http://www.minetest.net/irc/) before starting.
1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository and [clone](https://help.github.com/articles/cloning-a-repository/) your fork.
2. Start coding!
- Refer to the [Lua API](https://github.com/minetest/minetest/blob/master/doc/lua_api.txt), [Developer Wiki](http://dev.minetest.net/Main_Page) and other [documentation](https://github.com/minetest/minetest/tree/master/doc).
- Follow the [C/C++](http://dev.minetest.net/Code_style_guidelines) and [Lua](http://dev.minetest.net/Lua_code_style_guidelines) code style guidelines.
- Check your code works as expected and document any changes to the Lua API.
3. Commit & [push](https://help.github.com/articles/pushing-to-a-remote/) your changes to a new branch (not `master`, one change per branch)
- Commit messages should:
- Use the present tense
- Have a title which begins with a capital letter
- Be descriptive. (e.g. no `Update init.lua` or `Fix a problem`)
- Have a first line with less than *80 characters* and have a second line that is *empty*
4. Once you are happy with your changes, submit a pull request.
- Open the [pull-request form](https://github.com/minetest/minetest/pull/new/master)
- Add a short description explaining briefly what you've done (or if it's a work-in-progress - what you need to do)
##### A pull-request is considered merge-able when:
1. It follows the [roadmap](https://forum.minetest.net/viewtopic.php?t=9177) in some way and fits the whole picture of the project.
2. It works.
3. It follows the code style for [C/C++](http://dev.minetest.net/Code_style_guidelines) or [Lua](http://dev.minetest.net/Lua_code_style_guidelines).
4. The code's interfaces are well designed, regardless of other aspects that might need more work in the future.
5. It uses protocols and formats which include the required compatibility.
## Issues
If you experience an issue, we would like to know the details - especially when a stable release is on the way.
1. Do a quick search on GitHub to check if the issue has already been reported.
2. Is it an issue with the Minetest *engine*? If not, report it [elsewhere](http://www.minetest.net/development/#reporting-issues).
3. [Open an issue](https://github.com/minetest/minetest/issues/new) and describe the issue you are having - you could include:
- Error logs (check the bottom of the `debug.txt` file)
- Screenshots
- Ways you have tried to solve the issue, and whether they worked or not
- Your Minetest version and the content (subgames, mods or texture packs) you have installed
- Your platform (e.g. Windows 10 or Ubuntu 15.04 x64)
After reporting you should aim to answer questions or clarifications as this helps pinpoint the cause of the issue (if you don't do this your issue may be closed after 1 month).
## Feature requests
Feature requests are welcome but take a moment to see if your idea follows the [roadmap](https://forum.minetest.net/viewtopic.php?t=9177) in some way and fits the whole picture of the project. You should provide a clear explanation with as much detail as possible.
## Translations
Translations of Minetest are performed using Weblate. You can access the project page with a list of current languages [here](https://hosted.weblate.org/projects/minetest/minetest/).
### Donations
If you'd like to monetarily support Minetest development, you can find donation methods on [our website](http://www.minetest.net/development/#donate).
# Maintaining
*This is a concise version of the [Rules & Guidelines](http://dev.minetest.net/Category:Rules_and_Guidelines) on the developer wiki.*
These notes are for those who have push access Minetest (core developers / maintainers).
- See the [project organisation](http://dev.minetest.net/Organisation) for the people involved.
## Reviewing pull requests
Pull requests should be reviewed and, if appropriate, checked if they achieve their intended purpose. You can show that you are in the process of, or will review the pull request by commenting *"Looks good"* or something similar.
**If the pull-request is not [merge-able](#a-pull-request-is-considered-merge-able-when):**
Submit a comment explaining to the author what they need to change to make the pull-request merge-able.
- If the author comments or makes changes to the pull-request, it can be reviewed again.
- If no response is made from the author within 1 month (when improvements are suggested or a question is asked), it can be closed.
**If the pull-request is [merge-able](#a-pull-request-is-considered-merge-able-when):**
Submit a :+1: (+1) or "Looks good" comment to show you believe the pull-request should be merged. "Looks good" comments often signify that the patch might require (more) testing.
- Two core developers must agree to the merge before it is carried out and both should +1 the pull request.
- Who intends to merge the pull-request should follow the commit rules:
- The title should follow the commit guidelines (title starts with a capital letter, present tense, descriptive).
- Don't modify history older than 10 minutes.
- Use rebase, not merge to get linear history:
- `curl https://github.com/minetest/minetest/pull/1.patch | git am`
## Reviewing issues and feature requests
- If an issue does not get a response from its author within 1 month (when requiring more details), it can be closed.
- When an issue is a duplicate, refer to the first ones and close the later ones.
- Tag issues with the appropriate [labels](https://github.com/minetest/minetest/labels) for devices, platforms etc.
## Releasing a new version
*Refer to [dev.minetest.net/Releasing_Minetest](http://dev.minetest.net/Releasing_Minetest)*

View File

@ -859,7 +859,7 @@ core.register_chatcommand("clearobjects", {
description = "clear all objects in world",
privs = {server=true},
func = function(name, param)
options = {}
local options = {}
if param == "" or param == "full" then
options.mode = "full"
elseif param == "quick" then

View File

@ -30,8 +30,6 @@ core.register_entity(":__builtin:falling_node", {
end,
on_activate = function(self, staticdata)
-- Set gravity
self.object:setacceleration({x = 0, y = -10, z = 0})
self.object:set_armor_groups({immortal = 1})
local node = core.deserialize(staticdata)
@ -43,6 +41,11 @@ core.register_entity(":__builtin:falling_node", {
end,
on_step = function(self, dtime)
-- Set gravity
local acceleration = self.object:getacceleration()
if not vector.equals(acceleration, {x = 0, y = -10, z = 0}) then
self.object:setacceleration({x = 0, y = -10, z = 0})
end
-- Turn to actual sand when collides to ground or just move
local pos = self.object:getpos()
local bcp = {x = pos.x, y = pos.y - 0.7, z = pos.z} -- Position of bottom center point
@ -90,7 +93,9 @@ core.register_entity(":__builtin:falling_node", {
end
end
-- Create node and remove entity
core.add_node(np, self.node)
if core.registered_nodes[self.node.name] then
core.add_node(np, self.node)
end
self.object:remove()
nodeupdate(np)
return

View File

@ -17,63 +17,76 @@
--------------------------------------------------------------------------------
local core_developers = {
"Maksim Gamarnik (MoNTE48) <MoNTE48@mail.ua>",
"Perttu Ahola (celeron55) <celeron55@gmail.com>",
"Ryan Kwolek (kwolekr) <kwolekr@minetest.net>",
"PilzAdam <pilzadam@minetest.net>",
"sfan5 <sfan5@live.de>",
"kahrl <kahrl@gmx.net>",
"sapier",
"ShadowNinja <shadowninja@minetest.net>",
"Nathanael Courant (Nore/Ekdohibs) <nore@mesecons.net>",
"BlockMen",
"Craig Robbins (Zeno)",
"Loic Blot (nerzhul/nrz) <loic.blot@unix-experience.fr>",
"Mat Gregory (paramat)",
"est31 <MTest31@outlook.com>",
}
local active_contributors = {
"SmallJoker <mk939@ymail.com>",
"Andrew Ward (rubenwardy) <rubenwardy@gmail.com>",
"Aaron Suen <warr1024@gmail.com>",
"Sokomine <wegwerf@anarres.dyndns.org>",
"Břetislav Štec (t0suj4/TBC_x)",
"TeTpaAka",
"Jean-Patrick G (kilbith) <jeanpatrick.guerrero@gmail.com>",
"Diego Martinez (kaeza) <kaeza@users.sf.net>",
}
local previous_core_developers = {
"Maciej Kasatkin (RealBadAngel) <maciej.kasatkin@o2.pl>",
"Lisa Milne (darkrose) <lisa@ltmnet.com>",
"proller",
"Ilya Zhuravlev (xyz) <xyz@minetest.net>",
}
local previous_contributors = {
"Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>",
"Jurgen Doser (doserj) <jurgen.doser@gmail.com>",
"Gregory Currie (gregorycu)",
"Jeija <jeija@mesecons.net>",
"MirceaKitsune <mirceakitsune@gmail.com>",
"dannydark <the_skeleton_of_a_child@yahoo.co.uk>",
"0gb.us <0gb.us@0gb.us>",
"Guiseppe Bilotta (Oblomov) <guiseppe.bilotta@gmail.com>",
"Jonathan Neuschafer <j.neuschaefer@gmx.net>",
"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net>",
"Constantin Wenger (SpeedProg) <constantin.wenger@googlemail.com>",
"matttpt <matttpt@gmail.com>",
"JacobF <queatz@gmail.com>",
"TriBlade9 <triblade9@mail.com>",
"Zefram <zefram@fysh.org>",
}
tab_credits = {
name = "credits",
caption = fgettext("Credits"),
cbf_formspec = function (tabview, name, tabdata)
return "label[0.5,3.2;MultiCraft " .. core.get_version() .. "]" ..
"label[0.5,3.5;Open Source Project]" ..
"tablecolumns[color;text]" ..
"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
"table[3.5,-0.25;8.5,5.8;list_credits;" ..
"#FFFF00," .. fgettext("Core Developers") .."," ..
",Maksim Gamarnik (MoNTE48) <MoNTE48@mail.ua>,"..
",Perttu Ahola (celeron55) <celeron55@gmail.com>,"..
",Ryan Kwolek (kwolekr) <kwolekr@minetest.net>,"..
",PilzAdam <pilzadam@minetest.net>," ..
",sfan5 <sfan5@live.de>,"..
",kahrl <kahrl@gmx.net>,"..
",sapier,"..
",ShadowNinja <shadowninja@minetest.net>,"..
",Nathanael Courant (Nore/Ekdohibs) <nore@mesecons.net>,"..
",BlockMen,"..
",Craig Robbins (Zeno),"..
",Loic Blot (nerzhul/nrz) <loic.blot@unix-experience.fr>,"..
",Mat Gregory (paramat),"..
",est31 <MTest31@outlook.com>," ..
",,"..
"#FFFF00," .. fgettext("Active Contributors") .. "," ..
",SmallJoker <mk939@ymail.com>," ..
",Andrew Ward (rubenwardy) <rubenwardy@gmail.com>," ..
",Aaron Suen <warr1024@gmail.com>," ..
",Sokomine <wegwerf@anarres.dyndns.org>," ..
",Břetislav Štec (t0suj4/TBC_x)," ..
",TeTpaAka," ..
",Jean-Patrick G (kilbith) <jeanpatrick.guerrero@gmail.com>," ..
",Diego Martinez (kaeza) <kaeza@users.sf.net>," ..
",," ..
"#FFFF00," .. fgettext("Previous Core Developers") .."," ..
",Maciej Kasatkin (RealBadAngel) <maciej.kasatkin@o2.pl>,"..
",Lisa Milne (darkrose) <lisa@ltmnet.com>," ..
",proller," ..
",Ilya Zhuravlev (xyz) <xyz@minetest.net>," ..
",," ..
"#FFFF00," .. fgettext("Previous Contributors") .. "," ..
",Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>,"..
",Jurgen Doser (doserj) <jurgen.doser@gmail.com>,"..
",Gregory Currie (gregorycu)," ..
",Jeija <jeija@mesecons.net>,"..
",MirceaKitsune <mirceakitsune@gmail.com>,"..
",dannydark <the_skeleton_of_a_child@yahoo.co.uk>,"..
",0gb.us <0gb.us@0gb.us>,"..
",Guiseppe Bilotta (Oblomov) <guiseppe.bilotta@gmail.com>,"..
",Jonathan Neuschafer <j.neuschaefer@gmx.net>,"..
",Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net>,"..
",Constantin Wenger (SpeedProg) <constantin.wenger@googlemail.com>,"..
",matttpt <matttpt@gmail.com>,"..
",JacobF <queatz@gmail.com>,"..
",TriBlade9 <triblade9@mail.com>,"..
",Zefram <zefram@fysh.org>,"..
";1]"
end
}
cbf_formspec = function(tabview, name, tabdata)
return "label[0.5,3.2;MultiCraft " .. core.get_version() .. "]" ..
"label[0.5,3.5;Open Source Project]" ..
"tablecolumns[color;text]" ..
"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
"table[3.5,-0.25;8.5,5.8;list_credits;" ..
"#FFFF00," .. fgettext("Core Developers") .. ",," ..
table.concat(core_developers, ",,") .. ",,," ..
"#FFFF00," .. fgettext("Active Contributors") .. ",," ..
table.concat(active_contributors, ",,") .. ",,," ..
"#FFFF00," .. fgettext("Previous Core Developers") ..",," ..
table.concat(previous_core_developers, ",,") .. ",,," ..
"#FFFF00," .. fgettext("Previous Contributors") .. ",," ..
table.concat(previous_contributors, ",,") .. "," ..
";1]"
end
}

View File

@ -18,6 +18,7 @@
--------------------------------------------------------------------------------
local function filter_texture_pack_list(list)
local retval = {}
for _, item in ipairs(list) do
if item ~= "base" then
retval[#retval + 1] = item
@ -35,9 +36,9 @@ local function render_texture_pack_list(list)
local retval = ""
for i, v in ipairs(list) do
if v:sub(1,1) ~= "." then
if v:sub(1, 1) ~= "." then
if retval ~= "" then
retval = retval ..","
retval = retval .. ","
end
retval = retval .. core.formspec_escape(v)
@ -50,14 +51,14 @@ end
--------------------------------------------------------------------------------
local function get_formspec(tabview, name, tabdata)
local retval = "label[4,-0.25;".. fgettext("Select texture pack:") .. "]"..
local retval = "label[4,-0.25;" .. fgettext("Select texture pack:") .. "]" ..
"textlist[4,0.25;7.5,5.0;TPs;"
local current_texture_path = core.setting_get("texture_path")
local list = filter_texture_pack_list(core.get_dir_list(core.get_texturepath(), true))
local index = tonumber(core.setting_get("mainmenu_last_selected_TP"))
if index == nil then index = 1 end
if not index then index = 1 end
if current_texture_path == "" then
retval = retval ..
@ -66,15 +67,16 @@ local function get_formspec(tabview, name, tabdata)
return retval
end
local infofile = current_texture_path ..DIR_DELIM.."description.txt"
local infofile = current_texture_path .. DIR_DELIM .. "description.txt"
-- This adds backwards compatibility for old texture pack description files named
-- "info.txt", and should be removed once all such texture packs have been updated
if not file_exists(infofile) then
infofile = current_texture_path ..DIR_DELIM.."info.txt"
infofile = current_texture_path .. DIR_DELIM .. "info.txt"
if file_exists(infofile) then
core.log("info.txt is depreciated. description.txt should be used instead.");
core.log("info.txt is depreciated. description.txt should be used instead.")
end
end
local infotext = ""
local f = io.open(infofile, "r")
if not f then
@ -84,8 +86,8 @@ local function get_formspec(tabview, name, tabdata)
f:close()
end
local screenfile = current_texture_path..DIR_DELIM.."screenshot.png"
local no_screenshot = nil
local screenfile = current_texture_path .. DIR_DELIM .. "screenshot.png"
local no_screenshot
if not file_exists(screenfile) then
screenfile = nil
no_screenshot = defaulttexturedir .. "no_screenshot.png"
@ -94,24 +96,24 @@ local function get_formspec(tabview, name, tabdata)
return retval ..
render_texture_pack_list(list) ..
";" .. index .. "]" ..
"image[0.25,0.25;4.0,3.7;"..core.formspec_escape(screenfile or no_screenshot).."]"..
"textarea[0.6,3.25;3.7,1.5;;"..core.formspec_escape(infotext or "")..";]"
"image[0.25,0.25;4.0,3.7;" .. core.formspec_escape(screenfile or no_screenshot) .. "]" ..
"textarea[0.6,3.5;3.7,1.5;;" .. core.formspec_escape(infotext or "") .. ";]"
end
--------------------------------------------------------------------------------
local function main_button_handler(tabview, fields, name, tabdata)
if fields["TPs"] ~= nil then
if fields["TPs"] then
local event = core.explode_textlist_event(fields["TPs"])
if event.type == "CHG" or event.type == "DCL" then
local index = core.get_textlist_index("TPs")
core.setting_set("mainmenu_last_selected_TP",
index)
core.setting_set("mainmenu_last_selected_TP", index)
local list = filter_texture_pack_list(core.get_dir_list(core.get_texturepath(), true))
local current_index = core.get_textlist_index("TPs")
if current_index ~= nil and #list >= current_index then
local new_path = core.get_texturepath()..DIR_DELIM..list[current_index]
if list[current_index] == fgettext("None") then new_path = "" end
if current_index and #list >= current_index then
local new_path = core.get_texturepath() .. DIR_DELIM .. list[current_index]
if list[current_index] == fgettext("None") then
new_path = ""
end
core.setting_set("texture_path", new_path)
end
end

View File

@ -936,7 +936,7 @@ mgv7_spflags (Mapgen v7 flags) flags mountains,ridges mountains,ridges,nomountai
mgv7_np_terrain_base (Mapgen v7 terrain base noise parameters) noise_params 4, 70, (600, 600, 600), 82341, 5, 0.6, 2.0
mgv7_np_terrain_alt (Mapgen v7 terrain altitude noise parameters) noise_params 4, 25, (600, 600, 600), 5934, 5, 0.6, 2.0
mgv7_np_terrain_persist (Mapgen v7 terrain persistation noise parameters) noise_params 0.6, 0.1, (2000, 2000, 2000), 539, 3, 0.6, 2.0
mgv7_np_height_select (Mapgen v7 height select noise parameters) noise_params -12, 24, (500, 500, 500), 4213, 6, 0.7, 2.0
mgv7_np_height_select (Mapgen v7 height select noise parameters) noise_params -8, 16, (500, 500, 500), 4213, 6, 0.7, 2.0
mgv7_np_filler_depth (Mapgen v7 filler depth noise parameters) noise_params 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0
mgv7_np_mount_height (Mapgen v7 mount height noise parameters) noise_params 256, 112, (1000, 1000, 1000), 72449, 3, 0.6, 2.0
mgv7_np_ridge_uwater (Mapgen v7 ridge water noise parameters) noise_params 0, 1, (1000, 1000, 1000), 85039, 5, 0.6, 2.0

View File

@ -1,52 +1,51 @@
uniform mat4 mWorldViewProj;
uniform mat4 mInvWorld;
uniform mat4 mTransWorld;
uniform mat4 mWorld;
uniform float dayNightRatio;
uniform vec3 eyePosition;
uniform float animationTimer;
varying vec3 vPosition;
varying vec3 worldPosition;
varying vec3 eyeVec;
varying vec3 lightVec;
varying vec3 tsEyeVec;
varying vec3 tsLightVec;
uniform mat4 mWorldViewProj;
uniform mat4 mInvWorld;
uniform mat4 mTransWorld;
uniform mat4 mWorld;
uniform float dayNightRatio;
uniform vec3 eyePosition;
uniform float animationTimer;
varying vec3 vPosition;
varying vec3 worldPosition;
varying vec3 eyeVec;
varying vec3 lightVec;
varying vec3 tsEyeVec;
varying vec3 tsLightVec;
varying float area_enable_parallax;
varying float disp;
const float e = 2.718281828459;
const float BS = 10.0;
const float e = 2.718281828459;
const float BS = 10.0;
float smoothCurve(float x)
{
return x * x * (3.0 - 2.0 * x);
}
}
float triangleWave(float x)
{
return abs(fract(x + 0.5) * 2.0 - 1.0);
}
}
float smoothTriangleWave(float x)
{
return smoothCurve(triangleWave(x)) * 2.0 - 1.0;
}
}
void main(void)
{
gl_TexCoord[0] = gl_MultiTexCoord0;
//TODO: make offset depending on view angle and parallax uv displacement
//thats for textures that doesnt align vertically, like dirt with grass
void main(void)
{
gl_TexCoord[0] = gl_MultiTexCoord0;
//TODO: make offset depending on view angle and parallax uv displacement
//thats for textures that doesnt align vertically, like dirt with grass
//gl_TexCoord[0].y += 0.008;
//Allow parallax/relief mapping only for certain kind of nodes
//Allow parallax/relief mapping only for certain kind of nodes
//Variable is also used to control area of the effect
#if (DRAW_TYPE == NDT_NORMAL || DRAW_TYPE == NDT_LIQUID || DRAW_TYPE == NDT_FLOWINGLIQUID)
area_enable_parallax = 1.0;
@ -55,57 +54,62 @@ void main(void)
#endif
float disp_x;
float disp_z;
#if (MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES) || (MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS)
vec4 pos2 = mWorld * gl_Vertex;
float tOffset = (pos2.x + pos2.y) * 0.001 + pos2.z * 0.002;
disp = (smoothTriangleWave(animationTimer * 31.0 + tOffset) +
disp_x = (smoothTriangleWave(animationTimer * 23.0 + tOffset) +
smoothTriangleWave(animationTimer * 11.0 + tOffset)) * 0.4;
disp_z = (smoothTriangleWave(animationTimer * 31.0 + tOffset) +
smoothTriangleWave(animationTimer * 29.0 + tOffset) +
smoothTriangleWave(animationTimer * 13.0 + tOffset)) - 0.9;
smoothTriangleWave(animationTimer * 13.0 + tOffset)) * 0.5;
#endif
#if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER
vec4 pos = gl_Vertex;
pos.y -= 2.0;
float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH);
pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT;
gl_Position = mWorldViewProj * pos;
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES
vec4 pos = gl_Vertex;
pos.x += disp * 0.1;
pos.y += disp * 0.1;
pos.z += disp;
gl_Position = mWorldViewProj * pos;
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS
vec4 pos = gl_Vertex;
if (gl_TexCoord[0].y < 0.05) {
pos.z += disp;
}
gl_Position = mWorldViewProj * pos;
#else
gl_Position = mWorldViewProj * gl_Vertex;
#endif
vec4 pos = gl_Vertex;
pos.y -= 2.0;
float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH);
pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT;
gl_Position = mWorldViewProj * pos;
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES
vec4 pos = gl_Vertex;
pos.x += disp_x;
pos.y += disp_z * 0.1;
pos.z += disp_z;
gl_Position = mWorldViewProj * pos;
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS
vec4 pos = gl_Vertex;
if (gl_TexCoord[0].y < 0.05) {
pos.x += disp_x;
pos.z += disp_z;
}
gl_Position = mWorldViewProj * pos;
#else
gl_Position = mWorldViewProj * gl_Vertex;
#endif
vPosition = gl_Position.xyz;
worldPosition = (mWorld * gl_Vertex).xyz;
vPosition = gl_Position.xyz;
worldPosition = (mWorld * gl_Vertex).xyz;
// Don't generate heightmaps when too far from the eye
float dist = distance (vec3(0.0, 0.0 ,0.0), vPosition);
float dist = distance (vec3(0.0, 0.0, 0.0), vPosition);
if (dist > 150.0) {
area_enable_parallax = 0.0;
}
vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0);
vec3 normal, tangent, binormal;
normal = normalize(gl_NormalMatrix * gl_Normal);
vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0);
vec3 normal, tangent, binormal;
normal = normalize(gl_NormalMatrix * gl_Normal);
tangent = normalize(gl_NormalMatrix * gl_MultiTexCoord1.xyz);
binormal = normalize(gl_NormalMatrix * gl_MultiTexCoord2.xyz);
vec3 v;
lightVec = sunPosition - worldPosition;
lightVec = sunPosition - worldPosition;
v.x = dot(lightVec, tangent);
v.y = dot(lightVec, binormal);
v.z = dot(lightVec, normal);
@ -116,32 +120,32 @@ void main(void)
v.y = dot(eyeVec, binormal);
v.z = dot(eyeVec, normal);
tsEyeVec = normalize (v);
vec4 color;
float day = gl_Color.r;
float night = gl_Color.g;
float light_source = gl_Color.b;
float rg = mix(night, day, dayNightRatio);
rg += light_source * 2.5; // Make light sources brighter
float b = rg;
// Moonlight is blue
b += (day - night) / 13.0;
rg -= (day - night) / 23.0;
// Emphase blue a bit in darker places
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025);
// Artificial light is yellow-ish
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065);
color.r = rg;
color.g = rg;
color.b = b;
color.a = gl_Color.a;
gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0);
}
vec4 color;
float day = gl_Color.r;
float night = gl_Color.g;
float light_source = gl_Color.b;
float rg = mix(night, day, dayNightRatio);
rg += light_source * 2.5; // Make light sources brighter
float b = rg;
// Moonlight is blue
b += (day - night) / 13.0;
rg -= (day - night) / 23.0;
// Emphase blue a bit in darker places
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
b += max(0.0, (1.0 - abs(b - 0.13) / 0.17) * 0.025);
// Artificial light is yellow-ish
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
rg += max(0.0, (1.0 - abs(rg - 0.85) / 0.15) * 0.065);
color.r = rg;
color.g = rg;
color.b = b;
color.a = gl_Color.a;
gl_FrontColor = gl_BackColor = clamp(color, 0.0, 1.0);
}

View File

@ -1,144 +1,144 @@
uniform mat4 mWorldViewProj;
uniform mat4 mInvWorld;
uniform mat4 mTransWorld;
uniform mat4 mWorld;
uniform float dayNightRatio;
uniform vec3 eyePosition;
uniform float animationTimer;
varying vec3 vPosition;
varying vec3 worldPosition;
varying vec3 eyeVec;
varying vec3 lightVec;
varying vec3 tsEyeVec;
varying vec3 tsLightVec;
const float e = 2.718281828459;
const float BS = 10.0;
uniform mat4 mWorldViewProj;
uniform mat4 mInvWorld;
uniform mat4 mTransWorld;
uniform mat4 mWorld;
uniform float dayNightRatio;
uniform vec3 eyePosition;
uniform float animationTimer;
varying vec3 vPosition;
varying vec3 worldPosition;
varying vec3 eyeVec;
varying vec3 lightVec;
varying vec3 tsEyeVec;
varying vec3 tsLightVec;
const float e = 2.718281828459;
const float BS = 10.0;
float smoothCurve(float x)
{
return x * x * (3.0 - 2.0 * x);
}
}
float triangleWave(float x)
{
return abs(fract( x + 0.5 ) * 2.0 - 1.0);
}
}
float smoothTriangleWave(float x)
{
return smoothCurve(triangleWave( x )) * 2.0 - 1.0;
}
void main(void)
{
gl_TexCoord[0] = gl_MultiTexCoord0;
}
#if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER
vec4 pos = gl_Vertex;
pos.y -= 2.0;
float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH);
pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT;
gl_Position = mWorldViewProj * pos;
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES
vec4 pos = gl_Vertex;
vec4 pos2 = mWorld * gl_Vertex;
/*
* Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition)
* replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication)
* And bufferize calcul to a float
*/
float pos2XpZ = pos2.x + pos2.z;
pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * 0.01) * 2.0 - 1.0) * 0.4;
pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.2;
pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.4;
gl_Position = mWorldViewProj * pos;
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS
vec4 pos = gl_Vertex;
vec4 pos2 = mWorld * gl_Vertex;
if (gl_TexCoord[0].y < 0.05) {
/*
* Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition)
* replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication)
* And bufferize calcul to a float
*/
float pos2XpZ = pos2.x + pos2.z;
pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2XpZ * 0.1) * 2.0 - 1.0) * 0.8;
pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2XpZ * -0.5) * 2.0 - 1.0) * 0.4;
}
gl_Position = mWorldViewProj * pos;
#else
gl_Position = mWorldViewProj * gl_Vertex;
#endif
vPosition = gl_Position.xyz;
worldPosition = (mWorld * gl_Vertex).xyz;
vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0);
vec3 normal, tangent, binormal;
normal = normalize(gl_NormalMatrix * gl_Normal);
if (gl_Normal.x > 0.5) {
// 1.0, 0.0, 0.0
tangent = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, -1.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0));
} else if (gl_Normal.x < -0.5) {
// -1.0, 0.0, 0.0
tangent = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0));
} else if (gl_Normal.y > 0.5) {
// 0.0, 1.0, 0.0
tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0));
} else if (gl_Normal.y < -0.5) {
// 0.0, -1.0, 0.0
tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0));
} else if (gl_Normal.z > 0.5) {
// 0.0, 0.0, 1.0
tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0));
} else if (gl_Normal.z < -0.5) {
// 0.0, 0.0, -1.0
tangent = normalize(gl_NormalMatrix * vec3(-1.0, 0.0, 0.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0));
}
mat3 tbnMatrix = mat3(tangent.x, binormal.x, normal.x,
tangent.y, binormal.y, normal.y,
tangent.z, binormal.z, normal.z);
lightVec = sunPosition - worldPosition;
tsLightVec = lightVec * tbnMatrix;
eyeVec = (gl_ModelViewMatrix * gl_Vertex).xyz;
tsEyeVec = eyeVec * tbnMatrix;
vec4 color;
float day = gl_Color.r;
float night = gl_Color.g;
float light_source = gl_Color.b;
float rg = mix(night, day, dayNightRatio);
rg += light_source * 2.5; // Make light sources brighter
float b = rg;
// Moonlight is blue
b += (day - night) / 13.0;
rg -= (day - night) / 23.0;
// Emphase blue a bit in darker places
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025);
// Artificial light is yellow-ish
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065);
color.r = rg;
color.g = rg;
color.b = b;
color.a = gl_Color.a;
gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0);
}
void main(void)
{
gl_TexCoord[0] = gl_MultiTexCoord0;
#if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER
vec4 pos = gl_Vertex;
pos.y -= 2.0;
float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH);
pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT;
gl_Position = mWorldViewProj * pos;
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES
vec4 pos = gl_Vertex;
vec4 pos2 = mWorld * gl_Vertex;
/*
* Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition)
* replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication)
* And bufferize calcul to a float
*/
float pos2XpZ = pos2.x + pos2.z;
pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * 0.01) * 2.0 - 1.0) * 0.4;
pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.2;
pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.4;
gl_Position = mWorldViewProj * pos;
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS
vec4 pos = gl_Vertex;
vec4 pos2 = mWorld * gl_Vertex;
if (gl_TexCoord[0].y < 0.05) {
/*
* Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition)
* replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication)
* And bufferize calcul to a float
*/
float pos2XpZ = pos2.x + pos2.z;
pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2XpZ * 0.1) * 2.0 - 1.0) * 0.8;
pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2XpZ * -0.5) * 2.0 - 1.0) * 0.4;
}
gl_Position = mWorldViewProj * pos;
#else
gl_Position = mWorldViewProj * gl_Vertex;
#endif
vPosition = gl_Position.xyz;
worldPosition = (mWorld * gl_Vertex).xyz;
vec3 sunPosition = vec3 (0.0, eyePosition.y * BS + 900.0, 0.0);
vec3 normal, tangent, binormal;
normal = normalize(gl_NormalMatrix * gl_Normal);
if (gl_Normal.x > 0.5) {
// 1.0, 0.0, 0.0
tangent = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, -1.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0));
} else if (gl_Normal.x < -0.5) {
// -1.0, 0.0, 0.0
tangent = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0));
} else if (gl_Normal.y > 0.5) {
// 0.0, 1.0, 0.0
tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0));
} else if (gl_Normal.y < -0.5) {
// 0.0, -1.0, 0.0
tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, 0.0, 1.0));
} else if (gl_Normal.z > 0.5) {
// 0.0, 0.0, 1.0
tangent = normalize(gl_NormalMatrix * vec3( 1.0, 0.0, 0.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0));
} else if (gl_Normal.z < -0.5) {
// 0.0, 0.0, -1.0
tangent = normalize(gl_NormalMatrix * vec3(-1.0, 0.0, 0.0));
binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0, 0.0));
}
mat3 tbnMatrix = mat3(tangent.x, binormal.x, normal.x,
tangent.y, binormal.y, normal.y,
tangent.z, binormal.z, normal.z);
lightVec = sunPosition - worldPosition;
tsLightVec = lightVec * tbnMatrix;
eyeVec = (gl_ModelViewMatrix * gl_Vertex).xyz;
tsEyeVec = eyeVec * tbnMatrix;
vec4 color;
float day = gl_Color.r;
float night = gl_Color.g;
float light_source = gl_Color.b;
float rg = mix(night, day, dayNightRatio);
rg += light_source * 2.5; // Make light sources brighter
float b = rg;
// Moonlight is blue
b += (day - night) / 13.0;
rg -= (day - night) / 23.0;
// Emphase blue a bit in darker places
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
b += max(0.0, (1.0 - abs(b - 0.13)/0.17) * 0.025);
// Artificial light is yellow-ish
// See C++ implementation in mapblock_mesh.cpp finalColorBlend()
rg += max(0.0, (1.0 - abs(rg - 0.85)/0.15) * 0.065);
color.r = rg;
color.g = rg;
color.b = b;
color.a = gl_Color.a;
gl_FrontColor = gl_BackColor = clamp(color,0.0,1.0);
}

View File

@ -1177,7 +1177,7 @@
# mgv7_np_terrain_persist = 0.6, 0.1, (2000, 2000, 2000), 539, 3, 0.6, 2.0
# type: noise_params
# mgv7_np_height_select = -12, 24, (500, 500, 500), 4213, 6, 0.7, 2.0
# mgv7_np_height_select = -8, 16, (500, 500, 500), 4213, 6, 0.7, 2.0
# type: noise_params
# mgv7_np_filler_depth = 0, 1.2, (150, 150, 150), 261, 3, 0.7, 2.0

View File

@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2016-02-06 01:25+0000\n"
"Last-Translator: Joan Ciprià Moreno <joancipria@gmail.com>\n"
"Language-Team: Catalan <https://hosted.weblate.org/projects/minetest/"
"minetest/ca/>\n"
"PO-Revision-Date: 2016-03-21 19:40+0000\n"
"Last-Translator: Joan Ciprià Moreno Teodoro <joancipria@gmail.com>\n"
"Language-Team: Catalan "
"<https://hosted.weblate.org/projects/minetest/minetest/ca/>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.5-dev\n"
"X-Generator: Weblate 2.6-dev\n"
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
@ -224,7 +224,7 @@ msgstr "(Cap descripció d'ajustament donada)"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "< Back to Settings page"
msgstr ""
msgstr "< Torna a la pàgina de configuració"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Browse"
@ -252,6 +252,8 @@ msgid ""
"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
msgstr ""
"Format: <offset> <escala> (<extensió X>, <extensió Y> , <extensión Z>), "
"<llavor>, <octaves>, <persistència>"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Games"
@ -508,19 +510,19 @@ msgstr "Començar Joc"
#: builtin/mainmenu/tab_settings.lua
msgid "2x"
msgstr ""
msgstr "2x"
#: builtin/mainmenu/tab_settings.lua
msgid "3D Clouds"
msgstr ""
msgstr "Núvols 3D"
#: builtin/mainmenu/tab_settings.lua
msgid "4x"
msgstr ""
msgstr "4x"
#: builtin/mainmenu/tab_settings.lua
msgid "8x"
msgstr ""
msgstr "8x"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
@ -529,19 +531,19 @@ msgstr "Configuració"
#: builtin/mainmenu/tab_settings.lua
msgid "Antialiasing:"
msgstr ""
msgstr "Suavitzat (Antialiasing):"
#: builtin/mainmenu/tab_settings.lua
msgid "Are you sure to reset your singleplayer world?"
msgstr ""
msgstr "Esteu segur que voleu reiniciar el seu món d'un sol jugador?"
#: builtin/mainmenu/tab_settings.lua
msgid "Bilinear Filter"
msgstr ""
msgstr "Filtre Bilineal"
#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
msgid "Bumpmapping"
msgstr ""
msgstr "Mapat de relleu"
#: builtin/mainmenu/tab_settings.lua
msgid "Change keys"
@ -559,15 +561,15 @@ msgstr "Activar tot"
#: builtin/mainmenu/tab_settings.lua
msgid "Fancy Leaves"
msgstr ""
msgstr "Fulles Boniques"
#: builtin/mainmenu/tab_settings.lua
msgid "Generate Normalmaps"
msgstr ""
msgstr "Generar Mapes Normals"
#: builtin/mainmenu/tab_settings.lua
msgid "Mipmap"
msgstr ""
msgstr "Mipmap"
#: builtin/mainmenu/tab_settings.lua
msgid "Mipmap + Aniso. Filter"
@ -575,15 +577,15 @@ msgstr ""
#: builtin/mainmenu/tab_settings.lua
msgid "No Filter"
msgstr ""
msgstr "Sense Filtre"
#: builtin/mainmenu/tab_settings.lua
msgid "No Mipmap"
msgstr ""
msgstr "Sense MipMap"
#: builtin/mainmenu/tab_settings.lua
msgid "No!!!"
msgstr ""
msgstr "No!!!"
#: builtin/mainmenu/tab_settings.lua
msgid "Node Highlighting"
@ -595,15 +597,15 @@ msgstr "Ningun"
#: builtin/mainmenu/tab_settings.lua
msgid "Opaque Leaves"
msgstr ""
msgstr "Fulles opaques"
#: builtin/mainmenu/tab_settings.lua
msgid "Opaque Water"
msgstr ""
msgstr "Aigua opaca"
#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
msgid "Parallax Occlusion"
msgstr ""
msgstr "Oclusió de paral·laxi"
#: builtin/mainmenu/tab_settings.lua
msgid "Settings"
@ -611,23 +613,23 @@ msgstr "Configuració"
#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
msgid "Shaders"
msgstr ""
msgstr "Ombres"
#: builtin/mainmenu/tab_settings.lua
msgid "Simple Leaves"
msgstr ""
msgstr "Fulles senzilles"
#: builtin/mainmenu/tab_settings.lua
msgid "Smooth Lighting"
msgstr ""
msgstr "Il·luminació suau"
#: builtin/mainmenu/tab_settings.lua
msgid "Texturing:"
msgstr ""
msgstr "Texturització:"
#: builtin/mainmenu/tab_settings.lua
msgid "To enable shaders the OpenGL driver needs to be used."
msgstr ""
msgstr "Per habilitar les ombres el controlador OpenGL ha ser utilitzat."
#: builtin/mainmenu/tab_settings.lua
msgid "Touchthreshold (px)"

View File

@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2015-12-10 15:36+0000\n"
"PO-Revision-Date: 2016-03-04 04:45+0000\n"
"Last-Translator: Jakub Vaněk <vanek.jakub4@seznam.cz>\n"
"Language-Team: Czech <https://hosted.weblate.org/projects/minetest/minetest/"
"cs/>\n"
"Language-Team: Czech "
"<https://hosted.weblate.org/projects/minetest/minetest/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -520,9 +520,8 @@ msgid "8x"
msgstr ""
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Advanced Settings"
msgstr "Nastavení"
msgstr "Pokročilá nastavení"
#: builtin/mainmenu/tab_settings.lua
msgid "Antialiasing:"
@ -553,14 +552,13 @@ msgstr "Propojené sklo"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enable Particles"
msgstr "Povolit e"
msgstr "Povolit částice"
#: builtin/mainmenu/tab_settings.lua
msgid "Fancy Leaves"
msgstr "Vícevrstevné listí"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Generate Normalmaps"
msgstr "Generovat normálové mapy"
@ -573,9 +571,8 @@ msgid "Mipmap + Aniso. Filter"
msgstr "Mipmapa + Anizo. filtr"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "No Filter"
msgstr "Filtrování"
msgstr "Žádné filtr"
#: builtin/mainmenu/tab_settings.lua
msgid "No Mipmap"
@ -586,9 +583,8 @@ msgid "No!!!"
msgstr "Ne!!!"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Node Highlighting"
msgstr "Zvýraznění označených bloků"
msgstr "Zvýraznění bloků"
#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
msgid "None"
@ -1326,7 +1322,6 @@ msgid "3D mode"
msgstr "Režim 3D zobrazení"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"3D support.\n"
"Currently supported:\n"
@ -1340,10 +1335,10 @@ msgstr ""
"Podpora 3D zobrazení.\n"
"V současné době podporovány:\n"
"- none: žádný 3D výstup.\n"
"- anaglyph: azurová/purpurová barva 3D.\n"
"- interlaced: pro polarizaci ve stylu lichý/sudý řádek.\n"
"- anaglyph: azurové/purpurové barevné 3D.\n"
"- interlaced: pro polarizaci lichý/sudý řádek.\n"
"- topbottom: rozdělení obrazovky na horní a dolní část.\n"
"- sidebyside: rozdělené obrazovky na levou a pravou část."
"- sidebyside: rozdělení obrazovky na levou a pravou část."
#: src/settings_translation_file.cpp
msgid ""
@ -1454,9 +1449,8 @@ msgid "Backward key"
msgstr "Vzad"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Base terrain height"
msgstr "Výška vodních vln"
msgstr "Základní výška terénu"
#: src/settings_translation_file.cpp
msgid "Basic"
@ -1833,9 +1827,8 @@ msgid "Dump the mapgen debug infos."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enable VBO"
msgstr "Povolit balíček"
msgstr "Povolit VBO"
#: src/settings_translation_file.cpp
msgid "Enable mod security"
@ -1903,9 +1896,8 @@ msgid "Enables caching of facedir rotated meshes."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enables filmic tone mapping"
msgstr "Povolit minimapu."
msgstr "Povolit filmový tone mapping"
#: src/settings_translation_file.cpp
msgid "Enables minimap."
@ -2138,9 +2130,8 @@ msgid "Gravity"
msgstr "Gravitace"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "HTTP Mods"
msgstr "Mody"
msgstr "HTTP mody"
#: src/settings_translation_file.cpp
msgid "HUD toggle key"
@ -2737,9 +2728,8 @@ msgid "Mapblock unload timeout"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen Valleys"
msgstr "Jméno generátoru mapy"
msgstr "Mapgen údolí"
#: src/settings_translation_file.cpp
msgid "Mapgen biome heat noise parameters"
@ -2762,9 +2752,8 @@ msgid "Mapgen flags"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen flat"
msgstr "Jméno generátoru mapy"
msgstr "Mapgen plochy"
#: src/settings_translation_file.cpp
msgid "Mapgen flat cave1 noise parameters"
@ -3737,9 +3726,8 @@ msgid "Toggle camera mode key"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Tone Mapping"
msgstr "Mip-mapování"
msgstr "Tone mapping"
#: src/settings_translation_file.cpp
msgid "Tooltip delay"
@ -3879,9 +3867,8 @@ msgid "Walking speed"
msgstr "Rychlost chůze"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Water Features"
msgstr "Textury věcí..."
msgstr "Vlastnosti vody"
#: src/settings_translation_file.cpp
msgid "Water level"

View File

@ -8,20 +8,21 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2016-02-20 00:31+0000\n"
"Last-Translator: Miguel Isaac <mikik@hotmail.es>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/minetest/"
"minetest/es/>\n"
"PO-Revision-Date: 2016-03-15 07:22+0000\n"
"Last-Translator: Lucas Montenegro <lucasm52@rocketmail.com>\n"
"Language-Team: Spanish "
"<https://hosted.weblate.org/projects/minetest/minetest/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.5-dev\n"
"X-Generator: Weblate 2.5\n"
#: builtin/fstk/ui.lua
#, fuzzy
msgid "An error occured in a Lua script, such as a mod:"
msgstr "Un error ha ocurrido en un script de Lua, Como un mod:"
msgstr "Un error ha ocurrido en un script de Lua, tal como en un mod:"
#: builtin/fstk/ui.lua
msgid "An error occured:"
@ -53,7 +54,7 @@ msgstr "Desajuste con la versión de protocolo. "
#: builtin/mainmenu/common.lua
msgid "Server enforces protocol version $1. "
msgstr "El servidor hace cumplir la versión $1 del protocolo "
msgstr "El servidor hace respetar la versión $1 del protocolo "
#: builtin/mainmenu/common.lua
msgid "Server supports protocol versions between $1 and $2. "
@ -66,12 +67,13 @@ msgstr ""
"a Internet."
#: builtin/mainmenu/common.lua
#, fuzzy
msgid "We only support protocol version $1."
msgstr "Solo se soporta la version de protocolo $1"
msgstr "Solo se soporta la versión de protocolo $1."
#: builtin/mainmenu/common.lua
msgid "We support protocol versions between version $1 and $2."
msgstr "Nosotros soportamos versiones de protocolo entre la versíon $1 y $2"
msgstr "Nosotros soportamos versiones de protocolo entre la versión $1 y $2."
#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
#: builtin/mainmenu/dlg_rename_modpack.lua
@ -189,7 +191,7 @@ msgstr "Modmgr: Ruta del mod \"$1\" inválida"
#: builtin/mainmenu/dlg_delete_mod.lua
msgid "No of course not!"
msgstr "¡No, porque no!"
msgstr "¡No, claro que no!"
#: builtin/mainmenu/dlg_delete_mod.lua builtin/mainmenu/dlg_delete_world.lua
#: builtin/mainmenu/tab_settings.lua
@ -214,15 +216,16 @@ msgstr "Renombrar paquete de mod:"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "\"$1\" is not a valid flag."
msgstr "\"$ 1\" no es un indicador válido."
msgstr "\"$1\" no es un indicador válido."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "(No description of setting given)"
msgstr "(Ninguna descripción de ajuste dada)"
#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "< Back to Settings page"
msgstr ""
msgstr "< Volver a la página de Configuración"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Browse"
@ -250,7 +253,7 @@ msgid ""
"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
msgstr ""
"Formato: <offset> <escala> (<extensión X>, <extensión> Y, <extensión Z>), "
"Formato: <offset> <escala> (<extensión X>, <extensión Y> , <extensión Z>), "
"<semilla>, <octavas>, <persistencia>"
#: builtin/mainmenu/dlg_settings_advanced.lua
@ -268,7 +271,7 @@ msgstr ""
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Please enter a comma seperated list of flags."
msgstr "Por favor, introduzca una lista separada por comas de indicadores."
msgstr "Por favor, introduzca una lista de indicadores separados por comas."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Please enter a valid integer."
@ -280,7 +283,7 @@ msgstr "Por favor, introduzca un número válido."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Possible values are: "
msgstr "Los posibles valores son: "
msgstr "Los valores posibles son: "
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Restore Default"
@ -296,11 +299,11 @@ msgstr "Mostrar los nombres técnicos"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "The value must be greater than $1."
msgstr "El valor debe ser mayor que $ 1."
msgstr "El valor debe ser mayor que $1."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "The value must be lower than $1."
msgstr "El valor debe ser menor que $ 1."
msgstr "El valor debe ser menor que $1."
#: builtin/mainmenu/modmgr.lua
msgid ""
@ -528,9 +531,8 @@ msgid "8x"
msgstr "8x"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Advanced Settings"
msgstr "Configuración"
msgstr "Configuración Avanzada"
#: builtin/mainmenu/tab_settings.lua
msgid "Antialiasing:"
@ -556,19 +558,17 @@ msgstr "Configurar teclas"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Connected Glass"
msgstr "Vidrios conectados"
msgstr "Vidrio Encadenado"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enable Particles"
msgstr "Activar todos"
msgstr "Activar Partículas"
#: builtin/mainmenu/tab_settings.lua
msgid "Fancy Leaves"
msgstr "Hojas elegantes"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Generate Normalmaps"
msgstr "Generar mapas normales"
@ -581,9 +581,8 @@ msgid "Mipmap + Aniso. Filter"
msgstr "Mipmap + Filtro aniso."
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "No Filter"
msgstr "Filtrado"
msgstr "Sin Filtrado"
#: builtin/mainmenu/tab_settings.lua
msgid "No Mipmap"
@ -627,9 +626,8 @@ msgid "Simple Leaves"
msgstr "Hojas simples"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Smooth Lighting"
msgstr "Iluminación suave"
msgstr "Iluminación Suave"
#: builtin/mainmenu/tab_settings.lua
msgid "Texturing:"
@ -644,24 +642,20 @@ msgid "Touchthreshold (px)"
msgstr "Umbral táctil (px)"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Trilinear Filter"
msgstr "Filtrado trilineal"
msgstr "Filtrado Trilineal"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Leaves"
msgstr "Movimiento de hojas"
msgstr "Movimiento de Hojas"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Plants"
msgstr "Movimiento de plantas"
msgstr "Movimiento de Plantas"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Water"
msgstr "Oleaje en el agua"
msgstr "Oleaje"
#: builtin/mainmenu/tab_simple_main.lua
msgid "Config mods"
@ -1321,13 +1315,12 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"0 = parallax occlusion with slope information (faster).\n"
"1 = relief mapping (slower, more accurate)."
msgstr ""
"0 = Oclusion de paralaje cpn informacion pendiente (rapido).\n"
"1 = Mapeo Aliviado (Lento, Mas Preciso)."
"0 = oclusión de paralaje con información de inclinación (más rápido).\n"
"1 = mapa de relieve (más lento, más preciso)."
#: src/settings_translation_file.cpp
msgid "3D clouds"
@ -1352,20 +1345,19 @@ msgstr ""
"Soporte 3D.\n"
"Soportado Actualmente:\n"
"- Ninguno: No hay salida 3D.\n"
"- Anaglifo: Color cyan/magenta 3D.\n"
"- Entrelazado: Soporte de pantalla en polarizacion basado en line par e "
"impar.\n"
"- Superior Inferior: Partir pantalla superior/inferior.\n"
"- Lado a lado: Partir pantalla lado a lado."
"- Anaglifo: 3D para anteojos de colores cyan y magenta.\n"
"- Entrelazado: Filas pares e impares intercaladas.\n"
"- Superior-inferior: Partir pantalla horizontalmente.\n"
"- Lado a lado: Partir pantalla verticalmente."
#: src/settings_translation_file.cpp
msgid ""
"A chosen map seed for a new map, leave empty for random.\n"
"Will be overridden when creating a new world in the main menu."
msgstr ""
"Una semilla de mapa para un mapa nuevo, deja vacio para una semilla al "
"azar.\n"
"Sera borrado creando un nuevo mundo en el menu principal."
"Una semilla de mapa para un mapa nuevo, deja vacío para una semilla al azar."
"\n"
"Será anulado si se crea un nuevo mundo en el menú principal."
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server crashes."
@ -1400,27 +1392,26 @@ msgid ""
"Leave this blank to start a local server.\n"
"Note that the address field in the main menu overrides this setting."
msgstr ""
"Dirección a la cual conectarse.\n"
"Dejar en blanco para iniciar un servidor local.\n"
"A tener en cuenta: el campo de dirección en el menú principal sobreescribe "
"esta opción."
"Dirección a conectarse.\n"
"Dejar aquí vacío para iniciar un servidor local.\n"
"Nótese que el campo de dirección en el menú principal anula este ajuste."
#: src/settings_translation_file.cpp
msgid ""
"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
"screens."
msgstr ""
"Ajustar la configuración de puntos por pulgada a la pantalla (no X11/solo "
"Android) p.ej. para pantallas 4K."
"Ajustar la configuración de puntos por pulgada a tu pantalla (único no "
"X11/Android) p.ej. para pantallas 4K."
#: src/settings_translation_file.cpp
msgid ""
"Adjust the gamma encoding for the light tables. Lower numbers are brighter.\n"
"This setting is for the client only and is ignored by the server."
msgstr ""
"Ajustar la codificación de gamma para las tablas de luz. Números bajos para "
"más brillante.\n"
"Esta opción es solamente para el cliente y es ignorada por el servidor."
"Ajustar la codificación de gamma para las tablas de luz. Números bajos son "
"más luminosos.\n"
"Este ajuste es para el cliente sólo y está ignorado por el servidor."
#: src/settings_translation_file.cpp
msgid "Advanced"
@ -1456,6 +1447,9 @@ msgid ""
"If you want to announce your ipv6 address, use serverlist_url = v6.servers."
"minetest.net."
msgstr ""
"Anunciar a esta lista de servidores.\n"
"Si deseas anunciar tu dirección ipv6, usa serverlist_url = "
"v6.servers.minetest.net."
#: src/settings_translation_file.cpp
msgid "Approximate (X,Y,Z) scale of fractal in nodes."
@ -1498,7 +1492,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Build inside player"
msgstr ""
msgstr "Construir dentro de jugador"
#: src/settings_translation_file.cpp
msgid "Camera smoothing"
@ -1608,6 +1602,9 @@ msgid ""
"Comma-separated list of trusted mods that are allowed to access insecure\n"
"functions even when mod security is on (via request_insecure_environment())."
msgstr ""
"Lista de mods de fiar separada por coma que se permiten acceder a funciones\n"
"inseguras incluso quando securidad de mods está puesto (vía "
"request_insecure_environment())."
#: src/settings_translation_file.cpp
msgid ""
@ -1620,9 +1617,8 @@ msgid "Command key"
msgstr "Tecla comando"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Connect glass"
msgstr "Vidrios conectados"
msgstr "Conectar vidrio"
#: src/settings_translation_file.cpp
msgid "Connect to external media server"
@ -1633,9 +1629,8 @@ msgid "Connects glass if supported by node."
msgstr "Conectar gafas si el nodo lo soporta."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Console alpha"
msgstr "Consola"
msgstr "Alfa de consola"
#: src/settings_translation_file.cpp
msgid "Console color"
@ -1663,12 +1658,17 @@ msgid ""
"Examples: 72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays "
"unchanged."
msgstr ""
"Controla el duración del ciclo día/noche.\n"
"Ejemplos: 72 = 20min, 360 = 4min, 1 = 24hora, 0 = día/noche/lo que sea se "
"queda inalterado."
#: src/settings_translation_file.cpp
msgid ""
"Controls size of deserts and beaches in Mapgen v6.\n"
"When snowbiomes are enabled 'mgv6_freq_desert' is ignored."
msgstr ""
"Controla el tamaño de desiertos y playas en Mapgen v6.\n"
"Cuando snowbiomes están activados 'mgv6_freq_desert' se ignora."
#: src/settings_translation_file.cpp
msgid "Controls steepness/depth of lake depressions."
@ -1711,8 +1711,9 @@ msgid "Crosshair color (R,G,B)."
msgstr "Color de la cruz (R,G,B)."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Crouch speed"
msgstr ""
msgstr "Velocidad de agacharse"
#: src/settings_translation_file.cpp
msgid "DPI"
@ -4054,7 +4055,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "cURL timeout"
msgstr ""
msgstr "Tiempo de espera de cURL"
#, fuzzy
#~ msgid "If disabled "

View File

@ -8,20 +8,20 @@ msgstr ""
"Project-Id-Version: 0.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2015-11-08 22:26+0000\n"
"PO-Revision-Date: 2016-03-24 13:27+0000\n"
"Last-Translator: Jean-Patrick G. <jeanpatrick.guerrero@gmail.com>\n"
"Language-Team: French <https://hosted.weblate.org/projects/minetest/minetest/"
"fr/>\n"
"Language-Team: French "
"<https://hosted.weblate.org/projects/minetest/minetest/fr/>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 2.5-dev\n"
"X-Generator: Weblate 2.6-dev\n"
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
msgstr "Une erreur est survenue avec un script Lua, comme un mod :"
msgstr "Une erreur est survenue avec un script Lua, il peut s'agir d'un mod :"
#: builtin/fstk/ui.lua
msgid "An error occured:"
@ -85,7 +85,7 @@ msgstr "Dépend de :"
#: builtin/mainmenu/dlg_config_world.lua
msgid "Disable MP"
msgstr "Désactiver le pack de mods"
msgstr "Désactiver les packs de mods"
#: builtin/mainmenu/dlg_config_world.lua
msgid "Enable MP"
@ -220,7 +220,7 @@ msgstr "(Aucune description donnée de l'option)"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "< Back to Settings page"
msgstr ""
msgstr "< Revenir aux paramètres"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Browse"
@ -510,36 +510,33 @@ msgstr "Démarrer"
#: builtin/mainmenu/tab_settings.lua
msgid "2x"
msgstr ""
msgstr "2x"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "3D Clouds"
msgstr "Nuages 3D"
msgstr "Nuages en 3D"
#: builtin/mainmenu/tab_settings.lua
msgid "4x"
msgstr ""
msgstr "4x"
#: builtin/mainmenu/tab_settings.lua
msgid "8x"
msgstr ""
msgstr "8x"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Advanced Settings"
msgstr "Réglages"
msgstr "Réglages avancés"
#: builtin/mainmenu/tab_settings.lua
msgid "Antialiasing:"
msgstr ""
msgstr "Anti-crénelage :"
#: builtin/mainmenu/tab_settings.lua
msgid "Are you sure to reset your singleplayer world?"
msgstr "Êtes-vous sûr de vouloir réinitialiser votre monde ?"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Bilinear Filter"
msgstr "Filtrage bilinéaire"
@ -557,18 +554,16 @@ msgid "Connected Glass"
msgstr "Verre unifié"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enable Particles"
msgstr "Tout activer"
msgstr "Activer les particules"
#: builtin/mainmenu/tab_settings.lua
msgid "Fancy Leaves"
msgstr "Arbres détaillés"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Generate Normalmaps"
msgstr "Normal mapping"
msgstr "Générer un carte normal"
#: builtin/mainmenu/tab_settings.lua
msgid "Mipmap"
@ -579,9 +574,8 @@ msgid "Mipmap + Aniso. Filter"
msgstr "MIP map + anisotropie"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "No Filter"
msgstr "Filtrage"
msgstr "Aucun filtre"
#: builtin/mainmenu/tab_settings.lua
msgid "No Mipmap"
@ -594,7 +588,7 @@ msgstr "Non !"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Node Highlighting"
msgstr "Eclairage des blocs"
msgstr "Surbrillance des blocs"
#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
msgid "None"
@ -625,7 +619,6 @@ msgid "Simple Leaves"
msgstr "Arbres simples"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Smooth Lighting"
msgstr "Lumière douce"
@ -639,27 +632,23 @@ msgstr "Pour activer les shaders, le pilote OpenGL doit être utilisé."
#: builtin/mainmenu/tab_settings.lua
msgid "Touchthreshold (px)"
msgstr ""
msgstr "Sensibilité (px)"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Trilinear Filter"
msgstr "Filtrage trilinéaire"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Leaves"
msgstr "Feuilles d'arbres mouvantes"
msgstr "Feuilles ondulantes"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Plants"
msgstr "Plantes mouvantes"
msgstr "Plantes ondulantes"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Water"
msgstr "Liquides mouvants"
msgstr "Eau ondulante"
#: builtin/mainmenu/tab_simple_main.lua
msgid "Config mods"
@ -1326,7 +1315,6 @@ msgid "3D mode"
msgstr "Mode écran 3D"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"3D support.\n"
"Currently supported:\n"
@ -1343,7 +1331,8 @@ msgstr ""
"- anaglyphe : couleur 3D bleu turquoise/violet.\n"
"- entrelacé : polarisation basée sur des lignes avec support de l'écran.\n"
"- horizontal : partage de l'écran horizontal.\n"
"- vertical : partage de l'écran vertical."
"- vertical : partage de l'écran vertical.\n"
"- pageflip: 3D basé sur quadbuffer."
#: src/settings_translation_file.cpp
msgid ""
@ -1409,8 +1398,9 @@ msgid "Advanced"
msgstr "Avancé"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Altitude Chill"
msgstr ""
msgstr "Altitude d'état de froid"
#: src/settings_translation_file.cpp
msgid "Always fly and fast"
@ -1422,7 +1412,7 @@ msgstr "Occlusion gamma ambiente"
#: src/settings_translation_file.cpp
msgid "Amplifies the valleys"
msgstr ""
msgstr "Amplifier les vallées"
#: src/settings_translation_file.cpp
msgid "Anisotropic filtering"
@ -1461,9 +1451,8 @@ msgid "Backward key"
msgstr "Reculer"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Base terrain height"
msgstr "Hauteur des liquides mouvants"
msgstr "Hauteur du terrain de base"
#: src/settings_translation_file.cpp
msgid "Basic"
@ -1499,15 +1488,15 @@ msgstr "Touche de mise à jour de la caméra"
#: src/settings_translation_file.cpp
msgid "Cave noise #1"
msgstr ""
msgstr "Bruit de cave #1"
#: src/settings_translation_file.cpp
msgid "Cave noise #2"
msgstr ""
msgstr "Bruit de cave #2"
#: src/settings_translation_file.cpp
msgid "Caves and tunnels form at the intersection of the two noises"
msgstr ""
msgstr "Les caves et tunnels se forment à l'intersection de deux bruits"
#: src/settings_translation_file.cpp
msgid "Chat key"
@ -1593,8 +1582,9 @@ msgid ""
"Comma-separated list of trusted mods that are allowed to access insecure\n"
"functions even when mod security is on (via request_insecure_environment())."
msgstr ""
"Liste de mods fiables qui sont autorisées à des accès insécurisés\n"
"de fonctions même lorsque l'option de sécurisation des mods est activée (via "
"Liste séparée par des virgules des mods de confiance qui sont autorisés à "
"accéder aux fonctions non\n"
"sécurisées même lorsque l'option de sécurisation des mods est activée (via "
"request_insecure_environment())."
#: src/settings_translation_file.cpp
@ -1602,6 +1592,10 @@ msgid ""
"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
"allow them to upload and download data to/from the internet."
msgstr ""
"Liste séparée par des virgules des mods de confiance qui sont autorisés à "
"accéder\n"
"aux API HTTP, leur permettant d'envoyer et de télécharger des données vers/"
"depuis Internet."
#: src/settings_translation_file.cpp
msgid "Command key"
@ -1817,6 +1811,9 @@ msgid ""
"The 3 numbers in brackets control the scale of the\n"
"terrain, the 3 numbers should be identical."
msgstr ""
"Détermine la forme du terrain.\n"
"Les 3 nombres entre parenthèses contrôlent l'échelle du terrain,\n"
"ces nombres doivent être identiques."
#: src/settings_translation_file.cpp
msgid "Disable anticheat"
@ -1911,7 +1908,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Enables animation of inventory items."
msgstr ""
msgstr "Active la rotation des items d'inventaire."
#: src/settings_translation_file.cpp
msgid ""
@ -2037,7 +2034,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Filmic tone mapping"
msgstr ""
msgstr "Tone Mapping"
#: src/settings_translation_file.cpp
msgid ""
@ -2162,7 +2159,7 @@ msgstr "Gamma"
#: src/settings_translation_file.cpp
msgid "General"
msgstr ""
msgstr "Général"
#: src/settings_translation_file.cpp
msgid "Generate normalmaps"
@ -2234,7 +2231,7 @@ msgstr "Adresse web du serveur affichée sur la liste des serveurs."
#: src/settings_translation_file.cpp
msgid "How deep to make rivers"
msgstr ""
msgstr "Profondeur des rivières"
#: src/settings_translation_file.cpp
msgid ""
@ -2267,7 +2264,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "How wide to make rivers"
msgstr ""
msgstr "Largeur des rivières"
#: src/settings_translation_file.cpp
msgid "IPv6"
@ -2384,7 +2381,7 @@ msgstr "Intervalle d'envoi de l'heure de jeu aux clients."
#: src/settings_translation_file.cpp
msgid "Inventory items animations"
msgstr ""
msgstr "Animation des items d'inventaire"
#: src/settings_translation_file.cpp
msgid "Inventory key"
@ -2764,11 +2761,11 @@ msgstr "Langue"
#: src/settings_translation_file.cpp
msgid "Large cave depth"
msgstr ""
msgstr "Profondeur des grandes caves"
#: src/settings_translation_file.cpp
msgid "Lava Features"
msgstr ""
msgstr "Fonctionnalités de la lave"
#: src/settings_translation_file.cpp
msgid "Leaves style"
@ -3262,11 +3259,11 @@ msgstr "Mapgen V7 : paramètres du bruit de la persistance du terrain"
#: src/settings_translation_file.cpp
msgid "Massive cave depth"
msgstr ""
msgstr "Profondeur des caves massives"
#: src/settings_translation_file.cpp
msgid "Massive cave noise"
msgstr ""
msgstr "Bruit des caves massives"
#: src/settings_translation_file.cpp
msgid "Massive caves form here."
@ -3409,7 +3406,7 @@ msgstr "Message du jour affiché aux joueurs lors de la connexion."
#: src/settings_translation_file.cpp
msgid "Method used to highlight selected object."
msgstr ""
msgstr "Méthodes utilisées pour l'éclairage des objets."
#: src/settings_translation_file.cpp
msgid "Minimap"
@ -3540,7 +3537,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Noises"
msgstr ""
msgstr "Bruits"
#: src/settings_translation_file.cpp
msgid "Normalmaps sampling"
@ -3696,7 +3693,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Raises terrain to make valleys around the rivers"
msgstr ""
msgstr "Élève le terrain pour former des vallées autour des rivières"
#: src/settings_translation_file.cpp
msgid "Random input"
@ -3728,15 +3725,15 @@ msgstr "Intervalle de répétition du clic droit"
#: src/settings_translation_file.cpp
msgid "River Depth"
msgstr ""
msgstr "Profondeur des rivières"
#: src/settings_translation_file.cpp
msgid "River Noise"
msgstr ""
msgstr "Bruit des rivières"
#: src/settings_translation_file.cpp
msgid "River Size"
msgstr ""
msgstr "Taille des rivières"
#: src/settings_translation_file.cpp
msgid "River noise -- rivers occur close to zero"
@ -3969,7 +3966,7 @@ msgstr "SQLite synchronisé"
#: src/settings_translation_file.cpp
msgid "Terrain Height"
msgstr ""
msgstr "Hauteur du terrain"
#: src/settings_translation_file.cpp
msgid ""
@ -3991,7 +3988,7 @@ msgstr "Chemin des textures"
#: src/settings_translation_file.cpp
msgid "The altitude at which temperature drops by 20C"
msgstr ""
msgstr "L'altitude à laquelle la température descend de 20°C"
#: src/settings_translation_file.cpp
msgid "The depth of dirt or other filler"
@ -4168,11 +4165,11 @@ msgstr "Synchronisation verticale"
#: src/settings_translation_file.cpp
msgid "VBO"
msgstr ""
msgstr "VBO"
#: src/settings_translation_file.cpp
msgid "Valley Depth"
msgstr ""
msgstr "Profondeur des vallées"
#: src/settings_translation_file.cpp
msgid "Valley Fill"
@ -4180,11 +4177,11 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Valley Profile"
msgstr ""
msgstr "Profil des vallées"
#: src/settings_translation_file.cpp
msgid "Valley Slope"
msgstr ""
msgstr "Inclinaison des vallées"
#: src/settings_translation_file.cpp
msgid "Valleys C Flags"
@ -4207,6 +4204,8 @@ msgid ""
"View distance in nodes.\n"
"Min = 20"
msgstr ""
"Distance d'affichage en blocs.\n"
"Minimum à 20"
#: src/settings_translation_file.cpp
msgid "View range decrease key"

File diff suppressed because it is too large Load Diff

View File

@ -8,11 +8,11 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2016-01-26 16:32+0000\n"
"PO-Revision-Date: 2016-03-09 17:45+0000\n"
"Last-Translator: Muhammad Rifqi Priyo Susanto "
"<muhammadrifqipriyosusanto@gmail.com>\n"
"Language-Team: Indonesian <https://hosted.weblate.org/projects/minetest/"
"minetest/id/>\n"
"Language-Team: Indonesian "
"<https://hosted.weblate.org/projects/minetest/minetest/id/>\n"
"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -22,7 +22,7 @@ msgstr ""
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
msgstr "Sebuah kesalahan muncul pada skrip Lua, seperti pada mod:"
msgstr "Sebuah kesalahan terjadi di sebuah skrip Lua, seperti sebuah mod:"
#: builtin/fstk/ui.lua
msgid "An error occured:"
@ -30,7 +30,7 @@ msgstr "Kesalahan muncul:"
#: builtin/fstk/ui.lua
msgid "Main menu"
msgstr "Menu Utama"
msgstr "Menu utama"
#: builtin/fstk/ui.lua builtin/mainmenu/store.lua
msgid "Ok"
@ -38,7 +38,7 @@ msgstr "Oke"
#: builtin/fstk/ui.lua
msgid "Reconnect"
msgstr "Menyambung ulang"
msgstr "Sambung ulang"
#: builtin/fstk/ui.lua
msgid "The server has requested a reconnect:"
@ -63,8 +63,7 @@ msgstr "Server mendukung protokol antara versi $1 dan versi $2. "
#: builtin/mainmenu/common.lua
msgid "Try reenabling public serverlist and check your internet connection."
msgstr ""
"Cobalah mengaktifkan ulang daftar server publik dan cek koneksi internet "
"Anda."
"Cobalah mencentang ulang daftar server publik dan cek koneksi internet Anda."
#: builtin/mainmenu/common.lua
msgid "We only support protocol version $1."
@ -139,6 +138,7 @@ msgid "A world named \"$1\" already exists"
msgstr "Dunia bernama \"$1\" telah ada"
#: builtin/mainmenu/dlg_create_world.lua
#, fuzzy
msgid "Create"
msgstr "Buat"
@ -160,7 +160,7 @@ msgstr "Generator peta"
#: builtin/mainmenu/dlg_create_world.lua
msgid "No worldname given or no game selected"
msgstr "Tidak ada nama atau permainan yang dipilih"
msgstr "Tidak ada dunia atau permainan yang dipilih"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Seed"
@ -176,11 +176,11 @@ msgstr "Nama dunia"
#: builtin/mainmenu/dlg_create_world.lua
msgid "You have no subgames installed."
msgstr "Kamu tidak punya sub-permainan terpasang."
msgstr "Anda tidak punya sub-permainan terpasang."
#: builtin/mainmenu/dlg_delete_mod.lua
msgid "Are you sure you want to delete \"$1\"?"
msgstr "Kamu yakin ingin menghapus \"$1\"?"
msgstr "Anda yakin ingin menghapus \"$1\"?"
#: builtin/mainmenu/dlg_delete_mod.lua
msgid "Modmgr: failed to delete \"$1\""
@ -188,7 +188,7 @@ msgstr "Pengelola mod: gagal untuk menghapus \"$1\""
#: builtin/mainmenu/dlg_delete_mod.lua
msgid "Modmgr: invalid modpath \"$1\""
msgstr "Pengelola mod: jalur mod tidak sah"
msgstr "Pengelola mod: jalur mod tidak sah \"$1\""
#: builtin/mainmenu/dlg_delete_mod.lua
msgid "No of course not!"
@ -213,9 +213,10 @@ msgstr "Setuju"
#: builtin/mainmenu/dlg_rename_modpack.lua
msgid "Rename Modpack:"
msgstr "Ganti Nama Paket Mod:"
msgstr "Ganti nama paket mod:"
#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "\"$1\" is not a valid flag."
msgstr "\"$1\" bukan sebuah flag yang sah."
@ -224,8 +225,9 @@ msgid "(No description of setting given)"
msgstr "(Tidak ada keterangan dari pengaturan yang diberikan)"
#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "< Back to Settings page"
msgstr ""
msgstr "< Halaman Pengaturan"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Browse"
@ -233,7 +235,7 @@ msgstr "Jelajahi"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Disabled"
msgstr "Nonaktif"
msgstr "Dinonaktifkan"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Edit"
@ -244,6 +246,7 @@ msgid "Enabled"
msgstr "Diaktifkan"
#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "Format is 3 numbers separated by commas and inside brackets."
msgstr ""
"Format adalah 3 angka yang dipisahkan oleh koma dan di dalam tanda kurung."
@ -266,8 +269,10 @@ msgid "Mods"
msgstr "Mod"
#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "Optionally the lacunarity can be appended with a leading comma."
msgstr ""
"lacunarity (celah, opsional) dapat ditambahkan dengan awalan tanda koma."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Please enter a comma seperated list of flags."
@ -287,9 +292,10 @@ msgstr "Nilai yang mungkin adalah: "
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Restore Default"
msgstr "Kembalikan ke Bawaan"
msgstr "Atur ke Bawaan"
#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "Select path"
msgstr "Pilih jalur"
@ -311,7 +317,7 @@ msgid ""
"Install Mod: unsupported filetype \"$1\" or broken archive"
msgstr ""
"\n"
"Pemasangan Mod: tipe berkas tidak didukung \"$1\" atau kerusakan arsip"
"Pemasangan Mod: tipe berkas tidak didukung \"$1\" atau kerusakan pada arsip"
#: builtin/mainmenu/modmgr.lua
msgid "Failed to install $1 to $2"
@ -405,7 +411,7 @@ msgstr "Tidak ada deskripsi mod tersedia"
#: builtin/mainmenu/tab_mods.lua
msgid "Rename"
msgstr "Ganti Nama"
msgstr "Ganti nama"
#: builtin/mainmenu/tab_mods.lua
msgid "Select Mod File:"
@ -421,7 +427,7 @@ msgstr "Copot pemasangan paket mod terpilih"
#: builtin/mainmenu/tab_multiplayer.lua
msgid "Address / Port :"
msgstr "Alamat / Port:"
msgstr "Alamat / Port :"
#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
msgid "Client"
@ -446,7 +452,7 @@ msgstr "Hapus"
#: builtin/mainmenu/tab_multiplayer.lua
msgid "Name / Password :"
msgstr "Nama / Kata sandi:"
msgstr "Nama / Kata sandi :"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
msgid "Public Serverlist"
@ -484,7 +490,7 @@ msgstr "Baru"
#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
msgid "No world created or selected!"
msgstr "Tidak ada dunia atau permainan yang dipilih!"
msgstr "Tidak ada dunia yang dibuat atau dipilih!"
#: builtin/mainmenu/tab_server.lua
msgid "Port"
@ -512,40 +518,40 @@ msgstr "Mulai Permainan"
#: builtin/mainmenu/tab_settings.lua
msgid "2x"
msgstr ""
msgstr "2x"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "3D Clouds"
msgstr "Awan 3D"
#: builtin/mainmenu/tab_settings.lua
msgid "4x"
msgstr ""
msgstr "4x"
#: builtin/mainmenu/tab_settings.lua
msgid "8x"
msgstr ""
msgstr "8x"
#: builtin/mainmenu/tab_settings.lua
msgid "Advanced Settings"
msgstr "Pengaturan Lanjutan"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Advanced Settings"
msgstr "Pengaturan"
#: builtin/mainmenu/tab_settings.lua
msgid "Antialiasing:"
msgstr ""
msgstr "Antialiasing:"
#: builtin/mainmenu/tab_settings.lua
msgid "Are you sure to reset your singleplayer world?"
msgstr "Yakin ingin mengaturulang dunia anda?"
msgstr "Apakah Anda yakin ingin mengatur ulang dunia Anda?"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Bilinear Filter"
msgstr "Bilinear filtering"
msgstr "Bilinear Filter"
#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
#, fuzzy
msgid "Bumpmapping"
msgstr "Bumpmapping"
@ -554,34 +560,32 @@ msgid "Change keys"
msgstr "Ubah tombol"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Connected Glass"
msgstr "Sambungkan kaca"
msgstr "Kaca Tersambung"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enable Particles"
msgstr "Aktifkan semua"
msgstr "Aktifkan Partikel"
#: builtin/mainmenu/tab_settings.lua
msgid "Fancy Leaves"
msgstr "Daun Megah"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Generate Normalmaps"
msgstr "Gunakan Normalmaps"
msgstr "Hasilkan Normalmaps"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Mipmap"
msgstr "Mipmap"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Mipmap + Aniso. Filter"
msgstr "Mipmap + Aniso. Filter"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "No Filter"
msgstr "Tanpa Filter"
@ -596,7 +600,7 @@ msgstr "Tidak!!!"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Node Highlighting"
msgstr "Pencahayaan Halus"
msgstr "Node Highlighting"
#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
msgid "None"
@ -611,6 +615,7 @@ msgid "Opaque Water"
msgstr "Air Buram"
#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
#, fuzzy
msgid "Parallax Occlusion"
msgstr "Parallax Occlusion"
@ -620,14 +625,13 @@ msgstr "Pengaturan"
#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
msgid "Shaders"
msgstr "Shaders"
msgstr "Shader"
#: builtin/mainmenu/tab_settings.lua
msgid "Simple Leaves"
msgstr "Daun Sederhana"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Smooth Lighting"
msgstr "Pencahayaan Halus"
@ -839,7 +843,7 @@ msgstr ""
#: src/game.cpp
msgid "Exit to Menu"
msgstr "Kembali ke Menu Utama"
msgstr "Menu Utama"
#: src/game.cpp
msgid "Exit to OS"
@ -970,9 +974,8 @@ msgid "Sneak"
msgstr "Menyelinap"
#: src/guiKeyChangeMenu.cpp
#, fuzzy
msgid "Toggle Cinematic"
msgstr "Gerak cepat"
msgstr "Toggle Sinematik"
#: src/guiKeyChangeMenu.cpp
msgid "Toggle fast"
@ -1422,7 +1425,7 @@ msgstr "Lanjutan"
#: src/settings_translation_file.cpp
msgid "Altitude Chill"
msgstr ""
msgstr "Dingin di Ketinggian"
#: src/settings_translation_file.cpp
msgid "Always fly and fast"
@ -1434,8 +1437,9 @@ msgid "Ambient occlusion gamma"
msgstr "Ambient occlusion gamma"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Amplifies the valleys"
msgstr ""
msgstr "Menguatkan lembah"
#: src/settings_translation_file.cpp
#, fuzzy
@ -1457,8 +1461,9 @@ msgstr ""
"servers.minetest.net."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Approximate (X,Y,Z) scale of fractal in nodes."
msgstr ""
msgstr "Memperkirakan skala (X,Y,Z) dari fraktal pada node."
#: src/settings_translation_file.cpp
msgid "Ask to reconnect after crash"
@ -1513,15 +1518,15 @@ msgstr "Tombol beralih pembaruan kamera"
#: src/settings_translation_file.cpp
msgid "Cave noise #1"
msgstr ""
msgstr "Noise #1 gua"
#: src/settings_translation_file.cpp
msgid "Cave noise #2"
msgstr ""
msgstr "Noise #2 gua"
#: src/settings_translation_file.cpp
msgid "Caves and tunnels form at the intersection of the two noises"
msgstr ""
msgstr "Gua dan terowongan terbentuk di persimpangan antara dua noise"
#: src/settings_translation_file.cpp
msgid "Chat key"
@ -1592,7 +1597,7 @@ msgstr "Awan"
#: src/settings_translation_file.cpp
msgid "Clouds are a client side effect."
msgstr "Awan adalah efek tiap klien."
msgstr "Awan adalah efek dari klien."
#: src/settings_translation_file.cpp
msgid "Clouds in menu"
@ -1616,6 +1621,9 @@ msgid ""
"Comma-seperated list of mods that are allowed to access HTTP APIs, which\n"
"allow them to upload and download data to/from the internet."
msgstr ""
"Daftar yang dipisahkan koma dari mod yang dibolehkan untuk mengakses\n"
"HTTP API, membolehkan mereka untuk mengunggah dan mengunduh data\n"
"ke/dari internet."
#: src/settings_translation_file.cpp
msgid "Command key"
@ -1647,11 +1655,11 @@ msgstr "Tombol konsol"
#: src/settings_translation_file.cpp
msgid "Continuous forward"
msgstr ""
msgstr "Maju terus-menerus"
#: src/settings_translation_file.cpp
msgid "Continuous forward movement (only used for testing)."
msgstr ""
msgstr "Gerakan maju terus-menerus (hanya digunakan untuk pengujian)."
#: src/settings_translation_file.cpp
#, fuzzy
@ -1678,43 +1686,47 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Controls steepness/depth of lake depressions."
msgstr ""
msgstr "Mengatur kecuraman/kedalaman dari lekukan danau."
#: src/settings_translation_file.cpp
msgid "Controls steepness/height of hills."
msgstr ""
msgstr "Mengatur kecuraman/ketinggian dari bukit."
#: src/settings_translation_file.cpp
msgid "Crash message"
msgstr ""
msgstr "Pesan kerusakan"
#: src/settings_translation_file.cpp
msgid ""
"Creates unpredictable lava features in caves.\n"
"These can make mining difficult. Zero disables them. (0-10)"
msgstr ""
"Membuat lava yang tidak dapat diprediksi di dalam gua.\n"
"Ini dapat menyebabkan menambang menjadi sulit. Nol menonaktifkannya. (0-10)"
#: src/settings_translation_file.cpp
msgid ""
"Creates unpredictable water features in caves.\n"
"These can make mining difficult. Zero disables them. (0-10)"
msgstr ""
"Membuat air yang tidak dapat diprediksi di dalam gua.\n"
"Ini dapat menyebabkan menambang menjadi sulit. Nol menonaktifkannya. (0-10)"
#: src/settings_translation_file.cpp
msgid "Crosshair alpha"
msgstr ""
msgstr "Keburaman crosshair"
#: src/settings_translation_file.cpp
msgid "Crosshair alpha (opaqueness, between 0 and 255)."
msgstr ""
msgstr "Keburaman crosshair (keopakan, antara 0 sampai 255)."
#: src/settings_translation_file.cpp
msgid "Crosshair color"
msgstr ""
msgstr "Warna crosshair"
#: src/settings_translation_file.cpp
msgid "Crosshair color (R,G,B)."
msgstr ""
msgstr "Warna crosshair (merah,hijau,biru atau R,G,B)."
#: src/settings_translation_file.cpp
msgid "Crouch speed"
@ -1722,20 +1734,19 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "DPI"
msgstr ""
msgstr "DPI"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Damage"
msgstr "Aktifkan Kerusakan"
msgstr "Kerusakan"
#: src/settings_translation_file.cpp
msgid "Debug info toggle key"
msgstr ""
msgstr "Tombol beralih info debug"
#: src/settings_translation_file.cpp
msgid "Debug log level"
msgstr ""
msgstr "Tingkat catatan debug"
#: src/settings_translation_file.cpp
msgid "Dedicated server step"
@ -1743,32 +1754,36 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Default acceleration"
msgstr ""
msgstr "Percepatan bawaan"
#: src/settings_translation_file.cpp
msgid "Default game"
msgstr ""
msgstr "Permainan bawaan"
#: src/settings_translation_file.cpp
msgid ""
"Default game when creating a new world.\n"
"This will be overridden when creating a world from the main menu."
msgstr ""
"Permainan bawaan saat membuat dunia baru.\n"
"Ini akan diganti saat membuat dunia dari menu utama."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Default password"
msgstr "Kata Sandi Baru"
msgstr "Kata sandi bawaan"
#: src/settings_translation_file.cpp
msgid "Default privileges"
msgstr ""
msgstr "Izin bawaan"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Default timeout for cURL, stated in milliseconds.\n"
"Only has an effect if compiled with cURL."
msgstr ""
"Batas waktu bawaan untuk cURL, dalam milidetik.\n"
"Hanya berefek jika di-compile dengan cURL."
#: src/settings_translation_file.cpp
msgid ""
@ -1786,15 +1801,17 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Deprecated Lua API handling"
msgstr ""
msgstr "Penanganan Lua API usang"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Depth below which you'll find large caves."
msgstr ""
msgstr "Kedalaman minimal di mana Anda akan menemukan gua besar."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Depth below which you'll find massive caves."
msgstr ""
msgstr "Kedalaman minimal di mana Anda akan menemukan gua raksasa."
#: src/settings_translation_file.cpp
msgid "Descending speed"
@ -1805,6 +1822,8 @@ msgid ""
"Description of server, to be displayed when players join and in the "
"serverlist."
msgstr ""
"Deskripsi dari server yang akan ditampilkan saat pemain bergabung dan pada "
"daftar server."
#: src/settings_translation_file.cpp
msgid "Desynchronize block animation"
@ -1824,37 +1843,34 @@ msgid ""
"The 3 numbers in brackets control the scale of the\n"
"terrain, the 3 numbers should be identical."
msgstr ""
"Menentukan bentuk tanah.\n"
"3 angka dalam kurung mengatur skala dari bentuk\n"
"tanah, ketiganya harus sama."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Disable anticheat"
msgstr "Aktifkan Partikel"
msgstr "Nonaktifkan anticurang (anticheat)"
#: src/settings_translation_file.cpp
msgid "Disallow empty passwords"
msgstr ""
msgstr "Larang kata sandi kosong"
#: src/settings_translation_file.cpp
msgid "Domain name of server, to be displayed in the serverlist."
msgstr ""
msgstr "Nama domain dari server yang akan ditampilkan di daftar server."
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Double tap jump for fly"
msgstr ""
"Tekan ganda \"lompat\" untuk\n"
"beralih terbang"
msgstr "Tekan ganda \"lompat\" untuk terbang"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Double-tapping the jump key toggles fly mode."
msgstr ""
"Tekan ganda \"lompat\" untuk\n"
"beralih terbang"
msgstr "Menekan ganda tombol \"lompat\" untuk beralih terbang."
#: src/settings_translation_file.cpp
msgid "Drop item key"
msgstr ""
msgstr "Tombol menjatuhkan barang"
#: src/settings_translation_file.cpp
msgid "Dump the mapgen debug infos."
@ -1866,23 +1882,25 @@ msgid "Enable VBO"
msgstr "Aktifkan PM"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enable mod security"
msgstr "Gudang mod daring"
msgstr "Aktifkan mod keamanan"
#: src/settings_translation_file.cpp
msgid "Enable players getting damage and dying."
msgstr ""
msgstr "Membolehkan pemain terkena kerusakan dan mati."
#: src/settings_translation_file.cpp
msgid "Enable random user input (only used for testing)."
msgstr ""
msgstr "Aktifkan masukan acak dari pengguna (hanya digunakan untuk pengujian)."
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Enable smooth lighting with simple ambient occlusion.\n"
"Disable for speed or for different looks."
msgstr ""
"Aktifkan pencahayaan halus dengan ambient occlusion sederhana.\n"
"Nonaktifkan untuk kecepatan atau untuk tampilan lain."
#: src/settings_translation_file.cpp
msgid ""
@ -1892,6 +1910,12 @@ msgid ""
"to new servers, but they may not support all new features that you are "
"expecting."
msgstr ""
"Membolehkan untuk melarang klien lawas untuk terhubung.\n"
"Klien-klien lawas dianggap sesuai jika mereka tidak rusak saat "
"menghubungkan\n"
"ke server-server baru, tetapi mereka mungkin tidak mendukung semua fitur "
"baru\n"
"yang Anda harapkan."
#: src/settings_translation_file.cpp
msgid ""
@ -1900,6 +1924,10 @@ msgid ""
"textures)\n"
"when connecting to the server."
msgstr ""
"Membolehkan penggunaan server media asing (jika diberikan oleh server).\n"
"Server asing menawarkan cara lebih cepat untuk mengunduh media (misal.: "
"tekstur)\n"
"saat terhubung ke server."
#: src/settings_translation_file.cpp
msgid ""
@ -1907,10 +1935,13 @@ msgid ""
"to IPv6 clients, depending on system configuration.\n"
"Ignored if bind_address is set."
msgstr ""
"Nyalakan/matikan menjalankan server IPv6. Sebuah server IPv6 mungkin\n"
"terbatas untuk klien IPv6, tergantung dari konfigurasi sistem.\n"
"Diabaikan jika bind_address telah diatur."
#: src/settings_translation_file.cpp
msgid "Enables animation of inventory items."
msgstr ""
msgstr "Nyalakan animasi barang inventaris."
#: src/settings_translation_file.cpp
msgid ""
@ -1919,20 +1950,21 @@ msgid ""
"or need to be auto-generated.\n"
"Requires shaders to be enabled."
msgstr ""
"Nyalakan bumpmapping untuk tekstur. Normalmaps harus disediakan oleh paket\n"
"tekstur atau harus dihasilkan otomatis.\n"
"Membutuhkan shader diaktifkan."
#: src/settings_translation_file.cpp
msgid "Enables caching of facedir rotated meshes."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enables filmic tone mapping"
msgstr "Aktifkan Kerusakan"
msgstr "Mengaktifkan pemetaan suasana (tone mapping) filmis"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enables minimap."
msgstr "Aktifkan Kerusakan"
msgstr "Aktifkan peta mini."
#: src/settings_translation_file.cpp
msgid ""
@ -1951,10 +1983,12 @@ msgid ""
"Experimental option, might cause visible spaces between blocks\n"
"when set to higher number than 0."
msgstr ""
"Eksperimental, dapat menyebabkan terlihatnya spasi antara blok\n"
"saat diatur dengan angka yang lebih besar dari 0."
#: src/settings_translation_file.cpp
msgid "FPS in pause menu"
msgstr ""
msgstr "FPS (bingkai per detik) pada menu jeda"
#: src/settings_translation_file.cpp
msgid "FSAA"
@ -2242,6 +2276,9 @@ msgid ""
"If FPS would go higher than this, limit it by sleeping\n"
"to not waste CPU power for no benefit."
msgstr ""
"Jika FPS (bingkai per detik) lebih tinggi dari ini, akan\n"
"dibatasi dengan jeda agar tidak menghabiskan tenaga\n"
"CPU dengan percuma."
#: src/settings_translation_file.cpp
msgid ""
@ -3117,45 +3154,51 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Maximum FPS"
msgstr ""
msgstr "FPS (bingkai per detik) maksimal"
#: src/settings_translation_file.cpp
msgid "Maximum FPS when game is paused."
msgstr ""
msgstr "FPS (bingkai per detik) maksimal saat permainan dijeda."
#: src/settings_translation_file.cpp
msgid "Maximum forceloaded blocks"
msgstr ""
msgstr "Jumlah maksimal blok yang dipaksa muat (forceloaded)"
#: src/settings_translation_file.cpp
msgid "Maximum hotbar width"
msgstr ""
msgstr "Lebar maksimal hotbar"
#: src/settings_translation_file.cpp
msgid "Maximum number of blocks that can be queued for loading."
msgstr ""
msgstr "Jumlah maksimal blok yang dapat diantrikan untuk dimuat."
#: src/settings_translation_file.cpp
msgid ""
"Maximum number of blocks to be queued that are to be generated.\n"
"Set to blank for an appropriate amount to be chosen automatically."
msgstr ""
"Jumlah maksimal blok yang akan diantrikan yang akan dihasilkan.\n"
"Atur ke kosong untuk diatur secara otomatis."
#: src/settings_translation_file.cpp
msgid ""
"Maximum number of blocks to be queued that are to be loaded from file.\n"
"Set to blank for an appropriate amount to be chosen automatically."
msgstr ""
"Jumlah maksimal blok yang akan diantrikan yang akan dimuat dari berkas.\n"
"Atur ke kosong untuk diatur secara otomatis."
#: src/settings_translation_file.cpp
msgid "Maximum number of forceloaded mapblocks."
msgstr ""
msgstr "Jumlah maksimal blok peta (mapblock) yang dipaksa muat (forceloaded)."
#: src/settings_translation_file.cpp
msgid ""
"Maximum number of mapblocks for client to be kept in memory.\n"
"Set to -1 for unlimited amount."
msgstr ""
"Jumlah maksimal blok peta (mapblock) yang disimpan di memori klien.\n"
"Atur ke -1 untuk tak terhingga."
#: src/settings_translation_file.cpp
msgid ""
@ -3163,40 +3206,47 @@ msgid ""
"try reducing it, but don't reduce it to a number below double of targeted\n"
"client number."
msgstr ""
"Jumlah maksimal paket dikirim tiap langkah mengirim (send step), jika Anda\n"
"memiliki koneksi lambat, cobalah untuk menguranginya, tetapi jangan "
"mengurangi\n"
"di bawah dua kalinya jumlah klien yang ditargetkan."
#: src/settings_translation_file.cpp
msgid "Maximum number of players that can connect simultaneously."
msgstr ""
msgstr "Jumlah maksimal pemain yang dapat terhubung serentak."
#: src/settings_translation_file.cpp
msgid "Maximum number of statically stored objects in a block."
msgstr ""
msgstr "Jumlah maksimal objek yang disimpan secara statis dalam satu blok."
#: src/settings_translation_file.cpp
msgid ""
"Maximum proportion of current window to be used for hotbar.\n"
"Useful if there's something to be displayed right or left of hotbar."
msgstr ""
"Proporsi maksimal jendela saat ini yang digunakan untuk hotbar.\n"
"Berguna jika ada sesuatu yang akan ditampilkan di kanan atau kiri hotbar."
#: src/settings_translation_file.cpp
msgid "Maximum simultaneously blocks send per client"
msgstr ""
msgstr "Jumlah maksimal blok yang dikirim serentak tiap klien"
#: src/settings_translation_file.cpp
msgid "Maximum simultaneously bocks send total"
msgstr ""
msgstr "Jumlah maksimal total blok yang dikirim"
#: src/settings_translation_file.cpp
msgid "Maximum time in ms a file download (e.g. a mod download) may take."
msgstr ""
"Waktu maksimal dalam milidetik saat mengunduh berkas (misal.: mengunduh mod)."
#: src/settings_translation_file.cpp
msgid "Maximum users"
msgstr ""
msgstr "Jumlah pengguna maksimal"
#: src/settings_translation_file.cpp
msgid "Maxmimum objects per block"
msgstr ""
msgstr "Jumlah objek maksimal tiap blok"
#: src/settings_translation_file.cpp
#, fuzzy
@ -3209,11 +3259,11 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Message of the day"
msgstr ""
msgstr "Pesan hari ini"
#: src/settings_translation_file.cpp
msgid "Message of the day displayed to players connecting."
msgstr ""
msgstr "Pesan hari ini yang ditampilkan ke pemain yang terhubung."
#: src/settings_translation_file.cpp
msgid "Method used to highlight selected object."
@ -3221,11 +3271,11 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Minimap"
msgstr ""
msgstr "Peta mini"
#: src/settings_translation_file.cpp
msgid "Minimap key"
msgstr ""
msgstr "Tombol peta mini"
#: src/settings_translation_file.cpp
msgid "Minimap scan height"

View File

@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: Minetest 0.4.9\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2016-01-25 18:13+0000\n"
"Last-Translator: Paolo DGZ <pikinor24@yahoo.it>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/minetest/"
"minetest/it/>\n"
"PO-Revision-Date: 2016-03-12 13:59+0000\n"
"Last-Translator: Elia Zammuto <theelixzammuto@gmail.com>\n"
"Language-Team: Italian "
"<https://hosted.weblate.org/projects/minetest/minetest/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.5-dev\n"
"X-Generator: Weblate 2.5\n"
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
@ -224,7 +224,7 @@ msgstr "(Non è disponibile nessuna descrizione dell'impostazione)"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "< Back to Settings page"
msgstr ""
msgstr "<Torna alla pagina Impostazioni"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Browse"
@ -578,7 +578,7 @@ msgstr "Mip-Mapping"
#: builtin/mainmenu/tab_settings.lua
msgid "Mipmap + Aniso. Filter"
msgstr ""
msgstr "Mipmap + Filtro Anisotropico"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy

View File

@ -3,16 +3,16 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2016-01-14 08:53+0000\n"
"PO-Revision-Date: 2016-03-15 09:07+0000\n"
"Last-Translator: Rui <rui914t@gmail.com>\n"
"Language-Team: Japanese <https://hosted.weblate.org/projects/minetest/"
"minetest/ja/>\n"
"Language-Team: Japanese "
"<https://hosted.weblate.org/projects/minetest/minetest/ja/>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.5-dev\n"
"X-Generator: Weblate 2.5\n"
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
@ -36,7 +36,7 @@ msgstr "再接続"
#: builtin/fstk/ui.lua
msgid "The server has requested a reconnect:"
msgstr "サーバが再接続を要求しました:"
msgstr "サーバが再接続を要求しました:"
#: builtin/mainmenu/common.lua src/game.cpp
msgid "Loading..."
@ -48,15 +48,15 @@ msgstr "プロトコルバージョンが一致していません。 "
#: builtin/mainmenu/common.lua
msgid "Server enforces protocol version $1. "
msgstr "サーバのプロトコルバージョンは$1が適用されます。 "
msgstr "サーバのプロトコルバージョンは$1が適用されます。 "
#: builtin/mainmenu/common.lua
msgid "Server supports protocol versions between $1 and $2. "
msgstr "サーバは$1から$2までのプロトコルバージョンをサポートしています。 "
msgstr "サーバは$1から$2までのプロトコルバージョンをサポートしています。 "
#: builtin/mainmenu/common.lua
msgid "Try reenabling public serverlist and check your internet connection."
msgstr "インターネット接続を確認し、公開サーバーリストを再有効化してください。"
msgstr "インターネット接続を確認し、公開サーバ一覧を再有効化してください。"
#: builtin/mainmenu/common.lua
msgid "We only support protocol version $1."
@ -93,9 +93,7 @@ msgstr "全て有効化"
msgid ""
"Failed to enable mod \"$1\" as it contains disallowed characters. Only "
"chararacters [a-z0-9_] are allowed."
msgstr ""
"許可されていない文字が使用されているためMod \"$1\"を有効化できませんでした。"
"文字は[a-z0-9_]のみ使用できます。"
msgstr "許可されていない文字が使用されているためMod \"$1\"を有効化できませんでした。文字は[a-z0-9_]のみ使用できます。"
#: builtin/mainmenu/dlg_config_world.lua
msgid "Hide Game"
@ -132,8 +130,7 @@ msgstr "作成"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Download a subgame, such as minetest_game, from minetest.net"
msgstr ""
"minetest.netからminetest_gameなどのサブゲームをダウンロードしてください"
msgstr "minetest.netから、minetest_gameなどのサブゲームをダウンロードしてください"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Download one from minetest.net"
@ -214,7 +211,7 @@ msgstr "(設定の説明はありません)"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "< Back to Settings page"
msgstr ""
msgstr "< 設定ページに戻る"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Browse"
@ -237,13 +234,12 @@ msgid "Format is 3 numbers separated by commas and inside brackets."
msgstr "括弧内に3つの数字をカンマで区切って入力してください。"
#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid ""
"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
msgstr ""
"書式: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
"書式: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, <octaves>, "
"<persistence>"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Games"
@ -259,7 +255,7 @@ msgstr "空隙性の値には、任意でカンマを付けて読みやすくす
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Please enter a comma seperated list of flags."
msgstr "フラグはカンマで区切られた一覧で入力してください。"
msgstr "フラグ一覧はカンマで区切って入力してください。"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Please enter a valid integer."
@ -315,9 +311,7 @@ msgstr "Modインストール: $1の本来のMod名が不明です"
#: builtin/mainmenu/modmgr.lua
msgid "Install Mod: unable to find suitable foldername for modpack $1"
msgstr ""
"Modインストール: Modパック$1に適したフォルダ名を見つけることができませんでし"
"た"
msgstr "Modインストール: Modパック$1に適したフォルダ名を見つけることができませんでした"
#: builtin/mainmenu/store.lua
msgid "Close store"
@ -438,7 +432,7 @@ msgstr "名前とパスワード:"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
msgid "Public Serverlist"
msgstr "公開サーバーリスト"
msgstr "公開サーバ一覧"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
msgid "PvP enabled"
@ -480,7 +474,7 @@ msgstr "ポート"
#: builtin/mainmenu/tab_server.lua
msgid "Public"
msgstr "公開サーバ"
msgstr "公開サーバ"
#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
msgid "Select World:"
@ -488,11 +482,11 @@ msgstr "ワールドを選択:"
#: builtin/mainmenu/tab_server.lua
msgid "Server"
msgstr "サーバ"
msgstr "サーバ"
#: builtin/mainmenu/tab_server.lua
msgid "Server Port"
msgstr "サーバのポート"
msgstr "サーバのポート"
#: builtin/mainmenu/tab_server.lua
msgid "Start Game"
@ -503,7 +497,6 @@ msgid "2x"
msgstr "2倍"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "3D Clouds"
msgstr "立体な雲"
@ -516,9 +509,8 @@ msgid "8x"
msgstr "8倍"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Advanced Settings"
msgstr "設定"
msgstr "詳細設定"
#: builtin/mainmenu/tab_settings.lua
msgid "Antialiasing:"
@ -529,9 +521,8 @@ msgid "Are you sure to reset your singleplayer world?"
msgstr "シングルプレイヤーのワールドをリセットしてよろしいですか?"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Bilinear Filter"
msgstr "バイリニアフィルタリング"
msgstr "バイリニアフィルタ"
#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
msgid "Bumpmapping"
@ -542,21 +533,18 @@ msgid "Change keys"
msgstr "操作変更"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Connected Glass"
msgstr "ガラスを繋げる"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enable Particles"
msgstr "全て有効化"
msgstr "パーティクル有効化"
#: builtin/mainmenu/tab_settings.lua
msgid "Fancy Leaves"
msgstr "綺麗な葉"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Generate Normalmaps"
msgstr "ノーマルマップの生成"
@ -569,9 +557,8 @@ msgid "Mipmap + Aniso. Filter"
msgstr "異方性フィルタ"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "No Filter"
msgstr "フィルタリング"
msgstr "フィルタ無し"
#: builtin/mainmenu/tab_settings.lua
msgid "No Mipmap"
@ -582,9 +569,8 @@ msgid "No!!!"
msgstr "いいえ!!!"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Node Highlighting"
msgstr "ノードハイライト"
msgstr "ノードハイライト"
#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
msgid "None"
@ -615,9 +601,8 @@ msgid "Simple Leaves"
msgstr "シンプルな葉"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Smooth Lighting"
msgstr "滑らかな照明"
msgstr "滑らかな"
#: builtin/mainmenu/tab_settings.lua
msgid "Texturing:"
@ -632,22 +617,18 @@ msgid "Touchthreshold (px)"
msgstr "タッチのしきい値(ピクセル)"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Trilinear Filter"
msgstr "トリリニアフィルタリング"
msgstr "トリリニアフィルタ"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Leaves"
msgstr "揺れる葉"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Plants"
msgstr "揺れる草花"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Water"
msgstr "揺れる水"
@ -757,7 +738,7 @@ msgstr "パスワード変更"
#: src/game.cpp
msgid "Connecting to server..."
msgstr "サーバに接続中..."
msgstr "サーバに接続中..."
#: src/game.cpp
msgid "Continue"
@ -769,7 +750,7 @@ msgstr "クライアントを起動中..."
#: src/game.cpp
msgid "Creating server..."
msgstr "サーバを起動中..."
msgstr "サーバを起動中..."
#: src/game.cpp
msgid ""
@ -931,9 +912,7 @@ msgstr "キーが重複しています"
#: src/guiKeyChangeMenu.cpp
msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
msgstr ""
"操作設定です。 (変更に失敗した場合、minetest.confから該当する設定を削除してく"
"ださい)"
msgstr "操作設定です。 (変更に失敗した場合、minetest.confから該当する設定を削除してください)"
#: src/guiKeyChangeMenu.cpp src/keycode.cpp
msgid "Left"
@ -1321,7 +1300,6 @@ msgid "3D mode"
msgstr "3Dモード"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"3D support.\n"
"Currently supported:\n"
@ -1336,46 +1314,39 @@ msgstr ""
"サポートしている出力:\n"
"- none: 3D出力を行いません。\n"
"- anaglyph: 赤/青の色による3Dです。\n"
"- interlaced: 偶数/奇数のラインをベースで偏光式スクリーンに対応していま"
"す。\n"
"- interlaced: 偶数/奇数のラインをベースで偏光式スクリーンに対応しています。\n"
"- topbottom: 画面を上下で分割します。\n"
"- sidebyside: 画面を左右で分割します。"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"A chosen map seed for a new map, leave empty for random.\n"
"Will be overridden when creating a new world in the main menu."
msgstr ""
"新規マップを作成する際の初期シード値です。空にするとランダムに設定されま"
"す。\n"
"メインメニューから新規ワールドを作成する際に上書きされることがあります。"
"新規マップを作成する際の初期シード値です。空にするとランダムに設定されます。\n"
"ワールドを新規作成する際にシード値を入力すると上書きされます。"
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server crashes."
msgstr "サーバクラッシュ時に全てのクライアントへ表示するメッセージ。"
msgstr "サーバクラッシュ時に全てのクライアントへ表示するメッセージ。"
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server shuts down."
msgstr "サーバ終了時に全てのクライアントへ表示するメッセージ。"
msgstr "サーバ終了時に全てのクライアントへ表示するメッセージ。"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Absolute limit of emerge queues"
msgstr "エマージキューの絶対的な制限値"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Acceleration in air"
msgstr "空中での加速"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Active block range"
msgstr "アクティブなブロックの範囲"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Active object send range"
msgstr "アクティブなオブジェクトの送信の範囲"
@ -1385,12 +1356,15 @@ msgid ""
"Leave this blank to start a local server.\n"
"Note that the address field in the main menu overrides this setting."
msgstr ""
"接続先のアドレスです。\n"
"ローカルサーバを起動する際は空白に設定してください。\n"
"メインメニューのアドレス欄は、この設定を上書きすることに注意してください。"
#: src/settings_translation_file.cpp
msgid ""
"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
"screens."
msgstr ""
msgstr "4kスクリーンなどのための、画面の解像度の設定です (非X11/Android環境のみ)。"
#: src/settings_translation_file.cpp
msgid ""
@ -1400,7 +1374,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Advanced"
msgstr ""
msgstr "詳細"
#: src/settings_translation_file.cpp
msgid "Altitude Chill"
@ -1408,7 +1382,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Always fly and fast"
msgstr ""
msgstr "飛行時に加速する"
#: src/settings_translation_file.cpp
msgid "Ambient occlusion gamma"
@ -1420,11 +1394,11 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Anisotropic filtering"
msgstr ""
msgstr "異方性フィルタリング"
#: src/settings_translation_file.cpp
msgid "Announce server"
msgstr ""
msgstr "サーバを公開"
#: src/settings_translation_file.cpp
msgid ""
@ -1439,7 +1413,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Ask to reconnect after crash"
msgstr ""
msgstr "クラッシュ後に再接続を促す"
#: src/settings_translation_file.cpp
msgid "Automaticaly report to the serverlist."
@ -1450,20 +1424,18 @@ msgid "Backward key"
msgstr "後キー"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Base terrain height"
msgstr "水が揺れる高さ"
#: src/settings_translation_file.cpp
msgid "Basic"
msgstr ""
msgstr "基本"
#: src/settings_translation_file.cpp
msgid "Bilinear filtering"
msgstr "バイリニアフィルタリング"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Bind address"
msgstr "バインドアドレス"
@ -1532,37 +1504,35 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Chunk size"
msgstr ""
msgstr "チャンクサイズ"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Cinematic mode"
msgstr "クリエイティブモード"
msgstr "映画風モード"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Cinematic mode key"
msgstr "クリエイティブモード"
msgstr "映画風モード切り替えキー"
#: src/settings_translation_file.cpp
msgid "Clean transparent textures"
msgstr ""
msgstr "テクスチャの透過を削除"
#: src/settings_translation_file.cpp
msgid "Client and Server"
msgstr ""
msgstr "クライアントとサーバ"
#: src/settings_translation_file.cpp
msgid "Climbing speed"
msgstr ""
msgstr "上る速度"
#: src/settings_translation_file.cpp
msgid "Cloud height"
msgstr ""
msgstr "雲の高さ"
#: src/settings_translation_file.cpp
msgid "Cloud radius"
msgstr ""
msgstr "雲の半径"
#: src/settings_translation_file.cpp
msgid "Clouds"
@ -1570,7 +1540,7 @@ msgstr "雲"
#: src/settings_translation_file.cpp
msgid "Clouds are a client side effect."
msgstr ""
msgstr "雲はクライアント側で描画されます。"
#: src/settings_translation_file.cpp
msgid "Clouds in menu"
@ -1578,7 +1548,7 @@ msgstr "メニューに雲"
#: src/settings_translation_file.cpp
msgid "Colored fog"
msgstr ""
msgstr "色つきの霧"
#: src/settings_translation_file.cpp
msgid ""
@ -1597,14 +1567,12 @@ msgid "Command key"
msgstr "コマンドキー"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Connect glass"
msgstr "ガラスを繋げる"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Connect to external media server"
msgstr "サーバー接続中..."
msgstr "外部メディアサーバに接続中"
#: src/settings_translation_file.cpp
msgid "Connects glass if supported by node."
@ -1657,7 +1625,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Crash message"
msgstr ""
msgstr "クラッシュメッセージ"
#: src/settings_translation_file.cpp
msgid ""
@ -1673,7 +1641,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Crosshair alpha"
msgstr ""
msgstr "照準の透過度"
#: src/settings_translation_file.cpp
msgid "Crosshair alpha (opaqueness, between 0 and 255)."
@ -1693,7 +1661,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "DPI"
msgstr ""
msgstr "DPI"
#: src/settings_translation_file.cpp
msgid "Damage"
@ -1701,11 +1669,11 @@ msgstr "ダメージ"
#: src/settings_translation_file.cpp
msgid "Debug info toggle key"
msgstr ""
msgstr "デバッグ情報切り替えキー"
#: src/settings_translation_file.cpp
msgid "Debug log level"
msgstr ""
msgstr "デバッグログのレベル"
#: src/settings_translation_file.cpp
msgid "Dedicated server step"
@ -1717,7 +1685,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Default game"
msgstr ""
msgstr "標準ゲーム"
#: src/settings_translation_file.cpp
msgid ""
@ -1731,7 +1699,7 @@ msgstr "既定パスワード"
#: src/settings_translation_file.cpp
msgid "Default privileges"
msgstr ""
msgstr "標準権限"
#: src/settings_translation_file.cpp
msgid ""
@ -1811,7 +1779,6 @@ msgid "Double tap jump for fly"
msgstr "「ジャンプ」キー二回押しで飛行モード"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Double-tapping the jump key toggles fly mode."
msgstr "「ジャンプ」キー二回押しで飛行モード"
@ -1824,12 +1791,10 @@ msgid "Dump the mapgen debug infos."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enable VBO"
msgstr "有効化"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enable mod security"
msgstr "オンラインでModを検索"
@ -1888,7 +1853,6 @@ msgid "Enables caching of facedir rotated meshes."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Enables filmic tone mapping"
msgstr "ミニマップを有効にする。"
@ -2083,7 +2047,6 @@ msgid "GUI scaling"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "GUI scaling filter"
msgstr "メニューの大きさ"
@ -2122,7 +2085,6 @@ msgid "Gravity"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "HTTP Mods"
msgstr "Mod"
@ -2163,8 +2125,7 @@ msgid ""
"How large area of blocks are subject to the active block stuff, stated in "
"mapblocks (16 nodes).\n"
"In active blocks objects are loaded and ABMs run."
msgstr ""
"Mapblock (16ード) 数でオブジェクトのロードやABMの実効等の有効エリアを指定。"
msgstr "Mapblock (16ード) 数でオブジェクトのロードやABMの実効等の有効エリアを指定。"
#: src/settings_translation_file.cpp
msgid ""
@ -2258,7 +2219,6 @@ msgid "Ignore world errors"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "In-Game"
msgstr "ゲーム"
@ -2646,7 +2606,6 @@ msgid "Main menu game manager"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Main menu mod manager"
msgstr "メインメニューMod管理"
@ -2724,7 +2683,6 @@ msgid "Mapblock unload timeout"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen Valleys"
msgstr "マップ生成名"
@ -2749,7 +2707,6 @@ msgid "Mapgen flags"
msgstr "マップ生成フラグ"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen flat"
msgstr "マップ生成フラグ"
@ -2766,12 +2723,10 @@ msgid "Mapgen flat filler depth noise parameters"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen flat flags"
msgstr "マップ生成フラグ"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen flat ground level"
msgstr "マップ生成フラグ"
@ -2784,12 +2739,10 @@ msgid "Mapgen flat hill threshold"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen flat lake steepness"
msgstr "視差遮蔽マッピング"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen flat lake threshold"
msgstr "マップ生成フラグ"
@ -2802,7 +2755,6 @@ msgid "Mapgen flat terrain noise parameters"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal"
msgstr "マップ生成フラグ"
@ -2819,12 +2771,10 @@ msgid "Mapgen fractal filler depth noise parameters"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal fractal"
msgstr "マップ生成フラグ"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal iterations"
msgstr "視差遮蔽マッピング"
@ -2845,12 +2795,10 @@ msgid "Mapgen fractal julia z"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal offset"
msgstr "マップ生成フラグ"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal scale"
msgstr "マップ生成フラグ"
@ -2859,7 +2807,6 @@ msgid "Mapgen fractal seabed noise parameters"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen fractal slice w"
msgstr "マップ生成フラグ"
@ -2872,7 +2819,6 @@ msgid "Mapgen name"
msgstr "マップ生成名"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen v5"
msgstr "ワールドタイプ"
@ -2897,7 +2843,6 @@ msgid "Mapgen v5 height noise parameters"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen v6"
msgstr "ワールドタイプ"
@ -2958,7 +2903,6 @@ msgid "Mapgen v6 trees noise parameters"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Mapgen v7"
msgstr "ワールドタイプ"
@ -3306,17 +3250,14 @@ msgid "Parallax occlusion"
msgstr "視差遮蔽マッピング"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Parallax occlusion Scale"
msgstr "視差遮蔽マッピング"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Parallax occlusion bias"
msgstr "視差遮蔽マッピング"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Parallax occlusion iterations"
msgstr "視差遮蔽マッピング"
@ -3325,7 +3266,6 @@ msgid "Parallax occlusion mode"
msgstr "視差遮蔽マッピングモード"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Parallax occlusion strength"
msgstr "視差遮蔽マッピング"
@ -3401,7 +3341,6 @@ msgid "Random input"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Range select key"
msgstr "視野範囲変更"
@ -3503,37 +3442,36 @@ msgid "Selection box width"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Server / Singleplayer"
msgstr "シングルプレイ開始"
#: src/settings_translation_file.cpp
msgid "Server URL"
msgstr "サーバURL"
msgstr "サーバURL"
#: src/settings_translation_file.cpp
msgid "Server address"
msgstr "サーバアドレス"
msgstr "サーバアドレス"
#: src/settings_translation_file.cpp
msgid "Server description"
msgstr "サーバポート"
msgstr "サーバポート"
#: src/settings_translation_file.cpp
msgid "Server name"
msgstr "サーバ名"
msgstr "サーバ名"
#: src/settings_translation_file.cpp
msgid "Server port"
msgstr "サーバポート"
msgstr "サーバポート"
#: src/settings_translation_file.cpp
msgid "Serverlist URL"
msgstr "サーバーリストURL"
msgstr "サーバ一覧URL"
#: src/settings_translation_file.cpp
msgid "Serverlist file"
msgstr "サーバーリストファイル"
msgstr "サーバ一覧ファイル"
#: src/settings_translation_file.cpp
msgid ""
@ -3627,7 +3565,6 @@ msgid "Static spawnpoint"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Strength of generated normalmaps."
msgstr "ノーマルマップの生成"
@ -3743,7 +3680,6 @@ msgid "Toggle camera mode key"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Tone Mapping"
msgstr "ミップマッピング"
@ -3885,7 +3821,6 @@ msgid "Walking speed"
msgstr "歩く速度"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Water Features"
msgstr "テクスチャを設定中..."
@ -3915,15 +3850,15 @@ msgstr "揺れる水"
#: src/settings_translation_file.cpp
msgid "Waving water height"
msgstr "水揺れる高さ"
msgstr "水揺れる高さ"
#: src/settings_translation_file.cpp
msgid "Waving water length"
msgstr "水揺れる丈"
msgstr "水揺れる丈"
#: src/settings_translation_file.cpp
msgid "Waving water speed"
msgstr "水揺れる速度"
msgstr "水揺れる速度"
#: src/settings_translation_file.cpp
msgid ""
@ -3952,7 +3887,6 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"Where the map generator stops.\n"
"Please note:\n"
@ -3964,24 +3898,18 @@ msgstr ""
"どこでマップ生成を停止するかの設定です。\n"
"注意:\n"
"- 最大で31000です(これ以上に設定しても効果はありません)。\n"
"- マップ生成は80x80x80ードのグループで動作します (5x5x5マップブロッ"
"ク)。\n"
"- マップ生成は80x80x80ードのグループで動作します (5x5x5マップブロック)。\n"
"- このグループは原点から-32、-32ードのオフセットがあります。\n"
"- グループはmap_generation_limit内で生成されたものに限ります。"
#: src/settings_translation_file.cpp
msgid ""
"Whether freetype fonts are used, requires freetype support to be compiled in."
msgstr ""
"Freetypeフォントを利用するかどうかの設定です。Freetypeをサポートするビルドで"
"ある必要があります。"
msgstr "Freetypeフォントを利用するかどうかの設定です。Freetypeをサポートするビルドである必要があります。"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Whether node texture animations should be desynchronized per mapblock."
msgstr ""
"ノードのテクスチャのアニメーションをマップブロックごとに非同期にするかどうか"
"の設定です。"
msgstr "ノードのテクスチャのアニメーションをマップブロックごとに非同期にするかどうかの設定です。"
#: src/settings_translation_file.cpp
msgid ""
@ -4001,8 +3929,7 @@ msgid ""
"Set this to true if your server is set up to restart automatically."
msgstr ""
"(Luaが)クラッシュした際にクライアントに再接続を要求するかどうかの設定です。\n"
"サーバーが自動で再起動されるように設定されているならばtrueに設定してくださ"
"い。"
"サーバが自動で再起動されるように設定されているならばtrueに設定してください。"
#: src/settings_translation_file.cpp
msgid "Whether to fog out the end of the visible area."
@ -4011,9 +3938,7 @@ msgstr "可視領域の端に霧を表示するかどうかの設定です。"
#: src/settings_translation_file.cpp
msgid ""
"Whether to show the client debug info (has the same effect as hitting F5)."
msgstr ""
"クライアントのデバッグ情報を表示するかどうかの設定です(F5を押すのと同じ効"
"果)。"
msgstr "クライアントのデバッグ情報を表示するかどうかの設定です(F5を押すのと同じ効果)。"
#: src/settings_translation_file.cpp
msgid "Width component of the initial window size."
@ -4024,7 +3949,6 @@ msgid "Width of the selectionbox's lines around nodes."
msgstr "ノードを選択した際に表示される線の幅です。"
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"World directory (everything in the world is stored here).\n"
"Not needed if starting from the main menu."
@ -4041,12 +3965,10 @@ msgid "Y of upper limit of large pseudorandom caves."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "cURL file download timeout"
msgstr "cURLファイルダウンロードタイムアウト"
#: src/settings_translation_file.cpp
#, fuzzy
msgid "cURL parallel limit"
msgstr "cURLパラレル制限"

View File

@ -8,21 +8,21 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2016-01-31 17:19+0000\n"
"Last-Translator: Amadeo <amadeoras+weblate@gmail.com>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/minetest/minetest/"
"pl/>\n"
"PO-Revision-Date: 2016-03-24 19:38+0000\n"
"Last-Translator: red-001 <red-001@openmailbox.org>\n"
"Language-Team: Polish "
"<https://hosted.weblate.org/projects/minetest/minetest/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 2.5-dev\n"
"X-Generator: Weblate 2.6-dev\n"
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
msgstr ""
msgstr "Wystąpił błąd w skrypcie modyfikacji:"
#: builtin/fstk/ui.lua
msgid "An error occured:"
@ -50,7 +50,7 @@ msgstr "Ładowanie..."
#: builtin/mainmenu/common.lua
msgid "Protocol version mismatch. "
msgstr "Wesje protokołu niezgodne. "
msgstr "Niezgodne wersje protokołów. "
#: builtin/mainmenu/common.lua
msgid "Server enforces protocol version $1. "
@ -204,7 +204,7 @@ msgstr "Nie"
#: builtin/mainmenu/dlg_rename_modpack.lua src/keycode.cpp
msgid "Accept"
msgstr "Accept"
msgstr "Zaakceptuj"
#: builtin/mainmenu/dlg_rename_modpack.lua
msgid "Rename Modpack:"
@ -220,7 +220,7 @@ msgstr "(Brak opisu ustawienia)"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "< Back to Settings page"
msgstr ""
msgstr "< Wróć do ekranu ustawień"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Browse"
@ -404,9 +404,8 @@ msgid "Select Mod File:"
msgstr "Wybierz plik moda:"
#: builtin/mainmenu/tab_mods.lua
#, fuzzy
msgid "Uninstall selected mod"
msgstr "Usuń zaznaczony mod"
msgstr "Usuń zaznaczony modyfikację"
#: builtin/mainmenu/tab_mods.lua
msgid "Uninstall selected modpack"
@ -505,29 +504,27 @@ msgstr "Rozpocznij grę/Połącz"
#: builtin/mainmenu/tab_settings.lua
msgid "2x"
msgstr ""
msgstr "2x"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "3D Clouds"
msgstr "Chmury 3D"
#: builtin/mainmenu/tab_settings.lua
msgid "4x"
msgstr ""
msgstr "4x"
#: builtin/mainmenu/tab_settings.lua
msgid "8x"
msgstr ""
msgstr "8x"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Advanced Settings"
msgstr "Ustawienia"
msgstr "Ustawienia zaawansowane"
#: builtin/mainmenu/tab_settings.lua
msgid "Antialiasing:"
msgstr ""
msgstr "Antyaliasing:"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
@ -535,60 +532,52 @@ msgid "Are you sure to reset your singleplayer world?"
msgstr "Pojedynczy gracz"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Bilinear Filter"
msgstr "Filtrowanie dwuliniowe"
#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
#, fuzzy
msgid "Bumpmapping"
msgstr "Mip-Mappowanie"
msgstr "Mapowanie wypukłości"
#: builtin/mainmenu/tab_settings.lua
msgid "Change keys"
msgstr "Zmień klawisze"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Connected Glass"
msgstr "Połącz"
msgstr "Szkło połączone"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enable Particles"
msgstr "Włącz wszystkie"
msgstr "Włącz Efekty Cząsteczkowe"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Fancy Leaves"
msgstr "Nieprzeźroczysta woda"
msgstr "Ozdobne liście"
#: builtin/mainmenu/tab_settings.lua
msgid "Generate Normalmaps"
msgstr ""
msgstr "Generuj mapy normalnych"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Mipmap"
msgstr "Mip-Mappowanie"
msgstr "Mipmapy"
#: builtin/mainmenu/tab_settings.lua
msgid "Mipmap + Aniso. Filter"
msgstr ""
msgstr "Mipmapy i Filtr anizotropowe"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "No Filter"
msgstr "Filtrowanie anizotropowe"
msgstr "Filtrowanie wyłączone"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "No Mipmap"
msgstr "Mip-Mappowanie"
msgstr "Mip-Mappowanie wyłączone"
#: builtin/mainmenu/tab_settings.lua
msgid "No!!!"
msgstr ""
msgstr "Nie!!"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
@ -600,17 +589,16 @@ msgid "None"
msgstr "Brak"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Opaque Leaves"
msgstr "Nieprzeźroczysta woda"
msgstr "Nieprzejrzyste liście"
#: builtin/mainmenu/tab_settings.lua
msgid "Opaque Water"
msgstr "Nieprzeźroczysta woda"
msgstr "Nieprzejrzysta Woda"
#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
msgid "Parallax Occlusion"
msgstr ""
msgstr "Mapowanie paralaksy"
#: builtin/mainmenu/tab_settings.lua
msgid "Settings"
@ -621,18 +609,16 @@ msgid "Shaders"
msgstr "Shadery"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Simple Leaves"
msgstr "Nieprzeźroczysta woda"
msgstr "Proste Liście"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Smooth Lighting"
msgstr "Płynne oświetlenie"
#: builtin/mainmenu/tab_settings.lua
msgid "Texturing:"
msgstr ""
msgstr "Teksturowanie:"
#: builtin/mainmenu/tab_settings.lua
msgid "To enable shaders the OpenGL driver needs to be used."
@ -643,7 +629,6 @@ msgid "Touchthreshold (px)"
msgstr ""
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Trilinear Filter"
msgstr "Filtrowanie trójliniowe"
@ -1020,7 +1005,7 @@ msgstr "Głośność: "
#: src/keycode.cpp
msgid "Apps"
msgstr "Apps"
msgstr "Menu"
#: src/keycode.cpp
msgid "Attn"
@ -1059,6 +1044,7 @@ msgid "Down"
msgstr "Dół"
#: src/keycode.cpp
#, fuzzy
msgid "End"
msgstr "End"

View File

@ -8,29 +8,28 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2016-01-14 18:20+0000\n"
"Last-Translator: Ian giestas pauli <iangiestaspauli@gmail.com>\n"
"Language-Team: Portuguese <https://hosted.weblate.org/projects/minetest/"
"minetest/pt/>\n"
"PO-Revision-Date: 2016-03-25 10:43+0000\n"
"Last-Translator: Fernando Reis <fernando.reis@pt.lu>\n"
"Language-Team: Portuguese "
"<https://hosted.weblate.org/projects/minetest/minetest/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.5-dev\n"
"X-Generator: Weblate 2.6-dev\n"
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
msgstr ""
msgstr "Ocorreu um erro num script Lua, como por exemplo num extra:"
#: builtin/fstk/ui.lua
msgid "An error occured:"
msgstr ""
msgstr "Ocorreu um erro:"
#: builtin/fstk/ui.lua
#, fuzzy
msgid "Main menu"
msgstr "Menu Principal"
msgstr "Menu principal"
#: builtin/fstk/ui.lua builtin/mainmenu/store.lua
msgid "Ok"
@ -42,7 +41,7 @@ msgstr "Reconectar"
#: builtin/fstk/ui.lua
msgid "The server has requested a reconnect:"
msgstr "O servidor requisitou uma reconexão:"
msgstr "O servidor solicitou uma reconexão:"
#: builtin/mainmenu/common.lua src/game.cpp
msgid "Loading..."
@ -50,27 +49,29 @@ msgstr "A carregar..."
#: builtin/mainmenu/common.lua
msgid "Protocol version mismatch. "
msgstr ""
msgstr "Versão do protocolo não coincide. "
#: builtin/mainmenu/common.lua
msgid "Server enforces protocol version $1. "
msgstr ""
msgstr "O servidor requere o protocolo versão $1. "
#: builtin/mainmenu/common.lua
msgid "Server supports protocol versions between $1 and $2. "
msgstr ""
msgstr "Servidor suporta versões de protocolo entre $1 e $2. "
#: builtin/mainmenu/common.lua
msgid "Try reenabling public serverlist and check your internet connection."
msgstr ""
"Tente recarregar a lista de servidores públicos e verificar a sua ligação à "
"internet."
#: builtin/mainmenu/common.lua
msgid "We only support protocol version $1."
msgstr ""
msgstr "Nós suportamos apenas o protocolo versão $1."
#: builtin/mainmenu/common.lua
msgid "We support protocol versions between version $1 and $2."
msgstr ""
msgstr "Nós suportamos as versões de protocolo entre $1 e $2."
#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
#: builtin/mainmenu/dlg_rename_modpack.lua
@ -84,25 +85,24 @@ msgid "Depends:"
msgstr "Depende de:"
#: builtin/mainmenu/dlg_config_world.lua
#, fuzzy
msgid "Disable MP"
msgstr "Desativar Tudo"
msgstr "Desativar MP (mod pack)"
#: builtin/mainmenu/dlg_config_world.lua
#, fuzzy
msgid "Enable MP"
msgstr "Ativar Tudo"
msgstr "Ativar MP (mod pack)"
#: builtin/mainmenu/dlg_config_world.lua
#, fuzzy
msgid "Enable all"
msgstr "Ativar Tudo"
msgstr "Ativar tudo"
#: builtin/mainmenu/dlg_config_world.lua
msgid ""
"Failed to enable mod \"$1\" as it contains disallowed characters. Only "
"chararacters [a-z0-9_] are allowed."
msgstr ""
"Falha ao ativar mod \"$1\" porque contém caracteres inválidos. Apenas "
"caracteres de \"a\" até \"z\" e algarismos de 0 até 9 são permitidos."
#: builtin/mainmenu/dlg_config_world.lua
msgid "Hide Game"
@ -110,7 +110,7 @@ msgstr "Esconder Jogo"
#: builtin/mainmenu/dlg_config_world.lua
msgid "Hide mp content"
msgstr ""
msgstr "Ocultar conteúdo MP (mod pack)"
#: builtin/mainmenu/dlg_config_world.lua
msgid "Mod:"
@ -139,11 +139,11 @@ msgstr "Criar"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Download a subgame, such as minetest_game, from minetest.net"
msgstr ""
msgstr "Descarregue um jogo, como o minetest_game, do sítio minetest.net"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Download one from minetest.net"
msgstr ""
msgstr "Descarregue um do sítio minetest.net"
#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
msgid "Game"
@ -159,11 +159,13 @@ msgstr "Mundo sem nome ou nenhum jogo selecionado"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Seed"
msgstr ""
msgstr "Semente aleatória"
#: builtin/mainmenu/dlg_create_world.lua
msgid "Warning: The minimal development test is meant for developers."
msgstr ""
"Aviso: O jogo \"minimal development test\" destina-se apenas a "
"desenvolvedores."
#: builtin/mainmenu/dlg_create_world.lua
msgid "World name"
@ -171,7 +173,7 @@ msgstr "Nome do Mundo"
#: builtin/mainmenu/dlg_create_world.lua
msgid "You have no subgames installed."
msgstr ""
msgstr "Você não tem nenhum jogo instalado."
#: builtin/mainmenu/dlg_delete_mod.lua
msgid "Are you sure you want to delete \"$1\"?"
@ -212,43 +214,43 @@ msgstr "Renomear Pacote de Extras:"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "\"$1\" is not a valid flag."
msgstr ""
msgstr "\"$1\" não é uma flag válida."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "(No description of setting given)"
msgstr ""
msgstr "(Descrição de configuração não fornecida)"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "< Back to Settings page"
msgstr ""
msgstr "< Voltar para as configurações"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Browse"
msgstr ""
msgstr "Navegar"
#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "Disabled"
msgstr "Desativar Tudo"
msgstr "Desativado"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Edit"
msgstr ""
msgstr "Editar"
#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "Enabled"
msgstr "ativo"
msgstr "Ativado"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Format is 3 numbers separated by commas and inside brackets."
msgstr ""
msgstr "O formato é de 3 números separados por vírgulas dentro de paréntesis."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid ""
"Format: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
msgstr ""
"Formato: <offset>, <scale>, (<spreadX>, <spreadY>, <spreadZ>), <seed>, "
"<octaves>, <persistence>"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Games"
@ -261,52 +263,52 @@ msgstr "Extras"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Optionally the lacunarity can be appended with a leading comma."
msgstr ""
"Opcionalmente a lacunaridade pode ser adicionada com uma vírgula na frente."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Please enter a comma seperated list of flags."
msgstr ""
msgstr "Por favor, introduza uma lista de flags separadas por vírgulas."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Please enter a valid integer."
msgstr ""
msgstr "Por favor insira um inteiro válido."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Please enter a valid number."
msgstr ""
msgstr "Por favor, insira um número válido."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Possible values are: "
msgstr ""
msgstr "Os valores possíveis são: "
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Restore Default"
msgstr ""
msgstr "Restaurar valores por defeito"
#: builtin/mainmenu/dlg_settings_advanced.lua
#, fuzzy
msgid "Select path"
msgstr "Seleccionar"
msgstr "Selecionar diretório"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Show technical names"
msgstr ""
msgstr "Mostrar nomes técnicos"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "The value must be greater than $1."
msgstr ""
msgstr "O valor deve ser maior do que $1."
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "The value must be lower than $1."
msgstr ""
msgstr "O valor deve ser menor do que $1."
#: builtin/mainmenu/modmgr.lua
#, fuzzy
msgid ""
"\n"
"Install Mod: unsupported filetype \"$1\" or broken archive"
msgstr ""
"\n"
"Instalar Extra: tipo de ficheiro desconhecido \"$1\""
"Instalação de extra: o tipo de arquivo \"$1\" não é suportado ou o arquivo "
"está corrompido"
#: builtin/mainmenu/modmgr.lua
msgid "Failed to install $1 to $2"
@ -318,19 +320,21 @@ msgstr "Instalar Extra: ficheiro: \"$1\""
#: builtin/mainmenu/modmgr.lua
msgid "Install Mod: unable to find real modname for: $1"
msgstr ""
msgstr "Instalação de extra: nome real de extra não encontrado para: $1"
#: builtin/mainmenu/modmgr.lua
msgid "Install Mod: unable to find suitable foldername for modpack $1"
msgstr ""
"Instalação de extra: não foi possível encontrar o nome adequado da pasta "
"para o pacote de extras $1"
#: builtin/mainmenu/store.lua
msgid "Close store"
msgstr ""
msgstr "Fechar repositório de extras"
#: builtin/mainmenu/store.lua
msgid "Downloading $1, please wait..."
msgstr ""
msgstr "Descarregando $1, por favor aguarde..."
#: builtin/mainmenu/store.lua
msgid "Install"
@ -346,16 +350,15 @@ msgstr "Classificação"
#: builtin/mainmenu/store.lua
msgid "Search"
msgstr ""
msgstr "Procurar"
#: builtin/mainmenu/store.lua
#, fuzzy
msgid "Shortname:"
msgstr "Nome do Mundo"
msgstr "Nome curto:"
#: builtin/mainmenu/store.lua
msgid "Successfully installed:"
msgstr ""
msgstr "Instalado com sucesso:"
#: builtin/mainmenu/store.lua
msgid "Unsorted"
@ -379,26 +382,23 @@ msgstr "Créditos"
#: builtin/mainmenu/tab_credits.lua
msgid "Previous Contributors"
msgstr "Antigos Contribuintes"
msgstr "Antigos Contribuidores"
#: builtin/mainmenu/tab_credits.lua
#, fuzzy
msgid "Previous Core Developers"
msgstr "Desenvolvedores Chave"
msgstr "Desenvolvedores Chave Antigos"
#: builtin/mainmenu/tab_mods.lua
msgid "Installed Mods:"
msgstr "Extras Instalados:"
#: builtin/mainmenu/tab_mods.lua
#, fuzzy
msgid "Mod information:"
msgstr "Sem informação"
msgstr "Informação do extra:"
#: builtin/mainmenu/tab_mods.lua
#, fuzzy
msgid "No mod description available"
msgstr "Sem informação"
msgstr "Nenhuma descrição disponível do extra"
#: builtin/mainmenu/tab_mods.lua
msgid "Rename"
@ -409,18 +409,16 @@ msgid "Select Mod File:"
msgstr "Seleccionar ficheiro de Extra:"
#: builtin/mainmenu/tab_mods.lua
#, fuzzy
msgid "Uninstall selected mod"
msgstr "Remover extra selecionado"
msgstr "Desinstalar extra selecionado"
#: builtin/mainmenu/tab_mods.lua
msgid "Uninstall selected modpack"
msgstr "Desinstalar mode selecionado"
msgstr "Desinstalar pacote de extras selecionado"
#: builtin/mainmenu/tab_multiplayer.lua
#, fuzzy
msgid "Address / Port :"
msgstr "Endereço/Porta"
msgstr "Endereço / Porta :"
#: builtin/mainmenu/tab_multiplayer.lua src/settings_translation_file.cpp
msgid "Client"
@ -431,14 +429,12 @@ msgid "Connect"
msgstr "Ligar"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "Creative mode"
msgstr "Modo Criativo"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "Damage enabled"
msgstr "ativo"
msgstr "Dano ativado"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_server.lua
#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
@ -446,18 +442,16 @@ msgid "Delete"
msgstr "Eliminar"
#: builtin/mainmenu/tab_multiplayer.lua
#, fuzzy
msgid "Name / Password :"
msgstr "Nome/Senha"
msgstr "Nome / Senha :"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
msgid "Public Serverlist"
msgstr "Lista de Servidores Públicos"
#: builtin/mainmenu/tab_multiplayer.lua builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "PvP enabled"
msgstr "ativo"
msgstr "PvP activado"
#: builtin/mainmenu/tab_server.lua
msgid "Bind Address"
@ -486,13 +480,12 @@ msgid "New"
msgstr "Novo"
#: builtin/mainmenu/tab_server.lua builtin/mainmenu/tab_singleplayer.lua
#, fuzzy
msgid "No world created or selected!"
msgstr "Mundo sem nome ou nenhum jogo selecionado"
msgstr "Nenhum mundo criado ou selecionado!"
#: builtin/mainmenu/tab_server.lua
msgid "Port"
msgstr ""
msgstr "Porta"
#: builtin/mainmenu/tab_server.lua
msgid "Public"
@ -516,90 +509,79 @@ msgstr "Jogar"
#: builtin/mainmenu/tab_settings.lua
msgid "2x"
msgstr ""
msgstr "2x"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "3D Clouds"
msgstr "Nuvens 3D"
#: builtin/mainmenu/tab_settings.lua
msgid "4x"
msgstr ""
msgstr "4x"
#: builtin/mainmenu/tab_settings.lua
msgid "8x"
msgstr ""
msgstr "8x"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Advanced Settings"
msgstr "Definições"
msgstr "Configurações Avançadas"
#: builtin/mainmenu/tab_settings.lua
msgid "Antialiasing:"
msgstr ""
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Are you sure to reset your singleplayer world?"
msgstr "Um Jogador"
msgstr "Tem a certeza que deseja reiniciar o seu mundo?"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Bilinear Filter"
msgstr "Filtro Bi-Linear"
msgstr "Filtro bi-linear"
#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
#, fuzzy
msgid "Bumpmapping"
msgstr "Mip-Mapping"
msgstr "Bump mapping"
#: builtin/mainmenu/tab_settings.lua
msgid "Change keys"
msgstr "Mudar teclas"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Connected Glass"
msgstr "Ligar"
msgstr "Vidro conectado"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Enable Particles"
msgstr "Ativar Tudo"
msgstr "Ativar Partículas"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Fancy Leaves"
msgstr "Água Opaca"
msgstr "Folheamento detalhado"
#: builtin/mainmenu/tab_settings.lua
msgid "Generate Normalmaps"
msgstr ""
msgstr "Gerar Normalmaps"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Mipmap"
msgstr "Mip-Mapping"
msgstr "Mapa MIP"
#: builtin/mainmenu/tab_settings.lua
msgid "Mipmap + Aniso. Filter"
msgstr ""
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "No Filter"
msgstr "Filtro Anisotrópico"
msgstr "Sem Filtro"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "No Mipmap"
msgstr "Mip-Mapping"
msgstr "Sem mapa MIP"
#: builtin/mainmenu/tab_settings.lua
msgid "No!!!"
msgstr ""
msgstr "Não!!!"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
@ -608,12 +590,11 @@ msgstr "Iluminação Suave"
#: builtin/mainmenu/tab_settings.lua builtin/mainmenu/tab_texturepacks.lua
msgid "None"
msgstr ""
msgstr "Nenhum"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Opaque Leaves"
msgstr "Água Opaca"
msgstr "Folhas Opacas"
#: builtin/mainmenu/tab_settings.lua
msgid "Opaque Water"
@ -632,9 +613,8 @@ msgid "Shaders"
msgstr "Sombras"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Simple Leaves"
msgstr "Água Opaca"
msgstr "Folheamento simples"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
@ -643,50 +623,43 @@ msgstr "Iluminação Suave"
#: builtin/mainmenu/tab_settings.lua
msgid "Texturing:"
msgstr ""
msgstr "Texturização:"
#: builtin/mainmenu/tab_settings.lua
msgid "To enable shaders the OpenGL driver needs to be used."
msgstr ""
msgstr "Para ativar os sombreadores é necessário usar o driver OpenGL."
#: builtin/mainmenu/tab_settings.lua
msgid "Touchthreshold (px)"
msgstr ""
msgstr "Nível de sensibilidade ao toque (px)"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Trilinear Filter"
msgstr "Filtro Tri-Linear"
msgstr "Filtro tri-linear"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Leaves"
msgstr "Árvores Melhoradas"
msgstr "Folheamento ondulante"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Plants"
msgstr "Árvores Melhoradas"
msgstr "Plantas ondulantes"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Water"
msgstr "Árvores Melhoradas"
msgstr "Água ondulante"
#: builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "Config mods"
msgstr "Configurar"
msgstr "Configurar extras"
#: builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "Main"
msgstr "Menu Principal"
msgstr "Principal"
#: builtin/mainmenu/tab_simple_main.lua
#, fuzzy
msgid "Start Singleplayer"
msgstr "Um Jogador"
msgstr "Iniciar jogo solo"
#: builtin/mainmenu/tab_singleplayer.lua src/keycode.cpp
msgid "Play"
@ -705,36 +678,32 @@ msgid "Select texture pack:"
msgstr "Selecione um pacote de texturas:"
#: builtin/mainmenu/tab_texturepacks.lua
#, fuzzy
msgid "Texturepacks"
msgstr "Pacotes de Texturas"
msgstr "Pacotes de texturas"
#: src/client.cpp
#, fuzzy
msgid "Connection timed out."
msgstr "Erro de conexão (excedeu tempo?)"
msgstr "Erro de ligação (tempo excedido)."
#: src/client.cpp
msgid "Done!"
msgstr ""
msgstr "Terminado!"
#: src/client.cpp
msgid "Initializing nodes"
msgstr ""
msgstr "Inicializando cubos"
#: src/client.cpp
msgid "Initializing nodes..."
msgstr ""
msgstr "Inicializando cubos..."
#: src/client.cpp
#, fuzzy
msgid "Loading textures..."
msgstr "A carregar..."
msgstr "A carregar texturas..."
#: src/client.cpp
#, fuzzy
msgid "Rebuilding shaders..."
msgstr "A resolver endereço..."
msgstr "Reconstruindo sombreadores..."
#: src/client/clientlauncher.cpp
msgid "Connection error (timed out?)"
@ -778,7 +747,6 @@ msgstr ""
"Consulte debug.txt para mais detalhes."
#: src/game.cpp
#, fuzzy
msgid "Change Keys"
msgstr "Mudar teclas"
@ -799,7 +767,6 @@ msgid "Creating client..."
msgstr "A criar cliente..."
#: src/game.cpp
#, fuzzy
msgid "Creating server..."
msgstr "A criar servidor..."
@ -871,7 +838,7 @@ msgstr ""
#: src/game.cpp
msgid "Node definitions..."
msgstr ""
msgstr "Definindo cubos..."
#: src/game.cpp src/guiFormSpecMenu.cpp
msgid "Proceed"
@ -886,7 +853,6 @@ msgid "Respawn"
msgstr "Reaparecer"
#: src/game.cpp
#, fuzzy
msgid "Shutting down..."
msgstr "A desligar..."
@ -975,9 +941,8 @@ msgid "Sneak"
msgstr "Agachar"
#: src/guiKeyChangeMenu.cpp
#, fuzzy
msgid "Toggle Cinematic"
msgstr "Ativar/Desativar correr"
msgstr "Ativar/Desativar câmera cinemática"
#: src/guiKeyChangeMenu.cpp
msgid "Toggle fast"
@ -1041,7 +1006,7 @@ msgstr "Voltar"
#: src/keycode.cpp
msgid "Capital"
msgstr "Capital"
msgstr "Caps Lock"
#: src/keycode.cpp
msgid "Clear"
@ -1133,7 +1098,7 @@ msgstr "Shift Esquerdo"
#: src/keycode.cpp
msgid "Left Windows"
msgstr "WINDOWS Esq."
msgstr "Tecla WINDOWS esquerda"
#: src/keycode.cpp
msgid "Menu"
@ -1269,7 +1234,7 @@ msgstr "Shift Direito"
#: src/keycode.cpp
msgid "Right Windows"
msgstr "WINDOWS Dir."
msgstr "Tecla WINDOWS direita"
#: src/keycode.cpp
msgid "Scroll Lock"
@ -1331,7 +1296,6 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "3D clouds"
msgstr "Nuvens 3D"
@ -1421,9 +1385,8 @@ msgid "Amplifies the valleys"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Anisotropic filtering"
msgstr "Filtro Anisotrópico"
msgstr "Filtro anisotrópico"
#: src/settings_translation_file.cpp
msgid "Announce server"
@ -1438,7 +1401,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Approximate (X,Y,Z) scale of fractal in nodes."
msgstr ""
msgstr "Aproxima escala (X,Y,Z) do fractal em cubos."
#: src/settings_translation_file.cpp
msgid "Ask to reconnect after crash"
@ -1449,9 +1412,8 @@ msgid "Automaticaly report to the serverlist."
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Backward key"
msgstr "Recuar"
msgstr "Tecla para andar para trás"
#: src/settings_translation_file.cpp
msgid "Base terrain height"
@ -1462,9 +1424,8 @@ msgid "Basic"
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid "Bilinear filtering"
msgstr "Filtro Bi-Linear"
msgstr "Filtro bi-linear"
#: src/settings_translation_file.cpp
#, fuzzy
@ -1618,7 +1579,7 @@ msgstr "A conectar ao servidor..."
#: src/settings_translation_file.cpp
msgid "Connects glass if supported by node."
msgstr ""
msgstr "Conecta o vidro se suportado pelo cubo."
#: src/settings_translation_file.cpp
#, fuzzy
@ -2077,16 +2038,21 @@ msgid ""
"From how far blocks are generated for clients, stated in mapblocks (16 "
"nodes)."
msgstr ""
"Distância máxima de geração de blocos para clientes, em mapblocks (16^3 "
"cubos)."
#: src/settings_translation_file.cpp
msgid ""
"From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
msgstr ""
"Distância máxima de envio de blocos para clientes, em mapblocks (16^3 cubos)."
#: src/settings_translation_file.cpp
msgid ""
"From how far clients know about objects, stated in mapblocks (16 nodes)."
msgstr ""
"Distância máxima de envio de dados sobre objectos para clientes, em "
"mapblocks (16^3 cubos)."
#: src/settings_translation_file.cpp
msgid "Full screen"
@ -2185,6 +2151,8 @@ msgid ""
"mapblocks (16 nodes).\n"
"In active blocks objects are loaded and ABMs run."
msgstr ""
"Dimensão da área de blocos mantida ativa, em mapblocks (16^3 cubos).\n"
"Em blocos ativos objetos são carregados e ABMs são executados."
#: src/settings_translation_file.cpp
msgid ""
@ -2235,6 +2203,9 @@ msgid ""
"nodes.\n"
"This requires the \"noclip\" privilege on the server."
msgstr ""
"Se ativado com o modo de vôo, o jogador é capaz de voar através de cubos "
"sólidos.\n"
"Isto requer o privilégio \"noclip\" no servidor."
#: src/settings_translation_file.cpp
msgid ""
@ -2268,6 +2239,9 @@ msgid ""
"you stand.\n"
"This is helpful when working with nodeboxes in small areas."
msgstr ""
"Se ativado, você pode colocar blocos na posição (pés + nível dos olhos) onde "
"você está.\n"
"Isto é útil quando se trabalha com nodeboxes em pequenas áreas."
#: src/settings_translation_file.cpp
msgid "If this is set, players will always (re)spawn at the given position."
@ -3280,7 +3254,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Node highlighting"
msgstr ""
msgstr "Destacando cubos"
#: src/settings_translation_file.cpp
msgid "Noise parameters for biome API temperature, humidity and biome blend."
@ -3416,6 +3390,8 @@ msgid ""
"Values larger than 26 will start to produce sharp cutoffs at cloud area "
"corners."
msgstr ""
"Raio da área de nuvens indicado em número de 64 cubos de nuvem.\n"
"Valores superiores a 26 produzem arestas acentuadas nos cantos das nuvens."
#: src/settings_translation_file.cpp
msgid "Raises terrain to make valleys around the rivers"
@ -3616,7 +3592,7 @@ msgstr ""
msgid ""
"Size of chunks to be generated at once by mapgen, stated in mapblocks (16 "
"nodes)."
msgstr ""
msgstr "Dimensão da parcela a ser gerada por mapgen, em mapblocks (16^3 cubos)."
#: src/settings_translation_file.cpp
msgid "Slope and fill work together to modify the heights"

File diff suppressed because it is too large Load Diff

View File

@ -8,28 +8,28 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2015-10-27 16:46+0200\n"
"Last-Translator: PilzAdam <PilzAdam@minetest.net>\n"
"Language-Team: Romanian <https://hosted.weblate.org/projects/minetest/"
"minetest/ro/>\n"
"PO-Revision-Date: 2016-03-17 15:28+0000\n"
"Last-Translator: Lordmusic Player <lordmusicplro1@gmail.com>\n"
"Language-Team: Romanian "
"<https://hosted.weblate.org/projects/minetest/minetest/ro/>\n"
"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
"20)) ? 1 : 2;\n"
"X-Generator: Weblate 2.5-dev\n"
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
msgstr ""
#: builtin/fstk/ui.lua
msgid "An error occured:"
msgstr ""
"X-Generator: Weblate 2.5\n"
#: builtin/fstk/ui.lua
#, fuzzy
msgid "An error occured in a Lua script, such as a mod:"
msgstr "A apărut o eroare in un script Lua,ca la un mod :"
#: builtin/fstk/ui.lua
msgid "An error occured:"
msgstr "A apărut o eroare:"
#: builtin/fstk/ui.lua
msgid "Main menu"
msgstr "Meniul Principal"
@ -38,13 +38,12 @@ msgid "Ok"
msgstr "Ok"
#: builtin/fstk/ui.lua
#, fuzzy
msgid "Reconnect"
msgstr "Conectează"
msgstr "Reconectează-te"
#: builtin/fstk/ui.lua
msgid "The server has requested a reconnect:"
msgstr ""
msgstr "Serverul cere o reconectare :"
#: builtin/mainmenu/common.lua src/game.cpp
msgid "Loading..."
@ -65,6 +64,8 @@ msgstr ""
#: builtin/mainmenu/common.lua
msgid "Try reenabling public serverlist and check your internet connection."
msgstr ""
"Încercați să activați lista de servere publică și să vă verificați "
"conexiunea la internet."
#: builtin/mainmenu/common.lua
msgid "We only support protocol version $1."

View File

@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-27 05:49+0100\n"
"PO-Revision-Date: 2015-12-30 16:01+0000\n"
"Last-Translator: Jun Zhang <zhangjunphy@gmail.com>\n"
"Language-Team: Chinese (China) <https://hosted.weblate.org/projects/minetest/"
"minetest/zh_CN/>\n"
"PO-Revision-Date: 2016-03-22 07:59+0000\n"
"Last-Translator: akiyama akira <utawarerumono@yeah.net>\n"
"Language-Team: Chinese (China) "
"<https://hosted.weblate.org/projects/minetest/minetest/zh_CN/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.5-dev\n"
"X-Generator: Weblate 2.6-dev\n"
#: builtin/fstk/ui.lua
msgid "An error occured in a Lua script, such as a mod:"
@ -25,7 +25,7 @@ msgstr "Lua 脚本错误:"
#: builtin/fstk/ui.lua
msgid "An error occured:"
msgstr "错误:"
msgstr "发生了一个错误:"
#: builtin/fstk/ui.lua
msgid "Main menu"
@ -216,7 +216,7 @@ msgstr "(没有关于此设置的信息)"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "< Back to Settings page"
msgstr ""
msgstr "< 返回到设置页面"
#: builtin/mainmenu/dlg_settings_advanced.lua
msgid "Browse"
@ -499,7 +499,7 @@ msgstr "启动游戏"
#: builtin/mainmenu/tab_settings.lua
msgid "2x"
msgstr ""
msgstr "两倍"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
@ -508,20 +508,19 @@ msgstr "3D 云彩"
#: builtin/mainmenu/tab_settings.lua
msgid "4x"
msgstr ""
msgstr "四倍"
#: builtin/mainmenu/tab_settings.lua
msgid "8x"
msgstr ""
msgstr "八倍"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Advanced Settings"
msgstr "设置"
msgstr "高级设置"
#: builtin/mainmenu/tab_settings.lua
msgid "Antialiasing:"
msgstr ""
msgstr "反锯齿:"
#: builtin/mainmenu/tab_settings.lua
msgid "Are you sure to reset your singleplayer world?"
@ -554,7 +553,7 @@ msgstr "全部启用"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Fancy Leaves"
msgstr "花式树"
msgstr "华丽的树叶"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
@ -594,9 +593,8 @@ msgid "None"
msgstr "无"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Opaque Leaves"
msgstr "不透明的"
msgstr "不透明的树叶"
#: builtin/mainmenu/tab_settings.lua
msgid "Opaque Water"
@ -615,9 +613,8 @@ msgid "Shaders"
msgstr "着色器"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Simple Leaves"
msgstr "摇动的叶子"
msgstr "简单的树叶"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
@ -626,7 +623,7 @@ msgstr "平滑光照"
#: builtin/mainmenu/tab_settings.lua
msgid "Texturing:"
msgstr ""
msgstr "纹理:"
#: builtin/mainmenu/tab_settings.lua
msgid "To enable shaders the OpenGL driver needs to be used."
@ -642,19 +639,16 @@ msgid "Trilinear Filter"
msgstr "三线性过滤"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Leaves"
msgstr "摇动的叶子"
msgstr "飘动的树叶"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Plants"
msgstr "摇的植物"
msgstr "摇的植物"
#: builtin/mainmenu/tab_settings.lua
#, fuzzy
msgid "Waving Water"
msgstr "摇动的水"
msgstr "鳞波的水面"
#: builtin/mainmenu/tab_simple_main.lua
msgid "Config mods"
@ -1337,18 +1331,21 @@ msgid ""
msgstr ""
#: src/settings_translation_file.cpp
#, fuzzy
msgid ""
"A chosen map seed for a new map, leave empty for random.\n"
"Will be overridden when creating a new world in the main menu."
msgstr ""
"输入新地图的随机种子值,不填则随机生成。\n"
"创建新地图的时候,将会覆盖原来的值。"
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server crashes."
msgstr ""
msgstr "当服务器挂掉的时候,发送给所有客户端的信息。"
#: src/settings_translation_file.cpp
msgid "A message to be displayed to all clients when the server shuts down."
msgstr ""
msgstr "当关闭服务器时,发送给所有客户端的信息。"
#: src/settings_translation_file.cpp
msgid "Absolute limit of emerge queues"
@ -1356,7 +1353,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Acceleration in air"
msgstr ""
msgstr "空中加速"
#: src/settings_translation_file.cpp
msgid "Active block range"
@ -1372,12 +1369,15 @@ msgid ""
"Leave this blank to start a local server.\n"
"Note that the address field in the main menu overrides this setting."
msgstr ""
"服务器连接地址。\n"
"留空则启动一个本地服务器。\n"
"注意,主菜单的地址栏将会覆盖这里的设置。"
#: src/settings_translation_file.cpp
msgid ""
"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
"screens."
msgstr ""
msgstr "为支持4K等屏幕调节像素点密度非 X11/Android 环境才有效)。"
#: src/settings_translation_file.cpp
msgid ""
@ -1395,7 +1395,7 @@ msgstr ""
#: src/settings_translation_file.cpp
msgid "Always fly and fast"
msgstr ""
msgstr "保持高速飞行"
#: src/settings_translation_file.cpp
msgid "Ambient occlusion gamma"
@ -1411,7 +1411,7 @@ msgstr "各向异性过滤"
#: src/settings_translation_file.cpp
msgid "Announce server"
msgstr ""
msgstr "发布服务器"
#: src/settings_translation_file.cpp
msgid ""
@ -1419,6 +1419,8 @@ msgid ""
"If you want to announce your ipv6 address, use serverlist_url = v6.servers."
"minetest.net."
msgstr ""
"发布到此服务器列表。\n"
"如果你想发布你的 IPv6 地址,使用 serverlist_url = v6.servers.minetest.net 。"
#: src/settings_translation_file.cpp
msgid "Approximate (X,Y,Z) scale of fractal in nodes."

File diff suppressed because it is too large Load Diff

View File

@ -273,6 +273,49 @@ inline bool isPointableNode(const MapNode &n,
(liquids_pointable && features.isLiquid());
}
static inline void getNeighborConnectingFace(v3s16 p, INodeDefManager *nodedef,
ClientMap *map, MapNode n, u8 bitmask, u8 *neighbors)
{
MapNode n2 = map->getNodeNoEx(p);
if (nodedef->nodeboxConnects(n, n2, bitmask))
*neighbors |= bitmask;
}
static inline u8 getNeighbors(v3s16 p, INodeDefManager *nodedef, ClientMap *map, MapNode n)
{
u8 neighbors = 0;
const ContentFeatures &f = nodedef->get(n);
// locate possible neighboring nodes to connect to
if (f.drawtype == NDT_NODEBOX && f.node_box.type == NODEBOX_CONNECTED) {
v3s16 p2 = p;
p2.Y++;
getNeighborConnectingFace(p2, nodedef, map, n, 1, &neighbors);
p2 = p;
p2.Y--;
getNeighborConnectingFace(p2, nodedef, map, n, 2, &neighbors);
p2 = p;
p2.Z--;
getNeighborConnectingFace(p2, nodedef, map, n, 4, &neighbors);
p2 = p;
p2.X--;
getNeighborConnectingFace(p2, nodedef, map, n, 8, &neighbors);
p2 = p;
p2.Z++;
getNeighborConnectingFace(p2, nodedef, map, n, 16, &neighbors);
p2 = p;
p2.X++;
getNeighborConnectingFace(p2, nodedef, map, n, 32, &neighbors);
}
return neighbors;
}
/*
Find what the player is pointing at
*/
@ -350,8 +393,9 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio
for (s16 x = xstart; x <= xend; x++) {
MapNode n;
bool is_valid_position;
v3s16 p(x, y, z);
n = map.getNodeNoEx(v3s16(x, y, z), &is_valid_position);
n = map.getNodeNoEx(p, &is_valid_position);
if (!is_valid_position) {
continue;
}
@ -360,7 +404,7 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio
}
std::vector<aabb3f> boxes;
n.getSelectionBoxes(nodedef, &boxes);
n.getSelectionBoxes(nodedef, &boxes, getNeighbors(p, nodedef, &map, n));
v3s16 np(x, y, z);
v3f npf = intToFloat(np, BS);
@ -392,7 +436,7 @@ PointedThing getPointedThing(Client *client, Hud *hud, const v3f &player_positio
MapNode n = map.getNodeNoEx(pointed_pos);
v3f npf = intToFloat(pointed_pos, BS);
std::vector<aabb3f> boxes;
n.getSelectionBoxes(nodedef, &boxes);
n.getSelectionBoxes(nodedef, &boxes, getNeighbors(pointed_pos, nodedef, &map, n));
f32 face_min_distance = 1000 * BS;
for (std::vector<aabb3f>::const_iterator
i = boxes.begin();

View File

@ -1614,7 +1614,7 @@ s32 Map::transforming_liquid_size() {
return m_transforming_liquid.size();
}
void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks)
void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks)
{
INodeDefManager *nodemgr = m_gamedef->ndef();
@ -1632,7 +1632,7 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks)
std::deque<v3s16> must_reflow;
// List of MapBlocks that will require a lighting update (due to lava)
std::map<v3s16, MapBlock*> lighting_modified_blocks;
std::map<v3s16, MapBlock *> lighting_modified_blocks;
u32 liquid_loop_max = g_settings->getS32("liquid_loop_max");
u32 loop_max = liquid_loop_max;
@ -1675,7 +1675,7 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks)
s8 liquid_level = -1;
content_t liquid_kind = CONTENT_IGNORE;
content_t floodable_node = CONTENT_AIR;
ContentFeatures cf = nodemgr->get(n0);
const ContentFeatures &cf = nodemgr->get(n0);
LiquidType liquid_type = cf.liquid_type;
switch (liquid_type) {
case LIQUID_SOURCE:
@ -1721,7 +1721,7 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks)
}
v3s16 npos = p0 + dirs[i];
NodeNeighbor nb(getNodeNoEx(npos), nt, npos);
ContentFeatures cfnb = nodemgr->get(nb.n);
const ContentFeatures &cfnb = nodemgr->get(nb.n);
switch (nodemgr->get(nb.n.getContent()).liquid_type) {
case LIQUID_NONE:
if (cfnb.floodable) {

View File

@ -246,14 +246,31 @@ void Mapgen::lightSpread(VoxelArea &a, v3s16 p, u8 light)
return;
u32 vi = vm->m_area.index(p);
MapNode &nn = vm->m_data[vi];
MapNode &n = vm->m_data[vi];
light--;
// should probably compare masked, but doesn't seem to make a difference
if (light <= nn.param1 || !ndef->get(nn).light_propagates)
// Decay light in each of the banks separately
u8 light_day = light & 0x0F;
if (light_day > 0)
light_day -= 0x01;
u8 light_night = light & 0xF0;
if (light_night > 0)
light_night -= 0x10;
// Bail out only if we have no more light from either bank to propogate, or
// we hit a solid block that light cannot pass through.
if ((light_day <= (n.param1 & 0x0F) &&
light_night <= (n.param1 & 0xF0)) ||
!ndef->get(n).light_propagates)
return;
nn.param1 = light;
// Since this recursive function only terminates when there is no light from
// either bank left, we need to take the max of both banks into account for
// the case where spreading has stopped for one light bank but not the other.
light = MYMAX(light_day, n.param1 & 0x0F) |
MYMAX(light_night, n.param1 & 0xF0);
n.param1 = light;
lightSpread(a, p + v3s16(0, 0, 1), light);
lightSpread(a, p + v3s16(0, 1, 0), light);
@ -284,6 +301,9 @@ void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax, bool propagate_shadow)
bool block_is_underground = (water_level >= nmax.Y);
v3s16 em = vm->m_area.getExtent();
// NOTE: Direct access to the low 4 bits of param1 is okay here because,
// by definition, sunlight will never be in the night lightbank.
for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) {
for (int x = a.MinEdge.X; x <= a.MaxEdge.X; x++) {
// see if we can get a light value from the overtop
@ -320,15 +340,21 @@ void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
u32 i = vm->m_area.index(a.MinEdge.X, y, z);
for (int x = a.MinEdge.X; x <= a.MaxEdge.X; x++, i++) {
MapNode &n = vm->m_data[i];
if (n.getContent() == CONTENT_IGNORE ||
!ndef->get(n).light_propagates)
if (n.getContent() == CONTENT_IGNORE)
continue;
u8 light_produced = ndef->get(n).light_source & 0x0F;
if (light_produced)
n.param1 = light_produced;
const ContentFeatures &cf = ndef->get(n);
if (!cf.light_propagates)
continue;
u8 light = n.param1 & 0x0F;
// TODO(hmmmmm): Abstract away direct param1 accesses with a
// wrapper, but something lighter than MapNode::get/setLight
u8 light_produced = cf.light_source;
if (light_produced)
n.param1 = light_produced | (light_produced << 4);
u8 light = n.param1;
if (light) {
lightSpread(a, v3s16(x, y, z + 1), light);
lightSpread(a, v3s16(x, y + 1, z ), light);

View File

@ -565,6 +565,7 @@ void MapgenFlat::generateCaves(s16 max_stone_y)
for (s16 z = node_min.Z; z <= node_max.Z; z++)
for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
bool column_is_open = false; // Is column open to overground
bool is_tunnel = false; // Is tunnel or tunnel floor
u32 vi = vm->m_area.index(x, node_max.Y + 1, z);
u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride +
(x - node_min.X);
@ -591,13 +592,16 @@ void MapgenFlat::generateCaves(s16 max_stone_y)
if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) {
// In tunnel and ground content, excavate
vm->m_data[vi] = MapNode(CONTENT_AIR);
} else if (column_is_open &&
is_tunnel = true;
} else if (is_tunnel && column_is_open &&
(c == biome->c_filler || c == biome->c_stone)) {
// Tunnel entrance floor
vm->m_data[vi] = MapNode(biome->c_top);
column_is_open = false;
is_tunnel = false;
} else {
column_is_open = false;
is_tunnel = false;
}
}
}

View File

@ -693,6 +693,7 @@ void MapgenFractal::generateCaves(s16 max_stone_y)
for (s16 z = node_min.Z; z <= node_max.Z; z++)
for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
bool column_is_open = false; // Is column open to overground
bool is_tunnel = false; // Is tunnel or tunnel floor
u32 vi = vm->m_area.index(x, node_max.Y + 1, z);
u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride +
(x - node_min.X);
@ -719,13 +720,16 @@ void MapgenFractal::generateCaves(s16 max_stone_y)
if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) {
// In tunnel and ground content, excavate
vm->m_data[vi] = MapNode(CONTENT_AIR);
} else if (column_is_open &&
is_tunnel = true;
} else if (is_tunnel && column_is_open &&
(c == biome->c_filler || c == biome->c_stone)) {
// Tunnel entrance floor
vm->m_data[vi] = MapNode(biome->c_top);
column_is_open = false;
is_tunnel = false;
} else {
column_is_open = false;
is_tunnel = false;
}
}
}

View File

@ -152,7 +152,7 @@ MapgenV7Params::MapgenV7Params()
np_terrain_base = NoiseParams(4, 70, v3f(600, 600, 600), 82341, 5, 0.6, 2.0);
np_terrain_alt = NoiseParams(4, 25, v3f(600, 600, 600), 5934, 5, 0.6, 2.0);
np_terrain_persist = NoiseParams(0.6, 0.1, v3f(2000, 2000, 2000), 539, 3, 0.6, 2.0);
np_height_select = NoiseParams(-12, 24, v3f(500, 500, 500), 4213, 6, 0.7, 2.0);
np_height_select = NoiseParams(-8, 16, v3f(500, 500, 500), 4213, 6, 0.7, 2.0);
np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261, 3, 0.7, 2.0);
np_mount_height = NoiseParams(256, 112, v3f(1000, 1000, 1000), 72449, 3, 0.6, 2.0);
np_ridge_uwater = NoiseParams(0, 1, v3f(1000, 1000, 1000), 85039, 5, 0.6, 2.0);
@ -875,6 +875,7 @@ void MapgenV7::generateCaves(s16 max_stone_y)
for (s16 z = node_min.Z; z <= node_max.Z; z++)
for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) {
bool column_is_open = false; // Is column open to overground
bool is_tunnel = false; // Is tunnel or tunnel floor
u32 vi = vm->m_area.index(x, node_max.Y + 1, z);
u32 index3d = (z - node_min.Z) * zstride + (csize.Y + 1) * ystride +
(x - node_min.X);
@ -901,13 +902,16 @@ void MapgenV7::generateCaves(s16 max_stone_y)
if (d1 * d2 > 0.3f && ndef->get(c).is_ground_content) {
// In tunnel and ground content, excavate
vm->m_data[vi] = MapNode(CONTENT_AIR);
} else if (column_is_open &&
is_tunnel = true;
} else if (is_tunnel && column_is_open &&
(c == biome->c_filler || c == biome->c_stone)) {
// Tunnel entrance floor
vm->m_data[vi] = MapNode(biome->c_top);
column_is_open = false;
is_tunnel = false;
} else {
column_is_open = false;
is_tunnel = false;
}
}
}

View File

@ -456,10 +456,10 @@ void MapNode::getCollisionBoxes(INodeDefManager *nodemgr, std::vector<aabb3f> *b
transformNodeBox(*this, f.collision_box, nodemgr, boxes, neighbors);
}
void MapNode::getSelectionBoxes(INodeDefManager *nodemgr, std::vector<aabb3f> *boxes)
void MapNode::getSelectionBoxes(INodeDefManager *nodemgr, std::vector<aabb3f> *boxes, u8 neighbors)
{
const ContentFeatures &f = nodemgr->get(*this);
transformNodeBox(*this, f.selection_box, nodemgr, boxes);
transformNodeBox(*this, f.selection_box, nodemgr, boxes, neighbors);
}
u8 MapNode::getMaxLevel(INodeDefManager *nodemgr) const

View File

@ -245,7 +245,7 @@ struct MapNode
/*
Gets list of selection boxes
*/
void getSelectionBoxes(INodeDefManager *nodemg, std::vector<aabb3f> *boxes);
void getSelectionBoxes(INodeDefManager *nodemg, std::vector<aabb3f> *boxes, u8 neighbors = 0);
/*
Gets list of collision boxes

View File

@ -267,7 +267,7 @@ bool Schematic::deserializeFromMts(std::istream *is,
//// Read signature
u32 signature = readU32(ss);
if (signature != MTSCHEM_FILE_SIGNATURE) {
errorstream << "Schematic::deserializeFromMts: invalid schematic "
errorstream << __FUNCTION__ << ": invalid schematic "
"file" << std::endl;
return false;
}
@ -275,7 +275,7 @@ bool Schematic::deserializeFromMts(std::istream *is,
//// Read version
u16 version = readU16(ss);
if (version > MTSCHEM_FILE_VER_HIGHEST_READ) {
errorstream << "Schematic::deserializeFromMts: unsupported schematic "
errorstream << __FUNCTION__ << ": unsupported schematic "
"file version" << std::endl;
return false;
}
@ -439,7 +439,7 @@ bool Schematic::loadSchematicFromFile(const std::string &filename,
{
std::ifstream is(filename.c_str(), std::ios_base::binary);
if (!is.good()) {
errorstream << "Schematic::loadSchematicFile: unable to open file '"
errorstream << __FUNCTION__ << ": unable to open file '"
<< filename << "'" << std::endl;
return false;
}
@ -448,17 +448,19 @@ bool Schematic::loadSchematicFromFile(const std::string &filename,
if (!deserializeFromMts(&is, &m_nodenames))
return false;
m_nnlistsizes.push_back(m_nodenames.size() - origsize);
name = filename;
if (replace_names) {
for (size_t i = origsize; i != m_nodenames.size(); i++) {
std::string &name = m_nodenames[i];
StringMap::iterator it = replace_names->find(name);
for (size_t i = origsize; i < m_nodenames.size(); i++) {
std::string &node_name = m_nodenames[i];
StringMap::iterator it = replace_names->find(node_name);
if (it != replace_names->end())
name = it->second;
node_name = it->second;
}
}
m_nnlistsizes.push_back(m_nodenames.size() - origsize);
if (ndef)
ndef->pendNodeResolve(this);

View File

@ -1808,7 +1808,7 @@ void Server::handleCommand_FirstSrp(NetworkPacket* pkt)
*pkt >> salt >> verification_key >> is_empty;
verbosestream << "Server: Got TOSERVER_FIRST_SRP from " << addr_s
<< ", with is_empty= " << is_empty << std::endl;
<< ", with is_empty=" << (is_empty == 1) << std::endl;
// Either this packet is sent because the user is new or to change the password
if (cstate == CS_HelloSent) {

View File

@ -346,7 +346,7 @@ void ParticleManager::step(float dtime)
void ParticleManager::stepSpawners (float dtime)
{
MutexAutoLock lock(m_spawner_list_lock);
for(std::map<u32, ParticleSpawner*>::iterator i =
for (std::map<u32, ParticleSpawner*>::iterator i =
m_particle_spawners.begin();
i != m_particle_spawners.end();)
{
@ -408,94 +408,92 @@ void ParticleManager::clearAll ()
void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
scene::ISceneManager* smgr, LocalPlayer *player)
{
if (event->type == CE_DELETE_PARTICLESPAWNER) {
MutexAutoLock lock(m_spawner_list_lock);
if (m_particle_spawners.find(event->delete_particlespawner.id) !=
m_particle_spawners.end())
{
delete m_particle_spawners.find(event->delete_particlespawner.id)->second;
m_particle_spawners.erase(event->delete_particlespawner.id);
}
// no allocated memory in delete event
return;
}
if (event->type == CE_ADD_PARTICLESPAWNER) {
{
switch (event->type) {
case CE_DELETE_PARTICLESPAWNER: {
MutexAutoLock lock(m_spawner_list_lock);
if (m_particle_spawners.find(event->add_particlespawner.id) !=
m_particle_spawners.end())
{
delete m_particle_spawners.find(event->add_particlespawner.id)->second;
m_particle_spawners.erase(event->add_particlespawner.id);
if (m_particle_spawners.find(event->delete_particlespawner.id) !=
m_particle_spawners.end()) {
delete m_particle_spawners.find(event->delete_particlespawner.id)->second;
m_particle_spawners.erase(event->delete_particlespawner.id);
}
// no allocated memory in delete event
break;
}
video::ITexture *texture =
gamedef->tsrc()->getTextureForMesh(*(event->add_particlespawner.texture));
case CE_ADD_PARTICLESPAWNER: {
{
MutexAutoLock lock(m_spawner_list_lock);
if (m_particle_spawners.find(event->add_particlespawner.id) !=
m_particle_spawners.end()) {
delete m_particle_spawners.find(event->add_particlespawner.id)->second;
m_particle_spawners.erase(event->add_particlespawner.id);
}
}
ParticleSpawner* toadd = new ParticleSpawner(gamedef, smgr, player,
event->add_particlespawner.amount,
event->add_particlespawner.spawntime,
*event->add_particlespawner.minpos,
*event->add_particlespawner.maxpos,
*event->add_particlespawner.minvel,
*event->add_particlespawner.maxvel,
*event->add_particlespawner.minacc,
*event->add_particlespawner.maxacc,
event->add_particlespawner.minexptime,
event->add_particlespawner.maxexptime,
event->add_particlespawner.minsize,
event->add_particlespawner.maxsize,
event->add_particlespawner.collisiondetection,
event->add_particlespawner.vertical,
texture,
event->add_particlespawner.id,
this);
video::ITexture *texture =
gamedef->tsrc()->getTextureForMesh(*(event->add_particlespawner.texture));
/* delete allocated content of event */
delete event->add_particlespawner.minpos;
delete event->add_particlespawner.maxpos;
delete event->add_particlespawner.minvel;
delete event->add_particlespawner.maxvel;
delete event->add_particlespawner.minacc;
delete event->add_particlespawner.texture;
delete event->add_particlespawner.maxacc;
ParticleSpawner* toadd = new ParticleSpawner(gamedef, smgr, player,
event->add_particlespawner.amount,
event->add_particlespawner.spawntime,
*event->add_particlespawner.minpos,
*event->add_particlespawner.maxpos,
*event->add_particlespawner.minvel,
*event->add_particlespawner.maxvel,
*event->add_particlespawner.minacc,
*event->add_particlespawner.maxacc,
event->add_particlespawner.minexptime,
event->add_particlespawner.maxexptime,
event->add_particlespawner.minsize,
event->add_particlespawner.maxsize,
event->add_particlespawner.collisiondetection,
event->add_particlespawner.vertical,
texture,
event->add_particlespawner.id,
this);
{
MutexAutoLock lock(m_spawner_list_lock);
m_particle_spawners.insert(
std::pair<u32, ParticleSpawner*>(
event->add_particlespawner.id,
toadd));
/* delete allocated content of event */
delete event->add_particlespawner.minpos;
delete event->add_particlespawner.maxpos;
delete event->add_particlespawner.minvel;
delete event->add_particlespawner.maxvel;
delete event->add_particlespawner.minacc;
delete event->add_particlespawner.texture;
delete event->add_particlespawner.maxacc;
{
MutexAutoLock lock(m_spawner_list_lock);
m_particle_spawners.insert(
std::pair<u32, ParticleSpawner*>(
event->add_particlespawner.id,
toadd));
}
break;
}
case CE_SPAWN_PARTICLE: {
video::ITexture *texture =
gamedef->tsrc()->getTextureForMesh(*(event->spawn_particle.texture));
return;
}
Particle* toadd = new Particle(gamedef, smgr, player, m_env,
*event->spawn_particle.pos,
*event->spawn_particle.vel,
*event->spawn_particle.acc,
event->spawn_particle.expirationtime,
event->spawn_particle.size,
event->spawn_particle.collisiondetection,
event->spawn_particle.vertical,
texture,
v2f(0.0, 0.0),
v2f(1.0, 1.0));
if (event->type == CE_SPAWN_PARTICLE) {
video::ITexture *texture =
gamedef->tsrc()->getTextureForMesh(*(event->spawn_particle.texture));
addParticle(toadd);
Particle* toadd = new Particle(gamedef, smgr, player, m_env,
*event->spawn_particle.pos,
*event->spawn_particle.vel,
*event->spawn_particle.acc,
event->spawn_particle.expirationtime,
event->spawn_particle.size,
event->spawn_particle.collisiondetection,
event->spawn_particle.vertical,
texture,
v2f(0.0, 0.0),
v2f(1.0, 1.0));
delete event->spawn_particle.pos;
delete event->spawn_particle.vel;
delete event->spawn_particle.acc;
addParticle(toadd);
delete event->spawn_particle.pos;
delete event->spawn_particle.vel;
delete event->spawn_particle.acc;
return;
break;
}
default: break;
}
}