master
Henry 2013-04-03 19:01:39 -07:00
parent 8d4b768297
commit 891a76d43d
18 changed files with 175 additions and 165 deletions

BIN
.DS_Store vendored Normal file

Binary file not shown.

View File

@ -12,7 +12,7 @@ set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
set(VERSION_MAJOR 0)
set(VERSION_MINOR 4)
set(VERSION_PATCH 5)
set(VERSION_PATCH 6)
if(VERSION_EXTRA)
set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA})
endif()

View File

@ -244,7 +244,7 @@ function minetest.item_place(itemstack, placer, pointed_thing)
local n = minetest.env:get_node(pointed_thing.under)
local nn = n.name
if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer, itemstack)
return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer, itemstack) or itemstack
end
end

View File

@ -1,5 +1,5 @@
Minetest Lua Modding API Reference 0.4.5
==========================================
Minetest Lua Modding API Reference 0.4.6
========================================
More information at http://c55.me/minetest/
Introduction

View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: 0.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-03-30 19:56+0100\n"
"PO-Revision-Date: 2013-02-21 17:34+0200\n"
"PO-Revision-Date: 2013-04-01 18:56+0200\n"
"Last-Translator: Sfan5 . <sfan5@live.de>\n"
"Language-Team: Deutsch <>\n"
"Language: de\n"
@ -258,13 +258,12 @@ msgid "Name/Password"
msgstr "Name/Passwort"
#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184
#, fuzzy
msgid "Favorites:"
msgstr "Zeige Favoriten"
msgstr "Zeige Favoriten:"
#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194
msgid "Public Server List:"
msgstr ""
msgstr "Öffentliche Server Liste:"
#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568
msgid "Address/Port"
@ -291,9 +290,8 @@ msgid "Start Game / Connect"
msgstr "Spiel starten / Verbinden"
#: src/guiMainMenu.cpp:632
#, fuzzy
msgid "Public"
msgstr "Zeige öffentliche"
msgstr "Öffentlich"
#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113
msgid "Delete world"
@ -349,7 +347,7 @@ msgstr "Aktiviere Partikel"
#: src/guiMainMenu.cpp:759
msgid "Finite liquid"
msgstr ""
msgstr "Realistiches Wasser"
#: src/guiMainMenu.cpp:769
msgid "Change keys"
@ -361,7 +359,7 @@ msgstr "Adresse benötigt."
#: src/guiMainMenu.cpp:1102
msgid "Cannot delete world: Nothing selected"
msgstr "Kann Welt nicht löschen: Nichts ausgewählt"
msgstr "Kann Welt nicht löchen: Nichts ausgewählt"
#: src/guiMainMenu.cpp:1117
msgid "Files to be deleted"
@ -377,7 +375,7 @@ msgstr "Kann Welt nicht konfigurieren: Nichts ausgewählt"
#: src/guiMainMenu.cpp:1256
msgid "Failed to delete all world files"
msgstr "Welt Dateien löschen gescheitert"
msgstr "Es konnten nicht alle Welt Dateien gelöscht werden"
#: src/guiPasswordChange.cpp:108
msgid "Old Password"
@ -409,7 +407,7 @@ msgstr "Passwort ändern"
#: src/guiPauseMenu.cpp:140
msgid "Sound Volume"
msgstr ""
msgstr "Sound Lautstärke"
#: src/guiPauseMenu.cpp:147
msgid "Exit to Menu"
@ -446,11 +444,11 @@ msgstr ""
#: src/guiVolumeChange.cpp:108
msgid "Sound Volume: "
msgstr ""
msgstr "Sound Lautstärke: "
#: src/guiVolumeChange.cpp:121
msgid "Exit"
msgstr ""
msgstr "Zurück"
#: src/keycode.cpp:223
msgid "Left Button"
@ -758,7 +756,7 @@ msgstr "Keine Welt ausgewählt und keine Adresse angegeben. Nichts zu tun."
#: src/main.cpp:1850
msgid "Could not find or load game \""
msgstr "Kann Spiel nicht finden/laden\""
msgstr "Kann Spiel nicht finden/laden \""
#: src/main.cpp:1864
msgid "Invalid gamespec."

View File

@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-03-30 19:56+0100\n"
"PO-Revision-Date: 2013-03-19 04:31+0200\n"
"Last-Translator: Lord James <neftali_dtctv@hotmail.com>\n"
"PO-Revision-Date: 2013-04-03 17:22+0200\n"
"Last-Translator: Diego Martínez <lkaezadl3@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@ -52,7 +52,7 @@ msgstr "Dependencias:"
#: src/guiConfigureWorld.cpp:240
msgid "is required by:"
msgstr "es dependencia de:"
msgstr "es requerido por:"
#: src/guiConfigureWorld.cpp:262 src/guiCreateWorld.cpp:165
#: src/guiKeyChangeMenu.cpp:179 src/keycode.cpp:223
@ -93,11 +93,11 @@ msgstr "Crear"
#: src/guiDeathScreen.cpp:96
msgid "You died."
msgstr "Estas Muerto."
msgstr "Has muerto."
#: src/guiDeathScreen.cpp:104
msgid "Respawn"
msgstr "Respawn"
msgstr "Revivir"
#: src/guiFormSpecMenu.cpp:582
msgid "Left click: Move all items, Right click: Move single item"
@ -121,7 +121,7 @@ msgstr "\"Usar\" = Descender"
#: src/guiKeyChangeMenu.cpp:164
msgid "Double tap \"jump\" to toggle fly"
msgstr "Pulsar dos veces \"saltar\" para activar volar"
msgstr "Dos veces \"saltar\" para volar"
#: src/guiKeyChangeMenu.cpp:269
msgid "Key already in use"
@ -137,7 +137,7 @@ msgstr "Adelante"
#: src/guiKeyChangeMenu.cpp:373
msgid "Backward"
msgstr "Atras"
msgstr "Atrás"
#: src/guiKeyChangeMenu.cpp:374 src/keycode.cpp:228
msgid "Left"
@ -157,7 +157,7 @@ msgstr "Saltar"
#: src/guiKeyChangeMenu.cpp:378
msgid "Sneak"
msgstr "Agacharse"
msgstr "Caminar"
#: src/guiKeyChangeMenu.cpp:379
msgid "Drop"
@ -193,11 +193,11 @@ msgstr "Activar noclip"
#: src/guiKeyChangeMenu.cpp:387
msgid "Range select"
msgstr "Seleccionar rango"
msgstr "Seleccionar distancia"
#: src/guiKeyChangeMenu.cpp:388
msgid "Print stacks"
msgstr "Imprimir Stacks"
msgstr "Imprimir Pilas"
#: src/guiMainMenu.cpp:92
msgid "Cannot create world: Name contains invalid characters"
@ -217,7 +217,7 @@ msgstr "Multijugador"
#: src/guiMainMenu.cpp:285
msgid "Advanced"
msgstr "Servidor"
msgstr "Avanzado"
#: src/guiMainMenu.cpp:286
msgid "Settings"
@ -260,13 +260,12 @@ msgid "Name/Password"
msgstr "Nombre/Clave"
#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184
#, fuzzy
msgid "Favorites:"
msgstr "Mostrar Favoritos"
msgstr "Favoritos:"
#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194
msgid "Public Server List:"
msgstr ""
msgstr "Lista de Servidores Públicos:"
#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568
msgid "Address/Port"
@ -293,9 +292,8 @@ msgid "Start Game / Connect"
msgstr "Iniciar juego/Conectar"
#: src/guiMainMenu.cpp:632
#, fuzzy
msgid "Public"
msgstr "Servidores Públicos"
msgstr "Público"
#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113
msgid "Delete world"
@ -339,7 +337,7 @@ msgstr "Filtrado Tri-Lineal"
#: src/guiMainMenu.cpp:738
msgid "Shaders"
msgstr "Habilitar Shaders"
msgstr "Sombreadores"
#: src/guiMainMenu.cpp:745
msgid "Preload item visuals"
@ -347,11 +345,11 @@ msgstr "Precarga elementos visuales"
#: src/guiMainMenu.cpp:752
msgid "Enable Particles"
msgstr "Partículas"
msgstr "Habilitar partículas"
#: src/guiMainMenu.cpp:759
msgid "Finite liquid"
msgstr ""
msgstr "Líquidos Finitos"
#: src/guiMainMenu.cpp:769
msgid "Change keys"
@ -411,7 +409,7 @@ msgstr "Modificar contraseña"
#: src/guiPauseMenu.cpp:140
msgid "Sound Volume"
msgstr ""
msgstr "Volúmen del Sonido"
#: src/guiPauseMenu.cpp:147
msgid "Exit to Menu"
@ -442,18 +440,18 @@ msgstr ""
"- Ratón, rueda: seleccionar objecto\n"
"- 0... 9: Seleccionar objecto\n"
"- Mayúscula: caminar despacio\n"
"- R: Ajustar distancia de los chunks cargados\n"
"- R: Ajustar distancia de los pedazos cargados\n"
"- I: Inventario \n"
"- ESC: Este Menu\n"
"- T: Chat\n"
"- T: Conversar\n"
#: src/guiVolumeChange.cpp:108
msgid "Sound Volume: "
msgstr ""
msgstr "Volúmen del Sonido: "
#: src/guiVolumeChange.cpp:121
msgid "Exit"
msgstr ""
msgstr "Salir"
#: src/keycode.cpp:223
msgid "Left Button"
@ -521,7 +519,7 @@ msgstr "Convertir"
#: src/keycode.cpp:226
msgid "Escape"
msgstr "Esc"
msgstr "Escape"
#: src/keycode.cpp:226
msgid "Final"
@ -537,7 +535,7 @@ msgstr "Kanji"
#: src/keycode.cpp:226
msgid "Nonconvert"
msgstr "Nonconvert"
msgstr "No convertir"
#: src/keycode.cpp:227
msgid "Accept"
@ -693,7 +691,7 @@ msgstr "Control Izqdo"
#: src/keycode.cpp:241
msgid "Left Menu"
msgstr "Menú Izquierda"
msgstr "Menú Izquierdo"
#: src/keycode.cpp:241
msgid "Right Control"
@ -701,7 +699,7 @@ msgstr "Control Dcho"
#: src/keycode.cpp:241
msgid "Right Menu"
msgstr "Menú Derecha"
msgstr "Menú Derecho"
#: src/keycode.cpp:243
msgid "Comma"

View File

@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-03-30 19:56+0100\n"
"PO-Revision-Date: 2013-03-07 09:48+0200\n"
"Last-Translator: Ragnar Laud <ragnarlaud@gmail.com>\n"
"PO-Revision-Date: 2013-04-03 17:02+0200\n"
"Last-Translator: Pilz Adam <PilzAdam@gmx.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
@ -260,13 +260,12 @@ msgid "Name/Password"
msgstr "Nimi/Parool"
#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184
#, fuzzy
msgid "Favorites:"
msgstr "Näita lemmikuid"
msgstr "Lemmikud:"
#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194
msgid "Public Server List:"
msgstr ""
msgstr "Avatud serverite nimekiri:"
#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568
msgid "Address/Port"
@ -293,9 +292,8 @@ msgid "Start Game / Connect"
msgstr "Alusta mängu / Liitu"
#: src/guiMainMenu.cpp:632
#, fuzzy
msgid "Public"
msgstr "Näita avalikke"
msgstr "Avalik"
#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113
msgid "Delete world"
@ -351,7 +349,7 @@ msgstr "Lülita osakesed sisse"
#: src/guiMainMenu.cpp:759
msgid "Finite liquid"
msgstr ""
msgstr "Löppev vedelik"
#: src/guiMainMenu.cpp:769
msgid "Change keys"
@ -411,7 +409,7 @@ msgstr "Vaheta parooli"
#: src/guiPauseMenu.cpp:140
msgid "Sound Volume"
msgstr ""
msgstr "Hääle volüüm"
#: src/guiPauseMenu.cpp:147
msgid "Exit to Menu"
@ -449,11 +447,11 @@ msgstr ""
#: src/guiVolumeChange.cpp:108
msgid "Sound Volume: "
msgstr ""
msgstr "Hääle Volüüm: "
#: src/guiVolumeChange.cpp:121
msgid "Exit"
msgstr ""
msgstr "Välju"
#: src/keycode.cpp:223
msgid "Left Button"
@ -500,7 +498,6 @@ msgid "Control"
msgstr "CTRL"
#: src/keycode.cpp:225
#, fuzzy
msgid "Kana"
msgstr "Kana"
@ -529,12 +526,10 @@ msgid "Final"
msgstr "Viimane"
#: src/keycode.cpp:226
#, fuzzy
msgid "Junja"
msgstr "Junja"
#: src/keycode.cpp:226
#, fuzzy
msgid "Kanji"
msgstr "Kanji"
@ -692,90 +687,92 @@ msgstr "Parem Shift"
#: src/keycode.cpp:241
msgid "Left Control"
msgstr ""
msgstr "Vasak CTRL"
#: src/keycode.cpp:241
msgid "Left Menu"
msgstr ""
msgstr "Vasak Menüü"
#: src/keycode.cpp:241
msgid "Right Control"
msgstr ""
msgstr "Parem CTRL"
#: src/keycode.cpp:241
msgid "Right Menu"
msgstr ""
msgstr "Parem Menüü"
#: src/keycode.cpp:243
msgid "Comma"
msgstr ""
msgstr "Koma"
#: src/keycode.cpp:243
msgid "Minus"
msgstr ""
msgstr "Miinus"
#: src/keycode.cpp:243
msgid "Period"
msgstr ""
msgstr "Punkt"
#: src/keycode.cpp:243
msgid "Plus"
msgstr ""
msgstr "Pluss"
#: src/keycode.cpp:247
msgid "Attn"
msgstr ""
msgstr "Attn"
#: src/keycode.cpp:247
msgid "CrSel"
msgstr ""
msgstr "CrSel"
#: src/keycode.cpp:248
msgid "Erase OEF"
msgstr ""
msgstr "Kustuta OEF"
#: src/keycode.cpp:248
msgid "ExSel"
msgstr ""
msgstr "ExSel"
#: src/keycode.cpp:248
msgid "OEM Clear"
msgstr ""
msgstr "OEM Tühi"
#: src/keycode.cpp:248
msgid "PA1"
msgstr ""
msgstr "PA1"
#: src/keycode.cpp:248
msgid "Zoom"
msgstr ""
msgstr "Suumi"
#: src/main.cpp:1506
msgid "Main Menu"
msgstr ""
msgstr "Menüü"
#: src/main.cpp:1830
msgid "Failed to initialize world"
msgstr ""
msgstr "Maailma initsialiseerimine ebaõnnestus"
#: src/main.cpp:1842
msgid "No world selected and no address provided. Nothing to do."
msgstr ""
msgstr "Pole valitud ei maailma ega IP aadressi. Pole midagi teha."
#: src/main.cpp:1850
msgid "Could not find or load game \""
msgstr ""
msgstr "Ei leia ega suuda jätkata mängu."
#: src/main.cpp:1864
msgid "Invalid gamespec."
msgstr ""
msgstr "Vale mängu ID."
#: src/main.cpp:1904
msgid "Connection error (timed out?)"
msgstr ""
msgstr "Ühenduse viga (Aeg otsas?)"
#: src/main.cpp:1915
msgid ""
"\n"
"Check debug.txt for details."
msgstr ""
"\n"
"Vaata debug.txt info jaoks."

View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: 0.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-03-30 19:56+0100\n"
"PO-Revision-Date: 2013-02-28 17:44+0200\n"
"PO-Revision-Date: 2013-04-01 14:13+0200\n"
"Last-Translator: we prefer instagib metl3 <calinou9999spam@gmail.com>\n"
"Language-Team: Français <>\n"
"Language: fr\n"
@ -226,7 +226,7 @@ msgstr "Crédits"
#: src/guiMainMenu.cpp:317
msgid "Select World:"
msgstr "Sélectionner le monde :"
msgstr "Sélectionner un monde :"
#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229
msgid "Delete"
@ -257,13 +257,12 @@ msgid "Name/Password"
msgstr "Nom / MdP"
#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184
#, fuzzy
msgid "Favorites:"
msgstr "Voir serveurs favoris"
msgstr "Favoris :"
#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194
msgid "Public Server List:"
msgstr ""
msgstr "Liste de serveurs publics :"
#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568
msgid "Address/Port"
@ -271,11 +270,11 @@ msgstr "Adresse / Port"
#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183
msgid "Show Public"
msgstr "Voir serveurs publics"
msgstr "Voir les serveurs publics"
#: src/guiMainMenu.cpp:501 src/guiMainMenu.cpp:1193
msgid "Show Favorites"
msgstr "Voir serveurs favoris"
msgstr "Voir les serveurs favoris"
#: src/guiMainMenu.cpp:521
msgid "Connect"
@ -290,13 +289,12 @@ msgid "Start Game / Connect"
msgstr "Démarrer / Connecter"
#: src/guiMainMenu.cpp:632
#, fuzzy
msgid "Public"
msgstr "Voir serveurs publics"
msgstr "Public"
#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113
msgid "Delete world"
msgstr "Supprimer monde"
msgstr "Supprimer ce monde"
#: src/guiMainMenu.cpp:647
msgid "Create world"
@ -304,7 +302,7 @@ msgstr "Créer un monde"
#: src/guiMainMenu.cpp:681
msgid "Fancy trees"
msgstr "Arbres spéciaux"
msgstr "Feuilles transparentes"
#: src/guiMainMenu.cpp:687
msgid "Smooth Lighting"
@ -344,11 +342,11 @@ msgstr "Précharger les visuels d'objets"
#: src/guiMainMenu.cpp:752
msgid "Enable Particles"
msgstr "Activer les particules"
msgstr "Particules"
#: src/guiMainMenu.cpp:759
msgid "Finite liquid"
msgstr ""
msgstr "Liquides limités"
#: src/guiMainMenu.cpp:769
msgid "Change keys"
@ -408,7 +406,7 @@ msgstr "Changer mot de passe"
#: src/guiPauseMenu.cpp:140
msgid "Sound Volume"
msgstr ""
msgstr "Volume sonore"
#: src/guiPauseMenu.cpp:147
msgid "Exit to Menu"
@ -445,11 +443,11 @@ msgstr ""
#: src/guiVolumeChange.cpp:108
msgid "Sound Volume: "
msgstr ""
msgstr "Volume sonore :"
#: src/guiVolumeChange.cpp:121
msgid "Exit"
msgstr ""
msgstr "OK"
#: src/keycode.cpp:223
msgid "Left Button"
@ -753,7 +751,7 @@ msgstr "Le monde n'a pas pu être initialisé"
#: src/main.cpp:1842
msgid "No world selected and no address provided. Nothing to do."
msgstr "Pas de monde sélectionné et pas d'adresse. Rien à faire."
msgstr "Pas de monde sélectionné et pas d'adresse fournie. Rien à faire."
#: src/main.cpp:1850
msgid "Could not find or load game \""

View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-03-30 19:56+0100\n"
"PO-Revision-Date: 2013-03-30 11:04+0200\n"
"PO-Revision-Date: 2013-03-30 20:50+0200\n"
"Last-Translator: Fabio Luongo <e249260@rmqkr.net>\n"
"Language-Team: Italian\n"
"Language: it\n"
@ -765,7 +765,7 @@ msgstr "Impossibile trovare o caricare il gioco \""
#: src/main.cpp:1864
msgid "Invalid gamespec."
msgstr "Gamespec invalide."
msgstr "Specifiche di gioco non valide."
#: src/main.cpp:1904
msgid "Connection error (timed out?)"

View File

@ -3,19 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-03-30 19:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2013-03-31 15:40+0200\n"
"Last-Translator: Chynggyz Jumaliev <translatorky@lavabit.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"Language: ky\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 1.4-dev\n"
#: src/guiConfigureWorld.cpp:125
msgid ""
@ -35,11 +36,11 @@ msgstr ""
#: src/guiConfigureWorld.cpp:215
msgid "Enable All"
msgstr ""
msgstr "Баарын күйгүзүү"
#: src/guiConfigureWorld.cpp:222
msgid "Disable All"
msgstr ""
msgstr "Баарын өчүрүү"
#: src/guiConfigureWorld.cpp:228
msgid "depends on:"
@ -52,47 +53,47 @@ msgstr ""
#: src/guiConfigureWorld.cpp:262 src/guiCreateWorld.cpp:165
#: src/guiKeyChangeMenu.cpp:179 src/keycode.cpp:223
msgid "Cancel"
msgstr ""
msgstr "Жокко чыгаруу"
#: src/guiConfigureWorld.cpp:268 src/guiKeyChangeMenu.cpp:173
msgid "Save"
msgstr ""
msgstr "Сактоо"
#: src/guiConfigureWorld.cpp:394
msgid "Configuration saved. "
msgstr ""
msgstr "Ырастоолор сакталды. "
#: src/guiConfigureWorld.cpp:402
msgid "Warning: Configuration not consistent. "
msgstr ""
msgstr "Эскертүү: Туура эмес конфигурация. "
#: src/guiConfirmMenu.cpp:120
msgid "Yes"
msgstr ""
msgstr "Ооба"
#: src/guiConfirmMenu.cpp:126
msgid "No"
msgstr ""
msgstr "Жок"
#: src/guiCreateWorld.cpp:116
msgid "World name"
msgstr ""
msgstr "Дүйнөнүн аты"
#: src/guiCreateWorld.cpp:135
msgid "Game"
msgstr ""
msgstr "Оюн"
#: src/guiCreateWorld.cpp:159
msgid "Create"
msgstr ""
msgstr "Жаратуу"
#: src/guiDeathScreen.cpp:96
msgid "You died."
msgstr ""
msgstr "Сиз өлдүңүз."
#: src/guiDeathScreen.cpp:104
msgid "Respawn"
msgstr ""
msgstr "Кайтадан жаралуу"
#: src/guiFormSpecMenu.cpp:582
msgid "Left click: Move all items, Right click: Move single item"
@ -101,7 +102,7 @@ msgstr ""
#: src/guiFormSpecMenu.cpp:607 src/guiMessageMenu.cpp:109
#: src/guiTextInputMenu.cpp:131
msgid "Proceed"
msgstr ""
msgstr "Улантуу"
#: src/guiKeyChangeMenu.cpp:114
msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
@ -125,27 +126,27 @@ msgstr ""
#: src/guiKeyChangeMenu.cpp:372
msgid "Forward"
msgstr ""
msgstr "Алга"
#: src/guiKeyChangeMenu.cpp:373
msgid "Backward"
msgstr ""
msgstr "Артка"
#: src/guiKeyChangeMenu.cpp:374 src/keycode.cpp:228
msgid "Left"
msgstr ""
msgstr "Солго"
#: src/guiKeyChangeMenu.cpp:375 src/keycode.cpp:228
msgid "Right"
msgstr ""
msgstr "Оңго"
#: src/guiKeyChangeMenu.cpp:376
msgid "Use"
msgstr ""
msgstr "Колдонуу"
#: src/guiKeyChangeMenu.cpp:377
msgid "Jump"
msgstr ""
msgstr "Секирүү"
#: src/guiKeyChangeMenu.cpp:378
msgid "Sneak"
@ -153,7 +154,7 @@ msgstr ""
#: src/guiKeyChangeMenu.cpp:379
msgid "Drop"
msgstr ""
msgstr "Ыргытуу"
#: src/guiKeyChangeMenu.cpp:380
msgid "Inventory"
@ -161,15 +162,15 @@ msgstr ""
#: src/guiKeyChangeMenu.cpp:381
msgid "Chat"
msgstr ""
msgstr "Маек"
#: src/guiKeyChangeMenu.cpp:382
msgid "Command"
msgstr ""
msgstr "Команда"
#: src/guiKeyChangeMenu.cpp:383
msgid "Console"
msgstr ""
msgstr "Консоль"
#: src/guiKeyChangeMenu.cpp:384
msgid "Toggle fly"
@ -213,31 +214,31 @@ msgstr ""
#: src/guiMainMenu.cpp:286
msgid "Settings"
msgstr ""
msgstr "Ырастоолор"
#: src/guiMainMenu.cpp:287
msgid "Credits"
msgstr ""
msgstr "Алкыштар"
#: src/guiMainMenu.cpp:317
msgid "Select World:"
msgstr ""
msgstr "Дүйнөнү тандаңыз:"
#: src/guiMainMenu.cpp:339 src/guiMainMenu.cpp:511 src/keycode.cpp:229
msgid "Delete"
msgstr ""
msgstr "Өчүрүү"
#: src/guiMainMenu.cpp:346
msgid "New"
msgstr ""
msgstr "Жаңы"
#: src/guiMainMenu.cpp:354
msgid "Configure"
msgstr ""
msgstr "Ырастоо"
#: src/guiMainMenu.cpp:369 src/keycode.cpp:248
msgid "Play"
msgstr ""
msgstr "Ойноо"
#: src/guiMainMenu.cpp:380 src/guiMainMenu.cpp:619
msgid "Creative Mode"
@ -249,7 +250,7 @@ msgstr ""
#: src/guiMainMenu.cpp:406 src/guiMainMenu.cpp:541
msgid "Name/Password"
msgstr ""
msgstr "Атыңыз/Сырсөзүңүз"
#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184
msgid "Favorites:"
@ -261,7 +262,7 @@ msgstr ""
#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568
msgid "Address/Port"
msgstr ""
msgstr "Адреси/Порту"
#: src/guiMainMenu.cpp:497 src/guiMainMenu.cpp:1183
msgid "Show Public"
@ -273,7 +274,7 @@ msgstr ""
#: src/guiMainMenu.cpp:521
msgid "Connect"
msgstr ""
msgstr "Туташуу"
#: src/guiMainMenu.cpp:591
msgid "Leave address blank to start a local server."
@ -289,11 +290,11 @@ msgstr ""
#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113
msgid "Delete world"
msgstr ""
msgstr "Дүйнөнү өчүрүү"
#: src/guiMainMenu.cpp:647
msgid "Create world"
msgstr ""
msgstr "Дүйнөнү жаратуу"
#: src/guiMainMenu.cpp:681
msgid "Fancy trees"
@ -305,7 +306,7 @@ msgstr ""
#: src/guiMainMenu.cpp:693
msgid "3D Clouds"
msgstr ""
msgstr "3D булуттар"
#: src/guiMainMenu.cpp:699
msgid "Opaque water"

View File

@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-03-30 19:56+0100\n"
"PO-Revision-Date: 2013-02-22 16:59+0200\n"
"Last-Translator: Maciej Kasatkin <maciej.kasatkin@yahoo.com>\n"
"PO-Revision-Date: 2013-04-03 16:42+0200\n"
"Last-Translator: Dêivan Ortiz Munhoz <deivan@novoseusadosinformatica.com.br>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
@ -199,7 +199,7 @@ msgstr "Zasięg widzenia"
#: src/guiKeyChangeMenu.cpp:388
msgid "Print stacks"
msgstr "Print stacks"
msgstr "stosy Drukuj"
#: src/guiMainMenu.cpp:92
msgid "Cannot create world: Name contains invalid characters"
@ -262,13 +262,12 @@ msgid "Name/Password"
msgstr "Nazwa gracza/Hasło"
#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184
#, fuzzy
msgid "Favorites:"
msgstr "Pokaż ulubione"
msgstr "Ulubione:"
#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194
msgid "Public Server List:"
msgstr ""
msgstr "Lista publicznych serwerów:"
#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568
msgid "Address/Port"
@ -295,9 +294,8 @@ msgid "Start Game / Connect"
msgstr "Rozpocznij grę/Połącz"
#: src/guiMainMenu.cpp:632
#, fuzzy
msgid "Public"
msgstr "Pokaż publiczne"
msgstr "Publiczne"
#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113
msgid "Delete world"
@ -353,7 +351,7 @@ msgstr "Włącz cząstki"
#: src/guiMainMenu.cpp:759
msgid "Finite liquid"
msgstr ""
msgstr "Realistyczne ciecze"
#: src/guiMainMenu.cpp:769
msgid "Change keys"
@ -413,7 +411,7 @@ msgstr "Zmień hasło"
#: src/guiPauseMenu.cpp:140
msgid "Sound Volume"
msgstr ""
msgstr "Głośność"
#: src/guiPauseMenu.cpp:147
msgid "Exit to Menu"
@ -451,11 +449,11 @@ msgstr ""
#: src/guiVolumeChange.cpp:108
msgid "Sound Volume: "
msgstr ""
msgstr "Głośność: "
#: src/guiVolumeChange.cpp:121
msgid "Exit"
msgstr ""
msgstr "Wyjście"
#: src/keycode.cpp:223
msgid "Left Button"

View File

@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-03-30 19:56+0100\n"
"PO-Revision-Date: 2013-02-26 20:10+0200\n"
"Last-Translator: Francizca Rodriguez <joaoadriano3@gmail.com>\n"
"PO-Revision-Date: 2013-04-03 16:35+0200\n"
"Last-Translator: Dêivan Ortiz Munhoz <deivan@novoseusadosinformatica.com.br>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
@ -257,13 +257,12 @@ msgid "Name/Password"
msgstr "Nome/Senha"
#: src/guiMainMenu.cpp:442 src/guiMainMenu.cpp:459 src/guiMainMenu.cpp:1184
#, fuzzy
msgid "Favorites:"
msgstr "Mostrar Favoritos"
msgstr "Favoritos:"
#: src/guiMainMenu.cpp:450 src/guiMainMenu.cpp:1194
msgid "Public Server List:"
msgstr ""
msgstr "Lista de servidor públicos:"
#: src/guiMainMenu.cpp:470 src/guiMainMenu.cpp:568
msgid "Address/Port"
@ -290,9 +289,8 @@ msgid "Start Game / Connect"
msgstr "Iniciar Jogo / Conectar"
#: src/guiMainMenu.cpp:632
#, fuzzy
msgid "Public"
msgstr "Mostrar Públicos"
msgstr "Público"
#: src/guiMainMenu.cpp:640 src/guiMainMenu.cpp:1113
msgid "Delete world"
@ -348,7 +346,7 @@ msgstr "Ativar Particulas"
#: src/guiMainMenu.cpp:759
msgid "Finite liquid"
msgstr ""
msgstr "Líquido finito"
#: src/guiMainMenu.cpp:769
msgid "Change keys"
@ -408,7 +406,7 @@ msgstr "Mudar Senha"
#: src/guiPauseMenu.cpp:140
msgid "Sound Volume"
msgstr ""
msgstr "Volume do som"
#: src/guiPauseMenu.cpp:147
msgid "Exit to Menu"
@ -446,11 +444,11 @@ msgstr ""
#: src/guiVolumeChange.cpp:108
msgid "Sound Volume: "
msgstr ""
msgstr "Volume do som: "
#: src/guiVolumeChange.cpp:121
msgid "Exit"
msgstr ""
msgstr "Saida"
#: src/keycode.cpp:223
msgid "Left Button"

View File

@ -218,6 +218,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
// Smooth the movement when walking up stairs
v3f old_player_position = m_playernode->getPosition();
v3f player_position = player->getPosition();
if (player->isAttached && player->parent)
player_position = player->parent->getPosition();
//if(player->touching_ground && player_position.Y > old_player_position.Y)
if(player->touching_ground &&
player_position.Y > old_player_position.Y)

View File

@ -209,10 +209,15 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
}
speed_f += accel_f * dtime;
// If there is no speed, there are no collisions
// If there is no speed, there are no collisions
if(speed_f.getLength() == 0)
return result;
// Limit speed for avoiding hangs
speed_f.Y=rangelim(speed_f.Y,-5000,5000);
speed_f.X=rangelim(speed_f.X,-5000,5000);
speed_f.Z=rangelim(speed_f.Z,-5000,5000);
/*
Collect node boxes in movement range
*/

View File

@ -1129,6 +1129,7 @@ public:
{
LocalPlayer *player = m_env->getLocalPlayer();
player->overridePosition = getParent()->getPosition();
m_env->getLocalPlayer()->parent = getParent();
}
}
else

View File

@ -1207,6 +1207,15 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
switch(event.GUIEvent.Caller->getID())
{
case GUI_ID_ADDRESS_INPUT: case GUI_ID_PORT_INPUT: case GUI_ID_NAME_INPUT: case 264:
MainMenuData cur;
readInput(&cur);
if (getTab() == TAB_MULTIPLAYER && cur.address == L"")
{
(new GUIMessageMenu(env, parent, -1, menumgr,
wgettext("Address required."))
)->drop();
return true;
}
acceptInput();
quitMenu();
return true;

View File

@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
LocalPlayer::LocalPlayer(IGameDef *gamedef):
Player(gamedef),
parent(0),
isAttached(false),
overridePosition(v3f(0,0,0)),
last_position(v3f(0,0,0)),

View File

@ -25,6 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class ClientEnvironment;
class ClientActiveObject;
class LocalPlayer : public Player
{
public:
@ -35,6 +37,8 @@ public:
{
return true;
}
ClientActiveObject *parent;
bool isAttached;