Merge pull request #1 from EliasFleckenstein03/master

update

410 files changed, 37139 insertions, 41372 deletions

diff --git a/.clang-format b/.clang-format
index dc7380ffd..0db8ab167 100644
--- a/.clang-format
+++ b/.clang-format
@@ -29,3 +29,4 @@ AlignAfterOpenBracket: DontAlign
 ContinuationIndentWidth: 16
 ConstructorInitializerIndentWidth: 16
 BreakConstructorInitializers: AfterColon
+AlwaysBreakTemplateDeclarations: Yes
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..bda43ebc0
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+./cmake-build-*
+./build/*
+./cache/*
+Dockerfile
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b01a89509..fbd372b3b 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -70,7 +70,9 @@ Feature requests are welcome but take a moment to see if your idea follows the r
 
 ## 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/).
+The core 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/).
+
+Builtin (the component which contains things like server messages, chat command descriptions, privilege descriptions) is translated separately; it needs to be translated by editing a `.tr` text file. See [Translation](https://dev.minetest.net/Translation) for more information.
 
 ## Donations
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3cc92a8e..d268aa0cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,6 +13,8 @@ on:
       - 'util/buildbot/**'
       - 'util/ci/**'
       - '.github/workflows/**.yml'
+      - 'Dockerfile'
+      - '.dockerignore'
   pull_request:
     paths:
       - 'lib/**.[ch]'
@@ -24,6 +26,8 @@ on:
       - 'util/buildbot/**'
       - 'util/ci/**'
       - '.github/workflows/**.yml'
+      - 'Dockerfile'
+      - '.dockerignore'
 
 jobs:
   # This is our minor gcc compiler
@@ -76,7 +80,7 @@ jobs:
       - name: Install deps
         run: |
           source ./util/ci/common.sh
-          install_linux_deps clang-3.9
+          install_linux_deps clang-3.9 gdb
 
       - name: Build
         run: |
@@ -85,10 +89,14 @@ jobs:
           CC: clang-3.9
           CXX: clang++-3.9
 
-      - name: Test
+      - name: Unittest
         run: |
           ./bin/minetest --run-unittests
 
+      - name: Integration test
+        run: |
+          ./util/test_multiplayer.sh
+
   # This is the current clang version
   clang_9:
     runs-on: ubuntu-18.04
@@ -124,7 +132,7 @@ jobs:
       - name: Install deps
         run: |
           source ./util/ci/common.sh
-          install_linux_deps clang-9
+          install_linux_deps --old-irr clang-9
 
       - name: Build prometheus-cpp
         run: |
@@ -212,7 +220,10 @@ jobs:
 
   msvc:
     name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}
-    runs-on: windows-2019 
+    runs-on: windows-2019
+    #### Disabled due to Irrlicht switch
+    if: false
+    #### Disabled due to Irrlicht switch
     env:
       VCPKG_VERSION: 0bf3923f9fab4001c00f0f429682a0853b5749e0
 #                    2020.11
diff --git a/.github/workflows/cpp_lint.yml b/.github/workflows/cpp_lint.yml
index 1f97d105a..2bd884c7a 100644
--- a/.github/workflows/cpp_lint.yml
+++ b/.github/workflows/cpp_lint.yml
@@ -24,20 +24,21 @@ on:
       - '.github/workflows/**.yml'
 
 jobs:
-  clang_format:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install clang-format
-        run: |
-          sudo apt-get install clang-format-9 -qyy
 
-      - name: Run clang-format
-        run: |
-          source ./util/ci/lint.sh
-          perform_lint
-        env:
-          CLANG_FORMAT: clang-format-9
+#  clang_format:
+#    runs-on: ubuntu-18.04
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Install clang-format
+#        run: |
+#          sudo apt-get install clang-format-9 -qyy
+#
+#      - name: Run clang-format
+#        run: |
+#          source ./util/ci/clang-format.sh
+#          check_format
+#        env:
+#          CLANG_FORMAT: clang-format-9
 
   clang_tidy:
     runs-on: ubuntu-18.04
diff --git a/.gitignore b/.gitignore
index bfb815bbf..35ba7c112 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,8 +86,7 @@ src/test_config.h
 src/cmake_config.h
 src/cmake_config_githash.h
 src/unittest/test_world/world.mt
-src/lua/build/
-locale/
+/locale/
 .directory
 *.cbp
 *.layout
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0441aeaa1..597e7ab52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,16 +9,24 @@ stages:
   - deploy
 
 variables:
+  IRRLICHT_TAG: "1.9.0mt1"
   MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
   CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
 
 .build_template:
   stage: build
+  before_script:
+   - apt-get update
+   - apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
   script:
+    - git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG
+    - cd irrlicht
+    - cmake . -DBUILD_SHARED_LIBS=OFF
+    - make -j2
+    - cd ..
     - mkdir cmakebuild
-    - mkdir -p artifact/minetest/usr/
     - cd cmakebuild
-    - cmake -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DENABLE_SYSTEM_JSONCPP=TRUE -DBUILD_SERVER=TRUE ..
+    - cmake -DIRRLICHT_LIBRARY=$PWD/../irrlicht/lib/Linux/libIrrlichtMt.a -DIRRLICHT_INCLUDE_DIR=$PWD/../irrlicht/include -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE ..
     - make -j2
     - make install
   artifacts:
@@ -30,7 +38,7 @@ variables:
 .debpkg_template:
   stage: package
   before_script:
-    - apt-get update -y
+    - apt-get update
     - apt-get install -y git
     - mkdir -p build/deb/minetest/DEBIAN/
     - cp misc/debpkg-control build/deb/minetest/DEBIAN/control
@@ -39,6 +47,7 @@ variables:
     - git clone $MINETEST_GAME_REPO build/deb/minetest/usr/share/minetest/games/minetest_game
     - rm -rf build/deb/minetest/usr/share/minetest/games/minetest/.git
     - sed -i 's/DATEPLACEHOLDER/'$(date +%y.%m.%d)'/g' build/deb/minetest/DEBIAN/control
+    - sed -i 's/JPEG_PLACEHOLDER/'$JPEG_PKG'/g' build/deb/minetest/DEBIAN/control
     - sed -i 's/LEVELDB_PLACEHOLDER/'$LEVELDB_PKG'/g' build/deb/minetest/DEBIAN/control
     - cd build/deb/ && dpkg-deb -b minetest/ && mv minetest.deb ../../
   artifacts:
@@ -49,7 +58,7 @@ variables:
 .debpkg_install:
   stage: deploy
   before_script:
-    - apt-get update -y
+    - apt-get update
   script:
     - apt-get install -y ./*.deb
     - minetest --version
@@ -63,9 +72,6 @@ variables:
 build:debian-9:
  extends: .build_template
  image: debian:9
- before_script:
-   - apt-get update -y
-   - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
 package:debian-9:
   extends: .debpkg_template
@@ -74,6 +80,7 @@ package:debian-9:
     - build:debian-9
   variables:
     LEVELDB_PKG: libleveldb1v5
+    JPEG_PKG: libjpeg62-turbo
 
 deploy:debian-9:
   extends: .debpkg_install
@@ -86,9 +93,6 @@ deploy:debian-9:
 build:debian-10:
  extends: .build_template
  image: debian:10
- before_script:
-   - apt-get update -y
-   - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
 package:debian-10:
   extends: .debpkg_template
@@ -97,6 +101,7 @@ package:debian-10:
     - build:debian-10
   variables:
     LEVELDB_PKG: libleveldb1d
+    JPEG_PKG: libjpeg62-turbo
 
 deploy:debian-10:
   extends: .debpkg_install
@@ -113,9 +118,6 @@ deploy:debian-10:
 build:ubuntu-16.04:
   extends: .build_template
   image: ubuntu:xenial
-  before_script:
-    - apt-get update -y
-    - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
 package:ubuntu-16.04:
   extends: .debpkg_template
@@ -124,6 +126,7 @@ package:ubuntu-16.04:
     - build:ubuntu-16.04
   variables:
     LEVELDB_PKG: libleveldb1v5
+    JPEG_PKG: libjpeg-turbo8
 
 deploy:ubuntu-16.04:
   extends: .debpkg_install
@@ -136,9 +139,6 @@ deploy:ubuntu-16.04:
 build:ubuntu-18.04:
   extends: .build_template
   image: ubuntu:bionic
-  before_script:
-    - apt-get update -y
-    - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
 package:ubuntu-18.04:
   extends: .debpkg_template
@@ -147,6 +147,7 @@ package:ubuntu-18.04:
     - build:ubuntu-18.04
   variables:
     LEVELDB_PKG: libleveldb1v5
+    JPEG_PKG: libjpeg-turbo8
 
 deploy:ubuntu-18.04:
   extends: .debpkg_install
@@ -163,17 +164,17 @@ build:fedora-28:
   extends: .build_template
   image: fedora:28
   before_script:
-    - dnf -y install make automake gcc gcc-c++ kernel-devel cmake libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel
+    - dnf -y install make git gcc gcc-c++ kernel-devel cmake libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel
 
 ##
 ## MinGW for Windows
 ##
 
 .generic_win_template:
-  image: ubuntu:bionic
+  image: ubuntu:focal
   before_script:
-    - apt-get update -y
-    - apt-get install -y wget xz-utils unzip git cmake gettext
+    - apt-get update
+    - DEBIAN_FRONTEND=noninteractive apt-get install -y wget xz-utils unzip git cmake gettext
     - wget -nv http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
     - tar -xaf mingw.tar.xz -C /usr
 
@@ -183,13 +184,13 @@ build:fedora-28:
   artifacts:
     expire_in: 1h
     paths:
-      - build/minetest/_build/*
+      - build/build/*.zip
 
 .package_win_template:
   extends: .generic_win_template
   stage: package
   script:
-    - unzip build/minetest/_build/minetest-*.zip
+    - unzip build/build/*.zip
     - cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libgcc*.dll minetest-*-win*/bin/
     - cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libstdc++*.dll minetest-*-win*/bin/
     - cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libwinpthread*.dll minetest-*-win*/bin/
@@ -201,7 +202,7 @@ build:fedora-28:
 build:win32:
   extends: .build_win_template
   script:
-    - ./util/buildbot/buildwin32.sh build
+    - EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh build
   variables:
     WIN_ARCH: "i686"
 
@@ -216,7 +217,7 @@ package:win32:
 build:win64:
   extends: .build_win_template
   script:
-    - ./util/buildbot/buildwin64.sh build
+    - EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh build
   variables:
     WIN_ARCH: "x86_64"
 
diff --git a/.luacheckrc b/.luacheckrc
index e010ab95c..ca321d953 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -19,8 +19,8 @@ read_globals = {
 	"Settings",
 
 	string = {fields = {"split", "trim"}},
-	table  = {fields = {"copy", "getn", "indexof", "insert_all"}},
-	math   = {fields = {"hypot"}},
+	table  = {fields = {"copy", "getn", "indexof", "insert_all", "combine"}},
+	math   = {fields = {"hypot", "round"}},
 }
 
 globals = {
diff --git a/.mailmap b/.mailmap
index c487460a0..fcc763411 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,33 +1,67 @@
+# Documentation: https://git-scm.com/docs/git-check-mailmap#_mapping_authors
+
 0gb.us <0gb.us@0gb.us> <us_0gb@laptop-0gb-us.0gb.us>
-Calinou <calinou9999@gmail.com> <calinou9999spam@gmail.com>
-Perttu Ahola <celeron55@gmail.com> celeron55 <celeron55@gmail.com>
+Calinou <calinou@opmbx.org> <calinou9999@gmail.com>
+Calinou <calinou@opmbx.org> <calinou9999spam@gmail.com>
+Perttu Ahola <celeron55@gmail.com>
 Perttu Ahola <celeron55@gmail.com> celeron55 <celeron55@armada.(none)>
-Craig Robbins <kde.psych@gmail.com> <crobbins@localhost.localdomain>
+Zeno- <kde.psych@gmail.com>
+Zeno- <kde.psych@gmail.com> <crobbins@localhost.localdomain>
+Diego Martínez <kaeza@users.sf.net>
 Diego Martínez <kaeza@users.sf.net> <lkaezadl3@gmail.com>
+Ilya Zhuravlev <zhuravlevilya@ya.ru>
 Ilya Zhuravlev <zhuravlevilya@ya.ru> <whatever@xyz.is>
 kwolekr <kwolekr@minetest.net> <mirrorisim@gmail.com>
-PilzAdam <pilzadam@minetest.net> PilzAdam <adam-k@outlook.com>
-PilzAdam <pilzadam@minetest.net> Pilz Adam <PilzAdam@gmx.de>
-PilzAdam <pilzadam@minetest.net> PilzAdam <PilzAdam@gmx.de>
+PilzAdam <pilzadam@minetest.net> <adam-k@outlook.com>
+PilzAdam <pilzadam@minetest.net> <PilzAdam@gmx.de>
 proller <proller@github.com> <proler@github.com>
 proller <proller@github.com> <proler@gmail.com>
 RealBadAngel <maciej.kasatkin@o2.pl> <mk@realbadangel.pl>
 RealBadAngel <maciej.kasatkin@o2.pl> <maciej.kasatkin@yahoo.com>
 Selat <LongExampleTestName@gmail.com> <LongExampletestName@gmail.com>
 ShadowNinja <shadowninja@minetest.net> ShadowNinja <noreply@gmail.com>
-Shen Zheyu <arsdragonfly@gmail.com> arsdragonfly <arsdragonfly@gmail.com>
-Pavel Elagin <elagin.pasha@gmail.com> elagin <elagin.pasha@gmail.com>
-Esteban I. Ruiz Moreno <exio4.com@gmail.com> Esteban I. RM <exio4.com@gmail.com>
-manuel duarte <ffrogger0@yahoo.com> manuel joaquim <ffrogger0@yahoo.com>
-manuel duarte <ffrogger0@yahoo.com> sweetbomber <ffrogger _zero_ at yahoo dot com>
-Diego Martínez <kaeza@users.sf.net> kaeza <kaeza@users.sf.net>
-Diego Martínez <kaeza@users.sf.net> Diego Martinez <kaeza@users.sf.net>
-Lord James <neftali_dtctv@hotmail.com> Lord89James <neftali_dtctv@hotmail.com>
-BlockMen <nmuelll@web.de> Block Men <nmuelll@web.de>
-sfan5 <sfan5@live.de> Sfan5 <sfan5@live.de>
-DannyDark <the_skeleton_of_a_child@yahoo.co.uk> dannydark <the_skeleton_of_a_child@yahoo.co.uk>
-Ilya Pavlov <TTChangeTheWorld@gmail.com> Ilya <TTChangeTheWorld@gmail.com>
-Ilya Zhuravlev <zhuravlevilya@ya.ru> xyzz <zhuravlevilya@ya.ru>
+Esteban I. Ruiz Moreno <exio4.com@gmail.com>
+Esteban I. Ruiz Moreno <exio4.com@gmail.com> <me@exio4.xyz>
+Lord James <neftali_dtctv@hotmail.com>
+BlockMen <nmuelll@web.de>
+sfan5 <sfan5@live.de>
+DannyDark <the_skeleton_of_a_child@yahoo.co.uk>
+Ilya Pavlov <TTChangeTheWorld@gmail.com>
 sapier <Sapier at GMX dot net> sapier <sapier AT gmx DOT net>
 sapier <Sapier at GMX dot net> sapier <sapier at gmx dot net>
-
+SmallJoker <SmallJoker@users.noreply.github.com> <mk939@ymail.com>
+Loïc Blot <nerzhul@users.noreply.github.com>
+Loïc Blot <nerzhul@users.noreply.github.com> <loic.blot@unix-experience.fr>
+numzero <numzer0@yandex.ru> Vitaliy <numzer0@yandex.ru>
+numzero <numzer0@yandex.ru> <silverunicorn2011@yandex.ru>
+Jean-Patrick Guerrero <kilbith@users.noreply.github.com>
+Jean-Patrick Guerrero <kilbith@users.noreply.github.com> <jeanpatrick.guerrero@gmail.com>
+HybridDog <3192173+HybridDog@users.noreply.github.com> <ovvv@web.de>
+srfqi <muhammadrifqipriyosusanto@gmail.com>
+Dániel Juhász <juhdanad@gmail.com>
+rubenwardy <rw@rubenwardy.com>
+rubenwardy <rw@rubenwardy.com> <rubenwardy@gmail.com>
+Paul Ouellette <oue.paul18@gmail.com>
+Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> <vanessaezekowitz@gmail.com>
+ClobberXD <ClobberXD@gmail.com>
+ClobberXD <ClobberXD@gmail.com> <ClobberXD@protonmail.com>
+ClobberXD <ClobberXD@gmail.com> <36130650+ClobberXD@users.noreply.github.com>
+Auke Kok <sofar+github@foo-projects.org>
+Auke Kok <sofar+github@foo-projects.org> <sofar@foo-projects.org>
+Desour <vorunbekannt75@web.de>
+Nathanaël Courant <Ekdohibs@users.noreply.github.com> <nathanael.courant@laposte.net>
+Ezhh <owlecho@live.com>
+paramat <paramat@users.noreply.github.com>
+paramat <paramat@users.noreply.github.com> <mat.gregory@virginmedia.com>
+lhofhansl <lhofhansl@yahoo.com> <larsh@apache.org>
+red-001 <red-001@outlook.ie> <red-001@openmailbox.org>
+Wuzzy <wuzzy2@mail.ru> <Wuzzy2@mail.ru>
+Wuzzy <wuzzy2@mail.ru> <almikes@aol.com>
+Jordach <jordach.snelling@gmail.com>
+MoNTE48 <MoNTE48@mail.ua>
+v-rob <robinsonvincent89@gmail.com>
+v-rob <robinsonvincent89@gmail.com> <31123645+v-rob@users.noreply.github.com>
+EvidenceB <49488517+EvidenceBKidscode@users.noreply.github.com>
+gregorycu <gregory.currie@gmail.com>
+Rogier <rogier777@gmail.com>
+Rogier <rogier777@gmail.com> <Rogier-5@users.noreply.github.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 997e8518f..e4ec5ea18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,9 +10,9 @@ set(CLANG_MINIMUM_VERSION "3.4")
 
 # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
 set(VERSION_MAJOR 5)
-set(VERSION_MINOR 4)
+set(VERSION_MINOR 5)
 set(VERSION_PATCH 0)
-set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
+set(VERSION_EXTRA "dragonfire" CACHE STRING "Stuff to append to version string")
 
 # Change to false for releases
 set(DEVELOPMENT_BUILD FALSE)
@@ -59,6 +59,29 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 # This is done here so that relative search paths are more reasonable
 find_package(Irrlicht)
+if(BUILD_CLIENT AND NOT IRRLICHT_FOUND)
+	message(FATAL_ERROR "IrrlichtMt is required to build the client, but it was not found.")
+elseif(NOT IRRLICHT_INCLUDE_DIR)
+	message(FATAL_ERROR "Irrlicht or IrrlichtMt headers are required to build the server, but none found.")
+endif()
+
+include(CheckSymbolExists)
+set(CMAKE_REQUIRED_INCLUDES ${IRRLICHT_INCLUDE_DIR})
+unset(HAS_FORKED_IRRLICHT CACHE)
+check_symbol_exists(IRRLICHT_VERSION_MT "IrrCompileConfig.h" HAS_FORKED_IRRLICHT)
+if(NOT HAS_FORKED_IRRLICHT)
+	string(CONCAT EXPLANATION_MSG
+		"Irrlicht found, but it is not IrrlichtMt (Minetest's Irrlicht fork). "
+		"The Minetest team has forked Irrlicht to make their own customizations. "
+		"It can be found here: https://github.com/minetest/irrlicht")
+	if(BUILD_CLIENT)
+		message(FATAL_ERROR "${EXPLANATION_MSG}\n"
+			"Building the client with upstream Irrlicht is no longer possible.")
+	else()
+		message(WARNING "${EXPLANATION_MSG}\n"
+			"The server can still be built with upstream Irrlicht but this is DISCOURAGED.")
+	endif()
+endif()
 
 
 # Installation
@@ -167,7 +190,6 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/devtest" DESTINATION "${SHA
 if(BUILD_CLIENT)
 	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client/shaders" DESTINATION "${SHAREDIR}/client")
 	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base")
-	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}")
 	if(RUN_IN_PLACE)
 		install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/clientmods" DESTINATION "${SHAREDIR}")
 		install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client/serverlist" DESTINATION "${SHAREDIR}/client")
@@ -202,8 +224,8 @@ find_package(GMP REQUIRED)
 find_package(Json REQUIRED)
 find_package(Lua REQUIRED)
 
-# JsonCPP doesn't compile well on GCC 4.8
-if(NOT ENABLE_SYSTEM_JSONCPP)
+# JsonCpp doesn't compile well on GCC 4.8
+if(NOT USE_SYSTEM_JSONCPP)
 	set(GCC_MINIMUM_VERSION "4.9")
 endif()
 
@@ -212,7 +234,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		message(FATAL_ERROR "Insufficient gcc version, found ${CMAKE_CXX_COMPILER_VERSION}. "
 			"Version ${GCC_MINIMUM_VERSION} or higher is required.")
 	endif()
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?Clang")
 	if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "${CLANG_MINIMUM_VERSION}")
 		message(FATAL_ERROR "Insufficient clang version, found ${CMAKE_CXX_COMPILER_VERSION}. "
 			"Version ${CLANG_MINIMUM_VERSION} or higher is required.")
diff --git a/Dockerfile b/Dockerfile
index 871ca9825..7cb6bec84 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
-FROM alpine:3.11
+FROM alpine:3.13
 
 ENV MINETEST_GAME_VERSION master
+ENV IRRLICHT_VERSION master
 
 COPY .git /usr/src/minetest/.git
 COPY CMakeLists.txt /usr/src/minetest/CMakeLists.txt
@@ -18,9 +19,7 @@ COPY textures /usr/src/minetest/textures
 
 WORKDIR /usr/src/minetest
 
-RUN apk add --no-cache git build-base irrlicht-dev cmake bzip2-dev libpng-dev \
-		jpeg-dev libxxf86vm-dev mesa-dev sqlite-dev libogg-dev \
-		libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev \
+RUN apk add --no-cache git build-base cmake sqlite-dev curl-dev zlib-dev \
 		gmp-dev jsoncpp-dev postgresql-dev luajit-dev ca-certificates && \
 	git clone --depth=1 -b ${MINETEST_GAME_VERSION} https://github.com/minetest/minetest_game.git ./games/minetest_game && \
 	rm -fr ./games/minetest_game/.git
@@ -36,6 +35,9 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp/ && \
 	make -j2 && \
 	make install
 
+RUN git clone --depth=1 https://github.com/minetest/irrlicht/ -b ${IRRLICHT_VERSION} && \
+	cp -r irrlicht/include /usr/include/irrlichtmt
+
 WORKDIR /usr/src/minetest
 RUN mkdir build && \
 	cd build && \
@@ -49,9 +51,9 @@ RUN mkdir build && \
 	make -j2 && \
 	make install
 
-FROM alpine:3.11
+FROM alpine:3.13
 
-RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit && \
+RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit jsoncpp && \
 	adduser -D minetest --uid 30000 -h /var/lib/minetest && \
 	chown -R minetest:minetest /var/lib/minetest
 
diff --git a/LICENSE.txt b/LICENSE.txt
index 27b30323a..34ee8c9f0 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -14,6 +14,9 @@ https://www.apache.org/licenses/LICENSE-2.0.html
 Textures by Zughy are under CC BY-SA 4.0
 https://creativecommons.org/licenses/by-sa/4.0/
 
+textures/base/pack/server_public.png is under CC-BY 4.0, taken from Twitter's Twemoji set
+https://creativecommons.org/licenses/by/4.0/
+
 Authors of media files
 -----------------------
 Everything not listed in here:
@@ -39,10 +42,10 @@ EliasFleckenstein03:
   misc/dragonfire.svg
   textures/base/pack/logo.png
 
-JRottm
+JRottm:
   textures/base/pack/player_marker.png
 
-srifqi
+srifqi:
   textures/base/pack/chat_hide_btn.png
   textures/base/pack/chat_show_btn.png
   textures/base/pack/joystick_bg.png
@@ -58,6 +61,9 @@ Zughy:
   textures/base/pack/cdb_update.png
   textures/base/pack/cdb_viewonline.png
 
+appgurueu:
+  textures/base/pack/server_incompatible.png
+
 License of Minetest source code
 -------------------------------
 
@@ -81,7 +87,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 Irrlicht
 ---------------
 
-This program uses the Irrlicht Engine. http://irrlicht.sourceforge.net/
+This program uses IrrlichtMt, Minetest's fork of
+the Irrlicht Engine. http://irrlicht.sourceforge.net/
 
  The Irrlicht Engine License
 
diff --git a/README.md b/README.md
index a06c3e257..013687685 100644
--- a/README.md
+++ b/README.md
@@ -31,10 +31,10 @@ Table of Contents
 
 Further documentation
 ----------------------
-- Website: http://minetest.net/
-- Wiki: http://wiki.minetest.net/
-- Developer wiki: http://dev.minetest.net/
-- Forum: http://forum.minetest.net/
+- Website: https://minetest.net/
+- Wiki: https://wiki.minetest.net/
+- Developer wiki: https://dev.minetest.net/
+- Forum: https://forum.minetest.net/
 - GitHub: https://github.com/minetest/minetest/
 - [doc/](doc/) directory of source distribution
 
@@ -68,7 +68,7 @@ Some can be changed in the key config dialog in the settings tab.
 | P                             | Enable/disable pitch move mode                                 |
 | J                             | Enable/disable fast mode (needs fast privilege)                |
 | H                             | Enable/disable noclip mode (needs noclip privilege)            |
-| E                             | Move fast in fast mode                                         |
+| E                             | Aux1 (Move fast in fast mode. Games may add special features)  |
 | C                             | Cycle through camera modes                                     |
 | V                             | Cycle through minimap modes                                    |
 | Shift + V                     | Change minimap orientation                                     |
@@ -133,8 +133,8 @@ Compiling
 | Dependency | Version | Commentary |
 |------------|---------|------------|
 | GCC        | 4.9+    | Can be replaced with Clang 3.4+ |
-| CMake      | 2.6+    |            |
-| Irrlicht   | 1.7.3+  |            |
+| CMake      | 3.5+    |            |
+| IrrlichtMt | -       | Custom version of Irrlicht, see https://github.com/minetest/irrlicht |
 | SQLite3    | 3.0+    |            |
 | LuaJIT     | 2.0+    | Bundled Lua 5.1 is used if not present |
 | GMP        | 5.0.0+  | Bundled mini-GMP is used if not present |
@@ -142,19 +142,19 @@ Compiling
 
 For Debian/Ubuntu users:
 
-    sudo apt install g++ make libc6-dev libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+    sudo apt install g++ make libc6-dev cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
 For Fedora users:
 
-    sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel bzip2-libs gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel doxygen spatialindex-devel bzip2-devel
+    sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel
     
 For Arch users:
 
-    sudo pacman -S base-devel libcurl-gnutls cmake libxxf86vm irrlicht libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses
+    sudo pacman -S base-devel libcurl-gnutls cmake libxxf86vm libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses
 
 For Alpine users:
 
-    sudo apk add build-base irrlicht-dev cmake bzip2-dev libpng-dev jpeg-dev libxxf86vm-dev mesa-dev sqlite-dev libogg-dev libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev gmp-dev jsoncpp-dev luajit-dev
+    sudo apk add build-base cmake libpng-dev jpeg-dev libxxf86vm-dev mesa-dev sqlite-dev libogg-dev libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev gmp-dev jsoncpp-dev luajit-dev
 
 #### Download
 
@@ -209,8 +209,8 @@ Run it:
 - You can disable the client build by specifying `-DBUILD_CLIENT=FALSE`.
 - You can select between Release and Debug build by `-DCMAKE_BUILD_TYPE=<Debug or Release>`.
   - Debug build is slower, but gives much more useful output in a debugger.
-- If you build a bare server you don't need to have Irrlicht installed.
-  - In that case use `-DIRRLICHT_SOURCE_DIR=/the/irrlicht/source`.
+- If you build a bare server you don't need to have the Irrlicht or IrrlichtMt library installed.
+  - In that case use `-DIRRLICHT_INCLUDE_DIR=/some/where/irrlicht/include`.
 
 ### CMake options
 
@@ -229,7 +229,7 @@ General options and their default values:
     ENABLE_CURSES=ON           - Build with (n)curses; Enables a server side terminal (command line option: --terminal)
     ENABLE_FREETYPE=ON         - Build with FreeType2; Allows using TTF fonts
     ENABLE_GETTEXT=ON          - Build with Gettext; Allows using translations
-    ENABLE_GLES=OFF            - Build for OpenGL ES instead of OpenGL (requires support by Irrlicht)
+    ENABLE_GLES=OFF            - Build for OpenGL ES instead of OpenGL (requires support by IrrlichtMt)
     ENABLE_LEVELDB=ON          - Build with LevelDB; Enables use of LevelDB map backend
     ENABLE_POSTGRESQL=ON       - Build with libpq; Enables use of PostgreSQL map backend (PostgreSQL 9.5 or greater recommended)
     ENABLE_REDIS=ON            - Build with libhiredis; Enables use of Redis map backend
@@ -238,7 +238,7 @@ General options and their default values:
     ENABLE_LUAJIT=ON           - Build with LuaJIT (much faster than non-JIT Lua)
     ENABLE_PROMETHEUS=OFF      - Build with Prometheus metrics exporter (listens on tcp/30000 by default)
     ENABLE_SYSTEM_GMP=ON       - Use GMP from system (much faster than bundled mini-gmp)
-    ENABLE_SYSTEM_JSONCPP=OFF  - Use JsonCPP from system
+    ENABLE_SYSTEM_JSONCPP=ON   - Use JsonCPP from system
     OPENGL_GL_PREFERENCE=LEGACY - Linux client build only; See CMake Policy CMP0072 for reference
     RUN_IN_PLACE=FALSE         - Create a portable install (worlds, settings etc. in current directory)
     USE_GPROF=FALSE            - Enable profiling using GProf
@@ -246,8 +246,6 @@ General options and their default values:
 
 Library specific options:
 
-    BZIP2_INCLUDE_DIR               - Linux only; directory where bzlib.h is located
-    BZIP2_LIBRARY                   - Linux only; path to libbz2.a/libbz2.so
     CURL_DLL                        - Only if building with cURL on Windows; path to libcurl.dll
     CURL_INCLUDE_DIR                - Only if building with cURL; directory where curl.h is located
     CURL_LIBRARY                    - Only if building with cURL; path to libcurl.a/libcurl.so/libcurl.lib
@@ -257,14 +255,13 @@ Library specific options:
     FREETYPE_INCLUDE_DIR_ft2build   - Only if building with FreeType 2; directory that contains ft2build.h
     FREETYPE_LIBRARY                - Only if building with FreeType 2; path to libfreetype.a/libfreetype.so/freetype.lib
     FREETYPE_DLL                    - Only if building with FreeType 2 on Windows; path to libfreetype.dll
-    GETTEXT_DLL                     - Only when building with gettext on Windows; path to libintl3.dll
-    GETTEXT_ICONV_DLL               - Only when building with gettext on Windows; path to libiconv2.dll
+    GETTEXT_DLL                     - Only when building with gettext on Windows; paths to libintl + libiconv DLLs
     GETTEXT_INCLUDE_DIR             - Only when building with gettext; directory that contains iconv.h
     GETTEXT_LIBRARY                 - Only when building with gettext on Windows; path to libintl.dll.a
     GETTEXT_MSGFMT                  - Only when building with gettext; path to msgfmt/msgfmt.exe
-    IRRLICHT_DLL                    - Only on Windows; path to Irrlicht.dll
+    IRRLICHT_DLL                    - Only on Windows; path to IrrlichtMt.dll
     IRRLICHT_INCLUDE_DIR            - Directory that contains IrrCompileConfig.h
-    IRRLICHT_LIBRARY                - Path to libIrrlicht.a/libIrrlicht.so/libIrrlicht.dll.a/Irrlicht.lib
+    IRRLICHT_LIBRARY                - Path to libIrrlichtMt.a/libIrrlichtMt.so/libIrrlichtMt.dll.a/IrrlichtMt.lib
     LEVELDB_INCLUDE_DIR             - Only when building with LevelDB; directory that contains db.h
     LEVELDB_LIBRARY                 - Only when building with LevelDB; path to libleveldb.a/libleveldb.so/libleveldb.dll.a
     LEVELDB_DLL                     - Only when building with LevelDB on Windows; path to libleveldb.dll
@@ -276,7 +273,6 @@ Library specific options:
     SPATIAL_LIBRARY                 - Only when building with LibSpatial; path to libspatialindex_c.so/spatialindex-32.lib
     LUA_INCLUDE_DIR                 - Only if you want to use LuaJIT; directory where luajit.h is located
     LUA_LIBRARY                     - Only if you want to use LuaJIT; path to libluajit.a/libluajit.so
-    MINGWM10_DLL                    - Only if compiling with MinGW; path to mingwm10.dll
     OGG_DLL                         - Only if building with sound on Windows; path to libogg.dll
     OGG_INCLUDE_DIR                 - Only if building with sound; directory that contains an ogg directory which contains ogg.h
     OGG_LIBRARY                     - Only if building with sound; path to libogg.a/libogg.so/libogg.dll.a
@@ -287,9 +283,8 @@ Library specific options:
     OPENGLES2_LIBRARY               - Only if building with GLES; path to libGLESv2.a/libGLESv2.so
     SQLITE3_INCLUDE_DIR             - Directory that contains sqlite3.h
     SQLITE3_LIBRARY                 - Path to libsqlite3.a/libsqlite3.so/sqlite3.lib
-    VORBISFILE_DLL                  - Only if building with sound on Windows; path to libvorbisfile-3.dll
     VORBISFILE_LIBRARY              - Only if building with sound; path to libvorbisfile.a/libvorbisfile.so/libvorbisfile.dll.a
-    VORBIS_DLL                      - Only if building with sound on Windows; path to libvorbis-0.dll
+    VORBIS_DLL                      - Only if building with sound on Windows; paths to vorbis DLLs
     VORBIS_INCLUDE_DIR              - Only if building with sound; directory that contains a directory vorbis with vorbisenc.h inside
     VORBIS_LIBRARY                  - Only if building with sound; path to libvorbis.a/libvorbis.so/libvorbis.dll.a
     XXF86VM_LIBRARY                 - Only on Linux; path to libXXf86vm.a/libXXf86vm.so
@@ -314,9 +309,10 @@ It is highly recommended to use vcpkg as package manager.
 
 After you successfully built vcpkg you can easily install the required libraries:
 ```powershell
-vcpkg install irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit gmp jsoncpp --triplet x64-windows
+vcpkg install zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit gmp jsoncpp --triplet x64-windows
 ```
 
+- **Note that you currently need to build irrlicht on your own**
 - `curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store.
 - `openal-soft`, `libvorbis` and `libogg` are optional, but required to use sound.
 - `freetype` is optional, it allows true-type font rendering.
@@ -354,7 +350,7 @@ This is outdated and not recommended. Follow the instructions on https://dev.min
 Run the following script in PowerShell:
 
 ```powershell
-cmake . -G"Visual Studio 15 2017 Win64" -DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_GETTEXT=OFF -DENABLE_CURSES=OFF -DENABLE_SYSTEM_JSONCPP=ON
+cmake . -G"Visual Studio 15 2017 Win64" -DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_GETTEXT=OFF -DENABLE_CURSES=OFF
 cmake --build . --config Release
 ```
 Make sure that the right compiler is selected and the path to the vcpkg toolchain is correct.
diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle
index fccb7b3b4..7f4eba8c4 100644
--- a/build/android/app/build.gradle
+++ b/build/android/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 android {
 	compileSdkVersion 29
-	buildToolsVersion '30.0.2'
-	ndkVersion '21.3.6528147'
+	buildToolsVersion '30.0.3'
+	ndkVersion '22.0.7026061'
 	defaultConfig {
 		applicationId 'net.minetest.minetest'
 		minSdkVersion 16
diff --git a/build/android/build.gradle b/build/android/build.gradle
index 111a506e1..3ba51a4bb 100644
--- a/build/android/build.gradle
+++ b/build/android/build.gradle
@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 project.ext.set("versionMajor", 5)      // Version Major
-project.ext.set("versionMinor", 3)      // Version Minor
+project.ext.set("versionMinor", 5)      // Version Minor
 project.ext.set("versionPatch", 0)      // Version Patch
 project.ext.set("versionExtra", "-dev") // Version Extra
-project.ext.set("versionCode", 30)      // Android Version Code
+project.ext.set("versionCode", 32)      // Android Version Code
 // NOTE: +2 after each release!
 // +1 for ARM and +1 for ARM64 APK's, because
 // each APK must have a larger `versionCode` than the previous
@@ -15,7 +15,7 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.0.1'
+		classpath 'com.android.tools.build:gradle:4.1.1'
 		classpath 'de.undercouch:gradle-download-task:4.1.1'
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
diff --git a/build/android/gradle/wrapper/gradle-wrapper.properties b/build/android/gradle/wrapper/gradle-wrapper.properties
index ed85703f3..7fd9307d7 100644
--- a/build/android/gradle/wrapper/gradle-wrapper.properties
+++ b/build/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Sep 07 22:11:10 CEST 2020
+#Fri Jan 08 17:52:00 UTC 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
diff --git a/build/android/icons/aux1_btn.svg b/build/android/icons/aux1_btn.svg
new file mode 100644
index 000000000..e0ee97c0c
--- /dev/null
+++ b/build/android/icons/aux1_btn.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="24.000002"
+   inkscape:export-xdpi="24.000002"
+   inkscape:export-filename="/home/stu/Desktop/icons/png/aux_btn.png"
+   sodipodi:docname="aux_btn.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 135.46666 135.46667"
+   height="512"
+   width="512">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-bbox="true"
+     showguides="true"
+     inkscape:snap-page="true"
+     inkscape:snap-grids="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:window-maximized="1"
+     inkscape:window-y="31"
+     inkscape:window-x="0"
+     inkscape:window-height="1024"
+     inkscape:window-width="1920"
+     units="px"
+     showgrid="true"
+     inkscape:current-layer="layer2"
+     inkscape:document-units="mm"
+     inkscape:cy="212.91276"
+     inkscape:cx="201.43176"
+     inkscape:zoom="1.4633894"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     id="base">
+    <inkscape:grid
+       empopacity="0.25098039"
+       empcolor="#40ff40"
+       opacity="0.1254902"
+       color="#40ff40"
+       empspacing="4"
+       spacingy="0.26458333"
+       spacingx="0.26458333"
+       id="grid16"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="display:inline"
+     inkscape:label="Layer 2"
+     id="layer2"
+     inkscape:groupmode="layer">
+    <path
+       inkscape:connector-curvature="0"
+       id="path7055"
+       d=""
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7035"
+       d=""
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7005"
+       d=""
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5127"
+       d=""
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <text
+       transform="scale(1.0078883,0.99217343)"
+       id="text4716"
+       y="85.59491"
+       x="67.78315"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.4785px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#d9d9d9;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="fill:#d9d9d9;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         y="85.59491"
+         x="67.78315"
+         id="tspan4714"
+         sodipodi:role="line">Aux1</tspan></text>
+    <flowRoot
+       transform="scale(0.26458333)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+       id="flowRoot4718"
+       xml:space="preserve"><flowRegion
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+         id="flowRegion4720"><rect
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+           y="124.10143"
+           x="264.65997"
+           height="136.37059"
+           width="157.5838"
+           id="rect4722" /></flowRegion><flowPara
+         id="flowPara4724" /></flowRoot>
+  </g>
+</svg>
diff --git a/build/android/icons/aux_btn.svg b/build/android/icons/aux_btn.svg
deleted file mode 100644
index 6bbefff67..000000000
--- a/build/android/icons/aux_btn.svg
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="512"
-   height="512"
-   viewBox="0 0 135.46666 135.46667"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="aux_btn.svg"
-   inkscape:export-filename="/home/stu/Desktop/icons/png/aux_btn.png"
-   inkscape:export-xdpi="24.000002"
-   inkscape:export-ydpi="24.000002">
-  <defs
-     id="defs2">
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Colorize"
-       id="filter4628">
-      <feComposite
-         in2="SourceGraphic"
-         operator="arithmetic"
-         k1="0"
-         k2="1"
-         result="composite1"
-         id="feComposite4614" />
-      <feColorMatrix
-         in="composite1"
-         values="1"
-         type="saturate"
-         result="colormatrix1"
-         id="feColorMatrix4616" />
-      <feFlood
-         flood-opacity="1"
-         flood-color="rgb(158,0,0)"
-         result="flood1"
-         id="feFlood4618" />
-      <feBlend
-         in="flood1"
-         in2="colormatrix1"
-         mode="multiply"
-         result="blend1"
-         id="feBlend4620" />
-      <feBlend
-         in2="blend1"
-         mode="screen"
-         result="blend2"
-         id="feBlend4622" />
-      <feColorMatrix
-         in="blend2"
-         values="1"
-         type="saturate"
-         result="colormatrix2"
-         id="feColorMatrix4624" />
-      <feComposite
-         in="colormatrix2"
-         in2="SourceGraphic"
-         operator="in"
-         k2="1"
-         result="composite2"
-         id="feComposite4626" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Sharpen More"
-       id="filter5109"
-       inkscape:menu="Image Effects"
-       inkscape:menu-tooltip="Sharpen edges and boundaries within the object, force=0.3">
-      <feComposite
-         in2="SourceGraphic"
-         operator="arithmetic"
-         k1="0"
-         k2="1"
-         result="composite1"
-         id="feComposite5095" />
-      <feColorMatrix
-         in="composite1"
-         values="1"
-         type="saturate"
-         result="colormatrix1"
-         id="feColorMatrix5097" />
-      <feFlood
-         flood-opacity="1"
-         flood-color="rgb(158,67,0)"
-         result="flood1"
-         id="feFlood5099" />
-      <feBlend
-         in="flood1"
-         in2="colormatrix1"
-         mode="multiply"
-         result="blend1"
-         id="feBlend5101" />
-      <feBlend
-         in2="blend1"
-         mode="screen"
-         result="blend2"
-         id="feBlend5103" />
-      <feColorMatrix
-         in="blend2"
-         values="1"
-         type="saturate"
-         result="colormatrix2"
-         id="feColorMatrix5105" />
-      <feComposite
-         in="colormatrix2"
-         in2="SourceGraphic"
-         operator="in"
-         k2="1"
-         result="fbSourceGraphic"
-         id="feComposite5107" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix5111" />
-      <feComposite
-         in2="fbSourceGraphic"
-         id="feComposite5113"
-         operator="arithmetic"
-         k1="0"
-         k2="1"
-         result="composite1"
-         in="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix5115"
-         in="composite1"
-         values="1"
-         type="saturate"
-         result="colormatrix1" />
-      <feFlood
-         id="feFlood5117"
-         flood-opacity="1"
-         flood-color="rgb(158,0,0)"
-         result="flood1" />
-      <feBlend
-         in2="colormatrix1"
-         id="feBlend5119"
-         in="flood1"
-         mode="multiply"
-         result="blend1" />
-      <feBlend
-         in2="blend1"
-         id="feBlend5121"
-         mode="screen"
-         result="blend2" />
-      <feColorMatrix
-         id="feColorMatrix5123"
-         in="blend2"
-         values="1"
-         type="saturate"
-         result="colormatrix2" />
-      <feComposite
-         in2="fbSourceGraphic"
-         id="feComposite5125"
-         in="colormatrix2"
-         operator="in"
-         k2="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix7007" />
-      <feConvolveMatrix
-         id="feConvolveMatrix7009"
-         order="3 3"
-         kernelMatrix="0 -0.15 0 -0.15 1.6 -0.15 0 -0.15 0"
-         divisor="1"
-         in="fbSourceGraphic"
-         targetX="1"
-         targetY="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix7011" />
-      <feConvolveMatrix
-         id="feConvolveMatrix7013"
-         targetY="1"
-         targetX="1"
-         in="fbSourceGraphic"
-         divisor="1"
-         kernelMatrix="0 -0.3 0 -0.3 2.2 -0.3 0 -0.3 0"
-         order="3 3"
-         result="result1" />
-      <feBlend
-         in2="fbSourceGraphic"
-         id="feBlend7015"
-         mode="normal"
-         result="result2" />
-    </filter>
-    <marker
-       style="overflow:visible"
-       refY="0.0"
-       refX="0.0"
-       orient="auto"
-       id="DistanceX">
-      <path
-         id="path7410"
-         style="stroke:#000000; stroke-width:0.5"
-         d="M 3,-3 L -3,3 M 0,-5 L  0,5" />
-    </marker>
-    <pattern
-       y="0"
-       x="0"
-       width="8"
-       patternUnits="userSpaceOnUse"
-       id="Hatch"
-       height="8">
-      <path
-         id="path7413"
-         stroke-width="0.25"
-         stroke="#000000"
-         linecap="square"
-         d="M8 4 l-4,4" />
-      <path
-         id="path7415"
-         stroke-width="0.25"
-         stroke="#000000"
-         linecap="square"
-         d="M6 2 l-4,4" />
-      <path
-         id="path7417"
-         stroke-width="0.25"
-         stroke="#000000"
-         linecap="square"
-         d="M4 0 l-4,4" />
-    </pattern>
-    <symbol
-       id="*Model_Space" />
-    <symbol
-       id="*Paper_Space" />
-    <symbol
-       id="*Paper_Space0" />
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Colorize"
-       id="filter4883">
-      <feComposite
-         in2="SourceGraphic"
-         operator="arithmetic"
-         k1="0"
-         k2="1"
-         result="composite1"
-         id="feComposite4869" />
-      <feColorMatrix
-         in="composite1"
-         values="1"
-         type="saturate"
-         result="colormatrix1"
-         id="feColorMatrix4871" />
-      <feFlood
-         flood-opacity="1"
-         flood-color="rgb(158,21,0)"
-         result="flood1"
-         id="feFlood4873" />
-      <feBlend
-         in="flood1"
-         in2="colormatrix1"
-         mode="multiply"
-         result="blend1"
-         id="feBlend4875" />
-      <feBlend
-         in2="blend1"
-         mode="screen"
-         result="blend2"
-         id="feBlend4877" />
-      <feColorMatrix
-         in="blend2"
-         values="1"
-         type="saturate"
-         result="colormatrix2"
-         id="feColorMatrix4879" />
-      <feComposite
-         in="colormatrix2"
-         in2="SourceGraphic"
-         operator="in"
-         k2="1"
-         result="composite2"
-         id="feComposite4881" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#404040"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="-341.34157"
-     inkscape:cy="210.02973"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer2"
-     showgrid="true"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1023"
-     inkscape:window-x="0"
-     inkscape:window-y="34"
-     inkscape:window-maximized="1"
-     inkscape:pagecheckerboard="false"
-     inkscape:snap-grids="false"
-     inkscape:snap-page="true"
-     showguides="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-to-guides="true"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-others="true"
-     inkscape:snap-bbox-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid16"
-       spacingx="0.26458333"
-       spacingy="0.26458333"
-       empspacing="4"
-       color="#40ff40"
-       opacity="0.1254902"
-       empcolor="#40ff40"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 2"
-     style="display:inline">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d=""
-       id="path7055"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d=""
-       id="path7035"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d=""
-       id="path7005"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d=""
-       id="path5127"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.47851181px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#d9d9d9;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       x="67.78315"
-       y="85.59491"
-       id="text4716"
-       transform="scale(1.0078883,0.99217343)"><tspan
-         sodipodi:role="line"
-         id="tspan4714"
-         x="67.78315"
-         y="85.59491"
-         style="fill:#d9d9d9;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">AUX</tspan></text>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot4718"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
-       transform="scale(0.26458333)"><flowRegion
-         id="flowRegion4720"
-         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"><rect
-           id="rect4722"
-           width="157.5838"
-           height="136.37059"
-           x="264.65997"
-           y="124.10143"
-           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" /></flowRegion><flowPara
-         id="flowPara4724" /></flowRoot>  </g>
-</svg>
diff --git a/build/android/native/build.gradle b/build/android/native/build.gradle
index 69e1cf461..8ea6347b3 100644
--- a/build/android/native/build.gradle
+++ b/build/android/native/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'de.undercouch.download'
 
 android {
 	compileSdkVersion 29
-	buildToolsVersion '30.0.2'
-	ndkVersion '21.3.6528147'
+	buildToolsVersion '30.0.3'
+	ndkVersion '22.0.7026061'
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
@@ -71,7 +71,7 @@ task getDeps(dependsOn: downloadDeps, type: Copy) {
 }
 
 // get sqlite
-def sqlite_ver = '3320200'
+def sqlite_ver = '3340000'
 task downloadSqlite(dependsOn: getDeps, type: Download) {
 	src 'https://www.sqlite.org/2020/sqlite-amalgamation-' + sqlite_ver + '.zip'
 	dest new File(buildDir, 'sqlite.zip')
diff --git a/build/android/native/jni/Android.mk b/build/android/native/jni/Android.mk
index 140947e6a..477392af0 100644
--- a/build/android/native/jni/Android.mk
+++ b/build/android/native/jni/Android.mk
@@ -14,7 +14,7 @@ include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := Irrlicht
-LOCAL_SRC_FILES := deps/Android/Irrlicht/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libIrrlicht.a
+LOCAL_SRC_FILES := deps/Android/Irrlicht/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libIrrlichtMt.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 #include $(CLEAR_VARS)
@@ -47,18 +47,6 @@ LOCAL_MODULE := OpenAL
 LOCAL_SRC_FILES := deps/Android/OpenAL-Soft/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libopenal.a
 include $(PREBUILT_STATIC_LIBRARY)
 
-# You can use `OpenSSL and Crypto` instead `mbedTLS mbedx509 mbedcrypto`,
-#but it increase APK size on ~0.7MB
-#include $(CLEAR_VARS)
-#LOCAL_MODULE := OpenSSL
-#LOCAL_SRC_FILES := deps/Android/OpenSSL/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libssl.a
-#include $(PREBUILT_STATIC_LIBRARY)
-
-#include $(CLEAR_VARS)
-#LOCAL_MODULE := Crypto
-#LOCAL_SRC_FILES := deps/Android/OpenSSL/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libcrypto.a
-#include $(PREBUILT_STATIC_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := Vorbis
 LOCAL_SRC_FILES := deps/Android/Vorbis/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libvorbis.a
@@ -207,7 +195,6 @@ LOCAL_SRC_FILES += \
 LOCAL_SRC_FILES += deps/Android/sqlite/sqlite3.c
 
 LOCAL_STATIC_LIBRARIES += Curl Freetype Irrlicht OpenAL mbedTLS mbedx509 mbedcrypto Vorbis LuaJIT android_native_app_glue $(PROFILER_LIBS) #LevelDB
-#OpenSSL Crypto
 
 LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES
 
diff --git a/builtin/client/chatcommands.lua b/builtin/client/chatcommands.lua
index 0da3dab1b..37308efd9 100644
--- a/builtin/client/chatcommands.lua
+++ b/builtin/client/chatcommands.lua
@@ -7,7 +7,7 @@ core.register_on_sending_chat_message(function(message)
 
 	local first_char = message:sub(1,1)
 	if first_char == "/" or first_char == "." then
-		core.display_chat_message(core.gettext("issued command: ") .. message)
+		core.display_chat_message(core.gettext("Issued command: ") .. message)
 	end
 
 	if first_char ~= "." then
@@ -18,7 +18,7 @@ core.register_on_sending_chat_message(function(message)
 	param = param or ""
 
 	if not cmd then
-		core.display_chat_message(core.gettext("-!- Empty command"))
+		core.display_chat_message("-!- " .. core.gettext("Empty command."))
 		return true
 	end
 
@@ -35,7 +35,7 @@ core.register_on_sending_chat_message(function(message)
 			core.display_chat_message(result)
 		end
 	else
-		core.display_chat_message(core.gettext("-!- Invalid command: ") .. cmd)
+		core.display_chat_message("-!- " .. core.gettext("Invalid command: ") .. cmd)
 	end
 
 	return true
@@ -69,7 +69,7 @@ core.register_chatcommand("teleport", {
 core.register_chatcommand("wielded", {
 	description = "Print itemstring of wieleded item",
 	func = function()
-		return true, core.localplayer:get_wielded_item():get_name()
+		return true, core.localplayer:get_wielded_item():to_string()
 	end
 })
 
diff --git a/builtin/client/death_formspec.lua b/builtin/client/death_formspec.lua
index 7b8530440..6d6fd6fd9 100644
--- a/builtin/client/death_formspec.lua
+++ b/builtin/client/death_formspec.lua
@@ -11,12 +11,12 @@ core.register_on_death(function()
 	if core.settings:get_bool("autorespawn") then
 		core.send_respawn()
 	else
-		core.show_formspec("__builtin__:death", death_formspec)
+		core.show_formspec("bultin:death", death_formspec)
 	end
 end)
 
 core.register_on_formspec_input(function(formname, fields)
-	if formname == "__builtin__:death" then
+	if formname == "bultin:death" then
 		if fields.btn_ghost_mode then
 			core.display_chat_message("You are in ghost mode. Use .respawn to Respawn.")
 		else
diff --git a/builtin/client/register.lua b/builtin/client/register.lua
index 2b5526523..f17188b84 100644
--- a/builtin/client/register.lua
+++ b/builtin/client/register.lua
@@ -105,6 +105,10 @@ core.registered_on_inventory_open, core.register_on_inventory_open = make_regist
 core.registered_on_recieve_physics_override, core.register_on_recieve_physics_override = make_registration()
 core.registered_on_play_sound, core.register_on_play_sound = make_registration()
 core.registered_on_spawn_particle, core.register_on_spawn_particle = make_registration()
+core.registered_on_object_properties_change, core.register_on_object_properties_change = make_registration()
+core.registered_on_object_hp_change, core.register_on_object_hp_change = make_registration()
+core.registered_on_object_add, core.register_on_object_add = make_registration()
 
 core.registered_nodes = {}
 core.registered_items = {}
+core.object_refs = {}
diff --git a/builtin/client/util.lua b/builtin/client/util.lua
index aea15e00f..440f99ebc 100644
--- a/builtin/client/util.lua
+++ b/builtin/client/util.lua
@@ -58,3 +58,23 @@ end
 function core.get_nearby_objects(radius)
 	return core.get_objects_inside_radius(core.localplayer:get_pos(), radius)
 end
+
+-- HTTP callback interface
+
+function core.http_add_fetch(httpenv)
+	httpenv.fetch = function(req, callback)
+		local handle = httpenv.fetch_async(req)
+
+		local function update_http_status()
+			local res = httpenv.fetch_async_get(handle)
+			if res.completed then
+				callback(res)
+			else
+				core.after(0, update_http_status)
+			end
+		end
+		core.after(0, update_http_status)
+	end
+
+	return httpenv
+end
diff --git a/builtin/common/chatcommands.lua b/builtin/common/chatcommands.lua
index fb593e839..62f9eacd0 100644
--- a/builtin/common/chatcommands.lua
+++ b/builtin/common/chatcommands.lua
@@ -1,5 +1,9 @@
 -- Minetest: builtin/common/chatcommands.lua
 
+-- For server-side translations (if INIT == "game")
+-- Otherwise, use core.gettext
+local S = core.get_translator("__builtin")
+
 core.registered_chatcommands = {}
 
 function core.register_chatcommand(cmd, def)
@@ -74,25 +78,12 @@ if INIT == "client" then
 	end
 end
 
-local cmd_marker = "/"
-
-local function gettext(...)
-	return ...
-end
-
-local function gettext_replace(text, replace)
-	return text:gsub("$1", replace)
-end
-
-
-if INIT == "client" then
-	cmd_marker = "."
-	gettext = core.gettext
-	gettext_replace = fgettext_ne
-end
-
 local function do_help_cmd(name, param)
 	local function format_help_line(cmd, def)
+		local cmd_marker = "/"
+		if INIT == "client" then
+			cmd_marker = "."
+		end
 		local msg = core.colorize("#00ffff", cmd_marker .. cmd)
 		if def.params and def.params ~= "" then
 			msg = msg .. " " .. def.params
@@ -110,9 +101,21 @@ local function do_help_cmd(name, param)
 			end
 		end
 		table.sort(cmds)
-		return true, gettext("Available commands: ") .. table.concat(cmds, " ") .. "\n"
-				.. gettext_replace("Use '$1help <cmd>' to get more information,"
-				.. " or '$1help all' to list everything.", cmd_marker)
+		local msg
+		if INIT == "game" then
+			msg = S("Available commands: @1",
+				table.concat(cmds, " ")) .. "\n"
+				.. S("Use '/help <cmd>' to get more "
+				.. "information, or '/help all' to list "
+				.. "everything.")
+		else
+			msg = core.gettext("Available commands: ")
+				.. table.concat(cmds, " ") .. "\n"
+				.. core.gettext("Use '.help <cmd>' to get more "
+				.. "information, or '.help all' to list "
+				.. "everything.")
+		end
+		return true, msg
 	elseif param == "all" then
 		local cmds = {}
 		for cmd, def in pairs(core.registered_chatcommands) do
@@ -121,19 +124,31 @@ local function do_help_cmd(name, param)
 			end
 		end
 		table.sort(cmds)
-		return true, gettext("Available commands:").."\n"..table.concat(cmds, "\n")
+		local msg
+		if INIT == "game" then
+			msg = S("Available commands:")
+		else
+			msg = core.gettext("Available commands:")
+		end
+		return true, msg.."\n"..table.concat(cmds, "\n")
 	elseif INIT == "game" and param == "privs" then
 		local privs = {}
 		for priv, def in pairs(core.registered_privileges) do
 			privs[#privs + 1] = priv .. ": " .. def.description
 		end
 		table.sort(privs)
-		return true, "Available privileges:\n"..table.concat(privs, "\n")
+		return true, S("Available privileges:").."\n"..table.concat(privs, "\n")
 	else
 		local cmd = param
 		local def = core.registered_chatcommands[cmd]
 		if not def then
-			return false, gettext("Command not available: ")..cmd
+			local msg
+			if INIT == "game" then
+				msg = S("Command not available: @1", cmd)
+			else
+				msg = core.gettext("Command not available: ") .. cmd
+			end
+			return false, msg
 		else
 			return true, format_help_line(cmd, def)
 		end
@@ -142,16 +157,16 @@ end
 
 if INIT == "client" then
 	core.register_chatcommand("help", {
-		params = gettext("[all | <cmd>]"),
-		description = gettext("Get help for commands"),
+		params = core.gettext("[all | <cmd>]"),
+		description = core.gettext("Get help for commands"),
 		func = function(param)
 			return do_help_cmd(nil, param)
 		end,
 	})
 else
 	core.register_chatcommand("help", {
-		params = "[all | privs | <cmd>]",
-		description = "Get help for commands or list privileges",
+		params = S("[all | privs | <cmd>]"),
+		description = S("Get help for commands or list privileges"),
 		func = do_help_cmd,
 	})
 end
diff --git a/builtin/common/information_formspecs.lua b/builtin/common/information_formspecs.lua
index 8afa5bc87..e814b4c43 100644
--- a/builtin/common/information_formspecs.lua
+++ b/builtin/common/information_formspecs.lua
@@ -20,7 +20,8 @@ local LIST_FORMSPEC_DESCRIPTION = [[
 		button_exit[5,7;3,1;quit;%s]
 	]]
 
-local formspec_escape = core.formspec_escape
+local F = core.formspec_escape
+local S = core.get_translator("__builtin")
 local check_player_privs = core.check_player_privs
 
 
@@ -51,22 +52,23 @@ core.after(0, load_mod_command_tree)
 
 local function build_chatcommands_formspec(name, sel, copy)
 	local rows = {}
-	rows[1] = "#FFF,0,Command,Parameters"
+	rows[1] = "#FFF,0,"..F(S("Command"))..","..F(S("Parameters"))
 
-	local description = "For more information, click on any entry in the list.\n" ..
-		"Double-click to copy the entry to the chat history."
+	local description = S("For more information, click on "
+		.. "any entry in the list.").. "\n" ..
+		S("Double-click to copy the entry to the chat history.")
 
 	for i, data in ipairs(mod_cmds) do
-		rows[#rows + 1] = COLOR_BLUE .. ",0," .. formspec_escape(data[1]) .. ","
+		rows[#rows + 1] = COLOR_BLUE .. ",0," .. F(data[1]) .. ","
 		for j, cmds in ipairs(data[2]) do
 			local has_priv = check_player_privs(name, cmds[2].privs)
 			rows[#rows + 1] = ("%s,1,%s,%s"):format(
 				has_priv and COLOR_GREEN or COLOR_GRAY,
-				cmds[1], formspec_escape(cmds[2].params))
+				cmds[1], F(cmds[2].params))
 			if sel == #rows then
 				description = cmds[2].description
 				if copy then
-					core.chat_send_player(name, ("Command: %s %s"):format(
+					core.chat_send_player(name, S("Command: @1 @2",
 						core.colorize("#0FF", "/" .. cmds[1]), cmds[2].params))
 				end
 			end
@@ -74,9 +76,9 @@ local function build_chatcommands_formspec(name, sel, copy)
 	end
 
 	return LIST_FORMSPEC_DESCRIPTION:format(
-			"Available commands: (see also: /help <cmd>)",
+			F(S("Available commands: (see also: /help <cmd>)")),
 			table.concat(rows, ","), sel or 0,
-			description, "Close"
+			F(description), F(S("Close"))
 		)
 end
 
@@ -91,19 +93,19 @@ local function build_privs_formspec(name)
 	table.sort(privs, function(a, b) return a[1] < b[1] end)
 
 	local rows = {}
-	rows[1] = "#FFF,0,Privilege,Description"
+	rows[1] = "#FFF,0,"..F(S("Privilege"))..","..F(S("Description"))
 
 	local player_privs = core.get_player_privs(name)
 	for i, data in ipairs(privs) do
 		rows[#rows + 1] = ("%s,0,%s,%s"):format(
 			player_privs[data[1]] and COLOR_GREEN or COLOR_GRAY,
-				data[1], formspec_escape(data[2].description))
+				data[1], F(data[2].description))
 	end
 
 	return LIST_FORMSPEC:format(
-			"Available privileges:",
+			F(S("Available privileges:")),
 			table.concat(rows, ","),
-			"Close"
+			F(S("Close"))
 		)
 end
 
@@ -115,7 +117,7 @@ core.register_on_player_receive_fields(function(player, formname, fields)
 		return
 	end
 
-	local event = minetest.explode_table_event(fields.list)
+	local event = core.explode_table_event(fields.list)
 	if event.type ~= "INV" then
 		local name = player:get_player_name()
 		core.show_formspec(name, "__builtin:help_cmds",
diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index b86d68f5f..324d83b07 100644
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -244,6 +244,15 @@ function math.factorial(x)
 	return v
 end
 
+
+function math.round(x)
+	if x >= 0 then
+		return math.floor(x + 0.5)
+	end
+	return math.ceil(x - 0.5)
+end
+
+
 function core.formspec_escape(text)
 	if text ~= nil then
 		text = string.gsub(text,"\\","\\\\")
@@ -785,3 +794,12 @@ end
 function core.is_nan(number)
 	return number ~= number
 end
+
+function core.inventorycube(img1, img2, img3)
+	img2 = img2 or img1
+	img3 = img3 or img1
+	return "[inventorycube"
+			.. "{" .. img1:gsub("%^", "&")
+			.. "{" .. img2:gsub("%^", "&")
+			.. "{" .. img3:gsub("%^", "&")
+end
diff --git a/builtin/common/tests/vector_spec.lua b/builtin/common/tests/vector_spec.lua
index 0f287363a..104c656e9 100644
--- a/builtin/common/tests/vector_spec.lua
+++ b/builtin/common/tests/vector_spec.lua
@@ -48,6 +48,25 @@ describe("vector", function()
 		assert.same({ x = 41, y = 52, z = 63 }, vector.offset(vector.new(1, 2, 3), 40, 50, 60))
 	end)
 
+	it("to_string()", function()
+		local v = vector.new(1, 2, 3.14)
+		assert.same("(1, 2, 3.14)", vector.to_string(v))
+	end)
+
+	it("from_string()", function()
+		local v = vector.new(1, 2, 3.14)
+		assert.same({v, 13}, {vector.from_string("(1, 2, 3.14)")})
+		assert.same({v, 12}, {vector.from_string("(1,2 ,3.14)")})
+		assert.same({v, 12}, {vector.from_string("(1,2,3.14,)")})
+		assert.same({v, 11}, {vector.from_string("(1 2 3.14)")})
+		assert.same({v, 15}, {vector.from_string("( 1, 2, 3.14 )")})
+		assert.same({v, 15}, {vector.from_string(" ( 1, 2, 3.14) ")})
+		assert.same({vector.new(), 8}, {vector.from_string("(0,0,0) ( 1, 2, 3.14) ")})
+		assert.same({v, 22}, {vector.from_string("(0,0,0) ( 1, 2, 3.14) ", 8)})
+		assert.same({v, 22}, {vector.from_string("(0,0,0) ( 1, 2, 3.14) ", 9)})
+		assert.same(nil, vector.from_string("nothing"))
+	end)
+
 	-- This function is needed because of floating point imprecision.
 	local function almost_equal(a, b)
 		if type(a) == "number" then
diff --git a/builtin/common/vector.lua b/builtin/common/vector.lua
index d6437deda..2ef8fc617 100644
--- a/builtin/common/vector.lua
+++ b/builtin/common/vector.lua
@@ -12,6 +12,22 @@ function vector.new(a, b, c)
 	return {x=0, y=0, z=0}
 end
 
+function vector.from_string(s, init)
+	local x, y, z, np = string.match(s, "^%s*%(%s*([^%s,]+)%s*[,%s]%s*([^%s,]+)%s*[,%s]" ..
+			"%s*([^%s,]+)%s*[,%s]?%s*%)()", init)
+	x = tonumber(x)
+	y = tonumber(y)
+	z = tonumber(z)
+	if not (x and y and z) then
+		return nil
+	end
+	return {x = x, y = y, z = z}, np
+end
+
+function vector.to_string(v)
+	return string.format("(%g, %g, %g)", v.x, v.y, v.z)
+end
+
 function vector.equals(a, b)
 	return a.x == b.x and
 	       a.y == b.y and
@@ -41,9 +57,9 @@ end
 
 function vector.round(v)
 	return {
-		x = math.floor(v.x + 0.5),
-		y = math.floor(v.y + 0.5),
-		z = math.floor(v.z + 0.5)
+		x = math.round(v.x),
+		y = math.round(v.y),
+		z = math.round(v.z)
 	}
 end
 
diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua
index 3715e231b..424d329fb 100644
--- a/builtin/fstk/tabview.lua
+++ b/builtin/fstk/tabview.lua
@@ -58,26 +58,20 @@ end
 
 --------------------------------------------------------------------------------
 local function get_formspec(self)
-	local formspec = ""
+	if self.hidden or (self.parent ~= nil and self.parent.hidden) then
+		return ""
+	end
+	local tab = self.tablist[self.last_tab_index]
 
-	if not self.hidden and (self.parent == nil or not self.parent.hidden) then
+	local content, prepend = tab.get_formspec(self, tab.name, tab.tabdata, tab.tabsize)
 
-		if self.parent == nil then
-			local tsize = self.tablist[self.last_tab_index].tabsize or
-					{width=self.width, height=self.height}
-			formspec = formspec ..
-					string.format("size[%f,%f,%s]",tsize.width,tsize.height,
-						dump(self.fixed_size))
-		end
-		formspec = formspec .. self:tab_header()
-		formspec = formspec ..
-				self.tablist[self.last_tab_index].get_formspec(
-					self,
-					self.tablist[self.last_tab_index].name,
-					self.tablist[self.last_tab_index].tabdata,
-					self.tablist[self.last_tab_index].tabsize
-					)
+	if self.parent == nil and not prepend then
+		local tsize = tab.tabsize or {width=self.width, height=self.height}
+		prepend = string.format("size[%f,%f,%s]", tsize.width, tsize.height,
+				dump(self.fixed_size))
 	end
+
+	local formspec = (prepend or "") .. self:tab_header() .. content
 	return formspec
 end
 
@@ -97,14 +91,9 @@ local function handle_buttons(self,fields)
 		return true
 	end
 
-	if self.tablist[self.last_tab_index].button_handler ~= nil then
-		return
-			self.tablist[self.last_tab_index].button_handler(
-					self,
-					fields,
-					self.tablist[self.last_tab_index].name,
-					self.tablist[self.last_tab_index].tabdata
-					)
+	local tab = self.tablist[self.last_tab_index]
+	if tab.button_handler ~= nil then
+		return tab.button_handler(self, fields, tab.name, tab.tabdata)
 	end
 
 	return false
@@ -122,14 +111,9 @@ local function handle_events(self,event)
 		return true
 	end
 
-	if self.tablist[self.last_tab_index].evt_handler ~= nil then
-		return
-			self.tablist[self.last_tab_index].evt_handler(
-					self,
-					event,
-					self.tablist[self.last_tab_index].name,
-					self.tablist[self.last_tab_index].tabdata
-					)
+	local tab = self.tablist[self.last_tab_index]
+	if tab.evt_handler ~= nil then
+		return tab.evt_handler(self, event, tab.name, tab.tabdata)
 	end
 
 	return false
diff --git a/builtin/fstk/ui.lua b/builtin/fstk/ui.lua
index 7eeebdd47..976659ed3 100644
--- a/builtin/fstk/ui.lua
+++ b/builtin/fstk/ui.lua
@@ -18,6 +18,8 @@
 ui = {}
 ui.childlist = {}
 ui.default = nil
+-- Whether fstk is currently showing its own formspec instead of active ui elements.
+ui.overridden = false
 
 --------------------------------------------------------------------------------
 function ui.add(child)
@@ -55,6 +57,7 @@ end
 --------------------------------------------------------------------------------
 
 function ui.update()
+	ui.overridden = false
 	local formspec = {}
 
 	-- handle errors
@@ -71,6 +74,7 @@ function ui.update()
 			"button[2,6.6;4,1;btn_reconnect_yes;" .. fgettext("Reconnect") .. "]",
 			"button[8,6.6;4,1;btn_reconnect_no;" .. fgettext("Main menu") .. "]"
 		}
+		ui.overridden = true
 	elseif gamedata ~= nil and gamedata.errormessage ~= nil then
 		local error_message = core.formspec_escape(gamedata.errormessage)
 
@@ -89,6 +93,7 @@ function ui.update()
 				error_title, error_message),
 			"button[5,6.6;4,1;btn_error_confirm;" .. fgettext("OK") .. "]"
 		}
+		ui.overridden = true
 	else
 		local active_toplevel_ui_elements = 0
 		for key,value in pairs(ui.childlist) do
@@ -185,6 +190,16 @@ end
 
 --------------------------------------------------------------------------------
 core.event_handler = function(event)
+	-- Handle error messages
+	if ui.overridden then
+		if event == "MenuQuit" then
+			gamedata.errormessage = nil
+			gamedata.reconnect_requested = false
+			ui.update()
+		end
+		return
+	end
+
 	if ui.handle_events(event) then
 		ui.update()
 		return
diff --git a/builtin/game/chat.lua b/builtin/game/chat.lua
index 945707623..0bd12c25f 100644
--- a/builtin/game/chat.lua
+++ b/builtin/game/chat.lua
@@ -1,5 +1,7 @@
 -- Minetest: builtin/game/chat.lua
 
+local S = core.get_translator("__builtin")
+
 -- Helper function that implements search and replace without pattern matching
 -- Returns the string and a boolean indicating whether or not the string was modified
 local function safe_gsub(s, replace, with)
@@ -45,6 +47,8 @@ end
 
 core.chatcommands = core.registered_chatcommands -- BACKWARDS COMPATIBILITY
 
+local msg_time_threshold =
+	tonumber(core.settings:get("chatcommand_msg_time_threshold")) or 0.1
 core.register_on_chat_message(function(name, message)
 	if message:sub(1,1) ~= "/" then
 		return
@@ -52,7 +56,7 @@ core.register_on_chat_message(function(name, message)
 
 	local cmd, param = string.match(message, "^/([^ ]+) *(.*)")
 	if not cmd then
-		core.chat_send_player(name, "-!- Empty command")
+		core.chat_send_player(name, "-!- "..S("Empty command."))
 		return true
 	end
 
@@ -65,15 +69,17 @@ core.register_on_chat_message(function(name, message)
 
 	local cmd_def = core.registered_chatcommands[cmd]
 	if not cmd_def then
-		core.chat_send_player(name, "-!- Invalid command: " .. cmd)
+		core.chat_send_player(name, "-!- "..S("Invalid command: @1", cmd))
 		return true
 	end
 	local has_privs, missing_privs = core.check_player_privs(name, cmd_def.privs)
 	if has_privs then
 		core.set_last_run_mod(cmd_def.mod_origin)
+		local t_before = core.get_us_time()
 		local success, result = cmd_def.func(name, param)
+		local delay = (core.get_us_time() - t_before) / 1000000
 		if success == false and result == nil then
-			core.chat_send_player(name, "-!- Invalid command usage")
+			core.chat_send_player(name, "-!- "..S("Invalid command usage."))
 			local help_def = core.registered_chatcommands["help"]
 			if help_def then
 				local _, helpmsg = help_def.func(name, cmd)
@@ -81,13 +87,27 @@ core.register_on_chat_message(function(name, message)
 					core.chat_send_player(name, helpmsg)
 				end
 			end
-		elseif result then
-			core.chat_send_player(name, result)
+		else
+			if delay > msg_time_threshold then
+				-- Show how much time it took to execute the command
+				if result then
+					result = result .. core.colorize("#f3d2ff", S(" (@1 s)",
+						string.format("%.5f", delay)))
+				else
+					result = core.colorize("#f3d2ff", S(
+						"Command execution took @1 s",
+						string.format("%.5f", delay)))
+				end
+			end
+			if result then
+				core.chat_send_player(name, result)
+			end
 		end
 	else
-		core.chat_send_player(name, "You don't have permission"
-				.. " to run this command (missing privileges: "
-				.. table.concat(missing_privs, ", ") .. ")")
+		core.chat_send_player(name,
+				S("You don't have permission to run this command "
+				.. "(missing privileges: @1).",
+				table.concat(missing_privs, ", ")))
 	end
 	return true  -- Handled chat message
 end)
@@ -107,12 +127,13 @@ local function parse_range_str(player_name, str)
 	if args[1] == "here" then
 		p1, p2 = core.get_player_radius_area(player_name, tonumber(args[2]))
 		if p1 == nil then
-			return false, "Unable to get player " .. player_name .. " position"
+			return false, S("Unable to get position of player @1.", player_name)
 		end
 	else
 		p1, p2 = core.string_to_area(str)
 		if p1 == nil then
-			return false, "Incorrect area format. Expected: (x1,y1,z1) (x2,y2,z2)"
+			return false, S("Incorrect area format. "
+				.. "Expected: (x1,y1,z1) (x2,y2,z2)")
 		end
 	end
 
@@ -123,9 +144,9 @@ end
 -- Chat commands
 --
 core.register_chatcommand("me", {
-	params = "<action>",
-	description = "Show chat action (e.g., '/me orders a pizza' displays"
-			.. " '<player name> orders a pizza')",
+	params = S("<action>"),
+	description = S("Show chat action (e.g., '/me orders a pizza' "
+		.. "displays '<player name> orders a pizza')"),
 	privs = {shout=true},
 	func = function(name, param)
 		core.chat_send_all("* " .. name .. " " .. param)
@@ -134,43 +155,54 @@ core.register_chatcommand("me", {
 })
 
 core.register_chatcommand("admin", {
-	description = "Show the name of the server owner",
+	description = S("Show the name of the server owner"),
 	func = function(name)
 		local admin = core.settings:get("name")
 		if admin then
-			return true, "The administrator of this server is " .. admin .. "."
+			return true, S("The administrator of this server is @1.", admin)
 		else
-			return false, "There's no administrator named in the config file."
+			return false, S("There's no administrator named "
+				.. "in the config file.")
 		end
 	end,
 })
 
+local function privileges_of(name, privs)
+	if not privs then
+		privs = core.get_player_privs(name)
+	end
+	local privstr = core.privs_to_string(privs, ", ")
+	if privstr == "" then
+		return S("@1 does not have any privileges.", name)
+	else
+		return S("Privileges of @1: @2", name, privstr)
+	end
+end
+
 core.register_chatcommand("privs", {
-	params = "[<name>]",
-	description = "Show privileges of yourself or another player",
+	params = S("[<name>]"),
+	description = S("Show privileges of yourself or another player"),
 	func = function(caller, param)
 		param = param:trim()
 		local name = (param ~= "" and param or caller)
 		if not core.player_exists(name) then
-			return false, "Player " .. name .. " does not exist."
+			return false, S("Player @1 does not exist.", name)
 		end
-		return true, "Privileges of " .. name .. ": "
-			.. core.privs_to_string(
-				core.get_player_privs(name), ", ")
+		return true, privileges_of(name)
 	end,
 })
 
 core.register_chatcommand("haspriv", {
-	params = "<privilege>",
-	description = "Return list of all online players with privilege.",
+	params = S("<privilege>"),
+	description = S("Return list of all online players with privilege"),
 	privs = {basic_privs = true},
 	func = function(caller, param)
 		param = param:trim()
 		if param == "" then
-			return false, "Invalid parameters (see /help haspriv)"
+			return false, S("Invalid parameters (see /help haspriv).")
 		end
 		if not core.registered_privileges[param] then
-			return false, "Unknown privilege!"
+			return false, S("Unknown privilege!")
 		end
 		local privs = core.string_to_privs(param)
 		local players_with_priv = {}
@@ -180,19 +212,20 @@ core.register_chatcommand("haspriv", {
 				table.insert(players_with_priv, player_name)
 			end
 		end
-		return true, "Players online with the \"" .. param .. "\" privilege: " ..
-			table.concat(players_with_priv, ", ")
+		return true, S("Players online with the \"@1\" privilege: @2",
+				param,
+				table.concat(players_with_priv, ", "))
 	end
 })
 
 local function handle_grant_command(caller, grantname, grantprivstr)
 	local caller_privs = core.get_player_privs(caller)
 	if not (caller_privs.privs or caller_privs.basic_privs) then
-		return false, "Your privileges are insufficient."
+		return false, S("Your privileges are insufficient.")
 	end
 
 	if not core.get_auth_handler().get_auth(grantname) then
-		return false, "Player " .. grantname .. " does not exist."
+		return false, S("Player @1 does not exist.", grantname)
 	end
 	local grantprivs = core.string_to_privs(grantprivstr)
 	if grantprivstr == "all" then
@@ -204,10 +237,13 @@ local function handle_grant_command(caller, grantname, grantprivstr)
 		core.string_to_privs(core.settings:get("basic_privs") or "interact,shout")
 	for priv, _ in pairs(grantprivs) do
 		if not basic_privs[priv] and not caller_privs.privs then
-			return false, "Your privileges are insufficient."
+			return false, S("Your privileges are insufficient. "..
+					"'@1' only allows you to grant: @2",
+					"basic_privs",
+					core.privs_to_string(basic_privs, ', '))
 		end
 		if not core.registered_privileges[priv] then
-			privs_unknown = privs_unknown .. "Unknown privilege: " .. priv .. "\n"
+			privs_unknown = privs_unknown .. S("Unknown privilege: @1", priv) .. "\n"
 		end
 		privs[priv] = true
 	end
@@ -221,33 +257,31 @@ local function handle_grant_command(caller, grantname, grantprivstr)
 	core.set_player_privs(grantname, privs)
 	core.log("action", caller..' granted ('..core.privs_to_string(grantprivs, ', ')..') privileges to '..grantname)
 	if grantname ~= caller then
-		core.chat_send_player(grantname, caller
-				.. " granted you privileges: "
-				.. core.privs_to_string(grantprivs, ' '))
+		core.chat_send_player(grantname,
+				S("@1 granted you privileges: @2", caller,
+				core.privs_to_string(grantprivs, ', ')))
 	end
-	return true, "Privileges of " .. grantname .. ": "
-		.. core.privs_to_string(
-			core.get_player_privs(grantname), ' ')
+	return true, privileges_of(grantname)
 end
 
 core.register_chatcommand("grant", {
-	params = "<name> (<privilege> | all)",
-	description = "Give privileges to player",
+	params = S("<name> (<privilege> [, <privilege2> [<...>]] | all)"),
+	description = S("Give privileges to player"),
 	func = function(name, param)
 		local grantname, grantprivstr = string.match(param, "([^ ]+) (.+)")
 		if not grantname or not grantprivstr then
-			return false, "Invalid parameters (see /help grant)"
+			return false, S("Invalid parameters (see /help grant).")
 		end
 		return handle_grant_command(name, grantname, grantprivstr)
 	end,
 })
 
 core.register_chatcommand("grantme", {
-	params = "<privilege> | all",
-	description = "Grant privileges to yourself",
+	params = S("<privilege> [, <privilege2> [<...>]] | all"),
+	description = S("Grant privileges to yourself"),
 	func = function(name, param)
 		if param == "" then
-			return false, "Invalid parameters (see /help grantme)"
+			return false, S("Invalid parameters (see /help grantme).")
 		end
 		return handle_grant_command(name, name, param)
 	end,
@@ -256,23 +290,20 @@ core.register_chatcommand("grantme", {
 local function handle_revoke_command(caller, revokename, revokeprivstr)
 	local caller_privs = core.get_player_privs(caller)
 	if not (caller_privs.privs or caller_privs.basic_privs) then
-		return false, "Your privileges are insufficient."
+		return false, S("Your privileges are insufficient.")
 	end
 
 	if not core.get_auth_handler().get_auth(revokename) then
-		return false, "Player " .. revokename .. " does not exist."
+		return false, S("Player @1 does not exist.", revokename)
 	end
 
-	local revokeprivs = core.string_to_privs(revokeprivstr)
 	local privs = core.get_player_privs(revokename)
-	local basic_privs =
-		core.string_to_privs(core.settings:get("basic_privs") or "interact,shout")
-	for priv, _ in pairs(revokeprivs) do
-		if not basic_privs[priv] and not caller_privs.privs then
-			return false, "Your privileges are insufficient."
-		end
-	end
 
+	local revokeprivs = core.string_to_privs(revokeprivstr)
+	local is_singleplayer = core.is_singleplayer()
+	local is_admin = not is_singleplayer
+			and revokename == core.settings:get("name")
+			and revokename ~= ""
 	if revokeprivstr == "all" then
 		revokeprivs = privs
 		privs = {}
@@ -282,53 +313,99 @@ local function handle_revoke_command(caller, revokename, revokeprivstr)
 		end
 	end
 
+	local privs_unknown = ""
+	local basic_privs =
+		core.string_to_privs(core.settings:get("basic_privs") or "interact,shout")
+	local irrevokable = {}
+	local has_irrevokable_priv = false
+	for priv, _ in pairs(revokeprivs) do
+		if not basic_privs[priv] and not caller_privs.privs then
+			return false, S("Your privileges are insufficient. "..
+					"'@1' only allows you to revoke: @2",
+					"basic_privs",
+					core.privs_to_string(basic_privs, ', '))
+		end
+		local def = core.registered_privileges[priv]
+		if not def then
+			privs_unknown = privs_unknown .. S("Unknown privilege: @1", priv) .. "\n"
+		elseif is_singleplayer and def.give_to_singleplayer then
+			irrevokable[priv] = true
+		elseif is_admin and def.give_to_admin then
+			irrevokable[priv] = true
+		end
+	end
+	for priv, _ in pairs(irrevokable) do
+		revokeprivs[priv] = nil
+		has_irrevokable_priv = true
+	end
+	if privs_unknown ~= "" then
+		return false, privs_unknown
+	end
+	if has_irrevokable_priv then
+		if is_singleplayer then
+			core.chat_send_player(caller,
+					S("Note: Cannot revoke in singleplayer: @1",
+					core.privs_to_string(irrevokable, ', ')))
+		elseif is_admin then
+			core.chat_send_player(caller,
+					S("Note: Cannot revoke from admin: @1",
+					core.privs_to_string(irrevokable, ', ')))
+		end
+	end
+
+	local revokecount = 0
 	for priv, _ in pairs(revokeprivs) do
 		-- call the on_revoke callbacks
 		core.run_priv_callbacks(revokename, priv, caller, "revoke")
+		revokecount = revokecount + 1
 	end
 
 	core.set_player_privs(revokename, privs)
+	local new_privs = core.get_player_privs(revokename)
+
+	if revokecount == 0 then
+		return false, S("No privileges were revoked.")
+	end
+
 	core.log("action", caller..' revoked ('
 			..core.privs_to_string(revokeprivs, ', ')
 			..') privileges from '..revokename)
 	if revokename ~= caller then
-		core.chat_send_player(revokename, caller
-			.. " revoked privileges from you: "
-			.. core.privs_to_string(revokeprivs, ' '))
+		core.chat_send_player(revokename,
+			S("@1 revoked privileges from you: @2", caller,
+			core.privs_to_string(revokeprivs, ', ')))
 	end
-	return true, "Privileges of " .. revokename .. ": "
-		.. core.privs_to_string(
-			core.get_player_privs(revokename), ' ')
+	return true, privileges_of(revokename, new_privs)
 end
 
 core.register_chatcommand("revoke", {
-	params = "<name> (<privilege> | all)",
-	description = "Remove privileges from player",
+	params = S("<name> (<privilege> [, <privilege2> [<...>]] | all)"),
+	description = S("Remove privileges from player"),
 	privs = {},
 	func = function(name, param)
 		local revokename, revokeprivstr = string.match(param, "([^ ]+) (.+)")
 		if not revokename or not revokeprivstr then
-			return false, "Invalid parameters (see /help revoke)"
+			return false, S("Invalid parameters (see /help revoke).")
 		end
 		return handle_revoke_command(name, revokename, revokeprivstr)
 	end,
 })
 
 core.register_chatcommand("revokeme", {
-	params = "<privilege> | all",
-	description = "Revoke privileges from yourself",
+	params = S("<privilege> [, <privilege2> [<...>]] | all"),
+	description = S("Revoke privileges from yourself"),
 	privs = {},
 	func = function(name, param)
 		if param == "" then
-			return false, "Invalid parameters (see /help revokeme)"
+			return false, S("Invalid parameters (see /help revokeme).")
 		end
 		return handle_revoke_command(name, name, param)
 	end,
 })
 
 core.register_chatcommand("setpassword", {
-	params = "<name> <password>",
-	description = "Set player's password",
+	params = S("<name> <password>"),
+	description = S("Set player's password"),
 	privs = {password=true},
 	func = function(name, param)
 		local toname, raw_password = string.match(param, "^([^ ]+) +(.+)$")
@@ -338,207 +415,197 @@ core.register_chatcommand("setpassword", {
 		end
 
 		if not toname then
-			return false, "Name field required"
+			return false, S("Name field required.")
 		end
 
-		local act_str_past, act_str_pres
+		local msg_chat, msg_log, msg_ret
 		if not raw_password then
 			core.set_player_password(toname, "")
-			act_str_past = "cleared"
-			act_str_pres = "clears"
+			msg_chat = S("Your password was cleared by @1.", name)
+			msg_log = name .. " clears password of " .. toname .. "."
+			msg_ret = S("Password of player \"@1\" cleared.", toname)
 		else
 			core.set_player_password(toname,
 					core.get_password_hash(toname,
 							raw_password))
-			act_str_past = "set"
-			act_str_pres = "sets"
+			msg_chat = S("Your password was set by @1.", name)
+			msg_log = name .. " sets password of " .. toname .. "."
+			msg_ret = S("Password of player \"@1\" set.", toname)
 		end
 
 		if toname ~= name then
-			core.chat_send_player(toname, "Your password was "
-					.. act_str_past .. " by " .. name)
+			core.chat_send_player(toname, msg_chat)
 		end
 
-		core.log("action", name .. " " .. act_str_pres ..
-				" password of " .. toname .. ".")
+		core.log("action", msg_log)
 
-		return true, "Password of player \"" .. toname .. "\" " .. act_str_past
+		return true, msg_ret
 	end,
 })
 
 core.register_chatcommand("clearpassword", {
-	params = "<name>",
-	description = "Set empty password for a player",
+	params = S("<name>"),
+	description = S("Set empty password for a player"),
 	privs = {password=true},
 	func = function(name, param)
 		local toname = param
 		if toname == "" then
-			return false, "Name field required"
+			return false, S("Name field required.")
 		end
 		core.set_player_password(toname, '')
 
 		core.log("action", name .. " clears password of " .. toname .. ".")
 
-		return true, "Password of player \"" .. toname .. "\" cleared"
+		return true, S("Password of player \"@1\" cleared.", toname)
 	end,
 })
 
 core.register_chatcommand("auth_reload", {
 	params = "",
-	description = "Reload authentication data",
+	description = S("Reload authentication data"),
 	privs = {server=true},
 	func = function(name, param)
 		local done = core.auth_reload()
-		return done, (done and "Done." or "Failed.")
+		return done, (done and S("Done.") or S("Failed."))
 	end,
 })
 
 core.register_chatcommand("remove_player", {
-	params = "<name>",
-	description = "Remove a player's data",
+	params = S("<name>"),
+	description = S("Remove a player's data"),
 	privs = {server=true},
 	func = function(name, param)
 		local toname = param
 		if toname == "" then
-			return false, "Name field required"
+			return false, S("Name field required.")
 		end
 
 		local rc = core.remove_player(toname)
 
 		if rc == 0 then
 			core.log("action", name .. " removed player data of " .. toname .. ".")
-			return true, "Player \"" .. toname .. "\" removed."
+			return true, S("Player \"@1\" removed.", toname)
 		elseif rc == 1 then
-			return true, "No such player \"" .. toname .. "\" to remove."
+			return true, S("No such player \"@1\" to remove.", toname)
 		elseif rc == 2 then
-			return true, "Player \"" .. toname .. "\" is connected, cannot remove."
+			return true, S("Player \"@1\" is connected, cannot remove.", toname)
 		end
 
-		return false, "Unhandled remove_player return code " .. rc .. ""
+		return false, S("Unhandled remove_player return code @1.", tostring(rc))
 	end,
 })
 
-core.register_chatcommand("teleport", {
-	params = "<X>,<Y>,<Z> | <to_name> | (<name> <X>,<Y>,<Z>) | (<name> <to_name>)",
-	description = "Teleport to position or player",
-	privs = {teleport=true},
-	func = function(name, param)
-		-- Returns (pos, true) if found, otherwise (pos, false)
-		local function find_free_position_near(pos)
-			local tries = {
-				{x=1,y=0,z=0},
-				{x=-1,y=0,z=0},
-				{x=0,y=0,z=1},
-				{x=0,y=0,z=-1},
-			}
-			for _, d in ipairs(tries) do
-				local p = {x = pos.x+d.x, y = pos.y+d.y, z = pos.z+d.z}
-				local n = core.get_node_or_nil(p)
-				if n and n.name then
-					local def = core.registered_nodes[n.name]
-					if def and not def.walkable then
-						return p, true
-					end
-				end
+
+-- pos may be a non-integer position
+local function find_free_position_near(pos)
+	local tries = {
+		{x=1, y=0, z=0},
+		{x=-1, y=0, z=0},
+		{x=0, y=0, z=1},
+		{x=0, y=0, z=-1},
+	}
+	for _, d in ipairs(tries) do
+		local p = vector.add(pos, d)
+		local n = core.get_node_or_nil(p)
+		if n then
+			local def = core.registered_nodes[n.name]
+			if def and not def.walkable then
+				return p
 			end
-			return pos, false
 		end
+	end
+	return pos
+end
 
+-- Teleports player <name> to <p> if possible
+local function teleport_to_pos(name, p)
+	local lm = 31000
+	if p.x < -lm or p.x > lm or p.y < -lm or p.y > lm
+			or p.z < -lm or p.z > lm then
+		return false, S("Cannot teleport out of map bounds!")
+	end
+	local teleportee = core.get_player_by_name(name)
+	if not teleportee then
+		return false, S("Cannot get player with name @1.", name)
+	end
+	if teleportee:get_attach() then
+		return false, S("Cannot teleport, @1 " ..
+			"is attached to an object!", name)
+	end
+	teleportee:set_pos(p)
+	return true, S("Teleporting @1 to @2.", name, core.pos_to_string(p, 1))
+end
+
+-- Teleports player <name> next to player <target_name> if possible
+local function teleport_to_player(name, target_name)
+	if name == target_name then
+		return false, S("One does not teleport to oneself.")
+	end
+	local teleportee = core.get_player_by_name(name)
+	if not teleportee then
+		return false, S("Cannot get teleportee with name @1.", name)
+	end
+	if teleportee:get_attach() then
+		return false, S("Cannot teleport, @1 " ..
+			"is attached to an object!", name)
+	end
+	local target = core.get_player_by_name(target_name)
+	if not target then
+		return false, S("Cannot get target player with name @1.", target_name)
+	end
+	local p = find_free_position_near(target:get_pos())
+	teleportee:set_pos(p)
+	return true, S("Teleporting @1 to @2 at @3.", name, target_name,
+		core.pos_to_string(p, 1))
+end
+
+core.register_chatcommand("teleport", {
+	params = S("<X>,<Y>,<Z> | <to_name> | <name> <X>,<Y>,<Z> | <name> <to_name>"),
+	description = S("Teleport to position or player"),
+	privs = {teleport=true},
+	func = function(name, param)
 		local p = {}
-		p.x, p.y, p.z = string.match(param, "^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
-		p.x = tonumber(p.x)
-		p.y = tonumber(p.y)
-		p.z = tonumber(p.z)
+		p.x, p.y, p.z = param:match("^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
+		p = vector.apply(p, tonumber)
 		if p.x and p.y and p.z then
-
-			local lm = 31000
-			if p.x < -lm or p.x > lm or p.y < -lm or p.y > lm or p.z < -lm or p.z > lm then
-				return false, "Cannot teleport out of map bounds!"
-			end
-			local teleportee = core.get_player_by_name(name)
-			if teleportee then
-				if teleportee:get_attach() then
-					return false, "Can't teleport, you're attached to an object!"
-				end
-				teleportee:set_pos(p)
-				return true, "Teleporting to "..core.pos_to_string(p)
-			end
+			return teleport_to_pos(name, p)
 		end
 
 		local target_name = param:match("^([^ ]+)$")
-		local teleportee = core.get_player_by_name(name)
-
-		p = nil
 		if target_name then
-			local target = core.get_player_by_name(target_name)
-			if target then
-				p = target:get_pos()
-			end
-		end
-
-		if teleportee and p then
-			if teleportee:get_attach() then
-				return false, "Can't teleport, you're attached to an object!"
-			end
-			p = find_free_position_near(p)
-			teleportee:set_pos(p)
-			return true, "Teleporting to " .. target_name
-					.. " at "..core.pos_to_string(p)
+			return teleport_to_player(name, target_name)
 		end
 
-		if not core.check_player_privs(name, {bring=true}) then
-			return false, "You don't have permission to teleport other players (missing bring privilege)"
-		end
+		local has_bring_priv = core.check_player_privs(name, {bring=true})
+		local missing_bring_msg = S("You don't have permission to teleport " ..
+			"other players (missing privilege: @1).", "bring")
 
-		teleportee = nil
-		p = {}
 		local teleportee_name
 		teleportee_name, p.x, p.y, p.z = param:match(
 				"^([^ ]+) +([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
-		p.x, p.y, p.z = tonumber(p.x), tonumber(p.y), tonumber(p.z)
-		if teleportee_name then
-			teleportee = core.get_player_by_name(teleportee_name)
-		end
-		if teleportee and p.x and p.y and p.z then
-			if teleportee:get_attach() then
-				return false, "Can't teleport, player is attached to an object!"
+		p = vector.apply(p, tonumber)
+		if teleportee_name and p.x and p.y and p.z then
+			if not has_bring_priv then
+				return false, missing_bring_msg
 			end
-			teleportee:set_pos(p)
-			return true, "Teleporting " .. teleportee_name
-					.. " to " .. core.pos_to_string(p)
+			return teleport_to_pos(teleportee_name, p)
 		end
 
-		teleportee = nil
-		p = nil
 		teleportee_name, target_name = string.match(param, "^([^ ]+) +([^ ]+)$")
-		if teleportee_name then
-			teleportee = core.get_player_by_name(teleportee_name)
-		end
-		if target_name then
-			local target = core.get_player_by_name(target_name)
-			if target then
-				p = target:get_pos()
+		if teleportee_name and target_name then
+			if not has_bring_priv then
+				return false, missing_bring_msg
 			end
-		end
-		if teleportee and p then
-			if teleportee:get_attach() then
-				return false, "Can't teleport, player is attached to an object!"
-			end
-			p = find_free_position_near(p)
-			teleportee:set_pos(p)
-			return true, "Teleporting " .. teleportee_name
-					.. " to " .. target_name
-					.. " at " .. core.pos_to_string(p)
+			return teleport_to_player(teleportee_name, target_name)
 		end
 
-		return false, 'Invalid parameters ("' .. param
-				.. '") or player not found (see /help teleport)'
+		return false
 	end,
 })
 
 core.register_chatcommand("set", {
-	params = "([-n] <name> <value>) | <name>",
-	description = "Set or read server configuration setting",
+	params = S("([-n] <name> <value>) | <name>"),
+	description = S("Set or read server configuration setting"),
 	privs = {server=true},
 	func = function(name, param)
 		local arg, setname, setvalue = string.match(param, "(-[n]) ([^ ]+) (.+)")
@@ -550,22 +617,23 @@ core.register_chatcommand("set", {
 		setname, setvalue = string.match(param, "([^ ]+) (.+)")
 		if setname and setvalue then
 			if not core.settings:get(setname) then
-				return false, "Failed. Use '/set -n <name> <value>' to create a new setting."
+				return false, S("Failed. Use '/set -n <name> <value>' "
+					.. "to create a new setting.")
 			end
 			core.settings:set(setname, setvalue)
-			return true, setname .. " = " .. setvalue
+			return true, S("@1 = @2", setname, setvalue)
 		end
 
 		setname = string.match(param, "([^ ]+)")
 		if setname then
 			setvalue = core.settings:get(setname)
 			if not setvalue then
-				setvalue = "<not set>"
+				setvalue = S("<not set>")
 			end
-			return true, setname .. " = " .. setvalue
+			return true, S("@1 = @2", setname, setvalue)
 		end
 
-		return false, "Invalid parameters (see /help set)."
+		return false, S("Invalid parameters (see /help set).")
 	end,
 })
 
@@ -578,26 +646,27 @@ local function emergeblocks_callback(pos, action, num_calls_remaining, ctx)
 
 	if ctx.current_blocks == ctx.total_blocks then
 		core.chat_send_player(ctx.requestor_name,
-			string.format("Finished emerging %d blocks in %.2fms.",
-			ctx.total_blocks, (os.clock() - ctx.start_time) * 1000))
+			S("Finished emerging @1 blocks in @2ms.",
+				ctx.total_blocks,
+				string.format("%.2f", (os.clock() - ctx.start_time) * 1000)))
 	end
 end
 
 local function emergeblocks_progress_update(ctx)
 	if ctx.current_blocks ~= ctx.total_blocks then
 		core.chat_send_player(ctx.requestor_name,
-			string.format("emergeblocks update: %d/%d blocks emerged (%.1f%%)",
+			S("emergeblocks update: @1/@2 blocks emerged (@3%)",
 			ctx.current_blocks, ctx.total_blocks,
-			(ctx.current_blocks / ctx.total_blocks) * 100))
+			string.format("%.1f", (ctx.current_blocks / ctx.total_blocks) * 100)))
 
 		core.after(2, emergeblocks_progress_update, ctx)
 	end
 end
 
 core.register_chatcommand("emergeblocks", {
-	params = "(here [<radius>]) | (<pos1> <pos2>)",
-	description = "Load (or, if nonexistent, generate) map blocks "
-		.. "contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)",
+	params = S("(here [<radius>]) | (<pos1> <pos2>)"),
+	description = S("Load (or, if nonexistent, generate) map blocks contained in "
+		.. "area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)"),
 	privs = {server=true},
 	func = function(name, param)
 		local p1, p2 = parse_range_str(name, param)
@@ -615,15 +684,15 @@ core.register_chatcommand("emergeblocks", {
 		core.emerge_area(p1, p2, emergeblocks_callback, context)
 		core.after(2, emergeblocks_progress_update, context)
 
-		return true, "Started emerge of area ranging from " ..
-			core.pos_to_string(p1, 1) .. " to " .. core.pos_to_string(p2, 1)
+		return true, S("Started emerge of area ranging from @1 to @2.",
+			core.pos_to_string(p1, 1), core.pos_to_string(p2, 1))
 	end,
 })
 
 core.register_chatcommand("deleteblocks", {
-	params = "(here [<radius>]) | (<pos1> <pos2>)",
-	description = "Delete map blocks contained in area pos1 to pos2 "
-		.. "(<pos1> and <pos2> must be in parentheses)",
+	params = S("(here [<radius>]) | (<pos1> <pos2>)"),
+	description = S("Delete map blocks contained in area pos1 to pos2 "
+		.. "(<pos1> and <pos2> must be in parentheses)"),
 	privs = {server=true},
 	func = function(name, param)
 		local p1, p2 = parse_range_str(name, param)
@@ -632,18 +701,20 @@ core.register_chatcommand("deleteblocks", {
 		end
 
 		if core.delete_area(p1, p2) then
-			return true, "Successfully cleared area ranging from " ..
-				core.pos_to_string(p1, 1) .. " to " .. core.pos_to_string(p2, 1)
+			return true, S("Successfully cleared area "
+				.. "ranging from @1 to @2.",
+				core.pos_to_string(p1, 1), core.pos_to_string(p2, 1))
 		else
-			return false, "Failed to clear one or more blocks in area"
+			return false, S("Failed to clear one or more "
+				.. "blocks in area.")
 		end
 	end,
 })
 
 core.register_chatcommand("fixlight", {
-	params = "(here [<radius>]) | (<pos1> <pos2>)",
-	description = "Resets lighting in the area between pos1 and pos2 "
-		.. "(<pos1> and <pos2> must be in parentheses)",
+	params = S("(here [<radius>]) | (<pos1> <pos2>)"),
+	description = S("Resets lighting in the area between pos1 and pos2 "
+		.. "(<pos1> and <pos2> must be in parentheses)"),
 	privs = {server = true},
 	func = function(name, param)
 		local p1, p2 = parse_range_str(name, param)
@@ -652,17 +723,18 @@ core.register_chatcommand("fixlight", {
 		end
 
 		if core.fix_light(p1, p2) then
-			return true, "Successfully reset light in the area ranging from " ..
-				core.pos_to_string(p1, 1) .. " to " .. core.pos_to_string(p2, 1)
+			return true, S("Successfully reset light in the area "
+				.. "ranging from @1 to @2.",
+				core.pos_to_string(p1, 1), core.pos_to_string(p2, 1))
 		else
-			return false, "Failed to load one or more blocks in area"
+			return false, S("Failed to load one or more blocks in area.")
 		end
 	end,
 })
 
 core.register_chatcommand("mods", {
 	params = "",
-	description = "List mods installed on the server",
+	description = S("List mods installed on the server"),
 	privs = {},
 	func = function(name, param)
 		return true, table.concat(core.get_modnames(), ", ")
@@ -674,117 +746,136 @@ local function handle_give_command(cmd, giver, receiver, stackstring)
 			.. ', stackstring="' .. stackstring .. '"')
 	local itemstack = ItemStack(stackstring)
 	if itemstack:is_empty() then
-		return false, "Cannot give an empty item"
+		return false, S("Cannot give an empty item.")
 	elseif (not itemstack:is_known()) or (itemstack:get_name() == "unknown") then
-		return false, "Cannot give an unknown item"
+		return false, S("Cannot give an unknown item.")
 	-- Forbid giving 'ignore' due to unwanted side effects
 	elseif itemstack:get_name() == "ignore" then
-		return false, "Giving 'ignore' is not allowed"
+		return false, S("Giving 'ignore' is not allowed.")
 	end
 	local receiverref = core.get_player_by_name(receiver)
 	if receiverref == nil then
-		return false, receiver .. " is not a known player"
+		return false, S("@1 is not a known player.", receiver)
 	end
 	local leftover = receiverref:get_inventory():add_item("main", itemstack)
 	local partiality
 	if leftover:is_empty() then
-		partiality = ""
+		partiality = nil
 	elseif leftover:get_count() == itemstack:get_count() then
-		partiality = "could not be "
+		partiality = false
 	else
-		partiality = "partially "
+		partiality = true
 	end
 	-- The actual item stack string may be different from what the "giver"
 	-- entered (e.g. big numbers are always interpreted as 2^16-1).
 	stackstring = itemstack:to_string()
+	local msg
+	if partiality == true then
+		msg = S("@1 partially added to inventory.", stackstring)
+	elseif partiality == false then
+		msg = S("@1 could not be added to inventory.", stackstring)
+	else
+		msg = S("@1 added to inventory.", stackstring)
+	end
 	if giver == receiver then
-		local msg = "%q %sadded to inventory."
-		return true, msg:format(stackstring, partiality)
+		return true, msg
 	else
-		core.chat_send_player(receiver, ("%q %sadded to inventory.")
-				:format(stackstring, partiality))
-		local msg = "%q %sadded to %s's inventory."
-		return true, msg:format(stackstring, partiality, receiver)
+		core.chat_send_player(receiver, msg)
+		local msg_other
+		if partiality == true then
+			msg_other = S("@1 partially added to inventory of @2.",
+					stackstring, receiver)
+		elseif partiality == false then
+			msg_other = S("@1 could not be added to inventory of @2.",
+					stackstring, receiver)
+		else
+			msg_other = S("@1 added to inventory of @2.",
+					stackstring, receiver)
+		end
+		return true, msg_other
 	end
 end
 
 core.register_chatcommand("give", {
-	params = "<name> <ItemString> [<count> [<wear>]]",
-	description = "Give item to player",
+	params = S("<name> <ItemString> [<count> [<wear>]]"),
+	description = S("Give item to player"),
 	privs = {give=true},
 	func = function(name, param)
 		local toname, itemstring = string.match(param, "^([^ ]+) +(.+)$")
 		if not toname or not itemstring then
-			return false, "Name and ItemString required"
+			return false, S("Name and ItemString required.")
 		end
 		return handle_give_command("/give", name, toname, itemstring)
 	end,
 })
 
 core.register_chatcommand("giveme", {
-	params = "<ItemString> [<count> [<wear>]]",
-	description = "Give item to yourself",
+	params = S("<ItemString> [<count> [<wear>]]"),
+	description = S("Give item to yourself"),
 	privs = {give=true},
 	func = function(name, param)
 		local itemstring = string.match(param, "(.+)$")
 		if not itemstring then
-			return false, "ItemString required"
+			return false, S("ItemString required.")
 		end
 		return handle_give_command("/giveme", name, name, itemstring)
 	end,
 })
 
 core.register_chatcommand("spawnentity", {
-	params = "<EntityName> [<X>,<Y>,<Z>]",
-	description = "Spawn entity at given (or your) position",
+	params = S("<EntityName> [<X>,<Y>,<Z>]"),
+	description = S("Spawn entity at given (or your) position"),
 	privs = {give=true, interact=true},
 	func = function(name, param)
 		local entityname, p = string.match(param, "^([^ ]+) *(.*)$")
 		if not entityname then
-			return false, "EntityName required"
+			return false, S("EntityName required.")
 		end
 		core.log("action", ("%s invokes /spawnentity, entityname=%q")
 				:format(name, entityname))
 		local player = core.get_player_by_name(name)
 		if player == nil then
 			core.log("error", "Unable to spawn entity, player is nil")
-			return false, "Unable to spawn entity, player is nil"
+			return false, S("Unable to spawn entity, player is nil.")
 		end
 		if not core.registered_entities[entityname] then
-			return false, "Cannot spawn an unknown entity"
+			return false, S("Cannot spawn an unknown entity.")
 		end
 		if p == "" then
 			p = player:get_pos()
 		else
 			p = core.string_to_pos(p)
 			if p == nil then
-				return false, "Invalid parameters ('" .. param .. "')"
+				return false, S("Invalid parameters (@1).", param)
 			end
 		end
 		p.y = p.y + 1
 		local obj = core.add_entity(p, entityname)
-		local msg = obj and "%q spawned." or "%q failed to spawn."
-		return true, msg:format(entityname)
+		if obj then
+			return true, S("@1 spawned.", entityname)
+		else
+			return true, S("@1 failed to spawn.", entityname)
+		end
 	end,
 })
 
 core.register_chatcommand("pulverize", {
 	params = "",
-	description = "Destroy item in hand",
+	description = S("Destroy item in hand"),
 	func = function(name, param)
 		local player = core.get_player_by_name(name)
 		if not player then
 			core.log("error", "Unable to pulverize, no player.")
-			return false, "Unable to pulverize, no player."
+			return false, S("Unable to pulverize, no player.")
 		end
 		local wielded_item = player:get_wielded_item()
 		if wielded_item:is_empty() then
-			return false, "Unable to pulverize, no item in hand."
+			return false, S("Unable to pulverize, no item in hand.")
 		end
 		core.log("action", name .. " pulverized \"" ..
 			wielded_item:get_name() .. " " .. wielded_item:get_count() .. "\"")
 		player:set_wielded_item(nil)
-		return true, "An item was pulverized."
+		return true, S("An item was pulverized.")
 	end,
 })
 
@@ -800,14 +891,15 @@ core.register_on_punchnode(function(pos, node, puncher)
 end)
 
 core.register_chatcommand("rollback_check", {
-	params = "[<range>] [<seconds>] [<limit>]",
-	description = "Check who last touched a node or a node near it"
-			.. " within the time specified by <seconds>. Default: range = 0,"
-			.. " seconds = 86400 = 24h, limit = 5. Set <seconds> to inf for no time limit",
+	params = S("[<range>] [<seconds>] [<limit>]"),
+	description = S("Check who last touched a node or a node near it "
+		.. "within the time specified by <seconds>. "
+		.. "Default: range = 0, seconds = 86400 = 24h, limit = 5. "
+		.. "Set <seconds> to inf for no time limit"),
 	privs = {rollback=true},
 	func = function(name, param)
 		if not core.settings:get_bool("enable_rollback_recording") then
-			return false, "Rollback functions are disabled."
+			return false, S("Rollback functions are disabled.")
 		end
 		local range, seconds, limit =
 			param:match("(%d+) *(%d*) *(%d*)")
@@ -815,30 +907,30 @@ core.register_chatcommand("rollback_check", {
 		seconds = tonumber(seconds) or 86400
 		limit = tonumber(limit) or 5
 		if limit > 100 then
-			return false, "That limit is too high!"
+			return false, S("That limit is too high!")
 		end
 
 		core.rollback_punch_callbacks[name] = function(pos, node, puncher)
 			local name = puncher:get_player_name()
-			core.chat_send_player(name, "Checking " .. core.pos_to_string(pos) .. "...")
+			core.chat_send_player(name, S("Checking @1 ...", core.pos_to_string(pos)))
 			local actions = core.rollback_get_node_actions(pos, range, seconds, limit)
 			if not actions then
-				core.chat_send_player(name, "Rollback functions are disabled")
+				core.chat_send_player(name, S("Rollback functions are disabled."))
 				return
 			end
 			local num_actions = #actions
 			if num_actions == 0 then
-				core.chat_send_player(name, "Nobody has touched"
-						.. " the specified location in "
-						.. seconds .. " seconds")
+				core.chat_send_player(name,
+						S("Nobody has touched the specified "
+						.. "location in @1 seconds.",
+						seconds))
 				return
 			end
 			local time = os.time()
 			for i = num_actions, 1, -1 do
 				local action = actions[i]
 				core.chat_send_player(name,
-					("%s %s %s -> %s %d seconds ago.")
-						:format(
+					S("@1 @2 @3 -> @4 @5 seconds ago.",
 							core.pos_to_string(action.pos),
 							action.actor,
 							action.oldnode.name,
@@ -847,110 +939,123 @@ core.register_chatcommand("rollback_check", {
 			end
 		end
 
-		return true, "Punch a node (range=" .. range .. ", seconds="
-				.. seconds .. "s, limit=" .. limit .. ")"
+		return true, S("Punch a node (range=@1, seconds=@2, limit=@3).",
+				range, seconds, limit)
 	end,
 })
 
 core.register_chatcommand("rollback", {
-	params = "(<name> [<seconds>]) | (:<actor> [<seconds>])",
-	description = "Revert actions of a player. Default for <seconds> is 60. Set <seconds> to inf for no time limit",
+	params = S("(<name> [<seconds>]) | (:<actor> [<seconds>])"),
+	description = S("Revert actions of a player. "
+		.. "Default for <seconds> is 60. "
+		.. "Set <seconds> to inf for no time limit"),
 	privs = {rollback=true},
 	func = function(name, param)
 		if not core.settings:get_bool("enable_rollback_recording") then
-			return false, "Rollback functions are disabled."
+			return false, S("Rollback functions are disabled.")
 		end
 		local target_name, seconds = string.match(param, ":([^ ]+) *(%d*)")
+		local rev_msg
 		if not target_name then
 			local player_name
 			player_name, seconds = string.match(param, "([^ ]+) *(%d*)")
 			if not player_name then
-				return false, "Invalid parameters. See /help rollback"
-						.. " and /help rollback_check."
+				return false, S("Invalid parameters. "
+					.. "See /help rollback and "
+					.. "/help rollback_check.")
 			end
+			seconds = tonumber(seconds) or 60
 			target_name = "player:"..player_name
+			rev_msg = S("Reverting actions of player '@1' since @2 seconds.",
+				player_name, seconds)
+		else
+			seconds = tonumber(seconds) or 60
+			rev_msg = S("Reverting actions of @1 since @2 seconds.",
+				target_name, seconds)
 		end
-		seconds = tonumber(seconds) or 60
-		core.chat_send_player(name, "Reverting actions of "
-				.. target_name .. " since "
-				.. seconds .. " seconds.")
+		core.chat_send_player(name, rev_msg)
 		local success, log = core.rollback_revert_actions_by(
 				target_name, seconds)
 		local response = ""
 		if #log > 100 then
-			response = "(log is too long to show)\n"
+			response = S("(log is too long to show)").."\n"
 		else
 			for _, line in pairs(log) do
 				response = response .. line .. "\n"
 			end
 		end
-		response = response .. "Reverting actions "
-				.. (success and "succeeded." or "FAILED.")
+		if success then
+			response = response .. S("Reverting actions succeeded.")
+		else
+			response = response .. S("Reverting actions FAILED.")
+		end
 		return success, response
 	end,
 })
 
 core.register_chatcommand("status", {
-	description = "Show server status",
+	description = S("Show server status"),
 	func = function(name, param)
 		local status = core.get_server_status(name, false)
 		if status and status ~= "" then
 			return true, status
 		end
-		return false, "This command was disabled by a mod or game"
+		return false, S("This command was disabled by a mod or game.")
 	end,
 })
 
 core.register_chatcommand("time", {
-	params = "[<0..23>:<0..59> | <0..24000>]",
-	description = "Show or set time of day",
+	params = S("[<0..23>:<0..59> | <0..24000>]"),
+	description = S("Show or set time of day"),
 	privs = {},
 	func = function(name, param)
 		if param == "" then
 			local current_time = math.floor(core.get_timeofday() * 1440)
 			local minutes = current_time % 60
 			local hour = (current_time - minutes) / 60
-			return true, ("Current time is %d:%02d"):format(hour, minutes)
+			return true, S("Current time is @1:@2.",
+					string.format("%d", hour),
+					string.format("%02d", minutes))
 		end
 		local player_privs = core.get_player_privs(name)
 		if not player_privs.settime then
-			return false, "You don't have permission to run this command " ..
-				"(missing privilege: settime)."
+			return false, S("You don't have permission to run "
+				.. "this command (missing privilege: @1).", "settime")
 		end
 		local hour, minute = param:match("^(%d+):(%d+)$")
 		if not hour then
 			local new_time = tonumber(param)
 			if not new_time then
-				return false, "Invalid time."
+				return false, S("Invalid time.")
 			end
 			-- Backward compatibility.
 			core.set_timeofday((new_time % 24000) / 24000)
 			core.log("action", name .. " sets time to " .. new_time)
-			return true, "Time of day changed."
+			return true, S("Time of day changed.")
 		end
 		hour = tonumber(hour)
 		minute = tonumber(minute)
 		if hour < 0 or hour > 23 then
-			return false, "Invalid hour (must be between 0 and 23 inclusive)."
+			return false, S("Invalid hour (must be between 0 and 23 inclusive).")
 		elseif minute < 0 or minute > 59 then
-			return false, "Invalid minute (must be between 0 and 59 inclusive)."
+			return false, S("Invalid minute (must be between 0 and 59 inclusive).")
 		end
 		core.set_timeofday((hour * 60 + minute) / 1440)
 		core.log("action", ("%s sets time to %d:%02d"):format(name, hour, minute))
-		return true, "Time of day changed."
+		return true, S("Time of day changed.")
 	end,
 })
 
 core.register_chatcommand("days", {
-	description = "Show day count since world creation",
+	description = S("Show day count since world creation"),
 	func = function(name, param)
-		return true, "Current day is " .. core.get_day_count()
+		return true, S("Current day is @1.", core.get_day_count())
 	end
 })
 
 core.register_chatcommand("shutdown", {
-	params = "[<delay_in_seconds> | -1] [reconnect] [<message>]",
-	description = "Shutdown server (-1 cancels a delayed shutdown)",
+	params = S("[<delay_in_seconds> | -1] [reconnect] [<message>]"),
+	description = S("Shutdown server (-1 cancels a delayed shutdown)"),
 	privs = {server=true},
 	func = function(name, param)
 		local delay, reconnect, message
@@ -963,7 +1068,7 @@ core.register_chatcommand("shutdown", {
 
 		if delay == 0 then
 			core.log("action", name .. " shuts down server")
-			core.chat_send_all("*** Server shutting down (operator request).")
+			core.chat_send_all("*** "..S("Server shutting down (operator request)."))
 		end
 		core.request_shutdown(message:trim(), core.is_yes(reconnect), delay)
 		return true
@@ -971,65 +1076,65 @@ core.register_chatcommand("shutdown", {
 })
 
 core.register_chatcommand("ban", {
-	params = "[<name>]",
-	description = "Ban the IP of a player or show the ban list",
+	params = S("[<name>]"),
+	description = S("Ban the IP of a player or show the ban list"),
 	privs = {ban=true},
 	func = function(name, param)
 		if param == "" then
 			local ban_list = core.get_ban_list()
 			if ban_list == "" then
-				return true, "The ban list is empty."
+				return true, S("The ban list is empty.")
 			else
-				return true, "Ban list: " .. ban_list
+				return true, S("Ban list: @1", ban_list)
 			end
 		end
 		if not core.get_player_by_name(param) then
-			return false, "Player is not online."
+			return false, S("Player is not online.")
 		end
 		if not core.ban_player(param) then
-			return false, "Failed to ban player."
+			return false, S("Failed to ban player.")
 		end
 		local desc = core.get_ban_description(param)
 		core.log("action", name .. " bans " .. desc .. ".")
-		return true, "Banned " .. desc .. "."
+		return true, S("Banned @1.", desc)
 	end,
 })
 
 core.register_chatcommand("unban", {
-	params = "<name> | <IP_address>",
-	description = "Remove IP ban belonging to a player/IP",
+	params = S("<name> | <IP_address>"),
+	description = S("Remove IP ban belonging to a player/IP"),
 	privs = {ban=true},
 	func = function(name, param)
 		if not core.unban_player_or_ip(param) then
-			return false, "Failed to unban player/IP."
+			return false, S("Failed to unban player/IP.")
 		end
 		core.log("action", name .. " unbans " .. param)
-		return true, "Unbanned " .. param
+		return true, S("Unbanned @1.", param)
 	end,
 })
 
 core.register_chatcommand("kick", {
-	params = "<name> [<reason>]",
-	description = "Kick a player",
+	params = S("<name> [<reason>]"),
+	description = S("Kick a player"),
 	privs = {kick=true},
 	func = function(name, param)
 		local tokick, reason = param:match("([^ ]+) (.+)")
 		tokick = tokick or param
 		if not core.kick_player(tokick, reason) then
-			return false, "Failed to kick player " .. tokick
+			return false, S("Failed to kick player @1.", tokick)
 		end
 		local log_reason = ""
 		if reason then
 			log_reason = " with reason \"" .. reason .. "\""
 		end
 		core.log("action", name .. " kicks " .. tokick .. log_reason)
-		return true, "Kicked " .. tokick
+		return true, S("Kicked @1.", tokick)
 	end,
 })
 
 core.register_chatcommand("clearobjects", {
-	params = "[full | quick]",
-	description = "Clear all objects in world",
+	params = S("[full | quick]"),
+	description = S("Clear all objects in world"),
 	privs = {server=true},
 	func = function(name, param)
 		local options = {}
@@ -1038,45 +1143,44 @@ core.register_chatcommand("clearobjects", {
 		elseif param == "full" then
 			options.mode = "full"
 		else
-			return false, "Invalid usage, see /help clearobjects."
+			return false, S("Invalid usage, see /help clearobjects.")
 		end
 
-		core.log("action", name .. " clears all objects ("
+		core.log("action", name .. " clears objects ("
 				.. options.mode .. " mode).")
-		core.chat_send_all("Clearing all objects. This may take a long time."
-				.. " You may experience a timeout. (by "
-				.. name .. ")")
+		if options.mode == "full" then
+			core.chat_send_all(S("Clearing all objects. This may take a long time. "
+				.. "You may experience a timeout. (by @1)", name))
+		end
 		core.clear_objects(options)
 		core.log("action", "Object clearing done.")
-		core.chat_send_all("*** Cleared all objects.")
+		core.chat_send_all("*** "..S("Cleared all objects."))
 		return true
 	end,
 })
 
 core.register_chatcommand("msg", {
-	params = "<name> <message>",
-	description = "Send a direct message to a player",
+	params = S("<name> <message>"),
+	description = S("Send a direct message to a player"),
 	privs = {shout=true},
 	func = function(name, param)
 		local sendto, message = param:match("^(%S+)%s(.+)$")
 		if not sendto then
-			return false, "Invalid usage, see /help msg."
+			return false, S("Invalid usage, see /help msg.")
 		end
 		if not core.get_player_by_name(sendto) then
-			return false, "The player " .. sendto
-					.. " is not online."
+			return false, S("The player @1 is not online.", sendto)
 		end
 		core.log("action", "DM from " .. name .. " to " .. sendto
 				.. ": " .. message)
-		core.chat_send_player(sendto, "DM from " .. name .. ": "
-				.. message)
-		return true, "Message sent."
+		core.chat_send_player(sendto, S("DM from @1: @2", name, message))
+		return true, S("Message sent.")
 	end,
 })
 
 core.register_chatcommand("last-login", {
-	params = "[<name>]",
-	description = "Get the last login time of a player or yourself",
+	params = S("[<name>]"),
+	description = S("Get the last login time of a player or yourself"),
 	func = function(name, param)
 		if param == "" then
 			param = name
@@ -1084,25 +1188,27 @@ core.register_chatcommand("last-login", {
 		local pauth = core.get_auth_handler().get_auth(param)
 		if pauth and pauth.last_login and pauth.last_login ~= -1 then
 			-- Time in UTC, ISO 8601 format
-			return true, param.."'s last login time was " ..
-				os.date("!%Y-%m-%dT%H:%M:%SZ", pauth.last_login)
+			return true, S("@1's last login time was @2.",
+				param,
+				os.date("!%Y-%m-%dT%H:%M:%SZ", pauth.last_login))
 		end
-		return false, param.."'s last login time is unknown"
+		return false, S("@1's last login time is unknown.", param)
 	end,
 })
 
 core.register_chatcommand("clearinv", {
-	params = "[<name>]",
-	description = "Clear the inventory of yourself or another player",
+	params = S("[<name>]"),
+	description = S("Clear the inventory of yourself or another player"),
 	func = function(name, param)
 		local player
 		if param and param ~= "" and param ~= name then
 			if not core.check_player_privs(name, {server=true}) then
-				return false, "You don't have permission"
-						.. " to clear another player's inventory (missing privilege: server)"
+				return false, S("You don't have permission to "
+					.. "clear another player's inventory "
+					.. "(missing privilege: @1).", "server")
 			end
 			player = core.get_player_by_name(param)
-			core.chat_send_player(param, name.." cleared your inventory.")
+			core.chat_send_player(param, S("@1 cleared your inventory.", name))
 		else
 			player = core.get_player_by_name(name)
 		end
@@ -1112,25 +1218,25 @@ core.register_chatcommand("clearinv", {
 			player:get_inventory():set_list("craft", {})
 			player:get_inventory():set_list("craftpreview", {})
 			core.log("action", name.." clears "..player:get_player_name().."'s inventory")
-			return true, "Cleared "..player:get_player_name().."'s inventory."
+			return true, S("Cleared @1's inventory.", player:get_player_name())
 		else
-			return false, "Player must be online to clear inventory!"
+			return false, S("Player must be online to clear inventory!")
 		end
 	end,
 })
 
 local function handle_kill_command(killer, victim)
 	if core.settings:get_bool("enable_damage") == false then
-		return false, "Players can't be killed, damage has been disabled."
+		return false, S("Players can't be killed, damage has been disabled.")
 	end
 	local victimref = core.get_player_by_name(victim)
 	if victimref == nil then
-		return false, string.format("Player %s is not online.", victim)
+		return false, S("Player @1 is not online.", victim)
 	elseif victimref:get_hp() <= 0 then
 		if killer == victim then
-			return false, "You are already dead."
+			return false, S("You are already dead.")
 		else
-			return false, string.format("%s is already dead.", victim)
+			return false, S("@1 is already dead.", victim)
 		end
 	end
 	if not killer == victim then
@@ -1138,12 +1244,12 @@ local function handle_kill_command(killer, victim)
 	end
 	-- Kill victim
 	victimref:set_hp(0)
-	return true, string.format("%s has been killed.", victim)
+	return true, S("@1 has been killed.", victim)
 end
 
 core.register_chatcommand("kill", {
-	params = "[<name>]",
-	description = "Kill player or yourself",
+	params = S("[<name>]"),
+	description = S("Kill player or yourself"),
 	privs = {server=true},
 	func = function(name, param)
 		return handle_kill_command(name, param == "" and name or param)
diff --git a/builtin/game/deprecated.lua b/builtin/game/deprecated.lua
index 20f0482eb..c5c7848f5 100644
--- a/builtin/game/deprecated.lua
+++ b/builtin/game/deprecated.lua
@@ -1,29 +1,6 @@
 -- Minetest: builtin/deprecated.lua
 
 --
--- Default material types
---
-local function digprop_err()
-	core.log("deprecated", "The core.digprop_* functions are obsolete and need to be replaced by item groups.")
-end
-
-core.digprop_constanttime = digprop_err
-core.digprop_stonelike = digprop_err
-core.digprop_dirtlike = digprop_err
-core.digprop_gravellike = digprop_err
-core.digprop_woodlike = digprop_err
-core.digprop_leaveslike = digprop_err
-core.digprop_glasslike = digprop_err
-
-function core.node_metadata_inventory_move_allow_all()
-	core.log("deprecated", "core.node_metadata_inventory_move_allow_all is obsolete and does nothing.")
-end
-
-function core.add_to_creative_inventory(itemstring)
-	core.log("deprecated", "core.add_to_creative_inventory is obsolete and does nothing.")
-end
-
---
 -- EnvRef
 --
 core.env = {}
@@ -77,7 +54,7 @@ core.setting_save = setting_proxy("write")
 
 function core.register_on_auth_fail(func)
 	core.log("deprecated", "core.register_on_auth_fail " ..
-		"is obsolete and should be replaced by " ..
+		"is deprecated and should be replaced by " ..
 		"core.register_on_authplayer instead.")
 
 	core.register_on_authplayer(function (player_name, ip, is_success)
diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 057d0d0ed..2cc0d8fac 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -84,9 +84,6 @@ core.register_entity(":__builtin:falling_node", {
 			local textures
 			if def.tiles and def.tiles[1] then
 				local tile = def.tiles[1]
-				if def.drawtype == "torchlike" and def.paramtype2 ~= "wallmounted" then
-					tile = def.tiles[2] or def.tiles[1]
-				end
 				if type(tile) == "table" then
 					tile = tile.name
 				end
@@ -147,11 +144,7 @@ core.register_entity(":__builtin:falling_node", {
 
 		-- Rotate entity
 		if def.drawtype == "torchlike" then
-			if def.paramtype2 == "wallmounted" then
-				self.object:set_yaw(math.pi*0.25)
-			else
-				self.object:set_yaw(-math.pi*0.25)
-			end
+			self.object:set_yaw(math.pi*0.25)
 		elseif ((node.param2 ~= 0 or def.drawtype == "nodebox" or def.drawtype == "mesh")
 				and (def.wield_image == "" or def.wield_image == nil))
 				or def.drawtype == "signlike"
@@ -165,8 +158,12 @@ core.register_entity(":__builtin:falling_node", {
 				if euler then
 					self.object:set_rotation(euler)
 				end
-			elseif (def.paramtype2 == "wallmounted" or def.paramtype2 == "colorwallmounted") then
+			elseif (def.paramtype2 == "wallmounted" or def.paramtype2 == "colorwallmounted" or def.drawtype == "signlike") then
 				local rot = node.param2 % 8
+				if (def.drawtype == "signlike" and def.paramtype2 ~= "wallmounted" and def.paramtype2 ~= "colorwallmounted") then
+					-- Change rotation to "floor" by default for non-wallmounted paramtype2
+					rot = 1
+				end
 				local pitch, yaw, roll = 0, 0, 0
 				if def.drawtype == "nodebox" or def.drawtype == "mesh" then
 					if rot == 0 then
@@ -208,6 +205,14 @@ core.register_entity(":__builtin:falling_node", {
 					end
 				end
 				self.object:set_rotation({x=pitch, y=yaw, z=roll})
+			elseif (def.drawtype == "mesh" and def.paramtype2 == "degrotate") then
+				local p2 = (node.param2 - (def.place_param2 or 0)) % 240
+				local yaw = (p2 / 240) * (math.pi * 2)
+				self.object:set_yaw(yaw)
+			elseif (def.drawtype == "mesh" and def.paramtype2 == "colordegrotate") then
+				local p2 = (node.param2 % 32 - (def.place_param2 or 0) % 32) % 24
+				local yaw = (p2 / 24) * (math.pi * 2)
+				self.object:set_yaw(yaw)
 			end
 		end
 	end,
@@ -407,7 +412,7 @@ local function convert_to_falling_node(pos, node)
 
 	obj:get_luaentity():set_node(node, metatable)
 	core.remove_node(pos)
-	return true
+	return true, obj
 end
 
 function core.spawn_falling_node(pos)
diff --git a/builtin/game/features.lua b/builtin/game/features.lua
index 4d3c90ff0..8f0604448 100644
--- a/builtin/game/features.lua
+++ b/builtin/game/features.lua
@@ -18,6 +18,8 @@ core.features = {
 	pathfinder_works = true,
 	object_step_has_moveresult = true,
 	direct_velocity_on_players = true,
+	use_texture_alpha_string_modes = true,
+	degrotate_240_steps = true,
 }
 
 function core.has_feature(arg)
diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 768df847b..c4d93abd6 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -15,15 +15,6 @@ end
 -- Item definition helpers
 --
 
-function core.inventorycube(img1, img2, img3)
-	img2 = img2 or img1
-	img3 = img3 or img1
-	return "[inventorycube"
-			.. "{" .. img1:gsub("%^", "&")
-			.. "{" .. img2:gsub("%^", "&")
-			.. "{" .. img3:gsub("%^", "&")
-end
-
 function core.dir_to_facedir(dir, is6d)
 	--account for y if requested
 	if is6d and math.abs(dir.y) > math.abs(dir.x) and math.abs(dir.y) > math.abs(dir.z) then
@@ -144,7 +135,7 @@ end
 
 function core.is_colored_paramtype(ptype)
 	return (ptype == "color") or (ptype == "colorfacedir") or
-		(ptype == "colorwallmounted")
+		(ptype == "colorwallmounted") or (ptype == "colordegrotate")
 end
 
 function core.strip_param2_color(param2, paramtype2)
@@ -155,6 +146,8 @@ function core.strip_param2_color(param2, paramtype2)
 		param2 = math.floor(param2 / 32) * 32
 	elseif paramtype2 == "colorwallmounted" then
 		param2 = math.floor(param2 / 8) * 8
+	elseif paramtype2 == "colordegrotate" then
+		param2 = math.floor(param2 / 32) * 32
 	end
 	-- paramtype2 == "color" requires no modification.
 	return param2
@@ -332,6 +325,8 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2,
 			color_divisor = 8
 		elseif def.paramtype2 == "colorfacedir" then
 			color_divisor = 32
+		elseif def.paramtype2 == "colordegrotate" then
+			color_divisor = 32
 		end
 		if color_divisor then
 			local color = math.floor(metatable.palette_index / color_divisor)
@@ -544,7 +539,7 @@ function core.node_dig(pos, node, digger)
 		log("info", diggername .. " tried to dig "
 			.. node.name .. " which is not diggable "
 			.. core.pos_to_string(pos))
-		return
+		return false
 	end
 
 	if core.is_protected(pos, diggername) then
@@ -553,7 +548,7 @@ function core.node_dig(pos, node, digger)
 				.. " at protected position "
 				.. core.pos_to_string(pos))
 		core.record_protection_violation(pos, diggername)
-		return
+		return false
 	end
 
 	log('action', diggername .. " digs "
@@ -636,6 +631,8 @@ function core.node_dig(pos, node, digger)
 		local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
 		callback(pos_copy, node_copy, digger)
 	end
+
+	return true
 end
 
 function core.itemstring_with_palette(item, palette_index)
@@ -663,7 +660,7 @@ end
 -- Item definition defaults
 --
 
-local default_stack_max = tonumber(minetest.settings:get("default_stack_max")) or 99
+local default_stack_max = tonumber(core.settings:get("default_stack_max")) or 99
 
 core.nodedef_default = {
 	-- Item properties
@@ -692,10 +689,6 @@ core.nodedef_default = {
 
 	on_receive_fields = nil,
 
-	on_metadata_inventory_move = core.node_metadata_inventory_move_allow_all,
-	on_metadata_inventory_offer = core.node_metadata_inventory_offer_allow_all,
-	on_metadata_inventory_take = core.node_metadata_inventory_take_allow_all,
-
 	-- Node properties
 	drawtype = "normal",
 	visual_scale = 1.0,
@@ -706,7 +699,6 @@ core.nodedef_default = {
 	--	{name="", backface_culling=true},
 	--	{name="", backface_culling=true},
 	--},
-	alpha = 255,
 	post_effect_color = {a=0, r=0, g=0, b=0},
 	paramtype = "none",
 	paramtype2 = "none",
diff --git a/builtin/game/knockback.lua b/builtin/game/knockback.lua
index b5c4cbc5a..a937aa186 100644
--- a/builtin/game/knockback.lua
+++ b/builtin/game/knockback.lua
@@ -42,5 +42,5 @@ core.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool
 		return -- barely noticeable, so don't even send
 	end
 
-	player:add_player_velocity(kdir)
+	player:add_velocity(kdir)
 end)
diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 96a0a2dda..fcb86146d 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -1,5 +1,7 @@
 -- Minetest: builtin/misc.lua
 
+local S = core.get_translator("__builtin")
+
 --
 -- Misc. API functions
 --
@@ -42,15 +44,15 @@ end
 
 function core.send_join_message(player_name)
 	if not core.is_singleplayer() then
-		core.chat_send_all("*** " .. player_name .. " joined the game.")
+		core.chat_send_all("*** " .. S("@1 joined the game.", player_name))
 	end
 end
 
 
 function core.send_leave_message(player_name, timed_out)
-	local announcement = "*** " ..  player_name .. " left the game."
+	local announcement = "*** " .. S("@1 left the game.", player_name)
 	if timed_out then
-		announcement = announcement .. " (timed out)"
+		announcement = "*** " .. S("@1 left the game (timed out).", player_name)
 	end
 	core.chat_send_all(announcement)
 end
@@ -266,3 +268,26 @@ end
 function core.cancel_shutdown_requests()
 	core.request_shutdown("", false, -1)
 end
+
+
+-- Callback handling for dynamic_add_media
+
+local dynamic_add_media_raw = core.dynamic_add_media_raw
+core.dynamic_add_media_raw = nil
+function core.dynamic_add_media(filepath, callback)
+	local ret = dynamic_add_media_raw(filepath)
+	if ret == false then
+		return ret
+	end
+	if callback == nil then
+		core.log("deprecated", "Calling minetest.dynamic_add_media without "..
+			"a callback is deprecated and will stop working in future versions.")
+	else
+		-- At the moment async loading is not actually implemented, so we
+		-- immediately call the callback ourselves
+		for _, name in ipairs(ret) do
+			callback(name)
+		end
+	end
+	return true
+end
diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua
index c7417d2f4..1d3efb525 100644
--- a/builtin/game/privileges.lua
+++ b/builtin/game/privileges.lua
@@ -1,5 +1,7 @@
 -- Minetest: builtin/privileges.lua
 
+local S = core.get_translator("__builtin")
+
 --
 -- Privileges
 --
@@ -15,7 +17,7 @@ function core.register_privilege(name, param)
 			def.give_to_admin = def.give_to_singleplayer
 		end
 		if def.description == nil then
-			def.description = "(no description)"
+			def.description = S("(no description)")
 		end
 	end
 	local def
@@ -28,69 +30,75 @@ function core.register_privilege(name, param)
 	core.registered_privileges[name] = def
 end
 
-core.register_privilege("interact", "Can interact with things and modify the world")
-core.register_privilege("shout", "Can speak in chat")
-core.register_privilege("basic_privs", "Can modify 'shout' and 'interact' privileges")
-core.register_privilege("privs", "Can modify privileges")
+core.register_privilege("interact", S("Can interact with things and modify the world"))
+core.register_privilege("shout", S("Can speak in chat"))
+
+local basic_privs =
+	core.string_to_privs((core.settings:get("basic_privs") or "shout,interact"))
+local basic_privs_desc = S("Can modify basic privileges (@1)",
+	core.privs_to_string(basic_privs, ', '))
+core.register_privilege("basic_privs", basic_privs_desc)
+
+core.register_privilege("privs", S("Can modify privileges"))
 
 core.register_privilege("teleport", {
-	description = "Can teleport self",
+	description = S("Can teleport self"),
 	give_to_singleplayer = false,
 })
 core.register_privilege("bring", {
-	description = "Can teleport other players",
+	description = S("Can teleport other players"),
 	give_to_singleplayer = false,
 })
 core.register_privilege("settime", {
-	description = "Can set the time of day using /time",
+	description = S("Can set the time of day using /time"),
 	give_to_singleplayer = false,
 })
 core.register_privilege("server", {
-	description = "Can do server maintenance stuff",
+	description = S("Can do server maintenance stuff"),
 	give_to_singleplayer = false,
 	give_to_admin = true,
 })
 core.register_privilege("protection_bypass", {
-	description = "Can bypass node protection in the world",
+	description = S("Can bypass node protection in the world"),
 	give_to_singleplayer = false,
 })
 core.register_privilege("ban", {
-	description = "Can ban and unban players",
+	description = S("Can ban and unban players"),
 	give_to_singleplayer = false,
 	give_to_admin = true,
 })
 core.register_privilege("kick", {
-	description = "Can kick players",
+	description = S("Can kick players"),
 	give_to_singleplayer = false,
 	give_to_admin = true,
 })
 core.register_privilege("give", {
-	description = "Can use /give and /giveme",
+	description = S("Can use /give and /giveme"),
 	give_to_singleplayer = false,
 })
 core.register_privilege("password", {
-	description = "Can use /setpassword and /clearpassword",
+	description = S("Can use /setpassword and /clearpassword"),
 	give_to_singleplayer = false,
 	give_to_admin = true,
 })
 core.register_privilege("fly", {
-	description = "Can use fly mode",
+	description = S("Can use fly mode"),
 	give_to_singleplayer = false,
 })
 core.register_privilege("fast", {
-	description = "Can use fast mode",
+	description = S("Can use fast mode"),
 	give_to_singleplayer = false,
 })
 core.register_privilege("noclip", {
-	description = "Can fly through solid nodes using noclip mode",
+	description = S("Can fly through solid nodes using noclip mode"),
 	give_to_singleplayer = false,
 })
 core.register_privilege("rollback", {
-	description = "Can use the rollback functionality",
+	description = S("Can use the rollback functionality"),
 	give_to_singleplayer = false,
 })
 core.register_privilege("debug", {
-	description = "Allows enabling various debug options that may affect gameplay",
+	description = S("Allows enabling various debug options that may affect gameplay"),
 	give_to_singleplayer = false,
 	give_to_admin = true,
 })
diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index 1f94a9dca..c07535855 100644
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -1,5 +1,7 @@
 -- Minetest: builtin/misc_register.lua
 
+local S = core.get_translator("__builtin")
+
 --
 -- Make raw registration functions inaccessible to anyone except this file
 --
@@ -118,10 +120,6 @@ function core.register_item(name, itemdef)
 	end
 	itemdef.name = name
 
-	-- default short_description to first line of description
-	itemdef.short_description = itemdef.short_description or
-		(itemdef.description or ""):gsub("\n.*","")
-
 	-- Apply defaults and add to registered_* table
 	if itemdef.type == "node" then
 		-- Use the nodebox as selection box if it's not set manually
@@ -324,20 +322,13 @@ for name in pairs(forbidden_item_names) do
 	register_alias_raw(name, "")
 end
 
-
--- Obsolete:
--- Aliases for core.register_alias (how ironic...)
--- core.alias_node = core.register_alias
--- core.alias_tool = core.register_alias
--- core.alias_craftitem = core.register_alias
-
 --
 -- Built-in node definitions. Also defined in C.
 --
 
 core.register_item(":unknown", {
 	type = "none",
-	description = "Unknown Item",
+	description = S("Unknown Item"),
 	inventory_image = "unknown_item.png",
 	on_place = core.item_place,
 	on_secondary_use = core.item_secondary_use,
@@ -347,7 +338,7 @@ core.register_item(":unknown", {
 })
 
 core.register_node(":air", {
-	description = "Air",
+	description = S("Air"),
 	inventory_image = "air.png",
 	wield_image = "air.png",
 	drawtype = "airlike",
@@ -364,7 +355,7 @@ core.register_node(":air", {
 })
 
 core.register_node(":ignore", {
-	description = "Ignore",
+	description = S("Ignore"),
 	inventory_image = "ignore.png",
 	wield_image = "ignore.png",
 	drawtype = "airlike",
@@ -377,11 +368,12 @@ core.register_node(":ignore", {
 	air_equivalent = true,
 	drop = "",
 	groups = {not_in_creative_inventory=1},
+	node_placement_prediction = "",
 	on_place = function(itemstack, placer, pointed_thing)
 		core.chat_send_player(
 				placer:get_player_name(),
 				core.colorize("#FF0000",
-				"You can't place 'ignore' nodes!"))
+				S("You can't place 'ignore' nodes!")))
 		return ""
 	end,
 })
@@ -617,6 +609,7 @@ core.registered_can_bypass_userlimit, core.register_can_bypass_userlimit = make_
 core.registered_on_modchannel_message, core.register_on_modchannel_message = make_registration()
 core.registered_on_player_inventory_actions, core.register_on_player_inventory_action = make_registration()
 core.registered_allow_player_inventory_actions, core.register_allow_player_inventory_action = make_registration()
+core.registered_on_rightclickplayers, core.register_on_rightclickplayer = make_registration()
 
 --
 -- Compatibility for on_mapgen_init()
diff --git a/builtin/game/statbars.lua b/builtin/game/statbars.lua
index d192029c5..db5087a16 100644
--- a/builtin/game/statbars.lua
+++ b/builtin/game/statbars.lua
@@ -84,8 +84,8 @@ local function update_builtin_statbars(player)
 	end
 
 	if hud.id_breathbar and (not show_breathbar or breath == breath_max) then
-		minetest.after(1, function(player_name, breath_bar)
-			local player = minetest.get_player_by_name(player_name)
+		core.after(1, function(player_name, breath_bar)
+			local player = core.get_player_by_name(player_name)
 			if player then
 				player:hud_remove(breath_bar)
 			end
diff --git a/builtin/init.lua b/builtin/init.lua
index f76174be7..171742ae1 100644
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -38,9 +38,20 @@ if INIT == "game" then
 	dofile(gamepath .. "init.lua")
 elseif INIT == "mainmenu" then
 	local mm_script = core.settings:get("main_menu_script")
+	local custom_loaded = false
 	if mm_script and mm_script ~= "" then
-		dofile(mm_script)
-	else
+		local testfile = io.open(mm_script, "r")
+		if testfile then
+			testfile:close()
+			dofile(mm_script)
+			custom_loaded = true
+			core.log("info", "Loaded custom main menu script: "..mm_script)
+		else
+			core.log("error", "Failed to load custom main menu script: "..mm_script)
+			core.log("info", "Falling back to default main menu script")
+		end
+	end
+	if not custom_loaded then
 		dofile(core.get_mainmenu_path() .. DIR_DELIM .. "init.lua")
 	end
 elseif INIT == "async" then
diff --git a/builtin/locale/__builtin.de.tr b/builtin/locale/__builtin.de.tr
new file mode 100644
index 000000000..e8bc1fd84
--- /dev/null
+++ b/builtin/locale/__builtin.de.tr
@@ -0,0 +1,240 @@
+# textdomain: __builtin
+Empty command.=Leerer Befehl.
+Invalid command: @1=Ungültiger Befehl: @1
+Invalid command usage.=Ungültige Befehlsverwendung.
+ (@1 s)= (@1 s)
+Command execution took @1 s=Befehlsausführung brauchte @1 s
+You don't have permission to run this command (missing privileges: @1).=Sie haben keine Erlaubnis, diesen Befehl auszuführen (fehlende Privilegien: @1).
+Unable to get position of player @1.=Konnte Position vom Spieler @1 nicht ermitteln.
+Incorrect area format. Expected: (x1,y1,z1) (x2,y2,z2)=Ungültiges Gebietsformat. Erwartet: (x1,y1,z1) (x2,y2,z2)
+<action>=<Aktion>
+Show chat action (e.g., '/me orders a pizza' displays '<player name> orders a pizza')=Chataktion zeigen (z.B. wird „/me isst Pizza“ zu „<Spielername> isst Pizza“)
+Show the name of the server owner=Den Namen des Servereigentümers zeigen
+The administrator of this server is @1.=Der Administrator dieses Servers ist @1.
+There's no administrator named in the config file.=In der Konfigurationsdatei wurde kein Administrator angegeben.
+@1 does not have any privileges.=@1 hat keine Privilegien.
+Privileges of @1: @2=Privilegien von @1: @2
+[<name>]=[<Name>]
+Show privileges of yourself or another player=Ihre eigenen Privilegien oder die eines anderen Spielers anzeigen
+Player @1 does not exist.=Spieler @1 existiert nicht.
+<privilege>=<Privileg>
+Return list of all online players with privilege=Liste aller Spieler mit einem Privileg ausgeben
+Invalid parameters (see /help haspriv).=Ungültige Parameter (siehe „/help haspriv“).
+Unknown privilege!=Unbekanntes Privileg!
+Players online with the "@1" privilege: @2=Derzeit online spielende Spieler mit dem „@1“-Privileg: @2
+Your privileges are insufficient.=Ihre Privilegien sind unzureichend.
+Your privileges are insufficient. '@1' only allows you to grant: @2=Ihre Privilegien sind unzureichend. Mit „@1“ können Sie nur folgendes gewähren: @2
+Unknown privilege: @1=Unbekanntes Privileg: @1
+@1 granted you privileges: @2=@1 gewährte Ihnen Privilegien: @2
+<name> (<privilege> [, <privilege2> [<...>]] | all)=<Name> (<Privileg> [, <Privileg2> [<...>]] | all)
+Give privileges to player=Privileg an Spieler vergeben
+Invalid parameters (see /help grant).=Ungültige Parameter (siehe „/help grant“).
+<privilege> [, <privilege2> [<...>]] | all=<Privileg> [, <Privileg2> [<...>]] | all
+Grant privileges to yourself=Privilegien an Ihnen selbst vergeben
+Invalid parameters (see /help grantme).=Ungültige Parameter (siehe „/help grantme“).
+Your privileges are insufficient. '@1' only allows you to revoke: @2=Ihre Privilegien sind unzureichend. Mit „@1“ können Sie nur folgendes entziehen: @2
+Note: Cannot revoke in singleplayer: @1=Anmerkung: Im Einzelspielermodus kann man folgendes nicht entziehen: @1
+Note: Cannot revoke from admin: @1=Anmerkung: Vom Admin kann man folgendes nicht entziehen: @1
+No privileges were revoked.=Es wurden keine Privilegien entzogen.
+@1 revoked privileges from you: @2=@1 entfernte Privilegien von Ihnen: @2
+Remove privileges from player=Privilegien von Spieler entfernen
+Invalid parameters (see /help revoke).=Ungültige Parameter (siehe „/help revoke“).
+Revoke privileges from yourself=Privilegien von Ihnen selbst entfernen
+Invalid parameters (see /help revokeme).=Ungültige Parameter (siehe „/help revokeme“).
+<name> <password>=<Name> <Passwort>
+Set player's password=Passwort von Spieler setzen
+Name field required.=Namensfeld benötigt.
+Your password was cleared by @1.=Ihr Passwort wurde von @1 geleert.
+Password of player "@1" cleared.=Passwort von Spieler „@1“ geleert.
+Your password was set by @1.=Ihr Passwort wurde von @1 gesetzt.
+Password of player "@1" set.=Passwort von Spieler „@1“ gesetzt.
+<name>=<Name>
+Set empty password for a player=Leeres Passwort für einen Spieler setzen
+Reload authentication data=Authentifizierungsdaten erneut laden
+Done.=Fertig.
+Failed.=Fehlgeschlagen.
+Remove a player's data=Daten eines Spielers löschen
+Player "@1" removed.=Spieler „@1“ gelöscht.
+No such player "@1" to remove.=Es gibt keinen Spieler „@1“, der gelöscht werden könnte.
+Player "@1" is connected, cannot remove.=Spieler „@1“ ist verbunden, er kann nicht gelöscht werden.
+Unhandled remove_player return code @1.=Nicht berücksichtigter remove_player-Rückgabewert @1.
+Cannot teleport out of map bounds!=Eine Teleportation außerhalb der Kartengrenzen ist nicht möglich!
+Cannot get player with name @1.=Spieler mit Namen @1 kann nicht gefunden werden.
+Cannot teleport, @1 is attached to an object!=Teleportation nicht möglich, @1 ist an einem Objekt befestigt!
+Teleporting @1 to @2.=Teleportation von @1 nach @2
+One does not teleport to oneself.=Man teleportiert sich doch nicht zu sich selbst.
+Cannot get teleportee with name @1.=Der zu teleportierende Spieler mit Namen @1 kann nicht gefunden werden.
+Cannot get target player with name @1.=Zielspieler mit Namen @1 kann nicht gefunden werden.
+Teleporting @1 to @2 at @3.=Teleportation von @1 zu @2 bei @3
+<X>,<Y>,<Z> | <to_name> | <name> <X>,<Y>,<Z> | <name> <to_name>=<X>,<Y>,<Z> | <zu_Name> | <Name> <X>,<Y>,<Z> | <Name> <zu_Name>
+Teleport to position or player=Zu Position oder Spieler teleportieren
+You don't have permission to teleport other players (missing privilege: @1).=Sie haben nicht die Erlaubnis, andere Spieler zu teleportieren (fehlendes Privileg: @1).
+([-n] <name> <value>) | <name>=([-n] <Name> <Wert>) | <Name>
+Set or read server configuration setting=Serverkonfigurationseinstellung setzen oder lesen
+Failed. Use '/set -n <name> <value>' to create a new setting.=Fehlgeschlagen. Benutzen Sie „/set -n <Name> <Wert>“, um eine neue Einstellung zu erstellen.
+@1 @= @2=@1 @= @2
+<not set>=<nicht gesetzt>
+Invalid parameters (see /help set).=Ungültige Parameter (siehe „/help set“).
+Finished emerging @1 blocks in @2ms.=Fertig mit Erzeugung von @1 Blöcken in @2 ms.
+emergeblocks update: @1/@2 blocks emerged (@3%)=emergeblocks-Update: @1/@2 Kartenblöcke geladen (@3%)
+(here [<radius>]) | (<pos1> <pos2>)=(here [<Radius>]) | (<Pos1> <Pos2>)
+Load (or, if nonexistent, generate) map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=Lade (oder, wenn nicht existent, generiere) Kartenblöcke im Gebiet zwischen Pos1 und Pos2 (<Pos1> und <Pos2> müssen in Klammern stehen)
+Started emerge of area ranging from @1 to @2.=Start des Ladevorgangs des Gebiets zwischen @1 und @2.
+Delete map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=Kartenblöcke innerhalb des Gebiets zwischen Pos1 und Pos2 löschen (<Pos1> und <Pos2> müssen in Klammern stehen)
+Successfully cleared area ranging from @1 to @2.=Gebiet zwischen @1 und @2 erfolgreich geleert.
+Failed to clear one or more blocks in area.=Fehlgeschlagen: Ein oder mehrere Kartenblöcke im Gebiet konnten nicht geleert werden.
+Resets lighting in the area between pos1 and pos2 (<pos1> and <pos2> must be in parentheses)=Setzt das Licht im Gebiet zwischen Pos1 und Pos2 zurück (<Pos1> und <Pos2> müssen in Klammern stehen)
+Successfully reset light in the area ranging from @1 to @2.=Das Licht im Gebiet zwischen @1 und @2 wurde erfolgreich zurückgesetzt.
+Failed to load one or more blocks in area.=Fehlgeschlagen: Ein oder mehrere Kartenblöcke im Gebiet konnten nicht geladen werden.
+List mods installed on the server=Installierte Mods auf dem Server auflisten
+Cannot give an empty item.=Ein leerer Gegenstand kann nicht gegeben werden.
+Cannot give an unknown item.=Ein unbekannter Gegenstand kann nicht gegeben werden.
+Giving 'ignore' is not allowed.=„ignore“ darf nicht gegeben werden.
+@1 is not a known player.=@1 ist kein bekannter Spieler.
+@1 partially added to inventory.=@1 teilweise ins Inventar eingefügt.
+@1 could not be added to inventory.=@1 konnte nicht ins Inventar eingefügt werden.
+@1 added to inventory.=@1 zum Inventar hinzugefügt.
+@1 partially added to inventory of @2.=@1 teilweise ins Inventar von @2 eingefügt.
+@1 could not be added to inventory of @2.=@1 konnte nicht ins Inventar von @2 eingefügt werden.
+@1 added to inventory of @2.=@1 ins Inventar von @2 eingefügt.
+<name> <ItemString> [<count> [<wear>]]=<Name> <ItemString> [<Anzahl> [<Abnutzung>]]
+Give item to player=Gegenstand an Spieler geben
+Name and ItemString required.=Name und ItemString benötigt.
+<ItemString> [<count> [<wear>]]=<ItemString> [<Anzahl> [<Abnutzung>]]
+Give item to yourself=Gegenstand Ihnen selbst geben
+ItemString required.=ItemString benötigt.
+<EntityName> [<X>,<Y>,<Z>]=<EntityName> [<X>,<Y>,<Z>]
+Spawn entity at given (or your) position=Entity an angegebener (oder Ihrer eigenen) Position spawnen
+EntityName required.=EntityName benötigt.
+Unable to spawn entity, player is nil.=Entity konnte nicht gespawnt werden, Spieler ist nil.
+Cannot spawn an unknown entity.=Ein unbekanntes Entity kann nicht gespawnt werden.
+Invalid parameters (@1).=Ungültige Parameter (@1).
+@1 spawned.=@1 gespawnt.
+@1 failed to spawn.=@1 konnte nicht gespawnt werden.
+Destroy item in hand=Gegenstand in der Hand zerstören
+Unable to pulverize, no player.=Konnte nicht pulverisieren, kein Spieler.
+Unable to pulverize, no item in hand.=Konnte nicht pulverisieren, kein Gegenstand in der Hand.
+An item was pulverized.=Ein Gegenstand wurde pulverisiert.
+[<range>] [<seconds>] [<limit>]=[<Reichweite>] [<Sekunden>] [<Limit>]
+Check who last touched a node or a node near it within the time specified by <seconds>. Default: range @= 0, seconds @= 86400 @= 24h, limit @= 5. Set <seconds> to inf for no time limit=Überprüfen, wer als letztes einen Node oder einen Node in der Nähe innerhalb der in <Sekunden> angegebenen Zeitspanne angefasst hat. Standard: Reichweite @= 0, Sekunden @= 86400 @= 24h, Limit @= 5. <Sekunden> auf „inf“ setzen, um Zeitlimit zu deaktivieren.
+Rollback functions are disabled.=Rollback-Funktionen sind deaktiviert.
+That limit is too high!=Dieses Limit ist zu hoch!
+Checking @1 ...=Überprüfe @1 ...
+Nobody has touched the specified location in @1 seconds.=Niemand hat die angegebene Position seit @1 Sekunden angefasst.
+@1 @2 @3 -> @4 @5 seconds ago.=@1 @2 @3 -> @4 vor @5 Sekunden.
+Punch a node (range@=@1, seconds@=@2, limit@=@3).=Hauen Sie einen Node (Reichweite@=@1, Sekunden@=@2, Limit@=@3).
+(<name> [<seconds>]) | (:<actor> [<seconds>])=(<Name> [<Sekunden>]) | (:<Akteur> [<Sekunden>])
+Revert actions of a player. Default for <seconds> is 60. Set <seconds> to inf for no time limit=Aktionen eines Spielers zurückrollen. Standard für <Sekunden> ist 60. <Sekunden> auf „inf“ setzen, um Zeitlimit zu deaktivieren
+Invalid parameters. See /help rollback and /help rollback_check.=Ungültige Parameter. Siehe /help rollback und /help rollback_check.
+Reverting actions of player '@1' since @2 seconds.=Die Aktionen des Spielers „@1“ seit @2 Sekunden werden rückgängig gemacht.
+Reverting actions of @1 since @2 seconds.=Die Aktionen von @1 seit @2 Sekunden werden rückgängig gemacht.
+(log is too long to show)=(Protokoll ist zu lang für die Anzeige)
+Reverting actions succeeded.=Die Aktionen wurden erfolgreich rückgängig gemacht.
+Reverting actions FAILED.=FEHLGESCHLAGEN: Die Aktionen konnten nicht rückgängig gemacht werden.
+Show server status=Serverstatus anzeigen
+This command was disabled by a mod or game.=Dieser Befehl wurde von einer Mod oder einem Spiel deaktiviert.
+[<0..23>:<0..59> | <0..24000>]=[<0..23>:<0..59> | <0..24000>]
+Show or set time of day=Tageszeit anzeigen oder setzen
+Current time is @1:@2.=Es ist jetzt @1:@2 Uhr.
+You don't have permission to run this command (missing privilege: @1).=Sie haben nicht die Erlaubnis, diesen Befehl auszuführen (fehlendes Privileg: @1).
+Invalid time.=Ungültige Zeit.
+Time of day changed.=Tageszeit geändert.
+Invalid hour (must be between 0 and 23 inclusive).=Ungültige Stunde (muss zwischen 0 und 23 inklusive liegen).
+Invalid minute (must be between 0 and 59 inclusive).=Ungültige Minute (muss zwischen 0 und 59 inklusive liegen).
+Show day count since world creation=Anzahl Tage seit der Erschaffung der Welt anzeigen
+Current day is @1.=Aktueller Tag ist @1.
+[<delay_in_seconds> | -1] [reconnect] [<message>]=[<Verzögerung_in_Sekunden> | -1] [reconnect] [<Nachricht>]
+Shutdown server (-1 cancels a delayed shutdown)=Server herunterfahren (-1 bricht einen verzögerten Abschaltvorgang ab)
+Server shutting down (operator request).=Server wird heruntergefahren (Betreiberanfrage).
+Ban the IP of a player or show the ban list=Die IP eines Spielers verbannen oder die Bannliste anzeigen
+The ban list is empty.=Die Bannliste ist leer.
+Ban list: @1=Bannliste: @1
+Player is not online.=Spieler ist nicht online.
+Failed to ban player.=Konnte Spieler nicht verbannen.
+Banned @1.=@1 verbannt.
+<name> | <IP_address>=<Name> | <IP_Adresse>
+Remove IP ban belonging to a player/IP=Einen IP-Bann auf einen Spieler zurücknehmen
+Failed to unban player/IP.=Konnte Bann auf Spieler/IP nicht zurücknehmen.
+Unbanned @1.=Bann auf @1 zurückgenommen.
+<name> [<reason>]=<Name> [<Grund>]
+Kick a player=Spieler hinauswerfen
+Failed to kick player @1.=Spieler @1 konnte nicht hinausgeworfen werden.
+Kicked @1.=@1 hinausgeworfen.
+[full | quick]=[full | quick]
+Clear all objects in world=Alle Objekte in der Welt löschen
+Invalid usage, see /help clearobjects.=Ungültige Verwendung, siehe /help clearobjects.
+Clearing all objects. This may take a long time. You may experience a timeout. (by @1)=Lösche alle Objekte. Dies kann eine lange Zeit dauern. Eine Netzwerkzeitüberschreitung könnte für Sie auftreten. (von @1)
+Cleared all objects.=Alle Objekte gelöscht.
+<name> <message>=<Name> <Nachricht>
+Send a direct message to a player=Eine Direktnachricht an einen Spieler senden
+Invalid usage, see /help msg.=Ungültige Verwendung, siehe /help msg.
+The player @1 is not online.=Der Spieler @1 ist nicht online.
+DM from @1: @2=DN von @1: @2
+Message sent.=Nachricht gesendet.
+Get the last login time of a player or yourself=Den letzten Loginzeitpunkt eines Spielers oder Ihren eigenen anfragen
+@1's last login time was @2.=Letzter Loginzeitpunkt von @1 war @2.
+@1's last login time is unknown.=Letzter Loginzeitpunkt von @1 ist unbekannt.
+Clear the inventory of yourself or another player=Das Inventar von Ihnen oder einem anderen Spieler leeren
+You don't have permission to clear another player's inventory (missing privilege: @1).=Sie haben nicht die Erlaubnis, das Inventar eines anderen Spielers zu leeren (fehlendes Privileg: @1).
+@1 cleared your inventory.=@1 hat Ihr Inventar geleert.
+Cleared @1's inventory.=Inventar von @1 geleert.
+Player must be online to clear inventory!=Spieler muss online sein, um das Inventar leeren zu können!
+Players can't be killed, damage has been disabled.=Spieler können nicht getötet werden, Schaden ist deaktiviert.
+Player @1 is not online.=Spieler @1 ist nicht online.
+You are already dead.=Sie sind schon tot.
+@1 is already dead.=@1 ist bereits tot.
+@1 has been killed.=@1 wurde getötet.
+Kill player or yourself=Einen Spieler oder Sie selbst töten
+Available commands: @1=Verfügbare Befehle: @1
+Use '/help <cmd>' to get more information, or '/help all' to list everything.=„/help <Befehl>“ benutzen, um mehr Informationen zu erhalten, oder „/help all“, um alles aufzulisten.
+Available commands:=Verfügbare Befehle:
+Command not available: @1=Befehl nicht verfügbar: @1
+[all | privs | <cmd>]=[all | privs | <Befehl>]
+Get help for commands or list privileges=Hilfe für Befehle erhalten oder Privilegien auflisten
+Command=Befehl
+Parameters=Parameter
+For more information, click on any entry in the list.=Für mehr Informationen klicken Sie auf einen beliebigen Eintrag in der Liste.
+Double-click to copy the entry to the chat history.=Doppelklicken, um den Eintrag in die Chathistorie einzufügen.
+Command: @1 @2=Befehl: @1 @2
+Available commands: (see also: /help <cmd>)=Verfügbare Befehle: (siehe auch: /help <Befehl>)
+Close=Schließen
+Privilege=Privileg
+Description=Beschreibung
+Available privileges:=Verfügbare Privilegien:
+print [<filter>] | dump [<filter>] | save [<format> [<filter>]] | reset=print [<Filter>] | dump [<Filter>] | save [<Format> [<Filter>]]
+Handle the profiler and profiling data=Den Profiler und Profilingdaten verwalten
+Statistics written to action log.=Statistiken zum Aktionsprotokoll geschrieben.
+Statistics were reset.=Statistiken wurden zurückgesetzt.
+Usage: @1=Verwendung: @1
+Format can be one of txt, csv, lua, json, json_pretty (structures may be subject to change).=Format kann entweder „txt“, „csv“, „lua“, „json“ oder „json_pretty“ sein (die Struktur kann sich in Zukunft ändern).
+@1 joined the game.=@1 ist dem Spiel beigetreten.
+@1 left the game.=@1 hat das Spiel verlassen.
+@1 left the game (timed out).=@1 hat das Spiel verlassen (Netzwerkzeitüberschreitung).
+(no description)=(keine Beschreibung)
+Can interact with things and modify the world=Kann mit Dingen interagieren und die Welt verändern
+Can speak in chat=Kann im Chat sprechen
+Can modify basic privileges (@1)=Kann grundlegende Privilegien anpassen (@1)
+Can modify privileges=Kann Privilegien anpassen
+Can teleport self=Kann sich selbst teleportieren
+Can teleport other players=Kann andere Spieler teleportieren
+Can set the time of day using /time=Kann die Tageszeit mit /time setzen
+Can do server maintenance stuff=Kann Serverwartungsdinge machen
+Can bypass node protection in the world=Kann den Schutz auf Blöcken in der Welt umgehen
+Can ban and unban players=Kann Spieler verbannen und entbannen
+Can kick players=Kann Spieler hinauswerfen
+Can use /give and /giveme=Kann /give und /giveme benutzen
+Can use /setpassword and /clearpassword=Kann /setpassword und /clearpassword benutzen
+Can use fly mode=Kann den Flugmodus benutzen
+Can use fast mode=Kann den Schnellmodus benutzen
+Can fly through solid nodes using noclip mode=Kann durch feste Blöcke mit dem Geistmodus fliegen
+Can use the rollback functionality=Kann die Rollback-Funktionalität benutzen
+Allows enabling various debug options that may affect gameplay=Erlaubt die Aktivierung diverser Debugoptionen, die das Spielgeschehen beeinflussen könnten
+Unknown Item=Unbekannter Gegenstand
+Air=Luft
+Ignore=Ignorieren
+You can't place 'ignore' nodes!=Sie können keine „ignore“-Blöcke platzieren!
+Values below show absolute/relative times spend per server step by the instrumented function.=Die unten angegebenen Werte zeigen absolute/relative Zeitspannen, die je Server-Step von der instrumentierten Funktion in Anspruch genommen wurden.
+A total of @1 sample(s) were taken.=Es wurden insgesamt @1 Datenpunkt(e) aufgezeichnet.
+The output is limited to '@1'.=Die Ausgabe ist beschränkt auf „@1“.
+Saving of profile failed: @1=Speichern des Profils fehlgeschlagen: @1
+Profile saved to @1=Profil abgespeichert nach @1
diff --git a/builtin/locale/__builtin.it.tr b/builtin/locale/__builtin.it.tr
new file mode 100644
index 000000000..8bce1d0d2
--- /dev/null
+++ b/builtin/locale/__builtin.it.tr
@@ -0,0 +1,247 @@
+# textdomain: __builtin
+Empty command.=Comando vuoto.
+Invalid command: @1=Comando non valido: @1
+Invalid command usage.=Utilizzo del comando non valido.
+ (@1 s)=
+Command execution took @1 s=
+You don't have permission to run this command (missing privileges: @1).=Non hai il permesso di eseguire questo comando (privilegi mancanti: @1).
+Unable to get position of player @1.=Impossibile ottenere la posizione del giocatore @1.
+Incorrect area format. Expected: (x1,y1,z1) (x2,y2,z2)=Formato dell'area non corretto. Richiesto: (x1,y1,z1) (x2,y2,z2)
+<action>=<azione>
+Show chat action (e.g., '/me orders a pizza' displays '<player name> orders a pizza')=Mostra un'azione in chat (es. `/me ordina una pizza` mostra `<nome giocatore> ordina una pizza`)
+Show the name of the server owner=Mostra il nome del proprietario del server
+The administrator of this server is @1.=L'amministratore di questo server è @1.
+There's no administrator named in the config file.=Non c'è nessun amministratore nel file di configurazione.
+@1 does not have any privileges.=
+Privileges of @1: @2=Privilegi di @1: @2
+[<name>]=[<nome>]
+Show privileges of yourself or another player=Mostra i privilegi propri o di un altro giocatore
+Player @1 does not exist.=Il giocatore @1 non esiste.
+<privilege>=<privilegio>
+Return list of all online players with privilege=Ritorna una lista di tutti i giocatori connessi col tale privilegio
+Invalid parameters (see /help haspriv).=Parametri non validi (vedi /help haspriv).
+Unknown privilege!=Privilegio sconosciuto!
+Players online with the "@1" privilege: @2=Giocatori connessi con il privilegio "@1": @2
+Your privileges are insufficient.=I tuoi privilegi sono insufficienti.
+Your privileges are insufficient. '@1' only allows you to grant: @2=
+Unknown privilege: @1=Privilegio sconosciuto: @1
+@1 granted you privileges: @2=@1 ti ha assegnato i seguenti privilegi: @2
+<name> (<privilege> [, <privilege2> [<...>]] | all)=
+Give privileges to player=Dà privilegi al giocatore
+Invalid parameters (see /help grant).=Parametri non validi (vedi /help grant).
+<privilege> [, <privilege2> [<...>]] | all=
+Grant privileges to yourself=Assegna dei privilegi a te stess�
+Invalid parameters (see /help grantme).=Parametri non validi (vedi /help grantme).
+Your privileges are insufficient. '@1' only allows you to revoke: @2=
+Note: Cannot revoke in singleplayer: @1=
+Note: Cannot revoke from admin: @1=
+No privileges were revoked.=
+@1 revoked privileges from you: @2=@1 ti ha revocato i seguenti privilegi: @2
+Remove privileges from player=Rimuove privilegi dal giocatore
+Invalid parameters (see /help revoke).=Parametri non validi (vedi /help revoke).
+Revoke privileges from yourself=Revoca privilegi a te stess�
+Invalid parameters (see /help revokeme).=Parametri non validi (vedi /help revokeme).
+<name> <password>=<nome> <password>
+Set player's password=Imposta la password del giocatore
+Name field required.=Campo "nome" richiesto.
+Your password was cleared by @1.=La tua password è stata resettata da @1.
+Password of player "@1" cleared.=Password del giocatore "@1" resettata.
+Your password was set by @1.=La tua password è stata impostata da @1.
+Password of player "@1" set.=Password del giocatore "@1" impostata.
+<name>=<nome>
+Set empty password for a player=Imposta una password vuota a un giocatore
+Reload authentication data=Ricarica i dati d'autenticazione
+Done.=Fatto.
+Failed.=Errore.
+Remove a player's data=Rimuove i dati di un giocatore
+Player "@1" removed.=Giocatore "@1" rimosso.
+No such player "@1" to remove.=Non è presente nessun giocatore "@1" da rimuovere.
+Player "@1" is connected, cannot remove.=Il giocatore "@1" è connesso, non può essere rimosso.
+Unhandled remove_player return code @1.=Codice ritornato da remove_player non gestito (@1).
+Cannot teleport out of map bounds!=Non ci si può teletrasportare fuori dai limiti della mappa!
+Cannot get player with name @1.=Impossibile trovare il giocatore chiamato @1.
+Cannot teleport, @1 is attached to an object!=Impossibile teletrasportare, @1 è attaccato a un oggetto!
+Teleporting @1 to @2.=Teletrasportando @1 da @2.
+One does not teleport to oneself.=Non ci si può teletrasportare su se stessi.
+Cannot get teleportee with name @1.=Impossibile trovare il giocatore chiamato @1 per il teletrasporto
+Cannot get target player with name @1.=Impossibile trovare il giocatore chiamato @1 per il teletrasporto
+Teleporting @1 to @2 at @3.=Teletrasportando @1 da @2 a @3
+<X>,<Y>,<Z> | <to_name> | <name> <X>,<Y>,<Z> | <name> <to_name>=<X>,<Y>,<Z> | <da_nome> | <nome> <X>,<Y>,<Z> | <nome> <da_nome>
+Teleport to position or player=Teletrasporta a una posizione o da un giocatore
+You don't have permission to teleport other players (missing privilege: @1).=Non hai il permesso di teletrasportare altri giocatori (privilegio mancante: @1).
+([-n] <name> <value>) | <name>=([-n] <nome> <valore>) | <nome>
+Set or read server configuration setting=Imposta o ottieni le configurazioni del server
+Failed. Use '/set -n <name> <value>' to create a new setting.=Errore. Usa 'set -n <nome> <valore>' per creare una nuova impostazione
+@1 @= @2=@1 @= @2
+<not set>=<non impostato>
+Invalid parameters (see /help set).=Parametri non validi (vedi /help set).
+Finished emerging @1 blocks in @2ms.=Finito di emergere @1 blocchi in @2ms
+emergeblocks update: @1/@2 blocks emerged (@3%)=aggiornamento emergeblocks: @1/@2 blocchi emersi (@3%)
+(here [<radius>]) | (<pos1> <pos2>)=(here [<raggio>]) | (<pos1> <pos2>)
+Load (or, if nonexistent, generate) map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=Carica (o, se non esiste, genera) blocchi mappa contenuti nell'area tra pos1 e pos2 (<pos1> e <pos2> vanno tra parentesi)
+Started emerge of area ranging from @1 to @2.=Iniziata emersione dell'area tra @1 e @2.
+Delete map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=Cancella i blocchi mappa contenuti nell'area tra pos1 e pos2 (<pos1> e <pos2> vanno tra parentesi)
+Successfully cleared area ranging from @1 to @2.=Area tra @1 e @2 ripulita con successo.
+Failed to clear one or more blocks in area.=Errore nel ripulire uno o più blocchi mappa nell'area
+Resets lighting in the area between pos1 and pos2 (<pos1> and <pos2> must be in parentheses)=Reimposta l'illuminazione nell'area tra pos1 e po2 (<pos1> e <pos2> vanno tra parentesi)
+Successfully reset light in the area ranging from @1 to @2.=Luce nell'area tra @1 e @2 reimpostata con successo.
+Failed to load one or more blocks in area.=Errore nel caricare uno o più blocchi mappa nell'area.
+List mods installed on the server=Elenca le mod installate nel server
+Cannot give an empty item.=Impossibile dare un oggetto vuoto.
+Cannot give an unknown item.=Impossibile dare un oggetto sconosciuto.
+Giving 'ignore' is not allowed.=Non è permesso dare 'ignore'.
+@1 is not a known player.=@1 non è un giocatore conosciuto.
+@1 partially added to inventory.=@1 parzialmente aggiunto all'inventario.
+@1 could not be added to inventory.=@1 non può essere aggiunto all'inventario.
+@1 added to inventory.=@1 aggiunto all'inventario.
+@1 partially added to inventory of @2.=@1 parzialmente aggiunto all'inventario di @2.
+@1 could not be added to inventory of @2.=Non è stato possibile aggiungere @1 all'inventario di @2.
+@1 added to inventory of @2.=@1 aggiunto all'inventario di @2.
+<name> <ItemString> [<count> [<wear>]]=<nome> <NomeOggetto> [<quantità> [<usura>]]
+Give item to player=Dà oggetti ai giocatori
+Name and ItemString required.=Richiesti nome e NomeOggetto.
+<ItemString> [<count> [<wear>]]=<NomeOggetto> [<quantità> [<usura>]]
+Give item to yourself=Dà oggetti a te stess�
+ItemString required.=Richiesto NomeOggetto.
+<EntityName> [<X>,<Y>,<Z>]=<NomeEntità> [<X>,<Y>,<Z>]
+Spawn entity at given (or your) position=Genera un'entità alla data coordinata (o la tua)
+EntityName required.=Richiesto NomeEntità
+Unable to spawn entity, player is nil.=Impossibile generare l'entità, il giocatore è nil.
+Cannot spawn an unknown entity.=Impossibile generare un'entità sconosciuta.
+Invalid parameters (@1).=Parametri non validi (@1).
+@1 spawned.=Generata entità @1.
+@1 failed to spawn.=Errore nel generare @1
+Destroy item in hand=Distrugge l'oggetto in mano
+Unable to pulverize, no player.=Impossibile polverizzare, nessun giocatore.
+Unable to pulverize, no item in hand.=Impossibile polverizzare, nessun oggetto in mano.
+An item was pulverized.=Un oggetto è stato polverizzato.
+[<range>] [<seconds>] [<limit>]=[<raggio>] [<secondi>] [<limite>]
+Check who last touched a node or a node near it within the time specified by <seconds>. Default: range @= 0, seconds @= 86400 @= 24h, limit @= 5. Set <seconds> to inf for no time limit=Controlla chi è l'ultimo giocatore che ha toccato un nodo o un nodo nelle sue vicinanze, negli ultimi secondi indicati. Di base: raggio @= 0, secondi @= 86400 @= 24h, limite @= 5.
+Rollback functions are disabled.=Le funzioni di rollback sono disabilitate.
+That limit is too high!=Il limite è troppo alto!
+Checking @1 ...=Controllando @1 ...
+Nobody has touched the specified location in @1 seconds.=Nessuno ha toccato il punto specificato negli ultimi @1 secondi.
+@1 @2 @3 -> @4 @5 seconds ago.=@1 @2 @3 -> @4 @5 secondi fa.
+Punch a node (range@=@1, seconds@=@2, limit@=@3).=Colpisce un nodo (raggio@=@1, secondi@=@2, limite@=@3)
+(<name> [<seconds>]) | (:<actor> [<seconds>])=(<nome> [<secondi>]) | (:<attore> [<secondi>])
+Revert actions of a player. Default for <seconds> is 60. Set <seconds> to inf for no time limit=Riavvolge le azioni di un giocatore. Di base, <secondi> è 60. Imposta <secondi> a inf per nessun limite di tempo
+Invalid parameters. See /help rollback and /help rollback_check.=Parametri non validi. Vedi /help rollback e /help rollback_check.
+Reverting actions of player '@1' since @2 seconds.=Riavvolge le azioni del giocatore '@1' avvenute negli ultimi @2 secondi.
+Reverting actions of @1 since @2 seconds.=Riavvolge le azioni di @1 avvenute negli ultimi @2 secondi.
+(log is too long to show)=(il log è troppo lungo per essere mostrato)
+Reverting actions succeeded.=Riavvolgimento azioni avvenuto con successo.
+Reverting actions FAILED.=Errore nel riavvolgere le azioni.
+Show server status=Mostra lo stato del server
+This command was disabled by a mod or game.=Questo comando è stato disabilitato da una mod o dal gioco.
+[<0..23>:<0..59> | <0..24000>]=[<0..23>:<0..59> | <0..24000>]
+Show or set time of day=Mostra o imposta l'orario della giornata
+Current time is @1:@2.=Orario corrente: @1:@2.
+You don't have permission to run this command (missing privilege: @1).=Non hai il permesso di eseguire questo comando (privilegio mancante: @1) 
+Invalid time.=Orario non valido.
+Time of day changed.=Orario della giornata cambiato.
+Invalid hour (must be between 0 and 23 inclusive).=Ora non valida (deve essere tra 0 e 23 inclusi)
+Invalid minute (must be between 0 and 59 inclusive).=Minuto non valido (deve essere tra 0 e 59 inclusi)
+Show day count since world creation=Mostra il conteggio dei giorni da quando il mondo è stato creato
+Current day is @1.=Giorno attuale: @1.
+[<delay_in_seconds> | -1] [reconnect] [<message>]=[<ritardo_in_secondi> | -1] [reconnect] [<messaggio>]
+Shutdown server (-1 cancels a delayed shutdown)=Arresta il server (-1 annulla un arresto programmato)
+Server shutting down (operator request).=Arresto del server in corso (per richiesta dell'operatore)
+Ban the IP of a player or show the ban list=Bandisce l'IP del giocatore o mostra la lista di quelli banditi
+The ban list is empty.=La lista banditi è vuota.
+Ban list: @1=Lista banditi: @1
+Player is not online.=Il giocatore non è connesso.
+Failed to ban player.=Errore nel bandire il giocatore.
+Banned @1.=@1 bandit�.
+<name> | <IP_address>=<nome> | <indirizzo_IP>
+Remove IP ban belonging to a player/IP=Perdona l'IP appartenente a un giocatore/IP
+Failed to unban player/IP.=Errore nel perdonare il giocatore/IP
+Unbanned @1.=@1 perdonat�
+<name> [<reason>]=<nome> [<ragione>]
+Kick a player=Caccia un giocatore
+Failed to kick player @1.=Errore nel cacciare il giocatore @1.
+Kicked @1.=@1 cacciat�.
+[full | quick]=[full | quick]
+Clear all objects in world=Elimina tutti gli oggetti/entità nel mondo
+Invalid usage, see /help clearobjects.=Uso incorretto, vedi /help clearobjects.
+Clearing all objects. This may take a long time. You may experience a timeout. (by @1)=Eliminando tutti gli oggetti/entità. Questo potrebbe richiedere molto tempo e farti eventualmente crashare. (di @1)
+Cleared all objects.=Tutti gli oggetti sono stati eliminati.
+<name> <message>=<nome> <messaggio>
+Send a direct message to a player=Invia un messaggio privato al giocatore
+Invalid usage, see /help msg.=Uso incorretto, vedi /help msg
+The player @1 is not online.=Il giocatore @1 non è connesso.
+DM from @1: @2=Messaggio privato da @1: @2
+Message sent.=Messaggio inviato.
+Get the last login time of a player or yourself=Ritorna l'ultimo accesso di un giocatore o di te stess�
+@1's last login time was @2.=L'ultimo accesso di @1 è avvenuto il @2
+@1's last login time is unknown.=L'ultimo accesso di @1 non è conosciuto
+Clear the inventory of yourself or another player=Svuota l'inventario tuo o di un altro giocatore
+You don't have permission to clear another player's inventory (missing privilege: @1).=Non hai il permesso di svuotare l'inventario di un altro giocatore (privilegio mancante: @1).
+@1 cleared your inventory.=@1 ha svuotato il tuo inventario.
+Cleared @1's inventory.=L'inventario di @1 è stato svuotato.
+Player must be online to clear inventory!=Il giocatore deve essere connesso per svuotarne l'inventario!
+Players can't be killed, damage has been disabled.=I giocatori non possono essere uccisi, il danno è disabilitato.
+Player @1 is not online.=Il giocatore @1 non è connesso.
+You are already dead.=Sei già mort�.
+@1 is already dead.=@1 è già mort�.
+@1 has been killed.=@1 è stato uccis�.
+Kill player or yourself=Uccide un giocatore o te stess�
+Available commands: @1=Comandi disponibili: @1
+Use '/help <cmd>' to get more information, or '/help all' to list everything.=Usa '/help <comando>' per ottenere più informazioni, o '/help all' per elencare tutti i comandi.
+Available commands:=Comandi disponibili:
+Command not available: @1=Comando non disponibile: @1
+[all | privs | <cmd>]=[all | privs | <comando>]
+Get help for commands or list privileges=Richiama la finestra d'aiuto dei comandi o dei privilegi
+Command=Comando
+Parameters=Parametri
+For more information, click on any entry in the list.=Per più informazioni, clicca su una qualsiasi voce dell'elenco.
+Double-click to copy the entry to the chat history.=Doppio click per copiare la voce nella cronologia della chat.
+Command: @1 @2=Comando: @1 @2
+Available commands: (see also: /help <cmd>)=Comandi disponibili: (vedi anche /help <comando>)
+Close=Chiudi
+Privilege=Privilegio
+Description=Descrizione
+Available privileges:=Privilegi disponibili:
+print [<filter>] | dump [<filter>] | save [<format> [<filter>]] | reset=print [<filtro>] | dump [<filtro>] | save [<formato> [<filtro>]] | reset
+Handle the profiler and profiling data=Gestisce il profiler e i dati da esso elaborati
+Statistics written to action log.=Statistiche scritte nel log delle azioni.
+Statistics were reset.=Le statistiche sono state resettate.
+Usage: @1=Utilizzo: @1
+Format can be one of txt, csv, lua, json, json_pretty (structures may be subject to change).=I formati supportati sono txt, csv, lua, json e json_pretty (le strutture potrebbero essere soggetti a cambiamenti).
+@1 joined the game.=
+@1 left the game.=
+@1 left the game (timed out).=
+(no description)=(nessuna descrizione)
+Can interact with things and modify the world=Si può interagire con le cose e modificare il mondo
+Can speak in chat=Si può parlare in chat
+Can modify basic privileges (@1)=
+Can modify privileges=Si possono modificare i privilegi
+Can teleport self=Si può teletrasportare se stessз
+Can teleport other players=Si possono teletrasportare gli altri giocatori
+Can set the time of day using /time=Si può impostate l'orario della giornata tramite /time
+Can do server maintenance stuff=Si possono eseguire operazioni di manutenzione del server
+Can bypass node protection in the world=Si può aggirare la protezione dei nodi nel mondo
+Can ban and unban players=Si possono bandire e perdonare i giocatori
+Can kick players=Si possono cacciare i giocatori
+Can use /give and /giveme=Si possono usare /give e /give me
+Can use /setpassword and /clearpassword=Si possono usare /setpassword e /clearpassword
+Can use fly mode=Si può usare la modalità volo
+Can use fast mode=Si può usare la modalità rapida
+Can fly through solid nodes using noclip mode=Si può volare attraverso i nodi solidi con la modalità incorporea
+Can use the rollback functionality=Si può usare la funzione di rollback
+Allows enabling various debug options that may affect gameplay=Permette di abilitare varie opzioni di debug che potrebbero influenzare l'esperienza di gioco
+Unknown Item=Oggetto sconosciuto
+Air=Aria
+Ignore=Ignora
+You can't place 'ignore' nodes!=Non puoi piazzare nodi 'ignore'!
+Values below show absolute/relative times spend per server step by the instrumented function.=
+A total of @1 sample(s) were taken.=
+The output is limited to '@1'.=
+Saving of profile failed: @1=
+Profile saved to @1=
+
+
+##### not used anymore #####
+
+<name> (<privilege> | all)=<nome> (<privilegio> | all)
+<privilege> | all=<privilegio> | all
+Can modify 'shout' and 'interact' privileges=Si possono modificare i privilegi 'shout' e 'interact'
diff --git a/builtin/locale/template.txt b/builtin/locale/template.txt
new file mode 100644
index 000000000..db0ee07b8
--- /dev/null
+++ b/builtin/locale/template.txt
@@ -0,0 +1,240 @@
+# textdomain: __builtin
+Empty command.=
+Invalid command: @1=
+Invalid command usage.=
+ (@1 s)=
+Command execution took @1 s=
+You don't have permission to run this command (missing privileges: @1).=
+Unable to get position of player @1.=
+Incorrect area format. Expected: (x1,y1,z1) (x2,y2,z2)=
+<action>=
+Show chat action (e.g., '/me orders a pizza' displays '<player name> orders a pizza')=
+Show the name of the server owner=
+The administrator of this server is @1.=
+There's no administrator named in the config file.=
+@1 does not have any privileges.=
+Privileges of @1: @2=
+[<name>]=
+Show privileges of yourself or another player=
+Player @1 does not exist.=
+<privilege>=
+Return list of all online players with privilege=
+Invalid parameters (see /help haspriv).=
+Unknown privilege!=
+Players online with the "@1" privilege: @2=
+Your privileges are insufficient.=
+Your privileges are insufficient. '@1' only allows you to grant: @2=
+Unknown privilege: @1=
+@1 granted you privileges: @2=
+<name> (<privilege> [, <privilege2> [<...>]] | all)=
+Give privileges to player=
+Invalid parameters (see /help grant).=
+<privilege> [, <privilege2> [<...>]] | all=
+Grant privileges to yourself=
+Invalid parameters (see /help grantme).=
+Your privileges are insufficient. '@1' only allows you to revoke: @2=
+Note: Cannot revoke in singleplayer: @1=
+Note: Cannot revoke from admin: @1=
+No privileges were revoked.=
+@1 revoked privileges from you: @2=
+Remove privileges from player=
+Invalid parameters (see /help revoke).=
+Revoke privileges from yourself=
+Invalid parameters (see /help revokeme).=
+<name> <password>=
+Set player's password=
+Name field required.=
+Your password was cleared by @1.=
+Password of player "@1" cleared.=
+Your password was set by @1.=
+Password of player "@1" set.=
+<name>=
+Set empty password for a player=
+Reload authentication data=
+Done.=
+Failed.=
+Remove a player's data=
+Player "@1" removed.=
+No such player "@1" to remove.=
+Player "@1" is connected, cannot remove.=
+Unhandled remove_player return code @1.=
+Cannot teleport out of map bounds!=
+Cannot get player with name @1.=
+Cannot teleport, @1 is attached to an object!=
+Teleporting @1 to @2.=
+One does not teleport to oneself.=
+Cannot get teleportee with name @1.=
+Cannot get target player with name @1.=
+Teleporting @1 to @2 at @3.=
+<X>,<Y>,<Z> | <to_name> | <name> <X>,<Y>,<Z> | <name> <to_name>=
+Teleport to position or player=
+You don't have permission to teleport other players (missing privilege: @1).=
+([-n] <name> <value>) | <name>=
+Set or read server configuration setting=
+Failed. Use '/set -n <name> <value>' to create a new setting.=
+@1 @= @2=
+<not set>=
+Invalid parameters (see /help set).=
+Finished emerging @1 blocks in @2ms.=
+emergeblocks update: @1/@2 blocks emerged (@3%)=
+(here [<radius>]) | (<pos1> <pos2>)=
+Load (or, if nonexistent, generate) map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=
+Started emerge of area ranging from @1 to @2.=
+Delete map blocks contained in area pos1 to pos2 (<pos1> and <pos2> must be in parentheses)=
+Successfully cleared area ranging from @1 to @2.=
+Failed to clear one or more blocks in area.=
+Resets lighting in the area between pos1 and pos2 (<pos1> and <pos2> must be in parentheses)=
+Successfully reset light in the area ranging from @1 to @2.=
+Failed to load one or more blocks in area.=
+List mods installed on the server=
+Cannot give an empty item.=
+Cannot give an unknown item.=
+Giving 'ignore' is not allowed.=
+@1 is not a known player.=
+@1 partially added to inventory.=
+@1 could not be added to inventory.=
+@1 added to inventory.=
+@1 partially added to inventory of @2.=
+@1 could not be added to inventory of @2.=
+@1 added to inventory of @2.=
+<name> <ItemString> [<count> [<wear>]]=
+Give item to player=
+Name and ItemString required.=
+<ItemString> [<count> [<wear>]]=
+Give item to yourself=
+ItemString required.=
+<EntityName> [<X>,<Y>,<Z>]=
+Spawn entity at given (or your) position=
+EntityName required.=
+Unable to spawn entity, player is nil.=
+Cannot spawn an unknown entity.=
+Invalid parameters (@1).=
+@1 spawned.=
+@1 failed to spawn.=
+Destroy item in hand=
+Unable to pulverize, no player.=
+Unable to pulverize, no item in hand.=
+An item was pulverized.=
+[<range>] [<seconds>] [<limit>]=
+Check who last touched a node or a node near it within the time specified by <seconds>. Default: range @= 0, seconds @= 86400 @= 24h, limit @= 5. Set <seconds> to inf for no time limit=
+Rollback functions are disabled.=
+That limit is too high!=
+Checking @1 ...=
+Nobody has touched the specified location in @1 seconds.=
+@1 @2 @3 -> @4 @5 seconds ago.=
+Punch a node (range@=@1, seconds@=@2, limit@=@3).=
+(<name> [<seconds>]) | (:<actor> [<seconds>])=
+Revert actions of a player. Default for <seconds> is 60. Set <seconds> to inf for no time limit=
+Invalid parameters. See /help rollback and /help rollback_check.=
+Reverting actions of player '@1' since @2 seconds.=
+Reverting actions of @1 since @2 seconds.=
+(log is too long to show)=
+Reverting actions succeeded.=
+Reverting actions FAILED.=
+Show server status=
+This command was disabled by a mod or game.=
+[<0..23>:<0..59> | <0..24000>]=
+Show or set time of day=
+Current time is @1:@2.=
+You don't have permission to run this command (missing privilege: @1).=
+Invalid time.=
+Time of day changed.=
+Invalid hour (must be between 0 and 23 inclusive).=
+Invalid minute (must be between 0 and 59 inclusive).=
+Show day count since world creation=
+Current day is @1.=
+[<delay_in_seconds> | -1] [reconnect] [<message>]=
+Shutdown server (-1 cancels a delayed shutdown)=
+Server shutting down (operator request).=
+Ban the IP of a player or show the ban list=
+The ban list is empty.=
+Ban list: @1=
+Player is not online.=
+Failed to ban player.=
+Banned @1.=
+<name> | <IP_address>=
+Remove IP ban belonging to a player/IP=
+Failed to unban player/IP.=
+Unbanned @1.=
+<name> [<reason>]=
+Kick a player=
+Failed to kick player @1.=
+Kicked @1.=
+[full | quick]=
+Clear all objects in world=
+Invalid usage, see /help clearobjects.=
+Clearing all objects. This may take a long time. You may experience a timeout. (by @1)=
+Cleared all objects.=
+<name> <message>=
+Send a direct message to a player=
+Invalid usage, see /help msg.=
+The player @1 is not online.=
+DM from @1: @2=
+Message sent.=
+Get the last login time of a player or yourself=
+@1's last login time was @2.=
+@1's last login time is unknown.=
+Clear the inventory of yourself or another player=
+You don't have permission to clear another player's inventory (missing privilege: @1).=
+@1 cleared your inventory.=
+Cleared @1's inventory.=
+Player must be online to clear inventory!=
+Players can't be killed, damage has been disabled.=
+Player @1 is not online.=
+You are already dead.=
+@1 is already dead.=
+@1 has been killed.=
+Kill player or yourself=
+Available commands: @1=
+Use '/help <cmd>' to get more information, or '/help all' to list everything.=
+Available commands:=
+Command not available: @1=
+[all | privs | <cmd>]=
+Get help for commands or list privileges=
+Command=
+Parameters=
+For more information, click on any entry in the list.=
+Double-click to copy the entry to the chat history.=
+Command: @1 @2=
+Available commands: (see also: /help <cmd>)=
+Close=
+Privilege=
+Description=
+Available privileges:=
+print [<filter>] | dump [<filter>] | save [<format> [<filter>]] | reset=
+Handle the profiler and profiling data=
+Statistics written to action log.=
+Statistics were reset.=
+Usage: @1=
+Format can be one of txt, csv, lua, json, json_pretty (structures may be subject to change).=
+@1 joined the game.=
+@1 left the game.=
+@1 left the game (timed out).=
+(no description)=
+Can interact with things and modify the world=
+Can speak in chat=
+Can modify basic privileges (@1)=
+Can modify privileges=
+Can teleport self=
+Can teleport other players=
+Can set the time of day using /time=
+Can do server maintenance stuff=
+Can bypass node protection in the world=
+Can ban and unban players=
+Can kick players=
+Can use /give and /giveme=
+Can use /setpassword and /clearpassword=
+Can use fly mode=
+Can use fast mode=
+Can fly through solid nodes using noclip mode=
+Can use the rollback functionality=
+Allows enabling various debug options that may affect gameplay=
+Unknown Item=
+Air=
+Ignore=
+You can't place 'ignore' nodes!=
+Values below show absolute/relative times spend per server step by the instrumented function.=
+A total of @1 sample(s) were taken.=
+The output is limited to '@1'.=
+Saving of profile failed: @1=
+Profile saved to @1=
diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua
index 2bd8aa8a5..6db351048 100644
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -14,14 +14,11 @@
 --You should have received a copy of the GNU Lesser General Public License along
 --with this program; if not, write to the Free Software Foundation, Inc.,
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
---------------------------------------------------------------------------------
+
 -- Global menu data
---------------------------------------------------------------------------------
 menudata = {}
 
---------------------------------------------------------------------------------
 -- Local cached values
---------------------------------------------------------------------------------
 local min_supp_proto, max_supp_proto
 
 function common_update_cached_supp_proto()
@@ -29,14 +26,12 @@ function common_update_cached_supp_proto()
 	max_supp_proto = core.get_max_supp_proto()
 end
 common_update_cached_supp_proto()
---------------------------------------------------------------------------------
+
 -- Menu helper functions
---------------------------------------------------------------------------------
 
---------------------------------------------------------------------------------
 local function render_client_count(n)
-	if     n > 99 then return '99+'
-	elseif n >= 0 then return tostring(n)
+	if     n > 999 then return '99+'
+	elseif n >= 0  then return tostring(n)
 	else return '?' end
 end
 
@@ -50,39 +45,7 @@ local function configure_selected_world_params(idx)
 	end
 end
 
---------------------------------------------------------------------------------
-function image_column(tooltip, flagname)
-	return "image,tooltip=" .. core.formspec_escape(tooltip) .. "," ..
-		"0=" .. core.formspec_escape(defaulttexturedir .. "blank.png") .. "," ..
-		"1=" .. core.formspec_escape(defaulttexturedir ..
-			(flagname and "server_flags_" .. flagname .. ".png" or "blank.png")) .. "," ..
-		"2=" .. core.formspec_escape(defaulttexturedir .. "server_ping_4.png") .. "," ..
-		"3=" .. core.formspec_escape(defaulttexturedir .. "server_ping_3.png") .. "," ..
-		"4=" .. core.formspec_escape(defaulttexturedir .. "server_ping_2.png") .. "," ..
-		"5=" .. core.formspec_escape(defaulttexturedir .. "server_ping_1.png")
-end
-
---------------------------------------------------------------------------------
-function order_favorite_list(list)
-	local res = {}
-	--orders the favorite list after support
-	for i = 1, #list do
-		local fav = list[i]
-		if is_server_protocol_compat(fav.proto_min, fav.proto_max) then
-			res[#res + 1] = fav
-		end
-	end
-	for i = 1, #list do
-		local fav = list[i]
-		if not is_server_protocol_compat(fav.proto_min, fav.proto_max) then
-			res[#res + 1] = fav
-		end
-	end
-	return res
-end
-
---------------------------------------------------------------------------------
-function render_serverlist_row(spec, is_favorite)
+function render_serverlist_row(spec)
 	local text = ""
 	if spec.name then
 		text = text .. core.formspec_escape(spec.name:trim())
@@ -93,31 +56,29 @@ function render_serverlist_row(spec, is_favorite)
 		end
 	end
 
-	local grey_out = not is_server_protocol_compat(spec.proto_min, spec.proto_max)
+	local grey_out = not spec.is_compatible
 
-	local details
-	if is_favorite then
-		details = "1,"
-	else
-		details = "0,"
-	end
+	local details = {}
 
-	if spec.ping then
-		local ping = spec.ping * 1000
-		if ping <= 50 then
-			details = details .. "2,"
-		elseif ping <= 100 then
-			details = details .. "3,"
-		elseif ping <= 250 then
-			details = details .. "4,"
+	if spec.lag or spec.ping then
+		local lag = (spec.lag or 0) * 1000 + (spec.ping or 0) * 250
+		if lag <= 125 then
+			table.insert(details, "1")
+		elseif lag <= 175 then
+			table.insert(details, "2")
+		elseif lag <= 250 then
+			table.insert(details, "3")
 		else
-			details = details .. "5,"
+			table.insert(details, "4")
 		end
 	else
-		details = details .. "0,"
+		table.insert(details, "0")
 	end
 
-	if spec.clients and spec.clients_max then
+	table.insert(details, ",")
+
+	local color = (grey_out and "#aaaaaa") or ((spec.is_favorite and "#ddddaa") or "#ffffff")
+	if spec.clients and (spec.clients_max or 0) > 0 then
 		local clients_percent = 100 * spec.clients / spec.clients_max
 
 		-- Choose a color depending on how many clients are connected
@@ -128,74 +89,50 @@ function render_serverlist_row(spec, is_favorite)
 		elseif clients_percent <= 60  then clients_color = '#a1e587' -- 0-60%: green
 		elseif clients_percent <= 90  then clients_color = '#ffdc97' -- 60-90%: yellow
 		elseif clients_percent == 100 then clients_color = '#dd5b5b' -- full server: red (darker)
-		else				   clients_color = '#ffba97' -- 90-100%: orange
+		else                               clients_color = '#ffba97' -- 90-100%: orange
 		end
 
-		details = details .. clients_color .. ',' ..
-			render_client_count(spec.clients) .. ',/,' ..
-			render_client_count(spec.clients_max) .. ','
-
-	elseif grey_out then
-		details = details .. '#aaaaaa,?,/,?,'
+		table.insert(details, clients_color)
+		table.insert(details, render_client_count(spec.clients) .. " / " ..
+			render_client_count(spec.clients_max))
 	else
-		details = details .. ',?,/,?,'
+		table.insert(details, color)
+		table.insert(details, "?")
 	end
 
 	if spec.creative then
-		details = details .. "1,"
+		table.insert(details, "1") -- creative icon
 	else
-		details = details .. "0,"
-	end
-
-	if spec.damage then
-		details = details .. "1,"
-	else
-		details = details .. "0,"
+		table.insert(details, "0")
 	end
 
 	if spec.pvp then
-		details = details .. "1,"
+		table.insert(details, "2") -- pvp icon
+	elseif spec.damage then
+		table.insert(details, "1") -- heart icon
 	else
-		details = details .. "0,"
+		table.insert(details, "0")
 	end
 
-	return details .. (grey_out and '#aaaaaa,' or ',') .. text
+	table.insert(details, color)
+	table.insert(details, text)
+
+	return table.concat(details, ",")
 end
 
 --------------------------------------------------------------------------------
 os.tempfolder = function()
-	if core.settings:get("TMPFolder") then
-		return core.settings:get("TMPFolder") .. DIR_DELIM .. "MT_" .. math.random(0,10000)
-	end
-
-	local filetocheck = os.tmpname()
-	os.remove(filetocheck)
-
-	-- luacheck: ignore
-	-- https://blogs.msdn.microsoft.com/vcblog/2014/06/18/c-runtime-crt-features-fixes-and-breaking-changes-in-visual-studio-14-ctp1/
-	--   The C runtime (CRT) function called by os.tmpname is tmpnam.
-	--   Microsofts tmpnam implementation in older CRT / MSVC releases is defective.
-	--   tmpnam return values starting with a backslash characterize this behavior.
-	-- https://sourceforge.net/p/mingw-w64/bugs/555/
-	--   MinGW tmpnam implementation is forwarded to the CRT directly.
-	-- https://sourceforge.net/p/mingw-w64/discussion/723797/thread/55520785/
-	--   MinGW links to an older CRT release (msvcrt.dll).
-	--   Due to legal concerns MinGW will never use a newer CRT.
-	--
-	--   Make use of TEMP to compose the temporary filename if an old
-	--   style tmpnam return value is detected.
-	if filetocheck:sub(1, 1) == "\\" then
-		local tempfolder = os.getenv("TEMP")
-		return tempfolder .. filetocheck
-	end
-
-	local randname = "MTTempModFolder_" .. math.random(0,10000)
-	local backstring = filetocheck:reverse()
-	return filetocheck:sub(0, filetocheck:len() - backstring:find(DIR_DELIM) + 1) ..
-		randname
+	local temp = core.get_temp_path()
+	return temp .. DIR_DELIM .. "MT_" .. math.random(0, 10000)
 end
 
+os.tmpname = function()
+	local path = os.tempfolder()
+	io.open(path, "w"):close()
+	return path
+end
 --------------------------------------------------------------------------------
+
 function menu_render_worldlist()
 	local retval = ""
 	local current_worldlist = menudata.worldlist:get_list()
@@ -209,7 +146,6 @@ function menu_render_worldlist()
 	return retval
 end
 
---------------------------------------------------------------------------------
 function menu_handle_key_up_down(fields, textlist, settingname)
 	local oldidx, newidx = core.get_textlist_index(textlist), 1
 	if fields.key_up or fields.key_down then
@@ -226,42 +162,6 @@ function menu_handle_key_up_down(fields, textlist, settingname)
 	return false
 end
 
---------------------------------------------------------------------------------
-function asyncOnlineFavourites()
-	if not menudata.public_known then
-		menudata.public_known = {{
-			name = fgettext("Loading..."),
-			description = fgettext_ne("Try reenabling public serverlist and check your internet connection.")
-		}}
-	end
-	menudata.favorites = menudata.public_known
-	menudata.favorites_is_public = true
-
-	if not menudata.public_downloading then
-		menudata.public_downloading = true
-	else
-		return
-	end
-
-	core.handle_async(
-		function(param)
-			return core.get_favorites("online")
-		end,
-		nil,
-		function(result)
-			menudata.public_downloading = nil
-			local favs = order_favorite_list(result)
-			if favs[1] then
-				menudata.public_known = favs
-				menudata.favorites = menudata.public_known
-				menudata.favorites_is_public = true
-			end
-			core.event_handler("Refresh")
-		end
-	)
-end
-
---------------------------------------------------------------------------------
 function text2textlist(xpos, ypos, width, height, tl_name, textlen, text, transparency)
 	local textlines = core.wrap_text(text, textlen, true)
 	local retval = "textlist[" .. xpos .. "," .. ypos .. ";" .. width ..
@@ -279,7 +179,6 @@ function text2textlist(xpos, ypos, width, height, tl_name, textlen, text, transp
 	return retval
 end
 
---------------------------------------------------------------------------------
 function is_server_protocol_compat(server_proto_min, server_proto_max)
 	if (not server_proto_min) or (not server_proto_max) then
 		-- There is no info. Assume the best and act as if we would be compatible.
@@ -287,7 +186,7 @@ function is_server_protocol_compat(server_proto_min, server_proto_max)
 	end
 	return min_supp_proto <= server_proto_max and max_supp_proto >= server_proto_min
 end
---------------------------------------------------------------------------------
+
 function is_server_protocol_compat_or_error(server_proto_min, server_proto_max)
 	if not is_server_protocol_compat(server_proto_min, server_proto_max) then
 		local server_prot_ver_info, client_prot_ver_info
@@ -315,7 +214,7 @@ function is_server_protocol_compat_or_error(server_proto_min, server_proto_max)
 
 	return true
 end
---------------------------------------------------------------------------------
+
 function menu_worldmt(selected, setting, value)
 	local world = menudata.worldlist:get_list()[selected]
 	if world then
diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua
index 2cf70c9c9..9bdf92a74 100644
--- a/builtin/mainmenu/dlg_config_world.lua
+++ b/builtin/mainmenu/dlg_config_world.lua
@@ -74,7 +74,7 @@ local function get_formspec(data)
 		"label[1.75,0;" .. data.worldspec.name .. "]"
 
 	if mod.is_modpack or mod.type == "game" then
-		local info = minetest.formspec_escape(
+		local info = core.formspec_escape(
 			core.get_content_info(mod.path).description)
 		if info == "" then
 			if mod.is_modpack then
diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua
index 32703a3b9..20a446d5d 100644
--- a/builtin/mainmenu/dlg_contentstore.lua
+++ b/builtin/mainmenu/dlg_contentstore.lua
@@ -15,7 +15,7 @@
 --with this program; if not, write to the Free Software Foundation, Inc.,
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-if not minetest.get_http_api then
+if not core.get_http_api then
 	function create_store_dlg()
 		return messagebox("store",
 				fgettext("ContentDB is not available when Minetest was compiled without cURL"))
@@ -23,9 +23,11 @@ if not minetest.get_http_api then
 	return
 end
 
-local store = { packages = {}, packages_full = {} }
+-- Unordered preserves the original order of the ContentDB API,
+-- before the package list is ordered based on installed state.
+local store = { packages = {}, packages_full = {}, packages_full_unordered = {} }
 
-local http = minetest.get_http_api()
+local http = core.get_http_api()
 
 -- Screenshot
 local screenshot_dir = core.get_cache_path() .. DIR_DELIM .. "cdb"
@@ -150,7 +152,7 @@ local function start_install(package)
 end
 
 local function queue_download(package)
-	local max_concurrent_downloads = tonumber(minetest.settings:get("contentdb_max_concurrent_downloads"))
+	local max_concurrent_downloads = tonumber(core.settings:get("contentdb_max_concurrent_downloads"))
 	if number_downloading < max_concurrent_downloads then
 		start_install(package)
 	else
@@ -318,7 +320,7 @@ function install_dialog.get_formspec()
 			selected_game_idx = i
 		end
 
-		games[i] = minetest.formspec_escape(games[i].name)
+		games[i] = core.formspec_escape(games[i].name)
 	end
 
 	local selected_game = pkgmgr.games[selected_game_idx]
@@ -329,7 +331,7 @@ function install_dialog.get_formspec()
 	local formatted_deps = {}
 	for _, dep in pairs(install_dialog.dependencies) do
 		formatted_deps[#formatted_deps + 1] = "#fff"
-		formatted_deps[#formatted_deps + 1] = minetest.formspec_escape(dep.name)
+		formatted_deps[#formatted_deps + 1] = core.formspec_escape(dep.name)
 		if dep.installed then
 			formatted_deps[#formatted_deps + 1] = "#ccf"
 			formatted_deps[#formatted_deps + 1] = fgettext("Already installed")
@@ -400,7 +402,7 @@ function install_dialog.handle_submit(this, fields)
 	end
 
 	if fields.will_install_deps ~= nil then
-		install_dialog.will_install_deps = minetest.is_yes(fields.will_install_deps)
+		install_dialog.will_install_deps = core.is_yes(fields.will_install_deps)
 		return true
 	end
 
@@ -551,7 +553,7 @@ function store.load()
 		end
 	end
 
-	local timeout = tonumber(minetest.settings:get("curl_file_download_timeout"))
+	local timeout = tonumber(core.settings:get("curl_file_download_timeout"))
 	local response = http.fetch_sync({ url = url, timeout = timeout })
 	if not response.succeeded then
 		return
@@ -572,6 +574,7 @@ function store.load()
 		end
 	end
 
+	store.packages_full_unordered = store.packages_full
 	store.packages = store.packages_full
 	store.loaded = true
 end
@@ -580,7 +583,7 @@ function store.update_paths()
 	local mod_hash = {}
 	pkgmgr.refresh_globals()
 	for _, mod in pairs(pkgmgr.clientmods:get_list()) do
-		if mod.author then
+		if mod.author and mod.release > 0 then
 			mod_hash[mod.author:lower() .. "/" .. mod.name] = mod
 		end
 	end
@@ -588,14 +591,14 @@ function store.update_paths()
 	local game_hash = {}
 	pkgmgr.update_gamelist()
 	for _, game in pairs(pkgmgr.games) do
-		if game.author ~= "" then
+		if game.author ~= "" and game.release > 0 then
 			game_hash[game.author:lower() .. "/" .. game.id] = game
 		end
 	end
 
 	local txp_hash = {}
 	for _, txp in pairs(pkgmgr.get_texture_packs()) do
-		if txp.author then
+		if txp.author and txp.release > 0 then
 			txp_hash[txp.author:lower() .. "/" .. txp.name] = txp
 		end
 	end
@@ -619,6 +622,33 @@ function store.update_paths()
 	end
 end
 
+function store.sort_packages()
+	local ret = {}
+
+	-- Add installed content
+	for i=1, #store.packages_full_unordered do
+		local package = store.packages_full_unordered[i]
+		if package.path then
+			ret[#ret + 1] = package
+		end
+	end
+
+	-- Sort installed content by title
+	table.sort(ret, function(a, b)
+		return a.title < b.title
+	end)
+
+	-- Add uninstalled content
+	for i=1, #store.packages_full_unordered do
+		local package = store.packages_full_unordered[i]
+		if not package.path then
+			ret[#ret + 1] = package
+		end
+	end
+
+	store.packages_full = ret
+end
+
 function store.filter_packages(query)
 	if query == "" and filter_type == 1 then
 		store.packages = store.packages_full
@@ -652,7 +682,6 @@ function store.filter_packages(query)
 			store.packages[#store.packages + 1] = package
 		end
 	end
-
 end
 
 function store.get_formspec(dlgdata)
@@ -764,8 +793,8 @@ function store.get_formspec(dlgdata)
 		-- title
 		formspec[#formspec + 1] = "label[1.875,0.1;"
 		formspec[#formspec + 1] = core.formspec_escape(
-				minetest.colorize(mt_color_green, package.title) ..
-				minetest.colorize("#BFBFBF", " by " .. package.author))
+				core.colorize(mt_color_green, package.title) ..
+				core.colorize("#BFBFBF", " by " .. package.author))
 		formspec[#formspec + 1] = "]"
 
 		-- buttons
@@ -960,6 +989,9 @@ function create_store_dlg(type)
 		store.load()
 	end
 
+	store.update_paths()
+	store.sort_packages()
+
 	search_string = ""
 	cur_page = 1
 
diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua
index 5931496c1..1938747fe 100644
--- a/builtin/mainmenu/dlg_create_world.lua
+++ b/builtin/mainmenu/dlg_create_world.lua
@@ -443,7 +443,7 @@ local function create_world_buttonhandler(this, fields)
 	end
 
 	if fields["mgv6_biomes"] then
-		local entry = minetest.formspec_escape(fields["mgv6_biomes"])
+		local entry = core.formspec_escape(fields["mgv6_biomes"])
 		for b=1, #mgv6_biomes do
 			if entry == mgv6_biomes[b][1] then
 				local ftable = core.settings:get_flags("mgv6_spflags")
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index 5c7e20932..2481078e2 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -34,6 +34,7 @@ dofile(basepath .. "fstk" .. DIR_DELIM .. "ui.lua")
 dofile(menupath .. DIR_DELIM .. "async_event.lua")
 dofile(menupath .. DIR_DELIM .. "common.lua")
 dofile(menupath .. DIR_DELIM .. "pkgmgr.lua")
+dofile(menupath .. DIR_DELIM .. "serverlistmgr.lua")
 dofile(menupath .. DIR_DELIM .. "textures.lua")
 
 dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
@@ -48,7 +49,7 @@ local tabs = {}
 
 tabs.settings = dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
 tabs.content  = dofile(menupath .. DIR_DELIM .. "tab_content.lua")
-tabs.credits  = dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
+tabs.about    = dofile(menupath .. DIR_DELIM .. "tab_about.lua")
 tabs.local_game = dofile(menupath .. DIR_DELIM .. "tab_local.lua")
 tabs.play_online = dofile(menupath .. DIR_DELIM .. "tab_online.lua")
 
@@ -97,7 +98,7 @@ local function init_globals()
 
 	tv_main:add(tabs.content)
 	tv_main:add(tabs.settings)
-	tv_main:add(tabs.credits)
+	tv_main:add(tabs.about)
 
 	tv_main:set_global_event_handler(main_event_handler)
 	tv_main:set_fixed_size(false)
diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua
index d4acb2b6a..58a4ed8c1 100644
--- a/builtin/mainmenu/pkgmgr.lua
+++ b/builtin/mainmenu/pkgmgr.lua
@@ -72,6 +72,34 @@ local function cleanup_path(temppath)
 	return temppath
 end
 
+local function load_texture_packs(txtpath, retval)
+	local list = core.get_dir_list(txtpath, true)
+	local current_texture_path = core.settings:get("texture_path")
+
+	for _, item in ipairs(list) do
+		if item ~= "base" then
+			local name = item
+
+			local path = txtpath .. DIR_DELIM .. item .. DIR_DELIM
+			if path == current_texture_path then
+				name = fgettext("$1 (Enabled)", name)
+			end
+
+			local conf = Settings(path .. "texture_pack.conf")
+
+			retval[#retval + 1] = {
+				name = item,
+				author = conf:get("author"),
+				release = tonumber(conf:get("release")) or 0,
+				list_name = name,
+				type = "txp",
+				path = path,
+				enabled = path == current_texture_path,
+			}
+		end
+	end
+end
+
 function get_mods(path,retval,modpack)
 	local mods = core.get_dir_list(path, true)
 
@@ -107,12 +135,12 @@ function get_mods(path,retval,modpack)
 			-- Read from config
 			toadd.name = name
 			toadd.author = mod_conf.author
-			toadd.release = tonumber(mod_conf.release or "0")
+			toadd.release = tonumber(mod_conf.release) or 0
 			toadd.path = prefix
 			toadd.type = "mod"
 
 			-- Check modpack.txt
-			--  Note: modpack.conf is already checked above
+			-- Note: modpack.conf is already checked above
 			local modpackfile = io.open(prefix .. DIR_DELIM .. "modpack.txt")
 			if modpackfile then
 				modpackfile:close()
@@ -136,32 +164,13 @@ pkgmgr = {}
 
 function pkgmgr.get_texture_packs()
 	local txtpath = core.get_texturepath()
-	local list = core.get_dir_list(txtpath, true)
+	local txtpath_system = core.get_texturepath_share()
 	local retval = {}
 
-	local current_texture_path = core.settings:get("texture_path")
-
-	for _, item in ipairs(list) do
-		if item ~= "base" then
-			local name = item
-
-			local path = txtpath .. DIR_DELIM .. item .. DIR_DELIM
-			if path == current_texture_path then
-				name = fgettext("$1 (Enabled)", name)
-			end
-
-			local conf = Settings(path .. "texture_pack.conf")
-
-			retval[#retval + 1] = {
-				name = item,
-				author = conf:get("author"),
-				release = tonumber(conf:get("release") or "0"),
-				list_name = name,
-				type = "txp",
-				path = path,
-				enabled = path == current_texture_path,
-			}
-		end
+	load_texture_packs(txtpath, retval)
+	-- on portable versions these two paths coincide. It avoids loading the path twice
+	if txtpath ~= txtpath_system then
+		load_texture_packs(txtpath_system, retval)
 	end
 
 	table.sort(retval, function(a, b)
@@ -404,18 +413,7 @@ function pkgmgr.is_modpack_entirely_enabled(data, name)
 end
 
 ---------- toggles or en/disables a mod or modpack and its dependencies --------
-function pkgmgr.enable_mod(this, toset)
-	local list = this.data.list:get_list()
-	local mod = list[this.data.selected_mod]
-
-	-- Game mods can't be enabled or disabled
-	if mod.is_game_content then
-		return
-	end
-
-	local toggled_mods = {}
-
-	local enabled_mods = {}
+local function toggle_mod_or_modpack(list, toggled_mods, enabled_mods, toset, mod)
 	if not mod.is_modpack then
 		-- Toggle or en/disable the mod
 		if toset == nil then
@@ -434,23 +432,29 @@ function pkgmgr.enable_mod(this, toset)
 		-- interleaved unsupported
 		for i = 1, #list do
 			if list[i].modpack == mod.name then
-				if toset == nil then
-					toset = not list[i].enabled
-				end
-				if list[i].enabled ~= toset then
-					list[i].enabled = toset
-					toggled_mods[#toggled_mods+1] = list[i].name
-				end
-				if toset then
-					enabled_mods[list[i].name] = true
-				end
+				toggle_mod_or_modpack(list, toggled_mods, enabled_mods, toset, list[i])
 			end
 		end
 	end
+end
+
+function pkgmgr.enable_mod(this, toset)
+	local list = this.data.list:get_list()
+	local mod = list[this.data.selected_mod]
+
+	-- Game mods can't be enabled or disabled
+	if mod.is_game_content then
+		return
+	end
+
+	local toggled_mods = {}
+	local enabled_mods = {}
+	toggle_mod_or_modpack(list, toggled_mods, enabled_mods, toset, mod)
+
 	if not toset then
 		-- Mod(s) were disabled, so no dependencies need to be enabled
 		table.sort(toggled_mods)
-		minetest.log("info", "Following mods were disabled: " ..
+		core.log("info", "Following mods were disabled: " ..
 			table.concat(toggled_mods, ", "))
 		return
 	end
@@ -487,7 +491,7 @@ function pkgmgr.enable_mod(this, toset)
 			enabled_mods[name] = true
 			local mod_to_enable = list[mod_ids[name]]
 			if not mod_to_enable then
-				minetest.log("warning", "Mod dependency \"" .. name ..
+				core.log("warning", "Mod dependency \"" .. name ..
 					"\" not found!")
 			else
 				if mod_to_enable.enabled == false then
@@ -508,7 +512,7 @@ function pkgmgr.enable_mod(this, toset)
 
 	-- Log the list of enabled mods
 	table.sort(toggled_mods)
-	minetest.log("info", "Following mods were enabled: " ..
+	core.log("info", "Following mods were enabled: " ..
 		table.concat(toggled_mods, ", "))
 end
 
diff --git a/builtin/mainmenu/serverlistmgr.lua b/builtin/mainmenu/serverlistmgr.lua
new file mode 100644
index 000000000..964d0c584
--- /dev/null
+++ b/builtin/mainmenu/serverlistmgr.lua
@@ -0,0 +1,252 @@
+--Minetest
+--Copyright (C) 2020 rubenwardy
+--
+--This program is free software; you can redistribute it and/or modify
+--it under the terms of the GNU Lesser General Public License as published by
+--the Free Software Foundation; either version 2.1 of the License, or
+--(at your option) any later version.
+--
+--This program is distributed in the hope that it will be useful,
+--but WITHOUT ANY WARRANTY; without even the implied warranty of
+--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--GNU Lesser General Public License for more details.
+--
+--You should have received a copy of the GNU Lesser General Public License along
+--with this program; if not, write to the Free Software Foundation, Inc.,
+--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+serverlistmgr = {}
+
+--------------------------------------------------------------------------------
+local function order_server_list(list)
+	local res = {}
+	--orders the favorite list after support
+	for i = 1, #list do
+		local fav = list[i]
+		if is_server_protocol_compat(fav.proto_min, fav.proto_max) then
+			res[#res + 1] = fav
+		end
+	end
+	for i = 1, #list do
+		local fav = list[i]
+		if not is_server_protocol_compat(fav.proto_min, fav.proto_max) then
+			res[#res + 1] = fav
+		end
+	end
+	return res
+end
+
+local public_downloading = false
+
+--------------------------------------------------------------------------------
+function serverlistmgr.sync()
+	if not serverlistmgr.servers then
+		serverlistmgr.servers = {{
+			name = fgettext("Loading..."),
+			description = fgettext_ne("Try reenabling public serverlist and check your internet connection.")
+		}}
+	end
+
+	local serverlist_url = core.settings:get("serverlist_url") or ""
+	if not core.get_http_api or serverlist_url == "" then
+		serverlistmgr.servers = {{
+			name = fgettext("Public server list is disabled"),
+			description = ""
+		}}
+		return
+	end
+
+	if public_downloading then
+		return
+	end
+	public_downloading = true
+
+	core.handle_async(
+		function(param)
+			local http = core.get_http_api()
+			local url = ("%s/list?proto_version_min=%d&proto_version_max=%d"):format(
+				core.settings:get("serverlist_url"),
+				core.get_min_supp_proto(),
+				core.get_max_supp_proto())
+
+			local response = http.fetch_sync({ url = url })
+			if not response.succeeded then
+				return {}
+			end
+
+			local retval = core.parse_json(response.data)
+			return retval and retval.list or {}
+		end,
+		nil,
+		function(result)
+			public_downloading = nil
+			local favs = order_server_list(result)
+			if favs[1] then
+				serverlistmgr.servers = favs
+			end
+			core.event_handler("Refresh")
+		end
+	)
+end
+
+--------------------------------------------------------------------------------
+local function get_favorites_path(folder)
+	local base = core.get_user_path() .. DIR_DELIM .. "client" .. DIR_DELIM .. "serverlist" .. DIR_DELIM
+	if folder then
+		return base
+	end
+	return base .. core.settings:get("serverlist_file")
+end
+
+--------------------------------------------------------------------------------
+local function save_favorites(favorites)
+	local filename = core.settings:get("serverlist_file")
+	-- If setting specifies legacy format change the filename to the new one
+	if filename:sub(#filename - 3):lower() == ".txt" then
+		core.settings:set("serverlist_file", filename:sub(1, #filename - 4) .. ".json")
+	end
+
+	assert(core.create_dir(get_favorites_path(true)))
+	core.safe_file_write(get_favorites_path(), core.write_json(favorites))
+end
+
+--------------------------------------------------------------------------------
+function serverlistmgr.read_legacy_favorites(path)
+	local file = io.open(path, "r")
+	if not file then
+		return nil
+	end
+
+	local lines = {}
+	for line in file:lines() do
+		lines[#lines + 1] = line
+	end
+	file:close()
+
+	local favorites = {}
+
+	local i = 1
+	while i < #lines do
+		local function pop()
+			local line = lines[i]
+			i = i + 1
+			return line and line:trim()
+		end
+
+		if pop():lower() == "[server]" then
+			local name = pop()
+			local address = pop()
+			local port = tonumber(pop())
+			local description = pop()
+
+			if name == "" then
+				name = nil
+			end
+
+			if description == "" then
+				description = nil
+			end
+
+			if not address or #address < 3 then
+				core.log("warning", "Malformed favorites file, missing address at line " .. i)
+			elseif not port or port < 1 or port > 65535 then
+				core.log("warning", "Malformed favorites file, missing port at line " .. i)
+			elseif (name and name:upper() == "[SERVER]") or
+					(address and address:upper() == "[SERVER]") or
+					(description and description:upper() == "[SERVER]") then
+				core.log("warning", "Potentially malformed favorites file, overran at line " .. i)
+			else
+				favorites[#favorites + 1] = {
+					name = name,
+					address = address,
+					port = port,
+					description = description
+				}
+			end
+		end
+	end
+
+	return favorites
+end
+
+--------------------------------------------------------------------------------
+local function read_favorites()
+	local path = get_favorites_path()
+
+	-- If new format configured fall back to reading the legacy file
+	if path:sub(#path - 4):lower() == ".json" then
+		local file = io.open(path, "r")
+		if file then
+			local json = file:read("*all")
+			file:close()
+			return core.parse_json(json)
+		end
+
+		path = path:sub(1, #path - 5) .. ".txt"
+	end
+
+	local favs = serverlistmgr.read_legacy_favorites(path)
+	if favs then
+		save_favorites(favs)
+		os.remove(path)
+	end
+	return favs
+end
+
+--------------------------------------------------------------------------------
+local function delete_favorite(favorites, del_favorite)
+	for i=1, #favorites do
+		local fav = favorites[i]
+
+		if fav.address == del_favorite.address and fav.port == del_favorite.port then
+			table.remove(favorites, i)
+			return
+		end
+	end
+end
+
+--------------------------------------------------------------------------------
+function serverlistmgr.get_favorites()
+	if serverlistmgr.favorites then
+		return serverlistmgr.favorites
+	end
+
+	serverlistmgr.favorites = {}
+
+	-- Add favorites, removing duplicates
+	local seen = {}
+	for _, fav in ipairs(read_favorites() or {}) do
+		local key = ("%s:%d"):format(fav.address:lower(), fav.port)
+		if not seen[key] then
+			seen[key] = true
+			serverlistmgr.favorites[#serverlistmgr.favorites + 1] = fav
+		end
+	end
+
+	return serverlistmgr.favorites
+end
+
+--------------------------------------------------------------------------------
+function serverlistmgr.add_favorite(new_favorite)
+	assert(type(new_favorite.port) == "number")
+
+	-- Whitelist favorite keys
+	new_favorite = {
+		name = new_favorite.name,
+		address = new_favorite.address,
+		port = new_favorite.port,
+		description = new_favorite.description,
+	}
+
+	local favorites = serverlistmgr.get_favorites()
+	delete_favorite(favorites, new_favorite)
+	table.insert(favorites, 1, new_favorite)
+	save_favorites(favorites)
+end
+
+--------------------------------------------------------------------------------
+function serverlistmgr.delete_favorite(del_favorite)
+	local favorites = serverlistmgr.get_favorites()
+	delete_favorite(favorites, del_favorite)
+	save_favorites(favorites)
+end
diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_about.lua
index 309a61858..cb566f773 100644
--- a/builtin/mainmenu/tab_credits.lua
+++ b/builtin/mainmenu/tab_about.lua
@@ -33,28 +33,37 @@ local core_developers = {
 	"Nathanaël Courant (Nore/Ekdohibs) <nore@mesecons.net>",
 	"Loic Blot (nerzhul/nrz) <loic.blot@unix-experience.fr>",
 	"paramat",
-	"Auke Kok (sofar) <sofar@foo-projects.org>",
 	"Andrew Ward (rubenwardy) <rw@rubenwardy.com>",
 	"Krock/SmallJoker <mk939@ymail.com>",
 	"Lars Hofhansl <larsh@apache.org>",
+	"Pierre-Yves Rollo <dev@pyrollo.com>",
+	"v-rob <robinsonvincent89@gmail.com>",
 }
 
+-- For updating active/previous contributors, see the script in ./util/gather_git_credits.py
+
 local active_contributors = {
-	"Hugues Ross [Formspecs]",
+	"Wuzzy [devtest game, visual corrections]",
+	"Zughy [Visual improvements, various fixes]",
 	"Maksim (MoNTE48) [Android]",
-	"DS [Formspecs]",
-	"pyrollo [Formspecs: Hypertext]",
-	"v-rob [Formspecs]",
-	"Jordach [set_sky]",
-	"random-geek [Formspecs]",
-	"Wuzzy [Pathfinder, builtin, translations]",
-	"ANAND (ClobberXD) [Fixes, per-player FOV]",
-	"Warr1024 [Fixes]",
-	"Paul Ouellette (pauloue) [Fixes, Script API]",
-	"Jean-Patrick G (kilbith) <jeanpatrick.guerrero@gmail.com> [Audiovisuals]",
-	"HybridDog [Script API]",
+	"numzero [Graphics and rendering]",
+	"appgurueu [Various internal fixes]",
+	"Desour [Formspec and vector API changes]",
+	"HybridDog [Rendering fixes and documentation]",
+	"Hugues Ross [Graphics-related improvements]",
+	"ANAND (ClobberXD) [Mouse buttons rebinding]",
+	"luk3yx [Fixes]",
+	"hecks [Audiovisuals, Lua API]",
+	"LoneWolfHT [Object crosshair, documentation fixes]",
+	"Lejo [Server-related improvements]",
+	"EvidenceB [Compass HUD element]",
+	"Paul Ouellette (pauloue) [Lua API, documentation]",
+	"TheTermos [Collision detection, physics]",
+	"David CARLIER [Unix & Haiku build fixes]",
 	"dcbrwn [Object shading]",
-	"srifqi [Fixes]",
+	"Elias Fleckenstein [API features/fixes]",
+	"Jean-Patrick Guerrero (kilbith) [model element, visual fixes]",
+	"k.h.lai [Memory leak fixes, documentation]",
 }
 
 local previous_core_developers = {
@@ -70,30 +79,23 @@ local previous_core_developers = {
 	"sapier",
 	"Zeno",
 	"ShadowNinja <shadowninja@minetest.net>",
+	"Auke Kok (sofar) <sofar@foo-projects.org>",
 }
 
 local previous_contributors = {
 	"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net> [Minetest Logo]",
-	"Dániel Juhász (juhdanad) <juhdanad@gmail.com>",
 	"red-001 <red-001@outlook.ie>",
-	"numberZero [Audiovisuals: meshgen]",
 	"Giuseppe Bilotta",
+	"Dániel Juhász (juhdanad) <juhdanad@gmail.com>",
 	"MirceaKitsune <mirceakitsune@gmail.com>",
 	"Constantin Wenger (SpeedProg)",
 	"Ciaran Gultnieks (CiaranG)",
 	"stujones11 [Android UX improvements]",
-	"Jeija <jeija@mesecons.net> [HTTP, particles]",
-	"Vincent Glize (Dumbeldor) [Cleanups, CSM APIs]",
-	"Ben Deutsch [Rendering, Fixes, SQLite auth]",
-	"TeTpaAka [Hand overriding, nametag colors]",
-	"Rui [Sound Pitch]",
-	"Duane Robertson <duane@duanerobertson.com> [MGValleys]",
-	"Raymoo [Tool Capabilities]",
 	"Rogier <rogier777@gmail.com> [Fixes]",
 	"Gregory Currie (gregorycu) [optimisation]",
-	"TriBlade9 <triblade9@mail.com> [Audiovisuals]",
-	"T4im [Profiler]",
-	"Jurgen Doser (doserj) <jurgen.doser@gmail.com>",
+	"srifqi [Fixes]",
+	"JacobF",
+	"Jeija <jeija@mesecons.net> [HTTP, particles]",
 }
 
 local function buildCreditList(source)
@@ -105,8 +107,8 @@ local function buildCreditList(source)
 end
 
 return {
-	name = "credits",
-	caption = fgettext("Credits"),
+	name = "about",
+	caption = fgettext("About"),
 	cbf_formspec = function(tabview, name, tabdata)
 		local logofile = defaulttexturedir .. "logo.png"
 		local version = core.get_version()
@@ -129,11 +131,16 @@ return {
 			buildCreditList(previous_contributors) .. "," ..
 			";1]"
 
+		-- Render information
+		fs = fs .. "label[0.75,4.9;" ..
+			fgettext("Active renderer:") .. "\n" ..
+			core.formspec_escape(core.get_screen_info().render_info) .. "]"
+
 		if PLATFORM ~= "Android" then
 			fs = fs .. "tooltip[userdata;" ..
 					fgettext("Opens the directory that contains user-provided worlds, games, mods,\n" ..
 							"and texture packs in a file manager / explorer.") .. "]"
-			fs = fs .. "button[0,4.75;3.5,1;userdata;" .. fgettext("Open User Data Directory") .. "]"
+			fs = fs .. "button[0,4;3.5,1;userdata;" .. fgettext("Open User Data Directory") .. "]"
 		end
 
 		return fs
diff --git a/builtin/mainmenu/tab_content.lua b/builtin/mainmenu/tab_content.lua
index a76fee864..1bffeeb22 100644
--- a/builtin/mainmenu/tab_content.lua
+++ b/builtin/mainmenu/tab_content.lua
@@ -206,15 +206,27 @@ local function get_formspec(tabview, name, tabdata)
 end
 
 --------------------------------------------------------------------------------
+local function handle_doubleclick(pkg, pkg_name)
+	if pkg.type == "txp" then
+		if core.settings:get("texture_path") == pkg.path then
+			core.settings:set("texture_path", "")
+		else
+			core.settings:set("texture_path", pkg.path)
+		end
+		packages = nil
+	elseif pkg.is_clientside then
+		pkgmgr.enable_mod({data = {list = packages, selected_mod = pkg_name}})
+		packages = nil
+	end
+end
+
+--------------------------------------------------------------------------------
 local function handle_buttons(tabview, fields, tabname, tabdata)
 	if fields["pkglist"] ~= nil then
 		local event = core.explode_table_event(fields["pkglist"])
 		tabdata.selected_pkg = event.row
-		local mod = packages:get_list()[tabdata.selected_pkg]
-
-		if event.type == "DCL" and mod.is_clientside then
-			pkgmgr.enable_mod({data = {list = packages, selected_mod = tabdata.selected_pkg}})
-			packages = nil
+		if event.type == "DCL" then
+			handle_doubleclick(packages:get_list()[tabdata.selected_pkg], tabdata.selected_pkg)
 		end
 		return true
 	end
diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua
index 2eb4752bc..0e06c3bef 100644
--- a/builtin/mainmenu/tab_local.lua
+++ b/builtin/mainmenu/tab_local.lua
@@ -116,7 +116,7 @@ local function get_formspec(tabview, name, tabdata)
 
 	retval = retval ..
 			"button[3.9,3.8;2.8,1;world_delete;".. fgettext("Delete") .. "]" ..
-			"button[6.55,3.8;2.8,1;world_configure;".. fgettext("Configure") .. "]" ..
+			"button[6.55,3.8;2.8,1;world_configure;".. fgettext("Select Mods") .. "]" ..
 			"button[9.2,3.8;2.8,1;world_create;".. fgettext("New") .. "]" ..
 			"label[3.9,-0.05;".. fgettext("Select World:") .. "]"..
 			"checkbox[0,-0.20;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
index 8f1341161..fb7409864 100644
--- a/builtin/mainmenu/tab_online.lua
+++ b/builtin/mainmenu/tab_online.lua
@@ -15,17 +15,50 @@
 --with this program; if not, write to the Free Software Foundation, Inc.,
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
---------------------------------------------------------------------------------
+local function get_sorted_servers()
+	local servers = {
+		fav = {},
+		public = {},
+		incompatible = {}
+	}
+
+	local favs = serverlistmgr.get_favorites()
+	local taken_favs = {}
+	local result = menudata.search_result or serverlistmgr.servers
+	for _, server in ipairs(result) do
+		server.is_favorite = false
+		for index, fav in ipairs(favs) do
+			if server.address == fav.address and server.port == fav.port then
+				taken_favs[index] = true
+				server.is_favorite = true
+				break
+			end
+		end
+		server.is_compatible = is_server_protocol_compat(server.proto_min, server.proto_max)
+		if server.is_favorite then
+			table.insert(servers.fav, server)
+		elseif server.is_compatible then
+			table.insert(servers.public, server)
+		else
+			table.insert(servers.incompatible, server)
+		end
+	end
+
+	if not menudata.search_result then
+		for index, fav in ipairs(favs) do
+			if not taken_favs[index] then
+				table.insert(servers.fav, fav)
+			end
+		end
+	end
+
+	return servers
+end
+
 local function get_formspec(tabview, name, tabdata)
 	-- Update the cached supported proto info,
 	-- it may have changed after a change by the settings menu.
 	common_update_cached_supp_proto()
-	local fav_selected
-	if menudata.search_result then
-		fav_selected = menudata.search_result[tabdata.fav_selected]
-	else
-		fav_selected = menudata.favorites[tabdata.fav_selected]
-	end
 
 	if not tabdata.search_for then
 		tabdata.search_for = ""
@@ -33,129 +66,221 @@ local function get_formspec(tabview, name, tabdata)
 
 	local retval =
 		-- Search
-		"field[0.15,0.075;5.91,1;te_search;;" .. core.formspec_escape(tabdata.search_for) .. "]" ..
-		"image_button[5.63,-.165;.83,.83;" .. core.formspec_escape(defaulttexturedir .. "search.png") .. ";btn_mp_search;]" ..
-		"image_button[6.3,-.165;.83,.83;" .. core.formspec_escape(defaulttexturedir .. "clear.png") .. ";btn_mp_clear;]" ..
-		"image_button[6.97,-.165;.83,.83;" .. core.formspec_escape(defaulttexturedir .. "refresh.png")
-			.. ";btn_mp_refresh;]" ..
+		"field[0.25,0.25;7,0.75;te_search;;" .. core.formspec_escape(tabdata.search_for) .. "]" ..
+		"container[7.25,0.25]" ..
+		"image_button[0,0;0.75,0.75;" .. core.formspec_escape(defaulttexturedir .. "search.png") .. ";btn_mp_search;]" ..
+		"image_button[0.75,0;0.75,0.75;" .. core.formspec_escape(defaulttexturedir .. "clear.png") .. ";btn_mp_clear;]" ..
+		"image_button[1.5,0;0.75,0.75;" .. core.formspec_escape(defaulttexturedir .. "refresh.png") .. ";btn_mp_refresh;]" ..
+		"tooltip[btn_mp_clear;" .. fgettext("Clear") .. "]" ..
+		"tooltip[btn_mp_search;" .. fgettext("Search") .. "]" ..
+		"tooltip[btn_mp_refresh;" .. fgettext("Refresh") .. "]" ..
+		"container_end[]" ..
+
+		"container[9.75,0]" ..
+		"box[0,0;5.75,7;#666666]" ..
 
 		-- Address / Port
-		"label[7.75,-0.25;" .. fgettext("Address / Port") .. "]" ..
-		"field[8,0.65;3.25,0.5;te_address;;" ..
+		"label[0.25,0.35;" .. fgettext("Address") .. "]" ..
+		"label[4.25,0.35;" .. fgettext("Port") .. "]" ..
+		"field[0.25,0.5;4,0.75;te_address;;" ..
 			core.formspec_escape(core.settings:get("address")) .. "]" ..
-		"field[11.1,0.65;1.4,0.5;te_port;;" ..
+		"field[4.25,0.5;1.25,0.75;te_port;;" ..
 			core.formspec_escape(core.settings:get("remote_port")) .. "]" ..
 
 		-- Name / Password
-		"label[7.75,0.95;" .. fgettext("Name / Password") .. "]" ..
-		"field[8,1.85;2.9,0.5;te_name;;" ..
+		"label[0.25,1.55;" .. fgettext("Name") .. "]" ..
+		"label[3,1.55;" .. fgettext("Password") .. "]" ..
+		"field[0.25,1.75;2.75,0.75;te_name;;" ..
 			core.formspec_escape(core.settings:get("name")) .. "]" ..
-		"pwdfield[10.73,1.85;1.77,0.5;te_pwd;]" ..
+		"pwdfield[3,1.75;2.5,0.75;te_pwd;]" ..
 
 		-- Description Background
-		"box[7.73,2.25;4.25,2.6;#999999]"..
+		"label[0.25,2.75;" .. fgettext("Server Description") .. "]" ..
+		"box[0.25,3;5.25,2.75;#999999]"..
 
 		-- Connect
-		"button[9.88,4.9;2.3,1;btn_mp_connect;" .. fgettext("Connect") .. "]"
+		"button[3,6;2.5,0.75;btn_mp_connect;" .. fgettext("Connect") .. "]"
 
-	if tabdata.fav_selected and fav_selected then
+	if tabdata.selected then
 		if gamedata.fav then
-			retval = retval .. "button[7.73,4.9;2.3,1;btn_delete_favorite;" ..
+			retval = retval .. "button[0.25,6;2.5,0.75;btn_delete_favorite;" ..
 				fgettext("Del. Favorite") .. "]"
 		end
-		if fav_selected.description then
-			retval = retval .. "textarea[8.1,2.3;4.23,2.9;;;" ..
-				core.formspec_escape((gamedata.serverdescription or ""), true) .. "]"
+		if gamedata.serverdescription then
+			retval = retval .. "textarea[0.25,3;5.25,2.75;;;" ..
+				core.formspec_escape(gamedata.serverdescription) .. "]"
 		end
 	end
 
-	--favourites
+	retval = retval .. "container_end[]"
+
+	-- Table
 	retval = retval .. "tablecolumns[" ..
-		image_column(fgettext("Favorite"), "favorite") .. ";" ..
-		image_column(fgettext("Ping")) .. ",padding=0.25;" ..
-		"color,span=3;" ..
-		"text,align=right;" ..                -- clients
-		"text,align=center,padding=0.25;" ..  -- "/"
-		"text,align=right,padding=0.25;" ..   -- clients_max
-		image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" ..
-		image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" ..
-		--~ PvP = Player versus Player
-		image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
+		"image,tooltip=" .. fgettext("Ping") .. "," ..
+		"0=" .. core.formspec_escape(defaulttexturedir .. "blank.png") .. "," ..
+		"1=" .. core.formspec_escape(defaulttexturedir .. "server_ping_4.png") .. "," ..
+		"2=" .. core.formspec_escape(defaulttexturedir .. "server_ping_3.png") .. "," ..
+		"3=" .. core.formspec_escape(defaulttexturedir .. "server_ping_2.png") .. "," ..
+		"4=" .. core.formspec_escape(defaulttexturedir .. "server_ping_1.png") .. "," ..
+		"5=" .. core.formspec_escape(defaulttexturedir .. "server_favorite.png") .. "," ..
+		"6=" .. core.formspec_escape(defaulttexturedir .. "server_public.png") .. "," ..
+		"7=" .. core.formspec_escape(defaulttexturedir .. "server_incompatible.png") .. ";" ..
 		"color,span=1;" ..
-		"text,padding=1]" ..
-		"table[-0.15,0.6;7.75,5.15;favourites;"
-
-	if menudata.search_result then
-		for i = 1, #menudata.search_result do
-			local favs = core.get_favorites("local")
-			local server = menudata.search_result[i]
-
-			for fav_id = 1, #favs do
-				if server.address == favs[fav_id].address and
-						server.port == favs[fav_id].port then
-					server.is_favorite = true
-				end
+		"text,align=inline;"..
+		"color,span=1;" ..
+		"text,align=inline,width=4.25;" ..
+		"image,tooltip=" .. fgettext("Creative mode") .. "," ..
+		"0=" .. core.formspec_escape(defaulttexturedir .. "blank.png") .. "," ..
+		"1=" .. core.formspec_escape(defaulttexturedir .. "server_flags_creative.png") .. "," ..
+		"align=inline,padding=0.25,width=1.5;" ..
+		--~ PvP = Player versus Player
+		"image,tooltip=" .. fgettext("Damage / PvP") .. "," ..
+		"0=" .. core.formspec_escape(defaulttexturedir .. "blank.png") .. "," ..
+		"1=" .. core.formspec_escape(defaulttexturedir .. "server_flags_damage.png") .. "," ..
+		"2=" .. core.formspec_escape(defaulttexturedir .. "server_flags_pvp.png") .. "," ..
+		"align=inline,padding=0.25,width=1.5;" ..
+		"color,align=inline,span=1;" ..
+		"text,align=inline,padding=1]" ..
+		"table[0.25,1;9.25,5.75;servers;"
+
+	local servers = get_sorted_servers()
+
+	local dividers = {
+		fav = "5,#ffff00," .. fgettext("Favorites") .. ",,,0,0,,",
+		public = "6,#4bdd42," .. fgettext("Public Servers") .. ",,,0,0,,",
+		incompatible = "7,"..mt_color_grey.."," .. fgettext("Incompatible Servers") .. ",,,0,0,,"
+	}
+	local order = {"fav", "public", "incompatible"}
+
+	tabdata.lookup = {} -- maps row number to server
+	local rows = {}
+	for _, section in ipairs(order) do
+		local section_servers = servers[section]
+		if next(section_servers) ~= nil then
+			rows[#rows + 1] = dividers[section]
+			for _, server in ipairs(section_servers) do
+				tabdata.lookup[#rows + 1] = server
+				rows[#rows + 1] = render_serverlist_row(server)
 			end
+		end
+	end
 
-			if i ~= 1 then
-				retval = retval .. ","
-			end
+	retval = retval .. table.concat(rows, ",")
 
-			retval = retval .. render_serverlist_row(server, server.is_favorite)
-		end
-	elseif #menudata.favorites > 0 then
-		local favs = core.get_favorites("local")
-		if #favs > 0 then
-			for i = 1, #favs do
-			for j = 1, #menudata.favorites do
-				if menudata.favorites[j].address == favs[i].address and
-						menudata.favorites[j].port == favs[i].port then
-					table.insert(menudata.favorites, i, table.remove(menudata.favorites, j))
-				end
+	if tabdata.selected then
+		retval = retval .. ";" .. tabdata.selected .. "]"
+	else
+		retval = retval .. ";0]"
+	end
+
+	return retval, "size[15.5,7,false]real_coordinates[true]"
+end
+
+--------------------------------------------------------------------------------
+
+local function search_server_list(input)
+	menudata.search_result = nil
+	if #serverlistmgr.servers < 2 then
+		return
+	end
+
+	-- setup the keyword list
+	local keywords = {}
+	for word in input:gmatch("%S+") do
+		word = word:gsub("(%W)", "%%%1")
+		table.insert(keywords, word)
+	end
+
+	if #keywords == 0 then
+		return
+	end
+
+	menudata.search_result = {}
+
+	-- Search the serverlist
+	local search_result = {}
+	for i = 1, #serverlistmgr.servers do
+		local server = serverlistmgr.servers[i]
+		local found = 0
+		for k = 1, #keywords do
+			local keyword = keywords[k]
+			if server.name then
+				local sername = server.name:lower()
+				local _, count = sername:gsub(keyword, keyword)
+				found = found + count * 4
 			end
-				if favs[i].address ~= menudata.favorites[i].address then
-					table.insert(menudata.favorites, i, favs[i])
-				end
+
+			if server.description then
+				local desc = server.description:lower()
+				local _, count = desc:gsub(keyword, keyword)
+				found = found + count * 2
 			end
 		end
-		retval = retval .. render_serverlist_row(menudata.favorites[1], (#favs > 0))
-		for i = 2, #menudata.favorites do
-			retval = retval .. "," .. render_serverlist_row(menudata.favorites[i], (i <= #favs))
+		if found > 0 then
+			local points = (#serverlistmgr.servers - i) / 5 + found
+			server.points = points
+			table.insert(search_result, server)
 		end
 	end
 
-	if tabdata.fav_selected then
-		retval = retval .. ";" .. tabdata.fav_selected .. "]"
-	else
-		retval = retval .. ";0]"
+	if #search_result == 0 then
+		return
 	end
 
-	return retval
+	table.sort(search_result, function(a, b)
+		return a.points > b.points
+	end)
+	menudata.search_result = search_result
 end
 
---------------------------------------------------------------------------------
-local function main_button_handler(tabview, fields, name, tabdata)
-	local serverlist = menudata.search_result or menudata.favorites
+local function set_selected_server(tabdata, idx, server)
+	-- reset selection
+	if idx == nil or server == nil then
+		tabdata.selected = nil
+
+		core.settings:set("address", "")
+		core.settings:set("remote_port", "30000")
+		return
+	end
+
+	local address = server.address
+	local port    = server.port
+	gamedata.serverdescription = server.description
 
+	gamedata.fav = false
+	for _, fav in ipairs(serverlistmgr.get_favorites()) do
+		if address == fav.address and port == fav.port then
+			gamedata.fav = true
+			break
+		end
+	end
+
+	if address and port then
+		core.settings:set("address", address)
+		core.settings:set("remote_port", port)
+	end
+	tabdata.selected = idx
+end
+
+local function main_button_handler(tabview, fields, name, tabdata)
 	if fields.te_name then
 		gamedata.playername = fields.te_name
 		core.settings:set("name", fields.te_name)
 	end
 
-	if fields.favourites then
-		local event = core.explode_table_event(fields.favourites)
-		local fav = serverlist[event.row]
+	if fields.servers then
+		local event = core.explode_table_event(fields.servers)
+		local server = tabdata.lookup[event.row]
 
-		if event.type == "DCL" then
-			if event.row <= #serverlist then
-				if menudata.favorites_is_public and
-						not is_server_protocol_compat_or_error(
-							fav.proto_min, fav.proto_max) then
+		if server then
+			if event.type == "DCL" then
+				if not is_server_protocol_compat_or_error(
+							server.proto_min, server.proto_max) then
 					return true
 				end
 
-				gamedata.address    = fav.address
-				gamedata.port       = fav.port
+				gamedata.address    = server.address
+				gamedata.port       = server.port
 				gamedata.playername = fields.te_name
 				gamedata.selected_world = 0
 
@@ -163,84 +288,32 @@ local function main_button_handler(tabview, fields, name, tabdata)
 					gamedata.password = fields.te_pwd
 				end
 
-				gamedata.servername        = fav.name
-				gamedata.serverdescription = fav.description
+				gamedata.servername        = server.name
+				gamedata.serverdescription = server.description
 
 				if gamedata.address and gamedata.port then
 					core.settings:set("address", gamedata.address)
 					core.settings:set("remote_port", gamedata.port)
 					core.start()
 				end
+				return true
 			end
-			return true
-		end
-
-		if event.type == "CHG" then
-			if event.row <= #serverlist then
-				gamedata.fav = false
-				local favs = core.get_favorites("local")
-				local address = fav.address
-				local port    = fav.port
-				gamedata.serverdescription = fav.description
-
-				for i = 1, #favs do
-					if fav.address == favs[i].address and
-							fav.port == favs[i].port then
-						gamedata.fav = true
-					end
-				end
-
-				if address and port then
-					core.settings:set("address", address)
-					core.settings:set("remote_port", port)
-				end
-				tabdata.fav_selected = event.row
+			if event.type == "CHG" then
+				set_selected_server(tabdata, event.row, server)
+				return true
 			end
-			return true
 		end
 	end
 
-	if fields.key_up or fields.key_down then
-		local fav_idx = core.get_table_index("favourites")
-		local fav = serverlist[fav_idx]
-
-		if fav_idx then
-			if fields.key_up and fav_idx > 1 then
-				fav_idx = fav_idx - 1
-			elseif fields.key_down and fav_idx < #menudata.favorites then
-				fav_idx = fav_idx + 1
-			end
-		else
-			fav_idx = 1
-		end
-
-		if not menudata.favorites or not fav then
-			tabdata.fav_selected = 0
-			return true
-		end
-
-		local address = fav.address
-		local port    = fav.port
-		gamedata.serverdescription = fav.description
-		if address and port then
-			core.settings:set("address", address)
-			core.settings:set("remote_port", port)
-		end
-
-		tabdata.fav_selected = fav_idx
-		return true
-	end
-
 	if fields.btn_delete_favorite then
-		local current_favourite = core.get_table_index("favourites")
-		if not current_favourite then return end
-
-		core.delete_favorite(current_favourite)
-		asyncOnlineFavourites()
-		tabdata.fav_selected = nil
-
-		core.settings:set("address", "")
-		core.settings:set("remote_port", "30000")
+		local idx = core.get_table_index("servers")
+		if not idx then return end
+		local server = tabdata.lookup[idx]
+		if not server then return end
+
+		serverlistmgr.delete_favorite(server)
+		-- the server at [idx+1] will be at idx once list is refreshed
+		set_selected_server(tabdata, idx, tabdata.lookup[idx+1])
 		return true
 	end
 
@@ -251,68 +324,18 @@ local function main_button_handler(tabview, fields, name, tabdata)
 	end
 
 	if fields.btn_mp_search or fields.key_enter_field == "te_search" then
-		tabdata.fav_selected = 1
-		local input = fields.te_search:lower()
 		tabdata.search_for = fields.te_search
-
-		if #menudata.favorites < 2 then
-			return true
+		search_server_list(fields.te_search:lower())
+		if menudata.search_result then
+			-- first server in row 2 due to header
+			set_selected_server(tabdata, 2, menudata.search_result[1])
 		end
 
-		menudata.search_result = {}
-
-		-- setup the keyword list
-		local keywords = {}
-		for word in input:gmatch("%S+") do
-			word = word:gsub("(%W)", "%%%1")
-			table.insert(keywords, word)
-		end
-
-		if #keywords == 0 then
-			menudata.search_result = nil
-			return true
-		end
-
-		-- Search the serverlist
-		local search_result = {}
-		for i = 1, #menudata.favorites do
-			local server = menudata.favorites[i]
-			local found = 0
-			for k = 1, #keywords do
-				local keyword = keywords[k]
-				if server.name then
-					local sername = server.name:lower()
-					local _, count = sername:gsub(keyword, keyword)
-					found = found + count * 4
-				end
-
-				if server.description then
-					local desc = server.description:lower()
-					local _, count = desc:gsub(keyword, keyword)
-					found = found + count * 2
-				end
-			end
-			if found > 0 then
-				local points = (#menudata.favorites - i) / 5 + found
-				server.points = points
-				table.insert(search_result, server)
-			end
-		end
-		if #search_result > 0 then
-			table.sort(search_result, function(a, b)
-				return a.points > b.points
-			end)
-			menudata.search_result = search_result
-			local first_server = search_result[1]
-			core.settings:set("address",     first_server.address)
-			core.settings:set("remote_port", first_server.port)
-			gamedata.serverdescription = first_server.description
-		end
 		return true
 	end
 
 	if fields.btn_mp_refresh then
-		asyncOnlineFavourites()
+		serverlistmgr.sync()
 		return true
 	end
 
@@ -321,43 +344,51 @@ local function main_button_handler(tabview, fields, name, tabdata)
 		gamedata.playername = fields.te_name
 		gamedata.password   = fields.te_pwd
 		gamedata.address    = fields.te_address
-		gamedata.port       = fields.te_port
+		gamedata.port       = tonumber(fields.te_port)
 		gamedata.selected_world = 0
-		local fav_idx = core.get_table_index("favourites")
-		local fav = serverlist[fav_idx]
 
-		if fav_idx and fav_idx <= #serverlist and
-				fav.address == fields.te_address and
-				fav.port    == fields.te_port then
+		local idx = core.get_table_index("servers")
+		local server = idx and tabdata.lookup[idx]
 
-			gamedata.servername        = fav.name
-			gamedata.serverdescription = fav.description
+		set_selected_server(tabdata)
 
-			if menudata.favorites_is_public and
-					not is_server_protocol_compat_or_error(
-						fav.proto_min, fav.proto_max) then
+		if server and server.address == gamedata.address and
+				server.port == gamedata.port then
+
+			serverlistmgr.add_favorite(server)
+
+			gamedata.servername        = server.name
+			gamedata.serverdescription = server.description
+
+			if not is_server_protocol_compat_or_error(
+						server.proto_min, server.proto_max) then
 				return true
 			end
 		else
 			gamedata.servername        = ""
 			gamedata.serverdescription = ""
+
+			serverlistmgr.add_favorite({
+				address = gamedata.address,
+				port = gamedata.port,
+			})
 		end
 
-		core.settings:set("address",     fields.te_address)
-		core.settings:set("remote_port", fields.te_port)
+		core.settings:set("address",     gamedata.address)
+		core.settings:set("remote_port", gamedata.port)
 
 		core.start()
 		return true
 	end
+
 	return false
 end
 
 local function on_change(type, old_tab, new_tab)
 	if type == "LEAVE" then return end
-	asyncOnlineFavourites()
+	serverlistmgr.sync()
 end
 
---------------------------------------------------------------------------------
 return {
 	name = "online",
 	caption = fgettext("Join Game"),
diff --git a/builtin/mainmenu/tests/favorites_wellformed.txt b/builtin/mainmenu/tests/favorites_wellformed.txt
new file mode 100644
index 000000000..8b87b4398
--- /dev/null
+++ b/builtin/mainmenu/tests/favorites_wellformed.txt
@@ -0,0 +1,29 @@
+[server]
+
+127.0.0.1
+30000
+
+
+[server]
+
+localhost
+30000
+
+
+[server]
+
+vps.rubenwardy.com
+30001
+
+
+[server]
+
+gundul.ddnss.de
+39155
+
+
+[server]
+VanessaE's Dreambuilder creative Server
+daconcepts.com
+30000
+VanessaE's Dreambuilder creative-mode server. Lots of mods, whitelisted buckets.
diff --git a/builtin/mainmenu/tests/serverlistmgr_spec.lua b/builtin/mainmenu/tests/serverlistmgr_spec.lua
new file mode 100644
index 000000000..148e9b794
--- /dev/null
+++ b/builtin/mainmenu/tests/serverlistmgr_spec.lua
@@ -0,0 +1,36 @@
+_G.core = {}
+_G.unpack = table.unpack
+_G.serverlistmgr = {}
+
+dofile("builtin/common/misc_helpers.lua")
+dofile("builtin/mainmenu/serverlistmgr.lua")
+
+local base = "builtin/mainmenu/tests/"
+
+describe("legacy favorites", function()
+	it("loads well-formed correctly", function()
+		local favs = serverlistmgr.read_legacy_favorites(base .. "favorites_wellformed.txt")
+
+		local expected = {
+			{
+				address = "127.0.0.1",
+				port = 30000,
+			},
+
+			{ address = "localhost", port = 30000 },
+
+			{ address = "vps.rubenwardy.com", port = 30001 },
+
+			{ address = "gundul.ddnss.de", port = 39155 },
+
+			{
+				address = "daconcepts.com",
+				port = 30000,
+				name = "VanessaE's Dreambuilder creative Server",
+				description = "VanessaE's Dreambuilder creative-mode server. Lots of mods, whitelisted buckets."
+			},
+		}
+
+		assert.same(expected, favs)
+	end)
+end)
diff --git a/builtin/profiler/init.lua b/builtin/profiler/init.lua
index a0033d752..7f63dfaea 100644
--- a/builtin/profiler/init.lua
+++ b/builtin/profiler/init.lua
@@ -15,6 +15,8 @@
 --with this program; if not, write to the Free Software Foundation, Inc.,
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+local S = core.get_translator("__builtin")
+
 local function get_bool_default(name, default)
 	local val = core.settings:get_bool(name)
 	if val == nil then
@@ -40,9 +42,9 @@ function profiler.init_chatcommand()
 		instrumentation.init_chatcommand()
 	end
 
-	local param_usage = "print [filter] | dump [filter] | save [format [filter]] | reset"
+	local param_usage = S("print [<filter>] | dump [<filter>] | save [<format> [<filter>]] | reset")
 	core.register_chatcommand("profiler", {
-		description = "handle the profiler and profiling data",
+		description = S("Handle the profiler and profiling data"),
 		params = param_usage,
 		privs = { server=true },
 		func = function(name, param)
@@ -51,21 +53,19 @@ function profiler.init_chatcommand()
 
 			if command == "dump" then
 				core.log("action", reporter.print(sampler.profile, arg0))
-				return true, "Statistics written to action log"
+				return true, S("Statistics written to action log.")
 			elseif command == "print" then
 				return true, reporter.print(sampler.profile, arg0)
 			elseif command == "save" then
 				return reporter.save(sampler.profile, args[1] or "txt", args[2])
 			elseif command == "reset" then
 				sampler.reset()
-				return true, "Statistics were reset"
+				return true, S("Statistics were reset.")
 			end
 
-			return false, string.format(
-				"Usage: %s\n" ..
-				"Format can be one of txt, csv, lua, json, json_pretty (structures may be subject to change).",
-				param_usage
-			)
+			return false,
+				S("Usage: @1", param_usage) .. "\n" ..
+				S("Format can be one of txt, csv, lua, json, json_pretty (structures may be subject to change).")
 		end
 	})
 
diff --git a/builtin/profiler/reporter.lua b/builtin/profiler/reporter.lua
index fed47a36b..5928a3718 100644
--- a/builtin/profiler/reporter.lua
+++ b/builtin/profiler/reporter.lua
@@ -15,6 +15,10 @@
 --with this program; if not, write to the Free Software Foundation, Inc.,
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+local S = core.get_translator("__builtin")
+-- Note: In this file, only messages are translated
+-- but not the table itself, to keep it simple.
+
 local DIR_DELIM, LINE_DELIM = DIR_DELIM, "\n"
 local table, unpack, string, pairs, io, os = table, unpack, string, pairs, io, os
 local rep, sprintf, tonumber = string.rep, string.format, tonumber
@@ -104,11 +108,11 @@ local TxtFormatter = Formatter:new {
 	end,
 	format = function(self, filter)
 		local profile = self.profile
-		self:print("Values below show absolute/relative times spend per server step by the instrumented function.")
-		self:print("A total of %d samples were taken", profile.stats_total.samples)
+		self:print(S("Values below show absolute/relative times spend per server step by the instrumented function."))
+		self:print(S("A total of @1 sample(s) were taken.", profile.stats_total.samples))
 
 		if filter then
-			self:print("The output is limited to '%s'", filter)
+			self:print(S("The output is limited to '@1'.", filter))
 		end
 
 		self:print()
@@ -259,19 +263,18 @@ function reporter.save(profile, format, filter)
 
 	local output, io_err = io.open(path, "w")
 	if not output then
-		return false, "Saving of profile failed with: " .. io_err
+		return false, S("Saving of profile failed: @1", io_err)
 	end
 	local content, err = serialize_profile(profile, format, filter)
 	if not content then
 		output:close()
-		return false, "Saving of profile failed with: " .. err
+		return false, S("Saving of profile failed: @1", err)
 	end
 	output:write(content)
 	output:close()
 
-	local logmessage = "Profile saved to " .. path
-	core.log("action", logmessage)
-	return true, logmessage
+	core.log("action", "Profile saved to " .. path)
+	return true, S("Profile saved to @1", path)
 end
 
 return reporter
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 39a6f7231..4c9d3f15b 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -75,7 +75,7 @@ free_move (Flying) bool false
 #    If enabled, makes move directions relative to the player's pitch when flying or swimming.
 pitch_move (Pitch move mode) bool false
 
-#    Fast movement (via the "special" key).
+#    Fast movement (via the "Aux1" key).
 #    This requires the "fast" privilege on the server.
 fast_move (Fast movement) bool false
 
@@ -99,14 +99,14 @@ invert_mouse (Invert mouse) bool false
 #    Mouse sensitivity multiplier.
 mouse_sensitivity (Mouse sensitivity) float 0.2
 
-#    If enabled, "special" key instead of "sneak" key is used for climbing down and
+#    If enabled, "Aux1" key instead of "Sneak" key is used for climbing down and
 #    descending.
-aux1_descends (Special key for climbing/descending) bool false
+aux1_descends (Aux1 key for climbing/descending) bool false
 
 #    Double-tapping the jump key toggles fly mode.
 doubletap_jump (Double tap jump for fly) bool false
 
-#    If disabled, "special" key is used to fly fast if both fly and fast mode are
+#    If disabled, "Aux1" key is used to fly fast if both fly and fast mode are
 #    enabled.
 always_fly_fast (Always fly and fast) bool true
 
@@ -135,9 +135,9 @@ touchscreen_threshold (Touch screen threshold) int 20 0 100
 #    If disabled, virtual joystick will center to first-touch's position.
 fixed_virtual_joystick (Fixed virtual joystick) bool false
 
-#    (Android) Use virtual joystick to trigger "aux" button.
-#    If enabled, virtual joystick will also tap "aux" button when out of main circle.
-virtual_joystick_triggers_aux (Virtual joystick triggers aux button) bool false
+#    (Android) Use virtual joystick to trigger "Aux1" button.
+#    If enabled, virtual joystick will also tap "Aux1" button when out of main circle.
+virtual_joystick_triggers_aux1 (Virtual joystick triggers Aux1 button) bool false
 
 #    Enable joysticks
 enable_joysticks (Enable joysticks) bool false
@@ -203,7 +203,7 @@ keymap_special_inventory (Special inventory key) key KEY_KEY_O
 
 #    Key for moving fast in fast mode.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
-keymap_special1 (Special key) key KEY_KEY_E
+keymap_aux1 (Aux1 key) key KEY_KEY_E
 
 #    Key for opening the chat window.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
@@ -463,6 +463,10 @@ keymap_decrease_viewing_range_min (View range decrease key) key -
 
 [**Basic]
 
+#    Whether nametag backgrounds should be shown by default.
+#    Mods may still set a background.
+show_nametag_backgrounds (Show nametag backgrounds by default) bool true
+
 #    Enable vertex buffer objects.
 #    This should greatly improve graphics performance.
 enable_vbo (VBO) bool true
@@ -512,18 +516,17 @@ bilinear_filter (Bilinear filtering) bool false
 trilinear_filter (Trilinear filtering) bool false
 
 #    Filtered textures can blend RGB values with fully-transparent neighbors,
-#    which PNG optimizers usually discard, sometimes resulting in a dark or
-#    light edge to transparent textures. Apply this filter to clean that up
-#    at texture load time.
+#    which PNG optimizers usually discard, often resulting in dark or
+#    light edges to transparent textures. Apply a filter to clean that up
+#    at texture load time. This is automatically enabled if mipmapping is enabled.
 texture_clean_transparent (Clean transparent textures) bool false
 
 #    When using bilinear/trilinear/anisotropic filters, low-resolution textures
 #    can be blurred, so automatically upscale them with nearest-neighbor
 #    interpolation to preserve crisp pixels. This sets the minimum texture size
 #    for the upscaled textures; higher values look sharper, but require more
-#    memory.  Powers of 2 are recommended. Setting this higher than 1 may not
-#    have a visible effect unless bilinear/trilinear/anisotropic filtering is
-#    enabled.
+#    memory.  Powers of 2 are recommended. This setting is ONLY applies if
+#    bilinear/trilinear/anisotropic filtering is enabled.
 #    This is also used as the base node texture size for world-aligned
 #    texture autoscaling.
 texture_min_size (Minimum texture size) int 64
@@ -670,7 +673,7 @@ lighting_boost_spread (Light curve boost spread) float 0.2 0.0 0.4
 #    Path to texture directory. All textures are first searched from here.
 texture_path (Texture path) path
 
-#    The rendering back-end for Irrlicht.
+#    The rendering back-end.
 #    A restart is required after changing this.
 #    Note: On Android, stick with OGLES1 if unsure! App may fail to start otherwise.
 #    On other platforms, OpenGL is recommended.
@@ -867,7 +870,7 @@ font_path (Regular font path) filepath fonts/Arimo-Regular.ttf
 
 font_path_bold (Bold font path) filepath fonts/Arimo-Bold.ttf
 font_path_italic (Italic font path) filepath fonts/Arimo-Italic.ttf
-font_path_bolditalic (Bold and italic font path) filepath fonts/Arimo-BoldItalic.ttf
+font_path_bold_italic (Bold and italic font path) filepath fonts/Arimo-BoldItalic.ttf
 
 #    Font size of the monospace font in point (pt).
 mono_font_size (Monospace font size) int 15 1
@@ -880,16 +883,7 @@ mono_font_path (Monospace font path) filepath fonts/Cousine-Regular.ttf
 
 mono_font_path_bold (Bold monospace font path) filepath fonts/Cousine-Bold.ttf
 mono_font_path_italic (Italic monospace font path) filepath fonts/Cousine-Italic.ttf
-mono_font_path_bolditalic (Bold and italic monospace font path) filepath fonts/Cousine-BoldItalic.ttf
-
-#    Font size of the fallback font in point (pt).
-fallback_font_size (Fallback font size) int 15 1
-
-#    Shadow offset (in pixels) of the fallback font. If 0, then shadow will not be drawn.
-fallback_font_shadow (Fallback font shadow) int 1
-
-#    Opaqueness (alpha) of the shadow behind the fallback font, between 0 and 255.
-fallback_font_shadow_alpha (Fallback font shadow alpha) int 128 0 255
+mono_font_path_bold_italic (Bold and italic monospace font path) filepath fonts/Cousine-BoldItalic.ttf
 
 #    Path of the fallback font.
 #    If “freetype� setting is enabled: Must be a TrueType font.
@@ -976,7 +970,7 @@ serverlist_url (Serverlist URL) string servers.minetest.net
 
 #    File in client/serverlist/ that contains your favorite servers displayed in the
 #    Multiplayer Tab.
-serverlist_file (Serverlist file) string favoriteservers.txt
+serverlist_file (Serverlist file) string favoriteservers.json
 
 #    Maximum size of the out chat queue.
 #    0 to disable queueing and -1 to make the queue size unlimited.
@@ -1097,7 +1091,7 @@ default_stack_max (Default stack size) int 99
 #    Enable players getting damage and dying.
 enable_damage (Damage) bool false
 
-#    Enable creative mode for new created maps.
+#    Enable creative mode for all players
 creative_mode (Creative) bool false
 
 #    A chosen map seed for a new map, leave empty for random.
@@ -1144,6 +1138,10 @@ enable_rollback_recording (Rollback recording) bool false
 #    @name, @message, @timestamp (optional)
 chat_message_format (Chat message format) string <@name> @message
 
+#    If the execution of a chat command takes longer than this specified time in
+#    seconds, add the time information to the chat command message
+chatcommand_msg_time_threshold (Chat command time message threshold) float 0.1
+
 #    A message to be displayed to all clients when the server shuts down.
 kick_msg_shutdown (Shutdown message) string Server shutting down.
 
@@ -1399,7 +1397,7 @@ name (Player name) string
 
 #    Set the language. Leave empty to use the system language.
 #    A restart is required after changing this.
-language (Language) enum   ,ar,ca,cs,da,de,dv,el,en,eo,es,et,eu,fil,fr,hu,id,it,ja,ja_KS,jbo,kk,kn,lo,lt,ms,my,nb,nl,nn,pl,pt,pt_BR,ro,ru,sl,sr_Cyrl,sv,sw,th,tr,uk,vi
+language (Language) enum   ,be,bg,ca,cs,da,de,el,en,eo,es,et,eu,fi,fr,gd,gl,hu,id,it,ja,jbo,kk,ko,lt,lv,ms,nb,nl,nn,pl,pt,pt_BR,ro,ru,sk,sl,sr_Cyrl,sr_Latn,sv,sw,tr,uk,vi,zh_CN,zh_TW
 
 #    Level of logging to be written to debug.txt:
 #    -    <nothing> (no logging)
@@ -1426,9 +1424,8 @@ enable_ipv6 (IPv6) bool true
 
 [*Advanced]
 
-#    Default timeout for cURL, stated in milliseconds.
-#    Only has an effect if compiled with cURL.
-curl_timeout (cURL timeout) int 5000
+#    Maximum time an interactive request (e.g. server list fetch) may take, stated in milliseconds.
+curl_timeout (cURL interactive timeout) int 20000
 
 #    Limits number of parallel HTTP requests. Affects:
 #    -    Media fetch if server uses remote_media setting.
@@ -1437,7 +1434,7 @@ curl_timeout (cURL timeout) int 5000
 #    Only has an effect if compiled with cURL.
 curl_parallel_limit (cURL parallel limit) int 8
 
-#    Maximum time in ms a file download (e.g. a mod download) may take.
+#    Maximum time a file download (e.g. a mod download) may take, stated in milliseconds.
 curl_file_download_timeout (cURL file download timeout) int 300000
 
 #    Makes DirectX work with LuaJIT. Disable if it causes troubles.
diff --git a/client/shaders/3d_interlaced_merge/opengl_fragment.glsl b/client/shaders/3d_interlaced_merge/opengl_fragment.glsl
index 7cba61b39..6d3ae5093 100644
--- a/client/shaders/3d_interlaced_merge/opengl_fragment.glsl
+++ b/client/shaders/3d_interlaced_merge/opengl_fragment.glsl
@@ -6,7 +6,7 @@ uniform sampler2D textureFlags;
 #define rightImage normalTexture
 #define maskImage textureFlags
 
-varying mediump vec2 varTexCoord;
+varying mediump vec4 varTexCoord;
 
 void main(void)
 {
diff --git a/client/shaders/3d_interlaced_merge/opengl_vertex.glsl b/client/shaders/3d_interlaced_merge/opengl_vertex.glsl
index 860049481..224b7d183 100644
--- a/client/shaders/3d_interlaced_merge/opengl_vertex.glsl
+++ b/client/shaders/3d_interlaced_merge/opengl_vertex.glsl
@@ -1,4 +1,4 @@
-varying mediump vec2 varTexCoord;
+varying mediump vec4 varTexCoord;
 
 void main(void)
 {
diff --git a/client/shaders/default_shader/opengl_vertex.glsl b/client/shaders/default_shader/opengl_vertex.glsl
index d95a3c2d3..a908ac953 100644
--- a/client/shaders/default_shader/opengl_vertex.glsl
+++ b/client/shaders/default_shader/opengl_vertex.glsl
@@ -3,5 +3,9 @@ varying lowp vec4 varColor;
 void main(void)
 {
 	gl_Position = mWorldViewProj * inVertexPosition;
+#ifdef GL_ES
+	varColor = inVertexColor.bgra;
+#else
 	varColor = inVertexColor;
+#endif
 }
diff --git a/client/shaders/minimap_shader/opengl_vertex.glsl b/client/shaders/minimap_shader/opengl_vertex.glsl
index 1a9491805..b23d27181 100644
--- a/client/shaders/minimap_shader/opengl_vertex.glsl
+++ b/client/shaders/minimap_shader/opengl_vertex.glsl
@@ -7,5 +7,9 @@ void main(void)
 {
 	varTexCoord = inTexCoord0.st;
 	gl_Position = mWorldViewProj * inVertexPosition;
+#ifdef GL_ES
+	varColor = inVertexColor.bgra;
+#else
 	varColor = inVertexColor;
+#endif
 }
diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl
index c68df4a8e..1a4840d35 100644
--- a/client/shaders/nodes_shader/opengl_vertex.glsl
+++ b/client/shaders/nodes_shader/opengl_vertex.glsl
@@ -146,10 +146,14 @@ void main(void)
 	// the brightness, so now we have to multiply these
 	// colors with the color of the incoming light.
 	// The pre-baked colors are halved to prevent overflow.
-	vec4 color;
+#ifdef GL_ES
+	vec4 color = inVertexColor.bgra;
+#else
+	vec4 color = inVertexColor;
+#endif
 	// The alpha gives the ratio of sunlight in the incoming light.
-	float nightRatio = 1.0 - inVertexColor.a;
-	color.rgb = inVertexColor.rgb * (inVertexColor.a * dayLight.rgb +
+	float nightRatio = 1.0 - color.a;
+	color.rgb = color.rgb * (color.a * dayLight.rgb +
 		nightRatio * artificialLight.rgb) * 2.0;
 	color.a = 1.0;
 
diff --git a/client/shaders/object_shader/opengl_vertex.glsl b/client/shaders/object_shader/opengl_vertex.glsl
index b4a4d0aaa..f26224e82 100644
--- a/client/shaders/object_shader/opengl_vertex.glsl
+++ b/client/shaders/object_shader/opengl_vertex.glsl
@@ -49,5 +49,9 @@ void main(void)
 		: directional_ambient(normalize(inVertexNormal));
 #endif
 
+#ifdef GL_ES
+	varColor = inVertexColor.bgra;
+#else
 	varColor = inVertexColor;
+#endif
 }
diff --git a/client/shaders/selection_shader/opengl_vertex.glsl b/client/shaders/selection_shader/opengl_vertex.glsl
index 9ca87a9cf..39dde3056 100644
--- a/client/shaders/selection_shader/opengl_vertex.glsl
+++ b/client/shaders/selection_shader/opengl_vertex.glsl
@@ -6,5 +6,9 @@ void main(void)
 	varTexCoord = inTexCoord0.st;
 	gl_Position = mWorldViewProj * inVertexPosition;
 
+#ifdef GL_ES
+	varColor = inVertexColor.bgra;
+#else
 	varColor = inVertexColor;
+#endif
 }
diff --git a/clientmods/preview/mod.conf b/clientmods/preview/mod.conf
new file mode 100644
index 000000000..4e56ec293
--- /dev/null
+++ b/clientmods/preview/mod.conf
@@ -0,0 +1 @@
+name = preview 
diff --git a/cmake/Modules/FindGMP.cmake b/cmake/Modules/FindGMP.cmake
index 7b45f16c7..190b7c548 100644
--- a/cmake/Modules/FindGMP.cmake
+++ b/cmake/Modules/FindGMP.cmake
@@ -12,8 +12,6 @@ if(ENABLE_SYSTEM_GMP)
 	else()
 		message (STATUS "Detecting GMP from system failed.")
 	endif()
-else()
-	message (STATUS "Detecting GMP from system disabled! (ENABLE_SYSTEM_GMP=0)")
 endif()
 
 if(NOT USE_SYSTEM_GMP)
diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake
index 529452a4a..b7681827c 100644
--- a/cmake/Modules/FindGettextLib.cmake
+++ b/cmake/Modules/FindGettextLib.cmake
@@ -42,15 +42,6 @@ if(WIN32)
 		NAMES ${GETTEXT_LIB_NAMES}
 		PATHS "${CUSTOM_GETTEXT_PATH}/lib"
 		DOC "GetText library")
-	find_file(GETTEXT_DLL
-		NAMES libintl.dll intl.dll libintl3.dll intl3.dll
-		PATHS "${CUSTOM_GETTEXT_PATH}/bin" "${CUSTOM_GETTEXT_PATH}/lib" 
-		DOC "gettext *intl*.dll")
-	find_file(GETTEXT_ICONV_DLL
-		NAMES libiconv2.dll
-		PATHS "${CUSTOM_GETTEXT_PATH}/bin" "${CUSTOM_GETTEXT_PATH}/lib"
-		DOC "gettext *iconv*.lib")
-	set(GETTEXT_REQUIRED_VARS ${GETTEXT_REQUIRED_VARS} GETTEXT_DLL GETTEXT_ICONV_DLL)
 endif(WIN32)
 
 
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
index 6f361e829..058e93878 100644
--- a/cmake/Modules/FindIrrlicht.cmake
+++ b/cmake/Modules/FindIrrlicht.cmake
@@ -1,73 +1,57 @@
 
-mark_as_advanced(IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR IRRLICHT_DLL)
-set(IRRLICHT_SOURCE_DIR "" CACHE PATH "Path to irrlicht source directory (optional)")
+mark_as_advanced(IRRLICHT_DLL)
 
+# Find include directory and libraries
 
-# Find include directory
-
-if(NOT IRRLICHT_SOURCE_DIR STREQUAL "")
-	set(IRRLICHT_SOURCE_DIR_INCLUDE
-		"${IRRLICHT_SOURCE_DIR}/include"
-	)
-
-	set(IRRLICHT_LIBRARY_NAMES libIrrlicht.a Irrlicht Irrlicht.lib)
-
-	if(WIN32)
-		if(MSVC)
-			set(IRRLICHT_SOURCE_DIR_LIBS "${IRRLICHT_SOURCE_DIR}/lib/Win32-visualstudio")
-			set(IRRLICHT_LIBRARY_NAMES Irrlicht.lib)
-		else()
-			set(IRRLICHT_SOURCE_DIR_LIBS "${IRRLICHT_SOURCE_DIR}/lib/Win32-gcc")
-			set(IRRLICHT_LIBRARY_NAMES libIrrlicht.a libIrrlicht.dll.a)
-		endif()
-	else()
-		set(IRRLICHT_SOURCE_DIR_LIBS "${IRRLICHT_SOURCE_DIR}/lib/Linux")
-		set(IRRLICHT_LIBRARY_NAMES libIrrlicht.a)
-	endif()
+# find our fork first, then upstream (TODO: remove this?)
+foreach(libname IN ITEMS IrrlichtMt Irrlicht)
+	string(TOLOWER "${libname}" libname2)
 
 	find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
+		DOC "Path to the directory with IrrlichtMt includes"
 		PATHS
-		${IRRLICHT_SOURCE_DIR_INCLUDE}
-		NO_DEFAULT_PATH
+		/usr/local/include/${libname2}
+		/usr/include/${libname2}
+		/system/develop/headers/${libname2} #Haiku
+		PATH_SUFFIXES "include/${libname2}"
 	)
 
-	find_library(IRRLICHT_LIBRARY NAMES ${IRRLICHT_LIBRARY_NAMES}
-		PATHS
-		${IRRLICHT_SOURCE_DIR_LIBS}
-		NO_DEFAULT_PATH
-	)
-
-else()
-	find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
-		PATHS
-		/usr/local/include/irrlicht
-		/usr/include/irrlicht
-		/system/develop/headers/irrlicht #Haiku
-		PATH_SUFFIXES "include/irrlicht"
-	)
-
-	find_library(IRRLICHT_LIBRARY NAMES libIrrlicht.so libIrrlicht.a Irrlicht
+	find_library(IRRLICHT_LIBRARY NAMES lib${libname} ${libname}
+		DOC "Path to the IrrlichtMt library file"
 		PATHS
 		/usr/local/lib
 		/usr/lib
 		/system/develop/lib # Haiku
 	)
-endif()
 
+	if(IRRLICHT_INCLUDE_DIR OR IRRLICHT_LIBRARY)
+		break()
+	endif()
+endforeach()
+
+# Handholding for users
+if(IRRLICHT_INCLUDE_DIR AND (NOT IS_DIRECTORY "${IRRLICHT_INCLUDE_DIR}" OR
+	NOT EXISTS "${IRRLICHT_INCLUDE_DIR}/irrlicht.h"))
+	message(WARNING "IRRLICHT_INCLUDE_DIR was set to ${IRRLICHT_INCLUDE_DIR} "
+		"but irrlicht.h does not exist inside. The path will not be used.")
+	unset(IRRLICHT_INCLUDE_DIR CACHE)
+endif()
+if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux" OR APPLE)
+	# (only on systems where we're sure how a valid library looks like)
+	if(IRRLICHT_LIBRARY AND (IS_DIRECTORY "${IRRLICHT_LIBRARY}" OR
+		NOT IRRLICHT_LIBRARY MATCHES "\\.(a|so|dylib|lib)([.0-9]+)?$"))
+		message(WARNING "IRRLICHT_LIBRARY was set to ${IRRLICHT_LIBRARY} "
+			"but is not a valid library file. The path will not be used.")
+		unset(IRRLICHT_LIBRARY CACHE)
+	endif()
+endif()
 
 # On Windows, find the DLL for installation
 if(WIN32)
 	# If VCPKG_APPLOCAL_DEPS is ON, dll's are automatically handled by VCPKG
 	if(NOT VCPKG_APPLOCAL_DEPS)
-		if(MSVC)
-			set(IRRLICHT_COMPILER "VisualStudio")
-		else()
-			set(IRRLICHT_COMPILER "gcc")
-		endif()
-		find_file(IRRLICHT_DLL NAMES Irrlicht.dll
-			PATHS
-			"${IRRLICHT_SOURCE_DIR}/bin/Win32-${IRRLICHT_COMPILER}"
-			DOC "Path of the Irrlicht dll (for installation)"
+		find_file(IRRLICHT_DLL NAMES IrrlichtMt.dll
+			DOC "Path of the IrrlichtMt dll (for installation)"
 		)
 	endif()
 endif(WIN32)
diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
index a5e9098f8..cce2d387f 100644
--- a/cmake/Modules/FindJson.cmake
+++ b/cmake/Modules/FindJson.cmake
@@ -1,26 +1,25 @@
-# Look for JSONCPP if asked to.
-# We use a bundled version by default because some distros ship versions of
-# JSONCPP that cause segfaults and other memory errors when we link with them.
-# See https://github.com/minetest/minetest/issues/1793
+# Look for JsonCpp, with fallback to bundeled version
 
 mark_as_advanced(JSON_LIBRARY JSON_INCLUDE_DIR)
-option(ENABLE_SYSTEM_JSONCPP "Enable using a system-wide JSONCPP.  May cause segfaults and other memory errors!" FALSE)
+option(ENABLE_SYSTEM_JSONCPP "Enable using a system-wide JsonCpp" TRUE)
+set(USE_SYSTEM_JSONCPP FALSE)
 
 if(ENABLE_SYSTEM_JSONCPP)
 	find_library(JSON_LIBRARY NAMES jsoncpp)
 	find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp)
 
-	include(FindPackageHandleStandardArgs)
-	find_package_handle_standard_args(Json DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR)
-
-	if(JSON_FOUND)
-		message(STATUS "Using system JSONCPP library.")
+	if(JSON_LIBRARY AND JSON_INCLUDE_DIR)
+		message(STATUS "Using JsonCpp provided by system.")
+		set(USE_SYSTEM_JSONCPP TRUE)
 	endif()
 endif()
 
-if(NOT JSON_FOUND)
-	message(STATUS "Using bundled JSONCPP library.")
+if(NOT USE_SYSTEM_JSONCPP)
+	message(STATUS "Using bundled JsonCpp library.")
 	set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp)
 	set(JSON_LIBRARY jsoncpp)
 	add_subdirectory(lib/jsoncpp)
 endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Json DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR)
diff --git a/cmake/Modules/FindOpenGLES2.cmake b/cmake/Modules/FindOpenGLES2.cmake
index a47126705..ce04191dd 100644
--- a/cmake/Modules/FindOpenGLES2.cmake
+++ b/cmake/Modules/FindOpenGLES2.cmake
@@ -42,7 +42,7 @@ else()
 	)
 
 	include(FindPackageHandleStandardArgs)
-	find_package_handle_standard_args(OPENGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)
+	find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG OPENGLES2_LIBRARY OPENGLES2_INCLUDE_DIR)
 
 	find_path(EGL_INCLUDE_DIR EGL/egl.h
 		PATHS /usr/openwin/share/include
@@ -59,7 +59,6 @@ else()
 			/usr/lib
 	)
 
-	include(FindPackageHandleStandardArgs)
 	find_package_handle_standard_args(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR)
 endif()
 
diff --git a/doc/client_lua_api.txt b/doc/client_lua_api.txt
index 94d40fe2a..22148ee51 100644
--- a/doc/client_lua_api.txt
+++ b/doc/client_lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Client Modding API Reference 5.4.0
+Minetest Lua Client Modding API Reference 5.5.0
 ================================================
 * More information at <http://www.minetest.net/>
 * Developer Wiki: <http://dev.minetest.net/>
@@ -94,7 +94,7 @@ Mod directory structure
 
 The format is documented in `builtin/settingtypes.txt`.
 It is parsed by the main menu settings dialogue to list mod-specific
-settings in the "Clientmods" category.    
+settings in the "Clientmods" category.
 
 ### modname
 
@@ -627,7 +627,7 @@ Helper functions
 * `minetest.is_yes(arg)`
     * returns whether `arg` can be interpreted as yes
 * `minetest.is_nan(arg)`
-    * returns true true when the passed number represents NaN.
+    * returns true when the passed number represents NaN.
 * `table.copy(table)`: returns a table
     * returns a deep copy of `table`
 
@@ -658,6 +658,9 @@ Minetest namespace reference
 * `minetest.sha1(data, [raw])`: returns the sha1 hash of data
     * `data`: string of data to hash
     * `raw`: return raw bytes instead of hex digits, default: false
+* `minetest.colorspec_to_colorstring(colorspec)`: Converts a ColorSpec to a
+  ColorString. If the ColorSpec is invalid, returns `nil`.
+    * `colorspec`: The ColorSpec to convert
 * `minetest.get_csm_restrictions()`: returns a table of `Flags` indicating the
    restrictions applied to the current mod.
    * If a flag in this table is set to true, the feature is RESTRICTED.
@@ -674,6 +677,11 @@ Minetest namespace reference
 ### Global callback registration functions
 Call these functions only at load time!
 
+* `minetest.get_send_speed(speed)`
+	* This function is called every time the player's speed is sent to server
+	* The `speed` argument is the actual speed of the player
+	* If you define it, you can return a modified `speed`. This speed will be
+		sent to server instead.
 * `minetest.open_enderchest()`
     * This function is called if the client uses the Keybind for it (by default "O")
     * You can override it
@@ -700,7 +708,7 @@ Call these functions only at load time!
     * Registers a chatcommand `command` to manage a list that takes the args `del | add | list <param>`
     * The list is stored comma-seperated in `setting`
     * `desc` is the description
-    * `add` adds something to the list 
+    * `add` adds something to the list
     * `del` del removes something from the list
     * `list` lists all items on the list
 * `minetest.register_on_chatcommand(function(command, params))`
@@ -762,7 +770,14 @@ Call these functions only at load time!
 * `minetest.register_on_spawn_partice(function(particle definition))`
     * Called when recieving a spawn particle command from server
     * Newest functions are called first
-    * If any function returns true, the particel does not spawn
+    * If any function returns true, the particle does not spawn
+* `minetest.register_on_object_add(function(obj))`
+	* Called every time an object is added
+* `minetest.register_on_object_properties_change(function(obj))`
+    * Called every time the properties of an object are changed server-side
+    * May modify the object's properties without the fear of infinite recursion
+* `minetest.register_on_object_hp_change(function(obj))`
+    * Called every time the hp of an object are changes server-side
 
 ### Setting-related
 * `minetest.settings`: Settings object containing all of the settings from the
@@ -929,6 +944,8 @@ Call these functions only at load time!
     * Convert between two privilege representations
 
 ### Client Environment
+* `minetest.object_refs`
+    * Map of object references, indexed by active object id
 * `minetest.get_player_names()`
     * Returns list of player names on server (nil if CSM_RF_READ_PLAYERINFO is enabled by server)
 * `minetest.get_objects_inside_radius(pos, radius)`: returns a list of
@@ -946,13 +963,21 @@ Call these functions only at load time!
 
 ### HTTP Requests
 
-* `minetest.get_http_api()`
-    * returns `HTTPApiTable` containing http functions.
-    * The returned table contains the functions `fetch_sync`, `fetch_async` and
+* `minetest.request_http_api()`:
+    * returns `HTTPApiTable` containing http functions if the calling mod has
+      been granted access by being listed in the `secure.http_mods` or
+      `secure.trusted_mods` setting, otherwise returns `nil`.
+    * The returned table contains the functions `fetch`, `fetch_async` and
       `fetch_async_get` described below.
+    * Only works at init time and must be called from the mod's main scope
+      (not from a function).
     * Function only exists if minetest server was built with cURL support.
-* `HTTPApiTable.fetch_sync(HTTPRequest req)`: returns HTTPRequestResult
-    * Performs given request synchronously
+    * **DO NOT ALLOW ANY OTHER MODS TO ACCESS THE RETURNED TABLE, STORE IT IN
+      A LOCAL VARIABLE!**
+* `HTTPApiTable.fetch(HTTPRequest req, callback)`
+    * Performs given request asynchronously and calls callback upon completion
+    * callback: `function(HTTPRequestResult res)`
+    * Use this HTTP function if you are unsure, the others are for advanced use
 * `HTTPApiTable.fetch_async(HTTPRequest req)`: returns handle
     * Performs given request asynchronously and returns handle for
       `HTTPApiTable.fetch_async_get`
@@ -1051,7 +1076,7 @@ Passed to `HTTPApiTable.fetch` callback. Returned by
 * `minetest.register_cheat(name, category, setting | function)`
     * Register an entry for the cheat menu
     * If the Category is nonexistant, it will be created
-    * If the 3rd argument is a string it will be interpreted as a setting and toggled 
+    * If the 3rd argument is a string it will be interpreted as a setting and toggled
         when the player selects the entry in the cheat menu
     * If the 3rd argument is a function it will be called
         when the player selects the entry in the cheat menu
@@ -1114,6 +1139,14 @@ Passed to `HTTPApiTable.fetch` callback. Returned by
     * Checks if a global variable has been set, without triggering a warning.
 * `minetest.make_screenshot()`
     * Triggers the MT makeScreenshot functionality
+* `minetest.request_insecure_environment()`: returns an environment containing
+  insecure functions if the calling mod has been listed as trusted in the
+  `secure.trusted_mods` setting or security is disabled, otherwise returns
+  `nil`.
+    * Only works at init time and must be called from the mod's main scope
+      (ie: the init.lua of the mod, not from another Lua file or within a function).
+    * **DO NOT ALLOW ANY OTHER MODS TO ACCESS THE RETURNED ENVIRONMENT, STORE
+      IT IN A LOCAL VARIABLE!**
 
 ### UI
 * `minetest.ui.minimap`
@@ -1395,12 +1428,16 @@ This is basically a reference to a C++ `GenericCAO`.
 * `is_player()`: returns true if the object is a player
 * `is_local_player()`: returns true if the object is the local player
 * `get_attach()`: returns parent or nil if it isn't attached.
-* `get_nametag()`: returns the nametag (string)
-* `get_item_textures()`: returns the textures
-* `get_max_hp()`: returns the maximum heath
+* `get_nametag()`: returns the nametag (deprecated, use get_properties().nametag instead)
+* `get_item_textures()`: returns the textures (deprecated, use get_properties().textures instead)
+* `get_max_hp()`: returns the maximum heath (deprecated, use get_properties().hp_max instead)
+* `set_properties(object property table)`
+* `get_properties()`: returns object property table
 * `punch()`: punches the object
 * `rightclick()`: rightclicks the object
-    
+* `remove()`: removes the object permanently
+* `set_nametag_images(images)`: Provides a list of images to be drawn below the nametag
+
 ### `Raycast`
 
 A raycast on the map. It works with selection boxes.
@@ -1429,6 +1466,8 @@ It can be created via `Raycast(pos1, pos2, objects, liquids)` or
 
 -----------------
 ### Definitions
+* `minetest.inventorycube(img1, img2, img3)`
+    * Returns a string for making an image of a cube (useful as an item image)
 * `minetest.get_node_def(nodename)`
 	* Returns [node definition](#node-definition) table of `nodename`
 * `minetest.get_item_def(itemstring)`
@@ -1440,10 +1479,67 @@ It can be created via `Raycast(pos1, pos2, objects, liquids)` or
       {light_source=minetest.LIGHT_MAX})`
     * Doesnt really work yet an causes strange bugs, I'm working to make is better
 
+
+#### Tile definition
+
+* `"image.png"`
+* `{name="image.png", animation={Tile Animation definition}}`
+* `{name="image.png", backface_culling=bool, align_style="node"/"world"/"user", scale=int}`
+    * backface culling enabled by default for most nodes
+    * align style determines whether the texture will be rotated with the node
+      or kept aligned with its surroundings. "user" means that client
+      setting will be used, similar to `glasslike_framed_optional`.
+      Note: supported by solid nodes and nodeboxes only.
+    * scale is used to make texture span several (exactly `scale`) nodes,
+      instead of just one, in each direction. Works for world-aligned
+      textures only.
+      Note that as the effect is applied on per-mapblock basis, `16` should
+      be equally divisible by `scale` or you may get wrong results.
+* `{name="image.png", color=ColorSpec}`
+    * the texture's color will be multiplied with this color.
+    * the tile's color overrides the owning node's color in all cases.
+
+##### Tile definition
+
+    {
+        type = "vertical_frames",
+
+        aspect_w = 16,
+        -- Width of a frame in pixels
+
+        aspect_h = 16,
+        -- Height of a frame in pixels
+
+        length = 3.0,
+        -- Full loop length
+    }
+
+    {
+        type = "sheet_2d",
+
+        frames_w = 5,
+        -- Width in number of frames
+
+        frames_h = 3,
+        -- Height in number of frames
+
+        frame_length = 0.5,
+        -- Length of a single frame
+    }
+
 #### Node Definition
 
 ```lua
 	{
+        tiles = {tile definition 1, def2, def3, def4, def5, def6},
+        -- Textures of node; +Y, -Y, +X, -X, +Z, -Z
+        overlay_tiles = {tile definition 1, def2, def3, def4, def5, def6},
+        -- Same as `tiles`, but these textures are drawn on top of the base
+        -- tiles. This is used to colorize only specific parts of the
+        -- texture. If the texture name is an empty string, that overlay is not
+        -- drawn
+        special_tiles = {tile definition 1, Tile definition 2},
+        -- Special textures of node; used rarely.
 		has_on_construct = bool,        -- Whether the node has the on_construct callback defined
 		has_on_destruct = bool,         -- Whether the node has the on_destruct callback defined
 		has_after_destruct = bool,      -- Whether the node has the after_destruct callback defined
@@ -1605,9 +1701,8 @@ The following functions provide escape sequences:
 
 Named colors are also supported and are equivalent to
 [CSS Color Module Level 4](http://dev.w3.org/csswg/css-color/#named-colors).
-To specify the value of the alpha channel, append `#AA` to the end of the color name
-(e.g. `colorname#08`). For named colors the hexadecimal string representing the alpha
-value must (always) be two hexadecimal digits.
+To specify the value of the alpha channel, append `#A` or `#AA` to the end of
+the color name (e.g. `colorname#08`).
 
 `Color`
 -------------
@@ -1792,7 +1887,7 @@ A reference to a C++ InventoryAction. You can move, drop and craft items in all
     * it specifies how many items to drop / craft / move
     * `0` means move all items
     * default count: `0`
-    
+
 #### example
     `local move_act = InventoryAction("move")
     move_act:from("current_player", "main", 1)
@@ -1807,7 +1902,7 @@ A reference to a C++ InventoryAction. You can move, drop and craft items in all
     drop_act:apply()
     `
     * e.g. In first hotbar slot there are tree logs: Move one to craft field, then craft wood out of it and immediately drop it
-    
 
-    
+
+
 
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 754f0305a..7104af3e7 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -256,6 +256,9 @@ Subfolders with names starting with `_` or `.` are ignored.
 If a subfolder contains a media file with the same name as a media file
 in one of its parents, the parent's file is used.
 
+Although it is discouraged, a mod can overwrite a media file of any mod that it
+depends on by supplying a file with an equal name.
+
 Naming conventions
 ------------------
 
@@ -1045,9 +1048,9 @@ The function of `param2` is determined by `paramtype2` in node definition.
             * The height of the 'plantlike' section is stored in `param2`.
             * The height is (`param2` / 16) nodes.
 * `paramtype2 = "degrotate"`
-    * Only valid for "plantlike" drawtype. The rotation of the node is stored in
-      `param2`.
-    * Values range 0 - 179. The value stored in `param2` is multiplied by two to
+    * Valid for `plantlike` and `mesh` drawtypes. The rotation of the node is
+      stored in `param2`.
+    * Values range 0–239. The value stored in `param2` is multiplied by 1.5 to
       get the actual rotation in degrees of the node.
 * `paramtype2 = "meshoptions"`
     * Only valid for "plantlike" drawtype. `param2` encodes the shape and
@@ -1085,6 +1088,11 @@ The function of `param2` is determined by `paramtype2` in node definition.
     * `param2` values 0-63 define 64 levels of internal liquid, 0 being empty
       and 63 being full.
     * Liquid texture is defined using `special_tiles = {"modname_tilename.png"}`
+* `paramtype2 = "colordegrotate"`
+    * Same as `degrotate`, but with colors.
+    * The first (most-significant) three bits of `param2` tells which color
+      is picked from the palette. The palette should have 8 pixels.
+    * Remaining 5 bits store rotation in range 0–23 (i.e. in 15° steps)
 * `paramtype2 = "none"`
     * `param2` will not be used by the engine and can be used to store
       an arbitrary value
@@ -1104,8 +1112,20 @@ Look for examples in `games/devtest` or `games/minetest_game`.
     * Invisible, uses no texture.
 * `liquid`
     * The cubic source node for a liquid.
+    * Faces bordering to the same node are never rendered.
+    * Connects to node specified in `liquid_alternative_flowing`.
+    * Use `backface_culling = false` for the tiles you want to make
+      visible when inside the node.
 * `flowingliquid`
     * The flowing version of a liquid, appears with various heights and slopes.
+    * Faces bordering to the same node are never rendered.
+    * Connects to node specified in `liquid_alternative_source`.
+    * Node textures are defined with `special_tiles` where the first tile
+      is for the top and bottom faces and the second tile is for the side
+      faces.
+    * `tiles` is used for the item/inventory/wield image rendering.
+    * Use `backface_culling = false` for the special tiles you want to make
+      visible when inside the node
 * `glasslike`
     * Often used for partially-transparent nodes.
     * Only external sides of textures are visible.
@@ -1132,14 +1152,20 @@ Look for examples in `games/devtest` or `games/minetest_game`.
       used to compensate for how `glasslike` reduces visual thickness.
 * `torchlike`
     * A single vertical texture.
-    * If placed on top of a node, uses the first texture specified in `tiles`.
-    * If placed against the underside of a node, uses the second texture
-      specified in `tiles`.
-    * If placed on the side of a node, uses the third texture specified in
-      `tiles` and is perpendicular to that node.
+    * If `paramtype2="[color]wallmounted":
+        * If placed on top of a node, uses the first texture specified in `tiles`.
+        * If placed against the underside of a node, uses the second texture
+          specified in `tiles`.
+        * If placed on the side of a node, uses the third texture specified in
+          `tiles` and is perpendicular to that node.
+    * If `paramtype2="none"`:
+        * Will be rendered as if placed on top of a node (see
+          above) and only the first texture is used.
 * `signlike`
     * A single texture parallel to, and mounted against, the top, underside or
       side of a node.
+    * If `paramtype2="[color]wallmounted", it rotates according to `param2`
+    * If `paramtype2="none"`, it will always be on the floor.
 * `plantlike`
     * Two vertical and diagonal textures at right-angles to each other.
     * See `paramtype2 = "meshoptions"` above for other options.
@@ -1722,7 +1748,15 @@ to games.
     * `3`: the node always gets the digging time 0 seconds (torch)
 * `disable_jump`: Player (and possibly other things) cannot jump from node
   or if their feet are in the node. Note: not supported for `new_move = false`
-* `fall_damage_add_percent`: damage speed = `speed * (1 + value/100)`
+* `fall_damage_add_percent`: modifies the fall damage suffered when hitting
+  the top of this node. There's also an armor group with the same name.
+  The final player damage is determined by the following formula:
+    damage =
+      collision speed
+      * ((node_fall_damage_add_percent   + 100) / 100) -- node group
+      * ((player_fall_damage_add_percent + 100) / 100) -- player armor group
+      - (14)                                           -- constant tolerance
+  Negative damage values are discarded as no damage.
 * `falling_node`: if there is no walkable block under the node it will fall
 * `float`: the node will not fall through liquids
 * `level`: Can be used to give an additional sense of progression in the game.
@@ -1742,11 +1776,15 @@ to games.
   `"toolrepair"` crafting recipe
 
 
-### `ObjectRef` groups
+### `ObjectRef` armor groups
 
 * `immortal`: Skips all damage and breath handling for an object. This group
-  will also hide the integrated HUD status bars for players, and is
-  automatically set to all players when damage is disabled on the server.
+  will also hide the integrated HUD status bars for players. It is
+  automatically set to all players when damage is disabled on the server and
+  cannot be reset (subject to change).
+* `fall_damage_add_percent`: Modifies the fall damage suffered by players
+  when they hit the ground. It is analog to the node group with the same
+  name. See the node group above for the exact calculation.
 * `punch_operable`: For entities; disables the regular damage mechanism for
   players punching it by hand or a non-tool item, so that it can do something
   else than take damage.
@@ -2113,7 +2151,7 @@ Examples
     list[current_player;main;0,3.5;8,4;]
     list[current_player;craft;3,0;3,3;]
     list[current_player;craftpreview;7,1;1,1;]
-   
+
 Version History
 ---------------
 
@@ -2226,7 +2264,8 @@ Elements
 * Show an inventory list if it has been sent to the client. Nothing will
   be shown if the inventory list is of size 0.
 * **Note**: With the new coordinate system, the spacing between inventory
-  slots is one-fourth the size of an inventory slot.
+  slots is one-fourth the size of an inventory slot by default. Also see
+  [Styling Formspecs] for changing the size of slots and spacing.
 
 ### `list[<inventory location>;<list name>;<X>,<Y>;<W>,<H>;<starting item index>]`
 
@@ -2294,7 +2333,7 @@ Elements
 * `frame duration`: Milliseconds between each frame. `0` means the frames don't advance.
 * `frame start` (Optional): The index of the frame to start on. Default `1`.
 
-### `model[<X>,<Y>;<W>,<H>;<name>;<mesh>;<textures>;<rotation X,Y>;<continuous>;<mouse control>;<frame loop range>]`
+### `model[<X>,<Y>;<W>,<H>;<name>;<mesh>;<textures>;<rotation X,Y>;<continuous>;<mouse control>;<frame loop range>;<animation speed>]`
 
 * Show a mesh model.
 * `name`: Element name that can be used for styling
@@ -2308,6 +2347,7 @@ Elements
 * `frame loop range` (Optional): Range of the animation frames.
     * Defaults to the full range of all available frames.
     * Syntax: `<begin>,<end>`
+* `animation speed` (Optional): Sets the animation speed. Default 0 FPS.
 
 ### `item_image[<X>,<Y>;<W>,<H>;<item name>]`
 
@@ -2673,7 +2713,7 @@ Elements
         * `span=<value>`: number of following columns to affect
           (default: infinite).
 
-### `style[<selector 1>,<selector 2>;<prop1>;<prop2>;...]`
+### `style[<selector 1>,<selector 2>,...;<prop1>;<prop2>;...]`
 
 * Set the style for the element(s) matching `selector` by name.
 * `selector` can be one of:
@@ -2686,7 +2726,7 @@ Elements
 * See [Styling Formspecs].
 
 
-### `style_type[<selector 1>,<selector 2>;<prop1>;<prop2>;...]`
+### `style_type[<selector 1>,<selector 2>,...;<prop1>;<prop2>;...]`
 
 * Set the style for the element(s) matching `selector` by type.
 * `selector` can be one of:
@@ -2759,10 +2799,10 @@ Styling Formspecs
 
 Formspec elements can be themed using the style elements:
 
-    style[<name 1>,<name 2>;<prop1>;<prop2>;...]
-    style[<name 1>:<state>,<name 2>:<state>;<prop1>;<prop2>;...]
-    style_type[<type 1>,<type 2>;<prop1>;<prop2>;...]
-    style_type[<type 1>:<state>,<type 2>:<state>;<prop1>;<prop2>;...]
+    style[<name 1>,<name 2>,...;<prop1>;<prop2>;...]
+    style[<name 1>:<state>,<name 2>:<state>,...;<prop1>;<prop2>;...]
+    style_type[<type 1>,<type 2>,...;<prop1>;<prop2>;...]
+    style_type[<type 1>:<state>,<type 2>:<state>,...;<prop1>;<prop2>;...]
 
 Where a prop is:
 
@@ -2809,6 +2849,7 @@ Some types may inherit styles from parent types.
 * image_button
 * item_image_button
 * label
+* list
 * model
 * pwdfield, inherits from field
 * scrollbar
@@ -2869,14 +2910,14 @@ Some types may inherit styles from parent types.
     * noclip - boolean, set to true to allow the element to exceed formspec bounds.
     * padding - rect, adds space between the edges of the button and the content. This value is
                 relative to bgimg_middle.
-    * sound - a sound to be played when clicked.
+    * sound - a sound to be played when triggered.
     * textcolor - color, default white.
 * checkbox
     * noclip - boolean, set to true to allow the element to exceed formspec bounds.
-    * sound - a sound to be played when clicked.
+    * sound - a sound to be played when triggered.
 * dropdown
     * noclip - boolean, set to true to allow the element to exceed formspec bounds.
-    * sound - a sound to be played when clicked.
+    * sound - a sound to be played when the entry is changed.
 * field, pwdfield, textarea
     * border - set to false to hide the textbox background and border. Default true.
     * font - Sets font type. See button `font` property for more information.
@@ -2896,6 +2937,10 @@ Some types may inherit styles from parent types.
     * font - Sets font type. See button `font` property for more information.
     * font_size - Sets font size. See button `font_size` property for more information.
     * noclip - boolean, set to true to allow the element to exceed formspec bounds.
+* list
+    * noclip - boolean, set to true to allow the element to exceed formspec bounds.
+    * size - 2d vector, sets the size of inventory slots in coordinates.
+    * spacing - 2d vector, sets the space between inventory slots in coordinates.
 * image_button (additional properties)
     * fgimg - standard image. Defaults to none.
     * fgimg_hovered - image when hovered. Defaults to fgimg when not provided.
@@ -2903,12 +2948,12 @@ Some types may inherit styles from parent types.
     * fgimg_pressed - image when pressed. Defaults to fgimg when not provided.
         * This is deprecated, use states instead.
     * NOTE: The parameters of any given image_button will take precedence over fgimg/fgimg_pressed
-    * sound - a sound to be played when clicked.
+    * sound - a sound to be played when triggered.
 * scrollbar
     * noclip - boolean, set to true to allow the element to exceed formspec bounds.
 * tabheader
     * noclip - boolean, set to true to allow the element to exceed formspec bounds.
-    * sound - a sound to be played when clicked.
+    * sound - a sound to be played when a different tab is selected.
     * textcolor - color. Default white.
 * table, textlist
     * font - Sets font type. See button `font` property for more information.
@@ -3067,9 +3112,8 @@ Colors
 
 Named colors are also supported and are equivalent to
 [CSS Color Module Level 4](http://dev.w3.org/csswg/css-color/#named-colors).
-To specify the value of the alpha channel, append `#AA` to the end of the color
-name (e.g. `colorname#08`). For named colors the hexadecimal string
-representing the alpha value must (always) be two hexadecimal digits.
+To specify the value of the alpha channel, append `#A` or `#AA` to the end of
+the color name (e.g. `colorname#08`).
 
 `ColorSpec`
 -----------
@@ -3135,6 +3179,16 @@ For the following functions, `v`, `v1`, `v2` are vectors,
     * Returns a vector.
     * A copy of `a` if `a` is a vector.
     * `{x = a, y = b, z = c}`, if all of `a`, `b`, `c` are defined numbers.
+* `vector.from_string(s[, init])`:
+    * Returns `v, np`, where `v` is a vector read from the given string `s` and
+      `np` is the next position in the string after the vector.
+    * Returns `nil` on failure.
+    * `s`: Has to begin with a substring of the form `"(x, y, z)"`. Additional
+           spaces, leaving away commas and adding an additional comma to the end
+           is allowed.
+    * `init`: If given starts looking for the vector at this string index.
+* `vector.to_string(v)`:
+    * Returns a string of the form `"(x, y, z)"`.
 * `vector.direction(p1, p2)`:
     * Returns a vector of length 1 with direction `p1` to `p2`.
     * If `p1` and `p2` are identical, returns `{x = 0, y = 0, z = 0}`.
@@ -3149,6 +3203,7 @@ For the following functions, `v`, `v1`, `v2` are vectors,
     * Returns a vector, each dimension rounded down.
 * `vector.round(v)`:
     * Returns a vector, each dimension rounded to nearest integer.
+    * At a multiple of 0.5, rounds away from zero.
 * `vector.apply(v, func)`:
     * Returns a vector where the function `func` has been applied to each
       component.
@@ -3223,6 +3278,8 @@ Helper functions
     * If the absolute value of `x` is within the `tolerance` or `x` is NaN,
       `0` is returned.
 * `math.factorial(x)`: returns the factorial of `x`
+* `math.round(x)`: Returns `x` rounded to the nearest integer.
+    * At a multiple of 0.5, rounds away from zero.
 * `string.split(str, separator, include_empty, max_splits, sep_is_pattern)`
     * `separator`: string, default: `","`
     * `include_empty`: boolean, default: `false`
@@ -3260,7 +3317,6 @@ Helper functions
     * returns true when the passed number represents NaN.
 * `minetest.get_us_time()`
     * returns time with microsecond precision. May not return wall time.
-    * This value might overflow on certain 32-bit systems!
 * `table.copy(table)`: returns a table
     * returns a deep copy of `table`
 * `table.indexof(list, val)`: returns the smallest numerical index containing
@@ -3271,7 +3327,8 @@ Helper functions
     * Appends all values in `other_table` to `table` - uses `#table + 1` to
       find new indices.
 * `table.key_value_swap(t)`: returns a table with keys and values swapped
-    * If multiple keys in `t` map to the same value, the result is undefined.
+    * If multiple keys in `t` map to the same value, it is unspecified which
+      value maps to that key.
 * `table.shuffle(table, [from], [to], [random_func])`:
     * Shuffles elements `from` to `to` in `table` in place
     * `from` defaults to `1`
@@ -4381,6 +4438,11 @@ Utilities
           object_step_has_moveresult = true,
           -- Whether get_velocity() and add_velocity() can be used on players (5.4.0)
           direct_velocity_on_players = true,
+          -- nodedef's use_texture_alpha accepts new string modes (5.4.0)
+          use_texture_alpha_string_modes = true,
+          -- degrotate param2 rotates in units of 1.5° instead of 2°
+          -- thus changing the range of values from 0-179 to 0-240 (5.5.0)
+          degrotate_240_steps = true,
       }
 
 * `minetest.has_feature(arg)`: returns `boolean, missing_features`
@@ -4440,6 +4502,9 @@ Utilities
 * `minetest.sha1(data, [raw])`: returns the sha1 hash of data
     * `data`: string of data to hash
     * `raw`: return raw bytes instead of hex digits, default: false
+* `minetest.colorspec_to_colorstring(colorspec)`: Converts a ColorSpec to a
+  ColorString. If the ColorSpec is invalid, returns `nil`.
+    * `colorspec`: The ColorSpec to convert
 
 Logging
 -------
@@ -4589,6 +4654,10 @@ Call these functions only at load time!
       the puncher to the punched.
     * `damage`: Number that represents the damage calculated by the engine
     * should return `true` to prevent the default damage mechanism
+* `minetest.register_on_rightclickplayer(function(player, clicker))`
+    * Called when a player is right-clicked
+    * `player`: ObjectRef - Player that was right-clicked
+    * `clicker`: ObjectRef - Object that right-clicked, may or may not be a player
 * `minetest.register_on_player_hpchange(function(player, hp_change, reason), modifier)`
     * Called when the player gets damaged or healed
     * `player`: ObjectRef of the player
@@ -4639,6 +4708,7 @@ Call these functions only at load time!
     * `cheat`: `{type=<cheat_type>}`, where `<cheat_type>` is one of:
         * `moved_too_fast`
         * `interacted_too_far`
+        * `interacted_with_self`
         * `interacted_while_dead`
         * `finished_unknown_dig`
         * `dug_unbreakable`
@@ -4879,7 +4949,7 @@ Environment access
     * Punch node with the same effects that a player would cause
 * `minetest.spawn_falling_node(pos)`
     * Change node into falling node
-    * Returns `true` if successful, `false` on failure
+    * Returns `true` and the ObjectRef of the spawned entity if successful, `false` on failure
 
 * `minetest.find_nodes_with_meta(pos1, pos2)`
     * Get a table of positions of nodes that have metadata within a region
@@ -5434,20 +5504,22 @@ Server
     * Returns a code (0: successful, 1: no such player, 2: player is connected)
 * `minetest.remove_player_auth(name)`: remove player authentication data
     * Returns boolean indicating success (false if player nonexistant)
-* `minetest.dynamic_add_media(filepath)`
-    * Adds the file at the given path to the media sent to clients by the server
-      on startup and also pushes this file to already connected clients.
+* `minetest.dynamic_add_media(filepath, callback)`
+    * `filepath`: path to a media file on the filesystem
+    * `callback`: function with arguments `name`, where name is a player name
+      (previously there was no callback argument; omitting it is deprecated)
+    * Adds the file to the media sent to clients by the server on startup
+      and also pushes this file to already connected clients.
       The file must be a supported image, sound or model format. It must not be
       modified, deleted, moved or renamed after calling this function.
       The list of dynamically added media is not persisted.
-    * Returns boolean indicating success (duplicate files count as error)
-    * The media will be ready to use (in e.g. entity textures, sound_play)
-      immediately after calling this function.
+    * Returns false on error, true if the request was accepted
+    * The given callback will be called for every player as soon as the
+      media is available on the client.
       Old clients that lack support for this feature will not see the media
-      unless they reconnect to the server.
-    * Since media transferred this way does not use client caching or HTTP
-      transfers, dynamic media should not be used with big files or performance
-      will suffer.
+      unless they reconnect to the server. (callback won't be called)
+    * Since media transferred this way currently does not use client caching
+       or HTTP transfers, dynamic media should not be used with big files.
 
 Bans
 ----
@@ -6025,18 +6097,18 @@ an itemstring, a table or `nil`.
   stack).
 * `set_metadata(metadata)`: (DEPRECATED) Returns true.
 * `get_description()`: returns the description shown in inventory list tooltips.
-    * The engine uses the same as this function for item descriptions.
+    * The engine uses this when showing item descriptions in tooltips.
     * Fields for finding the description, in order:
         * `description` in item metadata (See [Item Metadata].)
         * `description` in item definition
         * item name
-* `get_short_description()`: returns the short description.
+* `get_short_description()`: returns the short description or nil.
     * Unlike the description, this does not include new lines.
-    * The engine uses the same as this function for short item descriptions.
     * Fields for finding the short description, in order:
         * `short_description` in item metadata (See [Item Metadata].)
         * `short_description` in item definition
-        * first line of the description (See `get_description()`.)
+        * first line of the description (From item meta or def, see `get_description()`.)
+        * Returns nil if none of the above are set
 * `clear()`: removes all items from the stack, making it empty.
 * `replace(item)`: replace the contents of this stack.
     * `item` can also be an itemstring or table.
@@ -6213,8 +6285,8 @@ object you are working with still exists.
     * `time_from_last_punch` = time since last punch action of the puncher
     * `direction`: can be `nil`
 * `right_click(clicker)`; `clicker` is another `ObjectRef`
-* `get_hp()`: returns number of hitpoints (2 * number of hearts)
-* `set_hp(hp, reason)`: set number of hitpoints (2 * number of hearts).
+* `get_hp()`: returns number of health points
+* `set_hp(hp, reason)`: set number of health points
     * See reason in register_on_player_hpchange
     * Is limited to the range of 0 ... 65535 (2^16 - 1)
     * For players: HP are also limited by `hp_max` specified in the player's
@@ -6237,21 +6309,22 @@ object you are working with still exists.
   `frame_loop`.
 * `set_animation_frame_speed(frame_speed)`
     * `frame_speed`: number, default: `15.0`
-* `set_attach(parent, bone, position, rotation, forced_visible)`
-    * `bone`: string
-    * `position`: `{x=num, y=num, z=num}` (relative)
-    * `rotation`: `{x=num, y=num, z=num}` = Rotation on each axis, in degrees
+* `set_attach(parent[, bone, position, rotation, forced_visible])`
+    * `bone`: string. Default is `""`, the root bone
+    * `position`: `{x=num, y=num, z=num}`, relative, default `{x=0, y=0, z=0}`
+    * `rotation`: `{x=num, y=num, z=num}` = Rotation on each axis, in degrees.
+      Default `{x=0, y=0, z=0}`
     * `forced_visible`: Boolean to control whether the attached entity
-       should appear in first person.
+       should appear in first person. Default `false`.
 * `get_attach()`: returns parent, bone, position, rotation, forced_visible,
     or nil if it isn't attached.
 * `get_children()`: returns a list of ObjectRefs that are attached to the
     object.
 * `set_detach()`
-* `set_bone_position(bone, position, rotation)`
-    * `bone`: string
-    * `position`: `{x=num, y=num, z=num}` (relative)
-    * `rotation`: `{x=num, y=num, z=num}`
+* `set_bone_position([bone, position, rotation])`
+    * `bone`: string. Default is `""`, the root bone
+    * `position`: `{x=num, y=num, z=num}`, relative, `default {x=0, y=0, z=0}`
+    * `rotation`: `{x=num, y=num, z=num}`, default `{x=0, y=0, z=0}`
 * `get_bone_position(bone)`: returns position and rotation of the bone
 * `set_properties(object property table)`
 * `get_properties()`: returns object property table
@@ -6259,15 +6332,21 @@ object you are working with still exists.
 * `get_nametag_attributes()`
     * returns a table with the attributes of the nametag of an object
     * {
-        color = {a=0..255, r=0..255, g=0..255, b=0..255},
         text = "",
+        color = {a=0..255, r=0..255, g=0..255, b=0..255},
+        bgcolor = {a=0..255, r=0..255, g=0..255, b=0..255},
       }
 * `set_nametag_attributes(attributes)`
     * sets the attributes of the nametag of an object
     * `attributes`:
       {
-        color = ColorSpec,
         text = "My Nametag",
+        color = ColorSpec,
+        -- ^ Text color
+        bgcolor = ColorSpec or false,
+        -- ^ Sets background color of nametag
+        -- `false` will cause the background to be set automatically based on user settings
+        -- Default: false
       }
 
 #### Lua entity only (no-op for other objects)
@@ -6579,8 +6658,8 @@ object you are working with still exists.
     * `frame_speed` sets the animations frame speed. Default is 30.
 * `get_local_animation()`: returns idle, walk, dig, walk_while_dig tables and
   `frame_speed`.
-* `set_eye_offset(firstperson, thirdperson)`: defines offset vectors for camera
-  per player.
+* `set_eye_offset([firstperson, thirdperson])`: defines offset vectors for
+  camera per player. An argument defaults to `{x=0, y=0, z=0}` if unspecified.
     * in first person view
     * in third person view (max. values `{x=-10/10,y=-10,15,z=-5/5}`)
 * `get_eye_offset()`: returns first and third person offsets.
@@ -6936,10 +7015,18 @@ Player properties need to be saved manually.
         -- in mods.
 
         nametag = "",
-        -- By default empty, for players their name is shown if empty
+        -- The name to display on the head of the object. By default empty.
+        -- If the object is a player, a nil or empty nametag is replaced by the player's name.
+        -- For all other objects, a nil or empty string removes the nametag.
+        -- To hide a nametag, set its color alpha to zero. That will disable it entirely.
 
         nametag_color = <ColorSpec>,
-        -- Sets color of nametag
+        -- Sets text color of nametag
+
+        nametag_bgcolor = <ColorSpec>,
+        -- Sets background color of nametag
+        -- `false` will cause the background to be set automatically based on user settings.
+        -- Default: false
 
         infotext = "",
         -- By default empty, text to be shown when pointed at object
@@ -7152,8 +7239,9 @@ Used by `minetest.register_node`, `minetest.register_craftitem`, and
 
         short_description = "Steel Axe",
         -- Must not contain new lines.
-        -- Defaults to the first line of description.
-        -- See also: `get_short_description` in [`ItemStack`]
+        -- Defaults to nil.
+        -- Use an [`ItemStack`] to get the short description, eg:
+        --   ItemStack(itemname):get_short_description()
 
         groups = {},
         -- key = name, value = rating; rating = 1..3.
@@ -7326,10 +7414,18 @@ Used by `minetest.register_node`.
         -- If the node has a palette, then this setting only has an effect in
         -- the inventory and on the wield item.
 
-        use_texture_alpha = false,
-        -- Use texture's alpha channel
-        -- If this is set to false, the node will be rendered fully opaque
-        -- regardless of any texture transparency.
+        use_texture_alpha = ...,
+        -- Specifies how the texture's alpha channel will be used for rendering.
+        -- possible values:
+        -- * "opaque": Node is rendered opaque regardless of alpha channel
+        -- * "clip": A given pixel is either fully see-through or opaque
+        --           depending on the alpha channel being below/above 50% in value
+        -- * "blend": The alpha channel specifies how transparent a given pixel
+        --            of the rendered node is
+        -- The default is "opaque" for drawtypes normal, liquid and flowingliquid;
+        -- "clip" otherwise.
+        -- If set to a boolean value (deprecated): true either sets it to blend
+        -- or clip, false sets it to clip or opaque mode depending on the drawtype.
 
         palette = "palette.png",
         -- The node's `param2` is used to select a pixel from the image.
@@ -7371,7 +7467,16 @@ Used by `minetest.register_node`.
         -- If true, liquids flow into and replace this node.
         -- Warning: making a liquid node 'floodable' will cause problems.
 
-        liquidtype = "none",  -- "none" / "source" / "flowing"
+        liquidtype = "none",  -- specifies liquid physics
+        -- * "none":    no liquid physics
+        -- * "source":  spawns flowing liquid nodes at all 4 sides and below;
+        --              recommended drawtype: "liquid".
+        -- * "flowing": spawned from source, spawns more flowing liquid nodes
+        --              around it until `liquid_range` is reached;
+        --              will drain out without a source;
+        --              recommended drawtype: "flowingliquid".
+        -- If it's "source" or "flowing" and `liquid_range > 0`, then
+        -- both `liquid_alternative_*` fields must be specified
 
         liquid_alternative_flowing = "",  -- Flowing version of source liquid
 
@@ -7394,7 +7499,10 @@ Used by `minetest.register_node`.
         -- `minetest.set_node_level` and `minetest.add_node_level`.
 		-- Values above 124 might causes collision detection issues.
 
-        liquid_range = 8,  -- Number of flowing nodes around source (max. 8)
+        liquid_range = 8,
+        -- Maximum distance that flowing liquid nodes can spread around
+        -- source on flat land;
+        -- maximum = 8; set to 0 to disable liquid flow
 
         drowning = 0,
         -- Player will take this amount of damage if no bubbles are left
@@ -7604,6 +7712,8 @@ Used by `minetest.register_node`.
         on_dig = function(pos, node, digger),
         -- default: minetest.node_dig
         -- By default checks privileges, wears out tool and removes node.
+        -- return true if the node was dug successfully, false otherwise.
+        -- Deprecated: returning nil is the same as returning true.
 
         on_timer = function(pos, elapsed),
         -- default: nil
@@ -7643,12 +7753,12 @@ Used by `minetest.register_node`.
         -- intensity: 1.0 = mid range of regular TNT.
         -- If defined, called when an explosion touches the node, instead of
         -- removing the node.
-        
+
         mod_origin = "modname",
         -- stores which mod actually registered a node
         -- if it can not find a source, returns "??"
         -- useful for getting what mod truly registered something
-        -- example: if a node is registered as ":othermodname:nodename", 
+        -- example: if a node is registered as ":othermodname:nodename",
         -- nodename will show "othermodname", but mod_orgin will say "modname"
     }
 
@@ -8339,7 +8449,7 @@ Used by `HTTPApiTable.fetch` and `HTTPApiTable.fetch_async`.
         url = "http://example.org",
 
         timeout = 10,
-        -- Timeout for connection in seconds. Default is 3 seconds.
+        -- Timeout for request to be completed in seconds. Default depends on engine settings.
 
         method = "GET", "POST", "PUT" or "DELETE"
         -- The http method to use. Defaults to "GET".
diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt
index 1bcf697e9..f4dfff261 100644
--- a/doc/menu_lua_api.txt
+++ b/doc/menu_lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Mainmenu API Reference 5.4.0
+Minetest Lua Mainmenu API Reference 5.5.0
 =========================================
 
 Introduction
@@ -85,6 +85,7 @@ core.get_video_drivers()
 core.get_mapgen_names([include_hidden=false]) -> table of map generator algorithms
     registered in the core (possible in async calls)
 core.get_cache_path() -> path of cache
+core.get_temp_path() -> path of temp folder
 
 
 HTTP Requests
@@ -203,7 +204,8 @@ core.get_screen_info()
     display_width   = <width of display>,
     display_height  = <height of display>,
     window_width    = <current window width>,
-    window_height   = <current window height>
+    window_height   = <current window height>,
+    render_info     = <active render information>
     }
 
 
@@ -253,32 +255,6 @@ Package - content which is downloadable from the content db, may or may not be i
         }
 
 
-Favorites
----------
-
-core.get_favorites(location) -> list of favorites (possible in async calls)
-^ location: "local" or "online"
-^ returns {
-    [1] = {
-        clients       = <number of clients/nil>,
-        clients_max   = <maximum number of clients/nil>,
-        version       = <server version/nil>,
-        password      = <true/nil>,
-        creative      = <true/nil>,
-        damage        = <true/nil>,
-        pvp           = <true/nil>,
-        description   = <server description/nil>,
-        name          = <server name/nil>,
-        address       = <address of server/nil>,
-        port          = <port>
-        clients_list  = <array of clients/nil>
-        mods          = <array of mods/nil>
-    },
-    ...
-}
-core.delete_favorite(id, location) -> success
-
-
 Logging
 -------
 
diff --git a/doc/world_format.txt b/doc/world_format.txt
index 73a03e5ee..a8a9e463e 100644
--- a/doc/world_format.txt
+++ b/doc/world_format.txt
@@ -493,19 +493,8 @@ Static objects are persistent freely moving objects in the world.
 
 Object types:
 1: Test object
-2: Item
-3: Rat (obsolete)
-4: Oerkki (obsolete)
-5: Firefly (obsolete)
-6: MobV2 (obsolete)
 7: LuaEntity
 
-1: Item:
-  u8 version
-  version 0:
-    u16 len
-    u8[len] itemstring
-
 7: LuaEntity:
   u8 compatibility_byte (always 1)
   u16 len
diff --git a/games/devtest/mods/basenodes/init.lua b/games/devtest/mods/basenodes/init.lua
index 0cb85d808..2c808c35e 100644
--- a/games/devtest/mods/basenodes/init.lua
+++ b/games/devtest/mods/basenodes/init.lua
@@ -1,4 +1,4 @@
-local WATER_ALPHA = 160
+local WATER_ALPHA = "^[opacity:" .. 160
 local WATER_VISC = 1
 local LAVA_VISC = 7
 
@@ -128,12 +128,12 @@ minetest.register_node("basenodes:water_source", {
 		"Drowning damage: 1",
 	drawtype = "liquid",
 	waving = 3,
-	tiles = {"default_water.png"},
+	tiles = {"default_water.png"..WATER_ALPHA},
 	special_tiles = {
-		{name = "default_water.png", backface_culling = false},
-		{name = "default_water.png", backface_culling = true},
+		{name = "default_water.png"..WATER_ALPHA, backface_culling = false},
+		{name = "default_water.png"..WATER_ALPHA, backface_culling = true},
 	},
-	alpha = WATER_ALPHA,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	walkable = false,
 	pointable = false,
@@ -156,10 +156,12 @@ minetest.register_node("basenodes:water_flowing", {
 	waving = 3,
 	tiles = {"default_water_flowing.png"},
 	special_tiles = {
-		{name = "default_water_flowing.png", backface_culling = false},
-		{name = "default_water_flowing.png", backface_culling = false},
+		{name = "default_water_flowing.png"..WATER_ALPHA,
+			backface_culling = false},
+		{name = "default_water_flowing.png"..WATER_ALPHA,
+			backface_culling = false},
 	},
-	alpha = WATER_ALPHA,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	paramtype2 = "flowingliquid",
 	walkable = false,
@@ -181,12 +183,12 @@ minetest.register_node("basenodes:river_water_source", {
 		"Drowning damage: 1",
 	drawtype = "liquid",
 	waving = 3,
-	tiles = { "default_river_water.png" },
+	tiles = { "default_river_water.png"..WATER_ALPHA },
 	special_tiles = {
-		{name = "default_river_water.png", backface_culling = false},
-		{name = "default_river_water.png", backface_culling = true},
+		{name = "default_river_water.png"..WATER_ALPHA, backface_culling = false},
+		{name = "default_river_water.png"..WATER_ALPHA, backface_culling = true},
 	},
-	alpha = WATER_ALPHA,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	walkable = false,
 	pointable = false,
@@ -209,12 +211,14 @@ minetest.register_node("basenodes:river_water_flowing", {
 		"Drowning damage: 1",
 	drawtype = "flowingliquid",
 	waving = 3,
-	tiles = {"default_river_water_flowing.png"},
+	tiles = {"default_river_water_flowing.png"..WATER_ALPHA},
 	special_tiles = {
-		{name = "default_river_water_flowing.png", backface_culling = false},
-		{name = "default_river_water_flowing.png", backface_culling = false},
+		{name = "default_river_water_flowing.png"..WATER_ALPHA,
+			backface_culling = false},
+		{name = "default_river_water_flowing.png"..WATER_ALPHA,
+			backface_culling = false},
 	},
-	alpha = WATER_ALPHA,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	paramtype2 = "flowingliquid",
 	walkable = false,
diff --git a/games/devtest/mods/basenodes/textures/default_dirt.png b/games/devtest/mods/basenodes/textures/default_dirt.png
index 58670305d..aa75bffb6 100644
--- a/games/devtest/mods/basenodes/textures/default_dirt.png
+++ b/games/devtest/mods/basenodes/textures/default_dirt.png
diff --git a/games/devtest/mods/basenodes/textures/dirt_with_grass/info.txt b/games/devtest/mods/basenodes/textures/dirt_with_grass/info.txt
deleted file mode 100644
index 8db21ed9c..000000000
--- a/games/devtest/mods/basenodes/textures/dirt_with_grass/info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This is for testing loading textures from subfolders.
-If it works correctly, the default_grass_side.png file in this folder is used but
-default_grass.png is not overwritten by the file in this folder.
diff --git a/games/devtest/mods/basenodes/textures/info.txt b/games/devtest/mods/basenodes/textures/info.txt
new file mode 100644
index 000000000..2d4ef7efa
--- /dev/null
+++ b/games/devtest/mods/basenodes/textures/info.txt
@@ -0,0 +1,7 @@
+
+The dirt_with_grass folder is for testing loading textures from subfolders.
+If it works correctly, the default_grass_side.png file in the folder is used but
+default_grass.png is not overwritten by the file in the folder.
+
+default_dirt.png should be overwritten by the default_dirt.png in the unittests
+mod which depends on basenodes.
diff --git a/games/devtest/mods/chest/init.lua b/games/devtest/mods/chest/init.lua
index fc92bfdd1..5798c13e7 100644
--- a/games/devtest/mods/chest/init.lua
+++ b/games/devtest/mods/chest/init.lua
@@ -23,6 +23,18 @@ minetest.register_node("chest:chest", {
 		local inv = meta:get_inventory()
 		return inv:is_empty("main")
 	end,
+	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+		minetest.chat_send_player(player:get_player_name(), "Allow put: " .. stack:to_string())
+		return stack:get_count()
+	end,
+	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+		minetest.chat_send_player(player:get_player_name(), "Allow take: " .. stack:to_string())
+		return stack:get_count()
+	end,
+	on_metadata_inventory_put = function(pos, listname, index, stack, player)
+		minetest.chat_send_player(player:get_player_name(), "On put: " .. stack:to_string())
+	end,
+	on_metadata_inventory_take = function(pos, listname, index, stack, player)
+		minetest.chat_send_player(player:get_player_name(), "On take: " .. stack:to_string())
+	end,
 })
-
-
diff --git a/games/devtest/mods/experimental/commands.lua b/games/devtest/mods/experimental/commands.lua
index 132b08b0b..e42ae954d 100644
--- a/games/devtest/mods/experimental/commands.lua
+++ b/games/devtest/mods/experimental/commands.lua
@@ -131,10 +131,11 @@ local function place_nodes(param)
 				p2_max = 63
 			elseif def.paramtype2 == "leveled" then
 				p2_max = 127
-			elseif def.paramtype2 == "degrotate" and def.drawtype == "plantlike" then
-				p2_max = 179
+			elseif def.paramtype2 == "degrotate" and (def.drawtype == "plantlike" or def.drawtype == "mesh") then
+				p2_max = 239
 			elseif def.paramtype2 == "colorfacedir" or
 				def.paramtype2 == "colorwallmounted" or
+				def.paramtype2 == "colordegrotate" or
 				def.paramtype2 == "color" then
 				p2_max = 255
 			end
@@ -143,7 +144,8 @@ local function place_nodes(param)
 			-- Skip undefined param2 values
 			if not ((def.paramtype2 == "meshoptions" and p2 % 8 > 4) or
 					(def.paramtype2 == "colorwallmounted" and p2 % 8 > 5) or
-					(def.paramtype2 == "colorfacedir" and p2 % 32 > 23)) then
+					((def.paramtype2 == "colorfacedir" or def.paramtype2 == "colordegrotate")
+					and p2 % 32 > 23)) then
 
 				minetest.set_node(pos, { name = itemstring, param2 = p2 })
 				nodes_placed = nodes_placed + 1
@@ -215,5 +217,5 @@ minetest.register_chatcommand("test_place_nodes", {
 })
 
 core.register_on_chatcommand(function(name, command, params)
-	minetest.log("caught command '"..command.."', issued by '"..name.."'. Parameters: '"..params.."'")
+	minetest.log("action", "caught command '"..command.."', issued by '"..name.."'. Parameters: '"..params.."'")
 end)
diff --git a/games/devtest/mods/soundstuff/init.lua b/games/devtest/mods/soundstuff/init.lua
index 40ad8f562..b263a3f35 100644
--- a/games/devtest/mods/soundstuff/init.lua
+++ b/games/devtest/mods/soundstuff/init.lua
@@ -60,11 +60,13 @@ minetest.register_node("soundstuff:footstep_liquid", {
 	description = "Liquid Footstep Sound Node",
 	drawtype = "liquid",
 	tiles = {
-		"soundstuff_node_sound.png^[colorize:#0000FF:127",
+		"soundstuff_node_sound.png^[colorize:#0000FF:127^[opacity:190",
 	},
 	special_tiles = {
-		{name = "soundstuff_node_sound.png^[colorize:#0000FF:127", backface_culling = false},
-		{name = "soundstuff_node_sound.png^[colorize:#0000FF:127", backface_culling = true},
+		{name = "soundstuff_node_sound.png^[colorize:#0000FF:127^[opacity:190",
+			backface_culling = false},
+		{name = "soundstuff_node_sound.png^[colorize:#0000FF:127^[opacity:190",
+			backface_culling = true},
 	},
 	liquids_pointable = true,
 	liquidtype = "source",
@@ -73,7 +75,7 @@ minetest.register_node("soundstuff:footstep_liquid", {
 	liquid_renewable = false,
 	liquid_range = 0,
 	liquid_viscosity = 0,
-	alpha = 190,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	walkable = false,
 	pointable = false,
@@ -92,7 +94,6 @@ minetest.register_node("soundstuff:footstep_climbable", {
 	tiles = {
 		"soundstuff_node_climbable.png",
 	},
-	alpha = 120,
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
diff --git a/games/devtest/mods/testentities/visuals.lua b/games/devtest/mods/testentities/visuals.lua
index e3b758329..e382ec44c 100644
--- a/games/devtest/mods/testentities/visuals.lua
+++ b/games/devtest/mods/testentities/visuals.lua
@@ -103,23 +103,35 @@ minetest.register_entity("testentities:nametag", {
 
 	on_activate = function(self, staticdata)
 		if staticdata ~= "" then
-			self.color = minetest.deserialize(staticdata).color
+			local data = minetest.deserialize(staticdata)
+			self.color = data.color
+			self.bgcolor = data.bgcolor
 		else
 			self.color = {
 				r = math.random(0, 255),
 				g = math.random(0, 255),
 				b = math.random(0, 255),
 			}
+
+			if math.random(0, 10) > 5 then
+				self.bgcolor = {
+					r = math.random(0, 255),
+					g = math.random(0, 255),
+					b = math.random(0, 255),
+					a = math.random(0, 255),
+				}
+			end
 		end
 
 		assert(self.color)
 		self.object:set_properties({
 			nametag = tostring(math.random(1000, 10000)),
 			nametag_color = self.color,
+			nametag_bgcolor = self.bgcolor,
 		})
 	end,
 
 	get_staticdata = function(self)
-		return minetest.serialize({ color = self.color })
+		return minetest.serialize({ color = self.color, bgcolor = self.bgcolor })
 	end,
 })
diff --git a/games/devtest/mods/testformspec/formspec.lua b/games/devtest/mods/testformspec/formspec.lua
index 5495896ce..501b5e354 100644
--- a/games/devtest/mods/testformspec/formspec.lua
+++ b/games/devtest/mods/testformspec/formspec.lua
@@ -33,6 +33,34 @@ local tabheaders_fs = [[
 	tabheader[8,6;10,1.5;tabs_size2;Height=1.5;1;false;false]
 ]]
 
+local inv_style_fs = [[
+	style_type[list;noclip=true]
+	list[current_player;main;-0.75,0.75;2,2]
+
+	real_coordinates[false]
+	list[current_player;main;1.5,0;3,2]
+	real_coordinates[true]
+
+	real_coordinates[false]
+	style_type[list;size=1.1;spacing=0.1]
+	list[current_player;main;5,0;3,2]
+	real_coordinates[true]
+
+	style_type[list;size=.001;spacing=0]
+	list[current_player;main;7,3.5;8,4]
+
+	box[3,3.5;1,1;#000000]
+	box[5,3.5;1,1;#000000]
+	box[4,4.5;1,1;#000000]
+	box[3,5.5;1,1;#000000]
+	box[5,5.5;1,1;#000000]
+	style_type[list;spacing=.25,.125;size=.75,.875]
+	list[current_player;main;3,3.5;3,3]
+
+	style_type[list;spacing=0;size=1.1]
+	list[current_player;main;.5,7;8,4]
+]]
+
 local hypertext_basic = [[
 <bigger>Normal test</bigger>
 This is a normal text.
@@ -199,6 +227,7 @@ local scroll_fs =
 	"box[1,1;8,6;#00aa]"..
 	"scroll_container[1,1;8,6;scrbar;vertical]"..
 		"button[0,1;1,1;lorem;Lorem]"..
+		"animated_image[0,1;4.5,1;clip_animated_image;testformspec_animation.png;4;100]" ..
 		"button[0,10;1,1;ipsum;Ipsum]"..
 		"pwdfield[2,2;1,1;lorem2;Lorem]"..
 		"list[current_player;main;4,4;1,5;]"..
@@ -211,6 +240,8 @@ local scroll_fs =
 		"tooltip[0,11;3,2;Buz;#f00;#000]"..
 		"box[0,11;3,2;#00ff00]"..
 		"hypertext[3,13;3,3;;" .. hypertext_basic .. "]" ..
+		"hypertext[3,17;3,3;;Hypertext with no scrollbar\\; the scroll container should scroll.]" ..
+		"textarea[3,21;3,1;textarea;;More scroll within scroll]" ..
 		"container[0,18]"..
 			"box[1,2;3,2;#0a0a]"..
 			"scroll_container[1,2;3,2;scrbar2;horizontal;0.06]"..
@@ -310,6 +341,9 @@ local pages = {
 		"size[12,13]real_coordinates[true]" ..
 		"container[0.5,1.5]" .. tabheaders_fs .. "container_end[]",
 
+		-- Inv
+		"size[12,13]real_coordinates[true]" .. inv_style_fs,
+
 	-- Animation
 		[[
 			formspec_version[3]
@@ -328,20 +362,51 @@ Number]
 			animated_image[5.5,0.5;5,2;;testformspec_animation.png;4;100]
 			animated_image[5.5,2.75;5,2;;testformspec_animation.jpg;4;100]
 
+		]],
+
+	-- Model
+		[[
+			formspec_version[3]
+			size[12,13]
 			style[m1;bgcolor=black]
-			model[0.5,6;4,4;m1;testformspec_character.b3d;testformspec_character.png]
-			model[5,6;4,4;m2;testformspec_chest.obj;default_chest_top.png,default_chest_top.png,default_chest_side.png,default_chest_side.png,default_chest_front.png,default_chest_inside.png;30,1;true;true]
+			style[m2;bgcolor=black]
+			label[5,1;all defaults]
+			label[5,5.1;angle = 0, 180
+continuous = false
+mouse control = false
+frame loop range = 0,30]
+			label[5,9.2;continuous = true
+mouse control = true]
+			model[0.5,0.1;4,4;m1;testformspec_character.b3d;testformspec_character.png]
+			model[0.5,4.2;4,4;m2;testformspec_character.b3d;testformspec_character.png;0,180;false;false;0,30]
+			model[0.5,8.3;4,4;m3;testformspec_chest.obj;default_chest_top.png,default_chest_top.png,default_chest_side.png,default_chest_side.png,default_chest_front.png,default_chest_inside.png;30,1;true;true]
 		]],
 
 	-- Scroll containers
 		"formspec_version[3]size[12,13]" ..
 		scroll_fs,
+
+	-- Sound
+		[[
+			formspec_version[3]
+			size[12,13]
+			style[snd_btn;sound=soundstuff_mono]
+			style[snd_ibtn;sound=soundstuff_mono]
+			style[snd_drp;sound=soundstuff_mono]
+			style[snd_chk;sound=soundstuff_mono]
+			style[snd_tab;sound=soundstuff_mono]
+			button[0.5,0.5;2,1;snd_btn;Sound]
+			image_button[0.5,2;2,1;testformspec_item.png;snd_ibtn;Sound]
+			dropdown[0.5,4;4;snd_drp;Sound,Two,Three;]
+			checkbox[0.5,5.5.5;snd_chk;Sound;]
+			tabheader[0.5,7;8,0.65;snd_tab;Soundtab1,Soundtab2,Soundtab3;1;false;false]
+		]],
 }
 
 local function show_test_formspec(pname, page_id)
 	page_id = page_id or 2
 
-	local fs = pages[page_id] .. "tabheader[0,0;8,0.65;maintabs;Real Coord,Styles,Noclip,Hypertext,Tabs,Anim,ScrollC;" .. page_id .. ";false;false]"
+	local fs = pages[page_id] .. "tabheader[0,0;8,0.65;maintabs;Real Coord,Styles,Noclip,Hypertext,Tabs,Invs,Anim,Model,ScrollC,Sound;" .. page_id .. ";false;false]"
 
 	minetest.show_formspec(pname, "testformspec:formspec", fs)
 end
diff --git a/games/devtest/mods/testnodes/drawtypes.lua b/games/devtest/mods/testnodes/drawtypes.lua
index b3ab2b322..2bc7ec2e3 100644
--- a/games/devtest/mods/testnodes/drawtypes.lua
+++ b/games/devtest/mods/testnodes/drawtypes.lua
@@ -15,22 +15,6 @@ testing this node easier and more convenient.
 
 local S = minetest.get_translator("testnodes")
 
--- If set to true, will show an inventory image for nodes that have no inventory image as of Minetest 5.1.0.
--- This is due to <https://github.com/minetest/minetest/issues/9209>.
--- This is only added to make the items more visible to avoid confusion, but you will no longer see
--- the default inventory images for these items. When you want to test the default inventory image of drawtypes,
--- this should be turned off.
--- TODO: Remove support for fallback inventory image as soon #9209 is fixed.
-local SHOW_FALLBACK_IMAGE = minetest.settings:get_bool("testnodes_show_fallback_image", false)
-
-local fallback_image = function(img)
-	if SHOW_FALLBACK_IMAGE then
-		return img
-	else
-		return nil
-	end
-end
-
 -- A regular cube
 minetest.register_node("testnodes:normal", {
 	description = S("Normal Drawtype Test Node"),
@@ -145,20 +129,15 @@ minetest.register_node("testnodes:fencelike", {
 })
 
 minetest.register_node("testnodes:torchlike", {
-	description = S("Torchlike Drawtype Test Node"),
+	description = S("Floor Torchlike Drawtype Test Node"),
 	drawtype = "torchlike",
 	paramtype = "light",
-	tiles = {
-		"testnodes_torchlike_floor.png",
-		"testnodes_torchlike_ceiling.png",
-		"testnodes_torchlike_wall.png",
-	},
+	tiles = { "testnodes_torchlike_floor.png^[colorize:#FF0000:64" },
 
 
 	walkable = false,
 	sunlight_propagates = true,
 	groups = { dig_immediate = 3 },
-	inventory_image = fallback_image("testnodes_torchlike_floor.png"),
 })
 
 minetest.register_node("testnodes:torchlike_wallmounted", {
@@ -176,12 +155,22 @@ minetest.register_node("testnodes:torchlike_wallmounted", {
 	walkable = false,
 	sunlight_propagates = true,
 	groups = { dig_immediate = 3 },
-	inventory_image = fallback_image("testnodes_torchlike_floor.png"),
 })
 
+minetest.register_node("testnodes:signlike", {
+	description = S("Floor Signlike Drawtype Test Node"),
+	drawtype = "signlike",
+	paramtype = "light",
+	tiles = { "testnodes_signlike.png^[colorize:#FF0000:64" },
 
 
-minetest.register_node("testnodes:signlike", {
+	walkable = false,
+	groups = { dig_immediate = 3 },
+	sunlight_propagates = true,
+})
+
+
+minetest.register_node("testnodes:signlike_wallmounted", {
 	description = S("Wallmounted Signlike Drawtype Test Node"),
 	drawtype = "signlike",
 	paramtype = "light",
@@ -192,7 +181,6 @@ minetest.register_node("testnodes:signlike", {
 	walkable = false,
 	groups = { dig_immediate = 3 },
 	sunlight_propagates = true,
-	inventory_image = fallback_image("testnodes_signlike.png"),
 })
 
 minetest.register_node("testnodes:plantlike", {
@@ -223,6 +211,30 @@ minetest.register_node("testnodes:plantlike_waving", {
 
 
 -- param2 will rotate
+local function rotate_on_rightclick(pos, node, clicker)
+	local def = minetest.registered_nodes[node.name]
+	local aux1 = clicker:get_player_control().aux1
+
+	local deg, deg_max
+	local color, color_mult = 0, 0
+	if def.paramtype2 == "degrotate" then
+		deg = node.param2
+		deg_max = 240
+	elseif def.paramtype2 == "colordegrotate" then
+		-- MSB [3x color, 5x rotation] LSB
+		deg = node.param2 % 2^5
+		deg_max = 24
+		color_mult = 2^5
+		color = math.floor(node.param2 / color_mult)
+	end
+
+	deg = (deg + (aux1 and 10 or 1)) % deg_max
+	node.param2 = color * color_mult + deg
+	minetest.swap_node(pos, node)
+	minetest.chat_send_player(clicker:get_player_name(),
+		"Rotation is now " .. deg .. " / " .. deg_max)
+end
+
 minetest.register_node("testnodes:plantlike_degrotate", {
 	description = S("Degrotate Plantlike Drawtype Test Node"),
 	drawtype = "plantlike",
@@ -230,12 +242,43 @@ minetest.register_node("testnodes:plantlike_degrotate", {
 	paramtype2 = "degrotate",
 	tiles = { "testnodes_plantlike_degrotate.png" },
 
-
+	on_rightclick = rotate_on_rightclick,
+	place_param2 = 7,
 	walkable = false,
 	sunlight_propagates = true,
 	groups = { dig_immediate = 3 },
 })
 
+minetest.register_node("testnodes:mesh_degrotate", {
+	description = S("Degrotate Mesh Drawtype Test Node"),
+	drawtype = "mesh",
+	paramtype = "light",
+	paramtype2 = "degrotate",
+	mesh = "testnodes_ocorner.obj",
+	tiles = { "testnodes_mesh_stripes2.png" },
+
+	on_rightclick = rotate_on_rightclick,
+	place_param2 = 10, -- 15°
+	sunlight_propagates = true,
+	groups = { dig_immediate = 3 },
+})
+
+minetest.register_node("testnodes:mesh_colordegrotate", {
+	description = S("Color Degrotate Mesh Drawtype Test Node"),
+	drawtype = "mesh",
+	paramtype = "light",
+	paramtype2 = "colordegrotate",
+	palette = "testnodes_palette_facedir.png",
+	mesh = "testnodes_ocorner.obj",
+	tiles = { "testnodes_mesh_stripes3.png" },
+
+	on_rightclick = rotate_on_rightclick,
+	-- color index 1, 1 step (=15°) rotated
+	place_param2 = 1 * 2^5 + 1,
+	sunlight_propagates = true,
+	groups = { dig_immediate = 3 },
+})
+
 -- param2 will change height
 minetest.register_node("testnodes:plantlike_leveled", {
 	description = S("Leveled Plantlike Drawtype Test Node"),
@@ -350,68 +393,72 @@ minetest.register_node("testnodes:plantlike_rooted_degrotate", {
 })
 
 -- Demonstrative liquid nodes, source and flowing form.
-minetest.register_node("testnodes:liquid", {
-	description = S("Source Liquid Drawtype Test Node"),
-	drawtype = "liquid",
-	paramtype = "light",
-	tiles = {
-		"testnodes_liquidsource.png",
-	},
-	special_tiles = {
-		{name="testnodes_liquidsource.png", backface_culling=false},
-		{name="testnodes_liquidsource.png", backface_culling=true},
-	},
-	use_texture_alpha = true,
-
-
-	walkable = false,
-	liquidtype = "source",
-	liquid_range = 1,
-	liquid_viscosity = 0,
-	liquid_alternative_flowing = "testnodes:liquid_flowing",
-	liquid_alternative_source = "testnodes:liquid",
-	groups = { dig_immediate = 3 },
-})
-minetest.register_node("testnodes:liquid_flowing", {
-	description = S("Flowing Liquid Drawtype Test Node"),
-	drawtype = "flowingliquid",
-	paramtype = "light",
-	paramtype2 = "flowingliquid",
-	tiles = {
-		"testnodes_liquidflowing.png",
-	},
-	special_tiles = {
-		{name="testnodes_liquidflowing.png", backface_culling=false},
-		{name="testnodes_liquidflowing.png", backface_culling=false},
-	},
-	use_texture_alpha = true,
+-- DRAWTYPE ONLY, NO LIQUID PHYSICS!
+-- Liquid ranges 0 to 8
+for r = 0, 8 do
+	minetest.register_node("testnodes:liquid_"..r, {
+		description = S("Source Liquid Drawtype Test Node, Range @1", r),
+		drawtype = "liquid",
+		paramtype = "light",
+		tiles = {
+			"testnodes_liquidsource_r"..r..".png^[colorize:#FFFFFF:100",
+		},
+		special_tiles = {
+			{name="testnodes_liquidsource_r"..r..".png^[colorize:#FFFFFF:100", backface_culling=false},
+			{name="testnodes_liquidsource_r"..r..".png^[colorize:#FFFFFF:100", backface_culling=true},
+		},
+		use_texture_alpha = "blend",
+
+
+		walkable = false,
+		liquid_range = r,
+		liquid_viscosity = 0,
+		liquid_alternative_flowing = "testnodes:liquid_flowing_"..r,
+		liquid_alternative_source = "testnodes:liquid_"..r,
+		groups = { dig_immediate = 3 },
+	})
+	minetest.register_node("testnodes:liquid_flowing_"..r, {
+		description = S("Flowing Liquid Drawtype Test Node, Range @1", r),
+		drawtype = "flowingliquid",
+		paramtype = "light",
+		paramtype2 = "flowingliquid",
+		tiles = {
+			"testnodes_liquidflowing_r"..r..".png^[colorize:#FFFFFF:100",
+		},
+		special_tiles = {
+			{name="testnodes_liquidflowing_r"..r..".png^[colorize:#FFFFFF:100", backface_culling=false},
+			{name="testnodes_liquidflowing_r"..r..".png^[colorize:#FFFFFF:100", backface_culling=false},
+		},
+		use_texture_alpha = "blend",
+
+
+		walkable = false,
+		liquid_range = r,
+		liquid_viscosity = 0,
+		liquid_alternative_flowing = "testnodes:liquid_flowing_"..r,
+		liquid_alternative_source = "testnodes:liquid_"..r,
+		groups = { dig_immediate = 3 },
+	})
 
+end
 
-	walkable = false,
-	liquidtype = "flowing",
-	liquid_range = 1,
-	liquid_viscosity = 0,
-	liquid_alternative_flowing = "testnodes:liquid_flowing",
-	liquid_alternative_source = "testnodes:liquid",
-	groups = { dig_immediate = 3 },
-})
+-- Waving liquid test (drawtype only)
 minetest.register_node("testnodes:liquid_waving", {
 	description = S("Waving Source Liquid Drawtype Test Node"),
 	drawtype = "liquid",
 	paramtype = "light",
 	tiles = {
-		"testnodes_liquidsource.png^[brighten",
+		"testnodes_liquidsource.png^[colorize:#0000FF:127",
 	},
 	special_tiles = {
-		{name="testnodes_liquidsource.png^[brighten", backface_culling=false},
-		{name="testnodes_liquidsource.png^[brighten", backface_culling=true},
+		{name="testnodes_liquidsource.png^[colorize:#0000FF:127", backface_culling=false},
+		{name="testnodes_liquidsource.png^[colorize:#0000FF:127", backface_culling=true},
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	waving = 3,
 
 
 	walkable = false,
-	liquidtype = "source",
 	liquid_range = 1,
 	liquid_viscosity = 0,
 	liquid_alternative_flowing = "testnodes:liquid_flowing_waving",
@@ -424,18 +471,17 @@ minetest.register_node("testnodes:liquid_flowing_waving", {
 	paramtype = "light",
 	paramtype2 = "flowingliquid",
 	tiles = {
-		"testnodes_liquidflowing.png^[brighten",
+		"testnodes_liquidflowing.png^[colorize:#0000FF:127",
 	},
 	special_tiles = {
-		{name="testnodes_liquidflowing.png^[brighten", backface_culling=false},
-		{name="testnodes_liquidflowing.png^[brighten", backface_culling=false},
+		{name="testnodes_liquidflowing.png^[colorize:#0000FF:127", backface_culling=false},
+		{name="testnodes_liquidflowing.png^[colorize:#0000FF:127", backface_culling=false},
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	waving = 3,
 
 
 	walkable = false,
-	liquidtype = "flowing",
 	liquid_range = 1,
 	liquid_viscosity = 0,
 	liquid_alternative_flowing = "testnodes:liquid_flowing_waving",
@@ -443,8 +489,6 @@ minetest.register_node("testnodes:liquid_flowing_waving", {
 	groups = { dig_immediate = 3 },
 })
 
-
-
 -- Invisible node
 minetest.register_node("testnodes:airlike", {
 	description = S("Airlike Drawtype Test Node"),
@@ -455,7 +499,6 @@ minetest.register_node("testnodes:airlike", {
 	walkable = false,
 	groups = { dig_immediate = 3 },
 	sunlight_propagates = true,
-	inventory_image = fallback_image("testnodes_airlike.png"),
 })
 
 -- param2 changes liquid height
@@ -548,7 +591,7 @@ scale("plantlike",
 scale("torchlike_wallmounted",
 	S("Double-sized Wallmounted Torchlike Drawtype Test Node"),
 	S("Half-sized Wallmounted Torchlike Drawtype Test Node"))
-scale("signlike",
+scale("signlike_wallmounted",
 	S("Double-sized Wallmounted Signlike Drawtype Test Node"),
 	S("Half-sized Wallmounted Signlike Drawtype Test Node"))
 scale("firelike",
diff --git a/games/devtest/mods/testnodes/liquids.lua b/games/devtest/mods/testnodes/liquids.lua
index e316782ad..3d2ea17f5 100644
--- a/games/devtest/mods/testnodes/liquids.lua
+++ b/games/devtest/mods/testnodes/liquids.lua
@@ -9,11 +9,9 @@ for d=0, 8 do
 			{name = "testnodes_liquidsource_r"..d..".png", backface_culling = false},
 			{name = "testnodes_liquidsource_r"..d..".png", backface_culling = true},
 		},
-		alpha = 192,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		walkable = false,
-		pointable = false,
-		diggable = false,
 		buildable_to = true,
 		is_ground_content = false,
 		liquidtype = "source",
@@ -30,12 +28,10 @@ for d=0, 8 do
 			{name = "testnodes_liquidflowing_r"..d..".png", backface_culling = false},
 			{name = "testnodes_liquidflowing_r"..d..".png", backface_culling = false},
 		},
-		alpha = 192,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		paramtype2 = "flowingliquid",
 		walkable = false,
-		pointable = false,
-		diggable = false,
 		buildable_to = true,
 		is_ground_content = false,
 		liquidtype = "flowing",
@@ -53,11 +49,9 @@ for d=0, 8 do
 			{name = "testnodes_liquidsource_r"..d..".png"..mod, backface_culling = false},
 			{name = "testnodes_liquidsource_r"..d..".png"..mod, backface_culling = true},
 		},
-		alpha = 192,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		walkable = false,
-		pointable = false,
-		diggable = false,
 		buildable_to = true,
 		is_ground_content = false,
 		liquidtype = "source",
@@ -74,12 +68,10 @@ for d=0, 8 do
 			{name = "testnodes_liquidflowing_r"..d..".png"..mod, backface_culling = false},
 			{name = "testnodes_liquidflowing_r"..d..".png"..mod, backface_culling = false},
 		},
-		alpha = 192,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		paramtype2 = "flowingliquid",
 		walkable = false,
-		pointable = false,
-		diggable = false,
 		buildable_to = true,
 		is_ground_content = false,
 		liquidtype = "flowing",
diff --git a/games/devtest/mods/testnodes/properties.lua b/games/devtest/mods/testnodes/properties.lua
index 01846a5f0..a52cd1d6f 100644
--- a/games/devtest/mods/testnodes/properties.lua
+++ b/games/devtest/mods/testnodes/properties.lua
@@ -114,11 +114,10 @@ minetest.register_node("testnodes:liquid_nojump", {
 		{name = "testnodes_liquidsource.png^[colorize:#FF0000:127", backface_culling = false},
 		{name = "testnodes_liquidsource.png^[colorize:#FF0000:127", backface_culling = true},
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	pointable = false,
 	liquids_pointable = true,
-	diggable = false,
 	buildable_to = true,
 	is_ground_content = false,
 	post_effect_color = {a = 70, r = 255, g = 0, b = 200},
@@ -143,12 +142,11 @@ minetest.register_node("testnodes:liquidflowing_nojump", {
 		{name = "testnodes_liquidflowing.png^[colorize:#FF0000:127", backface_culling = false},
 		{name = "testnodes_liquidflowing.png^[colorize:#FF0000:127", backface_culling = false},
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	paramtype2 = "flowingliquid",
 	pointable = false,
 	liquids_pointable = true,
-	diggable = false,
 	buildable_to = true,
 	is_ground_content = false,
 	post_effect_color = {a = 70, r = 255, g = 0, b = 200},
diff --git a/games/devtest/mods/testnodes/settingtypes.txt b/games/devtest/mods/testnodes/settingtypes.txt
deleted file mode 100644
index 7f753bf3e..000000000
--- a/games/devtest/mods/testnodes/settingtypes.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# If set to true, will show an inventory image for nodes that have no inventory image as of Minetest 5.1.0.
-# This is due to <https://github.com/minetest/minetest/issues/9209>.
-# This is only added to make the items more visible to avoid confusion, but you will no longer see the default inventory images for these items. When you want to test the default inventory image of drawtypes, this should be turned off.
-testnodes_show_fallback_image (Use fallback inventory images) bool false
diff --git a/games/devtest/mods/testnodes/textures.lua b/games/devtest/mods/testnodes/textures.lua
index e0724c229..f6e6a0c2a 100644
--- a/games/devtest/mods/testnodes/textures.lua
+++ b/games/devtest/mods/testnodes/textures.lua
@@ -46,77 +46,22 @@ for a=1,#alphas do
 		tiles = {
 			"testnodes_alpha"..alpha..".png",
 		},
-		use_texture_alpha = true,
+		use_texture_alpha = "blend",
 
 		groups = { dig_immediate = 3 },
 	})
 
-	-- Transparency set via "alpha" parameter
+	-- Transparency set via texture modifier
 	minetest.register_node("testnodes:alpha_"..alpha, {
 		description = S("Alpha Test Node (@1)", alpha),
-		-- It seems that only the liquid drawtype supports the alpha parameter
-		drawtype = "liquid",
+		drawtype = "glasslike",
 		paramtype = "light",
 		tiles = {
-			"testnodes_alpha.png",
+			"testnodes_alpha.png^[opacity:" .. alpha,
 		},
-		alpha = alpha,
-
+		use_texture_alpha = "blend",
 
-		liquidtype = "source",
-		liquid_range = 0,
-		liquid_viscosity = 0,
-		liquid_alternative_source = "testnodes:alpha_"..alpha,
-		liquid_alternative_flowing = "testnodes:alpha_"..alpha,
 		groups = { dig_immediate = 3 },
 	})
 end
 
-
--- Bumpmapping and Parallax Occlusion
-
--- This node has a normal map which corresponds to a pyramid with sides tilted
--- by an angle of 45°, i.e. the normal map contains four vectors which point
--- diagonally away from the surface (e.g. (0.7, 0.7, 0)),
--- and the heights in the height map linearly increase towards the centre,
--- so that the surface corresponds to a simple pyramid.
--- The node can help to determine if e.g. tangent space transformations work
--- correctly.
--- If, for example, the light comes from above, then the (tilted) pyramids
--- should look like they're lit from this light direction on all node faces.
--- The white albedo texture has small black indicators which can be used to see
--- how it is transformed ingame (and thus see if there's rotation around the
--- normal vector).
-minetest.register_node("testnodes:height_pyramid", {
-	description = "Bumpmapping and Parallax Occlusion Tester (height pyramid)",
-	tiles = {"testnodes_height_pyramid.png"},
-	groups = {dig_immediate = 3},
-})
-
--- The stairs nodes should help to validate if shading works correctly for
--- rotated nodes (which have rotated textures).
-stairs.register_stair_and_slab("height_pyramid", "experimantal:height_pyramid",
-	{dig_immediate = 3},
-	{"testnodes_height_pyramid.png"},
-	"Bumpmapping and Parallax Occlusion Tester Stair (height pyramid)",
-	"Bumpmapping and Parallax Occlusion Tester Slab (height pyramid)")
-
--- This node has a simple heightmap for parallax occlusion testing and flat
--- normalmap.
--- When parallax occlusion is enabled, the yellow scrawl should stick out of
--- the texture when viewed at an angle.
-minetest.register_node("testnodes:parallax_extruded", {
-	description = "Parallax Occlusion Tester",
-	tiles = {"testnodes_parallax_extruded.png"},
-	groups = {dig_immediate = 3},
-})
-
--- Analogously to the height pyramid stairs nodes,
--- these nodes should help to validate if parallax occlusion works correctly for
--- rotated nodes (which have rotated textures).
-stairs.register_stair_and_slab("parallax_extruded",
-	"experimantal:parallax_extruded",
-	{dig_immediate = 3},
-	{"testnodes_parallax_extruded.png"},
-	"Parallax Occlusion Tester Stair",
-	"Parallax Occlusion Tester Slab")
diff --git a/games/devtest/mods/testnodes/textures/testnodes_height_pyramid.png b/games/devtest/mods/testnodes/textures/testnodes_height_pyramid.png
deleted file mode 100644
index 8c787b740..000000000
--- a/games/devtest/mods/testnodes/textures/testnodes_height_pyramid.png
+++ /dev/null
diff --git a/games/devtest/mods/testnodes/textures/testnodes_height_pyramid_normal.png b/games/devtest/mods/testnodes/textures/testnodes_height_pyramid_normal.png
deleted file mode 100644
index 5ab7865f2..000000000
--- a/games/devtest/mods/testnodes/textures/testnodes_height_pyramid_normal.png
+++ /dev/null
diff --git a/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded.png b/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded.png
deleted file mode 100644
index 7e1c32398..000000000
--- a/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded.png
+++ /dev/null
diff --git a/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded_normal.png b/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded_normal.png
deleted file mode 100644
index b134699d0..000000000
--- a/games/devtest/mods/testnodes/textures/testnodes_parallax_extruded_normal.png
+++ /dev/null
diff --git a/games/devtest/mods/testtools/README.md b/games/devtest/mods/testtools/README.md
index 9cfe29ea4..a1eb95ed7 100644
--- a/games/devtest/mods/testtools/README.md
+++ b/games/devtest/mods/testtools/README.md
@@ -33,6 +33,13 @@ Usage:
 * Punch node: Make it fall
 * Place: Try to teleport up to 2 units upwards, then make it fall
 
+## Node Meta Editor
+Edit and view metadata of nodes.
+
+Usage:
+
+* Punch: Open node metadata editor
+
 ## Entity Rotator
 Changes the entity rotation (with `set_rotation`).
 
@@ -90,6 +97,13 @@ Usage:
 * Place: Increase move distance
 * Sneak+place: Decrease move distance
 
+## Children Getter
+Shows list of objects that are attached to an object (aka "children") in chat.
+
+Usage:
+* Punch object: Show children of punched object
+* Punch air: Show your own children
+
 ## Entity Visual Scaler
 Change visual size of entities
 
@@ -97,3 +111,10 @@ Usage:
 
 * Punch entity to increase visual size
 * Sneak+punch entity to decrease visual size
+
+## Light Tool
+Show light level of node.
+
+Usage:
+* Punch: Show light info of node in front of the punched node's side
+* Place: Show light info of the node that you touched
diff --git a/games/devtest/mods/testtools/init.lua b/games/devtest/mods/testtools/init.lua
index d578b264a..1041acdeb 100644
--- a/games/devtest/mods/testtools/init.lua
+++ b/games/devtest/mods/testtools/init.lua
@@ -3,8 +3,6 @@ local F = minetest.formspec_escape
 
 dofile(minetest.get_modpath("testtools") .. "/light.lua")
 
--- TODO: Add a Node Metadata tool
-
 minetest.register_tool("testtools:param2tool", {
 	description = S("Param2 Tool") .."\n"..
 		S("Modify param2 value of nodes") .."\n"..
@@ -111,25 +109,6 @@ minetest.register_tool("testtools:node_setter", {
 	end,
 })
 
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	if formname == "testtools:node_setter" then
-		local playername = player:get_player_name()
-		local witem = player:get_wielded_item()
-		if witem:get_name() == "testtools:node_setter" then
-			if fields.nodename and fields.param2 then
-				local param2 = tonumber(fields.param2)
-				if not param2 then
-					return
-				end
-				local meta = witem:get_meta()
-				meta:set_string("node", fields.nodename)
-				meta:set_int("node_param2", param2)
-				player:set_wielded_item(witem)
-			end
-		end
-	end
-end)
-
 minetest.register_tool("testtools:remover", {
 	description = S("Remover") .."\n"..
 		S("Punch: Remove pointed node or object"),
@@ -634,6 +613,54 @@ minetest.register_tool("testtools:object_attacher", {
 	end,
 })
 
+local function print_object(obj)
+	if obj:is_player() then
+		return "player '"..obj:get_player_name().."'"
+	elseif obj:get_luaentity() then
+		return "LuaEntity '"..obj:get_luaentity().name.."'"
+	else
+		return "object"
+	end
+end
+
+minetest.register_tool("testtools:children_getter", {
+	description = S("Children Getter") .."\n"..
+		S("Shows list of objects attached to object") .."\n"..
+		S("Punch object to show its 'children'") .."\n"..
+		S("Punch air to show your own 'children'"),
+	inventory_image = "testtools_children_getter.png",
+	groups = { testtool = 1, disable_repair = 1 },
+	on_use = function(itemstack, user, pointed_thing)
+		if user and user:is_player() then
+			local name = user:get_player_name()
+			local selected_object
+			local self_name
+			if pointed_thing.type == "object" then
+				selected_object = pointed_thing.ref
+			elseif pointed_thing.type == "nothing" then
+				selected_object = user
+			else
+				return
+			end
+			self_name = print_object(selected_object)
+			local children = selected_object:get_children()
+			local ret = ""
+			for c=1, #children do
+				ret = ret .. "* " .. print_object(children[c])
+				if c < #children then
+					ret = ret .. "\n"
+				end
+			end
+			if ret == "" then
+				ret = S("No children attached to @1.", self_name)
+			else
+				ret = S("Children of @1:", self_name) .. "\n" .. ret
+			end
+			minetest.chat_send_player(user:get_player_name(), ret)
+		end
+	end,
+})
+
 -- Use loadstring to parse param as a Lua value
 local function use_loadstring(param, player)
 	-- For security reasons, require 'server' priv, just in case
@@ -666,6 +693,68 @@ local function use_loadstring(param, player)
 	return true, errOrResult
 end
 
+-- Node Meta Editor
+local node_meta_posses = {}
+local node_meta_latest_keylist = {}
+
+local function show_node_meta_formspec(user, pos, key, value, keylist)
+	local textlist
+	if keylist then
+		textlist = "textlist[0,0.5;2.5,6.5;keylist;"..keylist.."]"
+	else
+		textlist = ""
+	end
+	minetest.show_formspec(user:get_player_name(),
+		"testtools:node_meta_editor",
+		"size[15,9]"..
+		"label[0,0;"..F(S("Current keys:")).."]"..
+		textlist..
+		"field[3,0.5;12,1;key;"..F(S("Key"))..";"..F(key).."]"..
+		"textarea[3,1.5;12,6;value;"..F(S("Value (use empty value to delete key)"))..";"..F(value).."]"..
+		"button[0,8;3,1;get;"..F(S("Get value")).."]"..
+		"button[4,8;3,1;set;"..F(S("Set value")).."]"..
+		"label[0,7.2;"..F(S("pos = @1", minetest.pos_to_string(pos))).."]")
+end
+
+local function get_node_meta_keylist(meta, playername, escaped)
+	local keys = {}
+	local ekeys = {}
+	local mtable = meta:to_table()
+	for k,_ in pairs(mtable.fields) do
+		table.insert(keys, k)
+		if escaped then
+			table.insert(ekeys, F(k))
+		else
+			table.insert(ekeys, k)
+		end
+	end
+	if playername then
+		node_meta_latest_keylist[playername] = keys
+	end
+	return table.concat(ekeys, ",")
+end
+
+minetest.register_tool("testtools:node_meta_editor", {
+	description = S("Node Meta Editor") .. "\n" ..
+		S("Place: Edit node metadata"),
+	inventory_image = "testtools_node_meta_editor.png",
+	groups = { testtool = 1, disable_repair = 1 },
+	on_place = function(itemstack, user, pointed_thing)
+		if pointed_thing.type ~= "node" then
+			return itemstack
+		end
+		if not user:is_player() then
+			return itemstack
+		end
+		local pos = pointed_thing.under
+		node_meta_posses[user:get_player_name()] = pos
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		show_node_meta_formspec(user, pos, "", "", get_node_meta_keylist(meta, user:get_player_name(), true))
+		return itemstack
+	end,
+})
+
 minetest.register_on_player_receive_fields(function(player, formname, fields)
 	if not (player and player:is_player()) then
 		return
@@ -728,5 +817,70 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			editor_formspec(name, selected_objects[name], prop_to_string(props[key]), sel)
 			return
 		end
+	elseif formname == "testtools:node_setter" then
+		local playername = player:get_player_name()
+		local witem = player:get_wielded_item()
+		if witem:get_name() == "testtools:node_setter" then
+			if fields.nodename and fields.param2 then
+				local param2 = tonumber(fields.param2)
+				if not param2 then
+					return
+				end
+				local meta = witem:get_meta()
+				meta:set_string("node", fields.nodename)
+				meta:set_int("node_param2", param2)
+				player:set_wielded_item(witem)
+			end
+		end
+	elseif formname == "testtools:node_meta_editor" then
+		local name = player:get_player_name()
+		local pos = node_meta_posses[name]
+		if fields.keylist then
+			local evnt = minetest.explode_textlist_event(fields.keylist)
+			if evnt.type == "DCL" or evnt.type == "CHG" then
+				local keylist_table = node_meta_latest_keylist[name]
+				if not pos then
+					return
+				end
+				local meta = minetest.get_meta(pos)
+				if not keylist_table then
+					return
+				end
+				if #keylist_table == 0 then
+					return
+				end
+				local key = keylist_table[evnt.index]
+				local value = meta:get_string(key)
+				local keylist_escaped = {}
+				for k,v in pairs(keylist_table) do
+					keylist_escaped[k] = F(v)
+				end
+				local keylist = table.concat(keylist_escaped, ",")
+				show_node_meta_formspec(player, pos, key, value, keylist)
+				return
+			end
+		elseif fields.key and fields.key ~= "" and fields.value then
+			if not pos then
+				return
+			end
+			local meta = minetest.get_meta(pos)
+			if fields.get then
+				local value = meta:get_string(fields.key)
+				show_node_meta_formspec(player, pos, fields.key, value,
+						get_node_meta_keylist(meta, name, true))
+				return
+			elseif fields.set then
+				meta:set_string(fields.key, fields.value)
+				show_node_meta_formspec(player, pos, fields.key, fields.value,
+						get_node_meta_keylist(meta, name, true))
+				return
+			end
+		end
 	end
 end)
+
+minetest.register_on_leaveplayer(function(player)
+	local name = player:get_player_name()
+	node_meta_latest_keylist[name] = nil
+	node_meta_posses[name] = nil
+end)
diff --git a/games/devtest/mods/testtools/light.lua b/games/devtest/mods/testtools/light.lua
index a9458ca6b..afca9a489 100644
--- a/games/devtest/mods/testtools/light.lua
+++ b/games/devtest/mods/testtools/light.lua
@@ -1,22 +1,37 @@
 
 local S = minetest.get_translator("testtools")
 
-minetest.register_tool("testtools:lighttool", {
-	description = S("Light tool"),
-	inventory_image = "testtools_lighttool.png",
-	groups = { testtool = 1, disable_repair = 1 },
-	on_use = function(itemstack, user, pointed_thing)
-		local pos = pointed_thing.above
+local function get_func(is_place)
+	return function(itemstack, user, pointed_thing)
+		local pos
+		if is_place then
+			pos = pointed_thing.under
+		else
+			pos = pointed_thing.above
+		end
 		if pointed_thing.type ~= "node" or not pos then
 			return
 		end
 
 		local node = minetest.get_node(pos)
+		local pstr = minetest.pos_to_string(pos)
 		local time = minetest.get_timeofday()
 		local sunlight = minetest.get_natural_light(pos)
 		local artificial = minetest.get_artificial_light(node.param1)
-		local message = ("param1 0x%02x | time %.5f | sunlight %d | artificial %d")
-				:format(node.param1, time, sunlight, artificial)
+		local message = ("pos=%s | param1=0x%02x | " ..
+				"sunlight=%d | artificial=%d | timeofday=%.5f" )
+				:format(pstr, node.param1, sunlight, artificial, time)
 		minetest.chat_send_player(user:get_player_name(), message)
 	end
+end
+
+minetest.register_tool("testtools:lighttool", {
+	description = S("Light Tool") .. "\n" ..
+		S("Show light values of node") .. "\n" ..
+		S("Punch: Light of node above touched node") .. "\n" ..
+		S("Place: Light of touched node itself"),
+	inventory_image = "testtools_lighttool.png",
+	groups = { testtool = 1, disable_repair = 1 },
+	on_use = get_func(false),
+	on_place = get_func(true),
 })
diff --git a/games/devtest/mods/testtools/textures/testtools_children_getter.png b/games/devtest/mods/testtools/textures/testtools_children_getter.png
new file mode 100644
index 000000000..b7fa34025
--- /dev/null
+++ b/games/devtest/mods/testtools/textures/testtools_children_getter.png
diff --git a/games/devtest/mods/testtools/textures/testtools_node_meta_editor.png b/games/devtest/mods/testtools/textures/testtools_node_meta_editor.png
new file mode 100644
index 000000000..89eafd65c
--- /dev/null
+++ b/games/devtest/mods/testtools/textures/testtools_node_meta_editor.png
diff --git a/games/devtest/mods/unittests/itemdescription.lua b/games/devtest/mods/unittests/itemdescription.lua
index 1d0826545..d6ee6551a 100644
--- a/games/devtest/mods/unittests/itemdescription.lua
+++ b/games/devtest/mods/unittests/itemdescription.lua
@@ -26,15 +26,22 @@ minetest.register_chatcommand("item_description", {
 })
 
 function unittests.test_short_desc()
+	local function get_short_description(item)
+		return ItemStack(item):get_short_description()
+	end
+
 	local stack = ItemStack("unittests:colorful_pick")
 	assert(stack:get_short_description() == "Colorful Pickaxe")
-	assert(stack:get_short_description() == minetest.registered_items["unittests:colorful_pick"].short_description)
+	assert(get_short_description("unittests:colorful_pick") == "Colorful Pickaxe")
+	assert(minetest.registered_items["unittests:colorful_pick"].short_description == nil)
 	assert(stack:get_description() == full_description)
 	assert(stack:get_description() == minetest.registered_items["unittests:colorful_pick"].description)
 
 	stack:get_meta():set_string("description", "Hello World")
-	assert(stack:get_short_description() == "Colorful Pickaxe")
+	assert(stack:get_short_description() == "Hello World")
 	assert(stack:get_description() == "Hello World")
+	assert(get_short_description(stack) == "Hello World")
+	assert(get_short_description("unittests:colorful_pick") == "Colorful Pickaxe")
 
 	stack:get_meta():set_string("short_description", "Foo Bar")
 	assert(stack:get_short_description() == "Foo Bar")
diff --git a/games/devtest/mods/unittests/mod.conf b/games/devtest/mods/unittests/mod.conf
index 0d5e3c959..fa94e01a6 100644
--- a/games/devtest/mods/unittests/mod.conf
+++ b/games/devtest/mods/unittests/mod.conf
@@ -1,2 +1,3 @@
 name = unittests
 description = Adds automated unit tests for the engine
+depends = basenodes
diff --git a/games/devtest/mods/unittests/textures/default_dirt.png b/games/devtest/mods/unittests/textures/default_dirt.png
new file mode 100644
index 000000000..58670305d
--- /dev/null
+++ b/games/devtest/mods/unittests/textures/default_dirt.png
diff --git a/games/devtest/settingtypes.txt b/games/devtest/settingtypes.txt
index 40ee5845b..c4365643e 100644
--- a/games/devtest/settingtypes.txt
+++ b/games/devtest/settingtypes.txt
@@ -30,8 +30,3 @@ devtest_dungeon_mossycobble (Generate mossy cobblestone) bool false
 
 # If enabled, some very basic biomes will be registered.
 devtest_register_biomes (Register biomes) bool true
-
-# If set to true, will show an inventory image for nodes that have no inventory image as of Minetest 5.1.0.
-# This is due to <https://github.com/minetest/minetest/issues/9209>.
-# This is only added to make the items more visible to avoid confusion, but you will no longer see the default inventory images for these items. When you want to test the default inventory image of drawtypes, this should be turned off.
-testnodes_show_fallback_image (Use fallback inventory images) bool false
diff --git a/minetest.conf.example b/minetest.conf.example
index 086339037..6343c8234 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -75,10 +75,10 @@
 #    type: bool
 # always_fly_fast = true
 
-#    The time in seconds it takes between repeated right clicks when holding the right
-#    mouse button.
+#    The time in seconds it takes between repeated node placements when holding
+#    the place button.
 #    type: float min: 0.001
-# repeat_rightclick_time = 0.25
+# repeat_place_time = 0.25
 
 #    Automatically jump up single-node obstacles.
 #    type: bool
@@ -130,6 +130,7 @@
 # repeat_joystick_button_time = 0.17
 
 #    The deadzone of the joystick
+#    type: int
 # joystick_deadzone = 2048
 
 #    The sensitivity of the joystick axes for moving the
@@ -169,6 +170,16 @@
 #    type: key
 # keymap_sneak = KEY_LSHIFT
 
+#    Key for digging.
+#    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
+#    type: key
+# keymap_dig = KEY_LBUTTON
+
+#    Key for placing.
+#    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
+#    type: key
+# keymap_place = KEY_RBUTTON
+
 #    Key for opening the inventory.
 #    See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
 #    type: key
@@ -492,6 +503,11 @@
 
 ### Basic
 
+#    Whether nametag backgrounds should be shown by default.
+#    Mods may still set a background.
+#    type: bool
+# show_nametag_backgrounds = true
+
 #    Enable vertex buffer objects.
 #    This should greatly improve graphics performance.
 #    type: bool
@@ -572,8 +588,13 @@
 #    type: int
 # texture_min_size = 64
 
-#    Experimental option, might cause visible spaces between blocks
-#    when set to higher number than 0.
+#    Use multi-sample antialiasing (MSAA) to smooth out block edges.
+#    This algorithm smooths out the 3D viewport while keeping the image sharp,
+#    but it doesn't affect the insides of textures
+#    (which is especially noticeable with transparent textures).
+#    Visible spaces appear between nodes when shaders are disabled.
+#    If set to 0, MSAA is disabled.
+#    A restart is required after changing this option.
 #    type: enum values: 0, 1, 2, 4, 8, 16
 # fsaa = 0
 
@@ -605,37 +626,6 @@
 #    type: bool
 # tone_mapping = false
 
-#### Bumpmapping
-
-#    Enables bumpmapping for textures. Normalmaps need to be supplied by the texture pack.
-#    Requires shaders to be enabled.
-#    type: bool
-# enable_bumpmapping = false
-
-#### Parallax Occlusion
-
-#    Enables parallax occlusion mapping.
-#    Requires shaders to be enabled.
-#    type: bool
-# enable_parallax_occlusion = false
-
-#    0 = parallax occlusion with slope information (faster).
-#    1 = relief mapping (slower, more accurate).
-#    type: int min: 0 max: 1
-# parallax_occlusion_mode = 1
-
-#    Number of parallax occlusion iterations.
-#    type: int
-# parallax_occlusion_iterations = 4
-
-#    Overall scale of parallax occlusion effect.
-#    type: float
-# parallax_occlusion_scale = 0.08
-
-#    Overall bias of parallax occlusion effect, usually scale/2.
-#    type: float
-# parallax_occlusion_bias = 0.04
-
 #### Waving Nodes
 
 #    Set to true to enable waving liquids (like water).
@@ -684,9 +674,9 @@
 #    type: int min: 1
 # fps_max = 60
 
-#    Maximum FPS when game is paused.
+#    Maximum FPS when the window is not focused, or when the game is paused.
 #    type: int min: 1
-# pause_fps_max = 20
+# fps_max_unfocused = 20
 
 #    Open the pause menu when the window's focus is lost. Does not pause if a formspec is
 #    open.
@@ -695,7 +685,7 @@
 
 #    View distance in nodes.
 #    type: int min: 20 max: 4000
-# viewing_range = 100
+# viewing_range = 190
 
 #    Camera 'near clipping plane' distance in nodes, between 0 and 0.25
 #    Only works on GLES platforms. Most users will not need to change this.
@@ -771,11 +761,11 @@
 #    type: path
 # texture_path =
 
-#    The rendering back-end for Irrlicht.
+#    The rendering back-end.
 #    A restart is required after changing this.
 #    Note: On Android, stick with OGLES1 if unsure! App may fail to start otherwise.
-#    On other platforms, OpenGL is recommended, and it’s the only driver with
-#    shader support currently.
+#    On other platforms, OpenGL is recommended.
+#    Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)
 #    type: enum values: null, software, burningsvideo, direct3d8, direct3d9, opengl, ogles1, ogles2
 # video_driver = opengl
 
@@ -848,10 +838,12 @@
 # selectionbox_width = 2
 
 #    Crosshair color (R,G,B).
+#    Also controls the object crosshair color
 #    type: string
 # crosshair_color = (255,255,255)
 
 #    Crosshair alpha (opaqueness, between 0 and 255).
+#    Also controls the object crosshair color
 #    type: int min: 0 max: 255
 # crosshair_alpha = 255
 
@@ -1160,7 +1152,7 @@
 #    File in client/serverlist/ that contains your favorite servers displayed in the
 #    Multiplayer Tab.
 #    type: string
-# serverlist_file = favoriteservers.txt
+# serverlist_file = favoriteservers.json
 
 #    Maximum size of the out chat queue.
 #    0 to disable queueing and -1 to make the queue size unlimited.
@@ -1181,7 +1173,7 @@
 #    Maximum number of mapblocks for client to be kept in memory.
 #    Set to -1 for unlimited amount.
 #    type: int
-# client_mapblock_limit = 5000
+# client_mapblock_limit = 7500
 
 #    Whether to show the client debug info (has the same effect as hitting F5).
 #    type: bool
@@ -1269,6 +1261,14 @@
 #    type: int
 # max_packets_per_iteration = 1024
 
+#    ZLib compression level to use when sending mapblocks to the client.
+#    -1 - Zlib's default compression level
+#    0 - no compresson, fastest
+#    9 - best compression, slowest
+#    (levels 1-3 use Zlib's "fast" method, 4-9 use the normal method)
+#    type: int min: -1 max: 9
+# map_compression_level_net = -1
+
 ## Game
 
 #    Default game when creating a new world.
@@ -1303,7 +1303,7 @@
 #    type: bool
 # enable_damage = false
 
-#    Enable creative mode for new created maps.
+#    Enable creative mode for all players
 #    type: bool
 # creative_mode = false
 
@@ -1383,7 +1383,7 @@
 #    to maintain active objects up to this distance in the direction the
 #    player is looking. (This can avoid mobs suddenly disappearing from view)
 #    type: int
-# active_object_send_range_blocks = 4
+# active_object_send_range_blocks = 8
 
 #    The radius of the volume of blocks around every player that is subject to the
 #    active block stuff, stated in mapblocks (16 nodes).
@@ -1391,11 +1391,11 @@
 #    This is also the minimum range in which active objects (mobs) are maintained.
 #    This should be configured together with active_object_send_range_blocks.
 #    type: int
-# active_block_range = 3
+# active_block_range = 4
 
 #    From how far blocks are sent to clients, stated in mapblocks (16 nodes).
 #    type: int
-# max_block_send_distance = 10
+# max_block_send_distance = 12
 
 #    Maximum number of forceloaded mapblocks.
 #    type: int
@@ -1488,11 +1488,11 @@
 ### Advanced
 
 #    Handling for deprecated Lua API calls:
-#    -    legacy: (try to) mimic old behaviour (default for release).
-#    -    log: mimic and log backtrace of deprecated call (default for debug).
+#    -    none: Do not log deprecated calls
+#    -    log: mimic and log backtrace of deprecated call (default).
 #    -    error: abort on usage of deprecated call (suggested for mod developers).
-#    type: enum values: legacy, log, error
-# deprecated_lua_api_handling = legacy
+#    type: enum values: none, log, error
+# deprecated_lua_api_handling = log
 
 #    Number of extra blocks that can be loaded by /clearobjects at once.
 #    This is a trade-off between sqlite transaction overhead and
@@ -1513,6 +1513,14 @@
 #    type: enum values: 0, 1, 2
 # sqlite_synchronous = 2
 
+#    ZLib compression level to use when saving mapblocks to disk.
+#    -1 - Zlib's default compression level
+#    0 - no compresson, fastest
+#    9 - best compression, slowest
+#    (levels 1-3 use Zlib's "fast" method, 4-9 use the normal method)
+#    type: int min: -1 max: 9
+# map_compression_level_disk = 3
+
 #    Length of a server tick and the interval at which objects are generally updated over
 #    network.
 #    type: float
@@ -1526,6 +1534,11 @@
 #    type: float
 # abm_interval = 1.0
 
+#    The time budget allowed for ABMs to execute on each step
+#    (as a fraction of the ABM Interval)
+#    type: float min: 0.1 max: 0.9
+# abm_time_budget = 0.2
+
 #    Length of time between NodeTimer execution cycles
 #    type: float
 # nodetimer_interval = 0.2
@@ -1722,13 +1735,6 @@
 #    type: bool
 # high_precision_fpu = true
 
-#    Changes the main menu UI:
-#    -   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, etc.
-#    -   Simple: One singleplayer world, no game or texture pack choosers. May be
-#    necessary for smaller screens.
-#    type: enum values: full, simple
-# main_menu_style = full
-
 #    Replaces the default main menu with a custom one.
 #    type: string
 # main_menu_script =
@@ -1755,7 +1761,7 @@
 
 #    From how far blocks are generated for clients, stated in mapblocks (16 nodes).
 #    type: int
-# max_block_generate_distance = 8
+# max_block_generate_distance = 10
 
 #    Limit of map generation, in nodes, in all 6 directions from (0, 0, 0).
 #    Only mapchunks completely within the mapgen limit are generated.
@@ -1766,8 +1772,8 @@
 #    Global map generation attributes.
 #    In Mapgen v6 the 'decorations' flag controls all decorations except trees
 #    and junglegrass, in all other mapgens this flag controls all decorations.
-#    type: flags possible values: caves, dungeons, light, decorations, biomes, nocaves, nodungeons, nolight, nodecorations, nobiomes
-# mg_flags = caves,dungeons,light,decorations,biomes
+#    type: flags possible values: caves, dungeons, light, decorations, biomes, ores, nocaves, nodungeons, nolight, nodecorations, nobiomes, noores
+# mg_flags = caves,dungeons,light,decorations,biomes,ores
 
 ## Biome API temperature and humidity noise parameters
 
@@ -2753,8 +2759,8 @@
 
 #    Map generation attributes specific to Mapgen Flat.
 #    Occasional lakes and hills can be added to the flat world.
-#    type: flags possible values: lakes, hills, nolakes, nohills
-# mgflat_spflags = nolakes,nohills
+#    type: flags possible values: lakes, hills, caverns, nolakes, nohills, nocaverns
+# mgflat_spflags = nolakes,nohills,nocaverns
 
 #    Y of flat ground.
 #    type: int
@@ -2810,6 +2816,18 @@
 #    type: float
 # mgflat_hill_steepness = 64.0
 
+#    Y-level of cavern upper limit.
+#    type: int
+# mgflat_cavern_limit = -256
+
+#    Y-distance over which caverns expand to full size.
+#    type: int
+# mgflat_cavern_taper = 256
+
+#    Defines full size of caverns, smaller values create larger caverns.
+#    type: float
+# mgflat_cavern_threshold = 0.7
+
 #    Lower Y limit of dungeons.
 #    type: int
 # mgflat_dungeon_ymin = -31000
@@ -2872,6 +2890,19 @@
 #    flags       = 
 # }
 
+#    3D noise defining giant caverns.
+#    type: noise_params_3d
+# mgflat_np_cavern = {
+#    offset      = 0,
+#    scale       = 1,
+#    spread      = (384, 128, 384),
+#    seed        = 723,
+#    octaves     = 5,
+#    persistence = 0.63,
+#    lacunarity  = 2.0,
+#    flags       = 
+# }
+
 #    3D noise that determines number of dungeons per mapchunk.
 #    type: noise_params_3d
 # mgflat_np_dungeons = {
@@ -3322,17 +3353,17 @@
 
 #    Maximum number of blocks that can be queued for loading.
 #    type: int
-# emergequeue_limit_total = 512
+# emergequeue_limit_total = 1024
 
 #    Maximum number of blocks to be queued that are to be loaded from file.
 #    This limit is enforced per player.
 #    type: int
-# emergequeue_limit_diskonly = 64
+# emergequeue_limit_diskonly = 128
 
 #    Maximum number of blocks to be queued that are to be generated.
 #    This limit is enforced per player.
 #    type: int
-# emergequeue_limit_generate = 64
+# emergequeue_limit_generate = 128
 
 #    Number of emerge threads to use.
 #    Value 0:
@@ -3363,3 +3394,9 @@
 #    so see a full list at https://content.minetest.net/help/content_flags/
 #    type: string
 # contentdb_flag_blacklist = nonfree, desktop_default
+
+#    Maximum number of concurrent downloads. Downloads exceeding this limit will be queued.
+#    This should be lower than curl_parallel_limit.
+#    type: int
+# contentdb_max_concurrent_downloads = 3
+
diff --git a/misc/Info.plist b/misc/Info.plist
index b80ae9d7c..9460b273d 100644
--- a/misc/Info.plist
+++ b/misc/Info.plist
@@ -8,7 +8,13 @@
 	<string>minetest</string>
 	<key>CFBundleIconFile</key>
 	<string>dragonfire-icon.icns</string>
+	<key>CFBundleName</key>
+	<string>Minetest</string>
+	<key>CFBundleDisplayName</key>
+	<string>Minetest</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.minetest.minetest</string>
+	<key>NSHighResolutionCapable</key>
+	<false/>
 </dict>
 </plist>
diff --git a/misc/debpkg-control b/misc/debpkg-control
index 30dc94088..1fef17fd9 100644
--- a/misc/debpkg-control
+++ b/misc/debpkg-control
@@ -2,8 +2,8 @@ Section: games
 Priority: extra
 Standards-Version: 3.6.2
 Package: minetest-staging
-Version: 0.4.15-DATEPLACEHOLDER
-Depends: libc6, libcurl3-gnutls, libfreetype6, libirrlicht1.8, libjsoncpp1, LEVELDB_PLACEHOLDER, liblua5.1-0, libluajit-5.1-2, libopenal1, libsqlite3-0, libstdc++6, libvorbisfile3, libx11-6, zlib1g
+Version: 5.4.0-DATEPLACEHOLDER
+Depends: libc6, libcurl3-gnutls, libfreetype6, libgl1, JPEG_PLACEHOLDER, libjsoncpp1, LEVELDB_PLACEHOLDER, libopenal1, libpng16-16, libsqlite3-0, libstdc++6, libvorbisfile3, libx11-6, libxxf86vm1, zlib1g
 Maintainer: Loic Blot <loic.blot@unix-experience.fr>
 Homepage: https://www.minetest.net/
 Vcs-Git: https://github.com/minetest/minetest.git
@@ -12,15 +12,12 @@ Architecture: amd64
 Build-Depends:
  cmake,
  gettext,
- libbz2-dev,
  libcurl4-gnutls-dev,
  libfreetype6-dev,
- libglu1-mesa-dev,
- libirrlicht-dev (>= 1.7.0),
+ libgl1-mesa-dev,
  libjpeg-dev,
  libjsoncpp-dev,
  libleveldb-dev,
- libluajit-5.1-dev | liblua5.1-dev,
  libogg-dev,
  libopenal-dev,
  libpng-dev,
@@ -28,7 +25,7 @@ Build-Depends:
  libvorbis-dev,
  libx11-dev,
  zlib1g-dev
-Description: Multiplayer infinite-world block sandbox (server)
+Description: Multiplayer infinite-world block sandbox game
  Minetest is a minecraft-inspired game written from scratch and licensed
  under the LGPL (version 2.1 or later). It supports both survival and creative
  modes along with multiplayer support, dynamic lighting, and an "infinite" map
diff --git a/misc/minetest.exe.manifest b/misc/minetest.exe.manifest
index 3c32b0f8b..dcad3fcde 100644
--- a/misc/minetest.exe.manifest
+++ b/misc/minetest.exe.manifest
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <assemblyIdentity type="win32" name="minetest" version="0.0.0.0" />
     <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
         <security>
             <requestedPrivileges>
@@ -10,6 +11,7 @@
     <application xmlns="urn:schemas-microsoft-com:asm.v3">
         <windowsSettings>
             <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+            <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
         </windowsSettings>
     </application>
 </assembly>
diff --git a/misc/net.minetest.minetest.appdata.xml b/misc/net.minetest.minetest.appdata.xml
index f41762564..0e5397b37 100644
--- a/misc/net.minetest.minetest.appdata.xml
+++ b/misc/net.minetest.minetest.appdata.xml
@@ -62,6 +62,6 @@
 	<translation type="gettext">minetest</translation>
 	<update_contact>sfan5@live.de</update_contact>
 	<releases>
-		<release date="2019-10-12" version="5.1.0"/>
+		<release date="2021-02-23" version="5.4.0"/>
 	</releases>
 </component>
diff --git a/po/ar/minetest.po b/po/ar/minetest.po
index f83f7c733..1ab09c2bd 100644
--- a/po/ar/minetest.po
+++ b/po/ar/minetest.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-27 20:41+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-10-29 16:26+0000\n"
 "Last-Translator: abidin toumi <abidin24@disroot.org>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/minetest/minetest/"
 "ar/>\n"
@@ -18,7 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.3.2-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "أع�د الإحياء"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "م�ت"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -44,10 +52,6 @@ msgstr "أعد الإتصال"
 msgid "The server has requested a reconnect:"
 msgstr "يطلب الخادم إعادة الإتصال:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "يحمل..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "لا تتطابق نسخ المي�اق. "
@@ -61,10 +65,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "الخادم يدعم نسخ المي�اق ما بين $1 و $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "جرب إعادة تمكين قائمة الحوادم العامة وتحقق من إتصالك بالانترنت."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "نحن ندعم نسخة المي�اق $1�قط."
 
@@ -72,7 +72,8 @@ msgstr "نحن ندعم نسخة المي�اق $1�قط."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "نحن ندعم نسخ المي�اق ما بين $1 و $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -82,7 +83,8 @@ msgstr "نحن ندعم نسخ المي�اق ما بين $1 و $2."
 msgid "Cancel"
 msgstr "ألغ�"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "الإعتماديات:"
 
@@ -156,16 +158,57 @@ msgid "enabled"
 msgstr "م��عل"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "يحمل..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "كل الحزم"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "الم�تاح مستخدم مسبقا"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "ع�د للقائمة الرئيسة"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "استض� لعبة"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "لا يمكن استخدام ContentDB عند بناء Minetest بدون cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Downloading..."
@@ -185,22 +228,48 @@ msgid "Install"
 msgstr "ثبت"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "ثبت"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "الإعتماديات الإختيارية:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "التعديلات"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No packages could be retrieved"
-msgstr ""
+msgstr "تعذر استيراد الحزم"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No results"
 msgstr "بدون نتائج"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "إبحث"
+#, fuzzy
+msgid "No updates"
+msgstr "حد�ث"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -215,8 +284,12 @@ msgid "Update"
 msgstr "حد�ث"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "إعرض"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -224,31 +297,31 @@ msgstr "إسم العالم \"$1\" موجود مسبقاً"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "تضاريس إضا�ية"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr ""
+msgstr "تبريد مع زيادة الارت�اع"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
-msgstr ""
+msgstr "نقص الرطوبة مع الارت�اع"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biome blending"
-msgstr ""
+msgstr "دمج المواطن البيئية"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biomes"
-msgstr ""
+msgstr "مواطن بيئية"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caverns"
-msgstr ""
+msgstr "مغارات"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caves"
-msgstr ""
+msgstr "كهو�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
@@ -268,19 +341,17 @@ msgstr "نز�ّل لعبة من minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
-msgstr ""
+msgstr "الزنزانات"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
 msgstr "أرض مسطحة"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floating landmasses in the sky"
 msgstr "أرض عائمة �ي السماء"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floatlands (experimental)"
 msgstr "أراضيٌ عائمة (تجريبية)"
 
@@ -290,7 +361,7 @@ msgstr "اللعبة"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "ولد تضاريس غير كسورية: محيطات وباطن الأرض"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
@@ -298,11 +369,11 @@ msgstr "التلال"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
-msgstr ""
+msgstr "أنهار رطبة"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "ز�د الرطوبة قرب الأنهار"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
@@ -330,7 +401,7 @@ msgstr "جبال"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "تد�ق الطين"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
@@ -359,17 +430,17 @@ msgstr "أنهار بمستوى البحر"
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Seed"
-msgstr ""
+msgstr "البذرة"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "تغيير سلس للمناطق البيئية"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
-msgstr ""
+msgstr "المنشآت السطحية (لا تأثر على الأشجار والأعشاب المنشأة ب v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
@@ -385,11 +456,11 @@ msgstr "معتدل، صحراء، غابة"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "المعتدلة, الصحراء, الغابة, التندرا, التايغا"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr ""
+msgstr "تآكل التربة"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
@@ -469,10 +540,6 @@ msgid "Browse"
 msgstr "استعرض"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "عط�ّل"
 
@@ -517,6 +584,10 @@ msgid "Scale"
 msgstr "تكبير/تصغير"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "إبحث"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "إختر الدليل"
 
@@ -538,7 +609,7 @@ msgstr "يحب أن لا تزيد القيمة عن $1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "X"
-msgstr ""
+msgstr "X"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "X spread"
@@ -566,7 +637,7 @@ msgstr ""
 #. main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "absvalue"
-msgstr ""
+msgstr "القيمة المطلقة"
 
 #. ~ "defaults" is a noise parameter flag.
 #. It describes the default processing options
@@ -581,7 +652,7 @@ msgstr "إ�تراضي"
 #. main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "eased"
-msgstr ""
+msgstr "مخ��"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -605,7 +676,7 @@ msgstr "تثبيت تعديل: لا يمكن العصور على اسم مجلد
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install: Unsupported file type \"$1\" or broken archive"
-msgstr ""
+msgstr "يثبت: نوع المل� \"$1\" غير مدعوم أو هو أرشي� تال�"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install: file: \"$1\""
@@ -613,7 +684,7 @@ msgstr "ثبت: المل�: \"$1\""
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to find a valid mod or modpack"
-msgstr ""
+msgstr "�شل إيجاد تعديل أو حزمة تعديلات صالحة"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
@@ -621,7 +692,7 @@ msgstr "�شل تثبيت $1 كحزمة إكساء"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a game as a $1"
-msgstr "�شل تثبيت اللعبة كـ $1"
+msgstr "�شل تثبيت اللعبة ك $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a mod as a $1"
@@ -629,7 +700,20 @@ msgstr "�شل تثبيت التعديل كـ $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a modpack as a $1"
-msgstr ""
+msgstr "تعذر تثبيت حزمة التعديلات مثل $1"
+
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "يحمل..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "البرمجة النصية للعميل معطلة"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "جرب إعادة تمكين قائمة الحوادم العامة وتحقق من إتصالك بالانترنت."
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
@@ -661,7 +745,7 @@ msgstr "لايتو�ر وص� للحزمة"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Rename"
-msgstr ""
+msgstr "أعد التسمية"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Uninstall Package"
@@ -684,7 +768,14 @@ msgid "Credits"
 msgstr "إشادات"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "إختر الدليل"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -697,22 +788,18 @@ msgstr "المطورون الرئيسيون السابقون"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Announce Server"
-msgstr ""
+msgstr "أعلن عن الخادوم"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
 msgid "Bind Address"
-msgstr ""
+msgstr "العنوان المطلوب"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "اضبط"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
 msgid "Creative Mode"
 msgstr "النمط الإبداعي"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "مكن الضرر"
 
@@ -729,8 +816,8 @@ msgid "Install games from ContentDB"
 msgstr "ثبت العابا من ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "الاسم\\كلمة المرور"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -741,6 +828,11 @@ msgid "No world created or selected!"
 msgstr "لم تنشئ او تحدد عالما!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "كلمة مرور جديدة"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "إلعب"
 
@@ -749,6 +841,11 @@ msgid "Port"
 msgstr "المن�ذ"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "حدد العالم:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "حدد العالم:"
 
@@ -764,24 +861,23 @@ msgstr "ابدأ اللعبة"
 msgid "Address / Port"
 msgstr "العنوان \\ المن�ذ"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "اتصل"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "النمط الإبداعي"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "الضرر ممكن"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "حذ� الم�ضلة"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "الم�ضلة"
 
@@ -789,23 +885,22 @@ msgstr "الم�ضلة"
 msgid "Join Game"
 msgstr "انضم للعبة"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "الاسم \\ كلمة المرور"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "قتال اللاعبين ممكن"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
-msgstr ""
+msgstr "2x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "3D Clouds"
@@ -813,11 +908,11 @@ msgstr "سحب 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 "All Settings"
@@ -825,11 +920,7 @@ msgstr "كل الإعدادات"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
+msgstr "التنعييم:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
@@ -837,11 +928,7 @@ msgstr "ح�ظ حجم الشاشة تلقائيا"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
+msgstr "مرشح خطي ثنائي"
 
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
@@ -853,11 +940,7 @@ msgstr "زجاج متصل"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Fancy Leaves"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "ول�د خرائط عادية"
+msgstr "اوراق بت�اصيل واضحة"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
@@ -868,10 +951,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "بدون مرشح"
 
@@ -884,11 +963,11 @@ msgid "Node Highlighting"
 msgstr "إبراز العقد"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "Node Outlining"
-msgstr ""
+msgstr "عدم إبراز العقد"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "None"
 msgstr "بدون"
 
@@ -900,17 +979,9 @@ msgstr "اوراق معت�مة"
 msgid "Opaque Water"
 msgstr "مياه معتمة"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "أعد تعيين عالم اللاعب المن�رد"
+msgstr "جسيمات"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
@@ -925,11 +996,15 @@ msgid "Shaders"
 msgstr "م�ظللات"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "أراضيٌ عائمة (تجريبية)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "مظللات (غير متو�ر)"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Simple Leaves"
 msgstr "أوراق بسيطة"
 
@@ -951,11 +1026,11 @@ msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold: (px)"
-msgstr ""
+msgstr "حساسية اللمس: (بكسل)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
-msgstr ""
+msgstr "مرشح خطي ثلاثي"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
@@ -969,23 +1044,6 @@ msgstr "سوائل متموجة"
 msgid "Waving Plants"
 msgstr "نباتات متموجة"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "نعم"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "اضبط التعديلات"
-
-#: builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
-msgid "Main"
-msgstr "الرئيسية"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "إلعب �رديا"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "انتهت مهلة الاتصال."
@@ -1023,7 +1081,6 @@ msgid "Invalid gamespec."
 msgstr "مواص�ات اللعبة غير صالحة."
 
 #: src/client/clientlauncher.cpp
-#, fuzzy
 msgid "Main Menu"
 msgstr "القائمة الرئيسية"
 
@@ -1041,11 +1098,11 @@ msgstr "يرجى اختيار اسم!"
 
 #: src/client/clientlauncher.cpp
 msgid "Provided password file failed to open: "
-msgstr ""
+msgstr "�شل �تح مل� كلمة المرور المدخل: "
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
-msgstr ""
+msgstr "مسار العالم المدخل غير موجود: "
 
 #. ~ DO NOT TRANSLATE THIS LITERALLY!
 #. This is a special string. Put either "no" or "yes"
@@ -1064,117 +1121,131 @@ msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
+"\n"
+"راجع debug.txt لمزيد من الت�اصيل."
 
 #: src/client/game.cpp
 msgid "- Address: "
-msgstr ""
+msgstr "- العنوان: "
 
 #: src/client/game.cpp
 msgid "- Creative Mode: "
-msgstr ""
+msgstr "- النمط الإبداعي: "
 
 #: src/client/game.cpp
 msgid "- Damage: "
-msgstr ""
+msgstr "- التضرر: "
 
 #: src/client/game.cpp
 msgid "- Mode: "
-msgstr ""
+msgstr "- النمط: "
 
 #: src/client/game.cpp
 msgid "- Port: "
-msgstr ""
+msgstr "- المن�ذ: "
 
 #: src/client/game.cpp
 msgid "- Public: "
-msgstr ""
+msgstr "- عام: "
 
 #. ~ PvP = Player versus Player
 #: src/client/game.cpp
 msgid "- PvP: "
-msgstr ""
+msgstr "- قتال اللاعبين: "
 
 #: src/client/game.cpp
 msgid "- Server Name: "
-msgstr ""
+msgstr "- اسم الخادم: "
 
 #: src/client/game.cpp
 msgid "Automatic forward disabled"
-msgstr ""
+msgstr "المشي التلقائي معطل"
 
 #: src/client/game.cpp
 msgid "Automatic forward enabled"
-msgstr ""
+msgstr "المشي التلقائي ممكن"
 
 #: src/client/game.cpp
 msgid "Camera update disabled"
-msgstr ""
+msgstr "تحديث الكاميرا معطل"
 
 #: src/client/game.cpp
 msgid "Camera update enabled"
-msgstr ""
+msgstr "تحديث الكاميرا م�عل"
 
 #: src/client/game.cpp
 msgid "Change Password"
-msgstr ""
+msgstr "غير كلمة المرور"
 
 #: src/client/game.cpp
 msgid "Cinematic mode disabled"
-msgstr ""
+msgstr "الوضع السينمائي معطل"
 
 #: src/client/game.cpp
 msgid "Cinematic mode enabled"
-msgstr ""
+msgstr "الوضع السينمائي م�عل"
 
 #: src/client/game.cpp
+#, fuzzy
 msgid "Client side scripting is disabled"
-msgstr ""
+msgstr "البرمجة النصية للعميل معطلة"
 
 #: src/client/game.cpp
 msgid "Connecting to server..."
-msgstr ""
+msgstr "يتصل بالخادوم…"
 
 #: src/client/game.cpp
 msgid "Continue"
-msgstr ""
+msgstr "تابع"
 
 #: src/client/game.cpp
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
+"أزرار التحكم:\n"
+"- %s: سر للأمام\n"
+"- %s: سر للخل�\n"
+"- %s: سر يسارا\n"
+"- %s: سر يمينا\n"
+"- %s: اق�ز/تسلق\n"
+"- %s: ازح�/انزل\n"
+"- %s: ارمي عنصر\n"
+"- %s: ا�تح المخزن\n"
+"- تحريك ال�أرة: دوران\n"
+"- زر ال�أرة الأيمن: اح�ر/الكم\n"
+"- زر ال�أرة الأيسر: ضع/استخدم\n"
+"- عجلة ال�أرة: غيير العنصر\n"
+"- -%s: دردشة\n"
 
 #: src/client/game.cpp
 msgid "Creating client..."
-msgstr ""
+msgstr "ينشىء عميلا…"
 
 #: src/client/game.cpp
 msgid "Creating server..."
-msgstr ""
+msgstr "ينشىء خادوما…"
 
 #: src/client/game.cpp
 msgid "Debug info and profiler graph hidden"
-msgstr ""
+msgstr "معلومات التنقيح ومنحنى محلل البيانات مخ�يان"
 
 #: src/client/game.cpp
 msgid "Debug info shown"
-msgstr ""
+msgstr "معلومات التنقيح مرئية"
 
 #: src/client/game.cpp
 msgid "Debug info, profiler graph, and wireframe hidden"
@@ -1195,132 +1266,98 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
+"اعدادات التحكم الا�تراضية: \n"
+"بدون قائمة مرئية: \n"
+"- لمسة واحدة: زر ت�عيل\n"
+"- لمسة مزدوجة: ضع/استخدم\n"
+"- تحريك إصبع: دوران\n"
+"المخزن أو قائمة مرئية: \n"
+"- لمسة مزدوجة (خارج القائمة): \n"
+" --> اغلق القائمة\n"
+"- لمس خانة أو تكديس: \n"
+" --> حرك التكديس\n"
+"- لمس وسحب, ولمس باصبع ثان: \n"
+" --> وضع عنصر واحد �ي خانة\n"
 
 #: src/client/game.cpp
 msgid "Disabled unlimited viewing range"
-msgstr ""
+msgstr "مدى الرؤية غير المحدود معطل"
 
 #: src/client/game.cpp
 msgid "Enabled unlimited viewing range"
-msgstr ""
+msgstr "مدى الرؤية غير المحدود م�عل"
 
 #: src/client/game.cpp
 msgid "Exit to Menu"
-msgstr ""
+msgstr "اخرج للقائمة"
 
 #: src/client/game.cpp
 msgid "Exit to OS"
-msgstr ""
+msgstr "اخرج لنظام التشغيل"
 
 #: src/client/game.cpp
 msgid "Fast mode disabled"
-msgstr ""
+msgstr "نمط السرعة معطل"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled"
-msgstr ""
+msgstr "نمط السرعة م�عل"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr ""
+msgstr "نمط السرعة م�عل (ملاحظة: لا تمتلك امتياز 'السرعة')"
 
 #: src/client/game.cpp
 msgid "Fly mode disabled"
-msgstr ""
+msgstr "نمط الطيران معطل"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled"
-msgstr ""
+msgstr "نمط الطيران م�عل"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr ""
+msgstr "نمط الطيران م�عل (ملاحظة: لا تمتلك امتياز 'الطيران')"
 
 #: src/client/game.cpp
 msgid "Fog disabled"
-msgstr ""
+msgstr "الضباب معطل"
 
 #: src/client/game.cpp
 msgid "Fog enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "الضرر ممكن"
+msgstr "الضباب م�عل"
 
 #: src/client/game.cpp
 msgid "Game info:"
-msgstr ""
+msgstr "معلومات اللعبة:"
 
 #: src/client/game.cpp
 msgid "Game paused"
-msgstr ""
+msgstr "اللعبة موق�ة مؤقتا"
 
 #: src/client/game.cpp
 msgid "Hosting server"
-msgstr ""
+msgstr "استضا�ة خادوم"
 
 #: src/client/game.cpp
 msgid "Item definitions..."
-msgstr ""
+msgstr "تعري� العنصر…"
 
 #: src/client/game.cpp
 msgid "KiB/s"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "الضرر ممكن"
+msgstr "كب\\ثا"
 
 #: src/client/game.cpp
 msgid "Media..."
-msgstr ""
+msgstr "وسائط…"
 
 #: src/client/game.cpp
 msgid "MiB/s"
-msgstr ""
+msgstr "مب\\ثا"
 
 #: src/client/game.cpp
 msgid "Minimap currently disabled by game or mod"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
+msgstr "الخريطة المصغرة معطلة من قبل لعبة أو تعديل"
 
 #: src/client/game.cpp
 msgid "Noclip mode disabled"
@@ -1336,15 +1373,15 @@ msgstr ""
 
 #: src/client/game.cpp
 msgid "Node definitions..."
-msgstr ""
+msgstr "تعري�ات العقدة..."
 
 #: src/client/game.cpp
 msgid "Off"
-msgstr ""
+msgstr "معطّل"
 
 #: src/client/game.cpp
 msgid "On"
-msgstr ""
+msgstr "م�عل"
 
 #: src/client/game.cpp
 msgid "Pitch move mode disabled"
@@ -1356,140 +1393,125 @@ msgstr ""
 
 #: src/client/game.cpp
 msgid "Profiler graph shown"
-msgstr ""
+msgstr "منحنى محلل البيانات ظاهر"
 
 #: src/client/game.cpp
 msgid "Remote server"
-msgstr ""
+msgstr "خادوم بعيد"
 
 #: src/client/game.cpp
 msgid "Resolving address..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Respawn"
-msgstr "أع�د الإحياء"
+msgstr "يستورد العناوين…"
 
 #: src/client/game.cpp
 msgid "Shutting down..."
-msgstr ""
+msgstr "يغلق…"
 
 #: src/client/game.cpp
 msgid "Singleplayer"
-msgstr ""
+msgstr "لاعب من�رد"
 
 #: src/client/game.cpp
 msgid "Sound Volume"
-msgstr ""
+msgstr "حجم الصوت"
 
 #: src/client/game.cpp
 msgid "Sound muted"
-msgstr ""
+msgstr "الصوت مكتوم"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "نظام الصوت معطل"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "نظام الصوت غير مدمج أثناء البناء"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
-msgstr ""
+msgstr "الصوت غير مكتوم"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range changed to %d"
-msgstr ""
+msgstr "غ�يرَ مدى الرؤية الى %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at maximum: %d"
-msgstr ""
+msgstr "مدى الرؤية �ي أقصى حد: %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at minimum: %d"
-msgstr ""
+msgstr "مدى الرؤية �ي أدنى حد: %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Volume changed to %d%%"
-msgstr ""
+msgstr "غ�ير الحجم الى %d%%"
 
 #: src/client/game.cpp
 msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "م�ت"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
-msgstr ""
+msgstr "التكبير معطل من قبل لعبة أو تعديل"
 
 #: src/client/game.cpp
 msgid "ok"
-msgstr ""
+msgstr "موا�ق"
 
 #: src/client/gameui.cpp
 msgid "Chat hidden"
-msgstr ""
+msgstr "الدردشة مخ�ية"
 
 #: src/client/gameui.cpp
 msgid "Chat shown"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
+msgstr "الدردشة ظاهرة"
 
 #: src/client/gameui.cpp
 msgid "HUD hidden"
-msgstr ""
+msgstr "الواجهة مخ�ية"
 
 #: src/client/gameui.cpp
 msgid "HUD shown"
-msgstr ""
+msgstr "الواجهة ظاهرة"
 
 #: src/client/gameui.cpp
 msgid "Profiler hidden"
-msgstr ""
+msgstr "محلل البيانات مخ�ي"
 
 #: src/client/gameui.cpp
 #, c-format
 msgid "Profiler shown (page %d of %d)"
-msgstr ""
+msgstr "محلل البيانات ظاهر ( ص�حة %d من %d)"
 
 #: src/client/keycode.cpp
 msgid "Apps"
-msgstr ""
+msgstr "تطبيقات"
 
 #: src/client/keycode.cpp
 msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
-msgstr ""
+msgstr "Caps Lock"
 
 #: src/client/keycode.cpp
 msgid "Clear"
-msgstr ""
+msgstr "امسح"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Control"
-msgstr ""
+msgstr "Control"
 
 #: src/client/keycode.cpp
 msgid "Down"
-msgstr ""
+msgstr "أس�ل"
 
 #: src/client/keycode.cpp
 msgid "End"
@@ -1504,239 +1526,307 @@ msgid "Execute"
 msgstr ""
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Help"
-msgstr ""
+msgstr "Help"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "IME Accept"
-msgstr ""
+msgstr "IME Accept"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "IME Convert"
-msgstr ""
+msgstr "IME Convert"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "IME Escape"
-msgstr ""
+msgstr "IME Escape"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "IME Mode Change"
-msgstr ""
+msgstr "IME Mode Change"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "IME Nonconvert"
-msgstr ""
+msgstr "IME Nonconvert"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Insert"
-msgstr ""
+msgstr "Insert"
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
-msgstr ""
+msgstr "يسار"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
-msgstr ""
+msgstr "الزر الأيسر"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Left Control"
-msgstr ""
+msgstr "Left Control"
 
 #: src/client/keycode.cpp
 msgid "Left Menu"
-msgstr ""
+msgstr "القائمة اليسرى"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Left Shift"
-msgstr ""
+msgstr "Left Shift"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Left Windows"
-msgstr ""
+msgstr "Left Windows"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Menu"
-msgstr ""
+msgstr "Menu"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Middle Button"
-msgstr ""
+msgstr "Middle Button"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Num Lock"
-msgstr ""
+msgstr "Num Lock"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad *"
-msgstr ""
+msgstr "Numpad *"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad +"
-msgstr ""
+msgstr "Numpad +"
 
 #: src/client/keycode.cpp
 msgid "Numpad -"
 msgstr ""
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad ."
-msgstr ""
+msgstr "Numpad ."
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad /"
-msgstr ""
+msgstr "Numpad /"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad 0"
-msgstr ""
+msgstr "Numpad 0"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad 1"
-msgstr ""
+msgstr "Numpad 1"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad 2"
-msgstr ""
+msgstr "Numpad 2"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad 3"
-msgstr ""
+msgstr "Numpad 3"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad 4"
-msgstr ""
+msgstr "Numpad 4"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad 5"
-msgstr ""
+msgstr "Numpad 5"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad 6"
-msgstr ""
+msgstr "Numpad 6"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad 7"
-msgstr ""
+msgstr "Numpad 7"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad 8"
-msgstr ""
+msgstr "Numpad 8"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Numpad 9"
-msgstr ""
+msgstr "Numpad 9"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "OEM Clear"
-msgstr ""
+msgstr "OEM Clear"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Page down"
-msgstr ""
+msgstr "Page down"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Page up"
-msgstr ""
+msgstr "Page up"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Pause"
-msgstr ""
+msgstr "Pause"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Play"
-msgstr ""
+msgstr "Play"
 
 #. ~ "Print screen" key
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Print"
-msgstr ""
+msgstr "Print"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Return"
-msgstr ""
+msgstr "Return"
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
+#, fuzzy
 msgid "Right"
-msgstr ""
+msgstr "Right"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
 msgstr ""
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Right Control"
-msgstr ""
+msgstr "Right Control"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Right Menu"
-msgstr ""
+msgstr "Right Menu"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Right Shift"
-msgstr ""
+msgstr "Right Shift"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Right Windows"
-msgstr ""
+msgstr "Right Windows"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Scroll Lock"
-msgstr ""
+msgstr "Scroll Lock"
 
 #. ~ Key name
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Select"
-msgstr ""
+msgstr "Select"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Shift"
-msgstr ""
+msgstr "Shift"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Sleep"
-msgstr ""
+msgstr "Sleep"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Snapshot"
-msgstr ""
+msgstr "Snapshot"
 
 #: src/client/keycode.cpp
 msgid "Space"
 msgstr ""
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Tab"
-msgstr ""
+msgstr "Tab"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "Up"
-msgstr ""
+msgstr "Up"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "X Button 1"
-msgstr ""
+msgstr "X Button 1"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "X Button 2"
-msgstr ""
+msgstr "X Button 2"
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
 msgid "Zoom"
-msgstr ""
+msgstr "كب�ر"
+
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "الخريطة المصغرة مخ�ية"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "الخريطة المصغرة �ي وضع الرادار، تكبير x1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "الخريطة المصغرة �ي وضع الأسطح، تكبير x1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "الخريطة المصغرة �ي وضع الأسطح، تكبير x1"
 
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
-msgstr ""
+msgstr "كلمتا المرور غير متطابقتين!"
 
 #: src/gui/guiConfirmRegistration.cpp
 msgid "Register and Join"
-msgstr ""
+msgstr "سجل وادخل"
 
 #: src/gui/guiConfirmRegistration.cpp
 #, c-format
@@ -1747,58 +1837,41 @@ msgid ""
 "Please retype your password and click 'Register and Join' to confirm account "
 "creation, or click 'Cancel' to abort."
 msgstr ""
+"أنت على وشك دخول هذا الخادوم للمرة الأولى باسم \"%s\".\n"
+"اذا رغبت بالاستمرار سيتم إنشاء حساب جديد باستخدام بياناتك الاعتمادية.\n"
+"لتأكيد التسجيل ادخل كلمة مرورك وانقر 'سجل وادخل'، أو 'ألغ' للإلغاء."
 
 #: src/gui/guiFormSpecMenu.cpp
 msgid "Proceed"
-msgstr ""
+msgstr "تابع"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "\"Special\" = climb down"
-msgstr ""
+msgstr "\"خاص\" = التسلق نزولا"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Autoforward"
-msgstr ""
+msgstr "المشي التلقائي"
 
 #: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Automatic jumping"
-msgstr ""
+msgstr "الق�ز التلقائي"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Backward"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
+msgstr "للخل�"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
-msgstr ""
+msgstr "غير الكاميرا"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Chat"
-msgstr ""
+msgstr "دردشة"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Command"
-msgstr ""
+msgstr "الأوامر"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Console"
@@ -1814,15 +1887,15 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr ""
+msgstr "اضغط مرتين على \"اق�ز\" لت�عيل الطيران"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Drop"
-msgstr ""
+msgstr "اسقاط"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Forward"
-msgstr ""
+msgstr "للأمام"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. range"
@@ -1834,15 +1907,15 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inventory"
-msgstr ""
+msgstr "المخزن"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Jump"
-msgstr ""
+msgstr "اق�ز"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Key already in use"
-msgstr ""
+msgstr "الم�تاح مستخدم مسبقا"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
@@ -1854,23 +1927,23 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Mute"
-msgstr ""
+msgstr "اكتم"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Next item"
-msgstr ""
+msgstr "العنصر التالي"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Prev. item"
-msgstr ""
+msgstr "العنصر السابق"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Range select"
-msgstr ""
+msgstr "حدد المدى"
 
 #: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Screenshot"
-msgstr ""
+msgstr "صوّر الشاشة"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Sneak"
@@ -1878,47 +1951,31 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Special"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
+msgstr "خاص"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
+msgstr "بدّل عرض الواجهة"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
-msgstr ""
+msgstr "بدّل عرض سجل المحادثة"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
-msgstr ""
+msgstr "بدّل وضع السرعة"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fly"
-msgstr ""
+msgstr "بدّل حالة الطيران"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fog"
-msgstr ""
+msgstr "بدّل ظهور الضباب"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle minimap"
-msgstr ""
+msgstr "بدّل ظهور الخريطة المصغرة"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
@@ -1930,41 +1987,41 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "press key"
-msgstr ""
+msgstr "اضغط على زر"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
-msgstr ""
+msgstr "غيّ�ر"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Confirm Password"
-msgstr ""
+msgstr "أكد كلمة المرور"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "New Password"
-msgstr ""
+msgstr "كلمة مرور جديدة"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Old Password"
-msgstr ""
+msgstr "كلمة المرور القديمة"
 
 #: src/gui/guiVolumeChange.cpp
 msgid "Exit"
-msgstr ""
+msgstr "أخرج"
 
 #: src/gui/guiVolumeChange.cpp
 msgid "Muted"
-msgstr ""
+msgstr "مكتوم"
 
 #: src/gui/guiVolumeChange.cpp
 msgid "Sound Volume: "
-msgstr ""
+msgstr "حجم الصوت: "
 
 #. ~ Imperative, as in "Enter/type in text".
 #. Don't forget the space.
 #: src/gui/modalMenu.cpp
 msgid "Enter "
-msgstr ""
+msgstr "أدخل "
 
 #. ~ DO NOT TRANSLATE THIS LITERALLY!
 #. This is a special string which needs to contain the translation's
@@ -1978,6 +2035,8 @@ msgid ""
 "(Android) Fixes the position of virtual joystick.\n"
 "If disabled, virtual joystick will center to first-touch's position."
 msgstr ""
+"(أندرويد) ثبت موقع عصى التحكم.\n"
+"اذا ع�طل ستنتقل عصى التحكم لموقع اللمسة الأولى."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2010,12 +2069,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2115,13 +2168,17 @@ 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 "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2355,10 +2412,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2429,16 +2482,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2590,6 +2633,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2646,7 +2693,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2654,7 +2703,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2754,12 +2805,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2830,6 +2875,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2890,7 +2939,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2978,14 +3027,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -2995,18 +3036,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3023,12 +3052,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3038,7 +3061,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3093,11 +3116,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Field of view"
-msgstr ""
+msgstr "حقل الرؤية"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
-msgstr ""
+msgstr "حقل الرؤية بالدرجات."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3340,10 +3363,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3397,8 +3416,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3865,6 +3884,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3945,6 +3968,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4044,6 +4074,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4574,7 +4611,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Load the game profiler"
-msgstr ""
+msgstr "حمّل محلل بيانات اللعبة"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4600,10 +4637,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4617,6 +4650,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4780,7 +4821,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4829,6 +4870,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5058,14 +5106,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5091,10 +5131,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5120,34 +5156,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5213,6 +5221,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5368,10 +5384,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5623,6 +5635,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5752,10 +5774,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5849,6 +5867,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5907,8 +5929,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5934,15 +5956,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6078,6 +6105,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6280,6 +6318,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6402,6 +6446,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6413,11 +6475,59 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "موا�ق"
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "هل أنت متأكد من إعادة تعيين عالم اللاعب الوحيد؟"
 
 #~ msgid "Back"
 #~ msgstr "ع�د"
 
+#~ msgid "Bump Mapping"
+#~ msgstr "خريطة النتوءات"
+
+#~ msgid "Config mods"
+#~ msgstr "اضبط التعديلات"
+
+#~ msgid "Configure"
+#~ msgstr "اضبط"
+
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr "تنزيل وتثبيت $1, يرجى الإنتظار..."
+
+#~ msgid "Generate Normal Maps"
+#~ msgstr "ول�د خرائط عادية"
+
+#~ msgid "Main"
+#~ msgstr "الرئيسية"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "الخريطة المصغرة �ي وضع الرادار، تكبير x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "الخريطة المصغرة �ي وضع الرادار، تكبير x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "الخريطة المصغرة �ي وضع الأسطح، تكبير x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "الخريطة المصغرة �ي وضع الأسطح، تكبير x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "الاسم\\كلمة المرور"
+
+#~ msgid "No"
+#~ msgstr "لا"
+
+#~ msgid "Ok"
+#~ msgstr "موا�ق"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "أعد تعيين عالم اللاعب المن�رد"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "إلعب �رديا"
+
+#~ msgid "View"
+#~ msgstr "إعرض"
+
+#~ msgid "Yes"
+#~ msgstr "نعم"
diff --git a/po/be/minetest.po b/po/be/minetest.po
index 07e628cc0..8b597ca4b 100644
--- a/po/be/minetest.po
+++ b/po/be/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Belarusian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: 2019-11-19 23:04+0000\n"
 "Last-Translator: Viktar Vauchkevich <victorenator@gmail.com>\n"
 "Language-Team: Belarusian <https://hosted.weblate.org/projects/minetest/"
@@ -15,6 +15,14 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "�драдзіцца"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Вы загінулі"
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -39,10 +47,6 @@ msgstr "Перазлучыцца"
 msgid "The server has requested a reconnect:"
 msgstr "Сервер патрабуе перазлучыцца:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Загрузка…"
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Вер�іі пратакола адрозніваюцца. "
@@ -56,12 +60,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Сервер падтрымлівае вер�іі пратакола паміж $1 і $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Па�прабуйце паўторна ўключыць �пі� публічных �ервераў і праверце злуч�нне з "
-"�ецівам."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Мы падтрымліваем толькі $1 вер�ію пратакола."
 
@@ -69,7 +67,8 @@ msgstr "Мы падтрымліваем толькі $1 верÑ�Ñ–ÑŽ пратаÐ
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Мы падтрымліваем вер�іі пратакола паміж $1 і $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -79,7 +78,8 @@ msgstr "Мы падтрымліваем вер�іі пратакола памі
 msgid "Cancel"
 msgstr "Ска�аваць"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Залежна�ці:"
 
@@ -153,14 +153,55 @@ msgid "enabled"
 msgstr "уключаны"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Загрузка…"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "У�е пакункі"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Клавіша ўжо выкары�тоўваецца"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "В�рнуцца ў галоўнае меню"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Гул�ць (�ервер)"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -183,6 +224,16 @@ msgid "Install"
 msgstr "У�тал�ваць"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "У�тал�ваць"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "�еабав�зковы� залежна�ці:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Мадыфікацыі"
@@ -196,9 +247,26 @@ msgid "No results"
 msgstr "Вынікі ад�утнічаюць"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Пошук"
+#, fuzzy
+msgid "No updates"
+msgstr "�бнавіць"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Not found"
+msgstr "Выключыць гук"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -213,7 +281,11 @@ msgid "Update"
 msgstr "�бнавіць"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -483,11 +555,6 @@ msgid "Browse"
 msgstr "Прагл�дзець"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Кліент"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "�дключаны"
 
@@ -532,6 +599,10 @@ msgid "Scale"
 msgstr "Маштаб"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Пошук"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "�браць каталог"
 
@@ -649,6 +720,21 @@ msgstr "�е атрымала�� ў�тал�ваць мадыфікацыю �
 msgid "Unable to install a modpack as a $1"
 msgstr "�е атрымала�� ў�тал�ваць пакунак мадыфікацый �к $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Загрузка…"
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Кліент�кі� мадыфікацыі выключаны�"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Па�прабуйце паўторна ўключыць �пі� публічных �ервераў і праверце злуч�нне з "
+"�ецівам."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Пошук у �еціве"
@@ -702,7 +788,14 @@ msgid "Credits"
 msgstr "Падз�кі"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "�браць каталог"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -722,14 +815,10 @@ msgid "Bind Address"
 msgstr "�дра� прыв�зкі"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "�аладзіць"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Творчы р�жым"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Уключыць пашкоджанні"
 
@@ -746,8 +835,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Ім�/Пароль"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -758,6 +847,11 @@ msgid "No world created or selected!"
 msgstr "��ма �творанага альбо абранага �вету!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "�овы пароль"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Гул�ць"
 
@@ -766,6 +860,11 @@ msgid "Port"
 msgstr "Порт"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "�браць �вет:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "�браць �вет:"
 
@@ -781,23 +880,23 @@ msgstr "Пачаць гульню"
 msgid "Address / Port"
 msgstr "�дра� / Порт"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Злучыцца"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Творчы р�жым"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Пашкоджанні ўключаны�"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Прыбраць з упадабанага"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Упадабанае"
 
@@ -805,16 +904,16 @@ msgstr "Упадабанае"
 msgid "Join Game"
 msgstr "Далучыцца да гульні"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Ім� / Пароль"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Пінг"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP уключаны"
 
@@ -843,10 +942,6 @@ msgid "Antialiasing:"
 msgstr "Згладжванне:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Вы ўп�ўнены�, што хочаце �кінуць �вет адзіночнай гульні?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Запамінаць памеры �крана"
 
@@ -854,10 +949,6 @@ msgstr "Запамінаць памеры �крана"
 msgid "Bilinear Filter"
 msgstr "Білінейны фільтр"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Т�к�тураванне ма�камі"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Зм�ніць клавішы"
@@ -871,10 +962,6 @@ msgid "Fancy Leaves"
 msgstr "�здобленае лі�це"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Генерацы� мапы нармал�ў"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "MIP-т�к�тураванне"
 
@@ -883,10 +970,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "MIP-т�к�тураванне + анізатропны фільтр"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "�е"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Без фільтра"
 
@@ -914,19 +997,11 @@ msgstr "�епразры�тае лі�це"
 msgid "Opaque Water"
 msgstr "�епразры�та� вада"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Паралак�на� аклюзі�"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Ча�ціцы"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Скінуць �вет адзіночнай гульні"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Экран:"
 
@@ -939,6 +1014,11 @@ msgid "Shaders"
 msgstr "Ш�йд�ры"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Узровень л�тучых а�травоў"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Ш�йд�ры (неда�тупна)"
 
@@ -982,22 +1062,6 @@ msgstr "Калыханне вадка�ц�ў"
 msgid "Waving Plants"
 msgstr "Дрыготкі� ра�ліны"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Так"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "�алады мадыфікацый"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Галоўнае меню"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Пачаць адзіночную гульню"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Таймаут злуч�нн�."
@@ -1159,18 +1223,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Кіраванне:\n"
 "- %s: і�ці ўперад\n"
@@ -1284,16 +1345,6 @@ msgid "Fog enabled"
 msgstr "Туман уключаны"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Туман адключаны"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Туман уключаны"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Інфармацы� пра гульню:"
 
@@ -1314,16 +1365,6 @@ msgid "KiB/s"
 msgstr "КіБ/�ек"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Туман адключаны"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Пашкоджанні ўключаны�"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Меды�…"
 
@@ -1336,34 +1377,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Мінімапа на дадзены момант адключана� гульнёй альбо мадыфікацы�й"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Мінімапа �хавана�"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Мінімапа ў р�жыме радару, павеліч�нне х1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Мінімапа ў р�жыме радару, павеліч�нне х2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Мінімапа ў р�жыме радару, павеліч�нне х4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Мінімапа ў р�жыме паверхні, павеліч�нне х1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Мінімапа ў р�жыме паверхні, павеліч�нне х2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Мінімапа ў р�жыме паверхні, павеліч�нне х4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Р�жым руху �крозь �цены адключаны"
 
@@ -1408,10 +1421,6 @@ msgid "Resolving address..."
 msgstr "Ра�пазнаванне адра�а…"
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "�драдзіцца"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Выключ�нне…"
 
@@ -1464,10 +1473,6 @@ msgid "Wireframe shown"
 msgstr "Карка� паказваецца"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Вы загінулі"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Павеліч�нне зараз выключана гульнёй альбо мадыфікацы�й"
 
@@ -1484,16 +1489,6 @@ msgid "Chat shown"
 msgstr "Размова паказваецца"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Размова �хавана�"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Размова паказваецца"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD �хаваны"
 
@@ -1773,6 +1768,25 @@ msgstr "Дадат. кнопка 2"
 msgid "Zoom"
 msgstr "Пав�лічыць"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Мінімапа �хавана�"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Мінімапа ў р�жыме радару, павеліч�нне х1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Мінімапа ў р�жыме паверхні, павеліч�нне х1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Мінімальны памер т�к�туры"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Паролі не �упадаюць!"
@@ -1817,26 +1831,6 @@ msgid "Backward"
 msgstr "�азад"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Зм�ніць камеру"
 
@@ -1930,30 +1924,10 @@ msgid "Special"
 msgstr "�дмы�лова�"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "�дмы�лова�"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Кінематаграфічна�ць"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Кінематаграфічна�ць"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Палёт"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Размова"
 
@@ -2084,14 +2058,6 @@ msgstr ""
 "во�траву, зрабіце ў�е 3 лікі роўнымі дл� неапрацаванай формы."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = паралак�на� аклюзі� �а зве�ткамі аб нахіле (хутка).\n"
-"1 = р�льефнае т�к�тураванне (павольней, але �ка�ней)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "2D-шум, што кіруе формай/памерам горных хрыбтоў."
 
@@ -2214,6 +2180,10 @@ msgid "ABM interval"
 msgstr "Інт�рвал захаванн� мапы"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "�б�алютны ліміт чаргі запытаў"
@@ -2469,10 +2439,6 @@ msgid "Builtin"
 msgstr "Убудаваны"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Р�льефнае т�к�тураванне"
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
@@ -2549,22 +2515,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Змена інт�рфей�у галоўнага меню:\n"
-"-   full: выбар �вету дл� адзіночнай альбо �еткавай гульні, а�обны �пі� "
-"чужых �ервераў.\n"
-"-   simple: адзін �вет дл� адзіночнай гульні ў меню, дзе �пі� чужых "
-"�ервераў; можа быць кары�на дл� невелічкіх �кранаў.\n"
-"Прадвызначана: simple дл� Android, full дл� ў�іх а�татніх."
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "Памер шрыфту"
@@ -2730,6 +2680,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "Чорны �пі� �ц�жкоў ContentDB"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "URL ContentDB"
 
@@ -2790,7 +2744,10 @@ msgid "Crosshair alpha"
 msgstr "Празры�та�ць перакрыжаванн�"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Празры�та�ць перакрыжаванн� (паміж 0 і 255)."
 
 #: src/settings_translation_file.cpp
@@ -2798,8 +2755,10 @@ msgid "Crosshair color"
 msgstr "Колер перакрыжаванн�"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Колер перакрыжаванн� (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2905,14 +2864,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Вызначае разм�шч�нне і р�льеф дадатковых пагоркаў і азёр."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Вызначае крок ды�кр�тызацыі т�к�туры.\n"
-"Больш вы�окае знач�нне прыводзіць да больш гладкіх мапаў нармал�ў."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Вызначае базавы ўзровень з�млі."
 
@@ -2992,6 +2943,11 @@ msgid "Desynchronize block animation"
 msgstr "Д��інхранізаваць анімацыю блока"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Клавіша ўправа"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Ча�ціцы пры капанні"
 
@@ -3054,7 +3010,8 @@ msgid "Enable console window"
 msgstr "Уключаць акно кан�олі"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Уключыць творчы р�жым дл� новых мап."
 
 #: src/settings_translation_file.cpp
@@ -3159,17 +3116,6 @@ msgid "Enables animation of inventory items."
 msgstr "Уключае анімацыю прадметаў інвентару."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Уключае р�льефнае т�к�тураванне. Мапы нармал�ў му��ць быць пакункам т�к�тур "
-"ці �творанымі аўтаматычна.\n"
-"Патрабуюцца ўключаны� ш�йд�ры."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Уключае к�шаванне павернутых вонкі �етак."
 
@@ -3179,22 +3125,6 @@ msgstr "Уключае мінімапу."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Уключае генерацыю мапаў нармал�ў лётма (�фект Emboss).\n"
-"Патрабуецца р�льефнае т�к�тураванне."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Уключае паралак�нае аклюзіўнае т�к�тураванне.\n"
-"Патрабуюцца ўключаны� ш�йд�ры."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3211,14 +3141,6 @@ msgstr "Метады �утна�ці"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Эк�перыментальны параметр, �кі можа прыве�ці да візуальных прагалаў\n"
-"паміж блокамі пры знач�нні большым за 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3228,8 +3150,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS у меню паўзы"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "Мак�імальны FPS, калі гульн� прыпынена�."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3561,10 +3484,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "txr2img-фільтр маштабаванн� графічнага інт�рфей�у"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Генерацы� мапы нармал�ў"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Глабальны� зваротны� выклікі"
 
@@ -3625,8 +3544,8 @@ msgstr "Клавіша пераключ�нн� HUD"
 #, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "�працоўка �а�тар�лых выклікаў Lua API:\n"
@@ -4154,6 +4073,11 @@ msgid "Joystick button repetition interval"
 msgstr "Інт�рвал паўтору кнопкі джой�ціка"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "Тып джой�ціка"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "�дчувальна�ць джой�ціка"
 
@@ -4254,6 +4178,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Клавіша �кока.\n"
+"Гл�дзіце http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4396,6 +4331,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Клавіша �кока.\n"
+"Гл�дзіце http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -5154,10 +5100,6 @@ msgid "Main menu script"
 msgstr "Скрыпт галоўнага меню"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Стыль галоўнага меню"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5174,6 +5116,14 @@ msgid "Makes all liquids opaque"
 msgstr "Робіць у�е вадка�ці непразры�тымі"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Каталог мапаў"
 
@@ -5357,7 +5307,8 @@ msgid "Maximum FPS"
 msgstr "Мак�імальны FPS (кадраў за �екунду)"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "Мак�імальны FPS, калі гульн� прыпынена�."
 
 #: src/settings_translation_file.cpp
@@ -5418,6 +5369,13 @@ msgstr ""
 "Пакінце пу�тым дл� аўтаматычнага выбару неабходнага знач�нн�."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "Мак�імальна� колька�ць прыму�ова загружаемых блокаў мапы."
 
@@ -5675,14 +5633,6 @@ msgid "Noises"
 msgstr "Шумы"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Ды�кр�тызацы� мапы нармал�ў"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Моц мапы нармал�ў"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Колька�ць узнікаючых патокаў"
 
@@ -5729,10 +5679,6 @@ msgstr ""
 "і �пажываннем пам�ці (4096 = 100 МБ, �к правіла)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Колька�ць іт�рацый паралак�най аклюзіі."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Сеціўны р�пазіторый"
 
@@ -5760,34 +5706,6 @@ msgstr ""
 "небудзь меню ўжо адкрыта."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "�гульны зрух �фекту паралак�най аклюзіі. Звычайна маштаб/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "�гульны маштаб �фекту паралак�най аклюзіі."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Паралак�на� аклюзі�"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Зрух паралак�най аклюзіі"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Іт�рацыі паралак�най аклюзіі"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Р�жым паралак�най аклюзіі"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Маштаб паралак�най аклюзіі"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5856,6 +5774,16 @@ msgid "Pitch move mode"
 msgstr "Р�жым нахіленн� руху"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Клавіша палёту"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Інт�рвал паўторнай п�трычкі правай кнопкі мышы"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -6038,10 +5966,6 @@ msgid "Right key"
 msgstr "Клавіша ўправа"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Інт�рвал паўторнай п�трычкі правай кнопкі мышы"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Глыбін� р�чышча"
 
@@ -6340,6 +6264,19 @@ msgid "Show entity selection boxes"
 msgstr "Паказваць вобла�ць вылуч�нн�"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Прызначыць мову. Пакіньце пу�тым, каб выкары�таць мову �і�т�мы.\n"
+"Па�л� змены мовы патр�бна перазапу�ціць гульню."
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Паведамленне аб выключ�нні"
 
@@ -6494,10 +6431,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Моц паралак�а."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Моц згенераваных мапаў нармал�ў."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6604,6 +6537,11 @@ msgid "The URL for the content repository"
 msgstr "URL р�пазіторы�"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "The deadzone of the joystick"
+msgstr "Ід�нтыфікатар джой�ціка дл� выкары�танн�"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6670,13 +6608,14 @@ msgstr ""
 "�еабходна наладжваць разам з active_object_range."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end for Irrlicht.\n"
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "Рухавік адмалёўкі дл� Irrlicht.\n"
 "Па�л� змены г�тага параметра �патр�біцца перазупу�к.\n"
@@ -6717,6 +6656,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6724,10 +6669,10 @@ msgstr ""
 "джой�ціка."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 "Ча� у �екундах паміж паўторамі падзей пры ўтрыманні правай кнопкі мышы."
 
@@ -6890,6 +6835,17 @@ msgstr ""
 "Гама-кар�кцы� пры пам�нш�нні маштабу не падтрымліваецца."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Выкары�тоўваць трылінейную фільтрацыю пры маштабаванні т�к�тур."
 
@@ -7129,6 +7085,12 @@ msgstr ""
 "падча� кампіл�цыі."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 "Ці павінна быць паміж блокамі мапы д��інхранізацы� анімацыі т�к�тур блокаў."
@@ -7270,6 +7232,24 @@ msgid "Y-level of seabed."
 msgstr "Y-узровень мар�кога дна."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "Таймаўт �пампоўванн� файла па cURL"
 
@@ -7281,23 +7261,12 @@ msgstr "Ліміт аднача�овых злуч�нн�ў cURL"
 msgid "cURL timeout"
 msgstr "Таймаўт cURL"
 
-#~ msgid "Ok"
-#~ msgstr "Добра"
-
-#~ msgid "Back"
-#~ msgstr "�азад"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Спампоўванне і ў�талёўка $1. Калі ла�ка, пачакайце…"
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "�бмежаванне ч�ргаў на ды�ку"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Інт�н�іўна�ць паралак�най аклюзіі"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Каталог дл� захоўванн� здымкаў �крана."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = паралак�на� аклюзі� �а зве�ткамі аб нахіле (хутка).\n"
+#~ "1 = р�льефнае т�к�тураванне (павольней, але �ка�ней)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7311,10 +7280,46 @@ msgstr "Таймаўт cURL"
 #~ msgid "Alters how mountain-type floatlands taper above and below midpoint."
 #~ msgstr "Кіруе звуж�ннем а�травоў горнага тыпу ніж�й ��р�дн�й кропкі."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Вы ўп�ўнены�, што хочаце �кінуць �вет адзіночнай гульні?"
+
+#~ msgid "Back"
+#~ msgstr "�азад"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Т�к�тураванне ма�камі"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Р�льефнае т�к�тураванне"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Ц�нтр ��р�дн�га ўздыму крывой �в�тла."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Змена інт�рфей�у галоўнага меню:\n"
+#~ "-   full: выбар �вету дл� адзіночнай альбо �еткавай гульні, а�обны �пі� "
+#~ "чужых �ервераў.\n"
+#~ "-   simple: адзін �вет дл� адзіночнай гульні ў меню, дзе �пі� чужых "
+#~ "�ервераў; можа быць кары�на дл� невелічкіх �кранаў.\n"
+#~ "Прадвызначана: simple дл� Android, full дл� ў�іх а�татніх."
+
+#~ msgid "Config mods"
+#~ msgstr "�алады мадыфікацый"
+
+#~ msgid "Configure"
+#~ msgstr "�аладзіць"
+
+#~ msgid "Content Store"
+#~ msgstr "Крама дадаткаў"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7325,6 +7330,9 @@ msgstr "Таймаўт cURL"
 #~ msgstr ""
 #~ "Кіруе шырынёй тун�л�ў. Меншае знач�нне �тварае больш шырокі� тун�лі."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Колер перакрыжаванн� (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Р�зка�ць цемры"
 
@@ -7336,6 +7344,13 @@ msgstr "Таймаўт cURL"
 #~ "Гладка� паверхн� з'�ўл�ецца, калі шум больш нул�."
 
 #~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Вызначае крок ды�кр�тызацыі т�к�туры.\n"
+#~ "Больш вы�окае знач�нне прыводзіць да больш гладкіх мапаў нармал�ў."
+
+#~ msgid ""
 #~ "Deprecated, define and locate cave liquids using biome definitions "
 #~ "instead.\n"
 #~ "Y of upper limit of lava in large caves."
@@ -7344,12 +7359,49 @@ msgstr "Таймаўт cURL"
 #~ "азнач�нн�ў біёму.\n"
 #~ "Y верхн�й м�жы лавы ў в�лікіх п�чорах."
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Спампоўванне і ў�талёўка $1. Калі ла�ка, пачакайце…"
+
 #~ msgid "Enable VBO"
 #~ msgstr "Уключыць VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Уключае р�льефнае т�к�тураванне. Мапы нармал�ў му��ць быць пакункам "
+#~ "т�к�тур ці �творанымі аўтаматычна.\n"
+#~ "Патрабуюцца ўключаны� ш�йд�ры."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Уключае кінематаграфічнае танальнае адлю�траванне"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Уключае генерацыю мапаў нармал�ў лётма (�фект Emboss).\n"
+#~ "Патрабуецца р�льефнае т�к�тураванне."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Уключае паралак�нае аклюзіўнае т�к�тураванне.\n"
+#~ "Патрабуюцца ўключаны� ш�йд�ры."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Эк�перыментальны параметр, �кі можа прыве�ці да візуальных прагалаў\n"
+#~ "паміж блокамі пры знач�нні большым за 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS у меню паўзы"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Шум базавай вышыні л�тучых а�травоў"
 
@@ -7362,27 +7414,156 @@ msgstr "Таймаўт cURL"
 #~ msgid "Gamma"
 #~ msgstr "Гама"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Генерацы� мапы нармал�ў"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Генерацы� мапы нармал�ў"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Падтрымка IPv6."
 
+#~ msgid ""
+#~ "If enabled together with fly mode, makes move directions relative to the "
+#~ "player's pitch."
+#~ msgstr ""
+#~ "Калі ўключана аднача�ова з р�жымам палёту, то вызначае напрамак руху "
+#~ "адно�на кроку гульца."
+
 #~ msgid "Lava depth"
 #~ msgstr "Глыбін� лавы"
 
 #~ msgid "Lightness sharpness"
 #~ msgstr "Р�зка�ць паваротліва�ці"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "�бмежаванне ч�ргаў на ды�ку"
+
+#~ msgid "Main"
+#~ msgstr "Галоўнае меню"
+
+#~ msgid "Main menu style"
+#~ msgstr "Стыль галоўнага меню"
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen Carpathian.\n"
+#~ "Flags that are not enabled are not modified from the default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "�трыбуты генерацыі мапы дл� генератара мапы \"Карпаты\".\n"
+#~ "��вызначаны� атрыбуты прадвызначана не зм�н�юцца.\n"
+#~ "�трыбуты, што пачынаюцца з \"no\", выкары�тоўваюцца дл� іх выключ�нн�."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v5.\n"
+#~ "Flags that are not enabled are not modified from the default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "�трыбуты генерацыі мапы дл� генератара мапы 5.\n"
+#~ "��вызначаны� атрыбуты прадвызначана не зм�н�юцца.\n"
+#~ "�трыбуты, што пачынаюцца з 'no' выкары�тоўваюцца дл� іх выключ�нн�."
+
+#~ msgid ""
+#~ "Map generation attributes specific to Mapgen v7.\n"
+#~ "'ridges' enables the rivers.\n"
+#~ "Flags that are not enabled are not modified from the default.\n"
+#~ "Flags starting with 'no' are used to explicitly disable them."
+#~ msgstr ""
+#~ "�трыбуты генерацыі мапы дл� генератара мапы 7.\n"
+#~ "Параметр \"ridges\" (хрыбты)  ўключае р�кі.\n"
+#~ "��вызначаны� параметры прадвызначана не зм�н�юцца.\n"
+#~ "Параметры, што пачынаюцца з \"no\", выкары�тоўваюцца дл� выключ�нн�."
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Мінімапа ў р�жыме радару, павеліч�нне х2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Мінімапа ў р�жыме радару, павеліч�нне х4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Мінімапа ў р�жыме паверхні, павеліч�нне х2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Мінімапа ў р�жыме паверхні, павеліч�нне х4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Ім�/Пароль"
+
+#~ msgid "No"
+#~ msgstr "�е"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Ды�кр�тызацы� мапы нармал�ў"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Моц мапы нармал�ў"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Колька�ць іт�рацый паралак�най аклюзіі."
+
+#~ msgid "Ok"
+#~ msgstr "Добра"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "�гульны зрух �фекту паралак�най аклюзіі. Звычайна маштаб/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "�гульны маштаб �фекту паралак�най аклюзіі."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Паралак�на� аклюзі�"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Паралак�на� аклюзі�"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Зрух паралак�най аклюзіі"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Іт�рацыі паралак�най аклюзіі"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Р�жым паралак�най аклюзіі"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Маштаб паралак�най аклюзіі"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Інт�н�іўна�ць паралак�най аклюзіі"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Шл�х да TrueTypeFont ці ра�травага шрыфту."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Каталог дл� захоўванн� здымкаў �крана."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Праектаванне падз�мелл�ў"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Скінуць �вет адзіночнай гульні"
+
+#~ msgid "Select Package File:"
+#~ msgstr "�браць файл пакунка:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Ліміт цен�ў"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Пачаць адзіночную гульню"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Моц згенераваных мапаў нармал�ў."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Моц ��р�дн�га ўздыму крывой �в�тла."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Г�ты шрыфт будзе выкары�тоўваецца дл� некаторых моў."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Кінематаграфічна�ць"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7394,65 +7575,23 @@ msgstr "Таймаўт cURL"
 #~ "Вары�цы� вышыні пагоркаў і глыбінь азёр на гладкай м��цова�ці л�тучых "
 #~ "а�травоў."
 
-#~ msgid "Waving water"
+#~ msgid "Waving Water"
 #~ msgstr "Хвал�ванне вады"
 
-#~ msgid "Y-level of floatland midpoint and lake surface."
-#~ msgstr "Y-узровень ��р�дн�й кропкі і паверхні азёр л�тучых а�травоў."
-
-#~ msgid "Y-level to which floatland shadows extend."
-#~ msgstr "Y-узровень, да �кога ра�паў�юджваюцца цені л�тучых а�травоў."
-
-#~ msgid ""
-#~ "If enabled together with fly mode, makes move directions relative to the "
-#~ "player's pitch."
-#~ msgstr ""
-#~ "Калі ўключана аднача�ова з р�жымам палёту, то вызначае напрамак руху "
-#~ "адно�на кроку гульца."
-
-#~ msgid "Projecting dungeons"
-#~ msgstr "Праектаванне падз�мелл�ў"
-
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen v7.\n"
-#~ "'ridges' enables the rivers.\n"
-#~ "Flags that are not enabled are not modified from the default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "�трыбуты генерацыі мапы дл� генератара мапы 7.\n"
-#~ "Параметр \"ridges\" (хрыбты)  ўключае р�кі.\n"
-#~ "��вызначаны� параметры прадвызначана не зм�н�юцца.\n"
-#~ "Параметры, што пачынаюцца з \"no\", выкары�тоўваюцца дл� выключ�нн�."
+#~ msgid "Waving water"
+#~ msgstr "Хвал�ванне вады"
 
 #~ msgid "Whether dungeons occasionally project from the terrain."
 #~ msgstr "Вы�туп падз�мелл�ў па-над р�льефам."
 
-#~ msgid "Waving Water"
-#~ msgstr "Хвал�ванне вады"
-
 #~ msgid "Y of upper limit of lava in large caves."
 #~ msgstr "Y верхн�га ліміту лавы ў шырокіх п�чорах."
 
-#~ msgid "Select Package File:"
-#~ msgstr "�браць файл пакунка:"
-
-#~ msgid "Content Store"
-#~ msgstr "Крама дадаткаў"
+#~ msgid "Y-level of floatland midpoint and lake surface."
+#~ msgstr "Y-узровень ��р�дн�й кропкі і паверхні азёр л�тучых а�травоў."
 
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen Carpathian.\n"
-#~ "Flags that are not enabled are not modified from the default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "�трыбуты генерацыі мапы дл� генератара мапы \"Карпаты\".\n"
-#~ "��вызначаны� атрыбуты прадвызначана не зм�н�юцца.\n"
-#~ "�трыбуты, што пачынаюцца з \"no\", выкары�тоўваюцца дл� іх выключ�нн�."
+#~ msgid "Y-level to which floatland shadows extend."
+#~ msgstr "Y-узровень, да �кога ра�паў�юджваюцца цені л�тучых а�травоў."
 
-#~ msgid ""
-#~ "Map generation attributes specific to Mapgen v5.\n"
-#~ "Flags that are not enabled are not modified from the default.\n"
-#~ "Flags starting with 'no' are used to explicitly disable them."
-#~ msgstr ""
-#~ "�трыбуты генерацыі мапы дл� генератара мапы 5.\n"
-#~ "��вызначаны� атрыбуты прадвызначана не зм�н�юцца.\n"
-#~ "�трыбуты, што пачынаюцца з 'no' выкары�тоўваюцца дл� іх выключ�нн�."
+#~ msgid "Yes"
+#~ msgstr "Так"
diff --git a/po/ja_KS/minetest.po b/po/bg/minetest.po
index 257974819..62011a94a 100644
--- a/po/ja_KS/minetest.po
+++ b/po/bg/minetest.po
@@ -1,72 +1,78 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the minetest package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: Japanese (Kansai) (Minetest)\n"
+"Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-01-11 18:26+0000\n"
-"Last-Translator: rubenwardy <rubenwardy@gmail.com>\n"
-"Language-Team: Japanese (Kansai) <https://hosted.weblate.org/projects/"
-"minetest/minetest/ja_KS/>\n"
-"Language: ja_KS\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-08-04 04:41+0000\n"
+"Last-Translator: atomicbeef <teddyg522@gmail.com>\n"
+"Language-Team: Bulgarian <https://hosted.weblate.org/projects/minetest/"
+"minetest/bg/>\n"
+"Language: bg\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 3.10.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.2-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Прераждането"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Ти умр�"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "Добре"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
-msgstr ""
+msgstr "Имаше грешка в Lua �крипт:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred:"
-msgstr ""
+msgstr "Имаше грешка:"
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
-msgstr ""
+msgstr "Главното меню"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr ""
+msgstr "Повтар�не на връзката"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr ""
-
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
+msgstr "Сървърт пои�ка нова връзка:"
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr ""
+msgstr "Вер�и�та на протокола е грешна. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr ""
+msgstr "Сървърт налага вер�и� $1 на протокола. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr ""
-
-#: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
+msgstr "Сървърът подкреп� вер�ии на протокола между $1 и $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr ""
+msgstr "�ие �амо подкреп�ме вер�и� $1 на протокола."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr ""
+msgstr "�ие подкреп�ме вер�ии на протокола между $1 и $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -74,372 +80,448 @@ msgstr ""
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiKeyChangeMenu.cpp
 #: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
-msgstr ""
+msgstr "Отказ"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
-msgstr ""
+msgstr "Зави�имо�ти:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
-msgstr ""
+msgstr "Деактивиране на в�ички"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr ""
+msgstr "Деактивиране на модпака"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
-msgstr ""
+msgstr "�ктиривране на в�ички"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr ""
+msgstr "�ктивиране на модпака"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "characters [a-z0-9_] are allowed."
 msgstr ""
+"�ктивиране на мода \"$1\" беше неу�пешно, защото �ъдържа забранени �имволи. "
+"Само �имволите [a-z0-9_] �а разрешени."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "�амиране на Още Модове"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
-msgstr ""
+msgstr "Мод:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No (optional) dependencies"
-msgstr ""
+msgstr "��ма (незадължителни) зави�имо�ти"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No game description provided."
-msgstr ""
+msgstr "��ма опи�ание за играта."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No hard dependencies"
-msgstr ""
+msgstr "��ма задължителни зави�имо�ти"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
-msgstr ""
+msgstr "��ма опи�ание за модпака."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No optional dependencies"
-msgstr ""
+msgstr "��ма незадължителни зави�имо�ти"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
-msgstr ""
+msgstr "�езадължителни зави�имо�ти:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/gui/guiKeyChangeMenu.cpp
 msgid "Save"
-msgstr ""
+msgstr "Запи�ване"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "World:"
-msgstr ""
+msgstr "Св�т:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
+msgstr "�ктивиран"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Изтегл�..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
+msgstr "В�ички пакети"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
+msgstr "Обратно към Главното Меню"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB не е налично когато Minetest е �ъ�тавен без cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Downloading..."
-msgstr ""
+msgstr "Изтегл�..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
-msgstr ""
+msgstr "Изтегл�нето на $1 беше неу�пешно"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
-msgstr ""
+msgstr "Игри"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Install"
-msgstr ""
+msgstr "Ин�талиране"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Ин�талиране"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "�езадължителни зави�имо�ти:"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
-msgstr ""
+msgstr "Модове"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No packages could be retrieved"
-msgstr ""
+msgstr "Получаване на пакети беше неу�пешно"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No results"
+msgstr "��ма резултати"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "No updates"
+msgstr "�ктуализаци�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "Texture packs"
+msgid "Please check that the base game is correct."
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "Uninstall"
+msgid "Queued"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Texture packs"
+msgstr "Пакети на тек�тури"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Uninstall"
+msgstr "Деин�талиране"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Update"
+msgstr "�ктуализаци�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Update All [$1]"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr ""
+msgstr "Вече има �в�т � името \"$1\""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Допълнителен терен"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr ""
+msgstr "Студ от ви�очина"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
-msgstr ""
+msgstr "Сух от ви�очина"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biome blending"
-msgstr ""
+msgstr "Сме�ване между природни зони"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biomes"
-msgstr ""
+msgstr "Природни зони"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caverns"
-msgstr ""
+msgstr "Пещери"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caves"
-msgstr ""
+msgstr "Пещери"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
-msgstr ""
+msgstr "Създаване"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Decorations"
-msgstr ""
+msgstr "Укра�и"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
-msgstr ""
+msgstr "Изтегл�не на игра, например Minetest Game, от minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr ""
+msgstr "Изтегли един от minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
-msgstr ""
+msgstr "Тъмници"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Равен терен"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "Земни ма�и в небето"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
-msgstr ""
+msgstr "Земни ма�и в небето (ек�периментално)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
-msgstr ""
+msgstr "Игра"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Създаване на нефрактален терен: Морета и под зем�та"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Хълми"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
-msgstr ""
+msgstr "Влажни реки"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "�ара�тва влажно�т около реки"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Езера"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "�и�ка влажно�т и ви�ока топлина причин�ва ни�ки или �ухи реки"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
-msgstr ""
+msgstr "Създаване на �вета"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr ""
+msgstr "Флагове за �ъздаване на �вета"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mapgen-specific flags"
-msgstr ""
+msgstr "Флагове �пе�ифични за �ъздване на �вета"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "Планини"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Кален поток"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Мрежа от тунели и пещери"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
-msgstr ""
+msgstr "��ма избрана игра"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "�амал�ва топлина � ви�очина"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "�амал�ва влажно�т � ви�очина"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Rivers"
-msgstr ""
+msgstr "Реки"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Реки на мор�кото ниво"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Seed"
-msgstr ""
+msgstr "Семе"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "Гладка пром�на между природни зони"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"По�в�ване на �труктури на терена (н�ма ефект на трева от джунгла и дървета "
+"�ъздадени от v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "По�в�ване на �труктури на терена, типично дървета и ра�тени�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "Умерен, Пу�тин�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "Умерен, Пу�тин�, Джунгла"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "Умерен, Пу�тин�, Джунгла, Тундра, Тайга"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr ""
+msgstr "Ерози� на повърхно�т на терен"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "Трева в джунглата и дървета"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Vary river depth"
-msgstr ""
+msgstr "Вариране на дълбочина на реки"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Много големи пещери дълбоко под зем�та"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The Development Test is meant for developers."
-msgstr ""
+msgstr "Внимание: Те�тът за Развитие е предназначен за разработници."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
-msgstr ""
+msgstr "Име на �вета"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no games installed."
-msgstr ""
+msgstr "��маш ин�алирани игри."
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr ""
+msgstr "Сигурен ли �и че и�каш да изтриваш \"$1\"?"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/tab_local.lua
 #: src/client/keycode.cpp
 msgid "Delete"
-msgstr ""
+msgstr "Изтриване"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "pkgmgr: failed to delete \"$1\""
-msgstr ""
+msgstr "pkgmgr: Изтриване на \"$1\" беше неу�пешно"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "pkgmgr: invalid path \"$1\""
-msgstr ""
+msgstr "pkgmgr: Грешна пътека \"$1\""
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
-msgstr ""
+msgstr "Да изтриe ли �вета \"$1\"?"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
-msgstr ""
+msgstr "Приемане"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr ""
+msgstr "Преименуване на модпак:"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid ""
 "This modpack has an explicit name given in its modpack.conf which will "
 "override any renaming here."
 msgstr ""
+"Този модпак има изрично име дадено в негови� modpack.conf, което ще отмен� "
+"в��ко преименуване тука."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
@@ -454,16 +536,13 @@ msgid "< Back to Settings page"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+#, fuzzy
 msgid "Browse"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
+msgstr "Преглеждане"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
-msgstr ""
+msgstr "Изключено"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Edit"
@@ -471,7 +550,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Enabled"
-msgstr ""
+msgstr "Включено"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Lacunarity"
@@ -483,7 +562,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
 msgid "Offset"
-msgstr ""
+msgstr "Изме�тване"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Persistance"
@@ -502,8 +581,13 @@ msgid "Restore Default"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
+#, fuzzy
 msgid "Scale"
-msgstr ""
+msgstr "Мащаб"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Тър�ене"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
@@ -530,8 +614,9 @@ msgid "X"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+#, fuzzy
 msgid "X spread"
-msgstr ""
+msgstr "Разпро�транение на Х-о�та"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Y"
@@ -539,7 +624,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Y spread"
-msgstr ""
+msgstr "Разпро�транение на У-о�та"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Z"
@@ -620,6 +705,20 @@ msgstr ""
 msgid "Unable to install a modpack as a $1"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Зарежда..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Опитай да включиш публични� �пи�ък на �ървъри отново и �и провай интернет "
+"връзката."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -673,7 +772,13 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -693,14 +798,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr ""
 
@@ -717,7 +818,7 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -729,6 +830,10 @@ msgid "No world created or selected!"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr ""
 
@@ -737,6 +842,10 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ""
 
@@ -752,23 +861,23 @@ msgstr ""
 msgid "Address / Port"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
@@ -776,16 +885,16 @@ msgstr ""
 msgid "Join Game"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -814,10 +923,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -825,10 +930,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -842,10 +943,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -854,10 +951,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -885,19 +978,11 @@ msgstr ""
 msgid "Opaque Water"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr ""
 
@@ -910,6 +995,11 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Земни ма�и в небето (ек�периментално)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -953,22 +1043,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1039,7 +1113,7 @@ msgstr ""
 #. When in doubt, test your translation.
 #: src/client/fontengine.cpp
 msgid "needs_fallback_font"
-msgstr "yes"
+msgstr "no"
 
 #: src/client/game.cpp
 msgid ""
@@ -1128,18 +1202,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1227,14 +1298,6 @@ msgid "Fog enabled"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1255,14 +1318,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1275,34 +1330,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1347,10 +1374,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1403,10 +1426,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1423,14 +1442,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1710,6 +1721,24 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ""
@@ -1749,26 +1778,6 @@ msgid "Backward"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr ""
 
@@ -1861,26 +1870,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -1951,7 +1944,7 @@ msgstr ""
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
 msgid "LANG_CODE"
-msgstr "ja_KS"
+msgstr "bg"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1990,12 +1983,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2102,6 +2089,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2335,10 +2326,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2409,16 +2396,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2570,6 +2547,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2626,7 +2607,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2634,7 +2617,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2734,12 +2719,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2810,6 +2789,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2870,7 +2853,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2958,14 +2941,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -2975,18 +2950,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3003,12 +2966,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3018,7 +2975,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3320,10 +3277,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3377,8 +3330,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3845,6 +3798,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3925,6 +3882,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4024,6 +3988,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4580,10 +4551,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4597,6 +4564,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4760,7 +4735,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4809,6 +4784,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5038,14 +5020,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5071,10 +5045,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5100,34 +5070,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5193,6 +5135,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5348,10 +5298,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5603,6 +5549,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5732,10 +5688,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5829,6 +5781,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5887,8 +5843,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5914,15 +5870,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6058,6 +6019,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6260,6 +6232,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6382,6 +6360,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6392,3 +6388,6 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "cURL timeout"
 msgstr ""
+
+#~ msgid "View"
+#~ msgstr "Гледане"
diff --git a/po/ca/minetest.po b/po/ca/minetest.po
index a1ed767ff..f9aecf265 100644
--- a/po/ca/minetest.po
+++ b/po/ca/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Catalan (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/minetest/"
@@ -14,6 +14,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.9-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Reaparèixer"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+#, fuzzy
+msgid "You died"
+msgstr "Has mort."
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -40,10 +49,6 @@ msgstr "Torneu a connectar"
 msgid "The server has requested a reconnect:"
 msgstr "El servidor ha sol·licitat una reconnexió:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Carregant ..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Desajust de la versió del protocol. "
@@ -58,12 +63,6 @@ msgstr ""
 "El servidor es compatible amb les versions de protocol entre $ 1 i $ 2 . "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Intenta tornar a habilitar la llista de servidors públics i comprovi la seva "
-"connexió a Internet ."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Nosaltres sols suportem la versió $1 del protocol."
 
@@ -71,7 +70,8 @@ msgstr "Nosaltres sols suportem la versió $1 del protocol."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Nosaltres suportem versions del protocol entre la versió $1 i la $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -81,7 +81,8 @@ msgstr "Nosaltres suportem versions del protocol entre la versió $1 i la $2."
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependències:"
 
@@ -163,15 +164,56 @@ msgid "enabled"
 msgstr "Activat"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Carregant ..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
+msgid "Already installed"
+msgstr "La tecla s'està utilitzant"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
 msgid "Back to Main Menu"
 msgstr "Menú principal"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Ocultar Joc"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -195,6 +237,16 @@ msgid "Install"
 msgstr "Instal·lar"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Instal·lar"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Dependències opcionals:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mods"
@@ -208,9 +260,24 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Buscar"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
@@ -227,7 +294,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -496,11 +567,6 @@ msgid "Browse"
 msgstr "Navegar"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Client"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Desactivat"
 
@@ -545,6 +611,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Buscar"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 #, fuzzy
 msgid "Select directory"
 msgstr "Selecciona el fitxer del mod:"
@@ -679,6 +749,20 @@ msgstr "Error al instal·lar $1 en $2"
 msgid "Unable to install a modpack as a $1"
 msgstr "Error al instal·lar $1 en $2"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Carregant ..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Intenta tornar a habilitar la llista de servidors públics i comprovi la seva "
+"connexió a Internet ."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -739,7 +823,14 @@ msgid "Credits"
 msgstr "Crèdits"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Selecciona el fitxer del mod:"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -759,14 +850,10 @@ msgid "Bind Address"
 msgstr "Adreça BIND"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Configurar"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Mode Creatiu"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Permetre Danys"
 
@@ -785,8 +872,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nom/Contrasenya"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -797,6 +884,11 @@ msgid "No world created or selected!"
 msgstr "No s'ha creat ningun món o no s'ha seleccionat!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Nova contrasenya"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Jugar Joc"
 
@@ -805,6 +897,11 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Seleccionar un món:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Seleccionar un món:"
 
@@ -821,23 +918,23 @@ msgstr "Ocultar Joc"
 msgid "Address / Port"
 msgstr "Adreça / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Connectar"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Mode creatiu"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Dany activat"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Esborra preferit"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Preferit"
 
@@ -846,16 +943,16 @@ msgstr "Preferit"
 msgid "Join Game"
 msgstr "Ocultar Joc"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nom / Contrasenya"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP activat"
 
@@ -885,10 +982,6 @@ msgid "Antialiasing:"
 msgstr "Suavitzat (Antialiasing):"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Esteu segur que voleu reiniciar el seu món d'un sol jugador?"
-
-#: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Autosave Screen Size"
 msgstr "Desar automàticament mesures de la pantalla"
@@ -897,10 +990,6 @@ msgstr "Desar automàticament mesures de la pantalla"
 msgid "Bilinear Filter"
 msgstr "Filtre Bilineal"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Mapat de relleu"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Configurar Controls"
@@ -914,11 +1003,6 @@ msgid "Fancy Leaves"
 msgstr "Fulles Boniques"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Generate Normal Maps"
-msgstr "Generar Mapes Normals"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -927,10 +1011,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Aniso. Filtre"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "No"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Sense Filtre"
 
@@ -958,20 +1038,11 @@ msgstr "Fulles opaques"
 msgid "Opaque Water"
 msgstr "Aigua opaca"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Oclusió de paral·laxi"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Partícules"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Reset singleplayer world"
-msgstr "Reiniciar el mon individual"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Pantalla:"
 
@@ -984,6 +1055,10 @@ msgid "Shaders"
 msgstr "Ombres"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -1029,22 +1104,6 @@ msgstr "Moviment de les Fulles"
 msgid "Waving Plants"
 msgstr "Moviment de Plantes"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Sí"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Configurar mods"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Principal"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Començar Un Jugador"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Temps d'espera de la connexió esgotat."
@@ -1217,18 +1276,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Controls predeterminats:\n"
 "- WASD: moure\n"
@@ -1344,16 +1400,6 @@ msgid "Fog enabled"
 msgstr "Activat"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Desactivat"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Activat"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1376,16 +1422,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Desactivat"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Dany activat"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Media ..."
 
@@ -1398,34 +1434,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1472,10 +1480,6 @@ msgid "Resolving address..."
 msgstr "Resolent adreça ..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Reaparèixer"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Tancant ..."
 
@@ -1530,11 +1534,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "You died"
-msgstr "Has mort."
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1552,15 +1551,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Tecla del xat"
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1848,6 +1838,24 @@ msgstr "X Botó 2"
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Les contrasenyes no coincideixen!"
@@ -1889,26 +1897,6 @@ msgid "Backward"
 msgstr "Arrere"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
 msgid "Change camera"
 msgstr "Configurar controls"
@@ -2008,31 +1996,11 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Special Inv."
-msgstr "Tecla sigil"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Activar Cinematogràfic"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Activar Cinematogràfic"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle HUD"
 msgstr "Activar volar"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Toggle Killaura"
-msgstr "Activar volar"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle chat log"
 msgstr "Activar ràpid"
 
@@ -2153,14 +2121,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = oclusió de la paral.laxi amb informació d'inclinació (més ràpid).\n"
-"1 = mapa de relleu (més lent, més precís)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2280,6 +2240,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Límit absolut de cues emergents"
@@ -2528,10 +2492,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Mapat de relleu"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2608,16 +2568,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "Mida del chunk"
@@ -2783,6 +2733,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "Continuar"
@@ -2845,7 +2799,9 @@ msgid "Crosshair alpha"
 msgstr "Punt de mira Alpha"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2853,8 +2809,10 @@ msgid "Crosshair color"
 msgstr "Color del punt de mira"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Color del punt de mira (R, G, B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2959,12 +2917,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -3037,6 +2989,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Dig key"
+msgstr "Tecla dreta"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Digging particles"
 msgstr "Partícules"
 
@@ -3098,7 +3055,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3186,14 +3143,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3203,18 +3152,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3231,12 +3168,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3246,7 +3177,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3552,10 +3483,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3611,8 +3538,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -4087,6 +4014,10 @@ msgid "Joystick button repetition interval"
 msgstr "Interval de repetició del click dret"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Joystick frustum sensitivity"
 msgstr "Sensibilitat del ratolí"
@@ -4176,6 +4107,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla per botar.\n"
+"Veure http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4313,6 +4255,17 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla per botar.\n"
+"Veure http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -5035,11 +4988,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Menú principal"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5053,6 +5001,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -5225,7 +5181,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5274,6 +5230,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5504,14 +5467,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5537,10 +5492,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5566,35 +5517,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "Oclusió de paral·laxi"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5661,6 +5583,16 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Tecla mode cinematogràfic"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Interval de repetició del click dret"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5818,10 +5750,6 @@ msgid "Right key"
 msgstr "Tecla dreta"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Interval de repetició del click dret"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -6096,6 +6024,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -6231,10 +6169,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6329,6 +6263,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6387,8 +6325,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6413,6 +6351,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
 "The time in seconds it takes between repeated events\n"
@@ -6424,9 +6368,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 "El temps en segons que es pren entre la repetició de clicks drets quan "
 "s'està mantenint el botó dret del ratolí."
@@ -6566,6 +6509,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6773,6 +6727,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6899,6 +6859,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6910,15 +6888,12 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "D'acord"
-
-#~ msgid "Back"
-#~ msgstr "Enrere"
-
-#, fuzzy
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Descarregant $1, si us plau esperi ..."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = oclusió de la paral.laxi amb informació d'inclinació (més ràpid).\n"
+#~ "1 = mapa de relleu (més lent, més precís)."
 
 #, fuzzy
 #~ msgid ""
@@ -6930,13 +6905,78 @@ msgstr ""
 #~ "petits n'augmentaràn la brillantor.\n"
 #~ "Aquesta configuració només afecta al client, el servidor l'ignora."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Esteu segur que voleu reiniciar el seu món d'un sol jugador?"
+
+#~ msgid "Back"
+#~ msgstr "Enrere"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Mapat de relleu"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Mapat de relleu"
+
+#~ msgid "Config mods"
+#~ msgstr "Configurar mods"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr ""
 #~ "Controla l'amplada dels túnels, un valor més petit crea túnels més amples."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Color del punt de mira (R, G, B)."
+
+#, fuzzy
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Descarregant $1, si us plau esperi ..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Activar VBO"
 
 #, fuzzy
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Generar Mapes Normals"
+
+#~ msgid "Main"
+#~ msgstr "Principal"
+
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "Menú principal"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nom/Contrasenya"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Ok"
+#~ msgstr "D'acord"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Oclusió de paral·laxi"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Oclusió de paral·laxi"
+
+#, fuzzy
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Reiniciar el mon individual"
+
+#, fuzzy
 #~ msgid "Select Package File:"
 #~ msgstr "Selecciona el fitxer del mod:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Començar Un Jugador"
+
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Activar Cinematogràfic"
+
+#~ msgid "Yes"
+#~ msgstr "Sí"
diff --git a/po/cs/minetest.po b/po/cs/minetest.po
index 952bc99cd..1bb3a4336 100644
--- a/po/cs/minetest.po
+++ b/po/cs/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Czech (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-07-08 20:47+0000\n"
-"Last-Translator: sfan5 <sfan5@live.de>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-03 04:31+0000\n"
+"Last-Translator: Vít Skalický <vit.skalicky@email.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/minetest/minetest/"
 "cs/>\n"
 "Language: cs\n"
@@ -12,11 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Oživit"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Zemřel jsi"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -38,10 +46,6 @@ msgstr "Znovu se připojit"
 msgid "The server has requested a reconnect:"
 msgstr "Server vyžaduje znovupřipojení se:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Nahrávám..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Neshoda verze protokolu. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Server podporuje verze protokolů mezi $1 a $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Zkuste znovu povolit seznam veřejných serverů a zkontrolujte své internetové "
-"připojení."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Podporujeme pouze protokol verze $1."
 
@@ -68,7 +66,8 @@ msgstr "Podporujeme pouze protokol verze $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Podporujeme verze protokolů mezi $1 a $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Podporujeme verze protokolů mezi $1 a $2."
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Závislosti:"
 
@@ -108,7 +108,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "Najít více modů"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -152,14 +152,56 @@ msgid "enabled"
 msgstr "zapnuto"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" již existuje. Chcete jej přepsat?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 od $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 se stahuje,\n"
+"$2 �eká ve frontě"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 se stahuje..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Všechny balí�ky"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Klávesa je již používána"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Zpět do hlavní nabídky"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Založit hru"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -182,6 +224,16 @@ msgid "Install"
 msgstr "Instalovat"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Instalovat"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Volitelné závislosti:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mody"
@@ -195,9 +247,25 @@ msgid "No results"
 msgstr "Žádné výsledky"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Hledat"
+#, fuzzy
+msgid "No updates"
+msgstr "Aktualizovat"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -212,7 +280,11 @@ msgid "Update"
 msgstr "Aktualizovat"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -479,11 +551,6 @@ msgid "Browse"
 msgstr "Procházet"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Klient"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Vypnuto"
 
@@ -528,6 +595,10 @@ msgid "Scale"
 msgstr "Přiblížení"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Hledat"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Vyberte adresář"
 
@@ -645,6 +716,21 @@ msgstr "Selhala instalace rozšíření $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Selhala instalace rozšíření $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Nahrávám..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Uživatelské skripty nejsou povoleny"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Zkuste znovu povolit seznam veřejných serverů a zkontrolujte své internetové "
+"připojení."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Procházet online obsah"
@@ -698,7 +784,14 @@ msgid "Credits"
 msgstr "Autoři"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Vyberte adresář"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -718,14 +811,10 @@ msgid "Bind Address"
 msgstr "Poslouchat na Adrese"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Nastavit"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Kreativní mód"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Povolit zranění"
 
@@ -742,8 +831,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Jméno/Heslo"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -754,6 +843,11 @@ msgid "No world created or selected!"
 msgstr "Žádný svět nebyl vytvořen ani vybrán!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Nové heslo"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Spustit hru"
 
@@ -762,6 +856,11 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Vyberte svět:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Vyberte svět:"
 
@@ -777,23 +876,23 @@ msgstr "Spustit hru"
 msgid "Address / Port"
 msgstr "Adresa / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Připojit"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Kreativní mód"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Zranění povoleno"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Smazat oblíbené"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Oblíbené"
 
@@ -801,16 +900,16 @@ msgstr "Oblíbené"
 msgid "Join Game"
 msgstr "Připojit se ke hře"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Jméno / Heslo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP (hrá� proti hrá�i) povoleno"
 
@@ -839,10 +938,6 @@ msgid "Antialiasing:"
 msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Jste si jisti, že chcete resetovat místní svět?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Pamatovat si velikost obrazovky"
 
@@ -850,10 +945,6 @@ msgstr "Pamatovat si velikost obrazovky"
 msgid "Bilinear Filter"
 msgstr "Bilineární filtr"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Bump mapping"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Změnit klávesy"
@@ -867,10 +958,6 @@ msgid "Fancy Leaves"
 msgstr "Vícevrstevné listí"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Generovat Normální Mapy"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmapy zapnuté"
 
@@ -879,10 +966,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmapy + anizotropní filtr"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Ne"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Filtrování vypnuto"
 
@@ -910,19 +993,11 @@ msgstr "Neprůhledné listí"
 msgid "Opaque Water"
 msgstr "Neprůhledná voda"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parallax occlusion"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Částice"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Reset místního světa"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Obrazovka:"
 
@@ -935,6 +1010,11 @@ msgid "Shaders"
 msgstr "Shadery"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Výška létajících ostrovů"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Shadery (není dostupné)"
 
@@ -978,22 +1058,6 @@ msgstr "Vlnění Kapalin"
 msgid "Waving Plants"
 msgstr "Vlnění rostlin"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ano"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Nastavení modů"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Hlavní nabídka"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Start místní hry"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Vypršel �asový limit připojení."
@@ -1156,18 +1220,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Ovládání:\n"
 "- %s: pohyb dopředu\n"
@@ -1281,16 +1342,6 @@ msgid "Fog enabled"
 msgstr "Mlha je povolena"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Mlha je zakázána"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Mlha je povolena"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informace o hře:"
 
@@ -1311,16 +1362,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Mlha je zakázána"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Zranění povoleno"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Média..."
 
@@ -1333,34 +1374,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Minimapa je aktuálně zakázána"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Minimapa je skryta"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Minimapa v režimu radar, Přiblížení x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Minimapa v režimu radar, Přiblížení x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Minimapa v režimu radar, Přiblížení x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Minimapa v režimu povrch, Přiblížení x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Minimapa v režimu povrch, Přiblížení x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Minimapa v režimu povrch, Přiblížení x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Režim bez ořezu zakázán"
 
@@ -1405,10 +1418,6 @@ msgid "Resolving address..."
 msgstr "Překládám adresu..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Oživit"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Vypínání..."
 
@@ -1461,10 +1470,6 @@ msgid "Wireframe shown"
 msgstr "Obrysy zobrazeny"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Zemřel jsi"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Přiblížení je aktuálně zakázáno"
 
@@ -1481,16 +1486,6 @@ msgid "Chat shown"
 msgstr "Chat zobrazen"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Chat skryt"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Chat zobrazen"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "Ovládací prvky skryty"
 
@@ -1770,6 +1765,25 @@ msgstr "X Tla�ítko 2"
 msgid "Zoom"
 msgstr "Přiblížení"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Minimapa je skryta"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Minimapa v režimu radar, Přiblížení x1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Minimapa v režimu povrch, Přiblížení x1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Minimální velikost textury k filtrování"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Hesla se neshodují!"
@@ -1814,26 +1828,6 @@ msgid "Backward"
 msgstr "Vzad"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Změnit nastavení kamery"
 
@@ -1928,30 +1922,10 @@ msgid "Special"
 msgstr "Speciální"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Speciální"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Plynulá kamera"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Plynulá kamera"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Zapnout/Vypnout ovládací prvky"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Zapnout/Vypnout létání"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Zapnout/Vypnout záznam chatu"
 
@@ -2081,14 +2055,6 @@ msgstr ""
 "pro ostrov, nastavte všechna 3 �ísla stejně pro ryzí tvar."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = parallax occlusion s informacemi o sklonu (rychlejší).\n"
-"1 = mapování reliéfu (pomalejší, ale přesnější)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "2D šum, který definuje tvar/velikost horských útvarů."
 
@@ -2211,6 +2177,10 @@ msgid "ABM interval"
 msgstr "Interval Aktivní Blokové Modifikace (ABM)"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Maximální po�et emerge front"
@@ -2472,10 +2442,6 @@ msgid "Builtin"
 msgstr "Zabudované"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bump mapování"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2547,16 +2513,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "Velikost písma"
@@ -2718,6 +2674,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "Pokra�ovat"
@@ -2779,7 +2739,10 @@ msgid "Crosshair alpha"
 msgstr "Průhlednost zaměřova�e"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Průhlednost zaměřova�e (mezi 0 a 255)."
 
 #: src/settings_translation_file.cpp
@@ -2787,8 +2750,10 @@ msgid "Crosshair color"
 msgstr "Barva zaměřova�e"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Barva zaměřova�e (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2897,14 +2862,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Ur�uje pozici a terén možných hor a jezer."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Ur�uje vyhlazovací krok textur.\n"
-"Vyšší hodnota znamená vyhlazenější normálové mapy."
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Defines the base ground level."
 msgstr "Ur�uje lesní oblasti a hustotu stromového porostu."
@@ -2988,6 +2945,11 @@ msgid "Desynchronize block animation"
 msgstr "Nesynchronizovat animace bloků"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Klávesa doprava"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Částicové efekty při těžení"
 
@@ -3052,7 +3014,8 @@ msgid "Enable console window"
 msgstr "Povolit konzolové okno"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Zapnout kreativní mód pro nové mapy."
 
 #: src/settings_translation_file.cpp
@@ -3157,17 +3120,6 @@ msgid "Enables animation of inventory items."
 msgstr "Povolí animaci věcí v inventáři."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Povolí bump mapping textur. Balík textur bu� poskytne normálové mapy,\n"
-"nebo musí být automaticky vytvořeny.\n"
-"Nastavení vyžaduje zapnuté shadery."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Zapnout cachování geom. sítí oto�ených pomocí facedir."
 
@@ -3177,22 +3129,6 @@ msgstr "Zapne minimapu."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Zapne generování normálových map za běhu (efekt protla�ení).\n"
-"Nastavení vyžaduje zapnutý bump mapping."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Zapne parallax occlusion mapping.\n"
-"Nastavení vyžaduje zapnuté shadery."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3209,14 +3145,6 @@ msgstr "Metody entit"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Experimentální nastavení, může zapří�init viditelné mezery mezi bloky,\n"
-"je-li nastaveno na vyšší �íslo než 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3226,8 +3154,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS v menu pauzy"
+msgid "FPS when unfocused or paused"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3562,10 +3490,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Filtrovat při škálování GUI (txr2img)"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Generovat normálové mapy"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Globální callback funkce"
 
@@ -3629,8 +3553,8 @@ msgstr "Klávesa pro přepnutí HUD (Head-Up Display)"
 #, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Zacházení s voláními zastaralého Lua API:\n"
@@ -4178,6 +4102,11 @@ msgid "Joystick button repetition interval"
 msgstr "Interval opakování tla�ítek joysticku"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "Typ joysticku"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Citlivost otá�ení pohledu joystickem"
 
@@ -4279,6 +4208,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"klávesy pro snížení hlasitosti.\n"
+"viz. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4390,6 +4330,17 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"klávesy pro snížení hlasitosti.\n"
+"viz. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -5091,11 +5042,6 @@ msgid "Main menu script"
 msgstr "Skript hlavní nabídky"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Skript hlavní nabídky"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5109,6 +5055,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -5308,7 +5262,7 @@ msgid "Maximum FPS"
 msgstr "Maximální FPS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5357,6 +5311,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5588,14 +5549,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5621,10 +5574,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5650,35 +5599,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Parallax occlusion"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Náklon parallax occlusion"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Po�et iterací parallax occlusion"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Režim parallax occlusion"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "Škála parallax occlusion"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5736,15 +5656,24 @@ msgid "Physics"
 msgstr "Fyzika"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Pitch move key"
-msgstr "Klávesa létání"
+msgstr "létání"
 
 #: src/settings_translation_file.cpp
 msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Klávesa létání"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Interval opakování pravého kliknutí"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5902,10 +5831,6 @@ msgid "Right key"
 msgstr "Klávesa doprava"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Interval opakování pravého kliknutí"
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "River channel depth"
 msgstr "Hloubka řeky"
@@ -6199,6 +6124,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Zpráva o vypnutí"
 
@@ -6332,10 +6267,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Síla vygenerovaných normálových map."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Síla vygenerovaných normálových map."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6430,6 +6361,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6488,8 +6423,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6515,15 +6450,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6662,6 +6602,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6873,6 +6824,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6997,6 +6954,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -7008,14 +6983,12 @@ msgstr "cURL limit paralelních stahování"
 msgid "cURL timeout"
 msgstr "cURL timeout"
 
-#~ msgid "Ok"
-#~ msgstr "OK"
-
-#~ msgid "Back"
-#~ msgstr "Zpět"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Stahuji a instaluji $1, prosím �ekejte..."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = parallax occlusion s informacemi o sklonu (rychlejší).\n"
+#~ "1 = mapování reliéfu (pomalejší, ale přesnější)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7026,6 +6999,24 @@ msgstr "cURL timeout"
 #~ "hodnoty.\n"
 #~ "Toto nastavení ovlivňuje pouze klienta a serverem není použito."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Jste si jisti, že chcete resetovat místní svět?"
+
+#~ msgid "Back"
+#~ msgstr "Zpět"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Bump mapping"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bump mapování"
+
+#~ msgid "Config mods"
+#~ msgstr "Nastavení modů"
+
+#~ msgid "Configure"
+#~ msgstr "Nastavit"
+
 #, fuzzy
 #~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
@@ -7037,6 +7028,9 @@ msgstr "cURL timeout"
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "Ovládá šířku tunelů, menší hodnota vytváří širší tunely."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Barva zaměřova�e (R,G,B)."
+
 #~ msgid ""
 #~ "Defines areas of floatland smooth terrain.\n"
 #~ "Smooth floatlands occur when noise > 0."
@@ -7044,12 +7038,56 @@ msgstr "cURL timeout"
 #~ "Ur�uje oblasti létajících ostrovů s rovinný terénem.\n"
 #~ "Terén bude rovný v místech, kde hodnota šumu bude větší než 0."
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Ur�uje vyhlazovací krok textur.\n"
+#~ "Vyšší hodnota znamená vyhlazenější normálové mapy."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Stahuji a instaluji $1, prosím �ekejte..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Zapnout VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Povolí bump mapping textur. Balík textur bu� poskytne normálové mapy,\n"
+#~ "nebo musí být automaticky vytvořeny.\n"
+#~ "Nastavení vyžaduje zapnuté shadery."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Zapne filmový tone mapping"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Zapne generování normálových map za běhu (efekt protla�ení).\n"
+#~ "Nastavení vyžaduje zapnutý bump mapping."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Zapne parallax occlusion mapping.\n"
+#~ "Nastavení vyžaduje zapnuté shadery."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Experimentální nastavení, může zapří�init viditelné mezery mezi bloky,\n"
+#~ "je-li nastaveno na vyšší �íslo než 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS v menu pauzy"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Šum základní výšky létajících ostrovů"
 
@@ -7059,6 +7097,12 @@ msgstr "cURL timeout"
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Generovat Normální Mapy"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Generovat normálové mapy"
+
 #~ msgid "IPv6 support."
 #~ msgstr ""
 #~ "Nastavuje reálnou délku dne.\n"
@@ -7069,12 +7113,74 @@ msgstr "cURL timeout"
 #~ msgid "Lava depth"
 #~ msgstr "Hloubka velké jeskyně"
 
-#~ msgid "Waving water"
-#~ msgstr "Vlnění vody"
+#~ msgid "Main"
+#~ msgstr "Hlavní nabídka"
 
-#~ msgid "Waving Water"
-#~ msgstr "Vlnění vody"
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "Skript hlavní nabídky"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Minimapa v režimu radar, Přiblížení x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Minimapa v režimu radar, Přiblížení x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Minimapa v režimu povrch, Přiblížení x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Minimapa v režimu povrch, Přiblížení x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Jméno/Heslo"
+
+#~ msgid "No"
+#~ msgstr "Ne"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax occlusion"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Parallax occlusion"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Náklon parallax occlusion"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Po�et iterací parallax occlusion"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Režim parallax occlusion"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Škála parallax occlusion"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Reset místního světa"
 
 #, fuzzy
 #~ msgid "Select Package File:"
 #~ msgstr "Vybrat soubor s modem:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Start místní hry"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Síla vygenerovaných normálových map."
+
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Plynulá kamera"
+
+#~ msgid "Waving Water"
+#~ msgstr "Vlnění vody"
+
+#~ msgid "Waving water"
+#~ msgstr "Vlnění vody"
+
+#~ msgid "Yes"
+#~ msgstr "Ano"
diff --git a/po/da/minetest.po b/po/da/minetest.po
index 0eef49cbc..5a11a9779 100644
--- a/po/da/minetest.po
+++ b/po/da/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Danish (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: 2020-03-31 10:14+0000\n"
 "Last-Translator: sfan5 <sfan5@live.de>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -14,6 +14,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Genopstå"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Du døde"
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -39,10 +47,6 @@ msgstr "Forbind igen"
 msgid "The server has requested a reconnect:"
 msgstr "Serveren har anmodet om at forbinde igen:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Indlæser..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Protokol versionerne matchede ikke. "
@@ -56,12 +60,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Serveren understøtter protokol versioner mellem $1 og $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Prøv at slå den offentlige serverliste fra og til, og tjek din internet "
-"forbindelse."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Vi understøtter kun protokol version $1."
 
@@ -69,7 +67,8 @@ msgstr "Vi understøtter kun protokol version $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Vi understøtter protokol versioner mellem $1 og $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -79,7 +78,8 @@ msgstr "Vi understøtter protokol versioner mellem $1 og $2."
 msgid "Cancel"
 msgstr "Anuller"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Afhængigheder:"
 
@@ -157,14 +157,55 @@ msgid "enabled"
 msgstr "aktiveret"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Indlæser..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Alle pakker"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Tast allerede i brug"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Tilbage til hovedmenuen"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Vær vært for spil"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -187,6 +228,16 @@ msgid "Install"
 msgstr "Installer"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Installer"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Valgfrie afhængigheder:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mods"
@@ -200,9 +251,25 @@ msgid "No results"
 msgstr "Der er ingen resultater at vise"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Søg"
+#, fuzzy
+msgid "No updates"
+msgstr "Opdater"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -217,7 +284,11 @@ msgid "Update"
 msgstr "Opdater"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -487,11 +558,6 @@ msgid "Browse"
 msgstr "Gennemse"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Klient"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Deaktiveret"
 
@@ -537,6 +603,10 @@ msgid "Scale"
 msgstr "Skala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Søg"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Vælg mappe"
 
@@ -654,6 +724,20 @@ msgstr "Kan ikke installere $1 som et mod"
 msgid "Unable to install a modpack as a $1"
 msgstr "Kan ikke installere $1 som en samling af mods"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Indlæser..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Prøv at slå den offentlige serverliste fra og til, og tjek din internet "
+"forbindelse."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Gennemse online indhold"
@@ -707,7 +791,14 @@ msgid "Credits"
 msgstr "Skabt af"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Vælg mappe"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -727,14 +818,10 @@ msgid "Bind Address"
 msgstr "Bind adresse"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Konfigurér"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Kreativ tilstand"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Aktivér skade"
 
@@ -751,8 +838,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Navn/kodeord"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -763,6 +850,11 @@ msgid "No world created or selected!"
 msgstr "Ingen verden oprettet eller valgt!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Nyt kodeord"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Start spil"
 
@@ -771,6 +863,11 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Vælg verden:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Vælg verden:"
 
@@ -787,23 +884,23 @@ msgstr "Vær vært for spil"
 msgid "Address / Port"
 msgstr "Adresse/port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Forbind"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Kreativ tilstand"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Skade aktiveret"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Slet favorit"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favorit"
 
@@ -812,16 +909,16 @@ msgstr "Favorit"
 msgid "Join Game"
 msgstr "Vær vært for spil"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Navn/adgangskode"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Spiller mod spiller aktiveret"
 
@@ -851,10 +948,6 @@ msgid "Antialiasing:"
 msgstr "Udjævning:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Er du sikker på, at du vil nulstille din enkelt spiller-verden?"
-
-#: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Autosave Screen Size"
 msgstr "Autogem skærmstørrelse"
@@ -863,11 +956,6 @@ msgstr "Autogem skærmstørrelse"
 msgid "Bilinear Filter"
 msgstr "Bi-lineær filtréring"
 
-#: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Bump Mapping"
-msgstr "Bump Mapping"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Skift tastatur-bindinger"
@@ -882,11 +970,6 @@ msgstr "Smukke blade"
 
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
-msgid "Generate Normal Maps"
-msgstr "Opret normalkort"
-
-#: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -895,10 +978,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Aniso-filter"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Nej"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Intet filter"
 
@@ -926,19 +1005,11 @@ msgstr "Uuigennemsigtige blade"
 msgid "Opaque Water"
 msgstr "Uigennemsigtigt vand"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parallax-okklusion"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Partikler"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Nulstil spillerverden"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Skærm:"
 
@@ -951,6 +1022,11 @@ msgid "Shaders"
 msgstr "Dybdeskabere"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Svævelandsniveau"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -996,22 +1072,6 @@ msgstr "Bølgende blade"
 msgid "Waving Plants"
 msgstr "Bølgende planter"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ja"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Konfigurér mods"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Hovedmenu"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Enlig spiller"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Forbindelses fejl (tidsfristen udløb)."
@@ -1180,18 +1240,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Styring:\n"
 "- %s: bevæg dig fremad\n"
@@ -1312,16 +1369,6 @@ msgid "Fog enabled"
 msgstr "aktiveret"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Deaktivér alle"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "aktiveret"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spilinfo:"
 
@@ -1343,16 +1390,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Deaktivér alle"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Skade aktiveret"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Medier..."
 
@@ -1365,35 +1402,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Minimap hidden"
-msgstr "Minikorttast"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1439,10 +1447,6 @@ msgid "Resolving address..."
 msgstr "Slår adresse op ..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Genopstå"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Lukker ned..."
 
@@ -1497,10 +1501,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Du døde"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1518,15 +1518,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Snakketast"
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1807,6 +1798,25 @@ msgstr "X knap 2"
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap hidden"
+msgstr "Minikorttast"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Kodeordene er ikke ens!"
@@ -1848,26 +1858,6 @@ msgid "Backward"
 msgstr "Baglæns"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
 msgid "Change camera"
 msgstr "Skift bindinger"
@@ -1966,31 +1956,11 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Special Inv."
-msgstr "Snigetast"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Aktiver filmisk"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Aktiver filmisk"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle HUD"
 msgstr "Omstil flyvning"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Toggle Killaura"
-msgstr "Omstil flyvning"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle chat log"
 msgstr "Omstil hurtig"
 
@@ -2109,14 +2079,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = parallax-okklusion med kurveinformation (hurtigere).\n"
-"1 = relief-oversættelse (langsommere, mere præcis)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2239,6 +2201,10 @@ msgid "ABM interval"
 msgstr "Interval for kortlagring"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Absolut begrænsning af fremkomstkøer"
@@ -2489,11 +2455,6 @@ msgid "Builtin"
 msgstr "Indbygget"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Bumpmapping"
-msgstr "Bumpmapping"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2571,16 +2532,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "Skriftstørrelse"
@@ -2745,6 +2696,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "Fortsæt"
@@ -2806,7 +2761,10 @@ msgid "Crosshair alpha"
 msgstr "Crosshair alpha"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Crosshair alpha (uigennemsigtighed, mellem 0 og 255)."
 
 #: src/settings_translation_file.cpp
@@ -2814,8 +2772,10 @@ msgid "Crosshair color"
 msgstr "Crosshair-farve"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Crosshair-farve (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2921,14 +2881,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Definerer sampling-trin for tekstur.\n"
-"En højere værdi resulterer i en mere rullende normale kort."
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Defines the base ground level."
 msgstr "Definerer træområder og trætæthed."
@@ -3006,6 +2958,11 @@ msgid "Desynchronize block animation"
 msgstr "Afsynkroniser blokanimation"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Højretast"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Gravepartikler"
 
@@ -3069,7 +3026,8 @@ msgid "Enable console window"
 msgstr "Aktivér konsolvindue"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Aktivér kreativ tilstand for nyoprettede kort."
 
 #: src/settings_translation_file.cpp
@@ -3174,18 +3132,6 @@ msgid "Enables animation of inventory items."
 msgstr "Aktiverer animation af lagerelementer."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Aktiverer bumpmapping for teksturer. Normalmaps skal være angivet af "
-"teksturpakken\n"
-"eller skal være automatisk oprettet.\n"
-"Kræver at dybdeskabere er aktiveret."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Aktiverer mellemlagring af facedir-roterede mesher."
 
@@ -3195,22 +3141,6 @@ msgstr "Aktiverer minikort."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Aktiverer løbende normalmap-oprettelse (Emboss-effekt).\n"
-"Kræver bumpmapping for at være aktiveret."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Aktiverer parallax-okklusionoversættelse.\n"
-"Kræver at dybdeskabere er aktiveret."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3227,14 +3157,6 @@ msgstr "Entitetmetoder"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Eksperimentelt tilvalg, kan medføre synlige mellemrum mellem blokke\n"
-"når angivet til et højere nummer end 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3244,8 +3166,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS i pausemenu"
+msgid "FPS when unfocused or paused"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3585,10 +3507,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "GUI-skaleringsfilter txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Opret normalkort"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Globale tilbagekald"
 
@@ -3654,8 +3572,8 @@ msgstr "Tast for HUD"
 #, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Håndtering for forældede lua api-kald:\n"
@@ -4175,6 +4093,10 @@ msgid "Joystick button repetition interval"
 msgstr "Joystick-knaps gentagelsesinterval"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Joystick frustum-sensitivitet"
 
@@ -4278,6 +4200,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tast for hop.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4425,6 +4358,17 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tast for hop.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -5213,11 +5157,6 @@ msgid "Main menu script"
 msgstr "Hovedmenuskript"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Hovedmenuskript"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5234,6 +5173,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Kortmappe"
 
@@ -5434,7 +5381,7 @@ msgid "Maximum FPS"
 msgstr "Maksimal FPS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5483,6 +5430,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5716,14 +5670,6 @@ msgid "Noises"
 msgstr "Lyde"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5749,10 +5695,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5778,35 +5720,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "Parallax-okklusion"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5874,6 +5787,16 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Flyvetast"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Joystick-knaps gentagelsesinterval"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -6032,10 +5955,6 @@ msgid "Right key"
 msgstr "Højretast"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "River channel depth"
 msgstr "Floddybde"
@@ -6334,6 +6253,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Nedlukningsbesked"
 
@@ -6467,10 +6396,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6568,6 +6493,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6627,8 +6556,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6654,15 +6583,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6801,6 +6735,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -7013,6 +6958,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -7137,6 +7088,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -7148,17 +7117,12 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "cURL-tidsudløb"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Back"
-#~ msgstr "Tilbage"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Henter og installerer $1, vent venligst..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Begrænsning af fremkomsten af forespørgsler på disk"
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = parallax-okklusion med kurveinformation (hurtigere).\n"
+#~ "1 = relief-oversættelse (langsommere, mere præcis)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7168,26 +7132,101 @@ msgstr "cURL-tidsudløb"
 #~ "Justér gammakodningen for lystabellerne. Et større tal betyder lysere.\n"
 #~ "Denne indstilling gælder kun for klienten og ignoreres af serveren."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Er du sikker på, at du vil nulstille din enkelt spiller-verden?"
+
+#~ msgid "Back"
+#~ msgstr "Tilbage"
+
+#, fuzzy
+#~ msgid "Bump Mapping"
+#~ msgstr "Bump Mapping"
+
+#, fuzzy
+#~ msgid "Bumpmapping"
+#~ msgstr "Bumpmapping"
+
+#~ msgid "Config mods"
+#~ msgstr "Konfigurér mods"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurér"
+
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr ""
 #~ "Styrer bredden af tunneller. En lavere værdi giver bredere tunneller."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Crosshair-farve (R,G,B)."
+
 #, fuzzy
 #~ msgid "Darkness sharpness"
 #~ msgstr "Søstejlhed"
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Definerer sampling-trin for tekstur.\n"
+#~ "En højere værdi resulterer i en mere rullende normale kort."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Henter og installerer $1, vent venligst..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Aktiver VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Aktiverer bumpmapping for teksturer. Normalmaps skal være angivet af "
+#~ "teksturpakken\n"
+#~ "eller skal være automatisk oprettet.\n"
+#~ "Kræver at dybdeskabere er aktiveret."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Aktiverer filmisk toneoversættelse"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Aktiverer løbende normalmap-oprettelse (Emboss-effekt).\n"
+#~ "Kræver bumpmapping for at være aktiveret."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Aktiverer parallax-okklusionoversættelse.\n"
+#~ "Kræver at dybdeskabere er aktiveret."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Eksperimentelt tilvalg, kan medføre synlige mellemrum mellem blokke\n"
+#~ "når angivet til et højere nummer end 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS i pausemenu"
+
 #~ msgid "Font shadow alpha (opaqueness, between 0 and 255)."
 #~ msgstr "Alfa for skrifttypeskygge (uigennemsigtighed, mellem 0 og 255)."
 
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#, fuzzy
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Opret normalkort"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Opret normalkort"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Understøttelse af IPv6."
 
@@ -7195,9 +7234,47 @@ msgstr "cURL-tidsudløb"
 #~ msgid "Lava depth"
 #~ msgstr "Dybde for stor hule"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Begrænsning af fremkomsten af forespørgsler på disk"
+
+#~ msgid "Main"
+#~ msgstr "Hovedmenu"
+
 #, fuzzy
-#~ msgid "Shadow limit"
-#~ msgstr "Skygge grænse"
+#~ msgid "Main menu style"
+#~ msgstr "Hovedmenuskript"
+
+#~ msgid "Name/Password"
+#~ msgstr "Navn/kodeord"
+
+#~ msgid "No"
+#~ msgstr "Nej"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax-okklusion"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Parallax-okklusion"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Nulstil spillerverden"
 
 #~ msgid "Select Package File:"
 #~ msgstr "Vælg pakke fil:"
+
+#, fuzzy
+#~ msgid "Shadow limit"
+#~ msgstr "Skygge grænse"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Enlig spiller"
+
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Aktiver filmisk"
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
diff --git a/po/de/minetest.po b/po/de/minetest.po
index 8414e18fa..484c4707f 100644
--- a/po/de/minetest.po
+++ b/po/de/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: German (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-15 22:41+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-13 08:50+0000\n"
 "Last-Translator: Wuzzy <almikes@aol.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/minetest/minetest/"
 "de/>\n"
@@ -12,7 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.1\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Wiederbeleben"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Sie sind gestorben"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -38,27 +46,17 @@ msgstr "Erneut verbinden"
 msgid "The server has requested a reconnect:"
 msgstr "Der Server hat um eine Wiederverbindung gebeten:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Lädt …"
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Protokollversion stimmt nicht überein. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "Server erfordert Protokollversion $1. "
+msgstr "Der Server erfordert Protokollversion $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr "Server unterstützt Protokollversionen zwischen $1 und $2. "
-
-#: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Versuchen Sie, die öffentliche Serverliste neu zu laden und prüfen Sie Ihre "
-"Internetverbindung."
+msgstr "Der Server unterstützt die Protokollversionen von $1 bis $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
@@ -68,7 +66,8 @@ msgstr "Wir unterstützen nur Protokollversion $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Wir unterstützen Protokollversionen zwischen $1 und $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Wir unterstützen Protokollversionen zwischen $1 und $2."
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Abhängigkeiten:"
 
@@ -103,8 +103,8 @@ msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "characters [a-z0-9_] are allowed."
 msgstr ""
-"Fehler beim Aktivieren der Mod „$1“, da sie unerlaubte Zeichen enthält. Nur "
-"die folgenden Zeichen sind erlaubt: [a-z0-9_]."
+"Die Mod „$1“ konnte nicht aktiviert werden, da sie unzulässige Zeichen "
+"enthält. Nur die folgenden Zeichen sind erlaubt: [a-z0-9_]."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
@@ -124,7 +124,7 @@ msgstr "Keine Spielbeschreibung verfügbar."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No hard dependencies"
-msgstr "Keine harten Abhängigkeiten"
+msgstr "Keine notwendigen Abhängigkeiten"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
@@ -145,21 +145,61 @@ msgstr "Speichern"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "World:"
-msgstr "Welt:"
+msgstr "Weltname:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
 msgstr "Aktiviert"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "„$1“ existiert bereits. Wollen Sie es überschreiben?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 und $2 Abhängigkeiten werden installiert."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 von $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 laden herunter,\n"
+"$2 warten"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 laden herunter…"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 benötigte Abhängigkeiten konnten nicht gefunden werden."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 wird installiert und $2 Abhängigkeiten werden übersprungen."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Alle Pakete"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Bereits installiert"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Zurück zum Hauptmenü"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Basis-Spiel:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 "ContentDB ist nicht verfügbar, wenn Minetest ohne cURL kompiliert wurde"
@@ -182,22 +222,45 @@ msgid "Install"
 msgstr "Installieren"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "$1 installieren"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Fehlende Abhängigkeiten installieren"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mods"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No packages could be retrieved"
-msgstr "Es konnten keine Pakete empfangen werden"
+msgstr "Es konnten keine Pakete abgerufen werden"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No results"
 msgstr "Keine Treffer"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Suchen"
+msgid "No updates"
+msgstr "Keine Updates"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Nicht gefunden"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Ãœberschreiben"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Bitte prüfen Sie, ob das Basis-Spiel korrekt ist."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "Eingereiht"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -212,8 +275,12 @@ msgid "Update"
 msgstr "Aktualisieren"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Ansehen"
+msgid "Update All [$1]"
+msgstr "Alle aktualisieren [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Mehr Informationen im Webbrowser anschauen"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -306,7 +373,7 @@ msgstr "Seen"
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
 msgstr ""
-"Niedrige Luftfeuchtigkeit und hohe Hitze erzeugen seichte oder "
+"Niedrige Luftfeuchtigkeit und große Wärme erzeugen seichte oder "
 "ausgetrocknete Flüsse"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
@@ -327,7 +394,7 @@ msgstr "Berge"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr "Schlammfließen"
+msgstr "Erosion"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
@@ -339,11 +406,11 @@ msgstr "Kein Spiel ausgewählt"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr "Reduziert Hitze mit der Höhe"
+msgstr "Reduziert die Wärme mit der Höhe"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr "Reduziert Luftfeuchte mit der Höhe"
+msgstr "Reduziert Luftfeuchtigkeit mit der Höhe"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Rivers"
@@ -351,12 +418,12 @@ msgstr "Flüsse"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr "Flüsse am Meeresspiegel"
+msgstr "Flüsse auf Meeresspiegelhöhe"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Seed"
-msgstr "Seed"
+msgstr "Startwert (Seed)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
@@ -367,13 +434,13 @@ msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
-"Gebäude, die auf dem Gelände auftauchen (keine Wirkung auf von v6 erzeugte "
-"Bäume u. Dschungelgras)"
+"Strukturen, die auf dem Gelände auftauchen (keine Wirkung auf von v6 "
+"erzeugte Bäume u. Dschungelgras)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
 msgstr ""
-"Gebäude, die auf dem Gelände auftauchen, üblicherweise Bäume und Pflanzen"
+"Strukturen, die auf dem Gelände auftauchen, üblicherweise Bäume und Pflanzen"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
@@ -417,7 +484,7 @@ msgstr "Es sind keine Spiele installiert."
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr "Sind Sie sich sicher, dass Sie „$1“ löschen wollen?"
+msgstr "Sind Sie sicher, dass „$1“ gelöscht werden soll?"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/tab_local.lua
@@ -427,7 +494,7 @@ msgstr "Entfernen"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "pkgmgr: failed to delete \"$1\""
-msgstr "pkgmgr: Fehler beim Löschen von „$1“"
+msgstr "pkgmgr: Fehler beim Entfernen von „$1“"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "pkgmgr: invalid path \"$1\""
@@ -435,7 +502,7 @@ msgstr "pkgmgr: Ungültiger Pfad „$1“"
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
-msgstr "Welt „$1“ löschen?"
+msgstr "Die Welt „$1“ löschen?"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
@@ -470,17 +537,12 @@ msgid "Browse"
 msgstr "Durchsuchen"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Client"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Deaktiviert"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Edit"
-msgstr "Ändern"
+msgstr "Bearbeiten"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Enabled"
@@ -519,6 +581,10 @@ msgid "Scale"
 msgstr "Skalierung"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Suchen"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Verzeichnis auswählen"
 
@@ -528,7 +594,7 @@ msgstr "Datei auswählen"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
-msgstr "Technische Namen zeigen"
+msgstr "Techn. Bezeichnung zeigen"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be at least $1."
@@ -599,12 +665,12 @@ msgstr "Fehler bei der Installation von $1 nach $2"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install Mod: Unable to find real mod name for: $1"
-msgstr "Mod installieren: Echter Modname für $1 konnte nicht gefunden werden"
+msgstr "Modinstallation: Richtiger Modname für $1 konnte nicht gefunden werden"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install Mod: Unable to find suitable folder name for modpack $1"
 msgstr ""
-"Mod installieren: Geeigneter Verzeichnisname für Modpack $1 konnte nicht "
+"Modinstallation: Geeigneter Verzeichnisname für Modpack $1 konnte nicht "
 "gefunden werden"
 
 #: builtin/mainmenu/pkgmgr.lua
@@ -622,23 +688,38 @@ msgstr "Keine gültige Mod oder Modpack gefunden"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
-msgstr "Fehler bei der Installation von $1 als Texturenpaket"
+msgstr "Fehler bei der Texturenpaket-Installation von $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a game as a $1"
-msgstr "Fehler bei der Installation eines Spiels als $1"
+msgstr "Fehler bei der Spiel-Installation von $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a mod as a $1"
-msgstr "Fehler bei der Installation einer Mod als $1"
+msgstr "Fehler bei der Mod-Installation von $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a modpack as a $1"
-msgstr "Fehler bei der Installation eines Modpacks als $1"
+msgstr "Fehler bei der Modpack-Installation von $1"
+
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Lädt …"
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Clientseitige Skripte sind deaktiviert"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Versuchen Sie die öffentliche Serverliste neu zu laden und prüfen Sie Ihre "
+"Internetverbindung."
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
-msgstr "Online-Inhalte durchsuchen"
+msgstr "Onlineinhalte durchsuchen"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
@@ -689,8 +770,16 @@ msgid "Credits"
 msgstr "Mitwirkende"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "Benutzerdatenverzeichnis öffnen"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Öffnet das Verzeichnis, welches die Welten, Spiele, Mods und\n"
+"Texturenpakete des Benutzers enthält, im Datei-Manager."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -702,21 +791,17 @@ msgstr "Ehemalige Hauptentwickler"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Announce Server"
-msgstr "Server ankündigen"
+msgstr "Server veröffentlichen"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Bind Address"
 msgstr "Bind-Adresse"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Konfigurieren"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Kreativmodus"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Schaden einschalten"
 
@@ -730,11 +815,11 @@ msgstr "Server hosten"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr "Spiele von ContentDB installieren"
+msgstr "Spiele aus ContentDB installieren"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Name/Passwort"
+msgid "Name"
+msgstr "Name"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -745,6 +830,10 @@ msgid "No world created or selected!"
 msgstr "Keine Welt angegeben oder ausgewählt!"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Passwort"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Spiel starten"
 
@@ -753,6 +842,10 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Mods auswählen"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Welt wählen:"
 
@@ -768,23 +861,23 @@ msgstr "Spiel starten"
 msgid "Address / Port"
 msgstr "Adresse / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Verbinden"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Kreativmodus"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Schaden aktiviert"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Favorit löschen"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favorit"
 
@@ -792,16 +885,16 @@ msgstr "Favorit"
 msgid "Join Game"
 msgstr "Spiel beitreten"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Name / Passwort"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Latenz"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Spielerkampf aktiviert"
 
@@ -830,24 +923,16 @@ msgid "Antialiasing:"
 msgstr "Kantenglättung:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Sind Sie sicher, dass Sie die Einzelspielerwelt löschen wollen?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
-msgstr "Monitorgröße automatisch merken"
+msgstr "Fenstergröße merken"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
 msgstr "Bilinearer Filter"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Bumpmapping"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
-msgstr "Tasten ändern"
+msgstr "Tastenbelegung"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Connected Glass"
@@ -858,10 +943,6 @@ msgid "Fancy Leaves"
 msgstr "Schöne Blätter"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Normalmaps generieren"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -870,20 +951,16 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap u. Aniso. Filter"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Nein"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Kein Filter"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Mipmap"
-msgstr "Keine Mipmap"
+msgstr "Kein Mipmapping"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
-msgstr "Blöcke leuchten"
+msgstr "Blöcke aufhellen"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Outlining"
@@ -901,19 +978,11 @@ msgstr "Undurchs. Blätter"
 msgid "Opaque Water"
 msgstr "Undurchs. Wasser"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parallax-Occlusion"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Partikel"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Einzelspielerwelt zurücksetzen"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Monitor:"
 
@@ -926,6 +995,10 @@ msgid "Shaders"
 msgstr "Shader"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Shader (experimentell)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Shader (nicht verfügbar)"
 
@@ -943,11 +1016,11 @@ msgstr "Texturierung:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr "Um Shader zu benutzen, muss der OpenGL-Treiber benutzt werden."
+msgstr "Um Shader zu aktivieren, muss der OpenGL-Treiber genutzt werden."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
-msgstr "Tone-Mapping"
+msgstr "Dynamikkompression"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold: (px)"
@@ -969,22 +1042,6 @@ msgstr "Flüssigkeitswellen"
 msgid "Waving Plants"
 msgstr "Wehende Pflanzen"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ja"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Mods konfigurieren"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Hauptmenü"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Einzelspieler starten"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Verbindungsfehler, Zeitüberschreitung."
@@ -1019,7 +1076,7 @@ msgstr "Spiel konnte nicht gefunden oder geladen werden: \""
 
 #: src/client/clientlauncher.cpp
 msgid "Invalid gamespec."
-msgstr "Ungültige Spielspezif."
+msgstr "Ungültige Spielspezifikationen"
 
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
@@ -1031,7 +1088,7 @@ msgstr "Keine Welt ausgewählt und keine Adresse angegeben. Nichts zu tun."
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
-msgstr "Spielername zu lang."
+msgstr "Der Spielername ist zu lang."
 
 #: src/client/clientlauncher.cpp
 msgid "Please choose a name!"
@@ -1039,7 +1096,7 @@ msgstr "Bitte wählen Sie einen Namen!"
 
 #: src/client/clientlauncher.cpp
 msgid "Provided password file failed to open: "
-msgstr "Fehler beim öffnen der ausgewählten Passwort-Datei: "
+msgstr "Fehler beim Öffnen der angegebenen Passwortdatei: "
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
@@ -1063,7 +1120,7 @@ msgid ""
 "Check debug.txt for details."
 msgstr ""
 "\n"
-"Siehe debug.txt für Details."
+"Für mehr Details siehe debug.txt."
 
 #: src/client/game.cpp
 msgid "- Address: "
@@ -1139,25 +1196,22 @@ msgid "Continue"
 msgstr "Weiter"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Steuerung:\n"
 "- %s: Vorwärts\n"
@@ -1165,12 +1219,12 @@ msgstr ""
 "- %s: Nach links\n"
 "- %s: Nach rechts\n"
 "- %s: Springen/klettern\n"
+"- %s: Graben/Schlagen\n"
+"- %s: Bauen/Benutzen\n"
 "- %s: Kriechen/runter\n"
 "- %s: Gegenstand wegwerfen\n"
 "- %s: Inventar\n"
 "- Maus: Drehen/Umschauen\n"
-"- Maus links: Graben/Schlagen\n"
-"- Maus rechts: Bauen/Benutzen\n"
 "- Mausrad: Gegenstand wählen\n"
 "- %s: Chat\n"
 
@@ -1192,7 +1246,7 @@ msgstr "Debug-Infos angezeigt"
 
 #: src/client/game.cpp
 msgid "Debug info, profiler graph, and wireframe hidden"
-msgstr "Debug-Infos, Profiler-Graph und Drahtmodell verborgen"
+msgstr "Debug-Infos, Profiler und Drahtgitter deaktiviert"
 
 #: src/client/game.cpp
 msgid ""
@@ -1232,7 +1286,7 @@ msgstr "Unbegrenzte Sichtweite aktiviert"
 
 #: src/client/game.cpp
 msgid "Exit to Menu"
-msgstr "Hauptmenü"
+msgstr "Zum Hauptmenü"
 
 #: src/client/game.cpp
 msgid "Exit to OS"
@@ -1271,16 +1325,6 @@ msgid "Fog enabled"
 msgstr "Nebel aktiviert"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Nebel deaktiviert"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Nebel aktiviert"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spielinfo:"
 
@@ -1294,23 +1338,13 @@ msgstr "Gehosteter Server"
 
 #: src/client/game.cpp
 msgid "Item definitions..."
-msgstr "Gegenstands-Definitionen …"
+msgstr "Gegenstandsdefinitionen …"
 
 #: src/client/game.cpp
 msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Nebel deaktiviert"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Schaden aktiviert"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Medien …"
 
@@ -1323,34 +1357,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Ãœbersichtskarte momentan von Spiel oder Mod deaktiviert"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Ãœbersichtskarte verborgen"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Übersichtskarte im Radarmodus, Zoom ×1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Übersichtskarte im Radarmodus, Zoom ×2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Übersichtskarte im Radarmodus, Zoom ×4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Übersichtskarte im Bodenmodus, Zoom ×1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Übersichtskarte im Bodenmodus, Zoom ×2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Übersichtskarte im Bodenmodus, Zoom ×4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Geistmodus deaktiviert"
 
@@ -1392,11 +1398,7 @@ msgstr "Entfernter Server"
 
 #: src/client/game.cpp
 msgid "Resolving address..."
-msgstr "Löse Adresse auf …"
-
-#: src/client/game.cpp
-msgid "Respawn"
-msgstr "Wiederbeleben"
+msgstr "Adressauflösung …"
 
 #: src/client/game.cpp
 msgid "Shutting down..."
@@ -1412,7 +1414,7 @@ msgstr "Tonlautstärke"
 
 #: src/client/game.cpp
 msgid "Sound muted"
-msgstr "Ton verstummt"
+msgstr "Ton stummgeschaltet"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
@@ -1424,7 +1426,7 @@ msgstr "Tonsystem ist in diesem Build nicht unterstützt"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
-msgstr "Ton nicht mehr verstummt"
+msgstr "Ton nicht mehr stumm"
 
 #: src/client/game.cpp
 #, c-format
@@ -1448,11 +1450,7 @@ msgstr "Lautstärke auf %d%% gesetzt"
 
 #: src/client/game.cpp
 msgid "Wireframe shown"
-msgstr "Drahtmodell angezeigt"
-
-#: src/client/game.cpp
-msgid "You died"
-msgstr "Sie sind gestorben"
+msgstr "Drahtmodell aktiv"
 
 #: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
@@ -1471,16 +1469,6 @@ msgid "Chat shown"
 msgstr "Chat angezeigt"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Chat verborgen"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Chat angezeigt"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD verborgen"
 
@@ -1760,6 +1748,24 @@ msgstr "X-Knopf 2"
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Ãœbersichtskarte verborgen"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Übersichtskarte im Radarmodus, Zoom ×%d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Übersichtskarte im Bodenmodus, Zoom ×%d"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Ãœbersichtskarte im Texturmodus"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Passwörter stimmen nicht überein!"
@@ -1806,26 +1812,6 @@ msgid "Backward"
 msgstr "Rückwärts"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Kamerawechsel"
 
@@ -1920,30 +1906,10 @@ msgid "Special"
 msgstr "Spezial"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Spezial"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Filmmodus umschalten"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Filmmodus umschalten"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "HUD an/aus"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Flugmodus"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Chat an/aus"
 
@@ -2079,14 +2045,6 @@ msgstr ""
 "gleich für die Reinform."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = Parallax-Mapping mit Stufeninformation (schneller).\n"
-"1 = Relief-Mapping (langsamer, genauer)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "2-D-Rauschen, welches die Form/Größe von gezahnten Bergen steuert."
 
@@ -2126,7 +2084,7 @@ msgstr "3-Dimensionaler-Modus"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode parallax strength"
-msgstr "3D-Modus-Parallaxstärke"
+msgstr "3-D-Modus-Parallaxstärke"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
@@ -2148,7 +2106,7 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
-"3D-Rauschen, das die Form von Schwebeländern definiert.\n"
+"3-D-Rauschen, das die Form von Schwebeländern definiert.\n"
 "Falls vom Standardwert verschieden, müsste der Rauschwert „Skalierung“\n"
 "(standardmäßig 0.7) evtl. angepasst werden, da die Schwebeland-\n"
 "zuspitzung am Besten funktioniert, wenn dieses Rauschen\n"
@@ -2226,6 +2184,10 @@ msgid "ABM interval"
 msgstr "ABM-Intervall"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr "ABM-Zeitbudget"
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Absolute Grenze der zu erzeugenden Kartenblöcke in Warteschlange"
 
@@ -2488,10 +2450,6 @@ msgid "Builtin"
 msgstr "Builtin"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bumpmapping"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2570,22 +2528,6 @@ msgstr ""
 "Wobei 0.0 die minimale Lichtstufe und 1.0 die höchste Lichtstufe ist."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Ändert die Hauptmenü-UI:\n"
-"-   Full:  Mehrere Einzelspielerwelten, Spiel- und Texturenpaketauswahl, "
-"usw.\n"
-"-   Simple: Eine Einzelspielerwelt, keine Spiel- oder Texturenpaketauswahl. "
-"Könnte\n"
-"für kleinere Bildschirme nötig sein."
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr "Chat-Schriftgröße"
 
@@ -2753,6 +2695,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "ContentDB: Schwarze Liste"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "ContentDB Max. gleichzeitige Downloads"
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "ContentDB-URL"
 
@@ -2819,16 +2765,24 @@ msgid "Crosshair alpha"
 msgstr "Fadenkreuzundurchsichtigkeit"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "Fadenkreuzundurchsichtigkeit (Wert zwischen 0 und 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Fadenkreuzundurchsichtigkeit (Wert zwischen 0 und 255).\n"
+"Gilt auch für das Objektfadenkreuz"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
 msgstr "Fadenkreuzfarbe"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Fadenkreuzfarbe (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Fadenkreuzfarbe (R,G,B).\n"
+"Gilt auch für das Objektfadenkreuz"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2936,14 +2890,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Definiert Ort und Gelände der optionalen Hügel und Seen."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Definiert die Sampling-Schrittgröße der Textur.\n"
-"Ein höherer Wert resultiert in weichere Normal-Maps."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Definiert die Basisgeländehöhe."
 
@@ -3024,6 +2970,10 @@ msgid "Desynchronize block animation"
 msgstr "Blockanimationen desynchronisieren"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "Grabetaste"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Grabepartikel"
 
@@ -3088,7 +3038,8 @@ msgid "Enable console window"
 msgstr "Konsolenfenster aktivieren"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Kreativmodus für neu erstellte Karten aktivieren."
 
 #: src/settings_translation_file.cpp
@@ -3196,7 +3147,7 @@ msgid ""
 "appearance of high dynamic range images. Mid-range contrast is slightly\n"
 "enhanced, highlights and shadows are gradually compressed."
 msgstr ""
-"Aktiviert filmisches Tone-Mapping wie in Hables „Uncharted 2“.\n"
+"Aktiviert filmische Dynamikkompression wie in Hables „Uncharted 2“.\n"
 "Simuliert die Tonkurve von fotografischem Film und wie dies das Aussehen\n"
 "von „High Dynamic Range“-Bildern annähert. Mittlerer Kontrast wird leicht\n"
 "verstärkt, aufleuchtende Bereiche und Schatten werden graduell komprimiert."
@@ -3206,19 +3157,6 @@ msgid "Enables animation of inventory items."
 msgstr "Aktiviert die Animation von Inventargegenständen."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Aktiviert das Bump-Mapping für Texturen. Normal-Maps müssen im "
-"Texturenpaket\n"
-"vorhanden sein oder müssen automatisch erzeugt werden.\n"
-"Shader müssen aktiviert werden, bevor diese Einstellung aktiviert werden "
-"kann."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 "Aktiviert das Zwischenspeichern von 3-D-Modellen, die mittels facedir "
@@ -3230,22 +3168,6 @@ msgstr "Aktiviert die Ãœbersichtskarte."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Aktiviert die spontane Normalmap-Erzeugung (Prägungseffekt).\n"
-"Für diese Einstellung muss außerdem Bump-Mapping aktiviert sein."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Aktiviert Parralax-Occlusion-Mapping.\n"
-"Hierfür müssen Shader aktiviert sein."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3266,14 +3188,6 @@ msgstr "Entity-Methoden"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Experimentelle Einstellung, könnte sichtbare Leerräume zwischen\n"
-"Blöcken verursachen, wenn auf einen Wert größer 0 gesetzt."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3290,8 +3204,10 @@ msgstr ""
 "geeignet."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "Bildwiederholrate im Pausenmenü"
+msgid "FPS when unfocused or paused"
+msgstr ""
+"Maximale Bildwiederholrate, während das Spiel pausiert oder nicht fokussiert "
+"ist"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3372,7 +3288,7 @@ msgstr "Fülltiefenrauschen"
 
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"
-msgstr "Filmisches Tone-Mapping"
+msgstr "Filmische Dynamikkompression"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3630,10 +3546,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "GUI-Skalierungsfilter txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Normalmaps generieren"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Globale Rückruffunktionen"
 
@@ -3695,17 +3607,17 @@ msgstr "Taste zum Umschalten des HUD"
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Handhabung für veraltete Lua-API-Aufrufe:\n"
-"- legacy: Versuchen, altes Verhalten zu imitieren (Standard für Release).\n"
-"- log: Imitieren, und den Backtrace des veralteten Funktionsaufrufs "
+"- none: Veraltete Aufrufe nicht protokollieren.\n"
+"- log: Imitieren und den Backtrace des veralteten Funktionsaufrufs "
 "protokollieren\n"
-"  (Standard für Debug).\n"
+"  (Standard).\n"
 "- error: Bei Verwendung eines veralteten Funktionsaufrufs abbrechen\n"
-"  (empfohlen für Mod- Entwickler)."
+"  (empfohlen für Mod-Entwickler)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4247,6 +4159,10 @@ msgid "Joystick button repetition interval"
 msgstr "Joystick-Button-Wiederholungsrate"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr "Joystick-Totbereich"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Joystick-Pyramidenstumpf-Empfindlichkeit"
 
@@ -4350,6 +4266,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Taste zum Graben.\n"
+"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4492,6 +4418,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Taste zum Bauen.\n"
+"Siehe http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -5244,10 +5180,6 @@ msgid "Main menu script"
 msgstr "Hauptmenü-Skript"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Hauptmenü-Stil"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5265,6 +5197,14 @@ msgid "Makes all liquids opaque"
 msgstr "Macht alle Flüssigkeiten undurchsichtig"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr "Kartenkompressionsstufe für Festspeicher"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr "Kartenkompressionsstufe für Netzwerkverkehr"
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Kartenverzeichnis"
 
@@ -5449,8 +5389,10 @@ msgid "Maximum FPS"
 msgstr "Maximale Bildwiederholrate"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "Maximale Bildwiederholrate, während das Spiel pausiert ist."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr ""
+"Maximale Bildwiederholrate, während das Fenster nicht fokussiert oder das "
+"Spiel pausiert ist."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -5509,6 +5451,16 @@ msgstr ""
 "Diese Grenze wird für jeden Spieler einzeln erzwungen."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+"Maximale Anzahl an gleichzeitigen Downloads. Weitere werden in einer "
+"Warteschlange eingereiht.\n"
+"Dies sollte niedriger als das curl_parallel_limit sein."
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "Maximale Anzahl der zwangsgeladenen Kartenblöcke."
 
@@ -5774,14 +5726,6 @@ msgid "Noises"
 msgstr "Rauschen"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Normalmaps-Sampling"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Normalmap-Stärke"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Anzahl der Erzeugerthreads"
 
@@ -5822,10 +5766,6 @@ msgstr ""
 "Transaktions-Overhead und Speicherverbrauch (Faustregel: 4096=100MB)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Anzahl der Parallax-Occlusion-Iterationen."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Online-Inhaltespeicher"
 
@@ -5857,36 +5797,6 @@ msgstr ""
 "Wird nicht pausieren, wenn ein Formspec geöffnet ist."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-"Startwert des Parallax-Occlusion-Effektes, üblicherweise Skalierung geteilt "
-"durch 2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Gesamtskalierung des Parallax-Occlusion-Effektes."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Parallax-Occlusion"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Parallax-Occlusion-Startwert"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Parallax-Occlusion-Iterationen"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Parallax-Occlusion-Modus"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Parallax-Occlusion-Skalierung"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5978,6 +5888,14 @@ msgid "Pitch move mode"
 msgstr "Nick-Bewegungsmodus"
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr "Bautaste"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr "Bauen-Wiederholungsrate"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -6165,10 +6083,6 @@ msgid "Right key"
 msgstr "Rechtstaste"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Rechtsklick-Wiederholungsrate"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Flusskanaltiefe"
 
@@ -6210,7 +6124,7 @@ msgstr "Runde Ãœbersichtskarte"
 
 #: src/settings_translation_file.cpp
 msgid "Safe digging and placing"
-msgstr "Sicheres graben und bauen"
+msgstr "Sicheres Graben und Bauen"
 
 #: src/settings_translation_file.cpp
 msgid "Sandy beaches occur when np_beach exceeds this value."
@@ -6468,6 +6382,19 @@ msgid "Show entity selection boxes"
 msgstr "Entity-Auswahlboxen zeigen"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Entityauswahlboxen zeigen\n"
+"Nach Änderung ist ein Neustart erforderlich."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Schrift standardmäßig fett"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Herunterfahrnachricht"
 
@@ -6623,11 +6550,7 @@ msgstr "Stufenbergsausbreitungsrauschen"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of 3D mode parallax."
-msgstr "Stärke von 3D-Modus-Parallax."
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Stärke der generierten Normalmaps."
+msgstr "Stärke von 3-D-Modus-Parallax."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6753,6 +6676,10 @@ msgid "The URL for the content repository"
 msgstr "Die URL für den Inhaltespeicher"
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr "Der Totbereich des Joysticks"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6831,17 +6758,17 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "Das Renderer-Backend für Irrlicht.\n"
 "Ein Neustart ist erforderlich, wenn dies geändert wird.\n"
 "Anmerkung: Auf Android belassen Sie dies bei OGLES1, wenn Sie sich unsicher "
 "sind.\n"
-"Die App könnte sonst unfähig sein, zu starten.\n"
-"Auf anderen Plattformen wird OpelGL empfohlen, dies ist momentan der "
-"einzige\n"
-"Treiber mit Shader-Unterstützung."
+"Die App könnte sonst nicht mehr starten.\n"
+"Auf anderen Plattformen wird OpenGL empfohlen.\n"
+"Shader werden unter OpenGL (nur Desktop) und OGLES2 (experimentell) "
+"unterstützt."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6878,6 +6805,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+"Das erlaubte Zeitbudget für ABM-Ausführung jeden Schritt\n"
+"(als Bruchteil des ABM-Intervalls)"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6886,13 +6821,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
-"Die Zeit in Sekunden, in dem Rechtsklicks wiederholt werden, wenn die "
-"rechte\n"
-"Maustaste gedrückt gehalten wird."
+"Die Zeit in Sekunden, in dem die Blockplatzierung wiederholt wird, wenn\n"
+"die Bautaste gedrückt gehalten wird."
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
@@ -7060,6 +6993,26 @@ msgstr ""
 "Eine gammakorrigierte Herunterskalierung wird nicht unterstützt."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+"Multi-Sample-Antialiasing (MSAA) benutzen, um Blockecken zu glätten.\n"
+"Dieser Algorithmus glättet das 3-D-Sichtfeld während das Bild scharf "
+"bleibt,\n"
+"beeinträchtigt jedoch nicht die Textureninnenflächen\n"
+"(was sich insbesondere bei transparenten Texturen bemerkbar macht).\n"
+"Sichtbare Lücken erscheinen zwischen Blöcken, wenn Shader ausgeschaltet "
+"sind.\n"
+"Wenn der Wert auf 0 steht, ist MSAA deaktiviert.\n"
+"Ein Neustart ist erforderlich, nachdem diese Option geändert worden ist."
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Trilineare Filterung bei der Skalierung von Texturen benutzen."
 
@@ -7303,6 +7256,12 @@ msgstr ""
 "benutzt."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 "Ob Blocktexturanimationen pro Kartenblock desynchronisiert sein sollten."
@@ -7461,6 +7420,36 @@ msgid "Y-level of seabed."
 msgstr "Y-Höhe vom Meeresgrund."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"ZLib-Kompressionsniveau für Kartenblöcke im Festspeicher.\n"
+"-1 - Zlib-Standard-Kompressionsniveau\n"
+"0 - keine Kompression, am schnellsten\n"
+"9 - beste Kompression, am langsamsten\n"
+"(Niveaus 1-3 verwenden Zlibs „schnelles“ Verfahren, 4-9 das normale "
+"Verfahren)"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"ZLib-Kompressionsniveau für Kartenblöcke, die zu Clients gesendet werden.\n"
+"-1 - Zlib-Standard-Kompressionsniveau\n"
+"0 - keine Kompression, am schnellsten\n"
+"9 - beste Kompression, am langsamsten\n"
+"(Niveaus 1-3 verwenden Zlibs „schnelles“ Verfahren, 4-9 das normale "
+"Verfahren)"
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL-Dateidownload-Zeitüberschreitung"
 
@@ -7472,23 +7461,12 @@ msgstr "cURL-Parallel-Begrenzung"
 msgid "cURL timeout"
 msgstr "cURL-Zeitüberschreitung"
 
-#~ msgid "Ok"
-#~ msgstr "OK"
-
-#~ msgid "Back"
-#~ msgstr "Rücktaste"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "$1 wird heruntergeladen und installiert, bitte warten …"
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Erzeugungswarteschlangengrenze auf Festspeicher"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Parallax-Occlusion-Stärke"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Pfad, in dem Bildschirmfotos abgespeichert werden."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = Parallax-Mapping mit Stufeninformation (schneller).\n"
+#~ "1 = Relief-Mapping (langsamer, genauer)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7503,10 +7481,43 @@ msgstr "cURL-Zeitüberschreitung"
 #~ "Verändert, wie Schwebeländer des Bergtyps sich über und unter dem "
 #~ "Mittelpunkt zuspitzen."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Sind Sie sicher, dass Sie die Einzelspielerwelt löschen wollen?"
+
+#~ msgid "Back"
+#~ msgstr "Rücktaste"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Bumpmapping"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bumpmapping"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Mitte der Lichtkurven-Mittenverstärkung."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Ändert die Hauptmenü-UI:\n"
+#~ "-   Full:  Mehrere Einzelspielerwelten, Spiel- und Texturenpaketauswahl, "
+#~ "usw.\n"
+#~ "-   Simple: Eine Einzelspielerwelt, keine Spiel- oder "
+#~ "Texturenpaketauswahl. Könnte\n"
+#~ "für kleinere Bildschirme nötig sein."
+
+#~ msgid "Config mods"
+#~ msgstr "Mods konfigurieren"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurieren"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7518,6 +7529,9 @@ msgstr "cURL-Zeitüberschreitung"
 #~ "Legt die Breite von Tunneln fest; ein kleinerer Wert erzeugt breitere "
 #~ "Tunnel."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Fadenkreuzfarbe (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Dunkelheits-Steilheit"
 
@@ -7531,6 +7545,13 @@ msgstr "cURL-Zeitüberschreitung"
 #~ "Rauschwert > 0 ist."
 
 #~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Definiert die Sampling-Schrittgröße der Textur.\n"
+#~ "Ein höherer Wert resultiert in weichere Normal-Maps."
+
+#~ msgid ""
 #~ "Deprecated, define and locate cave liquids using biome definitions "
 #~ "instead.\n"
 #~ "Y of upper limit of lava in large caves."
@@ -7539,12 +7560,51 @@ msgstr "cURL-Zeitüberschreitung"
 #~ "Höhlenflüssigkeiten in Biomdefinitionen.\n"
 #~ "Y der Obergrenze von Lava in großen Höhlen."
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "$1 wird heruntergeladen und installiert, bitte warten …"
+
 #~ msgid "Enable VBO"
 #~ msgstr "VBO aktivieren"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Aktiviert das Bump-Mapping für Texturen. Normal-Maps müssen im "
+#~ "Texturenpaket\n"
+#~ "vorhanden sein oder müssen automatisch erzeugt werden.\n"
+#~ "Shader müssen aktiviert werden, bevor diese Einstellung aktiviert werden "
+#~ "kann."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Aktiviert filmisches Tone-Mapping"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Aktiviert die spontane Normalmap-Erzeugung (Prägungseffekt).\n"
+#~ "Für diese Einstellung muss außerdem Bump-Mapping aktiviert sein."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Aktiviert Parralax-Occlusion-Mapping.\n"
+#~ "Hierfür müssen Shader aktiviert sein."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Experimentelle Einstellung, könnte sichtbare Leerräume zwischen\n"
+#~ "Blöcken verursachen, wenn auf einen Wert größer 0 gesetzt."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "Bildwiederholrate im Pausenmenü"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Schwebeland-Basishöhenrauschen"
 
@@ -7558,6 +7618,12 @@ msgstr "cURL-Zeitüberschreitung"
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Normalmaps generieren"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Normalmaps generieren"
+
 #~ msgid "IPv6 support."
 #~ msgstr "IPv6-Unterstützung."
 
@@ -7567,18 +7633,107 @@ msgstr "cURL-Zeitüberschreitung"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Helligkeitsschärfe"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Erzeugungswarteschlangengrenze auf Festspeicher"
+
+#~ msgid "Main"
+#~ msgstr "Hauptmenü"
+
+#~ msgid "Main menu style"
+#~ msgstr "Hauptmenü-Stil"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Übersichtskarte im Radarmodus, Zoom ×2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Übersichtskarte im Radarmodus, Zoom ×4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Übersichtskarte im Bodenmodus, Zoom ×2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Übersichtskarte im Bodenmodus, Zoom ×4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Name/Passwort"
+
+#~ msgid "No"
+#~ msgstr "Nein"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Normalmaps-Sampling"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Normalmap-Stärke"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Anzahl der Parallax-Occlusion-Iterationen."
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr ""
+#~ "Startwert des Parallax-Occlusion-Effektes, üblicherweise Skalierung "
+#~ "geteilt durch 2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Gesamtskalierung des Parallax-Occlusion-Effektes."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax-Occlusion"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Parallax-Occlusion"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Parallax-Occlusion-Startwert"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Parallax-Occlusion-Iterationen"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Parallax-Occlusion-Modus"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Parallax-Occlusion-Skalierung"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Parallax-Occlusion-Stärke"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Pfad zu einer TrueType- oder Bitmap-Schrift."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Pfad, in dem Bildschirmfotos abgespeichert werden."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Herausragende Verliese"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Einzelspielerwelt zurücksetzen"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Paket-Datei auswählen:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Schattenbegrenzung"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Einzelspieler starten"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Stärke der generierten Normalmaps."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Stärke der Lichtkurven-Mittenverstärkung."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Diese Schrift wird von bestimmten Sprachen benutzt."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Filmmodus umschalten"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7590,9 +7745,21 @@ msgstr "cURL-Zeitüberschreitung"
 #~ "Variierung der Hügelhöhe und Seetiefe in den ruhig verlaufenden\n"
 #~ "Regionen der Schwebeländer."
 
+#~ msgid "View"
+#~ msgstr "Ansehen"
+
+#~ msgid "Waving Water"
+#~ msgstr "Wasserwellen"
+
 #~ msgid "Waving water"
 #~ msgstr "Wasserwellen"
 
+#~ msgid "Whether dungeons occasionally project from the terrain."
+#~ msgstr "Ob Verliese manchmal aus dem Gelände herausragen."
+
+#~ msgid "Y of upper limit of lava in large caves."
+#~ msgstr "Y-Wert der Obergrenze von Lava in großen Höhlen."
+
 #~ msgid "Y-level of floatland midpoint and lake surface."
 #~ msgstr ""
 #~ "Y-Höhe vom Mittelpunkt der Schwebeländer sowie\n"
@@ -7601,17 +7768,5 @@ msgstr "cURL-Zeitüberschreitung"
 #~ msgid "Y-level to which floatland shadows extend."
 #~ msgstr "Y-Höhe, bis zu der sich die Schatten der Schwebeländer ausbreiten."
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "Herausragende Verliese"
-
-#~ msgid "Whether dungeons occasionally project from the terrain."
-#~ msgstr "Ob Verliese manchmal aus dem Gelände herausragen."
-
-#~ msgid "Waving Water"
-#~ msgstr "Wasserwellen"
-
-#~ msgid "Y of upper limit of lava in large caves."
-#~ msgstr "Y-Wert der Obergrenze von Lava in großen Höhlen."
-
-#~ msgid "Select Package File:"
-#~ msgstr "Paket-Datei auswählen:"
+#~ msgid "Yes"
+#~ msgstr "Ja"
diff --git a/po/dv/minetest.po b/po/dv/minetest.po
index 49a27d271..4c4b53954 100644
--- a/po/dv/minetest.po
+++ b/po/dv/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dhivehi (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: 2019-11-10 15:04+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Dhivehi <https://hosted.weblate.org/projects/minetest/"
@@ -14,6 +14,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Þ‡Þ¦Þ�ÞªÞ‚Þ° Þ�Þ°Þ•Þ¦Þ‡ÞªÞ‚Þ°ÞˆÞ­"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Þ‰Þ¦ÞƒÞªÞˆÞ©"
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -40,10 +48,6 @@ msgstr "aa gulhumeh"
 msgid "The server has requested a reconnect:"
 msgstr "Þ�Þ¦Þ§ÞˆÞ¦Þƒ Þ‡Þ¨Þ‚Þ° ÞƒÞ¨Þ†Þ¦Þ‚Þ¬Þ†Þ°Þ“Þ¦Þ†Þ¦Þ�Þ° Þ‡Þ¬Þ‹Þ¬ÞŠÞ¨:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Þ�Þ¯Þ‘Þ°ÞˆÞ¦Þ‚Þ©..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Þ•Þ°ÞƒÞ®Þ“Þ®Þ†Þ¯Þ�Þ° ÞˆÞ§Þ�Þ¦Þ‚Þ° ÞŠÞªÞ�ÞªÞ‡Þ¬ÞƒÞªÞ‰Þ¬Þ‡Þ°. "
@@ -57,10 +61,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "$1 އާއި 2$ ދެމެދުގެ ޕްރޮޓޮކޯ�ް ވާ�ަންތައް �ާވަރ �ަިޕޯޓް ކުރޭ. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "Þ•Þ¦Þ„Þ°Þ�Þ¨Þ†Þ° Þ�Þ§ÞˆÞ¦Þƒ Þ�Þ¨Þ�Þ°Þ“Þª Þ‡Þ¦Þ�ÞªÞ‚Þ° Þ–Þ¦Þ‡Þ°Þ�Þ¦ÞˆÞ§.Þ‡Þ¦Þ‹Þ¨ Þ‡Þ¨Þ‚Þ°Þ“Þ¦Þ‚Þ¬Þ“Þ° Þ†Þ¦Þ‚Þ¬Þ†Þ°Þ�Þ¦Þ‚Þ° Þ—Þ¬Þ†Þ°Þ†ÞªÞƒÞ¦Þ‡Þ°ÞˆÞ§."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Þ‡Þ¦Þ…ÞªÞŽÞ¦Þ‚Þ‘ÞªÞ‰Þ¬Þ‚Þ° Þ€Þ¦Þ‰Þ¦Þ‡Þ¬Þ†Þ¦Þ‚Þ¨ Þ�Þ¦Þ•Þ¯Þ“Þ°Þ†ÞªÞƒÞ¦Þ‚Þ© Þ•Þ°ÞƒÞ®Þ“Þ®Þ†Þ¯Þ�Þ° ÞˆÞ§Þ�Þ¦Þ‚Þ° 1$."
 
@@ -68,7 +68,8 @@ msgstr "Þ‡Þ¦Þ…ÞªÞŽÞ¦Þ‚Þ‘ÞªÞ‰Þ¬Þ‚Þ° Þ€Þ¦Þ‰Þ¦Þ‡Þ¬Þ†Þ¦Þ‚Þ¨ Þ�Þ¦Þ•Þ¯Þ“Þ°Þ†ÞªÞƒÞ¦Þ‚Þ©
 msgid "We support protocol versions between version $1 and $2."
 msgstr "އަޅުގަނޑުމެން 1$ އާއި 2$ އާއި ދެމެދުގެ ޕޮރޮޓޮކޯ�ް ވާ�ަންތައް �ަޕޯޓް ކުރަން."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +79,8 @@ msgstr "Þ‡Þ¦Þ…ÞªÞŽÞ¦Þ‚Þ‘ÞªÞ‰Þ¬Þ‚Þ° 1$ Þ‡Þ§Þ‡Þ¨ 2$ Þ‡Þ§Þ‡Þ¨ Þ‹Þ¬Þ‰Þ¬Þ‹ÞªÞŽÞ¬ Þ•Þ®
 msgid "Cancel"
 msgstr "Þ†Þ¬Þ‚Þ°Þ�Þ¦Þ�Þ°"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Þ„Þ¦ÞƒÞ¯Þ�Þ§ÞˆÞ§(Þ‘Þ¨Þ•Þ¬Þ‚Þ°Þ‘Þ¬Þ‚Þ°Þ�Þ©Þ’Þ°):"
 
@@ -154,14 +156,54 @@ msgid "enabled"
 msgstr "Þ–Þ¦Þ‡Þ°Þ�Þ§ÞŠÞ¦"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Þ�Þ¯Þ‘Þ°ÞˆÞ¦Þ‚Þ©..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Þ‡Þ¬Þ‚Þ„ÞªÞƒÞ¨ Þ‰Þ¬Þ‡Þ¨Þ‚Þ° Þ‰Þ¬Þ‚Þ«Þ‡Þ¦Þ�Þ°"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "ÞŽÞ­Þ‰Þ° Þ€Þ®Þ�Þ°Þ“Þ°Þ†ÞªÞƒÞ­"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -184,6 +226,16 @@ msgid "Install"
 msgstr "Þ‡Þ¦Þ…Þ§"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Þ‡Þ¦Þ…Þ§"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "�ާޒިމުނޫން ޑިޕެންޑެން�ީތައް:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "މޮޑްތައް"
@@ -197,9 +249,24 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Þ€Þ¯Þ‹Þ§"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -214,7 +281,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -469,10 +540,6 @@ msgid "Browse"
 msgstr "ÞŠÞªÞ‚Þ°Þ†Þ®Þ�Þ° Þ€Þ¯Þ‹Þ§"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Þ‡Þ®ÞŠÞ°Þ†Þ®Þ�Þ°ÞŠÞ¦"
 
@@ -517,6 +584,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Þ€Þ¯Þ‹Þ§"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 #, fuzzy
 msgid "Select directory"
 msgstr "މޮޑްގެ ފައި�ް އިހްތިޔާރުކުރޭ:"
@@ -639,6 +710,18 @@ msgstr "$1 $2Þ‡Þ¦Þ�Þ° Þ‚Þ­Þ…ÞªÞ‚Þª"
 msgid "Unable to install a modpack as a $1"
 msgstr "$1 $2Þ‡Þ¦Þ�Þ° Þ‚Þ­Þ…ÞªÞ‚Þª"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Þ�Þ¯Þ‘Þ°ÞˆÞ¦Þ‚Þ©..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "Þ•Þ¦Þ„Þ°Þ�Þ¨Þ†Þ° Þ�Þ§ÞˆÞ¦Þƒ Þ�Þ¨Þ�Þ°Þ“Þª Þ‡Þ¦Þ�ÞªÞ‚Þ° Þ–Þ¦Þ‡Þ°Þ�Þ¦ÞˆÞ§.Þ‡Þ¦Þ‹Þ¨ Þ‡Þ¨Þ‚Þ°Þ“Þ¦Þ‚Þ¬Þ“Þ° Þ†Þ¦Þ‚Þ¬Þ†Þ°Þ�Þ¦Þ‚Þ° Þ—Þ¬Þ†Þ°Þ†ÞªÞƒÞ¦Þ‡Þ°ÞˆÞ§."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -696,7 +779,14 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "މޮޑްގެ ފައި�ް އިހްތިޔާރުކުރޭ:"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -716,14 +806,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Þ„Þ¦Þ‹Þ¦Þ�ÞªÞŽÞ¬Þ‚Þ­"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Þ†Þ°ÞƒÞ¨Þ‡Þ­Þ“Þ¨ÞˆÞ° Þ‰Þ¯Þ‘Þ°"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "ÞŽÞ¬Þ‡Þ°Þ�ÞªÞ‚Þ° Þ–Þ¦Þ‡Þ°Þ�Þ§"
 
@@ -740,8 +826,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Þ•Þ§Þ�Þ°ÞˆÞ¯Þ‘Þ° / Þ‚Þ¦Þ‚Þ°"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -752,6 +838,11 @@ msgid "No world created or selected!"
 msgstr "އެއްވެ�ް ދުނިޔެއެއް އުފެދިފައެއް ނުވަތަ އިހްތިޔާރުވެފައެއް ނެޠް!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Þ•Þ§Þ�Þ°ÞˆÞ¯Þ‘Þ° / Þ‚Þ¦Þ‚Þ°"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "ÞŽÞ­Þ‰Þ° Þ†ÞªÞ…Þ­"
 
@@ -760,6 +851,11 @@ msgid "Port"
 msgstr "Þ•Þ¯Þ“Þ°"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "ދުނިޔެ އިހްތިޔާރު ކުރޭ:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "ދުނިޔެ އިހްތިޔާރު ކުރޭ:"
 
@@ -776,23 +872,23 @@ msgstr "ÞŽÞ­Þ‰Þ° Þ€Þ®Þ�Þ°Þ“Þ°Þ†ÞªÞƒÞ­"
 msgid "Address / Port"
 msgstr "Þ‡Þ¬Þ‘Þ°ÞƒÞ¬Þ�Þ° / Þ•Þ¯Þ“Þ°"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Þ†Þ¦Þ‚Þ¬Þ†Þ°Þ“Þ°Þ†ÞªÞƒÞ­"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Þ†Þ°ÞƒÞ¨Þ‡Þ­Þ“Þ¨ÞˆÞ° Þ‰Þ¯Þ‘Þ°"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Þ‡Þ¦Þ‚Þ¨Þ”Þ§ÞˆÞªÞ‚Þ° Þ–Þ¦Þ‡Þ°Þ�Þ§ÞŠÞ¦Þ‡Þ¨"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Þ‡Þ¬Þ‚Þ°Þ‰Þ¬ ÞŽÞ¦Þ”Þ§Þ‚ÞªÞˆÞ­"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Þ‡Þ¬Þ‚Þ°Þ‰Þ¬ ÞŽÞ¦Þ”Þ§ÞˆÞ­"
 
@@ -801,16 +897,16 @@ msgstr "Þ‡Þ¬Þ‚Þ°Þ‰Þ¬ ÞŽÞ¦Þ”Þ§ÞˆÞ­"
 msgid "Join Game"
 msgstr "ÞŽÞ­Þ‰Þ° Þ€Þ®Þ�Þ°Þ“Þ°Þ†ÞªÞƒÞ­"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Þ•Þ§Þ�Þ°ÞˆÞ¯Þ‘Þ° / Þ‚Þ¦Þ‚Þ°"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Þ•Þ©.ÞˆÞ©.Þ•Þ© Þ–Þ¦Þ‡Þ°Þ�Þ§"
 
@@ -839,10 +935,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -850,10 +942,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -867,10 +955,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -879,10 +963,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Þ‚Þ«Þ‚Þ°"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -910,19 +990,11 @@ msgstr ""
 msgid "Opaque Water"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Þ�Þ°Þ†Þ°ÞƒÞ©Þ‚Þ°:"
 
@@ -935,6 +1007,10 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -978,22 +1054,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1156,18 +1216,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1271,16 +1328,6 @@ msgid "Fog enabled"
 msgstr "Þ–Þ¦Þ‡Þ°Þ�Þ§ÞŠÞ¦"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Þ‡Þ®ÞŠÞ°Þ†Þ®Þ�Þ°ÞŠÞ¦"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Þ–Þ¦Þ‡Þ°Þ�Þ§ÞŠÞ¦"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1301,16 +1348,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Þ‡Þ®ÞŠÞ°Þ†Þ®Þ�Þ°ÞŠÞ¦"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Þ‡Þ¦Þ‚Þ¨Þ”Þ§ÞˆÞªÞ‚Þ° Þ–Þ¦Þ‡Þ°Þ�Þ§ÞŠÞ¦Þ‡Þ¨"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1323,34 +1360,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1396,10 +1405,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Þ‡Þ¦Þ�ÞªÞ‚Þ° Þ�Þ°Þ•Þ¦Þ‡ÞªÞ‚Þ°ÞˆÞ­"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1452,10 +1457,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Þ‰Þ¦ÞƒÞªÞˆÞ©"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1472,14 +1473,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1759,6 +1752,24 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ""
@@ -1798,26 +1809,6 @@ msgid "Backward"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
 msgid "Change camera"
 msgstr "ފިތްތައް ބަދަ�ުކުރޭ"
@@ -1911,26 +1902,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -2040,12 +2015,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2152,6 +2121,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2389,10 +2362,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2463,16 +2432,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2624,6 +2583,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "Þ�Þ®Þ“Þ¯Þƒ Þ†ÞªÞ�Þ¯Þ’Þ°Þ†Þ®Þ�Þ°Þ�Þ§"
@@ -2681,7 +2644,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2689,7 +2654,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2791,12 +2758,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2867,6 +2828,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2927,7 +2892,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3015,14 +2980,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3032,18 +2989,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3060,12 +3005,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3075,8 +3014,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "Þ•Þ¯Þ�Þ° Þ‰Þ¬Þ‚Þ«ÞŽÞ¦Þ‡Þ¨ Þ‡Þ¬ÞŠÞ°.Þ•Þ©.Þ‡Þ¬Þ�Þ°"
+msgid "FPS when unfocused or paused"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3377,10 +3316,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3434,8 +3369,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3902,6 +3837,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3982,6 +3921,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4081,6 +4027,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4637,11 +4590,6 @@ msgid "Main menu script"
 msgstr "Þ‰Þ¬Þ‡Þ¨Þ‚Þ° Þ‰Þ¬Þ‚Þ« Þ�Þ°Þ†Þ°ÞƒÞ¨Þ•Þ°Þ“Þ°"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Þ‰Þ¬Þ‡Þ¨Þ‚Þ° Þ‰Þ¬Þ‚Þ« Þ�Þ°Þ†Þ°ÞƒÞ¨Þ•Þ°Þ“Þ°"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4655,6 +4603,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4824,7 +4780,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4873,6 +4829,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5105,14 +5068,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5138,10 +5093,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5167,34 +5118,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5260,6 +5183,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5415,10 +5346,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5670,6 +5597,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5799,10 +5736,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5896,6 +5829,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5954,8 +5891,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5981,15 +5918,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6125,6 +6067,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6327,6 +6280,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6450,6 +6409,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6461,12 +6438,25 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "emme rangalhu"
+#~ msgid "Configure"
+#~ msgstr "Þ„Þ¦Þ‹Þ¦Þ�ÞªÞŽÞ¬Þ‚Þ­"
 
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr "$1 ޑައުން�ޯޑޮކޮ�ް އިން�ްޓޯ�ްކުރަނީ، މަޑުކުރައްވާ..."
 
+#~ msgid "FPS in pause menu"
+#~ msgstr "Þ•Þ¯Þ�Þ° Þ‰Þ¬Þ‚Þ«ÞŽÞ¦Þ‡Þ¨ Þ‡Þ¬ÞŠÞ°.Þ•Þ©.Þ‡Þ¬Þ�Þ°"
+
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "Þ‰Þ¬Þ‡Þ¨Þ‚Þ° Þ‰Þ¬Þ‚Þ« Þ�Þ°Þ†Þ°ÞƒÞ¨Þ•Þ°Þ“Þ°"
+
+#~ msgid "No"
+#~ msgstr "Þ‚Þ«Þ‚Þ°"
+
+#~ msgid "Ok"
+#~ msgstr "emme rangalhu"
+
 #, fuzzy
 #~ msgid "Select Package File:"
 #~ msgstr "މޮޑްގެ ފައި�ް އިހްތިޔާރުކުރޭ:"
diff --git a/po/el/minetest.po b/po/el/minetest.po
index 46b525e9c..b9b6182bf 100644
--- a/po/el/minetest.po
+++ b/po/el/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Greek (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-03-31 20:29+0000\n"
-"Last-Translator: THANOS SIOURDAKIS <siourdakisthanos@gmail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-13 08:50+0000\n"
+"Last-Translator: Michalis <michalisntovas@yahoo.gr>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/minetest/minetest/"
 "el/>\n"
 "Language: el\n"
@@ -12,7 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.0-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr ""
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Πέθανες"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -38,10 +46,6 @@ msgstr "Επανασ�νδεση"
 msgid "The server has requested a reconnect:"
 msgstr "Ο διακομιστής ζήτησε επανασ�νδεση:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Φό�τωση..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Ασυμφωνία έκδοσης π�ωτοκόλλου. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Ο διακομιστής υποστη�ίζει εκδόσεις π�ωτοκόλλων μεταξ� $1 και $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Δοκιμάστε να ενε�γοποιήσετε ξανά τη δημόσια λίστα διακομιστών και ελέγξτε τη "
-"σ�νδεσή σας στο διαδίκτυο."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Υποστη�ίζουμε μόνο το π�ωτόκολλο έκδοσης $1."
 
@@ -68,7 +66,8 @@ msgstr "Υποστη�ίζουμε μόνο το π�ωτόκολλο έκδοσ
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Υποστη�ίζουμε τις εκδόσεις π�ωτοκόλλων μεταξ� της έκδοσης $1 και $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -76,9 +75,10 @@ msgstr "ΥποστηÏ�ίζουμε τις εκδόσεις Ï€Ï�ωτοκόλλωÎ
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiKeyChangeMenu.cpp
 #: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
-msgstr "Ματαίωση"
+msgstr "Άκυ�ο"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Εξα�τήσεις:"
 
@@ -150,21 +150,59 @@ msgid "enabled"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Λήψη ..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "Φό�τωση..."
+msgstr "Λήψη ..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
@@ -180,6 +218,14 @@ msgid "Install"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr ""
@@ -193,8 +239,23 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
@@ -210,7 +271,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -461,10 +526,6 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr ""
 
@@ -509,6 +570,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr ""
 
@@ -623,6 +688,20 @@ msgstr ""
 msgid "Unable to install a modpack as a $1"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Φό�τωση..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Δοκιμάστε να ενε�γοποιήσετε ξανά τη δημόσια λίστα διακομιστών και ελέγξτε τη "
+"σ�νδεσή σας στο διαδίκτυο."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -676,7 +755,13 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -696,14 +781,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr ""
 
@@ -720,7 +801,7 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -732,6 +813,10 @@ msgid "No world created or selected!"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr ""
 
@@ -740,6 +825,10 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ""
 
@@ -755,23 +844,23 @@ msgstr ""
 msgid "Address / Port"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
@@ -779,16 +868,16 @@ msgstr ""
 msgid "Join Game"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -817,10 +906,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -828,10 +913,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -845,10 +926,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -857,10 +934,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -888,19 +961,11 @@ msgstr ""
 msgid "Opaque Water"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr ""
 
@@ -913,6 +978,10 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -956,22 +1025,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1042,7 +1095,7 @@ msgstr ""
 #. When in doubt, test your translation.
 #: src/client/fontengine.cpp
 msgid "needs_fallback_font"
-msgstr "yes"
+msgstr "no"
 
 #: src/client/game.cpp
 msgid ""
@@ -1131,18 +1184,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1230,14 +1280,6 @@ msgid "Fog enabled"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1258,14 +1300,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1278,34 +1312,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1350,10 +1356,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1406,10 +1408,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Πέθανες"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1426,14 +1424,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1713,6 +1703,24 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ""
@@ -1752,26 +1760,6 @@ msgid "Backward"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr ""
 
@@ -1864,26 +1852,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -1993,12 +1965,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2105,6 +2071,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2338,10 +2308,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2412,16 +2378,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2573,6 +2529,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2629,7 +2589,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2637,7 +2599,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2737,12 +2701,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2813,6 +2771,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2873,7 +2835,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2961,14 +2923,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -2978,18 +2932,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3006,12 +2948,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3021,7 +2957,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3323,10 +3259,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3380,8 +3312,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3848,6 +3780,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3928,6 +3864,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4027,6 +3970,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4583,10 +4533,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4600,6 +4546,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4763,7 +4717,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4812,6 +4766,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5041,14 +5002,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5074,10 +5027,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5103,34 +5052,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5196,6 +5117,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5351,10 +5280,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5606,6 +5531,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5735,10 +5670,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5832,6 +5763,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5890,8 +5825,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5917,15 +5852,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6061,6 +6001,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6263,6 +6214,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6385,6 +6342,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
diff --git a/po/eo/minetest.po b/po/eo/minetest.po
index 570da68ba..64db5dd71 100644
--- a/po/eo/minetest.po
+++ b/po/eo/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Esperanto (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-07-06 21:41+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-07-17 08:41+0000\n"
 "Last-Translator: Tirifto <tirifto@posteo.cz>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/minetest/"
 "minetest/eo/>\n"
@@ -14,6 +14,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Renaski�i"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Vi mortis"
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr "Bone"
@@ -38,10 +46,6 @@ msgstr "Rekonekti"
 msgid "The server has requested a reconnect:"
 msgstr "La servilo petis rekonekton:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Enlegante…"
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Protokola versia miskongruo. "
@@ -55,11 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "La servilo subtenas protokolajn versiojn inter $1 kaj $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Provu re�alti la publikan liston de serviloj kaj kontroli vian retkonekton."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Ni nur subtenas protokolan version $1."
 
@@ -67,7 +66,8 @@ msgstr "Ni nur subtenas protokolan version $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Ni subtenas protokolajn versiojn inter versioj $1 kaj $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -77,7 +77,8 @@ msgstr "Ni subtenas protokolajn versiojn inter versioj $1 kaj $2."
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependas de:"
 
@@ -151,21 +152,61 @@ msgid "enabled"
 msgstr "�altita"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "El�utante…"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Ĉiuj pakaĵoj"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Klavo jam estas uzata"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Reeniri al ĉefmenuo"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Gastigi ludon"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB ne estas disponebla per Minetest kodotradukita sen cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "Enlegante…"
+msgstr "El�utante…"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
@@ -181,6 +222,16 @@ msgid "Install"
 msgstr "Instali"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Instali"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Malnepraj dependaĵoj:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Modifaĵoj"
@@ -194,9 +245,26 @@ msgid "No results"
 msgstr "Neniuj rezultoj"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Serĉi"
+#, fuzzy
+msgid "No updates"
+msgstr "Äœisdatigi"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Not found"
+msgstr "Silentigi sonon"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -211,8 +279,12 @@ msgid "Update"
 msgstr "Äœisdatigi"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Vido"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -326,7 +398,7 @@ msgstr "Montoj"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Fluo de koto"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
@@ -469,11 +541,6 @@ msgid "Browse"
 msgstr "Foliumi"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Kliento"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Mal�altita"
 
@@ -518,6 +585,10 @@ msgid "Scale"
 msgstr "Skalo"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Serĉi"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Elekti dosierujon"
 
@@ -633,6 +704,20 @@ msgstr "Malsukcesis instali modifaĵon kiel $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Malsukcesis instali modifaĵaron kiel $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Enlegante…"
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Klient-flanka skriptado mal�altita"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Provu re�alti la publikan liston de serviloj kaj kontroli vian retkonekton."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Foliumi enretan enhavon"
@@ -686,7 +771,14 @@ msgid "Credits"
 msgstr "Kontribuantaro"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Elekti dosierujon"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -706,14 +798,10 @@ msgid "Bind Address"
 msgstr "Asocii adreso"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Agordi"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Krea re�imo"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Åœalti difektadon"
 
@@ -727,11 +815,11 @@ msgstr "Gastigi servilon"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "Instali ludojn de ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nomo/Pasvorto"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -742,6 +830,11 @@ msgid "No world created or selected!"
 msgstr "Neniu mondo estas kreita aÅ­ elektita!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Nova pasvorto"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Ludi"
 
@@ -750,6 +843,11 @@ msgid "Port"
 msgstr "Pordo"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Elektu mondon:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Elektu mondon:"
 
@@ -765,23 +863,23 @@ msgstr "Ekigi ludon"
 msgid "Address / Port"
 msgstr "Adreso / Pordo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Konekti"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Krea re�imo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Difektado estas �altita"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Forigi �ataton"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Åœati"
 
@@ -789,16 +887,16 @@ msgstr "Åœati"
 msgid "Join Game"
 msgstr "Ali�i al ludo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nomo / Pasvorto"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Retprokrasto"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Dueloj �altitas"
 
@@ -827,10 +925,6 @@ msgid "Antialiasing:"
 msgstr "Glatigo:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Ĉu vi certas, ke vi volas rekomenci vian mondon por unu ludanto?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Memori grandecon de ekrano"
 
@@ -838,10 +932,6 @@ msgstr "Memori grandecon de ekrano"
 msgid "Bilinear Filter"
 msgstr "Dulineara filtrilo"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Tubera mapado"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Ŝan�i klavojn"
@@ -855,10 +945,6 @@ msgid "Fancy Leaves"
 msgstr "Åœikaj folioj"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Estigi Normalmapojn"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Etmapo"
 
@@ -867,10 +953,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Etmapo + Neizotropa filtrilo"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Ne"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Neniu filtrilo"
 
@@ -898,19 +980,11 @@ msgstr "Netravideblaj folioj"
 msgid "Opaque Water"
 msgstr "Netravidebla akvo"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Paralaksa ombrigo"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Partikloj"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Rekomenci mondon por unu ludanto"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Ekrano:"
 
@@ -923,6 +997,11 @@ msgid "Shaders"
 msgstr "Ombrigiloj"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Fluginsuloj (eksperimentaj)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Ombrigiloj (nehaveblaj)"
 
@@ -966,22 +1045,6 @@ msgstr "Ondantaj fluaĵoj"
 msgid "Waving Plants"
 msgstr "Ondantaj plantoj"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Jes"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Agordi modifaĵojn"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Ĉefmenuo"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Komenci ludon por unu"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Konekto eltempi�is."
@@ -1143,18 +1206,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Stirado:\n"
 "– %s: movi�i antaŭen\n"
@@ -1268,16 +1328,6 @@ msgid "Fog enabled"
 msgstr "Nebulo �altita"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Nebulo mal�altita"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Nebulo �altita"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Ludaj informoj:"
 
@@ -1298,16 +1348,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Nebulo mal�altita"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Difektado estas �altita"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Vidaŭdaĵoj…"
 
@@ -1320,34 +1360,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Mapeto nuntempe mal�altita de ludo aŭ modifaĵo"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Mapeto ka�ita"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Mapeto en radara re�imo, zomo ×1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Mapeto en radara re�imo, zomo ×2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Mapeto en radara re�imo, zomo ×4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Mapeto en supraĵa re�imo, zomo ×1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Mapeto en supraĵa re�imo, zomo ×2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Mapeto en supraĵa re�imo, zomo ×4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Trapasa re�imo mal�altita"
 
@@ -1392,10 +1404,6 @@ msgid "Resolving address..."
 msgstr "Serĉante adreson…"
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Renaski�i"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Mal�alti�ante…"
 
@@ -1448,10 +1456,6 @@ msgid "Wireframe shown"
 msgstr "Dratostaro montrita"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Vi mortis"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zomado nuntempe mal�altita de ludo aŭ modifaĵo"
 
@@ -1468,16 +1472,6 @@ msgid "Chat shown"
 msgstr "Babilo montrita"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Babilo ka�ita"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Babilo montrita"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "Travida fasado ka�ita"
 
@@ -1757,6 +1751,25 @@ msgstr "X-Butono 2"
 msgid "Zoom"
 msgstr "Zomo"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Mapeto ka�ita"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Mapeto en radara re�imo, zomo ×1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Mapeto en supraĵa re�imo, zomo ×1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Minimuma grandeco de teksturoj"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Pasvortoj ne kongruas!"
@@ -1800,26 +1813,6 @@ msgid "Backward"
 msgstr "MalantaÅ­en"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Ŝan�i vidpunkton"
 
@@ -1913,30 +1906,10 @@ msgid "Special"
 msgstr "Speciala"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Speciala"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Baskuligi glitan vidpunkton"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Baskuligi glitan vidpunkton"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Baskuligi travidan fasadon"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Baskuligi flugan re�imon"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Baskuligi babilan protokolon"
 
@@ -2067,14 +2040,6 @@ msgstr ""
 "egaligu ĉiujn tri nombrojn por akiri la krudan formon."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = paralaksa ombrigo kun klinaj informoj (pli rapida).\n"
-"1 = reliefa mapado (pli preciza)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "2d-a bruo, kiu regas la formon/grandon de krestaj montoj."
 
@@ -2133,6 +2098,10 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"3d-bruo difinanta la strukturon de fluginsuloj.\n"
+"Ŝan�ite de la implicita valoro, la bruo «scale» (implicite 0.7) eble\n"
+"bezonos al�ustigon, ĉar maldikigaj funkcioj de fluginsuloj funkcias\n"
+"plej bone kiam la bruo havas valoron inter -2.0 kaj 2.0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
@@ -2197,9 +2166,12 @@ msgid "ABM interval"
 msgstr "Intertempo de ABM (aktiva modifilo de monderoj)"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "Maksimumo de mondestigaj vicoj"
+msgstr "Absoluta maksimumo de atendantaj estigotaj monderoj"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -2256,6 +2228,11 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"Al�ustigas densecon de la fluginsula tavolo.\n"
+"Plialtigu la valoron por pliigi densecon. Eblas plusa aÅ­ minusa.\n"
+"Valoro = 0.0: 50% de volumeno estas fluginsuloj.\n"
+"Valoro = 2.0 (povas esti pli alta, depende de «mgv7_np_floatland»; ĉiam\n"
+"kontrolu certige) kreas solidan tavolon de fluginsulaĵo."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -2451,10 +2428,6 @@ msgid "Builtin"
 msgstr "Primitivaĵo"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Mapado de elstaraĵoj"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2532,22 +2505,6 @@ msgstr ""
 "Kie 0.0 estas minimuma lumnivelo, 1.0 estas maksimuma numnivelo."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Ŝan�oj al fasado de la ĉefmenuo:\n"
-"-   full (plena):  Pluraj mondoj por unu ludanto, elektilo de ludo, "
-"teksturaro, ktp.\n"
-"-   simple (simpla): Unu mondo por unu ludanto, neniuj elektiloj de ludo aÅ­ "
-"teksturaro.\n"
-"Povus esti bezona por malgrandaj ekranoj."
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr "Grandeco de babiluja tiparo"
 
@@ -2556,9 +2513,8 @@ msgid "Chat key"
 msgstr "Babila klavo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat log level"
-msgstr "Erarserĉa protokola nivelo"
+msgstr "Babileja protokola nivelo"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
@@ -2714,6 +2670,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "Malpermesitaj flagoj de ContentDB"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "URL de la datena deponejo"
 
@@ -2778,7 +2738,10 @@ msgid "Crosshair alpha"
 msgstr "Travidebleco de celilo"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Travidebleco de celilo (maltravidebleco, inter 0 kaj 255)."
 
 #: src/settings_translation_file.cpp
@@ -2786,8 +2749,10 @@ msgid "Crosshair color"
 msgstr "Koloro de celilo"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Koloro de celilo (R,V,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2850,9 +2815,8 @@ msgid "Default report format"
 msgstr "Implicita raporta formo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default stack size"
-msgstr "Norma ludo"
+msgstr "Implicita grandeco de la kolumno"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2893,14 +2857,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Difinas lokon kaj terenon de malnepraj montetoj kaj lagoj."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Difinas glatigan pa�on de teksturoj.\n"
-"Pli alta valoro signifas pli glatajn normalmapojn."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Difinas la bazan ternivelon."
 
@@ -2980,6 +2936,11 @@ msgid "Desynchronize block animation"
 msgstr "Malsamtempigi bildmovon de monderoj"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Dekstren-klavo"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Fosaj partikloj"
 
@@ -3044,7 +3005,8 @@ msgid "Enable console window"
 msgstr "Åœalti konzolan fenestron"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Ŝalti krean re�imon por novaj mapoj."
 
 #: src/settings_translation_file.cpp
@@ -3154,18 +3116,6 @@ msgid "Enables animation of inventory items."
 msgstr "Ŝaltas movbildojn en portaĵujo."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Ŝaltas mapadon de elstaraĵoj por teksturoj. Normalmapoj devas veni kun la "
-"teksturaro,\n"
-"aŭ esti�i memage.\n"
-"Bezonas �altitajn ombrigilojn."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Ŝaltas ka�memoradon de ma�oj turnitaj per «facedir»."
 
@@ -3175,22 +3125,6 @@ msgstr "Åœaltas mapeton."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Åœaltas dumludan estigadon de normalmapoj (Reliefiga efekto).\n"
-"Bezonas �altitan mapadon de elstaraĵoj."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Åœaltas mapadon de paralaksa ombrigo.\n"
-"Bezonas �altitajn ombrigilojn."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3211,14 +3145,6 @@ msgstr "Metodoj de estoj"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Prova elekteblo; povas estigi videblajn spacojn inter monderoj\n"
-"je nombro super 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3226,10 +3152,18 @@ msgid ""
 "Values < 1.0 (for example 0.25) create a more defined surface level with\n"
 "flatter lowlands, suitable for a solid floatland layer."
 msgstr ""
+"Eksponento de maldikigo de fluginsuloj. Ŝan�as la konduton\n"
+"de maldikigo.\n"
+"Valoro = 1.0 kreas unuforman, linearan maldikigon.\n"
+"Valoroj > 1.0 kreas glatan maldikigon taÅ­gan por la implicitaj apartaj\n"
+"fluginsuloj.\n"
+"Valoroj < 1.0 (ekzemple 0.25) kreas pli difinitan ternivelon kun\n"
+"pli plataj malaltejoj, taŭgaj por solida tavolo de fluginsulaĵo."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "Kadroj sekunde en paÅ­za menuo"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "Maksimumaj KS paÅ­ze."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3348,39 +3282,32 @@ msgid "Fixed virtual joystick"
 msgstr "Fiksita virtuala stirstango"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland density"
-msgstr "Denseco de fluginsulaj montoj"
+msgstr "Denseco de fluginsuloj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland maximum Y"
-msgstr "Maksimuma Y de forgeskelo"
+msgstr "Maksimuma Y de fluginsuloj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland minimum Y"
-msgstr "Minimuma Y de forgeskeloj"
+msgstr "Minimuma Y de fluginsuloj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland noise"
-msgstr "Baza bruo de fluginsuloj"
+msgstr "Bruo de fluginsuloj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland taper exponent"
-msgstr "Eksponento de fluginsulaj montoj"
+msgstr "Eksponento de maldikigo de fluginsuloj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland tapering distance"
-msgstr "Baza bruo de fluginsuloj"
+msgstr "Distanco de maldikigo de fluginsuloj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland water level"
-msgstr "Alteco de fluginsuloj"
+msgstr "Akvonivelo de fluginsuloj"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
@@ -3439,6 +3366,8 @@ msgid ""
 "Font size of the recent chat text and chat prompt in point (pt).\n"
 "Value 0 will use the default font size."
 msgstr ""
+"Grandeco de tiparo de fre�a babila teksto kaj babilujo en punktoj (pt).\n"
+"Valoro 0 uzos la implicitan grandecon de tiparo."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3559,10 +3488,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Skala filtrilo de grafika interfaco txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Estigi normalmapojn"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Mallokaj revokoj"
 
@@ -3572,6 +3497,10 @@ msgid ""
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations."
 msgstr ""
+"Ĉieaj atributoj de mondestigo.\n"
+"En mondestigo v6, la parametro «decorations» regas ĉiujn ornamojn\n"
+"krom arboj kaj �angala herbo; en ĉiuj ailaj mondestigiloj, ĉi tiu parametro\n"
+"regas ĉiujn ornamojn."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3618,10 +3547,11 @@ msgid "HUD toggle key"
 msgstr "Baskula klavo por travida fasado"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Traktado de evitindaj Lua-API-vokoj:\n"
@@ -4117,7 +4047,7 @@ msgstr "Dosierindiko al kursiva egallar�a tiparo"
 
 #: src/settings_translation_file.cpp
 msgid "Item entity TTL"
-msgstr ""
+msgstr "Daŭro de lasita portaĵo"
 
 #: src/settings_translation_file.cpp
 msgid "Iterations"
@@ -4145,6 +4075,11 @@ msgid "Joystick button repetition interval"
 msgstr "Ripeta periodo de stirstangaj klavoj"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "Speco de stirstango"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Sentemo de stirstanga vidamplekso"
 
@@ -4247,6 +4182,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Klavo por salti.\n"
+"Vidu http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4389,6 +4335,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Klavo por salti.\n"
+"Vidu http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -5127,19 +5084,14 @@ msgid "Lower Y limit of dungeons."
 msgstr "Suba Y-limo de forgeskeloj."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lower Y limit of floatlands."
-msgstr "Suba Y-limo de forgeskeloj."
+msgstr "Suba Y-limo de fluginsuloj."
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
 msgstr "Ĉefmenua skripto"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Stilo de ĉefmenuo"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5156,6 +5108,14 @@ msgid "Makes all liquids opaque"
 msgstr "Igas fluaĵojn netravideblaj"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Dosierujo kun mapoj"
 
@@ -5214,15 +5174,16 @@ msgstr ""
 "kaj la flago «jungles» estas malatentata."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "'ridges': Rivers.\n"
 "'floatlands': Floating land masses in the atmosphere.\n"
 "'caverns': Giant caves deep underground."
 msgstr ""
-"Mapestigilaj ecoj speciale por Mapestigilo v7.\n"
-"«ridges» �altas la riverojn."
+"Mapestigaj ecoj speciale por Mapestigilo v7.\n"
+"«ridges»: Riveroj.\n"
+"«floatlands»: Flugantaj teramasoj en la atmosfero.\n"
+"«caverns»: Grandaj kavernegoj profunde sub tero."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -5337,7 +5298,8 @@ msgid "Maximum FPS"
 msgstr "Maksimumaj KS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "Maksimumaj KS paÅ­ze."
 
 #: src/settings_translation_file.cpp
@@ -5381,22 +5343,27 @@ msgid "Maximum number of blocks that can be queued for loading."
 msgstr "Maksimuma nombro da mondopecoj atendantaj legon."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "This limit is enforced per player."
 msgstr ""
 "Maksimumo nombro de mondopecoj atendantaj estigon.\n"
-"Vakigu por memaga elekto de �usta kvanto."
+"Ĉi tiu limo estas devigata al ĉiu ludanto aparte."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "This limit is enforced per player."
 msgstr ""
 "Maksimuma nombro de atendantaj mondopecoj legotaj de loka dosiero.\n"
-"Agordi vake por memaga elekto de �usta nombro."
+"Ĉi tiu limo estas devigata al ĉiu ludanto aparte."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
@@ -5492,7 +5459,7 @@ msgstr "Metodo emfazi elektitan objekton."
 
 #: src/settings_translation_file.cpp
 msgid "Minimal level of logging to be written to chat."
-msgstr ""
+msgstr "Minimuma nivelo de protokolado skribota al la babilujo."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
@@ -5611,9 +5578,8 @@ msgid ""
 msgstr "Nomo de la servilo, montrota al ludantoj kaj en la listo de serviloj."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Near plane"
-msgstr "Proksime tonda ebeno"
+msgstr "Proksima ebeno"
 
 #: src/settings_translation_file.cpp
 msgid "Network"
@@ -5652,14 +5618,6 @@ msgid "Noises"
 msgstr "Bruoj"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Normalmapa specimenado"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Normalmapa potenco"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Nombro da mondestigaj fadenoj"
 
@@ -5705,10 +5663,6 @@ msgstr ""
 "kaj uzon de memoro (4096=100MB, proksimume)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Nombro da iteracioj de paralaksa ombrigo."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Enreta deponejo de enhavo"
 
@@ -5739,34 +5693,6 @@ msgstr ""
 "fenestro estas malfermita."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Entuta ekarto de la efiko de paralaksa ombrigo, kutime skalo/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Entuta vasteco de paralaksa ombrigo."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Paralaksa ombrigo"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Ekarto de paralaksa okludo"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Iteracioj de paralaksa ombrigo"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Re�imo de paralaksa ombrigo"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Skalo de paralaksa ombrigo"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5786,6 +5712,8 @@ msgid ""
 "Path to save screenshots at. Can be an absolute or relative path.\n"
 "The folder will be created if it doesn't already exist."
 msgstr ""
+"Dosierindiko por konservotaj ekrankopioj. Povas esti absoluta\n"
+"aŭ relativa. La dosierujo estos kreita, se �i ne jam ekzistas."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5851,6 +5779,16 @@ msgid "Pitch move mode"
 msgstr "Celilsekva re�imo"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Fluga klavo"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Periodo inter ripetoj de dekstra klako"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -6030,10 +5968,6 @@ msgid "Right key"
 msgstr "Dekstren-klavo"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Periodo inter ripetoj de dekstra klako"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Profundeco de rivera akvovojo"
 
@@ -6327,6 +6261,20 @@ msgid "Show entity selection boxes"
 msgstr "Montri elektujojn de estoj"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Agordi la lingvon. Lasu malplena por uzi la sisteman.\n"
+"Rerulo necesas post la �an�o."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Implice grasa tiparo"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Ferma mesa�o"
 
@@ -6475,10 +6423,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Potenco de paralakso."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Forteco de estigitaj normalmapoj."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6587,6 +6531,11 @@ msgid "The URL for the content repository"
 msgstr "URL al la deponejo de enhavo"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "The deadzone of the joystick"
+msgstr "Identigilo de la uzota stirstango"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6651,13 +6600,14 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end for Irrlicht.\n"
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "La bildiga internaĵo por Irrlicht.\n"
 "Rerulo necesas post ĉi tiu �an�o.\n"
@@ -6699,6 +6649,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6706,10 +6662,10 @@ msgstr ""
 "de stirstangaj klavoj."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 "Tempo (en sekundoj) inter ripetaj klakoj dum premo de la dekstra musbutono."
 
@@ -6865,6 +6821,17 @@ msgstr ""
 "Gamae �usta malgrandigado ne estas subtenata."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Uzi trilinearan filtradon skalante teksturojn."
 
@@ -7098,6 +7065,12 @@ msgstr ""
 "Mal�altite, ĉi tio anstataŭe uzigas tiparojn bitbildajn kaj XML-vektorajn."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr "Ĉu teksturaj movbildoj de monderoj malsamtempi�u en ĉiu mondopeco."
 
@@ -7241,6 +7214,24 @@ msgid "Y-level of seabed."
 msgstr "Y-nivelo de marplanko."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "Tempolimo de dosiere el�uto de cURL"
 
@@ -7252,23 +7243,12 @@ msgstr "Samtempa limo de cURL"
 msgid "cURL timeout"
 msgstr "cURL tempolimo"
 
-#~ msgid "Ok"
-#~ msgstr "Bone"
-
-#~ msgid "Back"
-#~ msgstr "Reeniri"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "El�utante kaj instalante $1, bonvolu atendi…"
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Limo de viceroj enlegotaj de disko"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Potenco de paralaksa ombrigo"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Dosierindiko por konservi ekrankopiojn."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = paralaksa ombrigo kun klinaj informoj (pli rapida).\n"
+#~ "1 = reliefa mapado (pli preciza)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7283,6 +7263,39 @@ msgstr "cURL tempolimo"
 #~ msgstr ""
 #~ "Ŝan�as kiel montecaj fluginsuloj maldiki�as super kaj sub la mezpunkto."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Ĉu vi certas, ke vi volas rekomenci vian mondon por unu ludanto?"
+
+#~ msgid "Back"
+#~ msgstr "Reeniri"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Tubera mapado"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Mapado de elstaraĵoj"
+
+#~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Ŝan�oj al fasado de la ĉefmenuo:\n"
+#~ "-   full (plena):  Pluraj mondoj por unu ludanto, elektilo de ludo, "
+#~ "teksturaro, ktp.\n"
+#~ "-   simple (simpla): Unu mondo por unu ludanto, neniuj elektiloj de ludo "
+#~ "aÅ­ teksturaro.\n"
+#~ "Povus esti bezona por malgrandaj ekranoj."
+
+#~ msgid "Config mods"
+#~ msgstr "Agordi modifaĵojn"
+
+#~ msgid "Configure"
+#~ msgstr "Agordi"
+
 #~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
@@ -7295,6 +7308,9 @@ msgstr "cURL tempolimo"
 #~ "Regas lar�econ de tuneloj; pli malgranda valoro kreas pri lar�ajn "
 #~ "tunelojn."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Koloro de celilo (R,V,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Akreco de mallumo"
 
@@ -7306,6 +7322,13 @@ msgstr "cURL tempolimo"
 #~ "Glataj fluginsuloj okazas kiam bruo superas nulon."
 
 #~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Difinas glatigan pa�on de teksturoj.\n"
+#~ "Pli alta valoro signifas pli glatajn normalmapojn."
+
+#~ msgid ""
 #~ "Deprecated, define and locate cave liquids using biome definitions "
 #~ "instead.\n"
 #~ "Y of upper limit of lava in large caves."
@@ -7314,9 +7337,47 @@ msgstr "cURL tempolimo"
 #~ "difinoj\n"
 #~ "Y de supra limo de lafo en grandaj kavernoj."
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "El�utante kaj instalante $1, bonvolu atendi…"
+
 #~ msgid "Enable VBO"
 #~ msgstr "Åœalti VBO(Vertex Buffer Object)"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Ŝaltas mapadon de elstaraĵoj por teksturoj. Normalmapoj devas veni kun la "
+#~ "teksturaro,\n"
+#~ "aŭ esti�i memage.\n"
+#~ "Bezonas �altitajn ombrigilojn."
+
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Åœaltas dumludan estigadon de normalmapoj (Reliefiga efekto).\n"
+#~ "Bezonas �altitan mapadon de elstaraĵoj."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Åœaltas mapadon de paralaksa ombrigo.\n"
+#~ "Bezonas �altitajn ombrigilojn."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Prova elekteblo; povas estigi videblajn spacojn inter monderoj\n"
+#~ "je nombro super 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "Kadroj sekunde en paÅ­za menuo"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Bruo de baza alteco de fluginsuloj"
 
@@ -7329,6 +7390,12 @@ msgstr "cURL tempolimo"
 #~ msgid "Gamma"
 #~ msgstr "Hel�ustigo"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Estigi Normalmapojn"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Estigi normalmapojn"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Subteno de IPv6."
 
@@ -7338,15 +7405,102 @@ msgstr "cURL tempolimo"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Akreco de heleco"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Limo de viceroj enlegotaj de disko"
+
+#~ msgid "Main"
+#~ msgstr "Ĉefmenuo"
+
+#~ msgid "Main menu style"
+#~ msgstr "Stilo de ĉefmenuo"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Mapeto en radara re�imo, zomo ×2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Mapeto en radara re�imo, zomo ×4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Mapeto en supraĵa re�imo, zomo ×2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Mapeto en supraĵa re�imo, zomo ×4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nomo/Pasvorto"
+
+#~ msgid "No"
+#~ msgstr "Ne"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Normalmapa specimenado"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Normalmapa potenco"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Nombro da iteracioj de paralaksa ombrigo."
+
+#~ msgid "Ok"
+#~ msgstr "Bone"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "Entuta ekarto de la efiko de paralaksa ombrigo, kutime skalo/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Entuta vasteco de paralaksa ombrigo."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Paralaksa ombrigo"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Paralaksa ombrigo"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Ekarto de paralaksa okludo"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Iteracioj de paralaksa ombrigo"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Re�imo de paralaksa ombrigo"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Skalo de paralaksa ombrigo"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Potenco de paralaksa ombrigo"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Dosierindiko al tiparo «TrueType» aŭ bitbildo."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Dosierindiko por konservi ekrankopiojn."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Planante forgeskelojn"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Rekomenci mondon por unu ludanto"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Elekti pakaĵan dosieron:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Limo por ombroj"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Komenci ludon por unu"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Forteco de estigitaj normalmapoj."
+
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Tiu ĉi tiparo uzi�os por iuj lingvoj."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Baskuligi glitan vidpunkton"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7357,21 +7511,21 @@ msgstr "cURL tempolimo"
 #~ "Variaĵo de alteco de montetoj kaj profundeco de lagoj sur glata tereno de "
 #~ "fluginsuloj."
 
-#~ msgid "Waving water"
-#~ msgstr "Ondanta akvo"
-
-#~ msgid "Y-level to which floatland shadows extend."
-#~ msgstr "Y-nivelo kien etendi�as ombroj de fluginsuloj."
-
-#~ msgid "Projecting dungeons"
-#~ msgstr "Planante forgeskelojn"
+#~ msgid "View"
+#~ msgstr "Vido"
 
 #~ msgid "Waving Water"
 #~ msgstr "Ondanta akvo"
 
+#~ msgid "Waving water"
+#~ msgstr "Ondanta akvo"
+
 #, fuzzy
 #~ msgid "Y of upper limit of lava in large caves."
 #~ msgstr "Y de supera limo de grandaj kvazaÅ­-hazardaj kavernoj."
 
-#~ msgid "Select Package File:"
-#~ msgstr "Elekti pakaĵan dosieron:"
+#~ msgid "Y-level to which floatland shadows extend."
+#~ msgstr "Y-nivelo kien etendi�as ombroj de fluginsuloj."
+
+#~ msgid "Yes"
+#~ msgstr "Jes"
diff --git a/po/es/minetest.po b/po/es/minetest.po
index 7a873f452..4d26f2b5c 100644
--- a/po/es/minetest.po
+++ b/po/es/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spanish (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-07-06 21:41+0000\n"
-"Last-Translator: Agustin Calderon <agustin25901@gmail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-05 09:40+0000\n"
+"Last-Translator: j45 minetest <j45minetest@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/minetest/"
 "minetest/es/>\n"
 "Language: es\n"
@@ -12,7 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Reaparecer"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Has muerto"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -38,10 +46,6 @@ msgstr "Reconectar"
 msgid "The server has requested a reconnect:"
 msgstr "El servidor ha solicitado una reconexión:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Cargando..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "La versión del protocolo no coincide. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "El servidor soporta versiones del protocolo entre $1 y $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Intente rehabilitar la lista de servidores públicos y verifique su conexión "
-"a Internet."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Solo se soporta la versión de protocolo $1."
 
@@ -68,7 +66,8 @@ msgstr "Solo se soporta la versión de protocolo $1."
 msgid "We support protocol versions between version $1 and $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_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Nosotros soportamos versiones de protocolo entre la versión $1 y $2."
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependencias:"
 
@@ -152,14 +152,54 @@ msgid "enabled"
 msgstr "activado"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" ya existe. Quieres remplazarlo?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Las dependencias $1 y $2 serán instaladas."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 por $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 descargando,\n"
+"$2 en espera"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 descargando..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 dependencias requeridas no se encuentran."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 serán instalados, y $2 dependencias serán ignoradas."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Todos los paquetes"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Ya está instalado"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Volver al menú principal"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Juego Base:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 "ContentDB no se encuentra disponible cuando Minetest se compiló sin cURL"
@@ -182,6 +222,14 @@ msgid "Install"
 msgstr "Instalar"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "Instalar $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Instalar dependencias faltantes"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mods"
@@ -195,9 +243,24 @@ msgid "No results"
 msgstr "Sin resultados"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Buscar"
+msgid "No updates"
+msgstr "No hay actualizaciones"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "No encontrado"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Sobreescribir"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Por favor verifica que el juego base está bien."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "En cola"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -212,8 +275,12 @@ msgid "Update"
 msgstr "Actualizar"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Ver"
+msgid "Update All [$1]"
+msgstr "Actualizar Todo [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Ver más información en un navegador web"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -470,11 +537,6 @@ msgid "Browse"
 msgstr "Explorar"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Cliente"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Desactivado"
 
@@ -519,6 +581,10 @@ msgid "Scale"
 msgstr "Escala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Buscar"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Seleccionar carpeta"
 
@@ -635,6 +701,21 @@ msgstr "Fallo al instalar un mod como $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Fallo al instalar un paquete de mod como $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "El Scripting en el lado del cliente está desactivado"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Intente rehabilitar la lista de servidores públicos y verifique su conexión "
+"a Internet."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Explorar contenido en línea"
@@ -688,8 +769,16 @@ msgid "Credits"
 msgstr "Créditos"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "Abrir Directorio de Datos de Usuario"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Abre el directorio que contiene los mundos, juegos, mods, y paquetes de\n"
+"textura, del usuario, en un gestor / explorador de archivos."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -708,32 +797,28 @@ msgid "Bind Address"
 msgstr "Asociar dirección"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Configurar"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Modo creativo"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Permitir daños"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Game"
-msgstr "Juego anfitrión"
+msgstr "Hospedar juego"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Server"
-msgstr "Servidor anfitrión"
+msgstr "Hospedar servidor"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
 msgstr "Instalar juegos desde ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nombre / contraseña"
+msgid "Name"
+msgstr "Nombre"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -744,6 +829,10 @@ msgid "No world created or selected!"
 msgstr "¡No se ha dado un nombre al mundo o no se ha seleccionado uno!"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Contraseña"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Jugar juego"
 
@@ -752,6 +841,10 @@ msgid "Port"
 msgstr "Puerto"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Selecciona Mods"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Selecciona un mundo:"
 
@@ -767,23 +860,23 @@ msgstr "Empezar juego"
 msgid "Address / Port"
 msgstr "Dirección / puerto"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Conectar"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Modo creativo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Daño activado"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Borrar Fav."
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favorito"
 
@@ -791,16 +884,16 @@ msgstr "Favorito"
 msgid "Join Game"
 msgstr "Unirse al juego"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nombre / contraseña"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP activado"
 
@@ -829,10 +922,6 @@ msgid "Antialiasing:"
 msgstr "Suavizado:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "¿Estás seguro de querer reiniciar el mundo de un jugador?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Auto-guardar tamaño de pantalla"
 
@@ -840,10 +929,6 @@ msgstr "Auto-guardar tamaño de pantalla"
 msgid "Bilinear Filter"
 msgstr "Filtrado bilineal"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Mapeado de relieve"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Configurar teclas"
@@ -857,10 +942,6 @@ msgid "Fancy Leaves"
 msgstr "Hojas elegantes"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Generar mapas normales"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -869,10 +950,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Filtro aniso."
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "No"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Sin filtrado"
 
@@ -900,19 +977,11 @@ msgstr "Hojas opacas"
 msgid "Opaque Water"
 msgstr "Agua opaca"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Oclusión de paralaje"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Partículas"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Reiniciar mundo de un jugador"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Pantalla:"
 
@@ -925,6 +994,10 @@ msgid "Shaders"
 msgstr "Sombreadores"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Sombreadores (experimental)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Sombreadores (no disponible)"
 
@@ -968,22 +1041,6 @@ msgstr "Movimiento de líquidos"
 msgid "Waving Plants"
 msgstr "Movimiento de plantas"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Sí"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Configurar mods"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Principal"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Comenzar un jugador"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Tiempo de espera de la conexión agotado."
@@ -1140,25 +1197,22 @@ msgid "Continue"
 msgstr "Continuar"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Controles:\n"
 "- %s: moverse adelante\n"
@@ -1166,12 +1220,12 @@ msgstr ""
 "- %s: moverse a la izquierda\n"
 "- %s: moverse a la derecha\n"
 "- %s: saltar/escalar\n"
-"- %s: agacharse/bajar\n"
+"- %s: excavar/golpear\n"
+"- %s: colocar/usar\n"
+"- %s: a hurtadillas/bajar\n"
 "- %s: soltar objeto\n"
 "- %s: inventario\n"
 "- Ratón: girar/mirar\n"
-"- Ratón izq.: cavar/golpear\n"
-"- Ratón der.: colocar/usar\n"
 "- Rueda del ratón: elegir objeto\n"
 "- %s: chat\n"
 
@@ -1272,16 +1326,6 @@ msgid "Fog enabled"
 msgstr "Niebla activada"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Niebla desactivada"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Niebla activada"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Información del juego:"
 
@@ -1302,16 +1346,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Niebla desactivada"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Daño activado"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Media..."
 
@@ -1324,34 +1358,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "El minimapa se encuentra actualmente desactivado por el juego o un mod"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Minimapa oculto"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Minimapa en modo radar, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Minimapa en modo radar, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Minimapa en modo radar, Zoom x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Minimapa en modo superficie, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Minimapa en modo superficie, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Minimapa en modo superficie, Zoom x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Modo 'Noclip' desactivado"
 
@@ -1361,7 +1367,7 @@ msgstr "Modo 'Noclip' activado"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled (note: no 'noclip' privilege)"
-msgstr "Modo \"noclip\" activado (nota: sin privilegio 'noclip')"
+msgstr "Modo 'Noclip' activado (nota: sin privilegio 'noclip')"
 
 #: src/client/game.cpp
 msgid "Node definitions..."
@@ -1396,10 +1402,6 @@ msgid "Resolving address..."
 msgstr "Resolviendo dirección..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Reaparecer"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Cerrando..."
 
@@ -1449,11 +1451,7 @@ msgstr "Volumen cambiado a %d%%"
 
 #: src/client/game.cpp
 msgid "Wireframe shown"
-msgstr "Wireframe mostrado"
-
-#: src/client/game.cpp
-msgid "You died"
-msgstr "Has muerto"
+msgstr "Líneas 3D mostradas"
 
 #: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
@@ -1461,7 +1459,7 @@ msgstr "El zoom está actualmente desactivado por el juego o un mod"
 
 #: src/client/game.cpp
 msgid "ok"
-msgstr "aceptar"
+msgstr "Aceptar"
 
 #: src/client/gameui.cpp
 msgid "Chat hidden"
@@ -1469,17 +1467,7 @@ msgstr "Chat oculto"
 
 #: src/client/gameui.cpp
 msgid "Chat shown"
-msgstr "Chat mostrado"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Chat oculto"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Chat mostrado"
+msgstr "Chat visible"
 
 #: src/client/gameui.cpp
 msgid "HUD hidden"
@@ -1761,6 +1749,24 @@ msgstr "X Botón 2"
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Minimapa oculto"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Minimapa en modo radar, Zoom x%d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Minimapa en modo superficie, Zoom x%d"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Minimapa en modo textura"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "¡Las contraseñas no coinciden!"
@@ -1805,26 +1811,6 @@ msgid "Backward"
 msgstr "Atrás"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Cambiar cámara"
 
@@ -1919,30 +1905,10 @@ msgid "Special"
 msgstr "Especial"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Especial"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Activar cinemático"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Activar cinemático"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Alternar el HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Activar volar"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Alternar el registro del chat"
 
@@ -2035,7 +2001,6 @@ msgstr ""
 "del círculo principal."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "(X,Y,Z) offset of fractal from world center in units of 'scale'.\n"
 "Can be used to move a desired point to (0, 0) to create a\n"
@@ -2048,14 +2013,17 @@ msgid ""
 msgstr ""
 "Desvío (X,Y,Z) del fractal desde el centro del mundo en unidades de "
 "'escala'.\n"
-"Puede ser utilizado para mover el punto deseado (0, 0) para crear un\n"
+"Puede ser utilizado para mover el punto deseado al inicio de coordenadas (0, "
+"0) para crear un\n"
 "punto de aparición mejor, o permitir 'ampliar' en un punto deseado si\n"
 "se incrementa la 'escala'.\n"
-"El valor por defecto está ajustado para un punto de aparición adecuado para\n"
-"los conjuntos Madelbrot con parámetros por defecto, podría ser necesario\n"
-"modificarlo para otras situaciones.\n"
-"El rango de está comprendido entre -2 y 2. Multiplicar por 'escala' para el\n"
-"desvío en nodos."
+"El valor por defecto está ajustado para un punto de aparición adecuado "
+"para \n"
+"los conjuntos Madelbrot\n"
+"Con parámetros por defecto, podría ser necesariomodificarlo para otras \n"
+"situaciones.\n"
+"El rango de está comprendido entre -2 y 2. Multiplicar por la 'escala' para "
+"el desvío en nodos."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2073,15 +2041,7 @@ msgstr ""
 "limitado en tamaño por el mundo.\n"
 "Incrementa estos valores para 'ampliar' el detalle del fractal.\n"
 "El valor por defecto es para ajustar verticalmente la forma para\n"
-"una isla, establece los 3 números igual para la forma pura."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"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)."
+"una isla, establece los 3 números iguales para la forma inicial."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
@@ -2096,28 +2056,22 @@ msgid "2D noise that controls the shape/size of step mountains."
 msgstr "Ruido 2D para controlar la forma/tamaño de las montañas inclinadas."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "2D noise that controls the size/occurrence of ridged mountain ranges."
-msgstr ""
-"Ruido 2D que controla los rangos de tamaño/aparición de las montañas "
-"escarpadas."
+msgstr "Ruido 2D que controla el tamaño/aparición de cordilleras montañosas."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "2D noise that controls the size/occurrence of rolling hills."
-msgstr "Ruido 2D para controlar el tamaño/aparición de las colinas."
+msgstr "Ruido 2D que controla el tamaño/aparición de las colinas ondulantes."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "2D noise that controls the size/occurrence of step mountain ranges."
 msgstr ""
-"Ruido 2D para controlar las rangos de tamaño/aparición de las montañas "
+"Ruido 2D que controla el tamaño/aparición de los intervalos de montañas "
 "inclinadas."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "2D noise that locates the river valleys and channels."
-msgstr "Ruido 2D para controlar la forma/tamaño de las colinas."
+msgstr "Ruido 2D para ubicar los ríos, valles y canales."
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2128,9 +2082,8 @@ msgid "3D mode"
 msgstr "Modo 3D"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D mode parallax strength"
-msgstr "Oclusión de paralaje"
+msgstr "Fuerza de paralaje en modo 3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
@@ -2151,6 +2104,12 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"Ruido 3D que define las estructuras flotantes.\n"
+"Si se altera la escala de ruido por defecto (0,7), puede ser necesario "
+"ajustarla, \n"
+"los valores de ruido que definen la estrechez de islas flotantes funcionan "
+"mejor \n"
+"cuando están en un rango de aproximadamente -2.0 a 2.0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
@@ -2219,9 +2178,12 @@ msgid "ABM interval"
 msgstr "Intervalo ABM"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "ABM time budget"
+msgstr "Límite de tiempo para MBA"
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "Limite absoluto de colas emergentes"
+msgstr "Límite absoluto de bloques en proceso"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -2278,6 +2240,12 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"Ajusta la densidad de la isla flotante.\n"
+"Incrementar el valor para incrementar la densidad. Este puede ser negativo o "
+"positivo\n"
+"Valor = 0.0: 50% del volumen está flotando \n"
+"Valor = 2.0 (puede ser mayor dependiendo de 'mgv7_np_floatland',\n"
+"siempre pruébelo para asegurarse) crea una isla flotante compacta."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -2479,11 +2447,6 @@ msgid "Builtin"
 msgstr "Incorporado"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Mapeado de relieve"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2491,9 +2454,10 @@ msgid ""
 "0.1 = Default, 0.25 = Good value for weaker tablets."
 msgstr ""
 "Distancia de la cámara 'cerca del plano delimitador' en nodos, entre 0 y "
-"0,5.\n"
-"La mayoría de los usuarios no necesitarán cambiar esto.\n"
-"El aumento puede reducir los artefactos en GPU más débiles.\n"
+"0,25.\n"
+"Solo funciona en plataformas GLES. La mayoría de los usuarios no necesitarán "
+"cambiar esto.\n"
+"Aumentarlo puede reducir el artifacting en GPU más débiles.\n"
 "0.1 = Predeterminado, 0,25 = Buen valor para comprimidos más débiles."
 
 #: src/settings_translation_file.cpp
@@ -2561,33 +2525,16 @@ msgstr ""
 "Cuando 0.0 es el nivel mínimo de luz, 1.0 es el nivel de luz máximo."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Cambia la UI del menú principal:\n"
-"-\tCompleto:\tMúltiples mundos, elección de juegos y texturas, etc.\n"
-"-\tSimple:\tUn solo mundo, sin elección de juegos o texturas.\n"
-"Puede ser necesario en pantallas pequeñas.\n"
-"-\tAutomático:\tSimple en Android, completo en otras plataformas."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat font size"
-msgstr "Tamaño de la fuente"
+msgstr "Tamaño de la fuente del chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
 msgstr "Tecla del Chat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat log level"
-msgstr "Nivel de registro de depuración"
+msgstr "Nivel de registro del chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
@@ -2683,12 +2630,12 @@ msgid ""
 "These flags are independent from Minetest versions,\n"
 "so see a full list at https://content.minetest.net/help/content_flags/"
 msgstr ""
-"Lista de banderas a ocultar en el repositorio de contenido. La lista usa la "
+"Lista de 'marcas' a ocultar en el repositorio de contenido. La lista usa la "
 "coma como separador.\n"
 "Se puede usar la etiqueta \"nonfree\" para ocultar paquetes que no tienen "
-"licencia libre (tal como define la Funcación de software libre (FSF).\n"
-"También puedes especificar proporciones de contenido.\n"
-"Estas banderas son independientes de la versión de Minetest.\n"
+"licencia libre (tal como define la Fundación de software libre (FSF)).\n"
+"También puedes especificar clasificaciones de contenido.\n"
+"Estas 'marcas' son independientes de la versión de Minetest.\n"
 "Si quieres ver una lista completa visita https://content.minetest.net/help/"
 "content_flags/"
 
@@ -2697,8 +2644,9 @@ msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
-"Lista separada por comas de mods que son permitidos de acceder a APIs de "
-"HTTP, las cuales les permiten subir y descargar archivos al/desde internet."
+"Lista (separada por comas) de mods a los que se les permite acceder a APIs "
+"de HTTP, las cuales \n"
+"les permiten subir y descargar archivos al/desde internet."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2742,6 +2690,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "Lista negra de banderas de ContentDB"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "Descargas máximas simultáneas para ContentDB"
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "Dirección URL de ContentDB"
 
@@ -2768,8 +2720,9 @@ msgid ""
 "72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged."
 msgstr ""
 "Controla la 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."
+"Ejemplos: \n"
+"72 = 20min, 360 = 4min, 1 = 24hs, 0 = día/noche/lo que sea se queda "
+"inalterado."
 
 #: src/settings_translation_file.cpp
 msgid "Controls sinking speed in liquid."
@@ -2808,16 +2761,24 @@ msgid "Crosshair alpha"
 msgstr "Opacidad del punto de mira"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "Alfa del punto de mira (opacidad, entre 0 y 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Alfa del punto de mira (opacidad, entre 0 y 255).\n"
+"También controla el color del objeto punto de mira."
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
 msgstr "Color de la cruz"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Color de la cruz (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Color del punto de mira (R,G,B).\n"
+"También controla el color del objeto punto de mira"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2880,9 +2841,8 @@ msgid "Default report format"
 msgstr "Formato de Reporte por defecto"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default stack size"
-msgstr "Juego por defecto"
+msgstr "Tamaño por defecto del stack (Montón)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2923,14 +2883,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Define la localización y terreno de colinas y lagos opcionales."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Define el intervalo de muestreo de las texturas.\n"
-"Un valor más alto causa mapas de relieve más suaves."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Define el nivel base del terreno."
 
@@ -2991,8 +2943,8 @@ msgid ""
 "Description of server, to be displayed when players join and in the "
 "serverlist."
 msgstr ""
-"Descripción del servidor, que se muestra cuando los jugadores se unen, y en\n"
-"la lista de servidores."
+"Descripción del servidor, que se muestra en la lista de servidores y cuando "
+"los jugadores se unen."
 
 #: src/settings_translation_file.cpp
 msgid "Desert noise threshold"
@@ -3011,6 +2963,10 @@ msgid "Desynchronize block animation"
 msgstr "Desincronizar la animación de los bloques"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "Tecla Excavar"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Partículas de excavación"
 
@@ -3076,7 +3032,8 @@ msgid "Enable console window"
 msgstr "Habilitar la ventana de la consola"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Habilitar el modo creativo para los nuevos mapas creados."
 
 #: src/settings_translation_file.cpp
@@ -3170,7 +3127,6 @@ msgstr ""
 "Necesita habilitar enable_ipv6 para ser activado."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enables Hable's 'Uncharted 2' filmic tone mapping.\n"
 "Simulates the tone curve of photographic film and how this approximates the\n"
@@ -3189,18 +3145,6 @@ msgid "Enables animation of inventory items."
 msgstr "Habilita la animación de objetos en el inventario."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Habilita mapeado de relieves para las texturas. El mapeado de normales "
-"necesita ser\n"
-"suministrados por el paquete de texturas, o será generado automaticamente.\n"
-"Requiere habilitar sombreadores."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Habilitar cacheado de mallas giradas."
 
@@ -3210,23 +3154,6 @@ msgstr "Activar mini-mapa."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Habilita la generación de mapas de normales (efecto realzado) en el "
-"momento.\n"
-"Requiere habilitar mapeado de relieve."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Habilita mapeado de oclusión de paralaje.\n"
-"Requiere habilitar sombreadores."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3247,14 +3174,6 @@ msgstr "Métodos de entidad"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Opción experimental, puede causar espacios visibles entre los\n"
-"bloques si se le da un valor mayor a 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3264,8 +3183,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS (cuadros/s) en el menú de pausa"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "FPS máximos cuando el juego está pausado."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3333,8 +3253,9 @@ msgid ""
 "the\n"
 "Multiplayer Tab."
 msgstr ""
-"Fichero en client/serverlist/ que contiene sus servidores favoritos que se "
-"mostrarán en la página de Multijugador."
+"Archivo en client/serverlist/ que contiene sus servidores favoritos "
+"mostrados en la \n"
+"página de Multijugador."
 
 #: src/settings_translation_file.cpp
 msgid "Filler depth"
@@ -3355,9 +3276,10 @@ msgid ""
 "light edge to transparent textures. Apply this filter to clean that up\n"
 "at texture load time."
 msgstr ""
-"Las texturas filtradas pueden mezclar los valores RGB de los vecinos\n"
-"completamete tranparentes, los cuales los optimizadores de ficheros\n"
-"PNG usualmente descartan, lo que a veces resulta en un borde claro u\n"
+"Las texturas filtradas pueden mezclar valores RGB con sus vecinos "
+"completamente transparentes, \n"
+"los cuales los optimizadores de PNG usualmente descartan, lo que a veces "
+"resulta en un borde claro u\n"
 "oscuro en las texturas transparentes. Aplica éste filtro para limpiar ésto\n"
 "al cargar las texturas."
 
@@ -3473,6 +3395,9 @@ msgid ""
 "Font size of the recent chat text and chat prompt in point (pt).\n"
 "Value 0 will use the default font size."
 msgstr ""
+"El tamaño de la fuente del texto del chat reciente y el indicador del chat "
+"en punto (pt).\n"
+"El valor 0 utilizará el tamaño de fuente predeterminado."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3554,11 +3479,10 @@ msgstr ""
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
-"Desde cuán lejos se envían bloques a los clientes, especificado en\n"
-"bloques de mapa (mapblocks, 16 nodos)."
+"Desde cuán lejos se envían bloques a los clientes, especificado en bloques "
+"de mapa (mapblocks, 16 nodos)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "From how far clients know about objects, stated in mapblocks (16 nodes).\n"
 "\n"
@@ -3570,8 +3494,8 @@ msgstr ""
 "\n"
 "Establecer esto a más de 'active_block_range' tambien causará que\n"
 "el servidor mantenga objetos activos hasta ésta distancia en la dirección\n"
-"que el jugador está mirando. (Ésto puede evitar que los\n"
-"enemigos desaparezcan)"
+"que el jugador está mirando. (Ésto puede evitar que los enemigos "
+"desaparezcan)"
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
@@ -3598,15 +3522,10 @@ msgid "GUI scaling filter txr2img"
 msgstr "Filtro de escala de IGU \"txr2img\""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Generar mapas normales"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Llamadas globales"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -3614,13 +3533,9 @@ msgid ""
 msgstr ""
 "Atributos del generador de mapas globales.\n"
 "En el generador de mapas V6 la opción (o marcador) \"decorations\" controla "
-"todos los elementos decorativos excepto los árboles y la hierba de la "
-"jungla, en todos los otros generadores de mapas esta opción controla todas "
-"las decoraciones.\n"
-"Las opciones que no son incluidas en el texto con la cadena de opciones no "
-"serán modificadas y mantendrán su valor por defecto.\n"
-"Las opciones que comienzan con el prefijo \"no\" son utilizadas para "
-"inhabilitar esas opciones."
+"todos los elementos decorativos excepto los árboles \n"
+"y la hierba de la jungla, en todos los otros generadores de mapas esta "
+"opción controla todas las decoraciones."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3667,10 +3582,11 @@ msgid "HUD toggle key"
 msgstr "Tecla de cambio del HUD"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Manejo de llamadas a la API de Lua en desuso:\n"
@@ -3682,7 +3598,6 @@ msgstr ""
 "desarrolladores de mods)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Have the profiler instrument itself:\n"
 "* Instrument an empty function.\n"
@@ -3694,7 +3609,7 @@ msgstr ""
 "* Instrumente una función vacía.\n"
 "Esto estima la sobrecarga, que la instrumentación está agregando (+1 llamada "
 "de función).\n"
-"* Instrumente el muestreador que se utiliza para actualizar las estadísticas."
+"* Instrumente el sampler que se utiliza para actualizar las estadísticas."
 
 #: src/settings_translation_file.cpp
 msgid "Heat blend noise"
@@ -3975,7 +3890,6 @@ msgstr ""
 "habilitados."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled the server will perform map block occlusion culling based on\n"
 "on the eye position of the player. This can reduce the number of blocks\n"
@@ -3984,11 +3898,11 @@ msgid ""
 "so that the utility of noclip mode is reduced."
 msgstr ""
 "Si está habilitado, el servidor realizará la selección de la oclusión del "
-"bloque del mapa basado en\n"
+"bloque del mapa basado\n"
 "en la posición del ojo del jugador. Esto puede reducir el número de bloques\n"
-"enviados al cliente en un 50-80%. El cliente ya no recibirá la mayoría de "
-"las invisibles\n"
-"para que la utilidad del modo nocturno se reduzca."
+"enviados al cliente en un 50-80%. El cliente ya no recibirá lo mas "
+"invisible\n"
+"por lo que la utilidad del modo \"NoClip\" se reduce."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4033,7 +3947,6 @@ msgstr ""
 "Actívelo sólo si sabe lo que hace."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, makes move directions relative to the player's pitch when flying "
 "or swimming."
@@ -4221,6 +4134,11 @@ msgid "Joystick button repetition interval"
 msgstr "Intervalo de repetición del botón del Joystick"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "Tipo de Joystick"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Sensibilidad del Joystick"
 
@@ -4323,6 +4241,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla para saltar.\n"
+"Véase http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4373,7 +4302,6 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for moving the player backward.\n"
 "Will also disable autoforward, when active.\n"
@@ -4381,6 +4309,8 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tecla para desplazar el jugador hacia atrás.\n"
+"Cuando esté activa, También desactivará el desplazamiento automático hacia "
+"adelante.\n"
 "Véase http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4467,6 +4397,17 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla para saltar.\n"
+"Véase http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4948,6 +4889,10 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tecla para activar/desactivar la actualización de la cámara. Solo usada para "
+"desarrollo\n"
+"Ver http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -4998,6 +4943,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tecla para activar/desactivar la consola de chat larga.\n"
+"Ver http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5032,6 +4980,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "Kick players who sent more than X messages per 10 seconds."
 msgstr ""
+"Expulsa a los jugadores que enviaron más de X mensajes cada 10 segundos."
 
 #: src/settings_translation_file.cpp
 msgid "Lake steepness"
@@ -5047,19 +4996,19 @@ msgstr "Idioma"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
-msgstr ""
+msgstr "Profundidad de la cueva grande"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave maximum number"
-msgstr ""
+msgstr "Numero máximo de cuevas grandes"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave minimum number"
-msgstr ""
+msgstr "Numero mínimo de cuevas grandes"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave proportion flooded"
-msgstr ""
+msgstr "Proporción de cuevas grandes inundadas"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -5092,24 +5041,30 @@ msgid ""
 "updated over\n"
 "network."
 msgstr ""
+"Duración de un tick del servidor y el intervalo en el que los objetos se "
+"actualizan generalmente sobre la\n"
+"red."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Length of liquid waves.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"Longitud de las ondas líquidas.\n"
+"Requiere que se habiliten los líquidos ondulados."
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between Active Block Modifier (ABM) execution cycles"
 msgstr ""
+"Período de tiempo entre ciclos de ejecución de Active Block Modifier (ABM)"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between NodeTimer execution cycles"
-msgstr ""
+msgstr "Cantidad de tiempo entre ciclos de ejecución de NodeTimer"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between active block management cycles"
-msgstr ""
+msgstr "Periodo de tiempo entre ciclos de gestión de bloques activos"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5122,6 +5077,14 @@ msgid ""
 "-    info\n"
 "-    verbose"
 msgstr ""
+"Nivel de registro que se escribirá en debug.txt:\n"
+"-   <nada> (sin registro)\n"
+"-   ninguno (mensajes sin nivel)\n"
+"-   error\n"
+"-   advertencia\n"
+"-   acción\n"
+"-   información\n"
+"-   detallado"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost"
@@ -5148,11 +5111,16 @@ msgid "Light curve low gradient"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Limit of map generation, in nodes, in all 6 directions from (0, 0, 0).\n"
 "Only mapchunks completely within the mapgen limit are generated.\n"
 "Value is stored per-world."
 msgstr ""
+"Límite de la generación de mapa, en nodos, en todas las 6 direcciones desde "
+"(0, 0, 0).\n"
+"Solo las porciones de terreno dentro de los límites son generadas.\n"
+"Los valores se guardan por mundo."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5165,11 +5133,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity"
-msgstr ""
+msgstr "Fluidez líquida"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity smoothing"
-msgstr ""
+msgstr "Suavizado de la fluidez líquida"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid loop max"
@@ -5210,7 +5178,7 @@ msgstr "Intervalo de modificador de bloques activos"
 
 #: src/settings_translation_file.cpp
 msgid "Lower Y limit of dungeons."
-msgstr ""
+msgstr "Límite inferior en Y de mazmorras."
 
 #: src/settings_translation_file.cpp
 msgid "Lower Y limit of floatlands."
@@ -5221,62 +5189,51 @@ msgid "Main menu script"
 msgstr "Script del menú principal"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Estilo del menú principal"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
+"Hace que la niebla y los colores del cielo dependan de la hora del día "
+"(amanecer / atardecer) y la dirección de vista."
 
 #: src/settings_translation_file.cpp
 msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 msgstr ""
+"Hace que DirectX funcione con LuaJIT. Desactivar si ocasiona problemas."
 
 #: src/settings_translation_file.cpp
 msgid "Makes all liquids opaque"
+msgstr "Vuelve opacos a todos los líquidos"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Map directory"
+msgid "Map Compression Level for Network Transfer"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map directory"
+msgstr "Directorio de mapas"
+
+#: src/settings_translation_file.cpp
 msgid "Map generation attributes specific to Mapgen Carpathian."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Flat.\n"
 "Occasional lakes and hills can be added to the flat world."
 msgstr ""
-"Atributos del generador de mapas globales.\n"
-"En el generador de mapas V6 la opción (o marcador) \"decorations\" controla "
-"todos los elementos decorativos excepto los árboles y la hierba de la "
-"jungla, en todos los otros generadores de mapas esta opción controla todas "
-"las decoraciones.\n"
-"Las opciones que no son incluidas en el texto con la cadena de opciones no "
-"serán modificadas y mantendrán su valor por defecto.\n"
-"Las opciones que comienzan con el prefijo \"no\" son utilizadas para "
-"inhabilitar esas opciones."
+"Atributos de generación de mapa específicos para generador de mapas planos.\n"
+"Ocasionalmente pueden agregarse lagos y colinas al mundo plano."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Fractal.\n"
 "'terrain' enables the generation of non-fractal terrain:\n"
 "ocean, islands and underground."
 msgstr ""
-"Atributos del generador de mapas globales.\n"
-"En el generador de mapas V6 la opción (o marcador) \"decorations\" controla "
-"todos los elementos decorativos excepto los árboles y la hierba de la "
-"jungla, en todos los otros generadores de mapas esta opción controla todas "
-"las decoraciones.\n"
-"Las opciones que no son incluidas en el texto con la cadena de opciones no "
-"serán modificadas y mantendrán su valor por defecto.\n"
-"Las opciones que comienzan con el prefijo \"no\" son utilizadas para "
-"inhabilitar esas opciones."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5330,11 +5287,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
-msgstr ""
+msgstr "Límite de generación de mapa"
 
 #: src/settings_translation_file.cpp
 msgid "Map save interval"
-msgstr ""
+msgstr "Intervalo de guardado de mapa"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
@@ -5366,54 +5323,48 @@ msgid "Mapgen Flat"
 msgstr "Generador de mapas plano"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Flat specific flags"
-msgstr "Banderas planas de Mapgen"
+msgstr "Banderas de generador de mapas plano"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Fractal"
 msgstr "Generador de mapas fractal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal specific flags"
-msgstr "Banderas planas de Mapgen"
+msgstr "Banderas de generador de mapas fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V5"
 msgstr "Generador de mapas V5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V5 specific flags"
-msgstr "Banderas planas de Mapgen"
+msgstr "Banderas de generador de mapas V5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V6"
 msgstr "Generador de mapas V6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V6 specific flags"
-msgstr "Banderas planas de Mapgen"
+msgstr "Banderas de generador de mapas V6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V7"
 msgstr "Generador de mapas v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V7 specific flags"
-msgstr "Banderas planas de Mapgen"
+msgstr "Banderas de generador de mapas V7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys"
-msgstr "Valles de Mapgen"
+msgstr "Generador de mapas Valleys"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Valleys specific flags"
-msgstr "Banderas planas de Mapgen"
+msgstr "Banderas de generador de mapas Valleys"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen debug"
@@ -5446,11 +5397,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS"
-msgstr "FPS máximos"
+msgstr "FPS máximo"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "FPS máximos cuando el juego está pausado."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr "FPS máximo cuando el juego está pausado."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -5501,6 +5452,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5557,6 +5515,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
 msgstr ""
+"Tiempo máximo en ms que puede demorar una descarga (por ejemplo, la descarga "
+"de un mod)."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum users"
@@ -5568,7 +5528,7 @@ msgstr "Menús"
 
 #: src/settings_translation_file.cpp
 msgid "Mesh cache"
-msgstr ""
+msgstr "Caché de mallas poligonales"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day"
@@ -5584,7 +5544,7 @@ msgstr "Método utilizado para resaltar el objeto seleccionado."
 
 #: src/settings_translation_file.cpp
 msgid "Minimal level of logging to be written to chat."
-msgstr ""
+msgstr "Nivel mínimo de logging a ser escrito al chat."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
@@ -5626,11 +5586,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
-msgstr ""
+msgstr "Ruta de fuente monoespaciada"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font size"
-msgstr ""
+msgstr "Tamaño de fuente monoespaciada"
 
 #: src/settings_translation_file.cpp
 msgid "Mountain height noise"
@@ -5650,11 +5610,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
-msgstr ""
+msgstr "Sensibilidad del ratón"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity multiplier."
-msgstr ""
+msgstr "Multiplicador de sensiblidad del ratón."
 
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
@@ -5688,6 +5648,10 @@ msgid ""
 "When running a server, clients connecting with this name are admins.\n"
 "When starting from the main menu, this is overridden."
 msgstr ""
+"Nombre del jugador.\n"
+"Cuando se ejecuta un servidor, los clientes que se conecten con este nombre "
+"son administradores.\n"
+"Al comenzar desde el menú principal, esto se anula."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5710,7 +5674,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "New users need to input this password."
-msgstr ""
+msgstr "Los usuarios nuevos deben ingresar esta contraseña."
 
 #: src/settings_translation_file.cpp
 msgid "Noclip"
@@ -5733,14 +5697,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5766,16 +5722,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Contenido del repositorio en linea"
 
 #: src/settings_translation_file.cpp
 msgid "Opaque liquids"
-msgstr ""
+msgstr "Líquidos opacos"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5795,39 +5747,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion"
-msgstr "Oclusión de paralaje"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion bias"
-msgstr "Oclusión de paralaje"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion iterations"
-msgstr "Oclusión de paralaje"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion mode"
-msgstr "Oclusión de paralaje"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "Oclusión de paralaje"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5895,6 +5814,16 @@ msgid "Pitch move mode"
 msgstr "Modo de movimiento de inclinación activado"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Tecla vuelo"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Intervalo de repetición del botón del Joystick"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5948,7 +5877,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Profiling"
-msgstr ""
+msgstr "Perfilando"
 
 #: src/settings_translation_file.cpp
 msgid "Prometheus listener address"
@@ -6052,10 +5981,6 @@ msgid "Right key"
 msgstr "Tecla derecha"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "River channel depth"
 msgstr "Profundidad del relleno"
@@ -6074,7 +5999,7 @@ msgstr "Ruido de río"
 
 #: src/settings_translation_file.cpp
 msgid "River size"
-msgstr ""
+msgstr "Tamaño del río"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -6343,6 +6268,17 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Fuente en negrita por defecto"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -6473,10 +6409,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "La fuerza del paralaje del modo 3D."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Fuerza de los mapas normales generados."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6571,6 +6503,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6629,8 +6565,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6656,15 +6592,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6802,6 +6743,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -7012,6 +6964,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -7134,10 +7092,28 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "cURL file download timeout"
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "cURL file download timeout"
+msgstr "Tiempo de espera de descarga por cURL"
+
+#: src/settings_translation_file.cpp
 msgid "cURL parallel limit"
 msgstr ""
 
@@ -7145,17 +7121,12 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "Tiempo de espera de cURL"
 
-#~ msgid "Ok"
-#~ msgstr "Aceptar"
-
-#~ msgid "Back"
-#~ msgstr "Atrás"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Descargando e instalando $1, por favor espere..."
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Ruta para guardar las capturas de pantalla."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "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)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7171,6 +7142,37 @@ msgstr "Tiempo de espera de cURL"
 #~ "Modifica cómo las tierras flotantes del tipo montaña aparecen arriba y "
 #~ "abajo del punto medio."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "¿Estás seguro de querer reiniciar el mundo de un jugador?"
+
+#~ msgid "Back"
+#~ msgstr "Atrás"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Mapeado de relieve"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Mapeado de relieve"
+
+#~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Cambia la UI del menú principal:\n"
+#~ "-   Completo: Múltiples mundos, elección de juegos y texturas, etc.\n"
+#~ "-   Simple: Un solo mundo, sin elección de juegos o texturas.\n"
+#~ "Puede ser necesario en pantallas pequeñas."
+
+#~ msgid "Config mods"
+#~ msgstr "Configurar mods"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
 #~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
@@ -7182,6 +7184,9 @@ msgstr "Tiempo de espera de cURL"
 #~ msgstr ""
 #~ "Controla el ancho de los túneles, un valor menor crea túneles más anchos."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Color de la cruz (R,G,B)."
+
 #, fuzzy
 #~ msgid "Darkness sharpness"
 #~ msgstr "Agudeza de la obscuridad"
@@ -7193,12 +7198,59 @@ msgstr "Tiempo de espera de cURL"
 #~ "Define áreas de terreno liso flotante.\n"
 #~ "Las zonas flotantes lisas se producen cuando el ruido > 0."
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Define el intervalo de muestreo de las texturas.\n"
+#~ "Un valor más alto causa mapas de relieve más suaves."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Descargando e instalando $1, por favor espere..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Activar VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Habilita mapeado de relieves para las texturas. El mapeado de normales "
+#~ "necesita ser\n"
+#~ "suministrados por el paquete de texturas, o será generado "
+#~ "automaticamente.\n"
+#~ "Requiere habilitar sombreadores."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Habilita el mapeado de tonos fílmico"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Habilita la generación de mapas de normales (efecto realzado) en el "
+#~ "momento.\n"
+#~ "Requiere habilitar mapeado de relieve."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Habilita mapeado de oclusión de paralaje.\n"
+#~ "Requiere habilitar sombreadores."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Opción experimental, puede causar espacios visibles entre los\n"
+#~ "bloques si se le da un valor mayor a 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS (cuadros/s) en el menú de pausa"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Ruido de altura base para tierra flotante"
 
@@ -7211,6 +7263,12 @@ msgstr "Tiempo de espera de cURL"
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Generar mapas normales"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Generar mapas normales"
+
 #~ msgid "IPv6 support."
 #~ msgstr "soporte IPv6."
 
@@ -7218,11 +7276,82 @@ msgstr "Tiempo de espera de cURL"
 #~ msgid "Lava depth"
 #~ msgstr "Características de la Lava"
 
-#~ msgid "Waving water"
-#~ msgstr "Oleaje en el agua"
+#~ msgid "Main"
+#~ msgstr "Principal"
 
-#~ msgid "Waving Water"
-#~ msgstr "Oleaje"
+#~ msgid "Main menu style"
+#~ msgstr "Estilo del menú principal"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Minimapa en modo radar, Zoom x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Minimapa en modo radar, Zoom x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Minimapa en modo superficie, Zoom x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Minimapa en modo superficie, Zoom x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nombre / contraseña"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Oclusión de paralaje"
+
+#, fuzzy
+#~ msgid "Parallax occlusion"
+#~ msgstr "Oclusión de paralaje"
+
+#, fuzzy
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Oclusión de paralaje"
+
+#, fuzzy
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Oclusión de paralaje"
+
+#, fuzzy
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Oclusión de paralaje"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Oclusión de paralaje"
+
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Ruta para guardar las capturas de pantalla."
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Reiniciar mundo de un jugador"
 
 #~ msgid "Select Package File:"
 #~ msgstr "Seleccionar el archivo del paquete:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Comenzar un jugador"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Fuerza de los mapas normales generados."
+
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Activar cinemático"
+
+#~ msgid "View"
+#~ msgstr "Ver"
+
+#~ msgid "Waving Water"
+#~ msgstr "Oleaje"
+
+#~ msgid "Waving water"
+#~ msgstr "Oleaje en el agua"
+
+#~ msgid "Yes"
+#~ msgstr "Sí"
diff --git a/po/et/minetest.po b/po/et/minetest.po
index c9da5e664..5feb9be60 100644
--- a/po/et/minetest.po
+++ b/po/et/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Estonian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-05-03 19:14+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-12-05 15:29+0000\n"
 "Last-Translator: Janar Leas <janar.leas@gmail.com>\n"
 "Language-Team: Estonian <https://hosted.weblate.org/projects/minetest/"
 "minetest/et/>\n"
@@ -12,11 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.1-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Ärka ellu"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Said surma"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "Valmis"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -32,16 +40,12 @@ msgstr "Peamenüü"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr "Taasta ühendus"
+msgstr "Taasühenda"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
 msgstr "Server taotles taasühendumist:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Laadimine..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Protokolli versioon ei sobi. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Server toetab protokolli versioone $1 kuni $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Proovi lubada uuesti avalike serverite loend ja kontrolli oma Interneti "
-"ühendust."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Meie toetame ainult protokolli versiooni $1."
 
@@ -68,7 +66,8 @@ msgstr "Meie toetame ainult protokolli versiooni $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Meie toetame protokolli versioone $1 kuni $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Meie toetame protokolli versioone $1 kuni $2."
 msgid "Cancel"
 msgstr "Tühista"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Sõltuvused:"
 
@@ -103,12 +103,12 @@ msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "characters [a-z0-9_] are allowed."
 msgstr ""
-"Tõrge MOD-i \"$1\" lubamisel, kuna sisaldab keelatud sümboleid. Lubatud on "
+"MOD-i \"$1\" kasutamine nurjus, kuna sisaldab keelatud sümboleid. Lubatud on "
 "ainult [a-z0-9_] märgid."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "Leia rohkem MODe"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -152,21 +152,61 @@ msgid "enabled"
 msgstr "Sisse lülitatud"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Allalaadimine..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Kõik pakid"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Nupp juba kasutuses"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Tagasi peamenüüsse"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Võõrusta"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "Laadimine..."
+msgstr "Allalaadimine..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
@@ -182,6 +222,16 @@ msgid "Install"
 msgstr "Paigalda"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Paigalda"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Valikulised sõltuvused:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "MOD-id"
@@ -195,9 +245,25 @@ msgid "No results"
 msgstr "Tulemused puuduvad"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Otsi"
+#, fuzzy
+msgid "No updates"
+msgstr "Uuenda"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -212,7 +278,11 @@ msgid "Update"
 msgstr "Uuenda"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -221,42 +291,39 @@ msgstr "Maailm nimega \"$1\" on juba olemas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Täiendav maastik"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr ""
+msgstr "Külmetus kõrgus"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
-msgstr ""
+msgstr "Põua kõrgus"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biome blending"
-msgstr ""
+msgstr "Loodusvööndi hajumine"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biomes"
-msgstr ""
+msgstr "Loodusvööndid"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caverns"
-msgstr "Koobaste läve"
+msgstr "Koopasaalid"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "Oktaavid"
+msgstr "Koopad"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "Loo"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Teave:"
+msgstr "Ilmestused"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -267,21 +334,20 @@ msgid "Download one from minetest.net"
 msgstr "Laadi minetest.net-st üks mäng alla"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "Dungeon noise"
+msgstr "Keldrid"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Lame maastik"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "Taevas hõljuvad saared"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
-msgstr ""
+msgstr "Lendsaared (katseline)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -289,53 +355,51 @@ msgstr "Mäng"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Mitte-fraktaalse maastiku tekitamine: mered ja süvapinnas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Künkad"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
-msgstr ""
+msgstr "Rõsked jõed"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Suurendab niiskust jõe lähistel"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Järved"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "Madal niiskus ja suur kuum põhjustavad madala või kuiva jõesängi"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
 msgstr "Kaardi generaator"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen flags"
-msgstr "Põlvkonna kaardid"
+msgstr "Kaartiloome lipud"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mapgen-specific flags"
-msgstr "Põlvkonna kaardid"
+msgstr "Kaartiloome-põhised lipud"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "Mäed"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Muda voog"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Käikude ja koobaste võrgustik"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -343,72 +407,72 @@ msgstr "Mäng valimata"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "Ilma jahenemine kõrgemal"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "Ilma kuivenemine kõrgemal"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Rivers"
-msgstr "Parem Windowsi nupp"
+msgstr "Jõed"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Jõed merekõrgusel"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Seed"
-msgstr "Seed"
+msgstr "Külv"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "Sujuv loodusvööndi vaheldumine"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"Rajatised ilmuvad maastikul (v6 tekitatud puudele ja tihniku rohule mõju ei "
+"avaldu)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "Struktuurid ilmuvad maastikul, enamasti puud ja teised taimed"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "Rohtla, Lagendik"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "Rohtla, Lagendik, Tihnik"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "Rohtla, Lagendik, Tihnik, Tundra, Laas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr ""
+msgstr "Maapinna kulumine"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "Puud ja tihniku rohi"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Vary river depth"
-msgstr ""
+msgstr "Muutlik jõe sügavus"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Väga suured koopasaalid maapõue sügavuses"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
-msgstr "Hoiatus: minimaalne arendustest on mõeldud arendajatele."
+msgstr "Hoiatus: \"Arendustest\" on mõeldud arendajatele."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -446,7 +510,7 @@ msgstr "Nõustu"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr "Nimetad ümber MOD-i paki:"
+msgstr "Taasnimeta MOD-i pakk:"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid ""
@@ -462,7 +526,7 @@ msgstr "(Kirjeldus seadistusele puudub)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "2D Noise"
-msgstr "2-mõõtmeline müra"
+msgstr "kahemõõtmeline müra"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
@@ -473,10 +537,6 @@ msgid "Browse"
 msgstr "Sirvi"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Keelatud"
 
@@ -490,11 +550,11 @@ msgstr "Lubatud"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Lacunarity"
-msgstr "Lakunaarsus"
+msgstr "Pinna auklikus"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Octaves"
-msgstr "Oktaavid"
+msgstr "Oktavid"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
 msgid "Offset"
@@ -521,6 +581,10 @@ msgid "Scale"
 msgstr "Ulatus"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Otsi"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Vali kataloog"
 
@@ -546,7 +610,7 @@ msgstr "X"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "X spread"
-msgstr "X levitus"
+msgstr "X levi"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Y"
@@ -554,7 +618,7 @@ msgstr "Y"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Y spread"
-msgstr "Y levitus"
+msgstr "Y levi"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Z"
@@ -562,7 +626,7 @@ msgstr "Z"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Z spread"
-msgstr "Z levitus"
+msgstr "Z levi"
 
 #. ~ "absvalue" is a noise parameter flag.
 #. It is short for "absolute value".
@@ -570,14 +634,14 @@ msgstr "Z levitus"
 #. main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "absvalue"
-msgstr "absoluutväärtus"
+msgstr "täisväärtus"
 
 #. ~ "defaults" is a noise parameter flag.
 #. It describes the default processing options
 #. for noise settings in main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "defaults"
-msgstr "vaikesätted"
+msgstr "algne"
 
 #. ~ "eased" is a noise parameter flag.
 #. It is used to make the map smoother and
@@ -636,6 +700,21 @@ msgstr "Mod nimega $1 paigaldamine nurjus"
 msgid "Unable to install a modpack as a $1"
 msgstr "Mod-komplekt nimega $1 paigaldamine nurjus"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Laadimine..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Kliendipoolne skriptimine on keelatud"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Proovi lubada uuesti avalike serverite loend ja kontrolli oma Interneti "
+"ühendust."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Sirvi veebist sisu"
@@ -678,63 +757,66 @@ msgstr "Vali tekstuurikomplekt"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
-msgstr "Co-arendaja"
+msgstr "Tegevad panustajad"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Core Developers"
-msgstr "Põhiline arendaja"
+msgstr "Põhi arendajad"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
-msgstr "Tänuavaldused"
+msgstr "Tegijad"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Vali kataloog"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
-msgstr "Early arendajad"
+msgstr "Eelnevad panustajad"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
-msgstr "Eelmised põhilised arendajad"
+msgstr "Eelnevad põhi-arendajad"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Announce Server"
-msgstr "Kuuluta serverist"
+msgstr "Võõrustamise kuulutamine"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Bind Address"
-msgstr "Aadress"
+msgstr "Seo aadress"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Konfigureeri"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
-msgstr "Kujunduslik mängumood"
+msgstr "Looja"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
-msgstr "Lülita valu sisse"
+msgstr "Ellujääja"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Game"
-msgstr "Majuta mäng"
+msgstr "Võõrusta"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Server"
-msgstr "Majuta server"
+msgstr "Majuta külastajatele"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "Lisa mänge sisuvaramust"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nimi/Parool"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -742,7 +824,12 @@ msgstr "Uus"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "No world created or selected!"
-msgstr "Ãœhtegi maailma pole loodud ega valitud!"
+msgstr "Pole valitud ega loodud ühtegi maailma!"
+
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Uus parool"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
@@ -753,57 +840,62 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Vali maailm:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Vali maailm:"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Server Port"
-msgstr "Serveri port"
+msgstr "Võõrustaja kanal"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Start Game"
-msgstr "Alusta mäng"
+msgstr "Alusta mängu"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
-msgstr "Aadress / Port"
+msgstr "Aadress / kanal"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
-msgstr "Liitu"
+msgstr "Ãœhine"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
-msgstr "Loov režiim"
+msgstr "Looja"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
-msgstr "Kahjustamine lubatud"
+msgstr "Ellujääja"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
-msgstr "Eemalda lemmik"
+msgstr "Pole lemmik"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
-msgstr "Lisa lemmikuks"
+msgstr "On lemmik"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Join Game"
-msgstr "Liitu mänguga"
+msgstr "Ãœhine"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
-msgstr "Nimi / Salasõna"
+msgstr "Nimi / salasõna"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
-msgstr "Ping"
+msgstr "Viivitus"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
-msgstr "PvP lubatud"
+msgstr "Vaenulikus lubatud"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
@@ -811,7 +903,7 @@ msgstr "2x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "3D Clouds"
-msgstr "3D pilved"
+msgstr "Ruumilised pilved"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "4x"
@@ -827,24 +919,16 @@ msgstr "Kõik sätted"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr "Antialiasing:"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Olete kindel, et lähtestate oma üksikmängija maailma?"
+msgstr "Silu servad:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
-msgstr "Salvesta ekraani suurus"
+msgstr "Mäleta ekraani suurust"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
 msgstr "Bi-lineaarne filtreerimine"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Muhkkaardistamine"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Vaheta klahve"
@@ -858,22 +942,14 @@ msgid "Fancy Leaves"
 msgstr "Uhked lehed"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Loo normaalkaardistusi"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
-msgstr "Mipmap"
+msgstr "KaugVaatEsemeKaart"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Ei"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Filtrita"
 
@@ -883,11 +959,11 @@ msgstr "Mipmapita"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
-msgstr "Blokkide esiletõstmine"
+msgstr "Valitud klotsi ilme"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Outlining"
-msgstr "Blokkide kontuur"
+msgstr "Klotsi servad"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "None"
@@ -901,19 +977,11 @@ msgstr "Läbipaistmatud lehed"
 msgid "Opaque Water"
 msgstr "Läbipaistmatu vesi"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Osakesed"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Lähtesta üksikmängija maailm"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Ekraan:"
 
@@ -926,6 +994,11 @@ msgid "Shaders"
 msgstr "Varjutajad"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Lendsaared (katseline)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Varjutajad (pole saadaval)"
 
@@ -969,22 +1042,6 @@ msgstr "Lainetavad vedelikud"
 msgid "Waving Plants"
 msgstr "Lehvivad taimed"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Jah"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Seadista mod-e"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Peamine"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Alusta üksikmängu"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Ãœhendus aegus."
@@ -995,11 +1052,11 @@ msgstr "Valmis!"
 
 #: src/client/client.cpp
 msgid "Initializing nodes"
-msgstr "Blokkide häälestamine"
+msgstr "Klotsidega täitmine"
 
 #: src/client/client.cpp
 msgid "Initializing nodes..."
-msgstr "Blokkide häälestamine..."
+msgstr "Klotsidega täitmine..."
 
 #: src/client/client.cpp
 msgid "Loading textures..."
@@ -1092,7 +1149,7 @@ msgstr "- Avalik: "
 #. ~ PvP = Player versus Player
 #: src/client/game.cpp
 msgid "- PvP: "
-msgstr "- PvP: "
+msgstr "- Ãœksteise vastu: "
 
 #: src/client/game.cpp
 msgid "- Server Name: "
@@ -1146,18 +1203,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Klahvid:\n"
 "- %s: liigu edasi\n"
@@ -1271,16 +1325,6 @@ msgid "Fog enabled"
 msgstr "Udu lubatud"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Udu keelatud"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Udu lubatud"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Mängu teave:"
 
@@ -1301,16 +1345,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Udu keelatud"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Kahjustamine lubatud"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Meedia..."
 
@@ -1323,34 +1357,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Pisikaardi keelab hetkel mäng või MOD"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Pisikaart peidetud"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Radarkaart, Suurendus ×1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Radarkaart, Suurendus ×2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Radarkaart, Suurendus ×4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Pinnakaart, Suurendus ×1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Pinnakaart, Suurendus ×2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Pinnakaart, Suurendus ×4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Haakumatus keelatud"
 
@@ -1364,15 +1370,15 @@ msgstr "Haakumatus lubatud (pole 'haakumatus' volitust)"
 
 #: src/client/game.cpp
 msgid "Node definitions..."
-msgstr ""
+msgstr "Klotsi määratlused..."
 
 #: src/client/game.cpp
 msgid "Off"
-msgstr ""
+msgstr "Väljas"
 
 #: src/client/game.cpp
 msgid "On"
-msgstr ""
+msgstr "Sees"
 
 #: src/client/game.cpp
 msgid "Pitch move mode disabled"
@@ -1388,19 +1394,15 @@ msgstr ""
 
 #: src/client/game.cpp
 msgid "Remote server"
-msgstr ""
+msgstr "Kaug võõrustaja"
 
 #: src/client/game.cpp
 msgid "Resolving address..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Respawn"
-msgstr "Ärka ellu"
+msgstr "Aadressi lahendamine..."
 
 #: src/client/game.cpp
 msgid "Shutting down..."
-msgstr ""
+msgstr "Sulgemine..."
 
 #: src/client/game.cpp
 msgid "Singleplayer"
@@ -1416,11 +1418,11 @@ msgstr "Heli vaigistatud"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "Heli süsteem on keelatud"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "See kooste ei toeta heli süsteemi"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1429,17 +1431,17 @@ msgstr "Heli taastatud"
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range changed to %d"
-msgstr ""
+msgstr "Vaate kaugus on nüüd: %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at maximum: %d"
-msgstr ""
+msgstr "Vaate kaugus on suurim võimalik: %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at minimum: %d"
-msgstr ""
+msgstr "Vaate kaugus on vähim võimalik: %d"
 
 #: src/client/game.cpp
 #, c-format
@@ -1451,10 +1453,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Said surma"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1471,15 +1469,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Vestlus peidetud"
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1501,9 +1490,8 @@ msgid "Apps"
 msgstr "Aplikatsioonid"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Backspace"
-msgstr "Tagasi"
+msgstr "Tagasinihe"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
@@ -1542,29 +1530,24 @@ msgid "Home"
 msgstr "Kodu"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "IME Accept"
-msgstr "Nõustu"
+msgstr "Sisendviisiga nõustumine"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "IME Convert"
-msgstr "Konverteeri"
+msgstr "Sisendviisi teisendamine"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "IME Escape"
-msgstr "Põgene"
+msgstr "Sisendviisi paoklahv"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "IME Mode Change"
-msgstr "Moodi vahetamine"
+msgstr "Sisendviisi laadi vahetus"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "IME Nonconvert"
-msgstr "Konverteerimatta"
+msgstr "Sisendviisi mitte-teisendada"
 
 #: src/client/keycode.cpp
 msgid "Insert"
@@ -1765,6 +1748,25 @@ msgstr "X Nupp 2"
 msgid "Zoom"
 msgstr "Suumi"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Pisikaart peidetud"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Radarkaart, Suurendus ×1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Pinnakaart, Suurendus ×1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Pinnakaart, Suurendus ×1"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Paroolid ei ole samad!"
@@ -1792,9 +1794,8 @@ msgid "\"Special\" = climb down"
 msgstr "\"Eriline\" = roni alla"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Autoforward"
-msgstr "Automaatedasiliikumine"
+msgstr "Iseastuja"
 
 #: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Automatic jumping"
@@ -1805,26 +1806,6 @@ msgid "Backward"
 msgstr "Tagasi"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Muuda kaamerat"
 
@@ -1919,30 +1900,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Hiilimine"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Lülita kiirus sisse"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Lülita kiirus sisse"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Lülita HUD sisse/välja"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Lülita lendamine sisse"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Lülita vestluslogi sisse/välja"
 
@@ -2052,12 +2013,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2164,6 +2119,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2173,7 +2132,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration of gravity, in nodes per second per second."
-msgstr ""
+msgstr "Raskuskiirendus, (klotsi sekundis) sekundi kohta."
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifiers"
@@ -2200,7 +2159,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Adds particles when digging a node."
-msgstr ""
+msgstr "Lendlevad osakesed klotsi kaevandamisel."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2306,7 +2265,7 @@ msgstr "Automaatse edasiliikumise klahv"
 
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
-msgstr ""
+msgstr "Iseseisvalt hüppab üle ühe klotsi kordse tõkke."
 
 #: src/settings_translation_file.cpp
 msgid "Automatically report to the serverlist."
@@ -2397,10 +2356,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Muhkkaardistamine"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2471,16 +2426,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2489,9 +2434,8 @@ msgid "Chat key"
 msgstr "Vestlusklahv"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat log level"
-msgstr "Vestluse lülitusklahv"
+msgstr "Vestlus päeviku täpsus"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
@@ -2502,9 +2446,8 @@ msgid "Chat message format"
 msgstr "Vestluse sõnumi formaat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat message kick threshold"
-msgstr "Vestlussõnumi kick läve"
+msgstr "Vestlus sõnumi väljaviskamis lävi"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message max length"
@@ -2615,7 +2558,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Connects glass if supported by node."
-msgstr ""
+msgstr "Ühendab klaasi, kui klots võimaldab."
 
 #: src/settings_translation_file.cpp
 msgid "Console alpha"
@@ -2634,8 +2577,12 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
-msgstr "ContentDB URL"
+msgstr "ContentDB aadress"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward"
@@ -2690,7 +2637,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2698,7 +2647,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2706,9 +2657,8 @@ msgid "DPI"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Damage"
-msgstr "Damage"
+msgstr "Vigastused"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
@@ -2761,9 +2711,8 @@ msgid "Default report format"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default stack size"
-msgstr "Vaikemäng"
+msgstr "Vaike lasu hulk"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2800,12 +2749,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2863,19 +2806,26 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Desert noise threshold"
-msgstr ""
+msgstr "Müra künnis lagendikule"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Deserts occur when np_biome exceeds this value.\n"
 "When the 'snowbiomes' flag is enabled, this is ignored."
 msgstr ""
+"Lagendikud ilmuvad kui np_biome ületab selle väärtuse.\n"
+"Seda eiratakse, kui lipp 'lumistud' on lubatud."
 
 #: src/settings_translation_file.cpp
 msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Parem klahv"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Kaevamisel tekkivad osakesed"
 
@@ -2916,9 +2866,8 @@ msgid "Dungeon minimum Y"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Dungeon noise"
-msgstr "Dungeon noise"
+msgstr "Müra keldritele"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2937,7 +2886,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3025,14 +2974,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3042,18 +2983,6 @@ msgstr "Lubab minikaarti."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3070,12 +2999,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3085,7 +3008,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3174,9 +3097,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Filtering"
-msgstr "Anisotroopne Filtreerimine"
+msgstr "Filtreerimine"
 
 #: src/settings_translation_file.cpp
 msgid "First of 4 2D noises that together define hill/mountain range height."
@@ -3207,9 +3129,8 @@ msgid "Floatland minimum Y"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland noise"
-msgstr "Põlvkonna kaardid"
+msgstr "Müra lendsaartele"
 
 #: src/settings_translation_file.cpp
 msgid "Floatland taper exponent"
@@ -3325,9 +3246,8 @@ msgid "Formspec full-screen background opacity (between 0 and 255)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Forward key"
-msgstr "Edasi"
+msgstr "Edasi klahv"
 
 #: src/settings_translation_file.cpp
 msgid "Fourth of 4 2D noises that together define hill/mountain range height."
@@ -3390,10 +3310,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3403,6 +3319,10 @@ msgid ""
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations."
 msgstr ""
+"Ãœldised maailma-loome omadused.\n"
+"Maailma loome v6 puhul lipp 'Ilmestused' ei avalda mõju puudele ja \n"
+"tihniku rohule, kõigi teiste versioonide puhul mõjutab see lipp \n"
+"kõiki ilmestusi (nt: lilled, seened, vetikad, korallid, jne)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3425,14 +3345,12 @@ msgid "Gravity"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ground level"
-msgstr "Põlvkonna kaardid"
+msgstr "Pinna tase"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ground noise"
-msgstr "Põlvkonna kaardid"
+msgstr "Müra pinnasele"
 
 #: src/settings_translation_file.cpp
 msgid "HTTP mods"
@@ -3449,8 +3367,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3476,9 +3394,8 @@ msgid "Height component of the initial window size."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height noise"
-msgstr "Parem Windowsi nupp"
+msgstr "Müra kõrgusele"
 
 #: src/settings_translation_file.cpp
 msgid "Height select noise"
@@ -3489,14 +3406,12 @@ msgid "High-precision FPU"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hill steepness"
-msgstr "Põlvkonna kaardid"
+msgstr "Küngaste järskus"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hill threshold"
-msgstr "Põlvkonna kaardid"
+msgstr "Küngaste lävi"
 
 #: src/settings_translation_file.cpp
 msgid "Hilliness1 noise"
@@ -3806,9 +3721,8 @@ msgid "Ignore world errors"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "In-Game"
-msgstr "Mäng"
+msgstr "Mängu-sisene"
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
@@ -3823,9 +3737,8 @@ msgid "In-game chat console height, between 0.1 (10%) and 1.0 (100%)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Inc. volume key"
-msgstr "Konsool"
+msgstr "Heli valjemaks"
 
 #: src/settings_translation_file.cpp
 msgid "Initial vertical speed when jumping, in nodes per second."
@@ -3878,9 +3791,8 @@ msgid "Inventory items animations"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Inventory key"
-msgstr "Seljakott"
+msgstr "Varustuse klahv"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse"
@@ -3923,6 +3835,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3980,9 +3896,8 @@ msgid "Julia z"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Jump key"
-msgstr "Hüppamine"
+msgstr "Hüppa"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
@@ -4004,6 +3919,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4103,6 +4025,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4479,14 +4408,12 @@ msgid "Kick players who sent more than X messages per 10 seconds."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lake steepness"
-msgstr "Põlvkonna kaardid"
+msgstr "Sügavus järvedele"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lake threshold"
-msgstr "Põlvkonna kaardid"
+msgstr "Järvede lävi"
 
 #: src/settings_translation_file.cpp
 msgid "Language"
@@ -4509,9 +4436,8 @@ msgid "Large cave proportion flooded"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Large chat console key"
-msgstr "Konsool"
+msgstr "Suure vestlus-viiba klahv"
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
@@ -4526,9 +4452,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Left key"
-msgstr "Vasak Menüü"
+msgstr "Vasak klahv"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4659,14 +4584,8 @@ msgid "Lower Y limit of floatlands."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Main menu script"
-msgstr "Menüü"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Menüü"
+msgstr "Peamenüü skript"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4682,6 +4601,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4723,6 +4650,11 @@ msgid ""
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
 "the 'jungles' flag is ignored."
 msgstr ""
+"Maailma-loome v6 spetsiifilised omadused. \n"
+"Lipp 'lumistud' võimaldab uudse 5-e loodusvööndi süsteemi.\n"
+"Kui lipp 'lumistud' on lubatud, siis võimaldatakse ka tihnikud ning "
+"eiratakse \n"
+"lippu 'tihnikud'."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4757,84 +4689,68 @@ msgid "Mapblock unload timeout"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Carpathian"
-msgstr "Põlvkonna kaardid"
+msgstr "Maailmaloome: Mäestik"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Carpathian specific flags"
-msgstr "Põlvkonna kaardid"
+msgstr "Mäestiku spetsiifilised omadused"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Flat"
-msgstr "Põlvkonna kaardid"
+msgstr "Maailmaloome: Lamemaa"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Flat specific flags"
-msgstr "Põlvkonna kaardid"
+msgstr "Lamemaa spetsiifilised omadused"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal"
-msgstr "Põlvkonna kaardid"
+msgstr "Maailmaloome: Fraktaalne"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal specific flags"
-msgstr "Põlvkonna kaardid"
+msgstr "Fraktaalse maailma spetsiifilised lipud"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V5"
-msgstr "Põlvkonna kaardid"
+msgstr "Maailmaloome: V5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V5 specific flags"
-msgstr "Põlvkonna kaardid"
+msgstr "V5 spetsiifilised lipud"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V6"
-msgstr "Põlvkonna kaardid"
+msgstr "Maailmaloome: V6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V6 specific flags"
-msgstr "Põlvkonna kaardid"
+msgstr "V6 spetsiifilised lipud"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V7"
-msgstr "Põlvkonna kaardid"
+msgstr "Maailmaloome: V7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V7 specific flags"
-msgstr "Põlvkonna kaardid"
+msgstr "V7 spetsiifilised lipud"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Valleys"
-msgstr "Põlvkonna kaardid"
+msgstr "Maailmaloome: Vooremaa"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Valleys specific flags"
-msgstr "Põlvkonna kaardid"
+msgstr "Vooremaa spetsiifilised lipud"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen debug"
-msgstr "Põlvkonna kaardid"
+msgstr "Maailmaloome: veaproov"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen name"
-msgstr "Põlvkonna kaardid"
+msgstr "Maailma tekitus-valemi nimi"
 
 #: src/settings_translation_file.cpp
 msgid "Max block generate distance"
@@ -4861,7 +4777,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4910,6 +4826,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -4971,9 +4894,8 @@ msgid "Maximum users"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Menus"
-msgstr "Menüü"
+msgstr "Menüüd"
 
 #: src/settings_translation_file.cpp
 msgid "Mesh cache"
@@ -5020,9 +4942,8 @@ msgid "Minimum texture size"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mipmapping"
-msgstr "Väga hea kvaliteet"
+msgstr "Astmik-tapeetimine"
 
 #: src/settings_translation_file.cpp
 msgid "Mod channels"
@@ -5075,9 +4996,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mute key"
-msgstr "Vajuta nuppu"
+msgstr "Vaigista"
 
 #: src/settings_translation_file.cpp
 msgid "Mute sound"
@@ -5142,14 +5062,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5175,10 +5087,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5204,34 +5112,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5289,15 +5169,23 @@ msgid "Physics"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Pitch move key"
-msgstr "Kujunduslik mängumood"
+msgstr "Kõrvale astumise klahv"
 
 #: src/settings_translation_file.cpp
 msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Kõrvale astumise klahv"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5385,18 +5273,16 @@ msgid "Random input"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Range select key"
-msgstr "Kauguse valik"
+msgstr "Valiku ulatuse klahv"
 
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Regular font path"
-msgstr "Vali"
+msgstr "Tavafondi asukoht"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
@@ -5417,9 +5303,8 @@ msgid "Replaces the default main menu with a custom one."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Report path"
-msgstr "Vali"
+msgstr "Aruande asukoht"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5452,13 +5337,8 @@ msgid "Ridged mountain size noise"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Right key"
-msgstr "Parem Menüü"
-
-#: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
+msgstr "Parem klahv"
 
 #: src/settings_translation_file.cpp
 msgid "River channel depth"
@@ -5473,9 +5353,8 @@ msgid "River depth"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River noise"
-msgstr "Parem Windowsi nupp"
+msgstr "Jõe müra"
 
 #: src/settings_translation_file.cpp
 msgid "River size"
@@ -5543,14 +5422,12 @@ msgid "Screenshot folder"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot format"
-msgstr "Mängupilt"
+msgstr "Kuvapildi vorming"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Screenshot quality"
-msgstr "Mängupilt"
+msgstr "Kuvapildi tase"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5615,9 +5492,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Server / Singleplayer"
-msgstr "Üksikmäng"
+msgstr "Võõrusta / Üksi"
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
@@ -5644,14 +5520,12 @@ msgid "Server side occlusion culling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Serverlist URL"
-msgstr "Avatud serverite nimekiri:"
+msgstr "Võõrustaja-loendi aadress"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Serverlist file"
-msgstr "Avatud serverite nimekiri:"
+msgstr "Võõrustaja-loendi fail"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5682,9 +5556,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Shader path"
-msgstr "Varjutajad"
+msgstr "Varjutaja asukoht"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5719,6 +5592,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5764,9 +5647,8 @@ msgid "Small-scale temperature variation for blending biomes on borders."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Smooth lighting"
-msgstr "Ilus valgustus"
+msgstr "Hajus valgus"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5783,14 +5665,12 @@ msgid "Smooths rotation of camera. 0 to disable."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Sneak key"
-msgstr "Hiilimine"
+msgstr "Hiilimis klahv"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Sneaking speed"
-msgstr "Hiilimine"
+msgstr "Hiilimis kiirus"
 
 #: src/settings_translation_file.cpp
 msgid "Sneaking speed, in nodes per second."
@@ -5801,9 +5681,8 @@ msgid "Sound"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Special key"
-msgstr "Hiilimine"
+msgstr "Eri klahv"
 
 #: src/settings_translation_file.cpp
 msgid "Special key for climbing/descending"
@@ -5852,10 +5731,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5931,9 +5806,8 @@ msgid "Terrain persistence noise"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Texture path"
-msgstr "Vali graafika:"
+msgstr "Tapeedi kaust"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5950,6 +5824,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6008,8 +5886,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6035,15 +5913,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6100,18 +5983,16 @@ msgid "Tooltip delay"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touch screen threshold"
-msgstr "Põlvkonna kaardid"
+msgstr "Puuteekraani lävi"
 
 #: src/settings_translation_file.cpp
 msgid "Trees noise"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Trilinear filtering"
-msgstr "Tri-Linear Filtreerimine"
+msgstr "kolmik-lineaar filtreerimine"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6181,6 +6062,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6258,7 +6150,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "View distance in nodes."
-msgstr ""
+msgstr "Vaate kaugus klotsides."
 
 #: src/settings_translation_file.cpp
 msgid "View range decrease key"
@@ -6281,9 +6173,8 @@ msgid "Virtual joystick triggers aux button"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Volume"
-msgstr "Hääle volüüm"
+msgstr "Valjus"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6318,40 +6209,35 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."
-msgstr ""
+msgstr "Merepinna kõrgus maailmas."
 
 #: src/settings_translation_file.cpp
 msgid "Waving Nodes"
-msgstr ""
+msgstr "Lainetavad klotsid"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving leaves"
-msgstr "Uhked puud"
+msgstr "Lehvivad lehed"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids"
 msgstr "Lainetavad vedelikud"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave height"
-msgstr "Uhked puud"
+msgstr "Vedeliku laine kõrgus"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave speed"
-msgstr "Uhked puud"
+msgstr "Vedeliku laine kiirus"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wavelength"
-msgstr "Uhked puud"
+msgstr "Vedeliku laine pikkus"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
-msgstr ""
+msgstr "Õõtsuvad taimed"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6389,6 +6275,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6400,7 +6292,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether to allow players to damage and kill each other."
-msgstr ""
+msgstr "Kas mängjail on võimalus teineteist tappa."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6410,7 +6302,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether to fog out the end of the visible area."
-msgstr ""
+msgstr "Kas nähtava ala lõpp udutada."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6447,9 +6339,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "World start time"
-msgstr "Maailma nimi"
+msgstr "Aeg alustatavas maailmas"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6512,6 +6403,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL faili allalaadimine aegus"
 
@@ -6521,20 +6430,32 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "cURL timeout"
-msgstr ""
+msgstr "cURL aegus"
 
-#~ msgid "Ok"
-#~ msgstr "Olgu."
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Kindlasti lähtestad oma üksikmängija maailma algseks?"
 
 #~ msgid "Back"
 #~ msgstr "Tagasi"
 
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Palun oota $1 allalaadimist ja paigaldamist…"
+#~ msgid "Bump Mapping"
+#~ msgstr "Konarlik tapeet"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Muhkkaardistamine"
+
+#~ msgid "Config mods"
+#~ msgstr "Seadista mod-e"
+
+#~ msgid "Configure"
+#~ msgstr "Kohanda"
 
 #~ msgid "Darkness sharpness"
 #~ msgstr "Pimeduse teravus"
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Palun oota $1 allalaadimist ja paigaldamist…"
+
 #~ msgid "Enable VBO"
 #~ msgstr "Luba VBO"
 
@@ -6542,6 +6463,52 @@ msgstr ""
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Lubab filmic tone mapping"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Loo normaalkaardistusi"
+
+#~ msgid "Main"
+#~ msgstr "Peamine"
+
+#~ msgid "Main menu style"
+#~ msgstr "Peamenüü ilme"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Radarkaart, Suurendus ×2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Radarkaart, Suurendus ×4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Pinnakaart, Suurendus ×2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Pinnakaart, Suurendus ×4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nimi/Salasõna"
+
+#~ msgid "No"
+#~ msgstr "Ei"
+
+#~ msgid "Ok"
+#~ msgstr "Olgu."
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Lähtesta üksikmängija maailm"
+
 #, fuzzy
 #~ msgid "Select Package File:"
 #~ msgstr "Vali modifikatsiooni fail:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Alusta üksikmängu"
+
+#, fuzzy
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Lülita kiirus sisse"
+
+#~ msgid "View"
+#~ msgstr "Vaade"
+
+#~ msgid "Yes"
+#~ msgstr "Jah"
diff --git a/po/eu/minetest.po b/po/eu/minetest.po
index c12d2f9ab..d639a79ed 100644
--- a/po/eu/minetest.po
+++ b/po/eu/minetest.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-07-08 20:47+0000\n"
-"Last-Translator: sfan5 <sfan5@live.de>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-23 15:50+0000\n"
+"Last-Translator: Osoitz <oelkoro@gmail.com>\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/minetest/minetest/"
 "eu/>\n"
 "Language: eu\n"
@@ -17,11 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.5\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Birsortu"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Hil zara"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "Ados"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -43,10 +51,6 @@ msgstr "Birkonektatu"
 msgid "The server has requested a reconnect:"
 msgstr "Zerbitzariak birkonexioa eskatu du:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Kargatzen..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Protokoloaren bertsioen desadostasuna. "
@@ -60,12 +64,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Zerbitzariak $1 eta $2 arteko protokolo bertsioak onartzen ditu. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Saia zaitez zerbitzari publikoen zerrenda birgaitzen eta egiazta ezazu zure "
-"internet konexioa."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "$1 bertsioa soilik onartzen dugu."
 
@@ -73,7 +71,8 @@ msgstr "$1 bertsioa soilik onartzen dugu."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "$1 eta $2 arteko protokolo bertsioak onartzen ditugu."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -83,7 +82,8 @@ msgstr "$1 eta $2 arteko protokolo bertsioak onartzen ditugu."
 msgid "Cancel"
 msgstr "Utzi"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Mendekotasunak:"
 
@@ -113,7 +113,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "Mod gehiago aurkitu"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -157,21 +157,61 @@ msgid "enabled"
 msgstr "gaituta"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" existitzen da. Gainidatzi egin nahi al duzu?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 et $2 mendekotasunak instalatuko dira."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 deskargatzen,\n"
+"$2 ilaran"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 deskargatzen..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1-ek behar dituen mendekotasunak ezin dira aurkitu."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+"$1 instalatua izango da, eta $2-ren mendekotasunak baztertu egingo dira."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Pakete guztiak"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Instalaturik jada"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Itzuli menu nagusira"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Oinarri jokoa:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB ez dago erabilgarri Minetest cURL gabe konpilatzean"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "Kargatzen..."
+msgstr "Deskargatzen..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
@@ -187,6 +227,14 @@ msgid "Install"
 msgstr "Instalatu"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "$1 Instalatu"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Falta diren mendekotasunak instalatu"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mod-ak"
@@ -200,13 +248,28 @@ msgid "No results"
 msgstr "Emaitzarik ez"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Bilatu"
+msgid "No updates"
+msgstr "Eguneraketarik ez"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Ez da aurkitu"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Gainidatzi"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Mesedez, egiaztatu oinarri jokoa zuzena dela."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "Ilaran"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
-msgstr ""
+msgstr "testura paketeak"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Uninstall"
@@ -217,8 +280,12 @@ msgid "Update"
 msgstr "Eguneratu"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr ""
+msgid "Update All [$1]"
+msgstr "Guztia eguneratu [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Ikusi informazio gehiago web nabigatzailean"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -226,40 +293,39 @@ msgstr "Badago \"$1\" izeneko mundu bat"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Lurrazal gehigarria"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr ""
+msgstr "Garaierako hotza"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
-msgstr ""
+msgstr "Garaierako lehortasuna"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biome blending"
-msgstr ""
+msgstr "Bioma nahasketa"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biomes"
-msgstr ""
+msgstr "Biomak"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caverns"
-msgstr ""
+msgstr "Leizeak"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caves"
-msgstr ""
+msgstr "Leizeak"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "Sortu"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Informazioa:"
+msgstr "Apaingarriak"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -272,11 +338,11 @@ msgstr "Deskargatu minetest.net zerbitzaritik"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
-msgstr ""
+msgstr "Leotzak"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Lurrazal laua"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
@@ -292,27 +358,29 @@ msgstr "Jolasa"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Lurrazal ez fraktalak sortu: Ozeanoak eta lurpekoak"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Mendiak"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
-msgstr ""
+msgstr "Erreka hezeak"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Hezetasuna areagotu erreka inguruetan"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Lakuak"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
 msgstr ""
+"Hezetasun baxuak eta bero handiak sakonera gutxikoak edo lehorrak diren "
+"ibaiak sortzen dituzte"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -320,7 +388,7 @@ msgstr "Mapa sortzailea"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr ""
+msgstr "Mapgen banderatxoak"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mapgen-specific flags"
@@ -473,10 +541,6 @@ msgid "Browse"
 msgstr "Arakatu"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Desgaituta"
 
@@ -521,6 +585,10 @@ msgid "Scale"
 msgstr "Eskala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Bilatu"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Hautatu direktorioa"
 
@@ -638,6 +706,20 @@ msgstr "Ezinezkoa mod bat $1 moduan instalatzea"
 msgid "Unable to install a modpack as a $1"
 msgstr "Ezinezkoa mod pakete bat $1 moduan instalatzea"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Kargatzen..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Saia zaitez zerbitzari publikoen zerrenda birgaitzen eta egiazta ezazu zure "
+"internet konexioa."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Lineako edukiak esploratu"
@@ -660,7 +742,7 @@ msgstr "Instalaturiko paketeak:"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No dependencies."
-msgstr "Menpekotasunik gabe."
+msgstr "Mendekotasunik gabe."
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No package description available"
@@ -691,7 +773,14 @@ msgid "Credits"
 msgstr "Kredituak"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Hautatu direktorioa"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -711,14 +800,10 @@ msgid "Bind Address"
 msgstr "Helbidea lotu"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Konfiguratu"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Sormen modua"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Kalteak baimendu"
 
@@ -732,10 +817,10 @@ msgstr "Zerbitzari ostalaria"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "Instalatu ContentDB-ko jolasak"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -747,6 +832,10 @@ msgid "No world created or selected!"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr ""
 
@@ -755,6 +844,11 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Hautatu"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ""
 
@@ -764,46 +858,46 @@ msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Start Game"
-msgstr ""
+msgstr "Hasi partida"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
-msgstr ""
+msgstr "Sormen modua"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Join Game"
-msgstr ""
+msgstr "Elkartu partidara"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -825,17 +919,13 @@ msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "All Settings"
-msgstr ""
+msgstr "Ezarpen guztiak"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -843,10 +933,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -860,10 +946,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -872,10 +954,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -897,37 +975,33 @@ msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
-msgstr ""
+msgstr "Hosto opakoak"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Water"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
+msgstr "Ur opakoa"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
-msgstr ""
+msgstr "Ezarpenak"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -971,22 +1045,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1071,11 +1129,11 @@ msgstr ""
 
 #: src/client/game.cpp
 msgid "- Creative Mode: "
-msgstr ""
+msgstr "- Sormen modua: "
 
 #: src/client/game.cpp
 msgid "- Damage: "
-msgstr ""
+msgstr "- Kaltea: "
 
 #: src/client/game.cpp
 msgid "- Mode: "
@@ -1146,27 +1204,24 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
 msgid "Creating client..."
-msgstr ""
+msgstr "Bezeroa sortzen..."
 
 #: src/client/game.cpp
 msgid "Creating server..."
-msgstr ""
+msgstr "Zerbitzaria sortzen..."
 
 #: src/client/game.cpp
 msgid "Debug info and profiler graph hidden"
@@ -1245,15 +1300,6 @@ msgid "Fog enabled"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "gaituta"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1274,15 +1320,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "gaituta"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Multimedia..."
 
@@ -1295,34 +1332,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1367,10 +1376,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Birsortu"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1423,10 +1428,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Hil zara"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1443,14 +1444,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1730,6 +1723,24 @@ msgstr "2. X botoia"
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Pasahitzak ez datoz bat!"
@@ -1769,26 +1780,6 @@ msgid "Backward"
 msgstr "Atzera"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Aldatu kamera"
 
@@ -1881,29 +1872,10 @@ msgid "Special"
 msgstr "Berezia"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Berezia"
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Txandakatu hegaz egitea"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Txandakatu hegaz egitea"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -2013,12 +1985,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2125,6 +2091,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2358,10 +2328,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2432,16 +2398,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2593,6 +2549,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2642,14 +2602,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Creative"
-msgstr ""
+msgstr "Sormena"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2657,7 +2619,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2666,7 +2630,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Damage"
-msgstr ""
+msgstr "Kaltea"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
@@ -2757,12 +2721,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2835,6 +2793,11 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Eskuinera tekla"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2895,8 +2858,9 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
-msgstr ""
+#, fuzzy
+msgid "Enable creative mode for all players"
+msgstr "Gaitu sormen modua mapa sortu berrietan."
 
 #: src/settings_translation_file.cpp
 msgid "Enable joysticks"
@@ -2912,7 +2876,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enable players getting damage and dying."
-msgstr ""
+msgstr "Ahalbidetu jokalariek kaltea jasotzea eta hiltzea."
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
@@ -2987,14 +2951,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3004,18 +2960,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3032,12 +2976,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3047,7 +2985,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3356,10 +3294,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3413,8 +3347,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3881,6 +3815,11 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "Joystick mota"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3963,6 +3902,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Ikusmen barrutia txikitzeko tekla.\n"
+"Ikusi http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4068,6 +4018,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Ikusmen barrutia txikitzeko tekla.\n"
+"Ikusi http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4640,10 +4601,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4657,6 +4614,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4820,7 +4785,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4869,6 +4834,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5098,14 +5070,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5131,12 +5095,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
-msgstr ""
+msgstr "Sareko eduki biltegia"
 
 #: src/settings_translation_file.cpp
 msgid "Opaque liquids"
@@ -5160,34 +5120,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5253,6 +5185,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Hegaz egin tekla"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5408,10 +5349,6 @@ msgid "Right key"
 msgstr "Eskuinera tekla"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5663,6 +5600,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5792,10 +5739,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5886,7 +5829,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "The URL for the content repository"
-msgstr ""
+msgstr "Eduki biltegiaren URL helbidea"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "The deadzone of the joystick"
+msgstr "Joystick mota"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5949,8 +5897,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5976,15 +5924,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6123,6 +6076,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6325,6 +6289,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6338,7 +6308,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether to allow players to damage and kill each other."
-msgstr ""
+msgstr "Jokalariak elkarren artean hil daitezkeen ala ez."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6449,6 +6419,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6460,11 +6448,14 @@ msgstr ""
 msgid "cURL timeout"
 msgstr "cURL-en denbora muga"
 
-#~ msgid "Ok"
-#~ msgstr "Ados"
-
 #~ msgid "Back"
 #~ msgstr "Atzera"
 
+#~ msgid "Configure"
+#~ msgstr "Konfiguratu"
+
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr "$1 deskargatu eta instalatzen, itxaron mesedez..."
+
+#~ msgid "Ok"
+#~ msgstr "Ados"
diff --git a/po/my/minetest.po b/po/fi/minetest.po
index 45be63bb8..57682ebba 100644
--- a/po/my/minetest.po
+++ b/po/fi/minetest.po
@@ -1,22 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the minetest package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: Burmese (Minetest)\n"
+"Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-01-11 18:26+0000\n"
-"Last-Translator: rubenwardy <rubenwardy@gmail.com>\n"
-"Language-Team: Burmese <https://hosted.weblate.org/projects/minetest/"
-"minetest/my/>\n"
-"Language: my\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-01 05:52+0000\n"
+"Last-Translator: Tviljan <virallinen@gmail.com>\n"
+"Language-Team: Finnish <https://hosted.weblate.org/projects/minetest/"
+"minetest/fi/>\n"
+"Language: fi\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 3.10.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Synny uudelleen"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Kuolit"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -24,7 +37,7 @@ msgstr ""
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred:"
-msgstr ""
+msgstr "Tapahtui virhe:"
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
@@ -32,16 +45,12 @@ msgstr ""
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr ""
+msgstr "Yhdistä uudelleen"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
 msgstr ""
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr ""
@@ -55,10 +64,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr ""
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr ""
 
@@ -66,7 +71,8 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -76,7 +82,8 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
@@ -137,25 +144,64 @@ msgstr ""
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/gui/guiKeyChangeMenu.cpp
 msgid "Save"
-msgstr ""
+msgstr "Tallenna"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "World:"
-msgstr ""
+msgstr "Maailma:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Ladataan..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -177,6 +223,14 @@ msgid "Install"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr ""
@@ -190,8 +244,23 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
@@ -207,7 +276,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -458,10 +531,6 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr ""
 
@@ -506,6 +575,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr ""
 
@@ -620,6 +693,18 @@ msgstr ""
 msgid "Unable to install a modpack as a $1"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Ladataan..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -673,7 +758,13 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -693,14 +784,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr ""
 
@@ -717,7 +804,7 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -729,6 +816,10 @@ msgid "No world created or selected!"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr ""
 
@@ -737,6 +828,10 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ""
 
@@ -752,23 +847,23 @@ msgstr ""
 msgid "Address / Port"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
@@ -776,16 +871,16 @@ msgstr ""
 msgid "Join Game"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -814,10 +909,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -825,10 +916,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -842,10 +929,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -854,10 +937,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -885,19 +964,11 @@ msgstr ""
 msgid "Opaque Water"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr ""
 
@@ -910,6 +981,10 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -953,22 +1028,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1039,7 +1098,7 @@ msgstr ""
 #. When in doubt, test your translation.
 #: src/client/fontengine.cpp
 msgid "needs_fallback_font"
-msgstr "yes"
+msgstr "no"
 
 #: src/client/game.cpp
 msgid ""
@@ -1128,18 +1187,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1227,14 +1283,6 @@ msgid "Fog enabled"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1255,14 +1303,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1275,34 +1315,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1347,10 +1359,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1403,10 +1411,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1423,14 +1427,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1710,6 +1706,24 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ""
@@ -1749,26 +1763,6 @@ msgid "Backward"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr ""
 
@@ -1861,26 +1855,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -1951,7 +1929,7 @@ msgstr ""
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
 msgid "LANG_CODE"
-msgstr "my"
+msgstr "fi"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1990,12 +1968,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2102,6 +2074,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2335,10 +2311,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2409,16 +2381,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2570,6 +2532,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2626,7 +2592,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2634,7 +2602,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2734,12 +2704,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2810,6 +2774,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2870,7 +2838,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2958,14 +2926,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -2975,18 +2935,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3003,12 +2951,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3018,7 +2960,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3320,10 +3262,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3377,8 +3315,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3845,6 +3783,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3925,6 +3867,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4024,6 +3973,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4580,10 +4536,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4597,6 +4549,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4760,7 +4720,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4809,6 +4769,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5038,14 +5005,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5071,10 +5030,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5100,34 +5055,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5193,6 +5120,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5348,10 +5283,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5603,6 +5534,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5732,10 +5673,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5829,6 +5766,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5887,8 +5828,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5914,15 +5855,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6058,6 +6004,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6260,6 +6217,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6382,6 +6345,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index d84247b51..98478e035 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: French (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-07-06 21:41+0000\n"
-"Last-Translator: Estébastien Robespi <estebastien@mailbox.org>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-01 05:52+0000\n"
+"Last-Translator: cafou <weblate@ptitux.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/minetest/minetest/"
 "fr/>\n"
 "Language: fr\n"
@@ -12,7 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Réapparaître"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Vous êtes mort"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -38,10 +46,6 @@ msgstr "Se reconnecter"
 msgid "The server has requested a reconnect:"
 msgstr "Le serveur souhaite rétablir une connexion :"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Chargement..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "La version du protocole ne correspond pas. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Le serveur supporte les versions de protocole entre $1 et $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Essayez de rechargez la liste des serveurs publics et vérifiez votre "
-"connexion Internet."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Nous supportons seulement la version du protocole $1."
 
@@ -68,7 +66,8 @@ msgstr "Nous supportons seulement la version du protocole $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Nous supportons seulement les versions du protocole entre $1 et $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Nous supportons seulement les versions du protocole entre $1 et $2."
 msgid "Cancel"
 msgstr "Annuler"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dépend de :"
 
@@ -153,14 +153,55 @@ msgid "enabled"
 msgstr "activé"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Chargement..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "Les dépendances nécessaires à 1 $ n'ont pas pu être trouvées."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 sera installé, et les dépendances de $2 seront ignorées."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Tous les paquets"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Touche déjà utilisée"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Retour au menu principal"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Héberger une partie"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr "ContentDB n'est pas disponible quand Minetest est compilé sans cURL"
 
@@ -182,6 +223,16 @@ msgid "Install"
 msgstr "Installer"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Installer"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Dépendances optionnelles :"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mods"
@@ -195,9 +246,26 @@ msgid "No results"
 msgstr "Aucun résultat"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Rechercher"
+#, fuzzy
+msgid "No updates"
+msgstr "Mise à jour"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Not found"
+msgstr "Couper le son"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Écraser"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "En file d'attente"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -212,8 +280,12 @@ msgid "Update"
 msgstr "Mise à jour"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Affichage"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Voir plus d'informations dans un navigateur web"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -469,11 +541,6 @@ msgid "Browse"
 msgstr "Parcourir"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Client"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Désactivé"
 
@@ -518,6 +585,10 @@ msgid "Scale"
 msgstr "Echelle"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Rechercher"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Choisissez un répertoire"
 
@@ -574,7 +645,7 @@ msgstr "Valeur absolue"
 #. for noise settings in main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "defaults"
-msgstr "par défaut"
+msgstr "Paramètres par défaut"
 
 #. ~ "eased" is a noise parameter flag.
 #. It is used to make the map smoother and
@@ -637,6 +708,21 @@ msgstr "Impossible d'installer un mod comme un $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Impossible d'installer un pack de mods comme un $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Chargement..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Les scripts côté client sont désactivés"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Essayez de rechargez la liste des serveurs publics et vérifiez votre "
+"connexion Internet."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Parcourir le contenu en ligne"
@@ -690,8 +776,18 @@ msgid "Credits"
 msgstr "Crédits"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Choisissez un répertoire"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Ouvre le répertoire qui contient les mondes fournis par les utilisateurs, "
+"les jeux, les mods,\n"
+"et des paquets de textures dans un gestionnaire de fichiers."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -710,14 +806,10 @@ msgid "Bind Address"
 msgstr "Adresse à assigner"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Configurer"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Mode créatif"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Activer les dégâts"
 
@@ -734,8 +826,8 @@ msgid "Install games from ContentDB"
 msgstr "Installer à partir de ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nom / Mot de passe"
+msgid "Name"
+msgstr "Nom"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -746,6 +838,11 @@ msgid "No world created or selected!"
 msgstr "Aucun monde créé ou sélectionné !"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Nouveau mot de passe"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Jouer"
 
@@ -754,6 +851,11 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Sélectionner un monde :"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Sélectionner un monde :"
 
@@ -767,25 +869,25 @@ msgstr "Démarrer"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
-msgstr "Adresse / Port :"
+msgstr "Adresse / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Rejoindre"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Mode créatif"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Dégâts activés"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
-msgstr "Supprimer favori :"
+msgstr "Supprimer favori"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favori"
 
@@ -793,16 +895,16 @@ msgstr "Favori"
 msgid "Join Game"
 msgstr "Rejoindre une partie"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nom / Mot de passe"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "JcJ activé"
 
@@ -831,10 +933,6 @@ msgid "Antialiasing:"
 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
 msgid "Autosave Screen Size"
 msgstr "Sauvegarder automatiquement la taille d'écran"
 
@@ -842,10 +940,6 @@ msgstr "Sauvegarder automatiquement la taille d'écran"
 msgid "Bilinear Filter"
 msgstr "Filtrage bilinéaire"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Placage de relief"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Changer les touches"
@@ -859,10 +953,6 @@ msgid "Fancy Leaves"
 msgstr "Arbres détaillés"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Génération de Normal Maps"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "MIP mapping"
 
@@ -871,10 +961,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "MIP map + anisotropie"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Non"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Aucun filtre"
 
@@ -902,19 +988,11 @@ msgstr "Arbres minimaux"
 msgid "Opaque Water"
 msgstr "Eau opaque"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Occlusion parallaxe"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Activer les particules"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Réinitialiser le monde"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Écran :"
 
@@ -927,6 +1005,11 @@ msgid "Shaders"
 msgstr "Shaders"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Îles volantes (expérimental)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Shaders (indisponible)"
 
@@ -971,22 +1054,6 @@ msgstr "Liquides ondulants"
 msgid "Waving Plants"
 msgstr "Plantes ondulantes"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Oui"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Configurer les mods"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Principal"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Démarrer une partie solo"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Connexion perdue."
@@ -1148,20 +1215,17 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
-"Contrôles:\n"
+"Contrôles :\n"
 "- %s : avancer\n"
 "- %s : reculer\n"
 "- %s : à gauche\n"
@@ -1247,7 +1311,7 @@ msgstr "Vitesse en mode rapide activée"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr "Vitesse en mode rapide activée (note: pas de privilège 'fast')"
+msgstr "Vitesse en mode rapide activée (note : pas de privilège 'fast')"
 
 #: src/client/game.cpp
 msgid "Fly mode disabled"
@@ -1259,7 +1323,7 @@ msgstr "Mode vol activé"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr "Mode vol activé (note: pas de privilège 'fly')"
+msgstr "Mode vol activé (note : pas de privilège 'fly')"
 
 #: src/client/game.cpp
 msgid "Fog disabled"
@@ -1270,16 +1334,6 @@ msgid "Fog enabled"
 msgstr "Brouillard activé"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Brouillard désactivé"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Brouillard activé"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Infos de jeu :"
 
@@ -1300,16 +1354,6 @@ msgid "KiB/s"
 msgstr "Kio/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Brouillard désactivé"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Dégâts activés"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Média..."
 
@@ -1322,34 +1366,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "La minimap est actuellement désactivée par un jeu ou un mod"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Mini-carte cachée"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Mini-carte en mode radar, zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Mini-carte en mode radar, zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Mini-carte en mode radar, zoom x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Mini-carte en mode surface, zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Mini-carte en mode surface, zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Mini-carte en mode surface, zoom x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Collisions activées"
 
@@ -1359,7 +1375,7 @@ msgstr "Collisions désactivées"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled (note: no 'noclip' privilege)"
-msgstr "Collisions activées (note: pas de privilège 'noclip')"
+msgstr "Collisions activées (note : pas de privilège 'noclip')"
 
 #: src/client/game.cpp
 msgid "Node definitions..."
@@ -1394,10 +1410,6 @@ msgid "Resolving address..."
 msgstr "Résolution de l'adresse..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Réapparaître"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Fermeture du jeu..."
 
@@ -1428,7 +1440,7 @@ msgstr "Son rétabli"
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range changed to %d"
-msgstr "Distance de vue réglée sur %d%1"
+msgstr "Distance de vue réglée sur %d"
 
 #: src/client/game.cpp
 #, c-format
@@ -1450,10 +1462,6 @@ msgid "Wireframe shown"
 msgstr "Fils de fer affichés"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Vous êtes mort"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Le zoom est actuellement désactivé par un jeu ou un mod"
 
@@ -1470,16 +1478,6 @@ msgid "Chat shown"
 msgstr "Tchat affiché"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Tchat caché"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Tchat affiché"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "Interface cachée"
 
@@ -1759,6 +1757,25 @@ msgstr "Bouton X 2"
 msgid "Zoom"
 msgstr "Zoomer"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Mini-carte cachée"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Mini-carte en mode radar, zoom x1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Mini-carte en mode surface, zoom x1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Taille minimum des textures"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Les mots de passe ne correspondent pas !"
@@ -1805,26 +1822,6 @@ msgid "Backward"
 msgstr "Reculer"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Changer la caméra"
 
@@ -1842,7 +1839,7 @@ msgstr "Console"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Dec. range"
-msgstr "Plage de visualisation"
+msgstr "Reduire champ vision"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Dec. volume"
@@ -1917,30 +1914,10 @@ msgid "Special"
 msgstr "Spécial"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Spécial"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Mode cinématique"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Mode cinématique"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Afficher/retirer l'interface"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Voler"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Afficher/retirer le canal de discussion"
 
@@ -1970,7 +1947,7 @@ msgstr "Activer/désactiver vol vertical"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "press key"
-msgstr "appuyez sur une touche"
+msgstr "Appuyez sur une touche"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
@@ -2043,17 +2020,18 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"(X ; Y ; Z) de décalage fractal à partir du centre du monde en \n"
-"unités « échelle ». Peut être utilisé pour déplacer un point\n"
-"désiré en (0 ; 0) pour créer un point d'apparition convenable,\n"
-"ou pour « zoomer » sur un point désiré en augmentant\n"
-"« l'échelle ».\n"
-"La valeur par défaut est réglée pour créer une zone\n"
-"d'apparition convenable pour les ensembles de Mandelbrot\n"
-"avec les paramètres par défaut, elle peut nécessité une \n"
-"modification dans d'autres situations.\n"
-"Interval environ de -2 à 2. Multiplier par « échelle » convertir\n"
-"le décalage en nœuds."
+"(X,Y,Z) de décalage du fractal à partir du centre du monde en unités "
+"« échelle ».\n"
+"Peut être utilisé pour déplacer un point désiré à (0, 0) pour créer une\n"
+"zone d'apparition convenable, ou pour autoriser à « zoomer » sur un\n"
+"point désiré en augmentant l'« échelle ».\n"
+"La valeur par défaut est adaptée pour créer une zone d'apparition convenable "
+"pour les ensembles\n"
+"de Mandelbrot crées avec des paramètres par défaut. Elle peut nécessiter une "
+"modification dans\n"
+"d'autres situations.\n"
+"La gamme est d'environ -2 à 2. Multiplier par « échelle » pour le décalage "
+"en nœuds."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2075,14 +2053,6 @@ msgstr ""
 "un île, rendez les 3 nombres égaux pour la forme de base."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = occlusion parallaxe avec des informations de pente (plus rapide).\n"
-"1 = cartographie en relief (plus lent, plus précis)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "Bruit 2D controllant la forme et taille des montagnes crantées."
 
@@ -2108,7 +2078,7 @@ msgstr "Bruit 2D contrôlant la taille et la fréquence des plateaux montagneux.
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that locates the river valleys and channels."
-msgstr "Bruit 2D qui localise les vallées fluviales et les canaux"
+msgstr "Bruit 2D qui localise les vallées et les chenaux des rivières."
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2212,6 +2182,10 @@ msgid "ABM interval"
 msgstr "Intervalle des ABM"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Limite stricte de la file de blocs émergents"
 
@@ -2457,15 +2431,15 @@ msgstr "Chemin de la police en gras et en italique"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic monospace font path"
-msgstr "Chemin de la police Monospace"
+msgstr "Chemin de la police Monospace en gras et en italique"
 
 #: src/settings_translation_file.cpp
 msgid "Bold font path"
-msgstr "Chemin de police audacieux"
+msgstr "Chemin du fichier de police en gras"
 
 #: src/settings_translation_file.cpp
 msgid "Bold monospace font path"
-msgstr "Chemin de police monospace audacieux"
+msgstr "Chemin de la police Monospace en gras"
 
 #: src/settings_translation_file.cpp
 msgid "Build inside player"
@@ -2476,21 +2450,19 @@ msgid "Builtin"
 msgstr "Intégré"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bump mapping"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
 "Increasing can reduce artifacting on weaker GPUs.\n"
 "0.1 = Default, 0.25 = Good value for weaker tablets."
 msgstr ""
-"Caméra « près de la coupure de distance » dans les nœuds, entre 0 et 0,25.\n"
-"Fonctionne uniquement sur plateformes GLES.\n"
+"Distance en nœuds du plan de coupure rapproché de la caméra, entre 0 et "
+"0,25.\n"
+"Ne fonctionne uniquement que sur les plateformes GLES.\n"
 "La plupart des utilisateurs n’auront pas besoin de changer cela.\n"
-"L’augmentation peut réduire les anomalies sur des petites cartes graphique.\n"
-"0,1 par défaut, 0,25 bonne valeur pour des composants faibles."
+"L’augmentation peut réduire les anomalies sur des cartes graphique plus "
+"faibles.\n"
+"0,1 par défaut, 0,25 est une bonne valeur pour des composants faibles."
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
@@ -2558,23 +2530,6 @@ msgstr ""
 "lumière maximum."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Change l’interface du menu principal :\n"
-"-   Complet : Mondes solo, choix du jeu, sélecteur du pack de textures, "
-"etc.\n"
-"-   Simple : un monde solo, pas de sélecteurs de jeu ou de pack de textures. "
-"Peut être\n"
-"nécessaire pour les plus petits écrans.\n"
-"-   Auto : Simple sur Android, complet pour le reste."
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr "Taille de police du chat"
 
@@ -2741,6 +2696,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "Drapeaux ContentDB en liste noire"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "Maximum de téléchargement en parallèle pour ContentDB"
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "Adresse de la ContentDB"
 
@@ -2792,8 +2751,8 @@ msgid ""
 msgstr ""
 "Contrôle la largeur des tunnels, une valeur plus faible crée des tunnels "
 "plus large.\n"
-"Valeur >= 10,0 désactive complètement la génération de tunnel et évite le "
-"calcul intensif de bruit."
+"Valeur >= 10,0 désactive complètement la génération de tunnel et évite\n"
+"le calcul intensif de bruit."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -2808,7 +2767,10 @@ msgid "Crosshair alpha"
 msgstr "Opacité du réticule"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Opacité du réticule (entre 0 et 255)."
 
 #: src/settings_translation_file.cpp
@@ -2816,8 +2778,10 @@ msgid "Crosshair color"
 msgstr "Couleur du réticule"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Couleur du réticule (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2923,14 +2887,6 @@ msgstr ""
 "Définit l'emplacement et le terrain des collines facultatives et des lacs."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Niveau de lissage des normal maps.\n"
-"Une valeur plus grande lisse davantage les normal maps."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Définit le niveau du sol de base."
 
@@ -3010,6 +2966,11 @@ msgid "Desynchronize block animation"
 msgstr "Désynchroniser les textures animées par mapblock"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Droite"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Particules au minage"
 
@@ -3074,7 +3035,8 @@ msgid "Enable console window"
 msgstr "Activer la console"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Activer le mode créatif pour les cartes nouvellement créées."
 
 #: src/settings_translation_file.cpp
@@ -3143,7 +3105,7 @@ msgstr ""
 "Activer l'usage d'un serveur de média distant (si pourvu par le serveur).\n"
 "Les serveurs de média distants offrent un moyen significativement plus "
 "rapide de télécharger\n"
-"des données média (ex.: textures) lors de la connexion au serveur."
+"des données média (ex. : textures) lors de la connexion au serveur."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3189,19 +3151,6 @@ msgid "Enables animation of inventory items."
 msgstr "Active la rotation des items d'inventaire."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Active le bumpmapping pour les textures.\n"
-"Les normalmaps peuvent être fournies par un pack de textures pour un "
-"meilleur effet de relief,\n"
-"ou bien celui-ci est auto-généré.\n"
-"Nécessite les shaders pour être activé."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Active la mise en cache des meshnodes."
 
@@ -3211,22 +3160,6 @@ msgstr "Active la mini-carte."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Active la génération à la volée des normalmaps.\n"
-"Nécessite le bumpmapping pour être activé."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Active l'occlusion parallaxe.\n"
-"Nécessite les shaders pour être activé."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3248,14 +3181,6 @@ msgstr "Systèmes d'entité"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Option expérimentale, peut causer un espace vide visible entre les blocs\n"
-"quand paramétré avec un nombre supérieur à 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3271,8 +3196,9 @@ msgstr ""
 "définie en bas, plus pour une couche solide de massif volant."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS maximum sur le menu pause"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "FPS maximum quand le jeu est en pause."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3603,10 +3529,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Filtrage txr2img du GUI"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Normal mapping"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Rappels globaux"
 
@@ -3667,18 +3589,19 @@ msgid "HUD toggle key"
 msgstr "HUD"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Traitement des appels d'API Lua obsolètes :\n"
-"- legacy : imite l'ancien comportement (par défaut en mode release).\n"
-"- log : imite et enregistre les appels obsolètes (par défaut en mode "
-"debug).\n"
-"- error : interruption à l'usage d'un appel obsolète (recommandé pour les "
-"développeurs de mods)."
+"-    legacy : imite l'ancien comportement (par défaut en mode release).\n"
+"-    log : imite et enregistre la trace des appels obsolètes (par défaut en "
+"mode debug).\n"
+"-    error : (=erreur) interruption à l'usage d'un appel obsolète "
+"(recommandé pour les développeurs de mods)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3688,7 +3611,7 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
-"Auto-instrumentaliser le profileur:\n"
+"Auto-instrumentaliser le profileur :\n"
 "* Instrumentalise une fonction vide.\n"
 "La surcharge sera évaluée. (l'auto-instrumentalisation ajoute 1 appel de "
 "fonction à chaque fois).\n"
@@ -3733,11 +3656,11 @@ msgstr "Bruit de collines1"
 
 #: src/settings_translation_file.cpp
 msgid "Hilliness2 noise"
-msgstr "Bruit de colline2"
+msgstr "Bruit de collines2"
 
 #: src/settings_translation_file.cpp
 msgid "Hilliness3 noise"
-msgstr "Bruit de colline3"
+msgstr "Bruit de collines3"
 
 #: src/settings_translation_file.cpp
 msgid "Hilliness4 noise"
@@ -3970,7 +3893,7 @@ msgid ""
 "are\n"
 "enabled."
 msgstr ""
-"Si désactivé, la touche \"special\" est utilisée si  le vole et le mode "
+"Si désactivé, la touche \"special\" est utilisée si le vole et le mode "
 "rapide sont tous les deux activés."
 
 #: src/settings_translation_file.cpp
@@ -4212,6 +4135,11 @@ msgid "Joystick button repetition interval"
 msgstr "Intervalle de répétition du bouton du Joystick"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "Type de manette"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Sensibilité tronconique du joystick"
 
@@ -4229,9 +4157,9 @@ msgid ""
 msgstr ""
 "Réglage Julia uniquement.\n"
 "La composante W de la constante hypercomplexe.\n"
-"Transforme la forme de la fractale.\n"
+"Modifie la forme de la fractale.\n"
 "N'a aucun effet sur les fractales 3D.\n"
-"Portée environ -2 à 2."
+"Gamme d'environ -2 à 2."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4314,6 +4242,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Touche pour sauter.\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4456,6 +4395,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Touche pour sauter.\n"
+"Voir http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -5063,8 +5013,8 @@ msgid ""
 "Length of liquid waves.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
-"Longueur des vagues.\n"
-"Nécessite que l'ondulation des liquides soit active."
+"Longueur des vagues de liquides.\n"
+"Nécessite que les liquides ondulatoires soit activé."
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between Active Block Modifier (ABM) execution cycles"
@@ -5144,7 +5094,7 @@ msgstr ""
 "Nombre limite de requête HTTP en parallèle. Affecte :\n"
 "-  L'obtention de média si le serveur utilise l'option remote_media.\n"
 "-  Le téléchargement de la liste des serveurs et l'annonce du serveur.\n"
-"-  Les téléchargements effectués par le menu (ex.: gestionnaire de mods).\n"
+"-  Les téléchargements effectués par le menu (ex. : gestionnaire de mods).\n"
 "Prend seulement effet si Minetest est compilé avec cURL."
 
 #: src/settings_translation_file.cpp
@@ -5206,10 +5156,6 @@ msgid "Main menu script"
 msgstr "Script du menu principal"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Style du menu principal"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5227,6 +5173,14 @@ msgid "Makes all liquids opaque"
 msgstr "Rendre toutes les liquides opaques"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Répertoire de la carte du monde"
 
@@ -5240,7 +5194,8 @@ msgid ""
 "Occasional lakes and hills can be added to the flat world."
 msgstr ""
 "Attributs de terrain spécifiques au générateur de monde plat.\n"
-"Des lacs et des collines occasionnels peuvent être ajoutés au monde plat."
+"Des lacs et des collines peuvent être occasionnellement ajoutés au monde "
+"plat."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5315,7 +5270,7 @@ msgstr "Délai de génération des maillages de MapBlocks"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "Taille du cache du générateur de maillage pour les MapBloc en Mio"
+msgstr "Taille du cache du générateur de maillage pour les MapBloc en Mo"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
@@ -5410,7 +5365,8 @@ msgid "Maximum FPS"
 msgstr "FPS maximum"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "FPS maximum quand le jeu est en pause."
 
 #: src/settings_translation_file.cpp
@@ -5471,6 +5427,13 @@ msgstr ""
 "Laisser ce champ vide pour un montant approprié défini automatiquement."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "Nombre maximum de mapblocks chargés de force."
 
@@ -5537,7 +5500,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
 msgstr ""
-"Délais maximaux de téléchargement d'un fichier (ex.: un mod), établi en "
+"Délais maximaux de téléchargement d'un fichier (ex. : un mod), établi en "
 "millisecondes."
 
 #: src/settings_translation_file.cpp
@@ -5727,14 +5690,6 @@ msgid "Noises"
 msgstr "Bruits"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Échantillonnage de normalmaps"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Force des normalmaps"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Nombre de tâches en cours"
 
@@ -5776,10 +5731,6 @@ msgstr ""
 "(4096 = 100 Mo, comme règle fondamentale)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Nombre d'itérations sur l'occlusion parallaxe."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Dépôt de contenu en ligne"
 
@@ -5809,34 +5760,6 @@ msgstr ""
 "en pause si un formspec est ouvert."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Bias général de l'occlusion parallaxe, habituellement échelle/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Echelle générale de l'effet de l'occlusion parallaxe."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Occlusion parallaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Bias de l'occlusion parallaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Nombre d'itérations sur l'occlusion parallaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Mode occlusion parallaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Echelle de l'occlusion parallaxe"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5925,6 +5848,16 @@ msgid "Pitch move mode"
 msgstr "Mode de mouvement libre"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Voler"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Intervalle de répétition du clic droit"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -6113,10 +6046,6 @@ msgid "Right key"
 msgstr "Droite"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Intervalle de répétition du clic droit"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Profondeur des rivières"
 
@@ -6221,7 +6150,7 @@ msgid ""
 "Use 0 for default quality."
 msgstr ""
 "Qualité de capture d'écran. Utilisé uniquement pour le format JPEG.\n"
-"1 signifie mauvaise qualité; 100 signifie la meilleure qualité.\n"
+"1 signifie mauvaise qualité ; 100 signifie la meilleure qualité.\n"
 "Utilisez 0 pour la qualité par défaut."
 
 #: src/settings_translation_file.cpp
@@ -6420,6 +6349,20 @@ msgid "Show entity selection boxes"
 msgstr "Afficher les boîtes de sélection de l'entité"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Détermine la langue. Laisser vide pour utiliser celui de votre système.\n"
+"Un redémarrage du jeu est nécessaire pour prendre effet."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "La police est en gras par défaut"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Message d'arrêt du serveur"
 
@@ -6434,12 +6377,12 @@ msgid ""
 msgstr ""
 "Taille des mapchunks générés par mapgen, indiquée dans les mapblocks (16 "
 "nœuds).\n"
-"ATTENTION !: Il n’ya aucun avantage, et il y a plusieurs dangers, dans\n"
+"ATTENTION ! : Il n’y a aucun avantage, et plusieurs dangers, à\n"
 "augmenter cette valeur au-dessus de 5.\n"
 "Réduire cette valeur augmente la densité de cavernes et de donjons.\n"
-"La modification de cette valeur est réservée à un usage spécial, elle reste "
-"inchangée.\n"
-"conseillé."
+"La modification de cette valeur est réservée à un usage spécial. Il est "
+"conseillé\n"
+"de la laisser inchangée."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6580,10 +6523,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Intensité de parallaxe en mode 3D."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Force des normalmaps autogénérés."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6614,6 +6553,19 @@ msgid ""
 "server-intensive extreme water flow and to avoid vast flooding of the\n"
 "world surface below."
 msgstr ""
+"Niveau de la surface de l'eau (facultative) placée sur une couche solide de "
+"terre suspendue.\n"
+"L'eau est désactivée par défaut et ne sera placée que si cette valeur est\n"
+"fixée à plus de 'mgv7_floatland_ymax' - 'mgv7_floatland_taper'\n"
+"(début de l’effilage du haut)\n"
+"***ATTENTION, DANGER POTENTIEL AU MONDES ET AUX PERFORMANCES DES "
+"SERVEURS*** :\n"
+"Lorsque le placement de l'eau est activé, les île volantes doivent être\n"
+"configurées avec une couche solide en mettant 'mgv7_floatland_density' à "
+"2.0\n"
+"(ou autre valeur dépendante de 'mgv7_np_floatland'), pour éviter\n"
+"les chutes d'eaux énormes qui surchargent les serveurs et pourraient\n"
+"inonder les terres en dessous."
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -6693,6 +6645,11 @@ msgid "The URL for the content repository"
 msgstr "L'URL du dépôt de contenu en ligne"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "The deadzone of the joystick"
+msgstr "L'identifiant de la manette à utiliser"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6750,7 +6707,6 @@ msgstr ""
 "Entrer /privs dans le jeu pour voir une liste complète des privilèges."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The radius of the volume of blocks around every player that is subject to "
 "the\n"
@@ -6761,21 +6717,21 @@ msgid ""
 "This should be configured together with active_object_send_range_blocks."
 msgstr ""
 "Le rayon du volume de blocs autour de chaque joueur soumis à la\n"
-"truc de bloc actif, indiqué dans mapblocks (16 noeuds).\n"
-"Dans les blocs actifs, les objets sont chargés et les guichets automatiques "
-"sont exécutés.\n"
-"C'est également la plage minimale dans laquelle les objets actifs (mobs) "
+"matière de bloc actif, indiqué dans mapblocks (16 nœuds).\n"
+"Les objets sont chargés et les ABMs sont exécutés dans les blocs actifs.\n"
+"C'est également la distance minimale pour laquelle les objets actifs (mobs) "
 "sont conservés.\n"
-"Ceci devrait être configuré avec active_object_range."
+"Ceci devrait être configuré avec 'active_object_send_range_blocks'."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end for Irrlicht.\n"
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "Le moteur de rendu utilisé par Irrlicht.\n"
 "Un redémarrage est nécessaire après avoir changé cette option.\n"
@@ -6820,6 +6776,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6827,10 +6789,10 @@ msgstr ""
 "le bouton droit de la souris."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 "L'intervalle en secondes entre des clics droits répétés lors de l'appui sur "
 "le bouton droit de la souris."
@@ -6918,7 +6880,6 @@ msgid "Trilinear filtering"
 msgstr "Filtrage trilinéaire"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "True = 256\n"
 "False = 128\n"
@@ -6942,7 +6903,6 @@ msgid "Undersampling"
 msgstr "Sous-échantillonage"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Undersampling is similar to using a lower screen resolution, but it applies\n"
 "to the game world only, keeping the GUI intact.\n"
@@ -6950,11 +6910,12 @@ msgid ""
 "image.\n"
 "Higher values result in a less detailed image."
 msgstr ""
-"Le sous-échantillonage ressemble à l'utilisation d'une définition d'écran\n"
-"plus faible, mais il ne s'applique qu'au rendu 3D, gardant l'interface "
-"intacte.\n"
+"Le sous-échantillonage ressemble à l'utilisation d'une résolution d'écran "
+"inférieure,\n"
+"mais il ne s'applique qu'au rendu 3D, gardant l'interface usager intacte.\n"
 "Cela peut donner lieu à un bonus de performance conséquent, au détriment de "
-"la qualité d'image."
+"la qualité d'image.\n"
+"Les valeurs plus élevées réduisent la qualité du détail des images."
 
 #: src/settings_translation_file.cpp
 msgid "Unlimited player transfer distance"
@@ -6969,9 +6930,8 @@ msgid "Upper Y limit of dungeons."
 msgstr "Limite haute Y des donjons."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Upper Y limit of floatlands."
-msgstr "Limite haute Y des donjons."
+msgstr "Limite en Y des îles volantes."
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
@@ -7004,6 +6964,17 @@ msgstr ""
 "La réduction d'échelle gamma correcte n'est pas prise en charge."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Utilisation du filtrage trilinéaire."
 
@@ -7113,13 +7084,12 @@ msgid "Volume"
 msgstr "Volume du son"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
-"Active l'occlusion parallaxe.\n"
-"Nécessite les shaders pour être activé."
+"Volume de tous les sons.\n"
+"Exige que le son du système soit activé."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7165,24 +7135,20 @@ msgid "Waving leaves"
 msgstr "Feuilles d'arbres mouvantes"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids"
 msgstr "Liquides ondulants"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave height"
 msgstr "Hauteur des vagues"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave speed"
 msgstr "Vitesse de mouvement des liquides"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wavelength"
-msgstr "Durée du mouvement des liquides"
+msgstr "Espacement des vagues de liquides"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
@@ -7196,7 +7162,7 @@ msgid ""
 msgstr ""
 "Quand gui_scaling_filter est activé, tous les images du GUI sont\n"
 "filtrées dans Minetest, mais quelques images sont générées directement\n"
-"par le matériel (ex.: textures des blocs dans l'inventaire)."
+"par le matériel (ex. : textures des blocs dans l'inventaire)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7212,7 +7178,6 @@ msgstr ""
 "qui ne supportent pas le chargement des textures depuis le matériel."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
 "can be blurred, so automatically upscale them with nearest-neighbor\n"
@@ -7226,28 +7191,35 @@ msgid ""
 msgstr ""
 "En utilisant le filtrage bilinéaire/trilinéaire/anisotrope, les textures de "
 "basse résolution\n"
-"peuvent être floutées, agrandissez-les donc automatiquement avec "
-"l'interpolation du plus proche voisin\n"
-"pour garder des pixels nets. Ceci détermine la taille de la texture "
-"minimale\n"
-"pour les textures agrandies ; les valeurs plus hautes rendent les textures "
-"plus détaillées, mais nécessitent\n"
+"peuvent être brouillées.  Elles seront donc automatiquement agrandies avec "
+"l'interpolation\n"
+"du plus proche voisin pour garder des pixels moins floues. Ceci détermine la "
+"taille de la texture minimale\n"
+"pour les textures agrandies ; les valeurs plus hautes rendent plus "
+"détaillées, mais nécessitent\n"
 "plus de mémoire. Les puissances de 2 sont recommandées. Définir une valeur "
 "supérieure à 1 peut ne pas\n"
 "avoir d'effet visible sauf si le filtrage bilinéaire / trilinéaire / "
 "anisotrope est activé.\n"
-"ceci est également utilisée comme taille de texture de nœud par défaut pour\n"
+"Ceci est également utilisée comme taille de texture de nœud par défaut pour\n"
 "l'agrandissement des textures basé sur le monde."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Whether FreeType fonts are used, requires FreeType support to be compiled "
 "in.\n"
 "If disabled, bitmap and XML vectors fonts are used instead."
 msgstr ""
 "Détermine l'utilisation des polices Freetype. Nécessite une compilation avec "
-"le support Freetype."
+"le support Freetype.\n"
+"Si désactivée, des polices bitmap et en vecteurs XML seront utilisé en "
+"remplacement."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
@@ -7278,7 +7250,6 @@ msgid "Whether to fog out the end of the visible area."
 msgstr "Détermine la visibilité de la brume au bout de l'aire visible."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Whether to mute sounds. You can unmute sounds at any time, unless the\n"
 "sound system is disabled (enable_sound=false).\n"
@@ -7286,10 +7257,10 @@ msgid ""
 "pause menu."
 msgstr ""
 "S'il faut mettre les sons en sourdine. Vous pouvez désactiver les sons à "
-"tout moment, sauf si le\n"
+"tout moment, sauf si\n"
 "le système de sonorisation est désactivé (enable_sound=false).\n"
 "Dans le jeu, vous pouvez passer en mode silencieux avec la touche de mise en "
-"sourdine ou en utilisant la\n"
+"sourdine ou en utilisant le\n"
 "menu pause."
 
 #: src/settings_translation_file.cpp
@@ -7381,6 +7352,11 @@ msgid ""
 "For a solid floatland layer, this controls the height of hills/mountains.\n"
 "Must be less than or equal to half the distance between the Y limits."
 msgstr ""
+"Hauteur-Y à laquelle les îles volantes commence à rétrécir.\n"
+"L'effilage comment à cette distance de la limite en Y.\n"
+"Pour une courche solide de terre suspendue, ceci contrôle la hauteur des "
+"montagnes.\n"
+"Doit être égale ou moindre à la moitié de la distance entre les limites Y."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of average terrain surface."
@@ -7403,6 +7379,24 @@ msgid "Y-level of seabed."
 msgstr "Hauteur (Y) du fond marin."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "Délais d'interruption de cURL lors d'un téléchargement de fichier"
 
@@ -7414,23 +7408,12 @@ msgstr "Limite parallèle de cURL"
 msgid "cURL timeout"
 msgstr "Délais d'interruption de cURL"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Back"
-#~ msgstr "Retour"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Téléchargement et installation de $1, veuillez patienter..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Limite des files émergentes sur le disque"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Force de l'occlusion parallaxe"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Chemin où les captures d'écran sont sauvegardées."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = occlusion parallaxe avec des informations de pente (plus rapide).\n"
+#~ "1 = cartographie en relief (plus lent, plus précis)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7445,10 +7428,43 @@ msgstr "Délais d'interruption de cURL"
 #~ "Modifie la façon dont les terres flottantes montagneuses s’effilent au-"
 #~ "dessus et au-dessous du point médian."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Êtes-vous sûr de vouloir réinitialiser votre monde ?"
+
+#~ msgid "Back"
+#~ msgstr "Retour"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Placage de relief"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bump mapping"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Milieu de la courbe de lumière mi-boost."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Change l’interface du menu principal :\n"
+#~ "-   Complet : Mondes solo, choix du jeu, sélecteur du pack de textures, "
+#~ "etc.\n"
+#~ "-   Simple : un monde solo, pas de sélecteurs de jeu ou de pack de "
+#~ "textures. Peut être\n"
+#~ "nécessaire pour les plus petits écrans."
+
+#~ msgid "Config mods"
+#~ msgstr "Configurer les mods"
+
+#~ msgid "Configure"
+#~ msgstr "Configurer"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7460,6 +7476,9 @@ msgstr "Délais d'interruption de cURL"
 #~ "Contrôle la largeur des tunnels, une valeur plus petite crée des tunnels "
 #~ "plus larges."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Couleur du réticule (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Démarcation de l'obscurité"
 
@@ -7470,12 +7489,58 @@ msgstr "Délais d'interruption de cURL"
 #~ "Défini les zones de terrain plat flottant.\n"
 #~ "Des terrains plats flottants apparaissent lorsque le bruit > 0."
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Niveau de lissage des normal maps.\n"
+#~ "Une valeur plus grande lisse davantage les normal maps."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Téléchargement et installation de $1, veuillez patienter..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Activer Vertex Buffer Object: objet tampon de vertex"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Active le bumpmapping pour les textures.\n"
+#~ "Les normalmaps peuvent être fournies par un pack de textures pour un "
+#~ "meilleur effet de relief,\n"
+#~ "ou bien celui-ci est auto-généré.\n"
+#~ "Nécessite les shaders pour être activé."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Autorise le mappage tonal cinématographique"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Active la génération à la volée des normalmaps.\n"
+#~ "Nécessite le bumpmapping pour être activé."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Active l'occlusion parallaxe.\n"
+#~ "Nécessite les shaders pour être activé."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Option expérimentale, peut causer un espace vide visible entre les blocs\n"
+#~ "quand paramétré avec un nombre supérieur à 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS maximum sur le menu pause"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Le bruit de hauteur de base des terres flottantes"
 
@@ -7488,6 +7553,12 @@ msgstr "Délais d'interruption de cURL"
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Génération de Normal Maps"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Normal mapping"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Support IPv6."
 
@@ -7497,18 +7568,105 @@ msgstr "Délais d'interruption de cURL"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Démarcation de la luminosité"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Limite des files émergentes sur le disque"
+
+#~ msgid "Main"
+#~ msgstr "Principal"
+
+#~ msgid "Main menu style"
+#~ msgstr "Style du menu principal"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Mini-carte en mode radar, zoom x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Mini-carte en mode radar, zoom x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Mini-carte en mode surface, zoom x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Mini-carte en mode surface, zoom x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nom / Mot de passe"
+
+#~ msgid "No"
+#~ msgstr "Non"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Échantillonnage de normalmaps"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Force des normalmaps"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Nombre d'itérations sur l'occlusion parallaxe."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "Bias général de l'occlusion parallaxe, habituellement échelle/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Echelle générale de l'effet de l'occlusion parallaxe."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Occlusion parallaxe"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Occlusion parallaxe"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Bias de l'occlusion parallaxe"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Nombre d'itérations sur l'occlusion parallaxe"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Mode occlusion parallaxe"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Echelle de l'occlusion parallaxe"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Force de l'occlusion parallaxe"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Chemin vers police TrueType ou Bitmap."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Chemin où les captures d'écran sont sauvegardées."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Projection des donjons"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Réinitialiser le monde"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Sélectionner le fichier du mod :"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Limite des ombres"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Démarrer une partie solo"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Force des normalmaps autogénérés."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Force de la courbe de lumière mi-boost."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Cette police sera utilisée pour certaines langues."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Mode cinématique"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7520,28 +7678,28 @@ msgstr "Délais d'interruption de cURL"
 #~ "Variation de la hauteur des collines et de la profondeur des lacs sur les "
 #~ "terrains plats flottants."
 
-#~ msgid "Waving water"
-#~ msgstr "Vagues"
-
-#~ msgid "Y-level of floatland midpoint and lake surface."
-#~ msgstr "Hauteur (Y) du point de flottaison et de la surface des lacs."
+#~ msgid "View"
+#~ msgstr "Voir"
 
-#~ msgid "Y-level to which floatland shadows extend."
-#~ msgstr "Hauteur (Y) auquel les ombres portées s’étendent."
+#~ msgid "Waving Water"
+#~ msgstr "Eau ondulante"
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "Projection des donjons"
+#~ msgid "Waving water"
+#~ msgstr "Vagues"
 
 #~ msgid "Whether dungeons occasionally project from the terrain."
 #~ msgstr "Si les donjons font parfois saillie du terrain."
 
-#~ msgid "Waving Water"
-#~ msgstr "Eau ondulante"
-
 #~ msgid "Y of upper limit of lava in large caves."
 #~ msgstr ""
 #~ "Coordonnée Y de la limite supérieure des grandes grottes pseudo-"
 #~ "aléatoires."
 
-#~ msgid "Select Package File:"
-#~ msgstr "Sélectionner le fichier du mod :"
+#~ msgid "Y-level of floatland midpoint and lake surface."
+#~ msgstr "Hauteur (Y) du point de flottaison et de la surface des lacs."
+
+#~ msgid "Y-level to which floatland shadows extend."
+#~ msgstr "Hauteur (Y) auquel les ombres portées s’étendent."
+
+#~ msgid "Yes"
+#~ msgstr "Oui"
diff --git a/po/gd/minetest.po b/po/gd/minetest.po
index 83ac36bb5..e7147d3b5 100644
--- a/po/gd/minetest.po
+++ b/po/gd/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: 2020-06-22 17:56+0000\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Gaelic <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -20,6 +20,14 @@ msgstr ""
 "(n > 2 && n < 20) ? 2 : 3;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr ""
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr ""
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -44,10 +52,6 @@ msgstr ""
 msgid "The server has requested a reconnect:"
 msgstr ""
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
 #: builtin/mainmenu/common.lua
 #, fuzzy
 msgid "Protocol version mismatch. "
@@ -64,10 +68,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr " "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr ""
 
@@ -75,7 +75,8 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -85,7 +86,8 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
@@ -157,14 +159,52 @@ msgid "enabled"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -186,6 +226,14 @@ msgid "Install"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr ""
@@ -199,8 +247,23 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
@@ -216,7 +279,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -467,10 +534,6 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr ""
 
@@ -515,6 +578,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr ""
 
@@ -630,6 +697,18 @@ msgstr ""
 msgid "Unable to install a modpack as a $1"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -683,7 +762,13 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -703,14 +788,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr ""
 
@@ -727,7 +808,7 @@ msgid "Install games from ContentDB"
 msgstr "Stàlaich geamannan o ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -739,6 +820,10 @@ msgid "No world created or selected!"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr ""
 
@@ -747,6 +832,10 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ""
 
@@ -762,23 +851,23 @@ msgstr ""
 msgid "Address / Port"
 msgstr "Seòladh / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
@@ -786,16 +875,16 @@ msgstr ""
 msgid "Join Game"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -824,10 +913,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -835,10 +920,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -852,10 +933,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -864,10 +941,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -895,19 +968,11 @@ msgstr ""
 msgid "Opaque Water"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Sgrìn:"
 
@@ -920,6 +985,10 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -965,22 +1034,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1149,18 +1202,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Stiùireadh:\n"
 "- %s: gluais an comhair a’ bheòil\n"
@@ -1262,16 +1312,6 @@ msgid "Fog enabled"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Tha am modh sgiathaidh à comas"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Tha am modh sgiathaidh an comas"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Fiosrachadh mun gheama:"
 
@@ -1292,14 +1332,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1312,34 +1344,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Tha am modh gun bhearradh à comas"
 
@@ -1384,10 +1388,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1440,10 +1440,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1460,15 +1456,6 @@ msgid "Chat shown"
 msgstr "Tha a’ chabadaich ’ga shealltainn"
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Tha a’ chabadaich ’ga shealltainn"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1748,6 +1735,24 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ""
@@ -1787,26 +1792,6 @@ msgid "Backward"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr ""
 
@@ -1899,28 +1884,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Toglaich am modh gun bhearradh"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Toglaich sgiathadh"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -2031,12 +1998,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2151,6 +2112,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2389,10 +2354,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2465,16 +2426,6 @@ msgstr ""
 "Is 0.0 an ìre as fhainne agus 1.0 an ìre as soilleire air an solas."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2626,6 +2577,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2682,7 +2637,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2690,7 +2647,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2790,12 +2749,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Mìnichidh seo àirde bhunasach a’ ghrunnda."
 
@@ -2868,6 +2821,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2928,7 +2885,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3016,14 +2973,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3033,18 +2982,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3061,12 +2998,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3084,7 +3015,7 @@ msgstr ""
 "do bhreath tìre air fhleòd sholadach."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3390,10 +3321,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3456,8 +3383,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3944,6 +3871,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4023,6 +3954,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"An iuchair a thoglaicheas an sgiathadh.\n"
+"Faic http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4131,6 +4073,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"An iuchair a thoglaicheas an sgiathadh.\n"
+"Faic http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4813,10 +4766,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4830,6 +4779,14 @@ msgid "Makes all liquids opaque"
 msgstr "Dèan gach lionn trìd-dhoilleir"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -5014,7 +4971,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5065,6 +5022,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5305,14 +5269,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5338,10 +5294,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Ionad-tasgaidh susbaint air loidhne"
 
@@ -5369,36 +5321,6 @@ msgstr ""
 "Cha dèid a chur ’na stad nuair a bhios formspec fosgailte."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-"Claonadh na h-èifeachd occlusion na paraileig air fheadh, seo sgèile/2 mar "
-"as àbhaist."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5464,6 +5386,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Iuchair an sgiathaidh"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5623,10 +5554,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Doimhne sruth nan aibhnean"
 
@@ -5878,6 +5805,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -6014,10 +5951,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6126,6 +6059,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6187,8 +6124,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6214,15 +6151,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6362,6 +6304,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6566,6 +6519,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6699,6 +6658,24 @@ msgid "Y-level of seabed."
 msgstr "Àirde-Y aig grunnd na mara."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6709,3 +6686,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "cURL timeout"
 msgstr ""
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr ""
+#~ "Claonadh na h-èifeachd occlusion na paraileig air fheadh, seo sgèile/2 "
+#~ "mar as àbhaist."
diff --git a/po/gl/minetest.po b/po/gl/minetest.po
index b2cb6246b..6f5b479bc 100644
--- a/po/gl/minetest.po
+++ b/po/gl/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: 2020-07-08 20:47+0000\n"
 "Last-Translator: sfan5 <sfan5@live.de>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/minetest/"
@@ -19,6 +19,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Reaparecer"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Morreches"
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr "Vale"
@@ -43,10 +51,6 @@ msgstr "Reconectar"
 msgid "The server has requested a reconnect:"
 msgstr "O servidor solicitou que reconectes:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr ""
@@ -60,10 +64,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr ""
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr ""
 
@@ -71,7 +71,8 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -81,7 +82,8 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
@@ -153,14 +155,52 @@ msgid "enabled"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -182,6 +222,14 @@ msgid "Install"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr ""
@@ -195,8 +243,23 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
@@ -212,7 +275,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -463,10 +530,6 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr ""
 
@@ -511,6 +574,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr ""
 
@@ -625,6 +692,18 @@ msgstr ""
 msgid "Unable to install a modpack as a $1"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -678,7 +757,13 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -698,14 +783,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr ""
 
@@ -722,7 +803,7 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -734,6 +815,10 @@ msgid "No world created or selected!"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr ""
 
@@ -742,6 +827,10 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ""
 
@@ -757,23 +846,23 @@ msgstr ""
 msgid "Address / Port"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
@@ -781,16 +870,16 @@ msgstr ""
 msgid "Join Game"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -819,10 +908,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -830,10 +915,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -847,10 +928,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -859,10 +936,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -890,19 +963,11 @@ msgstr ""
 msgid "Opaque Water"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr ""
 
@@ -915,6 +980,10 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -958,22 +1027,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1133,18 +1186,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1232,14 +1282,6 @@ msgid "Fog enabled"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1260,14 +1302,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1280,34 +1314,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1352,10 +1358,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Reaparecer"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1408,10 +1410,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Morreches"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1428,14 +1426,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1715,6 +1705,24 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ""
@@ -1754,26 +1762,6 @@ msgid "Backward"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr ""
 
@@ -1866,26 +1854,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -1995,12 +1967,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2107,6 +2073,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2340,10 +2310,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2414,16 +2380,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2575,6 +2531,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2631,7 +2591,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2639,7 +2601,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2739,12 +2703,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2815,6 +2773,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2875,7 +2837,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2963,14 +2925,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -2980,18 +2934,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3008,12 +2950,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3023,7 +2959,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3325,10 +3261,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3382,8 +3314,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3850,6 +3782,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3930,6 +3866,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4029,6 +3972,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4585,10 +4535,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4602,6 +4548,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4765,7 +4719,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4814,6 +4768,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5043,14 +5004,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5076,10 +5029,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5105,34 +5054,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5198,6 +5119,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5353,10 +5282,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5608,6 +5533,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5737,10 +5672,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5834,6 +5765,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5892,8 +5827,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5919,15 +5854,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6063,6 +6003,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6265,6 +6216,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6387,6 +6344,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
diff --git a/po/he/minetest.po b/po/he/minetest.po
index fef9e8e51..2bfb5e711 100644
--- a/po/he/minetest.po
+++ b/po/he/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Hebrew (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2019-11-10 15:04+0000\n"
-"Last-Translator: Krock <mk939@ymail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-17 22:50+0000\n"
+"Last-Translator: Yossi Cohen <cohenyossi81@gmail.com>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/minetest/minetest/"
 "he/>\n"
 "Language: he\n"
@@ -13,21 +13,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 && "
 "n % 10 == 0) ? 2 : 3));\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 4.5\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "הזדמן"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "מתת"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "�ישור"
 
 #: builtin/fstk/ui.lua
-#, fuzzy
 msgid "An error occurred in a Lua script:"
-msgstr "�ירעה שגי�ה בקוד לו�ה (Lua), כנר�ה ב�חד המודי�:"
+msgstr "�ירעה שגי�ה בתסריט Lua:"
 
 #: builtin/fstk/ui.lua
-#, fuzzy
 msgid "An error occurred:"
-msgstr "התרחשה שגי�ה:"
+msgstr "�ירעה שגי�ה:"
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
@@ -35,15 +41,11 @@ msgstr "תפריט ר�שי"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr "התחבר מחדש"
+msgstr "התחברות מחדש"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr "השרת מבקש שתתחבר מחדש:"
-
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "טוען..."
+msgstr "השרת מבקש התחברות מחדש:"
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
@@ -51,17 +53,13 @@ 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. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "נסה לצ�ת והכנס מחדש לרשימת השרתי� ובדוק �ת חיבור ה�ינטרנט שלך."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "�נו תומכי� רק בגירסה 1$ של הפרוטוקול."
 
@@ -69,7 +67,8 @@ msgstr "�נו תומכי� רק בגירסה 1$ של הפרוטוקול."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "�נו תומכי� בגרס�ות בין 1$ ל-2$ של הפרוטוקול."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -79,42 +78,38 @@ msgstr "�נו תומכי� בגרס�ות בין 1$ ל-2$ של הפרוטוקו
 msgid "Cancel"
 msgstr "ביטול"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
-#, fuzzy
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
-msgstr "תלוי ב:"
+msgstr "תלויות:"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Disable all"
-msgstr "�פשר הכל"
+msgstr "להשבית הכול"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Disable modpack"
-msgstr "�פשר הכל"
+msgstr "השבתת ערכת המודי�"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
-msgstr "�פשר הכל"
+msgstr "להפעיל הכול"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Enable modpack"
-msgstr "�פשר הכל"
+msgstr "הפעלת ערכת המודי�"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "characters [a-z0-9_] are allowed."
 msgstr ""
-"טעינת המוד \"1$\" נכשלה מכיוון שהו� מכיל תווי� ל� חוקיי�. רק התווי� [a-"
+"הפעלת המוד \"1$\" נכשלה מכיוון שהו� מכיל תווי� ל� חוקיי�. רק התווי� [a-"
 "z0-9_] מותרי�."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "מצי�ת מודי� נוספי�"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -122,33 +117,32 @@ msgstr "מוד:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No (optional) dependencies"
-msgstr ""
+msgstr "�ין תלויות (רשות)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No game description provided."
-msgstr ""
+msgstr "ל� סופק תי�ור משחק."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No hard dependencies"
-msgstr "תלוי ב:"
+msgstr "לל� תלויות קשות"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
-msgstr ""
+msgstr "ל� סופק תי�ור לחבילת המוד."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No optional dependencies"
-msgstr ""
+msgstr "�ין תלויות רשות"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
-msgstr ""
+msgstr "תלויות �ופציונ�ליות:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/gui/guiKeyChangeMenu.cpp
 msgid "Save"
-msgstr "שמור"
+msgstr "שמירה"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "World:"
@@ -159,26 +153,64 @@ msgid "enabled"
 msgstr "מופעל"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "All packages"
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" כבר קיי�. ה�� תרצה להחליף �ותו?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "התלויות $1 ו $2 יותקנו."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 ליד $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
 msgstr ""
+"$1 מוריד,\n"
+"$2 ממתין"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 כעת בהורדה..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "ל� ניתן למצו� תלות חובה של $1."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 יותקן ו $2 תלויות שידולגו."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "All packages"
+msgstr "כל החבילות"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "כבר מותקן"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Back to Main Menu"
-msgstr "תפריט ר�שי"
+msgstr "חזרה לתפריט הר�שי"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "משחק בסיסי:"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "בסיס נתוני התוכן ל� זמין כ�שר מיינטסט מקומפל בלי cUrl"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "טוען..."
+msgstr "כעת בהורדה..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
-msgstr ""
+msgstr "הורדת $1 נכשלה"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -187,7 +219,15 @@ msgstr "משחקי�"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Install"
-msgstr "החקן"
+msgstr "התקנה"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "התקנת $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "מתקין תלויות חסרות"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -196,99 +236,115 @@ msgstr "מודי�"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No packages could be retrieved"
-msgstr ""
+msgstr "ל� ניתן להבי� �ת החבילות"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No results"
-msgstr ""
+msgstr "�ין תוצ�ות"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "חפש"
+msgid "No updates"
+msgstr "�ין עדכוני�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "ל� נמצ�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "דרוס"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "�נ� בדוק שמשחק הבסיס תקין."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "נכנס לתור"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Texture packs"
-msgstr "חבילות מרק�"
+msgstr "חבילות טקסטורה (מרק�)"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Uninstall"
-msgstr "החקן"
+msgstr "הסרה"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Update"
-msgstr ""
+msgstr "עדכון"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr ""
+msgid "Update All [$1]"
+msgstr "עדכן הכל [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "צפה במידע נוסף בדפדפן ה�ינטרנט"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr "עול� בש� \"1$\" כבר קיי�"
+msgstr "כבר קיי� עול� בש� \"$1\""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "שטח נוסף"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr ""
+msgstr "קור בגבהי�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
-msgstr ""
+msgstr "יובש בגבהי�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biome blending"
-msgstr ""
+msgstr "מיזוג ביומי� (�קולוגי)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biomes"
-msgstr ""
+msgstr "ביומי� (צמחיה �קולוגית)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caverns"
-msgstr ""
+msgstr "מערות (טבעיות בחלקן מו�רות)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caves"
-msgstr ""
+msgstr "מערות (לל� �ור שמש)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
-msgstr "ליצור"
+msgstr "יצירה"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Decorations"
-msgstr ""
+msgstr "קישוטי�"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Download a game, such as Minetest Game, from minetest.net"
-msgstr "הורד מפעיל משחק, למשל \"minetest_game\", מה�תר: minetest.net"
+msgstr "הורדת משחק, כמו משחק Minetest, מ�תר minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr "הורד �חד מ-\"minetest.net\""
+msgstr "הורד �חד מ�תר minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
-msgstr ""
+msgstr "מבוכי�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "עול� שטוח"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "גושי �דמה צפי� בשמי�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
-msgstr ""
+msgstr "�דמה צפה (נסיוני)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -296,281 +352,276 @@ msgstr "משחק"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "צור שטח ל� פרקטלי: �וקיינוסי� ותת קרקעי"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "גבעות"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
-msgstr ""
+msgstr "נהרות לחי�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "הגברת הלחות בסביבת נהרות"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "�גמי�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "לחות נמוכה וחו� גבוה גורמי� לנהרות רדודי� �ו יבשי�"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
-msgstr "מנוע מפות"
+msgstr "מנוע (מחולל) מפות"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr ""
+msgstr "�פשרויות מנוע מפות"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mapgen-specific flags"
-msgstr "מנוע מפות"
+msgstr "�פשרויות ספציפיות למנוע מפות"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "הרי�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "זרימת בוץ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "רשת מערות ומחילות"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "No game selected"
-msgstr "�ין עול� נוצר �ו נבחר!"
+msgstr "ל� נבחר משחק"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "הפחתה בחו� בגובה רב"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "הפחתת הלחות בגובה רב"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Rivers"
-msgstr ""
+msgstr "נהרות"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "נהרות בגובה פני הי�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Seed"
-msgstr ""
+msgstr "זרע"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "מעבר חלק בין �זורי �קלי� שוני�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
-msgstr ""
+msgstr "מבני� המופיעי� בשטח (�ין השפעה על עצי� ועשבי ג'ונגל שנוצרו על ידי v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "מבני� המופיעי� בשטח, בדרך כלל עצי� וצמחי�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "ממוזג, מדברי"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "ממוזג, מדברי, ג'ונגל"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "ממוזג, מדברי, ג'ונגל, טונדרה, טייגה"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr ""
+msgstr "סחף פני השטח"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "עצי� ודש� של ג׳ונגל"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Vary river depth"
-msgstr ""
+msgstr "עומק נהרות משתנה"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "מערות גדולות מ�וד עמוק מתחת ל�דמה"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
-msgstr "�זהרה: מצב המפתחי� נועד למפתחי�!."
+msgstr "�זהרה: מצב בדיקת הפיתוח נועד למפתחי�."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
 msgstr "ש� העול�"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "You have no games installed."
-msgstr "�ין לך �ף מפעיל משחק מותקן."
+msgstr "�ין לך משחקי� מותקני�."
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr "ה�� ברצונך למחוק �ת  \"$1\"?"
+msgstr "ה�� �כן ברצונך למחוק �ת \"$1\"?"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/tab_local.lua
 #: src/client/keycode.cpp
 msgid "Delete"
-msgstr "מחק"
+msgstr "מחיקה"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "pkgmgr: failed to delete \"$1\""
-msgstr ""
+msgstr "pkgmgr: מחיקת \"$1\" נכשלה"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "pkgmgr: invalid path \"$1\""
-msgstr ""
+msgstr "pkgmgr: נתיב ל� חוקי \"$1\""
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
-msgstr "למחוק עול� \"$1\"?"
+msgstr "למחוק �ת העול� \"$1\"?"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
-msgstr "קבל"
+msgstr "הסכמה"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr ""
+msgstr "שנה �ת ש� חבילת המודי�:"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid ""
 "This modpack has an explicit name given in its modpack.conf which will "
 "override any renaming here."
 msgstr ""
+"ל- modpack (חבילת תוספות) זה יש ש� מפורש שניתן ב modpack.conf שלו �שר יעקוף "
+"כל שינוי-ש� כ�ן."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
-msgstr ""
+msgstr "(ל� נוסף תי�ור להגדרה)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "2D Noise"
-msgstr ""
+msgstr "רעש דו-מיימדי"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
-msgstr ""
+msgstr "חזור לדף ההגדרות >"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "קלינט"
+msgstr "דפדף"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
-msgstr ""
+msgstr "מושבת"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Edit"
-msgstr ""
+msgstr "עריכה"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Enabled"
-msgstr ""
+msgstr "מופעל"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Lacunarity"
-msgstr ""
+msgstr "מרווחיות"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Octaves"
-msgstr ""
+msgstr "�וקטבות"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
 msgid "Offset"
-msgstr ""
+msgstr "היסט"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Persistance"
-msgstr ""
+msgstr "התמדה"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
-msgstr ""
+msgstr "הכנס מספר של� חוקי."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid number."
-msgstr ""
+msgstr "הכנס מספר חוקי."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
-msgstr ""
+msgstr "שחזור לברירת המחדל"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
 msgid "Scale"
-msgstr ""
+msgstr "קנה מידה"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "חיפוש"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Select directory"
-msgstr "בחר עול�:"
+msgstr "נ� לבחור תיקיה"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Select file"
-msgstr "בחר עול�:"
+msgstr "נ� לבחור קובץ"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
-msgstr ""
+msgstr "הצגת שמות טכניי�"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be at least $1."
-msgstr ""
+msgstr "הערך חייב להיות לפחות $1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must not be larger than $1."
-msgstr ""
+msgstr "הערך ל� יכול להיות גדול מ־$1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "X"
-msgstr ""
+msgstr "X"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "X spread"
-msgstr ""
+msgstr "מרווחיות X"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Y spread"
-msgstr ""
+msgstr "מרווחיות Y"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Z"
-msgstr ""
+msgstr "Z"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Z spread"
-msgstr ""
+msgstr "מרווחיות Z"
 
 #. ~ "absvalue" is a noise parameter flag.
 #. It is short for "absolute value".
@@ -578,14 +629,14 @@ msgstr ""
 #. main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "absvalue"
-msgstr ""
+msgstr "ערך מוחלט"
 
 #. ~ "defaults" is a noise parameter flag.
 #. It describes the default processing options
 #. for noise settings in main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "defaults"
-msgstr ""
+msgstr "ברירת מחדל"
 
 #. ~ "eased" is a noise parameter flag.
 #. It is used to make the map smoother and
@@ -593,161 +644,173 @@ msgstr ""
 #. main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "eased"
-msgstr ""
+msgstr "החלקת ערכי�"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "$1 (Enabled)"
-msgstr "מופעל"
+msgstr "$1 (מופעל)"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "$1 mods"
-msgstr "מודי�"
+msgstr "$1 מודי�"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Failed to install $1 to $2"
-msgstr ""
+msgstr "התקנת $1 �ל $2 נכשלה"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install Mod: Unable to find real mod name for: $1"
-msgstr ""
+msgstr "התקנת מוד: ל� ניתן למצו� �ת ש� המוד ה�מיתי עבור: $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install Mod: Unable to find suitable folder name for modpack $1"
-msgstr ""
+msgstr "התקנת מוד: ל� ניתן למצו� ש� תיקייה מת�י� עבור חבילת המודי� $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install: Unsupported file type \"$1\" or broken archive"
-msgstr ""
+msgstr "התקנה: סוג קובץ ל� נתמך \"$1\" �ו שה�רכיב פגו�"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install: file: \"$1\""
-msgstr ""
+msgstr "התקנה: מקובץ: \"$1\""
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to find a valid mod or modpack"
-msgstr ""
+msgstr "ל� ניתן למצו� מוד/חבילת מודי� תקינה"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
-msgstr ""
+msgstr "ל� ניתן להתקין $1 כחבילת טקסטורות"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a game as a $1"
-msgstr ""
+msgstr "ל� ניתן להתקין משחק בתור $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a mod as a $1"
-msgstr ""
+msgstr "ל� ניתן להתקין מוד בתור $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a modpack as a $1"
+msgstr "ל� ניתן להתקין חבילת מודי� בתור $1"
+
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "כעת בטעינה..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "סקריפטי� בצד לקוח מבוטלי�"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
 msgstr ""
+"נ� לנסות לצ�ת ולהיכנס מחדש לרשימת השרתי� ולבדוק �ת החיבור שלך ל�ינטרנט."
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
-msgstr ""
+msgstr "עיון בתוכן מקוון"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
-msgstr ""
+msgstr "תוכן"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Disable Texture Pack"
-msgstr "חבילות מרק�"
+msgstr "השבתת חבילת המרק�"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Information:"
-msgstr ""
+msgstr "מידע:"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Installed Packages:"
-msgstr ""
+msgstr "חבילות מותקנות:"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No dependencies."
-msgstr ""
+msgstr "�ין תלויות."
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No package description available"
-msgstr ""
+msgstr "�ין תי�ור חבילה זמין"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Rename"
-msgstr ""
+msgstr "שנה ש�"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Uninstall Package"
-msgstr ""
+msgstr "הסרת החבילה"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Use Texture Pack"
-msgstr "חבילות מרק�"
+msgstr "שימוש בחבילת המרק�"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
-msgstr ""
+msgstr "תורמי� פעילי�"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Core Developers"
-msgstr ""
+msgstr "מפתחי� עיקריי�"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
-msgstr "קרדיטי�"
+msgstr "תודות"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "נ� לבחור תיקיית משתמש"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"פותח �ת התיקייה המכילה עולמות, משחקי�, מודי�,\n"
+"וחבילות טקסטורה במנהל קבצי�."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
-msgstr ""
+msgstr "תורמי� קודמי�"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
-msgstr ""
+msgstr "מפתחי ליבה קודמי�"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Announce Server"
-msgstr ""
+msgstr "הכרז על השרת"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Bind Address"
-msgstr ""
+msgstr "הצמד כתובת"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "קביעת תצורה"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
-msgstr "משחק יצירתי"
+msgstr "מצב יצירתי"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
-msgstr "�פשר נזק"
+msgstr "ל�פשר חבלה"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Host Game"
-msgstr "הסתר משחק"
+msgstr "�ירוח משחק"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Host Server"
-msgstr "שרת"
+msgstr "�כסון שרת"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "התקנת משחק מContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "ש�/סיסמה"
+msgid "Name"
+msgstr "ש�"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -755,186 +818,164 @@ msgstr "חדש"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "No world created or selected!"
-msgstr "�ין עול� נוצר �ו נבחר!"
+msgstr "�ין עול� שנוצר �ו נבחר!"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "סיסמה"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Play Game"
-msgstr "התחל משחק"
+msgstr "להתחיל לשחק"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Port"
 msgstr "פורט"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "בחירת מודי�"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
-msgstr "בחר עול�:"
+msgstr "נ� לבחור עול�:"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Server Port"
-msgstr ""
+msgstr "פורט לשרת"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Start Game"
-msgstr "הסתר משחק"
+msgstr "התחלת המשחק"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
 msgstr "כתובת / פורט"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
-msgstr "התחבר"
+msgstr "התחברות"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
-msgstr ""
+msgstr "מצב יצירתי"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
-msgstr ""
+msgstr "נזק מופעל"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
-msgstr ""
+msgstr "מחק מועדף"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
-msgstr ""
+msgstr "מועדף"
 
 #: builtin/mainmenu/tab_online.lua
-#, fuzzy
 msgid "Join Game"
-msgstr "הסתר משחק"
+msgstr "הצטרפות למשחק"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "ש�/סיסמה"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
-msgstr ""
+msgstr "פינג"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
-msgstr "PvP �פשר"
+msgstr "ל�פשר קרבות"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
-msgstr ""
+msgstr "x2"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "3D Clouds"
-msgstr ""
+msgstr "ענני� תלת מימדיי�"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "4x"
-msgstr ""
+msgstr "x4"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "8x"
-msgstr ""
+msgstr "x8"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "All Settings"
-msgstr "הגדרות"
+msgstr "כל ההגדרות"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
+msgstr "החלקת קצוות (AA):"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
-msgstr ""
+msgstr "שמור �וטומטית גודל מסך"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
+msgstr "פילטר בילינ�רי"
 
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
-msgstr ""
+msgstr "שנה מקשי�"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Connected Glass"
-msgstr "התחבר"
+msgstr "זכוכיות מחוברות"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Fancy Leaves"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
+msgstr "עלי� מגניבי�"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
-msgstr ""
+msgstr "מיפמ�פ"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap + Aniso. Filter"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "ל�"
+msgstr "מיפמ�פ + פילטר �ניסוטרופי"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
-msgstr ""
+msgstr "בלי פילטר"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Mipmap"
-msgstr ""
+msgstr "בלי מיפמ�פ"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
-msgstr ""
+msgstr "הבלטת קוביות"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Outlining"
-msgstr ""
+msgstr "הדגשת מסגרת קוביות"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "None"
-msgstr ""
+msgstr "לל�"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
-msgstr ""
+msgstr "עלי� �טומי�"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Water"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
+msgstr "מי� �טומי� ל�ור"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "חלקיקי�"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Reset singleplayer world"
-msgstr "שרת"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
-msgstr ""
+msgstr "מסך:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -942,127 +983,115 @@ msgstr "הגדרות"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Shaders"
-msgstr ""
+msgstr "שיידרי�"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "שיידרי� (נסיוני)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
-msgstr ""
+msgstr "שיידרי� (ל� זמיני�)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Simple Leaves"
-msgstr ""
+msgstr "עלי� פשוטי�"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Smooth Lighting"
-msgstr ""
+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."
-msgstr ""
+msgstr "כדי ל�פשר שיידרי� יש להשתמש בדרייבר של OpenGL."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
-msgstr ""
+msgstr "מיפוי גווני�"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold: (px)"
-msgstr ""
+msgstr "סף נגיעה: (px)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
-msgstr ""
+msgstr "פילטר תלת לינ�רי"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
-msgstr ""
+msgstr "עלי� מתנופפי�"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Liquids"
-msgstr ""
+msgstr "נוזלי� ע� גלי�"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Plants"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "כן"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
+msgstr "צמחי� מתנוענעי�"
 
 #: src/client/client.cpp
 msgid "Connection timed out."
-msgstr ""
+msgstr "זמן המתנה לחיבור �זל."
 
 #: src/client/client.cpp
 msgid "Done!"
-msgstr ""
+msgstr "הסתיי�!"
 
 #: src/client/client.cpp
 msgid "Initializing nodes"
-msgstr ""
+msgstr "מ�תחל קוביות"
 
 #: src/client/client.cpp
 msgid "Initializing nodes..."
-msgstr ""
+msgstr "מ�תחל קוביות..."
 
 #: src/client/client.cpp
 msgid "Loading textures..."
-msgstr ""
+msgstr "טוען טקסטורות..."
 
 #: src/client/client.cpp
 msgid "Rebuilding shaders..."
-msgstr ""
+msgstr "בונה מחדש שיידרי�..."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
-msgstr ""
+msgstr "בעיה בחיבור (נגמר זמן ההמתנה?)"
 
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
-msgstr ""
+msgstr "ל� מצליח למצו� �ו לטעון משחק \""
 
 #: src/client/clientlauncher.cpp
 msgid "Invalid gamespec."
-msgstr ""
+msgstr "הגדרת משחק ל� תקינה."
 
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
-msgstr ""
+msgstr "תפריט ר�שי"
 
 #: src/client/clientlauncher.cpp
 msgid "No world selected and no address provided. Nothing to do."
-msgstr ""
+msgstr "ל� נבחר עול� ול� נתנה כתובת. ל� עושה כלו�."
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
-msgstr ""
+msgstr "ש� השחקן �רוך מידי."
 
 #: src/client/clientlauncher.cpp
 msgid "Please choose a name!"
-msgstr ""
+msgstr "נ� לבחור ש�!"
 
 #: src/client/clientlauncher.cpp
 msgid "Provided password file failed to open: "
-msgstr ""
+msgstr "הסיסמה שניתנה ל� פתחה: "
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
-msgstr ""
+msgstr "נתיב העול� שניתן ל� קיי�: "
 
 #. ~ DO NOT TRANSLATE THIS LITERALLY!
 #. This is a special string. Put either "no" or "yes"
@@ -1081,84 +1110,81 @@ msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
+"\n"
+"בדוק �ת debug.txt לפרטי� נוספי�."
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Address: "
-msgstr "כתובת / פורט"
+msgstr "- כתובת: "
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Creative Mode: "
-msgstr "משחק יצירתי"
+msgstr "- מצב יצירתי: "
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Damage: "
-msgstr "�פשר נזק"
+msgstr "- חבלה: "
 
 #: src/client/game.cpp
 msgid "- Mode: "
-msgstr ""
+msgstr "- מצב: "
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Port: "
-msgstr "פורט"
+msgstr "- פורט: "
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Public: "
-msgstr "ציבורי"
+msgstr "- ציבורי: "
 
 #. ~ PvP = Player versus Player
 #: src/client/game.cpp
 msgid "- PvP: "
-msgstr ""
+msgstr "- קרב: "
 
 #: src/client/game.cpp
 msgid "- Server Name: "
-msgstr ""
+msgstr "- ש� שרת: "
 
 #: src/client/game.cpp
 msgid "Automatic forward disabled"
-msgstr ""
+msgstr "התקדמות �וטומטית קדימה מבוטלת"
 
 #: src/client/game.cpp
 msgid "Automatic forward enabled"
-msgstr ""
+msgstr "תנועה קדימה �וטומטית מופעל"
 
 #: src/client/game.cpp
 msgid "Camera update disabled"
-msgstr ""
+msgstr "עדכון מצלמה מבוטל"
 
 #: src/client/game.cpp
 msgid "Camera update enabled"
-msgstr ""
+msgstr "עדכון מצלמה מופעל"
 
 #: src/client/game.cpp
 msgid "Change Password"
-msgstr ""
+msgstr "שנה סיסמה"
 
 #: src/client/game.cpp
 msgid "Cinematic mode disabled"
-msgstr ""
+msgstr "מצב קולנועי מבוטל"
 
 #: src/client/game.cpp
 msgid "Cinematic mode enabled"
-msgstr ""
+msgstr "מצב קולנועי מופעל"
 
 #: src/client/game.cpp
 msgid "Client side scripting is disabled"
-msgstr ""
+msgstr "סקריפטי� בצד לקוח מבוטלי�"
 
 #: src/client/game.cpp
 msgid "Connecting to server..."
-msgstr ""
+msgstr "מתחבר לשרת..."
 
 #: src/client/game.cpp
 msgid "Continue"
-msgstr ""
+msgstr "המשך"
 
 #: src/client/game.cpp
 #, c-format
@@ -1168,39 +1194,50 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
+"פקדי�:\n"
+"- %s: כדי לזוז קדימה\n"
+"- %s: כדי לזוז �חורה\n"
+"- %s: כדי לזוז שמ�לה\n"
+"- %s: כדי לזוז ימינה\n"
+"- %s: כדי לקפוץ �ו לטפס למעלה\n"
+"- %s: כדי לחפור �ו לחבוט\n"
+"- %s: כדי להניח �ו להשתמש\n"
+"- %s: כדי להתכופף �ו לטפס למטה\n"
+"- %s: כדי לזרוק פריט\n"
+"- %s: כדי לפתוח �ת תיק החפצי�\n"
+"- עכבר: כדי להסתובב �ו להסתכל\n"
+"- גלגלת העכבר: כדי לבחור פריט\n"
+"- %s: כדי לפתוח �ת הצ׳�ט\n"
 
 #: src/client/game.cpp
 msgid "Creating client..."
-msgstr ""
+msgstr "יוצר לקוח..."
 
 #: src/client/game.cpp
 msgid "Creating server..."
-msgstr ""
+msgstr "יוצר שרת..."
 
 #: src/client/game.cpp
 msgid "Debug info and profiler graph hidden"
-msgstr ""
+msgstr "מידע דיב�ג וגרף פרופיילר מוסתר"
 
 #: src/client/game.cpp
 msgid "Debug info shown"
-msgstr ""
+msgstr "מידע דיב�ג מוצג"
 
 #: src/client/game.cpp
 msgid "Debug info, profiler graph, and wireframe hidden"
-msgstr ""
+msgstr "מידע דיב�ג, גרף פרופיילר, ומצב שלד מוסתר"
 
 #: src/client/game.cpp
 msgid ""
@@ -1217,187 +1254,146 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
+"פקדי ברירת מחדל:\n"
+"ל� נר�ה תפריט:\n"
+"- לחיצה בודדת: הפעלת כפתור\n"
+"- הקשה כפולה: מקו� / שימוש\n"
+"- החלק �צבע: הביט סביב\n"
+"תפריט / מל�י גלוי:\n"
+"- לחיצה כפולה (בחוץ):\n"
+"--> סגור\n"
+"- מחסנית מגע, חריץ מגע:\n"
+"--> הזז מחסנית\n"
+"- גע וגרור, הקש על ה�צבע השנייה\n"
+"--> מק� פריט יחיד לחריץ\n"
 
 #: src/client/game.cpp
 msgid "Disabled unlimited viewing range"
-msgstr ""
+msgstr "ביטול טווח ר�יה בלתי מוגבל"
 
 #: src/client/game.cpp
 msgid "Enabled unlimited viewing range"
-msgstr ""
+msgstr "הפעלת טווח ר�יה בלתי מוגבל"
 
 #: src/client/game.cpp
 msgid "Exit to Menu"
-msgstr ""
+msgstr "יצי�ה לתפריט"
 
 #: src/client/game.cpp
 msgid "Exit to OS"
-msgstr ""
+msgstr "יצי�ה למערכת ההפעלה"
 
 #: src/client/game.cpp
 msgid "Fast mode disabled"
-msgstr ""
+msgstr "מצב מהיר מבוטל"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled"
-msgstr ""
+msgstr "מצב מהיר מופעל"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr ""
+msgstr "מצב מהיר מופעל (שי� לב, �ין הרש�ת 'fast')"
 
 #: src/client/game.cpp
 msgid "Fly mode disabled"
-msgstr ""
+msgstr "מצב תעופה מבוטל"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Fly mode enabled"
-msgstr "מופעל"
+msgstr "מצב תעופה הופעל"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr ""
+msgstr "מצב תעופה מופעל (שי� לב, �ין הרש�ת 'fly')"
 
 #: src/client/game.cpp
 msgid "Fog disabled"
-msgstr ""
+msgstr "ערפל מבוטל"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Fog enabled"
-msgstr "מופעל"
-
-#: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "מופעל"
+msgstr "ערפל מופעל"
 
 #: src/client/game.cpp
 msgid "Game info:"
-msgstr ""
+msgstr "מידע על המשחק:"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Game paused"
-msgstr "משחקי�"
+msgstr "המשחק הושהה"
 
 #: src/client/game.cpp
 msgid "Hosting server"
-msgstr ""
+msgstr "שרת מ�רח"
 
 #: src/client/game.cpp
 msgid "Item definitions..."
-msgstr ""
+msgstr "הגדרות פריט..."
 
 #: src/client/game.cpp
 msgid "KiB/s"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "מופעל"
+msgstr "קילובייט/שניה"
 
 #: src/client/game.cpp
 msgid "Media..."
-msgstr ""
+msgstr "מדיה..."
 
 #: src/client/game.cpp
 msgid "MiB/s"
-msgstr ""
+msgstr "מגהבייט/שניה"
 
 #: src/client/game.cpp
 msgid "Minimap currently disabled by game or mod"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
+msgstr "מיפמ�פ כרגע מבוטל ע\"י המשחק �ו המוד"
 
 #: src/client/game.cpp
 msgid "Noclip mode disabled"
-msgstr ""
+msgstr "מעבר דרך קירות מבוטל"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled"
-msgstr ""
+msgstr "מעבר דרך קירות מופעל"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled (note: no 'noclip' privilege)"
-msgstr ""
+msgstr "מעבר דרך קירות מופעל (שי� לב, �ין הרש�ת 'noclip')"
 
 #: src/client/game.cpp
 msgid "Node definitions..."
-msgstr ""
+msgstr "הגדרות קוביה..."
 
 #: src/client/game.cpp
 msgid "Off"
-msgstr ""
+msgstr "מכובה"
 
 #: src/client/game.cpp
 msgid "On"
-msgstr ""
+msgstr "דולק"
 
 #: src/client/game.cpp
 msgid "Pitch move mode disabled"
-msgstr ""
+msgstr "תנועה לכיוון מבט מכובה"
 
 #: src/client/game.cpp
 msgid "Pitch move mode enabled"
-msgstr ""
+msgstr "תנועה לכיוון מבט מופעל"
 
 #: src/client/game.cpp
 msgid "Profiler graph shown"
-msgstr ""
+msgstr "גרף פרופיילר מוצג"
 
 #: src/client/game.cpp
 msgid "Remote server"
-msgstr ""
+msgstr "שרת מרוחק"
 
 #: src/client/game.cpp
 msgid "Resolving address..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Respawn"
-msgstr ""
+msgstr "מפענח כתובת..."
 
 #: src/client/game.cpp
 msgid "Shutting down..."
-msgstr ""
+msgstr "מכבה..."
 
 #: src/client/game.cpp
 msgid "Singleplayer"
@@ -1405,274 +1401,261 @@ msgstr "שחקן יחיד"
 
 #: src/client/game.cpp
 msgid "Sound Volume"
-msgstr ""
+msgstr "ווליו� שמע"
 
 #: src/client/game.cpp
 msgid "Sound muted"
-msgstr ""
+msgstr "שמע מושתק"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "מערכת שמע ל� מופעלת"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "מערכת שמע ל� נתמכת בבניה הנוכחית"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
-msgstr ""
+msgstr "מערכת שמע מופעלת"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range changed to %d"
-msgstr ""
+msgstr "טווח ר�יה השתנה ל %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at maximum: %d"
-msgstr ""
+msgstr "טווח ר�יה הגיע למקסימו�: %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at minimum: %d"
-msgstr ""
+msgstr "טווח ר�יה הגיע למינימו�: %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Volume changed to %d%%"
-msgstr ""
+msgstr "עוצמת שמע שונתה ל %d%%"
 
 #: src/client/game.cpp
 msgid "Wireframe shown"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "You died"
-msgstr ""
+msgstr "מסגרת שלדית מוצגת"
 
 #: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
-msgstr ""
+msgstr "זו� גרגע מבוטל על-ידי המשחק �ו המוד"
 
 #: src/client/game.cpp
 msgid "ok"
-msgstr ""
+msgstr "�וקיי"
 
 #: src/client/gameui.cpp
 msgid "Chat hidden"
-msgstr ""
+msgstr "צ'�ט מוסתר"
 
 #: src/client/gameui.cpp
 msgid "Chat shown"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
+msgstr "צ'�ט מוצג"
 
 #: src/client/gameui.cpp
 msgid "HUD hidden"
-msgstr ""
+msgstr "מידע-על-מסך מוסתר"
 
 #: src/client/gameui.cpp
 msgid "HUD shown"
-msgstr ""
+msgstr "מידע-על-מסך מוצג"
 
 #: src/client/gameui.cpp
 msgid "Profiler hidden"
-msgstr ""
+msgstr "פרופיילר מוסתר"
 
 #: src/client/gameui.cpp
 #, c-format
 msgid "Profiler shown (page %d of %d)"
-msgstr ""
+msgstr "פרופיילר מוצג (עמוד %d מתוך %d)"
 
 #: src/client/keycode.cpp
 msgid "Apps"
-msgstr ""
+msgstr "�פליקציות"
 
 #: src/client/keycode.cpp
 msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
-msgstr ""
+msgstr "Caps Lock"
 
 #: src/client/keycode.cpp
 msgid "Clear"
-msgstr ""
+msgstr "נקה"
 
 #: src/client/keycode.cpp
 msgid "Control"
-msgstr ""
+msgstr "קונטרול"
 
 #: src/client/keycode.cpp
 msgid "Down"
-msgstr ""
+msgstr "למטה"
 
 #: src/client/keycode.cpp
 msgid "End"
-msgstr ""
+msgstr "End"
 
 #: src/client/keycode.cpp
 msgid "Erase EOF"
-msgstr ""
+msgstr "מחק EOF"
 
 #: src/client/keycode.cpp
 msgid "Execute"
-msgstr ""
+msgstr "בצע"
 
 #: src/client/keycode.cpp
 msgid "Help"
-msgstr ""
+msgstr "עזרה"
 
 #: src/client/keycode.cpp
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "IME Accept"
-msgstr "קבל"
+msgstr "קבל IME"
 
 #: src/client/keycode.cpp
 msgid "IME Convert"
-msgstr ""
+msgstr "המרת IME"
 
 #: src/client/keycode.cpp
 msgid "IME Escape"
-msgstr ""
+msgstr "יצי�ת IME"
 
 #: src/client/keycode.cpp
 msgid "IME Mode Change"
-msgstr ""
+msgstr "שינוי מצב IME"
 
 #: src/client/keycode.cpp
 msgid "IME Nonconvert"
-msgstr ""
+msgstr "IME לל� המרה"
 
 #: src/client/keycode.cpp
 msgid "Insert"
-msgstr ""
+msgstr "Insert"
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
-msgstr ""
+msgstr "שמ�לה"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
-msgstr ""
+msgstr "הלחצן השמ�לי"
 
 #: src/client/keycode.cpp
 msgid "Left Control"
-msgstr ""
+msgstr "מקש Control השמ�לי"
 
 #: src/client/keycode.cpp
 msgid "Left Menu"
-msgstr ""
+msgstr "תפריט שמ�לי"
 
 #: src/client/keycode.cpp
 msgid "Left Shift"
-msgstr ""
+msgstr "מקש Shift השמ�לי"
 
 #: src/client/keycode.cpp
 msgid "Left Windows"
-msgstr ""
+msgstr "מקש Windows השמ�לי"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
 msgid "Menu"
-msgstr ""
+msgstr "תפריט"
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
-msgstr ""
+msgstr "כפתור �מצעי"
 
 #: src/client/keycode.cpp
 msgid "Num Lock"
-msgstr ""
+msgstr "נעילה נומרית"
 
 #: src/client/keycode.cpp
 msgid "Numpad *"
-msgstr ""
+msgstr "מקלדת נומרית *"
 
 #: src/client/keycode.cpp
 msgid "Numpad +"
-msgstr ""
+msgstr "מקלדת נומרית +"
 
 #: src/client/keycode.cpp
 msgid "Numpad -"
-msgstr ""
+msgstr "מקלדת נומרית -"
 
 #: src/client/keycode.cpp
 msgid "Numpad ."
-msgstr ""
+msgstr "מקלדת נומרית ."
 
 #: src/client/keycode.cpp
 msgid "Numpad /"
-msgstr ""
+msgstr "מקלדת נומרית /"
 
 #: src/client/keycode.cpp
 msgid "Numpad 0"
-msgstr ""
+msgstr "מקלדת נומרית 0"
 
 #: src/client/keycode.cpp
 msgid "Numpad 1"
-msgstr ""
+msgstr "מקלדת נומרית 1"
 
 #: src/client/keycode.cpp
 msgid "Numpad 2"
-msgstr ""
+msgstr "מקלדת נומרית 2"
 
 #: src/client/keycode.cpp
 msgid "Numpad 3"
-msgstr ""
+msgstr "מקלדת נומרית 3"
 
 #: src/client/keycode.cpp
 msgid "Numpad 4"
-msgstr ""
+msgstr "מקלדת נומרית 4"
 
 #: src/client/keycode.cpp
 msgid "Numpad 5"
-msgstr ""
+msgstr "מקלדת נומרית 5"
 
 #: src/client/keycode.cpp
 msgid "Numpad 6"
-msgstr ""
+msgstr "מקלדת נומרית 6"
 
 #: src/client/keycode.cpp
 msgid "Numpad 7"
-msgstr ""
+msgstr "מקלדת נומרית 7"
 
 #: src/client/keycode.cpp
 msgid "Numpad 8"
-msgstr ""
+msgstr "מקלדת נומרית 8"
 
 #: src/client/keycode.cpp
 msgid "Numpad 9"
-msgstr ""
+msgstr "מקלדת נומרית 9"
 
 #: src/client/keycode.cpp
 msgid "OEM Clear"
-msgstr ""
+msgstr "ניקוי OME"
 
 #: src/client/keycode.cpp
 msgid "Page down"
-msgstr ""
+msgstr "Page down"
 
 #: src/client/keycode.cpp
 msgid "Page up"
-msgstr ""
+msgstr "Page up"
 
 #: src/client/keycode.cpp
 msgid "Pause"
-msgstr ""
+msgstr "Pause"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1681,88 +1664,106 @@ msgstr "שחק"
 #. ~ "Print screen" key
 #: src/client/keycode.cpp
 msgid "Print"
-msgstr ""
+msgstr "PrintScreen"
 
 #: src/client/keycode.cpp
 msgid "Return"
-msgstr ""
+msgstr "Enter"
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
 msgid "Right"
-msgstr ""
+msgstr "ימינה"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
-msgstr ""
+msgstr "הלחצן הימני"
 
 #: src/client/keycode.cpp
 msgid "Right Control"
-msgstr ""
+msgstr "מקש Control הימני"
 
 #: src/client/keycode.cpp
 msgid "Right Menu"
-msgstr ""
+msgstr "תפריט ימני"
 
 #: src/client/keycode.cpp
 msgid "Right Shift"
-msgstr ""
+msgstr "מקש Shift הימני"
 
 #: src/client/keycode.cpp
 msgid "Right Windows"
-msgstr ""
+msgstr "מקש Windows הימני"
 
 #: src/client/keycode.cpp
 msgid "Scroll Lock"
-msgstr ""
+msgstr "Scroll Lock"
 
 #. ~ Key name
 #: src/client/keycode.cpp
 msgid "Select"
-msgstr ""
+msgstr "Select"
 
 #: src/client/keycode.cpp
 msgid "Shift"
-msgstr ""
+msgstr "Shift"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
-msgstr ""
+msgstr "שינה"
 
 #: src/client/keycode.cpp
 msgid "Snapshot"
-msgstr ""
+msgstr "צילו� רגעי"
 
 #: src/client/keycode.cpp
 msgid "Space"
-msgstr ""
+msgstr "רווח"
 
 #: src/client/keycode.cpp
 msgid "Tab"
-msgstr ""
+msgstr "Tab"
 
 #: src/client/keycode.cpp
 msgid "Up"
-msgstr ""
+msgstr "למעלה"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
-msgstr ""
+msgstr "X כפתור 1"
 
 #: src/client/keycode.cpp
 msgid "X Button 2"
-msgstr ""
+msgstr "X כפתור 2"
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
 msgid "Zoom"
-msgstr ""
+msgstr "זו�"
+
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "מפה קטנה מוסתרת"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "מפה קטנה במצב ר�דר, זו� x %d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "מפה קטנה במצב שטח, זו� x %d"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "מפה קטנה במצב טקסטורה"
 
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
-msgstr ""
+msgstr "סיסמ�ות ל� תו�מות!"
 
 #: src/gui/guiConfirmRegistration.cpp
 msgid "Register and Join"
-msgstr ""
+msgstr "הרש� והצטרף"
 
 #: src/gui/guiConfirmRegistration.cpp
 #, c-format
@@ -1773,224 +1774,192 @@ msgid ""
 "Please retype your password and click 'Register and Join' to confirm account "
 "creation, or click 'Cancel' to abort."
 msgstr ""
+"�תה עומד להצטרף לשרת זה ע� הש� \"%s\" בפע� הר�שונה.\n"
+"�� תמשיך, ייווצר חשבון חדש ב�מצעות �ישוריך בשרת זה.\n"
+"�נ� הקלד מחדש �ת הסיסמה שלך ולחץ על 'הירש� והצטרף' כדי ל�שר �ת יצירת החשבון, "
+"�ו לחץ על 'ביטול' כדי לבטל."
 
 #: src/gui/guiFormSpecMenu.cpp
 msgid "Proceed"
-msgstr ""
+msgstr "להמשיך"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "\"Special\" = climb down"
-msgstr ""
+msgstr "\"מיוחד\" = טפס למטה"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Autoforward"
-msgstr ""
+msgstr "קדימה �וטומטי"
 
 #: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Automatic jumping"
-msgstr ""
+msgstr "קפיצה �וטומטית"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Backward"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
+msgstr "�חורה"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
-msgstr ""
+msgstr "שנה מצלמה"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Chat"
-msgstr ""
+msgstr "צ'�ט"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Command"
-msgstr ""
+msgstr "פקודה"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Console"
-msgstr ""
+msgstr "קונסולה"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Dec. range"
-msgstr ""
+msgstr "הקטן טווח"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Dec. volume"
-msgstr ""
+msgstr "הנמך ווליו�"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr ""
+msgstr "לחיצה כפולה על \"קפיצה\" כדי לכבות �ו להדליק �ת מצב התעופה"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Drop"
-msgstr ""
+msgstr "הפל"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Forward"
-msgstr ""
+msgstr "קדימה"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. range"
-msgstr ""
+msgstr "הגדל טווח"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. volume"
-msgstr ""
+msgstr "הגבר ווליו�"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inventory"
-msgstr ""
+msgstr "תיק חפצי�"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Jump"
-msgstr ""
+msgstr "קפיצה"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Key already in use"
-msgstr ""
+msgstr "מקש כבר בשימוש"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
-msgstr ""
+msgstr "קישור מקשי� (�� התפריט מתקלקל, הסר דברי� מminetest.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"
-msgstr ""
+msgstr "פקודה מקומית"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Mute"
-msgstr ""
+msgstr "השתק"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Next item"
-msgstr ""
+msgstr "הפריט הב�"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Prev. item"
-msgstr ""
+msgstr "הפריט הקוד�"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Range select"
-msgstr ""
+msgstr "בחר טווח"
 
 #: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Screenshot"
-msgstr ""
+msgstr "צילו� מסך"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Sneak"
-msgstr ""
+msgstr "התכופף"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Special"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
+msgstr "מיוחד"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
+msgstr "מתג מידע על מסך"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
-msgstr ""
+msgstr "מתג צ�'ט לוג"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
-msgstr ""
+msgstr "מתג מצב מהיר"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fly"
-msgstr ""
+msgstr "מתג תעופה"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fog"
-msgstr ""
+msgstr "מתג ערפל"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle minimap"
-msgstr ""
+msgstr "מתג מפה קטנה"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
-msgstr ""
+msgstr "מתג מעבר דרך קירות"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle pitchmove"
-msgstr ""
+msgstr "מתג תנועה לכיוון מבט"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "press key"
-msgstr ""
+msgstr "לחץ מקש"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
-msgstr ""
+msgstr "שנה"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Confirm Password"
-msgstr ""
+msgstr "�שר סיסמה"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "New Password"
-msgstr ""
+msgstr "סיסמה חדשה"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Old Password"
-msgstr ""
+msgstr "סיסמה ישנה"
 
 #: src/gui/guiVolumeChange.cpp
 msgid "Exit"
-msgstr ""
+msgstr "יצי�ה"
 
 #: src/gui/guiVolumeChange.cpp
 msgid "Muted"
-msgstr ""
+msgstr "מושתק"
 
 #: src/gui/guiVolumeChange.cpp
 msgid "Sound Volume: "
-msgstr ""
+msgstr "עוצמת שמע: "
 
 #. ~ Imperative, as in "Enter/type in text".
 #. Don't forget the space.
 #: src/gui/modalMenu.cpp
 msgid "Enter "
-msgstr ""
+msgstr "הכנס "
 
 #. ~ DO NOT TRANSLATE THIS LITERALLY!
 #. This is a special string which needs to contain the translation's
@@ -2004,6 +1973,8 @@ msgid ""
 "(Android) Fixes the position of virtual joystick.\n"
 "If disabled, virtual joystick will center to first-touch's position."
 msgstr ""
+"(Android) מתקן �ת המיקו� של הג'ויסטיק הווירטו�לי.\n"
+"�� מושבת, הג'ויסטיק הווירטו�לי יעמוד במיקו� המגע הר�שון."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2011,6 +1982,9 @@ msgid ""
 "If enabled, virtual joystick will also tap \"aux\" button when out of main "
 "circle."
 msgstr ""
+"(Android) השתמש בג'ויסטיק וירטו�לי כדי להפעיל �ת כפתור \"aux\".\n"
+"�� הו� מופעל, הג'ויסטיק הווירטו�לי ילחץ ג� על כפתור \"aux\" כשהו� מחוץ למעגל "
+"הר�שי."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2023,6 +1997,14 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X, Y, Z) היסט של פרקטל ממרכז עולמי ביחידות 'סק�לה'.\n"
+"ניתן להשתמש בה כדי להעביר נקודה רצויה ל (0, 0) כדי ליצור\n"
+"נקודת הופעה מת�ימה, �ו כדי ל�פשר 'התקרבות' לנקודה רצויה\n"
+"על ידי הגדלת 'סק�לה'.\n"
+"ברירת המחדל מכוונת לנקודת הופעה מת�ימה למנדלברוט\n"
+"קבוצות ע� פרמטרי ברירת מחדל, יתכן שיהיה צורך לשנות ז�ת\n"
+"מצבי�.\n"
+"טווח בערך -2 עד 2. הכפל ב�מצעות 'קנה מידה' עבור קיזוז בצמתי�."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2034,62 +2016,65 @@ msgid ""
 "Default is for a vertically-squashed shape suitable for\n"
 "an island, set all 3 numbers equal for the raw shape."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
+"(X, Y, Z) סק�לה של פרקטל בצמתי�.\n"
+"גודל הפרקטל בפועל יהיה גדול פי 2 עד 3.\n"
+"ניתן להפוך �ת המספרי� הללו לגדולי� מ�וד, כך הפרקטל\n"
+"ל� צריך להשתלב בעול�.\n"
+"הגדל �ת �לה ל\"התקרב \"לפרטי הפרקטל.\n"
+"ברירת המחדל הי� לצורה מעוכה �נכית המת�ימה ל\n"
+"�י, קבע �ת כל 3 המספרי� שווי� לצורה הגולמית."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
-msgstr ""
+msgstr "רעש דו-ממדי השולט על צורת� / גודל ההרי� המחורצי�."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of rolling hills."
-msgstr ""
+msgstr "רעש דו-ממדי השולט על צורת� / גודל הגבעות המתונות."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of step mountains."
-msgstr ""
+msgstr "רעש דו-ממדי השולט על צורת� / גודל ההרי� הניש�י�."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of ridged mountain ranges."
-msgstr ""
+msgstr "רעש דו-ממדי השולט על תדירות/ גודל רכסי ההרי�."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of rolling hills."
-msgstr ""
+msgstr "רעש דו-ממדי השולט על תדירות/גודל הגבעות המתונות."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of step mountain ranges."
-msgstr ""
+msgstr "רעש דו-ממדי השולט על תדירות/גודל רכסי ההרי�."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that locates the river valleys and channels."
-msgstr ""
+msgstr "רעש דו-ממדי שמ�תר �ת עמקי הנהרות ותעלותיה�."
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
-msgstr ""
+msgstr "ענני� תלת מימדיי�"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode"
-msgstr ""
+msgstr "מצב תלת מימדי"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode parallax strength"
-msgstr ""
+msgstr "חוזק פרלקסה במצב תלת ממדי"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
-msgstr ""
+msgstr "רעשי תלת מימד המגדירי� מערות ענק."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "3D noise defining mountain structure and height.\n"
 "Also defines structure of floatland mountain terrain."
 msgstr ""
+"רעש תלת ממדי המגדיר �ת מבנה ההרי� וגובה�.\n"
+"מגדיר ג� מבנה שטח הרי� צפי�."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2098,22 +2083,27 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"רעש תלת ממדי מגדיר מבנה של שטחי צף.\n"
+"�� משתנה מברירת המחדל, ייתכן ש\"סק�לת\" הרעש (0.7 כברירת מחדל) זקוקה\n"
+"להיות מות�מת, מכיוון שההתפשטות של שטחי צף מתפקדת בצורה הטובה ביותר כ�שר יש "
+"לרעש זה\n"
+"טווח ערכי� של כ -2.0 עד 2.0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
-msgstr ""
+msgstr "מבנה מגדיר רעש תלת ממדי של קירות קניון הנהר."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining terrain."
-msgstr ""
+msgstr "רעש תלת ממדי המגדיר שטח."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise for mountain overhangs, cliffs, etc. Usually small variations."
-msgstr ""
+msgstr "רעש תלת ממדי להרי� תלויי�, צוקי� וכו'בדרך כלל ורי�ציות קטנות."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise that determines number of dungeons per mapchunk."
-msgstr ""
+msgstr "רעש תלת ממדי הקובע �ת מספר הצינוקי� בנתח מפה."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2128,52 +2118,68 @@ msgid ""
 "-    pageflip: quadbuffer based 3d.\n"
 "Note that the interlaced mode requires shaders to be enabled."
 msgstr ""
+"תמיכה בתלת מימד.\n"
+"נתמך כרגע:\n"
+"- לל�: �ין פלט תלת-ממדי.\n"
+"- �נ�גליף: צבע צי�ן / מגנטה 3d.\n"
+"- interlaced: תמיכה במסך קיטוב מבוסס מוזר / שווה\n"
+"- topbottom: מסך מפוצל למעלה / למטה.\n"
+"- צדדי: פיצול מסך זה לצד זה.\n"
+"- תצוגת רוחב: 3D ע� עיניי� צולבות\n"
+"- pageflip: quadbuffer מבוסס 3d.\n"
+"שי� לב שמצב interlaced מחייב הפעלת shaders."
 
 #: 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 ""
+"זרע מפה שנבחר עבור מפה חדשה, הש�ר ריק ל�קר�י.\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 "ABM interval"
-msgstr ""
+msgstr "�ינטרוול ABM"
+
+#: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr "הקצ�ת זמן ABM"
 
 #: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr ""
+msgstr "מגבלה מוחלטת של בלוקי� בתור שיופיעו"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
-msgstr ""
+msgstr "ת�וצה ב�ויר"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration of gravity, in nodes per second per second."
-msgstr ""
+msgstr "ה�צת כוח הכבידה, בקוביות לשנייה בריבוע."
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifiers"
-msgstr ""
+msgstr "משניי בלוק פעיל"
 
 #: src/settings_translation_file.cpp
 msgid "Active block management interval"
-msgstr ""
+msgstr "�ינטרוול ניהול בלוק פעיל"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
-msgstr ""
+msgstr "טווח בלוק פעיל"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
-msgstr ""
+msgstr "טווח שליחת �ובייקט פעיל"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2181,16 +2187,19 @@ 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 "Adds particles when digging a node."
-msgstr ""
+msgstr "הוסף חלקיקי� כשחופרי� בקוביה."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
-msgstr ""
+msgstr "הת�� �ת תצורת dpi למסך שלך (ל� X11 / Android בלבד) למשל. למסכי 4k."
 
 #: src/settings_translation_file.cpp
 #, c-format
@@ -2201,10 +2210,15 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"מכוון �ת הצפיפות של שכבת �דמות צותף.\n"
+"הגדל �ת הערך כדי להגדיל �ת הצפיפות. יכול להיות חיובי �ו שלילי.\n"
+"ערך = 0.0: 50% מהנפח הו� שטח צף.\n"
+"ערך = 2.0 (יכול להיות גבוה יותר בהת�� ל- 'mgv7_np_floatland', בדוק תמיד\n"
+"כדי להיות בטוח) יוצר שכבת צף מוצקה."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
-msgstr ""
+msgstr "מתקד�"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2214,60 +2228,67 @@ msgid ""
 "This only has significant effect on daylight and artificial\n"
 "light, it has very little effect on natural night light."
 msgstr ""
+"משנה �ת עקומת ה�ור על ידי החלת 'תיקון גמ�' עליה.\n"
+"ערכי� גבוהי� הופכי� �ת רמות ה�ור ה�מצעיות והתחתונות לבהירות יותר.\n"
+"הערך '1.0' מש�יר �ת עקומת ה�ור לל� שינוי.\n"
+"יש לכך השפעה משמעותית רק על �ור יו� ומל�כותי\n"
+"זה משפיע מעט מ�וד על �ור הלילה הטבעי."
 
 #: src/settings_translation_file.cpp
 msgid "Always fly and fast"
-msgstr ""
+msgstr "תמיד לעוף ומהר"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
-msgstr ""
+msgstr "גמ� חסימה סביבתית"
 
 #: src/settings_translation_file.cpp
 msgid "Amount of messages a player may send per 10 seconds."
-msgstr ""
+msgstr "כמות ההודעות ששחקן עשוי לשלוח לכל 10 שניות."
 
 #: src/settings_translation_file.cpp
 msgid "Amplifies the valleys."
-msgstr ""
+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 "Announce to this serverlist."
-msgstr ""
+msgstr "הכרז לרשימת השרתי�."
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
-msgstr ""
+msgstr "הוסף ש� פריט"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name to tooltip."
-msgstr ""
+msgstr "הוסף �ת ש� הפריט לטיפ הכלי�."
 
 #: src/settings_translation_file.cpp
 msgid "Apple trees noise"
-msgstr ""
+msgstr "רעש עצי תפוחי�"
 
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
-msgstr ""
+msgstr "�ינרציה בזרוע"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Arm inertia, gives a more realistic movement of\n"
 "the arm when the camera moves."
 msgstr ""
+"�ינרציה בזרוע, נותנת תנועה מצי�ותית יותר של\n"
+"הזרוע כשהמצלמה נעה."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
-msgstr ""
+msgstr "ש�ל ה�� להתחבר מחדש ל�חר קריסה"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2283,106 +2304,110 @@ msgid ""
 "optimization.\n"
 "Stated in mapblocks (16 nodes)."
 msgstr ""
+"במרחק זה השרת יעשה �ופטימיזציה ל�ילו בלוקי� נשלחי�\n"
+"ללקוחות.\n"
+"ערכי� קטני� עשויי� לשפר ביצועי� רבות, על חשבון גלוי\n"
+"עיבוד תקלות (חלק מהבלוקי� ל� יועברו מתחת למי� ובמערות,\n"
+"כמו ג� לפעמי� ביבשה).\n"
+"הגדרת ערך זה יותר מ- max_block_send_distance מבטלת ז�ת\n"
+"�ופטימיזציה.\n"
+"מצוין במפה (16 קוביות)."
 
 #: src/settings_translation_file.cpp
 msgid "Automatic forward key"
-msgstr ""
+msgstr "מקש התקדמות �וטומטית"
 
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
-msgstr ""
+msgstr "קפיצה �וטומטית של מכשולי� בקוביה יחידה."
 
 #: src/settings_translation_file.cpp
 msgid "Automatically report to the serverlist."
-msgstr ""
+msgstr "דווח �וטומטית לרשימת השרתי�."
 
 #: src/settings_translation_file.cpp
 msgid "Autosave screen size"
-msgstr ""
+msgstr "שמור �וטומטית גודל מסך"
 
 #: src/settings_translation_file.cpp
 msgid "Autoscaling mode"
-msgstr ""
+msgstr "מצב סק�לה �וטומטית (Autoscale)"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
-msgstr ""
+msgstr "מקש התזוזה �חורה"
 
 #: src/settings_translation_file.cpp
 msgid "Base ground level"
-msgstr ""
+msgstr "מפלס בסיס ה�דמה"
 
 #: src/settings_translation_file.cpp
 msgid "Base terrain height."
-msgstr ""
+msgstr "גובה השטח."
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
-msgstr ""
+msgstr "בסיסי"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
-msgstr ""
+msgstr "הרש�ות בסיסיות"
 
 #: src/settings_translation_file.cpp
 msgid "Beach noise"
-msgstr ""
+msgstr "רעש חופי�"
 
 #: src/settings_translation_file.cpp
 msgid "Beach noise threshold"
-msgstr ""
+msgstr "סף רעש חופי�"
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
-msgstr ""
+msgstr "סינון בילינ�רי"
 
 #: src/settings_translation_file.cpp
 msgid "Bind address"
-msgstr ""
+msgstr "הצמד כתובת"
 
 #: src/settings_translation_file.cpp
 msgid "Biome API temperature and humidity noise parameters"
-msgstr ""
+msgstr "פרמטרי רעש טמפרטורה ולחות של Biome API"
 
 #: src/settings_translation_file.cpp
 msgid "Biome noise"
-msgstr ""
+msgstr "רעש Biome"
 
 #: src/settings_translation_file.cpp
 msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr ""
+msgstr "ביטי� לפיקסל (עומק צבע) במצב מסך מל�."
 
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
-msgstr ""
+msgstr "�ופטימיזצית שליחת בלוק"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic font path"
-msgstr ""
+msgstr "נתיב גופן עבה/מוטה"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic monospace font path"
-msgstr ""
+msgstr "נתיב גופן ע� מרווח �חיד עבה/מוטה"
 
 #: src/settings_translation_file.cpp
 msgid "Bold font path"
-msgstr ""
+msgstr "נתיב גופן עבה"
 
 #: src/settings_translation_file.cpp
 msgid "Bold monospace font path"
-msgstr ""
+msgstr "נתיב גופן מרווח �חיד"
 
 #: src/settings_translation_file.cpp
 msgid "Build inside player"
-msgstr ""
+msgstr "בנה בתוך שחקן"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
+msgstr "בילד�ין"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2391,138 +2416,134 @@ msgid ""
 "Increasing can reduce artifacting on weaker GPUs.\n"
 "0.1 = Default, 0.25 = Good value for weaker tablets."
 msgstr ""
+"מרחק מצלמה 'קרוב לקיר' בקוביות, בין 0 ל -0.25\n"
+"עובד רק בפלטפורמות GLES. רוב המשתמשי� ל� יצטרכו לשנות ז�ת.\n"
+"הגדלה יכולה להפחית חפצי� על גרפי GPU חלשי� יותר.\n"
+"0.1 = ברירת מחדל, 0.25 = ערך טוב לט�בלטי� חלשי� יותר."
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
-msgstr ""
+msgstr "החלקת מצלמה"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing in cinematic mode"
-msgstr ""
+msgstr "החלקת מצלמה ומצב קולנועי"
 
 #: src/settings_translation_file.cpp
 msgid "Camera update toggle key"
-msgstr ""
+msgstr "מקש החלפת עדכון המצלמה"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise"
-msgstr ""
+msgstr "רעש מערות"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #1"
-msgstr ""
+msgstr "רעש מערות #1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #2"
-msgstr ""
+msgstr "רעש מערות #2"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "רוחב מערות"
 
 #: src/settings_translation_file.cpp
 msgid "Cave1 noise"
-msgstr ""
+msgstr "רעש מערה1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave2 noise"
-msgstr ""
+msgstr "רעש מערה2"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern limit"
-msgstr ""
+msgstr "גבול מנהרות"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern noise"
-msgstr ""
+msgstr "רעש מנהרות"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern taper"
-msgstr ""
+msgstr "מחדד מערות"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern threshold"
-msgstr ""
+msgstr "סף מערות"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern upper limit"
-msgstr ""
+msgstr "גבול עליון מערות"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Center of light curve boost range.\n"
 "Where 0.0 is minimum light level, 1.0 is maximum light level."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
+"טווח דחיפה של מרכז עקומת �ור.\n"
+"כ�שר 0.0 הו� רמת �ור מינימלית, 1.0 הו� רמת �ור מקסימלית."
 
 #: src/settings_translation_file.cpp
 msgid "Chat font size"
-msgstr ""
+msgstr "גודל גופן צ'�ט"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
-msgstr ""
+msgstr "מקש צ'�ט"
 
 #: src/settings_translation_file.cpp
 msgid "Chat log level"
-msgstr ""
+msgstr "רמת לוג צ'�ט"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
-msgstr ""
+msgstr "הגבלת מספר הודעות צ'�ט"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message format"
-msgstr ""
+msgstr "פורמט הודעות צ'�ט"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message kick threshold"
-msgstr ""
+msgstr "סף בעיטה להודעות צ'�ט"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message max length"
-msgstr ""
+msgstr "�ורך הודעת צ'�ט מקסימלי"
 
 #: src/settings_translation_file.cpp
 msgid "Chat toggle key"
-msgstr ""
+msgstr "מתג הפעלת צ'�ט"
 
 #: src/settings_translation_file.cpp
 msgid "Chatcommands"
-msgstr ""
+msgstr "פקודות צ'�ט"
 
 #: src/settings_translation_file.cpp
 msgid "Chunk size"
-msgstr ""
+msgstr "גודל חתיכה"
 
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode"
-msgstr ""
+msgstr "מצב קולנועי"
 
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode key"
-msgstr ""
+msgstr "מקש מצב קולנועי"
 
 #: src/settings_translation_file.cpp
 msgid "Clean transparent textures"
-msgstr ""
+msgstr "טקסטורות נקיות ושקופות"
 
 #: src/settings_translation_file.cpp
 msgid "Client"
-msgstr "קלינט"
+msgstr "לקוח"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
-msgstr ""
+msgstr "שרת ולקוח"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2618,6 +2639,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2666,16 +2691,17 @@ msgid "Crash message"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Creative"
-msgstr "ליצור"
+msgstr "יצירתי"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2683,7 +2709,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2692,7 +2720,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Damage"
-msgstr ""
+msgstr "חבלה"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
@@ -2783,12 +2811,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2860,6 +2882,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Dig key"
+msgstr "מקש התזוזה ימינה"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Digging particles"
 msgstr "חלקיקי�"
 
@@ -2877,7 +2904,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Double tap jump for fly"
-msgstr ""
+msgstr "הקשה כפולה על \"קפיצה\" לתעופה"
 
 #: src/settings_translation_file.cpp
 msgid "Double-tapping the jump key toggles fly mode."
@@ -2920,7 +2947,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2937,7 +2964,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enable players getting damage and dying."
-msgstr ""
+msgstr "ל�פשר חבלה ומוות של השחקני�."
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
@@ -3008,14 +3035,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3025,18 +3044,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3053,12 +3060,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3068,7 +3069,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3307,7 +3308,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
-msgstr ""
+msgstr "מקש התזוזה קדימה"
 
 #: src/settings_translation_file.cpp
 msgid "Fourth of 4 2D noises that together define hill/mountain range height."
@@ -3370,10 +3371,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3428,8 +3425,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3896,6 +3893,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3954,11 +3955,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Jump key"
-msgstr ""
+msgstr "מקש הקפיצה"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
-msgstr ""
+msgstr "מהירות הקפיצה"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3976,6 +3977,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4075,6 +4083,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4496,7 +4511,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Left key"
-msgstr ""
+msgstr "מקש התזוזה שמ�לה"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4631,11 +4646,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "תפריט ר�שי"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4649,6 +4659,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4818,7 +4836,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4867,6 +4885,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -4977,7 +5002,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
-msgstr ""
+msgstr "מיפמ�פינג"
 
 #: src/settings_translation_file.cpp
 msgid "Mod channels"
@@ -5096,14 +5121,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5129,10 +5146,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5158,34 +5171,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5251,6 +5236,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5403,11 +5396,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
+msgstr "מקש התזוזה ימינה"
 
 #: src/settings_translation_file.cpp
 msgid "River channel depth"
@@ -5562,7 +5551,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Server / Singleplayer"
-msgstr "שרת"
+msgstr "שרת / שחקן יחיד"
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
@@ -5661,6 +5650,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5790,10 +5789,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5887,6 +5882,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5945,8 +5944,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5972,15 +5971,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6116,6 +6120,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6193,37 +6208,39 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "View distance in nodes."
-msgstr ""
+msgstr "טווח ר�יה בקוביות."
 
 #: src/settings_translation_file.cpp
 msgid "View range decrease key"
-msgstr ""
+msgstr "מקש הקטנת טווח ר�יה"
 
 #: src/settings_translation_file.cpp
 msgid "View range increase key"
-msgstr ""
+msgstr "מקש הגדלת טוחח ר�יה"
 
 #: src/settings_translation_file.cpp
 msgid "View zoom key"
-msgstr ""
+msgstr "מקש זו� (משקפת)"
 
 #: src/settings_translation_file.cpp
 msgid "Viewing range"
-msgstr ""
+msgstr "טווח ר�יה"
 
 #: src/settings_translation_file.cpp
 msgid "Virtual joystick triggers aux button"
-msgstr ""
+msgstr "מקש הפעלת ג'ויסטיק וירטו�לי"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
-msgstr ""
+msgstr "ווליו�"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
+"עוצמת הקול של כל הצלילי�.\n"
+"דורש הפעלת מערכת הקול."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6240,19 +6257,19 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Walking speed"
-msgstr ""
+msgstr "מהירות הליכה"
 
 #: src/settings_translation_file.cpp
 msgid "Walking, flying and climbing speed in fast mode, in nodes per second."
-msgstr ""
+msgstr "מהירות הליכה, טיסה וטיפוס במצב מהיר, בקוביות לשנייה."
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
-msgstr ""
+msgstr "מפלס המי�"
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."
-msgstr ""
+msgstr "מפלס פני המי� בעול�."
 
 #: src/settings_translation_file.cpp
 msgid "Waving Nodes"
@@ -6272,15 +6289,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wave speed"
-msgstr ""
+msgstr "מהירות גל של נוזלי� ע� גלי�"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wavelength"
-msgstr ""
+msgstr "�ורך גל של נוזלי� ע� גלי�"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
-msgstr ""
+msgstr "צמחי� מתנופפי�"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6318,6 +6335,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6329,7 +6352,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether to allow players to damage and kill each other."
-msgstr ""
+msgstr "ה�� ל�פשר לשחקני� להרוג �חד־�ת־השני."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6356,7 +6379,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Width component of the initial window size."
-msgstr ""
+msgstr "רכיב רוחב של גודל החלון הר�שוני."
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selection box lines around nodes."
@@ -6392,25 +6415,25 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "World-aligned textures mode"
-msgstr ""
+msgstr "מצב טקסטורות מיושרות לעול�"
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
-msgstr ""
+msgstr "Y לקרקע שטוחה."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Y of mountain density gradient zero level. Used to shift mountains "
 "vertically."
-msgstr ""
+msgstr "Y של צפיפות הרי� שיפוע רמת �פס. משמש להעברת הרי� �נכית."
 
 #: src/settings_translation_file.cpp
 msgid "Y of upper limit of large caves."
-msgstr ""
+msgstr "Y של הגבול העליון של מערות גדולות."
 
 #: src/settings_translation_file.cpp
 msgid "Y-distance over which caverns expand to full size."
-msgstr ""
+msgstr "מרחק Y שעליו מתרחבות מערות לגודל מל�."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6441,20 +6464,57 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "cURL file download timeout"
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "cURL parallel limit"
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "cURL file download timeout"
+msgstr "(cURL) זמן להורדה נגמר"
+
+#: src/settings_translation_file.cpp
+msgid "cURL parallel limit"
+msgstr "(cURL) מגבלה לפעולות במקביל"
+
+#: src/settings_translation_file.cpp
 msgid "cURL timeout"
-msgstr ""
+msgstr "(cURL) מגבלת זמן"
 
-#~ msgid "Ok"
-#~ msgstr "�ישור"
+#~ msgid "Configure"
+#~ msgstr "קביעת תצורה"
 
 #, fuzzy
 #~ msgid "Enable VBO"
 #~ msgstr "�פשר בכל"
+
+#~ msgid "Main menu style"
+#~ msgstr "סגנון התפריט הר�שי"
+
+#~ msgid "No"
+#~ msgstr "ל�"
+
+#~ msgid "Ok"
+#~ msgstr "�ישור"
+
+#, fuzzy
+#~ msgid "Reset singleplayer world"
+#~ msgstr "שרת"
+
+#~ msgid "View"
+#~ msgstr "תצוגה"
+
+#~ msgid "Yes"
+#~ msgstr "כן"
diff --git a/po/hi/minetest.po b/po/hi/minetest.po
index 83043b3df..2c88b00f0 100644
--- a/po/hi/minetest.po
+++ b/po/hi/minetest.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-29 07:53+0000\n"
-"Last-Translator: Agastya <acagastya@outlook.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-10-06 14:26+0000\n"
+"Last-Translator: Eyekay49 <satvikpatwardhan@gmail.com>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/minetest/minetest/"
 "hi/>\n"
 "Language: hi\n"
@@ -17,11 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "वापस ज़िंदा हो�ं"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "आपकी मौत हो गयी"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr "Okay"
+msgstr "ठीक है"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -43,10 +51,6 @@ msgstr "वापस कनेक�ट करें"
 msgid "The server has requested a reconnect:"
 msgstr "सर�वर वापस कनेक�ट करना चाहता है :"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "लोड हो रहा है ..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "प�रोटोकॉल संख�या �क नहीं है। "
@@ -60,10 +64,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "सर�वर केवल प�रोटोकॉल $1 से $2 ही लेता है। "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "सार�वजनिक सर�वर शृंखला (सर�वर लिस�ट) को 'हां' करें और इंटरनेट कनेक�शन जांचें।"
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "हम केवल प�रोटोकॉल $1 ही लेते हैं।"
 
@@ -71,7 +71,8 @@ msgstr "हम केवल पà¥�रोटोकॉल $1 ही लेते à
 msgid "We support protocol versions between version $1 and $2."
 msgstr "हम प�रोटोकॉल $1 से $2 ही लेते हैं।"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -81,7 +82,8 @@ msgstr "हम पà¥�रोटोकॉल $1 से $2 ही लेते हà
 msgid "Cancel"
 msgstr "रोकें"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "निर�भरता�ं :"
 
@@ -155,19 +157,59 @@ msgid "enabled"
 msgstr "चालू"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "लोड हो रहा है ..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "सभी पैकेज"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "की पहले से इस�तेमाल में है"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "वापस म�ख�य पृष�ठ पर जा�ं"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "खेल चला�ं"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "cURL के बगैर कंपाइल होने के कारण Content DB उपलब�ध नहीं है"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
 msgstr "लोड हो रहा है ..."
 
@@ -185,6 +227,16 @@ msgid "Install"
 msgstr "इन�स�टाल करें"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "इन�स�टाल करें"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "अनावश�यक निर�भरता�ं :"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "माॅड"
@@ -198,9 +250,25 @@ msgid "No results"
 msgstr "क�छ नहीं मिला"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "ढूंढें"
+#, fuzzy
+msgid "No updates"
+msgstr "नया संस�करण इन�स�टाल करें"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -215,8 +283,12 @@ msgid "Update"
 msgstr "नया संस�करण इन�स�टाल करें"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "दृश�य"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -224,32 +296,31 @@ msgstr "\"$1\" नामक द�निया पहले से ही है
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "अतिरिक�त भूमि"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr ""
+msgstr "ऊंचाई की ठंडक"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
-msgstr ""
+msgstr "ऊंचाई का सूखापन"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biome blending"
-msgstr ""
+msgstr "बायोम परिवर�तन नज़र न आना (Biome Blending)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biomes"
-msgstr ""
+msgstr "बायोम"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caverns"
-msgstr ""
+msgstr "ग�फा�ं"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "सप�टक (आक�टेव)"
+msgstr "ग�फा�ं"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
@@ -269,19 +340,19 @@ msgstr "आप किसी भी खेल को minetest.net से डाà¤
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
-msgstr ""
+msgstr "कालकोठरियां"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "समतल भूमि"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "आसमान में तैरते ह�� भूमि-खंड"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
-msgstr ""
+msgstr "फ�लोटलैंड�स (आसमान में तैरते ह�� भूमि-खंड) (प�रायोगिक)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -289,11 +360,11 @@ msgstr "खेल"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Non-fractal भूमि तैयार हो : सम�द�र व भूमि के नीचे"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "छोटे पहाड़"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
@@ -362,13 +433,13 @@ msgstr "बीज"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "बायोम के बीच में धीरे-धीरे परिवर�तन"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
-msgstr ""
+msgstr "भूमि पर बनावटें (v6 के पेड़ व जंगली घास पर कोई असर नहीं)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
@@ -396,14 +467,13 @@ msgstr "पेड़ और जंगल की घास"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Vary river depth"
-msgstr ""
+msgstr "नदी की गहराईयों में अंतर"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
 msgstr ""
 "चेतावनी : न�यूनतम विकास खेल (Minimal development test) खेल बनाने वालों के लि� है।"
@@ -469,10 +539,6 @@ msgid "Browse"
 msgstr "ढूंढें"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "र�का ह�आ"
 
@@ -517,6 +583,10 @@ msgid "Scale"
 msgstr "स�केल"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "ढूंढें"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "फाईल पाथ च�नें"
 
@@ -631,6 +701,19 @@ msgstr "मॉड को $1 के रूप में इन�स�टाल
 msgid "Unable to install a modpack as a $1"
 msgstr "माॅडपैक को $1 के रूप में इन�स�टाल नहीं किया जा सका"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "लोड हो रहा है ..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "क�लाइंट की तरफ से स�क�रिप�ट लगाना मना है"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "सार�वजनिक सर�वर शृंखला (सर�वर लिस�ट) को 'हां' करें और इंटरनेट कनेक�शन जांचें।"
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "नेट पर वस�त��ं ढूंढें"
@@ -684,7 +767,14 @@ msgid "Credits"
 msgstr "आभार सूची"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "फाईल पाथ च�नें"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -704,14 +794,10 @@ msgid "Bind Address"
 msgstr "बाईंड �ड�रेस"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "सेटिंग बदलें"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "असीमित संसाधन"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "हानि व मृत�य� हो सकती है"
 
@@ -728,8 +814,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "नाम/पासवर�ड"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -740,6 +826,11 @@ msgid "No world created or selected!"
 msgstr "कोई द�निया उपस�थित या च�नी गयी नहीं है !"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "नया पासवर�ड"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "खेल खेलें"
 
@@ -748,6 +839,11 @@ msgid "Port"
 msgstr "पोर�ट"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "द�निया च�न�हें :"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "द�निया च�न�हें :"
 
@@ -763,23 +859,23 @@ msgstr "खेल श�रू करें"
 msgid "Address / Port"
 msgstr "�डरेस / पोर�ट"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "कनेक�ट करें"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "असीमित संसाधन"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "हानि व मृत�य� हो सकती है"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "पसंद हटा�ं"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "पसंद"
 
@@ -787,16 +883,16 @@ msgstr "पसंद"
 msgid "Join Game"
 msgstr "खेल में शामिल हो�ं"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "नाम/पासवर�ड"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "पिंग"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "खिलाडियों में मारा-पीटी की अन�मती है"
 
@@ -825,10 +921,6 @@ msgid "Antialiasing:"
 msgstr "�न�टी �लियासिंग :"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "क�या आप सचम�च अपने �क-खिलाडी द�निया रद�द करना चाहते हैं?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "स�क�रीन परिमाण स�वयं सेव हो"
 
@@ -836,10 +928,6 @@ msgstr "सà¥�कà¥�रीन परिमाण सà¥�वयं सेव हà¥
 msgid "Bilinear Filter"
 msgstr "द�विरेखिय फिल�टर"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "टकराव मैपिंग"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "की बदलें"
@@ -853,10 +941,6 @@ msgid "Fancy Leaves"
 msgstr "रोचक पत�ते"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "मामूली नक�शे बना�ं"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "मिपमैप"
 
@@ -865,10 +949,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "मिपमैप व अनीसो. फिल�टर"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "नहीं"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "कोई फिल�टर नहीं"
 
@@ -896,19 +976,11 @@ msgstr "अपारदर�शी पत�ते"
 msgid "Opaque Water"
 msgstr "अपारदर�शी पानी"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "पेरलेक�स ऑक�लूजन"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "कण"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "�क-खिलाडी द�निया रीसेट करें"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "स�क�रीन :"
 
@@ -921,6 +993,11 @@ msgid "Shaders"
 msgstr "छाया बनावट"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "फ�लोटलैंड�स (आसमान में तैरते ह�� भूमि-खंड) (प�रायोगिक)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "छाया बनावट (अन�पलब�ध)"
 
@@ -964,22 +1041,6 @@ msgstr "पानी में लहरें बनें"
 msgid "Waving Plants"
 msgstr "पाैधे लहरा�ं"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "हां"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "मॉड कॆ सेटिंग बदलें"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "म�ख�य"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "�क-खिलाडी श�रू करें"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "कनेक�शन समय अंत|"
@@ -1141,18 +1202,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "कंट�रोल�स:\n"
 "- %s : आगे बढ़ने के लि�\n"
@@ -1266,16 +1324,6 @@ msgid "Fog enabled"
 msgstr "कोहरा चालू"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "कोहरा र�का ह�आ"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "कोहरा चालू"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "खेल की जानकारी :"
 
@@ -1296,16 +1344,6 @@ msgid "KiB/s"
 msgstr "कि॰बी॰/�स॰"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "कोहरा र�का ह�आ"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "हानि व मृत�य� हो सकती है"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "कला �वं आवाज़ें ..."
 
@@ -1318,34 +1356,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "खेल या मॉड़ के वजह से छोटा नक�शा मना है"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "छोटा नक�शा गायब"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "छोटा नक�शा रेडार मोड, 1 ग�ना ज़ूम"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "छोटा नक�शा रेडर मोड, दोग�ना जूम"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "छोटा नक�शा रेडार मोड, 4 ग�ना ज़ूम"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "छोटा नक�शा जमीन मोड, 1 ग�ना ज़ूम"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "छोटा नक�शा जमीन मोड, दोग�ना जूम"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "छोटा नक�शा जमीन मोड, 4 ग�ना जून"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "तरल चाल र�का ह�आ"
 
@@ -1390,10 +1400,6 @@ msgid "Resolving address..."
 msgstr "�ड�रेस सम�ा जा रहा है ..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "वापस ज़िंदा हो�ं"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "शट डाउन हो रहा है ..."
 
@@ -1446,10 +1452,6 @@ msgid "Wireframe shown"
 msgstr "डिब�बे रेखांकित"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "आपकी मौत हो गयी"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "खेल या मॉड़ के वजह से इस समय ज़ूम मना है"
 
@@ -1466,16 +1468,6 @@ msgid "Chat shown"
 msgstr "बातें दिखाई देंगी"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "बातें दिखाई नहीं देंगी"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "बातें दिखाई देंगी"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "हे॰अ॰डि॰ दिखाई नहीं देंगी"
 
@@ -1755,9 +1747,28 @@ msgstr "X बटन २"
 msgid "Zoom"
 msgstr "ज़ूम"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "छोटा नक�शा गायब"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "छोटा नक�शा रेडार मोड, 1 ग�ना ज़ूम"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "छोटा नक�शा जमीन मोड, 1 ग�ना ज़ूम"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "छोटा नक�शा जमीन मोड, 1 ग�ना ज़ूम"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
-msgstr "पासवर�ड अलग अलग हैं!"
+msgstr "पासवर�ड अलग-अलग हैं!"
 
 #: src/gui/guiConfirmRegistration.cpp
 msgid "Register and Join"
@@ -1799,26 +1810,6 @@ msgid "Backward"
 msgstr "पीछे जा�ं"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "कैमरा बदलना"
 
@@ -1911,29 +1902,10 @@ msgid "Special"
 msgstr "स�पेशल"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "स�पेशल"
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "तरल चाल"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "हे. अ. डि"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "उड़ना"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "बातें दिखना"
 
@@ -2043,12 +2015,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2155,6 +2121,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2388,10 +2358,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2462,16 +2428,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2623,6 +2579,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2679,7 +2639,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2687,7 +2649,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2787,12 +2751,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2863,6 +2821,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2923,7 +2885,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3011,14 +2973,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3028,18 +2982,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3056,12 +2998,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3071,7 +3007,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3375,10 +3311,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3432,8 +3364,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3908,6 +3840,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3988,6 +3924,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4087,6 +4030,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4643,10 +4593,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4660,6 +4606,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4823,7 +4777,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4872,6 +4826,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5101,14 +5062,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5134,10 +5087,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5163,34 +5112,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5256,6 +5177,15 @@ msgid "Pitch move mode"
 msgstr "पिच चलन"
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "राइट क�लिक के दोहराने का समय"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5413,10 +5343,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "राइट क�लिक के दोहराने का समय"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5668,6 +5594,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5799,10 +5735,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5896,6 +5828,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5954,8 +5890,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5981,15 +5917,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6125,6 +6066,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6327,6 +6279,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6449,6 +6407,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6460,11 +6436,62 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "ठीक है"
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "क�या आप सचम�च अपने �क-खिलाडी द�निया रद�द करना चाहते हैं?"
+
+#~ msgid "Back"
+#~ msgstr "पीछे"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "टकराव मैपिंग"
+
+#~ msgid "Config mods"
+#~ msgstr "मॉड कॆ सेटिंग बदलें"
+
+#~ msgid "Configure"
+#~ msgstr "सेटिंग बदलें"
 
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr "$1 का डाऊनलोड व इन�स�टाल चल रहा है, कृपया ठहरें ..."
 
-#~ msgid "Back"
-#~ msgstr "पीछे"
+#~ msgid "Generate Normal Maps"
+#~ msgstr "मामूली नक�शे बना�ं"
+
+#~ msgid "Main"
+#~ msgstr "म�ख�य"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "छोटा नक�शा रेडर मोड, दोग�ना जूम"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "छोटा नक�शा रेडार मोड, 4 ग�ना ज़ूम"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "छोटा नक�शा जमीन मोड, दोग�ना जूम"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "छोटा नक�शा जमीन मोड, 4 ग�ना जून"
+
+#~ msgid "Name/Password"
+#~ msgstr "नाम/पासवर�ड"
+
+#~ msgid "No"
+#~ msgstr "नहीं"
+
+#~ msgid "Ok"
+#~ msgstr "ठीक है"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "पेरलेक�स ऑक�लूजन"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "�क-खिलाडी द�निया रीसेट करें"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "�क-खिलाडी श�रू करें"
+
+#~ msgid "View"
+#~ msgstr "दृश�य"
+
+#~ msgid "Yes"
+#~ msgstr "हां"
diff --git a/po/hu/minetest.po b/po/hu/minetest.po
index be96cf523..090d92454 100644
--- a/po/hu/minetest.po
+++ b/po/hu/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Hungarian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-22 17:56+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-13 08:50+0000\n"
 "Last-Translator: �cs Zoltán <acszoltan111@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/minetest/"
 "minetest/hu/>\n"
@@ -12,11 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Újraéledés"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Meghaltál"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -38,10 +46,6 @@ msgstr "Újrakapcsolódás"
 msgid "The server has requested a reconnect:"
 msgstr "A kiszolgáló újrakapcsolódást kért:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Betöltés…"
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Protokollverzió-eltérés. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "A kiszolgáló $1 és $2 protokollverzió közötti verziókat támogat. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Próbáld újra engedélyezni a nyilvános kiszolgálólistát, és ellenőrizd az "
-"internetkapcsolatot."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Csak $1 protokollverziót támogjuk."
 
@@ -68,7 +66,8 @@ msgstr "Csak $1 protokollverziót támogjuk."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "$1 és $2 közötti protokollverziókat támogatjuk."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "$1 és $2 közötti protokollverziókat támogatjuk."
 msgid "Cancel"
 msgstr "Mégse"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Függőségek:"
 
@@ -152,16 +152,59 @@ msgid "enabled"
 msgstr "engedélyezve"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 letöltése,\n"
+"$2 sorba állítva"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Letöltés…"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Minden csomag"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "A gomb már használatban van"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Vissza a főmenübe"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Játék létrehozása"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "A ContentDB nem elérhető, ha a Minetest cURL nélkül lett lefordítva"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Downloading..."
@@ -181,6 +224,16 @@ msgid "Install"
 msgstr "Telepítés"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Telepítés"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Választható függőségek:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Modok"
@@ -194,9 +247,26 @@ msgid "No results"
 msgstr "Nincs találat"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Keresés"
+#, fuzzy
+msgid "No updates"
+msgstr "Frissítés"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Not found"
+msgstr "Hang némítása"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Felülírás"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "Sorbaállítva"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -211,8 +281,12 @@ msgid "Update"
 msgstr "Frissítés"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Megtekintés"
+msgid "Update All [$1]"
+msgstr "Összes frissítése [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "További információ megnyitása a böngészőben"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -223,9 +297,8 @@ msgid "Additional terrain"
 msgstr "További terep"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-#, fuzzy
 msgid "Altitude chill"
-msgstr "Hőmérsékletcsökkenés a magassággal"
+msgstr "Hőmérséklet-csökkenés a magassággal"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
@@ -264,13 +337,12 @@ msgid "Download one from minetest.net"
 msgstr "Letöltés a minetest.net címről"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "Tömlöc zaj"
+msgstr "Tömlöcök"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Lapos terep"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
@@ -285,8 +357,9 @@ msgid "Game"
 msgstr "Játék"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Nem-fraktál terep generálása: Óceánok és földalatti rész"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
@@ -364,14 +437,17 @@ msgid "Smooth transition between biomes"
 msgstr "Sima átmenet a biomok között"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"A terepen megjelenő struktúrák (nincs hatása a fákra és a dzsungelfűre, "
+"amelyet a v6 készített)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "A terepen megjelenő struktúrák, általában fák és növények"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
@@ -388,7 +464,7 @@ msgstr "Mérsékelt, Sivatag, Dzsungel, Tundra, Tajga"
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Terrain surface erosion"
-msgstr "Terep alapzaj"
+msgstr "Terepfelület erózió"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
@@ -469,11 +545,6 @@ msgid "Browse"
 msgstr "Tallózás"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Kliens"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Letiltva"
 
@@ -518,6 +589,10 @@ msgid "Scale"
 msgstr "Mérték"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Keresés"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Útvonal kiválasztása"
 
@@ -633,6 +708,21 @@ msgstr "$1 mod telepítése meghiúsult"
 msgid "Unable to install a modpack as a $1"
 msgstr "$1 modcsomag telepítése meghiúsult"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Betöltés…"
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Kliens oldali szkriptek letiltva"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Próbáld újra engedélyezni a nyilvános kiszolgálólistát, és ellenőrizd az "
+"internetkapcsolatot."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Online tartalmak böngészése"
@@ -686,8 +776,18 @@ msgid "Credits"
 msgstr "Köszönetnyilvánítás"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Útvonal kiválasztása"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Megnyitja a fájlkezelőben / intézőben azt a könyvtárat, amely a felhasználó "
+"világait,\n"
+"játékait, modjait, és textúráit tartalmazza."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -706,14 +806,10 @@ msgid "Bind Address"
 msgstr "Cím csatolása"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Beállítás"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Kreatív mód"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Sérülés engedélyezése"
 
@@ -730,8 +826,8 @@ msgid "Install games from ContentDB"
 msgstr "Játékok telepítése ContentDB-ről"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Név/jelszó"
+msgid "Name"
+msgstr "Név"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -742,6 +838,11 @@ msgid "No world created or selected!"
 msgstr "Nincs létrehozott vagy kiválasztott világ!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Új jelszó"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Játék indítása"
 
@@ -750,6 +851,11 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Világ kiválasztása:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Világ kiválasztása:"
 
@@ -765,23 +871,23 @@ msgstr "Indítás"
 msgid "Address / Port"
 msgstr "Cím / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Kapcsolódás"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Kreatív mód"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Sérülés engedélyezve"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Kedvenc törlése"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Kedvenc"
 
@@ -789,16 +895,16 @@ msgstr "Kedvenc"
 msgid "Join Game"
 msgstr "Csatlakozás játékhoz"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Név / Jelszó"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP engedélyezve"
 
@@ -827,10 +933,6 @@ msgid "Antialiasing:"
 msgstr "Élsimítás:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Biztosan visszaállítod az egyjátékos világod?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Képernyőméret automatikus mentése"
 
@@ -838,10 +940,6 @@ msgstr "Képernyőméret automatikus mentése"
 msgid "Bilinear Filter"
 msgstr "Bilineáris szűrés"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Bump mapping"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Gombok megváltoztatása"
@@ -855,10 +953,6 @@ msgid "Fancy Leaves"
 msgstr "Szép levelek"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Normál felületek generálása"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap effekt"
 
@@ -867,10 +961,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Anizotróp szűrés"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Nem"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Nincs szűrés"
 
@@ -898,19 +988,11 @@ msgstr "�tlátszatlan levelek"
 msgid "Opaque Water"
 msgstr "�tlátszatlan víz"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parallax Occlusion ( domború textúra )"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Részecskék"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Egyjátékos világ visszaállítása"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Képernyő:"
 
@@ -923,6 +1005,11 @@ msgid "Shaders"
 msgstr "�rnyalók"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Lebegő földek"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "�rnyalók (nem elérhető)"
 
@@ -966,22 +1053,6 @@ msgstr "Hullámzó folyadékok"
 msgid "Waving Plants"
 msgstr "Hullámzó növények"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Igen"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Modok beállítása"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "FÅ‘"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Egyjátékos mód indítása"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Csatlakozási idő lejárt."
@@ -1143,18 +1214,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Irányítás:\n"
 "- %s: mozgás előre\n"
@@ -1268,16 +1336,6 @@ msgid "Fog enabled"
 msgstr "köd engedélyezve"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Köd letiltva"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "köd engedélyezve"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Játékinformációk:"
 
@@ -1298,16 +1356,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Köd letiltva"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Sérülés engedélyezve"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Tartalom..."
 
@@ -1320,34 +1368,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "A kistérkép letiltva (szerver, vagy mod által)"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Kistérkép letiltva"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Kistérkép radar módban x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Kistérkép radar módban x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Kistérkép radar módban x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Kistérkép terület módban x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Kistérkép terület módban x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Kistérkép terület módban x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Noclip mód letiltva"
 
@@ -1392,10 +1412,6 @@ msgid "Resolving address..."
 msgstr "Cím feloldása…"
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Újraéledés"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Leállítás…"
 
@@ -1448,10 +1464,6 @@ msgid "Wireframe shown"
 msgstr "Drótváz megjelenítése"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Meghaltál"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Nagyítás letiltva (szerver, vagy mod által)"
 
@@ -1468,16 +1480,6 @@ msgid "Chat shown"
 msgstr "Csevegés megjelenítése"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Csevegés elrejtve"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Csevegés megjelenítése"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD elrejtése"
 
@@ -1757,6 +1759,25 @@ msgstr "X Gomb 2"
 msgid "Zoom"
 msgstr "Nagyítás"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Kistérkép letiltva"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Kistérkép radar módban x1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Kistérkép terület módban x1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Minimum textúra méret"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "A jelszavak nem egyeznek!"
@@ -1802,26 +1823,6 @@ msgid "Backward"
 msgstr "Hátra"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Nézet váltása"
 
@@ -1916,30 +1917,10 @@ msgid "Special"
 msgstr "Különleges"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Különleges"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Váltás „mozi� módba"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Váltás „mozi� módba"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "HUD váltása"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Repülés váltása"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Csevegésnapló váltása"
 
@@ -2032,7 +2013,6 @@ msgstr ""
 "gombot ha kint van a fő körből."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "(X,Y,Z) offset of fractal from world center in units of 'scale'.\n"
 "Can be used to move a desired point to (0, 0) to create a\n"
@@ -2043,13 +2023,6 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"A fraktál (X,Y,Z) eltolása a világ középpontjától, 'scale' egységekben.\n"
-"Egy megfelelő, alacsony magasságú keletkezési pont (0, 0) közelébe "
-"mozgatására használható.\n"
-"Az alapértelmezés megfelelő Mandelbrot-halmazokhoz, a szerkesztés Julia-"
-"halmazok esetén szükséges.\n"
-"Körülbelül -2 és 2 közötti érték. Szorozd be 'scale'-lel, hogy kockákban "
-"kapd meg az eltolást."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2063,14 +2036,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = parallax occlusion with slope information (gyorsabb).\n"
-"1 = relief mapping (lassabb, pontosabb)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "2D zaj, amely a hegyvonulatok az alakját/méretét szabályozza."
 
@@ -2109,9 +2074,8 @@ msgid "3D mode"
 msgstr "3D mód"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D mode parallax strength"
-msgstr "Parallax Occlusion hatás ereje"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
@@ -2194,9 +2158,12 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "A világgeneráló szálak számának abszolút határa"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -2309,17 +2276,16 @@ msgid "Apple trees noise"
 msgstr "Almafa zaj"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Arm inertia"
 msgstr "Kar tehetetlenség"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Arm inertia, gives a more realistic movement of\n"
 "the arm when the camera moves."
 msgstr ""
 "A kar tehetetlensége reálisabb mozgást biztosít\n"
+"a karnak, amikor a kamera mozog.\n"
 "a karnak, amikor a kamera mozog."
 
 #: src/settings_translation_file.cpp
@@ -2366,7 +2332,6 @@ msgid "Autosave screen size"
 msgstr "Képernyőméret automatikus mentése"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Autoscaling mode"
 msgstr "Automatikus méretezés mód"
 
@@ -2431,9 +2396,8 @@ msgid "Bold and italic monospace font path"
 msgstr "Félkövér dőlt monospace betűtípus útvonal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bold font path"
-msgstr "Betűtípus helye"
+msgstr "Félkövér betűtípus útvonala"
 
 #: src/settings_translation_file.cpp
 msgid "Bold monospace font path"
@@ -2448,10 +2412,6 @@ msgid "Builtin"
 msgstr "Beépített"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bumpmappolás"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2523,22 +2483,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Megváltoztatja a főmenü felhasználói felületét:\n"
-"- Teljes: Több egyjátékos világ, játékválasztás, textúracsomag-választó "
-"stb.\n"
-"- Egyszerű: Egy egyjátékos világ, nincs játék- vagy textúracsomag-választó.\n"
-"Szükséges lehet a kisebb képernyőkhöz."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat font size"
 msgstr "Betűtípus mérete"
 
@@ -2700,6 +2644,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "ContentDB zászló feketelista"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "ContentDB URL"
 
@@ -2760,7 +2708,10 @@ msgid "Crosshair alpha"
 msgstr "Célkereszt átlátszóság"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Célkereszt átlátszóság (0 és 255 között)."
 
 #: src/settings_translation_file.cpp
@@ -2768,8 +2719,10 @@ msgid "Crosshair color"
 msgstr "Célkereszt színe"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Célkereszt színe (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2879,14 +2832,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Az opcionális hegyek és tavak helyzetét és terepét határozza meg."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"A textúrák mintavételezési lépésközét adja meg.\n"
-"Nagyobb érték simább normal map-et eredményez."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Meghatározza az alap talajszintet."
 
@@ -2965,6 +2910,11 @@ msgid "Desynchronize block animation"
 msgstr "Blokkanimáció deszinkronizálása"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Jobb gomb"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "�sási részecskék"
 
@@ -3029,7 +2979,8 @@ msgid "Enable console window"
 msgstr "Konzolablak engedélyezése"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Kreatív mód engedélyezése az újonnan létrehozott térképekhez."
 
 #: src/settings_translation_file.cpp
@@ -3142,14 +3093,6 @@ msgid "Enables animation of inventory items."
 msgstr "Az eszköztárelemek animációjának engedélyezése."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Engedélyezi az elforgatott rácsvonalak gyorsítótárazását."
@@ -3160,20 +3103,6 @@ msgstr "Engedélyezi a kistérképet."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Parallax occlusion mapping bekapcsolása.\n"
-"A shaderek engedélyezve kell hogy legyenek."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3191,14 +3120,6 @@ msgstr "Egység módszerek"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Kísérleti opció, látható rések jelenhetnek meg a blokkok között\n"
-"ha nagyobbra van állítva, mint 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3208,8 +3129,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS a szünet menüben"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "Maximum FPS a játék szüneteltetésekor."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3375,11 +3297,11 @@ msgstr "Köd váltása gomb"
 
 #: src/settings_translation_file.cpp
 msgid "Font bold by default"
-msgstr ""
+msgstr "Félkövér betűtípus alapértelmezetten"
 
 #: src/settings_translation_file.cpp
 msgid "Font italic by default"
-msgstr ""
+msgstr "Dőlt betűtípus alapértelmezetten"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow"
@@ -3533,10 +3455,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Felhasználói felület méretarány szűrő txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Normálfelületek generálása"
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Global callbacks"
 msgstr "Globális visszahívások"
@@ -3601,8 +3519,8 @@ msgstr "HUD váltás gomb"
 #, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Az elavult lua API hívások kezelése:\n"
@@ -4122,6 +4040,11 @@ msgid "Joystick button repetition interval"
 msgstr "Joystick gomb ismétlési időköz"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "Joystick típus"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Joystick frustum érzékenység"
 
@@ -4225,6 +4148,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Gomb az ugráshoz.\n"
+"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4367,6 +4301,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Gomb az ugráshoz.\n"
+"Lásd: http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -5103,10 +5048,6 @@ msgid "Main menu script"
 msgstr "Főmenü szkript"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Főmenü stílusa"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5125,6 +5066,14 @@ msgid "Makes all liquids opaque"
 msgstr "Az összes folyadékot átlátszatlanná teszi"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Térkép mappája"
 
@@ -5324,7 +5273,8 @@ msgid "Maximum FPS"
 msgstr "Maximum FPS (képkocka/mp)"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "Maximum FPS a játék szüneteltetésekor."
 
 #: src/settings_translation_file.cpp
@@ -5380,6 +5330,13 @@ msgstr ""
 "Hagyd üresen, hogy automatikusan legyen kiválasztva a megfelelő mennyiség."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5625,14 +5582,6 @@ msgid "Noises"
 msgstr "Zajok"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5658,10 +5607,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Online tartalomtár"
 
@@ -5687,34 +5632,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Parallax Occlusion effekt"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Parallax Occlusion módja"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Parallax Occlusion mértéke"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5780,6 +5697,16 @@ msgid "Pitch move mode"
 msgstr "Pályamozgás mód"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Repülés gomb"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Jobb kattintás ismétlési időköz"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5948,10 +5875,6 @@ msgid "Right key"
 msgstr "Jobb gomb"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Jobb kattintás ismétlési időköz"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Folyómeder mélysége"
 
@@ -6247,6 +6170,20 @@ msgid "Show entity selection boxes"
 msgstr "Entitások kijelölő dobozának megjelenítése"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Nyelv beállítása. Hagyd üresen a rendszer nyelvének használatához.\n"
+"A változtatás után a játék újraindítása szükséges."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Félkövér betűtípus alapértelmezetten"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Leállítási üzenet"
 
@@ -6381,10 +6318,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Generált normálfelületek erőssége."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Generált normálfelületek erőssége."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6479,6 +6412,11 @@ msgid "The URL for the content repository"
 msgstr "Az URL a tartalomtárhoz"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "The deadzone of the joystick"
+msgstr "A használni kívánt joystick azonosítója"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6540,8 +6478,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6566,6 +6504,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
 "The time in seconds it takes between repeated events\n"
@@ -6577,9 +6521,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 "Ennyi másodperc szükséges az ismételt jobb kattintáshoz a jobb egérgomb "
 "nyomva tartásakor."
@@ -6730,6 +6673,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Trilineáris szűrés a textúrák méretezéséhez."
 
@@ -6941,6 +6895,12 @@ msgstr ""
 "támogatás."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -7072,6 +7032,24 @@ msgid "Y-level of seabed."
 msgstr "Tengerfenék Y szintje."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL fájlletöltés időkorlát"
 
@@ -7083,17 +7061,12 @@ msgstr "cURL párhuzamossági korlát"
 msgid "cURL timeout"
 msgstr "cURL időkorlát"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Back"
-#~ msgstr "Vissza"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "$1 letöltése és telepítése, kérlek várj…"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Képernyőmentések mappája."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = parallax occlusion with slope information (gyorsabb).\n"
+#~ "1 = relief mapping (lassabb, pontosabb)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7104,6 +7077,40 @@ msgstr "cURL időkorlát"
 #~ "fényerő.\n"
 #~ "Ez a beállítás csak a kliensre érvényes, a szerver nem veszi figyelembe."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Biztosan visszaállítod az egyjátékos világod?"
+
+#~ msgid "Back"
+#~ msgstr "Vissza"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Bump mapping"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bumpmappolás"
+
+#, fuzzy
+#~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Megváltoztatja a főmenü felhasználói felületét:\n"
+#~ "- Teljes: Több egyjátékos világ, játékválasztás, textúracsomag-választó "
+#~ "stb.\n"
+#~ "- Egyszerű: Egy egyjátékos világ, nincs játék- vagy textúracsomag-"
+#~ "választó.\n"
+#~ "Szükséges lehet a kisebb képernyőkhöz."
+
+#~ msgid "Config mods"
+#~ msgstr "Modok beállítása"
+
+#~ msgid "Configure"
+#~ msgstr "Beállítás"
+
 #, fuzzy
 #~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
@@ -7117,6 +7124,9 @@ msgstr "cURL időkorlát"
 #~ "A járatok szélességét határozza meg, alacsonyabb érték szélesebb "
 #~ "járatokat hoz létre."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Célkereszt színe (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "a sötétség élessége"
 
@@ -7127,12 +7137,39 @@ msgstr "cURL időkorlát"
 #~ "A lebegő szigetek sima területeit határozza meg.\n"
 #~ "Lapos szigetek ott fordulnak elő, ahol a zaj értéke pozitív."
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "A textúrák mintavételezési lépésközét adja meg.\n"
+#~ "Nagyobb érték simább normal map-et eredményez."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "$1 letöltése és telepítése, kérlek várj…"
+
 #~ msgid "Enable VBO"
 #~ msgstr "VBO engedélyez"
 
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "filmes tónus effektek bekapcsolása"
 
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Parallax occlusion mapping bekapcsolása.\n"
+#~ "A shaderek engedélyezve kell hogy legyenek."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Kísérleti opció, látható rések jelenhetnek meg a blokkok között\n"
+#~ "ha nagyobbra van állítva, mint 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS a szünet menüben"
+
 #, fuzzy
 #~ msgid "Floatland base height noise"
 #~ msgstr "A lebegő hegyek alapmagassága"
@@ -7147,6 +7184,12 @@ msgstr "cURL időkorlát"
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Normál felületek generálása"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Normálfelületek generálása"
+
 #~ msgid "IPv6 support."
 #~ msgstr "IPv6 támogatás."
 
@@ -7158,21 +7201,81 @@ msgstr "cURL időkorlát"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Fényélesség"
 
+#~ msgid "Main"
+#~ msgstr "FÅ‘"
+
+#~ msgid "Main menu style"
+#~ msgstr "Főmenü stílusa"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Kistérkép radar módban x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Kistérkép radar módban x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Kistérkép terület módban x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Kistérkép terület módban x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Név/jelszó"
+
+#~ msgid "No"
+#~ msgstr "Nem"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax Occlusion ( domború textúra )"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Parallax Occlusion effekt"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Parallax Occlusion módja"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Parallax Occlusion mértéke"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "A TrueType betűtípus (ttf) vagy bitmap útvonala."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Képernyőmentések mappája."
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Egyjátékos világ visszaállítása"
+
+#~ msgid "Select Package File:"
+#~ msgstr "csomag fájl kiválasztása:"
+
 #, fuzzy
 #~ msgid "Shadow limit"
 #~ msgstr "Térképblokk korlát"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Egyjátékos mód indítása"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Generált normálfelületek erőssége."
+
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Ezt a betűtípust bizonyos nyelvek használják."
 
-#~ msgid "Waving water"
-#~ msgstr "Hullámzó víz"
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Váltás „mozi� módba"
+
+#~ msgid "View"
+#~ msgstr "Megtekintés"
 
 #~ msgid "Waving Water"
 #~ msgstr "Hullámzó víz"
 
-#~ msgid "Select Package File:"
-#~ msgstr "csomag fájl kiválasztása:"
+#~ msgid "Waving water"
+#~ msgstr "Hullámzó víz"
+
+#~ msgid "Yes"
+#~ msgstr "Igen"
diff --git a/po/id/minetest.po b/po/id/minetest.po
index 26c1b7ff5..5f62541b5 100644
--- a/po/id/minetest.po
+++ b/po/id/minetest.po
@@ -2,10 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Indonesian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-25 16:39+0000\n"
-"Last-Translator: Muhammad Rifqi Priyo Susanto "
-"<muhammadrifqipriyosusanto@gmail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-23 15:50+0000\n"
+"Last-Translator: Reza Almanda <rezaalmanda27@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/minetest/"
 "minetest/id/>\n"
 "Language: id\n"
@@ -13,7 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.5\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Bangkit kembali"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Anda mati"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -39,10 +46,6 @@ msgstr "Sambung ulang"
 msgid "The server has requested a reconnect:"
 msgstr "Server ini meminta untuk menyambung ulang:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Memuat..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Versi protokol tidak sesuai. "
@@ -56,11 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 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 ""
-"Coba nyalakan ulang daftar server publik dan periksa sambungan internet Anda."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Kami hanya mendukung protokol versi $1."
 
@@ -68,7 +66,8 @@ msgstr "Kami hanya mendukung protokol versi $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Kami mendukung protokol antara versi $1 dan versi $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Kami mendukung protokol antara versi $1 dan versi $2."
 msgid "Cancel"
 msgstr "Batal"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependensi:"
 
@@ -152,14 +152,54 @@ msgid "enabled"
 msgstr "dinyalakan"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" telah ada. Apakah Anda mau menimpanya?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Dependensi $1 dan $2 akan dipasang."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 oleh $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 sedang diunduh,\n"
+"$2 dalam antrean"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 mengunduh..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 membutuhkan dependensi yang tidak bisa ditemukan."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 akan dipasang dan $2 dependensi akan dilewati."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Semua paket"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Telah terpasang"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Kembali ke menu utama"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Permainan Dasar:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr "ContentDB tidak tersedia ketika Minetest tidak dikompilasi dengan cURL"
 
@@ -181,6 +221,14 @@ msgid "Install"
 msgstr "Pasang"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "Pasang $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Pasang dependensi yang belum ada"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mod"
@@ -194,9 +242,24 @@ msgid "No results"
 msgstr "Tiada hasil"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Cari"
+msgid "No updates"
+msgstr "Tiada pembaruan"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Tidak ditemukan"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Timpa"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Harap pastikan bahwa permainan dasar telah sesuai."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "Diantrekan"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -211,8 +274,12 @@ msgid "Update"
 msgstr "Perbarui"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Tinjau"
+msgid "Update All [$1]"
+msgstr "Perbarui Semua [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Lihat informasi lebih lanjut di peramban web"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -276,7 +343,7 @@ msgstr "Tanah mengambang di langit"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
-msgstr "Floatland (uji coba)"
+msgstr "Floatland (tahap percobaan)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -466,11 +533,6 @@ msgid "Browse"
 msgstr "Jelajahi"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Klien"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Dimatikan"
 
@@ -515,6 +577,10 @@ msgid "Scale"
 msgstr "Skala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Cari"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Pilih direktori"
 
@@ -631,6 +697,20 @@ msgstr "Gagal memasang mod sebagai $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Gagal memasang paket mod sebagai $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Memuat..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Skrip sisi klien dimatikan"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Coba nyalakan ulang daftar server publik dan periksa sambungan internet Anda."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Jelajahi konten daring"
@@ -684,8 +764,16 @@ msgid "Credits"
 msgstr "Penghargaan"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "Pilih direktori"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Membuka direktori yang berisi dunia, permainan, mod, dan paket tekstur\n"
+"dari pengguna dalam pengelola/penjelajah berkas."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -704,14 +792,10 @@ msgid "Bind Address"
 msgstr "Alamat Sambungan"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Konfigurasi"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Mode Kreatif"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Nyalakan Kerusakan"
 
@@ -728,8 +812,8 @@ msgid "Install games from ContentDB"
 msgstr "Pasang permainan dari ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nama/Kata Sandi"
+msgid "Name"
+msgstr "Nama"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -740,6 +824,10 @@ msgid "No world created or selected!"
 msgstr "Tiada dunia yang dibuat atau dipilih!"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Kata sandi"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Mainkan Permainan"
 
@@ -748,6 +836,10 @@ msgid "Port"
 msgstr "Porta"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Pilih Mod"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Pilih Dunia:"
 
@@ -763,23 +855,23 @@ msgstr "Mulai Permainan"
 msgid "Address / Port"
 msgstr "Alamat/Porta"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Sambung"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Mode kreatif"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Kerusakan dinyalakan"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Hapus favorit"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favorit"
 
@@ -787,16 +879,16 @@ msgstr "Favorit"
 msgid "Join Game"
 msgstr "Gabung Permainan"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nama/Kata Sandi"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP dinyalakan"
 
@@ -825,10 +917,6 @@ msgid "Antialiasing:"
 msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Apakah Anda yakin ingin mengatur ulang dunia Anda?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Simpan Ukuran Layar"
 
@@ -836,10 +924,6 @@ msgstr "Simpan Ukuran Layar"
 msgid "Bilinear Filter"
 msgstr "Filter Bilinear"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Bump Mapping"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Ubah Tombol"
@@ -853,10 +937,6 @@ msgid "Fancy Leaves"
 msgstr "Daun Megah"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Buat Normal Maps"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -865,10 +945,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Filter Aniso. + Mipmap"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Tidak"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Tanpa Filter"
 
@@ -896,19 +972,11 @@ msgstr "Daun Opak"
 msgid "Opaque Water"
 msgstr "Air Opak"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parallax Occlusion"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Partikel"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Atur ulang dunia pemain tunggal"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Layar:"
 
@@ -921,6 +989,10 @@ msgid "Shaders"
 msgstr "Shader"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Shader (tahap percobaan)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Shader (tidak tersedia)"
 
@@ -942,7 +1014,7 @@ msgstr "Untuk menggunakan shader, pengandar OpenGL harus digunakan."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
-msgstr "Tone Mapping"
+msgstr "Pemetaan Nada"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold: (px)"
@@ -964,22 +1036,6 @@ msgstr "Air Berombak"
 msgid "Waving Plants"
 msgstr "Tanaman Berayun"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ya"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Konfigurasi mod"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Beranda"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Mulai Pemain Tunggal"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Sambungan kehabisan waktu."
@@ -1134,25 +1190,22 @@ msgid "Continue"
 msgstr "Lanjutkan"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Kontrol:\n"
 "- %s: maju\n"
@@ -1160,12 +1213,12 @@ msgstr ""
 "- %s: geser kiri\n"
 "- %s: geser kanan\n"
 "- %s: lompat/panjat\n"
+"- %s: gali/pukul\n"
+"- %s: taruh/pakai\n"
 "- %s: menyelinap/turun\n"
 "- %s: jatuhkan barang\n"
 "- %s: inventaris\n"
 "- Tetikus: belok/lihat\n"
-"- Klik kiri: gali/pukul\n"
-"- Klik kanan: taruh/pakai\n"
 "- Roda tetikus: pilih barang\n"
 "- %s: obrolan\n"
 
@@ -1266,16 +1319,6 @@ msgid "Fog enabled"
 msgstr "Kabut dinyalakan"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Kabut dimatikan"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Kabut dinyalakan"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informasi permainan:"
 
@@ -1296,16 +1339,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Kabut dimatikan"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Kerusakan dinyalakan"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Media..."
 
@@ -1318,34 +1351,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Peta mini sedang dilarang oleh permainan atau mod"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Peta mini disembunyikan"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Peta mini mode radar, perbesaran 1x"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Peta mini mode radar, perbesaran 2x"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Peta mini mode radar, perbesaran 4x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Peta mini mode permukaan, perbesaran 1x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Peta mini mode permukaan, perbesaran 2x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Peta mini mode permukaan, perbesaran 4x"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Mode tembus blok dimatikan"
 
@@ -1390,10 +1395,6 @@ msgid "Resolving address..."
 msgstr "Mencari alamat..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Bangkit kembali"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Mematikan..."
 
@@ -1446,10 +1447,6 @@ msgid "Wireframe shown"
 msgstr "Rangka kawat ditampilkan"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Anda mati"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zum sedang dilarang oleh permainan atau mod"
 
@@ -1466,16 +1463,6 @@ msgid "Chat shown"
 msgstr "Obrolan ditampilkan"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Obrolan disembunyikan"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Obrolan ditampilkan"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD disembunyikan"
 
@@ -1755,6 +1742,24 @@ msgstr "Tombol X 2"
 msgid "Zoom"
 msgstr "Zum"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Peta mini disembunyikan"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Peta mini mode radar, perbesaran %dx"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Peta mini mode permukaan, perbesaran %dx"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Peta mini mode tekstur"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Kata sandi tidak cocok!"
@@ -1799,26 +1804,6 @@ msgid "Backward"
 msgstr "Mundur"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Ubah kamera"
 
@@ -1913,30 +1898,10 @@ msgid "Special"
 msgstr "Spesial"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Spesial"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Mode sinema"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Mode sinema"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Alih HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Terbang"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Alih log obrolan"
 
@@ -2066,14 +2031,6 @@ msgstr ""
 "untuk pulau, atur ketiga angka menjadi sama untuk bentuk mentah."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = parallax occlusion dengan informasi kemiringan (cepat).\n"
-"1 = relief mapping (pelan, lebih akurat)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "Noise 2D yang mengatur bentuk/ukuran punggung gunung."
 
@@ -2200,6 +2157,10 @@ msgid "ABM interval"
 msgstr "Selang waktu ABM"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr "Anggaran waktu ABM"
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Batas mutlak antrean kemunculan blok"
 
@@ -2260,7 +2221,7 @@ msgid ""
 msgstr ""
 "Sesuaikan kepadatan lapisan floatland.\n"
 "Tambahkan nilai untuk menambah kepadatan. Dapat positif atau negatif.\n"
-"Nilai = 0.0: 50% volume adalah floatland.\n"
+"Nilai = 0.0: 50% o volume adalah floatland.\n"
 "Nilai = 2.0 (dapat lebih tinggi tergantung 'mgv7_np_floatland', selalu uji\n"
 "terlebih dahulu) membuat lapisan floatland padat (penuh)."
 
@@ -2458,10 +2419,6 @@ msgid "Builtin"
 msgstr "Terpasang bawaan"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bumpmapping"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2538,20 +2495,6 @@ msgstr ""
 "Nilai 0.0 adalah minimum, 1.0 adalah maksimum."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Mengubah antarmuka menu utama:\n"
-"-   Full: Banyak dunia pemain tunggal, pilih permainan, paket tekstur, dll.\n"
-"-   Simple: Satu dunia pemain tunggal, tanpa pilihan permainan atau paket\n"
-"tekstur. Cocok untuk layar kecil."
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr "Ukuran fon obrolan"
 
@@ -2672,8 +2615,8 @@ msgid ""
 "allow them to upload and download data to/from the internet."
 msgstr ""
 "Daftar yang dipisahkan dengan koma dari mod yang dibolehkan untuk\n"
-"mengakses HTTP API, membolehkan mereka untuk mengunggah dan\n"
-"mengunduh data ke/dari internet."
+"mengakses HTTP API, membolehkan mereka untuk mengunggah dan mengunduh data "
+"ke/dari internet."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2681,7 +2624,7 @@ msgid ""
 "functions even when mod security is on (via request_insecure_environment())."
 msgstr ""
 "Daftar yang dengan dipisahkan koma dari mod terpercaya yang diperbolehkan\n"
-"untuk mengakses fungsi yang tidak aman bahkan ketika mod security aktif\n"
+"untuk mengakses fungsi yang tidak aman bahkan ketika mod security aktif "
 "(melalui request_insecure_environment())."
 
 #: src/settings_translation_file.cpp
@@ -2717,6 +2660,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "Daftar Hitam Flag ContentDB"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "Jumlah Maks Pengunduhan ContentDB Bersamaan"
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "URL ContentDB"
 
@@ -2782,16 +2729,24 @@ msgid "Crosshair alpha"
 msgstr "Keburaman crosshair"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "Keburaman crosshair (keopakan, dari 0 sampai 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Keburaman crosshair (keopakan, dari 0 sampai 255).\n"
+"Juga mengatur warna crosshair objek"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
 msgstr "Warna crosshair"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Warna crosshair: (merah,hijau,biru) atau (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Warna crosshair (R,G,B),\n"
+"sekaligus mengatur warna crosshair objek"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2895,14 +2850,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Menetapkan lokasi dan medan dari danau dan bukit pilihan."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Menentukan langkah penyampelan tekstur.\n"
-"Nilai lebih tinggi menghasilkan peta lebih halus."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Mengatur ketinggian dasar tanah."
 
@@ -2981,6 +2928,10 @@ msgid "Desynchronize block animation"
 msgstr "Putuskan sinkronasi animasi blok"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "Tombol gali"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Partikel menggali"
 
@@ -3045,7 +2996,8 @@ msgid "Enable console window"
 msgstr "Gunakan jendela konsol"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Gunakan mode kreatif pada peta baru."
 
 #: src/settings_translation_file.cpp
@@ -3155,17 +3107,6 @@ msgid "Enables animation of inventory items."
 msgstr "Jalankan animasi barang inventaris."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Gunakan bumpmapping untuk tekstur. Normalmap harus disediakan oleh paket\n"
-"tekstur atau harus dihasilkan otomatis.\n"
-"Membutuhkan penggunaan shader."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Gunakan tembolok untuk facedir mesh yang diputar."
 
@@ -3175,22 +3116,6 @@ msgstr "Gunakan peta mini."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Buat normalmap secara langsung (efek Emboss).\n"
-"Membutuhkan penggunaan bumpmapping."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Gunakan pemetaan parallax occlusion.\n"
-"Membutuhkan penggunaan shader."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3211,14 +3136,6 @@ msgstr "Metode benda (entity)"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Masih tahap percobaan, dapat menyebabkan terlihatnya spasi antarblok\n"
-"saat diatur dengan angka yang lebih besar dari 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3234,8 +3151,8 @@ msgstr ""
 "yang rata dan cocok untuk lapisan floatland padat (penuh)."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS (bingkai per detik) pada menu jeda"
+msgid "FPS when unfocused or paused"
+msgstr "FPS (bingkai per detik) saat dijeda atau tidak difokuskan"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3556,10 +3473,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Filter txr2img skala GUI"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Buat normalmap"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Callback global"
 
@@ -3570,9 +3483,9 @@ msgid ""
 "and junglegrass, in all other mapgens this flag controls all decorations."
 msgstr ""
 "Atribut pembuatan peta global.\n"
-"Dalam pembuat peta v6, flag \"decorations\" mengatur semua hiasan kecuali\n"
-"pohon dan rumput rimba. Dalam pembuat peta lain, flag ini mengatur\n"
-"semua dekorasi."
+"Dalam pembuat peta v6, flag \"decorations\" mengatur semua hiasan, kecuali\n"
+"pohon dan rumput rimba. Dalam pembuat peta lain, flag ini mengatur semua "
+"dekorasi."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3621,12 +3534,12 @@ msgstr "Tombol beralih HUD"
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Penanganan panggilan Lua API usang:\n"
-"-    legacy: (mencoba untuk) menyerupai aturan lawas (bawaan untuk rilis).\n"
+"-    none: jangan catat panggilan usang\n"
 "-    log: menyerupai dan mencatat asal-usul panggilan usang (bawaan untuk "
 "awakutu).\n"
 "-    error: batalkan penggunaan panggilan usang (disarankan untuk pengembang "
@@ -3909,9 +3822,8 @@ 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."
+"Jika FPS (bingkai per detik) lebih tinggi daripada ini, akan dibatasi\n"
+"dengan jeda agar tidak membuang tenaga CPU dengan percuma."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3997,8 +3909,8 @@ msgid ""
 msgstr ""
 "Jika dinyalakan, Anda dapat menaruh blok pada posisi (kaki + ketinggian "
 "mata)\n"
-"tempat Anda berdiri.\n"
-"Ini berguna saat bekerja dengan kotak nodus (nodebox) dalam daerah sempit."
+"tempat Anda berdiri. Ini berguna saat bekerja dengan kotak nodus (nodebox) "
+"dalam daerah sempit."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4073,8 +3985,7 @@ msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
-"Melengkapi fungsi panggil balik (callback) global saat didaftarkan,\n"
-"dengan perkakas.\n"
+"Melengkapi fungsi panggil balik (callback) global saat didaftarkan.\n"
 "(semua yang dimasukkan ke fungsi minetest.register_*())"
 
 #: src/settings_translation_file.cpp
@@ -4149,8 +4060,7 @@ msgstr ""
 "Perulangan fungsi rekursif.\n"
 "Menaikkan nilai ini menaikkan detail, tetapi juga menambah\n"
 "beban pemrosesan.\n"
-"Saat perulangan = 20, pembuat peta ini memiliki beban yang\n"
-"mirip dengan pembuat peta v7."
+"Saat perulangan = 20, beban pembuat peta ini mirip dengan v7."
 
 #: src/settings_translation_file.cpp
 msgid "Joystick ID"
@@ -4161,6 +4071,10 @@ msgid "Joystick button repetition interval"
 msgstr "Jarak penekanan tombol joystick terus-menerus"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr "Zona mati joystick"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Kepekaan ruang gerak joystick"
 
@@ -4264,6 +4178,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tombol untuk gali.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4406,6 +4330,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tombol untuk taruh.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -5153,10 +5087,6 @@ msgid "Main menu script"
 msgstr "Skrip menu utama"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Gaya menu utama"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5172,6 +5102,14 @@ msgid "Makes all liquids opaque"
 msgstr "Buat semua cairan buram"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr "Tingkat Kompresi Peta untuk Penyimpanan Diska"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr "Tingkat Kompresi Peta untuk Transfer Jaringan"
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Direktori peta"
 
@@ -5354,8 +5292,10 @@ msgid "Maximum FPS"
 msgstr "FPS (bingkai per detik) maksimum"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "FPS (bingkai per detik) maksimum saat permainan dijeda."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr ""
+"FPS (bingkai per detik) maksimum saat permainan dijeda atau saat jendela "
+"tidak difokuskan."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -5412,6 +5352,16 @@ msgstr ""
 "Batasan ini diatur per pemain."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+"Jumlah maksimum pengunduhan bersamaan. Pengunduhan yang melebihi batas ini "
+"akan\n"
+"diantrekan. Nilai ini harus lebih rendah daripada curl_parallel_limit."
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "Jumlah maksimum blok peta yang dipaksa muat."
 
@@ -5664,14 +5614,6 @@ msgid "Noises"
 msgstr "Noise"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Sampling normalmap"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Kekuatan normalmap"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Jumlah utas kemunculan"
 
@@ -5712,10 +5654,6 @@ msgstr ""
 "penggunaan memori (4096=100MB, kasarannya)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Jumlah pengulangan parallax occlusion."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Gudang konten daring"
 
@@ -5739,38 +5677,11 @@ msgid ""
 "formspec is\n"
 "open."
 msgstr ""
-"Buka menu jeda saat jendela hilang fokus. Tidak menjeda jika formspec sedang "
+"Buka menu jeda saat jendela hilang fokus. Tidak menjeda jika formspec "
+"sedang \n"
 "dibuka."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Bias keseluruhan dari efek parallax occlusion, biasanya skala/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Skala keseluruhan dari efek parallax occlusion."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Parallax occlusion"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Pergeseran parallax occlusion"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Pengulangan parallax occlusion"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Mode parallax occlusion"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Skala parallax occlusion"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5851,6 +5762,14 @@ msgid "Pitch move mode"
 msgstr "Mode gerak sesuai pandang"
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr "Tombol taruh"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr "Jeda waktu taruh berulang"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5918,7 +5837,7 @@ msgstr "Profiling"
 
 #: src/settings_translation_file.cpp
 msgid "Prometheus listener address"
-msgstr ""
+msgstr "Alamat pendengar Prometheus"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5927,6 +5846,10 @@ msgid ""
 "enable metrics listener for Prometheus on that address.\n"
 "Metrics can be fetch on http://127.0.0.1:30000/metrics"
 msgstr ""
+"Alamat pendengar Prometheus.\n"
+"Jika Minetest dikompilasi dengan pilihan ENABLE_PROMETHEUS dinyalakan,\n"
+"ini menyalakan pendengar metrik untuk Prometheus pada alamat itu.\n"
+"Metrik dapat diambil pada http://127.0.0.1:30000/metrics"
 
 #: src/settings_translation_file.cpp
 msgid "Proportion of large caves that contain liquid."
@@ -5967,7 +5890,7 @@ msgstr "Media jarak jauh"
 
 #: src/settings_translation_file.cpp
 msgid "Remote port"
-msgstr "Porta server jarak jauh"
+msgstr "Port utk Kendali Jarak Jauh"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6031,10 +5954,6 @@ msgid "Right key"
 msgstr "Tombol kanan"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Jarak klik kanan berulang"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Kedalaman kanal sungai"
 
@@ -6103,12 +6022,11 @@ msgid ""
 "edge pixels when images are scaled by non-integer sizes."
 msgstr ""
 "Perbesar/perkecil GUI sesuai pengguna.\n"
-"Menggunakan filter nearest-neighbor-anti-alias untuk\n"
-"perbesar/perkecil GUI.\n"
+"Menggunakan filter nearest-neighbor-anti-alias untuk perbesar/perkecil GUI.\n"
 "Ini akan menghaluskan beberapa tepi kasar dan\n"
 "mencampurkan piksel-piksel saat diperkecil dengan\n"
-"mengaburkan beberapa piksel tepi saat diperkecil dengan\n"
-"skala bukan bilangan bulat."
+"mengaburkan beberapa piksel tepi saat diperkecil dengan skala bukan bilangan "
+"bulat."
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
@@ -6331,6 +6249,19 @@ msgid "Show entity selection boxes"
 msgstr "Tampilkan kotak pilihan benda"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Tampilkan kotak pilihan entitas\n"
+"Dibutuhkan mulai ulang setelah mengganti ini."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Fon tebal bawaan"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Pesan saat server dimatikan"
 
@@ -6348,7 +6279,8 @@ msgstr ""
 "PERINGATAN! Tidak ada untungnya dan berbahaya jika menaikkan\n"
 "nilai ini di atas 5.\n"
 "Mengecilkan nilai ini akan meningkatkan kekerapan gua dan dungeon.\n"
-"Mengubah nilai ini untuk kegunaan khusus, membiarkannya disarankan."
+"Mengubah nilai ini untuk kegunaan khusus, membiarkannya \n"
+"disarankan."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6483,10 +6415,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Kekuatan mode paralaks 3D."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Kekuatan normalmap yang dibuat."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6517,6 +6445,16 @@ msgid ""
 "server-intensive extreme water flow and to avoid vast flooding of the\n"
 "world surface below."
 msgstr ""
+"Tingkat permukaan peletakan air pada lapisan floatland padat.\n"
+"Air tidak ditaruh secara bawaan dan akan ditaruh jika nilai ini diatur ke\n"
+"atas 'mgv7_floatland_ymax' - 'mgv7_floatland_taper' (mulai dari\n"
+"penirusan atas).\n"
+"***PERINGATAN, POTENSI BAHAYA TERHADAP DUNIA DAN KINERJA SERVER***\n"
+"Ketika penaruhan air dinyalakan, floatland wajib diatur dan diuji agar\n"
+"berupa lapisan padat dengan mengatur 'mgv7_floatland_density' ke 2.0\n"
+"(atau nilai wajib lainnya sesuai 'mgv7_np_floatland') untuk menghindari\n"
+"aliran air ekstrem yang membebani server dan menghindari banjir\n"
+"bandang di permukaan dunia bawah."
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -6595,6 +6533,10 @@ msgid "The URL for the content repository"
 msgstr "URL dari gudang konten"
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr "Zona mati joystick yang digunakan"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6650,7 +6592,6 @@ msgstr ""
 "server Anda."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The radius of the volume of blocks around every player that is subject to "
 "the\n"
@@ -6660,8 +6601,8 @@ msgid ""
 "maintained.\n"
 "This should be configured together with active_object_send_range_blocks."
 msgstr ""
-"Jari-jari ruang di sekitar pemain yang menjadi blok aktif, dalam blok peta\n"
-"(16 nodus).\n"
+"Jari-jari volume blok di sekitar pemain yang menjadi blok aktif, dalam\n"
+"blok peta (16 nodus).\n"
 "Dalam blok aktif, objek dimuat dan ABM berjalan.\n"
 "Ini juga jangkauan minimum pengelolaan objek aktif (makhluk).\n"
 "Ini harus diatur bersama dengan active_object_range."
@@ -6672,14 +6613,14 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "Penggambar untuk Irrlicht.\n"
 "Mulai ulang dibutuhkan setelah mengganti ini.\n"
 "Catatan: Pada Android, gunakan OGLES1 jika tidak yakin! Apl mungkin gagal\n"
-"berjalan pada lainnya. Pada platform lain, OpenGL disarankan yang menjadi\n"
-"satu-satunya pengandar yang mendukung shader untuk saat ini."
+"berjalan untuk pilihan lainnya. Pada platform lain, OpenGL disarankan.\n"
+"Shader didukung oleh OpenGL (khusus desktop) dan OGLES2 (tahap percobaan)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6714,6 +6655,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+"Anggaran waktu yang dibolehkan untuk ABM dalam menjalankan\n"
+"tiap langkah (dalam pecahan dari jarak ABM)"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6722,11 +6671,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
-"Jeda dalam detik antarklik kanan berulang saat menekan tombol kanan tetikus."
+"Jeda dalam detik antar-penaruhan berulang saat menekan \n"
+"tombol taruh."
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
@@ -6878,12 +6827,29 @@ msgid ""
 "especially when using a high resolution texture pack.\n"
 "Gamma correct downscaling is not supported."
 msgstr ""
-"Gunakan mip mapping untuk penyekalaan tekstur. Dapat sedikit\n"
-"meningkatkan kinerja, terutama saat menggunakan paket tekstur\n"
-"beresolusi tinggi.\n"
+"Pakai mip mapping untuk penyekalaan tekstur. Bisa sedikit menaikkan\n"
+"kinerja, terutama pada saat memakai paket tekstur beresolusi tinggi.\n"
 "Pengecilan dengan tepat gamma tidak didukung."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+"Pakai antialias multisampel (MSAA) untuk memperhalus tepian blok.\n"
+"Algoritme ini memperhalus tampilan 3D sambil menjaga ketajaman gambar,\n"
+"tetapi tidak memengaruhi tekstur bagian dalam (yang terlihat khususnya\n"
+"dengan tekstur transparan).\n"
+"Muncul spasi tampak di antara nodus ketika shader dimatikan.\n"
+"Jika diatur 0, MSAA dimatikan.\n"
+"Dibutuhkan mulai ulang setelah penggantian pengaturan ini."
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Gunakan pemfilteran trilinear saat mengubah ukuran tekstur."
 
@@ -7069,10 +7035,9 @@ msgid ""
 "filtered in software, but some images are generated directly\n"
 "to hardware (e.g. render-to-texture for nodes in inventory)."
 msgstr ""
-"Saat gui_scaling_filter diatur ke true, semua gambar GUI harus\n"
-"difilter dalam perangkat lunak, tetapi beberapa gambar dibuat\n"
-"langsung ke perangkat keras (misal. render ke tekstur untuk nodus\n"
-"dalam inventaris)."
+"Saat gui_scaling_filter diatur ke true, semua gambar GUI harus difilter\n"
+"dalam perangkat lunak, tetapi beberapa gambar dibuat langsung ke\n"
+"perangkat keras (misal. render ke tekstur untuk nodus dalam inventaris)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7081,11 +7046,10 @@ msgid ""
 "to the old scaling method, for video drivers that don't\n"
 "properly support downloading textures back from hardware."
 msgstr ""
-"Saat gui_scaling_filter_txr2img dibolehkan, salin gambar-gambar\n"
-"tersebut dari perangkat keras ke perangkat lunak untuk perbesar/\n"
-"perkecil.  Saat tidak dibolehkan, kembali ke cara lama, untuk\n"
-"pengandar video yang tidak mendukung pengunduhan tekstur dari\n"
-"perangkat keras."
+"Saat gui_scaling_filter_txr2img dibolehkan, salin gambar-gambar tersebut\n"
+"dari perangkat keras ke perangkat lunak untuk perbesar/perkecil. Saat tidak\n"
+"dibolehkan, kembali ke cara lama, untuk pengandar video yang tidak\n"
+"mendukung pengunduhan tekstur dari perangkat keras."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7120,6 +7084,12 @@ msgstr ""
 "Jika dimatikan, fon bitmap dan vektor XML akan dipakai."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr "Apakah animasi tekstur nodus harus tidak disinkronkan tiap blok peta."
 
@@ -7223,8 +7193,8 @@ msgid ""
 "Y of mountain density gradient zero level. Used to shift mountains "
 "vertically."
 msgstr ""
-"Titik acuan kemiringan kepadatan gunung pada sumbu Y.\n"
-"Digunakan untuk menggeser gunung secara vertikal."
+"Titik acuan kemiringan kepadatan gunung pada sumbu Y. Digunakan untuk "
+"menggeser gunung secara vertikal."
 
 #: src/settings_translation_file.cpp
 msgid "Y of upper limit of large caves."
@@ -7241,6 +7211,10 @@ msgid ""
 "For a solid floatland layer, this controls the height of hills/mountains.\n"
 "Must be less than or equal to half the distance between the Y limits."
 msgstr ""
+"Jarak Y penirusan floatland dari padat sampai kosong.\n"
+"Penirusan dimulai dari jarak ini sampai batas Y.\n"
+"Untuk lapisan floatland padat, nilai ini mengatur tinggi bukit/gunung.\n"
+"Nilai ini harus kurang dari atau sama dengan setengah jarak antarbatas Y."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of average terrain surface."
@@ -7263,6 +7237,34 @@ msgid "Y-level of seabed."
 msgstr "Ketinggian Y dari dasar laut."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Tingkat kompresi ZLib saat pengiriman blok peta kepada klien.\n"
+"-1 - tingkat kompresi Zlib bawaan\n"
+"0 - tanpa kompresi, tercepat\n"
+"9 - kompresi terbaik, terlambat\n"
+"(tingkat 1-3 pakai metode \"cepat\" Zlib, 4-9 pakai metode normal)"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Tingkat kompresi ZLib saat penyimpanan blok peta kepada klien.\n"
+"-1 - tingkat kompresi Zlib bawaan\n"
+"0 - tanpa kompresi, tercepat\n"
+"9 - kompresi terbaik, terlambat\n"
+"(tingkat 1-3 pakai metode \"cepat\" Zlib, 4-9 pakai metode normal)"
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "Batas waktu cURL mengunduh berkas"
 
@@ -7274,23 +7276,12 @@ msgstr "Batas cURL paralel"
 msgid "cURL timeout"
 msgstr "Waktu habis untuk cURL"
 
-#~ msgid "Ok"
-#~ msgstr "Oke"
-
-#~ msgid "Back"
-#~ msgstr "Kembali"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Mengunduh dan memasang $1, mohon tunggu..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Batas antrean kemunculan (emerge queue) pada diska"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Kekuatan parallax occlusion"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Jalur untuk menyimpan tangkapan layar."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = parallax occlusion dengan informasi kemiringan (cepat).\n"
+#~ "1 = relief mapping (pelan, lebih akurat)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7305,10 +7296,43 @@ msgstr "Waktu habis untuk cURL"
 #~ msgstr ""
 #~ "Ubah cara gunung floatland meramping di atas dan di bawah titik tengah."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Apakah Anda yakin ingin mengatur ulang dunia Anda?"
+
+#~ msgid "Back"
+#~ msgstr "Kembali"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Bump Mapping"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bumpmapping"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Titik tengah penguatan tengah kurva cahaya."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Mengubah antarmuka menu utama:\n"
+#~ "-   Full: Banyak dunia pemain tunggal, pilih permainan, paket tekstur, "
+#~ "dll.\n"
+#~ "-   Simple: Satu dunia pemain tunggal, tanpa pilihan permainan atau "
+#~ "paket\n"
+#~ "tekstur. Cocok untuk layar kecil."
+
+#~ msgid "Config mods"
+#~ msgstr "Konfigurasi mod"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurasi"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7319,6 +7343,9 @@ msgstr "Waktu habis untuk cURL"
 #~ msgstr ""
 #~ "Mengatur lebar terowongan, nilai lebih kecil terowongan semakin lebar."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Warna crosshair: (merah,hijau,biru) atau (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Kecuraman kegelapan"
 
@@ -7329,12 +7356,56 @@ msgstr "Waktu habis untuk cURL"
 #~ "Mengatur daerah dari medan halus floatland.\n"
 #~ "Floatland halus muncul saat noise > 0."
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Menentukan langkah penyampelan tekstur.\n"
+#~ "Nilai lebih tinggi menghasilkan peta lebih halus."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Mengunduh dan memasang $1, mohon tunggu..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Gunakan VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Gunakan bumpmapping untuk tekstur. Normalmap harus disediakan oleh paket\n"
+#~ "tekstur atau harus dihasilkan otomatis.\n"
+#~ "Membutuhkan penggunaan shader."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Gunakan pemetaan suasana (tone mapping) filmis"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Buat normalmap secara langsung (efek Emboss).\n"
+#~ "Membutuhkan penggunaan bumpmapping."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Gunakan pemetaan parallax occlusion.\n"
+#~ "Membutuhkan penggunaan shader."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Masih tahap percobaan, dapat menyebabkan terlihatnya spasi antarblok\n"
+#~ "saat diatur dengan angka yang lebih besar dari 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS (bingkai per detik) pada menu jeda"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Noise ketinggian dasar floatland"
 
@@ -7347,6 +7418,12 @@ msgstr "Waktu habis untuk cURL"
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Buat Normal Maps"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Buat normalmap"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Dukungan IPv6."
 
@@ -7356,18 +7433,105 @@ msgstr "Waktu habis untuk cURL"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Kecuraman keterangan"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Batas antrean kemunculan (emerge queue) pada diska"
+
+#~ msgid "Main"
+#~ msgstr "Beranda"
+
+#~ msgid "Main menu style"
+#~ msgstr "Gaya menu utama"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Peta mini mode radar, perbesaran 2x"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Peta mini mode radar, perbesaran 4x"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Peta mini mode permukaan, perbesaran 2x"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Peta mini mode permukaan, perbesaran 4x"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nama/Kata Sandi"
+
+#~ msgid "No"
+#~ msgstr "Tidak"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Sampling normalmap"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Kekuatan normalmap"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Jumlah pengulangan parallax occlusion."
+
+#~ msgid "Ok"
+#~ msgstr "Oke"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "Bias keseluruhan dari efek parallax occlusion, biasanya skala/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Skala keseluruhan dari efek parallax occlusion."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax Occlusion"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Parallax occlusion"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Pergeseran parallax occlusion"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Pengulangan parallax occlusion"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Mode parallax occlusion"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Skala parallax occlusion"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Kekuatan parallax occlusion"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Jalur ke TrueTypeFont atau bitmap."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Jalur untuk menyimpan tangkapan layar."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Dungeon yang menonjol"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Atur ulang dunia pemain tunggal"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Pilih berkas paket:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Batas bayangan"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Mulai Pemain Tunggal"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Kekuatan normalmap yang dibuat."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Kekuatan penguatan tengah kurva cahaya."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Fon ini akan digunakan pada bahasa tertentu."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Mode sinema"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7379,26 +7543,26 @@ msgstr "Waktu habis untuk cURL"
 #~ "Variasi dari ketinggian bukit dan kedalaman danau pada medan halus "
 #~ "floatland."
 
-#~ msgid "Waving water"
-#~ msgstr "Air berombak"
-
-#~ msgid "Y-level of floatland midpoint and lake surface."
-#~ msgstr "Ketinggian Y dari titik tengah floatland dan permukaan danau."
+#~ msgid "View"
+#~ msgstr "Tinjau"
 
-#~ msgid "Y-level to which floatland shadows extend."
-#~ msgstr "Ketinggian Y tempat bayangan floatland diperpanjang."
+#~ msgid "Waving Water"
+#~ msgstr "Air Berombak"
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "Dungeon yang menonjol"
+#~ msgid "Waving water"
+#~ msgstr "Air berombak"
 
 #~ msgid "Whether dungeons occasionally project from the terrain."
 #~ msgstr "Apakah dungeon terkadang muncul dari medan."
 
-#~ msgid "Waving Water"
-#~ msgstr "Air Berombak"
-
 #~ msgid "Y of upper limit of lava in large caves."
 #~ msgstr "Batas atas Y untuk lava dalam gua besar."
 
-#~ msgid "Select Package File:"
-#~ msgstr "Pilih berkas paket:"
+#~ msgid "Y-level of floatland midpoint and lake surface."
+#~ msgstr "Ketinggian Y dari titik tengah floatland dan permukaan danau."
+
+#~ msgid "Y-level to which floatland shadows extend."
+#~ msgstr "Ketinggian Y tempat bayangan floatland diperpanjang."
+
+#~ msgid "Yes"
+#~ msgstr "Ya"
diff --git a/po/it/minetest.po b/po/it/minetest.po
index 13de365a2..897859222 100644
--- a/po/it/minetest.po
+++ b/po/it/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Italian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-26 10:41+0000\n"
-"Last-Translator: Hamlet <hamlatmesehub@riseup.net>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-13 08:50+0000\n"
+"Last-Translator: Jacques Lagrange <Jacques.Reads@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/minetest/"
 "minetest/it/>\n"
 "Language: it\n"
@@ -12,7 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Rinasci"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Sei morto"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -38,10 +46,6 @@ msgstr "Riconnettiti"
 msgid "The server has requested a reconnect:"
 msgstr "Il server ha richiesto una riconnessione:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Caricamento..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "La versione del protocollo non coincide. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Il server supporta versioni di protocollo comprese tra la $1 e la $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Prova a riabilitare l'elenco dei server pubblici e controlla la tua "
-"connessione internet."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Supportiamo solo la versione $1 del protocollo."
 
@@ -68,7 +66,8 @@ msgstr "Supportiamo solo la versione $1 del protocollo."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Supportiamo solo le versioni di protocollo comprese tra la $1 e la $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Supportiamo solo le versioni di protocollo comprese tra la $1 e la $2."
 msgid "Cancel"
 msgstr "Annulla"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dipendenze:"
 
@@ -88,7 +88,7 @@ msgstr "Disattiva tutto"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr "Disattiva la raccolta di mod"
+msgstr "Disattiva il pacchetto mod"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -96,7 +96,7 @@ msgstr "Attiva tutto"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr "Attiva la raccolta di mod"
+msgstr "Attiva il pacchetto mod"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
@@ -128,7 +128,7 @@ msgstr "Nessuna dipendenza"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
-msgstr "Non è stata fornita nessuna descrizione per la raccolta di mod."
+msgstr "Non è stata fornita alcuna descrizione per il pacchetto mod."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No optional dependencies"
@@ -152,14 +152,54 @@ msgid "enabled"
 msgstr "abilitato"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" già esiste. Vuoi sovrascriverlo?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Le dipendenze $1 e $2 verranno installate."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 di $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 in scaricamento,\n"
+"$2 in coda"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "Scaricando $1..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "Le dipendeze richieste per $1 non sono state trovate."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 verrà installato, e $2 dipendenze verranno ignorate."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Tutti i pacchetti"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Già installato"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Torna al Menu Principale"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Gioco base:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr "ContentDB non è disponibile quando Minetest viene compilato senza cuRL"
 
@@ -181,6 +221,14 @@ msgid "Install"
 msgstr "Installa"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "Installa $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Installa le dipendenze mancanti"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mod"
@@ -194,13 +242,28 @@ msgid "No results"
 msgstr "Nessun risultato"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Cerca"
+msgid "No updates"
+msgstr "Nessun aggiornamento"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Non trovato"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Sovrascrivi"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Per favore, controlla che il gioco base sia corretto."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "In coda"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
-msgstr "Raccolte di immagini"
+msgstr "Pacchetti texture"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Uninstall"
@@ -211,8 +274,12 @@ msgid "Update"
 msgstr "Aggiorna"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Vedi"
+msgid "Update All [$1]"
+msgstr "Aggiornat tutti [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Visualizza ulteriori informazioni in un browser web"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -440,15 +507,15 @@ msgstr "Accetta"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr "Rinomina la raccolta di mod:"
+msgstr "Rinomina il pacchetto mod:"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid ""
 "This modpack has an explicit name given in its modpack.conf which will "
 "override any renaming here."
 msgstr ""
-"Questa raccolta di mod esplicita un nome in modpack.conf che sovrascriverà "
-"ogni modifica qui fatta."
+"Questo pacchetto mod esplicita un nome in modpack.conf che sovrascriverà "
+"ogni modifica qui effettuata."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
@@ -467,11 +534,6 @@ msgid "Browse"
 msgstr "Scorri"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Client"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Disabilitato"
 
@@ -516,6 +578,10 @@ msgid "Scale"
 msgstr "Scala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Cerca"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Scegli la cartella"
 
@@ -601,8 +667,8 @@ msgstr "Installa mod: Impossibile trovare il vero nome del mod per: $1"
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install Mod: Unable to find suitable folder name for modpack $1"
 msgstr ""
-"Installa mod: Impossibile trovare un nome cartella corretto per la raccolta "
-"di mod $1"
+"Installa mod: Impossibile trovare un nome cartella corretto per il pacchetto "
+"mod $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install: Unsupported file type \"$1\" or broken archive"
@@ -614,11 +680,11 @@ msgstr "Install: File: \"$1\""
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to find a valid mod or modpack"
-msgstr "Impossibile trovare un mod o una raccolta di mod validi"
+msgstr "Impossibile trovare un mod o un pacchetto mod validi"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
-msgstr "Impossibile installare un $1 come una raccolta di immagini"
+msgstr "Impossibile installare un $1 come un pacchetto texture"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a game as a $1"
@@ -630,11 +696,26 @@ msgstr "Impossibile installare un mod come un $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a modpack as a $1"
-msgstr "Impossibile installare una raccolta di mod come un $1"
+msgstr "Impossibile installare un pacchetto mod come un $1"
+
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Caricamento..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Scripting su lato client disabilitato"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Prova a riabilitare l'elenco dei server pubblici e controlla la tua "
+"connessione internet."
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
-msgstr "Mostra contenuti in linea"
+msgstr "Mostra contenuti online"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
@@ -642,7 +723,7 @@ msgstr "Contenuti"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
-msgstr "Disattiva raccolta immagini"
+msgstr "Disattiva pacchetto texture"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Information:"
@@ -670,7 +751,7 @@ msgstr "Disinstalla la raccolta"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
-msgstr "Usa la raccolta di immagini"
+msgstr "Usa pacchetto texture"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
@@ -685,8 +766,16 @@ msgid "Credits"
 msgstr "Riconoscimenti"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "Apri la cartella dei dati utente"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Apre la cartella che contiene mondi, giochi, mod e pacchetti \n"
+"texture forniti dall'utente in un gestore di file / explorer."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -705,14 +794,10 @@ msgid "Bind Address"
 msgstr "Legare indirizzo"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Configura"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Modalità creativa"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Abilita il ferimento"
 
@@ -726,11 +811,11 @@ msgstr "Ospita un server"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr "Installa giochi dal ContentDB"
+msgstr "Installa giochi da ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nome/Password"
+msgid "Name"
+msgstr "Nome"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -741,6 +826,10 @@ msgid "No world created or selected!"
 msgstr "Nessun mondo creato o selezionato!"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Password"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Avvia il gioco"
 
@@ -749,6 +838,10 @@ msgid "Port"
 msgstr "Porta"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Seleziona mod"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Seleziona mondo:"
 
@@ -758,46 +851,46 @@ msgstr "Porta del server"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Start Game"
-msgstr "Comincia gioco"
+msgstr "Gioca"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
 msgstr "Indirizzo / Porta"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Connettiti"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Modalità creativa"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Danno fisico abilitato"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Elimina preferito"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Preferito"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Join Game"
-msgstr "Entra in un gioco"
+msgstr "Gioca online"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nome / Password"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP abilitato"
 
@@ -826,10 +919,6 @@ msgid "Antialiasing:"
 msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Sei sicuro di azzerare il tuo mondo locale?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Ricorda dim. finestra"
 
@@ -837,10 +926,6 @@ msgstr "Ricorda dim. finestra"
 msgid "Bilinear Filter"
 msgstr "Filtro bilineare"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Bump Mapping"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Cambia i tasti"
@@ -854,10 +939,6 @@ msgid "Fancy Leaves"
 msgstr "Foglie di qualità"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Genera Normal Map"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -866,10 +947,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Filtro aniso."
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "No"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Nessun filtro"
 
@@ -897,19 +974,11 @@ msgstr "Foglie opache"
 msgid "Opaque Water"
 msgstr "Acqua opaca"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parallax Occlusion"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Particelle"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Azzera mondo locale"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Schermo:"
 
@@ -922,6 +991,10 @@ msgid "Shaders"
 msgstr "Shaders"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Shader (sperimentali)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Shaders (non disponibili)"
 
@@ -965,22 +1038,6 @@ msgstr "Liquidi ondeggianti"
 msgid "Waving Plants"
 msgstr "Piante ondeggianti"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Sì"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Config mod"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Principale"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Avvia in locale"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Connessione scaduta."
@@ -999,7 +1056,7 @@ msgstr "Inizializzazione nodi..."
 
 #: src/client/client.cpp
 msgid "Loading textures..."
-msgstr "Caricamento immagini..."
+msgstr "Caricando le texture..."
 
 #: src/client/client.cpp
 msgid "Rebuilding shaders..."
@@ -1135,38 +1192,35 @@ msgid "Continue"
 msgstr "Continua"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Controlli:\n"
 "- %s: avanza\n"
 "- %s: arretra\n"
 "- %s: sinistra\n"
 "- %s: destra\n"
-"- %s: salta/arrampica\n"
-"- %s: striscia/scendi\n"
-"- %s: butta oggetto\n"
+"- %s: salta/arrampicati\n"
+"- %s: scava/colpisci\n"
+"- %s: piazza/usa\n"
+"- %s: furtivo/scendi\n"
+"- %s: lascia oggetto\n"
 "- %s: inventario\n"
 "- Mouse: gira/guarda\n"
-"- Mouse sx: scava/colpisci\n"
-"- Mouse dx: piazza/usa\n"
 "- Rotella mouse: scegli oggetto\n"
 "- %s: chat\n"
 
@@ -1267,16 +1321,6 @@ msgid "Fog enabled"
 msgstr "Nebbia abilitata"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Nebbia disabilitata"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Nebbia abilitata"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Info gioco:"
 
@@ -1297,16 +1341,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Nebbia disabilitata"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Danno fisico abilitato"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "File multimediali..."
 
@@ -1319,34 +1353,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Minimappa attualmente disabilitata dal gioco o da una mod"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Minimappa nascosta"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Minimappa in modalità radar, ingrandimento x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Minimappa in modalità radar, ingrandimento x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Minimappa in modalità radar, ingrandimento x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Minimappa in modalità superficie, ingrandimento x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Minimappa in modalità superficie, ingrandimento x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Minimappa in modalità superficie, ingrandimento x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Modalità incorporea disabilitata"
 
@@ -1372,11 +1378,11 @@ msgstr "Attivato"
 
 #: src/client/game.cpp
 msgid "Pitch move mode disabled"
-msgstr "Modalità movimento inclinazione disabilitata"
+msgstr "Modalità inclinazione movimento disabilitata"
 
 #: src/client/game.cpp
 msgid "Pitch move mode enabled"
-msgstr "Modalità movimento inclinazione abilitata"
+msgstr "Modalità inclinazione movimento abilitata"
 
 #: src/client/game.cpp
 msgid "Profiler graph shown"
@@ -1391,10 +1397,6 @@ msgid "Resolving address..."
 msgstr "Risoluzione indirizzo..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Rinasci"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Chiusura..."
 
@@ -1447,10 +1449,6 @@ msgid "Wireframe shown"
 msgstr "Struttura visualizzata"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Sei morto"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Ingrandimento attualmente disabilitato dal gioco o da un mod"
 
@@ -1467,22 +1465,12 @@ msgid "Chat shown"
 msgstr "Chat visualizzata"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Chat nascosta"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Chat visualizzata"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
-msgstr "Visore nascosto"
+msgstr "HUD nascosto"
 
 #: src/client/gameui.cpp
 msgid "HUD shown"
-msgstr "Visore visualizzato"
+msgstr "HUD visibile"
 
 #: src/client/gameui.cpp
 msgid "Profiler hidden"
@@ -1756,6 +1744,24 @@ msgstr "Pulsante X 2"
 msgid "Zoom"
 msgstr "Ingrandimento"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Minimappa nascosta"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Minimappa in modalità radar, ingrandimento x%d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Minimappa in modalità superficie, ingrandimento x%d"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Minimappa in modalità texture"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Le password non corrispondono!"
@@ -1800,26 +1806,6 @@ msgid "Backward"
 msgstr "Indietreggia"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Cambia vista"
 
@@ -1845,7 +1831,7 @@ msgstr "Diminuisci volume"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr "Doppio \"salta\" per scegliere il volo"
+msgstr "Doppio \"salta\" per volare"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Drop"
@@ -1886,7 +1872,7 @@ msgstr "Comando locale"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Mute"
-msgstr "Silenzio"
+msgstr "Muta audio"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Next item"
@@ -1906,63 +1892,43 @@ msgstr "Schermata"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Sneak"
-msgstr "Striscia"
+msgstr "Furtivo"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Special"
 msgstr "Speciale"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Speciale"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Scegli cinematica"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Scegli cinematica"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
-msgstr "Scegli visore"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Scegli volo"
+msgstr "HUD sì/no"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
-msgstr "Scegli registro chat"
+msgstr "Log chat sì/no"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
-msgstr "Scegli rapido"
+msgstr "Corsa sì/no"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fly"
-msgstr "Scegli volo"
+msgstr "Volo sì/no"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fog"
-msgstr "Scegli nebbia"
+msgstr "Nebbia sì/no"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle minimap"
-msgstr "Scegli minimappa"
+msgstr "Minimappa sì/no"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
-msgstr "Scegli incorporea"
+msgstr "Incorporeità sì/no"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle pitchmove"
-msgstr "Modalità beccheggio"
+msgstr "Beccheggio sì/no"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "press key"
@@ -2071,14 +2037,6 @@ msgstr ""
 "forma grezza."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = occlusione di parallasse con informazione di inclinazione (più veloce).\n"
-"1 = relief mapping (più lenta, più accurata)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "Rumore 2D che controlla forma/dimensione delle montagne con dirupi."
 
@@ -2211,6 +2169,10 @@ msgid "ABM interval"
 msgstr "Intervallo ABM"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr "Budget di tempo ABM"
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Limite assoluto di blocchi in coda da fare apparire"
 
@@ -2474,10 +2436,6 @@ msgid "Builtin"
 msgstr "Incorporato"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bumpmapping"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2500,7 +2458,7 @@ msgstr "Fluidità della telecamera in modalità cinematic"
 
 #: src/settings_translation_file.cpp
 msgid "Camera update toggle key"
-msgstr "Tasto di scelta dell'aggiornamento della telecamera"
+msgstr "Tasto di (dis)attivazione dell'aggiornamento della telecamera"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise"
@@ -2555,22 +2513,6 @@ msgstr ""
 "Dove 0.0 è il livello di luce minimo, 1.0 è il livello di luce massimo."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Cambia l'UI del menu principale:\n"
-"-   Completa: mondi locali multipli, scelta del gioco, selettore pacchetti "
-"grafici, ecc.\n"
-"-   Semplice: un mondo locale, nessun selettore di gioco o pacchetti "
-"grafici.\n"
-"Potrebbe servire per gli schermi più piccoli."
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr "Dimensione del carattere dell'area di messaggistica"
 
@@ -2600,7 +2542,7 @@ msgstr "Lunghezza massima dei messaggi di chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat toggle key"
-msgstr "Tasto di scelta della chat"
+msgstr "Tasto di (dis)attivazione della chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chatcommands"
@@ -2620,7 +2562,7 @@ msgstr "Tasto modalità cinematic"
 
 #: src/settings_translation_file.cpp
 msgid "Clean transparent textures"
-msgstr "Pulizia delle immagini trasparenti"
+msgstr "Pulizia delle texture trasparenti"
 
 #: src/settings_translation_file.cpp
 msgid "Client"
@@ -2676,8 +2618,8 @@ msgid ""
 "These flags are independent from Minetest versions,\n"
 "so see a full list at https://content.minetest.net/help/content_flags/"
 msgstr ""
-"Elenco separato da virgole di valori da nascondere nel deposito dei "
-"contenuti.\n"
+"Elenco di valori separato da virgole che si vuole nascondere dall'archivio "
+"dei contenuti.\n"
 "\"nonfree\" può essere usato per nascondere pacchetti che non si "
 "qualificano\n"
 "come \"software libero\", così come definito dalla Free Software "
@@ -2735,7 +2677,11 @@ msgstr "Altezza della console"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
-msgstr "Lista nera dei valori per il ContentDB"
+msgstr "Contenuti esclusi da ContentDB"
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "Massimi download contemporanei di ContentDB"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB URL"
@@ -2750,9 +2696,9 @@ msgid ""
 "Continuous forward movement, toggled by autoforward key.\n"
 "Press the autoforward key again or the backwards movement to disable."
 msgstr ""
-"Avanzamento continuo, scelto dal tasto avanzamento automatico.\n"
-"Premi nuovamente il tasto avanzamento automatico o il tasto di arretramento "
-"per disabilitarlo."
+"Avanzamento continuo, attivato dal tasto avanzamento automatico.\n"
+"Premi nuovamente il tasto di avanzamento automatico o il tasto di "
+"arretramento per disabilitarlo."
 
 #: src/settings_translation_file.cpp
 msgid "Controls"
@@ -2805,16 +2751,24 @@ msgid "Crosshair alpha"
 msgstr "Trasparenza del mirino"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "Trasparenza del mirino (opacità, tra 0 e 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Trasparenza del mirino (opacità, tra 0 e 255).\n"
+"Controlla anche il colore del mirino dell'oggetto"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
 msgstr "Colore del mirino"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Colore del mirino (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Colore del mirino (R,G,B).\n"
+"Controlla anche il colore del mirino dell'oggetto"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2826,7 +2780,7 @@ msgstr "Ferimento"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
-msgstr "Tasto di scelta delle informazioni di debug"
+msgstr "Tasto di (dis)attivazione delle informazioni di debug"
 
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
@@ -2920,14 +2874,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Definisce posizione e terreno di colline e laghi facoltativi."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Stabilisce il passo di campionamento dell'immagine.\n"
-"Un valore maggiore dà normalmap più uniformi."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Definisce il livello base del terreno."
 
@@ -3007,6 +2953,10 @@ msgid "Desynchronize block animation"
 msgstr "De-sincronizza l'animazione del blocco"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "Tasto scava"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Particelle di scavo"
 
@@ -3028,7 +2978,8 @@ msgstr "Doppio \"salta\" per volare"
 
 #: src/settings_translation_file.cpp
 msgid "Double-tapping the jump key toggles fly mode."
-msgstr "Premendo due volte il tasto di salto si sceglie la modalità di volo."
+msgstr ""
+"Premendo due volte il tasto di salto si (dis)attiva la modalità di volo."
 
 #: src/settings_translation_file.cpp
 msgid "Drop item key"
@@ -3071,7 +3022,8 @@ msgid "Enable console window"
 msgstr "Attivare la finestra della console"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Abilitare la modalità creativa per le nuove mappe create."
 
 #: src/settings_translation_file.cpp
@@ -3141,7 +3093,7 @@ msgstr ""
 "server).\n"
 "I server remoti offrono un sistema significativamente più rapido per "
 "scaricare\n"
-"contenuti multimediali (es. immagini) quando ci si connette al server."
+"contenuti multimediali (es. texture) quando ci si connette al server."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3188,17 +3140,6 @@ msgid "Enables animation of inventory items."
 msgstr "Attiva l'animazione degli oggetti dell'inventario."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Attiva il bumpmapping per le immagini. È necessario fornire le normalmap\n"
-"con la raccolta di immagini, o devono essere generate automaticamente.\n"
-"Necessita l'attivazione degli shader."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Attiva la cache delle mesh ruotate con facedir."
 
@@ -3208,22 +3149,6 @@ msgstr "Attiva la minimappa."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Attiva la generazione istantanea delle normalmap (effetto rilievo).\n"
-"Necessita l'attivazione del bumpmapping."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Attiva la parallax occlusion mapping.\n"
-"Necessita l'attivazione degli shader."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3245,14 +3170,6 @@ msgstr "Sistemi di entità"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Opzione sperimentale, potrebbe causare spazi visibili tra i blocchi\n"
-"quando impostata su numeri maggiori di 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3270,8 +3187,8 @@ msgstr ""
 "pianure più piatte, adatti a uno strato solido di terre fluttuanti."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS nel menu di pausa"
+msgid "FPS when unfocused or paused"
+msgstr "FPS quando il gioco è in pausa o in secondo piano"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3362,12 +3279,12 @@ msgid ""
 "light edge to transparent textures. Apply this filter to clean that up\n"
 "at texture load time."
 msgstr ""
-"Le immagini a cui si applicano i filtri possono amalgamare i valori RGB con "
+"Le texture a cui si applicano i filtri possono amalgamare i valori RGB con "
 "quelle vicine completamente trasparenti,\n"
 "che normalmente vengono scartati dagli ottimizzatori PNG, risultando a volte "
-"in immagini trasparenti scure o\n"
+"in texture trasparenti scure o\n"
 "dai bordi chiari. Applicare questo filtro aiuta a ripulire tutto ciò\n"
-"al momento del caricamento dell'immagine."
+"al momento del caricamento della texture."
 
 #: src/settings_translation_file.cpp
 msgid "Filtering"
@@ -3437,7 +3354,7 @@ msgstr "Inizio nebbia"
 
 #: src/settings_translation_file.cpp
 msgid "Fog toggle key"
-msgstr "Tasto scelta nebbia"
+msgstr "Tasto (dis)attivazione nebbia"
 
 #: src/settings_translation_file.cpp
 msgid "Font bold by default"
@@ -3605,10 +3522,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Filtro di scala txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Generare le normalmap"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Callback globali"
 
@@ -3662,26 +3575,25 @@ msgstr "Moduli HTTP"
 
 #: src/settings_translation_file.cpp
 msgid "HUD scale factor"
-msgstr "Fattore di scala del visore"
+msgstr "Fattore di scala dell'HUD"
 
 #: src/settings_translation_file.cpp
 msgid "HUD toggle key"
-msgstr "Tasto di scelta del visore"
+msgstr "Tasto di (dis)attivazione dell'HUD"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
-"Gestione delle chiamate deprecate alle API Lua:\n"
-"-   legacy (ereditaria): (prova a) simulare il vecchio comportamento "
-"(predefinito per i rilasci).\n"
-"-   log (registro): simula e registra la traccia della chiamata deprecata "
-"(predefinito per il debug).\n"
-"-   error (errore): interrompere all'uso della chiamata deprecata (suggerito "
-"per lo sviluppo di moduli)."
+"Gestione delle chiamate API Lua deprecate:\n"
+"- none (nessuno): non registra le chiamate obsolete\n"
+"- log (registro): imita e registra il backtrace di una chiamata obsoleta "
+"(impostazione predefinita).\n"
+"- error (errore): interrompe l'utilizzo della chiamata deprecata "
+"(consigliata per gli sviluppatori di mod)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4004,7 +3916,7 @@ msgid ""
 "down and\n"
 "descending."
 msgstr ""
-"Se abilitata, si usa il tasto \"speciale\" invece di \"striscia\" per "
+"Se abilitata, si usa il tasto \"speciale\" invece di \"furtivo\" per "
 "arrampicarsi e\n"
 "scendere."
 
@@ -4215,6 +4127,10 @@ msgid "Joystick button repetition interval"
 msgstr "Intervallo di ripetizione del pulsante del joystick"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr "Deadzone joystick"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Sensibilità del tronco del joystick"
 
@@ -4318,6 +4234,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tasto per scavare.\n"
+"Vedi http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4460,6 +4386,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tasto per piazzare.\n"
+"Vedi http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4806,7 +4742,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tasto per strisciare.\n"
+"Tasto per muoversi furtivamente.\n"
 "Usato anche per scendere, e per immergersi in acqua se aux1_descends è "
 "disattivato.\n"
 "Si veda http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4898,7 +4834,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tasto per scegliere la modalità di movimento di pendenza.\n"
+"Tasto per scegliere la modalità di inclinazione del movimento. \n"
 "Si veda http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4939,7 +4875,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tasto per scegliere la visualizzazione della nebbia.\n"
+"Tasto per attivare/disattivare la visualizzazione della nebbia.\n"
 "Si veda http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4949,7 +4885,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tasto per scegliere la visualizzazione del visore.\n"
+"Tasto per attivare/disattivare la visualizzazione dell'HUD.\n"
 "Si veda http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -5214,10 +5150,6 @@ msgid "Main menu script"
 msgstr "Script del menu principale"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Stile del menu principale"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5233,6 +5165,14 @@ msgid "Makes all liquids opaque"
 msgstr "Rende opachi tutti i liquidi"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr "Livello di compressione della mappa per l'archiviazione su disco"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr "Livello di compressione della mappa per il trasferimento in rete"
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Cartella della mappa"
 
@@ -5421,8 +5361,10 @@ msgid "Maximum FPS"
 msgstr "FPS massimi"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "FPS massimi quando il gioco è in pausa."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr ""
+"FPS massimi quando la finestra è in secondo piano o quando il gioco è in "
+"pausa."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -5481,6 +5423,16 @@ msgstr ""
 "Questo limite viene imposto per ciascun giocatore."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+"Numero massimo di download simultanei. I download che superano questo limite "
+"verranno messi in coda.\n"
+"Dovrebbe essere inferiore a curl_parallel_limit."
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "Numero massimo di blocchi mappa caricati a forza."
 
@@ -5604,7 +5556,7 @@ msgstr "Limite minimo di piccole grotte casuali per pezzo di mappa."
 
 #: src/settings_translation_file.cpp
 msgid "Minimum texture size"
-msgstr "Dimensione minima dell'immagine"
+msgstr "Dimensione minima della texture"
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
@@ -5616,7 +5568,7 @@ msgstr "Canali mod"
 
 #: src/settings_translation_file.cpp
 msgid "Modifies the size of the hudbar elements."
-msgstr "Modifica la dimensione degli elementi della barra del visore."
+msgstr "Modifica la dimensione degli elementi della barra dell'HUD."
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
@@ -5664,7 +5616,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mute key"
-msgstr "Tasto silenzio"
+msgstr "Tasto muta"
 
 #: src/settings_translation_file.cpp
 msgid "Mute sound"
@@ -5741,14 +5693,6 @@ msgid "Noises"
 msgstr "Rumori"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Campionamento normalmap"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Intensità normalmap"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Numero di thread emerge"
 
@@ -5792,10 +5736,6 @@ msgstr ""
 "consumo di memoria (4096 = 100MB, come regola generale)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Numero di iterazioni dell'occlusione di parallasse."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Deposito dei contenuti in linea"
 
@@ -5824,36 +5764,6 @@ msgstr ""
 "mette in pausa se è aperta una finestra di dialogo."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-"Deviazione complessiva dell'effetto di occlusione di parallasse, solitamente "
-"scala/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Scala globale dell'effetto di occlusione di parallasse."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Parallax Occlusion"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Deviazione dell'occlusione di parallasse"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Iterazioni dell'occlusione di parallasse"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Modalità dell'occlusione di parallasse"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Scala dell'occlusione di parallasse"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5889,8 +5799,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "Path to texture directory. All textures are first searched from here."
 msgstr ""
-"Percorso della cartella immagini. Tutte le immagini vengono cercate a "
-"partire da qui."
+"Percorso della cartella contenente le texture. Tutte le texture vengono "
+"cercate a partire da qui."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5940,11 +5850,19 @@ msgstr "Fisica"
 
 #: src/settings_translation_file.cpp
 msgid "Pitch move key"
-msgstr "Modalità movimento pendenza"
+msgstr "Modalità inclinazione movimento"
 
 #: src/settings_translation_file.cpp
 msgid "Pitch move mode"
-msgstr "Modalità movimento pendenza"
+msgstr "Modalità inclinazione movimento"
+
+#: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr "Tasto piazza"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr "Intervallo di ripetizione per il piazzamento"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6009,7 +5927,7 @@ msgstr "Generatore di profili"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
-msgstr "Tasto di scelta del generatore di profili"
+msgstr "Tasto di (dis)attivazione del generatore di profili"
 
 #: src/settings_translation_file.cpp
 msgid "Profiling"
@@ -6137,10 +6055,6 @@ msgid "Right key"
 msgstr "Tasto des."
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Intervallo di ripetizione del click destro"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Profondità dell'alveo dei fiumi"
 
@@ -6443,6 +6357,19 @@ msgid "Show entity selection boxes"
 msgstr "Mostrare le aree di selezione delle entità"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Mostra la casella di selezione delle entità\n"
+"È necessario riavviare dopo aver cambiato questo."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Carattere grassetto per impostazione predefinita"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Messaggio di chiusura"
 
@@ -6524,11 +6451,11 @@ msgstr "Rende fluida la rotazione della telecamera. 0 per disattivare."
 
 #: src/settings_translation_file.cpp
 msgid "Sneak key"
-msgstr "Tasto striscia"
+msgstr "Tasto furtivo"
 
 #: src/settings_translation_file.cpp
 msgid "Sneaking speed"
-msgstr "Velocità di strisciamento"
+msgstr "Velocità furtiva"
 
 #: src/settings_translation_file.cpp
 msgid "Sneaking speed, in nodes per second."
@@ -6600,10 +6527,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Intensità della parallasse della modalità 3D."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Intensità delle normalmap generate."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6705,7 +6628,7 @@ msgstr "Rumore di continuità del terreno"
 
 #: src/settings_translation_file.cpp
 msgid "Texture path"
-msgstr "Percorso delle immagini"
+msgstr "Percorso delle texture"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6716,7 +6639,7 @@ msgid ""
 "this option allows enforcing it for certain node types. Note though that\n"
 "that is considered EXPERIMENTAL and may not work properly."
 msgstr ""
-"Le immagini su un nodo possono essere allineate sia al nodo che al mondo.\n"
+"Le texture su un nodo possono essere allineate sia al nodo che al mondo.\n"
 "Il primo modo si addice meglio a cose come macchine, arredamento, ecc.,\n"
 "mentre il secondo fa sì che scale e microblocchi si adattino meglio ai "
 "dintorni.\n"
@@ -6730,6 +6653,10 @@ msgid "The URL for the content repository"
 msgstr "L'URL per il deposito dei contenuti"
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr "La deadzone del joystick"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6807,15 +6734,15 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
-"Il motore di resa per Irrlicht.\n"
+"Il back-end di rendering per Irrlicht.\n"
 "Dopo averlo cambiato è necessario un riavvio.\n"
-"Nota: su Android, si resti con OGLES1 se incerti! Altrimenti l'app potrebbe "
+"Nota: su Android, restare con OGLES1 se incerti! Altrimenti l'app potrebbe "
 "non partire.\n"
-"Su altre piattaforme, si raccomanda OpenGL, ed è attualmente l'unico driver\n"
-"con supporto degli shader."
+"Su altre piattaforme, si raccomanda OpenGL\n"
+"Le shader sono supportate da OpenGL (solo su desktop) e OGLES2 (sperimentale)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6854,6 +6781,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+"Il budget di tempo ha consentito agli ABM per eseguire ogni passaggio\n"
+"(come frazione dell'intervallo ABM)"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6862,12 +6797,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
-"Il tempo in secondi richiesto tra click destri ripetuti quando\n"
-"si tiene premuto il tasto destro del mouse."
+"Il tempo in secondi che intercorre tra il piazzamento dei nodi quando si "
+"tiene\n"
+"premuto il pulsante piazza."
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
@@ -6931,7 +6866,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Toggle camera mode key"
-msgstr "Tasto di scelta della modalità telecamera"
+msgstr "Tasto di (dis)attivazione della modalità telecamera"
 
 #: src/settings_translation_file.cpp
 msgid "Tooltip delay"
@@ -7014,12 +6949,12 @@ msgstr "Usare un'animazione con le nuvole per lo sfondo del menu principale."
 #: src/settings_translation_file.cpp
 msgid "Use anisotropic filtering when viewing at textures from an angle."
 msgstr ""
-"Usare il filtraggio anisotropico quando si guardano le immagini da "
+"Usare il filtraggio anisotropico quando si guardano le texture da "
 "un'angolazione."
 
 #: src/settings_translation_file.cpp
 msgid "Use bilinear filtering when scaling textures."
-msgstr "Usare il filtraggio bilineare quando si ridimensionano le immagini."
+msgstr "Usare il filtraggio bilineare quando si ridimensionano le texture."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7027,14 +6962,34 @@ msgid ""
 "especially when using a high resolution texture pack.\n"
 "Gamma correct downscaling is not supported."
 msgstr ""
-"Usare il mip mapping per ridimensionare le immagini. Potrebbe aumentare "
+"Usare il mip mapping per ridimensionare le texture. Potrebbe aumentare "
 "leggermente le prestazioni,\n"
-"specialmente quando si usa una raccolta di immagini ad alta risoluzione.\n"
+"specialmente quando si usa un pacchetto texture ad alta risoluzione.\n"
 "La correzione gamma del downscaling non è supportata."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+"Utilizzare l'antialiasing multi-campione (MSAA) per smussare i bordi del "
+"blocco.\n"
+"Questo algoritmo uniforma la visualizzazione 3D mantenendo l'immagine "
+"nitida,\n"
+"ma non influenza l'interno delle texture\n"
+"(che è particolarmente evidente con trame trasparenti).\n"
+"Gli spazi visibili appaiono tra i nodi quando gli shader sono disabilitati.\n"
+"Se impostato a 0, MSAA è disabilitato.\n"
+"È necessario riavviare dopo aver modificato questa opzione."
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
-msgstr "Usare il filtraggio trilineare quando si ridimensionano le immagini."
+msgstr "Usare il filtraggio trilineare quando si ridimensionano le texture."
 
 #: src/settings_translation_file.cpp
 msgid "VBO"
@@ -7234,7 +7189,7 @@ msgstr ""
 "Quando gui_scaling_filter_txr2img è Vero, copia quelle immagini\n"
 "dall'hardware al software per il ridimensionamento. Quando è Falso,\n"
 "ripiega sul vecchio metodo di ridimensionamento, per i driver video che\n"
-"non supportano correttamente lo scaricamento delle immagini dall'hardware."
+"non supportano correttamente lo scaricamento delle texture dall'hardware."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7248,13 +7203,13 @@ msgid ""
 "This is also used as the base node texture size for world-aligned\n"
 "texture autoscaling."
 msgstr ""
-"Quando si usano i filtri bilineare/trilineare/anisotropico, le immagini a "
+"Quando si usano i filtri bilineare/trilineare/anisotropico, le texture a "
 "bassa risoluzione\n"
-"possono essere sfocate, così si esegue l'upscaling automatico con "
+"possono essere sfocate, così viene eseguito l'ingrandimento automatico con "
 "l'interpolazione nearest-neighbor\n"
 "per conservare pixel chiari. Questo imposta la dimensione minima delle "
 "immagini\n"
-"per le immagini upscaled; valori più alti hanno un aspetto più nitido, ma "
+"per le texture ingrandite; valori più alti hanno un aspetto più nitido, ma "
 "richiedono più memoria.\n"
 "Sono raccomandate le potenze di 2. Impostarla a un valore maggiore di 1 "
 "potrebbe non avere\n"
@@ -7275,9 +7230,15 @@ msgstr ""
 "Se disabilitati, si utilizzano invece i caratteri bitmap e XML vettoriali."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
-"Se le animazioni delle immagini dei nodi dovrebbero essere asincrone per "
+"Se le animazioni delle texture dei nodi dovrebbero essere asincrone per "
 "blocco mappa."
 
 #: src/settings_translation_file.cpp
@@ -7315,8 +7276,7 @@ msgstr ""
 "Se silenziare i suoni. È possibile de-silenziare i suoni in qualsiasi "
 "momento, a meno che\n"
 "il sistema audio non sia disabilitato (enable_sound=false).\n"
-"Nel gioco, puoi alternare lo stato silenziato col tasto di silenzio o "
-"usando\n"
+"Nel gioco, puoi alternare lo stato silenziato col tasto muta o usando\n"
 "il menu di pausa."
 
 #: src/settings_translation_file.cpp
@@ -7365,19 +7325,19 @@ msgid ""
 "See also texture_min_size.\n"
 "Warning: This option is EXPERIMENTAL!"
 msgstr ""
-"Le immagini allineate al mondo possono essere ridimensionate per estendersi "
+"Le texture allineate al mondo possono essere ridimensionate per estendersi "
 "su diversi nodi.\n"
 "Comunque, il server potrebbe non inviare la scala che vuoi, specialmente se "
-"usi una raccolta di immagini\n"
-"progettata specificamente; con questa opzione, il client prova a stabilire "
+"usi un pacchetto texture\n"
+"progettato specificamente; con questa opzione, il client prova a stabilire "
 "automaticamente la scala\n"
-"basandosi sulla dimensione dell'immagine.\n"
+"basandosi sulla dimensione della texture.\n"
 "Si veda anche texture_min_size.\n"
 "Avviso: questa opzione è SPERIMENTALE!"
 
 #: src/settings_translation_file.cpp
 msgid "World-aligned textures mode"
-msgstr "Modalità immagini allineate al mondo"
+msgstr "Modalità texture allineate al mondo"
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
@@ -7434,6 +7394,38 @@ msgid "Y-level of seabed."
 msgstr "Livello Y del fondale marino."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Livello di compressione ZLib da utilizzare quando si salvano i blocchi mappa "
+"su disco.\n"
+"-1 - Livello di compressione predefinito di Zlib\n"
+"0 - nessuna compressione, più veloce\n"
+"9 - migliore compressione, più lenta\n"
+"(i livelli 1-3 usano il metodo \"veloce\" di Zlib, 4-9 usano il metodo "
+"normale)"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Livello di compressione ZLib da utilizzare quando si inviano i blocchi mappa "
+"al client.\n"
+"-1 - Livello di compressione predefinito di Zlib\n"
+"0 - nessuna compressione, più veloce\n"
+"9 - migliore compressione, più lenta\n"
+"(i livelli 1-3 usano il metodo \"veloce\" di Zlib, 4-9 usano il metodo "
+"normale)"
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "Scadenza cURL scaricamento file"
 
@@ -7445,23 +7437,13 @@ msgstr "Limite parallelo cURL"
 msgid "cURL timeout"
 msgstr "Scadenza cURL"
 
-#~ msgid "Ok"
-#~ msgstr "OK"
-
-#~ msgid "Back"
-#~ msgstr "Indietro"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Scaricamento e installazione di $1, attendere prego..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Limite di code emerge su disco"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Intensità dell'occlusione di parallasse"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Percorso dove salvare le schermate."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = occlusione di parallasse con informazione di inclinazione (più "
+#~ "veloce).\n"
+#~ "1 = relief mapping (più lenta, più accurata)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7477,10 +7459,43 @@ msgstr "Scadenza cURL"
 #~ "Modifica il restringimento superiore e inferiore rispetto al punto "
 #~ "mediano delle terre fluttuanti di tipo montagnoso."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Sei sicuro di azzerare il tuo mondo locale?"
+
+#~ msgid "Back"
+#~ msgstr "Indietro"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Bump Mapping"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bumpmapping"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Centro dell'aumento mediano della curva della luce."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Cambia l'UI del menu principale:\n"
+#~ "-   Completa: mondi locali multipli, scelta del gioco, selettore "
+#~ "pacchetti texture, ecc.\n"
+#~ "-   Semplice: un mondo locale, nessun selettore di gioco o pacchetti "
+#~ "grafici.\n"
+#~ "Potrebbe servire per gli schermi più piccoli."
+
+#~ msgid "Config mods"
+#~ msgstr "Config mod"
+
+#~ msgid "Configure"
+#~ msgstr "Configura"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7493,6 +7508,9 @@ msgstr "Scadenza cURL"
 #~ "Controlla la larghezza delle gallerie, un valore più piccolo crea "
 #~ "gallerie più larghe."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Colore del mirino (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Nitidezza dell'oscurità"
 
@@ -7504,6 +7522,13 @@ msgstr "Scadenza cURL"
 #~ "Le terre fluttuanti uniformi avvengono quando il rumore è > 0."
 
 #~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Stabilisce il passo di campionamento della texture.\n"
+#~ "Un valore maggiore dà normalmap più uniformi."
+
+#~ msgid ""
 #~ "Deprecated, define and locate cave liquids using biome definitions "
 #~ "instead.\n"
 #~ "Y of upper limit of lava in large caves."
@@ -7512,12 +7537,49 @@ msgstr "Scadenza cURL"
 #~ "posizionare le caverne di liquido.\n"
 #~ "Limite verticale della lava nelle caverne grandi."
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Scaricamento e installazione di $1, attendere prego..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Abilitare i VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Attiva il bumpmapping per le texture. È necessario fornire le normalmap\n"
+#~ "con i pacchetti texture, o devono essere generate automaticamente.\n"
+#~ "Necessita l'attivazione degli shader."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Attiva il filmic tone mapping"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Attiva la generazione istantanea delle normalmap (effetto rilievo).\n"
+#~ "Necessita l'attivazione del bumpmapping."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Attiva la parallax occlusion mapping.\n"
+#~ "Necessita l'attivazione degli shader."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Opzione sperimentale, potrebbe causare spazi visibili tra i blocchi\n"
+#~ "quando impostata su numeri maggiori di 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS nel menu di pausa"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Rumore base dell'altezza delle terre fluttuanti"
 
@@ -7530,6 +7592,12 @@ msgstr "Scadenza cURL"
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Genera Normal Map"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Generare le normalmap"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Supporto IPv6."
 
@@ -7539,18 +7607,107 @@ msgstr "Scadenza cURL"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Nitidezza della luminosità"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Limite di code emerge su disco"
+
+#~ msgid "Main"
+#~ msgstr "Principale"
+
+#~ msgid "Main menu style"
+#~ msgstr "Stile del menu principale"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Minimappa in modalità radar, ingrandimento x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Minimappa in modalità radar, ingrandimento x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Minimappa in modalità superficie, ingrandimento x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Minimappa in modalità superficie, ingrandimento x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nome/Password"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Campionamento normalmap"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Intensità normalmap"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Numero di iterazioni dell'occlusione di parallasse."
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr ""
+#~ "Deviazione complessiva dell'effetto di occlusione di parallasse, "
+#~ "solitamente scala/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Scala globale dell'effetto di occlusione di parallasse."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax Occlusion"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Parallax Occlusion"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Deviazione dell'occlusione di parallasse"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Iterazioni dell'occlusione di parallasse"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Modalità dell'occlusione di parallasse"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Scala dell'occlusione di parallasse"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Intensità dell'occlusione di parallasse"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Percorso del carattere TrueType o bitmap."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Percorso dove salvare le schermate."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Sotterranei protundenti"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Azzera mondo locale"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Seleziona pacchetto file:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Limite dell'ombra"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Avvia in locale"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Intensità delle normalmap generate."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Intensità dell'aumento mediano della curva di luce."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Questo carattere sarà usato per certe Lingue."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Scegli cinematica"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7562,9 +7719,21 @@ msgstr "Scadenza cURL"
 #~ "Variazione dell'altezza delle colline, e della profondità dei laghi sul\n"
 #~ "terreno uniforme delle terre fluttuanti."
 
+#~ msgid "View"
+#~ msgstr "Vedi"
+
+#~ msgid "Waving Water"
+#~ msgstr "Acqua ondeggiante"
+
 #~ msgid "Waving water"
 #~ msgstr "Acqua ondeggiante"
 
+#~ msgid "Whether dungeons occasionally project from the terrain."
+#~ msgstr "Se i sotterranei saltuariamente si protendono dal terreno."
+
+#~ msgid "Y of upper limit of lava in large caves."
+#~ msgstr "Y del limite superiore della lava nelle caverne grandi."
+
 #~ msgid "Y-level of floatland midpoint and lake surface."
 #~ msgstr ""
 #~ "Livello Y del punto medio delle terre fluttuanti e della superficie dei "
@@ -7573,17 +7742,5 @@ msgstr "Scadenza cURL"
 #~ msgid "Y-level to which floatland shadows extend."
 #~ msgstr "Livello Y a cui si estendono le ombre delle terre fluttuanti."
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "Sotterranei protundenti"
-
-#~ msgid "Whether dungeons occasionally project from the terrain."
-#~ msgstr "Se i sotterranei saltuariamente si protendono dal terreno."
-
-#~ msgid "Waving Water"
-#~ msgstr "Acqua ondeggiante"
-
-#~ msgid "Y of upper limit of lava in large caves."
-#~ msgstr "Y del limite superiore della lava nelle caverne grandi."
-
-#~ msgid "Select Package File:"
-#~ msgstr "Seleziona pacchetto file:"
+#~ msgid "Yes"
+#~ msgstr "Sì"
diff --git a/po/ja/minetest.po b/po/ja/minetest.po
index 356e1ce02..c3a5e3522 100644
--- a/po/ja/minetest.po
+++ b/po/ja/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Japanese (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-15 22:41+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-13 08:50+0000\n"
 "Last-Translator: BreadW <toshiharu.uno@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/minetest/"
 "minetest/ja/>\n"
@@ -12,7 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.1\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "リス�ーン"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "死ん�����"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -38,10 +46,6 @@ msgstr "�接続"
 msgid "The server has requested a reconnect:"
 msgstr "サー���接続を�求����:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "読�込�中..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "プロトコル��ージョン�一致�����ん。 "
@@ -55,10 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "サー��$1�ら$2���プロトコル��ージョンをサ�ート�����。 "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "インター�ット接続を確���公開サー�一覧を�有効化������。"
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "プロトコル��ージョン$1��をサ�ート�����。"
 
@@ -66,7 +66,8 @@ msgstr "プロトコルã�¯ãƒ�ージョン$1ã�®ã�¿ã‚’サãƒ�ートã�—ã�¦ã�„ã�¾ã�™ã
 msgid "We support protocol versions between version $1 and $2."
 msgstr "�ージョン$1�ら$2���プロトコルをサ�ート�����。"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -76,9 +77,10 @@ msgstr "ãƒ�ージョン$1ã�‹ã‚‰$2ã�¾ã�§ã�®ãƒ—ロトコルをサãƒ�ートã�—ã�¦ã�
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
-msgstr "�存関係:"
+msgstr "�存Mod:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
@@ -114,7 +116,7 @@ msgstr "Mod:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No (optional) dependencies"
-msgstr "(任�)�存関係��"
+msgstr "（任�）�存Mod��"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No game description provided."
@@ -122,7 +124,7 @@ msgstr "ゲーム�説明��り��ん。"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No hard dependencies"
-msgstr "�存関係��"
+msgstr "必須�存Mod��"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
@@ -130,11 +132,11 @@ msgstr "Modパック�説明��り��ん。"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No optional dependencies"
-msgstr "任��存関係��"
+msgstr "任��存Mod��"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
-msgstr "任�:"
+msgstr "任��存Mod:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/gui/guiKeyChangeMenu.cpp
@@ -150,12 +152,52 @@ msgid "enabled"
 msgstr "有効"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "「$1�����存在���。上書�����？"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 ��存Mod $2 �インストール�れ��。"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 by $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 ダウンロード中�\n"
+"$2 ダウンロード待機中"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 ダウンロード中..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 ��必���存Mod�見��り��ん���。"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 �インストール�れ��存Mod $2 �スキップ�れ��。"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "���"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "インストール済�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
-msgstr "メインメニュー�戻る"
+msgstr "メインメニュー�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "基盤ゲーム："
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
@@ -179,6 +221,14 @@ msgid "Install"
 msgstr "入手"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "$1 �インストール"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "�足�存Modインストール"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mod"
@@ -192,9 +242,24 @@ msgid "No results"
 msgstr "何も見��り��ん���"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "検索"
+msgid "No updates"
+msgstr "更新��"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "見��り��ん"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "上書�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "基盤��るゲーム�正������確�������。"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "待機中"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -209,12 +274,16 @@ msgid "Update"
 msgstr "æ›´æ–°"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "見る"
+msgid "Update All [$1]"
+msgstr "���更新 [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Webブラウザ�詳細を見る"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr "ワールド�「$1��既�存在���"
+msgstr "ワールド�「$1�����存在���"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
@@ -463,11 +532,6 @@ msgid "Browse"
 msgstr "�照"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "クライアント"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "無効"
 
@@ -512,6 +576,10 @@ msgid "Scale"
 msgstr "スケール"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "検索"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "ディレクトリ��択"
 
@@ -626,6 +694,19 @@ msgstr "Modを$1���インストール�る�������ん"
 msgid "Unable to install a modpack as a $1"
 msgstr "Modパックを$1���インストール�る�������ん"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "読�込�中..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "クライアント��スクリプト�無効"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "インター�ット接続を確���公開サー�一覧を�有効化������。"
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "オンラインコンテンツ�照"
@@ -648,7 +729,7 @@ msgstr "インストール済��パッケージ:"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No dependencies."
-msgstr "�存��。"
+msgstr "�存Mod��。"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No package description available"
@@ -679,8 +760,16 @@ msgid "Credits"
 msgstr "クレジット"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "ディレクトリを開�"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"ファイルマ�ージャー/エクスプローラー��ワールド�ゲーム�Mod�\n"
+"�よ�テクス�ャパックを�むディレクトリを開���。"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -699,14 +788,10 @@ msgid "Bind Address"
 msgstr "�インドアドレス"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "設定"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
-msgstr "クリエイティブモード"
+msgstr "クリエイティブ"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "ダメージ有効"
 
@@ -723,8 +808,8 @@ msgid "Install games from ContentDB"
 msgstr "コンテンツDB�らゲームをインストール"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "�� / パスワード"
+msgid "Name"
+msgstr "��"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -735,6 +820,10 @@ msgid "No world created or selected!"
 msgstr "ワールド�作�����択�れ����ん�"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "パスワード"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "ゲームプレイ"
 
@@ -743,6 +832,10 @@ msgid "Port"
 msgstr "�ート"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Modを�択"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "ワールドを�択:"
 
@@ -758,23 +851,23 @@ msgstr "ゲームスタート"
 msgid "Address / Port"
 msgstr "アドレス / �ート"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "接続"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "クリエイティブモード"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "ダメージ有効"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "�気�入り削除"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "�気�入り"
 
@@ -782,16 +875,16 @@ msgstr "�気�入り"
 msgid "Join Game"
 msgstr "ゲーム��加"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "�� / パスワード"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "応答速度"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP有効"
 
@@ -820,21 +913,13 @@ msgid "Antialiasing:"
 msgstr "アン�エイリアス:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "シングルプレイヤー�ワールドをリセット��よ������？"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
-msgstr "画��大��を自動�存"
+msgstr "大��を自動�存"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
 msgstr "�イリニアフィルタ"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "�ンプマッピング"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "キー変更"
@@ -848,10 +933,6 @@ msgid "Fancy Leaves"
 msgstr "綺麗�葉"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "法線マップ�生�"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "ミップマップ"
 
@@ -860,10 +941,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "ミップマップ�異方性フィルタ"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "���"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "フィルタ無�"
 
@@ -891,19 +968,11 @@ msgstr "��明�葉"
 msgid "Opaque Water"
 msgstr "��明�水"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "視差�蔽"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "パーティクル"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "ワールドをリセット"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "画�:"
 
@@ -916,6 +985,10 @@ msgid "Shaders"
 msgstr "シェーダー"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "シェーダー（実験的）"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "シェーダー (無効)"
 
@@ -959,22 +1032,6 @@ msgstr "�れる液体"
 msgid "Waving Plants"
 msgstr "�れる�花"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "��"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Mod設定"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "メイン"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "シングルプレイスタート"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "接続�タイムアウト����。"
@@ -1129,39 +1186,36 @@ msgid "Continue"
 msgstr "�開"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
-"�作:\n"
+"�作方法:\n"
 "- %s: �進\n"
 "- %s: 後退\n"
 "- %s: 左移動\n"
 "- %s: �移動\n"
 "- %s: ジャンプ/登る\n"
+"- %s: 掘削/パン�\n"
+"- %s: 設置/使用\n"
 "- %s: スニーク/�りる\n"
 "- %s: アイテムを���\n"
 "- %s: インベントリ\n"
 "- マウス: 見回�\n"
-"- 左クリック: 掘削/パン�\n"
-"- �クリック: 設置/使用\n"
-"- ホイール: アイテム�択\n"
+"- マウスホイール: アイテム�択\n"
 "- %s: �ャット\n"
 
 #: src/client/game.cpp
@@ -1261,16 +1315,6 @@ msgid "Fog enabled"
 msgstr "霧 有効"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "霧 無効"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "霧 有効"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "ゲーム情報:"
 
@@ -1291,16 +1335,6 @@ msgid "KiB/s"
 msgstr "KiB/秒"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "霧 無効"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "ダメージ有効"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "メディアを�信中..."
 
@@ -1313,34 +1347,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "ミニマップ��在ゲーム���Mod�より無効"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "ミニマップ �表示"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "ミニマップ レーダーモード�ズーム x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "ミニマップ レーダーモード�ズーム x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "ミニマップ レーダーモード�ズーム x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "ミニマップ 表�モード�ズーム x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "ミニマップ 表�モード�ズーム x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "ミニマップ 表�モード�ズーム x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "�り抜�モード 無効"
 
@@ -1385,10 +1391,6 @@ msgid "Resolving address..."
 msgstr "アドレスを解決中..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "リス�ーン"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "終了中..."
 
@@ -1441,10 +1443,6 @@ msgid "Wireframe shown"
 msgstr "ワイヤーフレーム 表示"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "死ん�����"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "ズーム��在ゲーム���Mod�より無効"
 
@@ -1461,16 +1459,6 @@ msgid "Chat shown"
 msgstr "�ャット 表示"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "�ャット �表示"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "�ャット 表示"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD �表示"
 
@@ -1750,6 +1738,24 @@ msgstr "Xボタン2"
 msgid "Zoom"
 msgstr "ズーム"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "ミニマップ �表示"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "ミニマップ レーダーモード�ズーム x%d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "ミニマップ 表�モード�ズーム x%d"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "ミニマップ テクス�ャモード"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "パスワード�一致���ん�"
@@ -1795,26 +1801,6 @@ msgid "Backward"
 msgstr "後退"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "視点変更"
 
@@ -1840,7 +1826,7 @@ msgstr "音�を下�る"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr "\"ジャンプ\"二度押��飛行モード切替"
+msgstr "\"ジャンプ\"２回�飛行モード切替"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Drop"
@@ -1873,7 +1859,7 @@ msgstr "キー��複�����"
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 msgstr ""
-"キー設定��。 (��メニュー�失敗�る場���minetest.conf�ら該当�る設定を"
+"キー設定��。 (��メニュー�失敗�る場�� minetest.conf �ら該当�る設定を"
 "削除������)"
 
 #: src/gui/guiKeyChangeMenu.cpp
@@ -1909,30 +1895,10 @@ msgid "Special"
 msgstr "スペシャル"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "スペシャル"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "映画風モード切替"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "映画風モード切替"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "HUD表示切替"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "飛行モード切替"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "�ャット表示切替"
 
@@ -2061,14 +2027,6 @@ msgstr ""
 "加工������形状�����3��数字を���等��設定���。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = 斜�情報付��視差�蔽マッピング(高速)。\n"
-"1 = リリーフマッピング(正確��低速)。"
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "尾根�形状/大��を制御�る2Dノイズ。"
 
@@ -2193,6 +2151,10 @@ msgid "ABM interval"
 msgstr "ABM�間隔"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr "ABM�時間予算"
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "キュー�入れられ�ブロック�出��る絶対制�"
 
@@ -2450,10 +2412,6 @@ msgid "Builtin"
 msgstr "ビルトイン"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "�ンプマッピング"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2531,21 +2489,6 @@ msgstr ""
 "0.0�最�光レベル�1.0�最大光レベル��。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"メインメニューUIを変更:\n"
-"-   Full:  複数�シングルプレイヤー�ワールド�ゲーム��択�\n"
-"テクス�ャパック��択���他。\n"
-"-   Simple: 1��シングルプレイヤー�ワールド�ゲームや\n"
-"テクス�ャパック��択��り��ん。���画��必��も�れ��ん。"
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr "�ャット�フォントサイズ"
 
@@ -2709,6 +2652,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "コンテンツDBフラグ�ブラックリスト"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "コンテンツDB�最大�時ダウンロード数"
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "コンテンツDB�URL"
 
@@ -2770,19 +2717,27 @@ msgstr "クリエイティブ"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
-msgstr "照準線���度"
+msgstr "�字カーソル���度"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "照準線��� (��明�0～255�間)。"
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"�字カーソル���度（��明�0～255�間）。\n"
+"オブジェクト�字カーソル�色も制御"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
-msgstr "照準線�色"
+msgstr "�字カーソル�色"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "照準線�色 (R,G,B)。"
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"�字カーソル�色（R,G,B）。\n"
+"オブジェクト�字カーソル�色も制御"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2885,14 +2840,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "オプション�丘�湖�場所�地形を定義���。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"テクス�ャ�サンプリング手順を定義���。\n"
-"値�大�����法線マップ�滑ら���り��。"
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "基準地上レベルを定義���。"
 
@@ -2934,7 +2881,7 @@ msgstr "ツール�ップを表示�る����延�ミリ秒�定��
 
 #: src/settings_translation_file.cpp
 msgid "Deprecated Lua API handling"
-msgstr "廃止予定�Lua API�処�"
+msgstr "�推奨� Lua API �処�"
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find giant caverns."
@@ -2967,6 +2914,10 @@ msgid "Desynchronize block animation"
 msgstr "ブロック�アニメーション���期化"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "掘削キー"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "掘削時パーティクル"
 
@@ -3031,7 +2982,8 @@ msgid "Enable console window"
 msgstr "コンソールウィンドウを有効化"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "新��作��れ�マップ�クリエイティブモードを有効����。"
 
 #: src/settings_translation_file.cpp
@@ -3142,17 +3094,6 @@ msgid "Enables animation of inventory items."
 msgstr "インベントリ�アイテム�アニメーションを有効����。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"テクス�ャ��ンプマッピングを有効����。法線マップ�\n"
-"テクス�ャパック�よ���供�れる����自動生��れる必���り��。\n"
-"シェーダー�有効��る必���り��。"
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "facedir回転メッシュ�キャッシングを有効����。"
 
@@ -3162,22 +3103,6 @@ msgstr "ミニマップを有効��る。"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"法線マップ生�を臨機応変�有効����(エンボス効果)。\n"
-"�ンプマッピング�有効��る必���り��。"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"視差�蔽マッピングを有効����。\n"
-"シェーダー�有効��る必���り��。"
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3198,14 +3123,6 @@ msgstr "エンティティメソッド"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"実験的�オプション��0 より大��数値�設定�る��ブロック間�\n"
-"目�見�るスペース�生�る�能性��り��。"
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3221,8 +3138,8 @@ msgstr ""
 "作���密�浮�大陸層�������。"
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "�ーズメニュー��FPS"
+msgid "FPS when unfocused or paused"
+msgstr "�アクティブ����ーズメニュー表示中�FPS"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3547,10 +3464,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "GUI拡大縮�フィルタ txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "法線マップ�生�"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "グロー�ルコール�ック"
 
@@ -3612,15 +3525,14 @@ msgstr "HUD表示切り替�キー"
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
-"廃止予定�Lua API呼�出��処�:\n"
-"-    legacy: ��振る舞�を模倣�る(試�る) (リリース版�既定値)。\n"
-"-    log: 廃止予定�呼�出�を模倣���ックトレースを記録 (デ�ッグ版�既定"
-"値)。\n"
-"-    error: 廃止予定�呼�出��使用を中止�る (Mod開発者���推奨)。"
+"�推奨� Lua API 呼�出��処�：\n"
+"-    none: �推奨�呼�出�を記録���\n"
+"-    log: �推奨�呼�出���ックトレースを模倣��記録���（既定値）。\n"
+"-    error: �推奨�呼�出��使用を中止���（Mod開発者�推奨）。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4142,6 +4054,10 @@ msgid "Joystick button repetition interval"
 msgstr "ジョイスティックボタン�繰り返�間隔"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr "ジョイスティック�デッドゾーン"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "ジョイスティック視��感度"
 
@@ -4245,6 +4161,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"掘削�るキー��。\n"
+"�照 http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4387,6 +4313,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"設置�るキー��。\n"
+"�照 http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -5129,10 +5065,6 @@ msgid "Main menu script"
 msgstr "メインメニュースクリプト"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "メインメニュー�スタイル"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr "霧�空�色を日中(夜明�/日没)�視線方���存����。"
@@ -5146,6 +5078,14 @@ msgid "Makes all liquids opaque"
 msgstr "����液体を��明��る"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr "ディスクストレージ�マップ圧縮レベル"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr "�ットワーク転�����マップ圧縮レベル"
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "マップディレクトリ"
 
@@ -5328,8 +5268,10 @@ msgid "Maximum FPS"
 msgstr "最大FPS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "�ーズメニュー��最大FPS。"
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr ""
+"ウィンドウ�フォーカス��������������ーズメニュー表示中�最大"
+"FPS。"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -5384,6 +5326,16 @@ msgstr ""
 "��制��プレイヤー����用�れ��。"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+"�時ダウンロード�最大数��。��制�を超�るダウンロード�キュー�入れられ"
+"��。\n"
+"�れ� curl_parallel_limit よりも低�値���れ��り��ん。"
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "強制読�込�マップブロック�最大数。"
 
@@ -5634,14 +5586,6 @@ msgid "Noises"
 msgstr "ノイズ"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "法線マップ�サンプリング"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "法線マップ�強�"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "出��るスレッド数"
 
@@ -5681,10 +5625,6 @@ msgstr ""
 "トレードオフ�� (経験則����4096 = 100MB)。"
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "視差�蔽�復�回数��。"
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "オンラインコンテンツリ�ジトリ"
 
@@ -5712,34 +5652,6 @@ msgstr ""
 "フォームスペック�開�れ��る����ーズメニューを開���ん。"
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "視差�蔽効果�全体的�イアス�通常 スケール/2 ��。"
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "視差�蔽効果�全体的�スケール��。"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "視差�蔽"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "視差�蔽�イアス"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "視差�蔽�復"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "視差�蔽モード"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "視差�蔽スケール"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5830,6 +5742,14 @@ msgid "Pitch move mode"
 msgstr "ピッ�移動モード"
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr "設置キー"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr "設置�繰り返�間隔"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -6013,10 +5933,6 @@ msgid "Right key"
 msgstr "�キー"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "�クリック繰り返��間隔"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "河��深�"
 
@@ -6307,7 +6223,20 @@ msgstr "デ�ッグ情報を表示"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
-msgstr "エンティティ��択ボックスを表示"
+msgstr "エンティティ��択ボックス表示"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"エンティティ��択ボックスを表示\n"
+"変更後��起動�必���。"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "既定�太字�フォント"
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
@@ -6461,10 +6390,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "3Dモード視差�強���。"
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "生��れ�法線マップ�強���。"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6584,6 +6509,10 @@ msgid "The URL for the content repository"
 msgstr "コンテンツリ�ジトリ�URL"
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr "ジョイスティック�デッドゾーン"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6657,15 +6586,15 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "Irrlicht�レンダリング�ックエンド。\n"
 "変更後��起動�必���。\n"
-"メモ: Android����明�場�� OGLES1 を使用������� \n"
-"�れ以外�場�アプリ�起動�失敗�る����り��。\n"
-"他�プラットフォーム���OpenGL �推奨�れ��り��在�れ�\n"
-"シェーダーをサ�ート�る唯一�ドライ���。"
+"注�：Android �場��よ���ら��場�� OGLES1 を使用�������\n"
+"������アプリ�起動�失敗�る����り��。\n"
+"��他�プラットフォーム���OpenGL �推奨�れ����。\n"
+"シェーダー� OpenGL（デスクトップ��）� OGLES2（実験的）�サ�ート"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6695,6 +6624,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+"ABM ��ステップ�実行��る時間予算\n"
+"（ABM間隔�一部���）"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6703,10 +6640,9 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
-msgstr "マウス��ボタンを押�����クリックを繰り返�秒���間隔。"
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
+msgstr "設置ボタンを押����ノード�設置を繰り返�秒���間隔。"
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
@@ -6861,6 +6797,25 @@ msgstr ""
 "ガンマ補正縮��サ�ート�れ����ん。"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+"マル�サンプルアン�エイリアス（MSAA）を使用���ブロックエッジを滑ら���"
+"��。\n"
+"��アルゴリズム��画�を鮮明�����ら3Dビュー�ートを滑ら�����。\n"
+"�����れ�テクス�ャ�内部��影響���ん\n"
+"（�れ���明�テクス�ャ�特�目立���）。\n"
+"シェーダーを無効��る��ノード間��視スペース�表示�れ��。\n"
+"0 �設定�る��MSAA�無効��り��。\n"
+"��オプションを変更��場���起動�必���。"
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "テクス�ャを拡大縮��る場��トライリニアフィルタリングを使用���。"
 
@@ -7096,6 +7051,12 @@ msgstr ""
 "�。"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 "ノード�テクス�ャ�アニメーションをマップブロック�����期�\n"
@@ -7107,7 +7068,7 @@ msgid ""
 "Deprecated, use the setting player_transfer_distance instead."
 msgstr ""
 "プレイヤー�範囲制����クライアント�表示�れる������。\n"
-"廃止予定�代�り�設定 player_transfer_distance を使用������。"
+"�推奨。代�り�設定 player_transfer_distance を使用������。"
 
 #: src/settings_translation_file.cpp
 msgid "Whether to allow players to damage and kill each other."
@@ -7250,6 +7211,34 @@ msgid "Y-level of seabed."
 msgstr "海底�Yレベル。"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"マップブロックをディスク��存�る���使用�る ZLib圧縮レベル。\n"
+"-1 - Zlib ��定�圧縮レベル\n"
+"0 - 圧縮���最速\n"
+"9 - 最高�圧縮�最も��\n"
+"（レベル 1〜3 �Zlib�「高速�方�を使用��4〜9 �通常方�を使用）"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"マップブロックをクライアント��信�る���使用�る ZLib圧縮レベル。\n"
+"-1 - Zlib ��定�圧縮レベル\n"
+"0 - 圧縮���最速\n"
+"9 - 最高�圧縮�最も��\n"
+"（レベル 1〜3 �Zlib�「高速�方�を使用��4〜9 �通常方�を使用）"
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURLファイルダウンロードタイムアウト"
 
@@ -7261,23 +7250,12 @@ msgstr "cURL並行処�制�"
 msgid "cURL timeout"
 msgstr "cURLタイムアウト"
 
-#~ msgid "Ok"
-#~ msgstr "決定"
-
-#~ msgid "Back"
-#~ msgstr "戻る"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "$1をインストール�������待�����..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "ディスク上�出��るキュー�制�"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "視差�蔽強度"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "スクリーンショットを�存�るパス。"
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = 斜�情報付��視差�蔽マッピング(高速)。\n"
+#~ "1 = リリーフマッピング(正確��低速)。"
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7290,10 +7268,42 @@ msgstr "cURLタイムアウト"
 #~ msgid "Alters how mountain-type floatlands taper above and below midpoint."
 #~ msgstr "山型浮�大陸�中間点�上下���よ��先細��る�を変更���。"
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "シングルプレイヤー�ワールドをリセット��よ������？"
+
+#~ msgid "Back"
+#~ msgstr "戻る"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "�ンプマッピング"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "�ンプマッピング"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "光度曲線ミッドブースト�中心。"
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "メインメニューUIを変更:\n"
+#~ "-   Full:  複数�シングルプレイヤー�ワールド�ゲーム��択�\n"
+#~ "テクス�ャパック��択���他。\n"
+#~ "-   Simple: 1��シングルプレイヤー�ワールド�ゲームや\n"
+#~ "テクス�ャパック��択��り��ん。���画��必��も�れ��ん。"
+
+#~ msgid "Config mods"
+#~ msgstr "Mod設定"
+
+#~ msgid "Configure"
+#~ msgstr "設定"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7303,6 +7313,9 @@ msgstr "cURLタイムアウト"
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "トン�ル�幅を制御����方�値��広�トン�ルを生����。"
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "照準線�色 (R,G,B)。"
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "暗��鋭�"
 
@@ -7314,6 +7327,13 @@ msgstr "cURLタイムアウト"
 #~ "ノイズ� 0 より大�����滑ら��浮�大陸��り��。"
 
 #~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "テクス�ャ�サンプリング手順を定義���。\n"
+#~ "値�大�����法線マップ�滑ら���り��。"
+
+#~ msgid ""
 #~ "Deprecated, define and locate cave liquids using biome definitions "
 #~ "instead.\n"
 #~ "Y of upper limit of lava in large caves."
@@ -7322,12 +7342,49 @@ msgstr "cURLタイムアウト"
 #~ "�。\n"
 #~ "大��洞窟内�溶岩�Y高�上�。"
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "$1をインストール�������待�����..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "VBOを有効化"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "テクス�ャ��ンプマッピングを有効����。法線マップ�\n"
+#~ "テクス�ャパック�よ���供�れる����自動生��れる必���り��。\n"
+#~ "シェーダー�有効��る必���り��。"
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "フィルム調トーンマッピング有効��る"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "法線マップ生�を臨機応変�有効����(エンボス効果)。\n"
+#~ "�ンプマッピング�有効��る必���り��。"
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "視差�蔽マッピングを有効����。\n"
+#~ "シェーダー�有効��る必���り��。"
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "実験的�オプション��0 より大��数値�設定�る��ブロック間�\n"
+#~ "目�見�るスペース�生�る�能性��り��。"
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "�ーズメニュー��FPS"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "浮�大陸�基準高�ノイズ"
 
@@ -7340,6 +7397,12 @@ msgstr "cURLタイムアウト"
 #~ msgid "Gamma"
 #~ msgstr "ガンマ"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "法線マップ�生�"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "法線マップ�生�"
+
 #~ msgid "IPv6 support."
 #~ msgstr "IPv6 サ�ート。"
 
@@ -7349,18 +7412,105 @@ msgstr "cURLタイムアウト"
 #~ msgid "Lightness sharpness"
 #~ msgstr "明る��鋭�"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "ディスク上�出��るキュー�制�"
+
+#~ msgid "Main"
+#~ msgstr "メイン"
+
+#~ msgid "Main menu style"
+#~ msgstr "メインメニュー�スタイル"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "ミニマップ レーダーモード�ズーム x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "ミニマップ レーダーモード�ズーム x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "ミニマップ 表�モード�ズーム x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "ミニマップ 表�モード�ズーム x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "�� / パスワード"
+
+#~ msgid "No"
+#~ msgstr "���"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "法線マップ�サンプリング"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "法線マップ�強�"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "視差�蔽�復�回数��。"
+
+#~ msgid "Ok"
+#~ msgstr "決定"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "視差�蔽効果�全体的�イアス�通常 スケール/2 ��。"
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "視差�蔽効果�全体的�スケール��。"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "視差�蔽"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "視差�蔽"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "視差�蔽�イアス"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "視差�蔽�復"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "視差�蔽モード"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "視差�蔽スケール"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "視差�蔽強度"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "TrueTypeフォント���ビットマップ��パス。"
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "スクリーンショットを�存�るパス。"
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "�出�るダンジョン"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "ワールドをリセット"
+
+#~ msgid "Select Package File:"
+#~ msgstr "パッケージファイルを�択:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "影�制�"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "シングルプレイスタート"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "生��れ�法線マップ�強���。"
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "光度曲線ミッドブースト�強�。"
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "��フォント�特定�言語�使用�れ��。"
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "映画風モード切替"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr "浮�大陸�山�中間点�上�下�典型的�最大高�。"
@@ -7368,26 +7518,26 @@ msgstr "cURLタイムアウト"
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr "浮�大陸�滑ら��地形���る丘�高��湖�深��変動。"
 
-#~ msgid "Waving water"
-#~ msgstr "�れる水"
-
-#~ msgid "Y-level of floatland midpoint and lake surface."
-#~ msgstr "浮�大陸�中間点�湖��Yレベル。"
+#~ msgid "View"
+#~ msgstr "見る"
 
-#~ msgid "Y-level to which floatland shadows extend."
-#~ msgstr "浮�大陸�影�広�るYレベル。"
+#~ msgid "Waving Water"
+#~ msgstr "�れる水"
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "�出�るダンジョン"
+#~ msgid "Waving water"
+#~ msgstr "�れる水"
 
 #~ msgid "Whether dungeons occasionally project from the terrain."
 #~ msgstr "ダンジョン�時折地形�ら�出�る����。"
 
-#~ msgid "Waving Water"
-#~ msgstr "�れる水"
-
 #~ msgid "Y of upper limit of lava in large caves."
 #~ msgstr "大��洞窟内�溶岩�Y高�上�。"
 
-#~ msgid "Select Package File:"
-#~ msgstr "パッケージファイルを�択:"
+#~ msgid "Y-level of floatland midpoint and lake surface."
+#~ msgstr "浮�大陸�中間点�湖��Yレベル。"
+
+#~ msgid "Y-level to which floatland shadows extend."
+#~ msgstr "浮�大陸�影�広�るYレベル。"
+
+#~ msgid "Yes"
+#~ msgstr "��"
diff --git a/po/jbo/minetest.po b/po/jbo/minetest.po
index 35cb5b401..83ccdb9df 100644
--- a/po/jbo/minetest.po
+++ b/po/jbo/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Lojban (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-03-15 18:36+0000\n"
-"Last-Translator: Robin Townsend <iantownsend@disroot.org>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-13 08:50+0000\n"
+"Last-Translator: Wuzzy <almikes@aol.com>\n"
 "Language-Team: Lojban <https://hosted.weblate.org/projects/minetest/minetest/"
 "jbo/>\n"
 "Language: jbo\n"
@@ -12,11 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.0-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "tolcanci"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr ".i do morsi"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "fitytu'i"
 
 #: builtin/fstk/ui.lua
 #, fuzzy
@@ -41,10 +49,6 @@ msgstr "za'u re'u samjo'e"
 msgid "The server has requested a reconnect:"
 msgstr ".i le samtcise'u cu cpedu pa nu za'u re'u co'a samjo'e"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ".i ca'o samymo'i"
-
 #: builtin/mainmenu/common.lua
 #, fuzzy
 msgid "Protocol version mismatch. "
@@ -60,12 +64,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr ""
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-".i ko troci lo nu za'u re'u samymo'i lo liste be lo'i samse'u .i ko cipcta "
-"lo do te samjo'e"
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr ""
 
@@ -73,7 +71,8 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -81,9 +80,10 @@ msgstr ""
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiKeyChangeMenu.cpp
 #: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
-msgstr "sisti"
+msgstr "fitytoltu'i"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "jai se nitcu"
 
@@ -158,14 +158,54 @@ msgid "enabled"
 msgstr "katci"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr ".i ca'o samymo'i"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "se cmima ro bakfu"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "xruti fi tu'a le ralju liste"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "cfari fa lo nu kelci"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -188,6 +228,16 @@ msgid "Install"
 msgstr "samtcise'a"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "samtcise'a"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "na'e se nitcu"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "se samtcise'a"
@@ -201,9 +251,24 @@ msgid "No results"
 msgstr ".i no da ckaji lo se sisku"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "sisku"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
@@ -219,7 +284,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -252,7 +321,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caves"
-msgstr ""
+msgstr "kevzda"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
@@ -275,7 +344,7 @@ msgstr ".i ko kibycpa pa se kelci la'o zoi. minetest.net .zoi"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
-msgstr ""
+msgstr "kevdi'u"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
@@ -283,11 +352,12 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "lo tumla cu fulta lo tsani"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Floatlands (experimental)"
-msgstr ""
+msgstr "fulta tumla"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -332,7 +402,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "cmana"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
@@ -356,7 +426,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Rivers"
-msgstr ""
+msgstr "rirxe"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
@@ -364,9 +434,8 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Seed"
-msgstr "cunso jai krasi"
+msgstr "cunso namcu"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
@@ -476,11 +545,6 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "lo samtciselse'u"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "ganda"
 
@@ -525,6 +589,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "sisku"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "cuxna fi lu'i le datnyveimei"
 
@@ -641,6 +709,20 @@ msgstr ""
 msgid "Unable to install a modpack as a $1"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ".i ca'o samymo'i"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+".i ko troci lo nu za'u re'u samymo'i lo liste be lo'i samse'u .i ko cipcta "
+"lo do te samjo'e"
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -697,7 +779,14 @@ msgid "Credits"
 msgstr "liste lu'i ro gunka"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "cuxna fi lu'i le datnyveimei"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -717,16 +806,12 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "tcimi'e"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "finti se kelci"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
-msgstr ""
+msgstr "pilno lo selxai"
 
 #: builtin/mainmenu/tab_local.lua
 #, fuzzy
@@ -742,8 +827,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "cmene .i lerpoijaspu"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -754,6 +839,10 @@ msgid "No world created or selected!"
 msgstr ".i do no munje cu cupra ja cu cuxna"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "lo lerpoijaspu"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "co'a kelci"
 
@@ -762,6 +851,11 @@ msgid "Port"
 msgstr "judrnporte"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr ".i ko cuxna fi lu'i le munje"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ".i ko cuxna fi lu'i le munje"
 
@@ -775,25 +869,25 @@ msgstr "co'a kelci"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
-msgstr "judri .i judrnporte"
+msgstr "lo samjudri jo'u judrnporte"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "co'a samjo'e"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "finti se kelci"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "co'u cmima lu'i ro nelci se tcita"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "nelci se tcita"
 
@@ -801,16 +895,16 @@ msgstr "nelci se tcita"
 msgid "Join Game"
 msgstr "co'a kansa fi le ka kelci"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
-msgstr "cmene .i lerpoijaspu"
+msgstr "lo cmene .e lo lerpoijaspu"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ".pin. temci"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -819,9 +913,8 @@ msgid "2x"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "3D Clouds"
-msgstr "le bliku dilnu"
+msgstr "cibyca'u dilnu"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "4x"
@@ -840,10 +933,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ".i xu do djica le nu xruti le do nonselkansa munje"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -851,11 +940,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr "puvyrelyli'iju'e"
 
-#: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Bump Mapping"
-msgstr "lo puvrmipmepi"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -871,31 +955,20 @@ msgid "Fancy Leaves"
 msgstr "lo tolkli pezli"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Mipmap"
 msgstr "lo puvrmipmepi"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Mipmap + Aniso. Filter"
 msgstr "lo puvrmipmepi .e lo puvytolmanfyju'e"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "na go'i"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "No Mipmap"
-msgstr "lo puvrmipmepi"
+msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
@@ -917,22 +990,12 @@ msgid "Opaque Leaves"
 msgstr "lo tolkli pezli"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Opaque Water"
-msgstr "lo tolkli djacu"
-
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
+msgstr "tolkli djacu"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Particles"
-msgstr "lo kantu"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "xruti le nonselkansa munje"
+msgstr "kantu"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
@@ -948,6 +1011,11 @@ msgstr "ti'orkemsamtci"
 
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
+msgid "Shaders (experimental)"
+msgstr "ti'orkemsamtci to na kakne toi"
+
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "Shaders (unavailable)"
 msgstr "ti'orkemsamtci to na kakne toi"
 
@@ -997,22 +1065,6 @@ msgstr ".i ca'o samymo'i lo me la'o gy.node.gy."
 msgid "Waving Plants"
 msgstr "lo melbi pezli"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "go'i"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "ralju"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "co'a nonselkansa kelci"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1186,18 +1238,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1288,16 +1337,6 @@ msgid "Fog enabled"
 msgstr "selpli"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "selpli"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "selpli"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ".i datni le se kelci"
 
@@ -1319,16 +1358,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "selpli"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "katci"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1341,34 +1370,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1414,10 +1415,6 @@ msgid "Resolving address..."
 msgstr ".i ca'o sisku le ka se judri da kau"
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "tolcanci"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ".i ca'o sisti"
 
@@ -1427,7 +1424,7 @@ msgstr "nonselkansa"
 
 #: src/client/game.cpp
 msgid "Sound Volume"
-msgstr ""
+msgstr "ni sance"
 
 #: src/client/game.cpp
 #, fuzzy
@@ -1465,17 +1462,13 @@ msgstr ""
 #: src/client/game.cpp
 #, c-format
 msgid "Volume changed to %d%%"
-msgstr ""
+msgstr ".i fe lo ni sance cu cenba fi li %d ce'i"
 
 #: src/client/game.cpp
 msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr ".i do morsi"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1492,16 +1485,6 @@ msgid "Chat shown"
 msgstr ".i ca viska le tavla .uidje"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr ".i ca mipri le tavla .uidje"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr ".i ca viska le tavla .uidje"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ".i ca mipri le crakemsazycimde"
 
@@ -1590,9 +1573,8 @@ msgid "Insert"
 msgstr ""
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Left"
-msgstr "za'i zu'e muvdu"
+msgstr "zu'e muvdu"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1718,9 +1700,8 @@ msgid "Return"
 msgstr ""
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Right"
-msgstr "za'i ri'u muvdu"
+msgstr "ri'u muvdu"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
@@ -1789,6 +1770,24 @@ msgstr "la'o gy.X Button 2.gy."
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ".i lu'i le re lerpoijaspu na simxu le ka mintu"
@@ -1825,29 +1824,8 @@ msgid "Automatic jumping"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Backward"
-msgstr "za'i ti'a muvdu"
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
+msgstr "ti'a muvdu"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
@@ -1872,21 +1850,19 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Dec. volume"
-msgstr ""
+msgstr "jdikygau lo ni sance"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Drop"
-msgstr "mu'e falcru"
+msgstr "falcru"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Forward"
-msgstr "za'i ca'u muvdu"
+msgstr "ca'u muvdu"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. range"
@@ -1894,7 +1870,7 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. volume"
-msgstr ""
+msgstr "zengau lo ni sance"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inventory"
@@ -1947,30 +1923,11 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Special Inv."
-msgstr "za'i masno cadzu"
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "mu'e co'a jonai mo'u vofli"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle HUD"
 msgstr "mu'e co'a jonai mo'u vofli"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Toggle Killaura"
-msgstr "mu'e co'a jonai mo'u vofli"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle chat log"
 msgstr "mu'e co'a jonai mo'u sutra"
 
@@ -2091,12 +2048,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2125,9 +2076,8 @@ msgid "2D noise that locates the river valleys and channels."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D clouds"
-msgstr "le bliku dilnu"
+msgstr "cibyca'u dilnu"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode"
@@ -2205,6 +2155,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2441,10 +2395,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2515,16 +2465,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2686,6 +2626,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "ranji"
@@ -2743,7 +2687,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2751,7 +2697,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2851,12 +2799,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2928,8 +2870,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Dig key"
+msgstr "za'i ri'u muvdu"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
-msgstr "lo kantu"
+msgstr "kakpa kantu"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2989,7 +2935,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3077,14 +3023,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3094,18 +3032,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3122,12 +3048,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3137,7 +3057,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3441,10 +3361,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3498,8 +3414,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3967,6 +3883,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4048,6 +3968,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4147,6 +4074,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4705,11 +4639,6 @@ msgid "Main menu script"
 msgstr "lo ralju"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "lo ralju"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4723,6 +4652,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4886,7 +4823,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4935,6 +4872,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5044,7 +4988,6 @@ msgid "Minimum texture size"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mipmapping"
 msgstr "lo puvrmipmepi"
 
@@ -5166,14 +5109,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5199,10 +5134,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5228,34 +5159,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5322,6 +5225,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "le nu finti kelci"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5479,10 +5391,6 @@ msgid "Right key"
 msgstr "za'i ri'u muvdu"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5736,6 +5644,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5869,10 +5787,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5966,6 +5880,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6024,8 +5942,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6051,15 +5969,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6196,6 +6119,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6296,9 +6230,8 @@ msgid "Virtual joystick triggers aux button"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Volume"
-msgstr "lo ni sance "
+msgstr "lo ni sance"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6405,6 +6338,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6528,6 +6467,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6539,15 +6496,47 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "je'e"
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr ".i xu do djica le nu xruti le do nonselkansa munje"
 
 #~ msgid "Back"
 #~ msgstr "xruti"
 
+#, fuzzy
+#~ msgid "Bump Mapping"
+#~ msgstr "lo puvrmipmepi"
+
+#~ msgid "Configure"
+#~ msgstr "tcimi'e"
+
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr ".i ca'o kibycpa la'o zoi. $1 .zoi je cu samtcise'a ri .i ko denpa"
 
 #, fuzzy
 #~ msgid "Enable VBO"
 #~ msgstr "selpli"
+
+#~ msgid "Main"
+#~ msgstr "ralju"
+
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "lo ralju"
+
+#~ msgid "Name/Password"
+#~ msgstr "cmene .i lerpoijaspu"
+
+#~ msgid "No"
+#~ msgstr "na go'i"
+
+#~ msgid "Ok"
+#~ msgstr "je'e"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "xruti le nonselkansa munje"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "co'a nonselkansa kelci"
+
+#~ msgid "Yes"
+#~ msgstr "go'i"
diff --git a/po/kk/minetest.po b/po/kk/minetest.po
index 23185bc1b..26fdf44e8 100644
--- a/po/kk/minetest.po
+++ b/po/kk/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kazakh (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-07-06 21:41+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-09-09 01:23+0000\n"
 "Last-Translator: Fontan 030 <pomanfedurin@gmail.com>\n"
 "Language-Team: Kazakh <https://hosted.weblate.org/projects/minetest/minetest/"
 "kk/>\n"
@@ -12,7 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr ""
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr ""
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -38,10 +46,6 @@ msgstr ""
 msgid "The server has requested a reconnect:"
 msgstr ""
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Жүктелуде..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr ""
@@ -55,10 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr ""
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr ""
 
@@ -66,7 +66,8 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -76,7 +77,8 @@ msgstr ""
 msgid "Cancel"
 msgstr "Болдырмау"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
@@ -148,14 +150,53 @@ msgid "enabled"
 msgstr "қо�ылған"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Жүктелуде..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -177,6 +218,15 @@ msgid "Install"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Жою"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Модтар"
@@ -190,9 +240,25 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Іздеу"
+#, fuzzy
+msgid "No updates"
+msgstr "Жаңарту"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -207,7 +273,11 @@ msgid "Update"
 msgstr "Жаңарту"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -458,10 +528,6 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr ""
 
@@ -506,6 +572,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Іздеу"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr ""
 
@@ -620,6 +690,18 @@ msgstr ""
 msgid "Unable to install a modpack as a $1"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Жүктелуде..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -673,7 +755,13 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -693,14 +781,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr ""
 
@@ -717,7 +801,7 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -729,6 +813,11 @@ msgid "No world created or selected!"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Құпи� �өзді өзгерту"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr ""
 
@@ -737,6 +826,10 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ""
 
@@ -752,23 +845,23 @@ msgstr ""
 msgid "Address / Port"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
@@ -776,16 +869,16 @@ msgstr ""
 msgid "Join Game"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -814,20 +907,12 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
+msgstr "Би�ызықты фильтраци�"
 
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
@@ -842,10 +927,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -854,10 +935,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Жоқ"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -875,7 +952,7 @@ msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "None"
-msgstr ""
+msgstr "Жоқ"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
@@ -885,17 +962,9 @@ msgstr ""
 msgid "Opaque Water"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
+msgstr "Бөлшектер"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
@@ -910,6 +979,10 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -923,7 +996,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."
@@ -939,7 +1012,7 @@ msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
-msgstr ""
+msgstr "Үш�ызықты фильтраци�"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
@@ -953,22 +1026,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Иә"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1098,7 +1155,7 @@ msgstr ""
 
 #: src/client/game.cpp
 msgid "Change Password"
-msgstr ""
+msgstr "Құпи� �өзді өзгерту"
 
 #: src/client/game.cpp
 msgid "Cinematic mode disabled"
@@ -1128,18 +1185,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1227,15 +1281,6 @@ msgid "Fog enabled"
 msgstr "Тұман қо�ылды"
 
 #: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Тұман қо�ылды"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1256,15 +1301,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "қо�ылған"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1277,34 +1313,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Миникарта жа�ырылды"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1349,10 +1357,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1405,10 +1409,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1425,16 +1425,6 @@ msgid "Chat shown"
 msgstr "Чат көр�етілді"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Чат жа�ырылды"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Чат көр�етілді"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD жа�ырылды"
 
@@ -1714,6 +1704,24 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Миникарта жа�ырылды"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ""
@@ -1753,26 +1761,6 @@ msgid "Backward"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr ""
 
@@ -1865,26 +1853,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -1994,12 +1966,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2106,6 +2072,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2339,10 +2309,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2413,16 +2379,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2574,6 +2530,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2630,7 +2590,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2638,7 +2600,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2738,12 +2702,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2814,6 +2772,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2874,7 +2836,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2962,14 +2924,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -2979,18 +2933,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3007,12 +2949,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3022,7 +2958,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3324,10 +3260,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3381,8 +3313,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3849,6 +3781,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3929,6 +3865,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4028,6 +3971,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4584,10 +4534,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4601,6 +4547,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4764,7 +4718,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4813,6 +4767,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5042,14 +5003,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5075,10 +5028,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5104,34 +5053,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5197,6 +5118,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5352,10 +5281,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5607,6 +5532,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5736,10 +5671,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5833,6 +5764,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5891,8 +5826,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5918,15 +5853,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6062,6 +6002,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6131,7 +6082,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
-msgstr ""
+msgstr "Видеодрайвер"
 
 #: src/settings_translation_file.cpp
 msgid "View bobbing factor"
@@ -6186,7 +6137,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Walking speed"
-msgstr ""
+msgstr "Жүру жылдамдығы"
 
 #: src/settings_translation_file.cpp
 msgid "Walking, flying and climbing speed in fast mode, in nodes per second."
@@ -6264,6 +6215,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6351,7 +6308,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Y of upper limit of large caves."
-msgstr ""
+msgstr "Үлкен үңгірлердің жоғарғы шегінің Y координаты."
 
 #: src/settings_translation_file.cpp
 msgid "Y-distance over which caverns expand to full size."
@@ -6386,6 +6343,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6396,3 +6371,12 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "cURL timeout"
 msgstr ""
+
+#~ msgid "Main"
+#~ msgstr "Ба�ты мәзір"
+
+#~ msgid "No"
+#~ msgstr "Жоқ"
+
+#~ msgid "Yes"
+#~ msgstr "Иә"
diff --git a/po/kn/minetest.po b/po/kn/minetest.po
index e34131e52..d820e246c 100644
--- a/po/kn/minetest.po
+++ b/po/kn/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kannada (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2019-11-10 15:04+0000\n"
-"Last-Translator: Krock <mk939@ymail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-01-02 07:29+0000\n"
+"Last-Translator: Tejaswi Hegde <tejaswihegde1@gmail.com>\n"
 "Language-Team: Kannada <https://hosted.weblate.org/projects/minetest/"
 "minetest/kn/>\n"
 "Language: kn\n"
@@ -12,21 +12,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 4.4.1-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "ಮತ�ತೆ ಹ�ಟ�ಟ�"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "ನೀನ� ಸತ�ತ�ಹೋದೆ"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "ಸರಿ"
 
 #: builtin/fstk/ui.lua
-#, fuzzy
 msgid "An error occurred in a Lua script:"
-msgstr "ಒಂದ� ಲ�ವಾ ಸ�ಕ�ರಿಪ�ಟ� ನಲ�ಲಿ ತಪ�ಪಾಗಿದೆ, ಉದಾಹರಣೆ ಮಾಡ��ನಲ�ಲಿ"
+msgstr "ಒಂದ� ಲ�ವಾ ಸ�ಕ�ರಿಪ�ಟ� ನಲ�ಲಿ ತಪ�ಪಾಗಿದೆ:"
 
 #: builtin/fstk/ui.lua
-#, fuzzy
 msgid "An error occurred:"
-msgstr "ಒಂದ� ತಪ�ಪಾಗಿದೆ:"
+msgstr "ದೋಷ ವೊಂದ� ಸಂಭವಿಸಿದೆ:"
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
@@ -40,10 +46,6 @@ msgstr "ಮರ�ಸಂಪರ�ಕಿಸ�"
 msgid "The server has requested a reconnect:"
 msgstr "ಸರ�ವರ� ಮರ�ಸಂಪರ�ಕ ಮಾಡಲ� ಕೇಳಿದೆ:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "ಲೋಡ� ಆಗ�ತ�ತಿದೆ..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "ಪ�ರೋಟೋಕಾಲ� ಆವೃತ�ತಿ ಹೊಂದಿಕೆಯಾಗಿಲ�ಲ. "
@@ -53,17 +55,8 @@ msgid "Server enforces protocol version $1. "
 msgstr "ಸರ�ವರ� ಪ�ರೋಟೋಕಾಲ� ಆವೃತ�ತಿ $1 ಅನ�ನ� ಜಾರಿಗೊಳಿಸ�ತ�ತದೆ. "
 
 #: builtin/mainmenu/common.lua
-#, fuzzy
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr ""
-"ಸರ�ವರ� $1 ಮತ�ತ� $2 ನಡ�ವೆಯ ಪ�ರೋಟೋಕಾಲ� \n"
-"ಅವೃತ�ತಿಗಳನ�ನ� ಬೆಂಬಲಿಸ�ತ�ತದೆ. "
-
-#: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"ಪಬ�ಲಿಕ� ಸರ�ವರ�ಲಿಸ�ಟ�ಅನ�ನ� ರಿಎನೆಬಲ� ಮಾಡಿ ಮತ�ತ� ಅಂತರ�ಜಾಲ ಸಂಪರ�ಕ \n"
-"ಪರಿಶೀಲಿಸಿ."
+msgstr "ಸರ�ವರ� $1 ಮತ�ತ� $2 ನಡ�ವೆಯ ಪ�ರೋಟೋಕಾಲ� ಅವೃತ�ತಿಗಳನ�ನ� ಬೆಂಬಲಿಸ�ತ�ತದೆ. "
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
@@ -73,7 +66,8 @@ msgstr "ನಾವ� $ 1 ಪ�ರೋಟೋಕಾಲ� ಆವೃತ�ತಿಯ
 msgid "We support protocol versions between version $1 and $2."
 msgstr "ಆವೃತ�ತಿ $1 ಮತ�ತ� $2 ನಡ�ವಿನ ಪ�ರೋಟೋಕಾಲ� ಆವೃತ�ತಿಯನ�ನ� ನಾವ� ಬೆಂಬಲಿಸ�ತ�ತೇವೆ."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -83,7 +77,8 @@ msgstr "ಆವೃತ�ತಿ $1 ಮತ�ತ� $2 ನಡ�ವಿನ ಪ�ರ
 msgid "Cancel"
 msgstr "ರದ�ದ�ಮಾಡಿ"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "ಅವಲಂಬನೆಗಳ�:"
 
@@ -93,7 +88,7 @@ msgstr "ಎಲà³�ಲವನà³�ನೂ ನಿಷà³�ಕà³�ರಿಯೆಗೊಳà²
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr ""
+msgstr "ಮಾಡ� ಪ�ಯಾಕ� ನಿಷ�ಕ�ರಿಯಗೊಳಿಸಿ"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -101,47 +96,43 @@ msgstr "ಎಲ�ಲವನ�ನೂ ಸಕ�ರಿಯಗೊಳಿಸಿ"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr ""
+msgstr "ಮಾಡ� ಪ�ಯಾಕ� ಕ�ರಿಯಾತ�ಮಕಗೊಳಿಸಿ"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "characters [a-z0-9_] are allowed."
 msgstr ""
-"\"$1\" ಮಾಡ� ಅನ�ನ� ಸಕ�ರಿಯಗೊಳಿಸಲಾಗಿಲ�ಲ �ಕೆಂದರೆ ಅದ� ಅನ�ಮತಿಸದ ಅಕ�ಷರಗಳನ�ನ� ಒಳಗೊಂಡಿದೆ. "
-"ಮಾತ�ರ chararacters [a-z0-9_] ಅನ�ಮತಿಸಲಾಗಿದೆ."
+"ಅನ�ಮತಿಸದೇ ಇರ�ವ ಅಕ�ಷರಗಳನ�ನ� ಹೊಂದಿರ�ವ �ದರಿಂದ mod \"$1\" ಅನ�ನ� ಕ�ರಿಯಾತ�ಮಕಗೊಳಿಸಲ� "
+"ವಿಫಲವಾಗಿದೆ. ಕೇವಲ ಅಕ�ಷರಗಳನ�ನ� [a-z0-9_] ಗೆ ಮಾತ�ರ ಅನ�ಮತಿಸಲಾಗ�ತ�ತದೆ."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "ಇನ�ನಷ�ಟ� ಮಾಡ� ಗಳನ�ನ� ಹ�ಡ�ಕಿ"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
 msgstr "ಮಾಡ�:"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No (optional) dependencies"
-msgstr "�ಚ�ಛಿಕ ಅವಲಂಬನೆಗಳ�:"
+msgstr "(�ಚ�ಛಿಕ) ಅವಲಂಬನೆಗಳ� ಇಲ�ಲ"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No game description provided."
 msgstr "ಯಾವ�ದೇ ಆಟದ ವಿವರಣೆ ಒದಗಿಸಿಲ�ಲ."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No hard dependencies"
-msgstr "�ಚ�ಛಿಕ ಅವಲಂಬನೆಗಳ�:"
+msgstr "ಯಾವ�ದೇ ಗಟ�ಟಿ ಅವಲಂಬನೆಗಳಿಲ�ಲ"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
 msgstr "ಯಾವ�ದೇ ಮಾಡ�ಪ�ಯಾಕ� ವಿವರಣೆ ಕೊಟ�ಟಿಲ�ಲ."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No optional dependencies"
-msgstr "�ಚ�ಛಿಕ ಅವಲಂಬನೆಗಳ�:"
+msgstr "ಯಾವ�ದೇ �ಚ�ಛಿಕ ಅವಲಂಬನೆಗಳಿಲ�ಲ"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
@@ -161,21 +152,59 @@ msgid "enabled"
 msgstr "ಸಕ�ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "ಡೌನ� ಲೋಡ� ಆಗ�ತ�ತಿದೆ..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "ಎಲ�ಲಾ ಪ�ಯಾಕೇಜ�ಗಳ�"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "ಮ�ಖ�ಯ ಮೆನ�ಗೆ ಹಿಂತಿರ�ಗಿ"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgid "Base Game:"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
+msgid "ContentDB is not available when Minetest was compiled without cURL"
+msgstr "cURL ಇಲ�ಲದೆ ಮೈನ� ಟೆಸ�ಟ� ಅನ�ನ� ಕಂಪೈಲ� ಮಾಡಿದಾಗ ContentDB ಲಭ�ಯವಿಲ�ಲ"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Downloading..."
-msgstr "ಲೋಡ� ಆಗ�ತ�ತಿದೆ..."
+msgstr "ಡೌನ� ಲೋಡ� ಆಗ�ತ�ತಿದೆ..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
@@ -191,22 +220,48 @@ msgid "Install"
 msgstr "ಇನ�ಸ�ಟಾಲ�"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "ಇನ�ಸ�ಟಾಲ�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "�ಚ�ಛಿಕ ಅವಲಂಬನೆಗಳ�:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "ಮಾಡ��ಗಳ�"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No packages could be retrieved"
-msgstr ""
+msgstr "ಯಾವ�ದೇ ಪ�ಯಾಕೇಜ� ಗಳನ�ನ� ಪಡೆಯಲಾಗಲಿಲ�ಲ"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No results"
 msgstr "ಫಲಿತಾಂಶಗಳಿಲ�ಲ"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "ಹ�ಡ�ಕ�"
+#, fuzzy
+msgid "No updates"
+msgstr "ನವೀಕರಿಸಿ"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -221,16 +276,20 @@ msgid "Update"
 msgstr "ನವೀಕರಿಸಿ"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr ""
+msgstr "\"$1\" ಹೆಸರಿನ ಒಂದ� ಪ�ರಪಂಚವ� ಈಗಾಗಲೇ ಇದೆ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "ಹೆಚ�ಚ�ವರಿ ಭೂಪ�ರದೇಶ"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
@@ -241,133 +300,149 @@ msgid "Altitude dry"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Biome blending"
-msgstr ""
+msgstr "ಪ�ರದೇಶ ಮಿಶ�ರಣ"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Biomes"
-msgstr ""
+msgstr "ಪ�ರದೇಶಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Caverns"
-msgstr ""
+msgstr "ಗ�ಹೆಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Caves"
-msgstr ""
+msgstr "ಗ�ಹೆಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Create"
-msgstr ""
+msgstr "ರಚಿಸ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Decorations"
-msgstr ""
+msgstr "ಅಲಂಕಾರಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
-msgstr ""
+msgstr "minetest.net ನಿಂದ ಮೈನ�ಟೆಸ�ಟ� ಗೇಮ� ನಂತಹ ಆಟವನ�ನ� ಡೌನ� ಲೋಡ� ಮಾಡಿ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr ""
+msgstr "minetest.net ಇಂದ ಒಂದನ�ನ� ಡೌನ� ಲೋಡ� ಮಾಡಿ"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Dungeons"
-msgstr ""
+msgstr "ಡಂಗೆನ�ಸ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "ಸಮತಟ�ಟಾದ ಭೂಪ�ರದೇಶ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "ಆಕಾಶದಲ�ಲಿ ತೇಲ�ತ�ತಿರ�ವ ಭೂಭಾಗಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Floatlands (experimental)"
-msgstr ""
+msgstr "ತೇಲ�ವ ಭೂಮಿಗಳ� (ಪ�ರಾಯೋಗಿಕ)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
-msgstr ""
+msgstr "ಆಟ"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "ಫ�ರಾಕ�ಟಲ� ಅಲ�ಲದ ಭೂಪ�ರದೇಶ ಸೃಷ�ಟಿಸಿ: ಸಾಗರಗಳ� ಮತ�ತ� ಭೂಗರ�ಭ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "ಬೆಟ�ಟಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Humid rivers"
-msgstr ""
+msgstr "ಆರ�ದ�ರ ನದಿಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "ನದಿಗಳ ಸ�ತ�ತ ತೇವಾಂಶ ವನ�ನ� ಹೆಚ�ಚಿಸ�ತ�ತದೆ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "ಕೆರೆ"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "ಕಡಿಮೆ ಆರ�ದ�ರತೆ ಮತ�ತ� ಅಧಿಕ ಶಾಖವ� ಆಳವಿಲ�ಲದ ಅಥವಾ ಶ�ಷ�ಕ ನದಿಗಳನ�ನ� ಉಂಟ�ಮಾಡ�ತ�ತದೆ"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen"
-msgstr ""
+msgstr "ಮ�ಯಾಪ�ಜೆನ�"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
+#, fuzzy
 msgid "Mapgen flags"
-msgstr ""
+msgstr "ಮ�ಯಾಪ�ಜೆನ� ಧ�ವಜಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Mapgen-specific flags"
-msgstr ""
+msgstr "ಮ�ಯಾಪ�ಜೆನ�-ನಿರ�ದಿಷ�ಟ ಧ�ವಜಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "ಪರ�ವತಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Mud flow"
-msgstr ""
+msgstr "ಮಣ�ಣಿನ ಹರಿವ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "ಸ�ರಂಗಗಳ� ಮತ�ತ� ಗ�ಹೆಗಳ ಜಾಲ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
-msgstr ""
+msgstr "ಯಾವ�ದೇ ಆಟ ಆಯ�ಕೆಯಾಗಿಲ�ಲ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "ಎತ�ತರದಲ�ಲಿ ಶಾಖವನ�ನ� ಕಡಿಮೆ ಮಾಡ�ತ�ತದೆ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "ಎತ�ತರದಲ�ಲಿ ತೇವಾಂಶವನ�ನ� ಕಡಿಮೆ ಮಾಡ�ತ�ತದೆ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Rivers"
-msgstr ""
+msgstr "ನದಿಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "ಸಮ�ದ�ರ ಮಟ�ಟದಲ�ಲಿರ�ವ ನದಿಗಳ�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
+#, fuzzy
 msgid "Seed"
-msgstr ""
+msgstr "ಬೀಜ"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "ಪ�ರದೇಶಗಳ ನಡ�ವೆ ಸ�ಗಮವಾದ ಸ�ಥಿತ�ಯಂತರ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
@@ -472,10 +547,6 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr ""
 
@@ -520,6 +591,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "ಹ�ಡ�ಕ�"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr ""
 
@@ -634,6 +709,18 @@ msgstr ""
 msgid "Unable to install a modpack as a $1"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "ಲೋಡ� ಆಗ�ತ�ತಿದೆ..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "ಪಬ�ಲಿಕ� ಸರ�ವರ�ಲಿಸ�ಟ�ಅನ�ನ� ರಿಎನೆಬಲ� ಮಾಡಿ ಮತ�ತ� ಅಂತರ�ಜಾಲ ಸಂಪರ�ಕ ಪರಿಶೀಲಿಸಿ."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -687,7 +774,13 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -707,14 +800,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr ""
 
@@ -731,7 +820,7 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -743,6 +832,10 @@ msgid "No world created or selected!"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr ""
 
@@ -751,6 +844,10 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ""
 
@@ -766,23 +863,23 @@ msgstr ""
 msgid "Address / Port"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
@@ -790,16 +887,16 @@ msgstr ""
 msgid "Join Game"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -828,10 +925,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -839,10 +932,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -856,10 +945,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -868,10 +953,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -899,19 +980,11 @@ msgstr ""
 msgid "Opaque Water"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr ""
 
@@ -924,6 +997,11 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "ತೇಲ�ವ ಭೂಮಿಗಳ� (ಪ�ರಾಯೋಗಿಕ)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -967,22 +1045,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1142,18 +1204,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1241,15 +1300,6 @@ msgid "Fog enabled"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "ಸಕ�ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1270,15 +1320,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "ಸಕ�ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1291,34 +1332,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1363,10 +1376,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "ಮತ�ತೆ ಹ�ಟ�ಟ�"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1419,10 +1428,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "ನೀನ� ಸತ�ತ�ಹೋದೆ"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1439,14 +1444,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1726,6 +1723,24 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ""
@@ -1765,26 +1780,6 @@ msgid "Backward"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr ""
 
@@ -1877,26 +1872,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -2006,12 +1985,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2118,6 +2091,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2351,10 +2328,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2425,16 +2398,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2586,6 +2549,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2642,7 +2609,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2650,7 +2619,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2750,12 +2721,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2826,6 +2791,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2886,7 +2855,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2974,14 +2943,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -2991,18 +2952,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3019,12 +2968,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3034,7 +2977,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3336,10 +3279,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3393,8 +3332,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3861,6 +3800,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3941,6 +3884,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4040,6 +3990,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4596,10 +4553,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4613,6 +4566,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4776,7 +4737,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4825,6 +4786,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5054,14 +5022,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5087,10 +5047,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5116,34 +5072,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5209,6 +5137,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5364,10 +5300,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5619,6 +5551,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5748,10 +5690,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5845,6 +5783,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5903,8 +5845,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5930,15 +5872,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6074,6 +6021,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6276,6 +6234,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6398,6 +6362,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6409,11 +6391,15 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "ಸರಿ"
-
 #~ msgid "Back"
 #~ msgstr "ಹಿಂದೆ"
 
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr "$1 ಡೌನ�ಲೋಡ� ಮತ�ತ� ಇನ�ಸ�ಟಾಲ� ಮಾಡಲಾಗ�ತ�ತಿದೆ, ದಯವಿಟ�ಟ� ನಿರೀಕ�ಷಿಸಿ..."
+
+#~ msgid "Ok"
+#~ msgstr "ಸರಿ"
+
+#, fuzzy
+#~ msgid "View"
+#~ msgstr "ತೋರಿಸ�"
diff --git a/po/ko/minetest.po b/po/ko/minetest.po
index 7e9dcfaca..d08dc7d72 100644
--- a/po/ko/minetest.po
+++ b/po/ko/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Korean (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-12-05 15:29+0000\n"
+"Last-Translator: HunSeongPark <gnstjd980831@naver.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/minetest/minetest/"
 "ko/>\n"
 "Language: ko\n"
@@ -12,19 +12,25 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.9-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "리스�"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "사�했습니다"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "확�"
 
 #: builtin/fstk/ui.lua
-#, fuzzy
 msgid "An error occurred in a Lua script:"
-msgstr "Lua 스�립트�서 오류가 발�했습니다. 해당 모드:"
+msgstr "Lua 스�립트�서 오류가 발�했습니다:"
 
 #: builtin/fstk/ui.lua
-#, fuzzy
 msgid "An error occurred:"
 msgstr "오류가 발�했습니다:"
 
@@ -40,10 +46,6 @@ msgstr "재접�"
 msgid "The server has requested a reconnect:"
 msgstr "서버� 재접� 하세요:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "불러오는 중..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "프로토콜 버전� 알맞지 않습니다. "
@@ -57,10 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "서버가 프로토콜 버전 $1와(과) $2 � 가지를 제공합니다. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "�터넷 연결� 확�한 후 서버 목�� 새로 고�보세요."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "프로토콜 버전 $1만 제공합니다."
 
@@ -68,7 +66,8 @@ msgstr "프로토콜 버전 $1만 제공합니다."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "프로토콜 버전 $1와(과) $2 사�� 버전� 제공합니다."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,73 +77,66 @@ msgstr "프로토콜 버전 $1와(과) $2 사�� 버전� 제공합니다."
 msgid "Cancel"
 msgstr "취소"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
-msgstr "필수�� 모드:"
+msgstr "�존:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
-msgstr "모� 비활성화"
+msgstr "모� 사용안함"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Disable modpack"
-msgstr "비활성화�"
+msgstr "모드 팩 비활성화"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
 msgstr "모� 활성화"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Enable modpack"
-msgstr "모드 팩 �름 바꾸기:"
+msgstr "모드 팩 활성화"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "characters [a-z0-9_] are allowed."
 msgstr ""
-"\"$1\"�(는) 사용할 수 없는 문��기� 모드를 활성화하지 못 했습니다. �름�"
-"는 [a-z0-9_]만 사용할 수 있습니다."
+"\"$1\"�(는) 사용할 수 없는 문��기� 모드를 활성화하지 못했습니다. �름�"
+"는 [a-z,0-9,_]만 사용할 수 있습니다."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "� 많� 모드 찾기"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
 msgstr "모드:"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No (optional) dependencies"
-msgstr "선��� 모드:"
+msgstr "종�성 없� (옵션)"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No game description provided."
-msgstr "모드 설명� 없습니다"
+msgstr "게임 설명� 제공�지 않았습니다."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No hard dependencies"
-msgstr "요구사항 없�."
+msgstr "요구사항 없�"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No modpack description provided."
-msgstr "모드 설명� 없습니다"
+msgstr "모드 설명� 제공�지 않았습니다."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No optional dependencies"
-msgstr "선��� 모드:"
+msgstr "선��지 않� 종�성"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
-msgstr "선��� 모드:"
+msgstr "종�성 선�:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/gui/guiKeyChangeMenu.cpp
@@ -160,27 +152,65 @@ msgid "enabled"
 msgstr "활성화�"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "다운 받는 중..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "모든 패키지"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
+msgid "Already installed"
+msgstr "�미 사용하고 있는 키입니다"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
-msgstr "주 메뉴"
+msgstr "주 메뉴로 �아가기"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "호스트 게임"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "cURL 없� Minetest를 컴파�한 경우 ContentDB를 사용할 수 없습니다"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "불러오는 중..."
+msgstr "다운 받는 중..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Failed to download $1"
-msgstr "$1� $2� 설치하는� 실패했습니다"
+msgstr "$1� 다운로드하는 �� 실패했습니다"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -192,6 +222,16 @@ msgid "Install"
 msgstr "설치"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "설치"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "종�성 선�:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "모드"
@@ -205,100 +245,109 @@ msgid "No results"
 msgstr "결과 없�"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "찾기"
+#, fuzzy
+msgid "No updates"
+msgstr "업��트"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Texture packs"
-msgstr "�스� 팩"
+msgstr "�스처 팩"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Uninstall"
-msgstr "설치"
+msgstr "제거"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Update"
 msgstr "업��트"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr "\"$1\" �름� 세계가 �미 존재합니다"
+msgstr "\"$1\" �름� 세계�(는) �미 존재합니다"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "추가 지형"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr ""
+msgstr "한랭 고�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
-msgstr ""
+msgstr "건조한 고�"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biome blending"
-msgstr "강 소리"
+msgstr "혼합 �물 군계"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biomes"
-msgstr "강 소리"
+msgstr "�물 군계"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caverns"
-msgstr "�굴 잡� #1"
+msgstr "�회�굴"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "�굴 잡� #1"
+msgstr "�굴"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "만들기"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "모드 정보:"
+msgstr "장�"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Download a game, 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"
 msgstr "minetest.net�서 다운로드 하세요"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "강 소리"
+msgstr "�전"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "��한 지형"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floating landmasses in the sky"
-msgstr "Floatland� 산 밀집�"
+msgstr "하늘� 떠있는 광대한 대지"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floatlands (experimental)"
-msgstr "Floatland� 높�"
+msgstr "��한 땅 (실험용)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -306,28 +355,27 @@ msgstr "게임"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "추���지 않� 지형 �성: 바다와 지하"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "언�"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Humid rivers"
-msgstr "비디오 드��버"
+msgstr "습한 강"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "강 주변� 습� �가"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "호수"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "낮� 습�와 높� 열로 �해 얕거나 건조한 강� 발�함"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -335,46 +383,43 @@ msgstr "세계 �성기"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr ""
+msgstr "세계 �성기 신호"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mapgen-specific flags"
-msgstr "Mapgen �름"
+msgstr "세계 �성기-특정 신호"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "ì‚°"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "진� �름"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "터�과 �굴� 네트워�"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "No game selected"
-msgstr "범위 선�"
+msgstr "선�� 게임� 없습니다"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "고�� 따른 열 �소"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "고�� 따른 습� �소"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Rivers"
-msgstr "강 �기"
+msgstr "ê°•"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "해수면 강"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -383,61 +428,58 @@ msgstr "시드"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "�물 군계 간 부드러운 전환"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"지형� 나타나는 구조물 (v6�서 만든 나무와 정글 � 풀�는 �향� 주지 않�)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "지형� 나타나는 구조물(�반�으로 나무와 �물)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "온대, 사막"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "온대, 사막, 정글"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "온대, 사막, 정글, 툰드�(한대), 침엽수 삼림 지대"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Terrain surface erosion"
-msgstr "지형 높�"
+msgstr "침�� 지형"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "나무와 정글 , 풀"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Vary river depth"
-msgstr "강 깊�"
+msgstr "강 깊� 변화"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "지하� � �굴� 깊� 변화"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
-msgstr "경고: 'minimal develop test'는 개발�를 위한 것입니다."
+msgstr "경고: Development Test는 개발�를 위한 모드입니다."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
 msgstr "세계 �름"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "You have no games installed."
-msgstr "서브게임� 설치하지 않았습니다."
+msgstr "게임� 설치�어 있지 않습니다."
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "Are you sure you want to delete \"$1\"?"
@@ -450,14 +492,12 @@ msgid "Delete"
 msgstr "삭제"
 
 #: builtin/mainmenu/dlg_delete_content.lua
-#, fuzzy
 msgid "pkgmgr: failed to delete \"$1\""
-msgstr "Modmgr: \"$1\"�(를) 삭제하지 못했습니다"
+msgstr "pkgmgr: \"$1\"�(를) 삭제하지 못했습니다"
 
 #: builtin/mainmenu/dlg_delete_content.lua
-#, fuzzy
 msgid "pkgmgr: invalid path \"$1\""
-msgstr "Modmgr: \"$1\"�(를) ��할 수 없습니다"
+msgstr "pkgmgr: 잘못� 경로\"$1\""
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
@@ -476,15 +516,16 @@ msgid ""
 "This modpack has an explicit name given in its modpack.conf which will "
 "override any renaming here."
 msgstr ""
+"� 모드팩�는 modpack.conf� 명시�� �름� 부여�어 있으며, �는 여기서 �"
+"름� 바꾸는 것� �용하지 않습니다."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
 msgstr "(설정� 대한 설명� 없습니다)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "2D Noise"
-msgstr "소리"
+msgstr "2차� 소�"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
@@ -495,11 +536,6 @@ msgid "Browse"
 msgstr "열기"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "���언트"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "비활성화�"
 
@@ -512,20 +548,18 @@ msgid "Enabled"
 msgstr "활성화�"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Lacunarity"
-msgstr "보안"
+msgstr "빈약�"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Octaves"
-msgstr ""
+msgstr "옥타브"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
 msgid "Offset"
-msgstr ""
+msgstr "오프셋"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Persistance"
 msgstr "플레�어 전송 거리"
 
@@ -543,17 +577,19 @@ msgstr "기본값 복�"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
 msgid "Scale"
-msgstr ""
+msgstr "스케�"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "찾기"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Select directory"
-msgstr "선�한 모드 파�:"
+msgstr "경로를 선�하세요"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Select file"
-msgstr "선�한 모드 파�:"
+msgstr "파� 선�"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
@@ -569,27 +605,27 @@ msgstr "값� $1� 초과하면 안 �니다."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "X"
-msgstr ""
+msgstr "X"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "X spread"
-msgstr ""
+msgstr "X 분산"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Y spread"
-msgstr ""
+msgstr "Y 분산"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Z"
-msgstr ""
+msgstr "Z"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Z spread"
-msgstr ""
+msgstr "Z 분산"
 
 #. ~ "absvalue" is a noise parameter flag.
 #. It is short for "absolute value".
@@ -597,15 +633,14 @@ msgstr ""
 #. main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "absvalue"
-msgstr ""
+msgstr "절댓값"
 
 #. ~ "defaults" is a noise parameter flag.
 #. It describes the default processing options
 #. for noise settings in main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "defaults"
-msgstr "기본 게임"
+msgstr "기본값"
 
 #. ~ "eased" is a noise parameter flag.
 #. It is used to make the map smoother and
@@ -613,115 +648,110 @@ msgstr "기본 게임"
 #. main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "eased"
-msgstr ""
+msgstr "맵 부드러움"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "$1 (Enabled)"
-msgstr "활성화�"
+msgstr "$1 (활성화�)"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "$1 mods"
-msgstr "3D 모드"
+msgstr "$1 모드"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Failed to install $1 to $2"
 msgstr "$1� $2� 설치하는� 실패했습니다"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Install Mod: Unable to find real mod name for: $1"
 msgstr "모드 설치: $1를(�) 찾� 수 없습니다"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Install Mod: Unable to find suitable folder name for modpack $1"
-msgstr "설치 모드: 모드 팩 $1 (�)� 올바른 ���름� 찾� 수 없습니다"
+msgstr "모드 설치: 모드 팩 $1 (�)� 올바른 ���름� 찾� 수 없습니다"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Install: Unsupported file type \"$1\" or broken archive"
 msgstr ""
-"\n"
-"모드 설치: \"$1\"는(�) 지� �지 않는 파� 형� �거나 깨진 압축 파�입니다"
+"모드 설치: \"$1\"는(�) 지� �지 않는 파� 형� �거나 ��� 압축 파�입니"
+"다"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Install: file: \"$1\""
 msgstr "모드 설치: 파�: \"$1\""
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Unable to find a valid mod or modpack"
 msgstr "설치 모드: 모드 팩 $1 (�)� 올바른 ���름� 찾� 수 없습니다"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Unable to install a $1 as a texture pack"
-msgstr "$1� $2� 설치하는� 실패했습니다"
+msgstr "$1� �스�팩으로 설치할 수 없습니다"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Unable to install a game as a $1"
-msgstr "$1� $2� 설치하는� 실패했습니다"
+msgstr "$1� 설치할 수 없습니다"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Unable to install a mod as a $1"
-msgstr "$1� $2� 설치하는� 실패했습니다"
+msgstr "$1 모드를 설치할 수 없습니다"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Unable to install a modpack as a $1"
-msgstr "$1� $2� 설치하는� 실패했습니다"
+msgstr "$1 모드팩� 설치할 수 없습니다"
+
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "불러오는 중..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "���언트 스�립트가 비활성화�"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "�터넷 연결� 확�한 후 서버 목�� 새로 고�보세요."
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "온�� 컨�츠 검색"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Content"
-msgstr "계�"
+msgstr "컨�츠"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Disable Texture Pack"
-msgstr "선�한 �스� 팩:"
+msgstr "비활성화� �스� 팩"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Information:"
-msgstr "모드 정보:"
+msgstr "ì •ë³´:"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Installed Packages:"
-msgstr "설치한 모드:"
+msgstr "설치� 패키지:"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No dependencies."
 msgstr "요구사항 없�."
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "No package description available"
-msgstr "모드 설명� 없습니다"
+msgstr "사용 가능한 패키지 설명� 없습니다"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Rename"
 msgstr "�름 바꾸기"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Uninstall Package"
-msgstr "선�한 모드 삭제"
+msgstr "패키지 삭제"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Use Texture Pack"
-msgstr "�스� 팩"
+msgstr "�스� 팩 사용"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
@@ -736,7 +766,14 @@ msgid "Credits"
 msgstr "만든�"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "경로를 선�하세요"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -748,43 +785,36 @@ msgid "Previous Core Developers"
 msgstr "�전 코어 개발�들"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Announce Server"
-msgstr "서버 발표"
+msgstr "서버 알리기"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Bind Address"
 msgstr "바�딩 주소"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "환경설정"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "�리��티브 모드"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "�미지 활성화"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Host Game"
-msgstr "게임 호스트하기"
+msgstr "호스트 게임"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Host Server"
-msgstr "서버 호스트하기"
+msgstr "호스트 서버"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "ContentDB�서 게임 설치"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "�름/비밀번호"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -795,6 +825,11 @@ msgid "No world created or selected!"
 msgstr "월드를 만들거나 선�하지 않았습니다!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "새로운 비밀번호"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "게임하기"
 
@@ -803,6 +838,11 @@ msgid "Port"
 msgstr "�트"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "월드 선�:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "월드 선�:"
 
@@ -811,49 +851,47 @@ msgid "Server Port"
 msgstr "서버 �트"
 
 #: builtin/mainmenu/tab_local.lua
-#, fuzzy
 msgid "Start Game"
-msgstr "게임 호스트하기"
+msgstr "게임 시작"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
 msgstr "주소/�트"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "ì—°ê²°"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "�리��티브 모드"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "�미지 활성화"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "�겨찾기 삭제"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "�겨찾기"
 
 #: builtin/mainmenu/tab_online.lua
-#, fuzzy
 msgid "Join Game"
-msgstr "게임 호스트하기"
+msgstr "게임 참가"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "�름/비밀번호"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "í•‘"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP 가능"
 
@@ -874,20 +912,14 @@ msgid "8x"
 msgstr "8 배�"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "All Settings"
-msgstr "설정"
+msgstr "모든 설정"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
 msgstr "매�럽게 표현하기:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "싱글 플레�어 월드를 리셋하겠습니까?"
-
-#: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Autosave Screen Size"
 msgstr "스�린 �기 �� 저장"
 
@@ -895,10 +927,6 @@ msgstr "스�린 �기 �� 저장"
 msgid "Bilinear Filter"
 msgstr "�중 선형 필터"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "범프 매핑"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "키 변경"
@@ -912,11 +940,6 @@ msgid "Fancy Leaves"
 msgstr "아름다운 나뭇잎 효과"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Generate Normal Maps"
-msgstr "Normalmaps �성"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "밉 맵"
 
@@ -925,10 +948,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "밉맵 + Aniso. 필터"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "아니오"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "필터 없�"
 
@@ -956,22 +975,13 @@ msgstr "불투명한 나뭇잎 효과"
 msgid "Opaque Water"
 msgstr "불투명한 물 효과"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "시차 �합"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "입� 효과"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "싱글 플레�어 월드 초기화"
-
-#: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Screen:"
-msgstr "스�린:"
+msgstr "화면:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -982,6 +992,11 @@ msgid "Shaders"
 msgstr "���"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "��한 땅 (실험용)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "��� (사용할 수 없�)"
 
@@ -1006,9 +1021,8 @@ msgid "Tone Mapping"
 msgstr "톤 매핑"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Touchthreshold: (px)"
-msgstr "터치임계값 (픽셀)"
+msgstr "터치 임계값: (픽셀)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
@@ -1019,30 +1033,13 @@ msgid "Waving Leaves"
 msgstr "움��는 나뭇잎 효과"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Liquids"
-msgstr "움��는 Node"
+msgstr "물 등� 물결효과"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Plants"
 msgstr "움��는 �물 효과"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "예"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "모드 설정"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "메�"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "싱글 플레�어 시작"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "연결 시간� 초과했습니다."
@@ -1097,7 +1094,7 @@ msgstr "�름� 선�하세요!"
 
 #: src/client/clientlauncher.cpp
 msgid "Provided password file failed to open: "
-msgstr ""
+msgstr "패스워드 파�� 여는� 실패했습니다: "
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
@@ -1124,9 +1121,8 @@ msgstr ""
 "�세한 내용� debug.txt� 확� 합니다."
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Address: "
-msgstr "바�딩 주소"
+msgstr "- 주소: "
 
 #: src/client/game.cpp
 msgid "- Creative Mode: "
@@ -1145,56 +1141,49 @@ msgid "- Port: "
 msgstr "- �트: "
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Public: "
-msgstr "�반"
+msgstr "- 공개: "
 
 #. ~ PvP = Player versus Player
 #: src/client/game.cpp
 msgid "- PvP: "
-msgstr "- PvP: "
+msgstr "- Player vs Player: "
 
 #: src/client/game.cpp
 msgid "- Server Name: "
 msgstr "- 서버 �름: "
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Automatic forward disabled"
-msgstr "앞으로 가는 키"
+msgstr "�� 전진 비활성화"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Automatic forward enabled"
-msgstr "앞으로 가는 키"
+msgstr "�� 전진 활성화"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Camera update disabled"
-msgstr "카메� 업��트 토글 키"
+msgstr "카메� 업��트 비활성화"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Camera update enabled"
-msgstr "카메� 업��트 토글 키"
+msgstr "카메� 업��트 활성화"
 
 #: src/client/game.cpp
 msgid "Change Password"
 msgstr "비밀번호 변경"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Cinematic mode disabled"
-msgstr "시네마틱 모드 스위치"
+msgstr "시네마틱 모드 비활성화"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Cinematic mode enabled"
-msgstr "시네마틱 모드 스위치"
+msgstr "시네마틱 모드 활성화"
 
 #: src/client/game.cpp
 msgid "Client side scripting is disabled"
-msgstr ""
+msgstr "���언트 스�립트가 비활성화�"
 
 #: src/client/game.cpp
 msgid "Connecting to server..."
@@ -1212,29 +1201,30 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
-msgstr ""
-"기본 컨트롤:-WASD: ��\n"
-"-스페�스: �프/오르기\n"
-"-쉬프트:살금살금/내려가기\n"
-"-Q: 아�템 드롭\n"
-"-I: �벤토리\n"
-"-마우스: �아보기/보기\n"
-"-마우스 왼쪽: 파내기/공격\n"
-"-마우스 오른쪽: 배치/사용\n"
-"-마우스 휠: 아�템 선�\n"
-"-T: 채팅\n"
+msgstr ""
+"ì¡°ìž‘:\n"
+"-%s: 앞으로 ��\n"
+"-%s:뒤로 ��\n"
+"-%s:왼쪽으로 ��\n"
+"-%s:오른쪽으로 ��\n"
+"-%s: �프/오르기\n"
+"-%s:조용히 걷기/내려가기\n"
+"-%s:아�템 버리기\n"
+"-%s:�벤토리\n"
+"-마우스: �기/보기\n"
+"-마우스 왼쪽 �릭: 땅파기/펀치\n"
+"-마우스 오른쪽 �릭: �기/사용하기\n"
+"-마우스 휠:아�템 선�\n"
+"-%s: 채팅\n"
 
 #: src/client/game.cpp
 msgid "Creating client..."
@@ -1246,16 +1236,15 @@ msgstr "서버 만드는 중..."
 
 #: src/client/game.cpp
 msgid "Debug info and profiler graph hidden"
-msgstr ""
+msgstr "디버그 정보 � 프로파�러 그래프 숨기기"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Debug info shown"
-msgstr "디버그 정보 토글 키"
+msgstr "디버그 정보 표시"
 
 #: src/client/game.cpp
 msgid "Debug info, profiler graph, and wireframe hidden"
-msgstr ""
+msgstr "디버그 정보, 프로파�러 그래프 , 선 표현 숨김"
 
 #: src/client/game.cpp
 msgid ""
@@ -1287,11 +1276,11 @@ msgstr ""
 
 #: src/client/game.cpp
 msgid "Disabled unlimited viewing range"
-msgstr ""
+msgstr "제한없는 시야 범위 비활성화"
 
 #: src/client/game.cpp
 msgid "Enabled unlimited viewing range"
-msgstr ""
+msgstr "제한없는 시야 범위 활성화"
 
 #: src/client/game.cpp
 msgid "Exit to Menu"
@@ -1302,52 +1291,36 @@ msgid "Exit to OS"
 msgstr "게임 종료"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Fast mode disabled"
-msgstr "고� 모드 ��"
+msgstr "고� 모드 비활성화"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Fast mode enabled"
-msgstr "고� 모드 ��"
+msgstr "고� 모드 활성화"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr ""
+msgstr "고� 모드 활성화(참고 : '고�'� 대한 권한 없�)"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Fly mode disabled"
-msgstr "고� 모드 ��"
+msgstr "비행 모드 비활성화"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Fly mode enabled"
-msgstr "�미지 활성화"
+msgstr "비행 모드 활성화"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr ""
+msgstr "비행 모드 활성화 (참고 : '비행'� 대한 권한 없�)"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Fog disabled"
-msgstr "비활성화�"
+msgstr "안개 비활성화"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Fog enabled"
-msgstr "활성화�"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "비활성화�"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "활성화�"
+msgstr "안개 활성화"
 
 #: src/client/game.cpp
 msgid "Game info:"
@@ -1358,9 +1331,8 @@ msgid "Game paused"
 msgstr "게임 �시정지"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Hosting server"
-msgstr "서버 만드는 중..."
+msgstr "호스팅 서버"
 
 #: src/client/game.cpp
 msgid "Item definitions..."
@@ -1371,16 +1343,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "비활성화�"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "�미지 활성화"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "미디어..."
 
@@ -1390,49 +1352,19 @@ msgstr "MiB/s"
 
 #: src/client/game.cpp
 msgid "Minimap currently disabled by game or mod"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Minimap hidden"
-msgstr "미니맵 키"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
+msgstr "게임 �는 모드� �해 현재 미니맵 비활성화"
 
 #: src/client/game.cpp
 msgid "Noclip mode disabled"
-msgstr ""
+msgstr "Noclip 모드 비활성화"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Noclip mode enabled"
-msgstr "�미지 활성화"
+msgstr "Noclip 모드 활성화"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled (note: no 'noclip' privilege)"
-msgstr ""
+msgstr "Noclip 모드 활성화 (참고 : 'noclip'� 대한 권한 없�)"
 
 #: src/client/game.cpp
 msgid "Node definitions..."
@@ -1448,30 +1380,25 @@ msgstr "켜기"
 
 #: src/client/game.cpp
 msgid "Pitch move mode disabled"
-msgstr ""
+msgstr "피치 �� 모드 비활성화"
 
 #: src/client/game.cpp
 msgid "Pitch move mode enabled"
-msgstr ""
+msgstr "피치 �� 모드 활성화"
 
 #: src/client/game.cpp
 msgid "Profiler graph shown"
-msgstr ""
+msgstr "프로파�러 그래프 보�기"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Remote server"
-msgstr "�격 �트"
+msgstr "�격 서버"
 
 #: src/client/game.cpp
 msgid "Resolving address..."
 msgstr "주소 분�중..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "리스�"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "서버가 닫혔습니다..."
 
@@ -1484,102 +1411,83 @@ msgid "Sound Volume"
 msgstr "볼륨 조절"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Sound muted"
-msgstr "볼륨 조절"
+msgstr "�소거"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "사운드 시스템 비활성화"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "본 빌드�서 지��지 않는 사운드 시스템"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Sound unmuted"
-msgstr "볼륨 조절"
+msgstr "�소거 해제"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid "Viewing range changed to %d"
-msgstr "시야 범위"
+msgstr "시야 범위 %d로 바꿈"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at maximum: %d"
-msgstr ""
+msgstr "시야 범위 최대치 : %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at minimum: %d"
-msgstr ""
+msgstr "시야 범위 최소치 : %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Volume changed to %d%%"
-msgstr ""
+msgstr "볼륨 %d%%로 바꿈"
 
 #: src/client/game.cpp
 msgid "Wireframe shown"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "You died"
-msgstr "사�했습니다."
+msgstr "선 표면 보�기"
 
 #: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
-msgstr ""
+msgstr "게임 �는 모드� �해 현재 확대 비활성화"
 
 #: src/client/game.cpp
 msgid "ok"
 msgstr "확�"
 
 #: src/client/gameui.cpp
-#, fuzzy
 msgid "Chat hidden"
-msgstr "채팅"
+msgstr "채팅 숨기기"
 
 #: src/client/gameui.cpp
 msgid "Chat shown"
-msgstr ""
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "채팅"
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
+msgstr "채팅 보�기"
 
 #: src/client/gameui.cpp
 msgid "HUD hidden"
-msgstr ""
+msgstr "HUD 숨기기"
 
 #: src/client/gameui.cpp
 msgid "HUD shown"
-msgstr ""
+msgstr "HUD 보�기"
 
 #: src/client/gameui.cpp
-#, fuzzy
 msgid "Profiler hidden"
-msgstr "프로파�러"
+msgstr "프로파�러 숨기기"
 
 #: src/client/gameui.cpp
 #, c-format
 msgid "Profiler shown (page %d of %d)"
-msgstr ""
+msgstr "프로파�러 보�기 (%d중 %d 페�지)"
 
 #: src/client/keycode.cpp
 msgid "Apps"
 msgstr "애플리케�션"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Backspace"
 msgstr "뒤로"
 
@@ -1604,9 +1512,8 @@ msgid "End"
 msgstr "�"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Erase EOF"
-msgstr "OEF를 지우기"
+msgstr "EOF 지우기"
 
 #: src/client/keycode.cpp
 msgid "Execute"
@@ -1630,7 +1537,7 @@ msgstr "IME 변환"
 
 #: src/client/keycode.cpp
 msgid "IME Escape"
-msgstr ""
+msgstr "IME 종료"
 
 #: src/client/keycode.cpp
 msgid "IME Mode Change"
@@ -1650,7 +1557,7 @@ msgstr "왼쪽"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
-msgstr "왼쪽� 버튼"
+msgstr "왼쪽 버튼"
 
 #: src/client/keycode.cpp
 msgid "Left Control"
@@ -1678,7 +1585,6 @@ msgid "Middle Button"
 msgstr "가운� 버튼"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Num Lock"
 msgstr "Num Lock"
 
@@ -1744,20 +1650,19 @@ msgstr "숫� 키패드 9"
 
 #: src/client/keycode.cpp
 msgid "OEM Clear"
-msgstr ""
+msgstr "OEM 초기화"
 
 #: src/client/keycode.cpp
 msgid "Page down"
-msgstr ""
+msgstr "페�지 내리기"
 
 #: src/client/keycode.cpp
 msgid "Page up"
-msgstr ""
+msgstr "페�지 올리기"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Pause"
-msgstr "�시 중지"
+msgstr "�시 정지"
 
 #: src/client/keycode.cpp
 msgid "Play"
@@ -1765,9 +1670,8 @@ msgstr "시작"
 
 #. ~ "Print screen" key
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Print"
-msgstr "�쇄"
+msgstr "출력"
 
 #: src/client/keycode.cpp
 msgid "Return"
@@ -1798,7 +1702,6 @@ msgid "Right Windows"
 msgstr "오른쪽 창"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Scroll Lock"
 msgstr "스�롤 �"
 
@@ -1820,9 +1723,8 @@ msgid "Snapshot"
 msgstr "스냅샷"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Space"
-msgstr "스페�스"
+msgstr "스페�스바"
 
 #: src/client/keycode.cpp
 msgid "Tab"
@@ -1844,13 +1746,32 @@ msgstr "X 버튼 2"
 msgid "Zoom"
 msgstr "확대/축소"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "미니맵 숨김"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "레�� 모드� 미니맵, 1배 확대"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "표면 모드� 미니맵, 1배 확대"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "최소 �스처 �기"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "비밀번호가 맞지 않습니다!"
 
 #: src/gui/guiConfirmRegistration.cpp
 msgid "Register and Join"
-msgstr ""
+msgstr "등�하고 참여"
 
 #: src/gui/guiConfirmRegistration.cpp
 #, c-format
@@ -1861,53 +1782,34 @@ msgid ""
 "Please retype your password and click 'Register and Join' to confirm account "
 "creation, or click 'Cancel' to abort."
 msgstr ""
+"당신� 처� \"%s\"�는 �름으로 � 서버� 참여하려고 합니다. \n"
+"계�한다면, �격� 갖춰진 새 계정� � 서버� �성�니다. \n"
+"비밀번호를 다시 입력하고 '등� 하고 참여'를 누르거나 '취소'를 눌러 중단하십시"
+"오."
 
 #: src/gui/guiFormSpecMenu.cpp
 msgid "Proceed"
 msgstr "계�하기"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "\"Special\" = climb down"
-msgstr "\"Use\" = 내려가기"
+msgstr "\"특별함\" = 아래로 타고 내려가기"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Autoforward"
-msgstr "앞으로"
+msgstr "��전진"
 
 #: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Automatic jumping"
-msgstr ""
+msgstr "�� �프"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Backward"
 msgstr "뒤로"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Change camera"
-msgstr "키 변경"
+msgstr "카메� 변경"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Chat"
@@ -1922,9 +1824,8 @@ msgid "Console"
 msgstr "콘솔"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Dec. range"
-msgstr "시야 범위"
+msgstr "범위 �소"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Dec. volume"
@@ -1943,9 +1844,8 @@ msgid "Forward"
 msgstr "앞으로"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Inc. range"
-msgstr "시야 범위"
+msgstr "범위 �가"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. volume"
@@ -1969,9 +1869,8 @@ msgstr ""
 "Keybindings. (� 메뉴를 고정하려면 minetest.cof�서 stuff를 제거해야합니다.)"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Local command"
-msgstr "채팅 명�어"
+msgstr "지역 명령어"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Mute"
@@ -1999,37 +1898,15 @@ msgstr "살금살금"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Special"
-msgstr ""
+msgstr "특별함"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "살금살금걷기 키"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "시네마틱 스위치"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "시네마틱 스위치"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle HUD"
-msgstr "비행 스위치"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "비행 스위치"
+msgstr "HUD 토글"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle chat log"
-msgstr "고� 스위치"
+msgstr "채팅 기� 토글"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
@@ -2040,23 +1917,20 @@ msgid "Toggle fly"
 msgstr "비행 스위치"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle fog"
-msgstr "비행 스위치"
+msgstr "안개 토글"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle minimap"
-msgstr "�유시� 스위치"
+msgstr "미니맵 토글"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
 msgstr "�유시� 스위치"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle pitchmove"
-msgstr "고� 스위치"
+msgstr "피치 �� 토글"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "press key"
@@ -2083,7 +1957,6 @@ msgid "Exit"
 msgstr "나가기"
 
 #: src/gui/guiVolumeChange.cpp
-#, fuzzy
 msgid "Muted"
 msgstr "�소거"
 
@@ -2109,6 +1982,8 @@ msgid ""
 "(Android) Fixes the position of virtual joystick.\n"
 "If disabled, virtual joystick will center to first-touch's position."
 msgstr ""
+"(Android) 가� 조�스틱� 위치를 수정합니다.\n"
+"비활성화하면, 가� 조�스틱� 첫번째 터치 위치� 중앙� 위치합니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2116,6 +1991,9 @@ msgid ""
 "If enabled, virtual joystick will also tap \"aux\" button when out of main "
 "circle."
 msgstr ""
+"(Android) 가� 조�스틱� 사용하여 \"aux\"버튼� 트리거합니다.\n"
+"활성화 � 경우 가� 조�스틱� 메� 서��서 벗어날 때 \"aux\"버튼� 탭합니"
+"다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2128,6 +2006,15 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X, Y, Z) '스케�' 단위로 세계 중심� 기준으로 프랙탈 오프셋� 정합니다.\n"
+"�하는 지�� (0, 0)으로 ��하여 �합한 스� 지�� 만들거나 \n"
+"'스케�'� 늘려 �하는 지��서 '확대'할 수 있습니다.\n"
+"기본값� 기본 매개 변수가있는 Mandelbrot 세트� �합한 스� 지�� 맞게 조정"
+"�어 있으며 \n"
+"다른 �황�서 변경해야 할 수� 있습니다. \n"
+"범위는 대략 -2 ~ 2입니다. \n"
+"노드� 오프셋� 대해\n"
+"'스케�'� 곱합니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2139,40 +2026,41 @@ msgid ""
 "Default is for a vertically-squashed shape suitable for\n"
 "an island, set all 3 numbers equal for the raw shape."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
+"노드�서 프랙탈� (X, Y, Z) 스케�.\n"
+"실제 프랙탈 �기는 2 ~ 3 배 � �니다.\n"
+"� 숫�는 매우 �게 만들 수 있으며 프랙탈� 세계� 맞지 않아��니다.\n"
+"프랙탈� 세부 사항� '확대'하�� 늘리십시오.\n"
+"기본값� 섬� �합한 수�으로 쪼개진 모양�며 \n"
+"기존 모양� 대해 3 개� 숫�를 \n"
+"모� ��하게 설정합니다."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
-msgstr ""
+msgstr "산� 모양 / �기를 제어하는 2D 노�즈."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of rolling hills."
-msgstr ""
+msgstr "언�� 모양 / �기를 제어하는 2D 노�즈."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of step mountains."
-msgstr ""
+msgstr "계단 형태 산� 모양 / �기를 제어하는 2D 노�즈."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of ridged mountain ranges."
-msgstr ""
+msgstr "능선 산맥� �기 / 발�정�를 제어하는 2D 노�즈."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of rolling hills."
-msgstr ""
+msgstr "언�� �기 / 발�정�를 제어하는 2D 노�즈."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of step mountain ranges."
-msgstr ""
+msgstr "계단 형태� 산맥� �기 / 발�정�를 제어하는 2D 노�즈."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that locates the river valleys and channels."
-msgstr ""
+msgstr "강 계곡과 채�� 위치한 2D 노�즈."
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2183,19 +2071,20 @@ msgid "3D mode"
 msgstr "3D 모드"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D mode parallax strength"
-msgstr "Normalmaps 강�"
+msgstr "3D 모드 시차 강�"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
-msgstr ""
+msgstr "거대한 �굴� 정�하는 3D 노�즈."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "3D noise defining mountain structure and height.\n"
 "Also defines structure of floatland mountain terrain."
 msgstr ""
+"산� 구조와 높�를 정�하는 3D 노�즈.\n"
+"�한 수� 지형 산악 지형� 구조를 정�합니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2204,25 +2093,30 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"플롯랜드� 구조를 정�하는 3D 노�즈.\n"
+"기본값�서 변경하면 노�즈 '스케�'(기본값 0.7)� 필요할 수 있습니다.\n"
+"� 소�� 값 범위가 약 -2.0 ~ 2.0 � 때 플로 트랜드 테���� 가장 잘 작�하"
+"므로 \n"
+"조정해야합니다."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
-msgstr ""
+msgstr "강 협곡 벽� 구조를 정�하는 3D 노�즈."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining terrain."
-msgstr ""
+msgstr "지형� 정�하는 3D 노�즈."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise for mountain overhangs, cliffs, etc. Usually small variations."
 msgstr ""
+"산 �출부, 절벽 등� 대한 3D 노�즈. �반�으로 작� 변화로 나타납니다."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise that determines number of dungeons per mapchunk."
-msgstr ""
+msgstr "맵 당 �전 수를 결정하는 3D 노�즈."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "3D support.\n"
 "Currently supported:\n"
@@ -2261,30 +2155,32 @@ msgid "A message to be displayed to all clients when the server shuts down."
 msgstr "서버가 닫� 때 모든 사용�들�게 표시 � 메시지입니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "ABM interval"
-msgstr "맵 저장 간격"
+msgstr "ABM 간격"
 
 #: src/settings_translation_file.cpp
-msgid "Absolute limit of queued blocks to emerge"
+msgid "ABM time budget"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Absolute limit of queued blocks to emerge"
+msgstr "대기중� 블�� 절대 한계"
+
+#: src/settings_translation_file.cpp
 msgid "Acceleration in air"
 msgstr "공중�서 가�"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration of gravity, in nodes per second per second."
-msgstr ""
+msgstr "중력 가��, 노드는 초당 노드입니다."
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifiers"
 msgstr "블� 수�어 활성"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Active block management interval"
-msgstr "블� 관리 간격 활성"
+msgstr "블� 관리 간격 활성화"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
@@ -2292,7 +2188,7 @@ msgstr "블� 범위 활성"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
-msgstr ""
+msgstr "�체 전달 범위 활성화"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2300,17 +2196,20 @@ 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
-#, fuzzy
 msgid "Adds particles when digging a node."
-msgstr "node를 부술 때� 파티� 효과를 추가합니다"
+msgstr "node를 부술 때� 파티� 효과를 추가합니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
 msgstr ""
+"화면� 맞게 dpi 구성� 조정합니다 (X11 미지� / Android 만 해당). 4k 화면 용."
 
 #: src/settings_translation_file.cpp
 #, c-format
@@ -2321,6 +2220,11 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"플롯랜드 레�어� 밀�를 조정합니다.\n"
+"밀�를 높�려면 값� 늘리십시오. 양수 �는 �수입니다.\n"
+"값 = 0.0 : 부피� 50 % o가 플롯랜드입니다.\n"
+"값 = 2.0 ( 'mgv7_np_floatland'� 따� � 높� 수 있�, \n"
+"항� 확실하게 테스트 후 사용)는 단단한 플롯랜드 레�어를 만듭니다."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -2334,59 +2238,63 @@ msgid ""
 "This only has significant effect on daylight and artificial\n"
 "light, it has very little effect on natural night light."
 msgstr ""
+"'�마 보정'� �용하여 조명 곡선� 변경합니다.\n"
+"값� 높�수� 중간 � 낮� 조명 수준� � �아집니다.\n"
+"값 '1.0'� 조명 곡선� 변경하지 않습니다.\n"
+"�것� �광 � �공 조명�만 중요한 �향� 미칩니다.\n"
+"빛�, �연�� 야간 조명� 거� �향� 미치지 않습니다."
 
 #: src/settings_translation_file.cpp
 msgid "Always fly and fast"
-msgstr "항� 비행하고 빠르게"
+msgstr "항� 비행 � 고� 모드"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
-msgstr ""
+msgstr "주변 occlusion �마"
 
 #: src/settings_translation_file.cpp
 msgid "Amount of messages a player may send per 10 seconds."
-msgstr ""
+msgstr "플레�어가 10 초당 보낼 수있는 메시지� 양."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Amplifies the valleys."
-msgstr "계곡 ��"
+msgstr "계곡 ��."
 
 #: src/settings_translation_file.cpp
 msgid "Anisotropic filtering"
 msgstr "�방성 필터�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Announce server"
-msgstr "서버 발표"
+msgstr "서버 공지"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Announce to this serverlist."
-msgstr "서버 발표"
+msgstr "� 서버 목�� 알림."
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
-msgstr ""
+msgstr "아�템 �름 추가"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name to tooltip."
-msgstr ""
+msgstr "툴�� 아�템 �름 추가."
 
 #: src/settings_translation_file.cpp
 msgid "Apple trees noise"
-msgstr ""
+msgstr "사과 나무 노�즈"
 
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
-msgstr ""
+msgstr "팔 관성"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Arm inertia, gives a more realistic movement of\n"
 "the arm when the camera moves."
 msgstr ""
+"팔 관성,보다 현실�� 움�임� 제공합니다.\n"
+"카메�가 움�� 때 팔� 함께 움�입니다."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
@@ -2406,19 +2314,26 @@ msgid ""
 "optimization.\n"
 "Stated in mapblocks (16 nodes)."
 msgstr ""
+"� 거리�서 서버는 ���언트로 전송�는 블�� 최�화를\n"
+"활성화합니다.\n"
+"작� 값� 눈� �는 렌�� 결함� 통해 \n"
+"잠재�으로 성능� �게 향�시킵니다 \n"
+"(�부 블�� 수중과 �굴, 때로는 육지�서� 렌���지 않습니다).\n"
+"� 값� max_block_send_distance보다 � 값으로 설정하면 \n"
+"최�화가 비활성화�니다.\n"
+"맵 블� (16 개 노드)� 명시�어 있습니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Automatic forward key"
-msgstr "앞으로 가는 키"
+msgstr "�� 전진 키"
 
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
-msgstr ""
+msgstr "단� 노드 장애물� 대한 �� �프."
 
 #: src/settings_translation_file.cpp
 msgid "Automatically report to the serverlist."
-msgstr ""
+msgstr "서버 목�� ��으로 보고."
 
 #: src/settings_translation_file.cpp
 msgid "Autosave screen size"
@@ -2426,38 +2341,35 @@ msgstr "스�린 �기 �� 저장"
 
 #: src/settings_translation_file.cpp
 msgid "Autoscaling mode"
-msgstr ""
+msgstr "�� 스케�� 모드"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
 msgstr "뒤로 ��하는 키"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base ground level"
-msgstr "물� 높�"
+msgstr "기본 지면 수준"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Base terrain height."
-msgstr "기본 지형 높�"
+msgstr "기본 지형 높�."
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
 msgstr "기본"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Basic privileges"
 msgstr "기본 권한"
 
 #: src/settings_translation_file.cpp
 msgid "Beach noise"
-msgstr ""
+msgstr "해변 잡�"
 
 #: src/settings_translation_file.cpp
 msgid "Beach noise threshold"
-msgstr ""
+msgstr "해변 잡� 임계치"
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
@@ -2469,61 +2381,56 @@ msgstr "바�딩 주소"
 
 #: src/settings_translation_file.cpp
 msgid "Biome API temperature and humidity noise parameters"
-msgstr ""
+msgstr "Biome API 온� � 습� 소� 매개 변수"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Biome noise"
-msgstr "강 소리"
+msgstr "Biome 노�즈"
 
 #: src/settings_translation_file.cpp
 msgid "Bits per pixel (aka color depth) in fullscreen mode."
 msgstr "전체 화면 모드�서 (�명 색 ��) 픽셀 당 비트."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Block send optimize distance"
-msgstr "최대 블� 전송 거리"
+msgstr "블� 전송 최�화 거리"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bold and italic font path"
-msgstr "고정 � 글꼴 경로"
+msgstr "굵� 기울임 꼴 글꼴 경로"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bold and italic monospace font path"
-msgstr "고정 � 글꼴 경로"
+msgstr "굵� 기울임 꼴 고정 � 글꼴 경로"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bold font path"
-msgstr "글꼴 경로"
+msgstr "굵� 글꼴 경로"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bold monospace font path"
-msgstr "고정 � 글꼴 경로"
+msgstr "굵� 고정 � 글꼴 경로"
 
 #: src/settings_translation_file.cpp
 msgid "Build inside player"
-msgstr ""
+msgstr "내부 사용� 빌드"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
 msgstr "기본 제공"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "범프맵핑"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
 "Increasing can reduce artifacting on weaker GPUs.\n"
 "0.1 = Default, 0.25 = Good value for weaker tablets."
 msgstr ""
+"0�서 0.25 사�� 노드�서 카메� '깎� �면 근처'거리는 GLES 플랫��서만 작"
+"�합니다. \n"
+"대부분� 사용�는 �것� 변경할 필요가 없습니다.\n"
+"값� �가하면 약한 GPU�서 아티팩트를 줄� 수 있습니다. \n"
+"0.1 = 기본값, 0.25 = 약한 태블릿� �합한 값."
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
@@ -2538,9 +2445,8 @@ msgid "Camera update toggle key"
 msgstr "카메� 업��트 토글 키"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cave noise"
-msgstr "�굴 잡� #1"
+msgstr "�굴 잡�"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #1"
@@ -2555,85 +2461,68 @@ msgid "Cave width"
 msgstr "�굴 너비"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cave1 noise"
-msgstr "�굴 잡� #1"
+msgstr "�굴1 잡�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cave2 noise"
-msgstr "�굴 잡� #1"
+msgstr "�굴2 잡�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cavern limit"
-msgstr "�굴 너비"
+msgstr "�굴 제한"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cavern noise"
-msgstr "�굴 잡� #1"
+msgstr "�굴 잡�"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern taper"
-msgstr ""
+msgstr "�굴 테��"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern threshold"
-msgstr ""
+msgstr "�굴 임계치"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Cavern upper limit"
-msgstr "�굴 너비"
+msgstr "�굴 �한선"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Center of light curve boost range.\n"
 "Where 0.0 is minimum light level, 1.0 is maximum light level."
 msgstr ""
+"빛 굴절 중심 범위 .\n"
+"0.0� 최소 조명 수준�고 1.0� 최대 조명 수준입니다."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat font size"
-msgstr "글꼴 �기"
+msgstr "채팅 글� �기"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
 msgstr "채팅"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat log level"
-msgstr "디버그 로그 수준"
+msgstr "채팅 기� 수준"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat message count limit"
-msgstr "접� 시 status메시지"
+msgstr "채팅 메세지 수 제한"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat message format"
-msgstr "접� 시 status메시지"
+msgstr "채팅 메세지 �맷"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message kick threshold"
-msgstr ""
+msgstr "채팅 메세지 강제퇴장 임계값"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message max length"
-msgstr ""
+msgstr "채팅 메세지 최대 길�"
 
 #: src/settings_translation_file.cpp
 msgid "Chat toggle key"
@@ -2656,7 +2545,6 @@ msgid "Cinematic mode key"
 msgstr "시네마틱 모드 스위치"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Clean transparent textures"
 msgstr "깨�하고 투명한 �스처"
 
@@ -2673,13 +2561,12 @@ msgid "Client modding"
 msgstr "���언트 모딩"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client side modding restrictions"
-msgstr "���언트 모딩"
+msgstr "���언트 측 모딩 제한"
 
 #: src/settings_translation_file.cpp
 msgid "Client side node lookup range restriction"
-msgstr ""
+msgstr "���언트 측 노드 조회 범위 제한"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
@@ -2715,14 +2602,20 @@ msgid ""
 "These flags are independent from Minetest versions,\n"
 "so see a full list at https://content.minetest.net/help/content_flags/"
 msgstr ""
+"컨�츠 저장소�서 쉼표로 구분� 숨겨진 플래그 목�입니다.\n"
+"\"nonfree\"는 Free Software Foundation�서 정�한대로 '�유 소프트웨어'로 분"
+"류�지 않는 패키지를 숨기는 � 사용할 수 있습니다,\n"
+"콘�츠 등급� 지정할 수� 있습니다.\n"
+"� 플래그는 Minetest 버전과 �립��므로. \n"
+"https://content.minetest.net/help/content_flags/�서,\n"
+"전체 목�� 참조하십시오."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
-"쉼표로 구분� 모드� 리스트는 HTTP API� 접근 할 수 있습니다.\n"
+"쉼표로 구분� 모드� 리스트는 HTTP API� 접근 할 수 있습니다,\n"
 "�터넷�서 ��터를 다운로드 하거나 업로드 할 수 있습니다."
 
 #: src/settings_translation_file.cpp
@@ -2730,6 +2623,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 ""
+"mod 보안� 켜져있는 경우�� 안전하지 않� 기능� 액세스 할 수있는 쉼표로 구"
+"분 � 신뢰 할 수 있는 모드� 목�입니다\n"
+"(request_insecure_environment ()를 통해)."
 
 #: src/settings_translation_file.cpp
 msgid "Command key"
@@ -2745,7 +2641,7 @@ msgstr "외부 미디어 서버� 연결"
 
 #: src/settings_translation_file.cpp
 msgid "Connects glass if supported by node."
-msgstr ""
+msgstr "노드�서 지�하는 경우 유리를 연결합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Console alpha"
@@ -2761,40 +2657,45 @@ msgstr "콘솔 높�"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
+msgstr "콘�츠DB 블랙리스트 플래그"
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "ContentDB URL"
-msgstr "계�"
+msgstr "ContentDB URL주소"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward"
-msgstr ""
+msgstr "연� 전진"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Continuous forward movement, toggled by autoforward key.\n"
 "Press the autoforward key again or the backwards movement to disable."
 msgstr ""
+"연� 전진 ��, �� 전진 키로 전환.\n"
+"비활성화하려면 �� 앞으로 �� 키를 다시 누르거나 뒤로 ��합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Controls"
 msgstr "컨트롤"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Controls length of day/night cycle.\n"
 "Examples:\n"
 "72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged."
 msgstr ""
 "낮/밤 주기� 길�를 컨트롤.\n"
-"예: 72 = 20 분, 360 = 4 분, 1 = 24 시간, 0 = 낮/밤/바뀌지 않고 그대로."
+"예: \n"
+"72 = 20 분, 360 = 4 분, 1 = 24 시간, 0 = 낮/밤/바뀌지 않고 그대로."
 
 #: src/settings_translation_file.cpp
 msgid "Controls sinking speed in liquid."
-msgstr ""
+msgstr "액체� 하강 �� 제어."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
@@ -2810,6 +2711,9 @@ msgid ""
 "Value >= 10.0 completely disables generation of tunnels and avoids the\n"
 "intensive noise calculations."
 msgstr ""
+"터� 너비를 제어하고 값� 작�수� � 넓� 터�� �성�니다.\n"
+"값> = 10.0� 터� �성� 완전히 비활성화하고 집중�� 노�즈 계산� \n"
+"방지합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -2824,7 +2728,10 @@ msgid "Crosshair alpha"
 msgstr "십�선 투명�"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "십�선 투명� (불투명 함, 0과 255 사�)."
 
 #: src/settings_translation_file.cpp
@@ -2832,8 +2739,10 @@ msgid "Crosshair color"
 msgstr "십�선 색"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "십�선 색 (빨, 초, 파)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2848,9 +2757,8 @@ msgid "Debug info toggle key"
 msgstr "디버그 정보 토글 키"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Debug log file size threshold"
-msgstr "디버그 로그 수준"
+msgstr "디버그 로그 파� �기 임계치"
 
 #: src/settings_translation_file.cpp
 msgid "Debug log level"
@@ -2862,11 +2770,11 @@ msgstr "볼륨 낮추기 키"
 
 #: src/settings_translation_file.cpp
 msgid "Decrease this to increase liquid resistance to movement."
-msgstr ""
+msgstr "움�임� 대한 액체 저항� 높�려면 � 값� 줄입니다."
 
 #: src/settings_translation_file.cpp
 msgid "Dedicated server step"
-msgstr ""
+msgstr "전용 서버 단계"
 
 #: src/settings_translation_file.cpp
 msgid "Default acceleration"
@@ -2877,7 +2785,6 @@ msgid "Default game"
 msgstr "기본 게임"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Default game when creating a new world.\n"
 "This will be overridden when creating a world from the main menu."
@@ -2898,31 +2805,32 @@ msgid "Default report format"
 msgstr "기본 보고서 형�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default stack size"
-msgstr "기본 게임"
+msgstr "기본 스� �기"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
 "Only has an effect if compiled with cURL."
 msgstr ""
+"cURL� 대한 기본 제한 시간 (밀리 초 단위).\n"
+"cURL로 컴파� � 경우�만 효과가 있습니다."
 
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
-msgstr ""
+msgstr "나무� 사과가 있는 �역 정�."
 
 #: src/settings_translation_file.cpp
 msgid "Defines areas with sandy beaches."
-msgstr ""
+msgstr "모래 해변� 있는 지역� 정�합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Defines distribution of higher terrain and steepness of cliffs."
-msgstr ""
+msgstr "높� 지형� 분�와 절벽� 가파른 정�를 정�합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Defines distribution of higher terrain."
-msgstr ""
+msgstr "� 높� 지형� 분�를 정�합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Defines full size of caverns, smaller values create larger caverns."
@@ -2937,15 +2845,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"�스처� 샘플� 단계를 정�합니다.\n"
-"�반 맵� 부드럽게 높� 값� 나타냅니다."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2954,7 +2853,6 @@ msgid "Defines the depth of the river channel."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr "블�� 최대 플레�어 전송 거리를 정� 합니다 (0 = 무제한)."
 
@@ -2981,7 +2879,6 @@ msgid "Delay in sending blocks after building"
 msgstr "건축 후 블� 전송 지연"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Delay showing tooltips, stated in milliseconds."
 msgstr "�구 설명 표시 지연, 1000분� 1초."
 
@@ -2990,12 +2887,10 @@ msgid "Deprecated Lua API handling"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Depth below which you'll find giant caverns."
 msgstr "� �굴� 발견할 수 있는 깊�."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Depth below which you'll find large caves."
 msgstr "� �굴� 발견할 수 있는 깊�."
 
@@ -3021,6 +2916,10 @@ msgstr "블� 애니메�션 비�기화"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Dig key"
+msgstr "오른쪽 키"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "입� 효과"
 
@@ -3049,7 +2948,6 @@ msgid "Drop item key"
 msgstr "아�템 드� 키"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Dump the mapgen debug information."
 msgstr "Mapgen 디버그 정보를 �프 합니다."
 
@@ -3062,9 +2960,8 @@ msgid "Dungeon minimum Y"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Dungeon noise"
-msgstr "강 소리"
+msgstr "�전 잡�"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3083,18 +2980,17 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "새로 만든 맵�서 creative모드를 활성화시킵니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable joysticks"
-msgstr "조�스틱 �용"
+msgstr "조�스틱 활성화"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable mod channels support."
-msgstr "모드 보안 �용"
+msgstr "모드 채� 지� 활성화."
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod security"
@@ -3133,7 +3029,8 @@ msgid ""
 "expecting."
 msgstr ""
 "오래� ���언트 연결� 허�하지 않는것� 사용.\n"
-"�전 ���언트는 서버�서 당신� 기대하는 새로운 특징들� 지�하지 않는다면 "
+"�전 ���언트는 서버�서 당신� 기대하는 새로운 특징들� 지�하지 않는다"
+"ë©´ \n"
 "새로운 서버로 연결할 때 충�하지 않� 것입니다."
 
 #: src/settings_translation_file.cpp
@@ -3143,9 +3040,9 @@ msgid ""
 "textures)\n"
 "when connecting to the server."
 msgstr ""
-"(만약 서버�서 제공한다면)�격 미디어 서버 사용 가능.\n"
-"�격 서버들� 서버� 연결할 때 매우 빠르게 미디어를 다운로드 할 수 있�� 제"
-"공합니다.(예: �스처)"
+"�격 미디어 서버 사용 가능(만약 서버�서 제공한다면).\n"
+"�격 서버들� 서버� 연결할 때 매우 빠르게 미디어를\n"
+"다운로드 할 수 있�� 제공합니다.(예: �스처)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3162,14 +3059,13 @@ msgstr ""
 "예 : 0� 화면 �들림 없�; 1.0� 노멀; 2.0� �블."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enable/disable running an IPv6 server.\n"
 "Ignored if bind_address is set.\n"
 "Needs enable_ipv6 to be enabled."
 msgstr ""
-"IPv6 서버를 실행 활성화/비활성화.  IPv6 서버는 IPv6 ���언트 시스템 구성� "
-"따� 제한 � 수 있습니다.\n"
+"IPv6 서버를 실행 활성화/비활성화.\n"
+"IPv6 서버는 IPv6 ���언트 시스템 구성� 따� 제한 � 수 있습니다.\n"
 "만약 Bind_address가 설정 � 경우 무시 �니다."
 
 #: src/settings_translation_file.cpp
@@ -3185,17 +3081,6 @@ msgid "Enables animation of inventory items."
 msgstr "�벤토리 아�템� 애니메�션 �용."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"�스처� bumpmapping� 할 수 있습니다. Normalmaps는 �스� 팩�서 받거나 �"
-"� �성� 필요가 있습니다.\n"
-"���를 활성화 해야 합니다."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3204,23 +3089,6 @@ msgid "Enables minimap."
 msgstr "미니맵 �용."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"비행 노멀맵 �성 �용 (엠보스 효과).\n"
-"Bumpmapping를 활성화 해야 합니다."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"시차 �합 맵핑 �용.\n"
-"���를 활성화 해야 합니다."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
@@ -3238,12 +3106,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3253,8 +3115,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "�시정지 메뉴�서 FPS"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "게임� �시정지�때� 최대 FPS."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3265,14 +3128,12 @@ msgid "Factor noise"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fall bobbing factor"
 msgstr "낙하 �들림"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fallback font path"
-msgstr "yes"
+msgstr "대체 글꼴 경로"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow"
@@ -3303,13 +3164,12 @@ msgid "Fast movement"
 msgstr "빠른 ��"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Fast movement (via the \"special\" key).\n"
 "This requires the \"fast\" privilege on the server."
 msgstr ""
-"빠른 ��('use'키 사용).\n"
-"서버�서는 \"fast\"권한� 요구�니다."
+"빠른 �� ( \"특수\"키 사용).\n"
+"�를 위해서는 서버� 대한 \"빠른\"권한� 필요합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Field of view"
@@ -3320,15 +3180,15 @@ msgid "Field of view in degrees."
 msgstr "��� 대한 시야."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "File in client/serverlist/ that contains your favorite servers displayed in "
 "the\n"
 "Multiplayer Tab."
-msgstr "���언트/서버리스트/멀티플레�어 탭�서 당신� 가장 좋아하는 서버"
+msgstr ""
+"멀티 플레�어 탭� 표시�는 �겨 찾는 서버가 �함 � \n"
+"client / serverlist /� 파�입니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Filler depth"
 msgstr "강 깊�"
 
@@ -3369,39 +3229,32 @@ msgid "Fixed virtual joystick"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland density"
-msgstr "Floatland� 산 밀집�"
+msgstr "Floatland� 밀집�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland maximum Y"
-msgstr "Floatland� 산 높�"
+msgstr "Floatland� Y 최대값"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland minimum Y"
-msgstr "Floatland� 산 높�"
+msgstr "Floatland� Y 최소값"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland noise"
-msgstr "Floatland� 높�"
+msgstr "Floatland 노�즈"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland taper exponent"
-msgstr "Floatland� 산 밀집�"
+msgstr "Floatland� 테�� 지수"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland tapering distance"
-msgstr "Floatland� 산 밀집�"
+msgstr "Floatland� 테��� 거리"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland water level"
-msgstr "Floatland� 높�"
+msgstr "Floatland� 물 높�"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
@@ -3489,22 +3342,18 @@ msgid "Formspec Full-Screen Background Opacity"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Formspec default background color (R,G,B)."
-msgstr "게임 내�서 채팅 콘솔 배경 색� (빨,초,파)."
+msgstr "게임 내�서 채팅 콘솔 배경 색� (빨강, 초�, 파랑)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Formspec default background opacity (between 0 and 255)."
 msgstr "게임 내�서 채팅 콘솔 배경 알파 (불투명 함, 0와 255 사�)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Formspec full-screen background color (R,G,B)."
-msgstr "게임 내�서 채팅 콘솔 배경 색� (빨,초,파)."
+msgstr "게임 내�서 채팅 콘솔 배경 색� (빨강, 초�, 파랑)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Formspec full-screen background opacity (between 0 and 255)."
 msgstr "게임 내�서 채팅 콘솔 배경 알파 (불투명 함, 0와 255 사�)."
 
@@ -3525,7 +3374,6 @@ msgid "Fraction of the visible distance at which fog starts to be rendered"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "FreeType fonts"
 msgstr "Freetype 글꼴"
 
@@ -3574,10 +3422,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "GUI �기 조정 필터 txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Normalmaps �성"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "글로벌 콜백"
 
@@ -3609,17 +3453,14 @@ msgid "Gravity"
 msgstr "중력"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ground level"
-msgstr "물� 높�"
+msgstr "지면 수준"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ground noise"
-msgstr "물� 높�"
+msgstr "지면 노�즈"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HTTP mods"
 msgstr "HTTP 모드"
 
@@ -3634,8 +3475,8 @@ msgstr "HUD 토글 키"
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3653,18 +3494,16 @@ msgid "Heat blend noise"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Heat noise"
-msgstr "�굴 잡� #1"
+msgstr "용암 잡�"
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "초기 창 �기� 높� 구성 요소입니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height noise"
-msgstr "오른쪽 창"
+msgstr "높� 노�즈"
 
 #: src/settings_translation_file.cpp
 msgid "Height select noise"
@@ -3683,24 +3522,20 @@ msgid "Hill threshold"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hilliness1 noise"
-msgstr "�굴 잡� #1"
+msgstr "언�1 잡�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hilliness2 noise"
-msgstr "�굴 잡� #1"
+msgstr "언�2 잡�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hilliness3 noise"
-msgstr "�굴 잡� #1"
+msgstr "언�3 잡�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hilliness4 noise"
-msgstr "�굴 잡� #1"
+msgstr "언�4 잡�"
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
@@ -3746,7 +3581,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 12 key"
-msgstr ""
+msgstr "핫바 슬롯 키 12"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 13 key"
@@ -3861,9 +3696,8 @@ msgid "Hotbar slot 9 key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "How deep to make rivers."
-msgstr "얼마나 강� 깊게 만들건가요"
+msgstr "제작할 강� 깊�."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3879,9 +3713,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "How wide to make rivers."
-msgstr "게곡� 얼마나 넓게 만들지"
+msgstr "제작할 강� 너비."
 
 #: src/settings_translation_file.cpp
 msgid "Humidity blend noise"
@@ -3933,12 +3766,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, \"special\" key instead of \"sneak\" key is used for climbing "
 "down and\n"
 "descending."
-msgstr "활성화시, \"sneak\"키 대신 \"use\"키가 내려가는� 사용�니다."
+msgstr ""
+"활성화시, \"sneak\"키 대신 \"특수\"키가 내려가는� \n"
+"사용�니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3967,12 +3801,13 @@ msgid "If enabled, new players cannot join with an empty password."
 msgstr "�용할 경우, 새로운 플레�어는 빈 암호로 가입 할 수 없습니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, you can place blocks at the position (feet + eye level) where "
 "you stand.\n"
 "This is helpful when working with nodeboxes in small areas."
-msgstr "활성화시, 당신� 서 있는 �리�� 블�� 놓� 수 있습니다."
+msgstr ""
+"활성화시,\n"
+"당신� 서 있는 �리�� 블�� 놓� 수 있습니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4002,7 +3837,6 @@ msgid "In-Game"
 msgstr "�게임"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
 msgstr "게임 내�서 채팅 콘솔 배경 알파 (불투명 함, 0와 255 사�)."
 
@@ -4011,14 +3845,12 @@ msgid "In-game chat console background color (R,G,B)."
 msgstr "게임 내�서 채팅 콘솔 배경 색� (빨,초,파)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "In-game chat console height, between 0.1 (10%) and 1.0 (100%)."
 msgstr "게임 내�서 채팅 콘솔 배경 알파 (불투명 함, 0와 255 사�)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Inc. volume key"
-msgstr "콘솔 키"
+msgstr "볼륨 �가 키"
 
 #: src/settings_translation_file.cpp
 msgid "Initial vertical speed when jumping, in nodes per second."
@@ -4083,19 +3915,16 @@ msgid "Invert vertical mouse movement."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Italic font path"
-msgstr "고정 � 글꼴 경로"
+msgstr "기울임꼴 경로"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Italic monospace font path"
-msgstr "고정 � 글꼴 경로"
+msgstr "고정 � 기울임 글꼴 경로"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Item entity TTL"
-msgstr "아�템�  TTL(Time To Live)"
+msgstr "아�템� TTL(Time To Live)"
 
 #: src/settings_translation_file.cpp
 msgid "Iterations"
@@ -4118,6 +3947,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4203,6 +4036,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"�프키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3 참조"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4223,7 +4067,6 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for increasing the volume.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4254,14 +4097,14 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for moving the player backward.\n"
 "Will also disable autoforward, when active.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"플레�어가 뒤쪽으로 움��는 키입니다.\n"
+"플레�어가 \n"
+"뒤쪽으로 움��는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
@@ -4296,7 +4139,6 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for muting the game.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4349,6 +4191,16 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"�프키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3 참조"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4358,7 +4210,6 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 12th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4369,354 +4220,322 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 13th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"13번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 14th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"14번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 15th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"15번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 16th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"16번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 17th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"17번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 18th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"18번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 19th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"19번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 20th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"20번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 21st hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"21번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 22nd hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"22번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 23rd hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"23번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 24th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"24번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 25th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"25번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 26th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"26번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 27th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"27번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 28th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"28번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 29th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"29번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 30th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"30번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 31st hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"31번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 32nd hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"32번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the eighth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"8번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the fifth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"5번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the first hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"1번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the fourth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"4번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the next item in the hotbar.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"다� 아�템 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the ninth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"9번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the previous item in the hotbar.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"�전 아�템 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the second hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"2번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the seventh hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"7번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the sixth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"6번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the tenth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"10번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the third hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�벤토리를 여는 키입니다.\n"
+"3번째 hotbar 슬롯� 선�하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
@@ -4755,14 +4574,13 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling autoforward.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"��으로 달리는 기능� 켜는 키입니다.\n"
-"http://irrlicht.sourceforge.net/docu/namespaceirr."
+"��전진 토글� 대한 키입니다.\n"
+"Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
@@ -4816,13 +4634,12 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling pitch move mode.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�유시� 모드 스위치 키입니다.\n"
+"피치 �� 모드 토글� 대한 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
@@ -4837,13 +4654,12 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the display of chat.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"채팅 스위치 키입니다.\n"
+"채팅 디스플레� 토글 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
@@ -4858,13 +4674,12 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the display of fog.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"안개 스위치 키입니다.\n"
+"안개 디스플레� 토글 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
@@ -4879,13 +4694,12 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the display of the large chat console.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"채팅 스위치 키입니다.\n"
+"채팅 콘솔 디스플레� 토글 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
@@ -4907,13 +4721,12 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key to use view zoom when possible.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"�프키입니다.\n"
+"가능한 경우 시야 확대를 사용하는 키입니다.\n"
 "Http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3 참조"
 
@@ -4950,16 +4763,14 @@ msgid "Large cave proportion flooded"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Large chat console key"
-msgstr "콘솔 키"
+msgstr "� 채팅 콘솔 키"
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
 msgstr "나뭇잎 스타�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Leaves style:\n"
 "-   Fancy:  all faces visible\n"
@@ -4983,7 +4794,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of liquid waves.\n"
 "Requires waving liquids to be enabled."
@@ -5040,12 +4850,14 @@ msgid "Light curve low gradient"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Limit of map generation, in nodes, in all 6 directions from (0, 0, 0).\n"
 "Only mapchunks completely within the mapgen limit are generated.\n"
 "Value is stored per-world."
-msgstr "(0,0,0)으로부터  6방향으로 뻗어나갈 맵 �기"
+msgstr ""
+"(0, 0, 0)�서 모든 6 개 방향� 노드�서 맵 �성 제한.\n"
+"mapgen 제한 내� 완전히 �함 � 맵 청� 만 �성�니다.\n"
+"값� 세계별로 저장�니다."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5073,7 +4885,6 @@ msgid "Liquid queue purge time"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Liquid sinking"
 msgstr "하강 ��"
 
@@ -5113,11 +4924,6 @@ msgid "Main menu script"
 msgstr "주 메뉴 스�립트"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "주 메뉴 스�립트"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5131,6 +4937,14 @@ msgid "Makes all liquids opaque"
 msgstr "모든 액체를 불투명하게 만들기"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -5194,14 +5008,12 @@ msgid "Mapblock limit"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapblock mesh generation delay"
-msgstr "맵 �성 제한"
+msgstr "맵 블� �성 지연"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr "맵 �성 제한"
+msgstr "Mapblock 메시 �성기� MapBlock �시 �기 (MB)"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
@@ -5216,46 +5028,40 @@ msgid "Mapgen Carpathian specific flags"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Flat"
-msgstr "Mapgen �름"
+msgstr "Mapgen 플랫"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Flat specific flags"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal"
-msgstr "Mapgen �름"
+msgstr "Mapgen 형태"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal specific flags"
-msgstr "Mapgen �름"
+msgstr "Mapgen 형태 �세 플래그"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V5"
-msgstr "맵젠v5"
+msgstr "맵젠 V5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V5 specific flags"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V6"
-msgstr "세계 �성기"
+msgstr "맵젠 V6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V6 specific flags"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V7"
-msgstr "세계 �성기"
+msgstr "맵젠 V7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V7 specific flags"
@@ -5302,12 +5108,13 @@ msgid "Maximum FPS"
 msgstr "최대 FPS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "게임� �시정지�때� 최대 FPS."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
-msgstr ""
+msgstr "최대 강제 로딩 블럭"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum hotbar width"
@@ -5351,6 +5158,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5368,9 +5182,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum number of players that can be connected simultaneously."
-msgstr "�시접� 할 수 있는 최대 ��수."
+msgstr "�시접� 할 수 있는 최대 �� 수."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of recent chat messages to show"
@@ -5385,7 +5198,6 @@ msgid "Maximum objects per block"
 msgstr "블� 당 최대 개체"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 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."
@@ -5394,7 +5206,6 @@ msgstr ""
 "hotbar� 오른쪽�나 왼쪽� 무언가를 나타낼 때 유용합니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Maximum simultaneous block sends per client"
 msgstr "���언트 당 최대 �시 블� 전송"
 
@@ -5463,9 +5274,8 @@ msgid "Minimum limit of random number of small caves per mapchunk."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Minimum texture size"
-msgstr "필터 최소 �스처 �기"
+msgstr "최소 �스처 �기"
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
@@ -5500,9 +5310,8 @@ msgid "Mountain variation noise"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mountain zero level"
-msgstr "물� 높�"
+msgstr "산 0 수준"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
@@ -5525,9 +5334,8 @@ msgstr ""
 "예 : 0� 화면 �들림 없�; 1.0� 노�; 2.0� �블."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mute key"
-msgstr "키 사용"
+msgstr "�소거 키"
 
 #: src/settings_translation_file.cpp
 msgid "Mute sound"
@@ -5595,14 +5403,6 @@ msgid "Noises"
 msgstr "소리"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Normalmaps 샘플�"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Normalmaps 강�"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5628,10 +5428,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "시차 �합 반복� 수"
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5657,37 +5453,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "�반�� 규모/2� 시차 �합 효과� 전반�� 바�어스."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Overall scale of parallax occlusion effect."
-msgstr "시차 �합 효과� 전체 규모"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "시차 �합"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "시차 �합 바�어스"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "시차 �합 반복"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion mode"
-msgstr "시차 �합 모드"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "시차 �합 규모"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5746,15 +5511,24 @@ msgid "Physics"
 msgstr "물리학"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Pitch move key"
-msgstr "비행 키"
+msgstr "피치 �� 키"
 
 #: src/settings_translation_file.cpp
 msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "비행 키"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "오른쪽 �릭 반복 간격"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5771,12 +5545,10 @@ msgid "Player transfer distance"
 msgstr "플레�어 전송 거리"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Player versus player"
 msgstr "PVP"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Port to connect to (UDP).\n"
 "Note that the port field in the main menu overrides this setting."
@@ -5791,12 +5563,10 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr "shell 명령어 실행 같� 안전 하지 않� 것으로부터 모드를 보호합니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Print the engine's profiling data in regular intervals (in seconds).\n"
 "0 = disable. Useful for developers."
@@ -5817,7 +5587,6 @@ msgid "Profiler toggle key"
 msgstr "프로파�러 토글 키"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Profiling"
 msgstr "프로 파��"
 
@@ -5847,12 +5616,10 @@ msgstr ""
 "26보다 � 수치들� 구름� 선명하게 만들고 모서리를 잘�낼 것입니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Raises terrain to make valleys around the rivers."
 msgstr "강 주변� 계곡� 만들기 위해 지형� 올립니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Random input"
 msgstr "임� 입력"
 
@@ -5865,7 +5632,6 @@ msgid "Recent Chat Messages"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Regular font path"
 msgstr "보고서 경로"
 
@@ -5884,12 +5650,10 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Replaces the default main menu with a custom one."
 msgstr "기본 주 메뉴를 커스텀 메뉴로 바꿉니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Report path"
 msgstr "보고서 경로"
 
@@ -5912,9 +5676,8 @@ msgid "Ridge mountain spread noise"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ridge noise"
-msgstr "강 소리"
+msgstr "능선 노�즈"
 
 #: src/settings_translation_file.cpp
 msgid "Ridge underwater noise"
@@ -5929,41 +5692,30 @@ msgid "Right key"
 msgstr "오른쪽 키"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "오른쪽 �릭 반복 간격"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River channel depth"
 msgstr "강 깊�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River channel width"
-msgstr "강 깊�"
+msgstr "강 너비"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River depth"
 msgstr "강 깊�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River noise"
 msgstr "강 소리"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River size"
 msgstr "강 �기"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River valley width"
-msgstr "강 깊�"
+msgstr "강 계곡 �"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Rollback recording"
 msgstr "롤백 레코딩"
 
@@ -5988,7 +5740,6 @@ msgid "Sandy beaches occur when np_beach exceeds this value."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Save the map received by the client on disk."
 msgstr "디스�� ���언트�서 받� 맵� 저장 합니다."
 
@@ -6040,9 +5791,8 @@ msgstr ""
 "기본 품질� 사용하려면 0� 사용 합니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Seabed noise"
-msgstr "�굴 잡� #1"
+msgstr "해저 노�즈"
 
 #: src/settings_translation_file.cpp
 msgid "Second of 4 2D noises that together define hill/mountain range height."
@@ -6057,7 +5807,6 @@ msgid "Security"
 msgstr "보안"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
 msgstr "Http://www.sqlite.org/pragma.html#pragma_synchronous 참조"
 
@@ -6074,7 +5823,6 @@ msgid "Selection box width"
 msgstr "선� 박스 너비"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Selects one of 18 fractal types.\n"
 "1 = 4D \"Roundy\" Mandelbrot set.\n"
@@ -6165,7 +5913,6 @@ msgid "Set the maximum character length of a chat message sent by clients."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving leaves.\n"
 "Requires shaders to be enabled."
@@ -6174,16 +5921,14 @@ msgstr ""
 "���를 활성화 해야 합니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving liquids (like water).\n"
 "Requires shaders to be enabled."
 msgstr ""
 "True로 설정하면 물결효과가 �용�니다.\n"
-"���를 활성화해야 합니다.."
+"���를 활성화해야 합니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving plants.\n"
 "Requires shaders to be enabled."
@@ -6196,7 +5941,6 @@ msgid "Shader path"
 msgstr "��� 경로"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
@@ -6205,17 +5949,16 @@ msgid ""
 msgstr ""
 "���는 확장� 시� 효과를 제공하고 몇몇 비디오 카드� 성능� �가할 수� 있"
 "습니다.\n"
-"�것� OpenGL video backend�서만 ��합니다."
+"�것� OpenGL video backend�서만 \n"
+"작�합니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shadow offset (in pixels) of the default font. If 0, then shadow will not be "
 "drawn."
 msgstr "글꼴 그림� 오프셋, 만약 0 �면 그림�는 나타나지 않� 것입니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shadow offset (in pixels) of the fallback font. If 0, then shadow will not "
 "be drawn."
@@ -6230,11 +5973,23 @@ msgid "Show debug info"
 msgstr "디버그 정보 보기"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Show entity selection boxes"
 msgstr "개체 선� �� 보기"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"언어 설정. 시스템 언어를 사용하려면 비워�세요.\n"
+"설정 �용 후 재시작� 필요합니다."
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "서버닫힘 메시지"
 
@@ -6260,9 +6015,8 @@ msgid "Slice w"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Slope and fill work together to modify the heights."
-msgstr "높� 수정� 위해 기울기와 채우기를 함께 작용합니다"
+msgstr "높� 수정� 위해 기울기와 채우기를 함께 작용합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Small cave maximum number"
@@ -6285,7 +6039,6 @@ msgid "Smooth lighting"
 msgstr "부드러운 조명효과"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
@@ -6309,7 +6062,6 @@ msgid "Sneak key"
 msgstr "살금살금걷기 키"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Sneaking speed"
 msgstr "걷는 ��"
 
@@ -6322,14 +6074,12 @@ msgid "Sound"
 msgstr "사운드"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Special key"
-msgstr "살금살금걷기 키"
+msgstr "특수 키"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Special key for climbing/descending"
-msgstr "오르기/내리기 � 사용�는 키입니다"
+msgstr "오르기/내리기 � 사용�는 특수키"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6362,24 +6112,18 @@ msgid "Steepness noise"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Step mountain size noise"
-msgstr "지형 높�"
+msgstr "계단� 산 높�"
 
 #: src/settings_translation_file.cpp
 msgid "Step mountain spread noise"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Strength of 3D mode parallax."
 msgstr "��으로 �성�는 노멀맵� 강�."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "��으로 �성�는 노멀맵� 강�."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6417,29 +6161,24 @@ msgid "Temperature variation for biomes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain alternative noise"
 msgstr "지형 높�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain base noise"
-msgstr "지형 높�"
+msgstr "지형 기초 분산"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain height"
 msgstr "지형 높�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain higher noise"
-msgstr "지형 높�"
+msgstr "지형 높� 분산"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain noise"
-msgstr "지형 높�"
+msgstr "지형 분산"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6478,15 +6217,18 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "The depth of dirt or other biome filler node."
-msgstr "��나 다른 것� 깊�"
+msgstr "��나 다른 것� 깊�."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6520,8 +6262,8 @@ msgid ""
 "See /privs in game for a full list on your server and mod configuration."
 msgstr ""
 "새로운 유저가 ��으로 얻는 권한입니다.\n"
-"게임�서 /privs를 입력하여 서버와 모드 환경설정� 전체 권한\n"
-" 목�� 확�하세요."
+"게임�서 /privs를 입력하여 서버와 모드 환경설정� 전체 권한 목�� 확�하세"
+"ìš”."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6540,8 +6282,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6567,15 +6309,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6594,18 +6341,18 @@ msgid "Third of 4 2D noises that together define hill/mountain range height."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
 "Setting it to -1 disables the feature."
-msgstr "드�� 아�템� 살아 있는 시간입니다. -1� 입력하여 비활성화합니다."
+msgstr ""
+"드�� 아�템� 살아 있는 시간입니다.\n"
+"-1� 입력하여 비활성화합니다."
 
 #: src/settings_translation_file.cpp
 msgid "Time of day when a new world is started, in millihours (0-23999)."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Time send interval"
 msgstr "시간 전송 간격"
 
@@ -6614,7 +6361,6 @@ msgid "Time speed"
 msgstr "시간 ��"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Timeout for client to remove unused map data from memory."
 msgstr ""
 "메모리�서 사용 하지 않는 맵 ��터를 제거하기 위해 ���언트� 대한 시간 제"
@@ -6631,17 +6377,14 @@ msgstr ""
 "�것� node가 배치�거나 제거� 후 얼마나 오래 �려지는지를 결정합니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Toggle camera mode key"
 msgstr "카메�모드 스위치 키"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Tooltip delay"
 msgstr "�구 설명 지연"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touch screen threshold"
 msgstr "터치임계값 (픽셀)"
 
@@ -6654,7 +6397,6 @@ msgid "Trilinear filtering"
 msgstr "삼중 선형 필터�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "True = 256\n"
 "False = 128\n"
@@ -6673,7 +6415,6 @@ msgid "URL to the server list displayed in the Multiplayer Tab."
 msgstr "멀티 탭� 표시 � 서버 목� URL입니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Undersampling"
 msgstr "좌표표집(Undersampling)"
 
@@ -6687,7 +6428,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Unlimited player transfer distance"
 msgstr "무제한 플레�어 전송 거리"
 
@@ -6712,7 +6452,6 @@ msgid "Use a cloud animation for the main menu background."
 msgstr "주 메뉴 배경� 구름 애니메�션� 사용 합니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Use anisotropic filtering when viewing at textures from an angle."
 msgstr "��� 따� �스처를 볼 때 �방성 필터�� 사용 합니다."
 
@@ -6728,7 +6467,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "삼중 선형 필터�� 질� 스케��� 할 때 사용 합니다."
 
@@ -6737,27 +6486,22 @@ msgid "VBO"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "VSync"
 msgstr "수��기화 V-Sync"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley depth"
 msgstr "계곡 깊�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley fill"
 msgstr "계곡 채우기"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley profile"
 msgstr "계곡 측면"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley slope"
 msgstr "계곡 경사"
 
@@ -6771,7 +6515,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Variation of number of caves."
-msgstr ""
+msgstr "숫� � 마우스 설정."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6790,7 +6534,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Varies steepness of cliffs."
 msgstr "산� 높�/경사를 조절."
 
@@ -6807,16 +6550,12 @@ msgid "Video driver"
 msgstr "비디오 드��버"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "View bobbing factor"
-msgstr "보기 만료"
+msgstr "시야� �들리는 정�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "View distance in nodes."
-msgstr ""
-"node� 보여지는 거리\n"
-"최소 = 20"
+msgstr "node� 보여지는 거리(최소 = 20)."
 
 #: src/settings_translation_file.cpp
 msgid "View range decrease key"
@@ -6843,7 +6582,6 @@ msgid "Volume"
 msgstr "볼륨"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
@@ -6881,7 +6619,6 @@ msgid "Water surface level of the world."
 msgstr "월드� 물 표면 높�."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving Nodes"
 msgstr "움��는 Node"
 
@@ -6890,22 +6627,18 @@ msgid "Waving leaves"
 msgstr "�들리는 나뭇잎 효과"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids"
-msgstr "움��는 Node"
+msgstr "물 움�임"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave height"
 msgstr "물결 높�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave speed"
 msgstr "물결 ��"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wavelength"
 msgstr "물결 길�"
 
@@ -6914,15 +6647,15 @@ msgid "Waving plants"
 msgstr "�들리는 �물 효과"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When gui_scaling_filter is true, all GUI images need to be\n"
 "filtered in software, but some images are generated directly\n"
 "to hardware (e.g. render-to-texture for nodes in inventory)."
 msgstr ""
 "Gui_scaling_filter� true �면 모든 GUI �미지 소프트웨어�서 필터� � 필요"
-"가 있습니다. 하지만 �부 �미지는 바로 하드웨어� �성�니다. (e.g. render-"
-"to-texture for nodes in inventory)."
+"가 있습니다. \n"
+"하지만 �부 �미지는 바로 하드웨어� �성�니다. \n"
+"(e.g. render-to-texture for nodes in inventory)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6933,7 +6666,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
 "can be blurred, so automatically upscale them with nearest-neighbor\n"
@@ -6945,12 +6677,16 @@ msgid ""
 "This is also used as the base node texture size for world-aligned\n"
 "texture autoscaling."
 msgstr ""
-"�중선형/삼중선형/�방성 필터를 사용할 때 저해�� �스�는 �미하게 보� 수 "
-"있습니다.so automatically upscale them with nearest-neighbor interpolation "
-"to preserve crisp pixels. This sets the minimum texture size for the "
-"upscaled textures; 값� 높�수� 선명하게 보입니다. 하지만 많� 메모리가 필요"
-"합니다. Powers of 2 are recommended. Setting this higher than 1 may not have "
-"a visible effect unless bilinear/trilinear/anisotropic filtering is enabled."
+"�중선형/삼중선형/�방성 필터를 사용할 때 \n"
+"저해�� �스�는 �미하게 보� 수 있습니다.\n"
+"so automatically upscale them with nearest-neighbor interpolation to "
+"preserve crisp pixels. \n"
+"This sets the minimum texture size for the upscaled textures; \n"
+"값� 높�수� 선명하게 보입니다. \n"
+"하지만 많� 메모리가 필요합니다. \n"
+"Powers of 2 are recommended. \n"
+"Setting this higher than 1 may not have a visible effect\n"
+"unless bilinear/trilinear/anisotropic filtering is enabled."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6960,6 +6696,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6997,12 +6739,10 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width component of the initial window size."
 msgstr "�� 초기 창 �기로 구성�어 있습니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width of the selection box lines around nodes."
 msgstr ""
 "node 주위 “selectionbox'� or (if UTF-8 supported) “selectionbox’� ��� 너비"
@@ -7024,9 +6764,8 @@ msgstr ""
 "주 메뉴�서 시작 하는 경우 필요 하지 않습니다."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "World start time"
-msgstr "세계 �름"
+msgstr "세계 시작 시간"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7043,9 +6782,8 @@ msgid "World-aligned textures mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Y of flat ground."
-msgstr "��한 땅� Y값"
+msgstr "��한 땅� Y값."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7090,6 +6828,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -7101,54 +6857,207 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "확�"
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = 경사 정보가 존재 (빠름).\n"
+#~ "1 = 릴리프 매핑 (� �리고 정확함)."
+
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "싱글 플레�어 월드를 리셋하겠습니까?"
 
 #~ msgid "Back"
 #~ msgstr "뒤로"
 
-#, fuzzy
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "$1 를(�) 다운로드중입니다. 기다려주세요..."
+#~ msgid "Bump Mapping"
+#~ msgstr "범프 매핑"
 
-#, fuzzy
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "시차 �합 강�"
+#~ msgid "Bumpmapping"
+#~ msgstr "범프맵핑"
 
-#~ msgid "Path to save screenshots at."
-#~ msgstr "스�린샷 저장 경로입니다."
+#~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "메� 메뉴 UI 변경 :\n"
+#~ "-전체 : 여러 싱글 플레�어 월드, 게임 선�, �스처 팩 선�기 등.\n"
+#~ "-단순함 : 단� 플레�어 세계, 게임 �는 �스처 팩 선�기가 없습니다. \n"
+#~ "작� 화면� 필요할 수 있습니다."
+
+#~ msgid "Config mods"
+#~ msgstr "모드 설정"
+
+#~ msgid "Configure"
+#~ msgstr "환경설정"
 
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "터� 너비를 조절, 작� 수치는 넓� 터�� 만듭니다."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "십�선 색 (빨, 초, 파)."
+
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "�스처� 샘플� 단계를 정�합니다.\n"
+#~ "�반 맵� 부드럽게 높� 값� 나타냅니다."
+
+#, fuzzy
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "$1 를(�) 다운로드중입니다. 기다려주세요..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "VBO �용"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "�스처� bumpmapping� 할 수 있습니다. \n"
+#~ "Normalmaps는 �스� 팩�서 받거나 �� �성� 필요가 있습니다.\n"
+#~ "���를 활성화 해야 합니다."
+
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "비행 노멀맵 �성 �용 (엠보스 효과).\n"
+#~ "Bumpmapping를 활성화 해야 합니다."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "시차 �합 맵핑 �용.\n"
+#~ "���를 활성화 해야 합니다."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "�시정지 메뉴�서 FPS"
+
 #~ msgid "Font shadow alpha (opaqueness, between 0 and 255)."
 #~ msgstr "글꼴 그림� 투명� (불투명 함, 0과 255 사�)."
 
 #~ msgid "Gamma"
 #~ msgstr "�마"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Normal maps �성"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Normalmaps �성"
+
 #, fuzzy
 #~ msgid "Lava depth"
 #~ msgstr "� �굴 깊�"
 
+#~ msgid "Main"
+#~ msgstr "메�"
+
+#~ msgid "Main menu style"
+#~ msgstr "주 메뉴 스�립트"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "레�� 모드� 미니맵, 2배 확대"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "레�� 모드� 미니맵, 4배 확대"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "표면 모드� 미니맵, 2배 확대"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "표면 모드� 미니맵, 4배 확대"
+
+#~ msgid "Name/Password"
+#~ msgstr "�름/비밀번호"
+
+#~ msgid "No"
+#~ msgstr "아니오"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Normalmaps 샘플�"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Normalmaps 강�"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "시차 �합 반복� 수."
+
+#~ msgid "Ok"
+#~ msgstr "확�"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "�반�� 규모/2� 시차 �합 효과� 전반�� 바�어스."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "시차 �합 효과� 전체 규모."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "시차 �합"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "시차 �합"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "시차 �합 바�어스"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "시차 �합 반복"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "시차 �합 모드"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "시차 �합 규모"
+
+#, fuzzy
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "시차 �합 강�"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "TrueTypeFont �는 비트맵� 경로입니다."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "스�린샷 저장 경로입니다."
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "싱글 플레�어 월드 초기화"
+
+#, fuzzy
+#~ msgid "Select Package File:"
+#~ msgstr "선�한 모드 파�:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "그림� 제한"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "싱글 플레�어 시작"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "��으로 �성�는 노멀맵� 강�."
+
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "� 글꼴� 특정 언어� 사용 �니다."
 
-#~ msgid "Waving water"
-#~ msgstr "물결 효과"
+#~ msgid "Toggle Cinematic"
+#~ msgstr "시네마틱 스위치"
+
+#~ msgid "View"
+#~ msgstr "보기"
 
 #~ msgid "Waving Water"
 #~ msgstr "물결 효과"
 
-#, fuzzy
-#~ msgid "Select Package File:"
-#~ msgstr "선�한 모드 파�:"
+#~ msgid "Waving water"
+#~ msgstr "물결 효과"
+
+#~ msgid "Yes"
+#~ msgstr "예"
diff --git a/po/ky/minetest.po b/po/ky/minetest.po
index 18da1e7c8..91c6e11b8 100644
--- a/po/ky/minetest.po
+++ b/po/ky/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Kyrgyz (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: 2019-11-10 15:04+0000\n"
 "Last-Translator: Krock <mk939@ymail.com>\n"
 "Language-Team: Kyrgyz <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -14,6 +14,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Кайтадан жаралуу"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+#, fuzzy
+msgid "You died"
+msgstr "Сиз өлдүңүз."
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -40,10 +49,6 @@ msgstr "Туташуу"
 msgid "The server has requested a reconnect:"
 msgstr ""
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Жүктөлүүдө..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr ""
@@ -57,10 +62,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr ""
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr ""
 
@@ -68,7 +69,8 @@ msgstr ""
 msgid "We support protocol versions between version $1 and $2."
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +80,8 @@ msgstr ""
 msgid "Cancel"
 msgstr "Жокко чыгаруу"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 #, fuzzy
 msgid "Dependencies:"
 msgstr "көз карандылыктары:"
@@ -157,15 +160,55 @@ msgid "enabled"
 msgstr "күйгүзүлгөн"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Жүктөлүүдө..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
 msgid "Back to Main Menu"
 msgstr "Башкы меню"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Оюн"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -190,6 +233,14 @@ msgid "Install"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr ""
@@ -203,8 +254,23 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
@@ -220,7 +286,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -473,10 +543,6 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 #, fuzzy
 msgid "Disabled"
 msgstr "Баарын өчүрүү"
@@ -523,6 +589,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 #, fuzzy
 msgid "Select directory"
 msgstr "Дүйнөнү тандаңыз:"
@@ -646,6 +716,18 @@ msgstr "Дүйнөнү инициалдаштыруу ката�ы"
 msgid "Unable to install a modpack as a $1"
 msgstr "Дүйнөнү инициалдаштыруу ката�ы"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Жүктөлүүдө..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -701,7 +783,14 @@ msgid "Credits"
 msgstr "�лкыштар"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Дүйнөнү тандаңыз:"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -721,14 +810,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Ыра�тоо"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Жаратуу режими"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Убалды күйгүзүү"
 
@@ -746,8 +831,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "�ты/�ыр�өзү"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -759,6 +844,11 @@ msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 #, fuzzy
+msgid "Password"
+msgstr "Жаңы �ыр�өз"
+
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
 msgid "Play Game"
 msgstr "Оюнду баштоо/туташуу"
 
@@ -767,6 +857,11 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Дүйнөнү тандаңыз:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Дүйнөнү тандаңыз:"
 
@@ -784,26 +879,26 @@ msgstr "Оюн"
 msgid "Address / Port"
 msgstr "Дареги/порту"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Туташуу"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 #, fuzzy
 msgid "Creative mode"
 msgstr "Жаратуу режими"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 #, fuzzy
 msgid "Damage enabled"
 msgstr "күйгүзүлгөн"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 #, fuzzy
 msgid "Del. Favorite"
 msgstr "Тандалмалар:"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 #, fuzzy
 msgid "Favorite"
 msgstr "Тандалмалар:"
@@ -813,17 +908,17 @@ msgstr "Тандалмалар:"
 msgid "Join Game"
 msgstr "Оюн"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 #, fuzzy
 msgid "Name / Password"
 msgstr "�ты/�ыр�өзү"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 #, fuzzy
 msgid "PvP enabled"
 msgstr "күйгүзүлгөн"
@@ -855,11 +950,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Бир кишилик"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -868,11 +958,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr "Эки�ызык чыпкалоо�у"
 
-#: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Bump Mapping"
-msgstr "Mip-тек�туралоо"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 #, fuzzy
 msgid "Change Keys"
@@ -889,10 +974,6 @@ msgid "Fancy Leaves"
 msgstr "Күңүрт �уу"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Mipmap"
 msgstr "Mip-тек�туралоо"
@@ -902,10 +983,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Жок"
-
-#: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "No Filter"
 msgstr "�низатропи� чыпкалоо�у"
@@ -939,10 +1016,6 @@ msgstr "Күңүрт �уу"
 msgid "Opaque Water"
 msgstr "Күңүрт �уу"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Particles"
@@ -950,11 +1023,6 @@ msgstr "Баарын күйгүзүү"
 
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
-msgid "Reset singleplayer world"
-msgstr "Бир кишилик"
-
-#: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Screen:"
 msgstr "Тез �үрөт"
 
@@ -967,6 +1035,10 @@ msgid "Shaders"
 msgstr "Көлөкөлөгүчтөр"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -1017,25 +1089,6 @@ msgstr "Кооз бактар"
 msgid "Waving Plants"
 msgstr "Кооз бактар"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ооба"
-
-#: builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
-msgid "Config mods"
-msgstr "Ыра�тоо"
-
-#: builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
-msgid "Main"
-msgstr "Башкы меню"
-
-#: builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
-msgid "Start Singleplayer"
-msgstr "Бир кишилик"
-
 #: src/client/client.cpp
 #, fuzzy
 msgid "Connection timed out."
@@ -1209,18 +1262,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Жары�ланба� башкаруу:\n"
 "- WASD: ба�уу\n"
@@ -1326,16 +1376,6 @@ msgid "Fog enabled"
 msgstr "күйгүзүлгөн"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Баарын өчүрүү"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "күйгүзүлгөн"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1359,16 +1399,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Баарын өчүрүү"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "күйгүзүлгөн"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1381,34 +1411,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1454,10 +1456,6 @@ msgid "Resolving address..."
 msgstr "Дареги чечилүүдө..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Кайтадан жаралуу"
-
-#: src/client/game.cpp
 #, fuzzy
 msgid "Shutting down..."
 msgstr "Оюн өчүрүлүүдө..."
@@ -1513,11 +1511,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "You died"
-msgstr "Сиз өлдүңүз."
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1535,15 +1528,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Ба�кычтарды өзгөртүү"
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1828,6 +1812,24 @@ msgstr ""
 msgid "Zoom"
 msgstr "Ма�штаб"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Сыр�өздөр дал келген жок!"
@@ -1868,26 +1870,6 @@ msgid "Backward"
 msgstr "�ртка"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
 msgid "Change camera"
 msgstr "Ба�кычтарды өзгөртүү"
@@ -1986,31 +1968,11 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Special Inv."
-msgstr "Уурданып ба�уу"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Тез ба�ууга которуу"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Тез ба�ууга которуу"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle HUD"
 msgstr "Учууга которуу"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Toggle Killaura"
-msgstr "Учууга которуу"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle chat log"
 msgstr "Тез ба�ууга которуу"
 
@@ -2124,12 +2086,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2237,6 +2193,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2476,11 +2436,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Bumpmapping"
-msgstr "Mip-тек�туралоо"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2551,16 +2506,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2726,6 +2671,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "Улантуу"
@@ -2785,7 +2734,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2793,7 +2744,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2895,12 +2848,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2972,6 +2919,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Dig key"
+msgstr "Оң меню"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Digging particles"
 msgstr "Баарын күйгүзүү"
 
@@ -3033,7 +2985,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3121,14 +3073,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3139,18 +3083,6 @@ msgstr "Убалды күйгүзүү"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3167,12 +3099,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3182,7 +3108,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3486,10 +3412,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3543,8 +3465,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -4015,6 +3937,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4096,6 +4022,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4195,6 +4128,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4754,11 +4694,6 @@ msgid "Main menu script"
 msgstr "Башкы меню"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Башкы меню"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4772,6 +4707,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4935,7 +4878,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4984,6 +4927,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5216,14 +5166,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5249,10 +5191,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5278,34 +5216,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5372,6 +5282,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Жаратуу режими"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5530,10 +5449,6 @@ msgid "Right key"
 msgstr "Оң меню"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5792,6 +5707,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5925,10 +5850,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6022,6 +5943,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6080,8 +6005,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6107,15 +6032,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6252,6 +6182,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6460,6 +6401,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6583,6 +6530,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6594,10 +6559,29 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Бир кишилик"
+
 #~ msgid "Back"
 #~ msgstr "�ртка"
 
 #, fuzzy
+#~ msgid "Bump Mapping"
+#~ msgstr "Mip-тек�туралоо"
+
+#, fuzzy
+#~ msgid "Bumpmapping"
+#~ msgstr "Mip-тек�туралоо"
+
+#, fuzzy
+#~ msgid "Config mods"
+#~ msgstr "Ыра�тоо"
+
+#~ msgid "Configure"
+#~ msgstr "Ыра�тоо"
+
+#, fuzzy
 #~ msgid "Enable VBO"
 #~ msgstr "Баарын күйгүзүү"
 
@@ -6606,5 +6590,34 @@ msgstr ""
 #~ msgstr "Убалды күйгүзүү"
 
 #, fuzzy
+#~ msgid "Main"
+#~ msgstr "Башкы меню"
+
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "Башкы меню"
+
+#~ msgid "Name/Password"
+#~ msgstr "�ты/�ыр�өзү"
+
+#~ msgid "No"
+#~ msgstr "Жок"
+
+#, fuzzy
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Бир кишилик"
+
+#, fuzzy
 #~ msgid "Select Package File:"
 #~ msgstr "Дүйнөнү тандаңыз:"
+
+#, fuzzy
+#~ msgid "Start Singleplayer"
+#~ msgstr "Бир кишилик"
+
+#, fuzzy
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Тез ба�ууга которуу"
+
+#~ msgid "Yes"
+#~ msgstr "Ооба"
diff --git a/po/lo/minetest.po b/po/lo/minetest.po
deleted file mode 100644
index 47bbaf3d9..000000000
--- a/po/lo/minetest.po
+++ /dev/null
@@ -1,6394 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Lao (Minetest)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-01-11 18:26+0000\n"
-"Last-Translator: rubenwardy <rubenwardy@gmail.com>\n"
-"Language-Team: Lao <https://hosted.weblate.org/projects/minetest/minetest/lo/"
-">\n"
-"Language: lo\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 3.10.1\n"
-
-#: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
-msgid "OK"
-msgstr ""
-
-#: builtin/fstk/ui.lua
-msgid "An error occurred in a Lua script:"
-msgstr ""
-
-#: builtin/fstk/ui.lua
-msgid "An error occurred:"
-msgstr ""
-
-#: builtin/fstk/ui.lua
-msgid "Main menu"
-msgstr ""
-
-#: builtin/fstk/ui.lua
-msgid "Reconnect"
-msgstr ""
-
-#: builtin/fstk/ui.lua
-msgid "The server has requested a reconnect:"
-msgstr ""
-
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
-#: builtin/mainmenu/common.lua
-msgid "Protocol version mismatch. "
-msgstr ""
-
-#: builtin/mainmenu/common.lua
-msgid "Server enforces protocol version $1. "
-msgstr ""
-
-#: builtin/mainmenu/common.lua
-msgid "Server supports protocol versions between $1 and $2. "
-msgstr ""
-
-#: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-
-#: builtin/mainmenu/common.lua
-msgid "We only support protocol version $1."
-msgstr ""
-
-#: builtin/mainmenu/common.lua
-msgid "We support protocol versions between version $1 and $2."
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
-#: builtin/mainmenu/dlg_delete_content.lua
-#: builtin/mainmenu/dlg_delete_world.lua
-#: builtin/mainmenu/dlg_rename_modpack.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua src/client/keycode.cpp
-#: src/gui/guiConfirmRegistration.cpp src/gui/guiKeyChangeMenu.cpp
-#: src/gui/guiPasswordChange.cpp
-msgid "Cancel"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
-msgid "Dependencies:"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Disable all"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Disable modpack"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Enable all"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Enable modpack"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid ""
-"Failed to enable mod \"$1\" as it contains disallowed characters. Only "
-"characters [a-z0-9_] are allowed."
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Find More Mods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "Mod:"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "No (optional) dependencies"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "No game description provided."
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "No hard dependencies"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "No modpack description provided."
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "No optional dependencies"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
-msgid "Optional dependencies:"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua src/gui/guiKeyChangeMenu.cpp
-msgid "Save"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "World:"
-msgstr ""
-
-#: builtin/mainmenu/dlg_config_world.lua
-msgid "enabled"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "All packages"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "Back to Main Menu"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "Downloading..."
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "Failed to download $1"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Games"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "Install"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Mods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "No packages could be retrieved"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "No results"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "Texture packs"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "Uninstall"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "Update"
-msgstr ""
-
-#: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "A world named \"$1\" already exists"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Additional terrain"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-msgid "Altitude chill"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Altitude dry"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Biome blending"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Biomes"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Caverns"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Caves"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Create"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Decorations"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Download a game, such as Minetest Game, from minetest.net"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Download one from minetest.net"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Dungeons"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Flat terrain"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Floating landmasses in the sky"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Floatlands (experimental)"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-msgid "Game"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Hills"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Humid rivers"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Increases humidity around rivers"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Lakes"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-msgid "Mapgen"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-msgid "Mapgen flags"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Mapgen-specific flags"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Mountains"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Mud flow"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Network of tunnels and caves"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "No game selected"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Reduces heat with altitude"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Reduces humidity with altitude"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Rivers"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Sea level rivers"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Seed"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Smooth transition between biomes"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid ""
-"Structures appearing on the terrain (no effect on trees and jungle grass "
-"created by v6)"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Temperate, Desert"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Temperate, Desert, Jungle"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Terrain surface erosion"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Trees and jungle grass"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Vary river depth"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Very large caverns deep in the underground"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "Warning: The Development Test is meant for developers."
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "World name"
-msgstr ""
-
-#: builtin/mainmenu/dlg_create_world.lua
-msgid "You have no games installed."
-msgstr ""
-
-#: builtin/mainmenu/dlg_delete_content.lua
-msgid "Are you sure you want to delete \"$1\"?"
-msgstr ""
-
-#: builtin/mainmenu/dlg_delete_content.lua
-#: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/tab_local.lua
-#: src/client/keycode.cpp
-msgid "Delete"
-msgstr ""
-
-#: builtin/mainmenu/dlg_delete_content.lua
-msgid "pkgmgr: failed to delete \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/dlg_delete_content.lua
-msgid "pkgmgr: invalid path \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/dlg_delete_world.lua
-msgid "Delete World \"$1\"?"
-msgstr ""
-
-#: builtin/mainmenu/dlg_rename_modpack.lua
-msgid "Accept"
-msgstr ""
-
-#: builtin/mainmenu/dlg_rename_modpack.lua
-msgid "Rename Modpack:"
-msgstr ""
-
-#: builtin/mainmenu/dlg_rename_modpack.lua
-msgid ""
-"This modpack has an explicit name given in its modpack.conf which will "
-"override any renaming here."
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "(No description of setting given)"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "2D Noise"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "< Back to Settings page"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Browse"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Disabled"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Edit"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Enabled"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Lacunarity"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Octaves"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
-msgid "Offset"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Persistance"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Please enter a valid integer."
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Please enter a valid number."
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Restore Default"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
-msgid "Scale"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Select directory"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Select file"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Show technical names"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "The value must be at least $1."
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "The value must not be larger than $1."
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "X"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "X spread"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Y"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Y spread"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Z"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Z spread"
-msgstr ""
-
-#. ~ "absvalue" is a noise parameter flag.
-#. It is short for "absolute value".
-#. It can be enabled in noise settings in
-#. main menu -> "All Settings".
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "absvalue"
-msgstr ""
-
-#. ~ "defaults" is a noise parameter flag.
-#. It describes the default processing options
-#. for noise settings in main menu -> "All Settings".
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "defaults"
-msgstr ""
-
-#. ~ "eased" is a noise parameter flag.
-#. It is used to make the map smoother and
-#. can be enabled in noise settings in
-#. main menu -> "All Settings".
-#: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "eased"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "$1 (Enabled)"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "$1 mods"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "Failed to install $1 to $2"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "Install Mod: Unable to find real mod name for: $1"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "Install Mod: Unable to find suitable folder name for modpack $1"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "Install: Unsupported file type \"$1\" or broken archive"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "Install: file: \"$1\""
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "Unable to find a valid mod or modpack"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "Unable to install a $1 as a texture pack"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "Unable to install a game as a $1"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "Unable to install a mod as a $1"
-msgstr ""
-
-#: builtin/mainmenu/pkgmgr.lua
-msgid "Unable to install a modpack as a $1"
-msgstr ""
-
-#: builtin/mainmenu/tab_content.lua
-msgid "Browse online content"
-msgstr ""
-
-#: builtin/mainmenu/tab_content.lua
-msgid "Content"
-msgstr ""
-
-#: builtin/mainmenu/tab_content.lua
-msgid "Disable Texture Pack"
-msgstr ""
-
-#: builtin/mainmenu/tab_content.lua
-msgid "Information:"
-msgstr ""
-
-#: builtin/mainmenu/tab_content.lua
-msgid "Installed Packages:"
-msgstr ""
-
-#: builtin/mainmenu/tab_content.lua
-msgid "No dependencies."
-msgstr ""
-
-#: builtin/mainmenu/tab_content.lua
-msgid "No package description available"
-msgstr ""
-
-#: builtin/mainmenu/tab_content.lua
-msgid "Rename"
-msgstr ""
-
-#: builtin/mainmenu/tab_content.lua
-msgid "Uninstall Package"
-msgstr ""
-
-#: builtin/mainmenu/tab_content.lua
-msgid "Use Texture Pack"
-msgstr ""
-
-#: builtin/mainmenu/tab_credits.lua
-msgid "Active Contributors"
-msgstr ""
-
-#: builtin/mainmenu/tab_credits.lua
-msgid "Core Developers"
-msgstr ""
-
-#: builtin/mainmenu/tab_credits.lua
-msgid "Credits"
-msgstr ""
-
-#: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
-msgstr ""
-
-#: builtin/mainmenu/tab_credits.lua
-msgid "Previous Contributors"
-msgstr ""
-
-#: builtin/mainmenu/tab_credits.lua
-msgid "Previous Core Developers"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Announce Server"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Bind Address"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Creative Mode"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Enable Damage"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Host Game"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Host Server"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Install games from ContentDB"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "New"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "No world created or selected!"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Play Game"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Port"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Select World:"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Server Port"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua
-msgid "Start Game"
-msgstr ""
-
-#: builtin/mainmenu/tab_online.lua
-msgid "Address / Port"
-msgstr ""
-
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Connect"
-msgstr ""
-
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Creative mode"
-msgstr ""
-
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Damage enabled"
-msgstr ""
-
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Del. Favorite"
-msgstr ""
-
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Favorite"
-msgstr ""
-
-#: builtin/mainmenu/tab_online.lua
-msgid "Join Game"
-msgstr ""
-
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Name / Password"
-msgstr ""
-
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-msgid "Ping"
-msgstr ""
-
-#. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-msgid "PvP enabled"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "2x"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "3D Clouds"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "4x"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "8x"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "All Settings"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Antialiasing:"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Autosave Screen Size"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bilinear Filter"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua src/client/game.cpp
-msgid "Change Keys"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Connected Glass"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Fancy Leaves"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Mipmap"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Mipmap + Aniso. Filter"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No Filter"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No Mipmap"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Node Highlighting"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Node Outlining"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "None"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Opaque Leaves"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Opaque Water"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Particles"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Screen:"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Settings"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Shaders"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Shaders (unavailable)"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Simple Leaves"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Smooth Lighting"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Texturing:"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Tone Mapping"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Touchthreshold: (px)"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Trilinear Filter"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Waving Leaves"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Waving Liquids"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Waving Plants"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
-#: src/client/client.cpp
-msgid "Connection timed out."
-msgstr ""
-
-#: src/client/client.cpp
-msgid "Done!"
-msgstr ""
-
-#: src/client/client.cpp
-msgid "Initializing nodes"
-msgstr ""
-
-#: src/client/client.cpp
-msgid "Initializing nodes..."
-msgstr ""
-
-#: src/client/client.cpp
-msgid "Loading textures..."
-msgstr ""
-
-#: src/client/client.cpp
-msgid "Rebuilding shaders..."
-msgstr ""
-
-#: src/client/clientlauncher.cpp
-msgid "Connection error (timed out?)"
-msgstr ""
-
-#: src/client/clientlauncher.cpp
-msgid "Could not find or load game \""
-msgstr ""
-
-#: src/client/clientlauncher.cpp
-msgid "Invalid gamespec."
-msgstr ""
-
-#: src/client/clientlauncher.cpp
-msgid "Main Menu"
-msgstr ""
-
-#: src/client/clientlauncher.cpp
-msgid "No world selected and no address provided. Nothing to do."
-msgstr ""
-
-#: src/client/clientlauncher.cpp
-msgid "Player name too long."
-msgstr ""
-
-#: src/client/clientlauncher.cpp
-msgid "Please choose a name!"
-msgstr ""
-
-#: src/client/clientlauncher.cpp
-msgid "Provided password file failed to open: "
-msgstr ""
-
-#: src/client/clientlauncher.cpp
-msgid "Provided world path doesn't exist: "
-msgstr ""
-
-#. ~ DO NOT TRANSLATE THIS LITERALLY!
-#. This is a special string. Put either "no" or "yes"
-#. into the translation field (literally).
-#. Choose "yes" if the language requires use of the fallback
-#. font, "no" otherwise.
-#. The fallback font is (normally) required for languages with
-#. non-Latin script, like Chinese.
-#. When in doubt, test your translation.
-#: src/client/fontengine.cpp
-msgid "needs_fallback_font"
-msgstr "yes"
-
-#: src/client/game.cpp
-msgid ""
-"\n"
-"Check debug.txt for details."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "- Address: "
-msgstr ""
-
-#: src/client/game.cpp
-msgid "- Creative Mode: "
-msgstr ""
-
-#: src/client/game.cpp
-msgid "- Damage: "
-msgstr ""
-
-#: src/client/game.cpp
-msgid "- Mode: "
-msgstr ""
-
-#: src/client/game.cpp
-msgid "- Port: "
-msgstr ""
-
-#: src/client/game.cpp
-msgid "- Public: "
-msgstr ""
-
-#. ~ PvP = Player versus Player
-#: src/client/game.cpp
-msgid "- PvP: "
-msgstr ""
-
-#: src/client/game.cpp
-msgid "- Server Name: "
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Automatic forward disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Automatic forward enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Camera update disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Camera update enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Change Password"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Cinematic mode disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Cinematic mode enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Client side scripting is disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Connecting to server..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Continue"
-msgstr ""
-
-#: src/client/game.cpp
-#, c-format
-msgid ""
-"Controls:\n"
-"- %s: move forwards\n"
-"- %s: move backwards\n"
-"- %s: move left\n"
-"- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
-"- %s: drop item\n"
-"- %s: inventory\n"
-"- %s: special inventory\n"
-"- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
-"- Mouse wheel: select item\n"
-"- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Creating client..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Creating server..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Debug info and profiler graph hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Debug info shown"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Debug info, profiler graph, and wireframe hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid ""
-"Default Controls:\n"
-"No menu visible:\n"
-"- single tap: button activate\n"
-"- double tap: place/use\n"
-"- slide finger: look around\n"
-"Menu/Inventory visible:\n"
-"- double tap (outside):\n"
-" -->close\n"
-"- touch stack, touch slot:\n"
-" --> move stack\n"
-"- touch&drag, tap 2nd finger\n"
-" --> place single item to slot\n"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Disabled unlimited viewing range"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Enabled unlimited viewing range"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Exit to Menu"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Exit to OS"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Fast mode disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Fast mode enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Fly mode disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Fly mode enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Fog disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Fog enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Game info:"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Game paused"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Hosting server"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Item definitions..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "KiB/s"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Media..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "MiB/s"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap currently disabled by game or mod"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Noclip mode disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Noclip mode enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Noclip mode enabled (note: no 'noclip' privilege)"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Node definitions..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Off"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "On"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Pitch move mode disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Pitch move mode enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Profiler graph shown"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Remote server"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Resolving address..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Respawn"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Shutting down..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Singleplayer"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Sound Volume"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Sound muted"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Sound system is disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Sound system is not supported on this build"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Sound unmuted"
-msgstr ""
-
-#: src/client/game.cpp
-#, c-format
-msgid "Viewing range changed to %d"
-msgstr ""
-
-#: src/client/game.cpp
-#, c-format
-msgid "Viewing range is at maximum: %d"
-msgstr ""
-
-#: src/client/game.cpp
-#, c-format
-msgid "Viewing range is at minimum: %d"
-msgstr ""
-
-#: src/client/game.cpp
-#, c-format
-msgid "Volume changed to %d%%"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Wireframe shown"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "You died"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Zoom currently disabled by game or mod"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "ok"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Chat hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Chat shown"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "HUD hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "HUD shown"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Profiler hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-#, c-format
-msgid "Profiler shown (page %d of %d)"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Apps"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Backspace"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Caps Lock"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Clear"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Control"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Down"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "End"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Erase EOF"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Execute"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Help"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Home"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "IME Accept"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "IME Convert"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "IME Escape"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "IME Mode Change"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "IME Nonconvert"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Insert"
-msgstr ""
-
-#: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
-msgid "Left"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Left Button"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Left Control"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Left Menu"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Left Shift"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Left Windows"
-msgstr ""
-
-#. ~ Key name, common on Windows keyboards
-#: src/client/keycode.cpp
-msgid "Menu"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Middle Button"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Num Lock"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad *"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad +"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad -"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad ."
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad /"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad 0"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad 1"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad 2"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad 3"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad 4"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad 5"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad 6"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad 7"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad 8"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Numpad 9"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "OEM Clear"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Page down"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Page up"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Pause"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Play"
-msgstr ""
-
-#. ~ "Print screen" key
-#: src/client/keycode.cpp
-msgid "Print"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Return"
-msgstr ""
-
-#: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
-msgid "Right"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Right Button"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Right Control"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Right Menu"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Right Shift"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Right Windows"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Scroll Lock"
-msgstr ""
-
-#. ~ Key name
-#: src/client/keycode.cpp
-msgid "Select"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Shift"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Sleep"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Snapshot"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Space"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Tab"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "Up"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "X Button 1"
-msgstr ""
-
-#: src/client/keycode.cpp
-msgid "X Button 2"
-msgstr ""
-
-#: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
-msgid "Zoom"
-msgstr ""
-
-#: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
-msgid "Passwords do not match!"
-msgstr ""
-
-#: src/gui/guiConfirmRegistration.cpp
-msgid "Register and Join"
-msgstr ""
-
-#: src/gui/guiConfirmRegistration.cpp
-#, c-format
-msgid ""
-"You are about to join this server with the name \"%s\" for the first time.\n"
-"If you proceed, a new account using your credentials will be created on this "
-"server.\n"
-"Please retype your password and click 'Register and Join' to confirm account "
-"creation, or click 'Cancel' to abort."
-msgstr ""
-
-#: src/gui/guiFormSpecMenu.cpp
-msgid "Proceed"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "\"Special\" = climb down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Autoforward"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
-msgid "Automatic jumping"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Backward"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Change camera"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Chat"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Command"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Console"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Dec. range"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Dec. volume"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Double tap \"jump\" to toggle fly"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Drop"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Forward"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Inc. range"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Inc. volume"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Inventory"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Jump"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Key already in use"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Local command"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Mute"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Next item"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Prev. item"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Range select"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
-msgid "Screenshot"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Sneak"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Special"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle HUD"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle chat log"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle fast"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle fly"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle fog"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle minimap"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle noclip"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle pitchmove"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "press key"
-msgstr ""
-
-#: src/gui/guiPasswordChange.cpp
-msgid "Change"
-msgstr ""
-
-#: src/gui/guiPasswordChange.cpp
-msgid "Confirm Password"
-msgstr ""
-
-#: src/gui/guiPasswordChange.cpp
-msgid "New Password"
-msgstr ""
-
-#: src/gui/guiPasswordChange.cpp
-msgid "Old Password"
-msgstr ""
-
-#: src/gui/guiVolumeChange.cpp
-msgid "Exit"
-msgstr ""
-
-#: src/gui/guiVolumeChange.cpp
-msgid "Muted"
-msgstr ""
-
-#: src/gui/guiVolumeChange.cpp
-msgid "Sound Volume: "
-msgstr ""
-
-#. ~ Imperative, as in "Enter/type in text".
-#. Don't forget the space.
-#: src/gui/modalMenu.cpp
-msgid "Enter "
-msgstr ""
-
-#. ~ DO NOT TRANSLATE THIS LITERALLY!
-#. This is a special string which needs to contain the translation's
-#. language code (e.g. "de" for German).
-#: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
-msgid "LANG_CODE"
-msgstr "lo"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"(Android) Fixes the position of virtual joystick.\n"
-"If disabled, virtual joystick will center to first-touch's position."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"(Android) Use virtual joystick to trigger \"aux\" button.\n"
-"If enabled, virtual joystick will also tap \"aux\" button when out of main "
-"circle."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"(X,Y,Z) offset of fractal from world center in units of 'scale'.\n"
-"Can be used to move a desired point to (0, 0) to create a\n"
-"suitable spawn point, or to allow 'zooming in' on a desired\n"
-"point by increasing 'scale'.\n"
-"The default is tuned for a suitable spawn point for Mandelbrot\n"
-"sets with default parameters, it may need altering in other\n"
-"situations.\n"
-"Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"(X,Y,Z) scale of fractal in nodes.\n"
-"Actual fractal size will be 2 to 3 times larger.\n"
-"These numbers can be made very large, the fractal does\n"
-"not have to fit inside the world.\n"
-"Increase these to 'zoom' into the detail of the fractal.\n"
-"Default is for a vertically-squashed shape suitable for\n"
-"an island, set all 3 numbers equal for the raw shape."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "2D noise that controls the shape/size of ridged mountains."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "2D noise that controls the shape/size of rolling hills."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "2D noise that controls the shape/size of step mountains."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "2D noise that controls the size/occurrence of ridged mountain ranges."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "2D noise that controls the size/occurrence of rolling hills."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "2D noise that controls the size/occurrence of step mountain ranges."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "2D noise that locates the river valleys and channels."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "3D clouds"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "3D mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "3D mode parallax strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "3D noise defining giant caverns."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"3D noise defining mountain structure and height.\n"
-"Also defines structure of floatland mountain terrain."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"3D noise defining structure of floatlands.\n"
-"If altered from the default, the noise 'scale' (0.7 by default) may need\n"
-"to be adjusted, as floatland tapering functions best when this noise has\n"
-"a value range of approximately -2.0 to 2.0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "3D noise defining structure of river canyon walls."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "3D noise defining terrain."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "3D noise for mountain overhangs, cliffs, etc. Usually small variations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "3D noise that determines number of dungeons per mapchunk."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"3D support.\n"
-"Currently supported:\n"
-"-    none: no 3d output.\n"
-"-    anaglyph: cyan/magenta color 3d.\n"
-"-    interlaced: odd/even line based polarisation screen support.\n"
-"-    topbottom: split screen top/bottom.\n"
-"-    sidebyside: split screen side by side.\n"
-"-    crossview: Cross-eyed 3d\n"
-"-    pageflip: quadbuffer based 3d.\n"
-"Note that the interlaced mode requires shaders to be enabled."
-msgstr ""
-
-#: 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 ""
-
-#: src/settings_translation_file.cpp
-msgid "A message to be displayed to all clients when the server crashes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "A message to be displayed to all clients when the server shuts down."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "ABM interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Absolute limit of queued blocks to emerge"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Acceleration in air"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Acceleration of gravity, in nodes per second per second."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Active Block Modifiers"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Active block management interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Active block range"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Active object send range"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Address to connect to.\n"
-"Leave this blank to start a local server.\n"
-"Note that the address field in the main menu overrides this setting."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Adds particles when digging a node."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
-"screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-#, c-format
-msgid ""
-"Adjusts the density of the floatland layer.\n"
-"Increase value to increase density. Can be positive or negative.\n"
-"Value = 0.0: 50% of volume is floatland.\n"
-"Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
-"to be sure) creates a solid floatland layer."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Advanced"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Alters the light curve by applying 'gamma correction' to it.\n"
-"Higher values make middle and lower light levels brighter.\n"
-"Value '1.0' leaves the light curve unaltered.\n"
-"This only has significant effect on daylight and artificial\n"
-"light, it has very little effect on natural night light."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Always fly and fast"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ambient occlusion gamma"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Amount of messages a player may send per 10 seconds."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Amplifies the valleys."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Anisotropic filtering"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Announce server"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Announce to this serverlist."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Append item name"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Append item name to tooltip."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Apple trees noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Arm inertia"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Arm inertia, gives a more realistic movement of\n"
-"the arm when the camera moves."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ask to reconnect after crash"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"At this distance the server will aggressively optimize which blocks are sent "
-"to\n"
-"clients.\n"
-"Small values potentially improve performance a lot, at the expense of "
-"visible\n"
-"rendering glitches (some blocks will not be rendered under water and in "
-"caves,\n"
-"as well as sometimes on land).\n"
-"Setting this to a value greater than max_block_send_distance disables this\n"
-"optimization.\n"
-"Stated in mapblocks (16 nodes)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Automatic forward key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Automatically jump up single-node obstacles."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Automatically report to the serverlist."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Autosave screen size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Autoscaling mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Backward key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Base ground level"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Base terrain height."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Basic"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Basic privileges"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Beach noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Beach noise threshold"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bilinear filtering"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bind address"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Biome API temperature and humidity noise parameters"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Biome noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Block send optimize distance"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bold and italic font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bold and italic monospace font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bold font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bold monospace font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Build inside player"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Builtin"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
-"Only works on GLES platforms. Most users will not need to change this.\n"
-"Increasing can reduce artifacting on weaker GPUs.\n"
-"0.1 = Default, 0.25 = Good value for weaker tablets."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Camera smoothing"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Camera smoothing in cinematic mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Camera update toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cave noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cave noise #1"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cave noise #2"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cave width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cave1 noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cave2 noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cavern limit"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cavern noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cavern taper"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cavern threshold"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cavern upper limit"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Center of light curve boost range.\n"
-"Where 0.0 is minimum light level, 1.0 is maximum light level."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chat font size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chat key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chat log level"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chat message count limit"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chat message format"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chat message kick threshold"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chat message max length"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chat toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chatcommands"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Chunk size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cinematic mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cinematic mode key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Clean transparent textures"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Client"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Client and Server"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Client modding"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Client side modding restrictions"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Client side node lookup range restriction"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Climbing speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Cloud radius"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Clouds"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Clouds are a client side effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Clouds in menu"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Colored fog"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-separated list of flags to hide in the content repository.\n"
-"\"nonfree\" can be used to hide packages which do not qualify as 'free "
-"software',\n"
-"as defined by the Free Software Foundation.\n"
-"You can also specify content ratings.\n"
-"These flags are independent from Minetest versions,\n"
-"so see a full list at https://content.minetest.net/help/content_flags/"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
-"allow them to upload and download data to/from the internet."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-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 ""
-
-#: src/settings_translation_file.cpp
-msgid "Command key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Connect glass"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Connect to external media server"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Connects glass if supported by node."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Console alpha"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Console color"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Console height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "ContentDB Flag Blacklist"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "ContentDB URL"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Continuous forward"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Continuous forward movement, toggled by autoforward key.\n"
-"Press the autoforward key again or the backwards movement to disable."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Controls"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Controls length of day/night cycle.\n"
-"Examples:\n"
-"72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Controls sinking speed in liquid."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Controls steepness/depth of lake depressions."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Controls steepness/height of hills."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Controls width of tunnels, a smaller value creates wider tunnels.\n"
-"Value >= 10.0 completely disables generation of tunnels and avoids the\n"
-"intensive noise calculations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Crash message"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Creative"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Crosshair alpha"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Crosshair color"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "DPI"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Damage"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Debug info toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Debug log file size threshold"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Debug log level"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Dec. volume key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Decrease this to increase liquid resistance to movement."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Dedicated server step"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Default acceleration"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Default game"
-msgstr ""
-
-#: 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 ""
-
-#: src/settings_translation_file.cpp
-msgid "Default password"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Default privileges"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Default report format"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Default stack size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Default timeout for cURL, stated in milliseconds.\n"
-"Only has an effect if compiled with cURL."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines areas where trees have apples."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines areas with sandy beaches."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines distribution of higher terrain and steepness of cliffs."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines distribution of higher terrain."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines full size of caverns, smaller values create larger caverns."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines large-scale river channel structure."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines location and terrain of optional hills and lakes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines the base ground level."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines the depth of the river channel."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines the width of the river channel."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines the width of the river valley."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Defines tree areas and tree density."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Delay between mesh updates on the client in ms. Increasing this will slow\n"
-"down the rate of mesh updates, thus reducing jitter on slower clients."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Delay in sending blocks after building"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Delay showing tooltips, stated in milliseconds."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Deprecated Lua API handling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Depth below which you'll find giant caverns."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Depth below which you'll find large caves."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Description of server, to be displayed when players join and in the "
-"serverlist."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Desert noise threshold"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Deserts occur when np_biome exceeds this value.\n"
-"When the 'snowbiomes' flag is enabled, this is ignored."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Desynchronize block animation"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Digging particles"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Disable anticheat"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Disallow empty passwords"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Domain name of server, to be displayed in the serverlist."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Double tap jump for fly"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Double-tapping the jump key toggles fly mode."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Drop item key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Dump the mapgen debug information."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Dungeon maximum Y"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Dungeon minimum Y"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Dungeon noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable IPv6 support (for both client and server).\n"
-"Required for IPv6 connections to work at all."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable Lua modding support on client.\n"
-"This support is experimental and API can change."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable console window"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable joysticks"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable mod channels support."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable mod security"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable players getting damage and dying."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable random user input (only used for testing)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enable register confirmation"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable register confirmation when connecting to server.\n"
-"If disabled, new account will be registered automatically."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable smooth lighting with simple ambient occlusion.\n"
-"Disable for speed or for different looks."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable to disallow old clients from connecting.\n"
-"Older clients are compatible in the sense that they will not crash when "
-"connecting\n"
-"to new servers, but they may not support all new features that you are "
-"expecting."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable usage of remote media server (if provided by server).\n"
-"Remote servers offer a significantly faster way to download media (e.g. "
-"textures)\n"
-"when connecting to the server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable vertex buffer objects.\n"
-"This should greatly improve graphics performance."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable view bobbing and amount of view bobbing.\n"
-"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enable/disable running an IPv6 server.\n"
-"Ignored if bind_address is set.\n"
-"Needs enable_ipv6 to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables Hable's 'Uncharted 2' filmic tone mapping.\n"
-"Simulates the tone curve of photographic film and how this approximates the\n"
-"appearance of high dynamic range images. Mid-range contrast is slightly\n"
-"enhanced, highlights and shadows are gradually compressed."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enables animation of inventory items."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enables caching of facedir rotated meshes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Enables minimap."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables the sound system.\n"
-"If disabled, this completely disables all sounds everywhere and the in-game\n"
-"sound controls will be non-functional.\n"
-"Changing this setting requires a restart."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Engine profiling data print interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Entity methods"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Exponent of the floatland tapering. Alters the tapering behaviour.\n"
-"Value = 1.0 creates a uniform, linear tapering.\n"
-"Values > 1.0 create a smooth tapering suitable for the default separated\n"
-"floatlands.\n"
-"Values < 1.0 (for example 0.25) create a more defined surface level with\n"
-"flatter lowlands, suitable for a solid floatland layer."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "FSAA"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Factor noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fall bobbing factor"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font shadow"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font shadow alpha"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fallback font size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fast key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fast mode acceleration"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fast mode speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fast movement"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Fast movement (via the \"special\" key).\n"
-"This requires the \"fast\" privilege on the server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Field of view"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Field of view in degrees."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"File in client/serverlist/ that contains your favorite servers displayed in "
-"the\n"
-"Multiplayer Tab."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Filler depth"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Filler depth noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Filmic tone mapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Filtered textures can blend RGB values with fully-transparent neighbors,\n"
-"which PNG optimizers usually discard, sometimes resulting in a dark or\n"
-"light edge to transparent textures. Apply this filter to clean that up\n"
-"at texture load time."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Filtering"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "First of 4 2D noises that together define hill/mountain range height."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "First of two 3D noises that together define tunnels."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fixed map seed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fixed virtual joystick"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Floatland density"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Floatland maximum Y"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Floatland minimum Y"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Floatland noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Floatland taper exponent"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Floatland tapering distance"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Floatland water level"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fly key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Flying"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fog"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fog start"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fog toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font bold by default"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font italic by default"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font shadow alpha"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font size of the default font in point (pt)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font size of the fallback font in point (pt)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Font size of the monospace font in point (pt)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Font size of the recent chat text and chat prompt in point (pt).\n"
-"Value 0 will use the default font size."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Format of player chat messages. The following strings are valid "
-"placeholders:\n"
-"@name, @message, @timestamp (optional)"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Format of screenshots."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Formspec Default Background Color"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Formspec Default Background Opacity"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Formspec Full-Screen Background Color"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Formspec Full-Screen Background Opacity"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Formspec default background color (R,G,B)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Formspec default background opacity (between 0 and 255)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Formspec full-screen background color (R,G,B)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Formspec full-screen background opacity (between 0 and 255)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Forward key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fourth of 4 2D noises that together define hill/mountain range height."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fractal type"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fraction of the visible distance at which fog starts to be rendered"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "FreeType fonts"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"From how far blocks are generated for clients, stated in mapblocks (16 "
-"nodes)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"From how far clients know about objects, stated in mapblocks (16 nodes).\n"
-"\n"
-"Setting this larger than active_block_range will also cause the server\n"
-"to maintain active objects up to this distance in the direction the\n"
-"player is looking. (This can avoid mobs suddenly disappearing from view)"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Full screen"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Full screen BPP"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Fullscreen mode."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "GUI scaling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "GUI scaling filter"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "GUI scaling filter txr2img"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Global callbacks"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Global map generation attributes.\n"
-"In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
-"and junglegrass, in all other mapgens this flag controls all decorations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Gradient of light curve at maximum light level.\n"
-"Controls the contrast of the highest light levels."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Gradient of light curve at minimum light level.\n"
-"Controls the contrast of the lowest light levels."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Graphics"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Gravity"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ground level"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ground noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "HTTP mods"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "HUD scale factor"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "HUD toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
-"-    error: abort on usage of deprecated call (suggested for mod developers)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Have the profiler instrument itself:\n"
-"* Instrument an empty function.\n"
-"This estimates the overhead, that instrumentation is adding (+1 function "
-"call).\n"
-"* Instrument the sampler being used to update the statistics."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Heat blend noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Heat noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Height component of the initial window size."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Height noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Height select noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "High-precision FPU"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hill steepness"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hill threshold"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hilliness1 noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hilliness2 noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hilliness3 noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hilliness4 noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Homepage of server, to be displayed in the serverlist."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Horizontal acceleration in air when jumping or falling,\n"
-"in nodes per second per second."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Horizontal and vertical acceleration in fast mode,\n"
-"in nodes per second per second."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Horizontal and vertical acceleration on ground or when climbing,\n"
-"in nodes per second per second."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar next key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar previous key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 1 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 10 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 11 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 12 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 13 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 14 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 15 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 16 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 17 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 18 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 19 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 2 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 20 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 21 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 22 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 23 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 24 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 25 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 26 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 27 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 28 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 29 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 3 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 30 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 31 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 32 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 4 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 5 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 6 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 7 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 8 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Hotbar slot 9 key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How deep to make rivers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"How fast liquid waves will move. Higher = faster.\n"
-"If negative, liquid waves will move backwards.\n"
-"Requires waving liquids to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"How much the server will wait before unloading unused mapblocks.\n"
-"Higher value is smoother, but will use more RAM."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "How wide to make rivers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Humidity blend noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Humidity noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Humidity variation for biomes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "IPv6"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "IPv6 server"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If FPS would go higher than this, limit it by sleeping\n"
-"to not waste CPU power for no benefit."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If disabled, \"special\" key is used to fly fast if both fly and fast mode "
-"are\n"
-"enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled the server will perform map block occlusion culling based on\n"
-"on the eye position of the player. This can reduce the number of blocks\n"
-"sent to the client 50-80%. The client will not longer receive most "
-"invisible\n"
-"so that the utility of noclip mode is reduced."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled together with fly mode, player is able to fly through solid "
-"nodes.\n"
-"This requires the \"noclip\" privilege on the server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, \"special\" key instead of \"sneak\" key is used for climbing "
-"down and\n"
-"descending."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, actions are recorded for rollback.\n"
-"This option is only read when server starts."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "If enabled, disable cheat prevention in multiplayer."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, invalid world data won't cause the server to shut down.\n"
-"Only enable this if you know what you are doing."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, makes move directions relative to the player's pitch when flying "
-"or swimming."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "If enabled, new players cannot join with an empty password."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If enabled, you can place blocks at the position (feet + eye level) where "
-"you stand.\n"
-"This is helpful when working with nodeboxes in small areas."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If the CSM restriction for node range is enabled, get_node calls are "
-"limited\n"
-"to this distance from the player to the node."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"If the file size of debug.txt exceeds the number of megabytes specified in\n"
-"this setting when it is opened, the file is moved to debug.txt.1,\n"
-"deleting an older debug.txt.1 if it exists.\n"
-"debug.txt is only moved if this setting is positive."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "If this is set, players will always (re)spawn at the given position."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ignore world errors"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "In-Game"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "In-game chat console background color (R,G,B)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "In-game chat console height, between 0.1 (10%) and 1.0 (100%)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Inc. volume key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Initial vertical speed when jumping, in nodes per second."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Instrument builtin.\n"
-"This is usually only needed by core/builtin contributors"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Instrument chatcommands on registration."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Instrument global callback functions on registration.\n"
-"(anything you pass to a minetest.register_*() function)"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Instrument the action function of Active Block Modifiers on registration."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Instrument the action function of Loading Block Modifiers on registration."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Instrument the methods of entities on registration."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Instrumentation"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Interval of saving important changes in the world, stated in seconds."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Interval of sending time of day to clients."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Inventory items animations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Inventory key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Invert mouse"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Invert vertical mouse movement."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Italic font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Italic monospace font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Item entity TTL"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Iterations of the recursive function.\n"
-"Increasing this increases the amount of fine detail, but also\n"
-"increases processing load.\n"
-"At iterations = 20 this mapgen has a similar load to mapgen V7."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Joystick ID"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Joystick button repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Joystick frustum sensitivity"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Joystick type"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Julia set only.\n"
-"W component of hypercomplex constant.\n"
-"Alters the shape of the fractal.\n"
-"Has no effect on 3D fractals.\n"
-"Range roughly -2 to 2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Julia set only.\n"
-"X component of hypercomplex constant.\n"
-"Alters the shape of the fractal.\n"
-"Range roughly -2 to 2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Julia set only.\n"
-"Y component of hypercomplex constant.\n"
-"Alters the shape of the fractal.\n"
-"Range roughly -2 to 2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Julia set only.\n"
-"Z component of hypercomplex constant.\n"
-"Alters the shape of the fractal.\n"
-"Range roughly -2 to 2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Julia w"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Julia x"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Julia y"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Julia z"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Jump key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Jumping speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for decreasing the viewing range.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for decreasing the volume.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for dropping the currently selected item.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for increasing the viewing range.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for increasing the volume.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for jumping.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving fast in fast mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player backward.\n"
-"Will also disable autoforward, when active.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player forward.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player left.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for moving the player right.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for muting the game.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the chat window to type commands.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the chat window to type local commands.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the chat window.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for opening the inventory.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 11th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 12th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 13th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 14th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 15th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 16th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 17th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 18th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 19th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 20th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 21st hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 22nd hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 23rd hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 24th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 25th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 26th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 27th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 28th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 29th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 30th hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 31st hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the 32nd hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the eighth hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the fifth hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the first hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the fourth hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the next item in the hotbar.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the ninth hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the previous item in the hotbar.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the second hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the seventh hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the sixth hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the tenth hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for selecting the third hotbar slot.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for sneaking.\n"
-"Also used for climbing down and descending in water if aux1_descends is "
-"disabled.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for switching between first- and third-person camera.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for taking screenshots.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling autoforward.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling cinematic mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling display of minimap.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling fast mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling flying.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling noclip mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling pitch move mode.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the camera update. Only used for development\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of chat.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of debug info.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of fog.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the HUD.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the large chat console.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling the display of the profiler. Used for development.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key for toggling unlimited view range.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Key to use view zoom when possible.\n"
-"See http://irrlicht.sourceforge.net/docu/namespaceirr."
-"html#a54da2a0e231901735e3da1b0edf72eb3"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Kick players who sent more than X messages per 10 seconds."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Lake steepness"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Lake threshold"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Language"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Large cave depth"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Large cave maximum number"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Large cave minimum number"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Large cave proportion flooded"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Large chat console key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Leaves style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Leaves style:\n"
-"-   Fancy:  all faces visible\n"
-"-   Simple: only outer faces, if defined special_tiles are used\n"
-"-   Opaque: disable transparency"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Left key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Length of a server tick and the interval at which objects are generally "
-"updated over\n"
-"network."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Length of liquid waves.\n"
-"Requires waving liquids to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Length of time between Active Block Modifier (ABM) execution cycles"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Length of time between NodeTimer execution cycles"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Length of time between active block management cycles"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Level of logging to be written to debug.txt:\n"
-"-    <nothing> (no logging)\n"
-"-    none (messages with no level)\n"
-"-    error\n"
-"-    warning\n"
-"-    action\n"
-"-    info\n"
-"-    verbose"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Light curve boost"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Light curve boost center"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Light curve boost spread"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Light curve gamma"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Light curve high gradient"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Light curve low gradient"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Limit of map generation, in nodes, in all 6 directions from (0, 0, 0).\n"
-"Only mapchunks completely within the mapgen limit are generated.\n"
-"Value is stored per-world."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Limits number of parallel HTTP requests. Affects:\n"
-"-    Media fetch if server uses remote_media setting.\n"
-"-    Serverlist download and server announcement.\n"
-"-    Downloads performed by main menu (e.g. mod manager).\n"
-"Only has an effect if compiled with cURL."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid fluidity"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid fluidity smoothing"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid loop max"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid queue purge time"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid sinking"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid update interval in seconds."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Liquid update tick"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Load the game profiler"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Load the game profiler to collect game profiling data.\n"
-"Provides a /profiler command to access the compiled profile.\n"
-"Useful for mod developers and server operators."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Loading Block Modifiers"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Lower Y limit of dungeons."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Lower Y limit of floatlands."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Main menu script"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Makes all liquids opaque"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Map directory"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Map generation attributes specific to Mapgen Carpathian."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen Flat.\n"
-"Occasional lakes and hills can be added to the flat world."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen Fractal.\n"
-"'terrain' enables the generation of non-fractal terrain:\n"
-"ocean, islands and underground."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen Valleys.\n"
-"'altitude_chill': Reduces heat with altitude.\n"
-"'humid_rivers': Increases humidity around rivers.\n"
-"'vary_river_depth': If enabled, low humidity and high heat causes rivers\n"
-"to become shallower and occasionally dry.\n"
-"'altitude_dry': Reduces humidity with altitude."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Map generation attributes specific to Mapgen v5."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen v6.\n"
-"The 'snowbiomes' flag enables the new 5 biome system.\n"
-"When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
-"the 'jungles' flag is ignored."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Map generation attributes specific to Mapgen v7.\n"
-"'ridges': Rivers.\n"
-"'floatlands': Floating land masses in the atmosphere.\n"
-"'caverns': Giant caves deep underground."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Map generation limit"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Map save interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock limit"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generation delay"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapblock unload timeout"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen Carpathian"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen Carpathian specific flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen Flat"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen Flat specific flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen Fractal"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen Fractal specific flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen V5"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen V5 specific flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen V6"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen V6 specific flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen V7"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen V7 specific flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen Valleys"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen Valleys specific flags"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen debug"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mapgen name"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Max block generate distance"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Max block send distance"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Max liquids processed per step."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Max. clearobjects extra blocks"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Max. packets per iteration"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum FPS"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum forceloaded blocks"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum hotbar width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum limit of random number of large caves per mapchunk."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum limit of random number of small caves per mapchunk."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum liquid resistance. Controls deceleration when entering liquid at\n"
-"high speed."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum number of blocks that are simultaneously sent per client.\n"
-"The maximum total count is calculated dynamically:\n"
-"max_total = ceil((#clients + max_users) * per_client / 4)"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of blocks that can be queued for loading."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum number of blocks to be queued that are to be generated.\n"
-"This limit is enforced per player."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum number of blocks to be queued that are to be loaded from file.\n"
-"This limit is enforced per player."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of forceloaded mapblocks."
-msgstr ""
-
-#: 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 ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum number of packets sent per send step, if you have a slow connection\n"
-"try reducing it, but don't reduce it to a number below double of targeted\n"
-"client number."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of players that can be connected simultaneously."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of recent chat messages to show"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum number of statically stored objects in a block."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum objects per block"
-msgstr ""
-
-#: 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 ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum simultaneous block sends per client"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum size of the out chat queue"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Maximum size of the out chat queue.\n"
-"0 to disable queueing and -1 to make the queue size unlimited."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum time in ms a file download (e.g. a mod download) may take."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Maximum users"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Menus"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mesh cache"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Message of the day"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Message of the day displayed to players connecting."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Method used to highlight selected object."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimal level of logging to be written to chat."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimap"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimap key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimap scan height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimum limit of random number of large caves per mapchunk."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimum limit of random number of small caves per mapchunk."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Minimum texture size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mipmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mod channels"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Modifies the size of the hudbar elements."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Monospace font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Monospace font size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mountain height noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mountain noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mountain variation noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mountain zero level"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mouse sensitivity"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mouse sensitivity multiplier."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mud noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Multiplier for fall bobbing.\n"
-"For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mute key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Mute sound"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Name of map generator to be used when creating a new world.\n"
-"Creating a world in the main menu will override this.\n"
-"Current mapgens in a highly unstable state:\n"
-"-    The optional floatlands of v7 (disabled by default)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Name of the player.\n"
-"When running a server, clients connecting with this name are admins.\n"
-"When starting from the main menu, this is overridden."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Name of the server, to be displayed when players join and in the serverlist."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Near plane"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Network"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Network port to listen (UDP).\n"
-"This value will be overridden when starting from the main menu."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "New users need to input this password."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Noclip"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Noclip key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Node highlighting"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "NodeTimer interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Noises"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Number of emerge threads"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Number of emerge threads to use.\n"
-"Value 0:\n"
-"-    Automatic selection. The number of emerge threads will be\n"
-"-    'number of processors - 2', with a lower limit of 1.\n"
-"Any other value:\n"
-"-    Specifies the number of emerge threads, with a lower limit of 1.\n"
-"WARNING: Increasing the number of emerge threads increases engine mapgen\n"
-"speed, but this may harm game performance by interfering with other\n"
-"processes, especially in singleplayer and/or when running Lua code in\n"
-"'on_generated'. For many users the optimum setting may be '1'."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Number of extra blocks that can be loaded by /clearobjects at once.\n"
-"This is a trade-off between sqlite transaction overhead and\n"
-"memory consumption (4096=100MB, as a rule of thumb)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Online Content Repository"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Opaque liquids"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Opaqueness (alpha) of the shadow behind the fallback font, between 0 and 255."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Open the pause menu when the window's focus is lost. Does not pause if a "
-"formspec is\n"
-"open."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Path of the fallback font.\n"
-"If “freetype� setting is enabled: Must be a TrueType font.\n"
-"If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
-"This font will be used for certain languages or if the default font is "
-"unavailable."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Path to save screenshots at. Can be an absolute or relative path.\n"
-"The folder will be created if it doesn't already exist."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Path to shader directory. If no path is defined, default location will be "
-"used."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Path to texture directory. All textures are first searched from here."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Path to the default font.\n"
-"If “freetype� setting is enabled: Must be a TrueType font.\n"
-"If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
-"The fallback font will be used if the font cannot be loaded."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Path to the monospace font.\n"
-"If “freetype� setting is enabled: Must be a TrueType font.\n"
-"If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
-"This font is used for e.g. the console and profiler screen."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Pause on lost window focus"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Per-player limit of queued blocks load from disk"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Per-player limit of queued blocks to generate"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Physics"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Pitch move key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Pitch move mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Player is able to fly without being affected by gravity.\n"
-"This requires the \"fly\" privilege on the server."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Player name"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Player transfer distance"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Player versus player"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Port to connect to (UDP).\n"
-"Note that the port field in the main menu overrides this setting."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Prevent digging and placing from repeating when holding the mouse buttons.\n"
-"Enable this when you dig or place too often by accident."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Prevent mods from doing insecure things like running shell commands."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Print the engine's profiling data in regular intervals (in seconds).\n"
-"0 = disable. Useful for developers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Privileges that players with basic_privs can grant"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Profiler"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Profiler toggle key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Profiling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Prometheus listener address"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Prometheus listener address.\n"
-"If minetest is compiled with ENABLE_PROMETHEUS option enabled,\n"
-"enable metrics listener for Prometheus on that address.\n"
-"Metrics can be fetch on http://127.0.0.1:30000/metrics"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Proportion of large caves that contain liquid."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Radius of cloud area stated in number of 64 node cloud squares.\n"
-"Values larger than 26 will start to produce sharp cutoffs at cloud area "
-"corners."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Raises terrain to make valleys around the rivers."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Random input"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Range select key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Recent Chat Messages"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Regular font path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Remote media"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Remote port"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Remove color codes from incoming chat messages\n"
-"Use this to stop players from being able to use color in their messages"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Replaces the default main menu with a custom one."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Report path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Restricts the access of certain client-side functions on servers.\n"
-"Combine the byteflags below to restrict client-side features, or set to 0\n"
-"for no restrictions:\n"
-"LOAD_CLIENT_MODS: 1 (disable loading client-provided mods)\n"
-"CHAT_MESSAGES: 2 (disable send_chat_message call client-side)\n"
-"READ_ITEMDEFS: 4 (disable get_item_def call client-side)\n"
-"READ_NODEDEFS: 8 (disable get_node_def call client-side)\n"
-"LOOKUP_NODES_LIMIT: 16 (limits get_node call client-side to\n"
-"csm_restriction_noderange)\n"
-"READ_PLAYERINFO: 32 (disable get_player_names call client-side)"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ridge mountain spread noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ridge noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ridge underwater noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Ridged mountain size noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Right key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "River channel depth"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "River channel width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "River depth"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "River noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "River size"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "River valley width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Rollback recording"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Rolling hill size noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Rolling hills spread noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Round minimap"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Safe digging and placing"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Sandy beaches occur when np_beach exceeds this value."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Save the map received by the client on disk."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Save window size automatically when modified."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Saving map received from server"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Scale GUI by a user specified value.\n"
-"Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
-"This will smooth over some of the rough edges, and blend\n"
-"pixels when scaling down, at the cost of blurring some\n"
-"edge pixels when images are scaled by non-integer sizes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screen height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screen width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot folder"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot format"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Screenshot quality"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Screenshot quality. Only used for JPEG format.\n"
-"1 means worst quality; 100 means best quality.\n"
-"Use 0 for default quality."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Seabed noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Second of 4 2D noises that together define hill/mountain range height."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Second of two 3D noises that together define tunnels."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Security"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Selection box border color (R,G,B)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Selection box color"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Selection box width"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Selects one of 18 fractal types.\n"
-"1 = 4D \"Roundy\" Mandelbrot set.\n"
-"2 = 4D \"Roundy\" Julia set.\n"
-"3 = 4D \"Squarry\" Mandelbrot set.\n"
-"4 = 4D \"Squarry\" Julia set.\n"
-"5 = 4D \"Mandy Cousin\" Mandelbrot set.\n"
-"6 = 4D \"Mandy Cousin\" Julia set.\n"
-"7 = 4D \"Variation\" Mandelbrot set.\n"
-"8 = 4D \"Variation\" Julia set.\n"
-"9 = 3D \"Mandelbrot/Mandelbar\" Mandelbrot set.\n"
-"10 = 3D \"Mandelbrot/Mandelbar\" Julia set.\n"
-"11 = 3D \"Christmas Tree\" Mandelbrot set.\n"
-"12 = 3D \"Christmas Tree\" Julia set.\n"
-"13 = 3D \"Mandelbulb\" Mandelbrot set.\n"
-"14 = 3D \"Mandelbulb\" Julia set.\n"
-"15 = 3D \"Cosine Mandelbulb\" Mandelbrot set.\n"
-"16 = 3D \"Cosine Mandelbulb\" Julia set.\n"
-"17 = 4D \"Mandelbulb\" Mandelbrot set.\n"
-"18 = 4D \"Mandelbulb\" Julia set."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Server / Singleplayer"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Server URL"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Server address"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Server description"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Server name"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Server port"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Server side occlusion culling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Serverlist URL"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Serverlist file"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set the language. Leave empty to use the system language.\n"
-"A restart is required after changing this."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Set the maximum character length of a chat message sent by clients."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set to true to enable waving leaves.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set to true to enable waving liquids (like water).\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Set to true to enable waving plants.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Shader path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Shaders allow advanced visual effects and may increase performance on some "
-"video\n"
-"cards.\n"
-"This only works with the OpenGL video backend."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Shadow offset (in pixels) of the default font. If 0, then shadow will not be "
-"drawn."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Shadow offset (in pixels) of the fallback font. If 0, then shadow will not "
-"be drawn."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Show debug info"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Show entity selection boxes"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Shutdown message"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of mapchunks generated by mapgen, stated in mapblocks (16 nodes).\n"
-"WARNING!: There is no benefit, and there are several dangers, in\n"
-"increasing this value above 5.\n"
-"Reducing this value increases cave and dungeon density.\n"
-"Altering this value is for special usage, leaving it unchanged is\n"
-"recommended."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Size of the MapBlock cache of the mesh generator. Increasing this will\n"
-"increase the cache hit %, reducing the data being copied from the main\n"
-"thread, thus reducing jitter."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Slice w"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Slope and fill work together to modify the heights."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Small cave maximum number"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Small cave minimum number"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Small-scale humidity variation for blending biomes on borders."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Small-scale temperature variation for blending biomes on borders."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Smooth lighting"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Smooths camera when looking around. Also called look or mouse smoothing.\n"
-"Useful for recording videos."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Smooths rotation of camera. 0 to disable."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Sneak key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Sneaking speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Sneaking speed, in nodes per second."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Sound"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Special key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Special key for climbing/descending"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Specifies URL from which client fetches media instead of using UDP.\n"
-"$filename should be accessible from $remote_media$filename via cURL\n"
-"(obviously, remote_media should end with a slash).\n"
-"Files that are not present will be fetched the usual way."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Specifies the default stack size of nodes, items and tools.\n"
-"Note that mods or games may explicitly set a stack for certain (or all) "
-"items."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Spread of light curve boost range.\n"
-"Controls the width of the range to be boosted.\n"
-"Standard deviation of the light curve boost Gaussian."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Static spawnpoint"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Steepness noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Step mountain size noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Step mountain spread noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Strength of 3D mode parallax."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Strength of light curve boost.\n"
-"The 3 'boost' parameters define a range of the light\n"
-"curve that is boosted in brightness."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Strict protocol checking"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Strip color codes"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Surface level of optional water placed on a solid floatland layer.\n"
-"Water is disabled by default and will only be placed if this value is set\n"
-"to above 'mgv7_floatland_ymax' - 'mgv7_floatland_taper' (the start of the\n"
-"upper tapering).\n"
-"***WARNING, POTENTIAL DANGER TO WORLDS AND SERVER PERFORMANCE***:\n"
-"When enabling water placement the floatlands must be configured and tested\n"
-"to be a solid layer by setting 'mgv7_floatland_density' to 2.0 (or other\n"
-"required value depending on 'mgv7_np_floatland'), to avoid\n"
-"server-intensive extreme water flow and to avoid vast flooding of the\n"
-"world surface below."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Synchronous SQLite"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Temperature variation for biomes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Terrain alternative noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Terrain base noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Terrain height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Terrain higher noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Terrain noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Terrain noise threshold for hills.\n"
-"Controls proportion of world area covered by hills.\n"
-"Adjust towards 0.0 for a larger proportion."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Terrain noise threshold for lakes.\n"
-"Controls proportion of world area covered by lakes.\n"
-"Adjust towards 0.0 for a larger proportion."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Terrain persistence noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Texture path"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Textures on a node may be aligned either to the node or to the world.\n"
-"The former mode suits better things like machines, furniture, etc., while\n"
-"the latter makes stairs and microblocks fit surroundings better.\n"
-"However, as this possibility is new, thus may not be used by older servers,\n"
-"this option allows enforcing it for certain node types. Note though that\n"
-"that is considered EXPERIMENTAL and may not work properly."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "The URL for the content repository"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The default format in which profiles are being saved,\n"
-"when calling `/profiler save [format]` without format."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "The depth of dirt or other biome filler node."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The file path relative to your worldpath in which profiles will be saved to."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "The identifier of the joystick to use"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "The length in pixels it takes for touch screen interaction to start."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The maximum height of the surface of waving liquids.\n"
-"4.0 = Wave height is two nodes.\n"
-"0.0 = Wave doesn't move at all.\n"
-"Default is 1.0 (1/2 node).\n"
-"Requires waving liquids to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "The network interface that the server listens on."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The privileges that new users automatically get.\n"
-"See /privs in game for a full list on your server and mod configuration."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The radius of the volume of blocks around every player that is subject to "
-"the\n"
-"active block stuff, stated in mapblocks (16 nodes).\n"
-"In active blocks objects are loaded and ABMs run.\n"
-"This is also the minimum range in which active objects (mobs) are "
-"maintained.\n"
-"This should be configured together with active_object_send_range_blocks."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The rendering back-end for Irrlicht.\n"
-"A restart is required after changing this.\n"
-"Note: On Android, stick with OGLES1 if unsure! App may fail to start "
-"otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The sensitivity of the joystick axes for moving the\n"
-"ingame view frustum around."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The strength (darkness) of node ambient-occlusion shading.\n"
-"Lower is darker, Higher is lighter. The valid range of values for this\n"
-"setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
-"set to the nearest valid value."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The time (in seconds) that the liquids queue may grow beyond processing\n"
-"capacity until an attempt is made to decrease its size by dumping old queue\n"
-"items.  A value of 0 disables the functionality."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The time in seconds it takes between repeated events\n"
-"when holding down a joystick button combination."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "The type of joystick"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"The vertical distance over which heat drops by 20 if 'altitude_chill' is\n"
-"enabled. Also the vertical distance over which humidity drops by 10 if\n"
-"'altitude_dry' is enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Third of 4 2D noises that together define hill/mountain range height."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Time in seconds for item entity (dropped items) to live.\n"
-"Setting it to -1 disables the feature."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Time of day when a new world is started, in millihours (0-23999)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Time send interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Time speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Timeout for client to remove unused map data from memory."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"To reduce lag, block transfers are slowed down when a player is building "
-"something.\n"
-"This determines how long they are slowed down after placing or removing a "
-"node."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Toggle camera mode key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Tooltip delay"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Touch screen threshold"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Trees noise"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Trilinear filtering"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"True = 256\n"
-"False = 128\n"
-"Usable to make minimap smoother on slower machines."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Trusted mods"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "URL to the server list displayed in the Multiplayer Tab."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Undersampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Undersampling is similar to using a lower screen resolution, but it applies\n"
-"to the game world only, keeping the GUI intact.\n"
-"It should give a significant performance boost at the cost of less detailed "
-"image.\n"
-"Higher values result in a less detailed image."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Unlimited player transfer distance"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Unload unused server data"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Upper Y limit of dungeons."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Upper Y limit of floatlands."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use 3D cloud look instead of flat."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use a cloud animation for the main menu background."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use anisotropic filtering when viewing at textures from an angle."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use bilinear filtering when scaling textures."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Use mip mapping to scale textures. May slightly increase performance,\n"
-"especially when using a high resolution texture pack.\n"
-"Gamma correct downscaling is not supported."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Use trilinear filtering when scaling textures."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "VBO"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "VSync"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Valley depth"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Valley fill"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Valley profile"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Valley slope"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Variation of biome filler depth."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Variation of maximum mountain height (in nodes)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Variation of number of caves."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Variation of terrain vertical scale.\n"
-"When noise is < -0.55 terrain is near-flat."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Varies depth of biome surface nodes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Varies roughness of terrain.\n"
-"Defines the 'persistence' value for terrain_base and terrain_alt noises."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Varies steepness of cliffs."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Vertical climbing speed, in nodes per second."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Vertical screen synchronization."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Video driver"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "View bobbing factor"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "View distance in nodes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "View range decrease key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "View range increase key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "View zoom key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Viewing range"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Virtual joystick triggers aux button"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Volume"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Volume of all sounds.\n"
-"Requires the sound system to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"W coordinate of the generated 3D slice of a 4D fractal.\n"
-"Determines which 3D slice of the 4D shape is generated.\n"
-"Alters the shape of the fractal.\n"
-"Has no effect on 3D fractals.\n"
-"Range roughly -2 to 2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Walking and flying speed, in nodes per second."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Walking speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Walking, flying and climbing speed in fast mode, in nodes per second."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Water level"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Water surface level of the world."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving Nodes"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving leaves"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving liquids"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving liquids wave height"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving liquids wave speed"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving liquids wavelength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Waving plants"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"When gui_scaling_filter is true, all GUI images need to be\n"
-"filtered in software, but some images are generated directly\n"
-"to hardware (e.g. render-to-texture for nodes in inventory)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"When gui_scaling_filter_txr2img is true, copy those images\n"
-"from hardware to software for scaling.  When false, fall back\n"
-"to the old scaling method, for video drivers that don't\n"
-"properly support downloading textures back from hardware."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
-"can be blurred, so automatically upscale them with nearest-neighbor\n"
-"interpolation to preserve crisp pixels. This sets the minimum texture size\n"
-"for the upscaled textures; higher values look sharper, but require more\n"
-"memory.  Powers of 2 are recommended. Setting this higher than 1 may not\n"
-"have a visible effect unless bilinear/trilinear/anisotropic filtering is\n"
-"enabled.\n"
-"This is also used as the base node texture size for world-aligned\n"
-"texture autoscaling."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether FreeType fonts are used, requires FreeType support to be compiled "
-"in.\n"
-"If disabled, bitmap and XML vectors fonts are used instead."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Whether node texture animations should be desynchronized per mapblock."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether players are shown to clients without any range limit.\n"
-"Deprecated, use the setting player_transfer_distance instead."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Whether to allow players to damage and kill each other."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether to ask clients to reconnect after a (Lua) crash.\n"
-"Set this to true if your server is set up to restart automatically."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Whether to fog out the end of the visible area."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether to mute sounds. You can unmute sounds at any time, unless the\n"
-"sound system is disabled (enable_sound=false).\n"
-"In-game, you can toggle the mute state with the mute key or by using the\n"
-"pause menu."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Whether to show the client debug info (has the same effect as hitting F5)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Width component of the initial window size."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Width of the selection box lines around nodes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Windows systems only: Start Minetest with the command line window in the "
-"background.\n"
-"Contains the same information as the file debug.txt (default name)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"World directory (everything in the world is stored here).\n"
-"Not needed if starting from the main menu."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "World start time"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"World-aligned textures may be scaled to span several nodes. However,\n"
-"the server may not send the scale you want, especially if you use\n"
-"a specially-designed texture pack; with this option, the client tries\n"
-"to determine the scale automatically basing on the texture size.\n"
-"See also texture_min_size.\n"
-"Warning: This option is EXPERIMENTAL!"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "World-aligned textures mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Y of flat ground."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Y of mountain density gradient zero level. Used to shift mountains "
-"vertically."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Y of upper limit of large caves."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Y-distance over which caverns expand to full size."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Y-distance over which floatlands taper from full density to nothing.\n"
-"Tapering starts at this distance from the Y limit.\n"
-"For a solid floatland layer, this controls the height of hills/mountains.\n"
-"Must be less than or equal to half the distance between the Y limits."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Y-level of average terrain surface."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Y-level of cavern upper limit."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Y-level of higher terrain that creates cliffs."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Y-level of lower terrain and seabed."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Y-level of seabed."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "cURL file download timeout"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "cURL parallel limit"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "cURL timeout"
-msgstr ""
diff --git a/po/lt/minetest.po b/po/lt/minetest.po
index 572e7323a..98bcff78d 100644
--- a/po/lt/minetest.po
+++ b/po/lt/minetest.po
@@ -2,31 +2,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Lithuanian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-05-10 12:32+0000\n"
-"Last-Translator: restcoser <restcoser.mail@gmail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-23 15:50+0000\n"
+"Last-Translator: Kornelijus Tvarijanavi�ius <kornelitvari@protonmail.com>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/minetest/"
 "minetest/lt/>\n"
 "Language: lt\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 % 10 == 1 && (n % 100 < 11 || n % 100 > "
-"19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? "
-"1 : 2);\n"
-"X-Generator: Weblate 4.1-dev\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 4.5\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Prisikelti"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "JÅ«s numirÄ—te"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
 
 #: builtin/fstk/ui.lua
-#, fuzzy
 msgid "An error occurred in a Lua script:"
-msgstr "Klaida įvyko Lua scenarijuje, tokiame kaip papildinys:"
+msgstr "Įvyko klaida Lua skripte:"
 
 #: builtin/fstk/ui.lua
-#, fuzzy
 msgid "An error occurred:"
 msgstr "Įvyko klaida:"
 
@@ -42,10 +47,6 @@ msgstr "Prisijungti iš naujo"
 msgid "The server has requested a reconnect:"
 msgstr "Serveris paprašė prisijungti iš naujo:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Įkeliama..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Neatitinka protokolo versija. "
@@ -59,20 +60,15 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Serveris palaiko protokolo versijas nuo $1 iki $2 "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Pabandykite dar kart įjungti viešą serverių sąrašą ir patikrinkite savo "
-"interneto ryšį."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Mes palaikome tik $1 protokolo versijÄ…."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr "Mes palaikome protokolo versijas nuo $1 iki $2."
+msgstr "Mes palaikome protokolo versijas tarp $1 ir $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -80,20 +76,18 @@ msgstr "Mes palaikome protokolo versijas nuo $1 iki $2."
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiKeyChangeMenu.cpp
 #: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
-msgstr "Atsisakyti"
+msgstr "Atšaukti"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
-#, fuzzy
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
-msgstr "Priklauso:"
+msgstr "Priklauso nuo:"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Disable all"
-msgstr "Išjungti papildinį"
+msgstr "IÅ¡jungti visus papildinius"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Disable modpack"
 msgstr "Išjungti papildinį"
 
@@ -102,9 +96,8 @@ msgid "Enable all"
 msgstr "Įjungti visus"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "Enable modpack"
-msgstr "Pervadinti papildinių paką:"
+msgstr "Aktyvuoti papildinį"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #, fuzzy
@@ -128,19 +121,16 @@ msgid "No (optional) dependencies"
 msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No game description provided."
-msgstr "Papildinio aprašymas nepateiktas"
+msgstr "Nepateiktas žaidimo aprašymas."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No hard dependencies"
-msgstr "Priklauso:"
+msgstr "Nėra būtinų priklausomybių"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No modpack description provided."
-msgstr "Papildinio aprašymas nepateiktas"
+msgstr "Nepateiktas papildinio aprašymas."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No optional dependencies"
@@ -164,15 +154,55 @@ msgid "enabled"
 msgstr "įjungtas"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 atsiun�iama..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
+msgid "Already installed"
+msgstr "Klavišas jau naudojamas"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
 msgid "Back to Main Menu"
 msgstr "Pagrindinis meniu"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "SlÄ—pti vidinius"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -196,6 +226,16 @@ msgid "Install"
 msgstr "Įdiegti"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Įdiegti"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Inicijuojami mazgai"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Papildiniai"
@@ -209,9 +249,25 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Ieškoti"
+#, fuzzy
+msgid "No updates"
+msgstr "Atnaujinti"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
@@ -228,7 +284,11 @@ msgid "Update"
 msgstr "Atnaujinti"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -268,9 +328,8 @@ msgid "Create"
 msgstr "Sukurti"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Papildinio informacija:"
+msgstr "Dekoracijos"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -489,11 +548,6 @@ msgstr "Naršyti"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 #, fuzzy
-msgid "Clientmods"
-msgstr "Žaisti tinkle(klientas)"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Disabled"
 msgstr "Išjungti papildinį"
 
@@ -539,14 +593,16 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
+msgid "Search"
+msgstr "Ieškoti"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
-msgstr "Pasirinkite papildinio failÄ…:"
+msgstr "Pasirinkite aplankÄ…"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "Select file"
-msgstr "Pasirinkite papildinio failÄ…:"
+msgstr "Pasirinkite failÄ…"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
@@ -635,11 +691,9 @@ msgstr ""
 "paketui $1"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Install: Unsupported file type \"$1\" or broken archive"
 msgstr ""
-"\n"
-"Papildinio diegimas: nepalaikomas failo tipas „$1“, arba sugadintas archyvas"
+"Papildinio diegimas: nepalaikomas failo tipas „$1“ arba sugadintas archyvas"
 
 #: builtin/mainmenu/pkgmgr.lua
 #, fuzzy
@@ -673,6 +727,20 @@ msgstr "Nepavyko įdiegti $1 į $2"
 msgid "Unable to install a modpack as a $1"
 msgstr "Nepavyko įdiegti $1 į $2"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Įkeliama..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Pabandykite dar kart įjungti viešą serverių sąrašą ir patikrinkite savo "
+"interneto ryšį."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -683,9 +751,8 @@ msgid "Content"
 msgstr "Tęsti"
 
 #: builtin/mainmenu/tab_content.lua
-#, fuzzy
 msgid "Disable Texture Pack"
-msgstr "Pasirinkite tekstūros paketą:"
+msgstr "Pasirinkite tekstūros paketą"
 
 #: builtin/mainmenu/tab_content.lua
 #, fuzzy
@@ -733,7 +800,14 @@ msgid "Credits"
 msgstr "PadÄ—kos"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Pasirinkite aplankÄ…"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -753,14 +827,10 @@ msgid "Bind Address"
 msgstr "Susieti adresÄ…"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Konfigūruoti"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "KÅ«rybinÄ— veiksena"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Leisti sužeidimus"
 
@@ -779,8 +849,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Vardas/slaptažodis"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -792,6 +862,11 @@ msgstr "Nesukurtas ar pasirinktas joks pasaulis!"
 
 #: builtin/mainmenu/tab_local.lua
 #, fuzzy
+msgid "Password"
+msgstr "Naujas slaptažodis"
+
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
 msgid "Play Game"
 msgstr "Pradėti žaidimą"
 
@@ -800,6 +875,11 @@ msgid "Port"
 msgstr "Prievadas"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Pasirinkite pasaulį:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Pasirinkite pasaulį:"
 
@@ -813,28 +893,26 @@ msgid "Start Game"
 msgstr "SlÄ—pti vidinius"
 
 #: builtin/mainmenu/tab_online.lua
-#, fuzzy
 msgid "Address / Port"
-msgstr "Adresas / Prievadas :"
+msgstr "Adresas / Prievadas"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Jungtis"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "KÅ«rybinÄ— veiksena"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Žalojimas įjungtas"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
-msgstr "MÄ—giami:"
+msgstr "Pašalinti iš mėgiamų"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 #, fuzzy
 msgid "Favorite"
 msgstr "MÄ—giami:"
@@ -844,17 +922,16 @@ msgstr "MÄ—giami:"
 msgid "Join Game"
 msgstr "SlÄ—pti vidinius"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
-#, fuzzy
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
-msgstr "Vardas / Slaptažodis :"
+msgstr "Vardas / Slaptažodis"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP įjungtas"
 
@@ -884,11 +961,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Atstatyti vieno žaidėjo pasaulį"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -896,10 +968,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr "„Bilinear“ filtras"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Nustatyti klavišus"
@@ -915,10 +983,6 @@ msgid "Fancy Leaves"
 msgstr "Nepermatomi lapai"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -927,10 +991,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Ne"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -960,21 +1020,12 @@ msgstr "Nepermatomi lapai"
 msgid "Opaque Water"
 msgstr "Nepermatomas vanduo"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "ParalaksinÄ— okliuzija"
-
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Particles"
 msgstr "Įjungti visus"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Reset singleplayer world"
-msgstr "Atstatyti vieno žaidėjo pasaulį"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr ""
 
@@ -987,6 +1038,10 @@ msgid "Shaders"
 msgstr "Šešėliavimai"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -1034,22 +1089,6 @@ msgstr "Nepermatomi lapai"
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Taip"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Konfigūruoti papildinius"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Pagrindinis"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Atstatyti vieno žaidėjo pasaulį"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "BaigÄ—si prijungimo laikas."
@@ -1132,33 +1171,28 @@ msgstr ""
 "Patikrinkite debug.txt dÄ—l papildomos informacijos."
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Address: "
-msgstr "Susieti adresÄ…"
+msgstr "- Adresas: "
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Creative Mode: "
-msgstr "KÅ«rybinÄ— veiksena"
+msgstr "- Kūrybinis režimas "
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Damage: "
-msgstr "Leisti sužeidimus"
+msgstr "- Sužeidimai: "
 
 #: src/client/game.cpp
 msgid "- Mode: "
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Port: "
-msgstr "Prievadas"
+msgstr "- Prievadas: "
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Public: "
-msgstr "Viešas"
+msgstr "- Viešas: "
 
 #. ~ PvP = Player versus Player
 #: src/client/game.cpp
@@ -1166,9 +1200,8 @@ msgid "- PvP: "
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "- Server Name: "
-msgstr "Serveris"
+msgstr "- Serverio pavadinimas: "
 
 #: src/client/game.cpp
 #, fuzzy
@@ -1223,30 +1256,30 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Numatytas valdymas:\n"
-"- WASD: judÄ—ti\n"
-"- Tarpas: Å¡okti/lipti\n"
-"- Lyg2: leistis/eiti žemyn\n"
-"- Q: išmesti elementą\n"
-"- I: inventorius\n"
+"- %s: judėti į priekį\n"
+"- %s: judÄ—ti atgal\n"
+"- %s: judėti į kairę\n"
+"- %s: judėti į dešinę\n"
+"- %s: Å¡okti/lipti\n"
+"- %s: leistis/eiti žemyn\n"
+"- %s: išmesti daiktą\n"
+"- %s: inventorius\n"
 "- Pelė: sukti/žiūrėti\n"
 "- PelÄ—s kairys: kasti/smugiuoti\n"
 "- Pelės dešinys: padėti/naudoti\n"
 "- PelÄ—s ratukas: pasirinkti elementÄ…\n"
-"- T: kalbÄ—tis\n"
+"- %s: kalbÄ—tis\n"
 
 #: src/client/game.cpp
 msgid "Creating client..."
@@ -1351,16 +1384,6 @@ msgid "Fog enabled"
 msgstr "įjungtas"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Išjungti papildinį"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "įjungtas"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1370,9 +1393,8 @@ msgid "Game paused"
 msgstr "Žaidimo pavadinimas"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Hosting server"
-msgstr "Kuriamas serveris...."
+msgstr "Kuriamas serveris"
 
 #: src/client/game.cpp
 msgid "Item definitions..."
@@ -1383,16 +1405,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Išjungti papildinį"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Žalojimas įjungtas"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Medija..."
 
@@ -1405,34 +1417,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1478,10 +1462,6 @@ msgid "Resolving address..."
 msgstr "Ieškoma adreso..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Prisikelti"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "IÅ¡jungiama..."
 
@@ -1536,11 +1516,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "You died"
-msgstr "JÅ«s numirÄ—te."
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1558,15 +1533,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Nustatyti klavišus"
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1853,6 +1819,24 @@ msgstr "X mygtukas 2"
 msgid "Zoom"
 msgstr "Pritraukti"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Slaptažodžiai nesutampa!"
@@ -1894,26 +1878,6 @@ msgid "Backward"
 msgstr "Atgal"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
 msgid "Change camera"
 msgstr "Nustatyti klavišus"
@@ -2011,31 +1975,11 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Special Inv."
-msgstr "Nustatyti klavišus"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Įjungti kinematografinį"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Įjungti kinematografinį"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle HUD"
 msgstr "Įjungti skrydį"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Toggle Killaura"
-msgstr "Įjungti skrydį"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle chat log"
 msgstr "Įjungti greitą"
 
@@ -2103,7 +2047,7 @@ msgstr "Garso lygis: "
 #. Don't forget the space.
 #: src/gui/modalMenu.cpp
 msgid "Enter "
-msgstr "Įvesti"
+msgstr "Įvesti "
 
 #. ~ DO NOT TRANSLATE THIS LITERALLY!
 #. This is a special string which needs to contain the translation's
@@ -2149,12 +2093,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2262,6 +2200,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2354,9 +2296,8 @@ msgid "Announce server"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Announce to this serverlist."
-msgstr "Paskelbti Serverį"
+msgstr "Paskelbti tai serverių sąrašui"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2499,10 +2440,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2573,16 +2510,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2722,9 +2649,8 @@ msgid "Connect glass"
 msgstr "Jungtis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Connect to external media server"
-msgstr "Jungiamasi prie serverio..."
+msgstr "Prisijungti prie išorinio medijos serverio"
 
 #: src/settings_translation_file.cpp
 msgid "Connects glass if supported by node."
@@ -2748,6 +2674,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "Tęsti"
@@ -2807,7 +2737,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2815,7 +2747,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2919,12 +2853,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2996,6 +2924,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Dig key"
+msgstr "Dešinėn"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Digging particles"
 msgstr "Įjungti visus"
 
@@ -3056,7 +2989,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3064,9 +2997,8 @@ msgid "Enable joysticks"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enable mod channels support."
-msgstr "Papildiniai internete"
+msgstr "Įjungti papildinių kanalų palaikymą."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3146,33 +3078,12 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Enables minimap."
-msgstr "Leisti sužeidimus"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
+msgstr "Įjungia minimapą."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3192,12 +3103,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3207,7 +3112,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3510,10 +3415,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3568,8 +3469,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -4040,6 +3941,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4121,6 +4026,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4220,6 +4132,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4779,11 +4698,6 @@ msgid "Main menu script"
 msgstr "Pagrindinis meniu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Pagrindinis meniu"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4797,6 +4711,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4969,7 +4891,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5018,6 +4940,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5249,14 +5178,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5282,10 +5203,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5311,35 +5228,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "ParalaksinÄ— okliuzija"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5406,6 +5294,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "KÅ«rybinÄ— veiksena"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5562,10 +5459,6 @@ msgid "Right key"
 msgstr "Dešinėn"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5827,6 +5720,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5960,10 +5863,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6057,6 +5956,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6115,8 +6018,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6142,15 +6045,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6286,6 +6194,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6492,6 +6411,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6615,6 +6540,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6626,12 +6569,18 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Gerai"
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Ar tikrai norite perkurti savo lokalų pasaulį?"
 
 #~ msgid "Back"
 #~ msgstr "Atgal"
 
+#~ msgid "Config mods"
+#~ msgstr "Konfigūruoti papildinius"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigūruoti"
+
 #, fuzzy
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr "Atsiun�iama $1, prašome palaukti..."
@@ -6644,6 +6593,42 @@ msgstr ""
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Leisti sužeidimus"
 
+#~ msgid "Main"
+#~ msgstr "Pagrindinis"
+
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "Pagrindinis meniu"
+
+#~ msgid "Name/Password"
+#~ msgstr "Vardas/slaptažodis"
+
+#~ msgid "No"
+#~ msgstr "Ne"
+
+#~ msgid "Ok"
+#~ msgstr "Gerai"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "ParalaksinÄ— okliuzija"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "ParalaksinÄ— okliuzija"
+
+#, fuzzy
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Atstatyti vieno žaidėjo pasaulį"
+
 #, fuzzy
 #~ msgid "Select Package File:"
 #~ msgstr "Pasirinkite papildinio failÄ…:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Atstatyti vieno žaidėjo pasaulį"
+
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Įjungti kinematografinį"
+
+#~ msgid "Yes"
+#~ msgstr "Taip"
diff --git a/po/lv/minetest.po b/po/lv/minetest.po
index 3f46a1aa5..e1b4de861 100644
--- a/po/lv/minetest.po
+++ b/po/lv/minetest.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-04 16:41+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-07-12 17:41+0000\n"
 "Last-Translator: Uko Koknevics <TheZeus121@gmail.com>\n"
 "Language-Team: Latvian <https://hosted.weblate.org/projects/minetest/"
 "minetest/lv/>\n"
@@ -18,7 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n % 10 == 0 || n % 100 >= 11 && n % 100 <= "
 "19) ? 0 : ((n % 10 == 1 && n % 100 != 11) ? 1 : 2);\n"
-"X-Generator: Weblate 4.1-dev\n"
+"X-Generator: Weblate 4.2-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Atdzīvoties"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Jūs nomir�t"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -44,10 +52,6 @@ msgstr "Atjaunot savienojumu"
 msgid "The server has requested a reconnect:"
 msgstr "Serveris ir pieprasījis savienojuma atjaunošanu:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Iel�de..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Protokola versiju neatbilstība. "
@@ -61,12 +65,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Serveris atbalsta protokola versijas starp $1 un $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Pamēģiniet atk�rtoti ieslēgt publisko serveru sarakstu un p�rbaudiet "
-"interneta savienojumu."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "MÄ“s atbalstam tikai protokola versiju $1."
 
@@ -74,7 +72,8 @@ msgstr "MÄ“s atbalstam tikai protokola versiju $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "MÄ“s atbalstam protokola versijas starp $1 un $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -84,7 +83,8 @@ msgstr "MÄ“s atbalstam protokola versijas starp $1 un $2."
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Atkarības:"
 
@@ -158,14 +158,55 @@ msgid "enabled"
 msgstr "iespējots"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Iel�de..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Visi papildin�jumi"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Šis taustiņš jau tiek izmantots"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Atpakaļ uz Galveno Izvēlni"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Spēlēt (k� serveris)"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -188,6 +229,16 @@ msgid "Install"
 msgstr "Instalēt"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Instalēt"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Neoblig�t�s atkarības:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Modi"
@@ -201,9 +252,25 @@ msgid "No results"
 msgstr "Nav result�tu"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Meklēt"
+#, fuzzy
+msgid "No updates"
+msgstr "Atjaunot"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -218,7 +285,11 @@ msgid "Update"
 msgstr "Atjaunot"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -259,9 +330,8 @@ msgid "Create"
 msgstr "Izveidot"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Inform�cija:"
+msgstr "Dekor�cijas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -475,10 +545,6 @@ msgid "Browse"
 msgstr "P�rlūkot"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Atspējots"
 
@@ -523,6 +589,10 @@ msgid "Scale"
 msgstr "MÄ“rogs"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Meklēt"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Izvēlēties mapi"
 
@@ -639,6 +709,21 @@ msgstr "Neizdev�s instalēt modu k� $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Neizdev�s instalēt modu komplektu k� $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Iel�de..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Klienta puses skriptēšana ir atspējota"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Pamēģiniet atk�rtoti ieslēgt publisko serveru sarakstu un p�rbaudiet "
+"interneta savienojumu."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "P�rlūkot tiešsaistes saturu"
@@ -692,7 +777,14 @@ msgid "Credits"
 msgstr "Pateicības"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Izvēlēties mapi"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -712,14 +804,10 @@ msgid "Bind Address"
 msgstr "Piesaistes adrese"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Iestatīt"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Radošais režīms"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Iespējot boj�jumus"
 
@@ -736,8 +824,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "V�rds/Parole"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -748,6 +836,11 @@ msgid "No world created or selected!"
 msgstr "Pasaule nav ne izveidota, ne izvēlēta!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Jaun� parole"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Spēlēt"
 
@@ -756,6 +849,11 @@ msgid "Port"
 msgstr "Ports"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Izvēlieties pasauli:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Izvēlieties pasauli:"
 
@@ -771,23 +869,23 @@ msgstr "S�kt spēli"
 msgid "Address / Port"
 msgstr "Adrese / Ports"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Pieslēgties"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Radošais režīms"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Boj�jumi iespējoti"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Izdzēst no izlases"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Pievienot izlasei"
 
@@ -795,16 +893,16 @@ msgstr "Pievienot izlasei"
 msgid "Join Game"
 msgstr "Pievienoties spēlei"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "V�rds / Parole"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Pings"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP iespējots"
 
@@ -833,11 +931,6 @@ msgid "Antialiasing:"
 msgstr "Gludin�šana:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-"Vai esat p�rliecin�ts, ka vēlaties atiestatīt savu viena spēlēt�ja pasauli?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Atcerēties ekr�na izmēru"
 
@@ -845,10 +938,6 @@ msgstr "Atcerēties ekr�na izmēru"
 msgid "Bilinear Filter"
 msgstr "Biline�rais filtrs"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "“Bump Mapping�"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Nomainīt kontroles"
@@ -862,10 +951,6 @@ msgid "Fancy Leaves"
 msgstr "Skaistas lapas"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Izveidot norm�l-kartes"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "“Mipmap�"
 
@@ -874,10 +959,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "“Mipmap� + anizotr. filtrs"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "NÄ“"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Bez filtra"
 
@@ -905,19 +986,11 @@ msgstr "Necaurredzamas lapas"
 msgid "Opaque Water"
 msgstr "Necaurredzams Å«dens"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Tekstūru dziļums"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Daļiņas"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Atiestatīt viena spēlēt�ja pasauli"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Ekr�ns:"
 
@@ -930,6 +1003,11 @@ msgid "Shaders"
 msgstr "Å eideri"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Å eideri (nepieejami)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Å eideri (nepieejami)"
 
@@ -973,22 +1051,6 @@ msgstr "Viļņojoši šķidrumi"
 msgid "Waving Plants"
 msgstr "Viļņojoši augi"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "J�"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Iestatīt modus"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Galven� izvēlne"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "S�kt viena spēlēt�ja spēli"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Savienojuma noildze."
@@ -1150,18 +1212,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Kontroles:\n"
 "- %s: uz priekšu\n"
@@ -1276,16 +1335,6 @@ msgid "Fog enabled"
 msgstr "Migla iespējota"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Migla atspējota"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Migla iespējota"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spēles inform�cija:"
 
@@ -1306,16 +1355,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Migla atspējota"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Boj�jumi iespējoti"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "MÄ“diji..."
 
@@ -1328,34 +1367,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Minikarte šobrīd atspējota vai nu spēlei, vai modam"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Minikarte paslēpta"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Minikarte radara režīm�, palielin�jums x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Minikarte radara režīm�, palielin�jums x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Minikarte radara režīm�, palielin�jums x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Minikarte virsmas režīm�, palielin�jums x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Minikarte virsmas režīm�, palielin�jums x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Minikarte virsmas režīm�, palielin�jums x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "“Noclip� režīms izslēgts"
 
@@ -1400,10 +1411,6 @@ msgid "Resolving address..."
 msgstr "Atrisina adresi..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Atdzīvoties"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Beidz darbu..."
 
@@ -1456,10 +1463,6 @@ msgid "Wireframe shown"
 msgstr "Karkasattēlojums iespējots"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Jūs nomir�t"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Tuvin�šana šobrīd atspējota vai nu spēlei, vai modam"
 
@@ -1476,16 +1479,6 @@ msgid "Chat shown"
 msgstr "Čats par�dīts"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Čats paslēpts"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Čats par�dīts"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "Spēles saskarne paslēpta"
 
@@ -1765,6 +1758,25 @@ msgstr "X Poga 2"
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Minikarte paslēpta"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Minikarte radara režīm�, palielin�jums x1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Minikarte virsmas režīm�, palielin�jums x1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Minikarte virsmas režīm�, palielin�jums x1"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Paroles nesakrīt!"
@@ -1810,26 +1822,6 @@ msgid "Backward"
 msgstr "Atmuguriski"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Mainīt kameru"
 
@@ -1924,29 +1916,10 @@ msgid "Special"
 msgstr "Speci�lais"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Speci�lais"
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "“Noclip�"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Spēles saskarne"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Lidot"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "ÄŒata logs"
 
@@ -2056,12 +2029,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2168,6 +2135,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2401,10 +2372,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2475,16 +2442,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2636,6 +2593,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2692,7 +2653,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2700,7 +2663,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2800,12 +2765,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2876,6 +2835,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2936,7 +2899,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3024,14 +2987,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3041,18 +2996,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3069,12 +3012,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3084,7 +3021,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3386,10 +3323,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3443,8 +3376,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3915,6 +3848,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3995,6 +3932,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4094,6 +4038,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4650,10 +4601,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4667,6 +4614,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4830,7 +4785,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4879,6 +4834,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5108,14 +5070,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5141,10 +5095,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5170,34 +5120,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5263,6 +5185,14 @@ msgid "Pitch move mode"
 msgstr "Kustība uz augšu/leju pēc skatīšan�s virziena"
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5420,10 +5350,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5675,6 +5601,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5804,10 +5740,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5901,6 +5833,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5959,8 +5895,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5986,15 +5922,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6130,6 +6071,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6332,6 +6284,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6454,6 +6412,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6465,11 +6441,61 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr ""
+#~ "Vai esat p�rliecin�ts, ka vēlaties atiestatīt savu viena spēlēt�ja "
+#~ "pasauli?"
+
+#~ msgid "Back"
+#~ msgstr "Atpakaļ"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "“Bump Mapping�"
+
+#~ msgid "Config mods"
+#~ msgstr "Iestatīt modus"
+
+#~ msgid "Configure"
+#~ msgstr "Iestatīt"
 
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr "Lejupl�dējas un instalējas $1, lūdzu uzgaidiet..."
 
-#~ msgid "Back"
-#~ msgstr "Atpakaļ"
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Izveidot norm�l-kartes"
+
+#~ msgid "Main"
+#~ msgstr "Galven� izvēlne"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Minikarte radara režīm�, palielin�jums x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Minikarte radara režīm�, palielin�jums x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Minikarte virsmas režīm�, palielin�jums x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Minikarte virsmas režīm�, palielin�jums x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "V�rds/Parole"
+
+#~ msgid "No"
+#~ msgstr "NÄ“"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Tekstūru dziļums"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Atiestatīt viena spēlēt�ja pasauli"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "S�kt viena spēlēt�ja spēli"
+
+#~ msgid "Yes"
+#~ msgstr "J�"
diff --git a/po/minetest.pot b/po/minetest.pot
index e544cbfeb..b5556d3f3 100644
--- a/po/minetest.pot
+++ b/po/minetest.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr ""
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr ""
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -41,14 +49,6 @@ msgstr ""
 msgid "An error occurred:"
 msgstr ""
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
-
-#: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
 msgstr ""
@@ -97,7 +97,8 @@ msgstr ""
 msgid "Optional dependencies:"
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr ""
 
@@ -110,7 +111,8 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -177,8 +179,55 @@ msgid "Failed to download $1"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
@@ -186,6 +235,24 @@ msgid "Back to Main Menu"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "No results"
 msgstr ""
 
@@ -198,7 +265,7 @@ msgid "Downloading..."
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "Install"
+msgid "Queued"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
@@ -210,7 +277,7 @@ msgid "Uninstall"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -445,10 +512,6 @@ msgid "Rename Modpack:"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr ""
 
@@ -560,6 +623,10 @@ msgid "Select file"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
 msgstr ""
 
@@ -623,6 +690,18 @@ msgstr ""
 msgid "$1 mods"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Installed Packages:"
 msgstr ""
@@ -668,10 +747,6 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
-msgstr ""
-
-#: builtin/mainmenu/tab_credits.lua
 msgid "Core Developers"
 msgstr ""
 
@@ -687,12 +762,22 @@ msgstr ""
 msgid "Previous Contributors"
 msgstr ""
 
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Open User Data Directory"
+msgstr ""
+
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
+msgid "Select Mods"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -703,11 +788,11 @@ msgstr ""
 msgid "Select World:"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Creative Mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr ""
 
@@ -724,7 +809,11 @@ msgid "Announce Server"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Password"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -755,36 +844,36 @@ msgstr ""
 msgid "Address / Port"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -853,18 +942,6 @@ msgid "8x"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Smooth Lighting"
 msgstr ""
 
@@ -905,11 +982,11 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Shaders (unavailable)"
+msgid "Shaders (experimental)"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
+msgid "Shaders (unavailable)"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
@@ -924,23 +1001,11 @@ msgstr ""
 msgid "Touchthreshold: (px)"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Waving Liquids"
 msgstr ""
 
@@ -960,18 +1025,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1032,18 +1085,6 @@ msgstr ""
 msgid "Invalid gamespec."
 msgstr ""
 
-#. ~ DO NOT TRANSLATE THIS LITERALLY!
-#. This is a special string. Put either "no" or "yes"
-#. into the translation field (literally).
-#. Choose "yes" if the language requires use of the fallback
-#. font, "no" otherwise.
-#. The fallback font is (normally) required for languages with
-#. non-Latin script, like Chinese.
-#. When in doubt, test your translation.
-#: src/client/fontengine.cpp
-msgid "needs_fallback_font"
-msgstr ""
-
 #: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
@@ -1158,22 +1199,6 @@ msgid "Noclip mode disabled"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Cinematic mode enabled"
 msgstr ""
 
@@ -1190,34 +1215,6 @@ msgid "Automatic forward disabled"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
@@ -1285,14 +1282,6 @@ msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Respawn"
-msgstr ""
-
-#: src/client/game.cpp
 msgid ""
 "Default Controls:\n"
 "No menu visible:\n"
@@ -1316,18 +1305,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1426,14 +1412,6 @@ msgid "Chat hidden"
 msgstr ""
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD shown"
 msgstr ""
 
@@ -1713,6 +1691,24 @@ msgstr ""
 msgid "OEM Clear"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp
 #, c-format
 msgid ""
@@ -1788,10 +1784,6 @@ msgid "Inventory"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Prev. item"
 msgstr ""
 
@@ -1883,38 +1875,6 @@ msgstr ""
 msgid "Toggle fog"
 msgstr ""
 
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
 #: src/gui/guiPasswordChange.cpp
 msgid "Old Password"
 msgstr ""
@@ -2085,14 +2045,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
+msgid "Place repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2187,6 +2146,14 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -2266,6 +2233,28 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Inventory key"
 msgstr ""
 
@@ -2963,6 +2952,16 @@ msgid "Basic"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "VBO"
 msgstr ""
 
@@ -3116,8 +3115,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3164,90 +3168,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Waving Nodes"
 msgstr ""
 
@@ -3340,11 +3260,11 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3517,8 +3437,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3655,7 +3575,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3663,7 +3585,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3834,6 +3758,12 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Menus"
 msgstr ""
 
@@ -4416,6 +4346,19 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Default game"
 msgstr ""
 
@@ -4485,7 +4428,7 @@ msgid "Creative"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4848,8 +4791,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -4891,6 +4834,19 @@ msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Dedicated server step"
 msgstr ""
 
@@ -4918,6 +4874,16 @@ msgid "Length of time between Active Block Modifier (ABM) execution cycles"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "NodeTimer interval"
 msgstr ""
 
@@ -5271,20 +5237,6 @@ msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Main menu script"
 msgstr ""
 
@@ -6395,3 +6347,14 @@ msgid ""
 "These flags are independent from Minetest versions,\n"
 "so see a full list at https://content.minetest.net/help/content_flags/"
 msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
diff --git a/po/ms/minetest.po b/po/ms/minetest.po
index 1d780c09c..d35e063cc 100644
--- a/po/ms/minetest.po
+++ b/po/ms/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Malay (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-07-08 20:47+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-01 05:52+0000\n"
 "Last-Translator: Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat "
 "Yasuyoshi <translation@mnh48.moe>\n"
 "Language-Team: Malay <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -13,7 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Lahir semula"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Anda telah meninggal"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -37,11 +45,7 @@ msgstr "Sambung semula"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr "Pelayan permainan meminta anda untuk menyambung semula:"
-
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Sedang memuatkan..."
+msgstr "Pelayan meminta anda untuk menyambung semula:"
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
@@ -49,17 +53,11 @@ msgstr "Versi protokol tidak serasi. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "Pelayan permainan menguatkuasakan protokol versi $1. "
+msgstr "Pelayan menguatkuasakan protokol versi $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr "Pelayan permainan menyokong protokol versi $1 hingga $2. "
-
-#: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Cuba aktifkan semula senarai pelayan awam dan periksa sambungan internet "
-"anda."
+msgstr "Pelayan menyokong protokol versi $1 hingga $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
@@ -69,7 +67,8 @@ msgstr "Kami hanya menyokong protokol versi $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Kami menyokong protokol versi $1 hingga $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -79,7 +78,8 @@ msgstr "Kami menyokong protokol versi $1 hingga $2."
 msgid "Cancel"
 msgstr "Batal"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Kebergantungan:"
 
@@ -153,14 +153,54 @@ msgid "enabled"
 msgstr "Dibolehkan"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" sudah wujud. Adakah anda ingin tulis gantinya?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Kebergantungan $1 dan $2 akan dipasangkan."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 oleh $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 sedang muat turun,\n"
+"$2 menunggu giliran"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 memuat turun..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 memerlukan kebergantungan yang tidak dijumpai."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 akan dipasangkan, dan kebergantungan $2 akan dilangkau."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Semua pakej"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Sudah dipasang"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Kembali ke Menu Utama"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Permainan Asas:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr "ContentDB tidak tersedia apabila Minetest dikompil tanpa cURL"
 
@@ -182,6 +222,14 @@ msgid "Install"
 msgstr "Pasang"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "Pasang $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Pasang kebergantungan yang hilang"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mods"
@@ -195,9 +243,24 @@ msgid "No results"
 msgstr "Tiada hasil"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Cari"
+msgid "No updates"
+msgstr "Tiada kemas kini"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Tidak dijumpai"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Tulis ganti"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Sila semak dan pastikan permainan asas itu betul."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "Menunggu giliran"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -212,8 +275,12 @@ msgid "Update"
 msgstr "Kemas kini"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Lihat"
+msgid "Update All [$1]"
+msgstr "Kemas Kini Semua [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Lihat maklumat lanjut dalam pelayar sesawang"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -467,11 +534,6 @@ msgid "Browse"
 msgstr "Layar"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Klien"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Dilumpuhkan"
 
@@ -516,6 +578,10 @@ msgid "Scale"
 msgstr "Skala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Cari"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Pilih direktori"
 
@@ -630,6 +696,21 @@ msgstr "Gagal memasang mods sebagai $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Gagal memasang pek mods sebagai $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Sedang memuatkan..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Skrip pihak klien dilumpuhkan"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Cuba aktifkan semula senarai pelayan awam dan periksa sambungan internet "
+"anda."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Layari kandungan dalam talian"
@@ -683,8 +764,16 @@ msgid "Credits"
 msgstr "Penghargaan"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "Buka Direktori Data Pengguna"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Membuka direktori yang mengandungi dunia, permainan, mods, dan pek\n"
+"tekstur yang disediakan oleh pengguna, dalam pengurus / pelayar fail."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -703,14 +792,10 @@ msgid "Bind Address"
 msgstr "Alamat Ikatan"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Konfigurasi"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Mod Kreatif"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Boleh Cedera"
 
@@ -727,8 +812,8 @@ msgid "Install games from ContentDB"
 msgstr "Pasangkan permainan daripada ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nama/Kata laluan"
+msgid "Name"
+msgstr "Nama"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -739,6 +824,10 @@ msgid "No world created or selected!"
 msgstr "Tiada dunia dicipta atau dipilih!"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Kata Laluan"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Mula Main"
 
@@ -747,6 +836,10 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Pilih Mods"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Pilih Dunia:"
 
@@ -762,23 +855,23 @@ msgstr "Mulakan Permainan"
 msgid "Address / Port"
 msgstr "Alamat / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Sambung"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Mod Kreatif"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Boleh Cedera"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Padam Kegemaran"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Kegemaran"
 
@@ -786,16 +879,16 @@ msgstr "Kegemaran"
 msgid "Join Game"
 msgstr "Sertai Permainan"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nama / Kata laluan"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Boleh Berlawan PvP"
 
@@ -824,10 +917,6 @@ msgid "Antialiasing:"
 msgstr "Antialias:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Adakah anda mahu set semula dunia pemain perseorangan?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Autosimpan Saiz Skrin"
 
@@ -835,10 +924,6 @@ msgstr "Autosimpan Saiz Skrin"
 msgid "Bilinear Filter"
 msgstr "Penapisan Bilinear"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Pemetaan Benggol"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Tukar Kekunci"
@@ -852,10 +937,6 @@ msgid "Fancy Leaves"
 msgstr "Daun Beragam"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Jana Peta Normal"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Peta Mip"
 
@@ -864,10 +945,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Peta Mip + Penapisan Aniso"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Tidak"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Tiada Tapisan"
 
@@ -895,19 +972,11 @@ msgstr "Daun Legap"
 msgid "Opaque Water"
 msgstr "Air Legap"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Oklusi Paralaks"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Partikel"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Set semula dunia pemain perseorangan"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Skrin:"
 
@@ -920,6 +989,10 @@ msgid "Shaders"
 msgstr "Pembayang"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Pembayang (dalam ujikaji)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Pembayang (tidak tersedia)"
 
@@ -963,22 +1036,6 @@ msgstr "Cecair Bergelora"
 msgid "Waving Plants"
 msgstr "Tumbuhan Bergoyang"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ya"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Konfigurasi mods"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Utama"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Mula Main Seorang"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Sambungan tamat tempoh."
@@ -1134,38 +1191,35 @@ msgid "Continue"
 msgstr "Teruskan"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
-"Kawalan:\n"
+"Controls:\n"
 "- %s: bergerak ke depan\n"
 "- %s: bergerak ke belakang\n"
 "- %s: bergerak ke kiri\n"
 "- %s: bergerak ke kanan\n"
 "- %s: lompat/naik atas\n"
+"- %s: gali/ketuk\n"
+"- %s: letak/guna\n"
 "- %s: selinap/turun bawah\n"
 "- %s: jatuhkan item\n"
 "- %s: inventori\n"
 "- Tetikus: pusing/lihat sekeliling\n"
-"- Tetikus kiri: gali/ketuk\n"
-"- Tetikus kanan: letak/guna\n"
 "- Roda tetikus: pilih item\n"
 "- %s: sembang\n"
 
@@ -1268,16 +1322,6 @@ msgid "Fog enabled"
 msgstr "Kabut dibolehkan"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Kabut dilumpuhkan"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Kabut dibolehkan"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Maklumat permainan:"
 
@@ -1298,16 +1342,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Kabut dilumpuhkan"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Boleh Cedera"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Sedang memuatkan media..."
 
@@ -1320,34 +1354,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Peta mini dilumpuhkan oleh permainan atau mods"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Peta mini disembunyikan"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Peta mini dalam mod radar, Zum 1x"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Peta mini dalam mod radar, Zum 2x"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Peta mini dalam mod radar, Zum 4x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Peta mini dalam mod permukaan, Zum 1x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Peta mini dalam mod permukaan, Zum 2x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Peta mini dalam mod permukaan, Zum 4x"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Mod tembus blok dilumpuhkan"
 
@@ -1392,10 +1398,6 @@ msgid "Resolving address..."
 msgstr "Sedang menyelesaikan alamat..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Lahir semula"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Sedang menutup..."
 
@@ -1448,10 +1450,6 @@ msgid "Wireframe shown"
 msgstr "Rangka dawai ditunjukkan"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Anda telah meninggal"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zum sedang dilumpuhkan oleh permainan atau mods"
 
@@ -1468,16 +1466,6 @@ msgid "Chat shown"
 msgstr "Sembang ditunjukkan"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Sembang disembunyikan"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Sembang ditunjukkan"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "Papar pandu (HUD) disembunyikan"
 
@@ -1757,6 +1745,24 @@ msgstr "Butang X 2"
 msgid "Zoom"
 msgstr "Zum"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Peta mini disembunyikan"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Peta mini dalam mod radar, Zum x%d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Peta mini dalam mod permukaan, Zum x%d"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Peta mini dalam mod tekstur"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Kata laluan tidak padan!"
@@ -1801,26 +1807,6 @@ msgid "Backward"
 msgstr "Ke Belakang"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Tukar kamera"
 
@@ -1915,30 +1901,10 @@ msgid "Special"
 msgstr "Istimewa"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Istimewa"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Togol Sinematik"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Togol Sinematik"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Togol papar pandu (HUD)"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Togol Terbang"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Togol log sembang"
 
@@ -2069,14 +2035,6 @@ msgstr ""
 "tetapkan kesemua 3 nombor yang sama untuk bentuk mentah."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = oklusi paralaks dengan maklumat cerun (lebih cepat).\n"
-"1 = pemetaan bentuk muka bumi (lebih lambat, lebih tepat)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "Hingar 2D yang mengawal bentuk/saiz gunung rabung."
 
@@ -2202,12 +2160,16 @@ msgid "ABM interval"
 msgstr "Selang masa ABM"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr "Peruntukan masa ABM"
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "Had mutlak untuk blok dibarisgilirkan untuk timbul"
+msgstr "Had mutlak untuk blok menunggu giliran untuk timbul"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
-msgstr "Pecutan dalam udara"
+msgstr "Pecutan di udara"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration of gravity, in nodes per second per second."
@@ -2236,7 +2198,7 @@ msgid ""
 "Note that the address field in the main menu overrides this setting."
 msgstr ""
 "Alamat untuk menyambung.\n"
-"Biar kosong untuk memulakan pelayan permainan tempatan.\n"
+"Biar kosong untuk memulakan pelayan tempatan.\n"
 "Ambil perhatian bahawa medan alamat dalam menu utama mengatasi tetapan ini."
 
 #: src/settings_translation_file.cpp
@@ -2307,11 +2269,11 @@ msgstr "Penapisan anisotropik"
 
 #: src/settings_translation_file.cpp
 msgid "Announce server"
-msgstr "Mengumumkan pelayan permainan"
+msgstr "Umumkan pelayan"
 
 #: src/settings_translation_file.cpp
 msgid "Announce to this serverlist."
-msgstr "Mengumumkan ke senarai pelayan ini."
+msgstr "Umumkan ke senarai pelayan ini."
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
@@ -2462,10 +2424,6 @@ msgid "Builtin"
 msgstr "Terbina dalam"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Pemetaan timbul"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2543,22 +2501,6 @@ msgstr ""
 "Di mana 0.0 ialah aras cahaya minimum, 1.0 ialah maksimum."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Mengubah antara muka menu utama:\n"
-"-   Penuh:  Banyak dunia pemain perseorangan, pilihan permainan, pek "
-"tekstur, dll.\n"
-"-   Mudah: Satu dunia pemain perseorangan, tiada pilihan permainan atau pek "
-"tekstur.\n"
-"Mungkin diperlukan untuk skrin yang lebih kecil."
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr "Saiz fon sembang"
 
@@ -2725,6 +2667,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "Senarai Hitam Bendera ContentDB"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "Muat Turun Serempak Maksimum ContentDB"
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "URL ContentDB"
 
@@ -2791,16 +2737,24 @@ msgid "Crosshair alpha"
 msgstr "Nilai alfa rerambut silang"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "Nilai alfa rerambut silang (kelegapan, antara 0 dan 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Nilai alfa rerambut silang (kelegapan, antara 0 dan 255).\n"
+"Juga mengawal warna rerambut silang objek"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
 msgstr "Warna rerambut silang"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Warna bagi kursor rerambut silang (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Warna rerambut silang (R,G,B).\n"
+"Juga mengawal warna rerambut silang objek"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2905,14 +2859,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Mentakrifkan kedudukan dan rupa bumi bukit dan tasik pilihan."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Mentakrifkan tahap persampelan tekstur.\n"
-"Nilai lebih tinggi menghasilakn peta normal lebih lembut."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Mentakrifkan aras tanah asas."
 
@@ -2973,8 +2919,8 @@ msgid ""
 "Description of server, to be displayed when players join and in the "
 "serverlist."
 msgstr ""
-"Perihal pelayan permainan, untuk dipaparkan apabila pemain masuk dan juga "
-"dalam senarai pelayan."
+"Perihal pelayan, untuk dipaparkan apabila pemain masuk dan juga dalam "
+"senarai pelayan."
 
 #: src/settings_translation_file.cpp
 msgid "Desert noise threshold"
@@ -2993,6 +2939,10 @@ msgid "Desynchronize block animation"
 msgstr "Menyahsegerakkan animasi blok"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "Kekunci gali"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Partikel ketika menggali"
 
@@ -3006,9 +2956,7 @@ msgstr "Menolak kata laluan kosong"
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
-msgstr ""
-"Nama domain pelayan permainan, untuk dipaparkan dalam senarai pelayan "
-"permainan."
+msgstr "Nama domain pelayan, untuk dipaparkan dalam senarai pelayan."
 
 #: src/settings_translation_file.cpp
 msgid "Double tap jump for fly"
@@ -3060,7 +3008,8 @@ msgid "Enable console window"
 msgstr "Membolehkan tetingkap konsol"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Membolehkan mod kreatif untuk peta baru dicipta."
 
 #: src/settings_translation_file.cpp
@@ -3173,18 +3122,6 @@ msgid "Enables animation of inventory items."
 msgstr "Membolehkan animasi item dalam inventori."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Membolehkan pemetaan timbul pada tekstur. Peta normal perlu disediakan oleh "
-"pek\n"
-"tekstur atau perlu dijana secara automatik.\n"
-"Perlukan pembayang dibolehkan."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Membolehkan pengagregatan jejaring yang diputar di paksi Y (facedir)."
 
@@ -3194,22 +3131,6 @@ msgstr "Membolehkan peta mini."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Membolehkan penjanaan peta normal secara layang (Kesan cetak timbul).\n"
-"Perlukan pemetaan timbul untuk dibolehkan."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Membolehkan pemetaan oklusi paralaks.\n"
-"Memerlukan pembayang untuk dibolehkan."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3230,14 +3151,6 @@ msgstr "Kaedah entiti"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Pilihan percubaan, mungkin menampakkan ruang yang nyata di\n"
-"antara blok apabila ditetapkan dengan nombor lebih besar daripada 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3253,8 +3166,8 @@ msgstr ""
 "bahagian tanah yang lebih rata, sesuai untuk lapisan tanah terapung pejal."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS di menu jeda"
+msgid "FPS when unfocused or paused"
+msgstr "Bingkai per saat (FPS) apabila permainan hilang fokus atau dijedakan"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3306,8 +3219,7 @@ msgid ""
 "This requires the \"fast\" privilege on the server."
 msgstr ""
 "Bergerak pantas (dengan kekunci \"istimewa\").\n"
-"Ini memerlukan keistimewaan \"pergerakan pantas\" dalam pelayan permainan "
-"tersebut."
+"Ini memerlukan keistimewaan \"pergerakan pantas\" dalam pelayan tersebut."
 
 #: src/settings_translation_file.cpp
 msgid "Field of view"
@@ -3323,9 +3235,8 @@ msgid ""
 "the\n"
 "Multiplayer Tab."
 msgstr ""
-"Fail dalam laluan client/serverlist/ yang mengandungi senarai pelayan "
-"kegemaran\n"
-"yang dipaparkan dalam Tab Pemain Ramai."
+"Fail dalam laluan client/serverlist/ yang mengandungi senarai\n"
+"pelayan kegemaran yang dipaparkan dalam Tab Pemain Ramai."
 
 #: src/settings_translation_file.cpp
 msgid "Filler depth"
@@ -3445,15 +3356,15 @@ msgstr "Saiz fon"
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the default font in point (pt)."
-msgstr "Saiz fon bagi fon lalai dalan unit poin (pt)."
+msgstr "Saiz fon bagi fon lalai dalan unit titik (pt)."
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the fallback font in point (pt)."
-msgstr "Saiz fon bagi fon berbalik dalam unit poin (pt)."
+msgstr "Saiz fon bagi fon berbalik dalam unit titik (pt)."
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the monospace font in point (pt)."
-msgstr "Saiz fon bagi fon monospace dalam unit poin (pt)."
+msgstr "Saiz fon bagi fon monospace dalam unit titik (pt)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3590,10 +3501,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Penapis skala GUI txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Jana peta normal"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Panggil balik sejagat"
 
@@ -3655,16 +3562,15 @@ msgstr "Kekunci menogol papar pandu (HUD)"
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Cara pengendalian panggilan API Lua yang terkecam:\n"
-"-    legacy: (cuba untuk) meniru tingkah laku yang lama (lalai untuk "
-"terbitan).\n"
-"-    log: meniru dan menulis log runut balik kesemua panggilan terkecam "
-"(lalai untuk nyahpepijat).\n"
-"-    error: gugurkan penggunaan panggilan terkecam (dicadangkan untuk "
+"-    none: Jangan log panggilan terkecam\n"
+"-    log: meniru dan menulis log runut balik bagi panggilan terkecam "
+"(lalai).\n"
+"-    error: gugurkan penggunaan panggilan terkecam (digalakkan untuk "
 "pembangun mods)."
 
 #: src/settings_translation_file.cpp
@@ -3731,9 +3637,7 @@ msgstr "Hingar kebukitan4"
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
-msgstr ""
-"Laman utama pelayan permainan, untuk dipaparkan dalam senarai pelayan "
-"permainan."
+msgstr "Laman utama pelayan, untuk dipaparkan dalam senarai pelayan."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3981,7 +3885,7 @@ msgid ""
 msgstr ""
 "Jika dibolehkan bersama mod terbang, pemain boleh terbang menerusi nod "
 "pepejal.\n"
-"Ini memerlukan keistimewaan \"tembus blok\" dalam pelayan permainan tersebut."
+"Ini memerlukan keistimewaan \"tembus blok\" dalam pelayan tersebut."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4077,7 +3981,7 @@ msgstr "Dalam Permainan"
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
 msgstr ""
-"Nilai alfa latar belakang konsol sembang dalam permainan (kelehapan, antara "
+"Nilai alfa latar belakang konsol sembang dalam permainan (kelegapan, antara "
 "0 dan 255)."
 
 #: src/settings_translation_file.cpp
@@ -4199,6 +4103,10 @@ msgid "Joystick button repetition interval"
 msgstr "Selang masa pengulangan butang kayu bedik"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr "Zon mati kayu bedik"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Kepekaan frustum kayu bedik"
 
@@ -4302,6 +4210,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Kekunci untuk menggali.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4444,6 +4362,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Kekunci untuk meletak.\n"
+"Lihat http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -5025,7 +4953,7 @@ msgid ""
 "-   Opaque: disable transparency"
 msgstr ""
 "Gaya daun:\n"
-"-   Beragam:  semua susu kelihatan\n"
+"-   Beragam:  semua sisi kelihatan\n"
 "-   Ringkas: hanya sisi luar kelihatan, jika special_tiles yang ditentukan "
 "digunakan\n"
 "-   Legap: melumpuhkan lut sinar"
@@ -5192,10 +5120,6 @@ msgid "Main menu script"
 msgstr "Skrip menu utama"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Gaya menu utama"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5212,6 +5136,14 @@ msgid "Makes all liquids opaque"
 msgstr "Buatkan semua cecair menjadi legap"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr "Tahap Pemampatan Peta untuk Simpanan Cakera"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr "Tahap Pemampatan Peta untuk Pemindahan Rangkaian"
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Direktori peta"
 
@@ -5394,8 +5326,10 @@ msgid "Maximum FPS"
 msgstr "FPS maksima"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "Bingkai per saat (FPS) maksima apabila permainan dijedakan."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr ""
+"Bingkai per saat (FPS) maksimum apabila tetingkap tidak difokuskan, atau "
+"apabila permainan dijedakan."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -5433,14 +5367,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
-msgstr "Jumlah maksimum blok yang boleh dibaris gilirkan untuk dimuatkan."
+msgstr "Jumlah maksimum blok yang boleh menunggu giliran untuk dimuatkan."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "This limit is enforced per player."
 msgstr ""
-"Jumlah maksimum blok untuk dibarisgilirkan untuk dijana.\n"
+"Jumlah maksimum blok untuk menunggu giliran untuk dijana.\n"
 "Had ini dikuatkuasakan per pemain."
 
 #: src/settings_translation_file.cpp
@@ -5448,10 +5382,20 @@ msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "This limit is enforced per player."
 msgstr ""
-"Jumlah maksimum blok untuk dibarisgilirkan untuk dimuatkan daripada fail.\n"
+"Jumlah maksimum blok untuk menunggu giliran untuk dimuatkan daripada fail.\n"
 "Had ini dikuatkuasakan per pemain."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+"Jumlah maksimum muat turun serempak. Muat turun melebihi had ini akan "
+"ditunggu giliran.\n"
+"Ini mestilah lebih rendah dari curl_parallel_limit."
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "Jumlah maksimum blokpeta yang dipaksa muat."
 
@@ -5460,7 +5404,7 @@ msgid ""
 "Maximum number of mapblocks for client to be kept in memory.\n"
 "Set to -1 for unlimited amount."
 msgstr ""
-"Jumlah peta blok maksima yang klien boleh simpan dalam memori.\n"
+"Jumlah blok peta maksimum yang klien boleh simpan dalam memori.\n"
 "Tetapkan kepada -1 untuk jumlah tanpa had."
 
 #: src/settings_translation_file.cpp
@@ -5664,8 +5608,8 @@ msgstr ""
 msgid ""
 "Name of the server, to be displayed when players join and in the serverlist."
 msgstr ""
-"Nama pelayan permainan, untuk dipaparkan apabila pemain masuk dan juga dalam "
-"senarai pelayan."
+"Nama pelayan, untuk dipaparkan apabila pemain masuk dan juga dalam senarai "
+"pelayan."
 
 #: src/settings_translation_file.cpp
 msgid "Near plane"
@@ -5708,14 +5652,6 @@ msgid "Noises"
 msgstr "Hingar"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Persampelan peta normal"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Kekuatan peta normal"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Jumlah jalur keluar"
 
@@ -5759,10 +5695,6 @@ msgstr ""
 "dan penggunaan memori (Kebiasaannya, 4096=100MB)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Jumlah lelaran oklusi paralaks."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Repositori Kandungan Dalam Talian"
 
@@ -5790,35 +5722,6 @@ msgstr ""
 "Tidak jeda jika formspec dibuka."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-"Pengaruh kesan oklusi paralaks pada keseluruhannya, kebiasaannya skala/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Skala keseluruhan kesan oklusi paralaks."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Oklusi paralaks"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Pengaruh oklusi paralaks"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Lelaran oklusi paralaks"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Mod oklusi paralaks"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Skala oklusi paralaks"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5904,12 +5807,20 @@ msgid "Pitch move mode"
 msgstr "Mod pergerakan pic"
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr "Kekunci letak"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr "Selang pengulangan perbuatan letak"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
 msgstr ""
 "Pemain boleh terbang tanpa terkesan dengan graviti.\n"
-"Ini memerlukan keistimewaan \"terbang\" dalam pelayan permainan tersebut."
+"Ini memerlukan keistimewaan \"terbang\" dalam pelayan tersebut."
 
 #: src/settings_translation_file.cpp
 msgid "Player name"
@@ -6094,10 +6005,6 @@ msgid "Right key"
 msgstr "Kekunci ke kanan"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Selang pengulangan klik kanan"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Kedalaman saluran sungai"
 
@@ -6155,7 +6062,7 @@ msgstr "Simpan saiz tetingkap secara automatik ketika diubah."
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
-msgstr "Simpan peta diterima dari pelayan permainan"
+msgstr "Simpan peta diterima dari pelayan"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6279,27 +6186,27 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Server / Singleplayer"
-msgstr "Pelayan permainan / Pemain perseorangan"
+msgstr "Pelayan / Pemain perseorangan"
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
-msgstr "URL pelayan permainan"
+msgstr "URL pelayan"
 
 #: src/settings_translation_file.cpp
 msgid "Server address"
-msgstr "Alamat pelayan permainan"
+msgstr "Alamat pelayan"
 
 #: src/settings_translation_file.cpp
 msgid "Server description"
-msgstr "Perihal pelayan permainan"
+msgstr "Perihal pelayan"
 
 #: src/settings_translation_file.cpp
 msgid "Server name"
-msgstr "Nama pelayan permainan"
+msgstr "Nama pelayan"
 
 #: src/settings_translation_file.cpp
 msgid "Server port"
-msgstr "Port pelayan permainan"
+msgstr "Port pelayan"
 
 #: src/settings_translation_file.cpp
 msgid "Server side occlusion culling"
@@ -6338,15 +6245,15 @@ msgid ""
 "Set to true to enable waving liquids (like water).\n"
 "Requires shaders to be enabled."
 msgstr ""
-"Tetapkan ke \"true\" untuk membolehkan cecair bergelora (macam air).\n"
-"Memerlukan pembayang dibolehkan."
+"Tetapkan kepada \"true\" untuk membolehkan cecair bergelora (macam air).\n"
+"Memerlukan pembayang untuk dibolehkan."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable waving plants.\n"
 "Requires shaders to be enabled."
 msgstr ""
-"Tetapkan ke \"true\" untuk membolehkan tumbuhan bergoyang.\n"
+"Tetapkan kepada \"true\" untuk membolehkan tumbuhan bergoyang.\n"
 "Memerlukan pembayang untuk dibolehkan."
 
 #: src/settings_translation_file.cpp
@@ -6393,6 +6300,19 @@ msgid "Show entity selection boxes"
 msgstr "Tunjukkan kotak pemilihan entiti"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Tunjuk kotak pemilihan entiti\n"
+"Anda perlu mulakan semula selepas mengubah tetapan ini."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Fon tebal secara lalainya"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Mesej penutupan"
 
@@ -6547,10 +6467,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Kekuatan paralaks mod 3D."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Kekuatan peta normal yang dijana."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6562,7 +6478,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
-msgstr "Pemeriksaan protokal ketat"
+msgstr "Pemeriksaan protokol ketat"
 
 #: src/settings_translation_file.cpp
 msgid "Strip color codes"
@@ -6679,6 +6595,10 @@ msgid "The URL for the content repository"
 msgstr "URL untuk repositori kandungan"
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr "Zon mati bagi kayu bedik yang digunakan"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6720,7 +6640,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
-msgstr "Antaramuka rangkaian yang pelayan permainan dengar."
+msgstr "Antaramuka rangkaian yang pelayan dengar."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6754,17 +6674,15 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "Terjemahan bahagian belakang untuk Irrlicht.\n"
 "Anda perlu memulakan semula selepas mengubah tetapan ini.\n"
-"Nota: Di Android, kekalkan dengan OGLES1 jika tidak pasti! Aplikasi mungkin "
-"tidak\n"
-"boleh dimulakan jika menggunakan tetapan lain. Di platform lain, OpenGL "
-"disyorkan,\n"
-"dan ia ialah satu-satunya pemacu yang mempunyai sokongan pembayang ketika "
-"ini."
+"Nota: Di Android, kekalkan dengan OGLES1 jika tidak pasti! Apl mungkin gagal "
+"dimulakan jika ditukar.\n"
+"Di platform lain, OpenGL digalakkan.\n"
+"Pembayang disokong oleh OpenGL (komputer sahaja) dan OGLES2 (dalam ujikaji)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6800,6 +6718,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+"Peruntukan masa yang dibenarkan untuk ABM dilakukan di setiap langkah\n"
+"(sebagai pecahan dari selang masa ABM)"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6808,13 +6734,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
-"Jumlah masa dalam saat diambil untuk melakukan klik kanan yang berulang "
-"apabila\n"
-"pemain menekan butang tetikus kanan tanpa melepaskannya."
+"Jumlah masa dalam saat diambil untuk meletakan nod yang berulang apabila\n"
+"pemain menekan butang letak tanpa melepaskannya."
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
@@ -6972,6 +6896,25 @@ msgstr ""
 "tinggi. Penyesuai-turun gama secara tepat tidak disokong."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+"Gunakan antialias pelbagai sampel (MSAA) untuk melembutkan sisi bongkah.\n"
+"Algoritma ini melembutkan port pandangan 3D sambil mengekalkan ketajaman "
+"imej,\n"
+"tetapi ia tidak memberi kesan bahagian dalam sesuatu tekstur\n"
+"(yang mana ia tampak lebih nyata dengan tekstur lutsinar).\n"
+"Ruangan kosong akan kelihatan di antara nod apabila pembayang dilumpuhkan.\n"
+"Jika ditetapkan ke 0, MSAA akan dilumpuhkan.\n"
+"Anda perlu mulakan semula selepas mengubah pilihan ini."
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Gunakan penapisan trilinear apabila menyesuaikan tekstur."
 
@@ -7162,7 +7105,7 @@ msgstr ""
 "semua\n"
 "imej GUI perlu ditapis dalam perisian, tetapi sesetengah imej dijana secara "
 "terus\n"
-"ke perkakasan (contohnya, render-to-texture untuk nod dalam inventori)."
+"ke perkakasan (contohnya, penerjemahan-ke-tekstur untuk nod dalam inventori)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7200,7 +7143,8 @@ msgstr ""
 "saiz tekstur minima untuk tekstur penyesuai-naikkan; nilai lebih tinggi "
 "tampak\n"
 "lebih tajam, tetapi memerlukan memori yang lebih banyak.  Nilai kuasa 2\n"
-"disyorkan.  Menetapkan nilai ini lebih tinggi dari 1 tidak akan menampakkan\n"
+"digalakkan.  Menetapkan nilai ini lebih tinggi dari 1 tidak akan "
+"menampakkan\n"
 "kesan yang nyata melainkan tapisan bilinear/trilinear/anisotropik "
 "dibolehkan.\n"
 "Ini juga digunakan sebagai saiz tekstur nod asas untuk autopenyesuaian\n"
@@ -7217,6 +7161,12 @@ msgstr ""
 "digunakan."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 "Sama ada animasi tekstur nod perlu dinyahsegerakkan pada setiap blok peta."
@@ -7242,8 +7192,8 @@ msgid ""
 msgstr ""
 "Tetapan sama ada untuk meminta klien menyambung semula selepas berlakunya "
 "keruntuhan (Lua).\n"
-"Tetapkan kepada benar jika pelayan anda ditetapkan untuk mula semula secara "
-"automatik."
+"Tetapkan kepada \"true\" jika pelayan anda ditetapkan untuk mula semula "
+"secara automatik."
 
 #: src/settings_translation_file.cpp
 msgid "Whether to fog out the end of the visible area."
@@ -7373,6 +7323,35 @@ msgid "Y-level of seabed."
 msgstr "Aras Y untuk dasar laut."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Tahap pemampatan ZLib untuk digunakan apabila menyimpan blokpeta ke cakera.\n"
+"-1 - tahap pemampatan lalai Zlib\n"
+"0 - tiada pemampatan, paling laju\n"
+"9 - pemampatan terbaik, paling lambat\n"
+"(tahap 1-3 menggunakan kaedah \"fast\" Zlib, 4-9 menggunakan kaedah biasa)"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Tahap pemampatan ZLib untuk digunakan apabila menghantar blokpeta kepada "
+"klien.\n"
+"-1 - tahap pemampatan lalai Zlib\n"
+"0 - tiada pemampatan, paling laju\n"
+"9 - pemampatan terbaik, paling lambat\n"
+"(tahap 1-3 menggunakan kaedah \"fast\" Zlib, 4-9 menggunakan kaedah biasa)"
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "Had masa muat turun fail cURL"
 
@@ -7384,23 +7363,12 @@ msgstr "Had cURL selari"
 msgid "cURL timeout"
 msgstr "Had masa cURL"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Back"
-#~ msgstr "Backspace"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Sedang muat turun dan memasang $1, sila tunggu..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Had baris hilir keluar pada cakera"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Kekuatan oklusi paralaks"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Laluan untuk simpan tangkap layar."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = oklusi paralaks dengan maklumat cerun (lebih cepat).\n"
+#~ "1 = pemetaan bentuk muka bumi (lebih lambat, lebih tepat)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7416,10 +7384,43 @@ msgstr "Had masa cURL"
 #~ "Ubah cara tanah terapung jenis gunung menirus di atas dan bawah titik "
 #~ "tengah."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Adakah anda mahu set semula dunia pemain perseorangan?"
+
+#~ msgid "Back"
+#~ msgstr "Backspace"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Pemetaan Bertompok"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Pemetaan bertompok"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Titik tengah tolakan-tengah lengkung cahaya."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Mengubah antara muka menu utama:\n"
+#~ "-   Penuh:  Banyak dunia pemain perseorangan, pilihan permainan, pek "
+#~ "tekstur, dll.\n"
+#~ "-   Mudah: Satu dunia pemain perseorangan, tiada pilihan permainan atau "
+#~ "pek tekstur.\n"
+#~ "Mungkin diperlukan untuk skrin yang lebih kecil."
+
+#~ msgid "Config mods"
+#~ msgstr "Konfigurasi mods"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurasi"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7430,6 +7431,9 @@ msgstr "Had masa cURL"
 #~ msgstr ""
 #~ "Mengawal lebar terowong, nilai lebih kecil mencipta terowong lebih lebar."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Warna bagi kursor rerambut silang (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Ketajaman kegelapan"
 
@@ -7441,6 +7445,13 @@ msgstr "Had masa cURL"
 #~ "Tanag terapung lembut berlaku apabila hingar > 0."
 
 #~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Mentakrifkan tahap persampelan tekstur.\n"
+#~ "Nilai lebih tinggi menghasilkan peta normal lebih lembut."
+
+#~ msgid ""
 #~ "Deprecated, define and locate cave liquids using biome definitions "
 #~ "instead.\n"
 #~ "Y of upper limit of lava in large caves."
@@ -7449,12 +7460,50 @@ msgstr "Had masa cURL"
 #~ "pentakrifan biom menggantikan cara asal.\n"
 #~ "Had Y atasan lava di gua-gua besar."
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Sedang muat turun dan memasang $1, sila tunggu..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Membolehkan VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Membolehkan pemetaan bertompok pada tekstur. Peta normal perlu disediakan "
+#~ "oleh pek\n"
+#~ "tekstur atau perlu dijana secara automatik.\n"
+#~ "Perlukan pembayang dibolehkan."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Membolehkan pemetaan tona sinematik"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Membolehkan penjanaan peta normal secara layang (Kesan cetak timbul).\n"
+#~ "Perlukan pemetaan bertompok untuk dibolehkan."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Membolehkan pemetaan oklusi paralaks.\n"
+#~ "Memerlukan pembayang untuk dibolehkan."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Pilihan percubaan, mungkin menampakkan ruang yang nyata di\n"
+#~ "antara blok apabila ditetapkan dengan nombor lebih besar daripada 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS di menu jeda"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Hingar ketinggian asas tanah terapung"
 
@@ -7467,6 +7516,12 @@ msgstr "Had masa cURL"
 #~ msgid "Gamma"
 #~ msgstr "Gama"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Jana Peta Normal"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Jana peta normal"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Sokongan IPv6."
 
@@ -7476,18 +7531,106 @@ msgstr "Had masa cURL"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Ketajaman pencahayaan"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Had baris hilir keluar pada cakera"
+
+#~ msgid "Main"
+#~ msgstr "Utama"
+
+#~ msgid "Main menu style"
+#~ msgstr "Gaya menu utama"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Peta mini dalam mod radar, Zum 2x"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Peta mini dalam mod radar, Zum 4x"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Peta mini dalam mod permukaan, Zum 2x"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Peta mini dalam mod permukaan, Zum 4x"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nama/Kata laluan"
+
+#~ msgid "No"
+#~ msgstr "Tidak"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Persampelan peta normal"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Kekuatan peta normal"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Jumlah lelaran oklusi paralaks."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr ""
+#~ "Pengaruh kesan oklusi paralaks pada keseluruhannya, kebiasaannya skala/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Skala keseluruhan kesan oklusi paralaks."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Oklusi Paralaks"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Oklusi paralaks"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Pengaruh oklusi paralaks"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Lelaran oklusi paralaks"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Mod oklusi paralaks"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Skala oklusi paralaks"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Kekuatan oklusi paralaks"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Laluan ke fon TrueType atau peta bit."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Laluan untuk simpan tangkap layar."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Kurungan bawah tanah melunjur"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Set semula dunia pemain perseorangan"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Pilih Fail Pakej:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Had bayang"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Mula Main Seorang"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Kekuatan peta normal yang dijana."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Kekuatan tolakan tengah lengkung cahaya."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Fon ini akan digunakan untuk sesetengah bahasa."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Togol Sinematik"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7499,27 +7642,27 @@ msgstr "Had masa cURL"
 #~ "Variasi ketinggian bukit dan kedalaman tasik rupa bumi lembut tanah "
 #~ "terapung."
 
-#~ msgid "Waving water"
-#~ msgstr "Air bergelora"
-
-#~ msgid "Y-level of floatland midpoint and lake surface."
-#~ msgstr "Aras Y untuk titik tengah tanah terapung dan permukaan tasik."
+#~ msgid "View"
+#~ msgstr "Lihat"
 
-#~ msgid "Y-level to which floatland shadows extend."
-#~ msgstr "Aras Y di mana bayang tanah terapung diperluaskan."
+#~ msgid "Waving Water"
+#~ msgstr "Air Bergelora"
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "Kurungan bawah tanah melunjur"
+#~ msgid "Waving water"
+#~ msgstr "Air bergelora"
 
 #~ msgid "Whether dungeons occasionally project from the terrain."
 #~ msgstr ""
 #~ "Sama ada kurungan bawah tanah kadang-kala terlunjur daripada rupa bumi."
 
-#~ msgid "Waving Water"
-#~ msgstr "Air Bergelora"
-
 #~ msgid "Y of upper limit of lava in large caves."
 #~ msgstr "Had Y pengatas lava dalam gua besar."
 
-#~ msgid "Select Package File:"
-#~ msgstr "Pilih Fail Pakej:"
+#~ msgid "Y-level of floatland midpoint and lake surface."
+#~ msgstr "Aras Y untuk titik tengah tanah terapung dan permukaan tasik."
+
+#~ msgid "Y-level to which floatland shadows extend."
+#~ msgstr "Aras Y di mana bayang tanah terapung diperluaskan."
+
+#~ msgid "Yes"
+#~ msgstr "Ya"
diff --git a/po/ms_Arab/minetest.po b/po/ms_Arab/minetest.po
index 03c6f7224..42d758b7d 100644
--- a/po/ms_Arab/minetest.po
+++ b/po/ms_Arab/minetest.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-07-08 20:47+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-10-20 18:26+0000\n"
 "Last-Translator: Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat "
 "Yasuyoshi <translation@mnh48.moe>\n"
 "Language-Team: Malay (Jawi) <https://hosted.weblate.org/projects/minetest/"
@@ -18,7 +18,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.3.1\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "لاهير سمولا"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "اندا تله منيڠݢل"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -42,11 +50,7 @@ msgstr "سمبوڠ سمولا"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr "ڤلاين ڤرماءينن ممينت اندا اونتوق مڽمبوڠ سمولا:"
-
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "سدڠ ممواتکن..."
+msgstr "ڤلاين ڤرماٴينن ممينت اندا اونتوق مڽمبوڠ سمولا:"
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
@@ -54,15 +58,11 @@ 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. "
-
-#: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "چوب اکتي�کن سمولا سناراي ڤلاين عوام �ان ڤريقسا سمبوڠن اينترنيت اندا."
+msgstr "ڤلاين ڤرماٴينن مڽوکوڠ ڤروتوکول �رسي $1 هيڠݢ $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
@@ -72,7 +72,8 @@ msgstr "کامي هاڽ مڽوکوڠ ڤروتوکول �رسي $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "کامي مڽوکوڠ ڤروتوکول �رسي $1 هيڠݢ $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -82,7 +83,8 @@ msgstr "کامي مڽوکوڠ ڤروتوکول �رسي $1 هيڠݢ $2."
 msgid "Cancel"
 msgstr "باتل"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "کبرݢنتوڠن:"
 
@@ -112,7 +114,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr "چاري مودس لاءين"
+msgstr "چاري مودس لاٴين"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -124,7 +126,7 @@ msgstr "تيادا کبرݢنتوڠن (ڤيليهن)"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No game description provided."
-msgstr "تيادا ڤريهل ڤرماءينن ترسديا."
+msgstr "تيادا ڤريهل ڤرماٴينن ترسديا."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No hard dependencies"
@@ -156,14 +158,55 @@ msgid "enabled"
 msgstr "دبوليهکن"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "مموات تورون..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "سموا ڤاکيج"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "ککونچي تله دݢوناکن اونتوق �وڠسي لاٴين"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "کمبالي کمينو اوتام"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "هوس ڤرماٴينن"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr "سيستم ContentDB تيدق ترسديا اڤابيلا Minetest دکومڤيل تنڤ cURL"
 
@@ -178,13 +221,23 @@ msgstr "ݢاݢل مموات تورون $1"
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
-msgstr "ڤرماءينن"
+msgstr "ڤرماٴينن"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Install"
 msgstr "ڤاسڠ"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "ڤاسڠ"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "کبرݢنتوڠن ڤيليهن:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "مودس"
@@ -198,9 +251,26 @@ msgid "No results"
 msgstr "تيادا حاصيل"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "چاري"
+#, fuzzy
+msgid "No updates"
+msgstr "کمس کيني"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Not found"
+msgstr "بيسوکن بوڽي"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -215,8 +285,12 @@ msgid "Update"
 msgstr "کمس کيني"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "ليهت"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -260,7 +334,7 @@ msgstr "هياسن"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
-msgstr "موات تورون ڤرماءينن� چونتوهڽ Minetest Game� دري minetest.net"
+msgstr "موات تورون ڤرماٴينن� چونتوهڽ Minetest Game� دري minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
@@ -284,11 +358,11 @@ msgstr "تانه تراڤوڠ (دالم اوجيکاجي)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
-msgstr "ڤرماءينن"
+msgstr "ڤرماٴينن"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr "جان روڤ بومي بوکن-�راکتل: لاءوتن دان باواه تانه"
+msgstr "جان روڤ بومي بوکن-�راکتل: لاٴوتن دان باواه تانه"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
@@ -312,7 +386,7 @@ msgstr "کلمبڤن رنده دان هاب تيڠݢي مڽببکن سوڠاي Ú
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
-msgstr "جاناءن ڤتا"
+msgstr "جاناٴن ڤتا"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
@@ -336,7 +410,7 @@ msgstr "جاريڠن تروووڠ دان ݢوا"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
-msgstr "تيادا ڤرماءينن دڤيليه"
+msgstr "تيادا ڤرماٴينن دڤيليه"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
@@ -352,7 +426,7 @@ msgstr "سوڠاي"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr "سوڠاي ارس لاءوت"
+msgstr "سوڠاي ارس لاٴوت"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -389,7 +463,7 @@ msgstr "اقليم سدرهانâ¹� ݢورونâ¹� هوتنâ¹� توندراâ¹� تØ
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr "هاکيسن ڤرموکاءن روڤ بومي"
+msgstr "هاکيسن ڤرموکاٴن روڤ بومي"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
@@ -405,7 +479,7 @@ msgstr "ݢوا ݢرݢاسي يڠ ساڠت مندالم باواه تانه"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The Development Test is meant for developers."
-msgstr "امرن: The Development Test هاڽله اونتوق کݢوناءن ڤمباڠون."
+msgstr "امرن: The Development Test هاڽله اونتوق کݢوناٴن ڤمباڠون."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -413,7 +487,7 @@ msgstr "نام دنيا"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no games installed."
-msgstr "اندا تيدق مماسڠ سبارڠ ڤرماءينن."
+msgstr "اندا تيدق مماسڠ سبارڠ ڤرماٴينن."
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "Are you sure you want to delete \"$1\"?"
@@ -450,8 +524,8 @@ msgid ""
 "This modpack has an explicit name given in its modpack.conf which will "
 "override any renaming here."
 msgstr ""
-"ڤيک مودس اين ممڤوڽاءي نام خصوص دبريکن دالم �ايل modpack.conf ميليقڽ يڠ اکن "
-"مڠاتسي سبارڠ ڤناماءن سمولا دسين."
+"ڤيک مودس اين ممڤوڽاٴي نام خصوص دبريکن دالم �ايل modpack.conf ميليقڽ يڠ اکن "
+"مڠاتسي سبارڠ ڤناماٴن سمولا دسين."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
@@ -470,10 +544,6 @@ msgid "Browse"
 msgstr "لاير"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "دلومڤوهکن"
 
@@ -518,6 +588,10 @@ msgid "Scale"
 msgstr "سکال"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "چاري"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "ڤيليه ديريکتوري"
 
@@ -622,7 +696,7 @@ msgstr "ݢاݢل مماسڠ $1 سباݢاي ڤيک تيکستور"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a game as a $1"
-msgstr "ݢاݢل مماسڠ ڤرماءينن سباݢاي $1"
+msgstr "ݢاݢل مماسڠ ڤرماٴينن سباݢاي $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a mod as a $1"
@@ -632,6 +706,19 @@ msgstr "ݢاݢل مماسڠ مودس سباݢاي $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "ݢاݢل مماسڠ ڤيک مودس سباݢاي $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "سدڠ ممواتکن..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "سکريڤ ڤيهق کليئن دلومڤوهکن"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "چوب اکتي�کن سمولا سناراي ڤلاين عوام �ان ڤريقسا سمبوڠن اينترنيت اندا."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "لايري کندوڠن دالم تالين"
@@ -682,10 +769,17 @@ msgstr "ڤمباڠون تراس"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
-msgstr "ڤڠهرݢاءن"
+msgstr "ڤڠهرݢاٴن"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "ڤيليه ديريکتوري"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -705,20 +799,16 @@ msgid "Bind Address"
 msgstr "علامت ايکتن"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "کون�يݢوراسي"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "مود کرياتي�"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "بوليه چدرا"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Game"
-msgstr "هوس ڤرماءينن"
+msgstr "هوس ڤرماٴينن"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Server"
@@ -726,11 +816,11 @@ msgstr "هوس ڤلاين"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr "ڤاسڠکن ڤرماءينن درڤد ContentDB"
+msgstr "ڤاسڠکن ڤرماٴينن درڤد ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "نام\\کات لالوان"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -741,14 +831,24 @@ msgid "No world created or selected!"
 msgstr "تيادا دنيا دچيڤت اتاو دڤيليه!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "کات لالوان لام"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
-msgstr "مولا ماءين"
+msgstr "مولا ماٴين"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Port"
 msgstr "ڤورت"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "ڤيليه دنيا:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "ڤيليه دنيا:"
 
@@ -758,46 +858,46 @@ msgstr "ڤورت ڤلاين"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Start Game"
-msgstr "مولاکن ڤرماءينن"
+msgstr "مولاکن ڤرماٴينن"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
 msgstr "علامت \\ ڤورت"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "سمبوڠ"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "مود کرياتي�"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "بوليه چدرا"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "ڤادم کݢمرن"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "کݢمرن"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Join Game"
-msgstr "سرتاءي ڤرماءينن"
+msgstr "سرتاٴي ڤرماٴينن"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "نام \\ کات لالوان"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ú¤ÙŠÚ "
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "بوليه برلاوان PvP"
 
@@ -826,21 +926,13 @@ msgid "Antialiasing:"
 msgstr "انتيالياس:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "اداکه اندا ماهو سيت سمولا دنيا ڤماءين ڤرساورڠن؟"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
-msgstr "اءوتوسيمڤن سايز سکرين"
+msgstr "اٴوتوسيمڤن ساٴيز سکرين"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
 msgstr "ڤناڤيسن بيلينيار"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "ڤمتاءن بيڠݢول"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "توکر ککونچي"
@@ -854,10 +946,6 @@ msgid "Fancy Leaves"
 msgstr "داون براݢم"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "جان ڤتا نورمل"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "ڤتا ميڤ"
 
@@ -866,10 +954,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "ڤتا ميڤ + ڤناڤيسن انيسو"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "تيدق"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "تيادا تاڤيسن"
 
@@ -895,21 +979,13 @@ msgstr "داون لݢڤ"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Water"
-msgstr "اءير لݢڤ"
-
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "اوکلوسي ڤارالکس"
+msgstr "اٴير لݢڤ"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "ڤرتيکل"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "سيت سمولا دنيا ڤماءين ڤرساورڠن"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "سکرين:"
 
@@ -922,6 +998,11 @@ msgid "Shaders"
 msgstr "ڤمبايڠ"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "تانه تراڤوڠ (دالم اوجيکاجي)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "ڤمبايڠ (تيدق ترسديا)"
 
@@ -931,7 +1012,7 @@ msgstr "داون ريڠکس"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Smooth Lighting"
-msgstr "ڤنچهاياءن لمبوت"
+msgstr "ڤنچهاياٴن لمبوت"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Texturing:"
@@ -943,7 +1024,7 @@ msgstr "اونتوق ممبوليهکن ڤمبايڠ� ڤماچو OpenGL مست
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
-msgstr "ڤمتاءن تونا"
+msgstr "ڤمتاٴن تونا"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold: (px)"
@@ -955,32 +1036,16 @@ msgstr "ڤناڤيسن تريلينيار"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
-msgstr "داءون برݢويڠ"
+msgstr "داٴون برݢويڠ"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Liquids"
-msgstr "چچاءير برݢلورا"
+msgstr "چچاٴير برݢلورا"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Plants"
 msgstr "تومبوهن برݢويڠ"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "ياء"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "کون�يݢوراسي مودس"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "اوتام"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "مولا ماءين ساورڠ"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "سمبوڠن تامت تيمڤوه."
@@ -1011,11 +1076,11 @@ msgstr "رالت دالم ڤڽمبوڠن (تامت تيمڤوه؟)"
 
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
-msgstr "تيدق جومڤ اتاو تيدق بوليه مواتکن ڤرماءينن \""
+msgstr "تيدق جومڤ اتاو تيدق بوليه مواتکن ڤرماٴينن \""
 
 #: src/client/clientlauncher.cpp
 msgid "Invalid gamespec."
-msgstr "سڤيسي�يکاسي ڤرماءينن تيدق صح."
+msgstr "سڤيسي�يکاسي ڤرماٴينن تيدق صح."
 
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
@@ -1027,7 +1092,7 @@ msgstr "تيادا دنيا دڤيليه اتاو تيادا علامت دبري
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
-msgstr "نام ڤماءين ترلالو ڤنجڠ."
+msgstr "نام ڤماٴين ترلالو ڤنجڠ."
 
 #: src/client/clientlauncher.cpp
 msgid "Please choose a name!"
@@ -1096,11 +1161,11 @@ msgstr "- نام ڤلاين: "
 
 #: src/client/game.cpp
 msgid "Automatic forward disabled"
-msgstr "ڤرݢرقن اءوتوماتيک دلومڤوهکن"
+msgstr "ڤرݢرقن اٴوتوماتيک دلومڤوهکن"
 
 #: src/client/game.cpp
 msgid "Automatic forward enabled"
-msgstr "ڤرݢرقن اءوتوماتيک دبوليهکن"
+msgstr "ڤرݢرقن اٴوتوماتيک دبوليهکن"
 
 #: src/client/game.cpp
 msgid "Camera update disabled"
@@ -1142,25 +1207,22 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "کاولن:\n"
 "- %s: برݢرق کدڤن\n"
 "- %s: برݢرق کبلاکڠ\n"
 "- %s: برݢرق ککيري\n"
 "- %s: برݢرق ککانن\n"
-"- %s: لومڤت\\ناءيق اتس\n"
+"- %s: لومڤت\\ناٴيق اتس\n"
 "- %s: سلينڤ\\تورون باواه\n"
 "- %s: جاتوهکن ايتم\n"
 "- %s: اين�ينتوري\n"
@@ -1232,7 +1294,7 @@ msgstr "کلوار کمينو"
 
 #: src/client/game.cpp
 msgid "Exit to OS"
-msgstr "کلوار تروس ڤرماءينن"
+msgstr "کلوار تروس ڤرماٴينن"
 
 #: src/client/game.cpp
 msgid "Fast mode disabled"
@@ -1244,7 +1306,7 @@ msgstr "مود ڤرݢرقن ڤنتس دبوليهکن"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr "مود ڤرݢرقن ڤنتس دبوليهکن (نوت: تيادا کأيستيميواءن 'ڤرݢرقن ڤنتس')"
+msgstr "مود ڤرݢرقن ڤنتس دبوليهکن (نوت: تيادا کأيستيميواٴن 'ڤرݢرقن ڤنتس')"
 
 #: src/client/game.cpp
 msgid "Fly mode disabled"
@@ -1256,7 +1318,7 @@ msgstr "مود تربڠ دبوليهکن"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr "مود تربڠ دبوليهکن (نوت: تيادا کأيستيميواءن 'تربڠ')"
+msgstr "مود تربڠ دبوليهکن (نوت: تيادا کأيستيميواٴن 'تربڠ')"
 
 #: src/client/game.cpp
 msgid "Fog disabled"
@@ -1267,22 +1329,12 @@ msgid "Fog enabled"
 msgstr "کابوت دبوليهکن"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "کابوت دلومڤوهکن"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "کابوت دبوليهکن"
-
-#: src/client/game.cpp
 msgid "Game info:"
-msgstr "معلومت ڤرماءينن:"
+msgstr "معلومت ڤرماٴينن:"
 
 #: src/client/game.cpp
 msgid "Game paused"
-msgstr "ڤرماءينن دجيداکن"
+msgstr "ڤرماٴينن دجيداکن"
 
 #: src/client/game.cpp
 msgid "Hosting server"
@@ -1297,16 +1349,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "کابوت دلومڤوهکن"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "بوليه چدرا"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "سدڠ ممواتکن ميديا..."
 
@@ -1316,35 +1358,7 @@ msgstr "MiB/s"
 
 #: src/client/game.cpp
 msgid "Minimap currently disabled by game or mod"
-msgstr "ڤتا ميني دلومڤوهکن اوليه ڤرماءينن اتاو مودس"
-
-#: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "ڤتا ميني دسمبوڽيکن"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "ڤتا ميني دالم مود رادر� زوم 1x"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "ڤتا ميني دالم مود رادر� زوم 2x"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "ڤتا ميني دالم مود رادر� زوم 4x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "ڤتا ميني دالم مود ڤرموکاءن� زوم 1x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "ڤتا ميني دالم مود ڤرموکاءن� زوم 2x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "ڤتا ميني دالم مود ڤرموکاءن� زوم 4x"
+msgstr "ڤتا ميني دلومڤوهکن اوليه ڤرماٴينن اتاو مودس"
 
 #: src/client/game.cpp
 msgid "Noclip mode disabled"
@@ -1356,7 +1370,7 @@ msgstr "مود تمبوس بلوک دبوليهکن"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled (note: no 'noclip' privilege)"
-msgstr "مود تمبوس بلوک دبوليهکن (نوت: تيادا کأيستيميواءن 'تمبوس بلوک')"
+msgstr "مود تمبوس بلوک دبوليهکن (نوت: تيادا کأيستيميواٴن 'تمبوس بلوک')"
 
 #: src/client/game.cpp
 msgid "Node definitions..."
@@ -1384,23 +1398,19 @@ msgstr "ݢرا� ڤمبوکه دتونجوقکن"
 
 #: src/client/game.cpp
 msgid "Remote server"
-msgstr "ڤلاين جارق جاءوه"
+msgstr "ڤلاين جارق جاٴوه"
 
 #: src/client/game.cpp
 msgid "Resolving address..."
 msgstr "سدڠ مڽلسايکن علامت..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "لاهير سمولا"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "سدڠ منوتوڤ..."
 
 #: src/client/game.cpp
 msgid "Singleplayer"
-msgstr "ڤماءين ڤرسأورڠن"
+msgstr "ڤماٴين ڤرسأورڠن"
 
 #: src/client/game.cpp
 msgid "Sound Volume"
@@ -1416,7 +1426,7 @@ msgstr "سيستم بوڽي دلومڤوهکن"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr "سيستم بوڽي تيدق دسوکوڠ دبيناءن اين"
+msgstr "سيستم بوڽي تيدق دسوکوڠ دبيناٴن اين"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1447,12 +1457,8 @@ msgid "Wireframe shown"
 msgstr "رڠک داواي دتونجوقکن"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "اندا تله منيڠݢل"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
-msgstr "زوم سدڠ دلومڤوهکن اوليه ڤرماءينن اتاو مودس"
+msgstr "زوم سدڠ دلومڤوهکن اوليه ڤرماٴينن اتاو مودس"
 
 #: src/client/game.cpp
 msgid "ok"
@@ -1467,16 +1473,6 @@ msgid "Chat shown"
 msgstr "سيمبڠ دتونجوقکن"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "سيمبڠ دسمبوڽيکن"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "سيمبڠ دتونجوقکن"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "ڤاڤر ڤندو (HUD) دسمبوڽيکن"
 
@@ -1676,7 +1672,7 @@ msgstr "Pause"
 
 #: src/client/keycode.cpp
 msgid "Play"
-msgstr "مولا ماءين"
+msgstr "مولا ماٴين"
 
 #. ~ "Print screen" key
 #: src/client/keycode.cpp
@@ -1756,13 +1752,32 @@ msgstr "بوتڠ X نومبور 2"
 msgid "Zoom"
 msgstr "زوم"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "ڤتا ميني دسمبوڽيکن"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "ڤتا ميني دالم مود رادر� زوم 1x"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "ڤتا ميني دالم مود ڤرموکاٴن� زوم 1x"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "سايز تيکستور مينيموم"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "کات لالوان تيدق ڤادن!"
 
 #: src/gui/guiConfirmRegistration.cpp
 msgid "Register and Join"
-msgstr "د�تر دان سرتاءي"
+msgstr "د�تر دان سرتاٴي"
 
 #: src/gui/guiConfirmRegistration.cpp
 #, c-format
@@ -1773,10 +1788,10 @@ msgid ""
 "Please retype your password and click 'Register and Join' to confirm account "
 "creation, or click 'Cancel' to abort."
 msgstr ""
-"اندا اکن سرتاءي ڤلاين دڠن نام \"%s\" اونتوق کالي ڤرتام.\n"
-"جيک اندا تروسکن� اکاءون بهارو دڠن معلومت اندا اکن دچيڤت دڤلاين اين.\n"
-"سيلا تايڤ سمولا کات لالوان اندا دان کليک 'د�تر دان سرتاءي' اونتوق صحکن "
-"ڤنچيڤتاءن اکاءون� اتاو کليک 'باتل' اونتوق ممباتلکن."
+"اندا اکن سرتاٴي ڤلاين دڠن نام \"%s\" اونتوق کالي ڤرتام.\n"
+"جيک اندا تروسکن� اکاٴون بهارو دڠن معلومت اندا اکن دچيڤت دڤلاين اين.\n"
+"سيلا تايڤ سمولا کات لالوان اندا دان کليک 'د�تر دان سرتاٴي' اونتوق صحکن "
+"ڤنچيڤتاٴن اکاٴون� اتاو کليک 'باتل' اونتوق ممباتلکن."
 
 #: src/gui/guiFormSpecMenu.cpp
 msgid "Proceed"
@@ -1799,26 +1814,6 @@ msgid "Backward"
 msgstr "کبلاکڠ"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "توکر کاميرا"
 
@@ -1856,7 +1851,7 @@ msgstr "کدڤن"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. range"
-msgstr "ناءيقکن جارق"
+msgstr "ناٴيقکن جارق"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. volume"
@@ -1872,7 +1867,7 @@ msgstr "لومڤت"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Key already in use"
-msgstr "ککونچي تله دݢوناکن اونتوق �وڠسي لاءين"
+msgstr "ککونچي تله دݢوناکن اونتوق �وڠسي لاٴين"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
@@ -1912,29 +1907,10 @@ msgid "Special"
 msgstr "ايستيميوا"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "ايستيميوا"
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "توݢول تمبوس بلوک"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "توݢول ڤاڤر ڤندو (HUD)"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "توݢول تربڠ"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "توݢول لوݢ سيمبڠ"
 
@@ -2037,6 +2013,14 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X,Y,Z) او�سيت �راکتل دري ڤوست دنيا دالم اونيت 'سکال'.\n"
+"بوليه ݢونا اونتوق ڤيندهکن تيتيق يڠ دايڠيني ک(0, 0)\n"
+"اونتوق چيڤت تيتيق کلاهيرن يڠ سسواي� اتاو اونتوق\n"
+"ممبوليهکن 'زوم ماسوق' ڤد تيتيق يڠ دايڠينکن\n"
+"دڠن مناٴيقکن 'سکال'.\n"
+"نيلاي لالاي دسسوايکن اونتوق تيتيق کلاهيرن سسواي اونتوق سيت Mandelbrot\n"
+"دڠن ڤاراميتر لالاي� اي موڠکين ڤرلو داوبه اونتوق سيتواسي يڠ لاٴين.\n"
+"جولت کاسرڽ -2 سهيڠݢ 2. داربکن دڠن 'سکال' اونتوق او�سيت دالم نود."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2050,12 +2034,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2085,15 +2063,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
-msgstr ""
+msgstr "اون 3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode"
-msgstr ""
+msgstr "مود 3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode parallax strength"
-msgstr ""
+msgstr "ککواتن ڤارالکس مود 3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
@@ -2142,32 +2120,48 @@ msgid ""
 "-    pageflip: quadbuffer based 3d.\n"
 "Note that the interlaced mode requires shaders to be enabled."
 msgstr ""
+"سوکوڠن 3D.\n"
+"يڠ دسوکوڠ ڤد ماس اين:\n"
+"-    تيادا: تيادا اٴوتڤوت 3D.\n"
+"-    اناݢلي�: 3D ورنا بيرو\\موره.\n"
+"-    سلڠ-سلي: ݢاريس ݢنڤ\\ݢنجيل برداسرکن سوکوڠن سکرين ڤولاريساسي.\n"
+"-    اتس-باوه: ڤيسه سکرين اتس\\باوه.\n"
+"-    کيري-کانن: ڤيسه سکرين کيري\\کانن.\n"
+"-    سيلڠ ليهت: 3D مات برسيلڠ\n"
+"-    سيلق هلامن: 3D براساسکن ڤنيمبل کواد.\n"
+"امبيل ڤرهاتين بهاوا مود سلڠ-سلي ممرلوکن ڤمبايڠ."
 
 #: 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 ""
+"بنيه ڤتا يڠ دڤيليه اونتوق ڤتا بارو� بيارکن کوسوڠ اونتوق بنيه راوق.\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 "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
-msgstr ""
+msgstr "ڤچوتن دأودارا"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration of gravity, in nodes per second per second."
@@ -2183,11 +2177,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
-msgstr ""
+msgstr "جارق بلوک اکتي�"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
-msgstr ""
+msgstr "جارق ڤڠهنترن اوبجيک اکتي�"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2195,16 +2189,21 @@ 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 "Adds particles when digging a node."
-msgstr ""
+msgstr "منمبه ڤرتيکل اڤابيلا مڠݢالي نود."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
 msgstr ""
+"لارسکن کون�يݢوراسي DPI کسکرين اندا (بوکن X11/Android سهاج) چونتوه اونتوق "
+"سکرين 4K."
 
 #: src/settings_translation_file.cpp
 #, c-format
@@ -2218,7 +2217,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
-msgstr ""
+msgstr "تتڤن مندالم"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2228,6 +2227,11 @@ msgid ""
 "This only has significant effect on daylight and artificial\n"
 "light, it has very little effect on natural night light."
 msgstr ""
+"اوبه لڠکوڠ چهاي دڠن مڠناکن 'ڤمبتولن ݢام'.\n"
+"نيلاي تيڠݢي بواتکن اساس چهاي تڠه دان رنده لبيه تراڠ.\n"
+"نيلاي '1.0' اکن بيارکن لڠکوڠ چهاي اصل تيدق براوبه.\n"
+"تتڤن اين هاڽ ممبري کسن مندالم ڤد چهاي ماتاهاري\n"
+"دان چهاي بواتن� کسنڽ ڤد چهاي مالم امت رنده."
 
 #: src/settings_translation_file.cpp
 msgid "Always fly and fast"
@@ -2235,11 +2239,11 @@ msgstr "سنتياس تربڠ دان برݢرق ڤنتس"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
-msgstr ""
+msgstr "ݢام اوکلوسي سکيتر"
 
 #: src/settings_translation_file.cpp
 msgid "Amount of messages a player may send per 10 seconds."
-msgstr ""
+msgstr "جومله ميسيج ڤماٴين بوليه هنتر ستياڤ 10 ساٴت."
 
 #: src/settings_translation_file.cpp
 msgid "Amplifies the valleys."
@@ -2247,23 +2251,23 @@ 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 "Announce to this serverlist."
-msgstr ""
+msgstr "عمومکن کسناراي ڤلاين اين."
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
-msgstr ""
+msgstr "تمبه نام ايتم"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name to tooltip."
-msgstr ""
+msgstr "تمبه نام ايتم کتيڤ التن."
 
 #: src/settings_translation_file.cpp
 msgid "Apple trees noise"
@@ -2271,17 +2275,19 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
-msgstr ""
+msgstr "اينرسيا لڠن"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Arm inertia, gives a more realistic movement of\n"
 "the arm when the camera moves."
 msgstr ""
+"اينرسيا لڠن� ممبريکن ڤرݢرقن لڠن يڠ\n"
+"لبيه رياليستيک اڤابيلا کاميرا دݢرقکن."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
-msgstr ""
+msgstr "مينتا سمبوڠ سمولا سلڤس کرونتوهن"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2308,15 +2314,15 @@ msgstr "لومڤت هالڠن ساتو-نود سچارا أوروماتيک."
 
 #: src/settings_translation_file.cpp
 msgid "Automatically report to the serverlist."
-msgstr ""
+msgstr "ملاڤورکن کڤد سناراي ڤلاين سچارا اٴوتوماتيک."
 
 #: src/settings_translation_file.cpp
 msgid "Autosave screen size"
-msgstr ""
+msgstr "أوتوسيمڤن سايز سکرين"
 
 #: src/settings_translation_file.cpp
 msgid "Autoscaling mode"
-msgstr ""
+msgstr "مود سکال أوتوماتيک"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -2332,11 +2338,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
-msgstr ""
+msgstr "اساس"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
-msgstr ""
+msgstr "کأيستيميواٴن اساس"
 
 #: src/settings_translation_file.cpp
 msgid "Beach noise"
@@ -2348,11 +2354,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
-msgstr ""
+msgstr "ڤناڤيسن بيلينيار"
 
 #: src/settings_translation_file.cpp
 msgid "Bind address"
-msgstr ""
+msgstr "علامت ايکتن"
 
 #: src/settings_translation_file.cpp
 msgid "Biome API temperature and humidity noise parameters"
@@ -2364,7 +2370,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr ""
+msgstr "بيت ڤر ڤيکسيل (اتاو کدالمن ورنا) دالم مود سکرين ڤنوه."
 
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
@@ -2372,39 +2378,39 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic font path"
-msgstr ""
+msgstr "لالوان �ون تبل دان ايتاليک"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic monospace font path"
-msgstr ""
+msgstr "لالوان �ون monospace تبل دان ايتاليک"
 
 #: src/settings_translation_file.cpp
 msgid "Bold font path"
-msgstr ""
+msgstr "لالوان �ون تبل"
 
 #: src/settings_translation_file.cpp
 msgid "Bold monospace font path"
-msgstr ""
+msgstr "لالوان �ون monospace تبل"
 
 #: src/settings_translation_file.cpp
 msgid "Build inside player"
-msgstr "بينا دالم ڤماءين"
+msgstr "بينا دالم ڤماٴين"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
 "Increasing can reduce artifacting on weaker GPUs.\n"
 "0.1 = Default, 0.25 = Good value for weaker tablets."
 msgstr ""
+"جارق کاميرا 'برهمڤيرن ساته کتيڤن' دالم نيلاي نود� انتارا 0 دان 0.5.\n"
+"هاڽ برکسن دڤلات�ورم GLES. کباڽقن ڤڠݢونا تيدق ڤرلو مڠاوبه نيلاي اين.\n"
+"مناٴيقکن نيلاي بوليه کورڠکن ارتي�ک ڤد GPU يڠ لبيه لمه.\n"
+"0.1 = اصل� 0.25 = نيلاي باݢوس اونتوق تابليت يڠ لبيه لمه."
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
@@ -2416,7 +2422,7 @@ msgstr "ڤلمبوتن کاميرا دالم مود سينماتيک"
 
 #: src/settings_translation_file.cpp
 msgid "Camera update toggle key"
-msgstr ""
+msgstr "ککونچي توݢول کمس کيني کاميرا"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise"
@@ -2467,20 +2473,12 @@ msgid ""
 "Center of light curve boost range.\n"
 "Where 0.0 is minimum light level, 1.0 is maximum light level."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
+"ڤرتڠهن جولت تولقن لڠکوڠ چهاي.\n"
+"دمان 0.0 اياله ارس چهاي مينيموم� 1.0 اياله مکسيموم."
 
 #: src/settings_translation_file.cpp
 msgid "Chat font size"
-msgstr ""
+msgstr "سايز �ون سيمبڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
@@ -2492,23 +2490,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
-msgstr ""
+msgstr "حد کيراٴن ميسيج سيمبڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message format"
-msgstr ""
+msgstr "�ورمت ميسيج سيمبڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message kick threshold"
-msgstr ""
+msgstr "نيلاي امبڠ تندڠ ميسيج سيمبڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message max length"
-msgstr ""
+msgstr "ڤنجڠ مکسيموم ميسيج سيمبڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Chat toggle key"
-msgstr ""
+msgstr "ککونچي توݢول سيمبڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Chatcommands"
@@ -2528,11 +2526,11 @@ msgstr "ککونچي مود سينماتيک"
 
 #: src/settings_translation_file.cpp
 msgid "Clean transparent textures"
-msgstr ""
+msgstr "برسيهکن تيکستور لوت سينر"
 
 #: src/settings_translation_file.cpp
 msgid "Client"
-msgstr ""
+msgstr "کليئن"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
@@ -2540,7 +2538,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Client modding"
-msgstr ""
+msgstr "مودس کليئن"
 
 #: src/settings_translation_file.cpp
 msgid "Client side modding restrictions"
@@ -2556,23 +2554,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Cloud radius"
-msgstr ""
+msgstr "ججاري اون"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds"
-msgstr ""
+msgstr "اون"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds are a client side effect."
-msgstr ""
+msgstr "اون ايت اي�يک ڤد ڤيهق کليئن."
 
 #: src/settings_translation_file.cpp
 msgid "Clouds in menu"
-msgstr ""
+msgstr "اون دالم مينو"
 
 #: src/settings_translation_file.cpp
 msgid "Colored fog"
-msgstr ""
+msgstr "کابوت برورنا"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2603,33 +2601,37 @@ msgstr "ککونچي ارهن"
 
 #: src/settings_translation_file.cpp
 msgid "Connect glass"
-msgstr ""
+msgstr "سمبوڠ کاچ"
 
 #: src/settings_translation_file.cpp
 msgid "Connect to external media server"
-msgstr ""
+msgstr "سمبوڠ کڤلاين ميديا لوارن"
 
 #: src/settings_translation_file.cpp
 msgid "Connects glass if supported by node."
-msgstr ""
+msgstr "سمبوڠکن کاچ جيک دسوکوڠ اوليه نود."
 
 #: src/settings_translation_file.cpp
 msgid "Console alpha"
-msgstr ""
+msgstr "نيلاي الڤا کونسول"
 
 #: src/settings_translation_file.cpp
 msgid "Console color"
-msgstr ""
+msgstr "ورنا کونسول"
 
 #: src/settings_translation_file.cpp
 msgid "Console height"
-msgstr ""
+msgstr "کتيڠݢين کونسول"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2655,6 +2657,10 @@ msgid ""
 "Examples:\n"
 "72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged."
 msgstr ""
+"مڠاول ڤنجڠ کيترن سياڠ\\مالم.\n"
+"چونتوهڽ:\n"
+"72 اونتوق 20 مينيت� 360 اونتوق 4 مينيت� 1 اونتوق 24 جم� 0 اونتوق سياڠ\\مالم"
+"\\لاٴين٢ ککل تيدق بروبه."
 
 #: src/settings_translation_file.cpp
 msgid "Controls sinking speed in liquid."
@@ -2677,39 +2683,44 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
-msgstr ""
+msgstr "ميسيج کرونتوهن"
 
 #: src/settings_translation_file.cpp
 msgid "Creative"
-msgstr ""
+msgstr "کرياتي�"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
-msgstr ""
+msgstr "نيلاي ال�ا ررمبوت سيلڠ"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr ""
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr "نيلاي ال�ا ررمبوت سيلڠ (کلݢڤن� انتارا 0 دان 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
-msgstr ""
+msgstr "ورنا ررمبوت سيلڠ"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
-msgstr ""
+msgstr "DPI"
 
 #: src/settings_translation_file.cpp
 msgid "Damage"
-msgstr ""
+msgstr "بوليه چدرا"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
-msgstr ""
+msgstr "ککونچي توݢول معلومت ڽهڤڤيجت"
 
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
@@ -2733,25 +2744,27 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Default acceleration"
-msgstr ""
+msgstr "ڤچوتن لالاي"
 
 #: src/settings_translation_file.cpp
 msgid "Default game"
-msgstr ""
+msgstr "ڤرماٴينن لالاي"
 
 #: 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 ""
+"ڤرماٴينن لالاي يڠ اکن دݢوناکن کتيک منچيڤتا دنيا بارو.\n"
+"تتڤن اين اکن دأتسي اڤابيلا ممبوات دنيا دري مينو اوتام."
 
 #: src/settings_translation_file.cpp
 msgid "Default password"
-msgstr ""
+msgstr "کات لالوان لالاي"
 
 #: src/settings_translation_file.cpp
 msgid "Default privileges"
-msgstr ""
+msgstr "کأيستيميواٴن لالاي"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
@@ -2759,7 +2772,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Default stack size"
-msgstr ""
+msgstr "ساٴيز تيندنن لالاي"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2796,12 +2809,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2812,6 +2819,7 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
+"منتعري�کن جارق مکسيموم اونتوق ڤميندهن ڤماٴين دالم اونيت بلوک (0 = تيادا حد)."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the width of the river channel."
@@ -2830,14 +2838,18 @@ msgid ""
 "Delay between mesh updates on the client in ms. Increasing this will slow\n"
 "down the rate of mesh updates, thus reducing jitter on slower clients."
 msgstr ""
+"لڠه ماس دانتارا کمسکيني ججاريڠ دکت کليئن دالم اونيت ميليساٴت (ms). مناٴيقکن "
+"نيلاي\n"
+"اين اکن مڠورڠکن کادر کمسکيني ججاريڠ� لالو مڠورڠکن کترن دکت کليئن يڠ لبيه "
+"ڤرلاهن."
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "لڠه ڤڠهنترن بلوک سلڤس ڤمبيناٴن"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
-msgstr ""
+msgstr "جومله لڠه اونتوق منونجوقکن تيڤ التن� دڽاتاکن دالم ميليساٴت."
 
 #: src/settings_translation_file.cpp
 msgid "Deprecated Lua API handling"
@@ -2856,6 +2868,8 @@ msgid ""
 "Description of server, to be displayed when players join and in the "
 "serverlist."
 msgstr ""
+"ڤريهل ڤلاين ڤرماٴينن� اونتوق دڤاڤرکن اڤابيلا ڤماٴين ماسوق دان جوݢ دالم "
+"سناراٴي ڤلاين."
 
 #: src/settings_translation_file.cpp
 msgid "Desert noise threshold"
@@ -2869,23 +2883,28 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Desynchronize block animation"
-msgstr ""
+msgstr "مڽهسݢرقکن انيماسي بلوک"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "ککومچي ککانن"
 
 #: src/settings_translation_file.cpp
 msgid "Digging particles"
-msgstr ""
+msgstr "ڤرتيکل کتيک مڠݢالي"
 
 #: src/settings_translation_file.cpp
 msgid "Disable anticheat"
-msgstr ""
+msgstr "ملومڤوهکن انتيتيڤو"
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
-msgstr ""
+msgstr "منولق کات لالوان کوسوڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "نام دوماٴين ڤلاين ڤرماٴينن� اونتوق دڤاڤرکن دالم سناراي ڤلاين ڤرماٴينن."
 
 #: src/settings_translation_file.cpp
 msgid "Double tap jump for fly"
@@ -2926,14 +2945,17 @@ msgid ""
 "Enable Lua modding support on client.\n"
 "This support is experimental and API can change."
 msgstr ""
+"ممبوليهکن سوکوڠن ڤمبواتن مودس Lua دکت کليئن.\n"
+"سوکوڠن اين دالم اوجيکاجي دان API بوليه براوبه."
 
 #: src/settings_translation_file.cpp
 msgid "Enable console window"
-msgstr ""
+msgstr "ممبوليهکن تتيڠکڤ کونسول"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
-msgstr ""
+#, fuzzy
+msgid "Enable creative mode for all players"
+msgstr "ممبوليهکن مود کرياتي� اونتوق ڤتا بارو دچيڤتا."
 
 #: src/settings_translation_file.cpp
 msgid "Enable joysticks"
@@ -2941,7 +2963,7 @@ msgstr "ممبوليهکن کايو بديق"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod channels support."
-msgstr ""
+msgstr "ممبوليهکن سوکوڠن سالوران مودس."
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod security"
@@ -2949,27 +2971,31 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Enable players getting damage and dying."
-msgstr ""
+msgstr "ممبوليهکن ڤماٴين منريما کچدراٴن دان ماتي."
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
-msgstr "ممبوليهکن اينڤوت ڤڠݢونا سچارا راوق (هاڽ اونتوق ڤرچوباءن)."
+msgstr "ممبوليهکن اينڤوت ڤڠݢونا سچارا راوق (هاڽ اونتوق ڤرچوباٴن)."
 
 #: src/settings_translation_file.cpp
 msgid "Enable register confirmation"
-msgstr ""
+msgstr "بوليهکن ڤڠصحن ڤند�ترن"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable register confirmation when connecting to server.\n"
 "If disabled, new account will be registered automatically."
 msgstr ""
+"ممبوليهکن ڤڠصحن ڤند�ترن اڤابيلا مڽمبوڠ کڤد ڤلاين.\n"
+"جک دلومڤوهکن� اکاٴون بارو اکن دد�ترکن سچارا اٴوتوماتيک."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable smooth lighting with simple ambient occlusion.\n"
 "Disable for speed or for different looks."
 msgstr ""
+"ممبوليهکن ڤنچهاياٴن لمبوت دڠن اوکلوسي سکيتر يڠ ريڠکس.\n"
+"لومڤوهکنڽ اونتوق کلاجوان اتاو اونتوق کليهتن بربيذا."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2979,6 +3005,10 @@ msgid ""
 "to new servers, but they may not support all new features that you are "
 "expecting."
 msgstr ""
+"بوليهکن تتڤن اونتوق ملارڠ کليئن لام درڤد مڽمبوڠ.\n"
+"کليئن لام ماسيه سسواي دݢوناکن جک مريک تيدق رونتوه (کريش) اڤابيلا چوبا اونتوق "
+"مڽمبوڠ کڤلاين بهارو�\n"
+"تتاڤي مريک موڠکين تيدق ممڤو مڽوکوڠ سموا صي�ت بهارو يڠ اندا سڠکاکن."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2987,18 +3017,26 @@ msgid ""
 "textures)\n"
 "when connecting to the server."
 msgstr ""
+"ممبوليهکن ڤڠݢوناٴن ڤلاين ميديا جارق جاٴوه (جک دبريکن اوليه ڤلاين).\n"
+"ڤلاين جارق جاٴوه مناورکن چارا لبيه چڤت اونتوق موات تورون ميديا (چونتوه "
+"تيکستور)\n"
+"اڤابيلا مڽمبوڠ کڤلاين ڤرماٴينن."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable vertex buffer objects.\n"
 "This should greatly improve graphics performance."
 msgstr ""
+"ممبوليهکن اوبجيک ڤنيمبل بوچو.\n"
+"اي ڤاتوت منيڠکتکن ڤريستاسي ݢرا�يک دڠن باڽق."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
 "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
+"ڤندارب اونتوق ڤڠاڤوڠن ڤندڠن.\n"
+"چونتوهڽ: 0 اونتوق تيادا اڤوڠن� 1.0 اونتوق بياسا� 2.0 اونتوق دوا کالي ݢندا."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3006,6 +3044,9 @@ msgid ""
 "Ignored if bind_address is set.\n"
 "Needs enable_ipv6 to be enabled."
 msgstr ""
+"ممبوليهکن\\ملومڤوهکن ڤنجالنن ڤلاين IPv6.\n"
+"دأبايکن جک تتڤن bind_address دتتڤکن.\n"
+"ممرلوکن تتڤن enable_ipv6 دبوليهکن."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3014,38 +3055,23 @@ msgid ""
 "appearance of high dynamic range images. Mid-range contrast is slightly\n"
 "enhanced, highlights and shadows are gradually compressed."
 msgstr ""
+"ممبوليهکن ڤمتاٴن تونا سينماتيک 'Uncharted 2' (انچرتد ثو) اوليه Hable "
+"(هيبل).\n"
+"مڽلاکوکن لڠکوڠ تونا �يلم �وتوݢرا�ي دان چارا اي مڠاڠݢرکن ڤنمڤيلن ايميج جارق\n"
+"ديناميک تيڠݢي. بيذا جلس ڤرتڠهن جولت دتيڠکتکن سديکيت� تونجولن دان بايڠن\n"
+"دممڤتکن سچارا برانسور."
 
 #: src/settings_translation_file.cpp
 msgid "Enables animation of inventory items."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
+msgstr "ممبوليهکن انيماسي ايتم دالم اين�ينتوري."
 
 #: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
-msgstr ""
+msgstr "ممبوليهکن ڤڠاݢريݢتن ججاريڠ يڠ دڤوتر دڤکسي Y ايايت (facedir)."
 
 #: src/settings_translation_file.cpp
 msgid "Enables minimap."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
+msgstr "ممبوليهکن ڤتا ميني."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3054,6 +3080,10 @@ msgid ""
 "sound controls will be non-functional.\n"
 "Changing this setting requires a restart."
 msgstr ""
+"ممبوليهکن سيستم بوڽي.\n"
+"جک دلومڤوهکن� اي اکن ملومڤوهکن کسموا بوڽي دسموا تمڤت\n"
+"دان کاولن بوڽي دالم ڤرماٴينن تيدق اکن بر�وڠسي.\n"
+"ڤڠوبهن تتڤن اين ممرلوکن ڤرمولاٴن سمولا."
 
 #: src/settings_translation_file.cpp
 msgid "Engine profiling data print interval"
@@ -3065,12 +3095,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3080,12 +3104,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr ""
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "بيڠکاي ڤر ساٴت (FPS) مکسيما اڤابيلا ڤرماٴينن دجيداکن."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
-msgstr ""
+msgstr "FSAA"
 
 #: src/settings_translation_file.cpp
 msgid "Factor noise"
@@ -3093,23 +3118,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Fall bobbing factor"
-msgstr ""
+msgstr "�کتور اڤوڠن کجاتوهن"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font path"
-msgstr ""
+msgstr "لالوان �ون برباليق"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow"
-msgstr ""
+msgstr "بايڠ �ون برباليق"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow alpha"
-msgstr ""
+msgstr "نيلاي ال�ا بايڠ �ون برباليق"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font size"
-msgstr ""
+msgstr "سايز �ون برباليق"
 
 #: src/settings_translation_file.cpp
 msgid "Fast key"
@@ -3133,15 +3158,15 @@ msgid ""
 "This requires the \"fast\" privilege on the server."
 msgstr ""
 "برݢرق ڤنتس (دڠن ککونچي \"ايستيميوا\").\n"
-"اين ممرلوکن کأيستيميواءن \"ڤرݢرقن ڤنتس\" دالم ڤلاين ڤرماءينن ترسبوت."
+"اين ممرلوکن کأيستيميواٴن \"ڤرݢرقن ڤنتس\" دالم ڤلاين ترسبوت."
 
 #: src/settings_translation_file.cpp
 msgid "Field of view"
-msgstr ""
+msgstr "ميدن ڤندڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
-msgstr ""
+msgstr "ميدن ڤندڠ دالم درجه سودوت."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3149,6 +3174,8 @@ msgid ""
 "the\n"
 "Multiplayer Tab."
 msgstr ""
+"�اٴيل دالم لالوان client/serverlist/ يڠ مڠندوڠي سناراي\n"
+"ڤلاين کݢمرن يڠ دڤاڤرکن دالم تب ڤماٴين راماي."
 
 #: src/settings_translation_file.cpp
 msgid "Filler depth"
@@ -3160,7 +3187,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"
-msgstr ""
+msgstr "ڤمتاٴن تونا سينماتيک"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3169,10 +3196,14 @@ msgid ""
 "light edge to transparent textures. Apply this filter to clean that up\n"
 "at texture load time."
 msgstr ""
+"تيکستور يڠ دتاڤيس بوليه سباتيکن نيلاي RGB دڠن جيرن يڠ لوت سينر سڤنوهڽ�\n"
+"يڠ مان ڤڠاوڤتيموم PNG سريڠ ابايکن� کادڠکال مڽببکن سيسي ݢلڤ اتاو تراڠ ڤد\n"
+"تيکستور لوت سينر. ݢونا ڤناڤيسن اين اونتوق ممبرسيهکن تيکستور ترسبوت کتيک\n"
+"اي سدڠ دمواتکن."
 
 #: src/settings_translation_file.cpp
 msgid "Filtering"
-msgstr ""
+msgstr "ڤناڤيسن"
 
 #: src/settings_translation_file.cpp
 msgid "First of 4 2D noises that together define hill/mountain range height."
@@ -3184,7 +3215,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Fixed map seed"
-msgstr ""
+msgstr "بنيه ڤتا تتڤ"
 
 #: src/settings_translation_file.cpp
 msgid "Fixed virtual joystick"
@@ -3228,53 +3259,55 @@ msgstr "تربڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Fog"
-msgstr ""
+msgstr "کابوت"
 
 #: src/settings_translation_file.cpp
 msgid "Fog start"
-msgstr ""
+msgstr "مولا کابوت"
 
 #: src/settings_translation_file.cpp
 msgid "Fog toggle key"
-msgstr ""
+msgstr "ککونچي توݢول کابوت"
 
 #: src/settings_translation_file.cpp
 msgid "Font bold by default"
-msgstr ""
+msgstr "�ون تبل سچارا لالايڽ"
 
 #: src/settings_translation_file.cpp
 msgid "Font italic by default"
-msgstr ""
+msgstr "�ون ايتاليک سچارا لالايڽ"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow"
-msgstr ""
+msgstr "بايڠ �ون"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow alpha"
-msgstr ""
+msgstr "نيلاي ال�ا بايڠ �ون"
 
 #: src/settings_translation_file.cpp
 msgid "Font size"
-msgstr ""
+msgstr "سايز �ون"
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the default font in point (pt)."
-msgstr ""
+msgstr "سايز �ون باݢي �ون لالاي دالم اونيت تيتيق (pt)."
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the fallback font in point (pt)."
-msgstr ""
+msgstr "سايز �ون باݢي �ون برباليق دالم اونيت تيتيق (pt)."
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the monospace font in point (pt)."
-msgstr ""
+msgstr "سايز �ون باݢي �ون monospace دالم اونيت تيتيق (pt)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Font size of the recent chat text and chat prompt in point (pt).\n"
 "Value 0 will use the default font size."
 msgstr ""
+"سايز �ون توليسن سيمبڠ بارو٢ اين دان ڤروم دالم اونيت تيتيق (pt).\n"
+"نيلاي 0 اکن مڠݢوناکن سايز �ون لالاي."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3282,42 +3315,45 @@ msgid ""
 "placeholders:\n"
 "@name, @message, @timestamp (optional)"
 msgstr ""
+"�ورمت ميسيج سيمبڠ ڤماٴين. رينتيتن بريکوت اياله ڤمݢڠ تمڤت يڠ صح:\n"
+"@name (اونتوق نام)� @message (اونتوق ميسيج)� @timestamp (ڤيليهن� اونتوق چوڤ "
+"ماس)"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
-msgstr ""
+msgstr "�ورمت يڠ دݢوناکن اونتوق تڠکڤ لاير."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Default Background Color"
-msgstr ""
+msgstr "ورنا لاتر بلاکڠ لالاي �ورمسڤيک"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Default Background Opacity"
-msgstr ""
+msgstr "کلݢڤن لاتر بلاکڠ لالاي �ورمسڤيک"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Color"
-msgstr ""
+msgstr "ورنا لاتر بلاکڠ سکرين-ڤنوه �ورمسڤيک"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Opacity"
-msgstr ""
+msgstr "کلݢڤن لاتر بلاکڠ سکرين-ڤنوه �ورمسڤيک"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec default background color (R,G,B)."
-msgstr ""
+msgstr "ورنا لاتر بلاکڠ اصل �ورمسڤيک (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec default background opacity (between 0 and 255)."
-msgstr ""
+msgstr "کلݢڤن اصل لاتر بلاکڠ �ورمسڤيک (انتارا 0 دان 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec full-screen background color (R,G,B)."
-msgstr ""
+msgstr "ورنا لاتر بلاکڠ سکرين-ڤنوه �ورمسڤيک (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec full-screen background opacity (between 0 and 255)."
-msgstr ""
+msgstr "کلݢڤن لاتر بلاکڠ سکرين-ڤنوه �ورمسڤيک (انتارا 0 دان 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
@@ -3333,11 +3369,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Fraction of the visible distance at which fog starts to be rendered"
-msgstr ""
+msgstr "بهاݢين درڤد جارق بوليه ليهت دمان کابوت مولا دجان"
 
 #: src/settings_translation_file.cpp
 msgid "FreeType fonts"
-msgstr ""
+msgstr "�ون FreeType"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3349,6 +3385,7 @@ msgstr ""
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
+"سجاٴوه ماناکه بلوک٢ دهنتر کڤد کليئن� دڽاتاکن دالم اونيت بلوکڤتا (16 نود)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3358,34 +3395,35 @@ msgid ""
 "to maintain active objects up to this distance in the direction the\n"
 "player is looking. (This can avoid mobs suddenly disappearing from view)"
 msgstr ""
+"درڤد جارق کليئن داڤت تاهو تنتڠ اوبجيک� دڽاتاکن دالم بلوکڤتا (16 نود).\n"
+"\n"
+"منتڤکن نيلاي اين لبيه تيڠݢي درڤد جارق بلوک اکتي� (active_block_range) جوݢ\n"
+"اکن مڽببکن ڤلاين اونتوق مڠکلکن اوبجيک اکتي� سهيڠݢ کجارق اين\n"
+"دالم اره ڤندڠن ڤماٴين. (اين بوليه ايلقکن موب تيبا٢ هيلڠ دري ڤندڠن)"
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
-msgstr ""
+msgstr "سکرين ڤنوه"
 
 #: src/settings_translation_file.cpp
 msgid "Full screen BPP"
-msgstr ""
+msgstr "BPP سکرين ڤنوه"
 
 #: src/settings_translation_file.cpp
 msgid "Fullscreen mode."
-msgstr ""
+msgstr "مود سکرين ڤنوه."
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
-msgstr ""
+msgstr "سکال GUI"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter"
-msgstr ""
+msgstr "ڤناڤيس سکال GUI"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter txr2img"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
+msgstr "ڤناڤيس سکال GUI جنيس txr2img"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
@@ -3403,16 +3441,20 @@ msgid ""
 "Gradient of light curve at maximum light level.\n"
 "Controls the contrast of the highest light levels."
 msgstr ""
+"کچرونن لڠکوڠ چهاي ڤد تاهڤ چهاي مکسيموم.\n"
+"مڠاول بيذا جلس تاهڤ چهاي ترتيڠݢي."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Gradient of light curve at minimum light level.\n"
 "Controls the contrast of the lowest light levels."
 msgstr ""
+"کچرونن لڠکوڠ چهاي ڤد تاهڤ چهاي مينيموم.\n"
+"مڠاول بيذا جلس تاهڤ چهاي ترنده."
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
-msgstr ""
+msgstr "ݢرا�يک"
 
 #: src/settings_translation_file.cpp
 msgid "Gravity"
@@ -3441,8 +3483,8 @@ msgstr "ککونچي منوݢول ڤاڤر ڤندو (HUD)"
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3465,7 +3507,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
-msgstr ""
+msgstr "کومڤونن تيڠݢي سايز تتيڠکڤ اول."
 
 #: src/settings_translation_file.cpp
 msgid "Height noise"
@@ -3505,13 +3547,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "لامن اوتام ڤلاين ڤرماٴينن� اونتوق دڤاڤرکن دالم سناراي ڤلاين ڤرماٴينن."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Horizontal acceleration in air when jumping or falling,\n"
 "in nodes per second per second."
 msgstr ""
+"ڤچوتن منداتر دأودارا اڤابيلا ملومڤت اتاو جاتوه�\n"
+"دالم اونيت نود ڤر ساٴت ڤر ساٴت."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3524,6 +3568,8 @@ msgid ""
 "Horizontal and vertical acceleration on ground or when climbing,\n"
 "in nodes per second per second."
 msgstr ""
+"ڤچوتن منداتر دان منݢق اتس تانه اتاو کتيک ممنجت�\n"
+"دالم اونيت نود ڤر ساٴت ڤر ساٴت."
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar next key"
@@ -3671,6 +3717,9 @@ msgid ""
 "If negative, liquid waves will move backwards.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"سچڤت مان ݢلورا چچاٴير اکن برݢرق. نيلاي تيڠݢي = لبيه لاجو.\n"
+"جيک نيلاي نيݢاتي�� ݢلورا چچاٴير اکن برݢرق کبلاکڠ.\n"
+"ممرلوکن تتڤن چچاٴير برݢلورا دبوليهکن."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3700,13 +3749,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 server"
-msgstr ""
+msgstr "ڤلاين IPv6"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If FPS would go higher than this, limit it by sleeping\n"
 "to not waste CPU power for no benefit."
 msgstr ""
+"جيک بيڠکاي ڤر ساٴت (FPS) اکن ناٴيق لبيه تيڠݢي درڤد نيلاي اين�\n"
+"حدکن اي دڠن تيدورکنڽ سوڤايا تيدق بازيرکن کواسا CPU دڠن سيا٢."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3732,8 +3783,8 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
-"جيک دبوليهکن برسام مود تربڠ� ڤماءين بوليه تربڠ منروسي نود ڤڤجل.\n"
-"اين ممرلوکن کأيستيميواءن \"تمبوس بلوک\" دالم ڤلاين ڤرماءينن ترسبوت."
+"جيک دبوليهکن برسام مود تربڠ� ڤماٴين بوليه تربڠ منروسي نود ڤڤجل.\n"
+"اين ممرلوکن کأيستيميواٴن \"تمبوس بلوک\" دالم ڤلاين ترسبوت."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3749,10 +3800,12 @@ msgid ""
 "If enabled, actions are recorded for rollback.\n"
 "This option is only read when server starts."
 msgstr ""
+"جک دبوليهکن� سموا تيندقن اکن دراکم اونتوق ݢولوڠ باليق.\n"
+"ڤيليهن اين هاڽ دباچ کتيک ڤلاين برمولا."
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, disable cheat prevention in multiplayer."
-msgstr ""
+msgstr "جک دبوليهکن� اي اکن ملومڤوهکن ڤنچݢهن ڤنيڤوان دالم ڤماٴين راماي."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3765,12 +3818,12 @@ msgid ""
 "If enabled, makes move directions relative to the player's pitch when flying "
 "or swimming."
 msgstr ""
-"جيک دبوليهکن� اي ممبواتکن اره ڤرݢرقن ريلاتي� دڠن ڤيچ ڤماءين اڤابيلا تربڠ "
+"جيک دبوليهکن� اي ممبواتکن اره ڤرݢرقن ريلاتي� دڠن ڤيچ ڤماٴين اڤابيلا تربڠ "
 "اتاو برنڠ."
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, new players cannot join with an empty password."
-msgstr ""
+msgstr "جک دبوليهکن� ڤماٴين٢ بارو تيدق بوليه ماسوق دڠن کات لالوان يڠ کوسوڠ."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3799,6 +3852,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "If this is set, players will always (re)spawn at the given position."
 msgstr ""
+"جک تتڤن اين دتتڤکن� ڤماٴين اکن سنتياسا دلاهيرکن (سمولا) دکت کدودوقن يڠ "
+"دبريکن."
 
 #: src/settings_translation_file.cpp
 msgid "Ignore world errors"
@@ -3806,19 +3861,21 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "In-Game"
-msgstr ""
+msgstr "دالم ڤرماٴينن"
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
 msgstr ""
+"نيلاي ال�ا لاتر بلاکڠ کونسول سيمبڠ دالم ڤرماٴينن (کلݢڤن� انتارا 0 دان 255)."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background color (R,G,B)."
-msgstr ""
+msgstr "ورنا لاتر بلاکڠ کونسول سيمبڠ دالم ڤرماٴينن (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console height, between 0.1 (10%) and 1.0 (100%)."
 msgstr ""
+"نيلاي کتيڠݢين کونسول سيمبڠ دالم ڤرماٴينن� انتارا 0.1 (10%) دان 1.0 (100%)."
 
 #: src/settings_translation_file.cpp
 msgid "Inc. volume key"
@@ -3865,14 +3922,15 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
 msgstr ""
+"سلڠ ماس دأنتارا ڤڽيمڤنن ڤروبهن ڤنتيڠ دالم دنيا� دڽاتاکن دالم اونيت ساٴت."
 
 #: src/settings_translation_file.cpp
 msgid "Interval of sending time of day to clients."
-msgstr ""
+msgstr "سلڠ دأنتارا ڤڠهنترن معلومت ماس ڤلاين کڤد کليئن."
 
 #: src/settings_translation_file.cpp
 msgid "Inventory items animations"
-msgstr ""
+msgstr "انيماسي ايتم اين�ينتوري"
 
 #: src/settings_translation_file.cpp
 msgid "Inventory key"
@@ -3888,15 +3946,15 @@ msgstr "مڽوڠسڠکن ڤرݢرقن تتيکوس منݢق."
 
 #: src/settings_translation_file.cpp
 msgid "Italic font path"
-msgstr ""
+msgstr "لالوان �ون ايتاليک"
 
 #: src/settings_translation_file.cpp
 msgid "Italic monospace font path"
-msgstr ""
+msgstr "لالوان �ون monospace ايتاليک"
 
 #: src/settings_translation_file.cpp
 msgid "Item entity TTL"
-msgstr ""
+msgstr "TTL اينتيتي ايتم"
 
 #: src/settings_translation_file.cpp
 msgid "Iterations"
@@ -3919,8 +3977,13 @@ msgid "Joystick button repetition interval"
 msgstr "سلڠ ماس ڤڠاولڠن بوتڠ کايو بديق"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "جنيس کايو بديق"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
-msgstr "کڤيکاءن �روستوم کايو بديق"
+msgstr "کڤيکاٴن �روستوم کايو بديق"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick type"
@@ -3989,6 +4052,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"ککونچي اونتوق مڠورڠکن جارق ڤندڠ.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4001,6 +4067,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"ککونچي اونتوق ملومڤت.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4016,6 +4093,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"ککونچي اونتوق منمبه جارق ڤندڠ.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4054,7 +4134,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"ککونچي اونتوق مڠݢرقکن ڤماءين کبلاکڠ.\n"
+"ککونچي اونتوق مڠݢرقکن ڤماٴين کبلاکڠ.\n"
 "جوݢ اکن ملومڤوهکن أوتوڤرݢرقن� اڤابيلا اکتي�.\n"
 "ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4065,7 +4145,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"ککونچي اونتوق مڠݢرقکن ڤماءين کدڤن.\n"
+"ککونچي اونتوق مڠݢرقکن ڤماٴين کدڤن.\n"
 "ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4075,7 +4155,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"ککونچي اونتوق مڠݢرقکن ڤماءين ککيري.\n"
+"ککونچي اونتوق مڠݢرقکن ڤماٴين ککيري.\n"
 "ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4085,7 +4165,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"ککونچي اونتوق مڠݢرقکن ڤماءين ککانن.\n"
+"ککونچي اونتوق مڠݢرقکن ڤماٴين ککانن.\n"
 "ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4095,7 +4175,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"ککونچي اونتوق ممبيسوکن ڤرماءينن.\n"
+"ککونچي اونتوق ممبيسوکن ڤرماٴينن.\n"
 "ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4105,7 +4185,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"ککونچي اونتوق ممبوک تتيڠکڤ سيمبڠ اونتوق مناءيڤ ارهن.\n"
+"ککونچي اونتوق ممبوک تتيڠکڤ سيمبڠ اونتوق مناٴيڤ ارهن.\n"
 "ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4115,7 +4195,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"ککونچي اونتوق ممبوک تتيڠکڤ سيمبڠ اونتوق مناءيڤ ارهن تمڤتن.\n"
+"ککونچي اونتوق ممبوک تتيڠکڤ سيمبڠ اونتوق مناٴيڤ ارهن تمڤتن.\n"
 "ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4140,6 +4220,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"ککونچي اونتوق ملومڤت.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4488,7 +4579,7 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "ککونچي اونتوق مڽلينڤ.\n"
-"جوݢ دݢوناکن اونتوق تورون باواه کتيک ممنجت دان دالم اءير جيک تتڤن "
+"جوݢ دݢوناکن اونتوق تورون باواه کتيک ممنجت دان دالم اٴير جيک تتڤن "
 "aux1_descends دلومڤوهکن.\n"
 "ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4499,6 +4590,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"ککونچي اونتوق برتوکر انتارا کاميرا اورڠ ڤرتام دان کتيݢ.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4586,6 +4680,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"ککونچي اونتوق منوݢول ڤڠمسکينين کاميرا. هاڽ دݢوناکن اونتوق ڤمباڠونن.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4593,6 +4690,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"ککونچي اونتوق منوݢول ڤاڤرن سيمبڠ.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4600,6 +4700,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"ککونچي اونتوق منوݢول ڤاڤرن معلومت ڽهڤڤيجت.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4607,6 +4710,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"ککونچي اونتوق منوݢول ڤاڤرن کابوت.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4624,6 +4730,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"ککونچي اونتوق منوݢول ڤاڤرن کونسول سيمبڠ بسر.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4631,6 +4740,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"ککونچي اونتوق منوݢول ڤمبوکه. دݢوناکن اونتوق ڤمباڠونن.\n"
+"ليهت http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4654,7 +4766,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Kick players who sent more than X messages per 10 seconds."
-msgstr ""
+msgstr "تندڠ ڤماٴين يڠ مڠهنتر ميسيج لبيه درڤد X ستياڤ 10 ساٴت."
 
 #: src/settings_translation_file.cpp
 msgid "Lake steepness"
@@ -4686,11 +4798,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Large chat console key"
-msgstr ""
+msgstr "ککونچي کونسول سيمبڠ بسر"
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
-msgstr ""
+msgstr "ݢاي داٴون"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4699,6 +4811,10 @@ msgid ""
 "-   Simple: only outer faces, if defined special_tiles are used\n"
 "-   Opaque: disable transparency"
 msgstr ""
+"ݢاي داٴون:\n"
+"-   براݢم:  سموا سيسي کليهتن\n"
+"-   ريڠکس: هاڽ سيسي لوار کليهتن� جيک special_tiles يڠ دتنتوکن دݢوناکن\n"
+"-   لݢڤ: ملومڤوهکن لوت سينر"
 
 #: src/settings_translation_file.cpp
 msgid "Left key"
@@ -4716,6 +4832,8 @@ msgid ""
 "Length of liquid waves.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"ڤنجڠ ݢلورا چچاٴير.\n"
+"ممرلوکن تتڤن چچاٴير برݢلورا دبوليهکن."
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between Active Block Modifier (ABM) execution cycles"
@@ -4743,27 +4861,27 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost"
-msgstr ""
+msgstr "تولقن لڠکوڠ چهاي"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost center"
-msgstr ""
+msgstr "تيتيق تڠه تولقن لڠکوڠ چهاي"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost spread"
-msgstr ""
+msgstr "سيبرن تولقن لڠکوڠ چهاي"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve gamma"
-msgstr ""
+msgstr "ݢام لڠکوڠ چهاي"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve high gradient"
-msgstr ""
+msgstr "کچرونن تيڠݢي لڠکوڠ چهاي"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve low gradient"
-msgstr ""
+msgstr "کچرونن رنده لڠکوڠ چهاي"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4837,13 +4955,10 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
+"بواتکن ورنا کابوت دان لاڠيت برݢنتوڠ کڤد وقتو (�جر\\ماتاهاري) دان اره ڤندڠ."
 
 #: src/settings_translation_file.cpp
 msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
@@ -4851,13 +4966,21 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Makes all liquids opaque"
+msgstr "بواتکن سموا چچاٴير منجادي لݢڤ"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Map directory"
+msgid "Map Compression Level for Network Transfer"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map directory"
+msgstr "ديريکتوري ڤتا"
+
+#: src/settings_translation_file.cpp
 msgid "Map generation attributes specific to Mapgen Carpathian."
 msgstr ""
 
@@ -4910,23 +5033,24 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Map save interval"
-msgstr ""
+msgstr "سلڠ ماس ڤڽيمڤنن ڤتا"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
-msgstr ""
+msgstr "حد بلوک ڤتا"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock mesh generation delay"
-msgstr ""
+msgstr "لڠه ماس ڤنجاناٴن ججاريڠ بلوک ڤتا"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock mesh generator's MapBlock cache size in MB"
 msgstr ""
+"ساٴيز کيش بلوکڤتا اونتوق ڤنجان ججاريڠ بلوکڤتا دالم اونيت ميݢاباٴيت (MB)"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
-msgstr ""
+msgstr "حد ماس ڽهموات بلوک ڤتا"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Carpathian"
@@ -4998,7 +5122,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Max block send distance"
-msgstr ""
+msgstr "جارق مکسيموم ڤڠهنترن بلوک"
 
 #: src/settings_translation_file.cpp
 msgid "Max liquids processed per step."
@@ -5010,23 +5134,24 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Max. packets per iteration"
-msgstr ""
+msgstr "بيڠکيسن مکسيما ستياڤ للرن"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS"
-msgstr ""
+msgstr "FPS مکسيما"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr ""
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr "بيڠکاي ڤر ساٴت (FPS) مکسيما اڤابيلا ڤرماٴينن دجيداکن."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
-msgstr ""
+msgstr "جومله مکسيموم بلوک يڠ دڤقسا موات"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum hotbar width"
-msgstr ""
+msgstr "ليبر هوتبر مکسيما"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of large caves per mapchunk."
@@ -5048,6 +5173,9 @@ msgid ""
 "The maximum total count is calculated dynamically:\n"
 "max_total = ceil((#clients + max_users) * per_client / 4)"
 msgstr ""
+"جومله بلوک مکسيموم يڠ دهنتر سرنتق ڤر کليئن.\n"
+"جومله مکسيموم دکيرا سچارا ديناميک:\n"
+"جومله_مکس = بولت_ناٴيق((#کليئن + ڤڠݢونا_مکس) * ڤر_کليئن \\ 4 )"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
@@ -5066,14 +5194,23 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum number of forceloaded mapblocks."
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Maximum number of forceloaded mapblocks."
+msgstr "جومله مکسيموم بلوکڤتا يڠ دڤقسا موات."
+
+#: 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 ""
+"جومله بلوک ڤتا مکسيموم يڠ کليئن بوليه سيمڤن دالم ميموري.\n"
+"تتڤکن کڤد -1 اونتوق جومله تنڤ حد."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5081,14 +5218,17 @@ msgid ""
 "try reducing it, but don't reduce it to a number below double of targeted\n"
 "client number."
 msgstr ""
+"جومله مکسيما بيڠکيسن يڠ دهنتر ڤد ستياڤ لڠکه ڤڠهنترن�\n"
+"جک اندا ممڤوڽاٴي سمبوڠن يڠ ڤرلاهن ماک چوبا کورڠکنڽ�\n"
+"نامون جاڠن کورڠکن کڤد نيلاي دباوه ݢندا دوا جومله کليئن ساسرن."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of players that can be connected simultaneously."
-msgstr ""
+msgstr "حد جومله ڤماٴين مکسيموم يڠ بوليه مڽمبوڠ سرنتق."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of recent chat messages to show"
-msgstr ""
+msgstr "جومله مکسيموم ميسيج سيمبڠ تربارو اونتوق دتونجوقکن"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of statically stored objects in a block."
@@ -5103,20 +5243,25 @@ 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 ""
+"ڤرکادرن مکسيما اونتوق تتيڠکڤ سماس يڠ دݢوناکن اونتوق هوتبر.\n"
+"برݢونا جيک اد سسواتو يڠ اکن دڤاڤرکن دسبله کانن اتاو کيري هوتبر."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum simultaneous block sends per client"
-msgstr ""
+msgstr "جومله بلوک مکسيموم يڠ دهنتر سرنتق کڤد ستياڤ کليئن"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum size of the out chat queue"
-msgstr ""
+msgstr "ساٴيز مکسيموم باريس ݢيلير کلوار سيمبڠ"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum size of the out chat queue.\n"
 "0 to disable queueing and -1 to make the queue size unlimited."
 msgstr ""
+"ساٴيز مکسيموم باريس ݢيلير کلوار سيمبڠ.\n"
+"0 اونتوق لومڤوهکن باريس ݢيلير دان -1 اونتوق بواتکن ساٴيز باريس ݢيلير تيادا "
+"حد."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
@@ -5124,27 +5269,27 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum users"
-msgstr ""
+msgstr "حد جومله ڤڠݢونا"
 
 #: src/settings_translation_file.cpp
 msgid "Menus"
-msgstr ""
+msgstr "مينو"
 
 #: src/settings_translation_file.cpp
 msgid "Mesh cache"
-msgstr ""
+msgstr "کيش ججاريڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day"
-msgstr ""
+msgstr "ميسيج هاري اين"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day displayed to players connecting."
-msgstr ""
+msgstr "ميسيج هاري اين يڠ اکن دڤاڤرکن کڤد ڤماٴين يڠ مڽمبوڠ."
 
 #: src/settings_translation_file.cpp
 msgid "Method used to highlight selected object."
-msgstr ""
+msgstr "قاعده يڠ دݢوناکن اونتوق منونجولکن اوبجيک دڤيليه."
 
 #: src/settings_translation_file.cpp
 msgid "Minimal level of logging to be written to chat."
@@ -5152,7 +5297,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
-msgstr ""
+msgstr "ڤتا ميني"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap key"
@@ -5160,7 +5305,7 @@ msgstr "ککونچي ڤتا ميني"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap scan height"
-msgstr ""
+msgstr "کتيڠݢين ايمبسن ڤتا ميني"
 
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
@@ -5172,15 +5317,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Minimum texture size"
-msgstr ""
+msgstr "سايز تيکستور مينيموم"
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
-msgstr ""
+msgstr "ڤمتاٴن ميڤ"
 
 #: src/settings_translation_file.cpp
 msgid "Mod channels"
-msgstr ""
+msgstr "سالوران مودس"
 
 #: src/settings_translation_file.cpp
 msgid "Modifies the size of the hudbar elements."
@@ -5188,11 +5333,11 @@ msgstr "مڠاوبه سايز ايليمن ڤالڠ ڤاڤر ڤندو (hudbar)."
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
-msgstr ""
+msgstr "لالوان �ون monospace"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font size"
-msgstr ""
+msgstr "سايز �ون monospace"
 
 #: src/settings_translation_file.cpp
 msgid "Mountain height noise"
@@ -5212,11 +5357,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
-msgstr "کڤيکاءن تتيکوس"
+msgstr "کڤيکاٴن تتيکوس"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity multiplier."
-msgstr "ڤندارب کڤيکاءن تتيکوس."
+msgstr "ڤندارب کڤيکاٴن تتيکوس."
 
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
@@ -5227,6 +5372,8 @@ msgid ""
 "Multiplier for fall bobbing.\n"
 "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
+"ڤندارب اونتوق اڤوڠن تيمبول تڠݢلم.\n"
+"چونتوهڽ: 0 اونتوق تيادا اڤوڠن� 1.0 اونتوق بياسا� 2.0 اونتوق دوا کالي ݢندا."
 
 #: src/settings_translation_file.cpp
 msgid "Mute key"
@@ -5234,7 +5381,7 @@ msgstr "ککونچي بيسو"
 
 #: src/settings_translation_file.cpp
 msgid "Mute sound"
-msgstr ""
+msgstr "بيسوکن بوڽي"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5255,24 +5402,28 @@ msgstr ""
 msgid ""
 "Name of the server, to be displayed when players join and in the serverlist."
 msgstr ""
+"نام ڤلاين ڤرماٴينن� اونتوق دڤاڤرکن اڤابيلا ڤماٴين ماسوق دان جوݢ دالم سناراي "
+"ڤلاين."
 
 #: src/settings_translation_file.cpp
 msgid "Near plane"
-msgstr ""
+msgstr "دکت ساته"
 
 #: src/settings_translation_file.cpp
 msgid "Network"
-msgstr ""
+msgstr "رڠکاين"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Network port to listen (UDP).\n"
 "This value will be overridden when starting from the main menu."
 msgstr ""
+"ڤورت رڠکاين اونتوق دڠر (UDP).\n"
+"نيلاي اين اکن دأتسي اڤابيلا ممولاکن ڤلاين دري مينو اوتام."
 
 #: src/settings_translation_file.cpp
 msgid "New users need to input this password."
-msgstr ""
+msgstr "ڤڠݢونا بارو مستي مماسوقکن کات لالوان اين."
 
 #: src/settings_translation_file.cpp
 msgid "Noclip"
@@ -5284,7 +5435,7 @@ msgstr "ککونچي تمبوس بلوک"
 
 #: src/settings_translation_file.cpp
 msgid "Node highlighting"
-msgstr ""
+msgstr "تونجولن نود"
 
 #: src/settings_translation_file.cpp
 msgid "NodeTimer interval"
@@ -5295,14 +5446,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5328,26 +5471,22 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Opaque liquids"
-msgstr ""
+msgstr "چچاٴير لݢڤ"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
-msgstr ""
+msgstr "کلݢڤن (ال�ا) بايڠ بلاکڠ �ون لالاي� نيلاي انتارا 0 دان 225."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the fallback font, between 0 and 255."
-msgstr ""
+msgstr "کلݢڤن (ال�ا) بايڠ بلاکڠ �ون برباليق� نيلاي انتارا 0 دان 225."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5355,34 +5494,8 @@ msgid ""
 "formspec is\n"
 "open."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
+"بوک مينو جيدا اڤابيلا �وکوس تتيڠکڤ هيلڠ.\n"
+"تيدق جيدا جيک �ورمسڤيک دبوک."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5392,22 +5505,30 @@ msgid ""
 "This font will be used for certain languages or if the default font is "
 "unavailable."
 msgstr ""
+"لالوان �ون برباليق.\n"
+"جيک تتڤن “freetype� دبوليهکن: اي مستيله �ون TrueType.\n"
+"جيک تتڤن “freetype� دلومڤوهکن: اي مستيله �ون ڤتا بيت اتاو �يکتور XML.\n"
+"�ون اين اکن دݢوناکن باݢي سستڠه بهاس اتاو جيک �ون لالاي تيدق ترسديا."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Path to save screenshots at. Can be an absolute or relative path.\n"
 "The folder will be created if it doesn't already exist."
 msgstr ""
+"لالوان اونتوق سيمڤن تڠکڤن لاير. وليه جادي لالوان مطلق اتاو ريلاتي�.\n"
+"�ولدر اکن دچيڤتا سکيراڽ اي بلوم وجود."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Path to shader directory. If no path is defined, default location will be "
 "used."
 msgstr ""
+"لالوان کديريکتوري ڤمبايڠ. جيک تيادا لالوان دتعري�کن� لوکاسي لالاي اکن "
+"دݢوناکن."
 
 #: src/settings_translation_file.cpp
 msgid "Path to texture directory. All textures are first searched from here."
-msgstr ""
+msgstr "لالوان کديريکتوري تيکستور. سموا تيکستور دچاري دري سيني داهولو."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5416,6 +5537,10 @@ msgid ""
 "If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
 "The fallback font will be used if the font cannot be loaded."
 msgstr ""
+"لالوان �ون لالاي.\n"
+"جيک تتڤن “freetype� دبوليهکن: اي مستيله �ون TrueType.\n"
+"جيک تتڤن “freetype� دلومڤوهکن: اي مستيله �ون ڤتا بيت اتاو �يکتور XML.\n"
+"�ون برباليق اکن دݢوناکن سکيراڽ �ون اين تيدق داڤت دمواتکن."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5424,10 +5549,14 @@ msgid ""
 "If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
 "This font is used for e.g. the console and profiler screen."
 msgstr ""
+"لالوان �ون monospace.\n"
+"جيک تتڤن “freetype� دبوليهکن: اي مستيله �ون TrueType.\n"
+"جيک تتڤن “freetype� دلومڤوهکن: اي مستيله �ون ڤتا بيت اتاو �يکتور XML.\n"
+"�ون اين دݢوناکن اونتوق عنصور سڤرتي کونسول دان سکرين ڤمبوکه."
 
 #: src/settings_translation_file.cpp
 msgid "Pause on lost window focus"
-msgstr ""
+msgstr "جيدا کتيک هيلڠ �وکوس تتيڠکڤ"
 
 #: src/settings_translation_file.cpp
 msgid "Per-player limit of queued blocks load from disk"
@@ -5439,7 +5568,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
-msgstr ""
+msgstr "ايکوت �يزيک"
 
 #: src/settings_translation_file.cpp
 msgid "Pitch move key"
@@ -5450,12 +5579,22 @@ msgid "Pitch move mode"
 msgstr "مود ڤرݢرقن ڤيچ"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "ککونچي تربڠ"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "سلڠ ڤڠاولڠن کليک کانن"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
 msgstr ""
-"ڤماءين بوليه تربڠ تنڤ ترکسن دڠن ݢرا�يتي.\n"
-"اين ممرلوکن کأيستيميواءن \"تربڠ\" دالم ڤلاين ڤرماءينن ترسبوت."
+"ڤماٴين بوليه تربڠ تنڤ ترکسن دڠن ݢرا�يتي.\n"
+"اين ممرلوکن کأيستيميواٴن \"تربڠ\" دالم ڤلاين ترسبوت."
 
 #: src/settings_translation_file.cpp
 msgid "Player name"
@@ -5463,17 +5602,19 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Player transfer distance"
-msgstr ""
+msgstr "جارق وميندهن ڤماٴين"
 
 #: src/settings_translation_file.cpp
 msgid "Player versus player"
-msgstr ""
+msgstr "ڤماٴين لاون ڤماٴين"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Port to connect to (UDP).\n"
 "Note that the port field in the main menu overrides this setting."
 msgstr ""
+"ڤورت اونتوق مڽمبوڠ (UDP).\n"
+"امبيل ڤرهاتيان بهاوا ميدن ڤورت دالم مينو اوتام مڠاتسي تتڤن اين."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5496,6 +5637,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
 msgstr ""
+"کأيستيميواٴن٢ يڠ بوليه دبريکن اوليه ڤماين يڠ ممڤوڽاٴي کأيستيميواٴن "
+"basic_privs"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler"
@@ -5503,7 +5646,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
-msgstr ""
+msgstr "ککونچي توݢول ڤمبوکه"
 
 #: src/settings_translation_file.cpp
 msgid "Profiling"
@@ -5511,7 +5654,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Prometheus listener address"
-msgstr ""
+msgstr "علامت ڤندڠر Prometheus"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5520,6 +5663,10 @@ msgid ""
 "enable metrics listener for Prometheus on that address.\n"
 "Metrics can be fetch on http://127.0.0.1:30000/metrics"
 msgstr ""
+"علامت ڤندڠر Prometheus.\n"
+"جک minetest دکومڤيل دڠن تتڤن ENABLE_PROMETHEUS دبوليهکن,\n"
+"ممبوليهکن ڤندڠر ميتريک اونتوق Prometheus ڤد علامت برکناٴن.\n"
+"ميتريک بوليه دأمبيل د http://127.0.0.1:30000/metrics"
 
 #: src/settings_translation_file.cpp
 msgid "Proportion of large caves that contain liquid."
@@ -5531,6 +5678,8 @@ msgid ""
 "Values larger than 26 will start to produce sharp cutoffs at cloud area "
 "corners."
 msgstr ""
+"ججاري کلواسن اون دڽاتاکن دالم جومله 64 نود ڤيتق اون.\n"
+"نيلاي لبيه دري 26 اکن مولا مڠهاسيلکن ڤموتوڠن تاجم دسودوت کاوسن اون."
 
 #: src/settings_translation_file.cpp
 msgid "Raises terrain to make valleys around the rivers."
@@ -5546,25 +5695,27 @@ msgstr "ککونچي جارق ڤميليهن"
 
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
-msgstr ""
+msgstr "ميسيج سيمبڠ ترکيني"
 
 #: src/settings_translation_file.cpp
 msgid "Regular font path"
-msgstr ""
+msgstr "لالوان �ون بياسا"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
-msgstr ""
+msgstr "ميديا جارق جاٴوه"
 
 #: src/settings_translation_file.cpp
 msgid "Remote port"
-msgstr ""
+msgstr "ڤورت جارق جاٴوه"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Remove color codes from incoming chat messages\n"
 "Use this to stop players from being able to use color in their messages"
 msgstr ""
+"بواڠ کود ورنا درڤد ميسيج سيمبڠ منداتڠ\n"
+"ݢوناکن اين اونتوق هنتيکن ڤماٴين درڤد مڠݢوناکن ورنا دالم ميسيج مريک"
 
 #: src/settings_translation_file.cpp
 msgid "Replaces the default main menu with a custom one."
@@ -5609,10 +5760,6 @@ msgid "Right key"
 msgstr "ککومچي ککانن"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "سلڠ ڤڠاولڠن کليک کانن"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5638,7 +5785,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Rollback recording"
-msgstr ""
+msgstr "راکمن ݢولوڠ باليق"
 
 #: src/settings_translation_file.cpp
 msgid "Rolling hill size noise"
@@ -5650,7 +5797,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Round minimap"
-msgstr ""
+msgstr "ڤتا ميني بولت"
 
 #: src/settings_translation_file.cpp
 msgid "Safe digging and placing"
@@ -5662,15 +5809,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Save the map received by the client on disk."
-msgstr ""
+msgstr "سيمڤن ڤتا يڠ دتريما اوليه کليئن دالم چکرا."
 
 #: src/settings_translation_file.cpp
 msgid "Save window size automatically when modified."
-msgstr ""
+msgstr "سيمڤن سايز تتيڠکڤ سچارا أوتوماتيک کتيک داوبه."
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
-msgstr ""
+msgstr "سيمڤن ڤتا دتريما دري ڤلاين ڤرماٴينن"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5680,26 +5827,31 @@ msgid ""
 "pixels when scaling down, at the cost of blurring some\n"
 "edge pixels when images are scaled by non-integer sizes."
 msgstr ""
+"مڽسوايکن GUI دڠن نيلاي دتنتوکن اوليه ڤڠݢونا.\n"
+"ݢوناکن ڤناڤيس انتيألياس جيرن تردکت اونتوق مڽسوايکن GUI.\n"
+"اين ممبوليهکن سيسي تاجم دلمبوتکن� دان سباتيکن ڤيکسل اڤابيلا\n"
+"مڽسوايتورونکن� نامون اي اکن مڠابورکن سستڠه ڤيکسل دسيسي\n"
+"اڤابيلا ايميج دسسوايکن دڠن سايز بوکن اينتيݢر."
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
-msgstr ""
+msgstr "تيڠݢي سکرين"
 
 #: src/settings_translation_file.cpp
 msgid "Screen width"
-msgstr ""
+msgstr "ليبر سکرين"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot folder"
-msgstr ""
+msgstr "�ولدر تڠکڤ لاير"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot format"
-msgstr ""
+msgstr "�ورمت تڠکڤ لاير"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot quality"
-msgstr ""
+msgstr "کواليتي تڠکڤ لاير"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5707,6 +5859,9 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"کواليتي تڠکڤ لاير. هاڽ دݢوناکن اونتوق �ورمت JPEG.\n"
+"1 مقصودڽ ڤاليڠ تروق� 100 مقصودڽ ڤاليڠ باݢوس.\n"
+"ݢوناکن 0 اونتوق کواليتي لالاي."
 
 #: src/settings_translation_file.cpp
 msgid "Seabed noise"
@@ -5730,15 +5885,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
-msgstr ""
+msgstr "ورنا سمڤادن کوتق ڤميليهن (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box color"
-msgstr ""
+msgstr "ورنا کوتق ڤميليهن"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box width"
-msgstr ""
+msgstr "ليبر کوتق ڤميليهن"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5765,27 +5920,27 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Server / Singleplayer"
-msgstr ""
+msgstr "ڤلاين ڤرماٴينن \\ ڤماٴين ڤرسأورڠن"
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
-msgstr ""
+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 "Server side occlusion culling"
@@ -5793,11 +5948,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist URL"
-msgstr ""
+msgstr "URL سناراي ڤلاين"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist file"
-msgstr ""
+msgstr "�اٴيل سناراي ڤلاين"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5807,29 +5962,35 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Set the maximum character length of a chat message sent by clients."
-msgstr ""
+msgstr "تتڤکن ڤنجڠ اکسارا مکسيموم ميسيج سيمبڠ دهنتر اوليه کليئن."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable waving leaves.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"تتڤکن کڤد \"true\" اونتوق ممبوليهکن داٴون برݢويڠ.\n"
+"ممرلوکن ڤمبايڠ اونتوق دبوليهکن."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable waving liquids (like water).\n"
 "Requires shaders to be enabled."
 msgstr ""
+"تتڤکن کڤد \"true\" اونتوق ممبوليهکن چچاٴير برݢلورا (ماچم اٴير).\n"
+"ممرلوکن ڤمبايڠ اونتوق دبوليهکن."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable waving plants.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"تتڤکن کڤد \"true\" اونتوق ممبوليهکن تومبوهن برݢويڠ.\n"
+"ممرلوکن ڤمبايڠ اونتوق دبوليهکن."
 
 #: src/settings_translation_file.cpp
 msgid "Shader path"
-msgstr ""
+msgstr "لالوان ڤمبايڠ"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5838,34 +5999,50 @@ msgid ""
 "cards.\n"
 "This only works with the OpenGL video backend."
 msgstr ""
+"ڤمبايڠ ممبوليهکن کسن �يسوال مندالم دان بوليه منيڠکتکن\n"
+"ڤريستاسي اونتوق سستڠه کد �يديو.\n"
+"نامون اي هاڽ بر�وڠسي دڠن ڤمبهاݢين بلاکڠ �يديو OpenGL."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Shadow offset (in pixels) of the default font. If 0, then shadow will not be "
 "drawn."
 msgstr ""
+"او�سيت بايڠ �ون لالاي (دالم اونيت ڤيکسل). جيک 0� ماک بايڠ تيدق اکن دلوکيس."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Shadow offset (in pixels) of the fallback font. If 0, then shadow will not "
 "be drawn."
 msgstr ""
+"او�سيت بايڠ �ون برباليق (دالم اونيت ڤيکسل). جيک 0� ماک بايڠ تيدق اکن دلوکيس."
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr ""
+msgstr "بنتوق ڤتا ميني. دبوليهکن = بولت� دلومڤوهکن = ڤيتق."
 
 #: src/settings_translation_file.cpp
 msgid "Show debug info"
-msgstr ""
+msgstr "تونجوقکن معلومت ڽهڤڤيجت"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
+msgstr "تونجوقکن کوتق ڤميليهن اينتيتي"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "�ون تبل سچارا لالايڽ"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
-msgstr ""
+msgstr "ميسيج ڤنوتوڤن"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5883,6 +6060,9 @@ msgid ""
 "increase the cache hit %, reducing the data being copied from the main\n"
 "thread, thus reducing jitter."
 msgstr ""
+"ساٴيز کيش بلوکڤتا اونتوق ڤنجان ججاريڠ. مناٴيقکن نيلاي اين\n"
+"اکن منيڠکتکن جومله % هيت کيش� مڠورڠکن داتا يڠ ڤرلو دسالين\n"
+"درڤد جالور اوتام� لالو مڠورڠکن کترن."
 
 #: src/settings_translation_file.cpp
 msgid "Slice w"
@@ -5910,7 +6090,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Smooth lighting"
-msgstr ""
+msgstr "ڤنچهاياٴن لمبوت"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5944,7 +6124,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
-msgstr ""
+msgstr "بوڽي"
 
 #: src/settings_translation_file.cpp
 msgid "Special key"
@@ -5961,6 +6141,10 @@ msgid ""
 "(obviously, remote_media should end with a slash).\n"
 "Files that are not present will be fetched the usual way."
 msgstr ""
+"منتڤکن URL دري مان کليئن مڠمبيل ميديا� مڠݢنتيکن UDP.\n"
+"$filename مستيله بوليه دأکسيس درڤد $remote_media$filename ملالوٴي\n"
+"cURL (سوده تنتو� remote_media مستي براخير دڠن تندا چوندوڠ).\n"
+"�اٴيل يڠ تيدق وجود اکن دأمبيل دڠن چارا بياسا."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5968,6 +6152,9 @@ msgid ""
 "Note that mods or games may explicitly set a stack for certain (or all) "
 "items."
 msgstr ""
+"منتڤکن ساٴيز تيندنن لالاي باݢي نود� ايتم دان التن.\n"
+"امبيل ڤرهاتيان بهاوا مودس اتاو ڤرماٴينن بوليه تتڤکن سچارا خصوص تيندنن اونتوق "
+"سستڠه (اتاو سموا) ايتم."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5975,10 +6162,13 @@ msgid ""
 "Controls the width of the range to be boosted.\n"
 "Standard deviation of the light curve boost Gaussian."
 msgstr ""
+"سيبر جولت تولقن لڠکوڠ چهاي.\n"
+"مڠاول ليبر جولت اونتوق دتولق.\n"
+"سيسيهن ڤياواي Gauss (ݢاٴوس) تولقن لڠکوڠ چهاي."
 
 #: src/settings_translation_file.cpp
 msgid "Static spawnpoint"
-msgstr ""
+msgstr "تيتيق لاهير ستاتيک"
 
 #: src/settings_translation_file.cpp
 msgid "Steepness noise"
@@ -5994,11 +6184,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Strength of 3D mode parallax."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
+msgstr "ککواتن ڤارالکس مود 3D."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6006,14 +6192,17 @@ msgid ""
 "The 3 'boost' parameters define a range of the light\n"
 "curve that is boosted in brightness."
 msgstr ""
+"ککواتن تولقن چهاي.\n"
+"تيݢ ڤاراميتر 'تولقن' منتعري�کن جولت لڠکوڠ\n"
+"چهاي يڠ دتولق دالم ڤنچهاياٴن."
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
-msgstr ""
+msgstr "ڤمريقساٴن ڤروتوکول کتت"
 
 #: src/settings_translation_file.cpp
 msgid "Strip color codes"
-msgstr ""
+msgstr "بواڠ کود ورنا"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6077,7 +6266,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Texture path"
-msgstr ""
+msgstr "لالوان تيکستور"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6088,12 +6277,23 @@ msgid ""
 "this option allows enforcing it for certain node types. Note though that\n"
 "that is considered EXPERIMENTAL and may not work properly."
 msgstr ""
+"تيکستور ڤد نود بوليه دجاجرکن سام اد کڤد نود اتاو دنيا.\n"
+"مود ڤرتام لبيه سسواي اونتوق بندا ماچم ميسين� ڤرابوت� دان لاٴين٢� ماناکال\n"
+"مود کدوا ممبواتکن تڠݢ دان بلوک ميکرو لبيه سسواي دڠن ڤرسکيترنڽ.\n"
+"نامون بݢيتو� کران اين چيري بارو� ماک اي موڠکين تيدق دݢوناکن دڤلاين لام�\n"
+"ڤيليهن اين ممبوليهکن ڤمقساٴن اي اونتوق جنيس نود ترتنتو. امبيل ڤرهاتين\n"
+"بهاوا اياڽ داڠݢڤ دالم اوجيکاجي دان موڠکين تيدق بر�وڠسي دڠن بتول."
 
 #: src/settings_translation_file.cpp
 msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "The deadzone of the joystick"
+msgstr "ڤڠنل ڤستي کايو بديق يڠ دݢوناکن"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6124,16 +6324,24 @@ msgid ""
 "Default is 1.0 (1/2 node).\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"تيڠݢي مکسيموم ڤرموکاٴن چچاٴير برݢلورا.\n"
+"4.0 = تيڠݢي ݢلورا اياله دوا نود.\n"
+"0.0 = ݢلورا تيدق برݢرق لڠسوڠ.\n"
+"نيلاي اصلڽ 1.0 (1/2 نود).\n"
+"ممرلوکن تتڤن چچاٴير برݢلورا دبوليهکن."
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
-msgstr ""
+msgstr "انتاراموک رڠکاين يڠ ڤلاين دڠر."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The privileges that new users automatically get.\n"
 "See /privs in game for a full list on your server and mod configuration."
 msgstr ""
+"کأيستيميواٴن يڠ ڤڠݢونا٢ بارو داڤت سچارا اٴوتوماتيک.\n"
+"ليهت /privs دالم ڤرماٴينن اونتوق سناراي ڤنوه کأيستيميواٴن ڤلاين دان "
+"کون�يݢوراسي مودس."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6145,24 +6353,36 @@ msgid ""
 "maintained.\n"
 "This should be configured together with active_object_send_range_blocks."
 msgstr ""
+"راديوس جيليد بلوک دسکيتر ستياڤ ڤماٴين يڠ ترتعلوق کڤد\n"
+"بندا بلوک اکتي�� دڽاتاکن دالم بلوکڤتا (16 نود).\n"
+"دالم بلوک اکتي�� اوبجيک دمواتکن دان ABM دجالنکن.\n"
+"اين جوݢ جارق مينيموم دمان اوبجيک اکتي� (موب) دککلکن.\n"
+"اين ڤرلو دتتڤکن برسام نيلاي بلوک جارق ڤڠهنترن اوبجيک اکتي� "
+"(active_object_send_range_blocks)."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end for Irrlicht.\n"
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
+"ترجمهن بهاݢين بلاکڠ اونتوق Irrlicht.\n"
+"اندا ڤرلو ممولاکن سمولا سلڤس مڠاوبه تتڤن اين.\n"
+"نوت: دAndroid� ککلکن دڠن OGLES1 جيک تيدق ڤستي! اڤليکاسي موڠکين تيدق\n"
+"بوليه دمولاکن جيک مڠݢوناکن تتڤن لاٴين. دڤلات�ورم لاٴين� OpenGL دشورکن�\n"
+"دان اي اياله ساتو-ساتوڽ ڤماچو يڠ ممڤوڽاٴي سوکوڠن ڤمبايڠ کتيک اين."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The sensitivity of the joystick axes for moving the\n"
 "ingame view frustum around."
 msgstr ""
-"کڤيکاءن ڤکسي کايو بديق اونتوق مڠݢرقکن\n"
-"�روستوم ڤڠليهتن دالم ڤرماءينن."
+"کڤيکاٴن ڤکسي کايو بديق اونتوق مڠݢرقکن\n"
+"�روستوم ڤڠليهتن دالم ڤرماٴينن."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6171,6 +6391,10 @@ msgid ""
 "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
 "set to the nearest valid value."
 msgstr ""
+"ککواتن (کݢلڤن) ڤمبايڠ نود اوکلوسي-سکيتر.\n"
+"لبيه رنده لبيه ݢلڤ� لبيه تيڠݢي لبيه تراڠ. نيلاي يڠ صح\n"
+"اونتوق تتڤن اين هاڽله دري 0.25 هيڠݢ 4.0. جيک نيلاي\n"
+"دلوار جولت� اي اکن دتتڤکن کڤد نيلاي صح يڠ تردکت."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6181,20 +6405,26 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
-"سلڠ ماس دالم ساءت� دامبيل انتارا ڤريستيوا يڠ براولڠن\n"
+"سلڠ ماس دالم ساٴت� دامبيل انتارا ڤريستيوا يڠ براولڠن\n"
 "اڤابيلا منکن کومبيناسي بوتڠ کايو بديق."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
-"جومله ماس دالم ساءت دامبيل اونتوق ملاکوکن کليک کانن يڠ براولڠ اڤابيلا\n"
-"ڤماءين منکن بوتڠ تتيکوس کانن تنڤ ملڤسکنڽ."
+"جومله ماس دالم ساٴت دامبيل اونتوق ملاکوکن کليک کانن يڠ براولڠ اڤابيلا\n"
+"ڤماٴين منکن بوتڠ تتيکوس کانن تنڤ ملڤسکنڽ."
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
@@ -6216,22 +6446,24 @@ msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
 "Setting it to -1 disables the feature."
 msgstr ""
+"ماس اونتوق اينتيتي ايتم (ايتم يڠ دجاتوهکن) تروس هيدوڤ دالم اونيت ساٴت.\n"
+"تتڤکن کڤد -1 اونتوق ملومڤوهکن صي�ت ترسبوت."
 
 #: src/settings_translation_file.cpp
 msgid "Time of day when a new world is started, in millihours (0-23999)."
-msgstr ""
+msgstr "وقتو دالم هاري اڤابيلا دنيا بارو دمولاکن� دالم ميليجم (0-23999)."
 
 #: src/settings_translation_file.cpp
 msgid "Time send interval"
-msgstr ""
+msgstr "سلڠ ڤڠهنترن ماس"
 
 #: src/settings_translation_file.cpp
 msgid "Time speed"
-msgstr ""
+msgstr "کلاجوان ماس"
 
 #: src/settings_translation_file.cpp
 msgid "Timeout for client to remove unused map data from memory."
-msgstr ""
+msgstr "حد ماس اونتوق کليئن ممبواڠ ڤتا يڠ تيدق دݢوناکن دري ميموري."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6240,14 +6472,18 @@ msgid ""
 "This determines how long they are slowed down after placing or removing a "
 "node."
 msgstr ""
+"اونتوق مڠورڠکن لمبڤڽ تيندق بالس� ڤميندهن بلوک دڤرلاهنکن اڤابيلا ڤماٴين "
+"ممبينا سسوات.\n"
+"تتڤن اين منتڤکن براڤ لام اياڽ دڤرلاهنکن ستله ملتقکن اتاٴو مڠاليهکن سسبواه "
+"نود."
 
 #: src/settings_translation_file.cpp
 msgid "Toggle camera mode key"
-msgstr ""
+msgstr "ککونچي توݢول مود کاميرا"
 
 #: src/settings_translation_file.cpp
 msgid "Tooltip delay"
-msgstr ""
+msgstr "لڠه تيڤ التن"
 
 #: src/settings_translation_file.cpp
 msgid "Touch screen threshold"
@@ -6259,7 +6495,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Trilinear filtering"
-msgstr ""
+msgstr "ڤناڤيسن تريلينيار"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6267,6 +6503,9 @@ msgid ""
 "False = 128\n"
 "Usable to make minimap smoother on slower machines."
 msgstr ""
+"True = 256\n"
+"False = 128\n"
+"بوليه دݢوناکن اونتوق ملنچرکن ڤتا ميني ڤد ميسين يڠ ڤرلاهن."
 
 #: src/settings_translation_file.cpp
 msgid "Trusted mods"
@@ -6274,11 +6513,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
-msgstr ""
+msgstr "URL کڤد سناراي ڤلاين يڠ دڤاڤرکن دالم تب ڤرماٴينن راماي."
 
 #: src/settings_translation_file.cpp
 msgid "Undersampling"
-msgstr ""
+msgstr "ڤنسمڤلن ڤڠورڠن"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6288,10 +6527,14 @@ msgid ""
 "image.\n"
 "Higher values result in a less detailed image."
 msgstr ""
+"ڤنسمڤلن ڤڠورڠن سروڤ سڤرتي مڠݢوناکن ريسولوسي سکرين رنده�\n"
+"تتاڤي اي هاڽ داڤليکاسيکن کڤد دنيا ڤرماٴينن سهاج� تيدق مڠاوبه GUI.\n"
+"اي بوليه منيڠکتکن ڤريستاسي دڠن مڠوربنکن ڤراينچين ايميج.\n"
+"نيلاي لبيه تيڠݢي ممبواتکن ايميج يڠ کورڠ ڤراينچين."
 
 #: src/settings_translation_file.cpp
 msgid "Unlimited player transfer distance"
-msgstr ""
+msgstr "جارق ڤميندهن ڤماٴين تنڤ حد"
 
 #: src/settings_translation_file.cpp
 msgid "Unload unused server data"
@@ -6307,19 +6550,19 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
-msgstr ""
+msgstr "ݢونا ڤاڤرن اون 3D مڠݢنتيکن اون رات."
 
 #: src/settings_translation_file.cpp
 msgid "Use a cloud animation for the main menu background."
-msgstr ""
+msgstr "ݢوناکن انيماسي اون سباݢاي لاتر بلاکڠ مينو اوتام."
 
 #: src/settings_translation_file.cpp
 msgid "Use anisotropic filtering when viewing at textures from an angle."
-msgstr ""
+msgstr "ݢوناکن ڤناڤيسن انيسوتروڤيک اڤابيلا مليهت تيکستور دري سواتو سودوت."
 
 #: src/settings_translation_file.cpp
 msgid "Use bilinear filtering when scaling textures."
-msgstr ""
+msgstr "ݢوناکن ڤناڤيسن بيلينيار اڤابيلا مڽسوايکن تيکستور."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6327,18 +6570,32 @@ msgid ""
 "especially when using a high resolution texture pack.\n"
 "Gamma correct downscaling is not supported."
 msgstr ""
+"ݢوناکن ڤمتاٴن ميڤ اونتوق مڽسوايکن تيکستور. بوليه منيڠکتکن\n"
+"سديکيت ڤريستاسي� تراوتاماڽ اڤابيلا مڠݢوناکن ڤيک تيکستور\n"
+"بردي�ينيسي تيڠݢي. ڤڽسواي-تورون ݢام سچار تڤت تيدق دسوکوڠ."
 
 #: src/settings_translation_file.cpp
-msgid "Use trilinear filtering when scaling textures."
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Use trilinear filtering when scaling textures."
+msgstr "ݢوناکن ڤناڤيسن تريلينيار اڤابيلا مڽسوايکن تيکستور."
+
+#: src/settings_translation_file.cpp
 msgid "VBO"
-msgstr ""
+msgstr "VBO"
 
 #: src/settings_translation_file.cpp
 msgid "VSync"
-msgstr ""
+msgstr "VSync"
 
 #: src/settings_translation_file.cpp
 msgid "Valley depth"
@@ -6394,27 +6651,27 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Vertical screen synchronization."
-msgstr ""
+msgstr "ڤڽݢرقن منݢق سکرين."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
-msgstr ""
+msgstr "ڤماچو �يديو"
 
 #: src/settings_translation_file.cpp
 msgid "View bobbing factor"
-msgstr ""
+msgstr "�کتور اڤوڠن ڤندڠ"
 
 #: src/settings_translation_file.cpp
 msgid "View distance in nodes."
-msgstr ""
+msgstr "جارق ڤندڠ دالم اونيت نود."
 
 #: src/settings_translation_file.cpp
 msgid "View range decrease key"
-msgstr ""
+msgstr "ککونچي مڠورڠ جارق ڤندڠ"
 
 #: src/settings_translation_file.cpp
 msgid "View range increase key"
-msgstr ""
+msgstr "ککونچي منمبه جارق ڤندڠ"
 
 #: src/settings_translation_file.cpp
 msgid "View zoom key"
@@ -6422,7 +6679,7 @@ msgstr "ککونچي زوم ڤندڠن"
 
 #: src/settings_translation_file.cpp
 msgid "Viewing range"
-msgstr ""
+msgstr "جارق ڤندڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Virtual joystick triggers aux button"
@@ -6430,13 +6687,15 @@ msgstr "کايو بديق ماي مميچو بوتڠ aux"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
-msgstr ""
+msgstr "کقواتن بوڽي"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
+"کقواتن سموا بوڽي.\n"
+"ممرلوکن سيستم بوڽي دبوليهکن."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6469,31 +6728,31 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Waving Nodes"
-msgstr ""
+msgstr "نود برݢويڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Waving leaves"
-msgstr ""
+msgstr "داٴون برݢويڠ"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids"
-msgstr ""
+msgstr "چچاٴير برݢلورا"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wave height"
-msgstr ""
+msgstr "کتيڠݢين اومبق چچاٴير برݢلورا"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wave speed"
-msgstr ""
+msgstr "کلاجوان اومبق چچاٴير برݢلورا"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wavelength"
-msgstr ""
+msgstr "ڤنجڠ اومبق چچاٴير برݢلورا"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
-msgstr ""
+msgstr "تومبوهن برݢويڠ"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6501,6 +6760,9 @@ msgid ""
 "filtered in software, but some images are generated directly\n"
 "to hardware (e.g. render-to-texture for nodes in inventory)."
 msgstr ""
+"اڤابيلا ڤناڤيس سکال GUI ايايتgui_scaling_filter دتتڤکن کڤد \"true\"� سموا\n"
+"ايميج GUI ڤرلو دتاڤيس دالم ڤرايسين� تتاڤي سستڠه ايميج دجان سچارا تروس\n"
+"کڤرکاکسن (چونتوهڽ� ڤنرجمهن-ک-تيکستور اونتوق نود دالم اين�ينتوري)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6509,6 +6771,11 @@ msgid ""
 "to the old scaling method, for video drivers that don't\n"
 "properly support downloading textures back from hardware."
 msgstr ""
+"اڤابيلا gui_scaling_filter_txr2img دتتڤکن کڤد \"true\"� سالين سمولا کسموا\n"
+"ايميج ترسبوت دري ڤرکاکسن کڤرايسين اونتوق دسسوايکن. سکيراڽ دتتڤکن کڤد\n"
+"\"false\"� برباليق کڤد قاعده ڤڽسواين يڠ لام� اونتوق ڤماچو �يديو يڠ تيدق "
+"ممڤو\n"
+"مڽوکوڠ دڠن سمڤورنا �وڠسي موات تورون سمولا تيکستور درڤد ڤرکاکسن."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6522,6 +6789,15 @@ msgid ""
 "This is also used as the base node texture size for world-aligned\n"
 "texture autoscaling."
 msgstr ""
+"اڤابيلا مڠݢوناکن تاڤيسن بيلينيار\\تريلينيار\\انيسوتروڤيک� تيکستور\n"
+"ريسولوسي رنده بوليه جادي کابور� جادي سسواي-ناٴيقکن مريک\n"
+"سچارا أوتوماتيک دڠن سيسيڤن جيرن تردکت اونتوق ممليهارا ڤيکسل\n"
+"کراس. تتڤن اين منتڤکن سايز تيکستور مينيما اونتوق تيکستور\n"
+"ڤڽسواي-ناٴيقکن� نيلاي لبيه تيڠݢي تمڤق لبيه تاجم� تتاڤي ممرلوکن\n"
+"ميموري يڠ لبيه باڽق.  نيلاي کواسا 2 دشورکن. منتڤکن نيلاي اين لبيه\n"
+"تيڠݢي دري 1 تيدق اکن منمڤقکن کسن يڠ ڽات ملاٴينکن تاڤيسن\n"
+"بيلينيار\\تريلينيار\\انيسوتروڤيک دبوليهکن. اين جوݢ دݢوناکن سباݢاي\n"
+"سايز تيکستور نود اساس اونتوق أوتوڤڽسواين تيکستور جاجرن دنيا."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6529,30 +6805,44 @@ msgid ""
 "in.\n"
 "If disabled, bitmap and XML vectors fonts are used instead."
 msgstr ""
+"منتڤکن سام اد �ون FreeType دݢوناکن� ممرلوکن سوکوڠن Freetype\n"
+"دکومڤيل برسام. جيک دلومڤوهکن� �ون ڤتا بيت دان �يکتور XML اکن دݢوناکن."
 
 #: src/settings_translation_file.cpp
-msgid "Whether node texture animations should be desynchronized per mapblock."
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Whether node texture animations should be desynchronized per mapblock."
+msgstr "سام اد انيماسي تيکستور نود ڤرلو دڽهسݢرقکن ڤد ستياڤ بلوک ڤتا."
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Whether players are shown to clients without any range limit.\n"
 "Deprecated, use the setting player_transfer_distance instead."
 msgstr ""
+"تتڤکن سام اد ڤماٴين دتونجوقکن کڤد کليئن تنڤا حد جارق.\n"
+"تتڤن اين ترکچم� ݢوناکن تتڤن player_transfer_distance سباݢاي ݢنتي."
 
 #: src/settings_translation_file.cpp
 msgid "Whether to allow players to damage and kill each other."
 msgstr ""
+"منتڤکن سام اد ايڠين ممبنرکن ڤماٴين اونتوق منچدراکن دان ممبونوه ساتو سام "
+"لاٴين."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether to ask clients to reconnect after a (Lua) crash.\n"
 "Set this to true if your server is set up to restart automatically."
 msgstr ""
+"تتڤن سام اد اونتوق ممينتا مڽمبوڠ سمولا سلڤس برلاکوڽ کرونتوهن (Lua).\n"
+"تتڤکن کڤد \"true\" جک ڤلاين اندا دتتڤکن اونتوق مولا سمولا سچارا اٴوتوماتيک."
 
 #: src/settings_translation_file.cpp
 msgid "Whether to fog out the end of the visible area."
-msgstr ""
+msgstr "سام اد اندا هندق مڠکابوتکن ڤڠهوجوڠ کاوسن يڠ کليهتن."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6561,19 +6851,24 @@ msgid ""
 "In-game, you can toggle the mute state with the mute key or by using the\n"
 "pause menu."
 msgstr ""
+"سام اد ايڠين ممبيسوکن بوڽي. اندا بوليه مڽهبيسو ڤد بيلا٢\n"
+"ماس� ملاٴينکن سيستم بوڽي دلومڤوهکن (enable_sound=false).\n"
+"دالم ڤرماٴينن� اندا بوليه منوݢول کأداٴن بيسو مڠݢوناکن ککونچي\n"
+"بيسو اتاو مڠݢوناکن مينو جيدا."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether to show the client debug info (has the same effect as hitting F5)."
 msgstr ""
+"تتڤکن سام اد هندق منونجوقکن معلومت ڽهڤڤيجت (کسنڽ سام سڤرتي منکن بوتڠ F5)."
 
 #: src/settings_translation_file.cpp
 msgid "Width component of the initial window size."
-msgstr ""
+msgstr "کومڤونن ليبر سايز تتيڠکڤ اول."
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selection box lines around nodes."
-msgstr ""
+msgstr "ليبر ݢاريسن کوتق ڤميليهن سکليليڠ نود."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6581,16 +6876,20 @@ msgid ""
 "background.\n"
 "Contains the same information as the file debug.txt (default name)."
 msgstr ""
+"سيستم Windows سهاج: مولاکن Minetest دڠن تتيڠکڤ ݢاريس ڤرينة دکت لاتر بلاکڠ.\n"
+"مڠندوڠي معلومت يڠ سام سڤرتي �اٴيل debug.txt (نام لالاي)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "World directory (everything in the world is stored here).\n"
 "Not needed if starting from the main menu."
 msgstr ""
+"ديريکتوري دنيا (سموا بندا دالم دنيا دسيمڤن دسيني).\n"
+"تيدق دڤرلوکن جک برمولا دري مينو اوتام."
 
 #: src/settings_translation_file.cpp
 msgid "World start time"
-msgstr ""
+msgstr "ماس مولا دنيا"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6601,10 +6900,16 @@ msgid ""
 "See also texture_min_size.\n"
 "Warning: This option is EXPERIMENTAL!"
 msgstr ""
+"تيکستور جاجرن دنيا بوليه دسسوايکن اونتوق منجڠکاو ببراڤ نود.\n"
+"نامون بݢيتو� ڤلاين موڠکين تيدق داڤت مڠهنتر سکال يڠ اندا\n"
+"ايڠينکن� تراوتاماڽ جيک اندا ݢوناکن ڤيک تيکستور يڠ دريک سچارا\n"
+"خصوص� دڠن ڤيليهن اين� کليئن اکن چوبا اونتوق مننتوکن سکال سچارا\n"
+"أوتوماتيک برداسرکن سايز تيکستور. جوݢ ليهت texture_min_size.\n"
+"امرن: ڤيليهن اين دالم اوجيکاجي!"
 
 #: src/settings_translation_file.cpp
 msgid "World-aligned textures mode"
-msgstr ""
+msgstr "مود تيکستور جاجرن دنيا"
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
@@ -6653,6 +6958,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6663,3 +6986,144 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "cURL timeout"
 msgstr ""
+
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = اوکلوسي ڤارالکس دڠن معلومت چرون (لبيه چڤت).\n"
+#~ "1 = ڤمتاٴن بنتوق موک بومي (لبيه لمبت� لبيه تڤت)."
+
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "اداکه اندا ماهو سيت سمولا دنيا ڤماٴين ڤرساورڠن؟"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "ڤمتاٴن برتومڤوق"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "ڤمتاٴن برتومڤوق"
+
+#~ msgid "Config mods"
+#~ msgstr "کون�يݢوراسي مودس"
+
+#~ msgid "Configure"
+#~ msgstr "کون�يݢوراسي"
+
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "ورنا باݢي کورسور ررمبوت سيلڠ (R,G,B)."
+
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "منتعري�کن تاهڤ ڤرسمڤلن تيکستور.\n"
+#~ "نيلاي لبيه تيڠݢي مڠحاصيلکن ڤتا نورمل لبيه لمبوت."
+
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "ممبوليهکن ڤمتاٴن برتومڤوق ڤد تيکستور. ڤتا نورمل ڤرلو دسدياکن\n"
+#~ "اوليه ڤيک تيکستور اتاو ڤرلو دجان سچارا أوتوماتيک.\n"
+#~ "ڤرلوکن ڤمبايڠ دبوليهکن."
+
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "ممبوليهکن ڤنجاناٴن ڤتا نورمل سچارا لايڠ (کسن چيتق تيمبول).\n"
+#~ "ڤرلوکن ڤمتاٴن برتومڤوق اونتوق دبوليهکن."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "ممبوليهکن ڤمتاٴن اوکلوسي ڤارالکس.\n"
+#~ "ممرلوکن ڤمبايڠ اونتوق دبوليهکن."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "ڤيليهن ڤرچوباٴن� موڠکين منمڤقکن رواڠ ڽات دانتارا\n"
+#~ "بلوک اڤابيلا دتتڤکن دڠن نومبور لبيه بسر درڤد 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS دمينو جيدا"
+
+#~ msgid "Generate Normal Maps"
+#~ msgstr "جان ڤتا نورمل"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "جان ڤتا نورمل"
+
+#~ msgid "Main"
+#~ msgstr "اوتام"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "ڤتا ميني دالم مود رادر� زوم 2x"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "ڤتا ميني دالم مود رادر� زوم 4x"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "ڤتا ميني دالم مود ڤرموکاٴن� زوم 2x"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "ڤتا ميني دالم مود ڤرموکاٴن� زوم 4x"
+
+#~ msgid "Name/Password"
+#~ msgstr "نام\\کات لالوان"
+
+#~ msgid "No"
+#~ msgstr "تيدق"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "ڤرسمڤلن ڤتا نورمل"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "ککواتن ڤتا نورمل"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "جومله للرن اوکلوسي ڤارالکس."
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "ڤڠاروه کسن اوکلوسي ڤارالکس ڤد کسلوروهنڽ� کبياساٴنڽ سکال\\2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "سکال کسلوروهن کسن اوکلوسي ڤارالکس."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "اوکلوسي ڤارالکس"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "اوکلوسي ڤارالکس"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "ڤڠاروه اوکلوسي ڤارالکس"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "للرن اوکلوسي ڤارالکس"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "مود اوکلوسي ڤارالکس"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "سکال اوکلوسي ڤارالکس"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "سيت سمولا دنيا ڤماٴين ڤرساورڠن"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "مولا ماٴين ساورڠ"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "ککواتن ڤتا نورمل يڠ دجان."
+
+#~ msgid "View"
+#~ msgstr "ليهت"
+
+#~ msgid "Yes"
+#~ msgstr "ياٴ"
diff --git a/po/nb/minetest.po b/po/nb/minetest.po
index 02eb3dc83..3762509a4 100644
--- a/po/nb/minetest.po
+++ b/po/nb/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Norwegian Bokmål (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-18 13:41+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-01-10 01:32+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
 "minetest/minetest/nb_NO/>\n"
@@ -12,11 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.1.1-dev\n"
+"X-Generator: Weblate 4.4.1-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Gjenoppstå"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Du døde"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -38,10 +46,6 @@ msgstr "Koble til på nytt"
 msgid "The server has requested a reconnect:"
 msgstr "Tjeneren har bedt om ny tilkobling:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Laster..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Avvikende protokollversjon. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Tjener støtter protokollversjoner mellom $1 og $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Prøv å aktivere offentlig tjenerliste på nytt og sjekk Internettforbindelsen "
-"din."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Vi støtter kun protokollversjon $1."
 
@@ -68,7 +66,8 @@ msgstr "Vi støtter kun protokollversjon $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Vi støtter protokollversjoner mellom versjon $1 og $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Vi støtter protokollversjoner mellom versjon $1 og $2."
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Avhengigheter:"
 
@@ -108,7 +108,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "Finn flere mods"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -116,7 +116,7 @@ msgstr "Mod:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No (optional) dependencies"
-msgstr "Kan gjerne bruke"
+msgstr "Ingen (valgfrie) avhengigheter"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No game description provided."
@@ -131,9 +131,8 @@ msgid "No modpack description provided."
 msgstr "Ingen modpakke-beskrivelse tilgjengelig."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No optional dependencies"
-msgstr "Valgfrie avhengigheter:"
+msgstr "Ingen valgfrie avhengigheter"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
@@ -153,21 +152,61 @@ msgid "enabled"
 msgstr "aktivert"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Laster ned..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Alle pakker"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Tast allerede i bruk"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Tilbake til hovedmeny"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Vær vert for spill"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB er ikke tilgjengelig når Minetest kompileres uten cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "Laster..."
+msgstr "Laster ned..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
@@ -183,6 +222,16 @@ msgid "Install"
 msgstr "Installer"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Installer"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Valgfrie avhengigheter:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Modder"
@@ -196,9 +245,25 @@ msgid "No results"
 msgstr "Resultatløst"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Søk"
+#, fuzzy
+msgid "No updates"
+msgstr "Oppdater"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -213,7 +278,11 @@ msgid "Update"
 msgstr "Oppdater"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -222,45 +291,39 @@ msgstr "En verden med navn \"$1\" eksisterer allerede"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Ytterligere terreng"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
 msgstr "Temperaturen synker med stigende høyde"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Altitude dry"
-msgstr "Temperaturen synker med stigende høyde"
+msgstr "Tørr høyde"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biome blending"
-msgstr "Biotoplyd"
+msgstr "Biotopblanding"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biomes"
-msgstr "Biotoplyd"
+msgstr "Biotop"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caverns"
-msgstr "Grottelyd"
+msgstr "Grotter"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "Oktaver"
+msgstr "Huler"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "Opprett"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Informasjon:"
+msgstr "Dekorasjoner"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -271,21 +334,20 @@ msgid "Download one from minetest.net"
 msgstr "Last ned en fra minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "Grottelyd"
+msgstr "Fangehull"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Flatt terreng"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "Flytende landmasser på himmelen"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
-msgstr ""
+msgstr "Flytlandene (eksperimentelt)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -300,21 +362,20 @@ msgid "Hills"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Humid rivers"
-msgstr "Videodriver"
+msgstr "Fuktige elver"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Øker fuktigheten rundt elver"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Innsjøer"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "Lav fuktighet og høy varme fører til små eller tørre elver"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -322,7 +383,7 @@ msgstr "Mapgen"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr ""
+msgstr "Mapgen-flagg"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -331,7 +392,7 @@ msgstr "Mapgen"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "Fjell"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
@@ -339,7 +400,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Nettverk av tuneller og huler"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -347,20 +408,19 @@ msgstr "Intet spill valgt"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "Reduserer varme ettersom høyden øker"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "Reduserer fuktighet ettersom høyden øker"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Rivers"
-msgstr "Elvestørrelse"
+msgstr "Elver"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Havnivåelver"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -399,21 +459,19 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "Trær og jungelgress"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Vary river depth"
-msgstr "Elvedybde"
+msgstr "Varier elvedybde"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
-msgstr "Advarsel: Den minimale utviklingstesten er tiltenkt utviklere."
+msgstr "Advarsel: Utviklingstesten er tiltenkt utviklere."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -471,18 +529,13 @@ msgstr "2D-støy"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
-msgstr "< Tilbake til instillinger"
+msgstr "< Tilbake til innstillinger"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
 msgstr "See gjennom"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Klient"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Deaktivert"
 
@@ -527,6 +580,10 @@ msgid "Scale"
 msgstr "Skala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Søk"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Velg mappe"
 
@@ -638,9 +695,23 @@ msgid "Unable to install a mod as a $1"
 msgstr "Klarte ikke å installere mod som en $1"
 
 #: builtin/mainmenu/pkgmgr.lua
-#, fuzzy
 msgid "Unable to install a modpack as a $1"
-msgstr "Klarte ikke å installere en modpakke som $1"
+msgstr "Klarte ikke å installere en modpakke som en $1"
+
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Laster..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Skripting er slått av på klientside"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Prøv å aktivere offentlig tjenerliste på nytt og sjekk Internettforbindelsen "
+"din."
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
@@ -695,7 +766,14 @@ msgid "Credits"
 msgstr "Bidragsytere"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Velg mappe"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -715,14 +793,10 @@ msgid "Bind Address"
 msgstr "Bindingsadresse"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Sett opp"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Kreativt modus"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Skru på skade"
 
@@ -736,11 +810,11 @@ msgstr "Vertstjener"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "Installer spill fra ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Navn/passord"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -751,6 +825,11 @@ msgid "No world created or selected!"
 msgstr "Ingen verden opprettet eller valgt!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Nytt passord"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Spill"
 
@@ -759,6 +838,11 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Velg verden:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Velg verden:"
 
@@ -774,23 +858,23 @@ msgstr "Start spill"
 msgid "Address / Port"
 msgstr "Adresse / port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Koble til"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Kreativ modus"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Skade aktivert"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Slett favoritt"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favoritt"
 
@@ -798,16 +882,16 @@ msgstr "Favoritt"
 msgid "Join Game"
 msgstr "Ta del i spill"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Navn / passord"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Latens"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Alle mot alle er på"
 
@@ -836,10 +920,6 @@ msgid "Antialiasing:"
 msgstr "Kantutjevning:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Er du sikker på at du ønsker å tilbakestille din enkeltspiller-verden?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Lagre skjermstørrelse automatisk"
 
@@ -847,10 +927,6 @@ msgstr "Lagre skjermstørrelse automatisk"
 msgid "Bilinear Filter"
 msgstr "Bilineært filter"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Teksturtilføyning"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Endre taster"
@@ -864,10 +940,6 @@ msgid "Fancy Leaves"
 msgstr "Forseggjorte blader"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Generer normale kart"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -876,10 +948,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + anisotropisk filter"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Nei"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Inget filter"
 
@@ -907,19 +975,11 @@ msgstr "Diffuse løv"
 msgid "Opaque Water"
 msgstr "Diffust vann"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parallakse Okklusjon"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Partikler"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Tilbakestill enkeltspillerverden"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Skjerm:"
 
@@ -932,6 +992,11 @@ msgid "Shaders"
 msgstr "Skygger"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Flytlandene (eksperimentelt)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Skyggelegging (ikke tilgjenglig)"
 
@@ -975,22 +1040,6 @@ msgstr "Skvulpende væsker"
 msgid "Waving Plants"
 msgstr "Bølgende planter"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ja"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Sett opp modder"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Hovedmeny"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Start enkeltspiller"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Forbindelsen løp ut på tid."
@@ -1152,18 +1201,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Controls:\n"
 "- %s: flytt forover\n"
@@ -1277,16 +1323,6 @@ msgid "Fog enabled"
 msgstr "Tåke på"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "TÃ¥ke av"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Tåke på"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spillinfo:"
 
@@ -1307,16 +1343,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "TÃ¥ke av"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Skade aktivert"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Media…"
 
@@ -1329,34 +1355,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Skjuler minikart"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1401,10 +1399,6 @@ msgid "Resolving address..."
 msgstr "Fortolker adresse…"
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Gjenoppstå"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Slås av…"
 
@@ -1421,12 +1415,13 @@ msgid "Sound muted"
 msgstr "Lyd av"
 
 #: src/client/game.cpp
+#, fuzzy
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "Lydsystem avskrudd"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "Lydsystem støttes ikke på dette bygget"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1457,10 +1452,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Du døde"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1477,16 +1468,6 @@ msgid "Chat shown"
 msgstr "Viser chat"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Chat skjult"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Viser chat"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1496,12 +1477,12 @@ msgstr ""
 
 #: src/client/gameui.cpp
 msgid "Profiler hidden"
-msgstr ""
+msgstr "Profiler skjult"
 
 #: src/client/gameui.cpp
 #, c-format
 msgid "Profiler shown (page %d of %d)"
-msgstr ""
+msgstr "Profiler vises (side %d av %d)"
 
 #: src/client/keycode.cpp
 msgid "Apps"
@@ -1766,6 +1747,24 @@ msgstr "X knapp 2"
 msgid "Zoom"
 msgstr "Forstørrelse"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Skjuler minikart"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Passordene samsvarer ikke!"
@@ -1794,9 +1793,8 @@ msgid "Proceed"
 msgstr "Fortsett"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "\"Special\" = climb down"
-msgstr "«bruk» = klatre ned"
+msgstr "«Spesial» = klatre ned"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Autoforward"
@@ -1811,26 +1809,6 @@ msgid "Backward"
 msgstr "Tilbake"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Endre visning"
 
@@ -1925,29 +1903,10 @@ msgid "Special"
 msgstr "Spesial"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Spesial"
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Gjennomtrengelige blokker av/på"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "HUD (hurtigtilgang) av/på"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Flymodus av/på"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Chattehistorikk av/på"
 
@@ -2080,12 +2039,6 @@ msgstr ""
 "i høyden og egner seg til øy. Angi tre like tall for grunnformen."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "2D-støytall som styrer form og størrelse på høydedrag."
 
@@ -2123,7 +2076,7 @@ msgstr "3D-modus"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode parallax strength"
-msgstr ""
+msgstr "Parallaksestyrke i 3D-modus"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
@@ -2208,6 +2161,10 @@ msgid "ABM interval"
 msgstr "ABM-intervall"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2341,7 +2298,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
-msgstr "Spør om å koble til igjen etter kræsj"
+msgstr "Spør om å koble til igjen etter krasj"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2463,10 +2420,6 @@ msgid "Builtin"
 msgstr "Innebygd"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Teksturpåføring (bump mapping)"
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
@@ -2544,22 +2497,6 @@ msgstr ""
 "der 0.0 er minimumsnivået for lysstyrke mens 1.0 er maksimumsnivået."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Endrer hovedmenyens brukergrensesnitt (UI):\n"
-"-   Fullstendig:  Flere enkeltspillerverdener, valg av spill, "
-"teksturpakkevalg, osv.\n"
-"-   Enkel: Én enkeltspillerverden, ingen valg av spill eller teksturpakke.  "
-"Kan være\n"
-"nødvendig på mindre skjermer."
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "Skriftstørrelse"
@@ -2724,6 +2661,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "ContentDBs svarteliste"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "ContentDB-URL"
 
@@ -2776,7 +2717,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
-msgstr "Kræsjmelding"
+msgstr "Krasjmelding"
 
 #: src/settings_translation_file.cpp
 msgid "Creative"
@@ -2787,7 +2728,10 @@ msgid "Crosshair alpha"
 msgstr "Trådkors-alpha"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Trådkors-alpha (ugjennomsiktighet, mellom 0 og 255)."
 
 #: src/settings_translation_file.cpp
@@ -2795,8 +2739,10 @@ msgid "Crosshair color"
 msgstr "Trådkorsfarge"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Trådkorsfarge (R, G, B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2896,12 +2842,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Defines the base ground level."
 msgstr "Definerer treområder og skogstetthet."
@@ -2973,6 +2913,11 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Høyre tast"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Gravepartikler"
 
@@ -3034,7 +2979,8 @@ msgid "Enable console window"
 msgstr "Skru på konsollvindu"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Skru på kreativt modusfor nye opprettede kart."
 
 #: src/settings_translation_file.cpp
@@ -3124,14 +3070,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3141,18 +3079,6 @@ msgstr "Aktiverer minikart."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3169,12 +3095,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3184,8 +3104,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr ""
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "Maks FPS når spillet står i pause."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3493,10 +3414,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3550,8 +3467,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -4019,6 +3936,11 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "Spillstikketype"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4105,6 +4027,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tast for hopping.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4155,14 +4088,14 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for moving the player backward.\n"
 "Will also disable autoforward, when active.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tast for hurtig gange i raskt modus.\n"
+"Tast for å bevege spilleren bakover\n"
+"Vil også koble ut automatisk foroverbevegelse, hvis aktiv.\n"
 "Se http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4232,6 +4165,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tast for hopping.\n"
+"Se http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4921,11 +4865,6 @@ msgid "Main menu script"
 msgstr "Skript for hovedmeny"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Hovedmeny"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4939,6 +4878,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Mappe for kart"
 
@@ -5108,7 +5055,8 @@ msgid "Maximum FPS"
 msgstr "Maks FPS («frames» - bilder per sekund)"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "Maks FPS når spillet står i pause."
 
 #: src/settings_translation_file.cpp
@@ -5157,6 +5105,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5388,14 +5343,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5421,10 +5368,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5450,34 +5393,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5544,6 +5459,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Flygingstast"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5700,10 +5624,6 @@ msgid "Right key"
 msgstr "Høyre tast"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Elveleiedybde"
 
@@ -5965,6 +5885,20 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Angi språk. La stå tom for å bruke operativsystemets språk.\n"
+"Krever omstart etter endring."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Fet skrifttype som forvalg"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Beskjed ved avslutning"
 
@@ -6103,10 +6037,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6201,6 +6131,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6264,8 +6198,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6291,15 +6225,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6440,6 +6379,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6648,6 +6598,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6730,7 +6686,6 @@ msgid "Y of flat ground."
 msgstr "Y-koordinat for flatt land."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Y of mountain density gradient zero level. Used to shift mountains "
 "vertically."
@@ -6775,6 +6730,24 @@ msgid "Y-level of seabed."
 msgstr "Y-nivå for havbunn."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "Tidsutløp for filnedlasting med cURL"
 
@@ -6786,32 +6759,97 @@ msgstr "Maksimal parallellisering i cURL"
 msgid "cURL timeout"
 msgstr "cURL-tidsgrense"
 
-#~ msgid "Ok"
-#~ msgstr "Okei"
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr ""
+#~ "Er du sikker på at du ønsker å tilbakestille din enkeltspiller-verden?"
 
 #~ msgid "Back"
 #~ msgstr "Tilbake"
 
+#~ msgid "Bump Mapping"
+#~ msgstr "Teksturtilføyning"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Teksturpåføring (bump mapping)"
+
+#~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Endrer hovedmenyens brukergrensesnitt (UI):\n"
+#~ "-   Fullstendig:  Flere enkeltspillerverdener, valg av spill, "
+#~ "teksturpakkevalg, osv.\n"
+#~ "-   Enkel: Én enkeltspillerverden, ingen valg av spill eller "
+#~ "teksturpakke.  Kan være\n"
+#~ "nødvendig på mindre skjermer."
+
+#~ msgid "Config mods"
+#~ msgstr "Sett opp modder"
+
+#~ msgid "Configure"
+#~ msgstr "Sett opp"
+
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Trådkorsfarge (R, G, B)."
+
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr "Laster ned og installerer $1, vent…"
 
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Filsti til lagring av skjermdumper."
-
 #~ msgid "Enable VBO"
 #~ msgstr "Aktiver VBO"
 
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Aktiver filmatisk toneoversettelse"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Generer normale kart"
+
 #~ msgid "IPv6 support."
 #~ msgstr "IPv6-støtte."
 
-#~ msgid "Y-level to which floatland shadows extend."
-#~ msgstr "Hvilket Y-nivå som skyggen til luftøyer når."
+#~ msgid "Main"
+#~ msgstr "Hovedmeny"
 
-#~ msgid "Y of upper limit of lava in large caves."
-#~ msgstr "Y-verdi for øvre grense for lava i store grotter."
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "Hovedmeny"
+
+#~ msgid "Name/Password"
+#~ msgstr "Navn/passord"
+
+#~ msgid "No"
+#~ msgstr "Nei"
+
+#~ msgid "Ok"
+#~ msgstr "Okei"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallakse Okklusjon"
+
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Filsti til lagring av skjermdumper."
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Tilbakestill enkeltspillerverden"
 
 #~ msgid "Select Package File:"
 #~ msgstr "Velg pakkefil:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Start enkeltspiller"
+
+#~ msgid "View"
+#~ msgstr "Vis"
+
+#~ msgid "Y of upper limit of lava in large caves."
+#~ msgstr "Y-verdi for øvre grense for lava i store grotter."
+
+#~ msgid "Y-level to which floatland shadows extend."
+#~ msgstr "Hvilket Y-nivå som skyggen til luftøyer når."
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
diff --git a/po/nl/minetest.po b/po/nl/minetest.po
index 5381babe2..f1982536a 100644
--- a/po/nl/minetest.po
+++ b/po/nl/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dutch (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-07-08 20:47+0000\n"
-"Last-Translator: sfan5 <sfan5@live.de>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-01 05:52+0000\n"
+"Last-Translator: eol <joshua.de.clercq@gmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/minetest/minetest/"
 "nl/>\n"
 "Language: nl\n"
@@ -12,7 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Herboren worden"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Je bent gestorven"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -38,10 +46,6 @@ msgstr "Opnieuw verbinding maken"
 msgid "The server has requested a reconnect:"
 msgstr "De server heeft gevraagd opnieuw verbinding te maken:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Laden..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Protocol versie stemt niet overeen. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "De server ondersteunt protocol versies tussen $1 en $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Probeer de publieke serverlijst opnieuw in te schakelen en controleer de "
-"internet verbinding."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Wij ondersteunen enkel protocol versie $1."
 
@@ -68,7 +66,8 @@ msgstr "Wij ondersteunen enkel protocol versie $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Wij ondersteunen protocol versies $1 tot en met $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Wij ondersteunen protocol versies $1 tot en met $2."
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Afhankelijkheden:"
 
@@ -152,14 +152,55 @@ msgid "enabled"
 msgstr "aangeschakeld"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" bestaat al. Wilt u het overschrijven ?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Afhankelijkheden $1 en $2 zullen geïnstalleerd worden."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 door $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 is aan het downloaden,\n"
+"$2 is ingepland"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 is aan het downloaden..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 benodigde afhankelijkheden werden niet gevonden."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+"$1 zal worden geïnstalleerd, en $2 afhankelijkheden worden overgeslagen."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Alle pakketten"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Reeds geïnstalleerd"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Terug naar hoofdmenu"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Basis Spel:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 "ContentDB is niet beschikbaar wanneer Minetest compileert is zonder cURL"
@@ -182,6 +223,14 @@ msgid "Install"
 msgstr "Installeren"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "Installeer $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Installeer ontbrekende afhankelijkheden"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mods"
@@ -195,9 +244,24 @@ msgid "No results"
 msgstr "Geen resultaten"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Zoeken"
+msgid "No updates"
+msgstr "Geen updates"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Niet gevonden"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Overschrijven"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Controleer of het basis spel correct is, aub."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "Ingepland"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -212,8 +276,12 @@ msgid "Update"
 msgstr "Update"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr ""
+msgid "Update All [$1]"
+msgstr "Allemaal bijwerken [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Bekijk meer informatie in een webbrowser"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -221,46 +289,39 @@ msgstr "Een wereld met de naam \"$1\" bestaat al"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Extra terrein"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
-#, fuzzy
 msgid "Altitude chill"
-msgstr "Temperatuurverschil vanwege hoogte"
+msgstr "Temperatuurdaling vanwege hoogte"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Altitude dry"
-msgstr "Temperatuurverschil vanwege hoogte"
+msgstr "Vochtigheidsverschil vanwege hoogte"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biome blending"
-msgstr "Biome-ruis"
+msgstr "Vegetatie mix"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biomes"
-msgstr "Biome-ruis"
+msgstr "Vegetaties"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caverns"
-msgstr "Grot ruis"
+msgstr "Grotten"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "Octaven"
+msgstr "Grotten"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "Maak aan"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Per soort"
+msgstr "Decoraties"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -271,23 +332,20 @@ msgid "Download one from minetest.net"
 msgstr "Laad er een van minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "Kerker ruis"
+msgstr "Kerkers"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Vlak terrein"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floating landmasses in the sky"
-msgstr "Drijvend gebergte dichtheid"
+msgstr "Zwevende gebergtes"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floatlands (experimental)"
-msgstr "Waterniveau"
+msgstr "Zwevende eilanden (experimenteel)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -295,28 +353,28 @@ msgstr "Spel"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Een niet-fractaal terrein genereren: Oceanen en ondergrond"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Heuvels"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Humid rivers"
-msgstr "Video driver"
+msgstr "Irrigerende rivier"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Verhoogt de luchtvochtigheid rond rivieren"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Meren"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
 msgstr ""
+"Lage luchtvochtigheid en hoge hitte zorgen voor ondiepe of droge rivieren"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -327,22 +385,20 @@ msgid "Mapgen flags"
 msgstr "Wereldgenerator vlaggen"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mapgen-specific flags"
-msgstr "Vlaggen"
+msgstr "Mapgeneratie-specifieke vlaggen"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mountains"
-msgstr "Bergen ruis"
+msgstr "Bergen"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Modderstroom"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Netwerk van tunnels en grotten"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -350,20 +406,19 @@ msgstr "Geen spel geselecteerd"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "Verminderen van hitte met hoogte"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "Vermindert de luchtvochtigheid met hoogte"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Rivers"
-msgstr "Grootte van rivieren"
+msgstr "Rivieren"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Rivieren op zeeniveau"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -372,50 +427,49 @@ msgstr "Kiemgetal"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "Zachte overgang tussen vegetatiezones"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"Structuren verschijnen op het terrein (geen effect op bomen en jungle gras "
+"gemaakt door v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "Structuren verschijnen op het terrein, voornamelijk bomen en planten"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "Gematigd, Woestijn"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "Gematigd, Woestijn, Oerwoud"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "Gematigd, Woestijn, Oerwoud, Toendra, Taiga"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Terrain surface erosion"
-msgstr "Terrein hoogte"
+msgstr "Terreinoppervlakte erosie"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "Bomen en oerwoudgras"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Vary river depth"
-msgstr "Diepte van rivieren"
+msgstr "Wisselende rivierdiepte"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Zeer grote en diepe grotten"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
 msgstr ""
 "Waarschuwing: Het minimale ontwikkellaars-test-spel is bedoeld voor "
@@ -484,11 +538,6 @@ msgid "Browse"
 msgstr "Bladeren"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Cliënt"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
@@ -533,6 +582,10 @@ msgid "Scale"
 msgstr "Schaal"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Zoeken"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Selecteer map"
 
@@ -648,6 +701,21 @@ msgstr "Installeren van mod $1 in $2 is mislukt"
 msgid "Unable to install a modpack as a $1"
 msgstr "Installeren van mod verzameling $1 in $2 is mislukt"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Laden..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Client-side scripting is uitgeschakeld"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Probeer de publieke serverlijst opnieuw in te schakelen en controleer de "
+"internet verbinding."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Content op internet bekijken"
@@ -701,8 +769,16 @@ msgid "Credits"
 msgstr "Credits"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "Open de gebruikersdatamap"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Open de map die de door de gebruiker aangeleverde werelden, spellen, mods\n"
+"en textuur pakketten bevat in een bestandsbeheer toepassing / verkenner."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -721,14 +797,10 @@ msgid "Bind Address"
 msgstr "Lokaal server-adres"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Instellingen"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Creatieve modus"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Verwondingen inschakelen"
 
@@ -742,11 +814,11 @@ msgstr "Server Hosten"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "Installeer spellen van ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Naam / Wachtwoord"
+msgid "Name"
+msgstr "Naam"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -757,14 +829,22 @@ msgid "No world created or selected!"
 msgstr "Geen wereldnaam opgegeven of geen wereld aangemaakt!"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
-msgstr "Spel Spelen"
+msgstr "Spel Starten"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Port"
 msgstr "Poort"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Selecteer Mods"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Selecteer Wereld:"
 
@@ -780,23 +860,23 @@ msgstr "Start spel"
 msgid "Address / Port"
 msgstr "Server adres / Poort"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Verbinden"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Creatieve modus"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Verwondingen ingeschakeld"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Verwijder Favoriete"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favorieten"
 
@@ -804,16 +884,16 @@ msgstr "Favorieten"
 msgid "Join Game"
 msgstr "Join spel"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Naam / Wachtwoord"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Spelergevechten ingeschakeld"
 
@@ -842,10 +922,6 @@ msgid "Antialiasing:"
 msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Weet je zeker dat je je wereld wilt resetten?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Schermafmetingen automatisch bewaren"
 
@@ -853,10 +929,6 @@ msgstr "Schermafmetingen automatisch bewaren"
 msgid "Bilinear Filter"
 msgstr "Bilineaire Filtering"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Bumpmapping"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Toetsen aanpassen"
@@ -870,10 +942,6 @@ msgid "Fancy Leaves"
 msgstr "Mooie bladeren"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Genereer normale werelden"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -882,10 +950,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Anisotropisch filteren"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Nee"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Geen Filter"
 
@@ -913,19 +977,11 @@ msgstr "Ondoorzichtige bladeren"
 msgid "Opaque Water"
 msgstr "Ondoorzichtig water"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parallax occlusie"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Effectdeeltjes"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Reset Singleplayer wereld"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Scherm:"
 
@@ -938,6 +994,10 @@ msgid "Shaders"
 msgstr "Shaders"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Shaders (experimenteel)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Shaders (niet beschikbaar)"
 
@@ -981,22 +1041,6 @@ msgstr "Golvende Vloeistoffen"
 msgid "Waving Plants"
 msgstr "Bewegende planten"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ja"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Mods configureren"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Hoofdmenu"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Start Singleplayer"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Time-out bij opzetten verbinding."
@@ -1151,25 +1195,22 @@ msgid "Continue"
 msgstr "Verder spelen"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Besturing: \n"
 "-%s: ga vooruit \n"
@@ -1177,12 +1218,12 @@ msgstr ""
 "-%s: ga naar links \n"
 "-%s: ga naar rechts \n"
 "-%s: springen / klimmen \n"
+"-%s: graaf/duw\n"
+"-%s: plaats/gebruik \n"
 "-%s: sluip / ga naar beneden \n"
 "-%s: drop item \n"
 "-%s: inventaris \n"
 "- Muis: draaien / kijken \n"
-"- Muis links: graven / stoten \n"
-"- Muis rechts: plaats / gebruik \n"
 "- Muiswiel: item selecteren \n"
 "-%s: chat\n"
 
@@ -1283,16 +1324,6 @@ msgid "Fog enabled"
 msgstr "Mist ingeschakeld"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Mist uitgeschakeld"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Mist ingeschakeld"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spel info:"
 
@@ -1313,16 +1344,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Mist uitgeschakeld"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Verwondingen ingeschakeld"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Media..."
 
@@ -1335,34 +1356,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Mini-kaart momenteel uitgeschakeld door spel of mod"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Mini-kaart verborgen"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Mini-kaart in radar modus, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Mini-kaart in radar modus, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Mini-kaart in radar modus, Zoom x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Minimap in oppervlaktemodus, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Minimap in oppervlaktemodus, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Minimap in oppervlaktemodus, Zoom x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Noclip-modus uitgeschakeld"
 
@@ -1407,10 +1400,6 @@ msgid "Resolving address..."
 msgstr "Server-adres opzoeken..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Herboren worden"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Uitschakelen..."
 
@@ -1428,11 +1417,11 @@ msgstr "Geluid gedempt"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "Systeemgeluiden zijn uitgeschakeld"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "Geluidssysteem is niet ondersteund in deze versie"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1459,15 +1448,10 @@ msgid "Volume changed to %d%%"
 msgstr "Volume gewijzigd naar %d%%"
 
 #: src/client/game.cpp
-#, fuzzy
 msgid "Wireframe shown"
 msgstr "Draadframe weergegeven"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Je bent gestorven"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom momenteel uitgeschakeld door game of mod"
 
@@ -1484,16 +1468,6 @@ msgid "Chat shown"
 msgstr "Chat weergegeven"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Chat verborgen"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Chat weergegeven"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD verborgen"
 
@@ -1515,7 +1489,6 @@ msgid "Apps"
 msgstr "Menu"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "Backspace"
 msgstr "Terug"
 
@@ -1618,11 +1591,11 @@ msgstr "Num Lock"
 
 #: src/client/keycode.cpp
 msgid "Numpad *"
-msgstr "Numpad *"
+msgstr "Numeriek pad *"
 
 #: src/client/keycode.cpp
 msgid "Numpad +"
-msgstr "Numpad +"
+msgstr "Numeriek pad +"
 
 #: src/client/keycode.cpp
 msgid "Numpad -"
@@ -1630,7 +1603,7 @@ msgstr "Numpad -"
 
 #: src/client/keycode.cpp
 msgid "Numpad ."
-msgstr "Numpad ."
+msgstr "Numeriek pad ."
 
 #: src/client/keycode.cpp
 msgid "Numpad /"
@@ -1774,6 +1747,24 @@ msgstr "X knop 2"
 msgid "Zoom"
 msgstr "Zoomen"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Mini-kaart verborgen"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Mini-kaart in radar modus, Zoom x%d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Minimap in oppervlaktemodus, Zoom x%d"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Minimap textuur modus"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "De wachtwoorden zijn niet gelijk!"
@@ -1820,26 +1811,6 @@ msgid "Backward"
 msgstr "Achteruit"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Camera veranderen"
 
@@ -1934,30 +1905,10 @@ msgid "Special"
 msgstr "Speciaal"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Speciaal"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Cinematic modus aan/uit"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Cinematic modus aan/uit"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Schakel HUD in/uit"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Vliegen aan/uit"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Chatlogboek wisselen"
 
@@ -2089,14 +2040,6 @@ msgstr ""
 "een eiland, stel alle 3 getallen gelijk voor de ruwe vorm."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = parallax occlusie met helling-informatie (sneller).\n"
-"1 = 'reliëf mapping' (lanzamer, nauwkeuriger)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "2D-ruis die de vorm/grootte van geribbelde bergen bepaalt."
 
@@ -2134,21 +2077,21 @@ msgid "3D mode"
 msgstr "3D modus"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D mode parallax strength"
-msgstr "Sterkte van normal-maps"
+msgstr "Sterkte van parallax in 3D modus"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
-msgstr "3D geluid voor grote holtes."
+msgstr "3D ruis voor grote holtes."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "3D noise defining mountain structure and height.\n"
 "Also defines structure of floatland mountain terrain."
 msgstr ""
-"3D geluid voor gebergte of hoge toppen.\n"
-"Ook voor luchtdrijvende bergen."
+"3D ruis voor het definiëren van de structuur en de hoogte van gebergtes of "
+"hoge toppen.\n"
+"Ook voor de structuur van bergachtig terrein om zwevende eilanden."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2157,10 +2100,16 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"3D ruis om de vorm van de zwevende eilanden te bepalen.\n"
+"Als de standaardwaarde wordt gewijzigd, dan moet de waarde van de "
+"geluidsschaal,\n"
+"standaard ingesteld op 0.7 gewijzigd worden, aangezien de afschuinings-"
+"functies van de zwevende eilanden\n"
+"het beste werkt met een waarde tussen -2.0 en 2.0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
-msgstr "3D geluid voor wanden van diepe rivier kloof."
+msgstr "3D ruis voor wanden van diepe rivier kloof."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining terrain."
@@ -2220,12 +2169,14 @@ msgstr ""
 "afgesloten wordt."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "ABM interval"
-msgstr "Interval voor opslaan wereld"
+msgstr "Interval voor ABM's"
+
+#: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr "ABM tijd budget"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Maximaal aantal 'emerge' blokken in de wachtrij"
 
@@ -2284,6 +2235,13 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"Past de densiteit van de zwevende eilanden aan.\n"
+"De densiteit verhoogt als de waarde verhoogt. Kan positief of negatief "
+"zijn.\n"
+"Waarde = 0,0 : 50% van het volume is een zwevend eiland.\n"
+"Waarde = 2.0 : een laag van massieve zwevende eilanden\n"
+"(kan ook hoger zijn, afhankelijk van 'mgv7_np_floatland', altijd testen om "
+"zeker te zijn)."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -2455,9 +2413,8 @@ msgid "Bits per pixel (aka color depth) in fullscreen mode."
 msgstr "Aantal bits per pixel (oftewel: kleurdiepte) in full-screen modus."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Block send optimize distance"
-msgstr "Blok verzend optimaliseren afstand"
+msgstr "Blok verzend optimalisatie afstand"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic font path"
@@ -2484,10 +2441,6 @@ msgid "Builtin"
 msgstr "Ingebouwd"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bumpmapping"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2565,34 +2518,16 @@ msgstr ""
 "Waar 0,0 het minimale lichtniveau is, is 1,0 het maximale lichtniveau."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Verandert de gebruikersinterface van het hoofdmenu: \n"
-"- Volledig: meerdere werelden voor één speler, spelkeuze, de kiezer van "
-"textuurpak, etc. \n"
-"- Eenvoudig: één wereld voor één speler, geen game- of texture pack-kiezers. "
-"Kan zijn \n"
-"noodzakelijk voor kleinere schermen."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat font size"
-msgstr "Lettergrootte"
+msgstr "Chat lettergrootte"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
 msgstr "Chat-toets"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat log level"
-msgstr "Debug logniveau"
+msgstr "Chat debug logniveau"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
@@ -2643,9 +2578,8 @@ msgid "Client and Server"
 msgstr "Cliënt en server"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Client modding"
-msgstr "Cliënt modding"
+msgstr "Cliënt personalisatie (modding)"
 
 #: src/settings_translation_file.cpp
 msgid "Client side modding restrictions"
@@ -2713,10 +2647,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 ""
-"Lijst van vertrouwde mods die onveilige functies mogen gebruiken,\n"
-"zelfs wanneer mod-beveiliging aan staat (via "
-"request_insecure_environment()).\n"
-"Gescheiden door komma's."
+"Komma gescheiden lijst van vertrouwde mods die onveilige functies mogen "
+"gebruiken,\n"
+"zelfs wanneer mod-beveiliging aan staat (via request_insecure_environment())."
 
 #: src/settings_translation_file.cpp
 msgid "Command key"
@@ -2748,9 +2681,12 @@ msgid "Console height"
 msgstr "Hoogte console"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "ContentDB Flag Blacklist"
-msgstr "ContentDB markeert zwarte lijst"
+msgstr "ContentDB optie: verborgen pakketten lijst"
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "ContentDB Maximum Gelijktijdige Downloads"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB URL"
@@ -2821,16 +2757,24 @@ msgid "Crosshair alpha"
 msgstr "Draadkruis-alphawaarde"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "Draadkruis-alphawaarde. (ondoorzichtigheid; tussen 0 en 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Draadkruis-alphawaarde (ondoorzichtigheid; tussen 0 en 255).\n"
+"Controleert ook het object draadkruis kleur"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
 msgstr "Draadkruis-kleur"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Draadkruis-kleur (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Draadkruis kleur (R,G,B).\n"
+"Controleert ook het object draadkruis kleur"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2893,9 +2837,8 @@ msgid "Default report format"
 msgstr "Standaardformaat voor rapport-bestanden"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default stack size"
-msgstr "Standaardspel"
+msgstr "Standaard voorwerpenstapel grootte"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2935,14 +2878,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Bepaalt de plaats van bijkomende heuvels en vijvers."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Bemonsterings-interval voor texturen.\n"
-"Een hogere waarde geeft vloeiender normal maps."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Definieert het basisgrondniveau."
 
@@ -2954,8 +2889,7 @@ msgstr "Definieert de diepte van het rivierkanaal."
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
 "Maximale afstand (in blokken van 16 nodes) waarbinnen andere spelers "
-"zichtbaar zijn\n"
-"(0 = oneindig ver)."
+"zichtbaar zijn (0 = oneindig ver)."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the width of the river channel."
@@ -3023,6 +2957,10 @@ msgid "Desynchronize block animation"
 msgstr "Textuur-animaties niet synchroniseren"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "Toets voor graven"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Graaf deeltjes"
 
@@ -3087,7 +3025,8 @@ msgid "Enable console window"
 msgstr "Schakel het console venster in"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Schakel creatieve modus in voor nieuwe kaarten."
 
 #: src/settings_translation_file.cpp
@@ -3141,8 +3080,7 @@ msgstr ""
 "Zet dit aan om verbindingen van oudere cliënten te weigeren.\n"
 "Oudere cliënten zijn compatibel, in de zin dat ze niet crashen als ze "
 "verbinding \n"
-"maken met nieuwere servers, maar ze ondersteunen wellicht niet alle "
-"nieuwere\n"
+"maken met nieuwere servers, maar ze ondersteunen wellicht niet alle nieuwere "
 "mogelijkheden."
 
 #: src/settings_translation_file.cpp
@@ -3204,18 +3142,6 @@ msgid "Enables animation of inventory items."
 msgstr "Schakelt animatie van inventaris items aan."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Bumpmapping aanzetten voor texturen. Normalmaps moeten al in de texture pack "
-"zitten\n"
-"of ze moeten automatisch gegenereerd worden.\n"
-"Schaduwen moeten aanstaan."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Schakelt caching van facedir geroteerde meshes."
 
@@ -3225,22 +3151,6 @@ msgstr "Schakelt de mini-kaart in."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Schakelt het genereren van normal maps in (emboss effect).\n"
-"Dit vereist dat bumpmapping ook aan staat."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Schakelt parallax occlusie mappen in.\n"
-"Dit vereist dat shaders ook aanstaan."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3261,14 +3171,6 @@ msgstr "Entiteit-functies"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Experimentele optie. Kan bij een waarde groter dan 0 zichtbare\n"
-"ruimtes tussen blokken tot gevolg hebben."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3276,10 +3178,17 @@ msgid ""
 "Values < 1.0 (for example 0.25) create a more defined surface level with\n"
 "flatter lowlands, suitable for a solid floatland layer."
 msgstr ""
+"Exponent voor de afschuining van het zwevende eiland. Wijzigt de "
+"afschuining.\n"
+"Waarde = 1.0 maakt een uniforme, rechte afschuining.\n"
+"Waarde > 1.0 maakt een vloeiende afschuining voor standaard gescheiden\n"
+"zwevende eilanden.\n"
+"Waarde < 1.0 (bijvoorbeeld 0.25) maakt een meer uitgesproken oppervlak met \n"
+"platte laaglanden, geschikt voor een solide zwevende eilanden laag."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS in het pauze-menu"
+msgid "FPS when unfocused or paused"
+msgstr "FPS als het spel gepauzeerd of niet gefocussed is"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3330,8 +3239,8 @@ msgid ""
 "Fast movement (via the \"special\" key).\n"
 "This requires the \"fast\" privilege on the server."
 msgstr ""
-"Snelle beweging (via de \"speciale\" toets). \n"
-"Dit vereist het \"snelle\" recht op de server."
+"Snelle beweging (via de \"speciaal\" toets). \n"
+"Dit vereist het \"snel bewegen\" recht op de server."
 
 #: src/settings_translation_file.cpp
 msgid "Field of view"
@@ -3364,7 +3273,6 @@ msgid "Filmic tone mapping"
 msgstr "Filmisch tone-mapping"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Filtered textures can blend RGB values with fully-transparent neighbors,\n"
 "which PNG optimizers usually discard, sometimes resulting in a dark or\n"
@@ -3382,14 +3290,14 @@ msgid "Filtering"
 msgstr "Filters"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "First of 4 2D noises that together define hill/mountain range height."
-msgstr "Eerste van 2 3D geluiden voor tunnels."
+msgstr ""
+"Eerste van vier 2D geluiden die samen de hoogte van een heuvel of berg "
+"bepalen."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "First of two 3D noises that together define tunnels."
-msgstr "Eerste van 2 3D geluiden voor tunnels."
+msgstr "Eerste van twee 3D geluiden voor tunnels."
 
 #: src/settings_translation_file.cpp
 msgid "Fixed map seed"
@@ -3400,39 +3308,32 @@ msgid "Fixed virtual joystick"
 msgstr "Vaste virtuele joystick"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland density"
-msgstr "Drijvend gebergte dichtheid"
+msgstr "Drijvend gebergte densiteit"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland maximum Y"
-msgstr "Dungeon maximaal Y"
+msgstr "Maximaal Y-waarde van zwevende eilanden"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland minimum Y"
-msgstr "Dungeon minimaal Y"
+msgstr "Minimum Y-waarde van zwevende eilanden"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland noise"
-msgstr "Drijvend land basis ruis"
+msgstr "Zwevende eilanden geluid"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland taper exponent"
-msgstr "Drijvend gebergte dichtheid"
+msgstr "Zwevend eiland vormfactor"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland tapering distance"
-msgstr "Drijvend land basis ruis"
+msgstr "Zwevend eiland afschuinings-afstand"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland water level"
-msgstr "Waterniveau"
+msgstr "Waterniveau van zwevend eiland"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
@@ -3447,9 +3348,8 @@ msgid "Fog"
 msgstr "Mist"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fog start"
-msgstr "Nevel aanvang"
+msgstr "Begin van de nevel of mist"
 
 #: src/settings_translation_file.cpp
 msgid "Fog toggle key"
@@ -3492,6 +3392,8 @@ msgid ""
 "Font size of the recent chat text and chat prompt in point (pt).\n"
 "Value 0 will use the default font size."
 msgstr ""
+"Tekstgrootte van de chatgeschiedenis en chat prompt in punten (pt).\n"
+"Waarde 0 zal de standaard tekstgrootte gebruiken."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3524,23 +3426,19 @@ msgid "Formspec Full-Screen Background Opacity"
 msgstr "Formspec Achtergronddekking op volledig scherm"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Formspec default background color (R,G,B)."
 msgstr "Chat console achtergrondkleur (R,G,B)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Formspec default background opacity (between 0 and 255)."
 msgstr ""
 "Chat console achtergrond alphawaarde (ondoorzichtigheid, tussen 0 en 255)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Formspec full-screen background color (R,G,B)."
 msgstr "Chat console achtergrondkleur (R,G,B)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Formspec full-screen background opacity (between 0 and 255)."
 msgstr ""
 "Chat console achtergrond alphawaarde (ondoorzichtigheid, tussen 0 en 255)."
@@ -3550,9 +3448,9 @@ msgid "Forward key"
 msgstr "Vooruit toets"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fourth of 4 2D noises that together define hill/mountain range height."
-msgstr "Eerste van 2 3D geluiden voor tunnels."
+msgstr ""
+"Vierde van vier 3D geluiden die de hoogte van heuvels en bergen bepalen."
 
 #: src/settings_translation_file.cpp
 msgid "Fractal type"
@@ -3563,7 +3461,6 @@ msgid "Fraction of the visible distance at which fog starts to be rendered"
 msgstr "Fractie van de zichtbare afstand vanaf waar de nevel wordt getoond"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "FreeType fonts"
 msgstr "Freetype lettertypes"
 
@@ -3623,15 +3520,10 @@ msgid "GUI scaling filter txr2img"
 msgstr "GUI schalingsfilter: txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Genereer normaalmappen"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Algemene callbacks"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Global map generation attributes.\n"
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
@@ -3671,19 +3563,16 @@ msgid "Gravity"
 msgstr "Zwaartekracht"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ground level"
 msgstr "Grondniveau"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ground noise"
-msgstr "Modder ruis"
+msgstr "Aarde/Modder geluid"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "HTTP mods"
-msgstr "HTTP Modules"
+msgstr "HTTP Mods"
 
 #: src/settings_translation_file.cpp
 msgid "HUD scale factor"
@@ -3694,20 +3583,18 @@ msgid "HUD toggle key"
 msgstr "HUD aan/uitschakelen toets"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
-"Behandeling van verouderde lua api aanroepen:\n"
-"-    legacy: (probeer) het oude gedrag na te bootsen\n"
-"     (standaard voor een 'release' versie).\n"
-"-    log: boots het oude gedrag na, en log een backtrace van de aanroep\n"
-"     (standaard voor een 'debug' versie).\n"
-"-    error: stop de server bij gebruik van een verouderde aanroep\n"
-"     (aanbevolen voor mod ontwikkelaars)."
+"Behandeling van verouderde Lua API aanroepen:\n"
+"-    none: log geen verouderde aanroepen\n"
+"-    log: boots het oude gedrag na, en log een backtrace van de aanroep "
+"(standaard voor een 'debug' versie).\n"
+"-    error: stop de server bij gebruik van een verouderde aanroep "
+"(aanbevolen voor mod ontwikkelaars)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3724,69 +3611,58 @@ msgstr ""
 "* Profileer de code die de statistieken ververst."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Heat blend noise"
-msgstr "Wereldgenerator landschapstemperatuurovergangen"
+msgstr "Geluid van landschapstemperatuurovergangen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Heat noise"
-msgstr "Grot ruispatroon #1"
+msgstr "Hitte geluid"
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
 msgstr "Aanvangshoogte van het venster."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height noise"
-msgstr "Rechter Windowstoets"
+msgstr "Hoogtegeluid"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Height select noise"
-msgstr "Hoogte-selectie ruisparameters"
+msgstr "Hoogte-selectie geluid"
 
 #: src/settings_translation_file.cpp
 msgid "High-precision FPU"
 msgstr "Hoge-nauwkeurigheid FPU"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hill steepness"
 msgstr "Steilheid van de heuvels"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hill threshold"
 msgstr "Heuvel-grenswaarde"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hilliness1 noise"
-msgstr "Steilte ruis"
+msgstr "Heuvelsteilte ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hilliness2 noise"
-msgstr "Steilte ruis"
+msgstr "Heuvelachtigheid2 ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hilliness3 noise"
-msgstr "Steilte ruis"
+msgstr "Heuvelachtigheid3 ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hilliness4 noise"
-msgstr "Steilte ruis"
+msgstr "Heuvelachtigheid4 ruis"
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
 msgstr "Home-pagina van de server. Wordt getoond in de serverlijst."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Horizontal acceleration in air when jumping or falling,\n"
 "in nodes per second per second."
@@ -3795,7 +3671,6 @@ msgstr ""
 "in knooppunten per seconde per seconde."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Horizontal and vertical acceleration in fast mode,\n"
 "in nodes per second per second."
@@ -3804,7 +3679,6 @@ msgstr ""
 "in knooppunten per seconde per seconde."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Horizontal and vertical acceleration on ground or when climbing,\n"
 "in nodes per second per second."
@@ -3821,164 +3695,132 @@ msgid "Hotbar previous key"
 msgstr "Toets voor vorig gebruikte tool"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 1 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 1 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 10 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 10 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 11 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 11 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 12 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 12 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 13 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 13 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 14 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 14 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 15 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 15 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 16 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 16 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 17 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 17 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 18 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 18 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 19 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 19 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 2 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 2 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 20 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 20 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 21 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 21 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 22 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 22 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 23 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 23 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 24 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 24 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 25 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 25 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 26 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 26 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 27 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 27 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 28 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 28 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 29 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 29 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 3 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 3 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 30 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 30 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 31 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 31 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 32 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 32 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 4 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 4 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 5 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 5 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 6 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 6 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 7 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 7 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 8 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 8 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Hotbar slot 9 key"
-msgstr "Toets voor volgend gebruikte tool"
+msgstr "Toets voor slot 9 van gebruikte tools"
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers."
@@ -4036,13 +3878,12 @@ msgstr ""
 "kracht verspild wordt zonder dat het toegevoegde waarde heeft."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If disabled, \"special\" key is used to fly fast if both fly and fast mode "
 "are\n"
 "enabled."
 msgstr ""
-"Indien uitgeschakeld, dan wordt met de \"gebruiken\" toets snel gevlogen "
+"Indien uitgeschakeld, dan wordt met de \"speciaal\" toets snel gevlogen "
 "wanneer\n"
 "de \"vliegen\" en de \"snel\" modus aanstaan."
 
@@ -4072,13 +3913,12 @@ msgstr ""
 "Dit vereist het \"noclip\" voorrecht op de server."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "If enabled, \"special\" key instead of \"sneak\" key is used for climbing "
 "down and\n"
 "descending."
 msgstr ""
-"Indien aangeschakeld, dan wordt de \"gebruiken\" toets gebruikt voor\n"
+"Indien aangeschakeld, dan wordt de \"speciaal\" toets gebruikt voor\n"
 "omlaagklimmen en dalen i.p.v. de \"sluipen\" toets."
 
 #: src/settings_translation_file.cpp
@@ -4173,15 +4013,13 @@ msgid "In-game chat console background color (R,G,B)."
 msgstr "Chat console achtergrondkleur (R,G,B)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "In-game chat console height, between 0.1 (10%) and 1.0 (100%)."
 msgstr ""
 "Chat console achtergrond alphawaarde (ondoorzichtigheid, tussen 0 en 255)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Inc. volume key"
-msgstr "Console-toets"
+msgstr "Verhoog volume toets"
 
 #: src/settings_translation_file.cpp
 msgid "Initial vertical speed when jumping, in nodes per second."
@@ -4194,7 +4032,7 @@ msgid ""
 msgstr ""
 "Profileer 'builtin'.\n"
 "Dit is normaal enkel nuttig voor gebruik door ontwikkelaars van\n"
-"het 'builtin'-gedeelte van de server"
+"het core/builtin-gedeelte van de server"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument chatcommands on registration."
@@ -4253,23 +4091,20 @@ msgid "Invert vertical mouse movement."
 msgstr "Vertikale muisbeweging omkeren."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Italic font path"
-msgstr "Vaste-breedte font pad"
+msgstr "Cursief font pad"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Italic monospace font path"
-msgstr "Vaste-breedte font pad"
+msgstr "Cursief vaste-breedte font pad"
 
 #: src/settings_translation_file.cpp
 msgid "Item entity TTL"
 msgstr "Bestaansduur van objecten"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Iterations"
-msgstr "Per soort"
+msgstr "Iteraties"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4294,16 +4129,18 @@ msgid "Joystick button repetition interval"
 msgstr "Joystick-knop herhalingsinterval"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr "Joystick dode zone"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Joystick frustrum gevoeligheid"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Joystick type"
-msgstr "Stuurknuppel Type"
+msgstr "Joystick type"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "W component of hypercomplex constant.\n"
@@ -4311,60 +4148,61 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Juliaverzameling: W-waarde van de 4D vorm. Heeft geen effect voor 3D-"
-"fractals.\n"
+"Alleen de Julia verzameling: \n"
+"W-waarde van de 4D vorm. \n"
+"Verandert de vorm van de fractal.\n"
+"Heeft geen effect voor 3D-fractals.\n"
 "Bereik is ongeveer -2 tot 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "X component of hypercomplex constant.\n"
 "Alters the shape of the fractal.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Juliaverzameling: X-waarde van de vorm.\n"
+"Allen de Julia verzameling: \n"
+"X-waarde van de 4D vorm.\n"
+"Verandert de vorm van de fractal.\n"
 "Bereik is ongeveer -2 tot 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "Y component of hypercomplex constant.\n"
 "Alters the shape of the fractal.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Juliaverzameling: Y-waarde van de vorm.\n"
+"Alleen de Julia verzameling: \n"
+"Y-waarde van de 4D vorm.\n"
+"Verandert de vorm van de fractal.\n"
 "Bereik is ongeveer -2 tot 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Julia set only.\n"
 "Z component of hypercomplex constant.\n"
 "Alters the shape of the fractal.\n"
 "Range roughly -2 to 2."
 msgstr ""
-"Juliaverzameling: Z-waarde van de vorm.\n"
+"Alleen de Julia verzameling: \n"
+"Z-waarde van de 4D vorm.\n"
+"Verandert de vorm van de fractal.\n"
 "Bereik is ongeveer -2 tot 2."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Julia w"
 msgstr "Julia w"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Julia x"
 msgstr "Julia x"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Julia y"
 msgstr "Julia y"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Julia z"
 msgstr "Julia z"
 
@@ -4398,6 +4236,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Toets voor graven.\n"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4423,8 +4271,7 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om het volume te verhogen.\n"
-"Zie\n"
-"http://irrlicht.sourceforge.net/docu/namespaceirr."
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
@@ -4448,7 +4295,6 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for moving the player backward.\n"
 "Will also disable autoforward, when active.\n"
@@ -4456,6 +4302,7 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Toets om de speler achteruit te bewegen.\n"
+"Zal ook het automatisch voortbewegen deactiveren, indien actief.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4510,13 +4357,12 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for opening the chat window to type local commands.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het chat-window te openen om commando's te typen.\n"
+"Toets om het chat-window te openen om lokale commando's te typen.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4541,288 +4387,272 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Toets voor plaatsen.\n"
+"Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 11de positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 12th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 12de positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 13th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 13de positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 14th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 14de positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 15th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 15de positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 16th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 16de positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 17th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 17de positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 18th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 18de positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 19th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 19de positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 20th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 20ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 21st hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 21ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 22nd hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 22ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 23rd hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 23ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 24th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 24ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 25th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 25ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 26th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 26ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 27th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 27ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 28th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 28ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 29th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 29ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 30th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 30ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 31st hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 32ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the 32nd hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 32ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the eighth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 8ste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the fifth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de vijfde positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the first hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de eerste positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the fourth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het vorige item in de hotbar te selecteren.\n"
+"Toets om de vierde positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4837,13 +4667,12 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the ninth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de negende positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4858,57 +4687,52 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the second hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de tweede positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the seventh hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de zevende positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the sixth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de zesde positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the tenth hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de 10de positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for selecting the third hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het volgende item in de hotbar te selecteren.\n"
+"Toets om de derde positie in de hotbar te selecteren.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4947,7 +4771,6 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling autoforward.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -5008,13 +4831,12 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling pitch move mode.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om 'noclip' modus aan/uit te schakelen.\n"
+"Toets om 'pitch move' modus aan/uit te schakelen.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -5030,7 +4852,6 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the display of chat.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -5051,7 +4872,6 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the display of fog.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -5072,13 +4892,12 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Key for toggling the display of the large chat console.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Toets om het tonen van chatberichten aan/uit te schakelen.\n"
+"Toets om het tonen van de grote chat weergave aan/uit te schakelen.\n"
 "Zie http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -5123,7 +4942,6 @@ msgid "Lake steepness"
 msgstr "Steilheid van meren"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lake threshold"
 msgstr "Meren-grenswaarde"
 
@@ -5148,9 +4966,8 @@ msgid "Large cave proportion flooded"
 msgstr "Grote grotaandeel overstroomd"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Large chat console key"
-msgstr "Console-toets"
+msgstr "Grote chatconsole-toets"
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
@@ -5174,26 +4991,23 @@ msgid "Left key"
 msgstr "Toets voor links"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of a server tick and the interval at which objects are generally "
 "updated over\n"
 "network."
 msgstr ""
-"Lengte van server stap, en interval waarin objecten via het netwerk ververst "
-"worden."
+"Lengte van server stap, en interval waarin objecten via het netwerk\n"
+"ververst worden."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of liquid waves.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
-"Bewegende bladeren staan aan indien 'true'.Dit vereist dat 'shaders' ook "
-"aanstaan."
+"Lengte van vloeibare golven.\n"
+"Dit vereist dat 'golfvloeistoffen' ook aanstaan."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of time between Active Block Modifier (ABM) execution cycles"
 msgstr ""
 "Tijdsinterval waarmee actieve blokken wijzigers (ABMs) geactiveerd worden"
@@ -5203,9 +5017,8 @@ msgid "Length of time between NodeTimer execution cycles"
 msgstr "Tijdsinterval waarmee node timerd geactiveerd worden"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Length of time between active block management cycles"
-msgstr "Tijd tussen ABM cycli"
+msgstr "Tijd tussen actieve blok beheer(ABM) cycli"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5293,7 +5106,6 @@ msgid "Liquid queue purge time"
 msgstr "Inkortingstijd vloeistof-wachtrij"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Liquid sinking"
 msgstr "Zinksnelheid in vloeistof"
 
@@ -5329,20 +5141,14 @@ msgid "Lower Y limit of dungeons."
 msgstr "Onderste Y-limiet van kerkers."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lower Y limit of floatlands."
-msgstr "Onderste Y-limiet van kerkers."
+msgstr "Onderste Y-limiet van zwevende eilanden."
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
 msgstr "Hoofdmenu script"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Hoofdmenu script"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5359,6 +5165,14 @@ msgid "Makes all liquids opaque"
 msgstr "Maak alle vloeistoffen ondoorzichtig"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr "Map compressie niveau voor het bewaren op de harde schijf"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr "Map compressie niveau voor netwerk transfert"
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Wereld map"
 
@@ -5367,29 +5181,22 @@ msgid "Map generation attributes specific to Mapgen Carpathian."
 msgstr "Wereldgeneratieattributen specifiek aan Mapgen Carpathian."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Flat.\n"
 "Occasional lakes and hills can be added to the flat world."
 msgstr ""
 "Wereldgenerator instellingen specifiek voor generator 'flat' (vlak).\n"
-"Verspreide meren en heuvels kunnen toegevoegd worden.\n"
-"Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
-"waarde.\n"
-"Zet \"no\" voor een vlag om hem expliciet uit te zetten."
+"Verspreide meren en heuvels kunnen toegevoegd worden."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Fractal.\n"
 "'terrain' enables the generation of non-fractal terrain:\n"
 "ocean, islands and underground."
 msgstr ""
-"Wereldgenerator instellingen specifiek voor generator 'flat' (vlak).\n"
-"Verspreide meren en heuvels kunnen toegevoegd worden.\n"
-"Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
-"waarde.\n"
-"Zet \"no\" voor een vlag om hem expliciet uit te zetten."
+"Wereldgenerator instellingen specifiek voor generator 'fractal'.\n"
+"\"terrein\" activeert de generatie van niet-fractale terreinen:\n"
+"oceanen, eilanden en ondergrondse ruimtes."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5412,7 +5219,6 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Wereldgenerator instellingen specifiek voor Mapgen V5."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
@@ -5420,23 +5226,22 @@ msgid ""
 "the 'jungles' flag is ignored."
 msgstr ""
 "Wereldgenerator instellingen specifiek voor generator v6.\n"
+"De sneeuwgebieden optie, activeert de nieuwe 5 vegetaties systeem.\n"
 "Indien sneeuwgebieden aanstaan, dan worden oerwouden ook aangezet, en wordt\n"
-"de \"jungles\" vlag genegeerd.\n"
-"Vlaggen die niet in de lijst van vlaggen staan, behouden hun standaard-"
-"waarde.\n"
-"Zet \"no\" voor een vlag om hem expliciet uit te zetten."
+"de \"jungles\" optie genegeerd."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "'ridges': Rivers.\n"
 "'floatlands': Floating land masses in the atmosphere.\n"
 "'caverns': Giant caves deep underground."
 msgstr ""
-"Kenmerken voor het genereren van kaarten die specifiek zijn voor Mapgen "
-"v7. \n"
-"'richels' maakt de rivieren mogelijk."
+"Wereldgenerator instellingen specifiek voor generator v7.\n"
+"'ridges': dit zijn uithollingen in het landschap die rivieren mogelijk "
+"maken.\n"
+"'floatlands': dit zijn zwevende landmassa's in de atmosfeer.\n"
+"'caverns': grote grotten diep onder de grond."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -5451,12 +5256,10 @@ msgid "Mapblock limit"
 msgstr "Max aantal wereldblokken"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapblock mesh generation delay"
-msgstr "Wereld-grens"
+msgstr "Mapblock maas generatie vertraging"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapblock mesh generator's MapBlock cache size in MB"
 msgstr "Mapblock maas generator's MapBlock cache grootte in MB"
 
@@ -5465,73 +5268,60 @@ msgid "Mapblock unload timeout"
 msgstr "Wereldblok vergeet-tijd"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Carpathian"
-msgstr "Fractal wereldgenerator"
+msgstr "wereldgenerator Karpaten"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Carpathian specific flags"
-msgstr "Vlaggen"
+msgstr "Wereldgenerator Karpaten specifieke opties"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Flat"
-msgstr "Vlakke Wereldgenerator"
+msgstr "Wereldgenerator vlak terrein"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Flat specific flags"
-msgstr "Vlaggen"
+msgstr "Wereldgenerator vlak terrein specifieke opties"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal"
-msgstr "Fractal wereldgenerator"
+msgstr "Wereldgenerator Fractal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal specific flags"
-msgstr "Vlaggen"
+msgstr "Wereldgenerator Fractal specifieke opties"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V5"
 msgstr "Wereldgenerator v5"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V5 specific flags"
-msgstr "Vlaggen"
+msgstr "Wereldgenerator v5 specifieke opties"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V6"
 msgstr "Wereldgenerator v6"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V6 specific flags"
-msgstr "Mapgen v6 Vlaggen"
+msgstr "Wereldgenerator v6 specifieke opties"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V7"
 msgstr "Wereldgenerator v7"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen V7 specific flags"
-msgstr "Mapgen v7 vlaggen"
+msgstr "Wereldgenerator v7 specifieke opties"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys"
 msgstr "Valleien Wereldgenerator"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Valleys specific flags"
-msgstr "Vlaggen"
+msgstr "Weredgenerator valleien specifieke opties"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen debug"
@@ -5552,8 +5342,8 @@ msgstr "Maximale afstand voor te versturen blokken"
 #: src/settings_translation_file.cpp
 msgid "Max liquids processed per step."
 msgstr ""
-"Maximaal aantal vloeistof-nodes te verwerken (dwz verspreiden)\n"
-"per server-stap."
+"Maximaal aantal vloeistof-nodes te verwerken (dwz verspreiden) per server-"
+"stap."
 
 #: src/settings_translation_file.cpp
 msgid "Max. clearobjects extra blocks"
@@ -5568,8 +5358,10 @@ msgid "Maximum FPS"
 msgstr "Maximum FPS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "Maximum FPS als het spel gepauzeerd is."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr ""
+"Maximum FPS als het venster niet gefocussed is, of wanneer het spel "
+"gepauzeerd is."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -5611,22 +5403,31 @@ msgid "Maximum number of blocks that can be queued for loading."
 msgstr "Maximaal aantal blokken in de wachtrij voor laden/genereren."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "This limit is enforced per player."
 msgstr ""
 "Maximaal aantal blokken in de wachtrij om gegenereerd te worden.\n"
-"Laat leeg om een geschikt aantal automatisch te laten berekenen."
+"Deze limiet is opgelegd per speler."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "This limit is enforced per player."
 msgstr ""
-"Maximaal aantal blokken in de wachtrij om van disk geladen te worden.\n"
-"Laat leeg om een geschikt aantal automatisch te laten berekenen."
+"Maximaal aantal blokken in de wachtrij om van een bestand/harde schijf "
+"geladen te worden.\n"
+"Deze limiet is opgelegd per speler."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+"Maximaal aantal gelijktijdige downloads. Downloads die deze limiet "
+"overschrijden zullen in de wachtrij geplaats worden.\n"
+"Deze instelling zou lager moeten zijn dan curl_parallel_limit."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
@@ -5729,7 +5530,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Minimal level of logging to be written to chat."
-msgstr ""
+msgstr "Minimaal aantal loggegevens in de chat weergeven."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
@@ -5752,9 +5553,8 @@ msgid "Minimum limit of random number of small caves per mapchunk."
 msgstr "Minimale limiet van willekeurig aantal kleine grotten per mapchunk."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Minimum texture size"
-msgstr "Minimale textuur-grootte voor filters"
+msgstr "Minimale textuur-grootte"
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
@@ -5777,18 +5577,16 @@ msgid "Monospace font size"
 msgstr "Vaste-breedte font grootte"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mountain height noise"
-msgstr "Heuvel-hoogte ruisparameters"
+msgstr "Berg-hoogte ruis"
 
 #: src/settings_translation_file.cpp
 msgid "Mountain noise"
 msgstr "Bergen ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mountain variation noise"
-msgstr "Heuvel-hoogte ruisparameters"
+msgstr "Berg-hoogte ruisvariatie"
 
 #: src/settings_translation_file.cpp
 msgid "Mountain zero level"
@@ -5897,19 +5695,10 @@ msgid "Noises"
 msgstr "Ruis"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Normal-maps bemonstering"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Sterkte van normal-maps"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Aantal 'emerge' threads"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Number of emerge threads to use.\n"
 "Value 0:\n"
@@ -5954,10 +5743,6 @@ msgstr ""
 "transactie), en geheugengebruik anderzijds (4096 = ca. 100MB)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Aantal parallax occlusie iteraties."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Online inhoud repository"
 
@@ -5989,36 +5774,6 @@ msgstr ""
 "een formspec geopend is."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-"Algemene afwijking van het parallax occlusie effect. Normaal: schaal/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Algemene schaal van het parallax occlusie effect."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Parallax occlusie"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Parallax occlusie afwijking"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Parallax occlusie iteraties"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Parallax occlusie modus"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "Parallax occlusie schaal"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -6039,6 +5794,9 @@ msgid ""
 "Path to save screenshots at. Can be an absolute or relative path.\n"
 "The folder will be created if it doesn't already exist."
 msgstr ""
+"Pad waar screenshots moeten bewaard worden. Kan een absoluut of relatief pad "
+"zijn.\n"
+"De map zal aangemaakt worden als ze nog niet bestaat."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6089,26 +5847,33 @@ msgstr "Pauzeer als venster focus verliest"
 #: src/settings_translation_file.cpp
 msgid "Per-player limit of queued blocks load from disk"
 msgstr ""
+"Per speler limiet van gevraagde blokken om te laden van de harde schijf"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Per-player limit of queued blocks to generate"
-msgstr "Emerge-wachtrij voor genereren"
+msgstr "Per speler limiet van de \"te genereren blokken\"-wachtrij"
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
 msgstr "Fysica"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Pitch move key"
-msgstr "Vliegen toets"
+msgstr "Vrij vliegen toets"
 
 #: src/settings_translation_file.cpp
 msgid "Pitch move mode"
 msgstr "Pitch beweeg modus"
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr "Plaats toets"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr "Plaats (Rechts-klik) herhalingsinterval"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -6125,9 +5890,8 @@ msgid "Player transfer distance"
 msgstr "Speler verplaatsingsafstand"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Player versus player"
-msgstr "Speler-gevechten"
+msgstr "Speler tegen speler"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6152,13 +5916,12 @@ msgstr ""
 "Voorkom dat mods onveilige commando's uitvoeren, zoals shell commando's."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Print the engine's profiling data in regular intervals (in seconds).\n"
 "0 = disable. Useful for developers."
 msgstr ""
-"Interval waarmee profiler-gegevens geprint worden. 0 = uitzetten. Dit is "
-"nuttig voor ontwikkelaars."
+"Interval waarmee profiler-gegevens geprint worden. \n"
+"0 = uitzetten. Dit is nuttig voor ontwikkelaars."
 
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
@@ -6178,7 +5941,7 @@ msgstr "Profileren"
 
 #: src/settings_translation_file.cpp
 msgid "Prometheus listener address"
-msgstr ""
+msgstr "Adres om te luisteren naar Prometheus"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6187,6 +5950,10 @@ msgid ""
 "enable metrics listener for Prometheus on that address.\n"
 "Metrics can be fetch on http://127.0.0.1:30000/metrics"
 msgstr ""
+"Adres om te luisteren naar Prometheus.\n"
+"Als Minetest is gecompileerd met de optie ENABLE_PROMETHEUS,\n"
+"zal dit adres gebruikt worden om naar Prometheus te luisteren.\n"
+"Meetwaarden zullen kunnen bekeken worden op http://127.0.0.1:30000/metrics"
 
 #: src/settings_translation_file.cpp
 msgid "Proportion of large caves that contain liquid."
@@ -6218,9 +5985,8 @@ msgid "Recent Chat Messages"
 msgstr "Recente chatberichten"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Regular font path"
-msgstr "Rapport pad"
+msgstr "Standaard lettertype pad"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
@@ -6274,34 +6040,26 @@ msgstr ""
 "READ_PLAYERINFO: 32 (deactiveer get_player_names call client-side)"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ridge mountain spread noise"
-msgstr "Onderwater richel ruis"
+msgstr "\"Berg richel verspreiding\" ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ridge noise"
-msgstr "Rivier ruis parameters"
+msgstr "Bergtoppen ruis"
 
 #: src/settings_translation_file.cpp
 msgid "Ridge underwater noise"
 msgstr "Onderwater richel ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Ridged mountain size noise"
-msgstr "Onderwater richel ruis"
+msgstr "Bergtoppen grootte ruis"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
 msgstr "Toets voor rechts"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Rechts-klik herhalingsinterval"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River channel depth"
 msgstr "Diepte van rivieren"
 
@@ -6310,24 +6068,20 @@ msgid "River channel width"
 msgstr "Breedte van rivieren"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River depth"
 msgstr "Diepte van rivieren"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River noise"
-msgstr "Rivier ruis parameters"
+msgstr "Rivier ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River size"
 msgstr "Grootte van rivieren"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River valley width"
-msgstr "Diepte van rivieren"
+msgstr "Breedte van vallei waar een rivier stroomt"
 
 #: src/settings_translation_file.cpp
 msgid "Rollback recording"
@@ -6366,7 +6120,6 @@ msgid "Saving map received from server"
 msgstr "Lokaal bewaren van de server-wereld"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Scale GUI by a user specified value.\n"
 "Use a nearest-neighbor-anti-alias filter to scale the GUI.\n"
@@ -6374,7 +6127,7 @@ msgid ""
 "pixels when scaling down, at the cost of blurring some\n"
 "edge pixels when images are scaled by non-integer sizes."
 msgstr ""
-"Schaal de GUI met een bepaalde factor.\n"
+"Schaal de GUI met een door de gebruiker bepaalde factor.\n"
 "Er wordt een dichtste-buur-anti-alias filter gebruikt om de GUI te schalen.\n"
 "Bij verkleinen worden sommige randen minder duidelijk, en worden\n"
 "pixels samengevoegd. Pixels bij randen kunnen vager worden als\n"
@@ -6415,21 +6168,19 @@ msgid "Seabed noise"
 msgstr "Zeebodem ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Second of 4 2D noises that together define hill/mountain range height."
-msgstr "Tweede van 2 3d geluiden voor tunnels."
+msgstr ""
+"Tweede van vier 2D geluiden die samen een heuvel/bergketen grootte bepalen."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Second of two 3D noises that together define tunnels."
-msgstr "Tweede van 2 3d geluiden voor tunnels."
+msgstr "Tweede van twee 3D geluiden die samen tunnels definiëren."
 
 #: src/settings_translation_file.cpp
 msgid "Security"
 msgstr "Veiligheid"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
 msgstr "Zie http://www.sqlite.org/pragma.html#pragma_synchronous"
 
@@ -6446,7 +6197,6 @@ msgid "Selection box width"
 msgstr "Breedte van selectie-randen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Selects one of 18 fractal types.\n"
 "1 = 4D \"Roundy\" Mandelbrot set.\n"
@@ -6468,7 +6218,7 @@ msgid ""
 "17 = 4D \"Mandelbulb\" Mandelbrot set.\n"
 "18 = 4D \"Mandelbulb\" Julia set."
 msgstr ""
-"Keuze uit 18 fractals op basis van 9 formules.\n"
+"Selecteert één van de 18 fractaal types:\n"
 "1 = 4D \"Roundy\" mandelbrot verzameling.\n"
 "2 = 4D \"Roundy\" julia verzameling.\n"
 "3 = 4D \"Squarry\" mandelbrot verzameling.\n"
@@ -6537,37 +6287,34 @@ msgid "Set the maximum character length of a chat message sent by clients."
 msgstr "Maximaal aantal tekens voor chatberichten van gebruikers instellen."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving leaves.\n"
 "Requires shaders to be enabled."
 msgstr ""
-"Bewegende bladeren staan aan indien 'true'.Dit vereist dat 'shaders' ook "
-"aanstaan."
+"Bewegende bladeren staan aan indien 'true'.\n"
+"Dit vereist dat 'shaders' ook aanstaan."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving liquids (like water).\n"
 "Requires shaders to be enabled."
 msgstr ""
-"Golvend water staat aan indien 'true'Dit vereist dat 'shaders' ook aanstaan."
+"Golvend water staat aan indien 'true'.\n"
+"Dit vereist dat 'shaders' ook aanstaan."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving plants.\n"
 "Requires shaders to be enabled."
 msgstr ""
-"Bewegende planten staan aan indien 'true'Dit vereist dat 'shaders' ook "
-"aanstaan."
+"Bewegende planten staan aan indien 'true'.\n"
+"Dit vereist dat 'shaders' ook aanstaan."
 
 #: src/settings_translation_file.cpp
 msgid "Shader path"
 msgstr "Shader pad"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shaders allow advanced visual effects and may increase performance on some "
 "video\n"
@@ -6579,18 +6326,20 @@ msgstr ""
 "Alleen mogelijk met OpenGL."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shadow offset (in pixels) of the default font. If 0, then shadow will not be "
 "drawn."
-msgstr "Fontschaduw afstand. Indien 0, dan wordt geen schaduw getekend."
+msgstr ""
+"Fontschaduw afstand (in beeldpunten). Indien 0, dan wordt geen schaduw "
+"getekend."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shadow offset (in pixels) of the fallback font. If 0, then shadow will not "
 "be drawn."
-msgstr "Fontschaduw afstand. Indien 0, dan wordt geen schaduw getekend."
+msgstr ""
+"Fontschaduw afstand van het standaard lettertype (in beeldpunten). Indien 0, "
+"dan wordt geen schaduw getekend."
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
@@ -6605,6 +6354,19 @@ msgid "Show entity selection boxes"
 msgstr "Toon selectie-box voor objecten"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Toon selectievakjes voor entiteiten\n"
+"Een herstart is noodzakelijk om de wijziging te activeren."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Standaard vetgedrukt"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Afsluitbericht van server"
 
@@ -6637,9 +6399,8 @@ msgstr ""
 "wordt gekopieerd waardoor flikkeren verminderd."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Slice w"
-msgstr "Slice w"
+msgstr "Doorsnede w"
 
 #: src/settings_translation_file.cpp
 msgid "Slope and fill work together to modify the heights."
@@ -6700,14 +6461,12 @@ msgid "Sound"
 msgstr "Geluid"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Special key"
-msgstr "Sluipen toets"
+msgstr "Speciaal ( Aux ) toets"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Special key for climbing/descending"
-msgstr "Gebruik de 'gebruiken'-toets voor klimmen en dalen"
+msgstr "Gebruik de 'speciaal'-toets voor klimmen en dalen"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6728,6 +6487,9 @@ msgid ""
 "Note that mods or games may explicitly set a stack for certain (or all) "
 "items."
 msgstr ""
+"Bepaalt de standaard stack grootte van nodes, items en tools.\n"
+"Merk op dat mods of spellen expliciet een stack kunnen maken voor sommige "
+"(of alle) items."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6748,23 +6510,16 @@ msgid "Steepness noise"
 msgstr "Steilte ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Step mountain size noise"
-msgstr "Bergen ruis"
+msgstr "Trap-Bergen grootte ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Step mountain spread noise"
-msgstr "Bergen ruis"
+msgstr "Trap-Bergen verspreiding ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Strength of 3D mode parallax."
-msgstr "Sterkte van de parallax."
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Sterkte van de normal-maps."
+msgstr "Sterkte van de 3D modus parallax."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6797,6 +6552,22 @@ msgid ""
 "server-intensive extreme water flow and to avoid vast flooding of the\n"
 "world surface below."
 msgstr ""
+"Oppervlaktehoogte van optioneel water, geplaatst op een vaste laag van een "
+"zwevend eiland.\n"
+"Water is standaard uitgeschakeld en zal enkel gemaakt worden als deze waarde "
+"is gezet op \n"
+"een waarde groter dan 'mgv7_floatland_ymax' - 'mgv7_floatland_taper' (het "
+"begin van de\n"
+"bovenste afschuining).\n"
+"***WAARSCHUWING, MOGELIJK GEVAAR VOOR WERELDEN EN SERVER PERFORMANTIE***:\n"
+"Als er water geplaatst wordt op zwevende eilanden, dan moet dit "
+"geconfigureerd en getest worden,\n"
+"dat het een vaste laag betreft met de instelling 'mgv7_floatland_density' op "
+"2.0 (of andere waarde\n"
+"afhankelijk van de waarde 'mgv7_np_floatland'), om te vermijden \n"
+"dat er server-intensieve water verplaatsingen zijn en om ervoor te zorgen "
+"dat het wereld oppervlak \n"
+"eronder niet overstroomt."
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -6807,29 +6578,24 @@ msgid "Temperature variation for biomes."
 msgstr "Temperatuurvariatie voor biomen."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain alternative noise"
-msgstr "Terrain_alt ruis"
+msgstr "Terrein alteratieve ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain base noise"
-msgstr "Terrein hoogte"
+msgstr "Terrein basis ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain height"
 msgstr "Terrein hoogte"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain higher noise"
-msgstr "Terrein hoogte"
+msgstr "Terrein hoger ruis"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain noise"
-msgstr "Terrein hoogte"
+msgstr "Terrein ruis"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6884,6 +6650,10 @@ msgid "The URL for the content repository"
 msgstr "De URL voor de inhoudsrepository"
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr "De dode zone van de stuurknuppel die u gebruikt"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6939,7 +6709,6 @@ msgstr ""
 "van beschikbare voorrechten op de server."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The radius of the volume of blocks around every player that is subject to "
 "the\n"
@@ -6955,7 +6724,7 @@ msgstr ""
 "In actieve blokken worden objecten geladen en ABM's uitgevoerd. \n"
 "Dit is ook het minimumbereik waarin actieve objecten (mobs) worden "
 "onderhouden. \n"
-"Dit moet samen met active_object_range worden geconfigureerd."
+"Dit moet samen met active_object_send_range_blocks worden geconfigureerd."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6963,15 +6732,16 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "De rendering back-end voor Irrlicht. \n"
 "Na het wijzigen hiervan is een herstart vereist. \n"
 "Opmerking: op Android, blijf bij OGLES1 als je het niet zeker weet! Anders "
 "start de app mogelijk niet. \n"
-"Op andere platforms wordt OpenGL aanbevolen en het is de enige driver met \n"
-"shader-ondersteuning momenteel."
+"Op andere platformen wordt OpenGL aanbevolen.\n"
+"OpenGL (alleen op desktop pc) en OGLES2 (experimenteel), zijn de enige "
+"drivers met shader-ondersteuning momenteel"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7006,20 +6776,27 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+"Het tijdsbudget dat toegestaan wordt aan ABM's om elke stap uit te voeren\n"
+"(als een deel van het ABM interval)"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
-"De tijd in seconden tussen herhaalde klikken als de joystick-knop ingedrukt "
-"gehouden wordt."
+"De tijd in seconden tussen herhaalde klikken als de joystick-knop\n"
+" ingedrukt gehouden wordt."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
-"De tijd in seconden tussen herhaalde rechts-klikken als de rechter muisknop\n"
+"De tijd in seconden tussen herhaalde rechts-klikken als de plaats knop "
+"(rechter muisknop)\n"
 "ingedrukt gehouden wordt."
 
 #: src/settings_translation_file.cpp
@@ -7039,9 +6816,10 @@ msgstr ""
 "'altitude_dry' is ingeschakeld."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Third of 4 2D noises that together define hill/mountain range height."
-msgstr "Eerste van 2 3D geluiden voor tunnels."
+msgstr ""
+"Derde van vier 2D geluiden die samen voor heuvel/bergketens hoogte "
+"definiëren."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7091,9 +6869,8 @@ msgid "Tooltip delay"
 msgstr "Tooltip tijdsduur"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touch screen threshold"
-msgstr "Strand geluid grenswaarde"
+msgstr "Gevoeligheid van het aanraakscherm"
 
 #: src/settings_translation_file.cpp
 msgid "Trees noise"
@@ -7104,14 +6881,13 @@ msgid "Trilinear filtering"
 msgstr "Tri-Lineare Filtering"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "True = 256\n"
 "False = 128\n"
 "Usable to make minimap smoother on slower machines."
 msgstr ""
-"Aan = 256\n"
-"Uit = 128\n"
+"True = 256\n"
+"False = 128\n"
 "Gebruik dit om de mini-kaart sneller te maken op langzamere machines."
 
 #: src/settings_translation_file.cpp
@@ -7127,7 +6903,6 @@ msgid "Undersampling"
 msgstr "Rendering"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Undersampling is similar to using a lower screen resolution, but it applies\n"
 "to the game world only, keeping the GUI intact.\n"
@@ -7138,8 +6913,9 @@ msgstr ""
 "Onderbemonstering is gelijkaardig aan het gebruik van een lagere "
 "schermresolutie,\n"
 "maar het behelst enkel de spel wereld. De GUI resolutie blijft intact.\n"
-"Dit zou een gewichtige prestatie verbetering moeten geven ten koste van een "
-"verminderde detailweergave."
+"Dit zou een duidelijke prestatie verbetering moeten geven ten koste van een "
+"verminderde detailweergave.\n"
+"Hogere waarden resulteren in een minder gedetailleerd beeld."
 
 #: src/settings_translation_file.cpp
 msgid "Unlimited player transfer distance"
@@ -7154,9 +6930,8 @@ msgid "Upper Y limit of dungeons."
 msgstr "Bovenste Y-limiet van kerkers."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Upper Y limit of floatlands."
-msgstr "Bovenste Y-limiet van kerkers."
+msgstr "Bovenste Y-limiet van zwevende eilanden."
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
@@ -7186,6 +6961,25 @@ msgstr ""
 "Gamma-correcte verkleining wordt niet ondersteund."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+"Gebruik multi-sample anti-aliasing (MSAA) om de randen van de blokken glad "
+"te maken.\n"
+"Dit algoritme maakt de 3D viewport glad en houdt intussen het beeld scherp,\n"
+"zonder de binnenkant van de texturen te wijzigen\n"
+"(wat erg opvalt bij transparante texturen)\n"
+"Zichtbare ruimtes verschijnen tussen nodes als de shaders uitgezet zijn.\n"
+"Als de waarde op 0 staat, is MSAA uitgeschakeld.\n"
+"Een herstart is nodig om deze wijziging te laten functioneren."
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Gebruik tri-lineaire filtering om texturen te schalen."
 
@@ -7194,27 +6988,22 @@ msgid "VBO"
 msgstr "VBO"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "VSync"
-msgstr "V-Sync"
+msgstr "Vertikale synchronisatie (VSync)"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley depth"
 msgstr "Vallei-diepte"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley fill"
 msgstr "Vallei-vulling"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley profile"
 msgstr "Vallei-profiel"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley slope"
 msgstr "Vallei-helling"
 
@@ -7251,9 +7040,8 @@ msgstr ""
 "Definieert de 'persistence' waarde voor terrain_base en terrain_alt ruis."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Varies steepness of cliffs."
-msgstr "Bepaalt steilheid/hoogte van heuvels."
+msgstr "Bepaalt steilheid/hoogte van kliffen."
 
 #: src/settings_translation_file.cpp
 msgid "Vertical climbing speed, in nodes per second."
@@ -7268,9 +7056,8 @@ msgid "Video driver"
 msgstr "Video driver"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "View bobbing factor"
-msgstr "Loopbeweging"
+msgstr "Loopbeweging factor"
 
 #: src/settings_translation_file.cpp
 msgid "View distance in nodes."
@@ -7301,16 +7088,14 @@ msgid "Volume"
 msgstr "Geluidsniveau"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
-"Schakelt parallax occlusie mappen in.\n"
-"Dit vereist dat shaders ook aanstaan."
+"Volume van alle geluiden.\n"
+"Dit vereist dat het geluidssysteem aanstaat."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "W coordinate of the generated 3D slice of a 4D fractal.\n"
 "Determines which 3D slice of the 4D shape is generated.\n"
@@ -7320,6 +7105,7 @@ msgid ""
 msgstr ""
 "W-coördinaat van de 3D doorsnede van de 4D vorm.\n"
 "Bepaalt welke 3D-doorsnelde van de 4D-vorm gegenereerd wordt.\n"
+"Verandert de vorm van de fractal.\n"
 "Heeft geen effect voor 3D-fractals.\n"
 "Bereik is ongeveer -2 tot 2."
 
@@ -7352,24 +7138,20 @@ msgid "Waving leaves"
 msgstr "Bewegende bladeren"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids"
-msgstr "Bewegende nodes"
+msgstr "Bewegende vloeistoffen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave height"
-msgstr "Golfhoogte van water"
+msgstr "Golfhoogte van water/vloeistoffen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave speed"
-msgstr "Golfsnelheid van water"
+msgstr "Golfsnelheid van water/vloeistoffen"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wavelength"
-msgstr "Golflengte van water"
+msgstr "Golflengte van water/vloeistoffen"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
@@ -7400,7 +7182,6 @@ msgstr ""
 "terug naar het werkgeheugen."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "When using bilinear/trilinear/anisotropic filters, low-resolution textures\n"
 "can be blurred, so automatically upscale them with nearest-neighbor\n"
@@ -7422,15 +7203,27 @@ msgstr ""
 "machten van 2 te gebruiken. Een waarde groter dan 1 heeft wellicht geen "
 "zichtbaar\n"
 "effect indien bi-lineaire, tri-lineaire of anisotropische filtering niet aan "
-"staan."
+"staan.\n"
+"Dit wordt ook gebruikt als basis node textuurgrootte voor wereld-"
+"gealigneerde\n"
+"automatische textuurschaling."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Whether FreeType fonts are used, requires FreeType support to be compiled "
 "in.\n"
 "If disabled, bitmap and XML vectors fonts are used instead."
-msgstr "Gebruik freetype fonts. Dit vereist dat freetype ingecompileerd is."
+msgstr ""
+"Gebruik freetype lettertypes, dit vereist dat freetype lettertype "
+"ondersteuning ingecompileerd is.\n"
+"Indien uitgeschakeld, zullen bitmap en XML verctor lettertypes gebruikt "
+"worden."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
@@ -7462,19 +7255,18 @@ msgstr ""
 "Maak het einde van het zichtbereik mistig, zodat het einde niet opvalt."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Whether to mute sounds. You can unmute sounds at any time, unless the\n"
 "sound system is disabled (enable_sound=false).\n"
 "In-game, you can toggle the mute state with the mute key or by using the\n"
 "pause menu."
 msgstr ""
-"Of geluiden moeten worden gedempt. U kunt het dempen van geluiden op elk "
-"moment opheffen, tenzij de \n"
+"Of geluiden moeten worden gedempt. Je kan het dempen van geluiden op elk "
+"moment opheffen, tenzij het \n"
 "geluidssysteem is uitgeschakeld (enable_sound = false). \n"
-"In de game kun je de mute-status wijzigen met de mute-toets of door de te "
-"gebruiken \n"
-"pauzemenu."
+"Tijdens het spel kan je de mute-status wijzigen met de mute-toets of door "
+"het pauzemenu \n"
+"te gebruiken."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7488,9 +7280,10 @@ msgid "Width component of the initial window size."
 msgstr "Aanvangsbreedte van het venster."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Width of the selection box lines around nodes."
-msgstr "Breedte van de lijnen om een geselecteerde node."
+msgstr ""
+"Breedte van de selectie-lijnen die getekend worden rond een geselecteerde "
+"node."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7512,9 +7305,8 @@ msgstr ""
 "gestart."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "World start time"
-msgstr "Wereld naam"
+msgstr "Wereld starttijd"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7551,9 +7343,8 @@ msgstr ""
 "bergen verticaal te verschuiven."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Y of upper limit of large caves."
-msgstr "Minimale diepte van grote semi-willekeurige grotten."
+msgstr "bovenste limiet Y-waarde van grote grotten."
 
 #: src/settings_translation_file.cpp
 msgid "Y-distance over which caverns expand to full size."
@@ -7566,6 +7357,13 @@ msgid ""
 "For a solid floatland layer, this controls the height of hills/mountains.\n"
 "Must be less than or equal to half the distance between the Y limits."
 msgstr ""
+"Y-afstand over dewelke de zwevende eilanden veranderen van volledige "
+"densiteit naar niets.\n"
+"De verandering start op deze afstand van de Y limiet.\n"
+"Voor een solide zwevend eiland, bepaalt deze waarde de hoogte van de heuvels/"
+"bergen.\n"
+"Deze waarde moet lager zijn of gelijk aan de helft van de afstand tussen de "
+"Y limieten."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of average terrain surface."
@@ -7576,20 +7374,48 @@ msgid "Y-level of cavern upper limit."
 msgstr "Y-niveau van hoogste limiet voor grotten."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Y-level of higher terrain that creates cliffs."
-msgstr "Y-niveau van lager terrein en vijver bodems."
+msgstr "Y-niveau van hoger terrein dat kliffen genereert."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Y-level of lower terrain and seabed."
-msgstr "Y-niveau van lager terrein en vijver bodems."
+msgstr "Y-niveau van lager terrein en vijver/zee bodems."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of seabed."
 msgstr "Y-niveau van zee bodem."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Zlib compressie niveau om mapblokken op de harde schijf te bewaren.\n"
+"-1: Zlib's standaard compressie niveau\n"
+"0: geen compressie, snelst\n"
+"9: maximale compressie, traagst\n"
+"(niveau's 1 tot 3 gebruiken Zlib's snelle methode, 4 tot 9 gebruiken de "
+"normale methode)"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Zlib compressie niveau om mapblokken te versturen naar de client.\n"
+"-1: Zlib's standaard compressie niveau\n"
+"0: geen compressie, snelst\n"
+"9: maximale compressie, traagst\n"
+"(niveau's 1 tot 3 gebruiken Zlib's snelle methode, 4 tot 9 gebruiken de "
+"normale methode)"
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "timeout voor cURL download"
 
@@ -7601,23 +7427,12 @@ msgstr "Maximaal parallellisme in cURL"
 msgid "cURL timeout"
 msgstr "cURL time-out"
 
-#~ msgid "Ok"
-#~ msgstr "Oké"
-
-#~ msgid "Back"
-#~ msgstr "Terug"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "$1 wordt gedownload, een ogenblik geduld alstublieft..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Emerge-wachtrij voor lezen"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Parallax occlusie sterkte"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Pad waar screenshots bewaard worden."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = parallax occlusie met helling-informatie (sneller).\n"
+#~ "1 = 'reliëf mapping' (lanzamer, nauwkeuriger)."
 
 #, fuzzy
 #~ msgid ""
@@ -7629,6 +7444,39 @@ msgstr "cURL time-out"
 #~ "Deze instelling wordt enkel gebruikt door de cliënt, en wordt genegeerd "
 #~ "door de server."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Weet je zeker dat je jouw wereld wilt resetten?"
+
+#~ msgid "Back"
+#~ msgstr "Terug"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Bumpmapping"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bumpmapping"
+
+#~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Verandert de gebruikersinterface van het hoofdmenu: \n"
+#~ "- Volledig: meerdere werelden voor één speler, spelkeuze, de kiezer van "
+#~ "textuurpak, etc. \n"
+#~ "- Eenvoudig: één wereld voor één speler, geen game- of texture pack-"
+#~ "kiezers. Kan zijn \n"
+#~ "noodzakelijk voor kleinere schermen."
+
+#~ msgid "Config mods"
+#~ msgstr "Mods configureren"
+
+#~ msgid "Configure"
+#~ msgstr "Instellingen"
+
 #, fuzzy
 #~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
@@ -7641,6 +7489,9 @@ msgstr "cURL time-out"
 #~ msgstr ""
 #~ "Bepaalt breedte van tunnels, een kleinere waarde maakt bredere tunnels."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Draadkruis-kleur (R,G,B)."
+
 #, fuzzy
 #~ msgid "Darkness sharpness"
 #~ msgstr "Steilheid Van de meren"
@@ -7652,12 +7503,57 @@ msgstr "cURL time-out"
 #~ "Bepaalt gebieden van drijvend glijdend terrein.\n"
 #~ "Drijvend glijdend terrein ontstaat wanneer ruis > 0."
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Bemonsterings-interval voor texturen.\n"
+#~ "Een hogere waarde geeft vloeiender normal maps."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "$1 wordt gedownload, een ogenblik geduld alstublieft..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "VBO aanzetten"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Bumpmapping aanzetten voor texturen. Normalmaps moeten al in de texture "
+#~ "pack zitten\n"
+#~ "of ze moeten automatisch gegenereerd worden.\n"
+#~ "Schaduwen moeten aanstaan."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Schakelt filmisch tone-mapping in"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Schakelt het genereren van normal maps in (emboss effect).\n"
+#~ "Dit vereist dat bumpmapping ook aan staat."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Schakelt parallax occlusie mappen in.\n"
+#~ "Dit vereist dat shaders ook aanstaan."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Experimentele optie. Kan bij een waarde groter dan 0 zichtbare\n"
+#~ "ruimtes tussen blokken tot gevolg hebben."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS in het pauze-menu"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Drijvend land basis hoogte ruis"
 
@@ -7671,6 +7567,12 @@ msgstr "cURL time-out"
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Genereer normale werelden"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Genereer normaalmappen"
+
 #~ msgid "IPv6 support."
 #~ msgstr "IPv6 ondersteuning."
 
@@ -7678,15 +7580,101 @@ msgstr "cURL time-out"
 #~ msgid "Lava depth"
 #~ msgstr "Diepte van grote grotten"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Emerge-wachtrij voor lezen"
+
+#~ msgid "Main"
+#~ msgstr "Hoofdmenu"
+
+#~ msgid "Main menu style"
+#~ msgstr "Hoofdmenu stijl"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Mini-kaart in radar modus, Zoom x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Mini-kaart in radar modus, Zoom x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Minimap in oppervlaktemodus, Zoom x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Minimap in oppervlaktemodus, Zoom x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Naam / Wachtwoord"
+
+#~ msgid "No"
+#~ msgstr "Nee"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Normal-maps bemonstering"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Sterkte van normal-maps"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Aantal parallax occlusie iteraties."
+
+#~ msgid "Ok"
+#~ msgstr "Oké"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr ""
+#~ "Algemene afwijking van het parallax occlusie effect. Normaal: schaal/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Algemene schaal van het parallax occlusie effect."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax occlusie"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Parallax occlusie"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Parallax occlusie afwijking"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Parallax occlusie iteraties"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Parallax occlusie modus"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Parallax occlusie schaal"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Parallax occlusie sterkte"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Pad van TrueType font of bitmap."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Pad waar screenshots bewaard worden."
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Reset Singleplayer wereld"
+
+#, fuzzy
+#~ msgid "Select Package File:"
+#~ msgstr "Selecteer Modbestand:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Schaduw limiet"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Start Singleplayer"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Sterkte van de normal-maps."
+
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Dit font wordt gebruikt voor bepaalde talen."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Cinematic modus aan/uit"
+
 #, fuzzy
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
@@ -7698,22 +7686,24 @@ msgstr "cURL time-out"
 #~ msgstr ""
 #~ "Variatie van de heuvel hoogte en vijver diepte op drijvend egaal terrein."
 
+#~ msgid "View"
+#~ msgstr "Bekijk"
+
+#~ msgid "Waving Water"
+#~ msgstr "Golvend water"
+
 #~ msgid "Waving water"
 #~ msgstr "Golvend water"
 
+#, fuzzy
+#~ msgid "Y of upper limit of lava in large caves."
+#~ msgstr "Minimale diepte van grote semi-willekeurige grotten."
+
 #~ msgid "Y-level of floatland midpoint and lake surface."
 #~ msgstr "Y-niveau van drijvend land middelpunt en vijver oppervlak."
 
 #~ msgid "Y-level to which floatland shadows extend."
 #~ msgstr "Y-niveau tot waar de schaduw van drijvend land reikt."
 
-#~ msgid "Waving Water"
-#~ msgstr "Golvend water"
-
-#, fuzzy
-#~ msgid "Y of upper limit of lava in large caves."
-#~ msgstr "Minimale diepte van grote semi-willekeurige grotten."
-
-#, fuzzy
-#~ msgid "Select Package File:"
-#~ msgstr "Selecteer Modbestand:"
+#~ msgid "Yes"
+#~ msgstr "Ja"
diff --git a/po/nn/minetest.po b/po/nn/minetest.po
index 73f8d9067..4ad47fbf8 100644
--- a/po/nn/minetest.po
+++ b/po/nn/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Norwegian Nynorsk (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-03-31 10:14+0000\n"
-"Last-Translator: sfan5 <sfan5@live.de>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-20 05:50+0000\n"
+"Last-Translator: Tor Egil Hoftun Kvæstad <toregilhk@hotmail.com>\n"
 "Language-Team: Norwegian Nynorsk <https://hosted.weblate.org/projects/"
 "minetest/minetest/nn/>\n"
 "Language: nn\n"
@@ -12,16 +12,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.0-dev\n"
+"X-Generator: Weblate 4.5\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Du har kome at"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Du døydde"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
-#, fuzzy
 msgid "An error occurred in a Lua script:"
-msgstr "Ein feil har skjedd med eit Lua manus, slik som ein mod:"
+msgstr "Ein feil oppstod i eit LUA-skript:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred:"
@@ -33,15 +40,11 @@ msgstr "Hovudmeny"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr "Kople attende sambandet"
+msgstr "Kople til igjen"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr "Tenarmaskinen ber om å få forbindelsen attende:"
-
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Laster ned..."
+msgstr "Tenaren har førespurt å kople til igjen:"
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
@@ -49,27 +52,22 @@ msgstr "Protkoll versjon bommert. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr "Tenarmaskinen krevjar protokoll versjon $1. "
+msgstr "Tenaren krev protokoll versjon $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr "Tenarmaskinen støttar protokoll versjonar mellom $1 og $2. "
-
-#: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Forsøkje å kople attende den offentlege tenarmaskin-lista og sjekk sambands "
-"koplingen."
+msgstr "Tenaren støtter protokollversjonar mellom $1 og $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr "Vi støttar berre protokoll versjon $1."
+msgstr "Me støtter berre protokoll versjon $1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr "Vi støttar protokoll versjonar mellom $1 og $2."
+msgstr "Me støtter protokollversjonar mellom $1 og $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -79,68 +77,66 @@ msgstr "Vi støttar protokoll versjonar mellom $1 og $2."
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Avhengigheiter:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
-msgstr "Deaktiver allt"
+msgstr "Deaktiver alt"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr "Deaktivere modifikasjons-pakka"
+msgstr "Deaktiver modifikasjonspakken"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
-msgstr "Aktiver allt"
+msgstr "Aktiver alt"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr "Aktiver modifikasjons-pakka"
+msgstr "Aktiver modifikasjonspakken"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "characters [a-z0-9_] are allowed."
 msgstr ""
-"Fåfengt å aktivere modifikasjon \"$1\" sia den innehald ugyldige teikn. "
-"Berre teikna [a-z0-9_] e tillaten."
+"Klarte ikkje å aktivere modifikasjon «$1», då den inneheld ugyldige teikn. "
+"Berre teikna [a-z0-9_] er tillatne."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "Finn fleire modifikasjonar"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
 msgstr "Modifikasjon:"
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No (optional) dependencies"
-msgstr "Valgbare avhengigheiter:"
+msgstr "Ingen (valfrie) avhengigheiter"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No game description provided."
 msgstr "Ikkje nokon spill skildring e sørgja for."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No hard dependencies"
-msgstr "Ikkje nokon avhengigheiter."
+msgstr "Ingen obligatoriske avhengigheiter"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
 msgstr "Ikkje noko modifikasjons-pakke skildring e sørgja for."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No optional dependencies"
-msgstr "Valgbare avhengigheiter:"
+msgstr "Ingen valfrie avhengigheiter"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
-msgstr "Valgbare avhengigheiter:"
+msgstr "Valfrie avhengigheiter:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/gui/guiKeyChangeMenu.cpp
@@ -149,23 +145,61 @@ msgstr "Lagre"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "World:"
-msgstr "Verda:"
+msgstr "Verd:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
-msgstr "Aktivert"
+msgstr "aktivert"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "«$1» eksisterer allereie. Vil du overskrive den?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$1 og $2 avhengigheiter vil verte installerte."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 lastar ned …"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 obligatoriske avhengigheiter vart ikkje funne."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 vil verte installert, og $2 avhengigheiter vil verte hoppa over."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Alle pakker"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Allereie installert"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Attende til hovudmeny"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Basisspel:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB er ikkje tilgjengeleg når Minetest vart kompilert utan cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
@@ -174,7 +208,7 @@ msgstr "Laster ned..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
-msgstr "Fåfengt å laste ned $1"
+msgstr "Klarte ikkje å laste ned $1"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -186,22 +220,45 @@ msgid "Install"
 msgstr "Installer"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "Installer $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Installer manglande avhengigheiter"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
-msgstr "Modder"
+msgstr "Modifikasjonar"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No packages could be retrieved"
-msgstr "Ikkje nokon pakkar kunne bli henta"
+msgstr "Ingen pakkar kunne verte henta"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No results"
-msgstr "Ikkje noko resultat"
+msgstr "Ingen resultat"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Søk"
+msgid "No updates"
+msgstr "Ingen oppdateringar"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Ikkje funnen"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Overskriv"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Ver venleg å sjekke at basisspelet er korrekt."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -216,16 +273,20 @@ msgid "Update"
 msgstr "Oppdater"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr ""
+msgid "Update All [$1]"
+msgstr "Oppdater alt [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Sjå meir informasjon i ein nettlesar"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr "Ein verd med namnet \"$1\" finns allereie"
+msgstr "Ein verd med namnet «$1» eksisterer allereie"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Ytterlegare terreng"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
@@ -241,11 +302,11 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biomes"
-msgstr ""
+msgstr "Biom"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caverns"
-msgstr ""
+msgstr "Holer"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -257,17 +318,16 @@ msgid "Create"
 msgstr "Skap"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Informasjon:"
+msgstr "Dekorasjonar"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
-msgstr "Last ned eit spel, sånn som Minetest spellet, ifrå minetest.net"
+msgstr "Last ned eit spel, slik som Minetest-spelet, frå minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr "Last eit ned på minetest.net"
+msgstr "Last ned eit frå minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
@@ -275,15 +335,15 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Flatt terreng"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "Svevande landmassar på himmelen"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
-msgstr ""
+msgstr "Flyteland (eksperimentell)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -291,11 +351,11 @@ msgstr "Spel"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Generer ikkjefraktalterreng: Hav og undergrunn"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Haugar"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
@@ -303,15 +363,15 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Aukar fuktigheita rundt elver"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Sjøar"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "Låg fuktigheit og høg temperatur fører til grunne eller tørre elver"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -327,15 +387,15 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "Fjell"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Leireflyt"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Nettverk av tunellar og holer"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -351,11 +411,11 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Rivers"
-msgstr ""
+msgstr "Elver"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Elver på havnivå"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -378,15 +438,15 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "Temperert, Ørken"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "Temperert, Ørken, Jungel"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "Temperert, Ørken, Jungel, Tundra, Taiga"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
@@ -394,15 +454,15 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "Tre og jungelgras"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Vary river depth"
-msgstr ""
+msgstr "Varier elvedjupne"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Svært store holer djupt i undergrunnen"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -419,7 +479,7 @@ msgstr "Du har ikkje installert noko spel."
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "Are you sure you want to delete \"$1\"?"
-msgstr "Er du sikker på at du har lyst til å slette \"$1\"?"
+msgstr "Er du sikker på at du vil slette «$1»?"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua builtin/mainmenu/tab_local.lua
@@ -429,23 +489,23 @@ msgstr "Slett"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "pkgmgr: failed to delete \"$1\""
-msgstr "pkgmgr: sletting av \"$1\" gjekk ikkje"
+msgstr "pkgmgr: klarte ikkje å slette «$1»"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "pkgmgr: invalid path \"$1\""
-msgstr "pkgmgr: ugyldig rute \"$1\""
+msgstr "pkgmgr: ugyldig sti «$1»"
 
 #: builtin/mainmenu/dlg_delete_world.lua
 msgid "Delete World \"$1\"?"
-msgstr "Slett verd \"$1\"?"
+msgstr "Slett verd «$1»?"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Accept"
-msgstr "Akseptér"
+msgstr "Aksepter"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr "Omdøp Modpakka:"
+msgstr "Døyp om modifikasjonspakken:"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid ""
@@ -461,21 +521,17 @@ msgstr "(Ikkje nokon skildring gjeven)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "2D Noise"
-msgstr "To-dimensjonal lyd"
+msgstr "2D-støy"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
-msgstr "<  Attende til instillinger"
+msgstr "< Tilbake til innstillingssida"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Browse"
 msgstr "Bla gjennom"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Deaktivert"
 
@@ -520,12 +576,16 @@ msgid "Scale"
 msgstr "Skala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Søk"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
-msgstr "Velje ein mappe"
+msgstr "Vel katalog"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select file"
-msgstr "Velje eit dokument"
+msgstr "Vel fil"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
@@ -533,11 +593,11 @@ msgstr "Vis tekniske namn"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be at least $1."
-msgstr "Verdien må i det minste være $1."
+msgstr "Verdien må minst vere $1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must not be larger than $1."
-msgstr "Verdien må ikkje være høgare enn $1."
+msgstr "Verdien må ikkje vere større enn $1."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "X"
@@ -576,7 +636,7 @@ msgstr "Absolutt verdi"
 #. for noise settings in main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "defaults"
-msgstr "Standard"
+msgstr "standardar"
 
 #. ~ "eased" is a noise parameter flag.
 #. It is used to make the map smoother and
@@ -592,35 +652,37 @@ msgstr "$1 (Aktivert)"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "$1 mods"
-msgstr "$1 modder"
+msgstr "$1 modifikasjonar"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Failed to install $1 to $2"
-msgstr "Funka ikkje å installere $1 til $2"
+msgstr "Klarte ikkje å installere $1 til $2"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install Mod: Unable to find real mod name for: $1"
 msgstr ""
-"Installer modifikasjon: Funka ikkje å finne eit ekte modifikasjons namn for: "
-"$1"
+"Installer modifikasjon: Klarte ikkje å finne det reelle modifikasjonsnamnet "
+"for: $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install Mod: Unable to find suitable folder name for modpack $1"
 msgstr ""
-"Installer Modifikasjon: Funka ikkje å finne ein passande for modpakke $1"
+"Installer modifikasjon: Klarte ikkje å finne ein passande katalog for "
+"modifikasjonspakke $1"
 
 #: builtin/mainmenu/pkgmgr.lua
+#, fuzzy
 msgid "Install: Unsupported file type \"$1\" or broken archive"
 msgstr ""
 "Installer: Ikkje-støtta dokument type \"$1\" eller så funker ikkje arkivet"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install: file: \"$1\""
-msgstr "Installer: dokument: \"$1\""
+msgstr "Installer: fil: «$1»"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to find a valid mod or modpack"
-msgstr "Funka ikkje å finne ein gyldig modifikasjon eller mod-pakke"
+msgstr "Klarte ikkje å finne ein gyldig modifikasjon eller modifikasjonspakke"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
@@ -638,6 +700,22 @@ msgstr "Funka ikkje å installere modifikasjon som ein $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Funka ikkje å installere mod-pakka som ein $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Lastar …"
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Klient side-skildring er av"
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Forsøkje å kople attende den offentlege tenarmaskin-lista og sjekk sambands "
+"koplingen."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Bla i nett-innhald"
@@ -648,7 +726,7 @@ msgstr "Innhald"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
-msgstr "Deaktivér tekstur pakke"
+msgstr "Deaktiver teksturpakke"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Information:"
@@ -656,15 +734,15 @@ msgstr "Informasjon:"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Installed Packages:"
-msgstr "Installer pakker:"
+msgstr "Installerte pakker:"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No dependencies."
-msgstr "Ikkje nokon avhengigheiter."
+msgstr "Ingen avhengigheiter."
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No package description available"
-msgstr "Ikkje nokon pakke skildring tilgjengelig"
+msgstr "Inga pakkeskildring tilgjengeleg"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Rename"
@@ -676,31 +754,38 @@ msgstr "Avinstallér pakka"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
-msgstr "Bruk tekstur pakke"
+msgstr "Bruk teksturpakke"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
-msgstr "Aktive bidragere"
+msgstr "Aktive bidragsytarar"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Core Developers"
-msgstr "Kjerne-utviklere"
+msgstr "Kjerne-utviklarar"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
 msgstr "Medvirkende"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Velje ein mappe"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
-msgstr "Førre bidragere"
+msgstr "Tidlegare bidragsytarar"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
-msgstr "Førre kjerne-utviklere"
+msgstr "Tidlegare kjerne-utviklarar"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Announce Server"
@@ -711,32 +796,30 @@ msgid "Bind Address"
 msgstr "Blind stad"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Konfigurér"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Kreativ stode"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Aktivér skading"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
 msgid "Host Game"
 msgstr "Bli husvert"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
 msgid "Host Server"
 msgstr "Bli tenarmaskin's vert"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "Installer spel frå ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Namn/passord"
+msgid "Name"
+msgstr "Namn"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -744,7 +827,11 @@ msgstr "Ny"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "No world created or selected!"
-msgstr "Ikkje noko verd skapt eller valgt!"
+msgstr "Inga verd skapt eller valt!"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Passord"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
@@ -755,12 +842,16 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Vel modifikasjonar"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Vel verd:"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Server Port"
-msgstr "Tenarmaskin port"
+msgstr "Tenarport"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Start Game"
@@ -768,25 +859,25 @@ msgstr "Start spel"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
-msgstr "Stad/port"
+msgstr "Adresse / port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Kople i hop"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Kreativ stode"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Skade aktivert"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Slett Favoritt"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favoritt"
 
@@ -794,16 +885,16 @@ msgstr "Favoritt"
 msgid "Join Game"
 msgstr "Bli med i spel"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Namn/Passord"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Spelar mot spelar aktivert"
 
@@ -825,17 +916,14 @@ msgstr "8x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "All Settings"
-msgstr "Alle instillinger"
+msgstr "Alle innstillingar"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
 msgstr "Kantutjemning:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Er du sikker på at du vill tilbakestille enkel-spelar verd?"
-
-#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "Autosave Screen Size"
 msgstr "Automatisk sjerm størrelse"
 
@@ -843,10 +931,6 @@ msgstr "Automatisk sjerm størrelse"
 msgid "Bilinear Filter"
 msgstr "Bi-lineært filtréring"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Dunke kartlegging"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Endre nykeler"
@@ -860,10 +944,6 @@ msgid "Fancy Leaves"
 msgstr "Fancy blader"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Generér normale kart"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipkart"
 
@@ -872,10 +952,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipkart + Aniso. filter"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Nei"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Inga filter"
 
@@ -884,10 +960,12 @@ msgid "No Mipmap"
 msgstr "Ingen Mipkart"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "Node Highlighting"
 msgstr "Knute-fremheving"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "Node Outlining"
 msgstr "Knute-utlinjing"
 
@@ -903,31 +981,30 @@ msgstr "Ugjennomsiktige blader"
 msgid "Opaque Water"
 msgstr "Ugjennomsiktig vatn"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parralax okklusjon"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
-msgstr "Partikkler"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Tilbakegå enkelspelar verd"
+msgstr "Partiklar"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
-msgstr "Sjerm:"
+msgstr "Skjerm:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
-msgstr "Instillinger"
+msgstr "Innstillingar"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+#, fuzzy
 msgid "Shaders"
 msgstr "Dybdeskaper"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Dybdeskaper (ikkje tilgjengelig)"
+
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "Shaders (unavailable)"
 msgstr "Dybdeskaper (ikkje tilgjengelig)"
 
@@ -944,10 +1021,12 @@ msgid "Texturing:"
 msgstr "Teksturering:"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "To enable shaders the OpenGL driver needs to be used."
 msgstr "For å aktivere skumrings-effekt så må OpenGL driveren være i bruk."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
+#, fuzzy
 msgid "Tone Mapping"
 msgstr "Tone kartlegging"
 
@@ -960,6 +1039,7 @@ msgid "Trilinear Filter"
 msgstr "Tri-lineær filtréring"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "Waving Leaves"
 msgstr "Raslende lauv"
 
@@ -969,25 +1049,10 @@ msgid "Waving Liquids"
 msgstr "Raslende lauv"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "Waving Plants"
 msgstr "Raslende planter"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ja"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Konfigurer modifikasjoner"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Hovud"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Start enkeltspelar oppleving"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Nett-kopling er brutt."
@@ -1002,23 +1067,24 @@ msgstr "Førebur noder"
 
 #: src/client/client.cpp
 msgid "Initializing nodes..."
-msgstr "Førebur node..."
+msgstr "Førebur nodar …"
 
 #: src/client/client.cpp
 msgid "Loading textures..."
-msgstr "Lastar teksturar..."
+msgstr "Lastar teksturar …"
 
 #: src/client/client.cpp
+#, fuzzy
 msgid "Rebuilding shaders..."
 msgstr "Gjennbygger dybdeskaper..."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
-msgstr "Kopling gikk galen (Tidsavbrott?)"
+msgstr "Tilkoplingsfeil (Tidsavbrot?)"
 
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
-msgstr "Kunne ikkje finne eller ha i gang spelet \""
+msgstr "Kunne ikkje finne eller laste spelet \""
 
 #: src/client/clientlauncher.cpp
 msgid "Invalid gamespec."
@@ -1029,8 +1095,9 @@ msgid "Main Menu"
 msgstr "Hovudmeny"
 
 #: src/client/clientlauncher.cpp
+#, fuzzy
 msgid "No world selected and no address provided. Nothing to do."
-msgstr "Ingen verd valgt og ikkje nokon adresse valg. Ikkje noko å gjere."
+msgstr "Inga verd er vald og ikkje nokon adresse valg. Ikkje noko å gjere."
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
@@ -1038,13 +1105,15 @@ msgstr "Spelarnamn for langt."
 
 #: src/client/clientlauncher.cpp
 msgid "Please choose a name!"
-msgstr "Ver vennleg og velje eit anna namn!"
+msgstr "Ver venleg å velje eit namn!"
 
 #: src/client/clientlauncher.cpp
+#, fuzzy
 msgid "Provided password file failed to open: "
 msgstr "Passord dokumentet du ga går ikkje an å åpne: "
 
 #: src/client/clientlauncher.cpp
+#, fuzzy
 msgid "Provided world path doesn't exist: "
 msgstr "Verds-ruta du ga finnes ikkje: "
 
@@ -1073,6 +1142,7 @@ msgid "- Address: "
 msgstr "- Adresse: "
 
 #: src/client/game.cpp
+#, fuzzy
 msgid "- Creative Mode: "
 msgstr "- Gude løyving: "
 
@@ -1099,7 +1169,7 @@ msgstr "- Spelar mot spelar (PvP): "
 
 #: src/client/game.cpp
 msgid "- Server Name: "
-msgstr "- Tenarmaskin namn: "
+msgstr "- Tenarnamn: "
 
 #: src/client/game.cpp
 msgid "Automatic forward disabled"
@@ -1139,43 +1209,40 @@ msgstr "Kopler til tenarmaskin..."
 
 #: src/client/game.cpp
 msgid "Continue"
-msgstr "Fortsetja"
+msgstr "Fortset"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Styring:\n"
-"- %s: Framsteg\n"
-"- %s: Baksteg\n"
-"- %s: Sidesteg mot venstre\n"
-"- %s: Sidesteg mot høyre\n"
-"- %s: hopp/klatre\n"
-"- %s: snike seg rundt/bøye seg\n"
-"- %s: slipp gjennstand\n"
+"- %s: gå framover\n"
+"- %s: gå bakover\n"
+"- %s: gå mot venstre\n"
+"- %s: gå mot høgre\n"
+"- %s: hopp/klatre opp\n"
+"- %s: grav/slå\n"
+"- %s: plasser/nytt\n"
+"- %s: snik/klatre ned\n"
+"- %s: slepp ting\n"
 "- %s: inventar\n"
-"- Datamus: snu seg/sjå rundt\n"
-"- Datamus, venstre klikk: grave/slå\n"
-"- Datamus, høgre klikk: plassér/bruk\n"
-"- Datamus, skrolle-hjul: select item\n"
-"- %s: skravlerør\n"
+"- Mus: snu deg/sjå\n"
+"- Musehjul: vel ting\n"
+"- %s: nettprat\n"
 
 #: src/client/game.cpp
 msgid "Creating client..."
@@ -1274,16 +1341,6 @@ msgid "Fog enabled"
 msgstr "TÃ¥ke er aktivert"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "TÃ¥ke er deaktivert"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "TÃ¥ke er aktivert"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spel info:"
 
@@ -1304,16 +1361,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "TÃ¥ke er deaktivert"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Skade aktivert"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Medier..."
 
@@ -1326,34 +1373,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Minikart er for tiden deaktivert tå spelet eller ein modifikasjon"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Minikart er gøymt"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Minikart i radar modus, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Minikart i radarmodus, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Minikart i radarmodus, Zoom x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Minikart i overflate modus, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Minikart i overflate modus, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Minikart i overflate modus, Zoom x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Ikkjeklipp modus er avtatt"
 
@@ -1399,10 +1418,6 @@ msgid "Resolving address..."
 msgstr "Slår opp addressa..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Du har kome at"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Slår av..."
 
@@ -1420,7 +1435,7 @@ msgstr "Lyd e dempa"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "Lydsystemet er slått av"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
@@ -1455,10 +1470,6 @@ msgid "Wireframe shown"
 msgstr "Jern-tråd-ramma er vist"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Du døydde"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom er for tiden deaktivert tå spelet eller ein modifikasjon"
 
@@ -1475,16 +1486,6 @@ msgid "Chat shown"
 msgstr "Skravlerøret er vist"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Skravlerøret er gøymt"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Skravlerøret er vist"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD er gøymt"
 
@@ -1764,6 +1765,25 @@ msgstr "X Knapp 2"
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Minikart er gøymt"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Minikart i radarmodus, Zoom x%d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Minikart i overflatemodus, Zoom x%d"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Minikart i overflate modus, Zoom x1"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Passorda passar ikkje!"
@@ -1808,26 +1828,6 @@ msgid "Backward"
 msgstr "Bakover"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Byt kamera"
 
@@ -1922,30 +1922,10 @@ msgid "Special"
 msgstr "Spesial"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Spesial"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Slå på/av kameramodus"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Slå på/av kameramodus"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Slå av/på HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Slåpå/av flyve løyving"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Slå av/på skravlerør"
 
@@ -2056,12 +2036,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2091,11 +2065,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
-msgstr ""
+msgstr "3D-skyer"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode"
-msgstr ""
+msgstr "3D-modus"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode parallax strength"
@@ -2103,13 +2077,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
-msgstr ""
+msgstr "3D-støy som definerer gigantiske holer."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "3D noise defining mountain structure and height.\n"
 "Also defines structure of floatland mountain terrain."
 msgstr ""
+"3D-støy som definerer fjellstruktur og -høgde.\n"
+"Definerer og strukturen på fjellterreng for flyteland."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2125,7 +2101,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining terrain."
-msgstr ""
+msgstr "3D-støy som definerer terreng."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise for mountain overhangs, cliffs, etc. Usually small variations."
@@ -2157,27 +2133,32 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server crashes."
-msgstr ""
+msgstr "Ein beskjed som skal visast til alle klientane når tenaren kræsjar."
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server shuts down."
 msgstr ""
+"Ein beskjed som skal visast til alle klientane når tenaren vert slått av."
 
 #: src/settings_translation_file.cpp
 msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
-msgstr ""
+msgstr "Akselerasjon i luft"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration of gravity, in nodes per second per second."
-msgstr ""
+msgstr "Gravitasjonsakselerasjon, i nodar per sekund per sekund."
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifiers"
@@ -2224,7 +2205,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
-msgstr ""
+msgstr "Avansert"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2245,11 +2226,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Amount of messages a player may send per 10 seconds."
-msgstr ""
+msgstr "Antal meldingar ein spelar kan sende per 10 sekund."
 
 #: src/settings_translation_file.cpp
 msgid "Amplifies the valleys."
-msgstr ""
+msgstr "Forsterkar dalane."
 
 #: src/settings_translation_file.cpp
 msgid "Anisotropic filtering"
@@ -2314,7 +2295,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Automatically report to the serverlist."
-msgstr ""
+msgstr "Rapporter automatisk til tenarlista."
 
 #: src/settings_translation_file.cpp
 msgid "Autosave screen size"
@@ -2322,7 +2303,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Autoscaling mode"
-msgstr ""
+msgstr "Autoskaleringsmodus"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -2338,11 +2319,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
-msgstr ""
+msgstr "Basis"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
-msgstr ""
+msgstr "Basisprivilegium"
 
 #: src/settings_translation_file.cpp
 msgid "Beach noise"
@@ -2398,11 +2379,7 @@ msgstr "Bygg intern spelar"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
+msgstr "Innebygd"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2475,22 +2452,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
-msgstr ""
+msgstr "Tekststørrelse for nettprat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
-msgstr ""
+msgstr "Nettpratstast"
 
 #: src/settings_translation_file.cpp
 msgid "Chat log level"
@@ -2538,11 +2505,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Client"
-msgstr ""
+msgstr "Klient"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
-msgstr ""
+msgstr "Klient og tenar"
 
 #: src/settings_translation_file.cpp
 msgid "Client modding"
@@ -2558,15 +2525,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
-msgstr ""
+msgstr "Klatrefart"
 
 #: src/settings_translation_file.cpp
 msgid "Cloud radius"
-msgstr ""
+msgstr "Skyradius"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds"
-msgstr ""
+msgstr "Skyer"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds are a client side effect."
@@ -2574,11 +2541,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Clouds in menu"
-msgstr ""
+msgstr "Skyer i meny"
 
 #: src/settings_translation_file.cpp
 msgid "Colored fog"
-msgstr ""
+msgstr "Farga tåke"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2636,10 +2603,14 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "ContentDB URL"
+msgid "ContentDB Max Concurrent Downloads"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB URL"
+msgstr "URL til ContentDB"
+
+#: src/settings_translation_file.cpp
 msgid "Continuous forward"
 msgstr ""
 
@@ -2681,18 +2652,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
-msgstr ""
+msgstr "Kræsjmelding"
 
 #: src/settings_translation_file.cpp
 msgid "Creative"
-msgstr ""
+msgstr "Kreativ"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2700,7 +2673,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2737,29 +2712,31 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Default acceleration"
-msgstr ""
+msgstr "Standard akselerasjon"
 
 #: src/settings_translation_file.cpp
 msgid "Default game"
-msgstr ""
+msgstr "Standard spel"
 
 #: 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 ""
+"Standard spel når du lagar ei ny verd.\n"
+"Dette vil verte overstyrt når du lagar ei verd frå hovudmenyen."
 
 #: src/settings_translation_file.cpp
 msgid "Default password"
-msgstr ""
+msgstr "Standard passord"
 
 #: src/settings_translation_file.cpp
 msgid "Default privileges"
-msgstr ""
+msgstr "Standard privilegium"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Standard rapportformat"
 
 #: src/settings_translation_file.cpp
 msgid "Default stack size"
@@ -2800,12 +2777,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2876,6 +2847,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2936,7 +2911,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3024,14 +2999,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3041,18 +3008,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3069,12 +3024,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3084,7 +3033,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3386,10 +3335,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3443,8 +3388,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3911,6 +3856,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3991,6 +3940,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4090,6 +4046,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4646,10 +4609,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4663,6 +4622,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4826,7 +4793,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4875,6 +4842,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5104,14 +5078,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5137,10 +5103,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5166,34 +5128,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5259,6 +5193,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5414,10 +5356,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5669,6 +5607,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5798,10 +5746,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5895,6 +5839,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5953,8 +5901,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5980,15 +5928,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6124,6 +6077,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6330,6 +6294,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6452,6 +6422,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6463,14 +6451,65 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "OK"
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Er du sikker på at du vill tilbakestille enkel-spelar verd?"
 
 #~ msgid "Back"
 #~ msgstr "Attende"
 
+#~ msgid "Bump Mapping"
+#~ msgstr "Dunke kartlegging"
+
+#~ msgid "Config mods"
+#~ msgstr "Konfigurer modifikasjoner"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurér"
+
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr "Henter og installerer $1, ver vennleg og vent..."
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Generér normale kart"
+
+#~ msgid "Main"
+#~ msgstr "Hovud"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Minikart i radarmodus, Zoom x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Minikart i radarmodus, Zoom x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Minikart i overflate modus, Zoom x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Minikart i overflate modus, Zoom x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Namn/passord"
+
+#~ msgid "No"
+#~ msgstr "Nei"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parralax okklusjon"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Tilbakegå enkelspelar verd"
+
 #~ msgid "Select Package File:"
 #~ msgstr "Velje eit pakke dokument:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Start enkeltspelar oppleving"
+
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Slå på/av kameramodus"
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
diff --git a/po/pl/minetest.po b/po/pl/minetest.po
index 47cdeb945..4c5d166e8 100644
--- a/po/pl/minetest.po
+++ b/po/pl/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Polish (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-09 12:14+0000\n"
-"Last-Translator: Mikołaj Zaremba <mikolajzaremba03@gmail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-12-27 00:29+0000\n"
+"Last-Translator: Atrate <Atrate@protonmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/minetest/minetest/"
 "pl/>\n"
 "Language: pl\n"
@@ -13,11 +13,19 @@ msgstr ""
 "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 4.1-dev\n"
+"X-Generator: Weblate 4.4.1-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Wróć do gry"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Umarłeś"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -39,10 +47,6 @@ msgstr "Połącz ponownie"
 msgid "The server has requested a reconnect:"
 msgstr "Serwer zażądał ponownego połączenia:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "�adowanie..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Niezgodne wersje protokołów. "
@@ -56,12 +60,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Serwer wspiera protokoły w wersjach od $1 do $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Spróbuj ponownie włączyć publiczną listę serwerów i sprawdź swoje połączenie "
-"z sieciÄ… Internet."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Wspieramy wyłącznie protokół w wersji $1."
 
@@ -69,7 +67,8 @@ msgstr "Wspieramy wyłącznie protokół w wersji $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Wspieramy protokoły w wersji od $1 do $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -79,7 +78,8 @@ msgstr "Wspieramy protokoły w wersji od $1 do $2."
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Zależności:"
 
@@ -153,16 +153,57 @@ msgid "enabled"
 msgstr "włączone"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "�adowanie..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Wszystkie zasoby"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Klawisz już zdefiniowany"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Powrót do menu głównego"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Utwórz grę"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB nie jest dostępne gdy Minetest był zbudowany bez cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
@@ -183,6 +224,16 @@ msgid "Install"
 msgstr "Instaluj"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Instaluj"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Dodatkowe zależności:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mody"
@@ -196,9 +247,26 @@ msgid "No results"
 msgstr "Brak Wyników"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Szukaj"
+#, fuzzy
+msgid "No updates"
+msgstr "Aktualizacja"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Not found"
+msgstr "Wycisz dźwięk"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -213,7 +281,11 @@ msgid "Update"
 msgstr "Aktualizacja"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -222,7 +294,7 @@ msgstr "Istnieje już świat o nazwie \"$1\""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Dodatkowy teren"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 #, fuzzy
@@ -230,9 +302,8 @@ msgid "Altitude chill"
 msgstr "Wysokość mrozu"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Altitude dry"
-msgstr "Wysokość mrozu"
+msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -259,9 +330,8 @@ msgid "Create"
 msgstr "Utwórz"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Iteracje"
+msgstr "Dekoracje"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -272,13 +342,12 @@ msgid "Download one from minetest.net"
 msgstr "ÅšciÄ…gnij takÄ… z minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "Minimalna wartość Y lochu"
+msgstr "Lochy"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "PÅ‚aski teren"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -286,9 +355,8 @@ msgid "Floating landmasses in the sky"
 msgstr "Gęstość gór na latających wyspach"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floatlands (experimental)"
-msgstr "Poziom wznoszonego terenu"
+msgstr "LatajÄ…ce wyspy (eksperymentalne)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -300,7 +368,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Wzgórza"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -309,15 +377,17 @@ msgstr "Sterownik graficzny"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Zwiększa wilgotność wokół rzek"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Jeziora"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
 msgstr ""
+"Niska wilgotność i wysoka temperatura wpływa na niski stan rzek lub ich "
+"wysychanie"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -333,9 +403,8 @@ msgid "Mapgen-specific flags"
 msgstr "Generator mapy flat flagi"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mountains"
-msgstr "Szum góry"
+msgstr "Góry"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
@@ -343,19 +412,20 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Sieć jaskiń i korytarzy."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
 msgstr "Nie wybrano gry"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "Spadek temperatury wraz z wysokością"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "Spadek wilgotności wraz ze wzrostem wysokości"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -484,11 +554,6 @@ msgid "Browse"
 msgstr "PrzeglÄ…daj"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Klient"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Wyłączone"
 
@@ -533,6 +598,10 @@ msgid "Scale"
 msgstr "Skaluj"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Szukaj"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Wybierz katalog"
 
@@ -648,6 +717,21 @@ msgstr "Nie moźna zainstalować moda jako $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Nie można zainstalować paczki modów jako $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "�adowanie..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Skryptowanie po stronie klienta jest wyłączone"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Spróbuj ponownie włączyć publiczną listę serwerów i sprawdź swoje połączenie "
+"z sieciÄ… Internet."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Przeglądaj zawartość online"
@@ -701,7 +785,14 @@ msgid "Credits"
 msgstr "Autorzy"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Wybierz katalog"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -721,14 +812,10 @@ msgid "Bind Address"
 msgstr "Adres"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Ustaw"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Tryb kreatywny"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Włącz obrażenia"
 
@@ -745,8 +832,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nazwa gracza/Hasło"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -757,6 +844,11 @@ msgid "No world created or selected!"
 msgstr "Nie wybrano bądź nie utworzono świata!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Nowe hasło"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Graj"
 
@@ -765,6 +857,11 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Wybierz świat:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Wybierz świat:"
 
@@ -780,23 +877,23 @@ msgstr "Rozpocznij grÄ™"
 msgid "Address / Port"
 msgstr "Adres / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Połącz"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Tryb kreatywny"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Obrażenia włączone"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Usuń ulubiony"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Ulubione"
 
@@ -804,16 +901,16 @@ msgstr "Ulubione"
 msgid "Join Game"
 msgstr "Dołącz do gry"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nazwa gracza / Hasło"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP włączone"
 
@@ -842,10 +939,6 @@ msgid "Antialiasing:"
 msgstr "Antyaliasing:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Jesteś pewny że chcesz zresetować świat singleplayer?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Automatyczny zapis rozmiaru okienka"
 
@@ -853,10 +946,6 @@ msgstr "Automatyczny zapis rozmiaru okienka"
 msgid "Bilinear Filter"
 msgstr "Filtrowanie dwuliniowe"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Mapowanie wypukłości"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Zmień klawisze"
@@ -870,10 +959,6 @@ msgid "Fancy Leaves"
 msgstr "Ozdobne liście"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Generuj normalne mapy"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmapy"
 
@@ -882,10 +967,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmapy i Filtr anizotropowe"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Nie"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Filtrowanie wyłączone"
 
@@ -913,19 +994,11 @@ msgstr "Nieprzejrzyste liście"
 msgid "Opaque Water"
 msgstr "Nieprzejrzysta Woda"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Mapowanie paralaksy"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "WÅ‚Ä…cz Efekty CzÄ…steczkowe"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Resetuj świat pojedynczego gracza"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Ekran:"
 
@@ -938,6 +1011,11 @@ msgid "Shaders"
 msgstr "Shadery"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "LatajÄ…ce wyspy (eksperymentalne)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Shadery (Nie dostępne)"
 
@@ -981,22 +1059,6 @@ msgstr "Fale (Ciecze)"
 msgid "Waving Plants"
 msgstr "Falujące rośliny"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Tak"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Ustawienia modów"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Menu główne"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Tryb jednoosobowy"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Upłynął czas połączenia."
@@ -1158,18 +1220,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Sterowanie:↵\n"
 "- %s: idź do przodu↵\n"
@@ -1283,16 +1342,6 @@ msgid "Fog enabled"
 msgstr "Mgła włączona"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Mgła wyłączona"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Mgła włączona"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informacje o grze:"
 
@@ -1313,16 +1362,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Mgła wyłączona"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Obrażenia włączone"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Media..."
 
@@ -1335,34 +1374,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Minimapa aktualnie wyłączona przez grę lub mod"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Minimapa ukryta"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Minimapa w trybie radaru, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Minimapa w trybie radaru, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Minimapa w trybie radaru, Zoom x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Minimapa w trybie powierzchniowym, powiększenie x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Minimapa w trybie powierzchniowym, powiększenie x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Minimapa w trybie powierzchniowym, powiększenie x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Tryb noclip wyłączony"
 
@@ -1407,10 +1418,6 @@ msgid "Resolving address..."
 msgstr "Sprawdzanie adresu..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Wróć do gry"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Wyłączanie..."
 
@@ -1463,10 +1470,6 @@ msgid "Wireframe shown"
 msgstr "Siatka widoczna"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Umarłeś"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Powiększenie jest obecnie wyłączone przez grę lub mod"
 
@@ -1483,16 +1486,6 @@ msgid "Chat shown"
 msgstr "Chat widoczny"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Czat ukryty"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Chat widoczny"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD ukryty"
 
@@ -1772,6 +1765,25 @@ msgstr "Przycisk X 2"
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Minimapa ukryta"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Minimapa w trybie radaru, Zoom x1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Minimapa w trybie powierzchniowym, powiększenie x1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Minimalna wielkość tekstury dla filtrów"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Hasła nie są jednakowe!"
@@ -1816,26 +1828,6 @@ msgid "Backward"
 msgstr "Tył"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Zmień kamerę"
 
@@ -1930,30 +1922,10 @@ msgid "Special"
 msgstr "Specialne"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Specialne"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Przełącz na tryb Cinematic"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Przełącz na tryb Cinematic"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Przełącz HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Przełącz tryb latania"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Przełącz historię czatu"
 
@@ -2086,14 +2058,6 @@ msgstr ""
 "dla wyspy, ustaw 3 wartości równe, aby uzyskać surowy kształt."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = parallax occlusion z informacjÄ… nachylenia (szybsze).\n"
-"1 = relief mapping (wolniejsze, bardziej dokładne)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "Szum 2D który wpływa na kształt/rozmiar łańcuchów górskich."
 
@@ -2221,6 +2185,10 @@ msgid "ABM interval"
 msgstr "Interwał zapisu mapy"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Bezwzględny limit kolejki"
@@ -2470,7 +2438,7 @@ msgstr "Ścieżka czcionki typu Monospace"
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Bold font path"
-msgstr "Ścieżka czcionki"
+msgstr "Ścieżka fontu pogrubionego."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2486,10 +2454,6 @@ msgid "Builtin"
 msgstr "Wbudowany"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Mapowanie wypukłości"
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
@@ -2567,21 +2531,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Zmienia interfejs użytkownika menu głównego:\n"
-"-   Pełny:   Wiele światów jednoosobowych, wybór gry, wybór paczki tekstur, "
-"itd.\n"
-"-   Prosty:   Jeden świat jednoosobowy, brak wyboru gry lub paczki tekstur. "
-"Może być konieczny dla mniejszych ekranów."
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "Rozmiar czcionki"
@@ -2744,6 +2693,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "Flaga czarnej listy ContentDB"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "Zawartość"
@@ -2810,7 +2763,10 @@ msgid "Crosshair alpha"
 msgstr "Kanał alfa celownika"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Kanał alfa celownika (pomiędzy 0 a 255)."
 
 #: src/settings_translation_file.cpp
@@ -2818,8 +2774,10 @@ msgid "Crosshair color"
 msgstr "Kolor celownika"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Kolor celownika (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2927,22 +2885,13 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Określa położenie oraz teren z dodatkowymi górami i jeziorami."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Definiuje krok próbkowania tekstury.\n"
-"Wyższa wartość reprezentuje łagodniejszą mapę normalnych."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Defines the base ground level."
-msgstr "Określa obszary drzewiaste oraz ich gęstość."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Defines the depth of the river channel."
-msgstr "Określa obszary drzewiaste oraz ich gęstość."
+msgstr "Określa głębokość rzek."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
@@ -2958,7 +2907,7 @@ msgstr "Określa strukturę kanałów rzecznych."
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Defines the width of the river valley."
-msgstr "Określa obszary na których drzewa mają jabłka."
+msgstr "Określa szerokość doliny rzecznej."
 
 #: src/settings_translation_file.cpp
 msgid "Defines tree areas and tree density."
@@ -3019,6 +2968,11 @@ msgid "Desynchronize block animation"
 msgstr "Odsynchronizuj animację bloków"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "W prawo"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "WÅ‚Ä…cz efekty czÄ…steczkowe"
 
@@ -3059,15 +3013,15 @@ msgid "Dungeon minimum Y"
 msgstr "Minimalna wartość Y lochu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Dungeon noise"
-msgstr "Minimalna wartość Y lochu"
+msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
 "Required for IPv6 connections to work at all."
-msgstr ""
+msgstr "Włącz protokół sieciowy IPv6 (dla gry oraz dla jej serwera)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3082,7 +3036,8 @@ msgid "Enable console window"
 msgstr "Odblokuj okno konsoli"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Zezwól na tryb kreatywny dla nowo powstałych map."
 
 #: src/settings_translation_file.cpp
@@ -3151,10 +3106,13 @@ msgstr ""
 "jeżeli następuje połączenie z serwerem."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Enable vertex buffer objects.\n"
 "This should greatly improve graphics performance."
 msgstr ""
+"Uaktywnij \"vertex buffer objects\" aby zmniejszyć wymagania wobec karty "
+"grafiki."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3188,18 +3146,6 @@ msgid "Enables animation of inventory items."
 msgstr "Włącz animację inwentarza przedmiotów."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Włącza mapowanie wypukłości dla tekstur. Mapy normalnych muszą być dodane w "
-"paczce tekstur\n"
-"lub muszą być automatycznie wygenerowane.\n"
-"Wymaga włączonych shaderów."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Włącza cachowanie facedir obracanych meshów."
 
@@ -3209,22 +3155,6 @@ msgstr "WÅ‚Ä…cz minimapÄ™."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Włącza generację map normalnych w locie  (efekt płaskorzeźby).\n"
-"Wymaga włączenia mapowania wypukłości."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"WÅ‚Ä…cza mapowanie paralaksy.\n"
-"Wymaga włączenia shaderów."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3241,14 +3171,6 @@ msgstr "Metody bytów"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Eksperymentalna opcja, może powodować widoczne przestrzenie\n"
-"pomiędzy blokami kiedy ustawiona powyżej 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3258,8 +3180,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS podczas pauzy w menu"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "Maksymalny FPS gdy gra spauzowana."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3410,9 +3333,8 @@ msgid "Floatland tapering distance"
 msgstr "Podstawowy szum wznoszÄ…cego siÄ™ terenu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland water level"
-msgstr "Poziom wznoszonego terenu"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
@@ -3596,10 +3518,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Filtr skalowania GUI txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Generuj mapy normalnych"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Globalne wywołania zwrotne"
 
@@ -3666,8 +3584,8 @@ msgstr "Klawisz przełączania HUD"
 #, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Obsługa przestarzałych wywołań lua api:\n"
@@ -4230,6 +4148,11 @@ msgid "Joystick button repetition interval"
 msgstr "Interwał powtarzania przycisku joysticka"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "Typ Joysticka"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Czułość drgania joysticka"
 
@@ -4333,6 +4256,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Klawisz skakania.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4478,6 +4412,17 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Klawisz skakania.\n"
+"Zobacz http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -5274,11 +5219,6 @@ msgid "Main menu script"
 msgstr "Skrypt głównego menu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Skrypt głównego menu"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5294,6 +5234,14 @@ msgid "Makes all liquids opaque"
 msgstr "Zmienia ciecze w nieprzeźroczyste"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Katalog map"
 
@@ -5493,7 +5441,8 @@ msgid "Maximum FPS"
 msgstr "Maksymalny FPS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "Maksymalny FPS gdy gra spauzowana."
 
 #: src/settings_translation_file.cpp
@@ -5553,6 +5502,13 @@ msgstr ""
 "Pozostaw puste a odpowiednia liczba zostanie dobrana automatycznie."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "Maksymalna ilość, wczytanych wymuszeniem, bloków mapy."
 
@@ -5807,14 +5763,6 @@ msgid "Noises"
 msgstr "Szumy"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Próbkowanie normalnych map"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Siła map normlanych"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Liczba powstających wątków"
 
@@ -5844,10 +5792,6 @@ msgstr ""
 "konsumpcją pamięci (4096=100MB, praktyczna zasada)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Liczba iteracji dla parallax occlusion."
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Online Content Repository"
 msgstr "Repozytorium Zawartości z Sieci"
@@ -5876,35 +5820,6 @@ msgstr ""
 "formspec jest otwarty."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Ogólny błąd systematyczny efektu zamykania paralaksy, zwykle skala/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Całkowity efekt skalowania zamknięcia paralaksy."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Zamknięcie paralaksy"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Błąd systematyczny zamknięcia paralaksy"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Iteracje zamknięcia paralaksy"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Tryb zamknięcia paralaksy"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "Skala parallax occlusion"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5977,6 +5892,16 @@ msgid "Pitch move mode"
 msgstr "Tryb nachylenia ruchu włączony"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Klawisz latania"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Interwał powtórzenia prawego kliknięcia myszy"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -6155,10 +6080,6 @@ msgid "Right key"
 msgstr "W prawo"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Interwał powtórzenia prawego kliknięcia myszy"
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "River channel depth"
 msgstr "Głębokość rzeki"
@@ -6465,6 +6386,19 @@ msgid "Show entity selection boxes"
 msgstr "Pokazuj zaznaczenie wybranych obiektów"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Ustaw język. Zostaw puste pole, aby użyć języka systemowego.\n"
+"Wymagany restart po zmianie ustawienia."
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Komunikat zamknięcia serwera"
 
@@ -6615,10 +6549,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Siła paralaksy."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Siła generowanych zwykłych map."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6721,6 +6651,11 @@ msgid "The URL for the content repository"
 msgstr "Adres URL repozytorium zawartości"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "The deadzone of the joystick"
+msgstr "Identyfikator użycia joysticka"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6786,8 +6721,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6820,6 +6755,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6827,10 +6768,10 @@ msgstr ""
 "joysticka."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 "Czas, wyrażany w sekundach,pomiędzy powtarzanymi kliknięciami prawego "
 "przycisku myszy."
@@ -6991,6 +6932,17 @@ msgstr ""
 "Gamma correct dowscaling nie jest wspierany."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Użyj filtrowania tri-linearnego podczas skalowania tekstur."
 
@@ -7239,6 +7191,12 @@ msgstr ""
 "wspierajÄ…ca takie czcionki."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr "Określ kiedy animacje tekstur na blok powinny być niesynchronizowane."
 
@@ -7375,6 +7333,24 @@ msgid "Y-level of seabed."
 msgstr "Wysokość dna jezior."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL przekroczono limit pobierania pliku"
 
@@ -7386,23 +7362,12 @@ msgstr "Limit równoległy cURL"
 msgid "cURL timeout"
 msgstr "Limit czasu cURL"
 
-#~ msgid "Ok"
-#~ msgstr "OK"
-
-#~ msgid "Back"
-#~ msgstr "Backspace"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Pobieranie i instalowanie $1, proszÄ™ czekaj..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Limit oczekiwań na dysku"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Siła zamknięcia paralaksy"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Ścieżka, pod którą zapisywane są zrzuty ekranu."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = parallax occlusion z informacjÄ… nachylenia (szybsze).\n"
+#~ "1 = relief mapping (wolniejsze, bardziej dokładne)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7418,10 +7383,42 @@ msgstr "Limit czasu cURL"
 #~ "Zmienia sposób w jaki podobne do gór latające wyspy zwężają się ku "
 #~ "środkowi nad i pod punktem środkowym."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Jesteś pewny że chcesz zresetować świat singleplayer?"
+
+#~ msgid "Back"
+#~ msgstr "Backspace"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Mapowanie wypukłości"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Mapowanie wypukłości"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Centrum przyśpieszenia środkowego krzywej światła."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Zmienia interfejs użytkownika menu głównego:\n"
+#~ "-   Pełny:   Wiele światów jednoosobowych, wybór gry, wybór paczki "
+#~ "tekstur, itd.\n"
+#~ "-   Prosty:   Jeden świat jednoosobowy, brak wyboru gry lub paczki "
+#~ "tekstur. Może być konieczny dla mniejszych ekranów."
+
+#~ msgid "Config mods"
+#~ msgstr "Ustawienia modów"
+
+#~ msgid "Configure"
+#~ msgstr "Ustaw"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7432,6 +7429,9 @@ msgstr "Limit czasu cURL"
 #~ msgstr ""
 #~ "Kontroluje szerokość tuneli, mniejsze wartości tworzą szersze tunele."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Kolor celownika (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Ostrość ciemności"
 
@@ -7442,12 +7442,57 @@ msgstr "Limit czasu cURL"
 #~ "Określa obszary wznoszącego się gładkiego terenu.\n"
 #~ "Wygładzone powierzchnie pojawiają się gdy szum > 0."
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Definiuje krok próbkowania tekstury.\n"
+#~ "Wyższa wartość reprezentuje łagodniejszą mapę normalnych."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Pobieranie i instalowanie $1, proszÄ™ czekaj..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "WÅ‚Ä…cz VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Włącza mapowanie wypukłości dla tekstur. Mapy normalnych muszą być dodane "
+#~ "w paczce tekstur\n"
+#~ "lub muszą być automatycznie wygenerowane.\n"
+#~ "Wymaga włączonych shaderów."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "WÅ‚Ä…cz filmic tone mapping"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Włącza generację map normalnych w locie  (efekt płaskorzeźby).\n"
+#~ "Wymaga włączenia mapowania wypukłości."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "WÅ‚Ä…cza mapowanie paralaksy.\n"
+#~ "Wymaga włączenia shaderów."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Eksperymentalna opcja, może powodować widoczne przestrzenie\n"
+#~ "pomiędzy blokami kiedy ustawiona powyżej 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS podczas pauzy w menu"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Podstawowy szum wysokości wznoszącego się terenu"
 
@@ -7460,6 +7505,12 @@ msgstr "Limit czasu cURL"
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Generuj normalne mapy"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Generuj mapy normalnych"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Wsparcie IPv6."
 
@@ -7470,18 +7521,108 @@ msgstr "Limit czasu cURL"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Ostrość naświetlenia"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Limit oczekiwań na dysku"
+
+#~ msgid "Main"
+#~ msgstr "Menu główne"
+
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "Skrypt głównego menu"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Minimapa w trybie radaru, Zoom x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Minimapa w trybie radaru, Zoom x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Minimapa w trybie powierzchniowym, powiększenie x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Minimapa w trybie powierzchniowym, powiększenie x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nazwa gracza/Hasło"
+
+#~ msgid "No"
+#~ msgstr "Nie"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Próbkowanie normalnych map"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Siła map normlanych"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Liczba iteracji dla parallax occlusion."
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr ""
+#~ "Ogólny błąd systematyczny efektu zamykania paralaksy, zwykle skala/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Całkowity efekt skalowania zamknięcia paralaksy."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Mapowanie paralaksy"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Zamknięcie paralaksy"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Błąd systematyczny zamknięcia paralaksy"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Iteracje zamknięcia paralaksy"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Tryb zamknięcia paralaksy"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Skala parallax occlusion"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Siła zamknięcia paralaksy"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Ścieżka do pliku .ttf lub bitmapy."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Ścieżka, pod którą zapisywane są zrzuty ekranu."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Projekcja lochów"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Resetuj świat pojedynczego gracza"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Wybierz plik paczki:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Limit cieni"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Tryb jednoosobowy"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Siła generowanych zwykłych map."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Siłą przyśpieszenia środkowego krzywej światła."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Ta czcionka zostanie użyta w niektórych językach."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Przełącz na tryb Cinematic"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7493,9 +7634,18 @@ msgstr "Limit czasu cURL"
 #~ "Zmienność wysokości wzgórz oraz głębokości jezior na gładkim terenie "
 #~ "wznoszÄ…cym siÄ™."
 
+#~ msgid "Waving Water"
+#~ msgstr "FalujÄ…ca woda"
+
 #~ msgid "Waving water"
 #~ msgstr "FalujÄ…ca woda"
 
+#~ msgid "Whether dungeons occasionally project from the terrain."
+#~ msgstr "Określa czy lochy mają być czasem przez generowane teren."
+
+#~ msgid "Y of upper limit of lava in large caves."
+#~ msgstr "Y górnej granicy lawy dużych jaskiń."
+
 #~ msgid "Y-level of floatland midpoint and lake surface."
 #~ msgstr ""
 #~ "Wysokość średniego punktu wznoszącego się terenu oraz powierzchni jezior."
@@ -7503,17 +7653,5 @@ msgstr "Limit czasu cURL"
 #~ msgid "Y-level to which floatland shadows extend."
 #~ msgstr "Wysokość do której rozciągają się cienie wznoszącego terenu."
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "Projekcja lochów"
-
-#~ msgid "Whether dungeons occasionally project from the terrain."
-#~ msgstr "Określa czy lochy mają być czasem przez generowane teren."
-
-#~ msgid "Waving Water"
-#~ msgstr "FalujÄ…ca woda"
-
-#~ msgid "Y of upper limit of lava in large caves."
-#~ msgstr "Y górnej granicy lawy dużych jaskiń."
-
-#~ msgid "Select Package File:"
-#~ msgstr "Wybierz plik paczki:"
+#~ msgid "Yes"
+#~ msgstr "Tak"
diff --git a/po/pt/minetest.po b/po/pt/minetest.po
index 912f18a5f..78c46b6d8 100644
--- a/po/pt/minetest.po
+++ b/po/pt/minetest.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Portuguese (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-03-31 10:14+0000\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-23 15:50+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/minetest/"
 "minetest/pt/>\n"
@@ -12,11 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.0-dev\n"
+"X-Generator: Weblate 4.5\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Renascer"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Você morreu"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -36,11 +44,7 @@ msgstr "Reconectar"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr "O servidor requisitou uma reconexão:"
-
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "A carregar..."
+msgstr "O servidor solicitou uma reconexão :"
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "O 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 verifique a sua ligação à "
-"internet."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Nós suportamos apenas o protocolo versão $1."
 
@@ -68,7 +66,8 @@ msgstr "Nós suportamos apenas o protocolo versão $1."
 msgid "We support protocol versions between version $1 and $2."
 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_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Nós suportamos as versões de protocolo entre $1 e $2."
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependências:"
 
@@ -88,7 +88,7 @@ msgstr "Desativar tudo"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr "Desabilitar modpack"
+msgstr "Desativar modpack"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -96,7 +96,7 @@ msgstr "Ativar tudo"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr "Habilitar modpack"
+msgstr "Ativar modpack"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
@@ -109,7 +109,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "Encontre Mais Mods"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -153,21 +153,60 @@ msgid "enabled"
 msgstr "ativado"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" já existe. Gostaria de sobrescrevê-lo?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "As dependências de $1 e $2 serão instaladas."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 por $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"A descarregar $1,\n"
+"$2 na fila"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "A descarregar $1..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 dependências necessárias não foram encontradas."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 serão instalados e $2 dependências serão ignoradas."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Todos os pacotes"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Já instalado"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Voltar ao menu principal"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Jogo base:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB não está disponível quando Minetest é compilado sem cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "A carregar..."
+msgstr "A descarregar..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
@@ -183,6 +222,14 @@ msgid "Install"
 msgstr "Instalar"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "Instalar $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Instalar dependências ausentes"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mods"
@@ -196,9 +243,24 @@ msgid "No results"
 msgstr "Sem resultados"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Procurar"
+msgid "No updates"
+msgstr "Sem atualizações"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Não encontrado"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Sobrescrever"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Verifique se o jogo base está correto."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "Enfileirado"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -213,8 +275,12 @@ msgid "Update"
 msgstr "Atualizar"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr ""
+msgid "Update All [$1]"
+msgstr "Atualizar tudo [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Exibir mais informações num navegador da Web"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -222,45 +288,39 @@ msgstr "O mundo com o nome \"$1\" já existe"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Terreno adicional"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
 msgstr "Frio de altitude"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Altitude dry"
-msgstr "Frio de altitude"
+msgstr "Altitude seca"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biome blending"
-msgstr "Ruído da Biome"
+msgstr "Mistura de biomas"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biomes"
-msgstr "Ruído da Biome"
+msgstr "Biomas"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caverns"
-msgstr "Barulho da caverna"
+msgstr "Cavernas"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "Octavos"
+msgstr "Cavernas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "Criar"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Monitorização"
+msgstr "Decorações"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -271,23 +331,20 @@ msgid "Download one from minetest.net"
 msgstr "Descarregue um do site minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "Ruído de masmorra"
+msgstr "Masmorras"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Terreno plano"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floating landmasses in the sky"
-msgstr "Densidade da terra flutuante montanhosa"
+msgstr "Terrenos flutuantes no céu"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floatlands (experimental)"
-msgstr "Nível de água"
+msgstr "Terrenos flutuantes (experimental)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -295,28 +352,27 @@ msgstr "Jogo"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Gerar terreno não-fractal: Oceanos e subsolo"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Montanhas"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Humid rivers"
-msgstr "Driver de vídeo"
+msgstr "Rios húmidos"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Aumenta a humidade perto de rios"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Lagos"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "Baixa humidade e calor elevado resultam em rios rasos ou secos"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -327,22 +383,20 @@ msgid "Mapgen flags"
 msgstr "Flags do mapgen"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mapgen-specific flags"
-msgstr "Flags específicas do gerador de mundo V5"
+msgstr "Flags específicas do mapgen"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mountains"
-msgstr "Ruído da montanha"
+msgstr "Montanhas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Fluxo de lama"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Conectar túneis e cavernas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -350,20 +404,19 @@ msgstr "Nenhum jogo selecionado"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "Reduz calor com altitude"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "Reduz humidade com altitude"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Rivers"
-msgstr "Tamanho do Rio"
+msgstr "Rios"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Rios ao nível do mar"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -372,52 +425,51 @@ msgstr "Seed"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "Transição suave entre biomas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"Estruturas que aparecem no terreno (sem efeito em árvores e grama da selva "
+"criada pelo v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "Estruturas que aparecem no terreno, geralmente árvores e plantas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "Temperado, Deserto"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "Temperado, Deserto, Selva"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "Temperado, Deserto, Selva, Tundra, Floresta Boreal"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Terrain surface erosion"
-msgstr "Altura do terreno"
+msgstr "Erosão superficial do terreno"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "�rvores e relva da selva"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Vary river depth"
-msgstr "Profundidade do Rio"
+msgstr "Variar a profundidade do rio"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Cavernas bastante profundas"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
-msgstr "Aviso: O minimal development test destina-se apenas a desenvolvedores."
+msgstr "Aviso: O Development Test destina-se apenas a programadores."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -439,7 +491,7 @@ msgstr "Eliminar"
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "pkgmgr: failed to delete \"$1\""
-msgstr "pkgmgr: não foi possível excluir \"$1\""
+msgstr "pkgmgr: não foi possível apagar \"$1\""
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "pkgmgr: invalid path \"$1\""
@@ -482,11 +534,6 @@ msgid "Browse"
 msgstr "Navegar"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Cliente"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Desativado"
 
@@ -531,6 +578,10 @@ msgid "Scale"
 msgstr "Escala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Procurar"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Selecione o diretório"
 
@@ -599,7 +650,7 @@ msgstr "amenizado"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "$1 (Enabled)"
-msgstr "$1 (Habilitado)"
+msgstr "$1 (Ativado)"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "$1 mods"
@@ -648,6 +699,21 @@ msgstr "Não foi possível instalar um módulo como um $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Não foi possível instalar um modpack como um $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "A carregar..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "O scripting de cliente está desativado"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Tente recarregar a lista de servidores públicos e verifique a sua ligação à "
+"internet."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Procurar conteúdo online"
@@ -658,7 +724,7 @@ msgstr "Conteúdo"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
-msgstr "Desabilitar pacote de texturas"
+msgstr "Desativar pacote de texturas"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Information:"
@@ -698,11 +764,19 @@ msgstr "Desenvolvedores Principais"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
-msgstr "Créditos"
+msgstr "Méritos"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "Abrir o diretório de dados do utilizador"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Abre o diretório que contém mundos, jogos, mods fornecidos pelo utilizador,\n"
+"e pacotes de textura num gestor de ficheiros / explorador."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -721,14 +795,10 @@ msgid "Bind Address"
 msgstr "Endereço de ligação"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Configurar"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Modo Criativo"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Ativar Dano"
 
@@ -742,11 +812,11 @@ msgstr "Servidor"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "Instalar jogos do ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nome/palavra-passe"
+msgid "Name"
+msgstr "Nome"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -757,6 +827,10 @@ msgid "No world created or selected!"
 msgstr "Nenhum mundo criado ou seleccionado!"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Palavra-passe"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Jogar Jogo"
 
@@ -765,6 +839,10 @@ msgid "Port"
 msgstr "Porta"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Selecionar mods"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Seleccionar Mundo:"
 
@@ -780,23 +858,23 @@ msgstr "Iniciar o jogo"
 msgid "Address / Port"
 msgstr "Endereço / Porta"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Ligar"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Modo Criativo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Dano ativado"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Rem. Favorito"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favorito"
 
@@ -804,16 +882,16 @@ msgstr "Favorito"
 msgid "Join Game"
 msgstr "Juntar-se ao jogo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nome / Palavra-passe"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP ativado"
 
@@ -842,10 +920,6 @@ msgid "Antialiasing:"
 msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Tem a certeza que deseja reiniciar o seu mundo?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Auto salvar tamanho do ecrã"
 
@@ -853,10 +927,6 @@ msgstr "Auto salvar tamanho do ecrã"
 msgid "Bilinear Filter"
 msgstr "Filtro bilinear"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Bump mapping"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Mudar teclas"
@@ -870,10 +940,6 @@ msgid "Fancy Leaves"
 msgstr "Folhas detalhadas"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Gerar Normal maps"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -882,10 +948,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Filtro Anisotrópico"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Não"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Sem Filtro"
 
@@ -913,21 +975,13 @@ msgstr "Folhas Opacas"
 msgid "Opaque Water"
 msgstr "�gua Opaca"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Oclusão de paralaxe"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Ativar Particulas"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Reiniciar mundo singleplayer"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
-msgstr "Tela:"
+msgstr "Ecrã:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
@@ -938,6 +992,10 @@ msgid "Shaders"
 msgstr "Sombras"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Shaders (experimental)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Sombreadores(indisponível)"
 
@@ -981,22 +1039,6 @@ msgstr "Líquidos ondulantes"
 msgid "Waving Plants"
 msgstr "Plantas ondulantes"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Sim"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Configurar mods"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Principal"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Iniciar Um Jogador"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Erro de ligação (tempo excedido)."
@@ -1112,15 +1154,15 @@ msgstr "Nome do servidor: "
 
 #: src/client/game.cpp
 msgid "Automatic forward disabled"
-msgstr "Avanço automático para frente desabilitado"
+msgstr "Avanço automático desativado"
 
 #: src/client/game.cpp
 msgid "Automatic forward enabled"
-msgstr "Avanço automático para frente habilitado"
+msgstr "Avanço automático para frente ativado"
 
 #: src/client/game.cpp
 msgid "Camera update disabled"
-msgstr "Atualização da camera desabilitada"
+msgstr "Atualização da camera desativada"
 
 #: src/client/game.cpp
 msgid "Camera update enabled"
@@ -1132,15 +1174,15 @@ msgstr "Mudar palavra-passe"
 
 #: src/client/game.cpp
 msgid "Cinematic mode disabled"
-msgstr "Modo cinemático desabilitado"
+msgstr "Modo cinemático desativado"
 
 #: src/client/game.cpp
 msgid "Cinematic mode enabled"
-msgstr "Modo cinemático habilitado"
+msgstr "Modo cinemático ativado"
 
 #: src/client/game.cpp
 msgid "Client side scripting is disabled"
-msgstr "Scripting de cliente está desabilitado"
+msgstr "O scripting de cliente está desativado"
 
 #: src/client/game.cpp
 msgid "Connecting to server..."
@@ -1151,53 +1193,37 @@ msgid "Continue"
 msgstr "Continuar"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Controles:\n"
-"\n"
-"- %s1: andar para frente\n"
-"\n"
-"- %s2: andar para trás\n"
-"\n"
-"- %s3: andar para a esquerda\n"
-"\n"
-"-%s4: andar para a direita\n"
-"\n"
-"- %s5: pular/escalar\n"
-"\n"
-"- %s6: esgueirar/descer\n"
-"\n"
-"- %s7: soltar item\n"
-"\n"
-"- %s8: inventário\n"
-"\n"
-"- Mouse: virar/olhar\n"
-"\n"
-"- Botão esquerdo do mouse: cavar/dar soco\n"
-"\n"
-"- Botão direito do mouse: colocar/usar\n"
-"\n"
-"- Roda do mouse: selecionar item\n"
-"\n"
-"- %s9: bate-papo\n"
+"- %s: mover para a frente\n"
+"- %s: mover para trás\n"
+"- %s: mover para a esquerda\n"
+"- %s: mover para a direita\n"
+"- %s: saltar/escalar\n"
+"- %s: cavar/socar\n"
+"- %s: colocar/usar\n"
+"- %s: esgueirar/descer\n"
+"- %s: soltar item\n"
+"- %s: inventário\n"
+"- Rato: virar/ver\n"
+"- Roda do rato: selecionar item\n"
+"- %s: bate-papo\n"
 
 #: src/client/game.cpp
 msgid "Creating client..."
@@ -1249,11 +1275,11 @@ msgstr ""
 
 #: src/client/game.cpp
 msgid "Disabled unlimited viewing range"
-msgstr "Alcance de visualização ilimitado desabilitado"
+msgstr "Alcance de visualização ilimitado desativado"
 
 #: src/client/game.cpp
 msgid "Enabled unlimited viewing range"
-msgstr "Alcance de visualização ilimitado habilitado"
+msgstr "Alcance de visualização ilimitado ativado"
 
 #: src/client/game.cpp
 msgid "Exit to Menu"
@@ -1265,47 +1291,37 @@ msgstr "Sair para o S.O"
 
 #: src/client/game.cpp
 msgid "Fast mode disabled"
-msgstr "Modo rápido desabilitado"
+msgstr "Modo rápido desativado"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled"
-msgstr "Modo rápido habilitado"
+msgstr "Modo rápido ativado"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr "Modo rápido habilitado(note: sem privilégio 'fast')"
+msgstr "Modo rápido ativado (note: sem privilégio 'fast')"
 
 #: src/client/game.cpp
 msgid "Fly mode disabled"
-msgstr "Modo voo desabilitado"
+msgstr "Modo voo desativado"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled"
-msgstr "Modo voo habilitado"
+msgstr "Modo voo ativado"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr "Modo voo habilitado(note: sem privilegio 'fly')"
+msgstr "Modo voo ativado (note: sem privilégio 'fly')"
 
 #: src/client/game.cpp
 msgid "Fog disabled"
-msgstr "Névoa desabilitada"
+msgstr "Névoa desativada"
 
 #: src/client/game.cpp
 msgid "Fog enabled"
 msgstr "Névoa habilitada"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Névoa desabilitada"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Névoa habilitada"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Info do jogo:"
 
@@ -1326,16 +1342,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Névoa desabilitada"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Dano ativado"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Media..."
 
@@ -1345,47 +1351,19 @@ msgstr "MiB/s"
 
 #: src/client/game.cpp
 msgid "Minimap currently disabled by game or mod"
-msgstr "Minipapa atualmente desabilitado por jogo ou mod"
-
-#: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Minimapa escondido"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Minimapa em modo radar, zoom 1x"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Minimapa em modo radar, zoom 2x"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Minimapa em modo radar, zoom 4x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Minimapa em modo de superfície, zoom 1x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Minimapa em modo de superfície, zoom 2x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Minimapa em modo de superfície, zoom 4x"
+msgstr "Minipapa atualmente desativado por jogo ou mod"
 
 #: src/client/game.cpp
 msgid "Noclip mode disabled"
-msgstr "Modo atravessar paredes desabilitado"
+msgstr "Modo de atravessar paredes desativado"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled"
-msgstr "Modo atravessar paredes habilitado"
+msgstr "Modo atravessar paredes ativado"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled (note: no 'noclip' privilege)"
-msgstr "Modo atravessar paredes habilitado(note: sem privilégio 'noclip')"
+msgstr "Modo atravessar paredes ativado (note: sem privilégio 'noclip')"
 
 #: src/client/game.cpp
 msgid "Node definitions..."
@@ -1401,11 +1379,11 @@ msgstr "Ligado"
 
 #: src/client/game.cpp
 msgid "Pitch move mode disabled"
-msgstr "Modo movimento pitch desabilitado"
+msgstr "Modo movimento pitch desativado"
 
 #: src/client/game.cpp
 msgid "Pitch move mode enabled"
-msgstr "Modo movimento pitch habilitado"
+msgstr "Modo movimento pitch ativado"
 
 #: src/client/game.cpp
 msgid "Profiler graph shown"
@@ -1420,10 +1398,6 @@ msgid "Resolving address..."
 msgstr "A resolver endereço..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Renascer"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "A desligar..."
 
@@ -1441,11 +1415,11 @@ msgstr "Som mutado"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "Som do sistema está desativado"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "Som do sistema não é suportado nesta versão"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1464,7 +1438,7 @@ msgstr "Distancia de visualização está no máximo:%d"
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at minimum: %d"
-msgstr "Distancia de visualização  está no mínima:%d"
+msgstr "Distancia de visualização está no mínimo: %d"
 
 #: src/client/game.cpp
 #, c-format
@@ -1476,12 +1450,8 @@ msgid "Wireframe shown"
 msgstr "Mostrar wireframe"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Você morreu"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
-msgstr "Zoom atualmente desabilitado por jogo ou mod"
+msgstr "Zoom atualmente desativado por jogo ou mod"
 
 #: src/client/game.cpp
 msgid "ok"
@@ -1496,16 +1466,6 @@ msgid "Chat shown"
 msgstr "Conversa mostrada"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Conversa oculta"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Conversa mostrada"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "Interface escondida"
 
@@ -1785,6 +1745,24 @@ msgstr "Botão X 2"
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Minimapa escondido"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Minimapa em modo radar, ampliação %dx"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Minimapa em modo de superfície, ampliação %dx"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Minimapa em modo de textura"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "As palavra-passes não correspondem!"
@@ -1830,26 +1808,6 @@ msgid "Backward"
 msgstr "Recuar"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Mudar camera"
 
@@ -1942,30 +1900,10 @@ msgid "Special"
 msgstr "Especial"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Especial"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Ativar/Desativar câmera cinemática"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Ativar/Desativar câmera cinemática"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Ativar interface"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Ativar/Desativar vôo"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Ativar histórico de conversa"
 
@@ -2044,7 +1982,7 @@ msgid ""
 "If disabled, virtual joystick will center to first-touch's position."
 msgstr ""
 "(Android) Corrige a posição do joystick virtual.\n"
-"Se desabilitado, o joystick virtual vai centralizar na posição do primeiro "
+"Se desativado, o joystick virtual vai centralizar na posição do primeiro "
 "toque."
 
 #: src/settings_translation_file.cpp
@@ -2054,8 +1992,8 @@ msgid ""
 "circle."
 msgstr ""
 "(Android) Use joystick virtual para ativar botão \"aux\".\n"
-"Se habilitado, o joystick virtual vai também clicar no botão \"aux\" quando "
-"estiver fora do circulo principal."
+"Se ativado, o joystick virtual vai também clicar no botão \"aux\" quando "
+"estiver fora do círculo principal."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2089,19 +2027,11 @@ msgid ""
 msgstr ""
 "(X,Y,Z) Escala fractal em nós.\n"
 "Tamanho fractal atual será de 2 a 3 vezes maior.\n"
-"Esses números podem ser muito grandes, o fractal não tem que encaixar dentro "
-"do mundo.\n"
+"Esses números podem ser muito grandes, o fractal não \n"
+"tem que encaixar dentro do mundo.\n"
 "Aumente estes para 'ampliar' nos detalhes do fractal.\n"
-"Padrão é para uma forma espremida verticalmente para uma ilha, coloque todos "
-"os 3 números iguais para a forma crua."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = oclusão paralaxe com dados de inclinação (mais rápido).\n"
-"1 = mapeamento de relevo (mais lento, mais preciso)."
+"Predefinição é para uma forma espremida verticalmente para uma ilha,\n"
+"ponha todos os 3 números iguais para a forma crua."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
@@ -2140,9 +2070,8 @@ msgid "3D mode"
 msgstr "Modo 3D"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D mode parallax strength"
-msgstr "Intensidade de normalmaps"
+msgstr "Força de paralaxe do modo 3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
@@ -2163,6 +2092,12 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"Ruído 3D definindo as estruturas de terras flutuantes\n"
+"Se alterar da predefinição, a 'escala' do ruído (0.7 por predefinição) pode "
+"precisar\n"
+"ser ajustada, já que o afunilamento das terras flutuantes funciona melhor "
+"quando o ruído tem\n"
+"um valor entre -2.0 e 2.0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
@@ -2195,16 +2130,16 @@ msgid ""
 "-    pageflip: quadbuffer based 3d.\n"
 "Note that the interlaced mode requires shaders to be enabled."
 msgstr ""
-"Suporte 3D.\n"
+"Suporte de 3D.\n"
 "Modos atualmente suportados:\n"
-"-    none: Nenhum efeito 3D.\n"
-"-    anaglyph: Sistema de cor Ciano/Magenta (Óculos 3D azul vermelho).\n"
-"-    interlaced: Sistema interlaçado (Óculos com lentes polarizadas).\n"
-"-    topbottom: Divide a tela em duas: uma em cima e outra em baixo.\n"
-"-    sidebyside: Divide a tela em duas: lado a lado.\n"
+"-    none: nenhum efeito 3D.\n"
+"-    anaglyph: sistema de cor Ciano/Magenta (Óculos 3D azul vermelho).\n"
+"-    interlaced: sistema interlaçado (Óculos com lentes polarizadas).\n"
+"-    topbottom: divide o ecrã em dois: um em cima e outro em baixo.\n"
+"-    sidebyside: divide o ecrã em dois: lado a lado.\n"
 " -   crossview: 3D de olhos cruzados.\n"
-" -   pageflip: Quadbuffer baseado em 3D.\n"
-"Note que o modo interlaçado requer que o sombreamento esteja habilitado."
+" -   pageflip: quadbuffer baseado em 3D.\n"
+"Note que o modo interlaçado requer que sombreamentos estejam ativados."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2231,9 +2166,12 @@ msgid "ABM interval"
 msgstr "Intervalo do ABM"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "ABM time budget"
+msgstr "Orçamento de tempo do ABM"
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "Limite absoluto da fila de espera emergente"
+msgstr "Limite absoluto de blocos em fila de espera a emergir"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -2290,6 +2228,11 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"Ajusta a densidade da camada de terrenos flutuantes.\n"
+"Aumenta o valor para aumentar a densidade. Pode ser positivo ou negativo.\n"
+"Valor = 0,0: 50% do volume são terrenos flutuantes.\n"
+"Valor = 2,0 (pode ser maior dependendo de 'mgv7_np_floatland', teste sempre\n"
+"para ter certeza) cria uma camada sólida de terrenos flutuantes."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -2358,8 +2301,8 @@ msgid ""
 "Arm inertia, gives a more realistic movement of\n"
 "the arm when the camera moves."
 msgstr ""
-"Inercia dos braços fornece um movimento mais realista dos braços quando a "
-"câmera mexe."
+"Inercia dos braços fornece um movimento mais \n"
+"realista dos braços quando a câmara se move."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
@@ -2380,12 +2323,15 @@ msgid ""
 "Stated in mapblocks (16 nodes)."
 msgstr ""
 "Nesta distância, o servidor otimizará agressivamente quais blocos são "
-"enviados aos clientes.\n"
-"Pequenos valores potencialmente melhoram muito o desempenho, à custa de "
-"falhas de renderização visíveis(alguns blocos não serão processados debaixo "
-"da água e nas cavernas, bem como às vezes em terra).\n"
+"enviados aos \n"
+"clientes.\n"
+"Pequenos valores potencialmente melhoram muito o desempenho, à custa de \n"
+"falhas de renderização visíveis (alguns blocos não serão processados debaixo "
+"da \n"
+"água e nas cavernas, bem como às vezes em terra).\n"
 "Configure isso como um valor maior do que a "
-"distância_máxima_de_envio_do_bloco para desabilitar essa otimização.\n"
+"distância_máxima_de_envio_do_bloco \n"
+"para desativar essa otimização.\n"
 "Especificado em barreiras do mapa (16 nós)."
 
 #: src/settings_translation_file.cpp
@@ -2485,21 +2431,16 @@ msgid "Builtin"
 msgstr "Integrado"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bump mapping"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
 "Increasing can reduce artifacting on weaker GPUs.\n"
 "0.1 = Default, 0.25 = Good value for weaker tablets."
 msgstr ""
-"Distancia do plano próximo da câmera em nós, entre 0 e 0.5\n"
+"Distancia do plano próximo da câmara em nós, entre 0 e 0.5\n"
 "A maioria dos utilizadores não precisará mudar isto.\n"
 "Aumentar pode reduzir a ocorrência de artefactos em GPUs mais fracas.\n"
-"0.1 = Padrão, 0.25 = Bom valor para tablets fracos."
+"0.1 = Predefinição, 0.25 = Bom valor para tablets fracos."
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
@@ -2566,33 +2507,16 @@ msgstr ""
 "0,0 é o nível mínimo de luz, 1,0 é o nível máximo de luz."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Mudanças para a interface do menu principal:\n"
-" - Total: Múltiplos mundos de um jogador, escolha de jogo, escolha de pacote "
-"de texturas, etc.\n"
-"- Simples: Um mundo de um jogador, sem escolha de jogo ou pacote de "
-"texturas. Pode ser necessário para telas menores."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat font size"
-msgstr "Tamanho da fonte"
+msgstr "Tamanho da fonte do chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
 msgstr "Tecla de conversação"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat log level"
-msgstr "Nível de log de depuração"
+msgstr "Nível de log do chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
@@ -2748,6 +2672,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "Lista negra de flags do ContentDB"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "Máximo de descargas simultâneas de ContentDB"
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "Url do ContentDB"
 
@@ -2760,9 +2688,9 @@ msgid ""
 "Continuous forward movement, toggled by autoforward key.\n"
 "Press the autoforward key again or the backwards movement to disable."
 msgstr ""
-"Movimento para frente contínuo, ativado pela tela de avanço automático.\n"
-"Pressione a tecla de avanço frontal novamente, ou a tecla de movimento para "
-"trás para desabilitar."
+"Movimento para frente contínuo, ativado pela tecla de avanço automático.\n"
+"Pressione a tecla de avanço frontal novamente ou a tecla de movimento para "
+"trás para desativar."
 
 #: src/settings_translation_file.cpp
 msgid "Controls"
@@ -2813,7 +2741,10 @@ msgid "Crosshair alpha"
 msgstr "Opacidade do cursor"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Opacidade do cursor (entre 0 e 255)."
 
 #: src/settings_translation_file.cpp
@@ -2821,8 +2752,10 @@ msgid "Crosshair color"
 msgstr "Cor do cursor"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Cor do cursor (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2849,9 +2782,8 @@ msgid "Dec. volume key"
 msgstr "Tecla de dimin. de som"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Decrease this to increase liquid resistance to movement."
-msgstr "Diminue isto para aumentar a resistência do líquido ao movimento."
+msgstr "Diminuir isto para aumentar a resistência do líquido ao movimento."
 
 #: src/settings_translation_file.cpp
 msgid "Dedicated server step"
@@ -2886,9 +2818,8 @@ msgid "Default report format"
 msgstr "Formato de report predefinido"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default stack size"
-msgstr "Jogo por defeito"
+msgstr "Tamanho de pilha predefinido"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2930,14 +2861,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Define localizações e terrenos de morros e lagos opcionais."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Define nível de amostragem de textura.\n"
-"Um valor mais alto resulta em mapas normais mais suaves."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Define o nível base do solo."
 
@@ -3018,6 +2941,11 @@ msgid "Desynchronize block animation"
 msgstr "Dessincroniza animação de blocos"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Tecla para a direita"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Ativar Particulas"
 
@@ -3074,24 +3002,25 @@ msgid ""
 "Enable Lua modding support on client.\n"
 "This support is experimental and API can change."
 msgstr ""
-"Habilitar suporte a mods LUA locais no cliente.\n"
+"Ativar suporte a mods LUA locais no cliente.\n"
 "Esse suporte é experimental e a API pode mudar."
 
 #: src/settings_translation_file.cpp
 msgid "Enable console window"
-msgstr "Habilitar janela de console"
+msgstr "Ativar janela de console"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
-msgstr "Habilitar modo criativo para mundos novos."
+#, fuzzy
+msgid "Enable creative mode for all players"
+msgstr "Ativar modo criativo para mundos novos."
 
 #: src/settings_translation_file.cpp
 msgid "Enable joysticks"
-msgstr "Habilitar Joysticks"
+msgstr "Ativar Joysticks"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod channels support."
-msgstr "Habilitar suporte a canais de módulos."
+msgstr "Ativar suporte a canais de módulos."
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod security"
@@ -3107,15 +3036,15 @@ msgstr "Ativa a entrada de comandos aleatória (apenas usado para testes)."
 
 #: src/settings_translation_file.cpp
 msgid "Enable register confirmation"
-msgstr "Habilitar registro de confirmação"
+msgstr "Ativar registo de confirmação"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable register confirmation when connecting to server.\n"
 "If disabled, new account will be registered automatically."
 msgstr ""
-"Habilitar confirmação de registro quando conectar ao servidor.\n"
-"Caso desabilitado, uma nova conta será registrada automaticamente."
+"Ativar confirmação de registo quando conectar ao servidor.\n"
+"Caso desativado, uma nova conta será registada automaticamente."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3168,13 +3097,12 @@ msgstr ""
 "Por exemplo: 0 para não ver balançando; 1.0 para normal; 2.0 para duplo."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enable/disable running an IPv6 server.\n"
 "Ignored if bind_address is set.\n"
 "Needs enable_ipv6 to be enabled."
 msgstr ""
-"Habilitar/desabilitar a execução de um IPv6 do servidor. \n"
+"Ativar/desativar a execução de um servidor de IPv6. \n"
 "Ignorado se bind_address estiver definido."
 
 #: src/settings_translation_file.cpp
@@ -3196,18 +3124,6 @@ msgid "Enables animation of inventory items."
 msgstr "Ativa animação de itens no inventário."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Ativa o bumpmapping para texturas. Mapas normais devem ser fornecidos pelo "
-"pack de\n"
-"texturas ou gerado automaticamente.\n"
-"Requer que as sombras sejam ativadas."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Ativar armazenamento em cache para os meshes das faces."
 
@@ -3217,22 +3133,6 @@ msgstr "Ativa mini-mapa."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Ativa geração de normalmap (efeito de relevo) ao voar.\n"
-"Requer texturização bump mapping para ser ativado."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Ativa mapeamento de oclusão de paralaxe.\n"
-"Requer sombreadores ativados."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3253,14 +3153,6 @@ msgstr "Metodos de entidade"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Opção experimental, pode causar espaços visíveis entre blocos\n"
-"quando definido com num úmero superior a 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3268,10 +3160,21 @@ msgid ""
 "Values < 1.0 (for example 0.25) create a more defined surface level with\n"
 "flatter lowlands, suitable for a solid floatland layer."
 msgstr ""
+"Expoente do afunilamento do terreno flutuante. Altera o comportamento de "
+"afunilamento.\n"
+"Valor = 1.0 cria um afunilamento linear e uniforme.\n"
+"Valores > 1.0 criam um afunilamento suave, adequado para a separação "
+"padrão.\n"
+"terras flutuantes.\n"
+"Valores < 1,0 (por exemplo, 0,25) criam um nível de superfície mais definido "
+"com\n"
+"terrenos flutuantes mais planos, adequados para uma camada sólida de "
+"terrenos flutuantes."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS em menu de pausa"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "Máximo FPS quando o jogo é pausado."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3286,9 +3189,8 @@ msgid "Fall bobbing factor"
 msgstr "Cair balançando"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fallback font path"
-msgstr "Fonte alternativa"
+msgstr "Caminho da fonte reserva"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow"
@@ -3296,7 +3198,7 @@ msgstr "Sombra da fonte alternativa"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow alpha"
-msgstr "Canal de opacidade  sombra da fonte alternativa"
+msgstr "Canal de opacidade sombra da fonte alternativa"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font size"
@@ -3389,24 +3291,20 @@ msgid "Fixed virtual joystick"
 msgstr "Joystick virtual fixo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland density"
-msgstr "Densidade da terra flutuante montanhosa"
+msgstr "Densidade do terreno flutuante"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland maximum Y"
-msgstr "Y máximo da dungeon"
+msgstr "Y máximo do terreno flutuante"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland minimum Y"
-msgstr "Y mínimo da dungeon"
+msgstr "Y mínimo do terreno flutuante"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland noise"
-msgstr "Ruído base de terra flutuante"
+msgstr "Ruído no terreno flutuante"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3505,11 +3403,11 @@ msgstr "Opacidade de fundo padrão do formspec"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Color"
-msgstr "Cor de fundo em tela cheia do formspec"
+msgstr "Cor de fundo em ecrã cheio do formspec"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Opacity"
-msgstr "Opacidade de fundo em tela cheia do formspec"
+msgstr "Opacidade de fundo em ecrã cheio do formspec"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec default background color (R,G,B)."
@@ -3521,11 +3419,11 @@ msgstr "Opacidade de fundo padrão do formspec (entre 0 e 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec full-screen background color (R,G,B)."
-msgstr "Cor de fundo(R,G,B) do formspec padrão em tela cheia."
+msgstr "Cor de fundo (R,G,B) do formspec em ecrã cheio."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec full-screen background opacity (between 0 and 255)."
-msgstr "Opacidade de fundo do formspec em tela cheia (entre 0 e 255)."
+msgstr "Opacidade de fundo do formspec em ecrã cheio (entre 0 e 255)."
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
@@ -3601,10 +3499,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Filtro txr2img de redimensionamento do interface gráfico"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Gerar mapa de normais"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Chamadas de retorno Globais"
 
@@ -3666,8 +3560,8 @@ msgstr "Tecla de comutação HUD"
 #, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Tratamento de chamadas ao API Lua obsoletas:\n"
@@ -3684,11 +3578,11 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
-"Tem o instrumento de registro em si:\n"
+"Fazer que o profiler instrumente si próprio:\n"
 "* Monitorar uma função vazia.\n"
-"Isto estima a sobrecarga, que o istrumento está adicionando  (+1 Chamada de "
+"Isto estima a sobrecarga, que o instrumento está a adicionar (+1 chamada de "
 "função).\n"
-"* Monitorar o amostrador que está sendo usado para atualizar as estatísticas."
+"* Monitorar o sampler que está a ser usado para atualizar as estatísticas."
 
 #: src/settings_translation_file.cpp
 msgid "Heat blend noise"
@@ -3960,8 +3854,8 @@ msgid ""
 "are\n"
 "enabled."
 msgstr ""
-"Se estiver desabilitado, a tecla \"especial será usada para voar rápido se "
-"modo voo e rápido estiverem habilitados."
+"Se estiver desativado, a tecla \"especial será usada para voar rápido se "
+"modo voo e rápido estiverem ativados."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3971,10 +3865,13 @@ msgid ""
 "invisible\n"
 "so that the utility of noclip mode is reduced."
 msgstr ""
-"Se habilitado, o servidor executará a seleção de oclusão de bloco de mapa "
-"com base na posição do olho do jogador. Isso pode reduzir o número de blocos "
-"enviados ao cliente de 50 a 80%. O cliente não será mais mais invisível, de "
-"modo que a utilidade do modo \"noclip\" (modo intangível) será reduzida."
+"Se ativado, o servidor executará a seleção de oclusão de bloco de mapa com "
+"base \n"
+"na posição do olho do jogador. Isso pode reduzir o número de blocos enviados "
+"ao \n"
+"cliente de 50 a 80%. O cliente ja não será invisível, de modo que a "
+"utilidade do \n"
+"modo \"noclip\" (modo intangível) será reduzida."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3992,15 +3889,15 @@ msgid ""
 "down and\n"
 "descending."
 msgstr ""
-"Se habilitado, a tecla \"especial\" em vez de \"esgueirar\" servirá para "
-"usada descer."
+"Se ativado, a tecla \"especial\" em vez de \"esgueirar\" servirá para usada "
+"descer."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, actions are recorded for rollback.\n"
 "This option is only read when server starts."
 msgstr ""
-"Se habilitado, as ações são registradas para reversão.\n"
+"Se ativado, as ações são registadas para reversão.\n"
 "Esta opção só é lido quando o servidor é iniciado."
 
 #: src/settings_translation_file.cpp
@@ -4012,16 +3909,16 @@ msgid ""
 "If enabled, invalid world data won't cause the server to shut down.\n"
 "Only enable this if you know what you are doing."
 msgstr ""
-"Se habilitado, dados inválidos do mundo não vão fazer o servidor desligar.\n"
-"Só habilite isso, se você souber o que está fazendo."
+"Se ativado, dados inválidos do mundo não vão fazer o servidor desligar.\n"
+"Só ative isto, se souber o que está a fazer."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, makes move directions relative to the player's pitch when flying "
 "or swimming."
 msgstr ""
-"Se habilitado, faz com que os movimentos sejam relativos ao pitch do jogador "
-"quando voando ou nadando."
+"Se ativado, faz com que os movimentos sejam relativos ao pitch do jogador "
+"quando a voar ou a nadar."
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, new players cannot join with an empty password."
@@ -4044,8 +3941,9 @@ msgid ""
 "limited\n"
 "to this distance from the player to the node."
 msgstr ""
-"Se a restrição de CSM para alcançe de nós está habilitado, chamadas get_node "
-"são limitadas a está distancia do player até o nó."
+"Se a restrição de CSM para o alcançe de nós está ativado, chamadas get_node "
+"são \n"
+"limitadas a está distancia do jogador até o nó."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4204,6 +4102,11 @@ msgid "Joystick button repetition interval"
 msgstr "Intervalo de repetição do botão do Joystick"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "Tipo do Joystick"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Sensibilidade do frustum do Joystick"
 
@@ -4304,6 +4207,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla para pular. \n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4361,7 +4275,7 @@ msgid ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
 "Tecla para mover o jogador para trás.\n"
-"Também ira desabilitar o andar para frente automático quando ativo.\n"
+"Também ira desativar o andar para frente automático quando ativo.\n"
 "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4446,6 +4360,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla para pular. \n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4815,7 +4740,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla para tirar fotos da tela.\n"
+"Tecla para tirar fotos do ecrã.\n"
 "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -5201,10 +5126,6 @@ msgid "Main menu script"
 msgstr "Menu principal de scripts"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Estilo do menu principal"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5220,6 +5141,14 @@ msgid "Makes all liquids opaque"
 msgstr "Torna todos os líquidos opacos"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Diretório do mapa"
 
@@ -5257,11 +5186,11 @@ msgid ""
 "'altitude_dry': Reduces humidity with altitude."
 msgstr ""
 "Atributos de geração de mapa específicos ao gerador Valleys.\n"
-"'altitude_chill':Reduz o calor com a altitude.\n"
-"'humid_rivers':Aumenta a umidade em volta dos rios.\n"
-"'profundidade_variada_rios': Se habilitado, baixa umidade e alto calor faz "
-"com que que rios se tornem mais rasos e eventualmente sumam.\n"
-"'altitude_dry': Reduz a umidade com a altitude."
+"'altitude_chill': Reduz o calor com a altitude.\n"
+"'humid_rivers': Aumenta a humidade à volta de rios.\n"
+"'profundidade_variada_rios': se ativado, baixa a humidade e alto calor faz \n"
+"com que rios se tornem mais rasos e eventualmente sumam.\n"
+"'altitude_dry': reduz a humidade com a altitude."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation attributes specific to Mapgen v5."
@@ -5323,7 +5252,7 @@ msgstr "Gerador de mundo Carpathian"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Carpathian specific flags"
-msgstr "Flags específicas do gerador de mundo  Carpathian"
+msgstr "Flags específicas do gerador do mundo Carpathian"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Flat"
@@ -5406,7 +5335,8 @@ msgid "Maximum FPS"
 msgstr "FPS máximo"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "Máximo FPS quando o jogo é pausado."
 
 #: src/settings_translation_file.cpp
@@ -5472,6 +5402,13 @@ msgstr ""
 "automaticamente."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "Número máximo de chunks carregados forçadamente."
 
@@ -5504,7 +5441,7 @@ msgstr "Número máximo de mensagens recentes mostradas"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of statically stored objects in a block."
-msgstr "Número máximo de objetos estaticamente armazenados em um bloco."
+msgstr "Número máximo de objetos estaticamente armazenados num bloco."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum objects per block"
@@ -5532,7 +5469,7 @@ msgid ""
 "0 to disable queueing and -1 to make the queue size unlimited."
 msgstr ""
 "Tamanho máximo da fila do chat.\n"
-"0 para desabilitar a fila e -1 para a tornar ilimitada."
+"0 para desativar a fila e -1 para a tornar ilimitada."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
@@ -5729,14 +5666,6 @@ msgid "Noises"
 msgstr "Ruidos"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Amostragem de normalmaps"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Intensidade de normalmaps"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Número de seguimentos de emersão"
 
@@ -5783,10 +5712,6 @@ msgstr ""
 "memória (4096 = 100 MB, como uma regra de ouro)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Número de iterações de oclusão de paralaxe."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Repositório de conteúdo online"
 
@@ -5814,34 +5739,6 @@ msgstr ""
 "formspec está aberto."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Enviesamento do efeito de oclusão de paralaxe, normalmente escala/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Escala do efeito de oclusão de paralaxe."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Oclusão de paralaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Enviesamento de oclusão paralaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Iterações de oclusão paralaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Modo de oclusão paralaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Escala de Oclusão de paralaxe"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5912,6 +5809,16 @@ msgid "Pitch move mode"
 msgstr "Modo movimento pitch"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Tecla de voar"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Intervalo de repetição do clique direito"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5944,9 +5851,9 @@ msgid ""
 "Prevent digging and placing from repeating when holding the mouse buttons.\n"
 "Enable this when you dig or place too often by accident."
 msgstr ""
-"Evita remoção e colocação de blocos repetidos quando os botoes do mouse são "
-"segurados.\n"
-"Habilite isto quando você cava ou coloca blocos constantemente por acidente."
+"Evita remoção e colocação de blocos repetidos quando os botoes do rato são "
+"seguros.\n"
+"Ative isto quando cava ou põe blocos constantemente por acidente."
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
@@ -5958,8 +5865,8 @@ msgid ""
 "Print the engine's profiling data in regular intervals (in seconds).\n"
 "0 = disable. Useful for developers."
 msgstr ""
-"Intervalo de impressão de dados do analisador (em segundos). 0 = "
-"desabilitado. Útil para desenvolvedores."
+"Intervalo de impressão de dados do analisador (em segundos). 0 = desativado. "
+"Útil para desenvolvedores."
 
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
@@ -6063,15 +5970,13 @@ msgstr ""
 "Restringe o acesso de certas funções a nível de cliente em servidores.\n"
 "Combine os byflags abaixo par restringir recursos de nível de cliente, ou "
 "coloque 0 para nenhuma restrição:\n"
-"LOAD_CLIENT_MODS: 1 (desabilita o carregamento de mods de cliente)\n"
-"CHAT_MESSAGES: 2 (desabilita a chamada send_chat_message no lado do "
-"cliente)\n"
-"READ_ITEMDEFS: 4 (desabilita a chamada get_item_def no lado do cliente)\n"
-"READ_NODEDEFS: 8 (desabilita a chamada get_node_def no lado do cliente)\n"
+"LOAD_CLIENT_MODS: 1 (desativa o carregamento de mods de cliente)\n"
+"CHAT_MESSAGES: 2 (desativa a chamada send_chat_message no lado do cliente)\n"
+"READ_ITEMDEFS: 4 (desativa a chamada get_item_def no lado do cliente)\n"
+"READ_NODEDEFS: 8 (desativa a chamada get_node_def no lado do cliente)\n"
 "LOOKUP_NODES_LIMIT: 16 (limita a chamada get_node no lado do cliente para "
 "csm_restriction_noderange)\n"
-"READ_PLAYERINFO: 32 (desabilita a chamada get_player_names no lado do "
-"cliente)"
+"READ_PLAYERINFO: 32 (desativa a chamada get_player_names no lado do cliente)"
 
 #: src/settings_translation_file.cpp
 msgid "Ridge mountain spread noise"
@@ -6094,10 +5999,6 @@ msgid "Right key"
 msgstr "Tecla para a direita"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Intervalo de repetição do clique direito"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Profundidade do canal do rio"
 
@@ -6267,7 +6168,7 @@ msgstr ""
 "7 = Conjunto de mandelbrot \"Variation\" 4D.\n"
 "8 = Conjunto de julia \"Variation\" 4D.\n"
 "9 = Conjunto de mandelbrot \"Mandelbrot/Mandelbar\" 3D.\n"
-"10 = Conjunto de julia  \"Mandelbrot/Mandelbar\" 3D.\n"
+"10 = Conjunto de julia \"Mandelbrot/Mandelbar\" 3D.\n"
 "11 = Conjunto de mandelbrot \"�rvore de natal\" 3D.\n"
 "12 = Conjunto de julia \"�rvore de natal\" 3D..\n"
 "13 = Conjunto de mandelbrot \"Bulbo de Mandelbrot\" 3D.\n"
@@ -6396,6 +6297,20 @@ msgid "Show entity selection boxes"
 msgstr "Mostrar as caixas de seleção entidades"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Defina o idioma. Deixe vazio para usar a linguagem do sistema.\n"
+"Apos mudar isso uma reinicialização é necessária."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Fonte em negrito por predefinição"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Mensagem de desligamento"
 
@@ -6504,9 +6419,9 @@ msgid ""
 msgstr ""
 "Especifica a URL no qual os clientes buscam a mídia ao em vez de usar o "
 "UDP.\n"
-"$filename deve ser acessível a partir de $remote_media$filename via cURL \n"
+"$filename deve ser acessível de $remote_media$filename via cURL \n"
 "(obviamente, remote_media deve terminar com uma barra \"/\").\n"
-"Arquivos que não estão presentes serão obtidos da maneira usual por UDP."
+"Ficheiros que não estão presentes serão obtidos da maneira usual por UDP."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6547,10 +6462,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Intensidade de paralaxe."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Intensidade de normalmaps gerados."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6644,7 +6555,7 @@ msgid ""
 "this option allows enforcing it for certain node types. Note though that\n"
 "that is considered EXPERIMENTAL and may not work properly."
 msgstr ""
-"Texturas em um nó podem ser alinhadas ao próprio nó ou ao mundo.\n"
+"Texturas num nó podem ser alinhadas ao próprio nó ou ao mundo.\n"
 "O modo antigo serve melhor para coisas como maquinas, móveis, etc, enquanto "
 "o novo faz com que escadas e microblocos encaixem melhor a sua volta.\n"
 "Entretanto, como essa é uma possibilidade nova, não deve ser usada em "
@@ -6657,6 +6568,11 @@ msgid "The URL for the content repository"
 msgstr "A url para o repositório de conteúdo"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "The deadzone of the joystick"
+msgstr "O identificador do joystick para usar"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6682,7 +6598,7 @@ msgstr "O identificador do joystick para usar"
 #: src/settings_translation_file.cpp
 msgid "The length in pixels it takes for touch screen interaction to start."
 msgstr ""
-"A largura em pixels necessária para interação de tela de toque começar."
+"A largura em pixels necessária para a interação de ecrã de toque começar."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6724,19 +6640,21 @@ msgstr ""
 "Isto deve ser configurado junto com o alcance_objeto_ativo."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end for Irrlicht.\n"
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
-"Renderizador de fundo para o irrlight.\n"
+"Renderizador de fundo para o Irrlicht.\n"
 "Uma reinicialização é necessária após alterar isso.\n"
-"Note: no android, use o OGLES1 caso em dúvida! O aplicativo pode falhar ao "
-"abrir em outro caso.\n"
-"Em outras plataformas, OpenGL é recomendo, e é o único driver com suporte a "
+"Note: no Android, use o OGLES1 caso em dúvida! A app pode falhar ao abrir em "
+"outro caso.\n"
+"Em outras plataformas, OpenGL é recomdado, e é o único driver com suporte "
+"a \n"
 "sombreamento atualmente."
 
 #: src/settings_translation_file.cpp
@@ -6774,6 +6692,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6781,10 +6705,10 @@ msgstr ""
 "quando pressionando uma combinação de botão no joystick."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 "O tempo em segundos entre repetidos cliques direitos ao segurar o botão "
 "direito do mouse."
@@ -6799,9 +6723,9 @@ msgid ""
 "enabled. Also the vertical distance over which humidity drops by 10 if\n"
 "'altitude_dry' is enabled."
 msgstr ""
-"A distancia vertical onde o calor cai por 20 caso 'altitude_chill' esteja "
-"habilitado. Também é a distancia vertical onde a umidade cai por 10 se "
-"'altitude_dry' estiver habilitado."
+"A distância vertical onde o calor cai por 20 caso 'altitude_chill' esteja \n"
+"ativado. Também é a distância vertical onde a humidade cai por 10 se \n"
+"'altitude_dry' estiver ativado."
 
 #: src/settings_translation_file.cpp
 msgid "Third of 4 2D noises that together define hill/mountain range height."
@@ -6855,7 +6779,7 @@ msgstr "Atraso de dica de ferramenta"
 
 #: src/settings_translation_file.cpp
 msgid "Touch screen threshold"
-msgstr "Limiar a tela de toque"
+msgstr "Limiar o ecrã de toque"
 
 #: src/settings_translation_file.cpp
 msgid "Trees noise"
@@ -6948,6 +6872,17 @@ msgstr ""
 "O downscaling correto de gama não é suportado."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Use a filtragem trilinear ao dimensionamento de texturas."
 
@@ -7018,7 +6953,7 @@ msgstr "Velocidade de subida vertical, em nós por segundo."
 
 #: src/settings_translation_file.cpp
 msgid "Vertical screen synchronization."
-msgstr "Sincronização vertical da tela."
+msgstr "Sincronização vertical do ecrã."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
@@ -7189,6 +7124,12 @@ msgstr ""
 "compilado."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 "Determina se animações das texturas dos cubos devem ser dessincronizadas "
@@ -7300,7 +7241,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Y of upper limit of large caves."
-msgstr "Limite Y máximo de grandes  cavernas."
+msgstr "Limite Y máximo de grandes cavernas."
 
 #: src/settings_translation_file.cpp
 msgid "Y-distance over which caverns expand to full size."
@@ -7336,6 +7277,24 @@ msgid "Y-level of seabed."
 msgstr "Nível Y do fundo do mar."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "Tempo limite de descarregamento de ficheiro via cURL"
 
@@ -7347,23 +7306,12 @@ msgstr "limite paralelo de cURL"
 msgid "cURL timeout"
 msgstr "Tempo limite de cURL"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Back"
-#~ msgstr "Voltar"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Descarregando e instalando $1, por favor aguarde..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Limite de filas emerge no disco"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Força da oclusão paralaxe"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Caminho para onde salvar screenshots."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = oclusão paralaxe com dados de inclinação (mais rápido).\n"
+#~ "1 = mapeamento de relevo (mais lento, mais preciso)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7379,10 +7327,43 @@ msgstr "Tempo limite de cURL"
 #~ "Altera como terras flutuantes montanhosas afunilam acima e abaixo do "
 #~ "ponto médio."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Tem a certeza que deseja reiniciar o seu mundo?"
+
+#~ msgid "Back"
+#~ msgstr "Voltar"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Bump mapping"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bump mapping"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Centro do aumento da curva de luz."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Mudanças para a interface do menu principal:\n"
+#~ "-   Total: Múltiplos mundos de um jogador, escolha de jogo, escolha de "
+#~ "pacote de texturas, etc.\n"
+#~ "-   Simples: Um mundo de um jogador, sem escolha de jogo ou pacote de "
+#~ "texturas. Pode ser \n"
+#~ "necessário para ecrãs menores."
+
+#~ msgid "Config mods"
+#~ msgstr "Configurar mods"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7392,6 +7373,9 @@ msgstr "Tempo limite de cURL"
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "Controla a largura dos túneis, um valor menor cria túneis maiores."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Cor do cursor (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Nitidez da escuridão"
 
@@ -7403,6 +7387,13 @@ msgstr "Tempo limite de cURL"
 #~ "Terrenos suavizados ocorrem quando o ruído é menor que zero."
 
 #~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Define nível de amostragem de textura.\n"
+#~ "Um valor mais alto resulta em mapas normais mais suaves."
+
+#~ msgid ""
 #~ "Deprecated, define and locate cave liquids using biome definitions "
 #~ "instead.\n"
 #~ "Y of upper limit of lava in large caves."
@@ -7411,12 +7402,50 @@ msgstr "Tempo limite de cURL"
 #~ "biomas.\n"
 #~ "Y do limite superior de lava em grandes cavernas."
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Descarregando e instalando $1, por favor aguarde..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Ativar VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Ativa o bumpmapping para texturas. Mapas normais devem ser fornecidos "
+#~ "pelo pack de\n"
+#~ "texturas ou gerado automaticamente.\n"
+#~ "Requer que as sombras sejam ativadas."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Ativa mapeamento de tons fílmico"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Ativa geração de normalmap (efeito de relevo) ao voar.\n"
+#~ "Requer texturização bump mapping para ser ativado."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Ativa mapeamento de oclusão de paralaxe.\n"
+#~ "Requer sombreadores ativados."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Opção experimental, pode causar espaços visíveis entre blocos\n"
+#~ "quando definido com num úmero superior a 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS em menu de pausa"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Altura base de ruído de terra flutuante"
 
@@ -7429,6 +7458,12 @@ msgstr "Tempo limite de cURL"
 #~ msgid "Gamma"
 #~ msgstr "Gama"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Gerar Normal maps"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Gerar mapa de normais"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Suporte IPv6."
 
@@ -7438,18 +7473,106 @@ msgstr "Tempo limite de cURL"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Nitidez da iluminação"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Limite de filas emerge no disco"
+
+#~ msgid "Main"
+#~ msgstr "Principal"
+
+#~ msgid "Main menu style"
+#~ msgstr "Estilo do menu principal"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Minimapa em modo radar, zoom 2x"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Minimapa em modo radar, zoom 4x"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Minimapa em modo de superfície, zoom 2x"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Minimapa em modo de superfície, zoom 4x"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nome/palavra-passe"
+
+#~ msgid "No"
+#~ msgstr "Não"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Amostragem de normalmaps"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Intensidade de normalmaps"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Número de iterações de oclusão de paralaxe."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr ""
+#~ "Enviesamento do efeito de oclusão de paralaxe, normalmente escala/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Escala do efeito de oclusão de paralaxe."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Oclusão de paralaxe"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Oclusão de paralaxe"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Enviesamento de oclusão paralaxe"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Iterações de oclusão paralaxe"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Modo de oclusão paralaxe"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Escala de Oclusão de paralaxe"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Força da oclusão paralaxe"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Caminho para TrueTypeFont ou bitmap."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Caminho para onde salvar screenshots."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Projetando dungeons"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Reiniciar mundo singleplayer"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Selecionar o ficheiro do pacote:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Limite de mapblock"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Iniciar Um Jogador"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Intensidade de normalmaps gerados."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Força do aumento médio da curva de luz."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Esta fonte será usada para determinados idiomas."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Ativar/Desativar câmera cinemática"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7461,9 +7584,21 @@ msgstr "Tempo limite de cURL"
 #~ "Variação da altura da colina e profundidade do lago no terreno liso da "
 #~ "Terra Flutuante."
 
+#~ msgid "View"
+#~ msgstr "Vista"
+
+#~ msgid "Waving Water"
+#~ msgstr "�gua ondulante"
+
 #~ msgid "Waving water"
 #~ msgstr "Balançar das Ondas"
 
+#~ msgid "Whether dungeons occasionally project from the terrain."
+#~ msgstr "Se dungeons ocasionalmente se projetam do terreno."
+
+#~ msgid "Y of upper limit of lava in large caves."
+#~ msgstr "Limite Y máximo de lava em grandes cavernas."
+
 #~ msgid "Y-level of floatland midpoint and lake surface."
 #~ msgstr ""
 #~ "Nível em Y do ponto médio da montanha flutuante e da superfície do lago."
@@ -7471,17 +7606,5 @@ msgstr "Tempo limite de cURL"
 #~ msgid "Y-level to which floatland shadows extend."
 #~ msgstr "Nível Y para o qual as sombras de ilhas flutuantes se estendem."
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "Projetando dungeons"
-
-#~ msgid "Whether dungeons occasionally project from the terrain."
-#~ msgstr "Se dungeons ocasionalmente se projetam do terreno."
-
-#~ msgid "Waving Water"
-#~ msgstr "�gua ondulante"
-
-#~ msgid "Y of upper limit of lava in large caves."
-#~ msgstr "Limite Y máximo de lava em grandes cavernas."
-
-#~ msgid "Select Package File:"
-#~ msgstr "Selecionar o ficheiro do pacote:"
+#~ msgid "Yes"
+#~ msgstr "Sim"
diff --git a/po/pt_BR/minetest.po b/po/pt_BR/minetest.po
index 79828bdcc..295a59bc5 100644
--- a/po/pt_BR/minetest.po
+++ b/po/pt_BR/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Portuguese (Brazil) (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2019-12-11 13:36+0000\n"
-"Last-Translator: ramon.venson <ramon.venson@gmail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-23 15:50+0000\n"
+"Last-Translator: Victor Barcelos Lacerda <victornuti.1@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "minetest/minetest/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -12,11 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 4.5\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Reviver"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Você morreu"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -38,10 +46,6 @@ msgstr "Reconectar"
 msgid "The server has requested a reconnect:"
 msgstr "O servidor solicitou uma nova conexão:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Carregando..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Versão do protocolo incompatível. "
@@ -55,20 +59,15 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "O 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 reabilitar a lista de servidores públicos e verifique sua conexão com "
-"a internet."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr "Nós apenas suportamos a versão de protocolo $1."
+msgstr "Suportamos apenas o protocolo de versão $1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr "Nós suportamos as versões de protocolo entre $1 e $2 ."
+msgstr "Suportamos protocolos com versões entre $1 e $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Nós suportamos as versões de protocolo entre $1 e $2 ."
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependências:"
 
@@ -109,7 +109,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "Encontre Mais Mods"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -124,9 +124,8 @@ msgid "No game description provided."
 msgstr "Nenhuma descrição de jogo disponível."
 
 #: builtin/mainmenu/dlg_config_world.lua
-#, fuzzy
 msgid "No hard dependencies"
-msgstr "Sem dependências."
+msgstr "Sem dependências"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
@@ -154,25 +153,64 @@ msgid "enabled"
 msgstr "habilitado"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" já existe. Gostaria de sobrescrevê-lo?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "As dependências $1 e $2 serão instaladas."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 por $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 baixando,\n"
+"$2 na fila"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 baixando..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 dependências obrigatórias não puderam ser encontradas."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 será instalado, e $2 dependências serão ignoradas."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Todos os pacotes"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Já instalado"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Voltar ao menu principal"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Jogo Base:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB não está disponível quando Minetest é compilado sem cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "Carregando..."
+msgstr "Baixando..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
-msgstr "Falhou em baixar $1"
+msgstr "Falha ao baixar $1"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -184,22 +222,45 @@ msgid "Install"
 msgstr "Instalar"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "Instalar $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Instalar dependências ausentes"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Modulos (Mods)"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No packages could be retrieved"
-msgstr "Nenhum pacote pode ser recuperado"
+msgstr "Nenhum pacote pôde ser recuperado"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No results"
 msgstr "Sem resultados"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Buscar"
+msgid "No updates"
+msgstr "Sem atualizações"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Não encontrado"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Sobrescrever"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Verifique se o jogo base está correto."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "Na fila"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -214,8 +275,12 @@ msgid "Update"
 msgstr "Atualizar"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr ""
+msgid "Update All [$1]"
+msgstr "Atualizar tudo [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Veja mais informações em um navegador da web"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -223,45 +288,39 @@ msgstr "Já existe um mundo com o nome \"$1\""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Terreno adicional"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr "Frio de altitude"
+msgstr "Altitude fria"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Altitude dry"
-msgstr "Frio de altitude"
+msgstr "Altitude seca"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biome blending"
-msgstr "Ruído do bioma"
+msgstr "Transição de bioma"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biomes"
-msgstr "Ruído do bioma"
+msgstr "Biomas"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caverns"
-msgstr "Barulho da caverna"
+msgstr "Cavernas"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "Octavos"
+msgstr "Cavernas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "Criar"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Monitorização"
+msgstr "Decorações"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -269,26 +328,23 @@ msgstr "Baixe um jogo, como Minetest Game, do site minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr "Baixe um apartir do site minetest.net"
+msgstr "Baixe um a partir do site minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "Y mínimo da dungeon"
+msgstr "Masmorras (Dungeons)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Terreno plano"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floating landmasses in the sky"
-msgstr "Densidade da Ilha Flutuante montanhosa"
+msgstr "Ilhas flutuantes no céu"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floatlands (experimental)"
-msgstr "Nível de água"
+msgstr "Ilhas flutuantes (experimental)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -296,28 +352,27 @@ msgstr "Jogo"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Gera terrenos não fractais: Oceanos e subterrâneos"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Colinas"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Humid rivers"
-msgstr "Driver de vídeo"
+msgstr "Rios húmidos"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Aumenta a humidade perto de rios"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Lagos"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "Baixa humidade e calor elevado resultam em rios rasos ou secos"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -325,25 +380,23 @@ msgstr "Gerador de mapa"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr "Flags do gerador de mundo"
+msgstr "Opções do gerador de mapas"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mapgen-specific flags"
-msgstr "Flags específicas do gerador de mundo V5"
+msgstr "Parâmetros específicos do gerador de mapas"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mountains"
-msgstr "Ruído da montanha"
+msgstr "Montanhas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Fluxo de lama"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Conectar túneis e cavernas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -351,75 +404,72 @@ msgstr "Nenhum jogo selecionado"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "Reduz calor com a altitude"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "Reduz humidade com a altitude"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Rivers"
-msgstr "Tamanho do Rio"
+msgstr "Rios"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Rios ao nível do mar"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Seed"
-msgstr "Seed"
+msgstr "Semente (Seed)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "Transição suave entre biomas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"Estruturas que aparecem no terreno (sem efeito em árvores e grama da selva "
+"criada pelo v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "Estruturas que aparecem no terreno, geralmente árvores e plantas"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "Temperado, Deserto"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "Temperado, Deserto, Selva"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "Temperado, Deserto, Selva, Tundra, Taiga"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Terrain surface erosion"
-msgstr "Altura do terreno"
+msgstr "Erosão na superfície do terreno"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "�rvores e relva da selva"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Vary river depth"
-msgstr "Profundidade do Rio"
+msgstr "Variar altura dos rios"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Cavernas muito grandes nas profundezas do subsolo"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
-msgstr ""
-"Aviso: O game \"minimal development test\" apenas serve para desenvolvedores."
+msgstr "Aviso: O jogo Development Test é projetado para desenvolvedores."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -457,7 +507,7 @@ msgstr "Aceitar"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid "Rename Modpack:"
-msgstr "Renomear pacote de módulos:"
+msgstr "Renomear Modpack:"
 
 #: builtin/mainmenu/dlg_rename_modpack.lua
 msgid ""
@@ -465,7 +515,7 @@ msgid ""
 "override any renaming here."
 msgstr ""
 "Esse modpack possui um nome explícito em seu modpack.conf que vai "
-"sobrescrever qualquer renomeio aqui."
+"sobrescrever qualquer nome aqui."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
@@ -484,11 +534,6 @@ msgid "Browse"
 msgstr "Procurar"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Cliente"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Desabilitado"
 
@@ -518,7 +563,7 @@ msgstr "Persistência"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
-msgstr "Por favor insira um inteiro válido."
+msgstr "Por favor, insira um inteiro válido."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid number."
@@ -526,13 +571,17 @@ msgstr "Por favor, insira um número válido."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
-msgstr "Restaurar para o padrão"
+msgstr "Restaurar Padrão"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
 msgid "Scale"
 msgstr "Escala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Buscar"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Selecione o diretório"
 
@@ -589,7 +638,7 @@ msgstr "valor absoluto"
 #. for noise settings in main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "defaults"
-msgstr "Padrões"
+msgstr "padrão"
 
 #. ~ "eased" is a noise parameter flag.
 #. It is used to make the map smoother and
@@ -605,34 +654,33 @@ msgstr "$1 (Habilitado)"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "$1 mods"
-msgstr "$1 módulos"
+msgstr "$1 mods"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Failed to install $1 to $2"
-msgstr "Não foi possível instalar $1 para $2"
+msgstr "Não foi possível instalar $1 em $2"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install Mod: Unable to find real mod name for: $1"
-msgstr ""
-"Instalação de módulo: não foi possível encontrar o nome real do módulo: $1"
+msgstr "Instalação de mod: não foi possível encontrar o nome real do mod: $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install Mod: Unable to find suitable folder name for modpack $1"
 msgstr ""
-"Instalação do Mod: não foi possível encontrar o nome da pasta adequado para "
+"Instalação de mod: não foi possível encontrar o nome da pasta adequado para "
 "o modpack $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install: Unsupported file type \"$1\" or broken archive"
-msgstr "Instalar: Tipo de arquivo \"$1\" não suportado ou corrompido"
+msgstr "Instalação: Tipo de arquivo \"$1\" não suportado ou corrompido"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install: file: \"$1\""
-msgstr "Instalar: arquivo: \"$1\""
+msgstr "Instalação: arquivo: \"$1\""
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to find a valid mod or modpack"
-msgstr "Incapaz de encontrar um módulo ou modpack válido"
+msgstr "Incapaz de encontrar um mod ou modpack válido"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
@@ -644,12 +692,27 @@ msgstr "Não foi possível instalar um jogo como um $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a mod as a $1"
-msgstr "Não foi possível instalar um módulo como um $1"
+msgstr "Não foi possível instalar um mod como um $1"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a modpack as a $1"
 msgstr "Não foi possível instalar um modpack como um $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Carregando..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Scripting de cliente está desabilitado"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Tente reativar a lista de servidores públicos e verifique sua conexão com a "
+"internet."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Procurar conteúdo online"
@@ -660,7 +723,7 @@ msgstr "Conteúdo"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
-msgstr "Desabilitar pacote de texturas"
+msgstr "Desabilitar Pacote de Texturas"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Information:"
@@ -668,7 +731,7 @@ msgstr "Informação:"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Installed Packages:"
-msgstr "Pacotes instalados:"
+msgstr "Pacotes Instalados:"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No dependencies."
@@ -676,7 +739,7 @@ msgstr "Sem dependências."
 
 #: builtin/mainmenu/tab_content.lua
 msgid "No package description available"
-msgstr "Nenhuma descrição do pacote disponível"
+msgstr "Nenhuma descrição de pacote disponível"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Rename"
@@ -684,71 +747,75 @@ msgstr "Renomear"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Uninstall Package"
-msgstr "Desinstalar o pacote"
+msgstr "Desinstalar Pacote"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Use Texture Pack"
-msgstr "Usar pacote de texturas"
+msgstr "Usar Pacote de Texturas"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Active Contributors"
-msgstr "Colaboradores ativos"
+msgstr "Colaboradores Ativos"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Core Developers"
-msgstr "Desenvolvedores principais"
+msgstr "Desenvolvedores Principais"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
 msgstr "Créditos"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "Abrir diretório de dados do usuário"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Abre o diretório que contém mundos, jogos, mods fornecidos pelo usuário,\n"
+"e pacotes de textura em um gerenciador / navegador de arquivos."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
-msgstr "Colaboradores anteriores"
+msgstr "Colaboradores Anteriores"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
-msgstr "Desenvolvedores principais anteriores"
+msgstr "Desenvolvedores Principais Anteriores"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Announce Server"
-msgstr "Anunciar servidor"
+msgstr "Anunciar Servidor"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Bind Address"
-msgstr "Endereço de Bind"
+msgstr "Endereço"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Configurar"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
-msgstr "Modo criativo"
+msgstr "Modo Criativo"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
-msgstr "Habilitar dano"
+msgstr "Habilitar Dano"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Game"
-msgstr "Criar Jogo"
+msgstr "Hospedar Jogo"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Server"
-msgstr "Criar Servidor"
+msgstr "Hospedar Servidor"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "Instalar jogos do ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nome / Senha"
+msgid "Name"
+msgstr "Nome"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -759,6 +826,10 @@ msgid "No world created or selected!"
 msgstr "Nenhum mundo criado ou selecionado!"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Senha"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Jogar"
 
@@ -767,55 +838,59 @@ msgid "Port"
 msgstr "Porta"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Selecione Mods"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Selecione um mundo:"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Server Port"
-msgstr "Porta do servidor"
+msgstr "Porta do Servidor"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Start Game"
-msgstr "Iniciar o jogo"
+msgstr "Iniciar Jogo"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
 msgstr "Endereço / Porta"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Conectar"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Modo criativo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Dano habilitado"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
-msgstr "Deletar Favorito"
+msgstr "Rem. Favorito"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
-msgstr "Favoritos"
+msgstr "Favorito"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Join Game"
-msgstr "Juntar-se ao jogo"
+msgstr "Entrar em um Jogo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nome / Senha"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP habilitado"
 
@@ -841,11 +916,7 @@ msgstr "Todas as configurações"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr "Antialiasing:"
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Você tem certeza que deseja resetar seu mundo um-jogador?"
+msgstr "Anti-aliasing:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
@@ -855,10 +926,6 @@ msgstr "Salvar automaticamente o tamanho da tela"
 msgid "Bilinear Filter"
 msgstr "Filtragem bi-linear"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Bump mapping"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Mudar teclas"
@@ -872,10 +939,6 @@ msgid "Fancy Leaves"
 msgstr "Folhas com transparência"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Gerar Normal maps"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap (filtro)"
 
@@ -884,10 +947,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Filtro Anisotrópico"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Não"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Sem filtros"
 
@@ -915,19 +974,11 @@ msgstr "Folhas Opacas"
 msgid "Opaque Water"
 msgstr "�gua opaca"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Oclusão de paralaxe"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Partículas"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Resetar mundo um-jogador"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Tela:"
 
@@ -940,6 +991,10 @@ msgid "Shaders"
 msgstr "Sombreadores"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Sombreadores (experimental)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Sombreadores(indisponível)"
 
@@ -976,30 +1031,13 @@ msgid "Waving Leaves"
 msgstr "Folhas Balançam"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
 msgid "Waving Liquids"
-msgstr "Nós que balancam"
+msgstr "Líquidos com ondas"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Plants"
 msgstr "Plantas balançam"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Sim"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Configurar Mods"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Principal"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Iniciar Um jogador"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Erro de conexão (tempo excedido)."
@@ -1051,7 +1089,7 @@ msgstr "Nome de jogador muito longo."
 
 #: src/client/clientlauncher.cpp
 msgid "Please choose a name!"
-msgstr "Por favor escolha um nome!"
+msgstr "Por favor, escolha um nome!"
 
 #: src/client/clientlauncher.cpp
 msgid "Provided password file failed to open: "
@@ -1059,7 +1097,7 @@ msgstr "Arquivo de senha fornecido falhou em abrir : "
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
-msgstr "O caminho do mundo providenciado  não existe. "
+msgstr "Caminho informado para o mundo não existe: "
 
 #. ~ DO NOT TRANSLATE THIS LITERALLY!
 #. This is a special string. Put either "no" or "yes"
@@ -1087,7 +1125,7 @@ msgstr "- Endereço: "
 
 #: src/client/game.cpp
 msgid "- Creative Mode: "
-msgstr "Modo Criativo: "
+msgstr "- Modo Criativo: "
 
 #: src/client/game.cpp
 msgid "- Damage: "
@@ -1155,53 +1193,37 @@ msgid "Continue"
 msgstr "Continuar"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Controles:\n"
-"\n"
-"- %s1: andar para frente\n"
-"\n"
-"- %s2: andar para trás\n"
-"\n"
-"- %s3: andar para a esquerda\n"
-"\n"
-"-%s4: andar para a direita\n"
-"\n"
-"- %s5: pular/escalar\n"
-"\n"
-"- %s6: esgueirar/descer\n"
-"\n"
-"- %s7: soltar item\n"
-"\n"
-"- %s8: inventário\n"
-"\n"
+"- %s: mover para frente\n"
+"- %s: mover para trás\n"
+"- %s: mover para esquerda\n"
+"- %s: mover para direita\n"
+"- %s: pular/subir\n"
+"- %s: cavar/socar\n"
+"- %s: colocar/usar\n"
+"- %s: andar furtivamente/descer\n"
+"- %s: soltar item\n"
+"- %s: inventário\n"
 "- Mouse: virar/olhar\n"
-"\n"
-"- Botão esquerdo do mouse: cavar/dar soco\n"
-"\n"
-"- Botão direito do mouse: colocar/usar\n"
-"\n"
 "- Roda do mouse: selecionar item\n"
-"\n"
-"- %s9: bate-papo\n"
+"- %s: bate-papo\n"
 
 #: src/client/game.cpp
 msgid "Creating client..."
@@ -1277,7 +1299,7 @@ msgstr "Modo rápido habilitado"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr "Modo rápido habilitado(note: sem privilégio 'fast')"
+msgstr "Modo rápido habilitado (nota: sem o privilégio 'fast')"
 
 #: src/client/game.cpp
 msgid "Fly mode disabled"
@@ -1300,16 +1322,6 @@ msgid "Fog enabled"
 msgstr "Névoa habilitada"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Névoa desabilitada"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Névoa habilitada"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informação do jogo:"
 
@@ -1330,16 +1342,6 @@ msgid "KiB/s"
 msgstr "KB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Névoa desabilitada"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Dano habilitado"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Mídia..."
 
@@ -1352,34 +1354,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Minipapa atualmente desabilitado por jogo ou mod"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Minimapa escondido"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Minimapa em modo radar, zoom 1x"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Minimapa em modo radar, zoom 2x"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Minimapa em modo radar, zoom 4x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Minimapa em modo de superfície, zoom 1x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Minimapa em modo de superfície, zoom 2x"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Minimapa em modo de superfície, zoom 4x"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Modo atravessar paredes desabilitado"
 
@@ -1424,10 +1398,6 @@ msgid "Resolving address..."
 msgstr "Resolvendo os endereços..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Reviver"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Desligando tudo..."
 
@@ -1445,11 +1415,11 @@ msgstr "Som mutado"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "Sistema de som está desativado"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "Sistema de som não é suportado nesta versão"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1468,7 +1438,7 @@ msgstr "Distancia de visualização está no máximo:%d"
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at minimum: %d"
-msgstr "Distancia de visualização  está no mínima:%d"
+msgstr "Alcance de visualização é no mínimo: %d"
 
 #: src/client/game.cpp
 #, c-format
@@ -1480,10 +1450,6 @@ msgid "Wireframe shown"
 msgstr "Mostrar wireframe"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Você morreu"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom atualmente desabilitado por jogo ou mod"
 
@@ -1500,16 +1466,6 @@ msgid "Chat shown"
 msgstr "Conversa mostrada"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Conversa oculta"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Conversa mostrada"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "Interface escondida"
 
@@ -1789,6 +1745,24 @@ msgstr "Botão X 2"
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Minimapa escondido"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Minimapa em modo radar, Zoom %dx"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Minimapa em modo de superfície, Zoom %dx"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Minimapa em modo de textura"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "As senhas não correspondem!"
@@ -1798,7 +1772,7 @@ msgid "Register and Join"
 msgstr "Registrar e entrar"
 
 #: src/gui/guiConfirmRegistration.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to join this server with the name \"%s\" for the first time.\n"
 "If you proceed, a new account using your credentials will be created on this "
@@ -1806,11 +1780,12 @@ msgid ""
 "Please retype your password and click 'Register and Join' to confirm account "
 "creation, or click 'Cancel' to abort."
 msgstr ""
-"Você está prestes a entrar no servidor em %1$s com o nome \"%2$s\" pela "
-"primeira vez. Se continuar, uma nova conta usando suas credenciais será "
-"criada neste servidor.\n"
-"Por favor, redigite sua senha e clique registrar e entrar para confirmar a "
-"criação da conta ou clique em cancelar para abortar."
+"Você está prestes a entrar no servidor com o nome \"%s\" pela primeira "
+"vez. \n"
+"Se continuar, uma nova conta usando suas credenciais será criada neste "
+"servidor.\n"
+"Por favor, confirme sua senha e clique em \"Registrar e Entrar\" para "
+"confirmar a criação da conta, ou clique em \"Cancelar\" para abortar."
 
 #: src/gui/guiFormSpecMenu.cpp
 msgid "Proceed"
@@ -1833,26 +1808,6 @@ msgid "Backward"
 msgstr "Voltar"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Mudar camera"
 
@@ -1916,11 +1871,11 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"
-msgstr "Comandos de Local"
+msgstr "Comando local"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Mute"
-msgstr "Mutar"
+msgstr "Mudo"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Next item"
@@ -1947,30 +1902,10 @@ msgid "Special"
 msgstr "Especial"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Especial"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Alternar modo de câmera cinemática"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Alternar modo de câmera cinemática"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Ativar interface"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Alternar voo"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Ativar histórico de conversa"
 
@@ -1995,9 +1930,8 @@ msgid "Toggle noclip"
 msgstr "Alternar noclip"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle pitchmove"
-msgstr "Ativar histórico de conversa"
+msgstr "Ativar Voar seguindo a câmera"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "press key"
@@ -2064,7 +1998,6 @@ msgstr ""
 "estiver fora do circulo principal."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "(X,Y,Z) offset of fractal from world center in units of 'scale'.\n"
 "Can be used to move a desired point to (0, 0) to create a\n"
@@ -2075,13 +2008,17 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
-"(X,Y,Z) Espaço do fractal a partir centro do mundo em unidades de 'escala'.\n"
-"Pode ser usado para mover um ponto desejado para (0, 0) para criar um ponto "
-"de spawn apropriado, ou para permitir zoom em um ponto desejado aumentando "
-"sua escala.\n"
-"O padrão é configurado para ponto de spawn mandelbrot, pode ser necessário "
-"altera-lo em outras situações.\n"
-"Variam de -2 a 2. Multiplica por \"escala\" para compensação de nós."
+"(X,Y,Z) compensação do fractal a partir centro do mundo em unidades de "
+"'escala'.\n"
+"Pode ser usado para mover um ponto desejado para (0, 0) para criar um\n"
+"ponto de spawn flexível ou para permitir zoom em um ponto desejado,\n"
+"aumentando 'escala'.\n"
+"O padrão é ajustado para um ponto de spawn adequado para conjuntos de\n"
+"Mandelbrot com parâmetros padrão, podendo ser necessário alterá-lo em "
+"outras \n"
+"situações.\n"
+"Variam aproximadamente de -2 a 2. Multiplique por 'escala' para compensar em "
+"nodes."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2095,19 +2032,11 @@ msgid ""
 msgstr ""
 "(X,Y,Z) Escala fractal em nós.\n"
 "Tamanho fractal atual será de 2 a 3 vezes maior.\n"
-"Esses números podem ser muito grandes, o fractal não tem que encaixar dentro "
-"do mundo.\n"
+"Esses números podem ser muito grandes, o fractal\n"
+"não tem que encaixar dentro do mundo.\n"
 "Aumente estes para 'ampliar' nos detalhes do fractal.\n"
-"Padrão é para uma forma espremida verticalmente para uma ilha, coloque todos "
-"os 3 números iguais para a forma crua."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = oclusão paralaxe com dados de inclinação (mais rápido).\n"
-"1 = mapeamento de relevo (mais lento, mais preciso)."
+"Padrão é para uma forma espremida verticalmente para\n"
+"uma ilha, coloque todos os 3 números iguais para a forma crua."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
@@ -2119,7 +2048,7 @@ msgstr "Ruído 2D que controla o formato/tamanho de colinas."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of step mountains."
-msgstr "Ruído 2D que controla o formato/tamanho de montanhas de etapa."
+msgstr "Ruído 2D que controla o formato/tamanho de montanhas de caminhada."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of ridged mountain ranges."
@@ -2131,12 +2060,13 @@ msgstr "2D noise que controla o tamanho/ocorrência de colinas."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of step mountain ranges."
-msgstr "Ruído 2D que controla o tamanho/ocorrência de montanhas de passo."
+msgstr ""
+"Ruído 2D que controla o tamanho/ocorrência de intervalos de montanhas de "
+"caminhar."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "2D noise that locates the river valleys and channels."
-msgstr "Ruído 2D que controla o formato/tamanho de colinas."
+msgstr "Ruído 2D que localiza os vales e canais dos rios."
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2147,20 +2077,19 @@ msgid "3D mode"
 msgstr "modo 3D"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D mode parallax strength"
-msgstr "Intensidade de normalmaps"
+msgstr "Força de paralaxe do modo 3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
-msgstr "barulho 3D que define cavernas gigantes."
+msgstr "Ruído 3D que define cavernas gigantes."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "3D noise defining mountain structure and height.\n"
 "Also defines structure of floatland mountain terrain."
 msgstr ""
-"barulho 3D que define estrutura de montanha e altura.\n"
+"Ruído 3D que define estrutura de montanha e altura.\n"
 "Também define a estrutura do terreno da montanha das ilhas flutuantes."
 
 #: src/settings_translation_file.cpp
@@ -2170,6 +2099,12 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"Ruído 3D definindo as estruturas de terras flutuantes\n"
+"Se alterar da predefinição, a 'escala' do ruído (0.7 por predefinição) pode "
+"precisar\n"
+"ser ajustada, já que o afunilamento das terras flutuantes funciona melhor "
+"quando o ruído tem\n"
+"um valor entre -2.0 e 2.0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
@@ -2238,9 +2173,12 @@ msgid "ABM interval"
 msgstr "Intervalo do ABM"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "ABM time budget"
+msgstr "Alocação de tempo do ABM"
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "Limite absoluto de filas emergentes"
+msgstr "Limite absoluto de filas de blocos para emergir"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -2297,6 +2235,11 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"Ajusta a densidade da camada de ilhas flutuantes.\n"
+"Aumente o valor para aumentar a densidade. Pode ser positivo ou negativo.\n"
+"Valor = 0.0: 50% do volume é ilhas flutuantes.\n"
+"Valor = 2.0 (pode ser maior dependendo do 'mgv7_np_floatland', sempre teste\n"
+"para ter certeza) cria uma camada sólida de ilhas flutuantes."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -2310,6 +2253,12 @@ msgid ""
 "This only has significant effect on daylight and artificial\n"
 "light, it has very little effect on natural night light."
 msgstr ""
+"Altera a curva da luz aplicando-lhe a 'correção gama'.\n"
+"Valores altos tornam os níveis médios e baixos de luminosidade mais "
+"brilhantes.\n"
+"O valor '1.0' mantêm a curva de luz inalterada.\n"
+"Isto só tem um efeito significativo sobre a luz do dia e a luz \n"
+"artificial, tem pouquíssimo efeito na luz natural da noite."
 
 #: src/settings_translation_file.cpp
 msgid "Always fly and fast"
@@ -2349,7 +2298,7 @@ msgstr "Concatenar nome do item a descrição."
 
 #: src/settings_translation_file.cpp
 msgid "Apple trees noise"
-msgstr "Barulho das �rvores de Macieira"
+msgstr "Ruído de �rvores de Macieira"
 
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
@@ -2360,8 +2309,8 @@ msgid ""
 "Arm inertia, gives a more realistic movement of\n"
 "the arm when the camera moves."
 msgstr ""
-"Inercia dos braços fornece um movimento mais realista dos braços quando a "
-"câmera mexe."
+"Inercia dos braços, fornece um movimento mais realista dos\n"
+"braços quando movimenta a câmera."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
@@ -2381,14 +2330,18 @@ msgid ""
 "optimization.\n"
 "Stated in mapblocks (16 nodes)."
 msgstr ""
-"Nesta distância, o servidor otimizará agressivamente quais blocos são "
-"enviados aos clientes.\n"
+"Nesta distância, o servidor otimizará agressivamente quais blocos serão "
+"enviados\n"
+"aos clientes.\n"
 "Pequenos valores potencialmente melhoram muito o desempenho, à custa de "
-"falhas de renderização visíveis(alguns blocos não serão processados debaixo "
-"da água e nas cavernas, bem como às vezes em terra).\n"
-"Configure isso como um valor maior do que a "
-"distância_máxima_de_envio_do_bloco para desabilitar essa otimização.\n"
-"Especificado em barreiras do mapa (16 nós)."
+"falhas\n"
+"de renderização visíveis (alguns blocos não serão processados debaixo da "
+"água e nas\n"
+"cavernas, bem como às vezes em terra).\n"
+"Configurando isso para um valor maior do que a "
+"distância_máxima_de_envio_do_bloco\n"
+"para desabilitar essa otimização.\n"
+"Especificado em barreiras do mapa (16 nodes)."
 
 #: src/settings_translation_file.cpp
 msgid "Automatic forward key"
@@ -2432,11 +2385,11 @@ msgstr "Privilégios básicos"
 
 #: src/settings_translation_file.cpp
 msgid "Beach noise"
-msgstr "barulho de praia"
+msgstr "Ruído de praias"
 
 #: src/settings_translation_file.cpp
 msgid "Beach noise threshold"
-msgstr "Limitar o barulho da praia"
+msgstr "Limiar do ruído de praias."
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
@@ -2465,24 +2418,20 @@ msgid "Block send optimize distance"
 msgstr "Distância otimizada de envio de bloco"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bold and italic font path"
-msgstr "Caminho de fonte monoespaçada"
+msgstr "Caminho de fonte em negrito e itálico"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bold and italic monospace font path"
-msgstr "Caminho de fonte monoespaçada"
+msgstr "Caminho de fonte monoespaçada para negrito e itálico"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bold font path"
-msgstr "Caminho da fonte"
+msgstr "Caminho da fonte em negrito"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Bold monospace font path"
-msgstr "Caminho de fonte monoespaçada"
+msgstr "Caminho de fonte monoespaçada em negrito"
 
 #: src/settings_translation_file.cpp
 msgid "Build inside player"
@@ -2493,19 +2442,15 @@ msgid "Builtin"
 msgstr "Embutido"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bump mapping"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
 "Increasing can reduce artifacting on weaker GPUs.\n"
 "0.1 = Default, 0.25 = Good value for weaker tablets."
 msgstr ""
-"Distancia do plano próximo da câmera em nós, entre 0 e 0.5\n"
-"A maioria dos usuários não precisarão mudar isto.\n"
+"Distancia do plano próximo da câmera em nós, entre 0 e 0.25\n"
+"Só funciona em plataformas GLES. A maioria dos usuários não precisarão mudar "
+"isto.\n"
 "Aumentar pode reduzir a ocorrencia de artefatos em GPUs mais fracas.\n"
 "0.1 = Padrão, 0.25 = Bom valor para tablets fracos."
 
@@ -2523,15 +2468,15 @@ msgstr "Tecla para alternar atualização da câmera"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise"
-msgstr "Barulho nas caverna"
+msgstr "Ruído de cavernas"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #1"
-msgstr "Barulho na caverna #1"
+msgstr "Ruído de cavernas #1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #2"
-msgstr "Barulho na caverna #2"
+msgstr "Ruído de cavernas #2"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
@@ -2539,11 +2484,11 @@ msgstr "Largura da caverna"
 
 #: src/settings_translation_file.cpp
 msgid "Cave1 noise"
-msgstr "Barulho na caverna1"
+msgstr "Ruídos de Cave1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave2 noise"
-msgstr "Barulho na caverna2"
+msgstr "Ruídos de Cave2"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern limit"
@@ -2551,7 +2496,7 @@ msgstr "Limite da caverna"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern noise"
-msgstr "Barulho da caverna"
+msgstr "Ruído de cavernas"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern taper"
@@ -2570,44 +2515,28 @@ msgid ""
 "Center of light curve boost range.\n"
 "Where 0.0 is minimum light level, 1.0 is maximum light level."
 msgstr ""
+"Centro da faixa de aumento da curva de luz.\n"
+"Onde 0.0 é o nível mínimo de luz, 1.0 é o nível máximo de luz."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Mudanças para a interface do menu principal:\n"
-" - Total: Múltiplos mundos de um jogador, escolha de jogo, escolha de pacote "
-"de texturas, etc.\n"
-"- Simples: Um mundo de um jogador, sem escolha de jogo ou pacote de "
-"texturas. Pode ser necessário para telas menores."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat font size"
-msgstr "Tamanho da fonte"
+msgstr "Tamanho da fonte do chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
 msgstr "Tecla de Chat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat log level"
-msgstr "Nível de log do Debug"
+msgstr "Nível de log do chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
 msgstr "Limite do contador de mensagens de bate-papo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat message format"
-msgstr "Tamanho máximo da mensagem de conversa"
+msgstr "Formato da mensagem de chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message kick threshold"
@@ -2754,6 +2683,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "Lista negra de flags do ContentDB"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "Máximo de downloads simultâneos de ContentDB"
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "Url do ContentDB"
 
@@ -2802,6 +2735,9 @@ msgid ""
 "Value >= 10.0 completely disables generation of tunnels and avoids the\n"
 "intensive noise calculations."
 msgstr ""
+"Controla a largura dos túneis, um valor menor cria túneis mais largos.\n"
+"Valor >= 10,0 desabilita completamente a geração de túneis e evita os\n"
+"cálculos intensivos de ruído."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
@@ -2816,16 +2752,24 @@ msgid "Crosshair alpha"
 msgstr "Alpha do cursor"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "Alpha do cursor (o quanto ele é opaco, níveis entre 0 e 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Alpha do cursor (o quanto ele é opaco, níveis entre 0 e 255).\n"
+"Também controla a cor da cruz do objeto"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
 msgstr "Cor do cursor"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Cor do cursor (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Cor da cruz (R, G, B).\n"
+"Também controla a cor da cruz do objeto"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2853,7 +2797,7 @@ msgstr "Tecla de abaixar volume"
 
 #: src/settings_translation_file.cpp
 msgid "Decrease this to increase liquid resistance to movement."
-msgstr ""
+msgstr "Diminua isto para aumentar a resistência do líquido ao movimento."
 
 #: src/settings_translation_file.cpp
 msgid "Dedicated server step"
@@ -2888,9 +2832,8 @@ msgid "Default report format"
 msgstr "Formato de reporte padrão"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default stack size"
-msgstr "Jogo padrão"
+msgstr "Tamanho padrão de stack"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2932,21 +2875,12 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Define localizações e terrenos de morros e lagos opcionais."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Define processo amostral de textura.\n"
-"Um valor mais alto resulta em mapas de normais mais suaves."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Define o nível base do solo."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Defines the depth of the river channel."
-msgstr "Define o nível base do solo."
+msgstr "Define a profundidade do canal do rio."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
@@ -2955,14 +2889,12 @@ msgstr ""
 "ilimitado)."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Defines the width of the river channel."
-msgstr "Define estruturas de canais de grande porte (rios)."
+msgstr "Define a largura do canal do rio."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Defines the width of the river valley."
-msgstr "Define áreas onde na árvores têm maçãs."
+msgstr "Define a largura do vale do rio."
 
 #: src/settings_translation_file.cpp
 msgid "Defines tree areas and tree density."
@@ -3002,27 +2934,30 @@ msgid ""
 "Description of server, to be displayed when players join and in the "
 "serverlist."
 msgstr ""
-"Descrição do servidor, a ser exibida quando os jogadores se se conectarem e "
-"na lista de servidores."
+"Descrição do servidor, a ser exibida quando os jogadores se conectarem e na "
+"lista de servidores."
 
 #: src/settings_translation_file.cpp
 msgid "Desert noise threshold"
 msgstr "Limite do ruído de deserto"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Deserts occur when np_biome exceeds this value.\n"
 "When the 'snowbiomes' flag is enabled, this is ignored."
 msgstr ""
-"Deserto ocorre quando \"np_biome\" excede esse valor.\n"
-"Quando o novo sistema de biomas está habilitado, isso é ignorado."
+"Os desertos ocorrem quando np_biome excede este valor.\n"
+"Quando a marcação 'snowbiomes' está ativada, isto é ignorado."
 
 #: src/settings_translation_file.cpp
 msgid "Desynchronize block animation"
 msgstr "Dessincronizar animação do bloco"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "Tecla para escavar"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Partículas de Escavação"
 
@@ -3063,15 +2998,16 @@ msgid "Dungeon minimum Y"
 msgstr "Y mínimo da dungeon"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Dungeon noise"
-msgstr "Y mínimo da dungeon"
+msgstr "Ruído de masmorra"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
 "Required for IPv6 connections to work at all."
 msgstr ""
+"Habilitar suporte IPv6 (tanto para cliente quanto para servidor).\n"
+"Necessário para que as conexões IPv6 funcionem."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3086,7 +3022,8 @@ msgid "Enable console window"
 msgstr "Habilitar janela de console"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Habilitar modo criativo para mundos novos."
 
 #: src/settings_translation_file.cpp
@@ -3160,6 +3097,8 @@ msgid ""
 "Enable vertex buffer objects.\n"
 "This should greatly improve graphics performance."
 msgstr ""
+"Ativa vertex buffer objects.\n"
+"Isso deve melhorar muito a performance gráfica."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3170,14 +3109,14 @@ msgstr ""
 "Por exemplo: 0 para não ver balançando; 1.0 para normal; 2.0 para duplo."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Enable/disable running an IPv6 server.\n"
 "Ignored if bind_address is set.\n"
 "Needs enable_ipv6 to be enabled."
 msgstr ""
 "Habilitar/desabilitar a execução de um IPv6 do servidor. \n"
-"Ignorado se bind_address estiver definido."
+"Ignorado se bind_address estiver definido.\n"
+"Precisa de  enable_ipv6 para ser ativado."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3186,24 +3125,17 @@ msgid ""
 "appearance of high dynamic range images. Mid-range contrast is slightly\n"
 "enhanced, highlights and shadows are gradually compressed."
 msgstr ""
+"Permite o mapeamento de tom do filme 'Uncharted 2', de Hable.\n"
+"Simula a curva de tons do filme fotográfico e como isso se aproxima da\n"
+"aparência de imagens de alto alcance dinâmico (HDR). O contraste de médio "
+"alcance é ligeiramente\n"
+"melhorado, os destaques e as sombras são gradualmente comprimidos."
 
 #: src/settings_translation_file.cpp
 msgid "Enables animation of inventory items."
 msgstr "Habilita itens animados no inventário."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Ativar texturização bump mapping para texturas. Normalmaps precisam ser "
-"fornecidos pelo\n"
-"pacote de textura ou a necessidade de ser auto-gerada.\n"
-"Requer shaders a serem ativados."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Ativar armazenamento em cache de direção de face girada das malhas."
 
@@ -3213,27 +3145,16 @@ msgstr "Habilitar minimapa."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Ativa geração de normalmap (efeito de relevo) ao voar.\n"
-"Requer texturização bump mapping para ser ativado."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Ativar mapeamento de oclusão de paralaxe.\n"
-"Requer shaders a serem ativados."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
 "Changing this setting requires a restart."
 msgstr ""
+"Ativa o sistema de som.\n"
+"Se desativado, isso desabilita completamente todos os sons em todos os "
+"lugares\n"
+"e os controles de som dentro do jogo se tornarão não funcionais.\n"
+"Mudar esta configuração requer uma reinicialização."
 
 #: src/settings_translation_file.cpp
 msgid "Engine profiling data print interval"
@@ -3245,14 +3166,6 @@ msgstr "Metodos de entidade"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Opção experimental, pode causar espaços visíveis entre blocos\n"
-"quando definido como número maior do que 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3260,10 +3173,18 @@ msgid ""
 "Values < 1.0 (for example 0.25) create a more defined surface level with\n"
 "flatter lowlands, suitable for a solid floatland layer."
 msgstr ""
+"Expoente de estreitamento das ilhas flutuantes. Altera o comportamento de "
+"afilamento.\n"
+"Valor = 1.0 cria um afunilamento linear uniforme.\n"
+"Valores> 1.0 criam um estreitamento suave adequado para as ilhas flutuantes\n"
+"padrão (separadas).\n"
+"Valores <1.0 (por exemplo 0.25) criam um nível de superfície mais definido "
+"com\n"
+"planícies mais planas, adequadas para uma camada sólida de ilhas flutuantes."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS no menu de pausa"
+msgid "FPS when unfocused or paused"
+msgstr "FPS quando o jogo é pausado ou perde o foco"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3278,9 +3199,8 @@ msgid "Fall bobbing factor"
 msgstr "Fator de balanço em queda"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Fallback font path"
-msgstr "Fonte Alternativa"
+msgstr "Fonte reserva"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow"
@@ -3381,39 +3301,32 @@ msgid "Fixed virtual joystick"
 msgstr "Joystick virtual fixo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland density"
-msgstr "Densidade da Ilha Flutuante montanhosa"
+msgstr "Densidade das terras flutuantes"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland maximum Y"
-msgstr "Y máximo da dungeon"
+msgstr "Y máximo das terras flutuantes"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland minimum Y"
-msgstr "Y mínimo da dungeon"
+msgstr "Y mínimo das terras flutuantes"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland noise"
-msgstr "Ruído base de Ilha Flutuante"
+msgstr "Ruído das terras flutuantes"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland taper exponent"
-msgstr "Expoente de terras flutuantes montanhosas"
+msgstr "Expoente de conicidade das ilhas flutuantes"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland tapering distance"
-msgstr "Ruído base de Ilha Flutuante"
+msgstr "Distância de afilamento da ilha flutuante"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland water level"
-msgstr "Nível de água"
+msgstr "Nível de água da ilha flutuante"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
@@ -3437,11 +3350,11 @@ msgstr "Tecla de comutação de névoa"
 
 #: src/settings_translation_file.cpp
 msgid "Font bold by default"
-msgstr ""
+msgstr "Fonte em negrito por padrão"
 
 #: src/settings_translation_file.cpp
 msgid "Font italic by default"
-msgstr ""
+msgstr "Fonte em itálico por padrão"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow"
@@ -3457,21 +3370,24 @@ msgstr "Tamanho da fonte"
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the default font in point (pt)."
-msgstr ""
+msgstr "Tamanho da fonte padrão em pontos (pt)."
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the fallback font in point (pt)."
-msgstr ""
+msgstr "Tamanho da fonte reserva em pontos (pt)."
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the monospace font in point (pt)."
-msgstr ""
+msgstr "Tamanho da fonte de largura fixa em pontos (pt)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Font size of the recent chat text and chat prompt in point (pt).\n"
 "Value 0 will use the default font size."
 msgstr ""
+"Tamanho da fonte do texto de bate-papo recente e do prompt do bate-papo em "
+"pontos (pt).\n"
+"O valor 0 irá utilizar o tamanho padrão de fonte."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3479,6 +3395,9 @@ msgid ""
 "placeholders:\n"
 "@name, @message, @timestamp (optional)"
 msgstr ""
+"Formato das mensagem de bate-papo dos jogadores. Os textos abaixo são "
+"palavras-chave válidas:\n"
+"@name, @message, @timestamp (opcional)"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
@@ -3591,10 +3510,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Filtro txr2img de escala da GUI"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Gerar mapa de normais"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Chamadas de retorno Globais"
 
@@ -3611,18 +3526,20 @@ msgstr ""
 "todas as decorações."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Gradient of light curve at maximum light level.\n"
 "Controls the contrast of the highest light levels."
-msgstr "Curva gradiente de iluminaçao no nível de luz maximo."
+msgstr ""
+"Gradiente da curva de luz no nível de luz máximo.\n"
+"Controla o contraste dos níveis de luz mais altos."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Gradient of light curve at minimum light level.\n"
 "Controls the contrast of the lowest light levels."
-msgstr "Curva gradiente de iluminação no nível de luz mínimo."
+msgstr ""
+"Gradiente da curva de luz no nível de luz mínimo.\n"
+"Controla o contraste dos níveis de luz mais baixos."
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
@@ -3653,19 +3570,16 @@ msgid "HUD toggle key"
 msgstr "Tecla de comutação HUD"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
-"Manipulação para chamadas de API Lua reprovados:\n"
-"-    legacy: (tentar) imitar o comportamento antigo (padrão para a "
-"liberação).\n"
-"-    log: imitação e log de retraçamento da chamada reprovada (padrão para "
-"depuração).\n"
-"-    error: abortar no uso da chamada reprovada (sugerido para "
+"Lidando com funções obsoletas da API Lua:\n"
+"-...none: não registra funções obsoletas.\n"
+"-...log: imita e registra as funções obsoletas chamadas (padrão).\n"
+"-...error: aborta quando chama uma função obsoleta (sugerido para "
 "desenvolvedores de mods)."
 
 #: src/settings_translation_file.cpp
@@ -3700,7 +3614,7 @@ msgstr "Ruído de altura"
 
 #: src/settings_translation_file.cpp
 msgid "Height select noise"
-msgstr "Parâmetros de ruido de seleção de altura do gerador de mundo v6"
+msgstr "Parâmetros de ruido de seleção de altura"
 
 #: src/settings_translation_file.cpp
 msgid "High-precision FPU"
@@ -3708,11 +3622,11 @@ msgstr "FPU de alta precisão"
 
 #: src/settings_translation_file.cpp
 msgid "Hill steepness"
-msgstr "Esparsamento das colinas no gerador de mundo plano"
+msgstr "Inclinação dos morros"
 
 #: src/settings_translation_file.cpp
 msgid "Hill threshold"
-msgstr "Threshold das colinas no gerador de mundo plano"
+msgstr "Limite das colinas no gerador de mundo plano"
 
 #: src/settings_translation_file.cpp
 msgid "Hilliness1 noise"
@@ -3739,18 +3653,24 @@ msgid ""
 "Horizontal acceleration in air when jumping or falling,\n"
 "in nodes per second per second."
 msgstr ""
+"Aceleração horizontal no ar ao saltar ou cair,\n"
+"em nós por segundo por segundo."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Horizontal and vertical acceleration in fast mode,\n"
 "in nodes per second per second."
 msgstr ""
+"Aceleração horizontal e vertical no modo rápido,\n"
+"em nós por segundo por segundo."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Horizontal and vertical acceleration on ground or when climbing,\n"
 "in nodes per second per second."
 msgstr ""
+"Aceleração horizontal e vertical no solo ou ao escalar,\n"
+"em nós por segundo por segundo."
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar next key"
@@ -3898,6 +3818,9 @@ msgid ""
 "If negative, liquid waves will move backwards.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"A velocidade com que as ondas líquidas se movem. Maior = mais rápido.\n"
+"Se negativo, as ondas líquidas se moverão para trás.\n"
+"Requer que a ondulação de líquidos esteja ativada."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4038,6 +3961,12 @@ msgid ""
 "deleting an older debug.txt.1 if it exists.\n"
 "debug.txt is only moved if this setting is positive."
 msgstr ""
+"Se o tamanho do arquivo debug.txt exceder o número de megabytes "
+"especificado\n"
+"nesta configuração quando ele for aberto, o arquivo é movido para debug."
+"txt.1,\n"
+"excluindo um debug.txt.1 mais antigo, se houver.\n"
+"debug.txt só é movido se esta configuração for positiva."
 
 #: src/settings_translation_file.cpp
 msgid "If this is set, players will always (re)spawn at the given position."
@@ -4075,15 +4004,15 @@ msgstr "Tecla de aumentar volume"
 
 #: src/settings_translation_file.cpp
 msgid "Initial vertical speed when jumping, in nodes per second."
-msgstr ""
+msgstr "Velocidade vertical inicial ao saltar, em nós por segundo."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
-"Monitoração imbutida.\n"
-"Isto é usualmente apenas nessesário por contribuidores core/builtin"
+"Monitoração embutida.\n"
+"Isto é necessário apenas por contribuidores core/builtin"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument chatcommands on registration."
@@ -4144,14 +4073,12 @@ msgid "Invert vertical mouse movement."
 msgstr "Inverta o movimento vertical do mouse."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Italic font path"
-msgstr "Caminho de fonte monoespaçada"
+msgstr "Caminho da fonte em itálico"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Italic monospace font path"
-msgstr "Caminho de fonte monoespaçada"
+msgstr "Caminho da fonte em itálico monoespaçada"
 
 #: src/settings_translation_file.cpp
 msgid "Item entity TTL"
@@ -4183,6 +4110,10 @@ msgid "Joystick button repetition interval"
 msgstr "Intervalo de repetição do botão do Joystick"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr "\"Zona morta\" do joystick"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Sensibilidade do frustum do Joystick"
 
@@ -4278,7 +4209,17 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla para diminuir o alcance de visão.\n"
+"Tecla para diminuir o volume.\n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla para escavar. \n"
 "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4308,7 +4249,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla para aumentar o alcance de visão.\n"
+"Tecla para aumentar o volume.\n"
 "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4380,7 +4321,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"Tecla para pular. \n"
+"Tecla para por o som em mudo. \n"
 "Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -4426,6 +4367,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tecla para colocar objetos. \n"
+"Consulte http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4982,15 +4933,15 @@ msgstr "Profundidade de cavernas grandes"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave maximum number"
-msgstr ""
+msgstr "Número máximo de cavernas grandes"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave minimum number"
-msgstr ""
+msgstr "Número mínimo de cavernas grandes"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave proportion flooded"
-msgstr ""
+msgstr "Proporção inundada de cavernas grandes"
 
 #: src/settings_translation_file.cpp
 msgid "Large chat console key"
@@ -5026,13 +4977,12 @@ msgstr ""
 "geralmente atualizados em rede."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of liquid waves.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
-"Definido como true habilita balanço folhas.\n"
-"Requer sombreadores serem ativados."
+"Comprimento das ondas líquidas.\n"
+"Requer que a ondulação de líquidos esteja ativada."
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between Active Block Modifier (ABM) execution cycles"
@@ -5067,34 +5017,28 @@ msgstr ""
 "-    verbose"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve boost"
-msgstr "Aumento leve da curva de luz"
+msgstr "Aumento da curva de luz"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve boost center"
-msgstr "Centro do aumento leve da curva de luz"
+msgstr "Centro do aumento da curva de luz"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve boost spread"
-msgstr "Extensão do aumento leve da curva de luz"
+msgstr "Extensão do aumento da curva de luz"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve gamma"
-msgstr "Aumento leve da curva de luz"
+msgstr "Gamma da curva de luz"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve high gradient"
-msgstr "Aumento leve da curva de luz"
+msgstr "Gradiente alto da curva de luz"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve low gradient"
-msgstr "Centro do aumento leve da curva de luz"
+msgstr "Gradiente baixo da curva de luz"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5138,9 +5082,8 @@ msgid "Liquid queue purge time"
 msgstr "Tempo para limpar a lista de espera para a atualização de líquidos"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Liquid sinking"
-msgstr "Velocidade do afundamento de liquido"
+msgstr "Afundamento do líquido"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid update interval in seconds."
@@ -5173,19 +5116,14 @@ msgid "Lower Y limit of dungeons."
 msgstr "Menor limite Y de dungeons."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lower Y limit of floatlands."
-msgstr "Menor limite Y de dungeons."
+msgstr "Menor limite Y de ilhas flutuantes."
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
 msgstr "Menu principal do script"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Estilo do menu principal"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5201,6 +5139,14 @@ msgid "Makes all liquids opaque"
 msgstr "Torna todos os líquidos opacos"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr "Nível de Compressão de Mapa no Armazenamento em Disco"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr "Nível de Compressão do Mapa na Transferência em Rede"
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Diretório do mapa"
 
@@ -5209,23 +5155,22 @@ msgid "Map generation attributes specific to Mapgen Carpathian."
 msgstr "Atributos de geração de mapa específicos ao gerador Carpathian."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Flat.\n"
 "Occasional lakes and hills can be added to the flat world."
 msgstr ""
-"Atributos de geração de mapas específicos para o gerador de mundo plano.\n"
+"Atributos de geração de mapas específicos para o Gerador de mundo Plano.\n"
 "Lagos e colinas ocasionalmente podem ser adicionados ao mundo plano."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Fractal.\n"
 "'terrain' enables the generation of non-fractal terrain:\n"
 "ocean, islands and underground."
 msgstr ""
-"Atributos de geração de mapa específicos ao gerador V7.\n"
-"'ridges' habilitam os rios."
+"Atributos de geração de mapas específicos para o Gerador de mundo Fractal.\n"
+"'terreno' permite a geração de terreno não fractal:\n"
+"oceano, ilhas e subterrâneos."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5240,7 +5185,7 @@ msgstr ""
 "'altitude_chill':Reduz o calor com a altitude.\n"
 "'humid_rivers':Aumenta a umidade em volta dos rios.\n"
 "'profundidade_variada_rios': Se habilitado, baixa umidade e alto calor faz "
-"com que que rios se tornem mais rasos e eventualmente sumam.\n"
+"com que rios se tornem mais rasos e eventualmente sumam.\n"
 "'altitude_dry': Reduz a umidade com a altitude."
 
 #: src/settings_translation_file.cpp
@@ -5248,28 +5193,29 @@ msgid "Map generation attributes specific to Mapgen v5."
 msgstr "Atributos de geração de mapa específicos ao gerador V5."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v6.\n"
 "The 'snowbiomes' flag enables the new 5 biome system.\n"
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
 "the 'jungles' flag is ignored."
 msgstr ""
-"Atributos de geração de mapas específico para o gerador de mundo v6.\n"
-" O 'snowbiomes' flag habilita o novo sistema de bioma 5.\n"
-"Quando o sistema de novo bioma estiver habilitado, selvas são "
-"automaticamente habilitadas e a flag 'jungles' é ignorada."
+"Atributos de geração de mapas específicos para Gerador de mapas v6.\n"
+"A opção 'snowbiomes' habilita o novo sistema de 5 biomas.\n"
+"Quando a opção 'snowbiomes' está ativada, as selvas são ativadas "
+"automaticamente e\n"
+"a opção 'jungles' é ignorada."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "'ridges': Rivers.\n"
 "'floatlands': Floating land masses in the atmosphere.\n"
 "'caverns': Giant caves deep underground."
 msgstr ""
-"Atributos de geração de mapa específicos ao gerador V7.\n"
-"'ridges' habilitam os rios."
+"Atributos de geração de mapas específicos para Gerador de mapas v7.\n"
+"'ridges': rios.\n"
+"'floatlands': massas de terra flutuantes na atmosfera.\n"
+"'caverns': cavernas gigantes no subsolo."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -5318,9 +5264,8 @@ msgid "Mapgen Fractal"
 msgstr "Gerador de mundo Fractal"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Mapgen Fractal specific flags"
-msgstr "Flags específicas do gerador de mundo plano"
+msgstr "Opções específicas do Gerador de mapas Fractal"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V5"
@@ -5387,8 +5332,9 @@ msgid "Maximum FPS"
 msgstr "FPS máximo"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "Máximo FPS quando o jogo é pausado."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr ""
+"FPS máximo quando a janela não está com foco, ou quando o jogo é pausado."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -5400,17 +5346,19 @@ msgstr "Largura máxima da hotbar"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of large caves per mapchunk."
-msgstr ""
+msgstr "Limite máximo do número aleatório de cavernas grandes por mapchunk."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of small caves per mapchunk."
-msgstr ""
+msgstr "Limite máximo do número aleatório de cavernas pequenas por mapchunk."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum liquid resistance. Controls deceleration when entering liquid at\n"
 "high speed."
 msgstr ""
+"Resistência líquida máxima. Controla desaceleração ao entrar num líquido\n"
+"em alta velocidade."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5428,25 +5376,32 @@ msgstr ""
 "Número máximo de blocos que podem ser enfileirados para o carregamento."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "This limit is enforced per player."
 msgstr ""
-"Número máximo de blocos para serem enfileirados que estão a ser gerados.\n"
-"Definido em branco para uma quantidade apropriada ser escolhida "
-"automaticamente."
+"Número máximo de blocos para serem enfileirado, dos que estão para ser "
+"gerados.\n"
+"Esse limite é forçado para cada jogador."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "This limit is enforced per player."
 msgstr ""
-"Número máximo de blocos para ser enfileirado que serão carregados do "
-"arquivo.\n"
-"Definido em branco para uma quantidade apropriada ser escolhida "
-"automaticamente."
+"Número máximo de blocos para serem enfileirado, dos que estão para ser "
+"carregados do arquivo.\n"
+"Esse limite é forçado para cada jogador."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+"Número máximo de downloads paralelos. Downloads excedendo esse limite "
+"esperarão numa fila.\n"
+"Deve ser menor que curl_parallel_limit."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
@@ -5543,7 +5498,7 @@ msgstr "Método usado para destacar o objeto selecionado."
 
 #: src/settings_translation_file.cpp
 msgid "Minimal level of logging to be written to chat."
-msgstr ""
+msgstr "Nível mínimo de registro a ser impresso no chat."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
@@ -5558,13 +5513,12 @@ msgid "Minimap scan height"
 msgstr "Altura de escaneamento do minimapa"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Minimum limit of random number of large caves per mapchunk."
-msgstr "Ruído 3D que determina o número de cavernas por pedaço de mapa."
+msgstr "Limite mínimo do número aleatório de grandes cavernas por mapchunk."
 
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of small caves per mapchunk."
-msgstr ""
+msgstr "Limite mínimo do número aleatório de cavernas pequenas por mapchunk."
 
 #: src/settings_translation_file.cpp
 msgid "Minimum texture size"
@@ -5635,19 +5589,17 @@ msgid "Mute sound"
 msgstr "Mutar som"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Name of map generator to be used when creating a new world.\n"
 "Creating a world in the main menu will override this.\n"
 "Current mapgens in a highly unstable state:\n"
 "-    The optional floatlands of v7 (disabled by default)."
 msgstr ""
-"Nome do gerador de mapa usando quando criar um novo mundo.\n"
-"Criar um mundo no menu principal vai sobrescrever isto.\n"
-"Geradores de mapa estáveis atualmente:\n"
-"v5, v6, v7(exceto terras flutuantes), singlenode.\n"
-"'estável' significa que a forma do terreno em um mundo existente não será "
-"alterado no futuro. Note que biomas definidos por jogos ainda podem mudar."
+"Nome do gerador de mapas a ser usado ao criar um novo mundo.\n"
+"Criar um mundo no menu principal substituirá isso.\n"
+"Geradores de mapa atuais em um estado altamente instável:\n"
+"- A opção de ilhas flutuantes do Gerador de mapas de v7 (desabilitado por "
+"padrão)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5668,9 +5620,8 @@ msgstr ""
 "servidores."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Near plane"
-msgstr "plano próximo"
+msgstr "Plano próximo"
 
 #: src/settings_translation_file.cpp
 msgid "Network"
@@ -5709,19 +5660,10 @@ msgid "Noises"
 msgstr "Ruidos"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Amostragem de normalmaps"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Intensidade de normalmaps"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Número de seguimentos de emersão"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Number of emerge threads to use.\n"
 "Value 0:\n"
@@ -5734,17 +5676,19 @@ msgid ""
 "processes, especially in singleplayer and/or when running Lua code in\n"
 "'on_generated'. For many users the optimum setting may be '1'."
 msgstr ""
-"Número de thread emergentes para usar.\n"
-"Vazio ou valor 0:\n"
-"- Seleção automática. O número de threads emergentes será 'número de "
-"processadores - 2', com limite mínimo de 1.\n"
+"Número de threads de emersão a serem usadas.\n"
+"Valor 0:\n"
+"- Seleção automática. O número de threads de emersão será\n"
+"- 'número de processadores - 2', com um limite inferior de 1.\n"
 "Qualquer outro valor:\n"
-"- Especifica o número de threads emergentes com limite mínimo de 1.\n"
-"Alerta: aumentando o número de threads emergentes aumenta a velocidade do "
-"gerador, mas pode prejudicar o desemepenho interferindo com outros "
-"processos, especialmente in singleplayer e/ou quando executando código lua "
-"em 'on_generated'.\n"
-"Para muitos usuários a opção mais recomendada é 1."
+"- Especifica o número de threads de emersão, com um limite inferior de 1.\n"
+"AVISO: Aumentar o número de threads de emersão aumenta a velocidade do motor "
+"de\n"
+"geração de mapas, mas isso pode prejudicar o desempenho do jogo, "
+"interferindo com outros\n"
+"processos, especialmente em singleplayer e / ou ao executar código Lua em "
+"eventos\n"
+"'on_generated'. Para muitos usuários, a configuração ideal pode ser '1'."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5758,10 +5702,6 @@ msgstr ""
 "memória (4096 = 100 MB, como uma regra de ouro)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Número de iterações de oclusão de paralaxe."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Repositório de conteúdo online"
 
@@ -5772,12 +5712,12 @@ msgstr "Líquidos Opacos"
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
-msgstr ""
+msgstr "Opacidade (alpha) das sombras atrás da fonte padrão, entre 0 e 255."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the fallback font, between 0 and 255."
-msgstr ""
+msgstr "Opacidade (alpha) da sombra atrás da fonte alternativa, entre 0 e 255."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5789,34 +5729,6 @@ msgstr ""
 "formspec está aberto."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Viés geral do efeito de oclusão de paralaxe, geralmente de escala/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Escala global do efeito de oclusão de paralaxe."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Oclusão de paralaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Viés de oclusão de paralaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Iterações de oclusão de paralaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Modo de oclusão de paralaxe"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Escala de Oclusão de paralaxe"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5824,12 +5736,20 @@ msgid ""
 "This font will be used for certain languages or if the default font is "
 "unavailable."
 msgstr ""
+"Caminho da fonte alternativa.\n"
+"Se a configuração \"freetype\" estiver ativa: Deve ser uma fonte TrueType.\n"
+"Se a configuração \"freetype\" não estiver ativa: Deve ser uma fonte bitmap "
+"ou de vetores XML.\n"
+"Essa fonte será usada por certas línguas ou se a padrão não estiver "
+"disponível."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Path to save screenshots at. Can be an absolute or relative path.\n"
 "The folder will be created if it doesn't already exist."
 msgstr ""
+"Caminho para salvar capturas de tela. Pode ser absoluto ou relativo.\n"
+"A pasta será criada se já não existe."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5852,6 +5772,11 @@ msgid ""
 "If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
 "The fallback font will be used if the font cannot be loaded."
 msgstr ""
+"Caminho para a fonte padrão.\n"
+"Se a configuração \"freetype\" estiver ativa: Deve ser uma fonte TrueType.\n"
+"Se a configuração \"freetype\" não estiver ativa: Deve ser uma fonte bitmap "
+"ou de vetores XML.\n"
+"A fonte alternativa será usada se não for possível carregar essa."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5860,6 +5785,11 @@ msgid ""
 "If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
 "This font is used for e.g. the console and profiler screen."
 msgstr ""
+"Caminho para a fonte monoespaçada.\n"
+"Se a configuração \"freetype\" estiver ativa: Deve ser uma fonte TrueType.\n"
+"Se a configuração \"freetype\" não estiver ativa: Deve ser uma fonte bitmap "
+"ou de vetores XML.\n"
+"Essa fonte será usada, por exemplo, no console e na tela de depuração."
 
 #: src/settings_translation_file.cpp
 msgid "Pause on lost window focus"
@@ -5868,11 +5798,11 @@ msgstr "Pausa quando o foco da janela é perdido"
 #: src/settings_translation_file.cpp
 msgid "Per-player limit of queued blocks load from disk"
 msgstr ""
+"Limite de blocos na fila de espera de carregamento do disco por jogador"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Per-player limit of queued blocks to generate"
-msgstr "Limite de filas emerge para gerar"
+msgstr "Limite por jogador de blocos enfileirados para gerar"
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
@@ -5887,6 +5817,14 @@ msgid "Pitch move mode"
 msgstr "Modo movimento pitch"
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr "Tecla de colocar"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr "Intervalo de repetição da ação colocar"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5954,7 +5892,7 @@ msgstr "Analizando"
 
 #: src/settings_translation_file.cpp
 msgid "Prometheus listener address"
-msgstr ""
+msgstr "Endereço do Prometheus"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5963,10 +5901,14 @@ msgid ""
 "enable metrics listener for Prometheus on that address.\n"
 "Metrics can be fetch on http://127.0.0.1:30000/metrics"
 msgstr ""
+"Endereço do Prometheus\n"
+"Se o minetest for compilado com a opção ENABLE_PROMETHEUS ativa,\n"
+"habilita a obtenção de métricas do Prometheus neste endereço.\n"
+"As métricas podem ser obtidas em http://127.0.0.1:30000/metrics"
 
 #: src/settings_translation_file.cpp
 msgid "Proportion of large caves that contain liquid."
-msgstr ""
+msgstr "Proporção de cavernas grandes que contém líquido."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5995,9 +5937,8 @@ msgid "Recent Chat Messages"
 msgstr "Mensagens de chat recentes"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Regular font path"
-msgstr "Diretorio de reporte"
+msgstr "Caminho da fonte regular"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
@@ -6070,18 +6011,12 @@ msgid "Right key"
 msgstr "Tecla direita"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Intervalo de repetição do clique direito"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River channel depth"
-msgstr "Profundidade do Rio"
+msgstr "Profundidade do canal do rio"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River channel width"
-msgstr "Profundidade do Rio"
+msgstr "Largura do canal do rio"
 
 #: src/settings_translation_file.cpp
 msgid "River depth"
@@ -6096,9 +6031,8 @@ msgid "River size"
 msgstr "Tamanho do Rio"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "River valley width"
-msgstr "Profundidade do Rio"
+msgstr "Largura do vale do rio"
 
 #: src/settings_translation_file.cpp
 msgid "Rollback recording"
@@ -6214,7 +6148,6 @@ msgid "Selection box width"
 msgstr "Largura da caixa de seleção"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Selects one of 18 fractal types.\n"
 "1 = 4D \"Roundy\" Mandelbrot set.\n"
@@ -6307,31 +6240,28 @@ msgstr ""
 "clientes."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving leaves.\n"
 "Requires shaders to be enabled."
 msgstr ""
-"Definido como true habilita balanço folhas.\n"
-"Requer sombreadores serem ativados."
+"Definido como true habilita o balanço das folhas.\n"
+"Requer que os sombreadores estejam ativados."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving liquids (like water).\n"
 "Requires shaders to be enabled."
 msgstr ""
-"Definido como true permite ondulação da água.\n"
-"Requer sombreadores seres ativados."
+"Definido como true permite ondulação de líquidos (como a água).\n"
+"Requer que os sombreadores estejam ativados."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving plants.\n"
 "Requires shaders to be enabled."
 msgstr ""
 "Definido como true permite balanço de plantas.\n"
-"Requer sombreadores serem ativados."
+"Requer que os sombreadores estejam ativados."
 
 #: src/settings_translation_file.cpp
 msgid "Shader path"
@@ -6349,18 +6279,20 @@ msgstr ""
 "Só funcionam com o modo de vídeo OpenGL."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shadow offset (in pixels) of the default font. If 0, then shadow will not be "
 "drawn."
-msgstr "Fonte de compensador de sombra, se 0 então sombra não será desenhada."
+msgstr ""
+"Distância (em pixels) da sombra da fonte padrão. Se 0, então a sombra não "
+"será desenhada."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shadow offset (in pixels) of the fallback font. If 0, then shadow will not "
 "be drawn."
-msgstr "Fonte de compensador de sombra, se 0 então sombra não será desenhada."
+msgstr ""
+"Distância (em pixels) da sombra da fonte de backup. Se 0, então nenhuma "
+"sombra será desenhada."
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
@@ -6375,6 +6307,19 @@ msgid "Show entity selection boxes"
 msgstr "Mostrar as caixas de seleção entidades"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Mostrar caixas de seleção de entidades\n"
+"É necessário reiniciar após alterar isso."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Fonte em negrito por padrão"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Mensagem de desligamento"
 
@@ -6413,11 +6358,11 @@ msgstr "Inclinação e preenchimento trabalham juntos para modificar as alturas.
 
 #: src/settings_translation_file.cpp
 msgid "Small cave maximum number"
-msgstr ""
+msgstr "Número máximo de cavernas pequenas"
 
 #: src/settings_translation_file.cpp
 msgid "Small cave minimum number"
-msgstr ""
+msgstr "Número mínimo de cavernas pequenas"
 
 #: src/settings_translation_file.cpp
 msgid "Small-scale humidity variation for blending biomes on borders."
@@ -6460,7 +6405,7 @@ msgstr "Velocidade da furtividade"
 
 #: src/settings_translation_file.cpp
 msgid "Sneaking speed, in nodes per second."
-msgstr ""
+msgstr "Velocidade ao esgueirar-se, em nós (blocos) por segundo."
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
@@ -6493,16 +6438,19 @@ msgid ""
 "Note that mods or games may explicitly set a stack for certain (or all) "
 "items."
 msgstr ""
+"Especifica o tamanho padrão da pilha de nós, items e ferramentas.\n"
+"Note que mods e games talvez definam explicitamente um tamanho para certos "
+"(ou todos) os itens."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Spread of light curve boost range.\n"
 "Controls the width of the range to be boosted.\n"
 "Standard deviation of the light curve boost Gaussian."
 msgstr ""
-"Extensão do aumento médio da curva da luz.\n"
-"Desvio padrão do aumento médio gaussiano."
+"Ampliação da faixa de aumento da curva de luz.\n"
+"Controla a largura do intervalo a ser aumentado.\n"
+"O desvio padrão da gaussiana do aumento da curva de luz."
 
 #: src/settings_translation_file.cpp
 msgid "Static spawnpoint"
@@ -6521,13 +6469,8 @@ msgid "Step mountain spread noise"
 msgstr "Extensão do ruído da montanha de passo"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Strength of 3D mode parallax."
-msgstr "Intensidade de paralaxe."
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Intensidade de normalmaps gerados."
+msgstr "Força da paralaxe do modo 3D."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6535,6 +6478,9 @@ msgid ""
 "The 3 'boost' parameters define a range of the light\n"
 "curve that is boosted in brightness."
 msgstr ""
+"Aumento da força da curva de luz.\n"
+"Os 3 parâmetros de 'aumento' definem uma faixa\n"
+"da curva de luz que é aumentada em brilho."
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
@@ -6557,6 +6503,21 @@ msgid ""
 "server-intensive extreme water flow and to avoid vast flooding of the\n"
 "world surface below."
 msgstr ""
+"Nível de superfície de água opcional colocada em uma camada sólida de "
+"flutuação.\n"
+"A água está desativada por padrão e só será colocada se este valor for "
+"definido\n"
+"acima de 'mgv7_floatland_ymax' - 'mgv7_floatland_taper' (o início do\n"
+"afilamento superior).\n"
+"*** AVISO, POTENCIAL PERIGO PARA OS MUNDOS E DESEMPENHO DO SERVIDOR ***:\n"
+"Ao habilitar a colocação de água, as áreas flutuantes devem ser configuradas "
+"e testadas\n"
+"para ser uma camada sólida, definindo 'mgv7_floatland_density' para 2.0 (ou "
+"outro\n"
+"valor necessário dependendo de 'mgv7_np_floatland'), para evitar\n"
+"fluxo de água extremo intensivo do servidor e para evitar grandes inundações "
+"do\n"
+"superfície do mundo abaixo."
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -6636,6 +6597,10 @@ msgid "The URL for the content repository"
 msgstr "A url para o repositório de conteúdo"
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr "A zona morta do joystick"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6671,6 +6636,11 @@ msgid ""
 "Default is 1.0 (1/2 node).\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"A altura máxima da superfície de líquidos com ondas.\n"
+"4.0 = Altura da onda é dois nós.\n"
+"0.0 = Onda nem se move.\n"
+"O padrão é 1.0 (meio nó).\n"
+"Requer ondas em líquidos habilitada."
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -6686,7 +6656,6 @@ msgstr ""
 "servidor e dos modificadores."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The radius of the volume of blocks around every player that is subject to "
 "the\n"
@@ -6696,11 +6665,12 @@ msgid ""
 "maintained.\n"
 "This should be configured together with active_object_send_range_blocks."
 msgstr ""
-"O raio do volume de blocos em volta de cada jogador que é sujeito a coisas "
-"de bloco ativo, em mapblocks (16 nós).\n"
-"Em blocos ativos, objetos são carregados e ABMs executam.\n"
-"Isto é também o alcançe mínimo em que objetos ativos(mobs) são mantidos.\n"
-"Isto deve ser configurado junto com o alcance_objeto_ativo."
+"O raio do volume dos blocos em torno de cada jogador que está sujeito ao\n"
+"material de bloco ativo, declarado em mapblocks (16 nós).\n"
+"Nos blocos ativos, os objetos são carregados e os ABMs executados.\n"
+"Este também é o intervalo mínimo no qual os objetos ativos (mobs) são "
+"mantidos.\n"
+"Isso deve ser configurado junto com active_object_send_range_blocks."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6708,15 +6678,15 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
-"Renderizador de fundo para o irrlight.\n"
-"Uma reinicialização é necessária após alterar isso.\n"
-"Note: no android, use o OGLES1 caso em dúvida! O aplicativo pode falhar ao "
-"abrir em outro caso.\n"
-"Em outras plataformas, OpenGL é recomendo, e é o único driver com suporte a "
-"sombreamento atualmente."
+"O back-end de renderização para Irrlicht.\n"
+"É necessário reiniciar após alterar isso.\n"
+"Nota: No Android, use OGLES1 se não tiver certeza! O aplicativo pode falhar "
+"ao iniciar de outra forma.\n"
+"Em outras plataformas, OpenGL é recomendado.\n"
+"Shaders são suportados por OpenGL (somente desktop) e OGLES2 (experimental)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6753,6 +6723,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+"O tempo disponível permitido para ABMs executarem em cada passo (como uma "
+"fração do intervalo do ABM)"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6761,12 +6739,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
-"O tempo em segundos entre repetidos cliques direitos ao segurar o botão "
-"direito do mouse."
+"O tempo em segundos que leva entre as colocações de nó repetidas ao segurar\n"
+"o botão de colocar."
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
@@ -6846,7 +6823,6 @@ msgid "Trilinear filtering"
 msgstr "Filtragem tri-linear"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "True = 256\n"
 "False = 128\n"
@@ -6869,7 +6845,6 @@ msgid "Undersampling"
 msgstr "Subamostragem"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Undersampling is similar to using a lower screen resolution, but it applies\n"
 "to the game world only, keeping the GUI intact.\n"
@@ -6877,10 +6852,12 @@ msgid ""
 "image.\n"
 "Higher values result in a less detailed image."
 msgstr ""
-"A subamostragem é semelhante ao uso de resolução de tela menor, mas se "
-"aplica apenas ao mundo do jogo, mantendo a GUI (Interface Gráfica do "
-"Usuário) intacta. Deve dar um aumento significativo no desempenho ao custo "
-"de uma imagem menos detalhada."
+"A subamostragem é semelhante a usar uma resolução de tela inferior, mas se "
+"aplica\n"
+"apenas para o mundo do jogo, mantendo a GUI intacta.\n"
+"Deve dar um aumento significativo de desempenho ao custo de uma imagem menos "
+"detalhada.\n"
+"Valores mais altos resultam em uma imagem menos detalhada."
 
 #: src/settings_translation_file.cpp
 msgid "Unlimited player transfer distance"
@@ -6895,9 +6872,8 @@ msgid "Upper Y limit of dungeons."
 msgstr "Limite topo Y de dungeons."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Upper Y limit of floatlands."
-msgstr "Limite topo Y de dungeons."
+msgstr "Limite máximo Y para as ilhas flutuantes."
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
@@ -6927,6 +6903,27 @@ msgstr ""
 "O downscaling correto de gama não é suportado."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+"Use o anti-serrilhamento de várias amostras (MSAA) para suavizar as bordas "
+"do bloco.\n"
+"Este algoritmo suaviza a janela de visualização 3D enquanto mantém a imagem "
+"nítida,\n"
+"mas não afeta o interior das texturas\n"
+"(que é especialmente perceptível com texturas transparentes).\n"
+"Espaços visíveis aparecem entre os nós quando os sombreadores são "
+"desativados.\n"
+"Se definido como 0, MSAA é desativado.\n"
+"É necessário reiniciar após alterar esta opção."
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Use a filtragem trilinear ao dimensionamento de texturas."
 
@@ -6993,7 +6990,7 @@ msgstr "Controla o esparsamento/altura das colinas."
 
 #: src/settings_translation_file.cpp
 msgid "Vertical climbing speed, in nodes per second."
-msgstr ""
+msgstr "Velocidade vertical de escalda, em nós por segundo."
 
 #: src/settings_translation_file.cpp
 msgid "Vertical screen synchronization."
@@ -7038,13 +7035,12 @@ msgid "Volume"
 msgstr "Volume do som"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
-"Ativar mapeamento de oclusão de paralaxe.\n"
-"Requer shaders a serem ativados."
+"Volume de todos os sons.\n"
+"Requer que o sistema de som esteja ativado."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7061,7 +7057,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Walking and flying speed, in nodes per second."
-msgstr ""
+msgstr "Velocidade do andar e voar, em nós por segundo."
 
 #: src/settings_translation_file.cpp
 msgid "Walking speed"
@@ -7070,6 +7066,7 @@ msgstr "Velocidade de caminhada"
 #: src/settings_translation_file.cpp
 msgid "Walking, flying and climbing speed in fast mode, in nodes per second."
 msgstr ""
+"Velocidade do caminhar, voar e escalar no modo rápido, em nós por segundo."
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
@@ -7088,22 +7085,18 @@ msgid "Waving leaves"
 msgstr "Balanço das árvores"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids"
-msgstr "Nós que balancam"
+msgstr "Líquidos ondulantes"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave height"
-msgstr "Altura de balanço da água"
+msgstr "Altura da onda nos líquidos ondulantes"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave speed"
 msgstr "Velocidade de balanço da água"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wavelength"
 msgstr "Comprimento de balanço da água"
 
@@ -7159,14 +7152,20 @@ msgstr ""
 "texturas."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Whether FreeType fonts are used, requires FreeType support to be compiled "
 "in.\n"
 "If disabled, bitmap and XML vectors fonts are used instead."
 msgstr ""
-"Se forem utilizadas fontes freetype, requer suporte a freetype para ser "
-"compilado."
+"Se as fontes FreeType são usadas, requer que suporte FreeType tenha sido "
+"compilado.\n"
+"Se desativado, fontes de bitmap e de vetores XML são usadas em seu lugar."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
@@ -7207,6 +7206,10 @@ msgid ""
 "In-game, you can toggle the mute state with the mute key or by using the\n"
 "pause menu."
 msgstr ""
+"Quando mutar os sons. Você pode mutar os sons a qualquer hora, a não ser\n"
+"que o sistema de som esteja desabilitado (enable_sound=false).\n"
+"No jogo, você pode habilitar o estado de mutado com o botão de mutar\n"
+"ou usando o menu de pausa."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7293,6 +7296,12 @@ msgid ""
 "For a solid floatland layer, this controls the height of hills/mountains.\n"
 "Must be less than or equal to half the distance between the Y limits."
 msgstr ""
+"Distância de Y sobre a qual as ilhas flutuantes diminuem de densidade total "
+"para nenhuma densidade.\n"
+"O afunilamento começa nesta distância do limite Y.\n"
+"Para uma ilha flutuante sólida, isso controla a altura das colinas / "
+"montanhas.\n"
+"Deve ser menor ou igual a metade da distância entre os limites Y."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of average terrain surface."
@@ -7315,6 +7324,36 @@ msgid "Y-level of seabed."
 msgstr "Nível Y do fundo do mar."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Nível de compressão ZLib a ser usada ao salvar mapblocks no disco.\n"
+"-1 - Nível de compressão padrão do Zlib\n"
+"0 - Nenhuma compressão; o mais rápido\n"
+"9 - Melhor compressão; o mais devagar\n"
+"(níveis 1-3 usam método \"rápido\" do Zlib, enquanto que 4-9 usam método "
+"normal)"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Nível de compressão ZLib a ser usada ao mandar mapblocks para o cliente.\n"
+"-1 - Nível de compressão padrão do Zlib\n"
+"0 - Nenhuma compressão; o mais rápido\n"
+"9 - Melhor compressão; o mais devagar\n"
+"(níveis 1-3 usam método \"rápido\" do Zlib, enquanto que 4-9 usam método "
+"normal)"
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "Tempo limite de download de arquivo via cURL"
 
@@ -7326,23 +7365,12 @@ msgstr "limite paralelo de cURL"
 msgid "cURL timeout"
 msgstr "Tempo limite de cURL"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Back"
-#~ msgstr "Backspace"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Baixando e instalando $1, por favor aguarde..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Limite de filas emerge no disco"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Insinsidade de oclusão de paralaxe"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Caminho para onde salvar screenshots."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = oclusão paralaxe com dados de inclinação (mais rápido).\n"
+#~ "1 = mapeamento de relevo (mais lento, mais preciso)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7358,10 +7386,42 @@ msgstr "Tempo limite de cURL"
 #~ "Altera como terras flutuantes montanhosas afunilam acima e abaixo do "
 #~ "ponto médio."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Você tem certeza que deseja resetar seu mundo um-jogador?"
+
+#~ msgid "Back"
+#~ msgstr "Backspace"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Bump mapping"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bump mapping"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Centro do aumento da curva de luz."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Mudanças para a interface do menu principal:\n"
+#~ " - Total: Múltiplos mundos de um jogador, escolha de jogo, escolha de "
+#~ "pacote de texturas, etc.\n"
+#~ "- Simples: Um mundo de um jogador, sem escolha de jogo ou pacote de "
+#~ "texturas. Pode ser necessário para telas menores."
+
+#~ msgid "Config mods"
+#~ msgstr "Configurar Mods"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7372,6 +7432,9 @@ msgstr "Tempo limite de cURL"
 #~ msgstr ""
 #~ "Controla a largura dos túneis, um valor menor cria túneis mais largos."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Cor do cursor (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Nitidez da escuridão"
 
@@ -7382,12 +7445,57 @@ msgstr "Tempo limite de cURL"
 #~ "Define áreas de Ilha Flutuante em terreno suavizado.\n"
 #~ "Terrenos suavizados ocorrem quando o ruído é menor que zero."
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Define processo amostral de textura.\n"
+#~ "Um valor mais alto resulta em mapas de normais mais suaves."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Baixando e instalando $1, por favor aguarde..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Habilitar VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Ativar texturização bump mapping para texturas. Normalmaps precisam ser "
+#~ "fornecidos pelo\n"
+#~ "pacote de textura ou a necessidade de ser auto-gerada.\n"
+#~ "Requer shaders a serem ativados."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Habilitar efeito \"filmic tone mapping\""
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Ativa geração de normalmap (efeito de relevo) ao voar.\n"
+#~ "Requer texturização bump mapping para ser ativado."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Ativar mapeamento de oclusão de paralaxe.\n"
+#~ "Requer shaders a serem ativados."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Opção experimental, pode causar espaços visíveis entre blocos\n"
+#~ "quando definido como número maior do que 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS no menu de pausa"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Altura base de ruído de Ilha Flutuante"
 
@@ -7400,6 +7508,12 @@ msgstr "Tempo limite de cURL"
 #~ msgid "Gamma"
 #~ msgstr "Gama"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Gerar Normal maps"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Gerar mapa de normais"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Suporte a IPv6."
 
@@ -7409,18 +7523,106 @@ msgstr "Tempo limite de cURL"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Nitidez da iluminação"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Limite de filas emerge no disco"
+
+#~ msgid "Main"
+#~ msgstr "Principal"
+
+#~ msgid "Main menu style"
+#~ msgstr "Estilo do menu principal"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Minimapa em modo radar, zoom 2x"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Minimapa em modo radar, zoom 4x"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Minimapa em modo de superfície, zoom 2x"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Minimapa em modo de superfície, zoom 4x"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nome / Senha"
+
+#~ msgid "No"
+#~ msgstr "Não"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Amostragem de normalmaps"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Intensidade de normalmaps"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Número de iterações de oclusão de paralaxe."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr ""
+#~ "Viés geral do efeito de oclusão de paralaxe, geralmente de escala/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Escala global do efeito de oclusão de paralaxe."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Oclusão de paralaxe"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Oclusão de paralaxe"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Viés de oclusão de paralaxe"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Iterações de oclusão de paralaxe"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Modo de oclusão de paralaxe"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Escala de Oclusão de paralaxe"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Insinsidade de oclusão de paralaxe"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Caminho para TrueTypeFont ou bitmap."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Caminho para onde salvar screenshots."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Projetando dungeons"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Resetar mundo um-jogador"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Selecionar o arquivo do pacote:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Limite de mapblock"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Iniciar Um jogador"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Intensidade de normalmaps gerados."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Força do aumento médio da curva de luz."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Esta fonte será usada para determinados idiomas."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Alternar modo de câmera cinemática"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7432,9 +7634,21 @@ msgstr "Tempo limite de cURL"
 #~ "Variação da altura da colina e profundidade do lago no terreno liso da "
 #~ "Terra Flutuante."
 
+#~ msgid "View"
+#~ msgstr "Vista"
+
+#~ msgid "Waving Water"
+#~ msgstr "Ondas na água"
+
 #~ msgid "Waving water"
 #~ msgstr "Balanço da água"
 
+#~ msgid "Whether dungeons occasionally project from the terrain."
+#~ msgstr "Se dungeons ocasionalmente se projetam do terreno."
+
+#~ msgid "Y of upper limit of lava in large caves."
+#~ msgstr "Limite Y máximo de lava em grandes cavernas."
+
 #~ msgid "Y-level of floatland midpoint and lake surface."
 #~ msgstr ""
 #~ "Nível em Y do ponto médio da montanha flutuante e da superfície do lago."
@@ -7442,17 +7656,5 @@ msgstr "Tempo limite de cURL"
 #~ msgid "Y-level to which floatland shadows extend."
 #~ msgstr "Nível Y para o qual as sombras de ilhas flutuantes se estendem."
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "Projetando dungeons"
-
-#~ msgid "Whether dungeons occasionally project from the terrain."
-#~ msgstr "Se dungeons ocasionalmente se projetam do terreno."
-
-#~ msgid "Waving Water"
-#~ msgstr "Ondas na água"
-
-#~ msgid "Y of upper limit of lava in large caves."
-#~ msgstr "Limite Y máximo de lava em grandes cavernas."
-
-#~ msgid "Select Package File:"
-#~ msgstr "Selecionar o arquivo do pacote:"
+#~ msgid "Yes"
+#~ msgstr "Sim"
diff --git a/po/ro/minetest.po b/po/ro/minetest.po
index 558ec6db9..48ad46e2c 100644
--- a/po/ro/minetest.po
+++ b/po/ro/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Romanian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-04 16:41+0000\n"
-"Last-Translator: f0roots <f0rootss@gmail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-11-24 11:29+0000\n"
+"Last-Translator: Nicolae Crefelean <kneekoo@yahoo.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/minetest/"
 "minetest/ro/>\n"
 "Language: ro\n"
@@ -13,11 +13,19 @@ msgstr ""
 "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 4.1-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Reînviere"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Ai murit"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -33,15 +41,11 @@ msgstr "Meniul principal"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr "Reconectează-te"
+msgstr "Reconectare"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr "Serverul cere o reconectare :"
-
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Se încarcă..."
+msgstr "Serverul cere o reconectare:"
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
@@ -53,23 +57,18 @@ msgstr "Serverul forțează versiunea protocolului $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr "Acest Server suporta versiunile protocolului intre $1 si $2. "
-
-#: 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."
+msgstr "Serverul permite versiuni ale protocolului între $1 și $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr "Suportam doar versiunea de protocol $1."
+msgstr "Permitem doar versiunea de protocol $1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Acceptăm versiuni de protocol între versiunea 1$ și 2$."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -79,7 +78,8 @@ msgstr "Acceptăm versiuni de protocol între versiunea 1$ și 2$."
 msgid "Cancel"
 msgstr "Anulează"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Dependențe:"
 
@@ -89,7 +89,7 @@ msgstr "Dezactivează toate"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr "Dezactiveaza pachet mod"
+msgstr "Dezactivează modpack-ul"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
@@ -97,7 +97,7 @@ msgstr "Activează tot"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr "Activeaza pachet mod"
+msgstr "Activează modpack-ul"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
@@ -109,7 +109,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "Găsește mai multe modificări"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -153,25 +153,65 @@ msgid "enabled"
 msgstr "activat"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Descărcare..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Toate pachetele"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Tastă deja folosită"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "ÃŽnapoi la meniul principal"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Găzduiește joc"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB nu este disponibilă când Minetest e compilat fără cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "Se încarcă..."
+msgstr "Descărcare..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
-msgstr "Nu a putut descărca $1"
+msgstr "Nu s-a putut descărca $1"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -183,9 +223,19 @@ msgid "Install"
 msgstr "Instalează"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Instalează"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Dependențe opționale:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
-msgstr "Moduri"
+msgstr "Modificări"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No packages could be retrieved"
@@ -193,16 +243,32 @@ msgstr "Nu s-au putut prelua pachete"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No results"
-msgstr "Fara rezultate"
+msgstr "Fără rezultate"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Caută"
+#, fuzzy
+msgid "No updates"
+msgstr "Actualizare"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
-msgstr "Pachete de textură"
+msgstr "Pachete de texturi"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Uninstall"
@@ -213,79 +279,76 @@ msgid "Update"
 msgstr "Actualizare"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
-msgstr "O lume cu numele \"$1\" deja există"
+msgstr "Deja există o lume numită \"$1\""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Teren suplimentar"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr "Altitudine de frisoane"
+msgstr "Răcire la altitudine"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Altitude dry"
-msgstr "Altitudine de frisoane"
+msgstr "Ariditate la altitudine"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biome blending"
-msgstr "Biome zgomot"
+msgstr "Amestec de biom"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biomes"
-msgstr "Biome zgomot"
+msgstr "Biomuri"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caverns"
-msgstr "Pragul cavernei"
+msgstr "Caverne"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "Octava"
+msgstr "Peșteri"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "Creează"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Informații:"
+msgstr "Decorațiuni"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
-msgstr "Descărcați un joc, cum ar fi Minetest Game, de pe minetest.net"
+msgstr "Descărcați un joc, precum Minetest Game, de pe minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
 msgstr "Descărcați unul de pe minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "Zgomotul temnițelor"
+msgstr "Temnițe"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Teren plat"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "Mase de teren plutitoare în cer"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
-msgstr ""
+msgstr "Terenuri plutitoare (experimental)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -293,27 +356,28 @@ msgstr "Joc"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Generare terenuri fără fracturi: Oceane și sub pământ"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Dealuri"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
-msgstr ""
+msgstr "Râuri umede"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Mărește umiditea în jurul râurilor"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Lacuri"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
 msgstr ""
+"Umiditatea redusă și căldura ridicată cauzează râuri superficiale sau uscate"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -324,21 +388,20 @@ msgid "Mapgen flags"
 msgstr "Steagurile Mapgen"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mapgen-specific flags"
-msgstr "Steaguri specifice Mapgen V5"
+msgstr "Steaguri specifice Mapgen"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "Munți"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Curgere de noroi"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Rețea de tunele și peșteri"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -346,20 +409,19 @@ msgstr "Nici un joc selectat"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "Reduce căldura cu altitudinea"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "Reduce umiditatea cu altitudinea"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Rivers"
-msgstr "Zgomotul râului"
+msgstr "Râuri"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Râuri la nivelul mării"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -368,51 +430,51 @@ msgstr "Seminţe"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "Tranziție lină între biomi"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"Structuri care apar pe teren (fără efect asupra copacilor și a ierbii de "
+"junglă creați de v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "Structuri care apar pe teren, tipic copaci și plante"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "Temperat, Deșert"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "Temperat, Deșert, Junglă"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "Temperat, Deșert, Junglă, Tundră, Taiga"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr ""
+msgstr "Eroziunea suprafeței terenului"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "Copaci și iarbă de junglă"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Vary river depth"
-msgstr ""
+msgstr "Adâncimea râului variază"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Caverne foarte mari adânc în pământ"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
-msgstr ""
-"Avertisment: Testul de dezvoltare minimă este destinat dezvoltatorilor."
+msgstr "Avertisment: Testul de dezvoltare este destinat dezvoltatorilor."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -477,11 +539,6 @@ msgid "Browse"
 msgstr "Navighează"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Client"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Dezactivat"
 
@@ -526,6 +583,10 @@ msgid "Scale"
 msgstr "Scală"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Caută"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Selectează directorul"
 
@@ -642,6 +703,21 @@ msgstr "Imposibil de instalat un mod ca $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Imposibil de instalat un pachet de moduri ca $ 1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Se încarcă..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Scripturile din partea clientului sunt dezactivate"
+
+#: builtin/mainmenu/serverlistmgr.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/tab_content.lua
 msgid "Browse online content"
 msgstr "Căutați conținut online"
@@ -695,7 +771,14 @@ msgid "Credits"
 msgstr "Credite"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Selectează directorul"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -715,14 +798,10 @@ msgid "Bind Address"
 msgstr "Adresa legată"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Configurează"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Modul Creativ"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Activează Daune"
 
@@ -736,11 +815,11 @@ msgstr "Găzduiește Server"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "Instalarea jocurilor din ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Nume/Parolă"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -751,6 +830,11 @@ msgid "No world created or selected!"
 msgstr "Nicio lume creată sau selectată!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Noua parolă"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Joacă jocul"
 
@@ -759,6 +843,11 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Selectează lumea:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Selectează lumea:"
 
@@ -774,23 +863,23 @@ msgstr "ÃŽncepe Jocul"
 msgid "Address / Port"
 msgstr "Adresă / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Conectează"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Modul Creativ"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Daune activate"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Åžterge Favorit"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favorit"
 
@@ -798,16 +887,16 @@ msgstr "Favorit"
 msgid "Join Game"
 msgstr "Alatură-te jocului"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Nume / Parolă"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP activat"
 
@@ -836,10 +925,6 @@ msgid "Antialiasing:"
 msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Eşti sigur că vrei să resetezi lumea proprie ?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Salvează automat dimensiunea ecranului"
 
@@ -847,10 +932,6 @@ msgstr "Salvează automat dimensiunea ecranului"
 msgid "Bilinear Filter"
 msgstr "Filtrare Biliniară"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Cartografiere cu denivelări"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Modifică tastele"
@@ -864,10 +945,6 @@ msgid "Fancy Leaves"
 msgstr "Frunze luxsoase"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Generați Hărți Normale"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Hartă mip"
 
@@ -876,10 +953,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Hartă mip + filtru aniso."
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Nu"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Fără Filtru"
 
@@ -907,19 +980,11 @@ msgstr "Frunze opace"
 msgid "Opaque Water"
 msgstr "Apă opacă"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Ocluzie Parallax"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Particule"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Resetează lume proprie"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Ecran:"
 
@@ -932,6 +997,11 @@ msgid "Shaders"
 msgstr "Umbră"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Terenuri plutitoare (experimental)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Shaders (indisponibil)"
 
@@ -975,22 +1045,6 @@ msgstr "Fluturarea lichidelor"
 msgid "Waving Plants"
 msgstr "Plante legănătoare"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Da"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Configurează moduri"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Principal"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Începeți Jucător singur"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Conexiunea a expirat."
@@ -1152,18 +1206,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Controale:\n"
 "-%s: deplasați înainte\n"
@@ -1277,16 +1328,6 @@ msgid "Fog enabled"
 msgstr "Ceață activată"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Ceață dezactivată"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Ceață activată"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Informatii despre joc:"
 
@@ -1307,16 +1348,6 @@ msgid "KiB/s"
 msgstr "KiB / s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Ceață dezactivată"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Daune activate"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Media..."
 
@@ -1329,34 +1360,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Hartă mip dezactivată de joc sau mod"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Hartă mip ascunsă"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Hartă mip în modul radar, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Hartă mip în modul radar, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Hartă mip în modul radar, Zoom x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Hartă mip în modul de suprafață, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Hartă mip în modul de suprafață, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Hartă mip în modul de suprafață, Zoom x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Modul Noclip este dezactivat"
 
@@ -1401,10 +1404,6 @@ msgid "Resolving address..."
 msgstr "Se rezolvă adresa..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Reînviere"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Se închide..."
 
@@ -1422,11 +1421,11 @@ msgstr "Sunet dezactivat"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "Sistem audio dezactivat"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "Sistemul audio nu e suportat în această construcție"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1457,10 +1456,6 @@ msgid "Wireframe shown"
 msgstr "Cadru de sârmă afișat"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Ai murit"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Zoom dezactivat în prezent de joc sau mod"
 
@@ -1477,16 +1472,6 @@ msgid "Chat shown"
 msgstr "Chat afișat"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Chat ascuns"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Chat afișat"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD ascuns"
 
@@ -1766,6 +1751,25 @@ msgstr "X Butonul 2"
 msgid "Zoom"
 msgstr "Mărire"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Hartă mip ascunsă"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Hartă mip în modul radar, Zoom x1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Hartă mip în modul de suprafață, Zoom x1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Hartă mip în modul de suprafață, Zoom x1"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Parolele nu se potrivesc!"
@@ -1811,26 +1815,6 @@ msgid "Backward"
 msgstr "ÃŽnapoi"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Schimba camera"
 
@@ -1924,30 +1908,10 @@ msgid "Special"
 msgstr "Special"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Special"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Intră pe rapid"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Intră pe rapid"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Comutați HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Intră pe zbor"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Comutați jurnalul de chat"
 
@@ -2081,14 +2045,6 @@ msgstr ""
 "o insulă, setați toate cele 3 numere egale pentru forma brută."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = ocluzia de paralax cu informații despre panta (mai rapid).\n"
-"1 = mapare în relief (mai lentă, mai exactă)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "Zgomot 2D care controlează forma/dimensiunea munților crestați."
 
@@ -2127,7 +2083,7 @@ msgstr "Mod 3D"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode parallax strength"
-msgstr ""
+msgstr "Mod 3D putere paralaxă"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
@@ -2148,6 +2104,10 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"Zgomot 3D care definește structura insulelor plutitoare (floatlands).\n"
+"Dacă este modificată valoarea implicită, 'scala' (0.7) ar putea trebui\n"
+"să fie ajustată, formarea floatland funcționează optim cu un zgomot\n"
+"în intervalul aproximativ -2.0 până la 2.0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
@@ -2215,9 +2175,12 @@ msgid "ABM interval"
 msgstr "Interval ABM"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "Limita absolută a cozilor emergente"
+msgstr "Limita absolută a cozilor de blocuri procesate"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -2274,6 +2237,13 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"Ajustează densitatea stratului floatland.\n"
+"Mărește valoarea pentru creșterea densității. Poate fi pozitivă sau "
+"negativă.\n"
+"Valoarea = 0.0: 50% din volum este floatland.\n"
+"Valoarea = 2.0 (poate fi mai mare în funcție de 'mgv7_np_floatland'; "
+"testați\n"
+"pentru siguranță) va crea un strat solid floatland."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -2473,10 +2443,6 @@ msgid "Builtin"
 msgstr "Incorporat"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Hartă pentru Denivelări"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2495,88 +2461,79 @@ msgstr "Netezirea camerei"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing in cinematic mode"
-msgstr ""
+msgstr "Cameră fluidă în modul cinematic"
 
 #: src/settings_translation_file.cpp
 msgid "Camera update toggle key"
-msgstr ""
+msgstr "Tasta de comutare a actualizării camerei"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise"
-msgstr ""
+msgstr "Zgomotul peșterilor"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #1"
-msgstr ""
+msgstr "Zgomotul 1 al peșterilor"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #2"
-msgstr ""
+msgstr "Zgomotul 2 al peșterilor"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "Lățime peșteri"
 
 #: src/settings_translation_file.cpp
 msgid "Cave1 noise"
-msgstr ""
+msgstr "Zgomot peșteri1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave2 noise"
-msgstr ""
+msgstr "Zgomot peșteri2"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern limit"
-msgstr ""
+msgstr "Limita cavernelor"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern noise"
-msgstr ""
+msgstr "Zgomotul cavernelor"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern taper"
-msgstr ""
+msgstr "Subțiere caverne"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern threshold"
-msgstr "Pragul cavernei"
+msgstr "Pragul cavernelor"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern upper limit"
-msgstr ""
+msgstr "Limita superioară a cavernelor"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Center of light curve boost range.\n"
 "Where 0.0 is minimum light level, 1.0 is maximum light level."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
+"Centrul razei de amplificare a curbei de lumină.\n"
+"Aici 0.0 este nivelul minim de lumină, iar 1.0 este nivelul maxim."
 
 #: src/settings_translation_file.cpp
 msgid "Chat font size"
-msgstr ""
+msgstr "Dimensiunea fontului din chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
 msgstr "Tasta de chat"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat log level"
-msgstr "Cheia de comutare a chatului"
+msgstr "Nivelul de raportare în chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
-msgstr ""
+msgstr "Limita mesajelor din chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message format"
@@ -2588,7 +2545,7 @@ msgstr "Pragul de lansare a mesajului de chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message max length"
-msgstr ""
+msgstr "Lungimea maximă a unui mesaj din chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chat toggle key"
@@ -2600,7 +2557,7 @@ msgstr "Comenzi de chat"
 
 #: src/settings_translation_file.cpp
 msgid "Chunk size"
-msgstr ""
+msgstr "Dimensiunea unui chunk"
 
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode"
@@ -2612,7 +2569,7 @@ msgstr "Tasta modului cinematografic"
 
 #: src/settings_translation_file.cpp
 msgid "Clean transparent textures"
-msgstr ""
+msgstr "Texturi transparente curate"
 
 #: src/settings_translation_file.cpp
 msgid "Client"
@@ -2620,7 +2577,7 @@ msgstr "Client"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
-msgstr ""
+msgstr "Client și server"
 
 #: src/settings_translation_file.cpp
 msgid "Client modding"
@@ -2632,11 +2589,11 @@ msgstr "Restricții de modificare de partea clientului"
 
 #: src/settings_translation_file.cpp
 msgid "Client side node lookup range restriction"
-msgstr ""
+msgstr "Restricția razei de căutare a nodurilor în clienți"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
-msgstr ""
+msgstr "Viteza escaladării"
 
 #: src/settings_translation_file.cpp
 msgid "Cloud radius"
@@ -2648,7 +2605,7 @@ msgstr "Nori"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds are a client side effect."
-msgstr ""
+msgstr "Norii sunt un efect pe client."
 
 #: src/settings_translation_file.cpp
 msgid "Clouds in menu"
@@ -2668,12 +2625,22 @@ msgid ""
 "These flags are independent from Minetest versions,\n"
 "so see a full list at https://content.minetest.net/help/content_flags/"
 msgstr ""
+"Listă separată de virgule cu etichete de ascuns din depozitul de conținut.\n"
+"\"nonfree\" se poate folosi pentru ascunderea pachetelor care nu sunt "
+"'software liber',\n"
+"conform definiției Free Software Foundation.\n"
+"Puteți specifica și clasificarea conținutului.\n"
+"Aceste etichete nu depind de versiunile Minetest.\n"
+"Puteți vedea lista completă la https://content.minetest.net/help/"
+"content_flags/"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
+"Listă separată de virgule, cu modificări care au acces la API-uri HTTP,\n"
+"care la permit încărcarea și descărcarea de date în/din internet."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2714,6 +2681,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "URL-ul ContentDB"
 
@@ -2770,7 +2741,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2778,7 +2751,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2879,12 +2854,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2955,6 +2924,11 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Tasta dreapta"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Particule pentru săpare"
 
@@ -3015,7 +2989,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3103,14 +3077,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3120,18 +3086,6 @@ msgstr "Activează minimap."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3148,12 +3102,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3163,7 +3111,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3466,10 +3414,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3523,8 +3467,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3991,6 +3935,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4071,6 +4019,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4170,6 +4125,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4726,10 +4688,6 @@ msgid "Main menu script"
 msgstr "Scriptul meniului principal"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Stilul meniului principal"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4743,6 +4701,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4906,7 +4872,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4955,6 +4921,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5184,14 +5157,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5217,10 +5182,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5246,34 +5207,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5339,6 +5272,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Tasta de mutare a pitch"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5494,10 +5436,6 @@ msgid "Right key"
 msgstr "Tasta dreapta"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5749,6 +5687,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5878,10 +5826,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5975,6 +5919,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6033,8 +5981,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6060,15 +6008,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6204,6 +6157,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6406,6 +6370,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6528,6 +6498,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6539,19 +6527,53 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = ocluzia de paralax cu informații despre panta (mai rapid).\n"
+#~ "1 = mapare în relief (mai lentă, mai exactă)."
+
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Eşti sigur că vrei să resetezi lumea proprie ?"
 
 #~ msgid "Back"
 #~ msgstr "ÃŽnapoi"
 
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Se descarca si se instaleaza $ 1, vă rugăm să așteptați ..."
+#~ msgid "Bump Mapping"
+#~ msgstr "Cartografiere cu denivelări"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Hartă pentru Denivelări"
+
+#~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Modifică interfața meniului principal:\n"
+#~ "-   Complet:  Lumi multiple singleplayer, selector de joc, selector de "
+#~ "texturi etc.\n"
+#~ "-   Simplu:  Doar o lume singleplayer, fără selectoare de joc sau "
+#~ "texturi.\n"
+#~ "Poate fi necesar pentru ecrane mai mici."
+
+#~ msgid "Config mods"
+#~ msgstr "Configurează moduri"
+
+#~ msgid "Configure"
+#~ msgstr "Configurează"
 
 #, fuzzy
 #~ msgid "Darkness sharpness"
 #~ msgstr "Mapgen"
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Se descarca si se instaleaza $ 1, vă rugăm să așteptați ..."
+
 #, fuzzy
 #~ msgid "Enable VBO"
 #~ msgstr "Activează MP"
@@ -6560,6 +6582,55 @@ msgstr ""
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Activează Daune"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Generați Hărți Normale"
+
+#~ msgid "Main"
+#~ msgstr "Principal"
+
+#~ msgid "Main menu style"
+#~ msgstr "Stilul meniului principal"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Hartă mip în modul radar, Zoom x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Hartă mip în modul radar, Zoom x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Hartă mip în modul de suprafață, Zoom x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Hartă mip în modul de suprafață, Zoom x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Nume/Parolă"
+
+#~ msgid "No"
+#~ msgstr "Nu"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Ocluzie Parallax"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Resetează lume proprie"
+
 #, fuzzy
 #~ msgid "Select Package File:"
 #~ msgstr "Selectează Fișierul Modului:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Începeți Jucător singur"
+
+#, fuzzy
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Intră pe rapid"
+
+#~ msgid "View"
+#~ msgstr "Vizualizare"
+
+#~ msgid "Yes"
+#~ msgstr "Da"
diff --git a/po/ru/minetest.po b/po/ru/minetest.po
index 4ede5a143..9f78a12da 100644
--- a/po/ru/minetest.po
+++ b/po/ru/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Russian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-18 13:41+0000\n"
-"Last-Translator: Maksim Gamarnik <MoNTE48@mail.ua>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-13 08:50+0000\n"
+"Last-Translator: Ertu (Er2, Err) <er2official@outlook.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/minetest/"
 "minetest/ru/>\n"
 "Language: ru\n"
@@ -13,7 +13,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Возродить��"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Вы умерли"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -39,10 +47,6 @@ msgstr "Переподключить��"
 msgid "The server has requested a reconnect:"
 msgstr "Сервер запро�ил переподключение:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Загрузка..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "�е�оответ�твие вер�ии протокола. "
@@ -53,22 +57,18 @@ msgstr "Сервер требует протокол вер�ии $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr "Сервер поддерживает вер�ии протокола между $1 и $2. "
-
-#: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Попробуйте обновить �пи�ок публичных �ерверов и проверьте �в�зь � Интернетом."
+msgstr "Сервер поддерживает вер�ии протокола � $1 по $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr "Поддерживает�� только протокол вер�ии $1."
+msgstr "Мы поддерживаем только протокол вер�ии $1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr "Мы поддерживаем вер�ии протоколов между $1 и $2."
+msgstr "Поддерживают�� только протоколы вер�ий � $1 по $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +78,8 @@ msgstr "Мы поддерживаем вер�ии протоколов межд
 msgid "Cancel"
 msgstr "Отмена"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Зави�имо�ти:"
 
@@ -149,22 +150,61 @@ msgstr "Мир:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
-msgstr "включен"
+msgstr "включено"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" уже �уще�твует. Перезапи�ать?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Зави�имо�ти $1 и $2 будут у�тановлены."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 из $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 �качивает��,\n"
+"$2 в очереди"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 �качивает��…"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "�е удало�ь найти требуемые зави�имо�ти $1."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "Будет у�тановлен $1, а зави�имо�ти $2 будут пропущены."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "В�е дополнени�"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Уже у�тановлено"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "�азад в главное меню"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Базова� игра:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr "ContentDB недо�тупен, когда Minetest �компилирован без cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
 msgstr "Загрузка..."
 
@@ -182,6 +222,14 @@ msgid "Install"
 msgstr "У�тановить"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "У�тановить $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "У�тановить недо�тающие зави�имо�ти"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Моды"
@@ -195,9 +243,24 @@ msgid "No results"
 msgstr "�ичего не найдено"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "И�кать"
+msgid "No updates"
+msgstr "�ет обновлений"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "�е найдено"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Перезапи�ать"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Пожалуй�та, убедите�ь, что базова� игра верна."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "В очереди"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -212,8 +275,12 @@ msgid "Update"
 msgstr "Обновить"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Вид"
+msgid "Update All [$1]"
+msgstr "Обновить в�е [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "По�мотреть дополнительную информацию в веб-браузере"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -225,41 +292,35 @@ msgstr "Дополнительна� ме�тно�ть"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr "Вы�ота нивального по��а"
+msgstr "Вы�ота над уровнем мор�"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Altitude dry"
 msgstr "Вы�ота нивального по��а"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biome blending"
-msgstr "Шум биомов"
+msgstr "Смешивание биомов"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biomes"
-msgstr "Шум биомов"
+msgstr "Биомы"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caverns"
-msgstr "Шум пещеры"
+msgstr "Пещеры"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "Октавы"
+msgstr "Пещеры"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "Создать"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Итерации"
+msgstr "Украшени�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -270,23 +331,20 @@ msgid "Download one from minetest.net"
 msgstr "Вы можете �качать их на minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "Шум подземель�"
+msgstr "Подземель�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
 msgstr "Пло�ка� ме�тно�ть"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floating landmasses in the sky"
-msgstr "Плотно�ть гор на пар�щих о�тровах"
+msgstr "Пар�щие о�трова на небе"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floatlands (experimental)"
-msgstr "Уровень пар�щих о�тровов"
+msgstr "Пар�щие о�трова (�к�периментальный)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -294,20 +352,19 @@ msgstr "Игра"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Создать нефрактальную ме�тно�ть: океаны и подземель�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
 msgstr "Холмы"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Humid rivers"
-msgstr "Видеодрайвер"
+msgstr "Влажно�ть рек"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Увеличивает влажно�ть вокруг рек"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
@@ -316,6 +373,7 @@ msgstr "Озёра"
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
 msgstr ""
+"Пониженную влажно�ть и вы�окую температуру вызывают отмель или вы�ыхание рек"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -326,18 +384,16 @@ msgid "Mapgen flags"
 msgstr "Флаги картогенератора"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mapgen-specific flags"
-msgstr "Специальные флаги картогенератора V5"
+msgstr "Специальные флаги картогенератора"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mountains"
-msgstr "Шум гор"
+msgstr "Горы"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Гр�зевой поток"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
@@ -356,13 +412,12 @@ msgid "Reduces humidity with altitude"
 msgstr "Уменьшает влажно�ть � вы�отой"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Rivers"
-msgstr "Размер рек"
+msgstr "Реки"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Реки на уровне мор�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -378,46 +433,44 @@ msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"Структуры, по�вл�ющие�� на поверхно�ти (не вли�ет на деревь� и тропиче�кую "
+"траву, �генерированные v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "Структуры, по�вл�ющие�� на поверхно�ти, типично деревь� и ра�тени�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "Умеренный по��, Пу�тын�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "Умеренный по��, Пу�тын�, Джунгли"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "Умеренный по��, Пу�тын�, Джунгли, Тундра, Тайга"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Terrain surface erosion"
-msgstr "Базовый шум поверхно�ти"
+msgstr "Разрушение поверхно�ти ме�тно�ти"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
 msgstr "Деревь� и Джунгли-трава"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Vary river depth"
-msgstr "Глубина рек"
+msgstr "Изменить глубину рек"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Очень большие пещеры глубоко под землей"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
-msgstr ""
-"Внимание: «Minimal development test» предназначен только дл� разработчиков."
+msgstr "Внимание: «The Development Test» предназначен дл� разработчиков."
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -462,8 +515,8 @@ msgid ""
 "This modpack has an explicit name given in its modpack.conf which will "
 "override any renaming here."
 msgstr ""
-"Этот модпак имеет �вное им�, указанное в modpack.conf, который переопределит "
-"любое переименование зде�ь."
+"Этот пакет модов имеет им�, �вно указанное в modpack.conf, которое не "
+"изменит�� от переименовани� зде�ь."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
@@ -482,11 +535,6 @@ msgid "Browse"
 msgstr "Обзор"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Клиент"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Отключено"
 
@@ -524,13 +572,17 @@ msgstr "Пожалуй�та, введите допу�тимое чи�ло."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
-msgstr "Сбро� на�троек"
+msgstr "Во��тановить �тандартные на�тройки"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
 msgid "Scale"
 msgstr "Ма�штаб"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "И�кать"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Выбрать каталог"
 
@@ -587,7 +639,7 @@ msgstr "аб�олютна� величина"
 #. for noise settings in main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "defaults"
-msgstr "�тандартные"
+msgstr "Базовый"
 
 #. ~ "eased" is a noise parameter flag.
 #. It is used to make the map smoother and
@@ -607,7 +659,7 @@ msgstr "$1 модов"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Failed to install $1 to $2"
-msgstr "�е удало�ь у�тановить $1 в $2"
+msgstr "�евозможно у�тановить $1 в $2"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Install Mod: Unable to find real mod name for: $1"
@@ -630,8 +682,7 @@ msgstr "У�тановка мода: файл \"$1\""
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to find a valid mod or modpack"
 msgstr ""
-"У�тановка мода: не удаёт�� найти подход�щий каталог дл� мода или пакета "
-"модов $1"
+"У�тановка мода: не удаёт�� найти подход�щий каталог дл� мода или пакета модов"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "Unable to install a $1 as a texture pack"
@@ -649,6 +700,20 @@ msgstr "�е удаёт�� у�тановить мод как $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "�е удаёт�� у�тановить пакет модов как $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Загрузка..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Клиент�кие моды отключены"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Попробуйте обновить �пи�ок публичных �ерверов и проверьте �в�зь � Интернетом."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Пои�к дополнений в �ети"
@@ -702,8 +767,16 @@ msgid "Credits"
 msgstr "Благодарно�ти"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "Открыть каталог данных пользовател�"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Открывает каталог, �одержащий пользователь�кие миры, игры, моды,\n"
+"и пакеты тек�тур в файловом менеджере / проводнике."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -722,14 +795,10 @@ msgid "Bind Address"
 msgstr "�дре� прив�зки"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "�а�троить"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Режим творче�тва"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Включить урон"
 
@@ -743,11 +812,11 @@ msgstr "Запу�тить �ервер"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr "У�тановите игры из ContentDB"
+msgstr "У�тановить игры из ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Им�/Пароль"
+msgid "Name"
+msgstr "Им�"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -758,6 +827,10 @@ msgid "No world created or selected!"
 msgstr "Мир не �оздан или не выбран!"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Пароль"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Играть"
 
@@ -766,6 +839,10 @@ msgid "Port"
 msgstr "Порт"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Выберите моды"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Выберите мир:"
 
@@ -781,25 +858,23 @@ msgstr "�ачать игру"
 msgid "Address / Port"
 msgstr "�дре� / Порт"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Подключить��"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Режим творче�тва"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Урон включён"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
-msgstr ""
-"Убрать из\n"
-"избранных"
+msgstr "Убрать из избранного"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "В избранные"
 
@@ -807,16 +882,16 @@ msgstr "В избранные"
 msgid "Join Game"
 msgstr "Подключить�� к игре"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Им� / Пароль"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Пинг"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP разрешён"
 
@@ -845,10 +920,6 @@ msgid "Antialiasing:"
 msgstr "Сглаживание:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Уверены, что хотите �бро�ить мир одиночной игры?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Запоминать размер окна"
 
@@ -856,10 +927,6 @@ msgstr "Запоминать размер окна"
 msgid "Bilinear Filter"
 msgstr "Билинейна� фильтраци�"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Бампмаппинг"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Смена управлени�"
@@ -873,10 +940,6 @@ msgid "Fancy Leaves"
 msgstr "Кра�ива� ли�тва"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Создавать карты нормалей"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Мипмаппинг"
 
@@ -885,12 +948,8 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Мипмаппинг + анизотр. фильтр"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "�ет"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
-msgstr "Без фильтрации (пик�ельное)"
+msgstr "Без фильтрации"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Mipmap"
@@ -916,19 +975,11 @@ msgstr "�епрозрачна� ли�тва"
 msgid "Opaque Water"
 msgstr "�епрозрачна� вода"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Объёмные тек�туры"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Ча�тицы"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Сбро� одиночной игры"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Экран:"
 
@@ -941,6 +992,10 @@ msgid "Shaders"
 msgstr "Шейдеры"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Шейдеры (�к�периментально)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Шейдеры (недо�тупно)"
 
@@ -966,7 +1021,7 @@ msgstr "Тональное отображение"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold: (px)"
-msgstr "Порог чув�твительно�ти: (px)"
+msgstr "Чув�твительно�ть: (px)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
@@ -978,28 +1033,12 @@ msgstr "Покачивание ли�твы"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Liquids"
-msgstr "Покачивание жидко�тей"
+msgstr "Волни�тые жидко�ти"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Plants"
 msgstr "Покачивание ра�тений"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Да"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "�а�тройка модов"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Главное меню"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "�ачать одиночную игру"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Тайм-аут �оединени�."
@@ -1123,7 +1162,7 @@ msgstr "�втобег включён"
 
 #: src/client/game.cpp
 msgid "Camera update disabled"
-msgstr "Обновление камеры отключено"
+msgstr "Обновление камеры выключено"
 
 #: src/client/game.cpp
 msgid "Camera update enabled"
@@ -1154,25 +1193,22 @@ msgid "Continue"
 msgstr "Продолжить"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Управление:\n"
 "- %s: вперёд\n"
@@ -1276,7 +1312,7 @@ msgstr "Режим полёта включён"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr "Режим полёта включён (но: нет привилегии «fly»)"
+msgstr "Режим полёта включён (но нет привилегии «fly»)"
 
 #: src/client/game.cpp
 msgid "Fog disabled"
@@ -1287,16 +1323,6 @@ msgid "Fog enabled"
 msgstr "Туман включён"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Туман отключён"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Туман включён"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Информаци� об игре:"
 
@@ -1317,16 +1343,6 @@ msgid "KiB/s"
 msgstr "КиБ/�"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Туман отключён"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Урон включён"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Медиафайлы..."
 
@@ -1339,34 +1355,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Миникарта �ейча� отключена игрой или модом"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Миникарта �крыта"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Миникарта в режиме радара, увеличение x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Миникарта в режиме радара, увеличение x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Миникарта в режиме радара, увеличение x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Миникарта в поверхно�тном режиме, увеличение x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Миникарта в поверхно�тном режиме, увеличение x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Миникарта в поверхно�тном режиме, увеличение x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Режим прохождени� �квозь �тены отключён"
 
@@ -1376,7 +1364,7 @@ msgstr "Режим прохождени� �квозь �тены включён
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled (note: no 'noclip' privilege)"
-msgstr "Режим прохождени� �квозь �тены включён (но: нет привилегии «noclip»)"
+msgstr "Режим прохождени� �квозь �тены включён (но нет привилегии «noclip»)"
 
 #: src/client/game.cpp
 msgid "Node definitions..."
@@ -1411,10 +1399,6 @@ msgid "Resolving address..."
 msgstr "Получение адре�а..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Возродить��"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Завершение..."
 
@@ -1467,10 +1451,6 @@ msgid "Wireframe shown"
 msgstr "Отображение карка�а включено"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Вы умерли"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Приближение в на�то�щее врем� отключено игрой или модом"
 
@@ -1487,16 +1467,6 @@ msgid "Chat shown"
 msgstr "Отображение чата включено"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Чат �крыт"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Отображение чата включено"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "Игровой интерфей� �крыт"
 
@@ -1583,7 +1553,7 @@ msgstr "Insert"
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
-msgstr "Влево"
+msgstr "Лево"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
@@ -1608,7 +1578,7 @@ msgstr "Левый Win"
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
 msgid "Menu"
-msgstr "Menu"
+msgstr "Контек�тное меню"
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
@@ -1776,6 +1746,24 @@ msgstr "Доп. кнопка 2"
 msgid "Zoom"
 msgstr "Приближение"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Миникарта �крыта"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Миникарта в режиме радара, увеличение x%d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Миникарта в поверхно�тном режиме, увеличение x%d"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Минимальный размер тек�туры"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Пароли не �овпадают!"
@@ -1821,32 +1809,12 @@ msgid "Backward"
 msgstr "�азад"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
-msgstr "Камера"
+msgstr "Изменить камеру"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Chat"
-msgstr "Сообщение"
+msgstr "Чат"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Command"
@@ -1878,11 +1846,11 @@ msgstr "Вперёд"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. range"
-msgstr "Видимо�ть +"
+msgstr "Увеличить видимо�ть"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. volume"
-msgstr "Громко�ть +"
+msgstr "Увеличить громко�ть"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inventory"
@@ -1904,11 +1872,11 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"
-msgstr "Команда клиента"
+msgstr "Локальна� команда"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Mute"
-msgstr "Звук"
+msgstr "Заглушить"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Next item"
@@ -1920,7 +1888,7 @@ msgstr "Пред. предмет"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Range select"
-msgstr "Видимо�ть"
+msgstr "Дально�ть прори�овки"
 
 #: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Screenshot"
@@ -1932,35 +1900,15 @@ msgstr "Кра�ть��"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Special"
-msgstr "И�пользовать"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "И�пользовать"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Кино"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Кино"
+msgstr "О�обенный"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
-msgstr "Игровой интерфей�"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Полёт"
+msgstr "Вкл/выкл игровой интерфей�"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
-msgstr "Чат"
+msgstr "Вкл/выкл и�торию чата"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
@@ -2081,20 +2029,13 @@ msgid ""
 "Default is for a vertically-squashed shape suitable for\n"
 "an island, set all 3 numbers equal for the raw shape."
 msgstr ""
-"(Х,Y,Z) шкала фрактала в нодах.\n"
-"Фактиче�кий фрактальный размер будет в 2-3 раза больше.\n"
-"Эти чи�ла могут быть очень большими, фракталу нет нужды заполн�ть мир.\n"
-"Увеличьте их, чтобы увеличить «ма�штаб» детали фрактала.\n"
-"Дл� вертикально �жатой фигуры, что подходит\n"
-"о�трову, �делайте в�е 3 чи�ла равными дл� необработанной формы."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = Параллак� окклюзии � информацией о �клоне (бы�тро).\n"
-"1 = Рельефный маппинг (медленно, но каче�твенно)."
+"(Х,Y,Z) ма�штаб фрактала в нодах.\n"
+"Фактиче�кий размер фрактала будет в 2-3 раза больше.\n"
+"Эти чи�ла могут быть очень большими, фракталу нет нужды\n"
+"заполн�ть мир. Увеличьте их, чтобы увеличить «ма�штаб»\n"
+"детали фрактала. По умолчанию значени� подход�т дл�\n"
+"вертикально �жатой фигуры, что подходит о�трову, дл�\n"
+"необработанной формы �делайте в�е 3 значени� равными."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
@@ -2135,9 +2076,8 @@ msgid "3D mode"
 msgstr "3D-режим"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D mode parallax strength"
-msgstr "Сила карт нормалей"
+msgstr "Сила параллак�а в 3D-режиме"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
@@ -2158,6 +2098,11 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"3D шум, определ�ющий �троение пар�щих о�тровов.\n"
+"Е�ли изменен по-умолчанию, 'уровень' шума (0.7 по-умолчанию) возможно "
+"необходимо у�тановить,\n"
+"так как функции �ужени� пар�щих о�тровов лучше в�его работают, \n"
+"когда значение шума находить�� в диапазоне от -2.0 до 2.0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
@@ -2170,7 +2115,7 @@ msgstr "Трёхмерный шум, определÑ�ющий рельеф меÑ
 #: src/settings_translation_file.cpp
 msgid "3D noise for mountain overhangs, cliffs, etc. Usually small variations."
 msgstr ""
-"3D-шум дл� горных вы�тупов, �кал и т. д. В о�новном небольшие вариации."
+"3D шум дл� горных вы�тупов, �кал и т. д. В о�новном небольшие вариации."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise that determines number of dungeons per mapchunk."
@@ -2195,9 +2140,10 @@ msgstr ""
 "-    anaglyph: голубой/пурпурный цвет в 3D.\n"
 "-    interlaced: чётные/нечётные линии отображают два разных кадра дл� "
 "�кранов, поддерживающих пол�ризацию.\n"
-"-    topbottom: Разделение �крана верх/низ\n"
+"-    topbottom: Разделение �крана верх/низ.\n"
 "-    sidebyside: Разделение �крана право/лево.\n"
-"-    pageflip: Четырёхкратна� буферизаци� (QuadBuffer).\n"
+"-    crossview: 3D на о�нове авто�тереограммы.\n"
+"-    pageflip: 3D на о�нове четырёхкратной буферизации.\n"
 "Примечание: в режиме interlaced шейдеры должны быть включены."
 
 #: src/settings_translation_file.cpp
@@ -2218,12 +2164,15 @@ msgstr "Сообщение, которое будет показано в�ем
 
 #: src/settings_translation_file.cpp
 msgid "ABM interval"
-msgstr "Интервал �охранени� карты"
+msgstr "ABM интервал"
+
+#: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "�б�олютный лимит по�вл�ющих�� запро�ов"
+msgstr "�б�олютный предел по�влени� блоков в очереди"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -2255,9 +2204,9 @@ 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"
-"ПРИМЕЧ��ИЕ: �то поле адре�а перезапишет �ту на�тройку в главном меню."
+"�дре�, к которому нужно при�оединить��.\n"
+"О�тавьте �то поле пу�тым, чтобы запу�тить локальный �ервер.\n"
+"Обратите внимание, что поле адре�а в главном меню перезапишет �ту на�тройку."
 
 #: src/settings_translation_file.cpp
 msgid "Adds particles when digging a node."
@@ -2280,6 +2229,13 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"Регулирует плотно�ть �ло� пар�щих о�тровов.\n"
+"Увеличьте значение, чтобы увеличить плотно�ть. Может быть положительным или "
+"отрицательным.\n"
+"Значение = 0,0: 50% объема пар�щих о�тровов.\n"
+"Значение = 2,0 (может быть выше в зави�имо�ти от 'mgv7_np_floatland', в�егда "
+"те�тируйте) \n"
+"�оздает �плошной �лой пар�щих о�тровов."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -2382,15 +2338,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Automatic forward key"
-msgstr "Клавиша авто-вперёд"
+msgstr "�втоматиче�ка� кнопка вперед"
 
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
-msgstr "�втоматиче�ки запрыгивать на преп�т�тви� вы�отой в одну ноду."
+msgstr "�втоматиче�кий подъем на одиночные блоки."
 
 #: src/settings_translation_file.cpp
 msgid "Automatically report to the serverlist."
-msgstr "�втоматиче�ки анон�ировать в �пи�ок �ерверов."
+msgstr "�втоматиче�ка� жалоба на �ервер-ли�т."
 
 #: src/settings_translation_file.cpp
 msgid "Autosave screen size"
@@ -2398,7 +2354,7 @@ msgstr "Запоминать размер окна"
 
 #: src/settings_translation_file.cpp
 msgid "Autoscaling mode"
-msgstr "Режим автома�штабировани�"
+msgstr "Режим автоматиче�кого ма�штабировани�"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
@@ -2406,7 +2362,7 @@ msgstr "Клавиша назад"
 
 #: src/settings_translation_file.cpp
 msgid "Base ground level"
-msgstr "Уровень земли"
+msgstr "Базовый уровень земли"
 
 #: src/settings_translation_file.cpp
 msgid "Base terrain height."
@@ -2458,7 +2414,7 @@ msgstr "Путь к жирному и кур�ивному шрифту"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic monospace font path"
-msgstr "Путь к жирному и кур�иву моноширинного шрифта"
+msgstr "Путь к жирному и кур�ивному моноширинному шрифту"
 
 #: src/settings_translation_file.cpp
 msgid "Bold font path"
@@ -2477,10 +2433,6 @@ msgid "Builtin"
 msgstr "В�троенный"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Бампмаппинг"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2559,33 +2511,16 @@ msgstr ""
 "где 0.0 — минимальный уровень �вета, а 1.0 — мак�имальный."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Изменение интерфей�а в главном меню:\n"
-"-   Full: не�колько однопользователь�ких миров, выбор игры, выбор пакета "
-"тек�тур и т. д.\n"
-"-   Simple: один однопользователь�кий мир без выбора игр или тек�тур. Может "
-"быть полезно дл� небольших �кранов."
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat font size"
-msgstr "Размер шрифта"
+msgstr "Размер шрифта чата"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
 msgstr "Кнопка чата"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat log level"
-msgstr "Отладочный уровень"
+msgstr "Уровень журнала чата"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
@@ -2694,8 +2629,8 @@ msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
-"Спи�ок доверенных модов через зап�тую, которым разрешён до�туп к HTTP API,  "
-"что позвол�ет им отправл�ть и принимать данные через Интернет."
+"Разделенный зап�тыми �пи�ок модов, которые позвол�ют получить до�туп к API "
+"дл� HTTP, что позволить им загружать и �качивать данные из интернета."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2739,6 +2674,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "Чёрный �пи�ок флагов ContentDB"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "Мак�имальное количе�тво одновременных загрузок ContentDB"
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "�дре� ContentDB"
 
@@ -2805,16 +2744,24 @@ msgid "Crosshair alpha"
 msgstr "Прозрачно�ть перекре�ти�"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "Прозрачно�ть прицела (от 0 (прозрачно) до 255 (непрозрачно))."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Прозрачно�ть прицела (от 0 (прозрачно) до 255 (непрозрачно)).\n"
+"Также контролирует цвет перекре�ти� объекта"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
 msgstr "Цвет перекре�ти�"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Цвет перекре�ти� (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Цвет прицела (R, G, B).\n"
+"Также контролирует цвет перекре�ти� объекта"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2877,9 +2824,8 @@ msgid "Default report format"
 msgstr "Формат отчёта по умолчанию"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default stack size"
-msgstr "Стандартна� игра"
+msgstr "Размер �така по умолчанию"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2921,14 +2867,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Определ�ет ра�положение и поверхно�ть дополнительных холмов и озёр."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Определ�ет шаг выборки тек�туры.\n"
-"Более вы�окое значение приводит к более гладким картам нормалей."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Определ�ет базовый уровень земли."
 
@@ -3009,6 +2947,10 @@ msgid "Desynchronize block animation"
 msgstr "Ра��инхронизаци� анимации блоков"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "Кнопка копать"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Ча�тицы при рытье"
 
@@ -3073,7 +3015,8 @@ msgid "Enable console window"
 msgstr "Включить окно кон�оли"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Включить творче�кий режим дл� вновь �озданных карт."
 
 #: src/settings_translation_file.cpp
@@ -3176,23 +3119,16 @@ msgid ""
 "appearance of high dynamic range images. Mid-range contrast is slightly\n"
 "enhanced, highlights and shadows are gradually compressed."
 msgstr ""
+"Включает кинематографиче�кое отображение тонов «Uncharted 2».\n"
+"Имитирует кривую тона фотопленки и приближает\n"
+"изображение к большему динамиче�кому диапазону. Средний контра�т �легка\n"
+"у�иливает��, блики и тени по�тепенно �жимают��."
 
 #: src/settings_translation_file.cpp
 msgid "Enables animation of inventory items."
 msgstr "Включить анимацию предметов в инвентаре."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Включает бампмаппинг дл� тек�тур. Карты нормалей должны быть предо�тавлены\n"
-"пакетом тек�тур или �генерированы автоматиче�ки.\n"
-"Требует, чтобы шейдеры были включены."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Включает к�ширование повёрнутых мешей."
 
@@ -3202,22 +3138,6 @@ msgstr "Включить мини-карту."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Включает генерацию карт нормалей \"на лету\" (�ффект ти�нени�).\n"
-"Требует, чтобы бампмаппинг был включён."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Включает Parallax Occlusion.\n"
-"Требует, чтобы шейдеры были включены."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3238,14 +3158,6 @@ msgstr "Методы �ущно�тей"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Эк�периментальна� опци�, может приве�ти к видимым зазорам\n"
-"между блоками, когда значение больше, чем 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3253,10 +3165,16 @@ msgid ""
 "Values < 1.0 (for example 0.25) create a more defined surface level with\n"
 "flatter lowlands, suitable for a solid floatland layer."
 msgstr ""
+"Степень �ужени� пар�щих о�тровов. Измен�ет характер �ужени�.\n"
+"Значение = 1.0 задает равномерное, линейное �ужение.\n"
+"Значени� > 1.0 задают гладкое �ужение, подходит дл� отдельных\n"
+" пар�щих о�тровов по-умолчанию.\n"
+"Значени� < 1.0 (например, 0.25) задают более точный уровень поверхно�ти\n"
+"� более пло�кими низинами, подходит дл� ма��ивного уровн� пар�щих о�тровов."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "Кадрова� ча�тота во врем� паузы"
+msgid "FPS when unfocused or paused"
+msgstr "Мак�имум кадровой ча�тоты при паузе."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3372,39 +3290,32 @@ msgid "Fixed virtual joystick"
 msgstr "Фик�аци� виртуального джой�тика"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland density"
-msgstr "Плотно�ть гор на пар�щих о�тровах"
+msgstr "Плотно�ть пар�щих о�тровов"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland maximum Y"
-msgstr "Мак�имальна� Y подземель�"
+msgstr "Мак�имальна� Y пар�щих о�тровов"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland minimum Y"
-msgstr "Минимальна� Y подземель�"
+msgstr "Минимальна� Y пар�щих о�тровов"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland noise"
-msgstr "Базовый шум пар�щих о�тровов"
+msgstr "Шум пар�щих о�тровов"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland taper exponent"
-msgstr "Эк�понента гор на пар�щих о�тровах"
+msgstr "Эк�понента кону�а на пар�щих о�тровах"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland tapering distance"
-msgstr "Базовый шум пар�щих о�тровов"
+msgstr "Ра��то�ние �ужени� пар�щих о�тровов"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland water level"
-msgstr "Уровень пар�щих о�тровов"
+msgstr "Уровень воды на пар�щих о�тровах"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
@@ -3463,6 +3374,8 @@ msgid ""
 "Font size of the recent chat text and chat prompt in point (pt).\n"
 "Value 0 will use the default font size."
 msgstr ""
+"Размер шрифта по�леднего чата и под�казки чата в точке (pt).\n"
+"Значение 0 будет и�пользовать размер шрифта по умолчанию."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3512,7 +3425,7 @@ msgstr "�епрозрачно�ть фона формы в полно�кран
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
-msgstr "Клавиша  вперёд"
+msgstr "Клавиша вперёд"
 
 #: src/settings_translation_file.cpp
 msgid "Fourth of 4 2D noises that together define hill/mountain range height."
@@ -3584,10 +3497,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Фильтр txr2img дл� ма�штабировани� интерфей�а"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Генерировать карты нормалей"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Глобальные обратные вызовы"
 
@@ -3603,18 +3512,20 @@ msgstr ""
 "контролирует в�е декорации."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Gradient of light curve at maximum light level.\n"
 "Controls the contrast of the highest light levels."
-msgstr "Градиент кривой �вета на мак�имальном уровне о�вещённо�ти."
+msgstr ""
+"Градиент кривой �вета на мак�имальном уровне о�вещённо�ти.\n"
+"Контролирует контра�тно�ть �амых вы�оких уровней о�вещенно�ти."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Gradient of light curve at minimum light level.\n"
 "Controls the contrast of the lowest light levels."
-msgstr "Градиент кривой �вета на минимальном уровне о�вещённо�ти."
+msgstr ""
+"Градиент кривой �вета на минимальном уровне о�вещённо�ти.\n"
+"Контролирует контра�тно�ть �амых низких уровней о�вещенно�ти."
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
@@ -3645,16 +3556,14 @@ msgid "HUD toggle key"
 msgstr "Клавиша переключени� игрового интерфей�а"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Обработка у�таревших вызовов Lua API:\n"
-"-    legacy: (пытать��) имитировать прежнее поведение (по умолчанию дл� "
-"релиза).\n"
+"-    none: не запи�ывать у�таревшие вызовы\n"
 "-    log: имитировать и журналировать у�таревшие вызовы (по умолчанию дл� "
 "отладки).\n"
 "-    error: прерывание при и�пользовании у�таревших вызовов (рекомендовано "
@@ -3895,6 +3804,9 @@ msgid ""
 "If negative, liquid waves will move backwards.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"Как бы�тро будут покачивать�� волны жидко�тей. Выше = бы�трее\n"
+"Е�ли отрицательно, жидкие волны будут двигать�� назад.\n"
+"Требует, чтобы волни�тые жидко�ти были включены."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4171,6 +4083,10 @@ msgid "Joystick button repetition interval"
 msgstr "Интервал повторного клика кнопкой джой�тика"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr "Мертва� зона джой�тика"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Чув�твительно�ть джой�тика"
 
@@ -4274,6 +4190,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Клавиша копани�.\n"
+"См. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4415,6 +4341,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Клавиша прыжка.\n"
+"См. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4981,7 +4918,7 @@ msgstr "Минимальное количе�тво больших пещер"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave proportion flooded"
-msgstr ""
+msgstr "Пропорци� затопленных больших пещер"
 
 #: src/settings_translation_file.cpp
 msgid "Large chat console key"
@@ -5018,13 +4955,12 @@ msgstr ""
 "обновл�ют�� по �ети."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Length of liquid waves.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
-"У�тановка в true включает покачивание ли�твы.\n"
-"Требует, чтобы шейдеры были включены."
+"Длина волн жидко�тей.\n"
+"Требует�� включение волни�тых жидко�тей."
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between Active Block Modifier (ABM) execution cycles"
@@ -5059,34 +4995,28 @@ msgstr ""
 "-    verbose (подробно�ти)"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve boost"
-msgstr "Средний подъём кривой �вета"
+msgstr "У�иление кривой �вета"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve boost center"
-msgstr "Центр �реднего подъёма кривой �вета"
+msgstr "Центр у�илени� кривой �вета"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve boost spread"
-msgstr "Ра�про�транение �реднего ро�та кривой �вета"
+msgstr "Ра�про�транение у�илени� ро�та кривой �вета"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve gamma"
-msgstr "Средний подъём кривой �вета"
+msgstr "Гамма кривой �вета"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve high gradient"
-msgstr "Средний подъём кривой �вета"
+msgstr "Вы�окий градиент кривой �вета"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Light curve low gradient"
-msgstr "Центр �реднего подъёма кривой �вета"
+msgstr "�изкий градиент кривой �вета"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5165,19 +5095,14 @@ msgid "Lower Y limit of dungeons."
 msgstr "�ижний лимит Y дл� подземелий."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lower Y limit of floatlands."
-msgstr "�ижний лимит Y дл� подземелий."
+msgstr "�ижний лимит Y дл� пар�щих о�тровов."
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
 msgstr "Скрипт главного меню"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Стиль главного меню"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5193,6 +5118,14 @@ msgid "Makes all liquids opaque"
 msgstr "Сделать в�е жидко�ти непрозрачными"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr "Уровень �жати� карты дл� ди�кового хранилища"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr "Уровень �жати� карты дл� передачи по �ети"
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Каталог �охранени� карт"
 
@@ -5201,7 +5134,6 @@ msgid "Map generation attributes specific to Mapgen Carpathian."
 msgstr "�трибуты генерации карт дл� Mapgen Carpathian."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Flat.\n"
 "Occasional lakes and hills can be added to the flat world."
@@ -5210,14 +5142,13 @@ msgstr ""
 "Иногда озера и холмы могут добавл�ть�� в пло�кий мир."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen Fractal.\n"
 "'terrain' enables the generation of non-fractal terrain:\n"
 "ocean, islands and underground."
 msgstr ""
 "�трибуты генерации дл� картогенератора пло�ко�ти.\n"
-"«terrain» включает генерацию нефрактального рельефа:\n"
+"'terrain' включает генерацию нефрактального рельефа:\n"
 "океаны, о�трова и подземель�."
 
 #: src/settings_translation_file.cpp
@@ -5253,15 +5184,16 @@ msgstr ""
 "активируют�� джунгли, а флаг «jungles» игнорирует��."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "'ridges': Rivers.\n"
 "'floatlands': Floating land masses in the atmosphere.\n"
 "'caverns': Giant caves deep underground."
 msgstr ""
-"�трибуты генерации карт дл� Mapgen v7.\n"
-"«хребты» включают реки."
+"�трибуты генерации карт, �пецифичные дл� Mapgen v7.\n"
+"'ridges': Реки.\n"
+"'floatlands': Пар�щие о�трова �уши в атмо�фере.\n"
+"'caverns': Гигант�кие пещеры глубоко под землей."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -5376,8 +5308,9 @@ msgid "Maximum FPS"
 msgstr "Мак�имум кадровой ча�тоты (FPS)"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "Мак�имум кадровой ча�тоты при паузе."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr ""
+"Мак�имальный FPS, когда окно не �фоку�ировано, или когда игра прио�тановлена."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -5389,20 +5322,21 @@ msgstr "Мак�имальна� ширина гор�чей панели"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of large caves per mapchunk."
-msgstr "Мак�имальный порог �лучайного количе�тва больших пещер на ку�ок карты"
+msgstr ""
+"Мак�имальный предел �лучайного количе�тва больших пещер на ку�ок карты."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of small caves per mapchunk."
 msgstr ""
+"Мак�имальный предел �лучайного количе�тва маленьких пещер на ку�ок карты."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum liquid resistance. Controls deceleration when entering liquid at\n"
 "high speed."
 msgstr ""
 "Мак�имальное �опротивление жидко�ти. Контролирует замедление\n"
-"при по�туплении жидко�ти � вы�окой �коро�тью."
+"при погружении в жидко�ть на вы�окой �коро�ти."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5421,22 +5355,31 @@ msgstr ""
 "загрузки."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "This limit is enforced per player."
 msgstr ""
-"Мак�имальное количе�тво блоков в очереди на генерацию. О�тавьте пу�тым дл� "
-"автоматиче�кого выбора подход�щего значени�."
+"Мак�имальное количе�тво блоков в очередь, которые должны быть �формированы.\n"
+"Это ограничение примен�ет�� дл� каждого игрока."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "This limit is enforced per player."
 msgstr ""
-"Мак�имальное количе�тво блоков в очереди на загрузку из файла. О�тавьте "
-"пу�тым дл� автоматиче�кого выбора подход�щего значени�."
+"Мак�имальное количе�тво блоков в очередь, которые должны быть загружены из "
+"файла.\n"
+"Это ограничение примен�ет�� дл� каждого игрока."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+"Мак�имальное количе�тво одновременных загрузок. Загрузки, превышающие �тот "
+"лимит, будут по�тавлены в очередь.\n"
+"Это должно быть меньше curl_parallel_limit."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
@@ -5533,7 +5476,7 @@ msgstr "Метод под�ветки выделенного объекта."
 
 #: src/settings_translation_file.cpp
 msgid "Minimal level of logging to be written to chat."
-msgstr ""
+msgstr "Минимальный уровень запи�и в чат."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
@@ -5548,13 +5491,12 @@ msgid "Minimap scan height"
 msgstr "Вы�ота �канировани� миникарты"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Minimum limit of random number of large caves per mapchunk."
-msgstr "3D-шум, определ�ющий количе�тво подземелий в ку�ке карты."
+msgstr "Минимальный предел �лучайного количе�тва больших пещер на ку�ок карты."
 
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of small caves per mapchunk."
-msgstr ""
+msgstr "Минимальное количе�тво маленьких пещер на ку�ок карты."
 
 #: src/settings_translation_file.cpp
 msgid "Minimum texture size"
@@ -5653,9 +5595,8 @@ msgid ""
 msgstr "Им� �ервера, отображаемое при входе и в �пи�ке �ерверов."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Near plane"
-msgstr "Близка� пло�ко�ть от�ечени�"
+msgstr "Ближн�� пло�ко�ть"
 
 #: src/settings_translation_file.cpp
 msgid "Network"
@@ -5694,19 +5635,10 @@ msgid "Noises"
 msgstr "Шумы"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Выборка карт нормалей"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Сила карт нормалей"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Количе�тво emerge-потоков"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Number of emerge threads to use.\n"
 "Value 0:\n"
@@ -5720,19 +5652,16 @@ msgid ""
 "'on_generated'. For many users the optimum setting may be '1'."
 msgstr ""
 "Количе�тво возникающих потоков дл� и�пользовани�.\n"
-"В�ИМ��ИЕ: Пока могут по�вл�ть�� ошибки, вызывающие �бой, е�ли\n"
-"«num_emerge_threads» больше 1. Строго рекомендует�� и�пользовать\n"
-"значение «1», до тех пор, пока предупреждение не будет убрано.\n"
 "Значение 0:\n"
 "-    �втоматиче�кий выбор. Количе�тво потоков будет\n"
-"-    «чи�ло проце��оров - 2», минимально — 1.\n"
+"-    'чи�ло проце��оров - 2', минимально — 1.\n"
 "Любое другое значение:\n"
 "-    Указывает количе�тво потоков, минимально — 1.\n"
 "В�ИМ��ИЕ: Увеличение чи�ла потоков улучшает бы�тродей�твие движка\n"
 "картогенератора, но может �нижать производительно�ть игры, меша� другим\n"
 "проце��ам, о�обенно в одиночной игре и при запу�ке кода Lua в "
-"«on_generated».\n"
-"Дл� большин�тва пользователей наилучшим значением может быть «1»."
+"'on_generated'.\n"
+"Дл� большин�тва пользователей наилучшим значением может быть '1'."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5747,10 +5676,6 @@ msgstr ""
 "пам�ти (4096=100 MБ, как правило)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Количе�тво итераций Parallax Occlusion."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Сетевой репозиторий"
 
@@ -5761,12 +5686,12 @@ msgstr "�епрозрачные жидко�ти"
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
-msgstr ""
+msgstr "�епрозрачно�ть (альфа) тени позади шрифта по умолчанию, между 0 и 255."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the fallback font, between 0 and 255."
-msgstr ""
+msgstr "�епрозрачно�ть (альфа) тени за резервным шрифтом, между 0 и 255."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5778,34 +5703,6 @@ msgstr ""
 "форма уже открыта."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Общее �мещение �ффекта Parallax Occlusion, обычно ма�штаб/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Общее �мещение �ффекта Parallax Occlusion."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Включить параллак�"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Смещение параллак�а"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Повторение параллак�а"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Режим параллак�а"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Ма�штаб параллак�ной окклюзии"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5813,12 +5710,20 @@ msgid ""
 "This font will be used for certain languages or if the default font is "
 "unavailable."
 msgstr ""
+"Путь к резервному шрифту.\n"
+"Е�ли параметр «freetype» включён: должен быть шрифтом TrueType.\n"
+"Е�ли параметр «freetype» отключён: должен быть векторным XML-шрифтом.\n"
+"Этот шрифт будет и�пользовать�� дл� некоторых �зыков или е�ли �тандартный "
+"шрифт недо�тупен."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Path to save screenshots at. Can be an absolute or relative path.\n"
 "The folder will be created if it doesn't already exist."
 msgstr ""
+"Путь дл� �охранени� �криншотов. Может быть аб�олютным или отно�ительным "
+"путем.\n"
+"Папка будет �оздана, е�ли она еще не �уще�твует."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5840,6 +5745,11 @@ msgid ""
 "If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
 "The fallback font will be used if the font cannot be loaded."
 msgstr ""
+"Путь к шрифту по умолчанию.\n"
+"Е�ли параметр «freetype» включен: должен быть шрифт TrueType.\n"
+"Е�ли параметр «freetype» отключен: �то должен быть ра�тровый или векторный "
+"шрифт XML.\n"
+"Резервный шрифт будет и�пользовать��, е�ли шрифт не может быть загружен."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5848,6 +5758,11 @@ msgid ""
 "If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
 "This font is used for e.g. the console and profiler screen."
 msgstr ""
+"Путь к моноширинному шрифту.\n"
+"Е�ли параметр «freetype» включен: должен быть шрифт TrueType.\n"
+"Е�ли параметр «freetype» отключен: �то должен быть ра�тровый или векторный "
+"шрифт XML.\n"
+"Этот шрифт и�пользует��, например, дл� �кран кон�оли и �крана профилей."
 
 #: src/settings_translation_file.cpp
 msgid "Pause on lost window focus"
@@ -5855,12 +5770,11 @@ msgstr "Пауза при потере фоку�а"
 
 #: src/settings_translation_file.cpp
 msgid "Per-player limit of queued blocks load from disk"
-msgstr ""
+msgstr "Ограничение поочередной загрузки блоков � ди�ка на игрока"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Per-player limit of queued blocks to generate"
-msgstr "Ограничение очередей emerge дл� генерации"
+msgstr "Ограничение дл� каждого игрока в очереди блоков дл� генерации"
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
@@ -5875,6 +5789,16 @@ msgid "Pitch move mode"
 msgstr "Режим движени� вниз/вверх по направлению взгл�да"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Клавиша полёта"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Интервал повторного клика правой кнопкой"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5944,7 +5868,7 @@ msgstr "Профилирование"
 
 #: src/settings_translation_file.cpp
 msgid "Prometheus listener address"
-msgstr ""
+msgstr "адре� приёмника Prometheus"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5953,10 +5877,14 @@ msgid ""
 "enable metrics listener for Prometheus on that address.\n"
 "Metrics can be fetch on http://127.0.0.1:30000/metrics"
 msgstr ""
+"�дре� приёмника Prometheus.\n"
+"Е�ли мой те�т �компилирован � включенной опцией ENABLE_PROMETHEUS,\n"
+"включить приемник метрик дл� Prometheus по �тому адре�у.\n"
+"Метрики можно получить на http://127.0.0.1:30000/metrics"
 
 #: src/settings_translation_file.cpp
 msgid "Proportion of large caves that contain liquid."
-msgstr ""
+msgstr "Дол� больших пещер, которые �одержат жидко�ть."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5984,9 +5912,8 @@ msgid "Recent Chat Messages"
 msgstr "�едавние �ообщени� чата"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Regular font path"
-msgstr "Путь дл� �охранени� отчётов"
+msgstr "Стандартный путь шрифта"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
@@ -6057,10 +5984,6 @@ msgid "Right key"
 msgstr "Права� клавиша меню"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Интервал повторного клика правой кнопкой"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Глубина ру�ла реки"
 
@@ -6200,7 +6123,6 @@ msgid "Selection box width"
 msgstr "Толщина рамки выделени�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Selects one of 18 fractal types.\n"
 "1 = 4D \"Roundy\" Mandelbrot set.\n"
@@ -6293,7 +6215,6 @@ msgstr ""
 "в чат."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving leaves.\n"
 "Requires shaders to be enabled."
@@ -6302,16 +6223,14 @@ msgstr ""
 "Требует, чтобы шейдеры были включены."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving liquids (like water).\n"
 "Requires shaders to be enabled."
 msgstr ""
-"У�тановка в true включает волны на воде.\n"
+"У�тановка в true включает волни�тые жидко�ти (например, вода).\n"
 "Требует, чтобы шейдеры были включены."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Set to true to enable waving plants.\n"
 "Requires shaders to be enabled."
@@ -6335,18 +6254,20 @@ msgstr ""
 "Работают только � видео-б�кендом OpenGL."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shadow offset (in pixels) of the default font. If 0, then shadow will not be "
 "drawn."
-msgstr "Смещение тени шрифта. Е�ли указан 0, то тень не будет показана."
+msgstr ""
+"Смещение тени �тандартного шрифта (в пик�ел�х). Е�ли указан 0, то тень не "
+"будет показана."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Shadow offset (in pixels) of the fallback font. If 0, then shadow will not "
 "be drawn."
-msgstr "Смещение тени шрифта. Е�ли указан 0, то тень не будет показана."
+msgstr ""
+"Смещение тени резервного шрифта (в пик�ел�х). Е�ли указан 0, то тень не "
+"будет показана."
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
@@ -6361,6 +6282,20 @@ msgid "Show entity selection boxes"
 msgstr "Показывать обла�ть выделени� объектов"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"У�тановка �зыка. О�тавьте пу�тым дл� и�пользовани� �и�темного �зыка.\n"
+"Требует перезапу�ка по�ле изменени�."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Стандартный жирный шрифт"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Сообщение о выключении"
 
@@ -6403,11 +6338,11 @@ msgstr "Склон и заполнение работают Ñ�овмеÑ�тно Ð
 
 #: src/settings_translation_file.cpp
 msgid "Small cave maximum number"
-msgstr ""
+msgstr "Мак�имальное количе�тво маленьких пещер"
 
 #: src/settings_translation_file.cpp
 msgid "Small cave minimum number"
-msgstr ""
+msgstr "Минимальное количе�тво маленьких пещер"
 
 #: src/settings_translation_file.cpp
 msgid "Small-scale humidity variation for blending biomes on borders."
@@ -6482,16 +6417,19 @@ msgid ""
 "Note that mods or games may explicitly set a stack for certain (or all) "
 "items."
 msgstr ""
+"У�танавливает размер �тека нодов, предметов и ин�трументов по-умолчанию.\n"
+"Обратите внимание, что моды или игры могут �вно у�тановить �тек дл� "
+"определенных (или в�ех) предметов."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Spread of light curve boost range.\n"
 "Controls the width of the range to be boosted.\n"
 "Standard deviation of the light curve boost Gaussian."
 msgstr ""
-"Ра�про�транение �реднего подъёма кривой �вета.\n"
-"Стандартное отклонение �реднего подъёма по Гау��у."
+"Диапазон увеличени� кривой �вета.\n"
+"Регулирует ширину увеличиваемого диапазона.\n"
+"Стандартное отклонение у�илени� кривой �вета по Гау��у."
 
 #: src/settings_translation_file.cpp
 msgid "Static spawnpoint"
@@ -6510,13 +6448,8 @@ msgid "Step mountain spread noise"
 msgstr "Шаг шума ра�про�транени� гор"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Strength of 3D mode parallax."
-msgstr "Сила параллак�а."
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Сила �генерированных карт нормалей."
+msgstr "Сила параллак�а в 3D режиме."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6524,6 +6457,9 @@ msgid ""
 "The 3 'boost' parameters define a range of the light\n"
 "curve that is boosted in brightness."
 msgstr ""
+"Сила и�кажени� �вета.\n"
+"3 параметра 'у�илени�' определ�ют предел и�кажени� �вета,\n"
+"который увеличивает�� в о�вещении."
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
@@ -6546,6 +6482,21 @@ msgid ""
 "server-intensive extreme water flow and to avoid vast flooding of the\n"
 "world surface below."
 msgstr ""
+"Уровень поверхно�ти необ�зательной воды размещенной на твердом �лое пар�щих "
+"о�тровов. \n"
+"Вода по умолчанию отключена и будет размещена только в том �лучае, е�ли �то "
+"значение \n"
+"будет у�тановлено выше «mgv7_floatland_ymax» - «mgv7_floatland_taper» \n"
+"(начало верхнего �ужени�).\n"
+"*** ПРЕДУПРЕЖДЕ�ИЕ, ПОТЕ�ЦИ�ЛЬ��Я ОП�С�ОСТЬ ДЛЯ МИРОВ И Р�БОТЫ СЕРВЕР� ***:\n"
+"При включении размещени� воды пар�щих о�тровов должны быть �конфигурированы "
+"и проверены \n"
+"на наличие �плошного �ло�, у�тановив «mgv7_floatland_density» на 2,0 (или "
+"другое \n"
+"требуемое значение в зави�имо�ти от «mgv7_np_floatland»), чтобы избежать \n"
+"чрезмерного интен�ивного потока воды на �ервере и избежать обширного "
+"затоплени�\n"
+"поверхно�ти мира внизу."
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -6626,6 +6577,10 @@ msgid "The URL for the content repository"
 msgstr "�дре� �етевого репозитори�"
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr "Мертва� зона джой�тика"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6662,6 +6617,11 @@ msgid ""
 "Default is 1.0 (1/2 node).\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"Мак�имальна� вы�ота поверхно�ти волни�тых жидко�тей.\n"
+"4.0 = вы�ота волны равна двум нодам.\n"
+"0.0 = волна не двигает�� вообще.\n"
+"Значение по умолчанию — 1.0 (1/2 ноды).\n"
+"Требует, чтобы волни�тые жидко�ти были включены."
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
@@ -6677,7 +6637,6 @@ msgstr ""
 "на�тройке мода."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "The radius of the volume of blocks around every player that is subject to "
 "the\n"
@@ -6687,21 +6646,23 @@ msgid ""
 "maintained.\n"
 "This should be configured together with active_object_send_range_blocks."
 msgstr ""
-"Радиу� объёма блоков вокруг каждого игрока, в котором дей�твуют\n"
-"активные блоки, определённые в блоках карты (16 нод).\n"
-"В активных блоках загружают�� объекты и работает ABM.\n"
-"Также �то минимальный диапазон, в котором обрабатывают�� активные объекты "
+"Радиу� объёма блоков вокруг каждого игрока, на которого ра�про�тран�ет�� "
+"дей�твие\n"
+"активного материала блока, указанного в mapblocks (16 узлов).\n"
+"В активные блоки загружают�� объекты и запу�кают�� ПРО.\n"
+"Это также минимальный диапазон, в котором поддерживают�� активные объекты "
 "(мобы).\n"
-"�еобходимо на�траивать вме�те � active_object_range."
+"Это должно быть на�троено вме�те � active_object_send_range_blocks."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end for Irrlicht.\n"
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "Программный интерфей� визуализации дл� Irrlicht.\n"
 "По�ле изменени� �того параметра потребует�� перезапу�к.\n"
@@ -6742,6 +6703,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6749,10 +6716,10 @@ msgstr ""
 "когда зажата комбинаци� кнопок на джой�тике."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr "Задержка в �екундах между кликами при зажатой правой кнопке мыши."
 
 #: src/settings_translation_file.cpp
@@ -6835,7 +6802,6 @@ msgid "Trilinear filtering"
 msgstr "Трилинейна� фильтраци�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "True = 256\n"
 "False = 128\n"
@@ -6885,9 +6851,8 @@ msgid "Upper Y limit of dungeons."
 msgstr "Верхний лимит Y дл� подземелий."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Upper Y limit of floatlands."
-msgstr "Верхний лимит Y дл� подземелий."
+msgstr "Верхний лимит Y дл� пар�щих о�тровов."
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
@@ -6918,6 +6883,26 @@ msgstr ""
 "Гамма-коррекци� при уменьшении ма�штаба не поддерживает��."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+"И�пользуйте многовыборочное �глаживание (MSAA) дл� �глаживани� краев "
+"блоков.\n"
+"Этот алгоритм �глаживает обла�ть про�мотра 3D, �охран�� резко�ть "
+"изображени�,\n"
+"но �то не вли�ет на внутренно�ти тек�тур\n"
+"(что о�обенно заметно на прозрачных тек�турах).\n"
+"Когда шейдеры отключены, между узлами по�вл�ют�� видимые пробелы.\n"
+"Е�ли у�тановлено значение 0, MSAA отключено.\n"
+"По�ле изменени� �той опции требует�� перезагрузка."
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "И�пользовать трилинейную фильтрацию дл� ма�штабировани� тек�тур."
 
@@ -7026,13 +7011,12 @@ msgid "Volume"
 msgstr "Громко�ть"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
-"Включает Parallax Occlusion.\n"
-"Требует, чтобы шейдеры были включены."
+"Громко�ть в�ех звуков.\n"
+"Требует�� включить звуковую �и�тему."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7079,24 +7063,20 @@ msgid "Waving leaves"
 msgstr "Покачивание ли�твы"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids"
-msgstr "Покачивание жидко�тей"
+msgstr "Волни�тые жидко�ти"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave height"
-msgstr "Вы�ота волн на воде"
+msgstr "Вы�ота волн волни�тых жидко�тей"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave speed"
-msgstr "Скоро�ть волн на воде"
+msgstr "Скоро�ть волн волни�тых жидко�тей"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wavelength"
-msgstr "Длина волн на воде"
+msgstr "Длина волн волни�тых жидко�тей"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
@@ -7150,14 +7130,20 @@ msgstr ""
 "автома�штабировани� тек�тур."
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Whether FreeType fonts are used, requires FreeType support to be compiled "
 "in.\n"
 "If disabled, bitmap and XML vectors fonts are used instead."
 msgstr ""
-"И�пользовать шрифты FreeType. Поддержка FreeType должна быть включена при "
-"�борке."
+"И�пользовать ли шрифты FreeType. Поддержка FreeType должна быть включена при "
+"�борке.\n"
+"Е�ли отключено, и�пользуют�� ра�тровые и XML-векторные изображени�."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
@@ -7196,6 +7182,10 @@ msgid ""
 "In-game, you can toggle the mute state with the mute key or by using the\n"
 "pause menu."
 msgstr ""
+"Отключить ли звуки. Вы можете включить звуки в любое врем�, е�ли \n"
+"звукова� �и�тема не отключена (enable_sound=false). \n"
+"В игре, вы можете отключить их � помощью клавиши mute\n"
+"или вызыва� меню паузы."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -7280,6 +7270,10 @@ msgid ""
 "For a solid floatland layer, this controls the height of hills/mountains.\n"
 "Must be less than or equal to half the distance between the Y limits."
 msgstr ""
+"Y-ра��то�ние, на котором равнины �ужают�� от полной плотно�ти до нул�.\n"
+"Сужение начинает�� на �том ра��то�нии от предела Y.\n"
+"Дл� твердого �ло� пар�щих о�тровов �то контролирует вы�оту холмов/гор.\n"
+"Должно быть меньше или равно половине ра��то�ни� между пределами Y."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of average terrain surface."
@@ -7302,6 +7296,35 @@ msgid "Y-level of seabed."
 msgstr "Y-уровень мор�кого дна."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Уровень �жати� ZLib дл� и�пользовани� при �охранении картографиче�ких блоков "
+"на ди�ке.\n"
+"-1 - уровень �жати� Zlib по умолчанию\n"
+"0 - без компре��ора, �амый бы�трый\n"
+"9 - лучшее �жатие, �амое медленное\n"
+"(уровни 1-3 и�пользуют \"бы�трый\" метод Zlib, 4-9 и�пользуют обычный метод)"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Уровень �жати� ZLib дл� и�пользовани� при отправке блоков карты клиенту.\n"
+"-1 - уровень �жати� Zlib по умолчанию\n"
+"0 - без компре��ора, �амый бы�трый\n"
+"9 - лучшее �жатие, �амое медленное\n"
+"(уровни 1-3 и�пользуют \"бы�трый\" метод Zlib, 4-9 и�пользуют обычный метод)"
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "Тайм-аут загрузки файла � помощью cURL"
 
@@ -7313,25 +7336,12 @@ msgstr "Лимит одновременных �оединений cURL"
 msgid "cURL timeout"
 msgstr "cURL тайм-аут"
 
-#~ msgid "Ok"
-#~ msgstr "Oк"
-
-#~ msgid "Back"
-#~ msgstr "�азад"
-
-#~ msgid "Downloading and installing $1, please wait..."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
 #~ msgstr ""
-#~ "Загружает�� и у�танавливает�� $1.\n"
-#~ "Пожалуй�та, подождите..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Ограничение очередей emerge на ди�ке"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Сила параллак�а"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Путь дл� �охранени� �криншотов."
+#~ "0 = Параллак� окклюзии � информацией о �клоне (бы�тро).\n"
+#~ "1 = Рельефный маппинг (медленно, но каче�твенно)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7345,10 +7355,42 @@ msgstr "cURL тайм-аут"
 #~ msgid "Alters how mountain-type floatlands taper above and below midpoint."
 #~ msgstr "Управл�ет �ужением о�тровов горного типа ниже �редней точки."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Уверены, что хотите �бро�ить мир одиночной игры?"
+
+#~ msgid "Back"
+#~ msgstr "�азад"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Бампмаппинг"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Бампмаппинг"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Центр �реднего подъёма кривой �вета."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Изменение интерфей�а в главном меню:\n"
+#~ "-   Full: не�колько однопользователь�ких миров, выбор игры, выбор пакета "
+#~ "тек�тур и т. д.\n"
+#~ "-   Simple: один однопользователь�кий мир без выбора игр или тек�тур. "
+#~ "Может быть полезно дл� небольших �кранов."
+
+#~ msgid "Config mods"
+#~ msgstr "�а�тройка модов"
+
+#~ msgid "Configure"
+#~ msgstr "�а�троить"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7360,6 +7402,9 @@ msgstr "cURL тайм-аут"
 #~ "Контролирует ширину тоннелей. Меньшие значени� �оздают более широкие "
 #~ "тоннели."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Цвет перекре�ти� (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Резко�ть темноты"
 
@@ -7371,6 +7416,13 @@ msgstr "cURL тайм-аут"
 #~ "Гладкие пар�щие о�трова по�вл�ют��, когда шум больше нол�."
 
 #~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Определ�ет шаг выборки тек�туры.\n"
+#~ "Более вы�окое значение приводит к более гладким картам нормалей."
+
+#~ msgid ""
 #~ "Deprecated, define and locate cave liquids using biome definitions "
 #~ "instead.\n"
 #~ "Y of upper limit of lava in large caves."
@@ -7379,12 +7431,52 @@ msgstr "cURL тайм-аут"
 #~ "определений биома.\n"
 #~ "Y верхней границы лавы в больших пещерах."
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr ""
+#~ "Загружает�� и у�танавливает�� $1.\n"
+#~ "Пожалуй�та, подождите..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Включить объекты буфера вершин (VBO)"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Включает бампмаппинг дл� тек�тур. Карты нормалей должны быть "
+#~ "предо�тавлены\n"
+#~ "пакетом тек�тур или �генерированы автоматиче�ки.\n"
+#~ "Требует, чтобы шейдеры были включены."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Включить кинематографиче�кое тональное отображение"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Включает генерацию карт нормалей \"на лету\" (�ффект ти�нени�).\n"
+#~ "Требует, чтобы бампмаппинг был включён."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Включает Parallax Occlusion.\n"
+#~ "Требует, чтобы шейдеры были включены."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Эк�периментальна� опци�, может приве�ти к видимым зазорам\n"
+#~ "между блоками, когда значение больше, чем 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "Кадрова� ча�тота во врем� паузы"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Шум базовой вы�оты пар�щих о�тровов"
 
@@ -7397,6 +7489,12 @@ msgstr "cURL тайм-аут"
 #~ msgid "Gamma"
 #~ msgstr "Гамма"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Создавать карты нормалей"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Генерировать карты нормалей"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Поддержка IPv6."
 
@@ -7406,18 +7504,105 @@ msgstr "cURL тайм-аут"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Резко�ть о�вещённо�ти"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Ограничение очередей emerge на ди�ке"
+
+#~ msgid "Main"
+#~ msgstr "Главное меню"
+
+#~ msgid "Main menu style"
+#~ msgstr "Стиль главного меню"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Миникарта в режиме радара, увеличение x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Миникарта в режиме радара, увеличение x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Миникарта в поверхно�тном режиме, увеличение x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Миникарта в поверхно�тном режиме, увеличение x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Им�/Пароль"
+
+#~ msgid "No"
+#~ msgstr "�ет"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Выборка карт нормалей"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Сила карт нормалей"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Количе�тво итераций Parallax Occlusion."
+
+#~ msgid "Ok"
+#~ msgstr "Oк"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "Общее �мещение �ффекта Parallax Occlusion, обычно ма�штаб/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Общее �мещение �ффекта Parallax Occlusion."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Объёмные тек�туры"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Включить параллак�"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Смещение параллак�а"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Повторение параллак�а"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Режим параллак�а"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Ма�штаб параллак�ной окклюзии"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Сила параллак�а"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Путь к шрифту TrueType или картинке �о шрифтом."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Путь дл� �охранени� �криншотов."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "Про�тупающие подземель�"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Сбро� одиночной игры"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Выберите файл дополнени�:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Лимит теней"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "�ачать одиночную игру"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Сила �генерированных карт нормалей."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Сила �реднего подъёма кривой �вета."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Этот шрифт будет и�пользован дл� некоторых �зыков."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Кино"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7429,24 +7614,24 @@ msgstr "cURL тайм-аут"
 #~ "Вариаци� вы�оты холмов и глубин озёр на гладкой ме�тно�ти пар�щих "
 #~ "о�тровов."
 
+#~ msgid "View"
+#~ msgstr "Вид"
+
+#~ msgid "Waving Water"
+#~ msgstr "Волны на воде"
+
 #~ msgid "Waving water"
 #~ msgstr "Волны на воде"
 
+#, fuzzy
+#~ msgid "Y of upper limit of lava in large caves."
+#~ msgstr "Верхний предел по Y дл� больших п�евдо�лучайных пещер."
+
 #~ msgid "Y-level of floatland midpoint and lake surface."
 #~ msgstr "Y-уровень �ередины поплавка и поверхно�ти озера."
 
 #~ msgid "Y-level to which floatland shadows extend."
 #~ msgstr "Y-уровень, на который ра�про�тран�ют�� тени � плавающей точкой."
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "Про�тупающие подземель�"
-
-#~ msgid "Waving Water"
-#~ msgstr "Волны на воде"
-
-#, fuzzy
-#~ msgid "Y of upper limit of lava in large caves."
-#~ msgstr "Верхний предел по Y дл� больших п�евдо�лучайных пещер."
-
-#~ msgid "Select Package File:"
-#~ msgstr "Выберите файл дополнени�:"
+#~ msgid "Yes"
+#~ msgstr "Да"
diff --git a/po/sk/minetest.po b/po/sk/minetest.po
index 6be7ed603..c8249c0f0 100644
--- a/po/sk/minetest.po
+++ b/po/sk/minetest.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-07-08 20:47+0000\n"
-"Last-Translator: rubenwardy <rw@rubenwardy.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-13 08:50+0000\n"
+"Last-Translator: Marian <daretmavi@gmail.com>\n"
 "Language-Team: Slovak <https://hosted.weblate.org/projects/minetest/minetest/"
 "sk/>\n"
 "Language: sk\n"
@@ -17,7 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Oživiť"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Zomrel si"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -43,10 +51,6 @@ msgstr "Znova pripojiť"
 msgid "The server has requested a reconnect:"
 msgstr "Server požadoval obnovu spojenia:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Nahrávam..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Nesúhlas verzií protokolov. "
@@ -60,12 +64,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Server podporuje verzie protokolov: $1 - $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Skús znova povoliť verejný zoznam serverov a skontroluj internetové "
-"pripojenie."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Podporujeme len protokol verzie $1."
 
@@ -73,7 +71,8 @@ msgstr "Podporujeme len protokol verzie $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Podporujeme verzie protokolov: $1 - $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -83,7 +82,8 @@ msgstr "Podporujeme verzie protokolov: $1 - $2."
 msgid "Cancel"
 msgstr "Zruš"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Závislosti:"
 
@@ -93,15 +93,15 @@ msgstr "Deaktivuj všetko"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr "Deaktivuj rozšírenie"
+msgstr "Deaktivuj balí�ek rozšírení"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
-msgstr "Povoľ všetko"
+msgstr "Aktivuj všetko"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr "Povoľ rozšírenie"
+msgstr "Aktivuj balí�ek rozšírení"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
@@ -117,7 +117,7 @@ msgstr "Nájdi viac rozšírení"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
-msgstr "Rozšírenie:"
+msgstr "Mod:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No (optional) dependencies"
@@ -154,17 +154,57 @@ msgstr "Svet:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
-msgstr "povolené"
+msgstr "aktívne"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" už exituje. Chcel by si ho prepísať?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "Závislosti $1 a $2 budú nainštalované."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 od $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 sťahujem,\n"
+"$2 �aká v rade"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 sťahujem..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 požadované závislosti nie je možné nájsť."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 bude nainštalovaný, a $2 závislosti budú presko�ené."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Všetky balí�ky"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Už je nainštalované"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Naspäť do hlavného menu"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Základná hra:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr "ContentDB nie je k dispozícií ak bol Minetest skompilovaný bez cURL"
 
@@ -186,6 +226,14 @@ msgid "Install"
 msgstr "Inštaluj"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "Inštaluj $1"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Nainštaluj chýbajúce závislosti"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Rozšírenia"
@@ -199,9 +247,24 @@ msgid "No results"
 msgstr "Bez výsledku"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Hľadaj"
+msgid "No updates"
+msgstr "Bez aktualizácií"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Nenájdené"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Prepíš"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Prosím skontroluj �i je základná hra v poriadku."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "Čaká v rade"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -216,8 +279,12 @@ msgid "Update"
 msgstr "Aktualizuj"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Zobraziť"
+msgid "Update All [$1]"
+msgstr "Aktualizuj všetky [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Pozri si viac informácií vo webovom prehliada�i"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -473,12 +540,8 @@ msgid "Browse"
 msgstr "Prehliadaj"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
-msgstr "Zablokované"
+msgstr "Vypnuté"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Edit"
@@ -486,7 +549,7 @@ msgstr "Upraviť"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Enabled"
-msgstr "Povolené"
+msgstr "Aktivované"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Lacunarity"
@@ -521,6 +584,10 @@ msgid "Scale"
 msgstr "Mierka"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Hľadaj"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Zvoľ adresár"
 
@@ -589,7 +656,7 @@ msgstr "zjemnené (eased)"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "$1 (Enabled)"
-msgstr "$1 (povolený)"
+msgstr "$1 (Aktivované)"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "$1 mods"
@@ -638,13 +705,28 @@ msgstr "Nie je možné nainštalovať rozšírenie $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Nie je možné nainštalovať balí�ek rozšírení $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Nahrávam..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Skriptovanie na strane klienta je zakázané"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Skús znova povoliť verejný zoznam serverov a skontroluj internetové "
+"pripojenie."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
-msgstr "Prehliadaj online obsah"
+msgstr "Hľadaj nový obsah na internete"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
-msgstr "Obsah"
+msgstr "Doplnky"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -688,11 +770,19 @@ msgstr "Hlavný vývojari"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
-msgstr "Uznanie"
+msgstr "Po�akovanie"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid "Open User Data Directory"
+msgstr "Otvor adresár s užívateľskými dátami"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Otvor adresár, ktorý obsahuje svety, hry, mody a textúry\n"
+"od užívateľov v správcovi/prieskumníkovi súborov."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -711,16 +801,12 @@ msgid "Bind Address"
 msgstr "Prira� adresu"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Konfigurácia"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Kreatívny mód"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
-msgstr "Povoľ poškodenie"
+msgstr "Aktivuj zranenie"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Game"
@@ -732,11 +818,11 @@ msgstr "Hosťuj server"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr "Inštaluj hru z ContentDB"
+msgstr "Inštaluj hry z ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Meno/Heslo"
+msgid "Name"
+msgstr "Meno"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -744,17 +830,25 @@ msgstr "Nový"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "No world created or selected!"
-msgstr ""
+msgstr "Nie je vytvorený ani zvolený svet!"
+
+#: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Heslo"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
-msgstr ""
+msgstr "Hraj hru"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Zvoľ mody"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Zvoľ si svet:"
 
@@ -764,288 +858,252 @@ msgstr "Port servera"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Start Game"
-msgstr ""
+msgstr "Spusti hru"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
-msgstr ""
+msgstr "Adresa / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
-msgstr ""
+msgstr "Pripojiť sa"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
-msgstr ""
+msgstr "Kreatívny mód"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
-msgstr ""
+msgstr "Poškodenie je aktivované"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
-msgstr ""
+msgstr "Zmaž obľúbené"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
-msgstr ""
+msgstr "Obľúbené"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Join Game"
-msgstr ""
+msgstr "Pripoj sa do hry"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
-msgstr ""
+msgstr "Meno / Heslo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
-msgstr ""
+msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
-msgstr ""
+msgstr "PvP je aktívne"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "2x"
-msgstr ""
+msgstr "2x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "3D Clouds"
-msgstr ""
+msgstr "3D mraky"
 
 #: 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 "All Settings"
-msgstr ""
+msgstr "VÅ¡etky nastavenia"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Antialiasing:"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
+msgstr "Vyhladzovanie:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
-msgstr ""
+msgstr "Automat. ulož. veľkosti okna"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Bilinear Filter"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
+msgstr "Bilineárny filter"
 
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
-msgstr ""
+msgstr "Zmeň ovládacie klávesy"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Connected Glass"
-msgstr ""
+msgstr "Prepojené sklo"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Fancy Leaves"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
+msgstr "Ozdobné listy"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
-msgstr ""
+msgstr "Mipmapy"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap + Aniso. Filter"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
+msgstr "Mipmapy + Aniso. filter"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
-msgstr ""
+msgstr "Žiaden filter"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "No Mipmap"
-msgstr ""
+msgstr "Žiadne Mipmapy"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Highlighting"
-msgstr ""
+msgstr "Nasvietenie kocky"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Node Outlining"
-msgstr ""
+msgstr "Obrys kocky"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "None"
-msgstr ""
+msgstr "Žiadne"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Leaves"
-msgstr ""
+msgstr "Nepriehľadné listy"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Opaque Water"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
+msgstr "Nepriehľadná voda"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
+msgstr "ÄŒastice"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
-msgstr ""
+msgstr "Zobrazenie:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Settings"
-msgstr ""
+msgstr "Nastavenia"
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Shaders"
-msgstr ""
+msgstr "Shadery"
+
+#: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Shadery (experimentálne)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
-msgstr ""
+msgstr "Shadery (nedostupné)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Simple Leaves"
-msgstr ""
+msgstr "Jednoduché listy"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Smooth Lighting"
-msgstr ""
+msgstr "Jemné osvetlenie"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Texturing:"
-msgstr ""
+msgstr "Textúrovanie:"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "To enable shaders the OpenGL driver needs to be used."
-msgstr ""
+msgstr "Aby mohli byť aktivované shadery, musí sa použiť OpenGL."
 
 #: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
 msgid "Tone Mapping"
-msgstr ""
+msgstr "Tone Mapping (Optim. farieb)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Touchthreshold: (px)"
-msgstr ""
+msgstr "Dotykový prah: (px)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
-msgstr ""
+msgstr "Trilineárny filter"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Leaves"
-msgstr ""
+msgstr "Vlniace sa listy"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Liquids"
-msgstr ""
+msgstr "Vlniace sa kvapaliny"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Waving Plants"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
+msgstr "Vlniace sa rastliny"
 
 #: src/client/client.cpp
 msgid "Connection timed out."
-msgstr ""
+msgstr "Časový limit pripojenia vypršal."
 
 #: src/client/client.cpp
 msgid "Done!"
-msgstr ""
+msgstr "Hotovo!"
 
 #: src/client/client.cpp
 msgid "Initializing nodes"
-msgstr ""
+msgstr "Inicializujem kocky"
 
 #: src/client/client.cpp
 msgid "Initializing nodes..."
-msgstr ""
+msgstr "Inicializujem kocky..."
 
 #: src/client/client.cpp
 msgid "Loading textures..."
-msgstr ""
+msgstr "Nahrávam textúry..."
 
 #: src/client/client.cpp
 msgid "Rebuilding shaders..."
-msgstr ""
+msgstr "Obnovujem shadery..."
 
 #: src/client/clientlauncher.cpp
 msgid "Connection error (timed out?)"
-msgstr ""
+msgstr "Chyba spojenia (�asový limit?)"
 
 #: src/client/clientlauncher.cpp
 msgid "Could not find or load game \""
-msgstr ""
+msgstr "Nie je možné nájsť alebo nahrať hru \""
 
 #: src/client/clientlauncher.cpp
 msgid "Invalid gamespec."
-msgstr ""
+msgstr "Chybná špec. hry."
 
 #: src/client/clientlauncher.cpp
 msgid "Main Menu"
-msgstr ""
+msgstr "Hlavné menu"
 
 #: src/client/clientlauncher.cpp
 msgid "No world selected and no address provided. Nothing to do."
-msgstr ""
+msgstr "Nie je zvolený svet ani poskytnutá adresa. Niet �o robiť."
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
-msgstr ""
+msgstr "Meno hrá�a je príliš dlhé."
 
 #: src/client/clientlauncher.cpp
 msgid "Please choose a name!"
-msgstr ""
+msgstr "Prosím zvoľ si meno!"
 
 #: src/client/clientlauncher.cpp
 msgid "Provided password file failed to open: "
-msgstr ""
+msgstr "Dodaný súbor s heslom nie je možné otvoriť: "
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
-msgstr ""
+msgstr "Zadaná cesta k svetu neexistuje: "
 
 #. ~ DO NOT TRANSLATE THIS LITERALLY!
 #. This is a special string. Put either "no" or "yes"
@@ -1057,86 +1115,88 @@ msgstr ""
 #. When in doubt, test your translation.
 #: src/client/fontengine.cpp
 msgid "needs_fallback_font"
-msgstr ""
+msgstr "no"
 
 #: src/client/game.cpp
 msgid ""
 "\n"
 "Check debug.txt for details."
 msgstr ""
+"\n"
+"Pozri detaily v debug.txt."
 
 #: src/client/game.cpp
 msgid "- Address: "
-msgstr ""
+msgstr "- Adresa: "
 
 #: src/client/game.cpp
 msgid "- Creative Mode: "
-msgstr ""
+msgstr "- Kreatívny mód: "
 
 #: src/client/game.cpp
 msgid "- Damage: "
-msgstr ""
+msgstr "- Poškodenie: "
 
 #: src/client/game.cpp
 msgid "- Mode: "
-msgstr ""
+msgstr "- Mode: "
 
 #: src/client/game.cpp
 msgid "- Port: "
-msgstr ""
+msgstr "- Port: "
 
 #: src/client/game.cpp
 msgid "- Public: "
-msgstr ""
+msgstr "- Verejný: "
 
 #. ~ PvP = Player versus Player
 #: src/client/game.cpp
 msgid "- PvP: "
-msgstr ""
+msgstr "- PvP: "
 
 #: src/client/game.cpp
 msgid "- Server Name: "
-msgstr ""
+msgstr "- Meno servera: "
 
 #: src/client/game.cpp
 msgid "Automatic forward disabled"
-msgstr ""
+msgstr "Automatický pohyb vpred je zakázaný"
 
 #: src/client/game.cpp
 msgid "Automatic forward enabled"
-msgstr ""
+msgstr "Automatický pohyb vpred je aktivovaný"
 
 #: src/client/game.cpp
 msgid "Camera update disabled"
-msgstr ""
+msgstr "Aktualizácia kamery je zakázaná"
 
 #: src/client/game.cpp
 msgid "Camera update enabled"
-msgstr ""
+msgstr "Aktualizácia kamery je aktivovaná"
 
 #: src/client/game.cpp
 msgid "Change Password"
-msgstr ""
+msgstr "Zmeniť heslo"
 
 #: src/client/game.cpp
 msgid "Cinematic mode disabled"
-msgstr ""
+msgstr "Filmový režim je zakázaný"
 
 #: src/client/game.cpp
 msgid "Cinematic mode enabled"
-msgstr ""
+msgstr "Filmový režim je aktivovaný"
 
 #: src/client/game.cpp
 msgid "Client side scripting is disabled"
-msgstr ""
+msgstr "Skriptovanie na strane klienta je zakázané"
 
 #: src/client/game.cpp
 msgid "Connecting to server..."
-msgstr ""
+msgstr "Pripájam sa k serveru..."
 
 #: src/client/game.cpp
 msgid "Continue"
-msgstr ""
+msgstr "Pokra�uj"
 
 #: src/client/game.cpp
 #, c-format
@@ -1146,39 +1206,50 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
+"Ovládanie:\n"
+"- %s: pohyb vpred\n"
+"- %s: pohyb vzad\n"
+"- %s: pohyb doľava\n"
+"- %s: pohyb doprava\n"
+"- %s: sko�/vylez\n"
+"- %s: kop/udri\n"
+"- %s: polož/použi\n"
+"- %s: zakrádaj sa/cho� dole\n"
+"- %s: odho� vec\n"
+"- %s: inventár\n"
+"- Myš: oto� sa/obzeraj sa\n"
+"- Myš koliesko: zvoľ si vec\n"
+"- %s: komunikácia\n"
 
 #: src/client/game.cpp
 msgid "Creating client..."
-msgstr ""
+msgstr "Vytváram klienta..."
 
 #: src/client/game.cpp
 msgid "Creating server..."
-msgstr ""
+msgstr "Vytváram server..."
 
 #: src/client/game.cpp
 msgid "Debug info and profiler graph hidden"
-msgstr ""
+msgstr "Ladiace informácie a Profilový graf sú skryté"
 
 #: src/client/game.cpp
 msgid "Debug info shown"
-msgstr ""
+msgstr "Ladiace informácie zobrazené"
 
 #: src/client/game.cpp
 msgid "Debug info, profiler graph, and wireframe hidden"
-msgstr ""
+msgstr "Ladiace informácie, Profilový graf a Obrysy sú skryté"
 
 #: src/client/game.cpp
 msgid ""
@@ -1195,548 +1266,517 @@ msgid ""
 "- touch&drag, tap 2nd finger\n"
 " --> place single item to slot\n"
 msgstr ""
+"Štandardné ovládanie:\n"
+"Menu nie je zobrazené:\n"
+"- jeden klik: tla�idlo aktivuj\n"
+"- dvojklik: polož/použi\n"
+"- posun prstom: pozeraj sa dookola\n"
+"Menu/Inventár je zobrazené/ý:\n"
+"- dvojklik (mimo):\n"
+" -->zatvor\n"
+"- klik na kôpku, klik na pozíciu:\n"
+" --> presuň kôpku \n"
+"- chyť a prenes, klik druhým prstom\n"
+" --> polož jednu vec na pozíciu\n"
 
 #: src/client/game.cpp
 msgid "Disabled unlimited viewing range"
-msgstr ""
+msgstr "Neobmedzená dohľadnosť je zakázaná"
 
 #: src/client/game.cpp
 msgid "Enabled unlimited viewing range"
-msgstr ""
+msgstr "Neobmedzená dohľadnosť je aktivovaná"
 
 #: src/client/game.cpp
 msgid "Exit to Menu"
-msgstr ""
+msgstr "Návrat do menu"
 
 #: src/client/game.cpp
 msgid "Exit to OS"
-msgstr ""
+msgstr "Ukon�iť hru"
 
 #: src/client/game.cpp
 msgid "Fast mode disabled"
-msgstr ""
+msgstr "Rýchly režim je zakázaný"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled"
-msgstr ""
+msgstr "Rýchly režim je aktívny"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
-msgstr ""
+msgstr "Rýchly režim je aktivovaný (poznámka: chýba právo 'fast')"
 
 #: src/client/game.cpp
 msgid "Fly mode disabled"
-msgstr ""
+msgstr "Režim lietania je zakázaný"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled"
-msgstr ""
+msgstr "Režim lietania je aktívny"
 
 #: src/client/game.cpp
 msgid "Fly mode enabled (note: no 'fly' privilege)"
-msgstr ""
+msgstr "Režim lietania je aktívny (poznámka: chýba právo 'fly')"
 
 #: src/client/game.cpp
 msgid "Fog disabled"
-msgstr ""
+msgstr "Hmla je vypnutá"
 
 #: src/client/game.cpp
 msgid "Fog enabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "povolené"
+msgstr "Hmla je aktivovaná"
 
 #: src/client/game.cpp
 msgid "Game info:"
-msgstr ""
+msgstr "Informácie o hre:"
 
 #: src/client/game.cpp
 msgid "Game paused"
-msgstr ""
+msgstr "Hra je pozastavená"
 
 #: src/client/game.cpp
 msgid "Hosting server"
-msgstr ""
+msgstr "Beží server"
 
 #: src/client/game.cpp
 msgid "Item definitions..."
-msgstr ""
+msgstr "Definície vecí..."
 
 #: src/client/game.cpp
 msgid "KiB/s"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "povolené"
+msgstr "KiB/s"
 
 #: src/client/game.cpp
 msgid "Media..."
-msgstr ""
+msgstr "Média..."
 
 #: src/client/game.cpp
 msgid "MiB/s"
-msgstr ""
+msgstr "MiB/s"
 
 #: src/client/game.cpp
 msgid "Minimap currently disabled by game or mod"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
+msgstr "Minimapa je aktuálne zakázaná hrou, alebo rozšírením"
 
 #: src/client/game.cpp
 msgid "Noclip mode disabled"
-msgstr ""
+msgstr "Režim prechádzania stenami je zakázaný"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled"
-msgstr ""
+msgstr "Režim prechádzania stenami je aktivovaný"
 
 #: src/client/game.cpp
 msgid "Noclip mode enabled (note: no 'noclip' privilege)"
 msgstr ""
+"Režim prechádzania stenami je aktivovaný (poznámka: chýba právo 'noclip')"
 
 #: src/client/game.cpp
 msgid "Node definitions..."
-msgstr ""
+msgstr "Definície kocky..."
 
 #: src/client/game.cpp
 msgid "Off"
-msgstr ""
+msgstr "Vypnutý"
 
 #: src/client/game.cpp
 msgid "On"
-msgstr ""
+msgstr "Aktívny"
 
 #: src/client/game.cpp
 msgid "Pitch move mode disabled"
-msgstr ""
+msgstr "Režim pohybu podľa sklonu je zakázaný"
 
 #: src/client/game.cpp
 msgid "Pitch move mode enabled"
-msgstr ""
+msgstr "Režim pohybu podľa sklonu je aktívny"
 
 #: src/client/game.cpp
 msgid "Profiler graph shown"
-msgstr ""
+msgstr "Profilový graf je zobrazený"
 
 #: src/client/game.cpp
 msgid "Remote server"
-msgstr ""
+msgstr "Vzdialený server"
 
 #: src/client/game.cpp
 msgid "Resolving address..."
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Respawn"
-msgstr "Oživiť"
+msgstr "Prekladám adresu..."
 
 #: src/client/game.cpp
 msgid "Shutting down..."
-msgstr ""
+msgstr "Vypínam..."
 
 #: src/client/game.cpp
 msgid "Singleplayer"
-msgstr ""
+msgstr "Hra pre jedného hrá�a"
 
 #: src/client/game.cpp
 msgid "Sound Volume"
-msgstr ""
+msgstr "Hlasitosť"
 
 #: src/client/game.cpp
 msgid "Sound muted"
-msgstr ""
+msgstr "Zvuk je stlmený"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "Zvukový systém je zakázaný"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "Zvukový systém nie je podporovaný v tomto zostavení"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
-msgstr ""
+msgstr "Zvuk je obnovený"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range changed to %d"
-msgstr ""
+msgstr "Dohľadnosť je zmenená na %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at maximum: %d"
-msgstr ""
+msgstr "Dohľadnosť je na maxime: %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Viewing range is at minimum: %d"
-msgstr ""
+msgstr "Dohľadnosť je na minime: %d"
 
 #: src/client/game.cpp
 #, c-format
 msgid "Volume changed to %d%%"
-msgstr ""
+msgstr "Hlasitosť zmenená na %d%%"
 
 #: src/client/game.cpp
 msgid "Wireframe shown"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "You died"
-msgstr "Zomrel si"
+msgstr "Obrysy zobrazené"
 
 #: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
-msgstr ""
+msgstr "Zvä�šenie je zakázané hrou, alebo rozšírením"
 
 #: src/client/game.cpp
 msgid "ok"
-msgstr ""
+msgstr "ok"
 
 #: src/client/gameui.cpp
 msgid "Chat hidden"
-msgstr ""
+msgstr "Komunika�ná konzola je skrytá"
 
 #: src/client/gameui.cpp
 msgid "Chat shown"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
+msgstr "Komunika�ná konzola je zobrazená"
 
 #: src/client/gameui.cpp
 msgid "HUD hidden"
-msgstr ""
+msgstr "HUD je skryrý"
 
 #: src/client/gameui.cpp
 msgid "HUD shown"
-msgstr ""
+msgstr "HUD je zobrazený"
 
 #: src/client/gameui.cpp
 msgid "Profiler hidden"
-msgstr ""
+msgstr "Profilovanie je skryté"
 
 #: src/client/gameui.cpp
 #, c-format
 msgid "Profiler shown (page %d of %d)"
-msgstr ""
+msgstr "Profilovanie je zobrazené (strana %d z %d)"
 
 #: src/client/keycode.cpp
 msgid "Apps"
-msgstr ""
+msgstr "Aplikácie"
 
 #: src/client/keycode.cpp
 msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
 
 #: src/client/keycode.cpp
 msgid "Caps Lock"
-msgstr ""
+msgstr "Caps Lock"
 
 #: src/client/keycode.cpp
 msgid "Clear"
-msgstr ""
+msgstr "Zmaž"
 
 #: src/client/keycode.cpp
 msgid "Control"
-msgstr ""
+msgstr "CTRL"
 
 #: src/client/keycode.cpp
 msgid "Down"
-msgstr ""
+msgstr "Dole"
 
 #: src/client/keycode.cpp
 msgid "End"
-msgstr ""
+msgstr "End"
 
 #: src/client/keycode.cpp
 msgid "Erase EOF"
-msgstr ""
+msgstr "Zmaž EOF"
 
 #: src/client/keycode.cpp
 msgid "Execute"
-msgstr ""
+msgstr "Spustiť"
 
 #: src/client/keycode.cpp
 msgid "Help"
-msgstr ""
+msgstr "Pomoc"
 
 #: src/client/keycode.cpp
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #: src/client/keycode.cpp
 msgid "IME Accept"
-msgstr ""
+msgstr "IME Súhlas"
 
 #: src/client/keycode.cpp
 msgid "IME Convert"
-msgstr ""
+msgstr "IME Konvertuj"
 
 #: src/client/keycode.cpp
 msgid "IME Escape"
-msgstr ""
+msgstr "IME Escape"
 
 #: src/client/keycode.cpp
 msgid "IME Mode Change"
-msgstr ""
+msgstr "IME Zmena módu"
 
 #: src/client/keycode.cpp
 msgid "IME Nonconvert"
-msgstr ""
+msgstr "IME Nekonvertuj"
 
 #: src/client/keycode.cpp
 msgid "Insert"
-msgstr ""
+msgstr "Vlož"
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
 msgid "Left"
-msgstr ""
+msgstr "Vľavo"
 
 #: src/client/keycode.cpp
 msgid "Left Button"
-msgstr ""
+msgstr "Ľavé tla�ítko"
 
 #: src/client/keycode.cpp
 msgid "Left Control"
-msgstr ""
+msgstr "Ľavý CRTL"
 
 #: src/client/keycode.cpp
 msgid "Left Menu"
-msgstr ""
+msgstr "Ľavé Menu"
 
 #: src/client/keycode.cpp
 msgid "Left Shift"
-msgstr ""
+msgstr "Ľavý Shift"
 
 #: src/client/keycode.cpp
 msgid "Left Windows"
-msgstr ""
+msgstr "Ľavá klávesa Windows"
 
 #. ~ Key name, common on Windows keyboards
 #: src/client/keycode.cpp
 msgid "Menu"
-msgstr ""
+msgstr "Menu"
 
 #: src/client/keycode.cpp
 msgid "Middle Button"
-msgstr ""
+msgstr "Stredné tla�ítko"
 
 #: src/client/keycode.cpp
 msgid "Num Lock"
-msgstr ""
+msgstr "Num Lock"
 
 #: src/client/keycode.cpp
 msgid "Numpad *"
-msgstr ""
+msgstr "Numerická klávesnica *"
 
 #: src/client/keycode.cpp
 msgid "Numpad +"
-msgstr ""
+msgstr "Numerická klávesnica +"
 
 #: src/client/keycode.cpp
 msgid "Numpad -"
-msgstr ""
+msgstr "Numerická klávesnica -"
 
 #: src/client/keycode.cpp
 msgid "Numpad ."
-msgstr ""
+msgstr "Numerická klávesnica ."
 
 #: src/client/keycode.cpp
 msgid "Numpad /"
-msgstr ""
+msgstr "Numerická klávesnica /"
 
 #: src/client/keycode.cpp
 msgid "Numpad 0"
-msgstr ""
+msgstr "Numerická klávesnica 0"
 
 #: src/client/keycode.cpp
 msgid "Numpad 1"
-msgstr ""
+msgstr "Numerická klávesnica 1"
 
 #: src/client/keycode.cpp
 msgid "Numpad 2"
-msgstr ""
+msgstr "Numerická klávesnica 2"
 
 #: src/client/keycode.cpp
 msgid "Numpad 3"
-msgstr ""
+msgstr "Numerická klávesnica 3"
 
 #: src/client/keycode.cpp
 msgid "Numpad 4"
-msgstr ""
+msgstr "Numerická klávesnica 4"
 
 #: src/client/keycode.cpp
 msgid "Numpad 5"
-msgstr ""
+msgstr "Numerická klávesnica 5"
 
 #: src/client/keycode.cpp
 msgid "Numpad 6"
-msgstr ""
+msgstr "Numerická klávesnica 6"
 
 #: src/client/keycode.cpp
 msgid "Numpad 7"
-msgstr ""
+msgstr "Numerická klávesnica 7"
 
 #: src/client/keycode.cpp
 msgid "Numpad 8"
-msgstr ""
+msgstr "Numerická klávesnica 8"
 
 #: src/client/keycode.cpp
 msgid "Numpad 9"
-msgstr ""
+msgstr "Numerická klávesnica 9"
 
 #: src/client/keycode.cpp
 msgid "OEM Clear"
-msgstr ""
+msgstr "OEM Clear"
 
 #: src/client/keycode.cpp
 msgid "Page down"
-msgstr ""
+msgstr "Page down"
 
 #: src/client/keycode.cpp
 msgid "Page up"
-msgstr ""
+msgstr "Page up"
 
 #: src/client/keycode.cpp
 msgid "Pause"
-msgstr ""
+msgstr "Pause"
 
 #: src/client/keycode.cpp
 msgid "Play"
-msgstr ""
+msgstr "Hraj"
 
 #. ~ "Print screen" key
 #: src/client/keycode.cpp
 msgid "Print"
-msgstr ""
+msgstr "PrtSc"
 
 #: src/client/keycode.cpp
 msgid "Return"
-msgstr ""
+msgstr "Enter"
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
 msgid "Right"
-msgstr ""
+msgstr "Vpravo"
 
 #: src/client/keycode.cpp
 msgid "Right Button"
-msgstr ""
+msgstr "Pravé tla�ítko"
 
 #: src/client/keycode.cpp
 msgid "Right Control"
-msgstr ""
+msgstr "Pravý CRTL"
 
 #: src/client/keycode.cpp
 msgid "Right Menu"
-msgstr ""
+msgstr "Pravé Menu"
 
 #: src/client/keycode.cpp
 msgid "Right Shift"
-msgstr ""
+msgstr "Pravý Shift"
 
 #: src/client/keycode.cpp
 msgid "Right Windows"
-msgstr ""
+msgstr "Pravá klávesa Windows"
 
 #: src/client/keycode.cpp
 msgid "Scroll Lock"
-msgstr ""
+msgstr "Scroll Lock"
 
 #. ~ Key name
 #: src/client/keycode.cpp
 msgid "Select"
-msgstr ""
+msgstr "Vybrať"
 
 #: src/client/keycode.cpp
 msgid "Shift"
-msgstr ""
+msgstr "Shift"
 
 #: src/client/keycode.cpp
 msgid "Sleep"
-msgstr ""
+msgstr "Spánok"
 
 #: src/client/keycode.cpp
 msgid "Snapshot"
-msgstr ""
+msgstr "Snímka"
 
 #: src/client/keycode.cpp
 msgid "Space"
-msgstr ""
+msgstr "Medzera"
 
 #: src/client/keycode.cpp
 msgid "Tab"
-msgstr ""
+msgstr "Tab"
 
 #: src/client/keycode.cpp
 msgid "Up"
-msgstr ""
+msgstr "Hore"
 
 #: src/client/keycode.cpp
 msgid "X Button 1"
-msgstr ""
+msgstr "X tla�idlo 1"
 
 #: src/client/keycode.cpp
 msgid "X Button 2"
-msgstr ""
+msgstr "X tla�idlo 2"
 
 #: src/client/keycode.cpp src/gui/guiKeyChangeMenu.cpp
 msgid "Zoom"
-msgstr ""
+msgstr "Priblíž"
+
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Minimapa je skrytá"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Minimapa v radarovom režime, priblíženie x%d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Minimapa v povrchovom režime, priblíženie x%d"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Minimapa v móde textúry"
 
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
-msgstr ""
+msgstr "Hesla sa nezhodujú!"
 
 #: src/gui/guiConfirmRegistration.cpp
 msgid "Register and Join"
-msgstr ""
+msgstr "Registrovať a pripojiť sa"
 
 #: src/gui/guiConfirmRegistration.cpp
 #, c-format
@@ -1747,224 +1787,195 @@ msgid ""
 "Please retype your password and click 'Register and Join' to confirm account "
 "creation, or click 'Cancel' to abort."
 msgstr ""
+"Chystáš sa pripojiť k serveru \"%s\" po prvý krát.\n"
+"Ak budeš pokra�ovať, bude na tomto serveri vytvorený nový ú�et s tvojimi "
+"údajmi.\n"
+"Zapíš znova prosím svoje heslo a klikni 'Registrovať a pripojiť sa' pre "
+"potvrdenie súhlasu s vytvorením ú�tu, alebo klikni 'Zrušiť' pre návrat."
 
 #: src/gui/guiFormSpecMenu.cpp
 msgid "Proceed"
-msgstr ""
+msgstr "Pokra�uj"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "\"Special\" = climb down"
-msgstr ""
+msgstr "\"Špeciál\"=šplhaj dole"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Autoforward"
-msgstr ""
+msgstr "Automaticky pohyb vpred"
 
 #: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Automatic jumping"
-msgstr ""
+msgstr "Automatické skákanie"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Backward"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
+msgstr "Vzad"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
-msgstr ""
+msgstr "Zmeň pohľad"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Chat"
-msgstr ""
+msgstr "Komunikácia"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Command"
-msgstr ""
+msgstr "Príkaz"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Console"
-msgstr ""
+msgstr "Konzola"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Dec. range"
-msgstr ""
+msgstr "Zníž dohľad"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Dec. volume"
-msgstr ""
+msgstr "Zníž hlasitosť"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Double tap \"jump\" to toggle fly"
-msgstr ""
+msgstr "2x stla� \"skok\" pre prepnutie lietania"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Drop"
-msgstr ""
+msgstr "Zahodiť"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Forward"
-msgstr ""
+msgstr "Vpred"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. range"
-msgstr ""
+msgstr "Zvýš dohľad"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inc. volume"
-msgstr ""
+msgstr "Zvýš hlasitosť"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Inventory"
-msgstr ""
+msgstr "Inventár"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Jump"
-msgstr ""
+msgstr "Skok"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Key already in use"
-msgstr ""
+msgstr "Klávesa sa už používa"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 msgstr ""
+"Priradenie kláves. (ak je toto menu rozbité, zmaž zbyto�nosti z minetest."
+"conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"
-msgstr ""
+msgstr "Lokálny príkaz"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Mute"
-msgstr ""
+msgstr "Vypni zvuk"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Next item"
-msgstr ""
+msgstr "Ďalšia vec"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Prev. item"
-msgstr ""
+msgstr "Pred. vec"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Range select"
-msgstr ""
+msgstr "Zmena dohľadu"
 
 #: src/gui/guiKeyChangeMenu.cpp src/settings_translation_file.cpp
 msgid "Screenshot"
-msgstr ""
+msgstr "Fotka obrazovky"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Sneak"
-msgstr ""
+msgstr "Zakrádať sa"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Special"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
+msgstr "Špeciál"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
+msgstr "Prepni HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
-msgstr ""
+msgstr "Prepni logovanie komunikácie"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
-msgstr ""
+msgstr "Prepni rýchly režim"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fly"
-msgstr ""
+msgstr "Prepni lietanie"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fog"
-msgstr ""
+msgstr "Prepni hmlu"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle minimap"
-msgstr ""
+msgstr "Prepni minimapu"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle noclip"
-msgstr ""
+msgstr "Prepni režim prechádzania stenami"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle pitchmove"
-msgstr ""
+msgstr "Prepni režim pohybu podľa sklonu"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "press key"
-msgstr ""
+msgstr "stla� klávesu"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Change"
-msgstr ""
+msgstr "Zmeniť"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Confirm Password"
-msgstr ""
+msgstr "Potvr� heslo"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "New Password"
-msgstr ""
+msgstr "Nové heslo"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Old Password"
-msgstr ""
+msgstr "Staré heslo"
 
 #: src/gui/guiVolumeChange.cpp
 msgid "Exit"
-msgstr ""
+msgstr "Odísť"
 
 #: src/gui/guiVolumeChange.cpp
 msgid "Muted"
-msgstr ""
+msgstr "Zvuk stlmený"
 
 #: src/gui/guiVolumeChange.cpp
 msgid "Sound Volume: "
-msgstr ""
+msgstr "Hlasitosť: "
 
 #. ~ Imperative, as in "Enter/type in text".
 #. Don't forget the space.
 #: src/gui/modalMenu.cpp
 msgid "Enter "
-msgstr ""
+msgstr "Vlož "
 
 #. ~ DO NOT TRANSLATE THIS LITERALLY!
 #. This is a special string which needs to contain the translation's
@@ -1978,6 +1989,8 @@ msgid ""
 "(Android) Fixes the position of virtual joystick.\n"
 "If disabled, virtual joystick will center to first-touch's position."
 msgstr ""
+"(Android) Zafixuje pozíciu virtuálneho joysticku.\n"
+"Ak je vypnuté, virtuálny joystick sa vycentruje na pozícií prvého dotyku."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1985,6 +1998,9 @@ msgid ""
 "If enabled, virtual joystick will also tap \"aux\" button when out of main "
 "circle."
 msgstr ""
+"(Android) Použije virtuálny joystick na stla�enie tla�idla \"aux\".\n"
+"Ak je aktivované, virtuálny joystick stla�í tla�idlo \"aux\" ke� je mimo "
+"hlavný kruh."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1997,6 +2013,14 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X,Y,Z) posun fraktálu od stredu sveta v jednotkách 'mierky'.\n"
+"Môže byť použité pre posun požadovaného bodu do (0, 0) pre\n"
+"vytvorenie vhodného bodu pre ožitie, alebo pre povolenie 'priblíženia'\n"
+"na želaný bod zvä�šením 'mierky'.\n"
+"Štandardne je to vyladené na vhodný bod oživenia pre Mandelbrot\n"
+"sadu so štandardnými parametrami, je možné, že bude potrebná úprava\n"
+"v iných situáciach.\n"
+"Rozsah je približne -2 to 2. Zvä�ší podľa 'mierky' pre posun v kockách."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2008,62 +2032,65 @@ msgid ""
 "Default is for a vertically-squashed shape suitable for\n"
 "an island, set all 3 numbers equal for the raw shape."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
+"(X,Y,Z) mierka fraktálu v kockách.\n"
+"Skuto�ná veľkosť fraktálu bude 2 až 3 krát vä�šia.\n"
+"Tieto �ísla môžu byť veľmi veľké, fraktál sa nemusí\n"
+"zmestiť do sveta.\n"
+"Zvýš pre 'priblíženie' detailu fraktálu.\n"
+"Štandardne je vertikálne stla�ený tvar vhodný pre\n"
+"ostrov, nastav všetky 3 �ísla rovnaké pre nezmenený tvar."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
-msgstr ""
+msgstr "2D šum, ktorý riadi tvar/veľkosť hrebeňa hôr."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of rolling hills."
-msgstr ""
+msgstr "2D šum, ktorý riadi tvar/veľkosť vlnitosti kopcov."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of step mountains."
-msgstr ""
+msgstr "2D šum, ktorý riadi tvar/veľkosť horských stepí."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of ridged mountain ranges."
-msgstr ""
+msgstr "2D šum, ktorý riadi veľkosť/výskyt hrebeňa kopcov."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of rolling hills."
-msgstr ""
+msgstr "2D šum, ktorý riadi veľkosť/výskyt zvlnenia kopcov."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of step mountain ranges."
-msgstr ""
+msgstr "2D šum, ktorý riadi veľkosť/výskyt horských stepí."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that locates the river valleys and channels."
-msgstr ""
+msgstr "2D šum, ktorý ur�uje údolia a kanály riek."
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
-msgstr ""
+msgstr "3D mraky"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode"
-msgstr ""
+msgstr "3D režim"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode parallax strength"
-msgstr ""
+msgstr "3D režim stupeň paralaxy"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
-msgstr ""
+msgstr "3D šum definujúci gigantické dutiny/jaskyne."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "3D noise defining mountain structure and height.\n"
 "Also defines structure of floatland mountain terrain."
 msgstr ""
+"3D šum definujúci štruktúru a výšku hôr.\n"
+"Takisto definuje štruktúru pohorí lietajúcich pevnín."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2072,22 +2099,27 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"3D šum definujúci štruktúru lietajúcich pevnín.\n"
+"Ak je zmenený zo štandardného, 'mierka' šumu (štandardne 0.7) môže\n"
+"potrebovať nastavenie, ke�že zošpicaťovanie lietajúcej pevniny funguje "
+"najlepšie,\n"
+"ke� tento šum má hodnotu približne v rozsahu -2.0 až 2.0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
-msgstr ""
+msgstr "3D šum definujúci štruktúru stien kaňona rieky."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining terrain."
-msgstr ""
+msgstr "3D šum definujúci terén."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise for mountain overhangs, cliffs, etc. Usually small variations."
-msgstr ""
+msgstr "3D šum pre previsy, útesy, at�. hôr. Obvykle malé odchýlky."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise that determines number of dungeons per mapchunk."
-msgstr ""
+msgstr "3D šum definujúci po�et kobiek na �asť mapy (mapchunk)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2102,52 +2134,69 @@ msgid ""
 "-    pageflip: quadbuffer based 3d.\n"
 "Note that the interlaced mode requires shaders to be enabled."
 msgstr ""
+"Podpora 3D.\n"
+"Aktuálne sú podporované:\n"
+"-    none: žiaden 3D režim.\n"
+"-    anaglyph: tyrkysovo/purpurová farba 3D.\n"
+"-    interlaced: podpora polarizácie založenej na párnych/nepárnych riadkoch "
+"obrazu.\n"
+"-    topbottom: rozdelená obrazovka hore/dole.\n"
+"-    sidebyside: rozdelená obrazovka vedľa seba.\n"
+"-    crossview: 3D prekrížených o�í (Cross-eyed)\n"
+"-    pageflip: 3D založené na quadbuffer\n"
+"Režim interlaced požaduje, aby boli aktivované shadery."
 
 #: 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 ""
+"Zvolené semienko pre novú mapu, ponechaj prázdne pre náhodné.\n"
+"Pri vytvorení nového sveta z hlavného menu, bude prepísané."
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server crashes."
-msgstr ""
+msgstr "Správa, ktorá sa zobrazí všetkým klientom pri páde servera."
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server shuts down."
-msgstr ""
+msgstr "Správa, ktorá sa zobrazí všetkým klientom, ke� sa server vypína."
 
 #: src/settings_translation_file.cpp
 msgid "ABM interval"
-msgstr ""
+msgstr "ABM interval"
+
+#: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr "Vyhradená doba ABM"
 
 #: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr ""
+msgstr "Absolútny limit kociek vo fronte"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
-msgstr ""
+msgstr "Zrýchlenie vo vzduchu"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration of gravity, in nodes per second per second."
-msgstr ""
+msgstr "Gravita�né zrýchlenie, v kockách za sekundu na druhú."
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifiers"
-msgstr ""
+msgstr "Aktívne modifikátory blokov (ABM)"
 
 #: src/settings_translation_file.cpp
 msgid "Active block management interval"
-msgstr ""
+msgstr "Riadiaci interval aktívnych blokov"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
-msgstr ""
+msgstr "Rozsah aktívnych blokov"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
-msgstr ""
+msgstr "Zasielaný rozsah aktívnych objektov"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2155,16 +2204,21 @@ msgid ""
 "Leave this blank to start a local server.\n"
 "Note that the address field in the main menu overrides this setting."
 msgstr ""
+"Adresa pre pripojenie sa.\n"
+"Ponechaj prázdne pre spustenie lokálneho servera.\n"
+"Adresné polí�ko v hlavnom menu prepíše toto nastavenie."
 
 #: src/settings_translation_file.cpp
 msgid "Adds particles when digging a node."
-msgstr ""
+msgstr "Pridá �asticové efekty pri vykopávaní kocky."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
 msgstr ""
+"Nastav dpi konfiguráciu podľa svojej obrazovky (nie pre X11/len pre Android) "
+"napr. pre 4k obrazovky."
 
 #: src/settings_translation_file.cpp
 #, c-format
@@ -2175,10 +2229,16 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"Nastav hustotu vrstvy lietajúcej pevniny.\n"
+"Zvýš hodnotu pre zvýšenie hustoty. Môže byť kladná, alebo záporná.\n"
+"Hodnota = 0.0: 50% objemu je lietajúca pevnina.\n"
+"Hodnota = 2.0 (môže byť vyššie v závislosti od 'mgv7_np_floatland', vždy "
+"otestuj\n"
+"aby si si bol istý) vytvorí pevnú úroveň lietajúcej pevniny."
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
-msgstr ""
+msgstr "Pokro�ilé"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2188,60 +2248,67 @@ msgid ""
 "This only has significant effect on daylight and artificial\n"
 "light, it has very little effect on natural night light."
 msgstr ""
+"Zmení svetelnú krivku aplikovaním 'gamma korekcie'.\n"
+"Vyššie hodnoty robia stredné a nižšie tóny svetlejšími.\n"
+"Hodnota '1.0' ponechá svetelnú krivku nezmenenú.\n"
+"Toto má vplyv len na denné a umelé svetlo,\n"
+"ma len veľmi malý vplyv na prirodzené no�né svetlo."
 
 #: src/settings_translation_file.cpp
 msgid "Always fly and fast"
-msgstr ""
+msgstr "Vždy zapnuté lietanie a rýchlosť"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
-msgstr ""
+msgstr "Ambient occlusion gamma"
 
 #: src/settings_translation_file.cpp
 msgid "Amount of messages a player may send per 10 seconds."
-msgstr ""
+msgstr "Po�et správ, ktoré môže hrá� poslať za 10 sekúnd."
 
 #: src/settings_translation_file.cpp
 msgid "Amplifies the valleys."
-msgstr ""
+msgstr "Zvä�šuje údolia."
 
 #: src/settings_translation_file.cpp
 msgid "Anisotropic filtering"
-msgstr ""
+msgstr "Anisotropné filtrovanie"
 
 #: src/settings_translation_file.cpp
 msgid "Announce server"
-msgstr ""
+msgstr "Zverejni server"
 
 #: src/settings_translation_file.cpp
 msgid "Announce to this serverlist."
-msgstr ""
+msgstr "Zverejni v zozname serverov."
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
-msgstr ""
+msgstr "Pridaj názov položky/veci"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name to tooltip."
-msgstr ""
+msgstr "Pridaj názov veci do popisku."
 
 #: src/settings_translation_file.cpp
 msgid "Apple trees noise"
-msgstr ""
+msgstr "Šum jabloní"
 
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
-msgstr ""
+msgstr "Zotrva�nosť ruky"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Arm inertia, gives a more realistic movement of\n"
 "the arm when the camera moves."
 msgstr ""
+"Zotrva�nosť ruky, vytvára realistickejší pohyb ruky\n"
+"pri pohybe kamery."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
-msgstr ""
+msgstr "Ponúkni obnovu pripojenia po páde"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2257,106 +2324,111 @@ msgid ""
 "optimization.\n"
 "Stated in mapblocks (16 nodes)."
 msgstr ""
+"V tento vzdialenosti bude server agresívne optimalizovať, ktoré\n"
+"bloky pošle klientovi.\n"
+"Malé hodnoty potenciálne výrazne zvýšia výkon, za cenu viditeľných\n"
+"chýb renderovania (niektoré bloky nebudú vyrenderované pod vodou a v "
+"jaskyniach,\n"
+"prípadne niekedy aj na súši).\n"
+"Nastavenie hodnoty vyššej ako max_block_send_distance deaktivuje túto\n"
+"optimalizáciu.\n"
+"Udávane v blokoch mapy (16 kociek)."
 
 #: src/settings_translation_file.cpp
 msgid "Automatic forward key"
-msgstr ""
+msgstr "Tla�idlo Automatický pohyb vpred"
 
 #: src/settings_translation_file.cpp
 msgid "Automatically jump up single-node obstacles."
-msgstr ""
+msgstr "Automaticky vysko�í na prekážku vysokú jedna kocka."
 
 #: src/settings_translation_file.cpp
 msgid "Automatically report to the serverlist."
-msgstr ""
+msgstr "Automaticky zápis do zoznamu serverov."
 
 #: src/settings_translation_file.cpp
 msgid "Autosave screen size"
-msgstr ""
+msgstr "Pamätať si veľkosť obrazovky"
 
 #: src/settings_translation_file.cpp
 msgid "Autoscaling mode"
-msgstr ""
+msgstr "Režim automatickej zmeny mierky"
 
 #: src/settings_translation_file.cpp
 msgid "Backward key"
-msgstr ""
+msgstr "Tla�idlo Vzad"
 
 #: src/settings_translation_file.cpp
 msgid "Base ground level"
-msgstr ""
+msgstr "Základná úroveň dna"
 
 #: src/settings_translation_file.cpp
 msgid "Base terrain height."
-msgstr ""
+msgstr "Základná výška terénu."
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
-msgstr ""
+msgstr "Základné"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
-msgstr ""
+msgstr "Základné práva"
 
 #: src/settings_translation_file.cpp
 msgid "Beach noise"
-msgstr ""
+msgstr "Šum pláže"
 
 #: src/settings_translation_file.cpp
 msgid "Beach noise threshold"
-msgstr ""
+msgstr "Hrani�ná hodnota šumu pláže"
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
-msgstr ""
+msgstr "Bilineárne filtrovanie"
 
 #: src/settings_translation_file.cpp
 msgid "Bind address"
-msgstr ""
+msgstr "Spájacia adresa"
 
 #: src/settings_translation_file.cpp
 msgid "Biome API temperature and humidity noise parameters"
-msgstr ""
+msgstr "Parametre Å¡umu teploty a vlhkosti pre Biome API"
 
 #: src/settings_translation_file.cpp
 msgid "Biome noise"
-msgstr ""
+msgstr "Šum biómu"
 
 #: src/settings_translation_file.cpp
 msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr ""
+msgstr "Po�et bitov na pixel (farebná hĺbka) v režime celej obrazovky."
 
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
-msgstr ""
+msgstr "Vzdialenosť pre optimalizáciu posielania blokov"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic font path"
-msgstr ""
+msgstr "Cesta k tu�nému šikmému písmu"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic monospace font path"
-msgstr ""
+msgstr "Cesta k tu�nému šikmému písmu s pevnou šírkou"
 
 #: src/settings_translation_file.cpp
 msgid "Bold font path"
-msgstr ""
+msgstr "Cesta k tu�nému písmu"
 
 #: src/settings_translation_file.cpp
 msgid "Bold monospace font path"
-msgstr ""
+msgstr "Cesta k tu�nému písmu s pevnou šírkou"
 
 #: src/settings_translation_file.cpp
 msgid "Build inside player"
-msgstr ""
+msgstr "Stavanie vnútri hrá�a"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
+msgstr "Vstavané (Builtin)"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2365,174 +2437,170 @@ msgid ""
 "Increasing can reduce artifacting on weaker GPUs.\n"
 "0.1 = Default, 0.25 = Good value for weaker tablets."
 msgstr ""
+"Vzdialenosť kamery 'blízko orezanej roviny' v kockách, medzi 0 a 0.25\n"
+"Funguje len na GLES platformách. Vä�šina toto nepotrebuje meniť.\n"
+"Zvýšenie môže zredukovať artefakty na slabších GPU.\n"
+"0.1 = Štandardná hodnota, 0.25 = Dobrá hodnota pre slabé tablety."
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
-msgstr ""
+msgstr "Plynulý pohyb kamery"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing in cinematic mode"
-msgstr ""
+msgstr "Plynulý pohyb kamery vo filmovom režime"
 
 #: src/settings_translation_file.cpp
 msgid "Camera update toggle key"
-msgstr ""
+msgstr "Tla�idlo Aktualizácia pohľadu"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise"
-msgstr ""
+msgstr "Å um jaskyne"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #1"
-msgstr ""
+msgstr "Šum jaskýň #1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave noise #2"
-msgstr ""
+msgstr "Šum jaskýň #2"
 
 #: src/settings_translation_file.cpp
 msgid "Cave width"
-msgstr ""
+msgstr "Šírka jaskyne"
 
 #: src/settings_translation_file.cpp
 msgid "Cave1 noise"
-msgstr ""
+msgstr "Cave1 Å¡um"
 
 #: src/settings_translation_file.cpp
 msgid "Cave2 noise"
-msgstr ""
+msgstr "Cave2 Å¡um"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern limit"
-msgstr ""
+msgstr "Limit dutín"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern noise"
-msgstr ""
+msgstr "Šum dutín"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern taper"
-msgstr ""
+msgstr "Zbiehavosť dutín"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern threshold"
-msgstr ""
+msgstr "Hrani�ná hodnota dutín"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern upper limit"
-msgstr ""
+msgstr "Horný limit dutín"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Center of light curve boost range.\n"
 "Where 0.0 is minimum light level, 1.0 is maximum light level."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
+"Centrum rozsahu zosilnenia svetelnej krivky.\n"
+"Kde 0.0 je minimálna úroveň, 1.0 je maximálna úroveň ."
 
 #: src/settings_translation_file.cpp
 msgid "Chat font size"
-msgstr ""
+msgstr "Veľkosť komunika�ného písma"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
-msgstr ""
+msgstr "Tla�idlo Komunikácia"
 
 #: src/settings_translation_file.cpp
 msgid "Chat log level"
-msgstr ""
+msgstr "Úroveň komunika�ného logu"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
-msgstr ""
+msgstr "Limit po�tu správ"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message format"
-msgstr ""
+msgstr "Formát komunika�ných správ"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message kick threshold"
-msgstr ""
+msgstr "Hranica správ pre vylú�enie"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message max length"
-msgstr ""
+msgstr "Max dĺžka správy"
 
 #: src/settings_translation_file.cpp
 msgid "Chat toggle key"
-msgstr ""
+msgstr "Tla�idlo Prepnutie komunikácie"
 
 #: src/settings_translation_file.cpp
 msgid "Chatcommands"
-msgstr ""
+msgstr "Komunika�né príkazy"
 
 #: src/settings_translation_file.cpp
 msgid "Chunk size"
-msgstr ""
+msgstr "Veľkosť �asti (chunk)"
 
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode"
-msgstr ""
+msgstr "Filmový mód"
 
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode key"
-msgstr ""
+msgstr "Tla�idlo Filmový režim"
 
 #: src/settings_translation_file.cpp
 msgid "Clean transparent textures"
-msgstr ""
+msgstr "Vy�isti priehľadné textúry"
 
 #: src/settings_translation_file.cpp
 msgid "Client"
-msgstr ""
+msgstr "Klient"
 
 #: src/settings_translation_file.cpp
 msgid "Client and Server"
-msgstr ""
+msgstr "Klient a Server"
 
 #: src/settings_translation_file.cpp
 msgid "Client modding"
-msgstr ""
+msgstr "Úpravy (modding) cez klienta"
 
 #: src/settings_translation_file.cpp
 msgid "Client side modding restrictions"
-msgstr ""
+msgstr "Obmedzenia úprav na strane klienta"
 
 #: src/settings_translation_file.cpp
 msgid "Client side node lookup range restriction"
-msgstr ""
+msgstr "Obmedzenie vyhľadávania dosahu kociek na strane klienta"
 
 #: src/settings_translation_file.cpp
 msgid "Climbing speed"
-msgstr ""
+msgstr "Rýchlosť šplhania"
 
 #: src/settings_translation_file.cpp
 msgid "Cloud radius"
-msgstr ""
+msgstr "Polomer mrakov"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds"
-msgstr ""
+msgstr "Mraky"
 
 #: src/settings_translation_file.cpp
 msgid "Clouds are a client side effect."
-msgstr ""
+msgstr "Mraky sú efektom na strane klienta."
 
 #: src/settings_translation_file.cpp
 msgid "Clouds in menu"
-msgstr ""
+msgstr "Mraky v menu"
 
 #: src/settings_translation_file.cpp
 msgid "Colored fog"
-msgstr ""
+msgstr "Farebná hmla"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2544,68 +2612,87 @@ msgid ""
 "These flags are independent from Minetest versions,\n"
 "so see a full list at https://content.minetest.net/help/content_flags/"
 msgstr ""
+"Čiarkou oddelený zoznam príznakov, ktoré sa skryjú v zozname doplnkov.\n"
+"\"nonfree\" môže byť využité na skrytie doplnkov, ktoré nie je možné "
+"považovať za 'voľný softvér',\n"
+"tak ako je definovaný Free Software Foundation.\n"
+"Môžeš definovať aj hodnotenie obsahu.\n"
+"Tie to príznaky sú nezávislé od verzie Minetestu,\n"
+"vi�. aj kompletný zoznam na https://content.minetest.net/help/content_flags/"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Comma-separated list of mods that are allowed to access HTTP APIs, which\n"
 "allow them to upload and download data to/from the internet."
 msgstr ""
+"Čiarkou oddelený zoznam rozšírení, ktoré majú povolené prístup na HTTP API,\n"
+"ktoré im dovolia posielať a sťahovať dáta z/na internet."
 
 #: src/settings_translation_file.cpp
 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 ""
+"Čiarkou oddelený zoznam dôveryhodných rozšírení, ktoré majú povolené\n"
+"nebezpe�né funkcie aj ke� je bezpe�nosť rozšírení aktívna (cez "
+"request_insecure_environment())."
 
 #: src/settings_translation_file.cpp
 msgid "Command key"
-msgstr ""
+msgstr "Tla�idlo Príkaz"
 
 #: src/settings_translation_file.cpp
 msgid "Connect glass"
-msgstr ""
+msgstr "Prepojené sklo"
 
 #: src/settings_translation_file.cpp
 msgid "Connect to external media server"
-msgstr ""
+msgstr "Pripoj sa na externý média server"
 
 #: src/settings_translation_file.cpp
 msgid "Connects glass if supported by node."
-msgstr ""
+msgstr "Prepojí sklo, ak je to podporované kockou."
 
 #: src/settings_translation_file.cpp
 msgid "Console alpha"
-msgstr ""
+msgstr "Priehľadnosť konzoly"
 
 #: src/settings_translation_file.cpp
 msgid "Console color"
-msgstr ""
+msgstr "Farba konzoly"
 
 #: src/settings_translation_file.cpp
 msgid "Console height"
-msgstr ""
+msgstr "Výška konzoly"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
-msgstr ""
+msgstr "Čierna listina príznakov z ContentDB"
+
+#: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "ContentDB Maximum súbežných sťahovaní"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB URL"
-msgstr ""
+msgstr "Cesta (URL) ku ContentDB"
 
 #: src/settings_translation_file.cpp
 msgid "Continuous forward"
-msgstr ""
+msgstr "Neustály pohyb vpred"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Continuous forward movement, toggled by autoforward key.\n"
 "Press the autoforward key again or the backwards movement to disable."
 msgstr ""
+"Neustály pohyb vpred, prepína sa klávesou pre \"Automatický pohyb vpred\".\n"
+"Opätovne stla� klávesu pre \"Automatický pohyb vpred\", alebo pohyb vzad pre "
+"vypnutie."
 
 #: src/settings_translation_file.cpp
 msgid "Controls"
-msgstr ""
+msgstr "Ovládanie"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2613,18 +2700,21 @@ msgid ""
 "Examples:\n"
 "72 = 20min, 360 = 4min, 1 = 24hour, 0 = day/night/whatever stays unchanged."
 msgstr ""
+"Riadi dĺžku dňa a noci.\n"
+"Príklad:\n"
+"72 = 20min, 360 = 4min, 1 = 24hodín, 0 = deň/noc/�okoľvek ostáva nezmenený."
 
 #: src/settings_translation_file.cpp
 msgid "Controls sinking speed in liquid."
-msgstr ""
+msgstr "Riadi rýchlosť ponárania v tekutinách."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
-msgstr ""
+msgstr "Riadi strmosť/hĺbku jazier."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/height of hills."
-msgstr ""
+msgstr "Riadi strmosť/výšku kopcov."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2632,302 +2722,332 @@ msgid ""
 "Value >= 10.0 completely disables generation of tunnels and avoids the\n"
 "intensive noise calculations."
 msgstr ""
+"Riadi šírku tunelov, menšia hodnota vytvára širšie tunely.\n"
+"Hodnota >= 10.0 úplne vypne generovanie tunelov, �ím sa vyhne\n"
+"náro�ným prepo�tom šumu."
 
 #: src/settings_translation_file.cpp
 msgid "Crash message"
-msgstr ""
+msgstr "Správa pri páde"
 
 #: src/settings_translation_file.cpp
 msgid "Creative"
-msgstr ""
+msgstr "Kreatívny režim"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair alpha"
-msgstr ""
+msgstr "Priehľadnosť zameriava�a"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
+"Priehľadnosť zameriava�a (nepriehľadnosť, medzi 0 a 255).\n"
+"Tiež nastavuje farbu objektu zameriava�a"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
-msgstr ""
+msgstr "Farba zameriava�a"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
+"Farba zameriava�a (R,G,B).\n"
+"Nastavuje farbu objektu zameriava�a"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
-msgstr ""
+msgstr "DPI"
 
 #: src/settings_translation_file.cpp
 msgid "Damage"
-msgstr ""
+msgstr "Zranenie"
 
 #: src/settings_translation_file.cpp
 msgid "Debug info toggle key"
-msgstr ""
+msgstr "Tla�idlo Ladiace informácie"
 
 #: src/settings_translation_file.cpp
 msgid "Debug log file size threshold"
-msgstr ""
+msgstr "Hrani�ná veľkosť ladiaceho log súboru"
 
 #: src/settings_translation_file.cpp
 msgid "Debug log level"
-msgstr ""
+msgstr "Úroveň ladiacich info"
 
 #: src/settings_translation_file.cpp
 msgid "Dec. volume key"
-msgstr ""
+msgstr "Tla�idlo Zníž hlasitosť"
 
 #: src/settings_translation_file.cpp
 msgid "Decrease this to increase liquid resistance to movement."
-msgstr ""
+msgstr "Zníž pre spomalenie te�enia."
 
 #: src/settings_translation_file.cpp
 msgid "Dedicated server step"
-msgstr ""
+msgstr "Ur�ený krok servera"
 
 #: src/settings_translation_file.cpp
 msgid "Default acceleration"
-msgstr ""
+msgstr "Štandardné zrýchlenie"
 
 #: src/settings_translation_file.cpp
 msgid "Default game"
-msgstr ""
+msgstr "Štandardná hra"
 
 #: 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 ""
+"Štandardná hra pri vytváraní nového sveta.\n"
+"Toto bude prepísané pri vytvorení nového sveta z hlavného menu."
 
 #: src/settings_translation_file.cpp
 msgid "Default password"
-msgstr ""
+msgstr "Štandardné heslo"
 
 #: src/settings_translation_file.cpp
 msgid "Default privileges"
-msgstr ""
+msgstr "Štandardné práva"
 
 #: src/settings_translation_file.cpp
 msgid "Default report format"
-msgstr ""
+msgstr "Štandardný formát záznamov"
 
 #: src/settings_translation_file.cpp
 msgid "Default stack size"
-msgstr ""
+msgstr "Štandardná veľkosť kôpky"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Default timeout for cURL, stated in milliseconds.\n"
 "Only has an effect if compiled with cURL."
 msgstr ""
+"Štandardný �asový rámec pre cURL, zadaný v milisekundách.\n"
+"Má efekt len ak je skompilovaný s cURL."
 
 #: src/settings_translation_file.cpp
 msgid "Defines areas where trees have apples."
-msgstr ""
+msgstr "Definuje oblasti, kde stromy majú jablká."
 
 #: src/settings_translation_file.cpp
 msgid "Defines areas with sandy beaches."
-msgstr ""
+msgstr "Definuje oblasti s pieskovými plážami."
 
 #: src/settings_translation_file.cpp
 msgid "Defines distribution of higher terrain and steepness of cliffs."
-msgstr ""
+msgstr "Definuje rozdelenie vyššieho terénu a strmosť útesov."
 
 #: src/settings_translation_file.cpp
 msgid "Defines distribution of higher terrain."
-msgstr ""
+msgstr "Definuje rozdelenie vyššieho terénu."
 
 #: src/settings_translation_file.cpp
 msgid "Defines full size of caverns, smaller values create larger caverns."
-msgstr ""
+msgstr "Definuje plnú šírku dutín, menšie hodnoty vytvoria vä�šie dutiny."
 
 #: src/settings_translation_file.cpp
 msgid "Defines large-scale river channel structure."
-msgstr ""
+msgstr "Vo veľkom merítku definuje štruktúru kanálov riek."
 
 #: src/settings_translation_file.cpp
 msgid "Defines location and terrain of optional hills and lakes."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
+msgstr "Definuje umiestnenie a terén voliteľných kopcov a jazier."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
-msgstr ""
+msgstr "Definuje úroveň dna."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the depth of the river channel."
-msgstr ""
+msgstr "Definuje hĺbku koryta rieky."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the maximal player transfer distance in blocks (0 = unlimited)."
 msgstr ""
+"Ur�uje maximálnu vzdialenosť zobrazenia hrá�a v blokoch (0 = neobmedzená)."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the width of the river channel."
-msgstr ""
+msgstr "Definuje šírku pre koryto rieky."
 
 #: src/settings_translation_file.cpp
 msgid "Defines the width of the river valley."
-msgstr ""
+msgstr "Definuje šírku údolia rieky."
 
 #: src/settings_translation_file.cpp
 msgid "Defines tree areas and tree density."
-msgstr ""
+msgstr "Definuje oblasti so stromami a hustotu stromov."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Delay between mesh updates on the client in ms. Increasing this will slow\n"
 "down the rate of mesh updates, thus reducing jitter on slower clients."
 msgstr ""
+"Oneskorenie, kým sa Mesh aktualizuje na strane klienta v ms.\n"
+"Zvýšenie spomalí množstvo aktualizácie Mesh objektov, teda zníži chvenie na "
+"pomalších klientoch."
 
 #: src/settings_translation_file.cpp
 msgid "Delay in sending blocks after building"
-msgstr ""
+msgstr "Oneskorenie posielania blokov po výstavbe"
 
 #: src/settings_translation_file.cpp
 msgid "Delay showing tooltips, stated in milliseconds."
-msgstr ""
+msgstr "Oneskorenie zobrazenia popisku, zadané v milisekundách."
 
 #: src/settings_translation_file.cpp
 msgid "Deprecated Lua API handling"
-msgstr ""
+msgstr "Zastaralé Lua API spracovanie"
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find giant caverns."
-msgstr ""
+msgstr "Hĺbka pod ktorou nájdeš gigantické dutiny/jaskyne."
 
 #: src/settings_translation_file.cpp
 msgid "Depth below which you'll find large caves."
-msgstr ""
+msgstr "Hĺbka pod ktorou nájdeš veľké jaskyne."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Description of server, to be displayed when players join and in the "
 "serverlist."
 msgstr ""
+"Zobrazovaný popis servera, ke� sa hrá� na server pripojí a v zozname "
+"serverov."
 
 #: src/settings_translation_file.cpp
 msgid "Desert noise threshold"
-msgstr ""
+msgstr "Hrani�ná hodnota šumu púšte"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Deserts occur when np_biome exceeds this value.\n"
 "When the 'snowbiomes' flag is enabled, this is ignored."
 msgstr ""
+"Púšte sa objavia ke� np_biome presiahne túto hodnotu.\n"
+"Ak je aktívny príznak 'snowbiomes', tak toto je ignorované."
 
 #: src/settings_translation_file.cpp
 msgid "Desynchronize block animation"
-msgstr ""
+msgstr "Nesynchronizuj animáciu blokov"
+
+#: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "Tla�idlo Kopanie"
 
 #: src/settings_translation_file.cpp
 msgid "Digging particles"
-msgstr ""
+msgstr "Časticové efekty pri kopaní"
 
 #: src/settings_translation_file.cpp
 msgid "Disable anticheat"
-msgstr ""
+msgstr "Zakáž anticheat"
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
-msgstr ""
+msgstr "Zakáž prázdne heslá"
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "Doménové meno servera, ktoré bude zobrazené v zozname serverov."
 
 #: src/settings_translation_file.cpp
 msgid "Double tap jump for fly"
-msgstr ""
+msgstr "Dvakrát skok pre lietanie"
 
 #: src/settings_translation_file.cpp
 msgid "Double-tapping the jump key toggles fly mode."
-msgstr ""
+msgstr "Dvojnásobné stla�enie klávesy pre skok prepne režim lietania."
 
 #: src/settings_translation_file.cpp
 msgid "Drop item key"
-msgstr ""
+msgstr "Tla�idlo Zaho� vec"
 
 #: src/settings_translation_file.cpp
 msgid "Dump the mapgen debug information."
-msgstr ""
+msgstr "Získaj ladiace informácie generátora máp."
 
 #: src/settings_translation_file.cpp
 msgid "Dungeon maximum Y"
-msgstr ""
+msgstr "Maximálne Y kobky"
 
 #: src/settings_translation_file.cpp
 msgid "Dungeon minimum Y"
-msgstr ""
+msgstr "Minimálne Y kobky"
 
 #: src/settings_translation_file.cpp
 msgid "Dungeon noise"
-msgstr ""
+msgstr "Å um kobky"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable IPv6 support (for both client and server).\n"
 "Required for IPv6 connections to work at all."
 msgstr ""
+"Aktivuj IPv6 podporu (pre klienta ako i server).\n"
+"Požadované aby IPv6 spojenie vôbec mohlo fungovať."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable Lua modding support on client.\n"
 "This support is experimental and API can change."
 msgstr ""
+"Aktivuj podporu úprav na klientovi pomocou Lua skriptov.\n"
+"Táto podpora je experimentálna a API sa môže zmeniť."
 
 #: src/settings_translation_file.cpp
 msgid "Enable console window"
-msgstr ""
+msgstr "Aktivuj okno konzoly"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
-msgstr ""
+#, fuzzy
+msgid "Enable creative mode for all players"
+msgstr "Aktivuj kreatívny režim pre novo vytvorené mapy."
 
 #: src/settings_translation_file.cpp
 msgid "Enable joysticks"
-msgstr ""
+msgstr "Aktivuj joysticky"
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod channels support."
-msgstr ""
+msgstr "Aktivuj podporu komunika�ných kanálov rozšírení (mod channels)."
 
 #: src/settings_translation_file.cpp
 msgid "Enable mod security"
-msgstr ""
+msgstr "Aktivuj rozšírenie pre zabezpe�enie"
 
 #: src/settings_translation_file.cpp
 msgid "Enable players getting damage and dying."
-msgstr ""
+msgstr "Aktivuje aby mohol byť hrá� zranený a zomrieť."
 
 #: src/settings_translation_file.cpp
 msgid "Enable random user input (only used for testing)."
-msgstr ""
+msgstr "Aktivuje náhodný užívateľský vstup (používa sa len pre testovanie)."
 
 #: src/settings_translation_file.cpp
 msgid "Enable register confirmation"
-msgstr ""
+msgstr "Aktivuj potvrdenie registrácie"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable register confirmation when connecting to server.\n"
 "If disabled, new account will be registered automatically."
 msgstr ""
+"Aktivuj potvrdzovanie registrácie pri pripájaní sa k serveru.\n"
+"Ak je zakázané, nové konto sa zaregistruje automaticky."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable smooth lighting with simple ambient occlusion.\n"
 "Disable for speed or for different looks."
 msgstr ""
+"Aktivuj jemné nasvietenie pomocou jednoduchej \"ambient occlusion\".\n"
+"Vypni pre zrýchlenie, alebo iný vzhľad."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2937,6 +3057,9 @@ msgid ""
 "to new servers, but they may not support all new features that you are "
 "expecting."
 msgstr ""
+"Aktivuj zakázanie pripojenia starých klientov.\n"
+"Starší klienti sú kompatibilný v tom zmysle, že nepadnú pri pripájaní\n"
+"k novým serverom, ale nemusia podporovať nové funkcie, ktoré o�akávaš."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2945,18 +3068,26 @@ msgid ""
 "textures)\n"
 "when connecting to the server."
 msgstr ""
+"Aktivuj použitie vzdialeného média servera (ak je poskytovaný serverom).\n"
+"Vzdialený server poskytuje výrazne rýchlejší spôsob pre sťahovanie médií "
+"(napr. textúr)\n"
+"pri pripojení na server."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable vertex buffer objects.\n"
 "This should greatly improve graphics performance."
 msgstr ""
+"Aktivuj \"vertex buffer objects\".\n"
+"Toto by malo viditeľne zvýšiť grafický výkon."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Enable view bobbing and amount of view bobbing.\n"
 "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
+"Aktivuj pohupovanie sa a hodnotu pohupovania.\n"
+"Napr.: 0 pre žiadne pohupovanie; 1.0 pre normálne; 2.0 pre dvojnásobné."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2964,6 +3095,9 @@ msgid ""
 "Ignored if bind_address is set.\n"
 "Needs enable_ipv6 to be enabled."
 msgstr ""
+"Aktivuj/vypni IPv6 server.\n"
+"Ignorované, ak je nastavená bind_address .\n"
+"Vyžaduje povolené enable_ipv6."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2972,38 +3106,22 @@ msgid ""
 "appearance of high dynamic range images. Mid-range contrast is slightly\n"
 "enhanced, highlights and shadows are gradually compressed."
 msgstr ""
+"Aktivuje Hablov 'Uncharted 2' filmový tone mapping.\n"
+"Simuluje farebnú krivku fotografického filmu a ako sa približuje\n"
+"vzhľadu obrázku s veľkým dynamickým rozsahom. Stredový kontrast je mierne\n"
+"zlepšený, nasvietenie a tiene sú postupne zhustené."
 
 #: src/settings_translation_file.cpp
 msgid "Enables animation of inventory items."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
+msgstr "Aktivuje animáciu vecí v inventári."
 
 #: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
-msgstr ""
+msgstr "Aktivuje ukladanie tvárou rotovaných Mesh objektov do medzipamäti."
 
 #: src/settings_translation_file.cpp
 msgid "Enables minimap."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
+msgstr "Aktivuje minimapu."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3012,20 +3130,18 @@ msgid ""
 "sound controls will be non-functional.\n"
 "Changing this setting requires a restart."
 msgstr ""
+"Aktivuje zvukový systém.\n"
+"Ak je zakázaný, tak kompletne zakáže všetky zvuky\n"
+"a ovládanie hlasitosti v hre bude nefunk�né.\n"
+"Zmena tohto nastavenia si vyžaduje reštart hry."
 
 #: src/settings_translation_file.cpp
 msgid "Engine profiling data print interval"
-msgstr ""
+msgstr "Interval tla�e profilových dát enginu"
 
 #: src/settings_translation_file.cpp
 msgid "Entity methods"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
+msgstr "Metódy bytostí"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3036,68 +3152,77 @@ msgid ""
 "Values < 1.0 (for example 0.25) create a more defined surface level with\n"
 "flatter lowlands, suitable for a solid floatland layer."
 msgstr ""
+"Exponent zošpicatenia lietajúcej pevniny. Pozmeňuje fungovanie "
+"zošpicatenia.\n"
+"Hodnota = 1.0 vytvorí stále, lineárne zošpicatenie.\n"
+"Hodnoty > 1.0 vytvoria plynulé zošpicatenie, vhodné pre štandardné oddelené\n"
+"lietajúce pevniny.\n"
+"Hodnoty < 1.0 (napríklad 0.25) vytvoria viac vymedzený povrch s\n"
+"rovnejšími nížinami, vhodné ako pevná základná vrstva lietajúcej pevniny."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr ""
+msgid "FPS when unfocused or paused"
+msgstr "FPS ak je hra nezameraná, alebo pozastavená"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
-msgstr ""
+msgstr "FSAA"
 
 #: src/settings_translation_file.cpp
 msgid "Factor noise"
-msgstr ""
+msgstr "Faktor Å¡umu"
 
 #: src/settings_translation_file.cpp
 msgid "Fall bobbing factor"
-msgstr ""
+msgstr "Faktor pohupovania sa pri pádu"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font path"
-msgstr ""
+msgstr "Cesta k záložnému písmu"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow"
-msgstr ""
+msgstr "Tieň záložného písma"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font shadow alpha"
-msgstr ""
+msgstr "Priehľadnosť tieňa záložného fontu"
 
 #: src/settings_translation_file.cpp
 msgid "Fallback font size"
-msgstr ""
+msgstr "Veľkosť záložného písma"
 
 #: src/settings_translation_file.cpp
 msgid "Fast key"
-msgstr ""
+msgstr "Tla�idlo Rýchlosť"
 
 #: src/settings_translation_file.cpp
 msgid "Fast mode acceleration"
-msgstr ""
+msgstr "Zrýchlenie v rýchlom režime"
 
 #: src/settings_translation_file.cpp
 msgid "Fast mode speed"
-msgstr ""
+msgstr "Rýchlosť v rýchlom režime"
 
 #: src/settings_translation_file.cpp
 msgid "Fast movement"
-msgstr ""
+msgstr "Rýchly pohyb"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Fast movement (via the \"special\" key).\n"
 "This requires the \"fast\" privilege on the server."
 msgstr ""
+"Rýchly pohyb (cez \"špeciálnu\" klávesu).\n"
+"Toto si na serveri vyžaduje privilégium \"fast\"."
 
 #: src/settings_translation_file.cpp
 msgid "Field of view"
-msgstr ""
+msgstr "Zorné pole"
 
 #: src/settings_translation_file.cpp
 msgid "Field of view in degrees."
-msgstr ""
+msgstr "Zorné pole v stupňoch."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3105,18 +3230,20 @@ msgid ""
 "the\n"
 "Multiplayer Tab."
 msgstr ""
+"Súbor v client/serverlist ktorý obsahuje obľúbené servery, ktoré\n"
+"sa zobrazujú v záložke Multiplayer."
 
 #: src/settings_translation_file.cpp
 msgid "Filler depth"
-msgstr ""
+msgstr "Hĺbka výplne"
 
 #: src/settings_translation_file.cpp
 msgid "Filler depth noise"
-msgstr ""
+msgstr "Šum hĺbky výplne"
 
 #: src/settings_translation_file.cpp
 msgid "Filmic tone mapping"
-msgstr ""
+msgstr "Filmový tone mapping"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3125,112 +3252,120 @@ msgid ""
 "light edge to transparent textures. Apply this filter to clean that up\n"
 "at texture load time."
 msgstr ""
+"Filtrované textúry môžu zmiešať svoje RGB hodnoty s plne priehľadnými "
+"susedmi,\n"
+"s PNG optimizérmi obvykle zmazané, niekdy môžu viesť k tmavým oblastiam\n"
+"alebo svetlým rohom na priehľadnej textúre.\n"
+"Aplikuj tento filter na ich vy�istenie pri nahrávaní textúry."
 
 #: src/settings_translation_file.cpp
 msgid "Filtering"
-msgstr ""
+msgstr "Filtrovanie"
 
 #: src/settings_translation_file.cpp
 msgid "First of 4 2D noises that together define hill/mountain range height."
-msgstr ""
+msgstr "Prvý zo 4 2D šumov, ktoré spolu definujú rozsah výšok kopcov/hôr."
 
 #: src/settings_translation_file.cpp
 msgid "First of two 3D noises that together define tunnels."
-msgstr ""
+msgstr "Prvý z dvoch 3D šumov, ktoré spolu definujú tunely."
 
 #: src/settings_translation_file.cpp
 msgid "Fixed map seed"
-msgstr ""
+msgstr "Predvolené semienko mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Fixed virtual joystick"
-msgstr ""
+msgstr "Pevný virtuálny joystick"
 
 #: src/settings_translation_file.cpp
 msgid "Floatland density"
-msgstr ""
+msgstr "Hustota lietajúcej pevniny"
 
 #: src/settings_translation_file.cpp
 msgid "Floatland maximum Y"
-msgstr ""
+msgstr "Maximálne Y lietajúcich pevnín"
 
 #: src/settings_translation_file.cpp
 msgid "Floatland minimum Y"
-msgstr ""
+msgstr "Minimálne Y lietajúcich pevnín"
 
 #: src/settings_translation_file.cpp
 msgid "Floatland noise"
-msgstr ""
+msgstr "Šum lietajúcich krajín"
 
 #: src/settings_translation_file.cpp
 msgid "Floatland taper exponent"
-msgstr ""
+msgstr "Exponent kužeľovitosti lietajúcej pevniny"
 
 #: src/settings_translation_file.cpp
 msgid "Floatland tapering distance"
-msgstr ""
+msgstr "Vzdialenosť špicatosti lietajúcich krajín"
 
 #: src/settings_translation_file.cpp
 msgid "Floatland water level"
-msgstr ""
+msgstr "Úroveň vody lietajúcich pevnín"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
-msgstr ""
+msgstr "Tla�idlo Lietanie"
 
 #: src/settings_translation_file.cpp
 msgid "Flying"
-msgstr ""
+msgstr "Lietanie"
 
 #: src/settings_translation_file.cpp
 msgid "Fog"
-msgstr ""
+msgstr "Hmla"
 
 #: src/settings_translation_file.cpp
 msgid "Fog start"
-msgstr ""
+msgstr "Za�iatok hmly"
 
 #: src/settings_translation_file.cpp
 msgid "Fog toggle key"
-msgstr ""
+msgstr "Tla�idlo Prepnutie hmly"
 
 #: src/settings_translation_file.cpp
 msgid "Font bold by default"
-msgstr ""
+msgstr "Štandardne tu�né písmo"
 
 #: src/settings_translation_file.cpp
 msgid "Font italic by default"
-msgstr ""
+msgstr "Štandardne šikmé písmo"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow"
-msgstr ""
+msgstr "Tieň písma"
 
 #: src/settings_translation_file.cpp
 msgid "Font shadow alpha"
-msgstr ""
+msgstr "Priehľadnosť tieňa písma"
 
 #: src/settings_translation_file.cpp
 msgid "Font size"
-msgstr ""
+msgstr "Veľkosť písma"
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the default font in point (pt)."
-msgstr ""
+msgstr "Veľkosť písma štandardného písma v bodoch (pt)."
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the fallback font in point (pt)."
-msgstr ""
+msgstr "Veľkosť písma záložného písma v bodoch (pt)."
 
 #: src/settings_translation_file.cpp
 msgid "Font size of the monospace font in point (pt)."
-msgstr ""
+msgstr "Veľkosť písma s pevnou šírkou v bodoch (pt)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Font size of the recent chat text and chat prompt in point (pt).\n"
 "Value 0 will use the default font size."
 msgstr ""
+"Veľkosť písma aktuálneho komunika�ného textu a príkazového riadku v bodoch "
+"(pt).\n"
+"Pri hodnote 0 bude použitá štandardná veľkosť písma."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3238,73 +3373,86 @@ msgid ""
 "placeholders:\n"
 "@name, @message, @timestamp (optional)"
 msgstr ""
+"Formát komunika�ných správ hrá�a. Nasledujúce reťazce sú platné zástupné "
+"symboly:\n"
+"@name, @message, @timestamp (voliteľné)"
 
 #: src/settings_translation_file.cpp
 msgid "Format of screenshots."
-msgstr ""
+msgstr "Formát obrázkov snímok obrazovky."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Default Background Color"
-msgstr ""
+msgstr "Formspec štandardná farba pozadia"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Default Background Opacity"
-msgstr ""
+msgstr "Formspec štandardná nepriehľadnosť pozadia"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Color"
-msgstr ""
+msgstr "Formspec Celo-obrazovková farba pozadia"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec Full-Screen Background Opacity"
-msgstr ""
+msgstr "Formspec Celo-obrazovková nepriehľadnosť pozadia"
 
 #: src/settings_translation_file.cpp
 msgid "Formspec default background color (R,G,B)."
-msgstr ""
+msgstr "Štandardná farba pozadia (R,G,B) v definícii formulára (Formspec)."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec default background opacity (between 0 and 255)."
 msgstr ""
+"Štandardná nepriehľadnosť pozadia (medzi 0 a 255) v definícii formulára "
+"(Formspec)."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec full-screen background color (R,G,B)."
 msgstr ""
+"Farba pozadia (R,G,B) v režime celej obrazovky v definícii formulára "
+"(Formspec)."
 
 #: src/settings_translation_file.cpp
 msgid "Formspec full-screen background opacity (between 0 and 255)."
 msgstr ""
+"Nepriehľadnosť pozadia (0-255) v režime celej obrazovky v definícii "
+"formulára (Formspec)."
 
 #: src/settings_translation_file.cpp
 msgid "Forward key"
-msgstr ""
+msgstr "Tla�idlo Vpred"
 
 #: src/settings_translation_file.cpp
 msgid "Fourth of 4 2D noises that together define hill/mountain range height."
-msgstr ""
+msgstr "Štvrtý zo 4 2D šumov, ktoré spolu definujú rozsah výšok kopcov/hôr."
 
 #: src/settings_translation_file.cpp
 msgid "Fractal type"
-msgstr ""
+msgstr "Typ fraktálu"
 
 #: src/settings_translation_file.cpp
 msgid "Fraction of the visible distance at which fog starts to be rendered"
-msgstr ""
+msgstr "Zlomok viditeľnej vzdialenosti od ktorej za�ne byť vykresľovaná hmla"
 
 #: src/settings_translation_file.cpp
 msgid "FreeType fonts"
-msgstr ""
+msgstr "FreeType písma"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far blocks are generated for clients, stated in mapblocks (16 "
 "nodes)."
 msgstr ""
+"Z akej vzdialeností sú klientovi generované bloky, zadané v blokoch mapy (16 "
+"kociek)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "From how far blocks are sent to clients, stated in mapblocks (16 nodes)."
 msgstr ""
+"Z akej vzdialenosti sú bloky posielané klientovi, uvádzané v blokoch mapy "
+"(16 kociek)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3314,38 +3462,40 @@ msgid ""
 "to maintain active objects up to this distance in the direction the\n"
 "player is looking. (This can avoid mobs suddenly disappearing from view)"
 msgstr ""
+"Do akej vzdialenosti vedia klienti o objektoch, uvádzané v blokoch mapy (16 "
+"kociek).\n"
+"\n"
+"Nastavenie vyššie ako active_block_range spôsobí, že server bude\n"
+"uchovávať objekty až do udanej vzdialenosti v smere v ktorom sa\n"
+"hrá� pozerá. (Toto môže zabrániť tomu aby mobovia zrazu zmizli z pohľadu)"
 
 #: src/settings_translation_file.cpp
 msgid "Full screen"
-msgstr ""
+msgstr "Celá obrazovka"
 
 #: src/settings_translation_file.cpp
 msgid "Full screen BPP"
-msgstr ""
+msgstr "BPP v režime celej obrazovky"
 
 #: src/settings_translation_file.cpp
 msgid "Fullscreen mode."
-msgstr ""
+msgstr "Režim celej obrazovky."
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling"
-msgstr ""
+msgstr "Mierka GUI"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter"
-msgstr ""
+msgstr "Filter mierky GUI"
 
 #: src/settings_translation_file.cpp
 msgid "GUI scaling filter txr2img"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
+msgstr "Filter mierky GUI txr2img"
 
 #: src/settings_translation_file.cpp
 msgid "Global callbacks"
-msgstr ""
+msgstr "Globálne odozvy"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3353,54 +3503,67 @@ msgid ""
 "In Mapgen v6 the 'decorations' flag controls all decorations except trees\n"
 "and junglegrass, in all other mapgens this flag controls all decorations."
 msgstr ""
+"Globálne atribúty pre generovanie máp.\n"
+"V generátore v6 príznak 'decorations' riadi všetky dekorácie okrem stromov\n"
+"a vysokej trávy, vo všetkých ostatných generátoroch tento príznak riadi "
+"všetky dekorácie."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Gradient of light curve at maximum light level.\n"
 "Controls the contrast of the highest light levels."
 msgstr ""
+"Gradient svetelnej krivky na maximálnych úrovniach svetlosti.\n"
+"Upravuje kontrast najvyšších úrovni svetlosti."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Gradient of light curve at minimum light level.\n"
 "Controls the contrast of the lowest light levels."
 msgstr ""
+"Gradient svetelnej krivky na minimálnych úrovniach svetlosti.\n"
+"Upravuje kontrast najnižších úrovni svetlosti."
 
 #: src/settings_translation_file.cpp
 msgid "Graphics"
-msgstr ""
+msgstr "Grafika"
 
 #: src/settings_translation_file.cpp
 msgid "Gravity"
-msgstr ""
+msgstr "Gravitácia"
 
 #: src/settings_translation_file.cpp
 msgid "Ground level"
-msgstr ""
+msgstr "Základná úroveň"
 
 #: src/settings_translation_file.cpp
 msgid "Ground noise"
-msgstr ""
+msgstr "Šum terénu"
 
 #: src/settings_translation_file.cpp
 msgid "HTTP mods"
-msgstr ""
+msgstr "HTTP rozšírenia"
 
 #: src/settings_translation_file.cpp
 msgid "HUD scale factor"
-msgstr ""
+msgstr "Mierka HUD"
 
 #: src/settings_translation_file.cpp
 msgid "HUD toggle key"
-msgstr ""
+msgstr "Tla�idlo Prepínanie HUD"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
+"Spracovanie zastaralých Lua API volaní:\n"
+"-    none: Zastarané funkcie neukladaj do logu\n"
+"-    log: napodobni log backtrace zastaralého volania  (štandardne).\n"
+"-    error: preruš spracovanie zastaralého volania (odporú�ané pre vývojárov "
+"rozšírení)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3410,216 +3573,227 @@ msgid ""
 "call).\n"
 "* Instrument the sampler being used to update the statistics."
 msgstr ""
+"Ako má profiler inštrumentovať sám seba:\n"
+"* Inštrumentuj prázdnu funkciu.\n"
+"Toto odhaduje režijné náklady, táto inštrumentácia pridáva (+1 funk�né "
+"volanie).\n"
+"* Instrument the sampler being used to update the statistics."
 
 #: src/settings_translation_file.cpp
 msgid "Heat blend noise"
-msgstr ""
+msgstr "Šum miešania teplôt"
 
 #: src/settings_translation_file.cpp
 msgid "Heat noise"
-msgstr ""
+msgstr "Teplotný šum"
 
 #: src/settings_translation_file.cpp
 msgid "Height component of the initial window size."
-msgstr ""
+msgstr "Výška okna po spustení."
 
 #: src/settings_translation_file.cpp
 msgid "Height noise"
-msgstr ""
+msgstr "Výškový šum"
 
 #: src/settings_translation_file.cpp
 msgid "Height select noise"
-msgstr ""
+msgstr "Šum výšok"
 
 #: src/settings_translation_file.cpp
 msgid "High-precision FPU"
-msgstr ""
+msgstr "Vysoko-presné FPU"
 
 #: src/settings_translation_file.cpp
 msgid "Hill steepness"
-msgstr ""
+msgstr "Strmosť kopcov"
 
 #: src/settings_translation_file.cpp
 msgid "Hill threshold"
-msgstr ""
+msgstr "Hranica kopcov"
 
 #: src/settings_translation_file.cpp
 msgid "Hilliness1 noise"
-msgstr ""
+msgstr "Šum Kopcovitosť1"
 
 #: src/settings_translation_file.cpp
 msgid "Hilliness2 noise"
-msgstr ""
+msgstr "Šum Kopcovitosť2"
 
 #: src/settings_translation_file.cpp
 msgid "Hilliness3 noise"
-msgstr ""
+msgstr "Šum Kopcovitosť3"
 
 #: src/settings_translation_file.cpp
 msgid "Hilliness4 noise"
-msgstr ""
+msgstr "Šum Kopcovitosť4"
 
 #: src/settings_translation_file.cpp
 msgid "Homepage of server, to be displayed in the serverlist."
-msgstr ""
+msgstr "Domovská stránka servera, ktorá bude zobrazená v zozname serverov."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Horizontal acceleration in air when jumping or falling,\n"
 "in nodes per second per second."
 msgstr ""
+"Horizontálne zrýchlenie vo vzduchu pri skákaní alebo padaní,\n"
+"v kockách za sekundu na druhú."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Horizontal and vertical acceleration in fast mode,\n"
 "in nodes per second per second."
 msgstr ""
+"Horizontálne a vertikálne zrýchlenie v rýchlom režime,\n"
+"v kockách za sekundu na druhú."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Horizontal and vertical acceleration on ground or when climbing,\n"
 "in nodes per second per second."
 msgstr ""
+"Horizontálne a vertikálne zrýchlenie na zemi, alebo pri šplhaní,\n"
+"v kockách za sekundu na druhú."
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar next key"
-msgstr ""
+msgstr "Tla�idlo Nasledujúca vec na opasku"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar previous key"
-msgstr ""
+msgstr "Tla�idlo Predchádzajúcu vec na opasku"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 1 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 1"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 10 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 10"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 11 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 11"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 12 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 12"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 13 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 13"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 14 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 14"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 15 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 15"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 16 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 16"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 17 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 17"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 18 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 18"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 19 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 19"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 2 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 2"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 20 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 20"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 21 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 21"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 22 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 22"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 23 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 23"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 24 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 24"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 25 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 25"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 26 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 26"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 27 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 27"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 28 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 28"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 29 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 29"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 3 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 3"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 30 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 30"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 31 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 31"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 32 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 32"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 4 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 4"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 5 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 5"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 6 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 6"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 7 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 7"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 8 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 8"
 
 #: src/settings_translation_file.cpp
 msgid "Hotbar slot 9 key"
-msgstr ""
+msgstr "Tla�idlo Opasok pozícia 9"
 
 #: src/settings_translation_file.cpp
 msgid "How deep to make rivers."
-msgstr ""
+msgstr "Aké hlboké majú byť rieky."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3627,42 +3801,49 @@ msgid ""
 "If negative, liquid waves will move backwards.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"Ako rýchlo sa budú pohybovať vlny tekutín. Vyššia hodnota = rýchlejšie.\n"
+"Ak je záporná, tekutina sa bude pohybovať naspäť.\n"
+"Požaduje, aby boli aktivované vlniace sa tekutiny."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "How much the server will wait before unloading unused mapblocks.\n"
 "Higher value is smoother, but will use more RAM."
 msgstr ""
+"Koľko bude server �akať kým uvoľní nepoužívané bloky mapy.\n"
+"Vyššia hodnota je plynulejšia, ale použije viac RAM."
 
 #: src/settings_translation_file.cpp
 msgid "How wide to make rivers."
-msgstr ""
+msgstr "Aké široké majú byť rieky."
 
 #: src/settings_translation_file.cpp
 msgid "Humidity blend noise"
-msgstr ""
+msgstr "Šum miešania vlhkostí"
 
 #: src/settings_translation_file.cpp
 msgid "Humidity noise"
-msgstr ""
+msgstr "Å um vlhkosti"
 
 #: src/settings_translation_file.cpp
 msgid "Humidity variation for biomes."
-msgstr ""
+msgstr "Odchýlky vlhkosti pre biómy."
 
 #: src/settings_translation_file.cpp
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 #: src/settings_translation_file.cpp
 msgid "IPv6 server"
-msgstr ""
+msgstr "IPv6 server"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If FPS would go higher than this, limit it by sleeping\n"
 "to not waste CPU power for no benefit."
 msgstr ""
+"Ak by malo byt FPS vyššie, bude obmedzené, aby\n"
+"sa bezvýznamne, bez úžitku neplytvalo výkonom CPU."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3670,6 +3851,8 @@ msgid ""
 "are\n"
 "enabled."
 msgstr ""
+"Ak je aktivované, použije sa \"špeciálna\" klávesa na lietanie, v prípade,\n"
+"že je povolený režim lietania aj rýchlosti."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3679,6 +3862,11 @@ msgid ""
 "invisible\n"
 "so that the utility of noclip mode is reduced."
 msgstr ""
+"Ak je aktivovaný, server bude realizovať occlusion culling blokov mapy "
+"založený\n"
+"na pozícií oka hrá�a. Toto môže znížiť po�et blokov posielaných klientovi\n"
+"o 50-80%. Klient už nebude dostávať takmer neviditeľné bloky,\n"
+"takže funk�nosť režim prechádzania stenami je obmedzená."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3686,6 +3874,9 @@ msgid ""
 "nodes.\n"
 "This requires the \"noclip\" privilege on the server."
 msgstr ""
+"Ak je aktivovaný spolu s režimom lietania, tak je hrá� schopný letieť cez "
+"pevné kocky.\n"
+"Toto si na serveri vyžaduje privilégium \"noclip\"."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3693,32 +3884,42 @@ msgid ""
 "down and\n"
 "descending."
 msgstr ""
+"Ak je aktivované, použije sa namiesto klávesy pre \"zakrádanie\" \"špeciálnu "
+"klávesu\"\n"
+"pre klesanie a Å¡plhanie dole."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, actions are recorded for rollback.\n"
 "This option is only read when server starts."
 msgstr ""
+"Ak je aktivované, akcie sa nahrávajú pre ú�ely obnovenia.\n"
+"Toto nastavenie sa pre�íta len pri štarte servera."
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, disable cheat prevention in multiplayer."
 msgstr ""
+"Ak je aktivované, zruší ochranu pred podvodmi (cheatmi) v multiplayeri."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, invalid world data won't cause the server to shut down.\n"
 "Only enable this if you know what you are doing."
 msgstr ""
+"Ak je aktivované, chybné dáta nespôsobia vypnutie servera.\n"
+"Povoľ len ak vieš �o robíš."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "If enabled, makes move directions relative to the player's pitch when flying "
 "or swimming."
 msgstr ""
+"Ak je aktivované, tak je smer pohybu pri lietaní, alebo plávaní daný sklonom "
+"hrá�a."
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, new players cannot join with an empty password."
-msgstr ""
+msgstr "Ak je aktivované, nový hrá�i sa nemôžu pridať bez zadaného hesla."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3726,6 +3927,9 @@ msgid ""
 "you stand.\n"
 "This is helpful when working with nodeboxes in small areas."
 msgstr ""
+"Ak je aktivované, môžeš dať bloky na miesto kde stojíš (v úrovni päta + "
+"o�i).\n"
+"Je to užito�né ak pracuješ s kockami v stiesnených priestoroch."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3733,6 +3937,8 @@ msgid ""
 "limited\n"
 "to this distance from the player to the node."
 msgstr ""
+"Ak sú CSM obmedzenia pre dohľad kocky aktívne, volania get_node sú\n"
+"obmedzené touto vzdialenosťou od hrá�a ku kocke."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3741,112 +3947,120 @@ msgid ""
 "deleting an older debug.txt.1 if it exists.\n"
 "debug.txt is only moved if this setting is positive."
 msgstr ""
+"Ak veľkosť súboru debug.txt prekro�í zadanú veľkosť v megabytoch,\n"
+"ke� bude otvorený, súbor bude presunutý do debug.txt.1,\n"
+"ak existuje starší debug.txt.1, tak tento bude zmazaný.\n"
+"debug.txt bude presunutý, len ak je toto nastavenie kladné."
 
 #: src/settings_translation_file.cpp
 msgid "If this is set, players will always (re)spawn at the given position."
-msgstr ""
+msgstr "Ak je povolený, hrá�i vždy ožijú (obnovia sa) na zadanej pozícií."
 
 #: src/settings_translation_file.cpp
 msgid "Ignore world errors"
-msgstr ""
+msgstr "Ignoruj chyby vo svete"
 
 #: src/settings_translation_file.cpp
 msgid "In-Game"
-msgstr ""
+msgstr "V hre"
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background alpha (opaqueness, between 0 and 255)."
-msgstr ""
+msgstr "Priehľadnosť pozadia konzoly v hre (nepriehľadnosť, medzi 0 a 255)."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console background color (R,G,B)."
-msgstr ""
+msgstr "Pozadie (R,G,B) komunika�nej konzoly v hre."
 
 #: src/settings_translation_file.cpp
 msgid "In-game chat console height, between 0.1 (10%) and 1.0 (100%)."
-msgstr ""
+msgstr "Výška komunika�nej konzoly v hre, medzi 0.1 (10%) a 1.0 (100%)."
 
 #: src/settings_translation_file.cpp
 msgid "Inc. volume key"
-msgstr ""
+msgstr "Tla�idlo Zvýš hlasitosť"
 
 #: src/settings_translation_file.cpp
 msgid "Initial vertical speed when jumping, in nodes per second."
-msgstr ""
+msgstr "Po�iato�ná vertikálna rýchlosť pri skákaní, v kockách za sekundu."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument builtin.\n"
 "This is usually only needed by core/builtin contributors"
 msgstr ""
+"Inštrumentuj vstavané (builtin).\n"
+"Toto je obvykle potrebné len pre core/builtin prispievateľov"
 
 #: src/settings_translation_file.cpp
 msgid "Instrument chatcommands on registration."
-msgstr ""
+msgstr "Inštrumentuj komunika�né príkazy pri registrácií."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument global callback functions on registration.\n"
 "(anything you pass to a minetest.register_*() function)"
 msgstr ""
+"Inštrumentuj globálne odozvy volaní funkcií pri registrácií.\n"
+"(�okoľvek je poslané minetest.register_*() funkcií)"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Active Block Modifiers on registration."
-msgstr ""
+msgstr "Inštrumentuj funkcie ABM pri registrácií."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Instrument the action function of Loading Block Modifiers on registration."
-msgstr ""
+msgstr "Inštrumentuj funkcie nahrávania modifikátorov blokov pri registrácií."
 
 #: src/settings_translation_file.cpp
 msgid "Instrument the methods of entities on registration."
-msgstr ""
+msgstr "Inštrumentuj metódy bytostí pri registrácií."
 
 #: src/settings_translation_file.cpp
 msgid "Instrumentation"
-msgstr ""
+msgstr "Výstroj"
 
 #: src/settings_translation_file.cpp
 msgid "Interval of saving important changes in the world, stated in seconds."
-msgstr ""
+msgstr "Interval ukladania dôležitých zmien vo svete, uvádzaný v sekundách."
 
 #: src/settings_translation_file.cpp
 msgid "Interval of sending time of day to clients."
-msgstr ""
+msgstr "Interval v akom sa posiela denný �as klientom."
 
 #: src/settings_translation_file.cpp
 msgid "Inventory items animations"
-msgstr ""
+msgstr "Animácia vecí v inventári"
 
 #: src/settings_translation_file.cpp
 msgid "Inventory key"
-msgstr ""
+msgstr "Tla�idlo Inventár"
 
 #: src/settings_translation_file.cpp
 msgid "Invert mouse"
-msgstr ""
+msgstr "Obrátiť smer myši"
 
 #: src/settings_translation_file.cpp
 msgid "Invert vertical mouse movement."
-msgstr ""
+msgstr "Obráti vertikálny pohyb myši."
 
 #: src/settings_translation_file.cpp
 msgid "Italic font path"
-msgstr ""
+msgstr "Cesta k šikmému písmu"
 
 #: src/settings_translation_file.cpp
 msgid "Italic monospace font path"
-msgstr ""
+msgstr "Cesta k šikmému písmu s pevnou šírkou"
 
 #: src/settings_translation_file.cpp
 msgid "Item entity TTL"
-msgstr ""
+msgstr "Životnosť odložených vecí"
 
 #: src/settings_translation_file.cpp
 msgid "Iterations"
-msgstr ""
+msgstr "Iterácie"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3855,22 +4069,30 @@ msgid ""
 "increases processing load.\n"
 "At iterations = 20 this mapgen has a similar load to mapgen V7."
 msgstr ""
+"Iterácie rekurzívnej funkcie.\n"
+"Zvýšenie zvýši úroveň jemnosti detailov, ale tiež\n"
+"zvýši zaťaženie pri spracovaní.\n"
+"Pri iteráciach = 20 má tento generátor podobné zaťaženie ako generátor V7."
 
 #: src/settings_translation_file.cpp
 msgid "Joystick ID"
-msgstr ""
+msgstr "ID joysticku"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick button repetition interval"
-msgstr ""
+msgstr "Interval opakovania tla�idla joysticku"
+
+#: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr "Mŕtva zóna joysticku"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
-msgstr ""
+msgstr "Citlivosť otá�ania pohľadu joystickom"
 
 #: src/settings_translation_file.cpp
 msgid "Joystick type"
-msgstr ""
+msgstr "Typ joysticku"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3880,6 +4102,11 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Len pre sadu Julia.\n"
+"W komponent hyperkomplexnej konštanty.\n"
+"Zmení tvar fraktálu.\n"
+"Nemá vplyv na 3D fraktály.\n"
+"Rozsah zhruba -2 až 2."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3888,6 +4115,10 @@ msgid ""
 "Alters the shape of the fractal.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Len pre sadu Julia.\n"
+"X komponent hyperkomplexnej konštanty.\n"
+"Zmení tvar fraktálu.\n"
+"Rozsah zhruba -2 až 2."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3896,6 +4127,10 @@ msgid ""
 "Alters the shape of the fractal.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Len pre sadu Julia.\n"
+"Y komponent hyperkomplexnej konštanty.\n"
+"Zmení tvar fraktálu.\n"
+"Rozsah zhruba -2 až 2."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3904,30 +4139,34 @@ msgid ""
 "Alters the shape of the fractal.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"Len pre sadu Julia.\n"
+"Z komponent hyperkomplexnej konštanty.\n"
+"Zmení tvar fraktálu.\n"
+"Rozsah zhruba -2 až 2."
 
 #: src/settings_translation_file.cpp
 msgid "Julia w"
-msgstr ""
+msgstr "Julia w"
 
 #: src/settings_translation_file.cpp
 msgid "Julia x"
-msgstr ""
+msgstr "Julia x"
 
 #: src/settings_translation_file.cpp
 msgid "Julia y"
-msgstr ""
+msgstr "Julia y"
 
 #: src/settings_translation_file.cpp
 msgid "Julia z"
-msgstr ""
+msgstr "Julia z"
 
 #: src/settings_translation_file.cpp
 msgid "Jump key"
-msgstr ""
+msgstr "Tla�idlo Skok"
 
 #: src/settings_translation_file.cpp
 msgid "Jumping speed"
-msgstr ""
+msgstr "Rýchlosť skákania"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3935,6 +4174,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre zníženie dohľadu.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3942,6 +4184,19 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre zníženie hlasitosti.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tla�idlo pre kopanie.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3949,6 +4204,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre zahodenie aktuálne vybranej veci.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3956,6 +4214,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre zvýšenie dohľadu.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3963,6 +4224,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre zvýšenie hlasitosti.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3970,6 +4234,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre skákanie.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3977,6 +4244,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre rýchly pohyb hrá�a v rýchlom móde.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3985,6 +4255,10 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre pohyb hrá�a vzad.\n"
+"Zároveň vypne automatický pohyb hrá�a dopredu, ak je aktívny.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3992,6 +4266,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre pohyb hrá�a vpred.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3999,6 +4276,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre pohyb hrá�a vľavo.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4006,6 +4286,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre pohyb hrá�a vpravo.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4013,6 +4296,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre vypnutie hlasitosti v hre.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4020,6 +4306,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre otvorenie komunika�ného okna pre zadávanie príkazov.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4027,6 +4316,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre otvorenie komunika�ného okna pre zadávanie lokálnych príkazov.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4034,6 +4326,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre otvorenie komunika�ného okna.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4041,6 +4336,19 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre otvorenie inventára.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Tla�idlo pre pokladanie.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4048,6 +4356,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber jedenástej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4055,6 +4366,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber dvanástej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4062,6 +4376,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber trinástej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4069,6 +4386,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber štrnástej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4076,6 +4396,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber pätnástej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4083,6 +4406,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber šestnástej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4090,6 +4416,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber sedemnástej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4097,6 +4426,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber osemnástej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4104,6 +4436,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber devätnástej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4111,6 +4446,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 20. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4118,6 +4456,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 21. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4125,6 +4466,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 22. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4132,6 +4476,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 23. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4139,6 +4486,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 24. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4146,6 +4496,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 25. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4153,6 +4506,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 26. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4160,6 +4516,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 27. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4167,6 +4526,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 28. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4174,6 +4536,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 29. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4181,6 +4546,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 30. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4188,6 +4556,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 31. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4195,6 +4566,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber 32. pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4202,6 +4576,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber ôsmej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4209,6 +4586,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber piatej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4216,6 +4596,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber prvej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4223,6 +4606,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber štvrtej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4230,6 +4616,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber �alšej veci na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4237,6 +4626,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber deviatej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4244,6 +4636,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber predchádzajúcej veci na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4251,6 +4646,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber druhej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4258,6 +4656,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber siedmej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4265,6 +4666,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber šiestej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4272,6 +4676,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber desiatej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4279,6 +4686,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre výber tretej pozície na opasku.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4288,6 +4698,11 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre utajený pohyb (zakrádanie) hrá�a.\n"
+"Tiež sa používa pre zliezanie a ponáranie vo vode ak aux1_descends je "
+"vypnutý.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4295,6 +4710,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepínanie medzi pohľadom z prvej a tretej osoby.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4302,6 +4720,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre snímanie obrazovky.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4309,6 +4730,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie režimu automatického pohybu vpred.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4316,6 +4740,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie filmového režimu.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4323,6 +4750,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie zobrazenia minimapy.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4330,6 +4760,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie režimu rýchlosť.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4337,6 +4770,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie lietania.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4344,6 +4780,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie režimu prechádzania stenami.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4351,6 +4790,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie režimu pohyb podľa sklonu.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4358,6 +4800,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie aktualizácie pohľadu. Používa sa len pre vývoj.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4365,6 +4810,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie zobrazenia komunikácie.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4372,6 +4820,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie zobrazenia ladiacich informácií.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4379,6 +4830,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie zobrazenia hmly.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4386,6 +4840,10 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie zobrazenia HUD (Head-Up Display - výhľadový "
+"displej).\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4393,6 +4851,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie zobrazenia veľkej konzoly na komunikáciu.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4400,6 +4861,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie zobrazenia profileru. Používa sa pri vývoji.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4407,6 +4871,9 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre prepnutie neobmedzeného dohľadu.\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4414,46 +4881,49 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
+"Tla�idlo pre použitie priblíženia pokiaľ je to možné .\n"
+"Vi�. http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
 msgid "Kick players who sent more than X messages per 10 seconds."
-msgstr ""
+msgstr "Vylú� hrá�a, ktorý pošle viac ako X správ za 10 sekúnd."
 
 #: src/settings_translation_file.cpp
 msgid "Lake steepness"
-msgstr ""
+msgstr "Strmosť jazier"
 
 #: src/settings_translation_file.cpp
 msgid "Lake threshold"
-msgstr ""
+msgstr "Hranica jazier"
 
 #: src/settings_translation_file.cpp
 msgid "Language"
-msgstr ""
+msgstr "Jazyk"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave depth"
-msgstr ""
+msgstr "Hĺbka veľkých jaskýň"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave maximum number"
-msgstr ""
+msgstr "Minimálny po�et veľkých jaskýň"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave minimum number"
-msgstr ""
+msgstr "Minimálny po�et veľkých jaskýň"
 
 #: src/settings_translation_file.cpp
 msgid "Large cave proportion flooded"
-msgstr ""
+msgstr "Pomer zaplavených �astí veľkých jaskýň"
 
 #: src/settings_translation_file.cpp
 msgid "Large chat console key"
-msgstr ""
+msgstr "Tla�idlo Veľká komunika�ná konzola"
 
 #: src/settings_translation_file.cpp
 msgid "Leaves style"
-msgstr ""
+msgstr "Štýl listov"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4462,10 +4932,15 @@ msgid ""
 "-   Simple: only outer faces, if defined special_tiles are used\n"
 "-   Opaque: disable transparency"
 msgstr ""
+"Štýly listov:\n"
+"-   Ozdobné:  všetky plochy sú viditeľné\n"
+"-   Jednoduché: sú použité len vonkajšie plochy, ak sú použité definované "
+"\"special_tiles\"\n"
+"-   Nepriehľadné: vypne priehliadnosť"
 
 #: src/settings_translation_file.cpp
 msgid "Left key"
-msgstr ""
+msgstr "Tla�idlo Vľavo"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4473,24 +4948,32 @@ msgid ""
 "updated over\n"
 "network."
 msgstr ""
+"Dĺžka kroku servera a interval v ktorom sú objekty aktualizované\n"
+"cez sieť."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Length of liquid waves.\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"Dĺžka vĺn tekutín.\n"
+"Požaduje, aby boli aktivované vlniace sa tekutiny."
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between Active Block Modifier (ABM) execution cycles"
 msgstr ""
+"Časový interval medzi jednotlivými vykonávacími cyklami ABM (Active Block "
+"Modifier)"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between NodeTimer execution cycles"
 msgstr ""
+"Časový interval medzi jednotlivými vykonávacími cyklami �asova�a kociek "
+"(NodeTimer)"
 
 #: src/settings_translation_file.cpp
 msgid "Length of time between active block management cycles"
-msgstr ""
+msgstr "Časový interval medzi jednotlivými riadiacimi cyklami aktívnych blokov"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4503,30 +4986,38 @@ msgid ""
 "-    info\n"
 "-    verbose"
 msgstr ""
+"Úroveň ladiacich informácií, ktoré budú zapísané do debug.txt:\n"
+"-    <ni�> (bez logovania)\n"
+"-    žiadna (správy bez úrovne)\n"
+"-    chyby\n"
+"-    varovania\n"
+"-    akcie\n"
+"-    informácie\n"
+"-    všetko"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost"
-msgstr ""
+msgstr "Zosilnenie svetelnej krivky"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost center"
-msgstr ""
+msgstr "Stred zosilnenia svetelnej krivky"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve boost spread"
-msgstr ""
+msgstr "Rozptyl zosilnenia svetelnej krivky"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve gamma"
-msgstr ""
+msgstr "Svetelná gamma krivka"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve high gradient"
-msgstr ""
+msgstr "Horný gradient svetelnej krivky"
 
 #: src/settings_translation_file.cpp
 msgid "Light curve low gradient"
-msgstr ""
+msgstr "Spodný gradient svetelnej krivky"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4534,6 +5025,10 @@ msgid ""
 "Only mapchunks completely within the mapgen limit are generated.\n"
 "Value is stored per-world."
 msgstr ""
+"Limit pre generovanie mapy, v kockách, vo všetkých 6 smeroch (0, 0, 0).\n"
+"Len �asti mapy (mapchunks) kompletne v rámci limitu generátora máp sú "
+"generované.\n"
+"Hodnota sa ukladá pre každý svet."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4543,38 +5038,43 @@ msgid ""
 "-    Downloads performed by main menu (e.g. mod manager).\n"
 "Only has an effect if compiled with cURL."
 msgstr ""
+"Maximálny po�et paralelných HTTP požiadavok. Ovplyvňuje:\n"
+"-    Získavanie médií ak server používa nastavenie remote_media.\n"
+"-    Sťahovanie zoznamu serverov a zverejňovanie servera.\n"
+"-    Sťahovania vykonávané z hlavného menu (napr. správca rozšírení).\n"
+"Má efekt len ak je skompilovaný s cURL."
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity"
-msgstr ""
+msgstr "Tekutosť kvapalín"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid fluidity smoothing"
-msgstr ""
+msgstr "Zjemnenie tekutosti kvapalín"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid loop max"
-msgstr ""
+msgstr "Max sprac. tekutín"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid queue purge time"
-msgstr ""
+msgstr "Čas do uvolnenia fronty tekutín"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid sinking"
-msgstr ""
+msgstr "Ponáranie v tekutinách"
 
 #: src/settings_translation_file.cpp
 msgid "Liquid update interval in seconds."
-msgstr ""
+msgstr "Aktualiza�ný interval tekutín v sekundách."
 
 #: src/settings_translation_file.cpp
 msgid "Liquid update tick"
-msgstr ""
+msgstr "Aktualiza�ný interval tekutín"
 
 #: src/settings_translation_file.cpp
 msgid "Load the game profiler"
-msgstr ""
+msgstr "Nahraj profiler hry"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4582,53 +5082,63 @@ msgid ""
 "Provides a /profiler command to access the compiled profile.\n"
 "Useful for mod developers and server operators."
 msgstr ""
+"Nahraj profiler hry pre získanie profilových dát.\n"
+"Poskytne príkaz /profiler pre prístup k skompilovanému profilu.\n"
+"Užito�né pre vývojárov rozšírení a správcov serverov."
 
 #: src/settings_translation_file.cpp
 msgid "Loading Block Modifiers"
-msgstr ""
+msgstr "Nahrávam modifikátory blokov"
 
 #: src/settings_translation_file.cpp
 msgid "Lower Y limit of dungeons."
-msgstr ""
+msgstr "Dolný Y limit kobiek."
 
 #: src/settings_translation_file.cpp
 msgid "Lower Y limit of floatlands."
-msgstr ""
+msgstr "Spodný Y limit lietajúcich pevnín."
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
+msgstr "Skript hlavného menu"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
+"Prispôsob farbu hmly a oblohy dennej dobe (svitanie/súmrak) a uhlu pohľadu."
 
 #: src/settings_translation_file.cpp
 msgid "Makes DirectX work with LuaJIT. Disable if it causes troubles."
-msgstr ""
+msgstr "Umožní DirectX pracovať s LuaJIT. Vypni ak to spôsobuje problémy."
 
 #: src/settings_translation_file.cpp
 msgid "Makes all liquids opaque"
-msgstr ""
+msgstr "Všetky tekutiny budú nepriehľadné"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr "Úroveň kompresie mapy pre diskové úložisko"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr "Úroveň kompresie mapy pre sieťový prenos"
 
 #: src/settings_translation_file.cpp
 msgid "Map directory"
-msgstr ""
+msgstr "Adresár máp"
 
 #: src/settings_translation_file.cpp
 msgid "Map generation attributes specific to Mapgen Carpathian."
-msgstr ""
+msgstr "Špecifické príznaky pre generátor máp Karpaty."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Map generation attributes specific to Mapgen Flat.\n"
 "Occasional lakes and hills can be added to the flat world."
 msgstr ""
+"Špecifické atribúty pre plochý generátor mapy.\n"
+"Príležitostne môžu byť na plochý svet pridané jazerá a kopce."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4636,6 +5146,9 @@ msgid ""
 "'terrain' enables the generation of non-fractal terrain:\n"
 "ocean, islands and underground."
 msgstr ""
+"Špecifické príznaky generátora máp Fraktál.\n"
+"'terrain' aktivuje generovanie nie-fraktálneho terénu:\n"
+"oceán, ostrovy and podzemie."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4646,10 +5159,16 @@ msgid ""
 "to become shallower and occasionally dry.\n"
 "'altitude_dry': Reduces humidity with altitude."
 msgstr ""
+"Špecifické príznaky pre generovanie mapy generátora Údolia.\n"
+"'altitude_chill': Znižuje teplotu s nadmorskou výškou.\n"
+"'humid_rivers': Zvyšuje vlhkosť okolo riek.\n"
+"'vary_river_depth': ak je aktívne, nízka vlhkosť a vysoké teploty\n"
+"spôsobia, že hladina rieky poklesne, niekdy aj vyschne.\n"
+"'altitude_dry': Znižuje vlhkosť s nadmorskou výškou."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation attributes specific to Mapgen v5."
-msgstr ""
+msgstr "Príznaky pre generovanie špecifické pre generátor V5."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4658,6 +5177,10 @@ msgid ""
 "When the 'snowbiomes' flag is enabled jungles are automatically enabled and\n"
 "the 'jungles' flag is ignored."
 msgstr ""
+"Špecifické atribúty pre generátor V6.\n"
+"Príznak 'snowbiomes' aktivuje nový systém 5 biómov.\n"
+"Ak je aktívny prźnak 'snowbiomes', džungle sú automaticky povolené a\n"
+"príznak 'jungles' je ignorovaný."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4666,144 +5189,153 @@ msgid ""
 "'floatlands': Floating land masses in the atmosphere.\n"
 "'caverns': Giant caves deep underground."
 msgstr ""
+"Špecifické príznaky pre generátor máp V7.\n"
+"'ridges': Rieky.\n"
+"'floatlands': Lietajúce masy pevnín v atmosfére.\n"
+"'caverns': Gigantické jaskyne hlboko v podzemí."
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
-msgstr ""
+msgstr "Limit generovania mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Map save interval"
-msgstr ""
+msgstr "Interval ukladania mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock limit"
-msgstr ""
+msgstr "Limit blokov mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock mesh generation delay"
-msgstr ""
+msgstr "Oneskorenie generovania Mesh blokov"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock mesh generator's MapBlock cache size in MB"
-msgstr ""
+msgstr "Medzipamäť Mapblock Mesh generátora blokov v MB"
 
 #: src/settings_translation_file.cpp
 msgid "Mapblock unload timeout"
-msgstr ""
+msgstr "Čas odstránenia bloku mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Carpathian"
-msgstr ""
+msgstr "Generátor mapy Karpaty"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Carpathian specific flags"
-msgstr ""
+msgstr "Špecifické príznaky generátora máp Karpaty"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Flat"
-msgstr ""
+msgstr "Generátor mapy plochý"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Flat specific flags"
-msgstr ""
+msgstr "Špecifické príznaky plochého generátora mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Fractal"
-msgstr ""
+msgstr "Generátor mapy Fraktál"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Fractal specific flags"
-msgstr ""
+msgstr "Špecifické príznaky generátora máp Fraktál"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V5"
-msgstr ""
+msgstr "Generátor mapy V5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V5 specific flags"
-msgstr ""
+msgstr "Špecifické príznaky pre generátor mapy V5"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V6"
-msgstr ""
+msgstr "Generátor mapy V6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V6 specific flags"
-msgstr ""
+msgstr "Špecifické príznaky generátora mapy V6"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V7"
-msgstr ""
+msgstr "Generátor mapy V7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen V7 specific flags"
-msgstr ""
+msgstr "Špecifické príznaky generátora V7"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys"
-msgstr ""
+msgstr "Generátor mapy Údolia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen Valleys specific flags"
-msgstr ""
+msgstr "Špecifické príznaky pre generátor Údolia"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen debug"
-msgstr ""
+msgstr "Ladenie generátora máp"
 
 #: src/settings_translation_file.cpp
 msgid "Mapgen name"
-msgstr ""
+msgstr "Meno generátora mapy"
 
 #: src/settings_translation_file.cpp
 msgid "Max block generate distance"
-msgstr ""
+msgstr "Maximálna vzdialenosť generovania blokov"
 
 #: src/settings_translation_file.cpp
 msgid "Max block send distance"
-msgstr ""
+msgstr "Max vzdialenosť posielania objektov"
 
 #: src/settings_translation_file.cpp
 msgid "Max liquids processed per step."
-msgstr ""
+msgstr "Maximálny po�et tekutín spracovaný v jednom kroku."
 
 #: src/settings_translation_file.cpp
 msgid "Max. clearobjects extra blocks"
-msgstr ""
+msgstr "Max. extra blokov clearobjects"
 
 #: src/settings_translation_file.cpp
 msgid "Max. packets per iteration"
-msgstr ""
+msgstr "Max. paketov za opakovanie"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum FPS"
-msgstr ""
+msgstr "Maximálne FPS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
+"Maximálne FPS, ak je hra nie je v aktuálnom okne, alebo je pozastavená."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
-msgstr ""
+msgstr "Maximum vynútene nahraných blokov"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum hotbar width"
-msgstr ""
+msgstr "Maximálna šírka opaska"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of large caves per mapchunk."
 msgstr ""
+"Maximálny limit náhodného po�tu veľkých jaskýň v danej �asti mapy (mapchunk)."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum limit of random number of small caves per mapchunk."
 msgstr ""
+"Maximálny limit náhodného po�tu malých jaskýň v danej �asti mapy (mapchunk)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum liquid resistance. Controls deceleration when entering liquid at\n"
 "high speed."
 msgstr ""
+"Maximálny odpor tekutín. Riadi spomalenie ak sa tekutina\n"
+"vlieva vysokou rýchlosťou."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4811,32 +5343,51 @@ msgid ""
 "The maximum total count is calculated dynamically:\n"
 "max_total = ceil((#clients + max_users) * per_client / 4)"
 msgstr ""
+"Maximálny po�et sú�asne posielaných blokov na klienta.\n"
+"Maximálny po�et sa prepo�ítava dynamicky:\n"
+"max_total = ceil((#clients + max_users) * per_client / 4)"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of blocks that can be queued for loading."
-msgstr ""
+msgstr "Maximálny limit kociek, ktoré môžu byť vo fronte pre nahrávanie."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "This limit is enforced per player."
 msgstr ""
+"Maximálny limit kociek vo fronte, ktoré budú generované.\n"
+"Tento limit je vynútený pre každého hrá�a."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "This limit is enforced per player."
 msgstr ""
+"Maximálny limit kociek vo fronte, ktoré budú nahrané zo súboru.\n"
+"Tento limit je vynútený pre každého hrá�a."
 
 #: src/settings_translation_file.cpp
-msgid "Maximum number of forceloaded mapblocks."
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
 msgstr ""
+"Maximálny po�et sú�asných sťahovaní. Sťahovania presahujúce tento limit budú "
+"�akať v rade.\n"
+"Mal by byť nižší ako curl_parallel_limit."
+
+#: src/settings_translation_file.cpp
+msgid "Maximum number of forceloaded mapblocks."
+msgstr "Maximálny po�et vynútene nahraných blokov mapy."
 
 #: 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 ""
+"Maximálny po�et blokov u klienta, ktoré ostávajú v pamäti.\n"
+"Nastav -1 pre neobmedzené množstvo."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4844,160 +5395,173 @@ msgid ""
 "try reducing it, but don't reduce it to a number below double of targeted\n"
 "client number."
 msgstr ""
+"Maximálny po�et paketov poslaný pri jednom kroku posielania,\n"
+"ak máš pomalé pripojenie skús ho znížiť, ale\n"
+"neznižuj ho pod dvojnásobok cieľového po�tu klientov."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of players that can be connected simultaneously."
-msgstr ""
+msgstr "Maximálny po�et hrá�ov, ktorí sa môžu sú�asne pripojiť."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of recent chat messages to show"
-msgstr ""
+msgstr "Maximálny po�et nedávnych správ v komunikácií, ktoré budú zobrazované"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of statically stored objects in a block."
-msgstr ""
+msgstr "Maximálny po�et staticky uložených objektov v bloku."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum objects per block"
-msgstr ""
+msgstr "Max. po�et objektov na 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 ""
+"Maximálny pomer aktuálneho okna, ktorý sa použije pre opasok.\n"
+"Užito�né, ak treba zobraziť nie�o vpravo, alebo vľavo od opaska."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum simultaneous block sends per client"
-msgstr ""
+msgstr "Maximum sú�asných odoslaní bloku na klienta"
 
 #: src/settings_translation_file.cpp
 msgid "Maximum size of the out chat queue"
-msgstr ""
+msgstr "Maximálna veľkosť výstupnej komunika�nej fronty"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Maximum size of the out chat queue.\n"
 "0 to disable queueing and -1 to make the queue size unlimited."
 msgstr ""
+"Maximálna veľkosť výstupnej komunika�nej fronty.\n"
+"0 pre zakázanie fronty a -1 pre neobmedzenú frontu."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum time in ms a file download (e.g. a mod download) may take."
 msgstr ""
+"Maximálny �as v ms, ktorý môže zabrať sťahovanie súboru (napr. sťahovanie "
+"rozšírenia)."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum users"
-msgstr ""
+msgstr "Maximálny po�et hrá�ov"
 
 #: src/settings_translation_file.cpp
 msgid "Menus"
-msgstr ""
+msgstr "Menu"
 
 #: src/settings_translation_file.cpp
 msgid "Mesh cache"
-msgstr ""
+msgstr "Medzipamäť Mesh"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day"
-msgstr ""
+msgstr "Správa dňa"
 
 #: src/settings_translation_file.cpp
 msgid "Message of the day displayed to players connecting."
-msgstr ""
+msgstr "Správa dňa sa zobrazí hrá�om pri pripájaní."
 
 #: src/settings_translation_file.cpp
 msgid "Method used to highlight selected object."
-msgstr ""
+msgstr "Metóda použitá pre zvýraznenie vybraných objektov."
 
 #: src/settings_translation_file.cpp
 msgid "Minimal level of logging to be written to chat."
-msgstr ""
+msgstr "Minimálna úroveň záznamov, ktoré budú vypísané do komunika�ného okna."
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
-msgstr ""
+msgstr "Minimapa"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap key"
-msgstr ""
+msgstr "Tla�idlo Minimapa"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap scan height"
-msgstr ""
+msgstr "Minimapa výška skenovania"
 
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of large caves per mapchunk."
 msgstr ""
+"Minimálny limit náhodného po�tu veľkých jaskýň v danej �asti mapy (mapchunk)."
 
 #: src/settings_translation_file.cpp
 msgid "Minimum limit of random number of small caves per mapchunk."
 msgstr ""
+"Minimálny limit náhodného po�tu malých jaskýň v danej �asti mapy (mapchunk)."
 
 #: src/settings_translation_file.cpp
 msgid "Minimum texture size"
-msgstr ""
+msgstr "Minimálna veľkosť textúry"
 
 #: src/settings_translation_file.cpp
 msgid "Mipmapping"
-msgstr ""
+msgstr "Mipmapping"
 
 #: src/settings_translation_file.cpp
 msgid "Mod channels"
-msgstr ""
+msgstr "Komunika�né kanály rozšírení"
 
 #: src/settings_translation_file.cpp
 msgid "Modifies the size of the hudbar elements."
-msgstr ""
+msgstr "Upraví veľkosť elementov v užívateľskom rozhraní."
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font path"
-msgstr ""
+msgstr "Cesta k písmu s pevnou šírkou"
 
 #: src/settings_translation_file.cpp
 msgid "Monospace font size"
-msgstr ""
+msgstr "Veľkosť písmo s pevnou šírkou"
 
 #: src/settings_translation_file.cpp
 msgid "Mountain height noise"
-msgstr ""
+msgstr "Šum pre výšku hôr"
 
 #: src/settings_translation_file.cpp
 msgid "Mountain noise"
-msgstr ""
+msgstr "Šum hôr"
 
 #: src/settings_translation_file.cpp
 msgid "Mountain variation noise"
-msgstr ""
+msgstr "Odchýlka šumu hôr"
 
 #: src/settings_translation_file.cpp
 msgid "Mountain zero level"
-msgstr ""
+msgstr "Základná úroveň hôr"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity"
-msgstr ""
+msgstr "Citlivosť myši"
 
 #: src/settings_translation_file.cpp
 msgid "Mouse sensitivity multiplier."
-msgstr ""
+msgstr "Multiplikátor citlivosti myši."
 
 #: src/settings_translation_file.cpp
 msgid "Mud noise"
-msgstr ""
+msgstr "Å um bahna"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Multiplier for fall bobbing.\n"
 "For example: 0 for no view bobbing; 1.0 for normal; 2.0 for double."
 msgstr ""
+"Násobiteľ pre pohupovanie sa pri pádu.\n"
+"Napr.: 0 pre žiadne pohupovanie; 1.0 pre normálne; 2.0 pre dvojnásobné."
 
 #: src/settings_translation_file.cpp
 msgid "Mute key"
-msgstr ""
+msgstr "Tla�idlo Ticho"
 
 #: src/settings_translation_file.cpp
 msgid "Mute sound"
-msgstr ""
+msgstr "Stíš hlasitosť"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5006,6 +5570,10 @@ msgid ""
 "Current mapgens in a highly unstable state:\n"
 "-    The optional floatlands of v7 (disabled by default)."
 msgstr ""
+"Meno generátora mapy, ktorý sa použije pri vytváraní nového sveta.\n"
+"Vytvorenie sveta cez hlavné menu toto prepíše.\n"
+"Aktuálne nestabilné generátory:\n"
+"-    Voliteľné lietajúce pevniny (floatlands) vo v7 (štandardne vypnuté)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5013,61 +5581,59 @@ msgid ""
 "When running a server, clients connecting with this name are admins.\n"
 "When starting from the main menu, this is overridden."
 msgstr ""
+"Meno hrá�a.\n"
+"Ak je spustený server, klienti s týmto menom sú administrátori.\n"
+"Pri štarte z hlavného menu, toto bude prepísané."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Name of the server, to be displayed when players join and in the serverlist."
 msgstr ""
+"Zobrazované meno servera, ke� sa hrá� na server pripojí a v zozname serverov."
 
 #: src/settings_translation_file.cpp
 msgid "Near plane"
-msgstr ""
+msgstr "Blízkosť roviny"
 
 #: src/settings_translation_file.cpp
 msgid "Network"
-msgstr ""
+msgstr "Sieť"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Network port to listen (UDP).\n"
 "This value will be overridden when starting from the main menu."
 msgstr ""
+"Sieťový port (UDP).\n"
+"Táto hodnota bude prepísaná pri spustení z hlavného menu."
 
 #: src/settings_translation_file.cpp
 msgid "New users need to input this password."
-msgstr ""
+msgstr "Noví hrá�i musia zadať toto heslo."
 
 #: src/settings_translation_file.cpp
 msgid "Noclip"
-msgstr ""
+msgstr "Prechádzanie stenami"
 
 #: src/settings_translation_file.cpp
 msgid "Noclip key"
-msgstr ""
+msgstr "Tla�idlo Prechádzanie stenami"
 
 #: src/settings_translation_file.cpp
 msgid "Node highlighting"
-msgstr ""
+msgstr "Zvýrazňovanie kociek"
 
 #: src/settings_translation_file.cpp
 msgid "NodeTimer interval"
-msgstr ""
+msgstr "Interval �asova�a kociek"
 
 #: src/settings_translation_file.cpp
 msgid "Noises"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
+msgstr "Å umy"
 
 #: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
-msgstr ""
+msgstr "Po�et použitých vlákien"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5082,6 +5648,16 @@ msgid ""
 "processes, especially in singleplayer and/or when running Lua code in\n"
 "'on_generated'. For many users the optimum setting may be '1'."
 msgstr ""
+"Po�et použitých vlákien.\n"
+"Hodnota 0:\n"
+"-    Automatický ur�enie. Po�et použitých vlákien bude\n"
+"-    'po�et procesorov - 2', s dolným limitom 1.\n"
+"Akákoľvek iná hodnota:\n"
+"-    Definuje po�et vlákien, s dolným limitom 1.\n"
+"VAROVANIE: Zvýšenie po�tu vlákien zvýši rýchlosť generátora máp,\n"
+"ale môže to uškodiť hernému výkonu interferenciou s inými\n"
+"procesmi, obzvlášť pri hre jedného hrá�a a/alebo ak beží Lua kód\n"
+"v 'on_generated'. Pre mnohých hrá�ov môže byť optimálne nastavenie '1'."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5089,28 +5665,27 @@ msgid ""
 "This is a trade-off between sqlite transaction overhead and\n"
 "memory consumption (4096=100MB, as a rule of thumb)."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
+"Po�et extra blokov, ktoré môžu byť naraz nahrané pomocou /clearobjects.\n"
+"Toto je kompromis medzi vyťažením sqlite transakciami\n"
+"a spotrebou pamäti (4096=100MB, ako približné pravidlo)."
 
 #: src/settings_translation_file.cpp
 msgid "Online Content Repository"
-msgstr ""
+msgstr "Úložisko doplnkov na internete"
 
 #: src/settings_translation_file.cpp
 msgid "Opaque liquids"
-msgstr ""
+msgstr "Nepriehľadné tekutiny"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the default font, between 0 and 255."
-msgstr ""
+msgstr "Nepriehľadnosť tieňa za štandardným písmom, medzi 0 a 255."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Opaqueness (alpha) of the shadow behind the fallback font, between 0 and 255."
-msgstr ""
+msgstr "Nepriehľadnosť tieňa za záložným písmom, medzi 0 a 255."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5118,34 +5693,8 @@ msgid ""
 "formspec is\n"
 "open."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
+"Otvorí menu pozastavenia, ak aktuálne okno hry nie je vybrané.\n"
+"Nepozastaví sa ak je otvorený formspec."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5155,22 +5704,33 @@ msgid ""
 "This font will be used for certain languages or if the default font is "
 "unavailable."
 msgstr ""
+"Cesta k záložnému písmu.\n"
+"Ak je aktívne nastavenie “freetype�: Musí to byť TrueType písmo.\n"
+"Ak je zakázané nastavenie “freetype�: Musí to byť bitmapové, alebo XML "
+"vektorové písmo.\n"
+"Toto písmo bude použité pre ur�ité jazyky, alebo ak nie je štandardné písmo "
+"k dispozícií."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Path to save screenshots at. Can be an absolute or relative path.\n"
 "The folder will be created if it doesn't already exist."
 msgstr ""
+"Cesta, kam sa budú ukladať snímky obrazovky. Môže to byť ako absolútna, tak "
+"relatívna cesta.\n"
+"Adresár bude vytvorený ak neexistuje."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Path to shader directory. If no path is defined, default location will be "
 "used."
 msgstr ""
+"Cesta do adresára so shadermi. Ak nie je definovaná, použije sa predvolená "
+"lokácia."
 
 #: src/settings_translation_file.cpp
 msgid "Path to texture directory. All textures are first searched from here."
-msgstr ""
+msgstr "Cesta do adresára s textúrami. Všetky textúry sú najprv hľadané tu."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5179,6 +5739,11 @@ msgid ""
 "If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
 "The fallback font will be used if the font cannot be loaded."
 msgstr ""
+"Cesta k štandardnému písmu.\n"
+"Ak je aktivné nastavenie “freetype�: Musí to byť TrueType písmo.\n"
+"Ak je zakázané nastavenie “freetype�: Musí to byť bitmapové, alebo XML "
+"vektorové písmo.\n"
+"Bude použité záložné písmo, ak nebude možné písmo nahrať."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5187,90 +5752,113 @@ msgid ""
 "If “freetype� setting is disabled: Must be a bitmap or XML vectors font.\n"
 "This font is used for e.g. the console and profiler screen."
 msgstr ""
+"Cesta k písmu s pevnou šírkou.\n"
+"Ak je aktívne nastavenie “freetype�: Musí to byť TrueType písmo.\n"
+"Ak je zakázané nastavenie “freetype�: Musí to byť bitmapové, alebo XML "
+"vektorové písmo.\n"
+"Toto písmo je použité pre napr. konzolu a okno profilera."
 
 #: src/settings_translation_file.cpp
 msgid "Pause on lost window focus"
-msgstr ""
+msgstr "Pozastav hru, pri strate zamerania okna"
 
 #: src/settings_translation_file.cpp
 msgid "Per-player limit of queued blocks load from disk"
-msgstr ""
+msgstr "Limit kociek vo fronte na každého hrá�a nahrávaných z disku"
 
 #: src/settings_translation_file.cpp
 msgid "Per-player limit of queued blocks to generate"
-msgstr ""
+msgstr "Limit kociek vo fronte na každého hrá�a pre generovanie"
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
-msgstr ""
+msgstr "Fyzika"
 
 #: src/settings_translation_file.cpp
 msgid "Pitch move key"
-msgstr ""
+msgstr "Tla�idlo Pohyb podľa sklonu"
 
 #: src/settings_translation_file.cpp
 msgid "Pitch move mode"
-msgstr ""
+msgstr "Režim pohybu podľa sklonu"
+
+#: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr "Tla�idlo na pokladanie"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr "Interval opakovania pokladania"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
 msgstr ""
+"Hrá� je schopný lietať bez ovplyvnenia gravitáciou.\n"
+"Toto si na serveri vyžaduje privilégium \"fly\"."
 
 #: src/settings_translation_file.cpp
 msgid "Player name"
-msgstr ""
+msgstr "Meno hrá�a"
 
 #: src/settings_translation_file.cpp
 msgid "Player transfer distance"
-msgstr ""
+msgstr "Vzdialenosť zobrazenia hrá�a"
 
 #: src/settings_translation_file.cpp
 msgid "Player versus player"
-msgstr ""
+msgstr "Hrá� proti hrá�ovi (PvP)"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Port to connect to (UDP).\n"
 "Note that the port field in the main menu overrides this setting."
 msgstr ""
+"Port pre pripojenie sa (UDP).\n"
+"Polí�ko pre nastavenie Portu v hlavnom menu prepíše toto nastavenie."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Prevent digging and placing from repeating when holding the mouse buttons.\n"
 "Enable this when you dig or place too often by accident."
 msgstr ""
+"Zabráni opakovanému kopaniu a ukladaniu blokov pri držaní tla�ítka myši.\n"
+"Aktivuj, ak príliš �asto omylom nie�o vykopeš, alebo položíš blok."
 
 #: src/settings_translation_file.cpp
 msgid "Prevent mods from doing insecure things like running shell commands."
 msgstr ""
+"Zabráni rozšíreniam aby robili nebezpe�né veci ako spúšťanie systémových "
+"príkazov."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Print the engine's profiling data in regular intervals (in seconds).\n"
 "0 = disable. Useful for developers."
 msgstr ""
+"Vytla�í profilové dáta enginu v pravidelných intervaloch (v sekundách).\n"
+"0 = vypnuté. Užito�né pre vývojárov."
 
 #: src/settings_translation_file.cpp
 msgid "Privileges that players with basic_privs can grant"
-msgstr ""
+msgstr "Oprávnenia, ktoré môže udeliť hrá� s basic_privs"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler"
-msgstr ""
+msgstr "Profiler"
 
 #: src/settings_translation_file.cpp
 msgid "Profiler toggle key"
-msgstr ""
+msgstr "Tla�idlo Prepínanie profileru"
 
 #: src/settings_translation_file.cpp
 msgid "Profiling"
-msgstr ""
+msgstr "Profilovanie"
 
 #: src/settings_translation_file.cpp
 msgid "Prometheus listener address"
-msgstr ""
+msgstr "Odpo�úvacia adresa Promethea"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5279,10 +5867,14 @@ msgid ""
 "enable metrics listener for Prometheus on that address.\n"
 "Metrics can be fetch on http://127.0.0.1:30000/metrics"
 msgstr ""
+"Odpo�úvacia adresa Promethea.\n"
+"Ak je minetest skompilovaný s nastaveným ENABLE_PROMETHEUS,\n"
+"aktivuj odpo�úvanie metriky pre Prometheus na zadanej adrese.\n"
+"Metrika môže byť získaná na http://127.0.0.1:30000/metrics"
 
 #: src/settings_translation_file.cpp
 msgid "Proportion of large caves that contain liquid."
-msgstr ""
+msgstr "Pomer �astí veľkých jaskýň, ktoré obsahujú tekutinu."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5290,48 +5882,52 @@ msgid ""
 "Values larger than 26 will start to produce sharp cutoffs at cloud area "
 "corners."
 msgstr ""
+"Polomer oblasti mrakov zadaný v po�toch 64 kociek na štvorcový mrak.\n"
+"Hodnoty vyššie než 26 budú produkovať ostré hranice na rohoch oblasti mrakov."
 
 #: src/settings_translation_file.cpp
 msgid "Raises terrain to make valleys around the rivers."
-msgstr ""
+msgstr "Zvýši terén aby vznikli údolia okolo riek."
 
 #: src/settings_translation_file.cpp
 msgid "Random input"
-msgstr ""
+msgstr "Náhodný vstup"
 
 #: src/settings_translation_file.cpp
 msgid "Range select key"
-msgstr ""
+msgstr "Tla�idlo Dohľad"
 
 #: src/settings_translation_file.cpp
 msgid "Recent Chat Messages"
-msgstr ""
+msgstr "Posledné správy v komunikácií"
 
 #: src/settings_translation_file.cpp
 msgid "Regular font path"
-msgstr ""
+msgstr "Štandardná cesta k písmam"
 
 #: src/settings_translation_file.cpp
 msgid "Remote media"
-msgstr ""
+msgstr "Vzdialené média"
 
 #: src/settings_translation_file.cpp
 msgid "Remote port"
-msgstr ""
+msgstr "Vzdialený port"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Remove color codes from incoming chat messages\n"
 "Use this to stop players from being able to use color in their messages"
 msgstr ""
+"Odstráň farby z prichádzajúcich komunika�ných správ\n"
+"Použi pre zabránenie používaniu farieb hrá�mi v ich správach"
 
 #: src/settings_translation_file.cpp
 msgid "Replaces the default main menu with a custom one."
-msgstr ""
+msgstr "Nahradí štandardné hlavné menu vlastným."
 
 #: src/settings_translation_file.cpp
 msgid "Report path"
-msgstr ""
+msgstr "Cesta k záznamom"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5346,90 +5942,96 @@ msgid ""
 "csm_restriction_noderange)\n"
 "READ_PLAYERINFO: 32 (disable get_player_names call client-side)"
 msgstr ""
+"Obmedzi prístup k ur�itým klientským funkciám na serveroch.\n"
+"Skombinuj bajtové príznaky dole pre obmedzenie jednotlivých\n"
+"fukncii u klienta, alebo nastav 0 pre funkcie bez obmedzení:\n"
+"LOAD_CLIENT_MODS: 1 (zakáže nahrávanie rozšírení u klienta)\n"
+"CHAT_MESSAGES: 2 (zakáže send_chat_message volania u klienta)\n"
+"READ_ITEMDEFS: 4 (zakáže get_item_def volania u klienta)\n"
+"READ_NODEDEFS: 8 (zakáže get_node_def volania u klienta)\n"
+"LOOKUP_NODES_LIMIT: 16 (obmedzí get_node volania u klienta na\n"
+"csm_restriction_noderange)\n"
+"READ_PLAYERINFO: 32 (zakáže get_player_names volania u klienta)"
 
 #: src/settings_translation_file.cpp
 msgid "Ridge mountain spread noise"
-msgstr ""
+msgstr "Rozptyl šumu hrebeňa hôr"
 
 #: src/settings_translation_file.cpp
 msgid "Ridge noise"
-msgstr ""
+msgstr "Šum hrebeňa"
 
 #: src/settings_translation_file.cpp
 msgid "Ridge underwater noise"
-msgstr ""
+msgstr "Šum podmorského hrebeňa"
 
 #: src/settings_translation_file.cpp
 msgid "Ridged mountain size noise"
-msgstr ""
+msgstr "Veľkosť šumu hrebeňa hôr"
 
 #: src/settings_translation_file.cpp
 msgid "Right key"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
+msgstr "Tla�idlo Vpravo"
 
 #: src/settings_translation_file.cpp
 msgid "River channel depth"
-msgstr ""
+msgstr "Hĺbka rie�neho kanála"
 
 #: src/settings_translation_file.cpp
 msgid "River channel width"
-msgstr ""
+msgstr "Šírka kanála rieky"
 
 #: src/settings_translation_file.cpp
 msgid "River depth"
-msgstr ""
+msgstr "Hĺbka rieky"
 
 #: src/settings_translation_file.cpp
 msgid "River noise"
-msgstr ""
+msgstr "Å um riek"
 
 #: src/settings_translation_file.cpp
 msgid "River size"
-msgstr ""
+msgstr "Veľkosť riek"
 
 #: src/settings_translation_file.cpp
 msgid "River valley width"
-msgstr ""
+msgstr "Šírka údolia rieky"
 
 #: src/settings_translation_file.cpp
 msgid "Rollback recording"
-msgstr ""
+msgstr "Nahrávanie pre obnovenie"
 
 #: src/settings_translation_file.cpp
 msgid "Rolling hill size noise"
-msgstr ""
+msgstr "Veľkosť šumu vlnitosti kopcov"
 
 #: src/settings_translation_file.cpp
 msgid "Rolling hills spread noise"
-msgstr ""
+msgstr "Rozptyl Å¡umu vlnitosti kopcov"
 
 #: src/settings_translation_file.cpp
 msgid "Round minimap"
-msgstr ""
+msgstr "Okrúhla minimapa"
 
 #: src/settings_translation_file.cpp
 msgid "Safe digging and placing"
-msgstr ""
+msgstr "Bezpe�né kopanie a ukladanie"
 
 #: src/settings_translation_file.cpp
 msgid "Sandy beaches occur when np_beach exceeds this value."
-msgstr ""
+msgstr "Pieskové pláže sa objavia ke� np_beach presiahne túto hodnotu."
 
 #: src/settings_translation_file.cpp
 msgid "Save the map received by the client on disk."
-msgstr ""
+msgstr "Ulož mapu získanú klientom na disk."
 
 #: src/settings_translation_file.cpp
 msgid "Save window size automatically when modified."
-msgstr ""
+msgstr "Automaticky ulož veľkosť okna po úprave."
 
 #: src/settings_translation_file.cpp
 msgid "Saving map received from server"
-msgstr ""
+msgstr "Ukladanie mapy získanej zo servera"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5439,26 +6041,31 @@ msgid ""
 "pixels when scaling down, at the cost of blurring some\n"
 "edge pixels when images are scaled by non-integer sizes."
 msgstr ""
+"Zmeň mierku užívateľského rozhrania (GUI) podľa zadanej hodnoty.\n"
+"Pre zmenu mierky GUI použi antialias filter podľa-najbližšieho-suseda.\n"
+"Toto zjemní niektoré hrubé hrany a zmieša pixely pri zmenšení,\n"
+"za cenu rozmazania niektorých okrajových pixelov ak sa mierka\n"
+"obrázkov mení podľa necelo�íselných hodnôt."
 
 #: src/settings_translation_file.cpp
 msgid "Screen height"
-msgstr ""
+msgstr "Výška obrazovky"
 
 #: src/settings_translation_file.cpp
 msgid "Screen width"
-msgstr ""
+msgstr "Šírka obrazovky"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot folder"
-msgstr ""
+msgstr "Adresár pre snímky obrazovky"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot format"
-msgstr ""
+msgstr "Formát snímok obrazovky"
 
 #: src/settings_translation_file.cpp
 msgid "Screenshot quality"
-msgstr ""
+msgstr "Kvalita snímok obrazovky"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5466,38 +6073,41 @@ msgid ""
 "1 means worst quality; 100 means best quality.\n"
 "Use 0 for default quality."
 msgstr ""
+"Kvalita snímok obrazovky. Používa sa len pre JPEG formát.\n"
+"1 znamená najhoršiu kvalitu; 100 znamená najlepšiu kvalitu.\n"
+"Použi 0 pre štandardnú kvalitu."
 
 #: src/settings_translation_file.cpp
 msgid "Seabed noise"
-msgstr ""
+msgstr "Šum morského dna"
 
 #: src/settings_translation_file.cpp
 msgid "Second of 4 2D noises that together define hill/mountain range height."
-msgstr ""
+msgstr "Druhý zo 4 2D šumov, ktoré spolu definujú rozsah výšok kopcov/hôr."
 
 #: src/settings_translation_file.cpp
 msgid "Second of two 3D noises that together define tunnels."
-msgstr ""
+msgstr "Druhý z dvoch 3D šumov, ktoré spolu definujú tunely."
 
 #: src/settings_translation_file.cpp
 msgid "Security"
-msgstr ""
+msgstr "Bezpe�nosť"
 
 #: src/settings_translation_file.cpp
 msgid "See https://www.sqlite.org/pragma.html#pragma_synchronous"
-msgstr ""
+msgstr "Vi�. https://www.sqlite.org/pragma.html#pragma_synchronous"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box border color (R,G,B)."
-msgstr ""
+msgstr "Farba obrysu bloku (R,G,B)."
 
 #: src/settings_translation_file.cpp
 msgid "Selection box color"
-msgstr ""
+msgstr "Farba obrysu bloku"
 
 #: src/settings_translation_file.cpp
 msgid "Selection box width"
-msgstr ""
+msgstr "Šírka obrysu bloku"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5521,74 +6131,101 @@ msgid ""
 "17 = 4D \"Mandelbulb\" Mandelbrot set.\n"
 "18 = 4D \"Mandelbulb\" Julia set."
 msgstr ""
+"Zvoľ si jeden z 18 typov fraktálu.\n"
+"1 = 4D \"Roundy\" sada Mandelbrot.\n"
+"2 = 4D \"Roundy\" sada Julia.\n"
+"3 = 4D \"Squarry\" sada Mandelbrot.\n"
+"4 = 4D \"Squarry\" sada Julia.\n"
+"5 = 4D \"Mandy Cousin\" sada Mandelbrot.\n"
+"6 = 4D \"Mandy Cousin\" sada Julia.\n"
+"7 = 4D \"Variation\" sada Mandelbrot.\n"
+"8 = 4D \"Variation\" sada Julia.\n"
+"9 = 3D \"Mandelbrot/Mandelbar\" sada Mandelbrot.\n"
+"10 = 3D \"Mandelbrot/Mandelbar\" sada Julia.\n"
+"11 = 3D \"Christmas Tree\" sada Mandelbrot.\n"
+"12 = 3D \"Christmas Tree\" sada Julia.\n"
+"13 = 3D \"Mandelbulb\" sada Mandelbrot.\n"
+"14 = 3D \"Mandelbulb\" sada Julia.\n"
+"15 = 3D \"Cosine Mandelbulb\" sada Mandelbrot.\n"
+"16 = 3D \"Cosine Mandelbulb\" sada Julia.\n"
+"17 = 4D \"Mandelbulb\" sada Mandelbrot.\n"
+"18 = 4D \"Mandelbulb\" sada Julia."
 
 #: src/settings_translation_file.cpp
 msgid "Server / Singleplayer"
-msgstr ""
+msgstr "Server / Hra pre jedného hrá�a"
 
 #: src/settings_translation_file.cpp
 msgid "Server URL"
-msgstr ""
+msgstr "URL servera"
 
 #: src/settings_translation_file.cpp
 msgid "Server address"
-msgstr ""
+msgstr "Adresa servera"
 
 #: src/settings_translation_file.cpp
 msgid "Server description"
-msgstr ""
+msgstr "Popis servera"
 
 #: src/settings_translation_file.cpp
 msgid "Server name"
-msgstr ""
+msgstr "Meno servera"
 
 #: src/settings_translation_file.cpp
 msgid "Server port"
-msgstr ""
+msgstr "Port servera"
 
 #: src/settings_translation_file.cpp
 msgid "Server side occlusion culling"
-msgstr ""
+msgstr "Occlusion culling na strane servera"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist URL"
-msgstr ""
+msgstr "URL zoznamu serverov"
 
 #: src/settings_translation_file.cpp
 msgid "Serverlist file"
-msgstr ""
+msgstr "Súbor so zoznamom serverov"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set the language. Leave empty to use the system language.\n"
 "A restart is required after changing this."
 msgstr ""
+"Nastav jazyk. Ponechaj prázdne pre systémové nastavenie.\n"
+"Po zmene je požadovaný reštart."
 
 #: src/settings_translation_file.cpp
 msgid "Set the maximum character length of a chat message sent by clients."
-msgstr ""
+msgstr "Nastav maximálny po�et znakov komunika�nej správy posielanej klientmi."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable waving leaves.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Nastav true pre povolenie vlniacich sa listov.\n"
+"Požaduje aby boli aktivované shadery."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable waving liquids (like water).\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Nastav true pre aktivovanie vlniacich sa tekutín (ako napr. voda).\n"
+"Požaduje aby boli aktivované shadery."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Set to true to enable waving plants.\n"
 "Requires shaders to be enabled."
 msgstr ""
+"Nastav true pre aktivovanie vlniacich sa rastlín.\n"
+"Požaduje aby boli aktivované shadery."
 
 #: src/settings_translation_file.cpp
 msgid "Shader path"
-msgstr ""
+msgstr "Cesta k shaderom"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5597,34 +6234,55 @@ msgid ""
 "cards.\n"
 "This only works with the OpenGL video backend."
 msgstr ""
+"Shadery umožňujú pokro�ilé vizuálne efekty a na niektorých grafických "
+"kartách\n"
+"môžu zvýšiť výkon.\n"
+"Toto funguje len s OpenGL."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Shadow offset (in pixels) of the default font. If 0, then shadow will not be "
 "drawn."
 msgstr ""
+"Posun tieňa (v pixeloch) štandardného písma. Ak je 0, tak tieň nebude "
+"vykreslený."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Shadow offset (in pixels) of the fallback font. If 0, then shadow will not "
 "be drawn."
 msgstr ""
+"Posun tieňa (v pixeloch) záložného písma. Ak je 0, tak tieň nebude "
+"vykreslený."
 
 #: src/settings_translation_file.cpp
 msgid "Shape of the minimap. Enabled = round, disabled = square."
-msgstr ""
+msgstr "Tvar minimapy. Aktivované = okrúhla, vypnuté = štvorcová."
 
 #: src/settings_translation_file.cpp
 msgid "Show debug info"
-msgstr ""
+msgstr "Zobraz ladiace informácie"
 
 #: src/settings_translation_file.cpp
 msgid "Show entity selection boxes"
+msgstr "Zobraz obrys bytosti"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
 msgstr ""
+"Zobraz obrysy bytosti\n"
+"Po zmene je požadovaný reštart."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Štandardne tu�né písmo"
 
 #: src/settings_translation_file.cpp
 msgid "Shutdown message"
-msgstr ""
+msgstr "Správa pri vypínaní"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5635,6 +6293,13 @@ msgid ""
 "Altering this value is for special usage, leaving it unchanged is\n"
 "recommended."
 msgstr ""
+"Veľkosť �asti mapy generovanej generátorom mapy, zadaný v blokoch mapy (16 "
+"kociek).\n"
+"VAROVANIE!: Neexistuje žiadna výhoda, a je tu pár rizík,\n"
+"pri zvýšení tejto hodnoty nad 5.\n"
+"Zníženie tejto hodnoty zvýši hustotu jaskýň a kobiek.\n"
+"Zmena tejto hodnoty slúži k špeciálnym ú�elom, odporú�a sa ponechať\n"
+"to nezmenené."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5642,72 +6307,78 @@ msgid ""
 "increase the cache hit %, reducing the data being copied from the main\n"
 "thread, thus reducing jitter."
 msgstr ""
+"Veľkosť medzipamäte blokov v Mesh generátoru.\n"
+"Zvýšenie zvýši využitie medzipamäte %, zníži sa množstvo dát kopírovaných\n"
+"z hlavnej vetvy a tým sa zníži chvenie."
 
 #: src/settings_translation_file.cpp
 msgid "Slice w"
-msgstr ""
+msgstr "Plátok w"
 
 #: src/settings_translation_file.cpp
 msgid "Slope and fill work together to modify the heights."
-msgstr ""
+msgstr "Sklon a výplň spolupracujú aby upravili výšky."
 
 #: src/settings_translation_file.cpp
 msgid "Small cave maximum number"
-msgstr ""
+msgstr "Maximálny po�et malých jaskýň"
 
 #: src/settings_translation_file.cpp
 msgid "Small cave minimum number"
-msgstr ""
+msgstr "Minimálny po�et malých jaskýň"
 
 #: src/settings_translation_file.cpp
 msgid "Small-scale humidity variation for blending biomes on borders."
-msgstr ""
+msgstr "Drobné odchýlky vlhkosti pre zjemnenie prechodu na hraniciach biómov."
 
 #: src/settings_translation_file.cpp
 msgid "Small-scale temperature variation for blending biomes on borders."
-msgstr ""
+msgstr "Drobné odchýlky teplôt pre zjemnenie prechodu na hraniciach biómov."
 
 #: src/settings_translation_file.cpp
 msgid "Smooth lighting"
-msgstr ""
+msgstr "Jemné osvetlenie"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Smooths camera when looking around. Also called look or mouse smoothing.\n"
 "Useful for recording videos."
 msgstr ""
+"Zjemňuje pohyb kamery pri pohľade po okolí. Tiež sa nazýva zjemnenie "
+"pohľady, alebo pohybu myši.\n"
+"Užito�né pri nahrávaní videí."
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera in cinematic mode. 0 to disable."
-msgstr ""
+msgstr "Zjemní rotáciu kamery vo filmovom režime. 0 je pre vypnuté."
 
 #: src/settings_translation_file.cpp
 msgid "Smooths rotation of camera. 0 to disable."
-msgstr ""
+msgstr "Zjemní rotáciu kamery. 0 je pre vypnuté."
 
 #: src/settings_translation_file.cpp
 msgid "Sneak key"
-msgstr ""
+msgstr "Tla�idlo zakrádania sa"
 
 #: src/settings_translation_file.cpp
 msgid "Sneaking speed"
-msgstr ""
+msgstr "Rýchlosť zakrádania"
 
 #: src/settings_translation_file.cpp
 msgid "Sneaking speed, in nodes per second."
-msgstr ""
+msgstr "Rýchlosť zakrádania sa, v kockách za sekundu."
 
 #: src/settings_translation_file.cpp
 msgid "Sound"
-msgstr ""
+msgstr "Zvuk"
 
 #: src/settings_translation_file.cpp
 msgid "Special key"
-msgstr ""
+msgstr "Špeciálne tla�idlo"
 
 #: src/settings_translation_file.cpp
 msgid "Special key for climbing/descending"
-msgstr ""
+msgstr "Špeciálna klávesa pre šplhanie hore/dole"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5716,6 +6387,10 @@ msgid ""
 "(obviously, remote_media should end with a slash).\n"
 "Files that are not present will be fetched the usual way."
 msgstr ""
+"Špecifikuje URL s ktorého klient stiahne média namiesto použitia UDP.\n"
+"$filename by mal byt dostupný z $remote_media$filename cez cURL\n"
+"(samozrejme, remote_media by mal kon�iť lomítkom).\n"
+"Súbory, ktoré nie sú dostupné budú získané štandardným spôsobom."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5723,6 +6398,9 @@ msgid ""
 "Note that mods or games may explicitly set a stack for certain (or all) "
 "items."
 msgstr ""
+"Definuje štandardnú veľkosť kôpky kociek, vecí a nástrojov.\n"
+"Ber v úvahu, že rozšírenia, alebo hry môžu explicitne nastaviť veľkosť pre "
+"ur�ité (alebo všetky) typy."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5730,30 +6408,29 @@ msgid ""
 "Controls the width of the range to be boosted.\n"
 "Standard deviation of the light curve boost Gaussian."
 msgstr ""
+"Rozptyl zosilnenia svetelnej krivky.\n"
+"Ur�uje šírku rozsahu , ktorý bude zosilnený.\n"
+"Štandardné gausovo rozdelenie odchýlky svetelnej krivky."
 
 #: src/settings_translation_file.cpp
 msgid "Static spawnpoint"
-msgstr ""
+msgstr "Pevný bod obnovy"
 
 #: src/settings_translation_file.cpp
 msgid "Steepness noise"
-msgstr ""
+msgstr "Šum zrázov"
 
 #: src/settings_translation_file.cpp
 msgid "Step mountain size noise"
-msgstr ""
+msgstr "Veľkosť šumu horských stepí"
 
 #: src/settings_translation_file.cpp
 msgid "Step mountain spread noise"
-msgstr ""
+msgstr "Rozptyl šumu horských stepí"
 
 #: src/settings_translation_file.cpp
 msgid "Strength of 3D mode parallax."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
+msgstr "Stupeň paralaxy 3D režimu."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5761,14 +6438,17 @@ msgid ""
 "The 3 'boost' parameters define a range of the light\n"
 "curve that is boosted in brightness."
 msgstr ""
+"Sila zosilnenia svetelnej krivky.\n"
+"Tri 'zosilňujúce' parametre definujú ktorý rozsah\n"
+"svetelnej krivky je zosilnený v jasu."
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
-msgstr ""
+msgstr "Prísna kontrola protokolu"
 
 #: src/settings_translation_file.cpp
 msgid "Strip color codes"
-msgstr ""
+msgstr "Odstráň farby"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5783,34 +6463,47 @@ msgid ""
 "server-intensive extreme water flow and to avoid vast flooding of the\n"
 "world surface below."
 msgstr ""
+"Povrchová úroveň voliteľnej vody umiestnená na pevnej vrstve lietajúcej "
+"krajiny.\n"
+"Štandardne je voda deaktivovaná a bude umiestnená len ak je táto voľba "
+"nastavená\n"
+"nad 'mgv7_floatland_ymax' - 'mgv7_floatland_taper'\n"
+"(štart horného zašpicaťovania).\n"
+"***VAROVANIE, POTENCI�LNE RIZIKO PRE V�KON SVETOV A SERVEROV***:\n"
+"Pri aktivovaní vody na lietajúcich pevninách musí byť nastavený\n"
+"a otestovaný pevný povrch nastavením 'mgv7_floatland_density' na 2.0 ( alebo "
+"inú\n"
+"požadovanú hodnotu v závislosti na 'mgv7_np_floatland'), aby sa zabránilo\n"
+"pre server náro�nému extrémnemu toku vody a rozsiahlym záplavám\n"
+"na svet pod nimi."
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
-msgstr ""
+msgstr "Synchrónne SQLite"
 
 #: src/settings_translation_file.cpp
 msgid "Temperature variation for biomes."
-msgstr ""
+msgstr "Odchýlky teplôt pre biómy."
 
 #: src/settings_translation_file.cpp
 msgid "Terrain alternative noise"
-msgstr ""
+msgstr "Alternatívny šum terénu"
 
 #: src/settings_translation_file.cpp
 msgid "Terrain base noise"
-msgstr ""
+msgstr "Základný šum terénu"
 
 #: src/settings_translation_file.cpp
 msgid "Terrain height"
-msgstr ""
+msgstr "Výška terénu"
 
 #: src/settings_translation_file.cpp
 msgid "Terrain higher noise"
-msgstr ""
+msgstr "Horný šum terénu"
 
 #: src/settings_translation_file.cpp
 msgid "Terrain noise"
-msgstr ""
+msgstr "Šum terénu"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5818,6 +6511,9 @@ msgid ""
 "Controls proportion of world area covered by hills.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"Prah šumu terénu pre kopce.\n"
+"Riadi pomer plochy sveta pokrytého kopcami.\n"
+"Uprav smerom k 0.0 pre vä�ší pomer."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5825,14 +6521,17 @@ msgid ""
 "Controls proportion of world area covered by lakes.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"Prah šumu terénu pre jazerá.\n"
+"Riadi pomer plochy sveta pokrytého jazerami.\n"
+"Uprav smerom k 0.0 pre vä�ší pomer."
 
 #: src/settings_translation_file.cpp
 msgid "Terrain persistence noise"
-msgstr ""
+msgstr "Stálosť šumu terénu"
 
 #: src/settings_translation_file.cpp
 msgid "Texture path"
-msgstr ""
+msgstr "Cesta k textúram"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5843,33 +6542,47 @@ msgid ""
 "this option allows enforcing it for certain node types. Note though that\n"
 "that is considered EXPERIMENTAL and may not work properly."
 msgstr ""
+"Textúry na kocke môžu byť zarovnané bu� podľa kocky, alebo sveta.\n"
+"Kým prvý režim poslúži lepšie veciam ako sú stroje, nábytok, at�.,\n"
+"tak s druhým režimom zapadnú schody a mikrobloky lepšie do svojho okolia.\n"
+"Ke�že je táto možnosť nová, nemusí byť použitá na starších serveroch,\n"
+"toto nastavenie povolí jeho vynútenie pre ur�ité typy kociek. Je potrebné\n"
+"si uvedomiť, že táto funkcia je EXPERIMENT�LNA a nemusí fungovať korektne."
 
 #: src/settings_translation_file.cpp
 msgid "The URL for the content repository"
-msgstr ""
+msgstr "Webová adresa (URL) k úložisku doplnkov"
+
+#: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr "Mŕtva zóna joysticku"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
 msgstr ""
+"Štandardný formát v ktorom sa ukladajú profily,\n"
+"pri volaní `/profiler save [format]` bez udania formátu."
 
 #: src/settings_translation_file.cpp
 msgid "The depth of dirt or other biome filler node."
-msgstr ""
+msgstr "Hĺbka zeminy, alebo inej výplne kocky."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The file path relative to your worldpath in which profiles will be saved to."
 msgstr ""
+"Relatívna cesta k súboru vzhľadom na svet z ktorého budú profily uložené."
 
 #: src/settings_translation_file.cpp
 msgid "The identifier of the joystick to use"
-msgstr ""
+msgstr "Identifikátor joysticku na použitie"
 
 #: src/settings_translation_file.cpp
 msgid "The length in pixels it takes for touch screen interaction to start."
 msgstr ""
+"Dĺžka v pixloch, ktorú potrebuje dotyková obrazovka pre za�iatok interakcie."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5879,16 +6592,24 @@ msgid ""
 "Default is 1.0 (1/2 node).\n"
 "Requires waving liquids to be enabled."
 msgstr ""
+"Maximálna výška povrchu vlniacich sa tekutín.\n"
+"4.0 = Výška vlny sú dve kocky.\n"
+"0.0 = Vlna sa vôbec nehýbe.\n"
+"Štandardná hodnota je 1.0 (1/2 kocky).\n"
+"Požaduje, aby boli aktivované vlniace sa tekutiny."
 
 #: src/settings_translation_file.cpp
 msgid "The network interface that the server listens on."
-msgstr ""
+msgstr "Sieťové rozhranie, na ktorom server na�úva."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The privileges that new users automatically get.\n"
 "See /privs in game for a full list on your server and mod configuration."
 msgstr ""
+"Oprávnenia, ktoré automaticky dostane nový hrá�.\n"
+"Pozri si /privs v hre pre kompletný zoznam pre daný server a konfigurácie "
+"rozšírení."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5900,6 +6621,12 @@ msgid ""
 "maintained.\n"
 "This should be configured together with active_object_send_range_blocks."
 msgstr ""
+"Polomer objemu blokov okolo každého hrá�a, ktoré sú predmetom\n"
+"záležitostí okolo aktívnych objektov, uvádzané v blokoch mapy (16 kociek).\n"
+"V objektoch aktívnych blokov sú nahrávané a spúšťané ABM.\n"
+"Toto je tiež minimálna vzdialenosť v ktorej sú aktívne objekty (mobovia) "
+"zachovávaný.\n"
+"Malo by to byť konfigurované spolu s active_object_send_range_blocks."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5907,15 +6634,23 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
+"Renderovací back-end pre Irrlicht.\n"
+"Po zmene je vyžadovaný reštart.\n"
+"Poznámka: Na Androide, ak si nie si istý, ponechaj OGLES1! Aplikácia by "
+"nemusela naštartovať.\n"
+"Na iných platformách, sa odporú�a OpenGL.\n"
+"Shadery sú podporované v OpenGL (len pre desktop) a v OGLES2 (experimentálne)"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The sensitivity of the joystick axes for moving the\n"
 "ingame view frustum around."
 msgstr ""
+"Citlivosť osí joysticku pre pohyb\n"
+"otá�ania pohľadu v hre."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5924,6 +6659,10 @@ msgid ""
 "setting is 0.25 to 4.0 inclusive. If the value is out of range it will be\n"
 "set to the nearest valid value."
 msgstr ""
+"Úroveň tieňovania ambient-occlusion kocky (tmavosť).\n"
+"Nižšia hodnota je tmavšie, vyššia svetlejšie.\n"
+"Platý rozsah hodnôt je od 0.25 po 0.4 vrátane.\n"
+"Ak je hodnota mimo rozsah, bude nastavená na najbližšiu platnú hodnotu."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5931,23 +6670,37 @@ msgid ""
 "capacity until an attempt is made to decrease its size by dumping old queue\n"
 "items.  A value of 0 disables the functionality."
 msgstr ""
+"Čas (c sekundách) kedy fronta tekutín môže narastať nad kapacitu\n"
+"spracovania než bude urobený pokus o jej zníženie zrušením starých\n"
+"vecí z fronty.  Hodnota 0 vypne túto funkciu."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+"Vyhradená doba pre ABM na vykonanie v každom kroku\n"
+"(ako zlomok ABM imtervalu)"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
+"Čas v sekundách medzi opakovanými udalosťami\n"
+"pri stla�enej kombinácií tla�idiel na joysticku."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
+"Čas v sekundách pre opakované položenie kocky\n"
+"ak je držané tla�ítko pokladania."
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
-msgstr ""
+msgstr "Typ joysticku"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5955,32 +6708,39 @@ msgid ""
 "enabled. Also the vertical distance over which humidity drops by 10 if\n"
 "'altitude_dry' is enabled."
 msgstr ""
+"Vertikálna vzdialenosť kedy poklesne teplota o 20 ak je 'altitude_chill'\n"
+"aktívne. Tiež je to vertikálna vzdialenosť kedy poklesne vlhkosť o 10,\n"
+"ak je 'altitude_dry' aktívne."
 
 #: src/settings_translation_file.cpp
 msgid "Third of 4 2D noises that together define hill/mountain range height."
-msgstr ""
+msgstr "Tretí zo 4 2D šumov, ktoré spolu definujú rozsah výšok kopcov/hôr."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
 "Setting it to -1 disables the feature."
 msgstr ""
+"Čas existencie odložený (odhodených) vecí v sekundách.\n"
+"Nastavené na -1 vypne túto vlastnosť."
 
 #: src/settings_translation_file.cpp
 msgid "Time of day when a new world is started, in millihours (0-23999)."
-msgstr ""
+msgstr "Čas pri spustení nového sveta, v milihodinách (0-23999)."
 
 #: src/settings_translation_file.cpp
 msgid "Time send interval"
-msgstr ""
+msgstr "Interval posielania �asu"
 
 #: src/settings_translation_file.cpp
 msgid "Time speed"
-msgstr ""
+msgstr "Rýchlosť �asu"
 
 #: src/settings_translation_file.cpp
 msgid "Timeout for client to remove unused map data from memory."
 msgstr ""
+"Časový limit na klientovi, pre odstránenie nepoužívaných mapových dát z "
+"pamäte."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5989,26 +6749,28 @@ msgid ""
 "This determines how long they are slowed down after placing or removing a "
 "node."
 msgstr ""
+"Pre zníženie lagu, prenos blokov je spomalený, ke� hrá� nie�o stavia.\n"
+"Toto ur�uje ako dlho je spomalený po vložení, alebo zmazaní kocky."
 
 #: src/settings_translation_file.cpp
 msgid "Toggle camera mode key"
-msgstr ""
+msgstr "Tla�idlo Prepnutie režimu zobrazenia"
 
 #: src/settings_translation_file.cpp
 msgid "Tooltip delay"
-msgstr ""
+msgstr "Oneskorenie popisku"
 
 #: src/settings_translation_file.cpp
 msgid "Touch screen threshold"
-msgstr ""
+msgstr "Prah citlivosti dotykovej obrazovky"
 
 #: src/settings_translation_file.cpp
 msgid "Trees noise"
-msgstr ""
+msgstr "Å um stromov"
 
 #: src/settings_translation_file.cpp
 msgid "Trilinear filtering"
-msgstr ""
+msgstr "Trilineárne filtrovanie"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6016,18 +6778,22 @@ msgid ""
 "False = 128\n"
 "Usable to make minimap smoother on slower machines."
 msgstr ""
+"Pravda = 256\n"
+"Nepravda = 128\n"
+"Užito�né pre plynulejšiu minimapu na pomalších strojoch."
 
 #: src/settings_translation_file.cpp
 msgid "Trusted mods"
-msgstr ""
+msgstr "Dôveryhodné rozšírenia"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
 msgstr ""
+"Adresa (URL) k zoznamu serverov, ktorý sa zobrazuje v záložke Multiplayer."
 
 #: src/settings_translation_file.cpp
 msgid "Undersampling"
-msgstr ""
+msgstr "Podvzorkovanie"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6037,38 +6803,42 @@ msgid ""
 "image.\n"
 "Higher values result in a less detailed image."
 msgstr ""
+"Podvzorkovanie je podobné ako použiť obrazovku s nižším rozlíšením, ale\n"
+"aplikuje sa len na samotný svet, pri�om GUI ostáva nezmenené.\n"
+"Malo by poskytnúť výrazné zvýšenie výkonu za cenu nižších detailov obrazu.\n"
+"Vyššie hodnotu vedú k menej detailnému obrazu."
 
 #: src/settings_translation_file.cpp
 msgid "Unlimited player transfer distance"
-msgstr ""
+msgstr "Neobmedzená vzdialenosť zobrazenia hrá�a"
 
 #: src/settings_translation_file.cpp
 msgid "Unload unused server data"
-msgstr ""
+msgstr "Uvoľni nepoužívané serverové dáta"
 
 #: src/settings_translation_file.cpp
 msgid "Upper Y limit of dungeons."
-msgstr ""
+msgstr "Horný Y limit kobiek."
 
 #: src/settings_translation_file.cpp
 msgid "Upper Y limit of floatlands."
-msgstr ""
+msgstr "Horný Y limit lietajúcich pevnín."
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
-msgstr ""
+msgstr "Použi 3D mraky namiesto plochých."
 
 #: src/settings_translation_file.cpp
 msgid "Use a cloud animation for the main menu background."
-msgstr ""
+msgstr "Použi animáciu mrakov pre pozadie hlavného menu."
 
 #: src/settings_translation_file.cpp
 msgid "Use anisotropic filtering when viewing at textures from an angle."
-msgstr ""
+msgstr "Použi anisotropné filtrovanie pri pohľade na textúry zo strany."
 
 #: src/settings_translation_file.cpp
 msgid "Use bilinear filtering when scaling textures."
-msgstr ""
+msgstr "Použi bilineárne filtrovanie pri zmene mierky textúr."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6076,116 +6846,143 @@ msgid ""
 "especially when using a high resolution texture pack.\n"
 "Gamma correct downscaling is not supported."
 msgstr ""
+"Použi mip mapy pre úpravu textúr. Môže jemne zvýšiť výkon,\n"
+"obzvlášť použití balí�ka textúr s vysokým rozlíšením.\n"
+"Gama korektné podvzorkovanie nie je podporované."
 
 #: src/settings_translation_file.cpp
-msgid "Use trilinear filtering when scaling textures."
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
 msgstr ""
+"Použi multi-sample antialiasing (MSAA) pre zjemnenie hrán blokov.\n"
+"Tento algoritmus zjemní 3D vzhľad zatiaľ �o zachová ostrosť obrazu,\n"
+"ale neovplyvní vnútro textúr\n"
+"(�o je obzvlášť viditeľné pri priesvitných textúrach).\n"
+"Ak sú shadery zakázané, objavia sa viditeľné medzery medzi kockami.\n"
+"Ak sú nastavené na 0, MSAA je zakázané.\n"
+"Po zmene tohto nastavenia je požadovaný reštart."
+
+#: src/settings_translation_file.cpp
+msgid "Use trilinear filtering when scaling textures."
+msgstr "Použi trilineárne filtrovanie pri zmene mierky textúr."
 
 #: src/settings_translation_file.cpp
 msgid "VBO"
-msgstr ""
+msgstr "VBO"
 
 #: src/settings_translation_file.cpp
 msgid "VSync"
-msgstr ""
+msgstr "VSync"
 
 #: src/settings_translation_file.cpp
 msgid "Valley depth"
-msgstr ""
+msgstr "Hĺbka údolia"
 
 #: src/settings_translation_file.cpp
 msgid "Valley fill"
-msgstr ""
+msgstr "Výplň údolí"
 
 #: src/settings_translation_file.cpp
 msgid "Valley profile"
-msgstr ""
+msgstr "Profil údolia"
 
 #: src/settings_translation_file.cpp
 msgid "Valley slope"
-msgstr ""
+msgstr "Sklon údolia"
 
 #: src/settings_translation_file.cpp
 msgid "Variation of biome filler depth."
-msgstr ""
+msgstr "Odchýlka hĺbky výplne biómu."
 
 #: src/settings_translation_file.cpp
 msgid "Variation of maximum mountain height (in nodes)."
-msgstr ""
+msgstr "Obmieňa maximálnu výšku hôr (v kockách)."
 
 #: src/settings_translation_file.cpp
 msgid "Variation of number of caves."
-msgstr ""
+msgstr "Rôznosť po�tu jaskýň."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Variation of terrain vertical scale.\n"
 "When noise is < -0.55 terrain is near-flat."
 msgstr ""
+"Rozptyl vertikálnej mierky terénu.\n"
+"Ak je šum <-0.55, terén je takmer rovný."
 
 #: src/settings_translation_file.cpp
 msgid "Varies depth of biome surface nodes."
-msgstr ""
+msgstr "Pozmeňuje hĺbku povrchových kociek biómu."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Varies roughness of terrain.\n"
 "Defines the 'persistence' value for terrain_base and terrain_alt noises."
 msgstr ""
+"Mení rôznorodosť terénu.\n"
+"Definuje hodnotu 'stálosti' pre terrain_base a terrain_alt noises."
 
 #: src/settings_translation_file.cpp
 msgid "Varies steepness of cliffs."
-msgstr ""
+msgstr "Pozmeňuje strmosť útesov."
 
 #: src/settings_translation_file.cpp
 msgid "Vertical climbing speed, in nodes per second."
-msgstr ""
+msgstr "Vertikálna rýchlosť šplhania, v kockách za sekundu."
 
 #: src/settings_translation_file.cpp
 msgid "Vertical screen synchronization."
-msgstr ""
+msgstr "Vertikálna synchronizácia obrazovky."
 
 #: src/settings_translation_file.cpp
 msgid "Video driver"
-msgstr ""
+msgstr "Grafický ovláda�"
 
 #: src/settings_translation_file.cpp
 msgid "View bobbing factor"
-msgstr ""
+msgstr "Faktor pohupovania sa"
 
 #: src/settings_translation_file.cpp
 msgid "View distance in nodes."
-msgstr ""
+msgstr "Vzdialenosť dohľadu v kockách."
 
 #: src/settings_translation_file.cpp
 msgid "View range decrease key"
-msgstr ""
+msgstr "Tla�idlo Zníž dohľad"
 
 #: src/settings_translation_file.cpp
 msgid "View range increase key"
-msgstr ""
+msgstr "Tla�idlo Zvýš dohľad"
 
 #: src/settings_translation_file.cpp
 msgid "View zoom key"
-msgstr ""
+msgstr "Tla�idlo Priblíženie pohľadu"
 
 #: src/settings_translation_file.cpp
 msgid "Viewing range"
-msgstr ""
+msgstr "Vzdialenosť dohľadu"
 
 #: src/settings_translation_file.cpp
 msgid "Virtual joystick triggers aux button"
-msgstr ""
+msgstr "Virtuálny joystick stla�í tla�idlo aux"
 
 #: src/settings_translation_file.cpp
 msgid "Volume"
-msgstr ""
+msgstr "Hlasitosť"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Volume of all sounds.\n"
 "Requires the sound system to be enabled."
 msgstr ""
+"Hlasitosť všetkých zvukov.\n"
+"Požaduje aby bol zvukový systém aktivovaný."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6195,54 +6992,60 @@ msgid ""
 "Has no effect on 3D fractals.\n"
 "Range roughly -2 to 2."
 msgstr ""
+"W koordináty generovaného 3D plátku v 4D fraktáli.\n"
+"Ur�uje, ktorý 3D plátok z 4D tvaru je generovaný.\n"
+"Zmení tvar fraktálu.\n"
+"Nemá vplyv na 3D fraktály.\n"
+"Rozsah zhruba -2 až 2."
 
 #: src/settings_translation_file.cpp
 msgid "Walking and flying speed, in nodes per second."
-msgstr ""
+msgstr "Rýchlosť chôdze a lietania, v kockách za sekundu."
 
 #: src/settings_translation_file.cpp
 msgid "Walking speed"
-msgstr ""
+msgstr "Rýchlosť chôdze"
 
 #: src/settings_translation_file.cpp
 msgid "Walking, flying and climbing speed in fast mode, in nodes per second."
 msgstr ""
+"Rýchlosť chôdze, lietania a šplhania v rýchlom režime, v kockách za sekundu."
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
-msgstr ""
+msgstr "Úroveň vody"
 
 #: src/settings_translation_file.cpp
 msgid "Water surface level of the world."
-msgstr ""
+msgstr "Hladina povrchovej vody vo svete."
 
 #: src/settings_translation_file.cpp
 msgid "Waving Nodes"
-msgstr ""
+msgstr "Vlniace sa kocky"
 
 #: src/settings_translation_file.cpp
 msgid "Waving leaves"
-msgstr ""
+msgstr "Vlniace sa listy"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids"
-msgstr ""
+msgstr "Vlniace sa tekutiny"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wave height"
-msgstr ""
+msgstr "Výška vlnenia sa tekutín"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wave speed"
-msgstr ""
+msgstr "Rýchlosť vlny tekutín"
 
 #: src/settings_translation_file.cpp
 msgid "Waving liquids wavelength"
-msgstr ""
+msgstr "Vlnová dĺžka vlniacich sa tekutín"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
-msgstr ""
+msgstr "Vlniace sa rastliny"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6250,6 +7053,9 @@ msgid ""
 "filtered in software, but some images are generated directly\n"
 "to hardware (e.g. render-to-texture for nodes in inventory)."
 msgstr ""
+"Ake je gui_scaling_filter povolený, všetky GUI obrázky potrebujú byť\n"
+"filtrované softvérom, ale niektoré obrázky sú generované priamo\n"
+"pre hardvér (napr. render-to-texture pre kocky v inventári)."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6258,6 +7064,10 @@ msgid ""
 "to the old scaling method, for video drivers that don't\n"
 "properly support downloading textures back from hardware."
 msgstr ""
+"Ake je gui_scaling_filter_txr2img povolený, nakopíruj tieto obrázky\n"
+"z hardvéru do softvéru pre zmenu mierky. Ak za vypnutý, vráť sa\n"
+"k starej metóde zmeny mierky, pre grafické ovláda�e, ktoré dostato�ne\n"
+"nepodporujú sťahovanie textúr z hardvéru."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6271,6 +7081,16 @@ msgid ""
 "This is also used as the base node texture size for world-aligned\n"
 "texture autoscaling."
 msgstr ""
+"Pri použití bilineárneho/trilineárneho/anisotropného filtra, textúry s "
+"nízkym\n"
+"rozlíšením môžu byť rozmazané, tak sa automaticky upravia interpoláciou\n"
+"s najbližším susedom aby bola zachovaná ostrosť pixelov.\n"
+"Toto nastaví minimálnu veľkosť pre upravenú textúru;\n"
+"vyššia hodnota znamená ostrejší vzhľad, ale potrebuje viac pamäti.\n"
+"Odporú�ané sú mocniny 2. Nastavenie viac než 1 nemusí mať viditeľný efekt,\n"
+"kým nie je použité  bilineárne/trilineárne/anisotropné filtrovanie.\n"
+"Toto sa tiež používa ako základná veľkosť textúry kociek pre\n"
+"\"world-aligned autoscaling\" textúr."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6278,30 +7098,43 @@ msgid ""
 "in.\n"
 "If disabled, bitmap and XML vectors fonts are used instead."
 msgstr ""
+"Aby boli FreeType písma použité, je nutné aby bola podpora FreeType "
+"zakompilovaná.\n"
+"Ak je zakázané, budú použité bitmapové a XML vektorové písma."
 
 #: src/settings_translation_file.cpp
-msgid "Whether node texture animations should be desynchronized per mapblock."
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Whether node texture animations should be desynchronized per mapblock."
+msgstr "Či sa nemá animácia textúry kocky synchronizovať."
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Whether players are shown to clients without any range limit.\n"
 "Deprecated, use the setting player_transfer_distance instead."
 msgstr ""
+"Či sa hrá�i zobrazia klientom bez obmedzenia vzdialenosti.\n"
+"Zastarané, namiesto tohto použi player_transfer_distance."
 
 #: src/settings_translation_file.cpp
 msgid "Whether to allow players to damage and kill each other."
-msgstr ""
+msgstr "Či sa môžu hrá�i navzájom poškodzovať a zabiť."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether to ask clients to reconnect after a (Lua) crash.\n"
 "Set this to true if your server is set up to restart automatically."
 msgstr ""
+"Či ná ponúknuť klientom obnovenie spojenia po páde (Lua).\n"
+"Povoľ, ak je tvoj server nastavený na automatický reštart."
 
 #: src/settings_translation_file.cpp
 msgid "Whether to fog out the end of the visible area."
-msgstr ""
+msgstr "Či zamlžiť okraj viditeľnej oblasti."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6310,19 +7143,23 @@ msgid ""
 "In-game, you can toggle the mute state with the mute key or by using the\n"
 "pause menu."
 msgstr ""
+"Vypnutie zvukov. Zapnúť zvuky môžeš kedykoľvek, pokiaľ\n"
+"nie je zakázaný zvukový systém (enable_sound=false).\n"
+"V hre môžeš zapnúť/vypnúť zvuk tla�idlom pre stíšenie zvuku, alebo\n"
+"pozastavením hry."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Whether to show the client debug info (has the same effect as hitting F5)."
-msgstr ""
+msgstr "Zobrazenie ladiaceho okna na klientovi (má rovnaký efekt ako F5)."
 
 #: src/settings_translation_file.cpp
 msgid "Width component of the initial window size."
-msgstr ""
+msgstr "Šírka okna po spustení."
 
 #: src/settings_translation_file.cpp
 msgid "Width of the selection box lines around nodes."
-msgstr ""
+msgstr "Šírka línií obrysu kocky."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6330,16 +7167,21 @@ msgid ""
 "background.\n"
 "Contains the same information as the file debug.txt (default name)."
 msgstr ""
+"Len pre systémy s Windows: Spusti Minetest s oknom príkazovej riadky na "
+"pozadí.\n"
+"Obsahuje tie isté informácie ako súbor debug.txt (štandardný názov)."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "World directory (everything in the world is stored here).\n"
 "Not needed if starting from the main menu."
 msgstr ""
+"Adresár sveta (všetko na svete je uložené tu).\n"
+"Nie je potrebné ak sa spúšťa z hlavného menu."
 
 #: src/settings_translation_file.cpp
 msgid "World start time"
-msgstr ""
+msgstr "Po�iato�ný �as sveta"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6350,28 +7192,37 @@ msgid ""
 "See also texture_min_size.\n"
 "Warning: This option is EXPERIMENTAL!"
 msgstr ""
+"Textúry zarovnané podľa sveta môžu byť zvä�šené aby pokryli niekoľko "
+"kociek.\n"
+"Avšak server nemusí poslať mierku akú potrebuješ, obzvlášť ak používaš\n"
+"špeciálne dizajnovaný balí�ek textúr; s týmto nastavením, sa klient pokúsi\n"
+"ur�iť mierku automaticky na základe veľkosti textúry.\n"
+"Vi�. tiež texture_min_size.\n"
+"Varovanie: Toto nastavenie je EXPERIMENT�LNE!"
 
 #: src/settings_translation_file.cpp
 msgid "World-aligned textures mode"
-msgstr ""
+msgstr "Režim zarovnaných textúr podľa sveta"
 
 #: src/settings_translation_file.cpp
 msgid "Y of flat ground."
-msgstr ""
+msgstr "Y plochej zeme."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Y of mountain density gradient zero level. Used to shift mountains "
 "vertically."
 msgstr ""
+"Y hustotný gradient hladiny nula pre hory. Používa sa pre vertikálny posun "
+"hôr."
 
 #: src/settings_translation_file.cpp
 msgid "Y of upper limit of large caves."
-msgstr ""
+msgstr "Horný Y limit veľkých jaskýň."
 
 #: src/settings_translation_file.cpp
 msgid "Y-distance over which caverns expand to full size."
-msgstr ""
+msgstr "Y-nová vzdialenosť nad ktorou dutiny expandujú do plnej veľkosti."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6380,35 +7231,228 @@ msgid ""
 "For a solid floatland layer, this controls the height of hills/mountains.\n"
 "Must be less than or equal to half the distance between the Y limits."
 msgstr ""
+"Y-vzdialenosť kde sa lietajúce pevniny zužujú od plnej hustoty po ni�.\n"
+"Zužovanie za�ína na tejto vzdialenosti z Y limitu.\n"
+"Pre jednozna�nosť vrstvy lietajúcej krajiny, toto riadi výšku kopcov/hôr.\n"
+"Musí byť menej ako, alebo rovnako ako polovica vzdialenosti medzi Y limitami."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of average terrain surface."
-msgstr ""
+msgstr "Y-úroveň priemeru povrchu terénu."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of cavern upper limit."
-msgstr ""
+msgstr "Y-úroveň horného limitu dutín."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of higher terrain that creates cliffs."
-msgstr ""
+msgstr "Y-úroveň horného terénu, ktorý tvorí útesy/skaly."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of lower terrain and seabed."
-msgstr ""
+msgstr "Y-úroveň dolnej �asti terénu a morského dna."
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of seabed."
+msgstr "Y-úroveň morského dna."
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
 msgstr ""
+"Úroveň kompresie ZLib používaný pri ukladaní blokov mapy na disk.\n"
+"-1 - predvolená úroveň kompresie Zlib\n"
+"0 - bez kompresie, najrýchlejšie\n"
+"9 - najlepšia kompresia, najpomalšie\n"
+"(pre úrovne 1-3 používa Zlib \"rýchlu\" metódu, pre 4-9 používa normálnu "
+"metódu)"
 
 #: src/settings_translation_file.cpp
-msgid "cURL file download timeout"
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
 msgstr ""
+"Úroveň kompresie ZLib používaný pri posielaní blokov mapy klientom.\n"
+"-1 - predvolená úroveň kompresie Zlib\n"
+"0 - bez kompresie, najrýchlejšie\n"
+"9 - najlepšia kompresia, najpomalšie\n"
+"(pre úrovne 1-3 používa Zlib \"rýchlu\" metódu, pre 4-9 používa normálnu "
+"metódu)"
+
+#: src/settings_translation_file.cpp
+msgid "cURL file download timeout"
+msgstr "cURL �asový rámec sťahovania súborov"
 
 #: src/settings_translation_file.cpp
 msgid "cURL parallel limit"
-msgstr ""
+msgstr "Paralelný limit cURL"
 
 #: src/settings_translation_file.cpp
 msgid "cURL timeout"
-msgstr ""
+msgstr "Časový rámec cURL"
+
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = parallax occlusion s informácia o sklone (rýchlejšie).\n"
+#~ "1 = mapovanie reliéfu (pomalšie, presnejšie)."
+
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Si si istý, že chceš vynulovať svoj svet jedného hrá�a?"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Bump Mapping (Ilúzia nerovnosti)"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bumpmapping"
+
+#~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Zmení užívateľské rozhranie (UI) hlavného menu:\n"
+#~ "-   Plné:  Viacero svetov, voľby hry, voľba balí�ka textúr, at�.\n"
+#~ "-   Jednoduché: Jeden svet, bez herných volieb, alebo voľby textúr. Môže "
+#~ "byť\n"
+#~ "nevyhnutné pre malé obrazovky."
+
+#~ msgid "Config mods"
+#~ msgstr "Nastav rozšírenia"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurácia"
+
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Farba zameriava�a (R,G,B)."
+
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Definuje vzorkovací krok pre textúry.\n"
+#~ "Vyššia hodnota vedie k jemnejším normálovým mapám."
+
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Aktivuje bumpmapping pre textúry. Normálové mapy musia byť dodané v "
+#~ "balí�ku textúr.\n"
+#~ "alebo musia byť automaticky generované.\n"
+#~ "Vyžaduje aby boli shadery aktivované."
+
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Aktivuje generovanie normálových máp za behu (efekt reliéfu).\n"
+#~ "Požaduje aby bol aktivovaný bumpmapping."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Aktivuj parallax occlusion mapping.\n"
+#~ "Požaduje aby boli aktivované shadery."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Experimentálne nastavenie, môže spôsobiť viditeľné medzery\n"
+#~ "medzi blokmi, ak je nastavené vä�šie než 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS v menu pozastavenia hry"
+
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Normal Maps (nerovnosti)"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Generuj normálové mapy"
+
+#~ msgid "Main"
+#~ msgstr "Hlavné"
+
+#~ msgid "Main menu style"
+#~ msgstr "Štýl hlavného menu"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Minimapa v radarovom režime, priblíženie x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Minimapa v radarovom režime, priblíženie x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Minimapa v povrchovom režime, priblíženie x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Minimapa v povrchovom režime, priblíženie x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Meno/Heslo"
+
+#~ msgid "No"
+#~ msgstr "Nie"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Vzorkovanie normálových máp"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Intenzita normálových máp"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Po�et opakovaní výpo�tu parallax occlusion."
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "Celkové skreslenie parallax occlusion efektu, obvykle mierka/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Celková mierka parallax occlusion efektu."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax Occlusion (nerovnosti)"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Parallax occlusion"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Skreslenie parallax occlusion"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Opakovania parallax occlusion"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Režim parallax occlusion"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Mierka parallax occlusion"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Vynuluj svet jedného hrá�a"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Spusti hru pre jedného hrá�a"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Intenzita generovaných normálových máp."
+
+#~ msgid "View"
+#~ msgstr "Zobraziť"
+
+#~ msgid "Yes"
+#~ msgstr "�no"
diff --git a/po/sl/minetest.po b/po/sl/minetest.po
index d3da7bc66..a67ac9c65 100644
--- a/po/sl/minetest.po
+++ b/po/sl/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Slovenian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2019-11-29 23:04+0000\n"
-"Last-Translator: Matej Mlinar <mlinar.matej@gmail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-09-30 19:41+0000\n"
+"Last-Translator: Iztok Bajcar <iztok.bajcar@gmail.com>\n"
 "Language-Team: Slovenian <https://hosted.weblate.org/projects/minetest/"
 "minetest/sl/>\n"
 "Language: sl\n"
@@ -13,11 +13,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 4.3-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Ponovno oživi"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Umrl si"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "V redu"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -39,10 +47,6 @@ msgstr "Ponovna povezava"
 msgid "The server has requested a reconnect:"
 msgstr "Strežnik zahteva ponovno povezavo:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Poteka nalaganje ..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Razli�ice protokola niso skladne. "
@@ -56,12 +60,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Strežnik podpira razli�ice protokolov med $1 in $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Morda je treba ponovno omogo�iti javni seznam strežnikov oziroma preveriti "
-"internetno povezavo."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Podporta je le razli�ica protokola $1."
 
@@ -69,7 +67,8 @@ msgstr "Podporta je le razli�ica protokola $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Podprte so razli�ice protokolov med $1 in $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -79,7 +78,8 @@ msgstr "Podprte so razli�ice protokolov med $1 in $2."
 msgid "Cancel"
 msgstr "Prekli�i"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Odvisnosti:"
 
@@ -109,7 +109,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "Poiš�i ve� razširitev"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -136,7 +136,7 @@ msgstr "Opis prilagoditve ni na voljo."
 #: builtin/mainmenu/dlg_config_world.lua
 #, fuzzy
 msgid "No optional dependencies"
-msgstr "Izbirne možnosti:"
+msgstr "Ni izbirnih odvisnosti"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
@@ -156,16 +156,57 @@ msgid "enabled"
 msgstr "omogo�eno"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Poteka nalaganje ..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Vsi paketi"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Tipka je že v uporabi"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Nazaj na glavni meni"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Gosti igro"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB ni na voljo, �e je bil Minetest narejen brez podpore cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
@@ -186,6 +227,16 @@ msgid "Install"
 msgstr "Namesti"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Namesti"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Izbirne možnosti:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Prilagoditve (mods)"
@@ -199,9 +250,25 @@ msgid "No results"
 msgstr "Ni rezultatov"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Poiš�i"
+#, fuzzy
+msgid "No updates"
+msgstr "Posodobi"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -216,7 +283,11 @@ msgid "Update"
 msgstr "Posodobi"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -224,8 +295,9 @@ msgid "A world named \"$1\" already exists"
 msgstr "Svet z imenom »$1« že obstaja"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Additional terrain"
-msgstr ""
+msgstr "Dodatni teren"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
@@ -236,12 +308,14 @@ msgid "Altitude dry"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Biome blending"
-msgstr ""
+msgstr "Zlivanje biomov"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Biomes"
-msgstr ""
+msgstr "Biomi"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -249,9 +323,8 @@ msgid "Caverns"
 msgstr "Å um votline"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "Oktave"
+msgstr "Jame"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
@@ -260,7 +333,7 @@ msgstr "Ustvari"
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Decorations"
-msgstr "Informacije:"
+msgstr "Dekoracije"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -273,15 +346,17 @@ msgstr "Na voljo so na spletiš�u minetest.net/customize"
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
 msgid "Dungeons"
-msgstr "Šum je�e"
+msgstr "Je�e"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Flat terrain"
-msgstr ""
+msgstr "Raven teren"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "Lebde�e kopenske mase na nebu"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
@@ -292,28 +367,29 @@ msgid "Game"
 msgstr "Igra"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Generiraj nefraktalen teren: oceani in podzemlje"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Hribi"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
-msgstr ""
+msgstr "Vlažne reke"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Pove�a vlažnost v bližini rek"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Jezera"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "Nizka vlažnost in visoka vro�ina povzro�ita plitve ali izsušene reke"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -321,7 +397,7 @@ msgstr "Oblika sveta (mapgen)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr ""
+msgstr "Možnosti generatorja zemljevida"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -330,15 +406,15 @@ msgstr "Oblika sveta (mapgen) Fractal"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "Gore"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Tok blata"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Omrežje predorov in jam"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -346,19 +422,19 @@ msgstr "Niste izbrali igre"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "Vro�ina pojema z višino"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "Vlažnost pojema z višino"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Rivers"
-msgstr ""
+msgstr "Reke"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Reke na višini morja"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -367,17 +443,20 @@ msgstr "Seme"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "Gladek prehod med biomi"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"Strukture, ki se pojavijo na terenu (nima vpliva na drevesa in džungelsko "
+"travo, ustvarjeno z mapgenom v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "Strukture, ki se pojavljajo na terenu, npr. drevesa in rastline"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
@@ -393,11 +472,11 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr ""
+msgstr "Erozija terena"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "Drevesa in džungelska trava"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -406,7 +485,7 @@ msgstr "Globina polnila"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Zelo velike jame globoko v podzemlju"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -464,9 +543,8 @@ msgid "(No description of setting given)"
 msgstr "(ni podanega opisa nastavitve)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
 msgid "2D Noise"
-msgstr "2D zvok"
+msgstr "2D Å¡um"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "< Back to Settings page"
@@ -477,11 +555,6 @@ msgid "Browse"
 msgstr "Prebrskaj"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Odjemalec"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Onemogo�eno"
 
@@ -494,8 +567,9 @@ msgid "Enabled"
 msgstr "Omogo�eno"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+#, fuzzy
 msgid "Lacunarity"
-msgstr ""
+msgstr "lacunarnost"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Octaves"
@@ -526,6 +600,10 @@ msgid "Scale"
 msgstr "Skala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Poiš�i"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Izberi mapo"
 
@@ -535,7 +613,7 @@ msgstr "Izberi datoteko"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Show technical names"
-msgstr "Pokaži tehni�ne zapise"
+msgstr "Prikaži tehni�na imena"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "The value must be at least $1."
@@ -589,8 +667,9 @@ msgstr "Privzeta/standardna vrednost (defaults)"
 #. can be enabled in noise settings in
 #. main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
+#, fuzzy
 msgid "eased"
-msgstr ""
+msgstr "sproš�eno"
 
 #: builtin/mainmenu/pkgmgr.lua
 msgid "$1 (Enabled)"
@@ -642,6 +721,21 @@ msgstr "Ni mogo�e namestiti prilagoditve kot $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "Ni mogo�e namestiti paketa prilagoditev kot $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Poteka nalaganje ..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Skriptiranje s strani odjemalca je onemogo�eno"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Morda je treba ponovno omogo�iti javni seznam strežnikov oziroma preveriti "
+"internetno povezavo."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Brskaj po spletnih vsebinah"
@@ -695,7 +789,14 @@ msgid "Credits"
 msgstr "Zasluge"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Izberi mapo"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -715,14 +816,10 @@ msgid "Bind Address"
 msgstr "Vezani naslov"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Nastavi"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Ustvarjalni na�in"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Omogo�i poškodbe"
 
@@ -736,11 +833,11 @@ msgstr "Gostiteljski strežnik"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "Namesti igre iz ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Ime / Geslo"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -751,6 +848,11 @@ msgid "No world created or selected!"
 msgstr "Ni ustvarjenega oziroma izbranega sveta!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "Novo geslo"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Zaženi igro"
 
@@ -759,6 +861,11 @@ msgid "Port"
 msgstr "Vrata"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Izbor sveta:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Izbor sveta:"
 
@@ -774,23 +881,23 @@ msgstr "Za�ni igro"
 msgid "Address / Port"
 msgstr "Naslov / Vrata"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Poveži"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Ustvarjalni na�in"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Poškodbe so omogo�ene"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Izbriši priljubljeno"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Priljubljeno"
 
@@ -798,16 +905,16 @@ msgstr "Priljubljeno"
 msgid "Join Game"
 msgstr "Prijavi se v igro"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Ime / Geslo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Igra PvP je omogo�ena"
 
@@ -836,10 +943,6 @@ msgid "Antialiasing:"
 msgstr "Glajenje:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Ali res želiš ponastaviti samostojno igro?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Samodejno shrani velikost zaslona"
 
@@ -847,10 +950,6 @@ msgstr "Samodejno shrani velikost zaslona"
 msgid "Bilinear Filter"
 msgstr "Bilinearni filter"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Površinsko preslikavanje"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Spremeni tipke"
@@ -864,10 +963,6 @@ msgid "Fancy Leaves"
 msgstr "Olepšani listi"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Generiranje normalnih svetov"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Zemljevid (minimap)"
 
@@ -876,10 +971,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Zemljevid (minimap) s filtrom Aniso"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Ne"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Brez filtra"
 
@@ -907,19 +998,11 @@ msgstr "Neprosojni listi"
 msgid "Opaque Water"
 msgstr "Neprosojna površina vode"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Paralaksa"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Delci"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Ponastavi samostojno igro"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Zaslon:"
 
@@ -932,8 +1015,13 @@ msgid "Shaders"
 msgstr "Sen�enje"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Sen�enje (ni na voljo)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
-msgstr ""
+msgstr "Sen�enje (ni na voljo)"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Simple Leaves"
@@ -956,8 +1044,9 @@ msgid "Tone Mapping"
 msgstr "Barvno preslikavanje"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "Touchthreshold: (px)"
-msgstr ""
+msgstr "Ob�utljivost dotika (v pikslih):"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Trilinear Filter"
@@ -975,22 +1064,6 @@ msgstr "Valovanje teko�in"
 msgid "Waving Plants"
 msgstr "Pokaži nihanje rastlin"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Da"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Nastavitve prilagoditev"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Glavni"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Zaženi samostojno igro"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Povezava je potekla."
@@ -1154,18 +1227,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Tipkovne bližnjice:\n"
 "- %s 1: premakne se naprej\n"
@@ -1191,16 +1261,18 @@ msgid "Creating server..."
 msgstr "Poteka zagon strežnika ..."
 
 #: src/client/game.cpp
+#, fuzzy
 msgid "Debug info and profiler graph hidden"
-msgstr ""
+msgstr "Podatki za razhroš�evanje in graf skriti"
 
 #: src/client/game.cpp
 msgid "Debug info shown"
 msgstr "Prikazani so podatki o odpravljanju napak"
 
 #: src/client/game.cpp
+#, fuzzy
 msgid "Debug info, profiler graph, and wireframe hidden"
-msgstr ""
+msgstr "Podatki za razhroš�evanje, graf, in ži�nati prikaz skriti"
 
 #: src/client/game.cpp
 msgid ""
@@ -1279,16 +1351,6 @@ msgid "Fog enabled"
 msgstr "Megla omogo�ena"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Megla onemogo�ena"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Megla omogo�ena"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Podrobnosti o igri:"
 
@@ -1309,16 +1371,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Megla onemogo�ena"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Poškodbe so omogo�ene"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Medij..."
 
@@ -1332,34 +1384,6 @@ msgstr ""
 "Zemljevid (minimap) je trenutno onemogo�en zaradi igre ali prilagoditve"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Zemljevid (minimap) je skrit"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Zemljevid (minimap) je v radar na�inu, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Zemljevid (minimap) je v radar na�inu, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Zemljevid (minimap) je v radar na�inu, Zoom x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Zemljevid (minimap) je v na�inu prikazovanja površja, Zoom x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Zemljevid (minimap) je v na�inu prikazovanja površja, Zoom x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Zemljevid (minimap) je v na�inu prikazovanja površja, Zoom x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Prehod skozi zid (na�in duha) je onemogo�en"
 
@@ -1394,8 +1418,9 @@ msgid "Pitch move mode enabled"
 msgstr "Prostorsko premikanje (pitch mode)  je omogo�eno"
 
 #: src/client/game.cpp
+#, fuzzy
 msgid "Profiler graph shown"
-msgstr ""
+msgstr "Profiler prikazan"
 
 #: src/client/game.cpp
 msgid "Remote server"
@@ -1406,10 +1431,6 @@ msgid "Resolving address..."
 msgstr "Poteka razreševanje naslova ..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Ponovno oživi"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Poteka zaustavljanje ..."
 
@@ -1427,11 +1448,11 @@ msgstr "Zvok je utišan"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "Zvo�ni sistem je onemogo�en"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "Zvo�ni sistem v tej izdaji Minetesta ni podprt"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1458,12 +1479,9 @@ msgid "Volume changed to %d%%"
 msgstr "Glasnost zvoka je nastavljena na %d %%"
 
 #: src/client/game.cpp
+#, fuzzy
 msgid "Wireframe shown"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "You died"
-msgstr "Umrl si"
+msgstr "Ži�nati prikaz omogo�en"
 
 #: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
@@ -1482,16 +1500,6 @@ msgid "Chat shown"
 msgstr "Pogovor je prikazan"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Pogovor je skrit"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Pogovor je prikazan"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD je skrit"
 
@@ -1500,13 +1508,14 @@ msgid "HUD shown"
 msgstr "HUD je prikazan"
 
 #: src/client/gameui.cpp
+#, fuzzy
 msgid "Profiler hidden"
-msgstr ""
+msgstr "Profiler skrit"
 
 #: src/client/gameui.cpp
-#, c-format
+#, fuzzy, c-format
 msgid "Profiler shown (page %d of %d)"
-msgstr ""
+msgstr "Profiler prikazan (stran %d od %d)"
 
 #: src/client/keycode.cpp
 msgid "Apps"
@@ -1553,24 +1562,29 @@ msgid "Home"
 msgstr "Za�etno mesto"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "IME Accept"
-msgstr ""
+msgstr "IME Sprejem"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "IME Convert"
-msgstr ""
+msgstr "IME Pretvorba"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "IME Escape"
-msgstr ""
+msgstr "IME Pobeg"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "IME Mode Change"
-msgstr ""
+msgstr "IME sprememba na�ina"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "IME Nonconvert"
-msgstr ""
+msgstr "IME Nepretvorba"
 
 #: src/client/keycode.cpp
 msgid "Insert"
@@ -1674,8 +1688,9 @@ msgid "Numpad 9"
 msgstr "Tipka 9 na števil�nici"
 
 #: src/client/keycode.cpp
+#, fuzzy
 msgid "OEM Clear"
-msgstr ""
+msgstr "OEM Clear"
 
 #: src/client/keycode.cpp
 msgid "Page down"
@@ -1771,6 +1786,25 @@ msgstr "X Gumb 2"
 msgid "Zoom"
 msgstr "Približanje"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Zemljevid (minimap) je skrit"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Zemljevid (minimap) je v radar na�inu, Zoom x1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Zemljevid (minimap) je v na�inu prikazovanja površja, Zoom x1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Zemljevid (minimap) je v na�inu prikazovanja površja, Zoom x1"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Gesli se ne ujemata!"
@@ -1815,26 +1849,6 @@ msgid "Backward"
 msgstr "Nazaj"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Sprememba kamere"
 
@@ -1893,6 +1907,8 @@ msgstr "Tipka je že v uporabi"
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
 msgstr ""
+"Vloge tipk (�e ta meni preneha delovati, odstranite nastavitve tipk iz "
+"datoteke minetest.conf)"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Local command"
@@ -1927,30 +1943,10 @@ msgid "Special"
 msgstr "Specialen"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Specialen"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Preklopi gladek pogled"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Preklopi gladek pogled"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "Preklopi HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Preklopi letenje"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Preklopi beleženje pogovora"
 
@@ -2029,6 +2025,9 @@ msgid ""
 "(Android) Fixes the position of virtual joystick.\n"
 "If disabled, virtual joystick will center to first-touch's position."
 msgstr ""
+"(Android) Popravi položaj virtualne igralne palice.\n"
+"Če je onemogo�eno, se bo sredina igralne palice nastavila na položaj prvega "
+"pritiska na ekran."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2036,6 +2035,9 @@ msgid ""
 "If enabled, virtual joystick will also tap \"aux\" button when out of main "
 "circle."
 msgstr ""
+"(Android) Uporabi virtualno igralno palico za pritisk gumba \"aux\".\n"
+"Če je omogo�eno, bo igralna palica sprožila gumb \"aux\", ko bo zunaj "
+"glavnega kroga."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2048,6 +2050,15 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X, Y, Z) Zamik fraktala od središ�a sveta v enotah 'scale'.\n"
+"Uporabno za premik dolo�ene to�ke na (0, 0) za ustvarjanje\n"
+"primerne za�etne to�ke (spawn point) ali za 'zumiranje' na dolo�eno\n"
+"to�ko, tako da pove�ate 'scale'.\n"
+"Privzeta vrednost je prirejena za primerno za�etno to�ko za Mandelbrotovo\n"
+"množico s privzetimi parametri, v ostalih situacijah jo bo morda treba\n"
+"spremeniti.\n"
+"Obseg je približno od -2 do 2. Pomnožite s 'scale', da dolo�ite zamik v "
+"enoti ene kocke."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2059,12 +2070,13 @@ msgid ""
 "Default is for a vertically-squashed shape suitable for\n"
 "an island, set all 3 numbers equal for the raw shape."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
+"(X, Y, Z) skala (razteg) fraktala v enoti ene kocke.\n"
+"Resni�na velikost fraktala bo 2- do 3-krat ve�ja.\n"
+"Te vrednosti so lahko zelo velike; ni potrebno,\n"
+"da se fraktal prilega velikosti sveta.\n"
+"Pove�ajte te vrednosti, da 'zumirate' na podrobnosti fraktala.\n"
+"Privzeta vrednost dolo�a vertikalno stisnjeno obliko, primerno za\n"
+"otok; nastavite vse tri vrednosti na isto Å¡tevilo za neobdelano obliko."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
@@ -2072,27 +2084,29 @@ msgstr "2D Å¡um, ki nadzoruje obliko/velikost gorskih verig."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of rolling hills."
-msgstr ""
+msgstr "2D Å¡um, ki nadzira obliko in velikost hribov."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of step mountains."
-msgstr ""
+msgstr "2D Å¡um, ki nadzira obliko/velikost gora."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "2D noise that controls the size/occurrence of ridged mountain ranges."
-msgstr ""
+msgstr "2D Å¡um, ki nadzira velikost/pojavljanje gorskih verig."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of rolling hills."
-msgstr ""
+msgstr "2D Å¡um, ki nadzira veliokst/pojavljanje hribov."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "2D noise that controls the size/occurrence of step mountain ranges."
-msgstr ""
+msgstr "2D Å¡um, ki nadzira velikost/pojavljanje gorskih verig."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that locates the river valleys and channels."
-msgstr ""
+msgstr "2D šum, ki dolo�a položaj re�nih dolin in kanalov."
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2104,17 +2118,19 @@ msgstr "3D na�in"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode parallax strength"
-msgstr ""
+msgstr "Mo� 3D parallax na�ina"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
-msgstr ""
+msgstr "3D šum, ki dolo�a ve�je jame."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "3D noise defining mountain structure and height.\n"
 "Also defines structure of floatland mountain terrain."
 msgstr ""
+"3D šum, ki dolo�a strukturo in višino gora\n"
+"ter strukturo terena lebde�ih gora."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2123,22 +2139,27 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"3D šum, ki dolo�a strukturo lebde�e pokrajine.\n"
+"Po spremembi s privzete vrednosti bo 'skalo' Å¡uma (privzeto 0,7) morda "
+"treba\n"
+"prilagoditi, saj program za generiranje teh pokrajin najbolje deluje\n"
+"z vrednostjo v obmo�ju med -2,0 in 2,0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
-msgstr ""
+msgstr "3D šum, ki dolo�a strukturo sten re�nih kanjonov."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining terrain."
-msgstr ""
+msgstr "3D šum za dolo�anje terena."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise for mountain overhangs, cliffs, etc. Usually small variations."
-msgstr ""
+msgstr "3D Å¡um za gorske previse, klife, itd. Ponavadi so variacije majhne."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise that determines number of dungeons per mapchunk."
-msgstr ""
+msgstr "3D šum, ki dolo�a število je� na posamezen kos zemljevida."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2159,6 +2180,9 @@ 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 ""
+"Izbrano seme zemljevida, pustite prazno za izbor naklju�nega semena.\n"
+"Ta nastavitev bo povožena v primeru ustvarjanja novega sveta iz glavnega "
+"menija."
 
 #: src/settings_translation_file.cpp
 msgid "A message to be displayed to all clients when the server crashes."
@@ -2173,6 +2197,10 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "ABM interval"
+msgstr "Interval ABM"
+
+#: src/settings_translation_file.cpp
+msgid "ABM time budget"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2181,23 +2209,23 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
-msgstr ""
+msgstr "Pospešek v zraku"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration of gravity, in nodes per second per second."
-msgstr ""
+msgstr "Pospešek gravitacije v kockah na kvadratno sekundo."
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifiers"
-msgstr ""
+msgstr "Modifikatorji aktivnih blokov"
 
 #: src/settings_translation_file.cpp
 msgid "Active block management interval"
-msgstr ""
+msgstr "Interval upravljanja aktivnih blokov"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
-msgstr ""
+msgstr "Doseg aktivnih blokov"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
@@ -2209,16 +2237,22 @@ msgid ""
 "Leave this blank to start a local server.\n"
 "Note that the address field in the main menu overrides this setting."
 msgstr ""
+"Naslov strežnika.\n"
+"Pustite prazno za zagon lokalnega strežnika.\n"
+"Polje za vpis naslova v glavnem meniju povozi to nastavitev."
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Adds particles when digging a node."
-msgstr ""
+msgstr "Doda partikle pri kopanju kocke."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Adjust dpi configuration to your screen (non X11/Android only) e.g. for 4k "
 "screens."
 msgstr ""
+"Nastavite dpi konfiguracijo (gostoto prikaza) svojemu ekranu (samo za ne-X11/"
+"Android), npr. za 4K ekrane."
 
 #: src/settings_translation_file.cpp
 #, c-format
@@ -2254,11 +2288,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Amount of messages a player may send per 10 seconds."
-msgstr ""
+msgstr "Najve�ja koli�ina sporo�il, ki jih igralec sme poslati v 10 sekundah."
 
 #: src/settings_translation_file.cpp
 msgid "Amplifies the valleys."
-msgstr ""
+msgstr "Oja�a doline."
 
 #: src/settings_translation_file.cpp
 msgid "Anisotropic filtering"
@@ -2274,7 +2308,7 @@ msgstr "Objavi strežnik na seznamu strežnikov."
 
 #: src/settings_translation_file.cpp
 msgid "Append item name"
-msgstr ""
+msgstr "Dodaj ime elementa"
 
 #: src/settings_translation_file.cpp
 msgid "Append item name to tooltip."
@@ -2287,13 +2321,15 @@ msgstr "Å um jablan"
 
 #: src/settings_translation_file.cpp
 msgid "Arm inertia"
-msgstr ""
+msgstr "Vztrajnost roke"
 
 #: src/settings_translation_file.cpp
 msgid ""
 "Arm inertia, gives a more realistic movement of\n"
 "the arm when the camera moves."
 msgstr ""
+"Vztrajnost roke; daje bolj realisti�no gibanje\n"
+"roke, ko se kamera premika."
 
 #: src/settings_translation_file.cpp
 msgid "Ask to reconnect after crash"
@@ -2313,6 +2349,15 @@ msgid ""
 "optimization.\n"
 "Stated in mapblocks (16 nodes)."
 msgstr ""
+"Na tej razdalji bo strežnik agresivno optimiziral, kateri bloki bodo "
+"poslani\n"
+"igralcem.\n"
+"Manjše vrednosti lahko mo�no pospešijo delovanje na ra�un napak\n"
+"pri izrisovanju (nekateri bloki se ne bodo izrisali pod vodo in v jamah,\n"
+"v�asih pa tudi na kopnem).\n"
+"Nastavljanje na vrednost, ve�jo od max_block_send_distance, onemogo�i to\n"
+"optimizacijo.\n"
+"Navedena vrednost ima enoto 'mapchunk' (16 blokov)."
 
 #: src/settings_translation_file.cpp
 msgid "Automatic forward key"
@@ -2346,11 +2391,11 @@ msgstr "Osnovna podlaga"
 
 #: src/settings_translation_file.cpp
 msgid "Base terrain height."
-msgstr ""
+msgstr "Višina osnovnega terena."
 
 #: src/settings_translation_file.cpp
 msgid "Basic"
-msgstr ""
+msgstr "Osnovno"
 
 #: src/settings_translation_file.cpp
 msgid "Basic privileges"
@@ -2366,7 +2411,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Bilinear filtering"
-msgstr ""
+msgstr "Bilinearno filtriranje"
 
 #: src/settings_translation_file.cpp
 msgid "Bind address"
@@ -2377,12 +2422,13 @@ msgid "Biome API temperature and humidity noise parameters"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Biome noise"
-msgstr ""
+msgstr "Å um bioma"
 
 #: src/settings_translation_file.cpp
 msgid "Bits per pixel (aka color depth) in fullscreen mode."
-msgstr ""
+msgstr "Biti na piksel (barvna globina) v celozaslonskem na�inu."
 
 #: src/settings_translation_file.cpp
 msgid "Block send optimize distance"
@@ -2390,11 +2436,11 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic font path"
-msgstr ""
+msgstr "Pot do krepke in poševne pisave"
 
 #: src/settings_translation_file.cpp
 msgid "Bold and italic monospace font path"
-msgstr ""
+msgstr "Pot do krepke in leže�e pisave konstantne širine"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2403,7 +2449,7 @@ msgstr "Pot pisave"
 
 #: src/settings_translation_file.cpp
 msgid "Bold monospace font path"
-msgstr ""
+msgstr "Pot do krepke pisave konstantne Å¡irine"
 
 #: src/settings_translation_file.cpp
 msgid "Build inside player"
@@ -2411,19 +2457,23 @@ msgstr "Postavljanje blokov znotraj igralca"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
+msgstr "Vgrajeno"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
 "Increasing can reduce artifacting on weaker GPUs.\n"
 "0.1 = Default, 0.25 = Good value for weaker tablets."
 msgstr ""
+"'Bližnja ravnina' kamere - najmanjša razdalja, na kateri kamera vidi objekte "
+"- v blokih, med 0 in 0,25.\n"
+"Deluje samo na platformah GLES. Ve�ini uporabnikov te nastavitve ni treba "
+"spreminjati.\n"
+"Pove�anje vrednosti lahko odpravi anomalije na šibkejših grafi�nih "
+"procesorjih.\n"
+"0.1 = privzeto, 0.25 = dobra vrednost za šibkejše naprave"
 
 #: src/settings_translation_file.cpp
 msgid "Camera smoothing"
@@ -2458,11 +2508,11 @@ msgstr "Å irina jame"
 
 #: src/settings_translation_file.cpp
 msgid "Cave1 noise"
-msgstr ""
+msgstr "Å um Cave1"
 
 #: src/settings_translation_file.cpp
 msgid "Cave2 noise"
-msgstr ""
+msgstr "Å um Cave2"
 
 #: src/settings_translation_file.cpp
 msgid "Cavern limit"
@@ -2490,16 +2540,8 @@ msgid ""
 "Center of light curve boost range.\n"
 "Where 0.0 is minimum light level, 1.0 is maximum light level."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
+"Središ�e obmo�ja pove�ave svetlobne krivulje.\n"
+"0.0 je minimalna raven svetlobe, 1.0 maksimalna."
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -2541,8 +2583,9 @@ msgid "Chatcommands"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Chunk size"
-msgstr ""
+msgstr "Velikost 'chunka'"
 
 #: src/settings_translation_file.cpp
 msgid "Cinematic mode"
@@ -2553,8 +2596,9 @@ msgid "Cinematic mode key"
 msgstr "Tipka za filmski na�in"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Clean transparent textures"
-msgstr ""
+msgstr "ÄŒiste prosojne teksture"
 
 #: src/settings_translation_file.cpp
 msgid "Client"
@@ -2625,7 +2669,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Command key"
-msgstr ""
+msgstr "Tipka Command"
 
 #: src/settings_translation_file.cpp
 msgid "Connect glass"
@@ -2646,17 +2690,21 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Console color"
-msgstr ""
+msgstr "Barva konzole"
 
 #: src/settings_translation_file.cpp
 msgid "Console height"
-msgstr ""
+msgstr "Višina konzole"
 
 #: src/settings_translation_file.cpp
 msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "ContentDB URL"
@@ -2672,8 +2720,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Controls"
-msgstr ""
+msgstr "Kontrole"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2684,15 +2733,15 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Controls sinking speed in liquid."
-msgstr ""
+msgstr "Nadzira hitrost potapljanja v teko�inah."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/depth of lake depressions."
-msgstr ""
+msgstr "Nadzira strmost/globino jezerskih depresij."
 
 #: src/settings_translation_file.cpp
 msgid "Controls steepness/height of hills."
-msgstr ""
+msgstr "Nadzira strmost/višino hribov."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2714,7 +2763,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2722,7 +2773,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2826,14 +2879,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Dolo�a lokacijo in teren neobveznih gri�ev in jezer."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Dolo�a korak vzor�enja teksture.\n"
-"Višja vrednost povzro�i bolj gladke normalne zemljevide."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Dolo�a osnovno podlago."
 
@@ -2906,6 +2951,11 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Tipka za met predmeta"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Kopanje delcev"
 
@@ -2966,7 +3016,8 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Omogo�i ustvarjalni na�in za novo ustvarjene svetove."
 
 #: src/settings_translation_file.cpp
@@ -3054,14 +3105,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3071,18 +3114,6 @@ msgstr "Omogo�i zemljevid (minimap)."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3099,12 +3130,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3114,7 +3139,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3427,10 +3452,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3484,8 +3505,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3971,6 +3992,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4051,6 +4076,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4150,6 +4182,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4706,10 +4745,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Slog glavnega menija"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4723,6 +4758,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4887,7 +4930,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4936,6 +4979,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5165,14 +5215,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5198,10 +5240,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5227,35 +5265,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "Lestvica okluzije paralakse"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5321,6 +5330,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Tipka za letenje"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5479,10 +5497,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5734,6 +5748,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5869,10 +5893,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5966,6 +5986,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6024,8 +6048,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6051,15 +6075,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6195,6 +6224,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6401,6 +6441,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6523,6 +6569,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6534,24 +6598,116 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "V redu"
+#, fuzzy
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = \"parallax occlusion\" s podatki o nagibih (hitrejše)\n"
+#~ "1 = mapiranje reliefa (po�asnejše, a bolj natan�no)"
+
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Ali res želiš ponastaviti samostojno igro?"
 
 #~ msgid "Back"
 #~ msgstr "Nazaj"
 
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Prenašanje in nameš�anje $1, prosimo po�akajte..."
+#~ msgid "Bump Mapping"
+#~ msgstr "Površinsko preslikavanje"
+
+#~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Spremeni uporabniški vmesnik glavnega menija:\n"
+#~ "-   Polno:  ve� enoigralskih svetov, izbira igre, izbirnik paketov "
+#~ "tekstur, itd.\n"
+#~ "-   Preprosto: en enoigralski svet, izbirnika iger in paketov tekstur se "
+#~ "ne prikažeta. Morda bo za manjše\n"
+#~ "ekrane potrebna ta nastavitev."
+
+#~ msgid "Config mods"
+#~ msgstr "Nastavitve prilagoditev"
+
+#~ msgid "Configure"
+#~ msgstr "Nastavi"
 
 #~ msgid "Darkness sharpness"
 #~ msgstr "Ostrina teme"
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Dolo�a korak vzor�enja teksture.\n"
+#~ "Višja vrednost povzro�i bolj gladke normalne zemljevide."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Prenašanje in nameš�anje $1, prosimo po�akajte..."
+
 #, fuzzy
 #~ msgid "Enable VBO"
 #~ msgstr "Omogo�i VBO"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Generiranje normalnih svetov"
+
 #~ msgid "IPv6 support."
 #~ msgstr "IPv6 podpora."
 
+#~ msgid "Main"
+#~ msgstr "Glavni"
+
+#~ msgid "Main menu style"
+#~ msgstr "Slog glavnega menija"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Zemljevid (minimap) je v radar na�inu, Zoom x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Zemljevid (minimap) je v radar na�inu, Zoom x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Zemljevid (minimap) je v na�inu prikazovanja površja, Zoom x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Zemljevid (minimap) je v na�inu prikazovanja površja, Zoom x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Ime / Geslo"
+
+#~ msgid "No"
+#~ msgstr "Ne"
+
+#~ msgid "Ok"
+#~ msgstr "V redu"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Paralaksa"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Lestvica okluzije paralakse"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Ponastavi samostojno igro"
+
 #~ msgid "Select Package File:"
 #~ msgstr "Izberi datoteko paketa:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Zaženi samostojno igro"
+
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Preklopi gladek pogled"
+
+#, fuzzy
+#~ msgid "View"
+#~ msgstr "Pogled"
+
+#~ msgid "Yes"
+#~ msgstr "Da"
diff --git a/po/sr_Cyrl/minetest.po b/po/sr_Cyrl/minetest.po
index 50fcba07d..5223e55e2 100644
--- a/po/sr_Cyrl/minetest.po
+++ b/po/sr_Cyrl/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Serbian (cyrillic) (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: 2020-07-08 20:47+0000\n"
 "Last-Translator: sfan5 <sfan5@live.de>\n"
 "Language-Team: Serbian (cyrillic) <https://hosted.weblate.org/projects/"
@@ -15,6 +15,15 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Врати �е у живот"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+#, fuzzy
+msgid "You died"
+msgstr "Умро/ла �и."
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -41,10 +50,6 @@ msgstr "Поновно повезивање"
 msgid "The server has requested a reconnect:"
 msgstr "Сервер тражи поновно повезивање:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Учитавање..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "�е�лагање верзија протокола. "
@@ -58,12 +63,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Сервер подржава верзије протокола између $1 и $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Покушајте да поновно укључите ли�ту �ервера и проверите вашу интернет "
-"конекцију."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Ми подржавамо �амо $1 верзију протокола."
 
@@ -71,7 +70,8 @@ msgstr "Ми подржавамо �амо $1 верзију протокола.
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Ми подржавамо верзије протокола између верзије $1 и $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -81,7 +81,8 @@ msgstr "Ми подржавамо верзије протокола између
 msgid "Cancel"
 msgstr "Прекини"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 #, fuzzy
 msgid "Dependencies:"
 msgstr "Зави�и од:"
@@ -164,15 +165,56 @@ msgid "enabled"
 msgstr "укључено"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Учитавање..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
+msgid "Already installed"
+msgstr "Дугме �е већ кори�ти"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
 msgid "Back to Main Menu"
 msgstr "Главни мени"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "�аправи игру"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -196,6 +238,16 @@ msgid "Install"
 msgstr "Ин�талирај"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Ин�талирај"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "�еобавезне зави�но�ти:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Модови"
@@ -209,9 +261,24 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Тражи"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
@@ -228,7 +295,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -494,11 +565,6 @@ msgid "Browse"
 msgstr "Прегледај"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Клијент"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Онемогућено"
 
@@ -543,6 +609,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Тражи"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 #, fuzzy
 msgid "Select directory"
 msgstr "Изаберите фајл мода:"
@@ -677,6 +747,20 @@ msgstr "�еу�пела ин�талација $1 у $2"
 msgid "Unable to install a modpack as a $1"
 msgstr "�еу�пела ин�талација $1 у $2"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Учитавање..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Покушајте да поновно укључите ли�ту �ервера и проверите вашу интернет "
+"конекцију."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -737,7 +821,14 @@ msgid "Credits"
 msgstr "За�луге"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Изаберите фајл мода:"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -757,14 +848,10 @@ msgid "Bind Address"
 msgstr "Вежи адре�у"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Поде�и"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Слободни мод"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Омогући оштећење"
 
@@ -781,8 +868,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Име/Шифра"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -794,6 +881,11 @@ msgstr "Ð�иједан Ñ�вет није направљен или изабраÐ
 
 #: builtin/mainmenu/tab_local.lua
 #, fuzzy
+msgid "Password"
+msgstr "�ова шифра"
+
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
 msgid "Play Game"
 msgstr "Почни игру"
 
@@ -802,6 +894,11 @@ msgid "Port"
 msgstr "Порт"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Одабери �вет:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Одабери �вет:"
 
@@ -818,23 +915,23 @@ msgstr "�аправи игру"
 msgid "Address / Port"
 msgstr "�дре�а / Порт"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Прикључи �е"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Слободни мод"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Оштећење омогућено"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Обриши Омиљени"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Омиљени"
 
@@ -843,16 +940,16 @@ msgstr "Омиљени"
 msgid "Join Game"
 msgstr "�аправи игру"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Име / Шифра"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Одзив"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Туча омогућена"
 
@@ -882,10 +979,6 @@ msgid "Antialiasing:"
 msgstr "Гланчање тек�тура:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Да ли �те �игурни да желите да ре�етујете ваш �вет?"
-
-#: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Autosave Screen Size"
 msgstr "�утомат�ки �ачувај величину екрана"
@@ -894,10 +987,6 @@ msgstr "�утомат�ки �ачувај величину екрана"
 msgid "Bilinear Filter"
 msgstr "Билинеарни филтер"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Bump-Мапирање"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Поде�и контроле"
@@ -911,10 +1000,6 @@ msgid "Fancy Leaves"
 msgstr "Елегантно лишће"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Мипмап"
 
@@ -923,10 +1008,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + �низотропни филтер"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "�е"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Без филтера"
 
@@ -954,19 +1035,11 @@ msgstr "�епровидно лишће"
 msgid "Opaque Water"
 msgstr "�епрозирна вода"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parallax Occlusion Мапирање"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Че�тице"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Ре�етуј �вет"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Екран:"
 
@@ -979,6 +1052,10 @@ msgid "Shaders"
 msgstr "Шејдери"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -1024,22 +1101,6 @@ msgstr "Лепршајуће лишће"
 msgid "Waving Plants"
 msgstr "Лепршајуће биљке"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Да"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Поде�и модове"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Главно"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Започни игру за једног играча"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Конекцији је и�текло време."
@@ -1208,18 +1269,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Уобичајене контроле:\n"
 "- %s: иди напред\n"
@@ -1338,16 +1396,6 @@ msgid "Fog enabled"
 msgstr "укључено"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Онемогућено"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "укључено"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Информације о игри:"
 
@@ -1368,16 +1416,6 @@ msgid "KiB/s"
 msgstr "КиБ/�"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Онемогућено"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Оштећење омогућено"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Медија..."
 
@@ -1390,34 +1428,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1463,10 +1473,6 @@ msgid "Resolving address..."
 msgstr "Разлучујем адре�у..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Врати �е у живот"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "И�кључивање..."
 
@@ -1521,11 +1527,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "You died"
-msgstr "Умро/ла �и."
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1543,15 +1544,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Кључ за чет"
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1833,6 +1825,24 @@ msgstr "X Дугме 2"
 msgid "Zoom"
 msgstr "Зумирај"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Шифре �е не поклапају!"
@@ -1874,26 +1884,6 @@ msgid "Backward"
 msgstr "�азад"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
 msgid "Change camera"
 msgstr "Промени дугмад"
@@ -1991,31 +1981,11 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Special Inv."
-msgstr "прити�ните дугме"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Укључи/И�кључи Cinematic мод"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Укључи/И�кључи Cinematic мод"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle HUD"
 msgstr "Укључи/И�кључи летење"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Toggle Killaura"
-msgstr "Укључи/И�кључи летење"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle chat log"
 msgstr "Укључи/И�кључи трчање"
 
@@ -2136,14 +2106,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 =  parallax occlusion �а информацијама о нагибима (брже)\n"
-"1 = мапирање рељефа (�порије, прецизније)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2261,6 +2223,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "�б�олутни лимит emerge токова."
@@ -2515,10 +2481,6 @@ msgid "Builtin"
 msgstr "Уграђено"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Рељефна тектура"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2590,16 +2552,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "Величина комада"
@@ -2763,6 +2715,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "�а�тави"
@@ -2824,7 +2780,10 @@ msgid "Crosshair alpha"
 msgstr "Провидно�т нишана"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Провидно�т нишана (видљиво�т, између 0 и 255)."
 
 #: src/settings_translation_file.cpp
@@ -2832,8 +2791,10 @@ msgid "Crosshair color"
 msgstr "Боја нишана"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Боја нишана (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2936,12 +2897,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -3012,6 +2967,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Digging particles"
 msgstr "Че�тице"
@@ -3074,7 +3033,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3162,14 +3121,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3179,18 +3130,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3207,12 +3146,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3222,7 +3155,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3528,10 +3461,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3586,8 +3515,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -4057,6 +3986,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4137,6 +4070,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4236,6 +4176,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4793,11 +4740,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Главни мени"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4811,6 +4753,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4980,7 +4930,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5029,6 +4979,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5258,14 +5215,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5291,10 +5240,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5320,35 +5265,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "Parallax Occlusion Мапирање"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5415,6 +5331,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Кључ за �инемат�ки мод"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5573,10 +5498,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5850,6 +5771,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5981,10 +5912,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6078,6 +6005,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6136,8 +6067,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6163,15 +6094,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6309,6 +6245,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6515,6 +6462,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6639,6 +6592,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6650,15 +6621,12 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Уреду"
-
-#~ msgid "Back"
-#~ msgstr "�азад"
-
-#, fuzzy
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Преузима �е $1, молим ва� �ачекајте..."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 =  parallax occlusion �а информацијама о нагибима (брже)\n"
+#~ "1 = мапирање рељефа (�порије, прецизније)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -6668,6 +6636,24 @@ msgstr ""
 #~ "Поде�и о�ветљење унутар игре. Веће вредно�ти �у �ветлије.\n"
 #~ "Ово подешавање је �амо за клијента, �ервер га игнорише."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Да ли �те �игурни да желите да ре�етујете ваш �вет?"
+
+#~ msgid "Back"
+#~ msgstr "�азад"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Bump-Мапирање"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Рељефна тектура"
+
+#~ msgid "Config mods"
+#~ msgstr "Поде�и модове"
+
+#~ msgid "Configure"
+#~ msgstr "Поде�и"
+
 #, fuzzy
 #~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
@@ -6679,6 +6665,48 @@ msgstr ""
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "Контролише ширину тунела, мања вредно�т �твара шире тунеле."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Боја нишана (R,G,B)."
+
+#, fuzzy
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Преузима �е $1, молим ва� �ачекајте..."
+
+#~ msgid "Main"
+#~ msgstr "Главно"
+
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "Главни мени"
+
+#~ msgid "Name/Password"
+#~ msgstr "Име/Шифра"
+
+#~ msgid "No"
+#~ msgstr "�е"
+
+#~ msgid "Ok"
+#~ msgstr "Уреду"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax Occlusion Мапирање"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Parallax Occlusion Мапирање"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Ре�етуј �вет"
+
 #, fuzzy
 #~ msgid "Select Package File:"
 #~ msgstr "Изаберите фајл мода:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Започни игру за једног играча"
+
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Укључи/И�кључи Cinematic мод"
+
+#~ msgid "Yes"
+#~ msgstr "Да"
diff --git a/po/fil/minetest.po b/po/sr_Latn/minetest.po
index ffb1ba36e..7c5ad11fc 100644
--- a/po/fil/minetest.po
+++ b/po/sr_Latn/minetest.po
@@ -1,73 +1,79 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the minetest package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: Filipino (Minetest)\n"
+"Project-Id-Version: minetest\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-01-11 18:26+0000\n"
-"Last-Translator: rubenwardy <rubenwardy@gmail.com>\n"
-"Language-Team: Filipino <https://hosted.weblate.org/projects/minetest/"
-"minetest/fil/>\n"
-"Language: fil\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-08-15 23:32+0000\n"
+"Last-Translator: Milos <milosfilic97@gmail.com>\n"
+"Language-Team: Serbian (latin) <https://hosted.weblate.org/projects/minetest/"
+"minetest/sr_Latn/>\n"
+"Language: sr_Latn\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 != 2 && n != 3 && (n % 10 == 4 "
-"|| n % 10 == 6 || n % 10 == 9);\n"
-"X-Generator: Weblate 3.10.1\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.2-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Vrati se u zivot"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Umro/la si."
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
-msgstr ""
+msgstr "Doslo je do greske u Lua skripti:"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred:"
-msgstr ""
+msgstr "Doslo je do greske:"
 
 #: builtin/fstk/ui.lua
 msgid "Main menu"
-msgstr ""
+msgstr "Glavni meni"
 
 #: builtin/fstk/ui.lua
 msgid "Reconnect"
-msgstr ""
+msgstr "Ponovno povezivanje"
 
 #: builtin/fstk/ui.lua
 msgid "The server has requested a reconnect:"
-msgstr ""
-
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr ""
+msgstr "Server je zahtevao ponovno povezivanje:"
 
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
-msgstr ""
+msgstr "Protokol verzija neuskladjena. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server enforces protocol version $1. "
-msgstr ""
+msgstr "Server primenjuje protokol verzije $1. "
 
 #: builtin/mainmenu/common.lua
 msgid "Server supports protocol versions between $1 and $2. "
-msgstr ""
-
-#: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
+msgstr "Server podrzava protokol verzije izmedju $1 ili $2. "
 
 #: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
-msgstr ""
+msgstr "Mi samo podrzavamo protokol verzije $1."
 
 #: builtin/mainmenu/common.lua
 msgid "We support protocol versions between version $1 and $2."
-msgstr ""
+msgstr "Mi podrzavamo protokol verzija izmedju verzije $1 i $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -75,140 +81,212 @@ msgstr ""
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiKeyChangeMenu.cpp
 #: src/gui/guiPasswordChange.cpp
 msgid "Cancel"
-msgstr ""
+msgstr "Ponisti"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
-msgstr ""
+msgstr "Zavisnosti:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable all"
-msgstr ""
+msgstr "Onemoguci sve"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Disable modpack"
-msgstr ""
+msgstr "Onemoguci modpack"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable all"
-msgstr ""
+msgstr "Omoguci sve"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Enable modpack"
-msgstr ""
+msgstr "Omoguci modpack"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid ""
 "Failed to enable mod \"$1\" as it contains disallowed characters. Only "
 "characters [a-z0-9_] are allowed."
 msgstr ""
+"Nije omogucen mod \"$1\" jer sadrzi nedozvoljene simbole. Samo simboli [a-z, "
+"0-9_] su dozvoljeni."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "Nadji jos modova"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
-msgstr ""
+msgstr "Mod:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No (optional) dependencies"
-msgstr ""
+msgstr "Nema (opcionih) zavisnosti"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No game description provided."
-msgstr ""
+msgstr "Opis igre nije prilozen."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No hard dependencies"
-msgstr ""
+msgstr "Bez teskih zavisnosti"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No modpack description provided."
-msgstr ""
+msgstr "Opis modpack-a nije prilozen."
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "No optional dependencies"
-msgstr ""
+msgstr "Bez neobaveznih zavisnosti"
 
 #: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
 msgid "Optional dependencies:"
-msgstr ""
+msgstr "Neobavezne zavisnosti:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua src/gui/guiKeyChangeMenu.cpp
 msgid "Save"
-msgstr ""
+msgstr "Sacuvaj"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "World:"
-msgstr ""
+msgstr "Svet:"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "enabled"
+msgstr "Omoguceno"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Preuzimanje..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
+msgstr "Svi paketi"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
+msgstr "Nazad na Glavni meni"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "ContentDB je nedostupan kada je Minetest sastavljen bez cURL"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Downloading..."
-msgstr ""
+msgstr "Preuzimanje..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
-msgstr ""
+msgstr "Neuspelo preuzimanje $1"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Games"
-msgstr ""
+msgstr "Igre"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Install"
-msgstr ""
+msgstr "Instalirati"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Instalirati"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Neobavezne zavisnosti:"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
-msgstr ""
+msgstr "Modovi"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No packages could be retrieved"
-msgstr ""
+msgstr "Nema paketa za preuzeti"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "No results"
+msgstr "Bez rezultata"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "No updates"
+msgstr "Azuriranje"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
+msgid "Overwrite"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "Texture packs"
+msgid "Please check that the base game is correct."
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "Uninstall"
+msgid "Queued"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Texture packs"
+msgstr "Pakovanja tekstura"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Uninstall"
+msgstr "Deinstaliraj"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Update"
+msgstr "Azuriranje"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Update All [$1]"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -217,31 +295,31 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "Dodatni teren"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
-msgstr ""
+msgstr "Nadmorska visina"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Altitude dry"
-msgstr ""
+msgstr "Visina suva"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biome blending"
-msgstr ""
+msgstr "Mesanje bioma"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Biomes"
-msgstr ""
+msgstr "Biomi"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caverns"
-msgstr ""
+msgstr "Pecine"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Caves"
-msgstr ""
+msgstr "Pecine"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
@@ -249,7 +327,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Decorations"
-msgstr ""
+msgstr "Dekoracije"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -257,23 +335,23 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download one from minetest.net"
-msgstr ""
+msgstr "Preuzmi jednu sa minetest.net"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Dungeons"
-msgstr ""
+msgstr "Tamnice"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "Ravan teren"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "Lebdece zemaljske mase na nebu"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floatlands (experimental)"
-msgstr ""
+msgstr "Lebdece zemlje (eksperimentalno)"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
@@ -281,27 +359,27 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "Stvaranje ne-fraktalnog terena: Okeani i podzemlje"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "Brda"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Humid rivers"
-msgstr ""
+msgstr "Vlazne reke"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "Povecana vlaznost oko reka"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "Jezera"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "Niska vlaga i visoka toplota uzrokuju plitke ili suve reke"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -309,7 +387,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen flags"
-msgstr ""
+msgstr "Mapgen zastave"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mapgen-specific flags"
@@ -317,15 +395,15 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mountains"
-msgstr ""
+msgstr "Planine"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "Protok blata"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "Mreza tunela i pecina"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -333,19 +411,19 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "Smanjuje toplotu sa visinom"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "Smanjuje vlaznost sa visinom"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Rivers"
-msgstr ""
+msgstr "Reke"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "Reke na nivou mora"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -354,45 +432,47 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "Glatki prelaz izmedju bioma"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"Konstrukcije koje se pojavljuju na terenu (nema efekta na drveca i travu "
+"dzungle koje je stvorio v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "Konstrukcije koje se pojavljuju na terenu , obicno drvece i biljke"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "Umereno,Pustinja"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "Umereno,Pustinja,Dzungla"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "Umereno,Pustinja,Dzungla,Tundra,Tajga"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr ""
+msgstr "Povrsinska erozija terena"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "Drveca i trava dzungle"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Vary river depth"
-msgstr ""
+msgstr "Razlicita dubina reke"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Veoma velike pecine duboko ispod zemlje"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Warning: The Development Test is meant for developers."
@@ -404,7 +484,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "You have no games installed."
-msgstr ""
+msgstr "Nema instaliranih igara."
 
 #: builtin/mainmenu/dlg_delete_content.lua
 msgid "Are you sure you want to delete \"$1\"?"
@@ -459,10 +539,6 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr ""
 
@@ -507,6 +583,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Trazi"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr ""
 
@@ -621,6 +701,20 @@ msgstr ""
 msgid "Unable to install a modpack as a $1"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Ucitavanje..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Pokusajte ponovo omoguciti javnu listu servera i proverite vasu internet "
+"vezu."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -674,7 +768,13 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -694,14 +794,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr ""
 
@@ -718,7 +814,7 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -730,6 +826,10 @@ msgid "No world created or selected!"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr ""
 
@@ -738,6 +838,10 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ""
 
@@ -753,23 +857,23 @@ msgstr ""
 msgid "Address / Port"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
@@ -777,16 +881,16 @@ msgstr ""
 msgid "Join Game"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -815,10 +919,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -826,10 +926,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -843,10 +939,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -855,10 +947,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -886,19 +974,11 @@ msgstr ""
 msgid "Opaque Water"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr ""
 
@@ -911,6 +991,11 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Lebdece zemlje (eksperimentalno)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -954,22 +1039,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1040,7 +1109,7 @@ msgstr ""
 #. When in doubt, test your translation.
 #: src/client/fontengine.cpp
 msgid "needs_fallback_font"
-msgstr "yes"
+msgstr "no"
 
 #: src/client/game.cpp
 msgid ""
@@ -1129,18 +1198,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1228,14 +1294,6 @@ msgid "Fog enabled"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Freecam enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1256,14 +1314,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Killaura enabled"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1276,34 +1326,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1348,10 +1370,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1404,10 +1422,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1424,14 +1438,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1711,6 +1717,24 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ""
@@ -1750,26 +1774,6 @@ msgid "Backward"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr ""
 
@@ -1862,26 +1866,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -1952,7 +1940,7 @@ msgstr ""
 #. language code (e.g. "de" for German).
 #: src/network/clientpackethandler.cpp src/script/lua_api/l_client.cpp
 msgid "LANG_CODE"
-msgstr "fil"
+msgstr "sr_Latn"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -1991,12 +1979,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2103,6 +2085,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2336,10 +2322,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2410,16 +2392,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2571,6 +2543,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2627,7 +2603,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2635,7 +2613,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2735,12 +2715,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2811,6 +2785,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2871,7 +2849,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2959,14 +2937,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -2976,18 +2946,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3004,12 +2962,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3019,7 +2971,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3321,10 +3273,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3378,8 +3326,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3846,6 +3794,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3926,6 +3878,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4025,6 +3984,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4581,10 +4547,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4598,6 +4560,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4761,7 +4731,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4810,6 +4780,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5039,14 +5016,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5072,10 +5041,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5101,34 +5066,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5194,6 +5131,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5349,10 +5294,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5604,6 +5545,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5733,10 +5684,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5830,6 +5777,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5888,8 +5839,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5915,15 +5866,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6059,6 +6015,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6261,6 +6228,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6383,6 +6356,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6393,3 +6384,6 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid "cURL timeout"
 msgstr ""
+
+#~ msgid "View"
+#~ msgstr "Pogled"
diff --git a/po/sv/minetest.po b/po/sv/minetest.po
index 1b1f1f698..e608d85e2 100644
--- a/po/sv/minetest.po
+++ b/po/sv/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Swedish (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: 2020-03-31 10:14+0000\n"
 "Last-Translator: sfan5 <sfan5@live.de>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/minetest/"
@@ -14,6 +14,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Återföds"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Du dog"
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -39,10 +47,6 @@ msgstr "Ã…teranslut"
 msgid "The server has requested a reconnect:"
 msgstr "Servern har begärt en återanslutning:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Laddar..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Protokollversionen matchar ej. "
@@ -56,11 +60,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Servern stöder protokollversioner mellan $1 och $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Försök återaktivera allmän serverlista och kolla din internetanslutning."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Vi stöder endast protokollversion $1."
 
@@ -68,7 +67,8 @@ msgstr "Vi stöder endast protokollversion $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Vi stöder protokollversioner mellan version $1 och $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +78,8 @@ msgstr "Vi stöder protokollversioner mellan version $1 och $2."
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Beroenden:"
 
@@ -155,14 +156,55 @@ msgid "enabled"
 msgstr "aktiverad"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Laddar..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Alla paket"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Tangent används redan"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Tillbaka till huvudmeny"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Bilda Spel"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -185,6 +227,16 @@ msgid "Install"
 msgstr "Installera"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Installera"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Valfria beroenden:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Moddar"
@@ -198,9 +250,25 @@ msgid "No results"
 msgstr "Inga resultat"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Sök"
+#, fuzzy
+msgid "No updates"
+msgstr "Uppdatera"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -215,7 +283,11 @@ msgid "Update"
 msgstr "Uppdatera"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -480,11 +552,6 @@ msgid "Browse"
 msgstr "Bläddra"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Klient"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Inaktiverad"
 
@@ -529,6 +596,10 @@ msgid "Scale"
 msgstr "Skala"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Sök"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Välj katalog"
 
@@ -658,6 +729,19 @@ msgstr "Misslyckades installera $1 till $2"
 msgid "Unable to install a modpack as a $1"
 msgstr "Misslyckades installera $1 till $2"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Laddar..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Försök återaktivera allmän serverlista och kolla din internetanslutning."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -718,7 +802,14 @@ msgid "Credits"
 msgstr "Medverkande"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Välj katalog"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -738,14 +829,10 @@ msgid "Bind Address"
 msgstr "Bindningsadress"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Konfigurera"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Kreativt läge"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Aktivera Skada"
 
@@ -762,8 +849,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Namn/Lösenord"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -775,6 +862,11 @@ msgstr "Ingen värld skapad eller vald!"
 
 #: builtin/mainmenu/tab_local.lua
 #, fuzzy
+msgid "Password"
+msgstr "Nytt Lösenord"
+
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
 msgid "Play Game"
 msgstr "Starta spel"
 
@@ -783,6 +875,11 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Välj värld:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Välj värld:"
 
@@ -799,23 +896,23 @@ msgstr "Bilda Spel"
 msgid "Address / Port"
 msgstr "Adress / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Anslut"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Kreativt läge"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Skada aktiverat"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Radera Favorit"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favoritmarkera"
 
@@ -824,16 +921,16 @@ msgstr "Favoritmarkera"
 msgid "Join Game"
 msgstr "Bilda Spel"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Namn / Lösenord"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP aktiverat"
 
@@ -863,10 +960,6 @@ msgid "Antialiasing:"
 msgstr "Kantutjämning:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Är du säker på att du vill starta om din enspelarvärld?"
-
-#: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Autosave Screen Size"
 msgstr "Spara fönsterstorlek automatiskt"
@@ -875,10 +968,6 @@ msgstr "Spara fönsterstorlek automatiskt"
 msgid "Bilinear Filter"
 msgstr "Bilinjärt filter"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Stötkartläggning"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Ändra Tangenter"
@@ -892,10 +981,6 @@ msgid "Fancy Leaves"
 msgstr "Fina Löv"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -904,10 +989,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Aniso-filter"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Nej"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Inget filter"
 
@@ -935,19 +1016,11 @@ msgstr "Ogenomskinliga löv"
 msgid "Opaque Water"
 msgstr "Ogenomskinligt vatten"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parrallax Ocklusion"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Partiklar"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Starta om enspelarvärld"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Skärm:"
 
@@ -960,6 +1033,10 @@ msgid "Shaders"
 msgstr "Shaders"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -1005,22 +1082,6 @@ msgstr "Vajande Löv"
 msgid "Waving Plants"
 msgstr "Vajande Växter"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ja"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Konfigurera moddar"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Huvudsaklig"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Starta Enspelarläge"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Anslutningens tidsgräns nådd."
@@ -1192,18 +1253,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Kontroller:\n"
 "- %s: rör dig framåt\n"
@@ -1322,16 +1380,6 @@ msgid "Fog enabled"
 msgstr "aktiverad"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Inaktiverad"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "aktiverad"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Spelinformation:"
 
@@ -1352,16 +1400,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Inaktiverad"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Skada aktiverat"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Media..."
 
@@ -1374,34 +1412,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1447,10 +1457,6 @@ msgid "Resolving address..."
 msgstr "Kollar upp address...."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Återföds"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Stänger av..."
 
@@ -1505,10 +1511,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Du dog"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1526,15 +1528,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Chattangent"
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1815,6 +1808,24 @@ msgstr "X Knapp 2"
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Lösenorden matchar inte!"
@@ -1856,26 +1867,6 @@ msgid "Backward"
 msgstr "Bakåt"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
 msgid "Change camera"
 msgstr "Ändra tangenter"
@@ -1972,31 +1963,11 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Special Inv."
-msgstr "tryck på tangent"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Slå av/på Filmisk Kamera"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Slå av/på Filmisk Kamera"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle HUD"
 msgstr "Slå av/på flygläge"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Toggle Killaura"
-msgstr "Slå av/på flygläge"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle chat log"
 msgstr "Slå av/på snabb"
 
@@ -2116,14 +2087,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = parallax ocklusion med sluttningsinformation (snabbare).\n"
-"1 = reliefmappning (långsammare, noggrannare)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2244,6 +2207,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Absolut gräns av emerge kö"
@@ -2501,10 +2468,6 @@ msgid "Builtin"
 msgstr "Inbyggd"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bumpmappning"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2576,16 +2539,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "Chunkstorlek"
@@ -2748,6 +2701,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "Fortsätt"
@@ -2809,7 +2766,10 @@ msgid "Crosshair alpha"
 msgstr "HÃ¥rkorsalpha"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "HÃ¥rkorsalpha (ogenomskinlighet, mellan 0 och 255)."
 
 #: src/settings_translation_file.cpp
@@ -2817,8 +2777,10 @@ msgid "Crosshair color"
 msgstr "Hårkorsfärg"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Hårkorsförg (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2928,14 +2890,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "Definierar plats och terräng för valfria kullar och sjöar."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Definierar samplingssteg av textur.\n"
-"Högre värden resulterar i jämnare normalmappning."
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Defines the base ground level."
 msgstr "Definierar trädområden och trädtäthet."
@@ -3020,6 +2974,10 @@ msgid "Desynchronize block animation"
 msgstr "Desynkronisera blockanimation"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Grävpartiklar"
 
@@ -3081,7 +3039,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3169,14 +3127,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3186,18 +3136,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3214,12 +3152,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3229,7 +3161,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3532,10 +3464,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3590,8 +3518,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -4058,6 +3986,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4138,6 +4070,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4237,6 +4176,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4795,11 +4741,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Huvudmeny"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4813,6 +4754,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4982,7 +4931,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5031,6 +4980,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5260,14 +5216,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5293,10 +5241,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5322,35 +5266,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "Parrallax Ocklusion"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5417,6 +5332,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Tangent för filmiskt länge"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5572,10 +5496,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5849,6 +5769,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5980,10 +5910,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6078,6 +6004,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6136,8 +6066,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6163,15 +6093,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6309,6 +6244,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6515,6 +6461,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6641,6 +6593,24 @@ msgid "Y-level of seabed."
 msgstr "Y-nivå av sjöbotten."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL filhemladdning tidsgräns"
 
@@ -6652,14 +6622,12 @@ msgstr "cURL parallellgräns"
 msgid "cURL timeout"
 msgstr "cURL-timeout"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Back"
-#~ msgstr "Tillbaka"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Laddar ner och installerar $1, vänligen vänta..."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = parallax ocklusion med sluttningsinformation (snabbare).\n"
+#~ "1 = reliefmappning (långsammare, noggrannare)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -6669,6 +6637,24 @@ msgstr "cURL-timeout"
 #~ "Justera gammakodningen för ljustabeller. Högre tal är ljusare.\n"
 #~ "Denna inställning påverkar endast klienten och ignoreras av servern."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Är du säker på att du vill starta om din enspelarvärld?"
+
+#~ msgid "Back"
+#~ msgstr "Tillbaka"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Stötkartläggning"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bumpmappning"
+
+#~ msgid "Config mods"
+#~ msgstr "Konfigurera moddar"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurera"
+
 #, fuzzy
 #~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
@@ -6681,6 +6667,9 @@ msgstr "cURL-timeout"
 #~ msgstr ""
 #~ "Kontrollerar bredd av tunnlar, mindre värden skapar bredare tunnlar."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Hårkorsförg (R,G,B)."
+
 #~ msgid ""
 #~ "Defines areas of floatland smooth terrain.\n"
 #~ "Smooth floatlands occur when noise > 0."
@@ -6688,9 +6677,54 @@ msgstr "cURL-timeout"
 #~ "Definierar områden för luftöars jämna terräng.\n"
 #~ "Jämna luftöar förekommer när oljud > 0."
 
-#~ msgid "Y-level to which floatland shadows extend."
-#~ msgstr "Y-nivå till vilket luftöars skuggor når."
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Definierar samplingssteg av textur.\n"
+#~ "Högre värden resulterar i jämnare normalmappning."
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Laddar ner och installerar $1, vänligen vänta..."
+
+#~ msgid "Main"
+#~ msgstr "Huvudsaklig"
+
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "Huvudmeny"
+
+#~ msgid "Name/Password"
+#~ msgstr "Namn/Lösenord"
+
+#~ msgid "No"
+#~ msgstr "Nej"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parrallax Ocklusion"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Parrallax Ocklusion"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Starta om enspelarvärld"
 
 #, fuzzy
 #~ msgid "Select Package File:"
 #~ msgstr "Välj modfil:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "Starta Enspelarläge"
+
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Slå av/på Filmisk Kamera"
+
+#~ msgid "Y-level to which floatland shadows extend."
+#~ msgstr "Y-nivå till vilket luftöars skuggor når."
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
diff --git a/po/sw/minetest.po b/po/sw/minetest.po
index 1cad7f456..d0fffcb91 100644
--- a/po/sw/minetest.po
+++ b/po/sw/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Swahili (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swahili <https://hosted.weblate.org/projects/minetest/"
@@ -14,6 +14,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.9-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Respawn"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Umekufa."
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -40,10 +48,6 @@ msgstr "Unganisha upya"
 msgid "The server has requested a reconnect:"
 msgstr "Seva imeomba na Unganisha upya:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Inapakia..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Itifaki ya toleo haifanani."
@@ -57,10 +61,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Seva inasaidia matoleo ya itifaki kati ya $1 na $2."
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "Jaribu reenabling serverlist umma na Kagua muunganisho wako wa tovuti."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Sisi tu mkono itifaki toleo la $1."
 
@@ -68,7 +68,8 @@ msgstr "Sisi tu mkono itifaki toleo la $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Tunaunga mkono matoleo ya itifaki kati ya toleo la $1 na $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +79,8 @@ msgstr "Tunaunga mkono matoleo ya itifaki kati ya toleo la $1 na $2."
 msgid "Cancel"
 msgstr "Katisha"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Mategemezi:"
 
@@ -157,15 +159,56 @@ msgid "enabled"
 msgstr "kuwezeshwa"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Inapakia..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
+msgid "Already installed"
+msgstr "Muhimu tayari katika matumizi"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
 msgid "Back to Main Menu"
 msgstr "Menyu kuu"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Ficha mchezo"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -189,6 +232,16 @@ msgid "Install"
 msgstr "Sakinisha"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "Sakinisha"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Inaanzilisha fundo"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mods"
@@ -202,9 +255,24 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Utafutaji"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
@@ -221,7 +289,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -494,11 +566,6 @@ msgid "Browse"
 msgstr "Vinjari"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Mteja"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Walemavu"
 
@@ -545,6 +612,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Utafutaji"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 #, fuzzy
 msgid "Select directory"
 msgstr "Orodha ya ramani"
@@ -679,6 +750,18 @@ msgstr "Imeshindwa kusakinisha $1 hadi $2"
 msgid "Unable to install a modpack as a $1"
 msgstr "Imeshindwa kusakinisha $1 hadi $2"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Inapakia..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "Jaribu reenabling serverlist umma na Kagua muunganisho wako wa tovuti."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -739,7 +822,14 @@ msgid "Credits"
 msgstr "Mikopo"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Orodha ya ramani"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -760,14 +850,10 @@ msgid "Bind Address"
 msgstr "Kumfunga anwani"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Sanidi"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Hali ya ubunifu"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Wezesha uharibifu"
 
@@ -786,8 +872,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Jina/nenosiri"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -799,6 +885,11 @@ msgstr "Duniani hakuna kuundwa au kuteuliwa!"
 
 #: builtin/mainmenu/tab_local.lua
 #, fuzzy
+msgid "Password"
+msgstr "Nywila mpya"
+
+#: builtin/mainmenu/tab_local.lua
+#, fuzzy
 msgid "Play Game"
 msgstr "Jina la mchezaji"
 
@@ -807,6 +898,11 @@ msgid "Port"
 msgstr "Bandari"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Teua ulimwengu:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Teua ulimwengu:"
 
@@ -823,23 +919,23 @@ msgstr "Ficha mchezo"
 msgid "Address / Port"
 msgstr "Kushughulikia / bandari"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Kuunganisha"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Hali ya ubunifu"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Uharibifu kuwezeshwa"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Del. kipendwa"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Kipendwa"
 
@@ -848,16 +944,16 @@ msgstr "Kipendwa"
 msgid "Join Game"
 msgstr "Ficha mchezo"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Jina / nenosiri"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP kuwezeshwa"
 
@@ -887,10 +983,6 @@ msgid "Antialiasing:"
 msgstr "Antialiasing:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Je, una hakika upya ulimwengu wako singleplayer?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -898,10 +990,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr "Kichujio bilinear"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Mapema ramani"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Badilisha funguo"
@@ -915,11 +1003,6 @@ msgid "Fancy Leaves"
 msgstr "Majani ya dhana"
 
 #: builtin/mainmenu/tab_settings.lua
-#, fuzzy
-msgid "Generate Normal Maps"
-msgstr "Kuzalisha normalmaps"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mipmap"
 
@@ -928,10 +1011,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mipmap + Aniso. Kichujio"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "La"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Kichujio hakuna"
 
@@ -959,19 +1038,11 @@ msgstr "Majani opaque"
 msgid "Opaque Water"
 msgstr "Maji opaque"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Parallax Occlusion"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Chembe"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Weka upya singleplayer ulimwengu"
-
-#: builtin/mainmenu/tab_settings.lua
 #, fuzzy
 msgid "Screen:"
 msgstr "Screenshot"
@@ -985,6 +1056,11 @@ msgid "Shaders"
 msgstr "Shaders"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Kiwango cha maji"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -1030,22 +1106,6 @@ msgstr "Waving fundo"
 msgid "Waving Plants"
 msgstr "Waving mimea"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Ndio"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Mods Now"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Kuu"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Kuanza Singleplayer"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Muunganisho limekatika."
@@ -1220,18 +1280,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Vidhibiti vya chaguo-msingi:\n"
 "-WASD: hoja\n"
@@ -1347,16 +1404,6 @@ msgid "Fog enabled"
 msgstr "kuwezeshwa"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Walemavu"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "kuwezeshwa"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1379,16 +1426,6 @@ msgid "KiB/s"
 msgstr "Kibu/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Walemavu"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Uharibifu kuwezeshwa"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Vyombo vya habari..."
 
@@ -1401,35 +1438,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Minimap hidden"
-msgstr "Ufunguo wa minimap"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1476,10 +1484,6 @@ msgid "Resolving address..."
 msgstr "Kusuluhisha anwani..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Respawn"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Inazima..."
 
@@ -1534,10 +1538,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Umekufa."
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1555,15 +1555,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Ufunguo wa mazungumzo"
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1852,6 +1843,26 @@ msgstr "X kitufe 2"
 msgid "Zoom"
 msgstr "Kuza"
 
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap hidden"
+msgstr "Ufunguo wa minimap"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Unamu wa kima cha chini cha ukubwa wa Vichujio"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "MaNenotambulishi hayaoani!"
@@ -1893,26 +1904,6 @@ msgid "Backward"
 msgstr "Nyuma"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
 msgid "Change camera"
 msgstr "Badilisha funguo"
@@ -2012,31 +2003,11 @@ msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Special Inv."
-msgstr "Zawadi muhimu"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Togoa Cinematic"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Togoa Cinematic"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle HUD"
 msgstr "Togoa kuruka"
 
 #: src/gui/guiKeyChangeMenu.cpp
 #, fuzzy
-msgid "Toggle Killaura"
-msgstr "Togoa kuruka"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
 msgid "Toggle chat log"
 msgstr "Togoa haraka"
 
@@ -2158,14 +2129,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = parallax occlusion na taarifa ya mteremko (haraka).\n"
-"1 = ramani ya misaada (polepole, sahihi zaidi)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2285,6 +2248,10 @@ msgid "ABM interval"
 msgstr "Ramani hifadhi muda"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Kikomo halisi ya foleni ya emerge"
@@ -2540,10 +2507,6 @@ msgid "Builtin"
 msgstr "Pamoja"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Bumpmapping"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2621,16 +2584,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "Ukubwa wa fonti"
@@ -2794,6 +2747,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "Kuendelea"
@@ -2856,7 +2813,10 @@ msgid "Crosshair alpha"
 msgstr "Crosshair Alfa"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Crosshair Alfa (opaqueness kati ya 0 na 255)."
 
 #: src/settings_translation_file.cpp
@@ -2864,8 +2824,10 @@ msgid "Crosshair color"
 msgstr "Rangi ya crosshair"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Rangi ya crosshair (R, G, B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2972,14 +2934,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Inafasili hatua ya sampuli ya unamu.\n"
-"Thamani ya juu zaidi matokeo katika ramani ya laini ya kawaida."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -3055,6 +3009,11 @@ msgstr "Desynchronize umbo la uhuishaji"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
+msgid "Dig key"
+msgstr "Ufunguo sahihi"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Digging particles"
 msgstr "Chembe"
 
@@ -3117,7 +3076,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3223,17 +3182,6 @@ msgid "Enables animation of inventory items."
 msgstr "Huwezesha uhuishaji wa vitu inventering."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Inawezesha bumpmapping kwa ajili ya unamu. Normalmaps haja iwekwe kwa pakiti "
-"ya unamu au haja ya kuwa yaliyozalishwa na otomatiki.\n"
-"Inahitaji shaders kwa kuwezeshwa."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Huwezesha uwekaji kache kwa facedir Iliyozungushwa meshes."
 
@@ -3243,22 +3191,6 @@ msgstr "Inawezesha minimap."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Huwezesha kwenye kizazi cha normalmap kuruka (Emboss athari).\n"
-"Inahitaji bumpmapping kwa kuwezeshwa."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Huwezesha parallax occlusion uramanishi.\n"
-"Inahitaji shaders kwa kuwezeshwa."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3275,14 +3207,6 @@ msgstr "Mbinu ya chombo"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Chaguo majaribio, inaweza kusababisha nafasi inayoonekana kati ya vitalu "
-"wakati kuweka namba ya juu zaidi kuliko 0."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3292,8 +3216,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "Ramprogrammen katika Menyu ya mapumziko"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "Ramprogrammen juu wakati mchezo umesitishwa."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3627,10 +3552,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "GUI kipimo Kichujio txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Kuzalisha normalmaps"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Callbacks ya kimataifa"
 
@@ -3696,8 +3617,8 @@ msgstr "HUD kibonye"
 #, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "Utunzaji kwa deprecated lua ya API: - Rithi: (jaribu kwa) mimic zamani tabia "
@@ -4220,6 +4141,10 @@ msgid "Joystick button repetition interval"
 msgstr "Kifimbocheza kitufe marudio nafasi"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Kifimbocheza frustum unyeti"
 
@@ -4319,6 +4244,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kuruka.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4466,6 +4402,17 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Muhimu kwa ajili ya kuruka.\n"
+"Ona http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -5249,11 +5196,6 @@ msgid "Main menu script"
 msgstr "Hati ya Menyu kuu"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "Hati ya Menyu kuu"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5269,6 +5211,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Orodha ya ramani"
 
@@ -5472,7 +5422,8 @@ msgid "Maximum FPS"
 msgstr "Ramprogrammen juu"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "Ramprogrammen juu wakati mchezo umesitishwa."
 
 #: src/settings_translation_file.cpp
@@ -5529,6 +5480,13 @@ msgstr ""
 "Seti kwa wazi kwa kiasi sahihi ili uweze kuchaguliwa moja kwa moja."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "Namba ya juu ya forceloaded mapblocks."
 
@@ -5783,14 +5741,6 @@ msgid "Noises"
 msgstr "Kila"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Sampuli ya Normalmaps"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Nguvu ya Normalmaps"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Idadi ya nyuzi emerge"
 
@@ -5819,10 +5769,6 @@ msgstr ""
 "(4096 = 100 MB, kama kanuni ya thumb)."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Idadi ya parallax occlusion Marudiorudio."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5848,35 +5794,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Upendeleo wa jumla wa parallax occlusion athari, kawaida kipimo/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Kipimo cha jumla ya parallax occlusion athari."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Parallax occlusion"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Parallax occlusion upendeleo"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Parallax occlusion Marudiorudio"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Parallax occlusion hali"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "Parallax occlusion wadogo"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5944,6 +5861,16 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Kuruka ufunguo"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "Bofya kulia marudio nafasi"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -6115,10 +6042,6 @@ msgid "Right key"
 msgstr "Ufunguo sahihi"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Bofya kulia marudio nafasi"
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "River channel depth"
 msgstr "Kina wa mto"
@@ -6425,6 +6348,19 @@ msgid "Show entity selection boxes"
 msgstr "Onyesha chombo masanduku ya uteuzi"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Seti lugha. Acha tupu kwa kutumia lugha ya mfumo.\n"
+"Kuanza upya inahitajika baada ya kubadilisha hii."
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Uzimaji ujumbe"
 
@@ -6569,10 +6505,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "Nguvu ya parallax."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Nguvu ya normalmaps inayozalishwa."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6677,6 +6609,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6743,8 +6679,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6777,6 +6713,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6786,9 +6728,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 "Wakati katika sekunde inachukua kati ya vibonyezo mara kwa mara sahihi "
 "wakati wa kufanya kitufe cha kulia."
@@ -6939,6 +6880,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Tumia uchujaji trilinear wakati upimaji unamu."
 
@@ -7181,6 +7133,12 @@ msgstr ""
 "katika."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr "Kama fundo unamu uhuishaji lazima desynchronized kwa mapblock."
 
@@ -7313,6 +7271,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL muda wa upakuzi wa faili"
 
@@ -7324,24 +7300,12 @@ msgstr "cURL kikomo sambamba"
 msgid "cURL timeout"
 msgstr "muda wa kuisha wa cURL"
 
-#~ msgid "Ok"
-#~ msgstr "Sawa kabisa"
-
-#~ msgid "Back"
-#~ msgstr "Nyuma"
-
-#, fuzzy
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "Inapakua $1, Tafadhali subiri..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Kikomo ya foleni emerge kwenye diski"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Parallax occlusion nguvu"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Njia ya kuokoa viwambo katika."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = parallax occlusion na taarifa ya mteremko (haraka).\n"
+#~ "1 = ramani ya misaada (polepole, sahihi zaidi)."
 
 #, fuzzy
 #~ msgid ""
@@ -7352,26 +7316,99 @@ msgstr "muda wa kuisha wa cURL"
 #~ "Rekebisha simbiko gamma kwa majedwali mwanga. Idadi ya chini ni mkali.\n"
 #~ "Kipimo hiki ni kwa ajili ya mteja tu na ni kupuuzwa na seva."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Je, una hakika upya ulimwengu wako singleplayer?"
+
+#~ msgid "Back"
+#~ msgstr "Nyuma"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Mapema ramani"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Bumpmapping"
+
+#~ msgid "Config mods"
+#~ msgstr "Mods Now"
+
+#~ msgid "Configure"
+#~ msgstr "Sanidi"
+
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr ""
 #~ "Vidhibiti vya upana wa vichuguu, thamani ndogo huunda vichuguu pana."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Rangi ya crosshair (R, G, B)."
+
 #, fuzzy
 #~ msgid "Darkness sharpness"
 #~ msgstr "Mwandishi ramani ziwa gorofa mwinuko"
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Inafasili hatua ya sampuli ya unamu.\n"
+#~ "Thamani ya juu zaidi matokeo katika ramani ya laini ya kawaida."
+
+#, fuzzy
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "Inapakua $1, Tafadhali subiri..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "Wezesha VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Inawezesha bumpmapping kwa ajili ya unamu. Normalmaps haja iwekwe kwa "
+#~ "pakiti ya unamu au haja ya kuwa yaliyozalishwa na otomatiki.\n"
+#~ "Inahitaji shaders kwa kuwezeshwa."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Huwezesha toni filmic ramani"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Huwezesha kwenye kizazi cha normalmap kuruka (Emboss athari).\n"
+#~ "Inahitaji bumpmapping kwa kuwezeshwa."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Huwezesha parallax occlusion uramanishi.\n"
+#~ "Inahitaji shaders kwa kuwezeshwa."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Chaguo majaribio, inaweza kusababisha nafasi inayoonekana kati ya vitalu "
+#~ "wakati kuweka namba ya juu zaidi kuliko 0."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "Ramprogrammen katika Menyu ya mapumziko"
+
 #~ msgid "Font shadow alpha (opaqueness, between 0 and 255)."
 #~ msgstr "Fonti kivuli Alfa (opaqueness kati ya 0 na 255)."
 
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#, fuzzy
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Kuzalisha normalmaps"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Kuzalisha normalmaps"
+
 #~ msgid "IPv6 support."
 #~ msgstr "IPv6 msaada."
 
@@ -7379,26 +7416,100 @@ msgstr "muda wa kuisha wa cURL"
 #~ msgid "Lava depth"
 #~ msgstr "Kina ya pango kubwa"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Kikomo ya foleni emerge kwenye diski"
+
+#~ msgid "Main"
+#~ msgstr "Kuu"
+
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "Hati ya Menyu kuu"
+
+#~ msgid "Name/Password"
+#~ msgstr "Jina/nenosiri"
+
+#~ msgid "No"
+#~ msgstr "La"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Sampuli ya Normalmaps"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Nguvu ya Normalmaps"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Idadi ya parallax occlusion Marudiorudio."
+
+#~ msgid "Ok"
+#~ msgstr "Sawa kabisa"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "Upendeleo wa jumla wa parallax occlusion athari, kawaida kipimo/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Kipimo cha jumla ya parallax occlusion athari."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax Occlusion"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Parallax occlusion"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Parallax occlusion upendeleo"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Parallax occlusion Marudiorudio"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Parallax occlusion hali"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Parallax occlusion wadogo"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Parallax occlusion nguvu"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "Njia ya TrueTypeFont au vitone michoro."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Njia ya kuokoa viwambo katika."
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Weka upya singleplayer ulimwengu"
+
+#, fuzzy
+#~ msgid "Select Package File:"
+#~ msgstr "Teua faili ya Moduli:"
+
 #, fuzzy
 #~ msgid "Shadow limit"
 #~ msgstr "Kikomo cha Mapblock"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Kuanza Singleplayer"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Nguvu ya normalmaps inayozalishwa."
+
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Fonti hii itatumika kwa lugha fulani."
 
-#~ msgid "Waving water"
-#~ msgstr "Waving maji"
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Togoa Cinematic"
 
 #~ msgid "Waving Water"
 #~ msgstr "Waving maji"
 
+#~ msgid "Waving water"
+#~ msgstr "Waving maji"
+
 #, fuzzy
 #~ msgid "Y of upper limit of lava in large caves."
 #~ msgstr "Y ya upper kikomo ya kubwa pseudorandom cellars."
 
-#, fuzzy
-#~ msgid "Select Package File:"
-#~ msgstr "Teua faili ya Moduli:"
+#~ msgid "Yes"
+#~ msgstr "Ndio"
diff --git a/po/th/minetest.po b/po/th/minetest.po
index 9d14d6783..06e322f79 100644
--- a/po/th/minetest.po
+++ b/po/th/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thai (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: 2020-07-08 08:41+0000\n"
 "Last-Translator: TZTarzan <khunsatyptiphan@gmail.com>\n"
 "Language-Team: Thai <https://hosted.weblate.org/projects/minetest/minetest/"
@@ -14,6 +14,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "เ�ิดใหม่"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "คุณตาย�ล้ว"
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -39,10 +47,6 @@ msgstr "เชื่อมต่อใหม่"
 msgid "The server has requested a reconnect:"
 msgstr "เซิร์ฟเวอร์ได้ร้องขอ�ารเชื่อมต่อใหม่:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "�ำลังโหลด..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "เวอร์ชันโปรโทคอลไม่ตรง�ัน "
@@ -56,10 +60,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "เซิร์ฟเวอร์ที่สนับสนุนเวอร์ชันโพรโทคอลระหว่าง $1 �ละ $2 "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "ลองเปิดใช้งานเซิร์ฟเวอร์ลิสต์สาธารณะอี�ครั้ง�ละตรวจสอบ�ารเชื่อมต่ออินเทอร์เน็ต"
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "เราสนับสนุนโพรโทคอลเวอร์ชัน $1 เท่านั้น"
 
@@ -67,7 +67,8 @@ msgstr "เราสนับสนุนโพรโทคอลเวอร์
 msgid "We support protocol versions between version $1 and $2."
 msgstr "เราสนับสนุนโพรโทคอลระหว่างเวอร์ชัน $1 �ละ $2"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -77,7 +78,8 @@ msgstr "เราสนับสนุนโพรโทคอลระหว่
 msgid "Cancel"
 msgstr "ย�เลิ�"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "ไฟล์อ้างอิง:"
 
@@ -154,14 +156,55 @@ msgid "enabled"
 msgstr "เปิดใช้งาน�ล้ว"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "โหลด ..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "�พคเ�จทั้งหมด"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "คีย์ใช้"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "�ลับไปยังเมนูหลั�"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "โฮสต์เ�ม"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -184,6 +227,16 @@ msgid "Install"
 msgstr "ติดตั้ง"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "ติดตั้ง"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "ไฟล์อ้างอิงที่เลือ�ใช้ได้:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "ม็อด"
@@ -197,9 +250,26 @@ msgid "No results"
 msgstr "ไม่มีผลลัพธ์"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "ค้นหา"
+#, fuzzy
+msgid "No updates"
+msgstr "อัปเดต"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Not found"
+msgstr "ปิดเสียง"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -214,7 +284,11 @@ msgid "Update"
 msgstr "อัปเดต"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -470,11 +544,6 @@ msgid "Browse"
 msgstr "เรีย�ดู"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "ไคลเอนต์"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "ปิด�ารใช้งาน�ล้ว"
 
@@ -521,6 +590,10 @@ msgid "Scale"
 msgstr "ขนาด"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "ค้นหา"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "เลือ�ไดเร�ทอรี"
 
@@ -635,6 +708,19 @@ msgstr "ไม่สามารถติดตั้ง mod  $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "ไม่สามารถติดตั้ง modpack ที่ $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "�ำลังโหลด..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "�ารเขียนสคริปต์�ั่งไคลเอ็นต์ถู�ปิดใช้งาน"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "ลองเปิดใช้งานเซิร์ฟเวอร์ลิสต์สาธารณะอี�ครั้ง�ละตรวจสอบ�ารเชื่อมต่ออินเทอร์เน็ต"
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "เรีย�ดูเนื้อหาออนไลน์"
@@ -688,7 +774,14 @@ msgid "Credits"
 msgstr "เครดิต"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "เลือ�ไดเร�ทอรี"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -708,14 +801,10 @@ msgid "Bind Address"
 msgstr "ผู�ที่อยู่"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "�ำหนดค่า"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "โหมดสร้างสรรค์"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "เปิดใช้งานความเสียหาย"
 
@@ -732,8 +821,8 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "ชื่อ/รหัสผ่าน"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -744,6 +833,11 @@ msgid "No world created or selected!"
 msgstr "ยังไม่มี�ารสร้างโล� หรือยังไม่ได้เลือ�!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "รหัสผ่านใหม่"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "เล่นเ�ม"
 
@@ -752,6 +846,11 @@ msgid "Port"
 msgstr "พอร์ต"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "เลือ�โล�:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "เลือ�โล�:"
 
@@ -767,23 +866,23 @@ msgstr "เริ่มเ�ม"
 msgid "Address / Port"
 msgstr "ที่อยู่ / พอร์ต"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "เชื่อมต่อ"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "โหมดสร้างสรรค์"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "ความเสียหาย ที่เปิดใช้งาน"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "ลบราย�ารโปรด"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "ชื่นชอบ"
 
@@ -791,16 +890,16 @@ msgstr "ชื่นชอบ"
 msgid "Join Game"
 msgstr "เข้าร่วมเ�ม"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "ชื่อ / รหัสผ่าน"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "เวลาตอบสนอง"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "PvP เปิดใช้งาน"
 
@@ -829,10 +928,6 @@ msgid "Antialiasing:"
 msgstr "ลบรอยหยั�:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "�ารตั้งค่าของคุณโล� singleplayer �น่ใจหรือไม่?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "ขนาดหน้าจอบันทึ�อัตโนมัติ"
 
@@ -840,10 +935,6 @@ msgstr "ขนาดหน้าจอบันทึ�อัตโนมัต
 msgid "Bilinear Filter"
 msgstr "�รอง bilinear"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "�าร�ม็ป ชน"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "เปลี่ยนคีย์"
@@ -857,10 +948,6 @@ msgid "Fancy Leaves"
 msgstr "ใบไม้"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "สร้าง�ผนที่ป�ติ"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "�ผนที่ย่อ"
 
@@ -869,10 +956,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "�ผนที่ย่อ + Aniso.�รอง"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "ไม่"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "ไม่มีตัว�รอง"
 
@@ -900,20 +983,11 @@ msgstr "ใบทึบ"
 msgid "Opaque Water"
 msgstr "น้ำขุ่น"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax Occlusion"
-msgstr "Parallax อุดตัน"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "อนุภาค"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "รีเซ็ต singleplayer โล�"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "หน้าจอ:"
 
@@ -928,6 +1002,11 @@ msgstr "Shaders"
 
 #: builtin/mainmenu/tab_settings.lua
 #, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Shaders (ไม่พร้อมใช้งาน)"
+
+#: builtin/mainmenu/tab_settings.lua
+#, fuzzy
 msgid "Shaders (unavailable)"
 msgstr "Shaders (ไม่พร้อมใช้งาน)"
 
@@ -973,22 +1052,6 @@ msgstr "โบ�โหนด"
 msgid "Waving Plants"
 msgstr "โบ�ไม้"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "ใช่"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "�ำหนดค่าวัยรุ่น"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "หลั�"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "เริ่มเล่นเดี่ยว"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "�ารเชื่อมต่อหมดเวลา"
@@ -1152,18 +1215,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "�ารควบคุม:\n"
 "-%s1: เลื่อนไปข้างหน้า\n"
@@ -1277,16 +1337,6 @@ msgid "Fog enabled"
 msgstr "หมอ�เปิดใช้งาน"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "หมอ�ปิด�ารใช้งาน"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "หมอ�เปิดใช้งาน"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "ข้อมูลเ�ม:"
 
@@ -1307,16 +1357,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "หมอ�ปิด�ารใช้งาน"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "ความเสียหาย ที่เปิดใช้งาน"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "สื่อ..."
 
@@ -1329,37 +1369,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "�ผนที่ย่อในปัจจุบันถู�ปิดใช้งานโดยเ�มหรือตัวดัด�ปลง"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "�ผนที่ย่อซ่อนอยู่"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "�ผนที่ย่อในโหมดเรดาร์, ซูม x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "�ผนที่ย่อในโหมดเรดาร์, ซูม x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "�ผนที่ย่อในโหมดเรดาร์, ซูม x4"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "�ผนที่ย่อในโหมด surface, ซูม x1"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "�ผนที่ย่อในโหมด surface, ซูม x2"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "�ผนที่ย่อในโหมด surface, ซูม x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "ปิดใช้งานโหมด Noclip"
 
@@ -1405,10 +1414,6 @@ msgid "Resolving address..."
 msgstr "�าร��้ไขที่อยู่..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "เ�ิดใหม่"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "ปิด..."
 
@@ -1461,10 +1466,6 @@ msgid "Wireframe shown"
 msgstr "�สดงโครงลวด"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "คุณตาย�ล้ว"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "ซูมถู�ปิดใช้งานในปัจจุบันโดยเ�มหรือตัวดัด�ปลง"
 
@@ -1482,16 +1483,6 @@ msgstr "สนทนา�สดง"
 
 #: src/client/gameui.cpp
 #, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "สนทนาซ่อนอยู่"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "สนทนา�สดง"
-
-#: src/client/gameui.cpp
-#, fuzzy
 msgid "HUD hidden"
 msgstr "ผิวที่ซ่อน"
 
@@ -1794,6 +1785,25 @@ msgstr "X ปุ่ม 2"
 msgid "Zoom"
 msgstr "ซูม"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "�ผนที่ย่อซ่อนอยู่"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "�ผนที่ย่อในโหมดเรดาร์, ซูม x1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "�ผนที่ย่อในโหมด surface, ซูม x1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "ขนาดพื้นผิวขั้นต่ำ"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "รหัสผ่านไม่ตรง�ับ!"
@@ -1838,26 +1848,6 @@ msgid "Backward"
 msgstr "ย้อนหลัง"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "เปลี่ยน�ล้อง"
 
@@ -1950,30 +1940,10 @@ msgid "Special"
 msgstr "พิเศษ"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "พิเศษ"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "สลับโรงภาพยนตร์"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "สลับโรงภาพยนตร์"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "สลับ HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "สลับบิน"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "บันทึ�สนทนาสลับ"
 
@@ -2088,14 +2058,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = �ารบดบังพารัล�ล�ซ์พร้อมข้อมูลความชัน (เร็ว�ว่า)\n"
-"1 = �ารทำ�ผนที่นูน (ช้า�ว่า�ม่นยำ�ว่า)"
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2215,6 +2177,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2460,11 +2426,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Bumpmapping"
-msgstr "Bumpmapping"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2539,16 +2500,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "ขนาดตัวอั�ษร"
@@ -2703,6 +2654,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2761,7 +2716,10 @@ msgid "Crosshair alpha"
 msgstr "Crosshair อัลฟา"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "Crosshair อัลฟา (ความทึบ�สงระหว่าง 0 ถึง 255)."
 
 #: src/settings_translation_file.cpp
@@ -2769,8 +2727,10 @@ msgid "Crosshair color"
 msgstr "สีของครอส�ฮร์"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "สีของครอส�ฮร์ (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2872,14 +2832,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"�ำหนดขั้นตอน�ารสุ่มตัวอย่างของพื้นผิว\n"
-"ค่าที่สูง�ว่าจะทำให้�ผนที่ป�ติราบรื่นขึ้น"
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2952,6 +2904,11 @@ msgid "Desynchronize block animation"
 msgstr "Desynchronize บล็อ�ภาพเคลื่อนไหว"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "ปุ่มขวา"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "ขุดอนุภาค"
 
@@ -3014,7 +2971,8 @@ msgid "Enable console window"
 msgstr "เปิดใช้งานหน้าต่างคอนโซล"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "เปิดใช้งานโหมดสร้างสรรค์สำหรับ�ผนที่ที่สร้างขึ้นใหม่."
 
 #: src/settings_translation_file.cpp
@@ -3117,17 +3075,6 @@ msgid "Enables animation of inventory items."
 msgstr "เปิดใช้งานภาพเคลื่อนไหวของราย�ารสินค้าคงคลัง."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"เปิดใช้งาน�าร�มป bump สำหรับพื้นผิว �ผนที่ป�ติจะต้องมี�ารจัดหาโดย�พ็คพื้นผิว\n"
-"หรือจำเป็นต้องสร้างขึ้นอัตโนมัติ\n"
-"ต้องมี shaders เพื่อเปิดใช้งาน"
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "เปิดใช้งาน�าร�คชของตาข่ายที่หมุนได้."
 
@@ -3137,22 +3084,6 @@ msgstr "เปิดใช้งานย่อ�ผนที่."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"เปิดใช้งาน�ารสร้าง�ผนที่ป�ติ�บบลอยตัว (เอฟเฟ�ต์นูน)\n"
-"ต้องมี�ารเปิดใช้งาน bumpmapping"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"เปิดใช้งาน�าร�มป�ารบดเคี้ยวของรัล�ล�ซ์\n"
-"ต้องมี shaders เพื่อเปิดใช้งาน"
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3169,14 +3100,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"ตัวเลือ��ารทดลองอาจทำให้เ�ิดช่องว่างระหว่างบล็อ�\n"
-"เมื่อตั้งค่าเป็นจำนวนที่สูง�ว่า 0"
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3186,8 +3109,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "FPS ในเมนูหยุดชั่วคราว"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "FPS สูงสุดเมื่อเ�มหยุดชั่วคราว"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -3500,10 +3424,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "ตัว�รอง�ารปรับขนาด GUI txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "สร้าง�ผนที่ป�ติ"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3559,8 +3479,8 @@ msgstr "ปุ่มสลับ HUD"
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -4039,6 +3959,11 @@ msgid "Joystick button repetition interval"
 msgstr "ช่วงเวลา�ารทำซ้ำปุ่มจอยสติ๊�"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "ประเภทของจอยสติ๊�"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "ความไวของจอยสติ๊� frustum"
 
@@ -4124,6 +4049,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"�ุ��จสำหรับ�าร�ระโดด.\n"
+"ดู http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4266,6 +4202,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"�ุ��จสำหรับ�าร�ระโดด.\n"
+"ดู http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4996,10 +4943,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5014,6 +4957,14 @@ msgid "Makes all liquids opaque"
 msgstr "ทำให้ของเหลวทั้งหมดขุ่น"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "ไดเร�ทอรี�ผนที่"
 
@@ -5177,7 +5128,8 @@ msgid "Maximum FPS"
 msgstr "FPS สูงสุด"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "FPS สูงสุดเมื่อเ�มหยุดชั่วคราว"
 
 #: src/settings_translation_file.cpp
@@ -5229,6 +5181,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5474,14 +5433,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "�ารสุ่มตัวอย่าง Normalmaps"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Normalmaps �ข็ง�รง"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5507,10 +5458,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "จำนวน�ารวนซ้ำของ�ารปิด�ั้น parallax"
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5536,34 +5483,6 @@ msgid ""
 msgstr "เปิดเมนูหยุดชั่วคราวเมื่อโฟ�ัสของหน้าต่างหายไป ไม่หยุดถ้า formspec คือ เปิด."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "ความเอนเอียงโดยรวมของเอฟเฟ็�ต์�ารบดเคี้ยวของ Parallax มั�เป็นสเ�ล / 2"
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "ขนาดโดยรวมของผล�ารบดเคี้ยวของรัล�ล�ซ์"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "�ารบดเคี้ยวของ Parallax"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "อคติ�ารบดเคี้ยวของ Parallax"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "�ารวนซ้ำของ Parallax"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "โหมด�ารบดเคี้ยวของ Parallax"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "ขนาด�ารบดเคี้ยวของ Parallax"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5629,6 +5548,16 @@ msgid "Pitch move mode"
 msgstr "โหมดย้ายสนาม"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "ปุ่ม Fly"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "�ระ�ท�ซ้ำช่วง"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5795,10 +5724,6 @@ msgid "Right key"
 msgstr "ปุ่มขวา"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "�ระ�ท�ซ้ำช่วง"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -6072,6 +5997,16 @@ msgid "Show entity selection boxes"
 msgstr "�สดง�ล่อง�ารเลือ�เอนทิตี"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "ข้อความปิดเครื่อง"
 
@@ -6214,10 +6149,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "ความ�ข็ง��ร่งของพารัล�ล�ซ์"
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "ความ�ข็ง��ร่งของ�ผนที่ป�ติที่สร้างขึ้น"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6317,6 +6248,11 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "The deadzone of the joystick"
+msgstr "ตัวระบุของจอยสติ๊�ที่จะใช้"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6372,13 +6308,14 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "The rendering back-end for Irrlicht.\n"
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "�าร�สดงผล�บ็�เอนด์สำหรับ Irrlicht\n"
 "จำเป็นต้องรีสตาร์ทหลังจา�เปลี่ยนสิ่งนี้\n"
@@ -6415,6 +6352,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6422,10 +6365,10 @@ msgstr ""
 "เมื่อ�ดปุ่มจอยสติ๊�ค้างไว้"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr "วินาทีเวลาใช้ระหว่าง�ารซ้ำขวาเมื่อ�ดปุ่มเมาส์ขวา"
 
 #: src/settings_translation_file.cpp
@@ -6577,6 +6520,17 @@ msgstr ""
 "ไม่รองรับ�ารลดขนาด��มมา��มมาที่ถู�ต้อง"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "ใช้�าร�รอง trilinear เมื่อปรับขนาดพื้นผิว"
 
@@ -6806,6 +6760,12 @@ msgstr ""
 "หา�ปิดใช้งาน ฟอนต์บิต�มป�ละเอ็�ซ์เอ็ม�อลเว�เตอร์จะใช้�ทน"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr "ระบุว่าควรสร้าง�ารซิงโครไนซ์ภาพเคลื่อนไหวพื้นผิวของโหนดต่อ�ม็ปบล็อ�หรือไม่"
 
@@ -6942,6 +6902,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6953,20 +6931,12 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "ต�ลง"
-
-#~ msgid "Back"
-#~ msgstr "หลัง"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "ดาวน์โหลด �ละติดตั้ง $1 �รุณารอสั�ครู่..."
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "�ำลังบดเคี้ยวของ Parallax"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "พา ธ เพื่อบันทึ�ภาพหน้าจอที่ ..."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = �ารบดบังพารัล�ล�ซ์พร้อมข้อมูลความชัน (เร็ว�ว่า)\n"
+#~ "1 = �ารทำ�ผนที่นูน (ช้า�ว่า�ม่นยำ�ว่า)"
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -6976,41 +6946,194 @@ msgstr ""
 #~ "ปรับ�ารเข้ารหัส��มม่าสำหรับตาราง�สง ตัวเลขที่สูง�ว่านั้นจะสว่าง�ว่า\n"
 #~ "�ารตั้งค่านี้มีไว้สำหรับไคลเอ็นต์เท่านั้น�ละเซิร์ฟเวอร์จะเพิ�เฉย"
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "�ารตั้งค่าของคุณโล� singleplayer �น่ใจหรือไม่?"
+
+#~ msgid "Back"
+#~ msgstr "หลัง"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "�าร�ม็ป ชน"
+
+#, fuzzy
+#~ msgid "Bumpmapping"
+#~ msgstr "Bumpmapping"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "�ึ่ง�ลางของเส้นโค้ง�สง - �ลางเพิ่ม"
 
+#~ msgid "Config mods"
+#~ msgstr "�ำหนดค่าวัยรุ่น"
+
+#~ msgid "Configure"
+#~ msgstr "�ำหนดค่า"
+
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "สีของครอส�ฮร์ (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "ความมืดมิด"
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "�ำหนดขั้นตอน�ารสุ่มตัวอย่างของพื้นผิว\n"
+#~ "ค่าที่สูง�ว่าจะทำให้�ผนที่ป�ติราบรื่นขึ้น"
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "ดาวน์โหลด �ละติดตั้ง $1 �รุณารอสั�ครู่..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "ทำให้สามารถ VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "เปิดใช้งาน�าร�มป bump สำหรับพื้นผิว �ผนที่ป�ติจะต้องมี�ารจัดหาโดย�พ็คพื้นผิว\n"
+#~ "หรือจำเป็นต้องสร้างขึ้นอัตโนมัติ\n"
+#~ "ต้องมี shaders เพื่อเปิดใช้งาน"
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "เปิดใช้งาน�ารจับคู่โทนภาพยนตร์"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "เปิดใช้งาน�ารสร้าง�ผนที่ป�ติ�บบลอยตัว (เอฟเฟ�ต์นูน)\n"
+#~ "ต้องมี�ารเปิดใช้งาน bumpmapping"
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "เปิดใช้งาน�าร�มป�ารบดเคี้ยวของรัล�ล�ซ์\n"
+#~ "ต้องมี shaders เพื่อเปิดใช้งาน"
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "ตัวเลือ��ารทดลองอาจทำให้เ�ิดช่องว่างระหว่างบล็อ�\n"
+#~ "เมื่อตั้งค่าเป็นจำนวนที่สูง�ว่า 0"
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "FPS ในเมนูหยุดชั่วคราว"
+
 #~ msgid "Font shadow alpha (opaqueness, between 0 and 255)."
 #~ msgstr "ตัวอั�ษรเงาอัลฟา (ความทึบระหว่าง 0 �ละ 255)."
 
 #~ msgid "Gamma"
 #~ msgstr "��มมา"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "สร้าง�ผนที่ป�ติ"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "สร้าง�ผนที่ป�ติ"
+
 #~ msgid "Lightness sharpness"
 #~ msgstr "ความคมชัดของ�สง"
 
+#~ msgid "Main"
+#~ msgstr "หลั�"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "�ผนที่ย่อในโหมดเรดาร์, ซูม x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "�ผนที่ย่อในโหมดเรดาร์, ซูม x4"
+
+#, fuzzy
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "�ผนที่ย่อในโหมด surface, ซูม x2"
+
+#, fuzzy
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "�ผนที่ย่อในโหมด surface, ซูม x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "ชื่อ/รหัสผ่าน"
+
+#~ msgid "No"
+#~ msgstr "ไม่"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "�ารสุ่มตัวอย่าง Normalmaps"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Normalmaps �ข็ง�รง"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "จำนวน�ารวนซ้ำของ�ารปิด�ั้น parallax"
+
+#~ msgid "Ok"
+#~ msgstr "ต�ลง"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "ความเอนเอียงโดยรวมของเอฟเฟ็�ต์�ารบดเคี้ยวของ Parallax มั�เป็นสเ�ล / 2"
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "ขนาดโดยรวมของผล�ารบดเคี้ยวของรัล�ล�ซ์"
+
+#, fuzzy
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Parallax อุดตัน"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "�ารบดเคี้ยวของ Parallax"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "อคติ�ารบดเคี้ยวของ Parallax"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "�ารวนซ้ำของ Parallax"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "โหมด�ารบดเคี้ยวของ Parallax"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "ขนาด�ารบดเคี้ยวของ Parallax"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "�ำลังบดเคี้ยวของ Parallax"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "เส้นทาง�บบอั�ษร."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "พา ธ เพื่อบันทึ�ภาพหน้าจอที่ ..."
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "รีเซ็ต singleplayer โล�"
+
+#~ msgid "Select Package File:"
+#~ msgstr "เลือ��ฟ้ม�พคเ�จ:"
+
+#~ msgid "Start Singleplayer"
+#~ msgstr "เริ่มเล่นเดี่ยว"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "ความ�ข็ง��ร่งของ�ผนที่ป�ติที่สร้างขึ้น"
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "ความ�ข็ง�รงของ�สงโค้ง�ลาง - เพิ่ม"
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "�บบอั�ษรนี้จะใช้สำหรับบางภาษา"
 
-#~ msgid "Waving water"
-#~ msgstr "โบ�น้ำ"
+#~ msgid "Toggle Cinematic"
+#~ msgstr "สลับโรงภาพยนตร์"
 
 #~ msgid "Waving Water"
 #~ msgstr "น้ำโบ�"
 
-#~ msgid "Select Package File:"
-#~ msgstr "เลือ��ฟ้ม�พคเ�จ:"
+#~ msgid "Waving water"
+#~ msgstr "โบ�น้ำ"
+
+#~ msgid "Yes"
+#~ msgstr "ใช่"
diff --git a/po/tr/minetest.po b/po/tr/minetest.po
index f3c363cb0..a2311124b 100644
--- a/po/tr/minetest.po
+++ b/po/tr/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Turkish (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-15 22:41+0000\n"
-"Last-Translator: monolifed <monolifed@protonmail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-02-13 08:50+0000\n"
+"Last-Translator: OÄŸuz Ersen <oguzersen@protonmail.com>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/minetest/"
 "minetest/tr/>\n"
 "Language: tr\n"
@@ -12,7 +12,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.1\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Yeniden Canlan"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Öldün"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -38,10 +46,6 @@ msgstr "BaÄŸlan"
 msgid "The server has requested a reconnect:"
 msgstr "Bu sunucu yeniden baÄŸlanma isteÄŸinde bulundu:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Yükleniyor..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Protokol sürümü uyumsuz. "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Bu sunucu $1 ve $2 arası tüm protokol sürümlerini destekler. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Açık sunucu listesini tekrar etkinleştirmeyi deneyin ve internet "
-"bağlantınızı doğrulayın."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Yalnızca $1 protokol sürümü desteklenmektedir."
 
@@ -68,7 +66,8 @@ msgstr "Yalnızca $1 protokol sürümü desteklenmektedir."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Yalnızca $1 ve $2 arası protokol sürümleri desteklenmektedir."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Yalnızca $1 ve $2 arası protokol sürümleri desteklenmektedir."
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Bağımlılıklar:"
 
@@ -152,14 +152,54 @@ msgid "enabled"
 msgstr "etkin"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr "\"$1\" zaten var.DeÄŸiÅŸtirilsin mi?"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr "$ 1 ve $ 2 destek dosyaları yüklenecek."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr "$1 'e $2"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+"$1 indiriliyor,\n"
+"$2 sırada"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 downloading..."
+msgstr "$1 indiriliyor..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr "$1 için destek dosyaları bulanamadı."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr "$1 indirilecek, ve $2 destek dosyaları atlanacak."
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Tüm paketler"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr "Zaten kuruldu"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "Ana Menüye Dön"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr "Yerel oyun:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr "Minetest cURL'siz derlediğinde ContentDB kullanılamaz"
 
@@ -181,6 +221,14 @@ msgid "Install"
 msgstr "Kur"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr "$1 kur"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install missing dependencies"
+msgstr "Eksik bağımlılıkları kur"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Modlar"
@@ -194,9 +242,24 @@ msgid "No results"
 msgstr "Sonuç yok"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Ara"
+msgid "No updates"
+msgstr "Güncelleme yok"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr "Bulunamadı"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr "Ãœzerine yaz"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr "Lütfen asıl oyunun doğru olup olmadığını gözden geçirin."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr "Sıraya alındı"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -211,8 +274,12 @@ msgid "Update"
 msgstr "Güncelle"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Görüntüle"
+msgid "Update All [$1]"
+msgstr "Hepsini güncelle [$1]"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr "Tarayıcı'da daha fazla bilgi edinin"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -466,11 +533,6 @@ msgid "Browse"
 msgstr "Gözat"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Ä°stemci"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Devre dışı"
 
@@ -515,6 +577,10 @@ msgid "Scale"
 msgstr "Boyut"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Ara"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "Dizin seç"
 
@@ -629,6 +695,21 @@ msgstr "Bir mod bir $1 olarak kurulamadı"
 msgid "Unable to install a modpack as a $1"
 msgstr "Bir mod paketi bir $1 olarak kurulamadı"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Yükleniyor..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "İstemci tarafı betik devre dışı"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Açık sunucu listesini tekrar etkinleştirmeyi deneyin ve internet "
+"bağlantınızı doğrulayın."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "Çevrim içi içeriğe göz at"
@@ -682,8 +763,16 @@ msgid "Credits"
 msgstr "Hakkında"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr "Kullanıcı Veri Dizinini Aç"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
+"Bir dosya yöneticisi / gezgininde kullanıcı tarafından sağlanan dünyaları,\n"
+"oyunları, modları ve doku paketlerini içeren dizini açar."
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Contributors"
@@ -702,14 +791,10 @@ msgid "Bind Address"
 msgstr "Bağlı Adres"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "Yapılandır"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "Yaratıcı Kip"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "Hasar Etkin"
 
@@ -726,8 +811,8 @@ msgid "Install games from ContentDB"
 msgstr "ContentDB'den oyunlar yükle"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Ad/Åžifre"
+msgid "Name"
+msgstr "Ad"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -738,6 +823,10 @@ msgid "No world created or selected!"
 msgstr "Dünya seçilmedi ya da yaratılmadı!"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr "Parola"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Oyunu Oyna"
 
@@ -746,6 +835,10 @@ msgid "Port"
 msgstr "Port"
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr "Mod seçin"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Dünya Seç:"
 
@@ -761,23 +854,23 @@ msgstr "Oyun BaÅŸlat"
 msgid "Address / Port"
 msgstr "Adres / Port"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "BaÄŸlan"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "Yaratıcı kip"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "Hasar etkin"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "Favoriyi Sil"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "Favori"
 
@@ -785,16 +878,16 @@ msgstr "Favori"
 msgid "Join Game"
 msgstr "Oyuna Katıl"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
-msgstr "Ad / Åžifre"
+msgstr "Ad / Parola"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "SavaÅŸ etkin"
 
@@ -823,10 +916,6 @@ msgid "Antialiasing:"
 msgstr "Düzgünleştirme:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Tek oyunculu dünyayı sıfırlamak istediğinizden emin misiniz ?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Ekran Boyutunu Hatırla"
 
@@ -834,10 +923,6 @@ msgstr "Ekran Boyutunu Hatırla"
 msgid "Bilinear Filter"
 msgstr "Bilineer Filtre"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Tümsek Eşleme"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Tuşları değiştir"
@@ -851,10 +936,6 @@ msgid "Fancy Leaves"
 msgstr "Şık Yapraklar"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Normal EÅŸlemeleri Ãœret"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mip eÅŸleme"
 
@@ -863,10 +944,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mip eÅŸleme + Aniso. Filtre"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "Hayır"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Filtre yok"
 
@@ -894,19 +971,11 @@ msgstr "Opak Yapraklar"
 msgid "Opaque Water"
 msgstr "Opak Su"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Paralaks Oklüzyon"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Parçacıklar"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Tek oyunculu dünyayı sıfırla"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Ekran:"
 
@@ -919,6 +988,10 @@ msgid "Shaders"
 msgstr "Gölgelemeler"
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr "Gölgelendirme (deneysel)"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Gölgelemeler (kullanılamaz)"
 
@@ -962,22 +1035,6 @@ msgstr "Dalgalanan Sıvılar"
 msgid "Waving Plants"
 msgstr "Dalgalanan Bitkiler"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Evet"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "Modları yapılandır"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Ana"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Tek oyunculu baÅŸlat"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Bağlantı zaman aşımına uğradı."
@@ -1032,7 +1089,7 @@ msgstr "Lütfen bir ad seçin!"
 
 #: src/client/clientlauncher.cpp
 msgid "Provided password file failed to open: "
-msgstr "Sağlanan şifre dosyası açılamadı: "
+msgstr "Sağlanan parola dosyası açılamadı: "
 
 #: src/client/clientlauncher.cpp
 msgid "Provided world path doesn't exist: "
@@ -1109,7 +1166,7 @@ msgstr "Kamera güncelleme etkin"
 
 #: src/client/game.cpp
 msgid "Change Password"
-msgstr "Åžifre deÄŸiÅŸtir"
+msgstr "Parola deÄŸiÅŸtir"
 
 #: src/client/game.cpp
 msgid "Cinematic mode disabled"
@@ -1132,25 +1189,22 @@ msgid "Continue"
 msgstr "Devam et"
 
 #: src/client/game.cpp
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Controls:\n"
 "- %s: move forwards\n"
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Kontroller:\n"
 "- %s: ileri hareket\n"
@@ -1158,12 +1212,12 @@ msgstr ""
 "- %s: sola hareket\n"
 "- %s: saÄŸa hareket\n"
 "- %s: zıpla/tırman\n"
+"- %s: kaz/vur\n"
+"- %s: yerleÅŸtir/kullan\n"
 "- %s: sız/aşağı in\n"
 "- %s: ögeyi at\n"
 "- %s: envanter\n"
 "- Fare: dön/bak\n"
-"- Sol fare: kaz/vur\n"
-"- SaÄŸ fare: yerleÅŸtir/kullan\n"
 "- Fare tekerleği: öge seç\n"
 "- %s: sohbet\n"
 
@@ -1264,16 +1318,6 @@ msgid "Fog enabled"
 msgstr "Sis etkin"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Sis devre dışı"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Sis etkin"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Oyun Bilgisi:"
 
@@ -1294,16 +1338,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Sis devre dışı"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Hasar etkin"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Medya..."
 
@@ -1316,34 +1350,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Mini harita şu anda, oyun veya mod tarafından devre dışı"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Mini harita gizli"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Radar kipinde mini harita, Yakınlaştırma x1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Radar kipinde mini harita, Yakınlaştırma x2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Radar kipinde mini harita, Yakınlaştırma x4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Yüzey kipinde mini harita, Yakınlaştırma x1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Yüzey kipinde mini harita, Yakınlaştırma x2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Yüzey kipinde mini harita, Yakınlaştırma x4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Hayalet kipi devre dışı"
 
@@ -1388,10 +1394,6 @@ msgid "Resolving address..."
 msgstr "Adres çözümleniyor..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Yeniden Canlan"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Kapatılıyor..."
 
@@ -1444,10 +1446,6 @@ msgid "Wireframe shown"
 msgstr "Telkafes gösteriliyor"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Öldün"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "Yakınlaştırma şu anda oyun veya mod tarafından devre dışı"
 
@@ -1464,16 +1462,6 @@ msgid "Chat shown"
 msgstr "Sohbet gösteriliyor"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Sohbet gizli"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Sohbet gösteriliyor"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD gizli"
 
@@ -1753,9 +1741,27 @@ msgstr "X Düğme 2"
 msgid "Zoom"
 msgstr "Yakınlaştır"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Mini harita gizli"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Radar kipinde mini harita, Yakınlaştırma x%d"
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Yüzey kipinde mini harita, Yakınlaştırma x%d"
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr "Doku kipinde mini harita"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
-msgstr "Şifreler aynı değil!"
+msgstr "Parolalar eÅŸleÅŸmiyor!"
 
 #: src/gui/guiConfirmRegistration.cpp
 msgid "Register and Join"
@@ -1773,7 +1779,7 @@ msgstr ""
 "Bu sunucuya \"%s\" adıyla ilk kez katılmak üzeresiniz.\n"
 "Devam ederseniz, kimlik bilgilerinizi kullanarak yeni bir hesap bu sunucuda "
 "oluÅŸturulur.\n"
-"Lütfen şifrenizi tekrar yazın ve hesap oluşturmayı onaylamak için 'Kayıt Ol "
+"Lütfen parolanızı tekrar yazın ve hesap oluşturmayı onaylamak için 'Kayıt Ol "
 "ve Katıl' düğmesini tıklayın veya iptal etmek için 'İptal'i tıklayın."
 
 #: src/gui/guiFormSpecMenu.cpp
@@ -1797,26 +1803,6 @@ msgid "Backward"
 msgstr "Geri"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Kamera deÄŸiÅŸtir"
 
@@ -1909,30 +1895,10 @@ msgid "Special"
 msgstr "Özel"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Özel"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Sinematik Aç/Kapa"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Sinematik Aç/Kapa"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "HUD'ı aç/kapa"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Uçmayı aç/kapa"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "Sohbet günlüğünü aç/kapa"
 
@@ -1970,15 +1936,15 @@ msgstr "DeÄŸiÅŸtir"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Confirm Password"
-msgstr "Şifreyi Doğrulayın"
+msgstr "Parolayı Doğrula"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "New Password"
-msgstr "Yeni Åžifre"
+msgstr "Yeni Parola"
 
 #: src/gui/guiPasswordChange.cpp
 msgid "Old Password"
-msgstr "Eski Åžifre"
+msgstr "Eski Parola"
 
 #: src/gui/guiVolumeChange.cpp
 msgid "Exit"
@@ -2062,14 +2028,6 @@ msgstr ""
 "içindir, kaba şekil için 3 sayıyı da eşit ayarlayın."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = eğim bilgili paralaks oklüzyon (daha hızlı).\n"
-"1 = kabartma eÅŸleme (daha yavaÅŸ, daha doÄŸru)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "Sırt dağların şeklini/boyutunu denetleyen 2D gürültü."
 
@@ -2196,6 +2154,10 @@ msgid "ABM interval"
 msgstr "ABM aralığı"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr "ABM zаman gideri"
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "Emerge için sıralanmış blokların mutlak sınırı"
 
@@ -2456,10 +2418,6 @@ msgid "Builtin"
 msgstr "YerleÅŸik"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Tümsek eşleme"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2538,21 +2496,6 @@ msgstr ""
 "0.0 minimum, 1.0 maksimum ışık seviyesidir."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"Ana Menü arayüzünü değiştirir:\n"
-"-   Full:  Çoklu tek oyunculu dünyalar, oyun seçimi, doku paketi seçici, "
-"vb.\n"
-"-   Simple: Bir tek oyunculu dünya, oyun veya doku paketi seçiciler yok.\n"
-"Küçük ekranlar için gerekli olabilir."
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr "Sohbet yazı tipi boyutu"
 
@@ -2716,6 +2659,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "ContentDB: Kara Liste"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr "ContentDB aşırı eşzamanlı indirmeler"
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "ContentDB URL"
 
@@ -2782,16 +2729,24 @@ msgid "Crosshair alpha"
 msgstr "Artı saydamlığı"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
-msgstr "Artı saydamlığı (solukluk, 0 ile 255 arasında)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Artı saydamlığı (solukluk, 0 ile 255 arasında).\n"
+"Ayrıca nesne artı rengini de denetler"
 
 #: src/settings_translation_file.cpp
 msgid "Crosshair color"
 msgstr "Artı rengi"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "Artı rengi (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
+"Artı rengi (R,G,B).\n"
+"Ayrıca nesne artı rengini de değiştirir"
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2843,7 +2798,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Default password"
-msgstr "Öntanımlı şifre"
+msgstr "Öntanımlı parola"
 
 #: src/settings_translation_file.cpp
 msgid "Default privileges"
@@ -2896,14 +2851,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "İsteğe bağlı tepelerin ve göllerin konumunu ve arazisini belirler."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"Dokuların örnekleme adımını tanımlar.\n"
-"Yüksek bir değer daha yumuşak normal eşlemeler verir."
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "Taban yer seviyesini belirler."
 
@@ -2984,6 +2931,10 @@ msgid "Desynchronize block animation"
 msgstr "Blok animasyonlarını eşzamansız yap"
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr "Kazma tuÅŸu"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Kazı parçacıkları"
 
@@ -2993,7 +2944,7 @@ msgstr "Hile önleme devre dışı"
 
 #: src/settings_translation_file.cpp
 msgid "Disallow empty passwords"
-msgstr "BoÅŸ ÅŸifrelere izin verme"
+msgstr "BoÅŸ parolalara izin verme"
 
 #: src/settings_translation_file.cpp
 msgid "Domain name of server, to be displayed in the serverlist."
@@ -3048,7 +2999,8 @@ msgid "Enable console window"
 msgstr "Konsol penceresini etkinleÅŸtir"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "Yeni yaratılan haritalar için yaratıcı kipi etkinleştir."
 
 #: src/settings_translation_file.cpp
@@ -3158,18 +3110,6 @@ msgid "Enables animation of inventory items."
 msgstr "Envanter ögelerinin animasyonunu etkinleştirir."
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Tümsek eşlemeyi dokular için etkinleştirir. Normal eşlemelerin doku paketi "
-"tarafından sağlanması\n"
-"veya kendiliğinden üretilmesi gerekir\n"
-"Gölgelemelerin etkin olmasını gerektirir."
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "Yüz yönü döndürülmüş kafeslerin önbelleklenmesini etkinleştirir."
 
@@ -3179,22 +3119,6 @@ msgstr "Mini haritayı etkinleştirir."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"Çalışma anı dikey eşleme üretimini (kabartma efekti) etkinleştirir.\n"
-"Tümsek eşlemenin etkin olmasını gerektirir."
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"Paralaks oklüzyon eşlemeyi etkinleştirir.\n"
-"Gölgelemelerin etkin olmasını gerektirir."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3215,14 +3139,6 @@ msgstr "Varlık yöntemleri"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"Deneysel seçenek, 0'dan daha büyük bir sayıya ayarlandığında\n"
-"bloklar arasında görünür boşluklara neden olabilir."
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3239,8 +3155,8 @@ msgstr ""
 "seviyesi oluşturur: katı bir yüzenkara katmanı için uygundur."
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "Duraklat menüsünde FPS"
+msgid "FPS when unfocused or paused"
+msgstr "Odaklanmadığında veya duraklatıldığında FPS"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3567,10 +3483,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "Arayüz boyutlandırma filtresi txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Normal eşlemeleri üret"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "Genel geri çağrılar"
 
@@ -3632,15 +3544,15 @@ msgstr "HUD açma/kapama tuşu"
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
-"Kullanım dışı lua API çağrılarının ele alınması:\n"
-"-    legacy: (eski) Eski davranış taklit etmeye çalışır (öntanımlı).\n"
-"-    log: (günlük) kullanım dışı çağrıları taklit eder ve günlükler (hata "
-"ayıklama için öntanımlı).\n"
-"-    error: (hata) kullanım dışı çağrıların kullanımını iptal eder (mod "
+"Kullanım dışı Lua API çağrılarının ele alınması:\n"
+"-    none: (yok) kullanım dışı çağrıları günlüğe kaydetmez.\n"
+"-    log: (günlük) kullanım dışı çağrıları taklit eder ve geri izlemesini "
+"günlüğe kaydeder (öntanımlı).\n"
+"-    error: (hata) kullanım dışı çağrılar kullanıldığında iptal eder (mod "
 "geliştiricileri için önerilen)."
 
 #: src/settings_translation_file.cpp
@@ -3996,7 +3908,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "If enabled, new players cannot join with an empty password."
-msgstr "Etkinleştirilirse, yeni oyuncular boş bir şifre ile katılamaz."
+msgstr "Etkinleştirilirse, yeni oyuncular boş bir parola ile katılamaz."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -4164,6 +4076,10 @@ msgid "Joystick button repetition interval"
 msgstr "Joystick düğmesi tekrarlama aralığı"
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr "Joystick ölü bölgesi"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "Joystick frustum duyarlılığı"
 
@@ -4267,6 +4183,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"Kazma tuÅŸu.\n"
+"Bakın: http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4409,6 +4335,16 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"YerleÅŸtirme tuÅŸu.\n"
+"Bakın: http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -5153,10 +5089,6 @@ msgid "Main menu script"
 msgstr "Ana menü betiği"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Ana menü stili"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -5174,6 +5106,14 @@ msgid "Makes all liquids opaque"
 msgstr "Tüm sıvıları opak yapar"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr "Hafıza deposu için harita sıkıştırma düzeyi"
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr "Ağ aktarma hızı için harita sıkıştırma düzeyi"
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Harita dizini"
 
@@ -5357,8 +5297,8 @@ msgid "Maximum FPS"
 msgstr "Maksimum FPS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
-msgstr "Oyun duraklatıldığında maksimum FPS."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
+msgstr "Pencere odaklanmadığında veya oyun duraklatıldığında en yüksek FPS."
 
 #: src/settings_translation_file.cpp
 msgid "Maximum forceloaded blocks"
@@ -5415,6 +5355,16 @@ msgstr ""
 "Bu sınır her oyuncu için zorunlu kılınır."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+"En yüksek eşzamanlı indirme sayısı.Bu sınırı aşan indirmeler sıraya "
+"alınacaktır.\n"
+"Bu curl_parallel_limit den daha az olmalıdır."
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "Zorla yüklenen harita bloklarının maksimum sayısı."
 
@@ -5645,7 +5595,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "New users need to input this password."
-msgstr "Yeni kullanıcıların bu şifreyi girmesi gerekir."
+msgstr "Yeni kullanıcıların bu parolayı girmesi gerekir."
 
 #: src/settings_translation_file.cpp
 msgid "Noclip"
@@ -5668,14 +5618,6 @@ msgid "Noises"
 msgstr "Gürültüler"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "Normal eşleme örnekleme"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "Normal eşleme gücü"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "Emerge iş sayısı"
 
@@ -5715,10 +5657,6 @@ msgstr ""
 "arasında bir dengedir."
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "Paralaks oklüzyon yineleme sayısı."
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "Çevrimiçi İçerik Deposu"
 
@@ -5749,34 +5687,6 @@ msgstr ""
 "duraklamaz."
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "Paralaks oklüzyon efektinin genel sapması, genellikle boyut/2."
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "Paralaks oklüzyon efektinin genel boyutu."
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Paralaks oklüzyon"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "Paralaks oklüzyon sapması"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "Paralaks oklüzyon yinelemesi"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "Paralaks oklüzyon kipi"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Paralaks oklüzyon boyutu"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5859,6 +5769,14 @@ msgid "Pitch move mode"
 msgstr "EÄŸim hareket kipi"
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr "YerleÅŸtirme tuÅŸu"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr "Yerleştirme tekrarlama aralığı"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -6043,10 +5961,6 @@ msgid "Right key"
 msgstr "SaÄŸ tuÅŸ"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "Sağ tık tekrarlama aralığı"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "Nehir kanal derinliÄŸi"
 
@@ -6342,6 +6256,19 @@ msgid "Show entity selection boxes"
 msgstr "Varlık seçim kutularını göster"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Varlık seçim kutularını göster.\n"
+"Bunu deÄŸiÅŸtirdikten sonra yeniden baÅŸlatma gerekir."
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "Öntanımlı kalın yazı tipi"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "Kapatma iletisi"
 
@@ -6493,10 +6420,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "3D kipi paralaksın gücü."
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "Üretilen normal eşlemelerin gücü."
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6617,6 +6540,10 @@ msgid "The URL for the content repository"
 msgstr "İçerik deposu için URL"
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr "Joystick ölü bölgesi"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6693,14 +6620,16 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 "Irrlicht için işleme arka ucu.\n"
-"Bunu deÄŸiÅŸtirdikten sonra tekrar baÅŸlatma gerekir.\n"
-"Not: Android'de, emin değilseniz OGLES1 kullanın! Başka türlü, uygulama\n"
-"başlayamayabilir. Diğer platformlarda, OpenGL önerilir ve şu anda gölgeleme\n"
-"desteği olan tek sürücüdür."
+"Bunu deÄŸiÅŸtirdikten sonra yeniden baÅŸlatma gerekir.\n"
+"Not: Android'de, emin değilseniz OGLES1 kullanın! Başka türlü, uygulama "
+"baÅŸlayamayabilir.\n"
+"Diğer platformlarda, OpenGL önerilir.\n"
+"Gölgelendiriciler OpenGL (yalnızca masaüstü) ve OGLES2 (deneysel) tarafından "
+"desteklenmektedir"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6736,6 +6665,14 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+"ABM'lerin her adımda yürütülmesi için izin verilen zaman gideri\n"
+"(ABM aralığının bir parçası olarak)"
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6744,13 +6681,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
-"Sağ fare tuşuna basılı tutarken tekrar eden sağ tıklar arasında saniye "
-"cinsinden\n"
-"geçen süre."
+"Yerleştirme tuşuna basılı tutarken tekrarlanan düğüm yerleşimleri arasında "
+"geçen\n"
+"saniye cinsinden süre."
 
 #: src/settings_translation_file.cpp
 msgid "The type of joystick"
@@ -6909,6 +6845,25 @@ msgstr ""
 "Gamma doğruluklu küçültme desteklenmez."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+"Öbek/Küme kenarlarını düzeltmek için çok örnekli düzgünleştirmeyi(anti-"
+"aliasing) kullanın.\n"
+"Bu işlem görüntüyü keskinleştirirken 3 boyutlu görüş alanını düzeltir.\n"
+"ama doku(texture) içindeki görüntüyü etkilemez.\n"
+"(Saydam dokularda etkisi daha belirgindir)\n"
+"Gölgelendirme kapalı ise düğüm arası(nod) boşluk görülür.\n"
+"0'da ise düzgünleştirme kapalıdır.\n"
+"Ayarları değiştirdikten sonra yenileme gereklidir."
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "Dokuları boyutlandırırken trilineer filtreleme kullan."
 
@@ -7146,6 +7101,12 @@ msgstr ""
 "Devre dışı kılınırsa, yerine bitmap ve XML vektör yazı tipleri kullanılır."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 "Harita bloğu başına nod doku animasyonlarının eşzamansız yapılıp "
@@ -7302,6 +7263,35 @@ msgid "Y-level of seabed."
 msgstr "Deniz yatağının Y-seviyesi."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Harita kütlerini diske kaydederken kullanılacak ZLib sıkıştırma düzeyi.\n"
+"-1 - Zlib'in varsayılan sıkıştırma düzeyi\n"
+"0 - hiçbir sıkıştırma yok, en hızlı\n"
+"9 - en iyi sıkıştırma, en yavaş\n"
+"(seviye 1-3, Zlib'in \"hızlı\" , 4-9 sıradan yöntemi kullanır)"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+"Harita kütlerini istemciye(client) gönderirken kullanılacak ZLib sıkıştırma "
+"düzeyi.\n"
+"-1 - Zlib'in varsayılan sıkıştırma düzeyi\n"
+"0 - hiçbir sıkıştırma yok, en hızlı\n"
+"9 - en iyi sıkıştırma, en yavaş\n"
+"(seviye 1-3, Zlib'in \"hızlı\" , 4-9 sıradan yöntemi kullanır)"
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL dosya indirme zaman aşımı"
 
@@ -7313,23 +7303,12 @@ msgstr "cURL paralel sınırı"
 msgid "cURL timeout"
 msgstr "cURL zaman aşımı"
 
-#~ msgid "Ok"
-#~ msgstr "Tamam"
-
-#~ msgid "Back"
-#~ msgstr "Geri"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "$1 indiriliyor ve kuruluyor, lütfen bekleyin..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "Diskte emerge sıralarının sınırı"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "Paralaks oklüzyon gücü"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "Ekran yakalamaların kaydedileceği konum."
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = eğim bilgili paralaks oklüzyon (daha hızlı).\n"
+#~ "1 = kabartma eÅŸleme (daha yavaÅŸ, daha doÄŸru)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7345,10 +7324,42 @@ msgstr "cURL zaman aşımı"
 #~ "Dağ-türü yüzerkaraların orta noktanın üstünde ve altında nasıl "
 #~ "konikleÅŸtiÄŸini deÄŸiÅŸtirir."
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Tek oyunculu dünyayı sıfırlamak istediğinizden emin misiniz ?"
+
+#~ msgid "Back"
+#~ msgstr "Geri"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "Tümsek Eşleme"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Tümsek eşleme"
+
 #~ msgid "Center of light curve mid-boost."
 #~ msgstr "Işık eğrisi orta-artırmanın merkezi."
 
 #~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "Ana Menü arayüzünü değiştirir:\n"
+#~ "-   Full:  Çoklu tek oyunculu dünyalar, oyun seçimi, doku paketi seçici, "
+#~ "vb.\n"
+#~ "-   Simple: Bir tek oyunculu dünya, oyun veya doku paketi seçiciler yok.\n"
+#~ "Küçük ekranlar için gerekli olabilir."
+
+#~ msgid "Config mods"
+#~ msgstr "Modları yapılandır"
+
+#~ msgid "Configure"
+#~ msgstr "Yapılandır"
+
+#~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
 #~ "Is a noise offset added to the 'mgv7_np_mountain' noise value."
 #~ msgstr ""
@@ -7360,6 +7371,9 @@ msgstr "cURL zaman aşımı"
 #~ "Tünellerin genişliğini denetler, daha küçük bir değer daha geniş tüneller "
 #~ "yaratır."
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "Artı rengi (R,G,B)."
+
 #~ msgid "Darkness sharpness"
 #~ msgstr "Karanlık keskinliği"
 
@@ -7371,6 +7385,13 @@ msgstr "cURL zaman aşımı"
 #~ "Gürültü > 0 iken düz yüzenkaralar oluşur."
 
 #~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "Dokuların örnekleme adımını tanımlar.\n"
+#~ "Yüksek bir değer daha yumuşak normal eşlemeler verir."
+
+#~ msgid ""
 #~ "Deprecated, define and locate cave liquids using biome definitions "
 #~ "instead.\n"
 #~ "Y of upper limit of lava in large caves."
@@ -7379,12 +7400,50 @@ msgstr "cURL zaman aşımı"
 #~ "sıvılarını tanımlayın ve bulun.\n"
 #~ "Büyük mağaralarda lav üst sınırının Y'si."
 
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "$1 indiriliyor ve kuruluyor, lütfen bekleyin..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "VBO'yu etkinleÅŸtir"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Tümsek eşlemeyi dokular için etkinleştirir. Normal eşlemelerin doku "
+#~ "paketi tarafından sağlanması\n"
+#~ "veya kendiliğinden üretilmesi gerekir\n"
+#~ "Gölgelemelerin etkin olmasını gerektirir."
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "Filmsel ton eÅŸlemeyi etkinleÅŸtirir"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "Çalışma anı dikey eşleme üretimini (kabartma efekti) etkinleştirir.\n"
+#~ "Tümsek eşlemenin etkin olmasını gerektirir."
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "Paralaks oklüzyon eşlemeyi etkinleştirir.\n"
+#~ "Gölgelemelerin etkin olmasını gerektirir."
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "Deneysel seçenek, 0'dan daha büyük bir sayıya ayarlandığında\n"
+#~ "bloklar arasında görünür boşluklara neden olabilir."
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "Duraklat menüsünde FPS"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "Yüzenkara taban yükseklik gürültüsü"
 
@@ -7397,6 +7456,12 @@ msgstr "cURL zaman aşımı"
 #~ msgid "Gamma"
 #~ msgstr "Gama"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Normal EÅŸlemeleri Ãœret"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Normal eşlemeleri üret"
+
 #~ msgid "IPv6 support."
 #~ msgstr "IPv6 desteÄŸi."
 
@@ -7406,18 +7471,105 @@ msgstr "cURL zaman aşımı"
 #~ msgid "Lightness sharpness"
 #~ msgstr "Aydınlık keskinliği"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "Diskte emerge sıralarının sınırı"
+
+#~ msgid "Main"
+#~ msgstr "Ana"
+
+#~ msgid "Main menu style"
+#~ msgstr "Ana menü stili"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Radar kipinde mini harita, Yakınlaştırma x2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Radar kipinde mini harita, Yakınlaştırma x4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Yüzey kipinde mini harita, Yakınlaştırma x2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Yüzey kipinde mini harita, Yakınlaştırma x4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Ad/Åžifre"
+
+#~ msgid "No"
+#~ msgstr "Hayır"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "Normal eşleme örnekleme"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "Normal eşleme gücü"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "Paralaks oklüzyon yineleme sayısı."
+
+#~ msgid "Ok"
+#~ msgstr "Tamam"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "Paralaks oklüzyon efektinin genel sapması, genellikle boyut/2."
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "Paralaks oklüzyon efektinin genel boyutu."
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Paralaks Oklüzyon"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Paralaks oklüzyon"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "Paralaks oklüzyon sapması"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "Paralaks oklüzyon yinelemesi"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "Paralaks oklüzyon kipi"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Paralaks oklüzyon boyutu"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "Paralaks oklüzyon gücü"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "TrueTypeFont veya bitmap konumu."
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "Ekran yakalamaların kaydedileceği konum."
+
+#~ msgid "Projecting dungeons"
+#~ msgstr "İzdüşüm zindanlar"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Tek oyunculu dünyayı sıfırla"
+
+#~ msgid "Select Package File:"
+#~ msgstr "Paket Dosyası Seç:"
+
 #~ msgid "Shadow limit"
 #~ msgstr "Gölge sınırı"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "Tek oyunculu baÅŸlat"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "Üretilen normal eşlemelerin gücü."
+
 #~ msgid "Strength of light curve mid-boost."
 #~ msgstr "Işık eğrisi orta-artırmanın kuvveti."
 
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "Belirli diller için bu yazı tipi kullanılacak."
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Sinematik Aç/Kapa"
+
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
 #~ msgstr ""
@@ -7428,26 +7580,26 @@ msgstr "cURL zaman aşımı"
 #~ msgstr ""
 #~ "Tepe yüksekliğinin ve göl derinliğinin yüzenkara düz arazide değişimi."
 
-#~ msgid "Waving water"
-#~ msgstr "Dalgalanan su"
-
-#~ msgid "Y-level of floatland midpoint and lake surface."
-#~ msgstr "Yüzenkara orta noktasının ve göl yüzeyinin Y-seviyesi."
+#~ msgid "View"
+#~ msgstr "Görüntüle"
 
-#~ msgid "Y-level to which floatland shadows extend."
-#~ msgstr "Yüzenkara gölgelerinin uzanacağı Y-seviyesi."
+#~ msgid "Waving Water"
+#~ msgstr "Dalgalanan Su"
 
-#~ msgid "Projecting dungeons"
-#~ msgstr "İzdüşüm zindanlar"
+#~ msgid "Waving water"
+#~ msgstr "Dalgalanan su"
 
 #~ msgid "Whether dungeons occasionally project from the terrain."
 #~ msgstr "Zindanların bazen araziden yansıyıp yansımayacağı."
 
-#~ msgid "Waving Water"
-#~ msgstr "Dalgalanan Su"
-
 #~ msgid "Y of upper limit of lava in large caves."
 #~ msgstr "Büyük mağaralardaki lavın üst sınırının Y'si."
 
-#~ msgid "Select Package File:"
-#~ msgstr "Paket Dosyası Seç:"
+#~ msgid "Y-level of floatland midpoint and lake surface."
+#~ msgstr "Yüzenkara orta noktasının ve göl yüzeyinin Y-seviyesi."
+
+#~ msgid "Y-level to which floatland shadows extend."
+#~ msgstr "Yüzenkara gölgelerinin uzanacağı Y-seviyesi."
+
+#~ msgid "Yes"
+#~ msgstr "Evet"
diff --git a/po/uk/minetest.po b/po/uk/minetest.po
index bc48d4643..81b100511 100644
--- a/po/uk/minetest.po
+++ b/po/uk/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ukrainian (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-26 10:41+0000\n"
-"Last-Translator: Maksim Gamarnik <MoNTE48@mail.ua>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-10-25 19:26+0000\n"
+"Last-Translator: Nick Naumenko <mykola.naumenko@protonmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/minetest/"
 "minetest/uk/>\n"
 "Language: uk\n"
@@ -13,7 +13,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.3.2-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Переродити��"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Ви загинули"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
@@ -39,10 +47,6 @@ msgstr "Повторне підключенн�"
 msgid "The server has requested a reconnect:"
 msgstr "Сервер запро�ив перез'єднанн�:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "Завантаженн�..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Вер�і� протоколу не �півпадає. "
@@ -56,12 +60,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Сервер підтримує вер�ії протоколу між $1 і $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Спробуйте оновити �пи�ок публічних �ерверів та перевірте �воє Інтернет-"
-"з'єднанн�."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Ми підтримуємо тільки протокол вер�ії $1."
 
@@ -69,7 +67,8 @@ msgstr "Ми підтримуємо тільки протокол вер�ії $
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Ми підтримуємо протокол між вер�і�ми $1 і $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -79,7 +78,8 @@ msgstr "Ми підтримуємо протокол між вер�і�ми $1
 msgid "Cancel"
 msgstr "Ска�увати"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Залежить від:"
 
@@ -109,7 +109,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr "Знайти Більше Модів"
+msgstr "Знайти більше модів"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -153,14 +153,55 @@ msgid "enabled"
 msgstr "увімкнено"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "Завантаженн�..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "В�і пакунки"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "Клавіша вже викори�товуєть��"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "�азад в Головне Меню"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "Грати (�ервер)"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr "ContentDB не є до�тупним коли Minetest не мі�тить підтримку cURL"
 
@@ -182,6 +223,16 @@ msgid "Install"
 msgstr "В�тановити"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "В�тановити"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "�еобов'�зкові залежно�ті:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Модифікації"
@@ -195,9 +246,25 @@ msgid "No results"
 msgstr "�ічого не знайдено"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "Пошук"
+#, fuzzy
+msgid "No updates"
+msgstr "Оновити"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -212,8 +279,12 @@ msgid "Update"
 msgstr "Оновити"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
-msgstr "Вид"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
+msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "A world named \"$1\" already exists"
@@ -252,9 +323,8 @@ msgid "Create"
 msgstr "Створити"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "Інформаці�"
+msgstr "Декорації"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -366,6 +436,8 @@ msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
 msgstr ""
+"Споруди, що з’�вл�ють�� на мі�цево�ті (не впливає на дерева та траву "
+"джунглів �творені у v6)"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
@@ -381,24 +453,23 @@ msgstr "Помірного По��у, Пу�телі, Джунглі"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "Помірний, пу�тел�, джунглі, тундра, тайга"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Terrain surface erosion"
-msgstr ""
+msgstr "Ерозі� поверхні мі�цево�ті"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "Дерева та трава джунглів"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Vary river depth"
-msgstr "Глибина великих печер"
+msgstr "Змінювати глибину річок"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "Дуже великі печери глибоко під землею"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -453,7 +524,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "(No description of setting given)"
-msgstr "(по��ненн� від�утнє)"
+msgstr "(по��ненн� налаштуванн� від�утнє)"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "2D Noise"
@@ -468,11 +539,6 @@ msgid "Browse"
 msgstr "Перегл�нути"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "Клієнт"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "Вимкнено"
 
@@ -502,23 +568,27 @@ msgstr "По�тійні�ть"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid integer."
-msgstr "Будь-ла�ка введіть дій�не ціле чи�ло."
+msgstr "Будь-ла�ка введіть коректне ціле чи�ло."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Please enter a valid number."
-msgstr "Будь-ла�ка введіть дій�не чи�ло."
+msgstr "Будь-ла�ка введіть коректне чи�ло."
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Restore Default"
-msgstr "Відновити �к було"
+msgstr "Відновити за замовченн�м"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua src/settings_translation_file.cpp
 msgid "Scale"
 msgstr "Шкала"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "Пошук"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
-msgstr "Виберіть папку"
+msgstr "Виберіть директорію"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select file"
@@ -542,7 +612,7 @@ msgstr "Ð¥"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "X spread"
-msgstr "Розкиданн� по X"
+msgstr "Поширенн� по X"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Y"
@@ -550,7 +620,7 @@ msgstr "Y"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Y spread"
-msgstr "Розкиданн� по Y"
+msgstr "Поширенн� по Y"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Z"
@@ -558,7 +628,7 @@ msgstr "Z"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Z spread"
-msgstr "Розкиданн� по Z"
+msgstr "Поширенн� по Z"
 
 #. ~ "absvalue" is a noise parameter flag.
 #. It is short for "absolute value".
@@ -573,7 +643,7 @@ msgstr "�б�. величина"
 #. for noise settings in main menu -> "All Settings".
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "defaults"
-msgstr "Стандартно"
+msgstr "За замовчанн�м"
 
 #. ~ "eased" is a noise parameter flag.
 #. It is used to make the map smoother and
@@ -633,13 +703,28 @@ msgstr "�е вдало�� в�тановити мод �к $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "�е вдало�� в�тановити модпак �к $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "Завантаженн�..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "Клієнто�торонні �крипти на клієнті вимкнено"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Спробуйте оновити �пи�ок публічних �ерверів та перевірте �воє Інтернет-"
+"з'єднанн�."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
-msgstr "Шукати додатки онлайн"
+msgstr "Перегл�нути контент у мережі"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Content"
-msgstr "Додатки"
+msgstr "Контент"
 
 #: builtin/mainmenu/tab_content.lua
 msgid "Disable Texture Pack"
@@ -679,14 +764,21 @@ msgstr "�ктивні уча�ники"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Core Developers"
-msgstr "Розробники двигуна"
+msgstr "Розробники �дра"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Credits"
 msgstr "Под�ки"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "Виберіть директорію"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -695,7 +787,7 @@ msgstr "Попередні уча�ники"
 
 #: builtin/mainmenu/tab_credits.lua
 msgid "Previous Core Developers"
-msgstr "Попередні розробники двигуна"
+msgstr "Попередні розробники �дра"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Announce Server"
@@ -706,16 +798,12 @@ msgid "Bind Address"
 msgstr "Закріпити адре�у"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "�алаштувати"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
-msgstr "Творчі�ть"
+msgstr "Творчій режим"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
-msgstr "Пораненн�"
+msgstr "Увімкнути ушкодженн�"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Host Game"
@@ -727,11 +815,11 @@ msgstr "Сервер"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "В�тановити ігри з ContentDB"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "Ім'�/Пароль"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -742,6 +830,11 @@ msgid "No world created or selected!"
 msgstr "Світ не �творено або не обрано!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "�овий пароль"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "Грати"
 
@@ -750,6 +843,11 @@ msgid "Port"
 msgstr "Порт"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "Виберіть �віт:"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "Виберіть �віт:"
 
@@ -759,46 +857,46 @@ msgstr "Порт �ервера"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Start Game"
-msgstr "Грати"
+msgstr "Почати гру"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Address / Port"
 msgstr "�дре�а / Порт"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "Під'єднати��"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
-msgstr "Творчі�ть"
+msgstr "Творчій режим"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
-msgstr "Пораненн�"
+msgstr "Ушкодженн� ввімкнено"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
-msgstr "Видалити мітку"
+msgstr "Видалити з закладок"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
-msgstr "Улюблені"
+msgstr "Закладки"
 
 #: builtin/mainmenu/tab_online.lua
 msgid "Join Game"
-msgstr "Мережа"
+msgstr "Під'єднати�� до гри"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "Ім'� / Пароль"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Пінг"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "Бої увімкнено"
 
@@ -808,7 +906,7 @@ msgstr "2x"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "3D Clouds"
-msgstr "Об'ємні хмари"
+msgstr "3D хмари"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "4x"
@@ -827,10 +925,6 @@ msgid "Antialiasing:"
 msgstr "Згладжуванн�:"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "Ви впевнені, що бажаєте �кинути �вій �віт одиночної гри?"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "Зберігати розмір вікна"
 
@@ -838,27 +932,19 @@ msgstr "Зберігати розмір вікна"
 msgid "Bilinear Filter"
 msgstr "Білінійна фільтраці�"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "Бамп маппінг"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "Змінити клавіші"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Connected Glass"
-msgstr "З'єднувати �кло"
+msgstr "З'єднане �кло"
 
 #: builtin/mainmenu/tab_settings.lua
 msgid "Fancy Leaves"
 msgstr "Гарне ли�т�"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "Генерувати мапи нормалів"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Міпмапи"
 
@@ -867,10 +953,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Міпмапи і анізотропний фільтр"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "�і"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "Без фільтрації"
 
@@ -898,19 +980,11 @@ msgstr "�епрозоре ли�т�"
 msgid "Opaque Water"
 msgstr "�епрозора вода"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "Паралак�ова оклюзі�"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "Ча�точки"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "Скинути �віт одиночної гри"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "Екран:"
 
@@ -923,6 +997,11 @@ msgid "Shaders"
 msgstr "Шейдери"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "Ви��чі о�трови"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "Шейдери (недо�тупно)"
 
@@ -966,22 +1045,6 @@ msgstr "Хвил��ті Рідини"
 msgid "Waving Plants"
 msgstr "Коливати квіти"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "Так"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "�алаштувати модифікації"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "Головне Меню"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "Почати одиночну гру"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "Ча� очікуванн� вийшов."
@@ -1024,7 +1087,7 @@ msgstr "Головне Меню"
 
 #: src/client/clientlauncher.cpp
 msgid "No world selected and no address provided. Nothing to do."
-msgstr "Жоден �віт не вибрано та не надано адре�и. �ічого робити."
+msgstr "Жоден �віт не вибрано та не надано адре�и. �емає чого робити."
 
 #: src/client/clientlauncher.cpp
 msgid "Player name too long."
@@ -1072,11 +1135,11 @@ msgstr "- Творчі�ть: "
 
 #: src/client/game.cpp
 msgid "- Damage: "
-msgstr "- Пораненн�: "
+msgstr "- Ушкодженн�: "
 
 #: src/client/game.cpp
 msgid "- Mode: "
-msgstr "- Тип: "
+msgstr "- Режим: "
 
 #: src/client/game.cpp
 msgid "- Port: "
@@ -1143,18 +1206,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "Стандартне керуванн� клавішами:\n"
 "- %s: вперед\n"
@@ -1167,7 +1227,7 @@ msgstr ""
 "- %s: інвентар\n"
 "- Мишка: поворот/дивити��\n"
 "- Ліва кнопка миші: копати/удар\n"
-"- Права кнопка миші: по�тавити/зробити\n"
+"- Права кнопка миші: по�тавити/викори�тати\n"
 "- Коле�о миші: вибір предмета\n"
 "- %s: чат\n"
 
@@ -1268,16 +1328,6 @@ msgid "Fog enabled"
 msgstr "Туман увімкнено"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "Туман вимкнено"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "Туман увімкнено"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "Інформаці� про гру:"
 
@@ -1298,16 +1348,6 @@ msgid "KiB/s"
 msgstr "КіБ/�ек"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "Туман вимкнено"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "Пораненн�"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "Ре�ур�и..."
 
@@ -1320,34 +1360,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "Мінімапа вимкнена грою або модифікацією"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "Мінімапа вимкнена"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "Мінімапа в режимі радар. �аближенн� х1"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "Мінімапа в режимі радар. �аближенн� х2"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "Мінімапа в режимі радар. �аближенн� х4"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "Мінімапа в режимі поверхн�. �аближенн� х1"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "Мінімапа в режимі поверхн�. �аближенн� х2"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "Мінімапа в режимі поверхн�. �аближенн� х4"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "Прохід крізь �тіни вимкнено"
 
@@ -1392,10 +1404,6 @@ msgid "Resolving address..."
 msgstr "Отриманн� адре�и..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Переродити��"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "Вимкненн�..."
 
@@ -1413,11 +1421,11 @@ msgstr "Звук вимкнено"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "Звукова �и�тема вимкнена"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "Звукова �и�тема не підтримуєть�� у цій збірці"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1448,10 +1456,6 @@ msgid "Wireframe shown"
 msgstr "Показ трикутників"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Ви загинули"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "�аближенн� (бінокль) вимкнено грою або модифікацією"
 
@@ -1468,16 +1472,6 @@ msgid "Chat shown"
 msgstr "Чат увімкнено"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "Чат вимкнено"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "Чат увімкнено"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "Позначки на екрані вимкнено"
 
@@ -1660,9 +1654,8 @@ msgid "Numpad 9"
 msgstr "Num 9"
 
 #: src/client/keycode.cpp
-#, fuzzy
 msgid "OEM Clear"
-msgstr "Почи�тити OEM"
+msgstr "Очи�тити OEM"
 
 #: src/client/keycode.cpp
 msgid "Page down"
@@ -1758,6 +1751,25 @@ msgstr "Додаткова кнопка 2"
 msgid "Zoom"
 msgstr "Збільшити"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "Мінімапа вимкнена"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "Мінімапа в режимі радар. �аближенн� х1"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "Мінімапа в режимі поверхн�. �аближенн� х1"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "Мінімапа в режимі поверхн�. �аближенн� х1"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "Паролі не збігають��!"
@@ -1802,26 +1814,6 @@ msgid "Backward"
 msgstr "�азад"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "Змінити камеру"
 
@@ -1916,28 +1908,8 @@ msgid "Special"
 msgstr "Спеціальна"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "Спеціальна"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "Кінематографічний режим"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "Кінематографічний режим"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
-msgstr "Увімкнути HUD"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "Політ"
+msgstr "Увімкнути позначки на екрані"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
@@ -2043,6 +2015,14 @@ msgid ""
 "situations.\n"
 "Range roughly -2 to 2. Multiply by 'scale' for offset in nodes."
 msgstr ""
+"(X,Y,Z) зміщенн� фракталу від центру �віта у одиниц�х  'ма�шабу'. \n"
+"Викори�товуєть�� дл� пере�уванн� бажаної точки до (0, 0) щоб \n"
+"�творити придатну точку переродженн� або дл� 'наближенн�' \n"
+"до бажаної точки шл�хом збільшенн� 'ма�штабу'. Значенн� за \n"
+"замовчанн�м налаштоване дл� придатної точки переродженн� \n"
+"дл� множин Мандельбро з параметрами за замовчанн�м; може \n"
+"потребувати зміни у інших �итуаці�х. Діапазон приблизно від -2 \n"
+"до 2. Помножте на 'ма�штаб' щоб отримати зміщенн� у блоках."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2054,42 +2034,41 @@ msgid ""
 "Default is for a vertically-squashed shape suitable for\n"
 "an island, set all 3 numbers equal for the raw shape."
 msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = технологі� \"parallax occlusion\" з інформацією про криві (швидше).\n"
-"1 = технологі� \"relief mapping\" (повільніше, більш акуратніше)."
+"(X,Y,Z) ма�штаб фракталу у блоках.\n"
+"Фактичний розмір фракталу буде у 2-3 рази більшим. Ці \n"
+"чи�ла можуть бути дуже великими, фрактал не обов'�зково \n"
+"має помі�тити�� у �віті. Збільшіть їх щоб 'наблизити' деталі \n"
+"фракталу. Чи�ла за замовчанн�м підход�ть дл� вертикально \n"
+"�ти�неної форми, придатної дл� о�трова, в�тановіть у�і три \n"
+"чи�ла рівними дл� форми без тран�формації."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
-msgstr ""
+msgstr "2D шум що контролює форму/розмір гребенів гір."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of rolling hills."
-msgstr ""
+msgstr "2D шум що контролює форму/розмір неви�оких пагорбів."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of step mountains."
-msgstr ""
+msgstr "2D шум що контролює форму/розмір �тупінча�тих гір."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of ridged mountain ranges."
-msgstr ""
+msgstr "2D шум що контролює розмір/імовірні�ть гребенів гір�ьких ма�ивів."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of rolling hills."
-msgstr ""
+msgstr "2D шум що контролює розмір/імовірні�ть неви�оких пагорбів."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that controls the size/occurrence of step mountain ranges."
-msgstr ""
+msgstr "2D шум що контролює розмір/імовірні�ть �тупінча�тих гір."
 
 #: src/settings_translation_file.cpp
 msgid "2D noise that locates the river valleys and channels."
-msgstr ""
+msgstr "2D шум що розміщує долини та ру�ла річок."
 
 #: src/settings_translation_file.cpp
 msgid "3D clouds"
@@ -2101,17 +2080,19 @@ msgstr "3D режим"
 
 #: src/settings_translation_file.cpp
 msgid "3D mode parallax strength"
-msgstr ""
+msgstr "Величина паралак�у у 3D режимі"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
-msgstr ""
+msgstr "3D шум що визначає гігант�ькі каверни."
 
 #: src/settings_translation_file.cpp
 msgid ""
 "3D noise defining mountain structure and height.\n"
 "Also defines structure of floatland mountain terrain."
 msgstr ""
+"3D шум що визначає �труктуру та ви�оті гір. \n"
+"Також визначає �труктуру ви��чих о�тровів."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2120,22 +2101,26 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"3D шум що визначає �труктуру ви��чих о�тровів.\n"
+"Якщо змінити значенн� за замовчан�м, 'ма�штаб' шуму (0.7 за замовчанн�м)\n"
+"може потребувати корекції, о�кільки функці� конічної транформації ви��чих\n"
+"о�тровів має діапазон значень приблизно від -2.0 до 2.0."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
-msgstr ""
+msgstr "3D шум що визначає �труктуру �тін каньйонів річок."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining terrain."
-msgstr ""
+msgstr "3D шум що визначає мі�цеві�ть."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise for mountain overhangs, cliffs, etc. Usually small variations."
-msgstr ""
+msgstr "3D шум дл� ви�тупів гір, �кель та ін. Зазвичай невеликі варіації."
 
 #: src/settings_translation_file.cpp
 msgid "3D noise that determines number of dungeons per mapchunk."
-msgstr ""
+msgstr "3D шум що визначає кількі�ть підземель на фрагмент карти."
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2150,52 +2135,70 @@ msgid ""
 "-    pageflip: quadbuffer based 3d.\n"
 "Note that the interlaced mode requires shaders to be enabled."
 msgstr ""
+"Підтримка 3D.\n"
+"Зараз підтримують��:\n"
+"-    none: 3d вимкнено.\n"
+"-    anaglyph: 3d з блакитно-пурпурними кольорами.\n"
+"-    interlaced: підтримка пол�різаційних екранів з непарними/парним "
+"ліні�ми.\n"
+"-    topbottom: поділ екрану вертикально.\n"
+"-    sidebyside: поділ екрану горизонтально.\n"
+"-    crossview: 3d на о�нові авто�тереограми.\n"
+"-    pageflip: 3d на о�нові quadbuffer.\n"
+"Зверніть увагу що режим interlaced потребує ввімкненн� шейдерів."
 
 #: 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 ""
+"Вибране зерно карти дл� нової карти, залиште порожнім дл� випадково "
+"вибраного чи�ла.\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 "ABM interval"
 msgstr "Інтервал ABM"
 
 #: src/settings_translation_file.cpp
-msgid "Absolute limit of queued blocks to emerge"
+msgid "ABM time budget"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Absolute limit of queued blocks to emerge"
+msgstr "�б�олютний ліміт відображенн� блоків з черги"
+
+#: src/settings_translation_file.cpp
 msgid "Acceleration in air"
-msgstr ""
+msgstr "При�коренн� у повітрі"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration of gravity, in nodes per second per second."
-msgstr ""
+msgstr "При�коренн� гравітації, у блоках на �екунду у квадраті."
 
 #: src/settings_translation_file.cpp
 msgid "Active Block Modifiers"
-msgstr ""
+msgstr "Модифікатори активних блоків"
 
 #: src/settings_translation_file.cpp
 msgid "Active block management interval"
-msgstr ""
+msgstr "Інтервал керуванн� активним блоком"
 
 #: src/settings_translation_file.cpp
 msgid "Active block range"
-msgstr ""
+msgstr "Діапазон активних блоків"
 
 #: src/settings_translation_file.cpp
 msgid "Active object send range"
-msgstr ""
+msgstr "Діапазон відправленн� активних блоків"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2203,6 +2206,9 @@ 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 "Adds particles when digging a node."
@@ -2405,10 +2411,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "Бамп-маппінг"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2479,19 +2481,8 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat font size"
-msgstr "Розмір шрифту"
+msgstr "Розмір шрифту чату"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
@@ -2642,6 +2633,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "Додатки"
@@ -2699,7 +2694,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2707,7 +2704,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2810,12 +2809,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2886,6 +2879,11 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "Права клавіша"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "Ча�точки при копанні"
 
@@ -2946,7 +2944,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3034,14 +3032,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -3051,18 +3041,6 @@ msgstr "Вмикає мінімапу."
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3079,12 +3057,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3094,8 +3066,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr ""
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "Мак�имум FPS при паузі."
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3397,10 +3370,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "Генерувати карти нормалів"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3454,8 +3423,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3923,6 +3892,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -4003,6 +3976,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4102,6 +4082,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4658,10 +4645,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "Стиль головного меню"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4675,6 +4658,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "Тека мапи"
 
@@ -4845,7 +4836,7 @@ msgstr "Мак�имальна кількі�ть кадрів в �екунду
 
 #: src/settings_translation_file.cpp
 #, fuzzy
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "Мак�имум FPS при паузі."
 
 #: src/settings_translation_file.cpp
@@ -4894,6 +4885,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5123,14 +5121,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5156,10 +5146,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5185,34 +5171,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "Паралак�ова оклюзі�"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "Ступінь паралак�ової оклюзії"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5279,6 +5237,15 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "Кнопка дл� польоту"
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5435,10 +5402,6 @@ msgid "Right key"
 msgstr "Права клавіша"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "River channel depth"
 msgstr "Глибина великих печер"
@@ -5693,6 +5656,19 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"Вказати мову. Залиште порожнім, щоб викори�товувати �и�темну мову.\n"
+"Потрібен перезапу�к пі�л� цієї зміни."
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5822,10 +5798,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5919,6 +5891,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5977,8 +5953,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6004,15 +5980,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6148,6 +6129,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6354,6 +6346,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6476,6 +6474,24 @@ msgid "Y-level of seabed."
 msgstr "Y-Рівень мор�ького дна."
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
@@ -6487,26 +6503,102 @@ msgstr ""
 msgid "cURL timeout"
 msgstr ""
 
-#~ msgid "Ok"
-#~ msgstr "Добре"
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = технологі� \"parallax occlusion\" з інформацією про криві (швидше).\n"
+#~ "1 = технологі� \"relief mapping\" (повільніше, більш акуратніше)."
+
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "Ви впевнені, що бажаєте �кинути �вій �віт одиночної гри?"
 
 #~ msgid "Back"
 #~ msgstr "�азад"
 
+#~ msgid "Bump Mapping"
+#~ msgstr "Бамп-маппінг"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "Бамп-маппінг"
+
+#~ msgid "Config mods"
+#~ msgstr "�алаштувати модифікації"
+
+#~ msgid "Configure"
+#~ msgstr "�алаштувати"
+
+#~ msgid "Content Store"
+#~ msgstr "Додатки"
+
 #~ msgid "Downloading and installing $1, please wait..."
 #~ msgstr "Завантаженн� і в�тановленн� $1, зачекайте..."
 
 #~ msgid "Enable VBO"
 #~ msgstr "Увімкнути VBO"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "Генерувати мапи нормалів"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "Генерувати карти нормалів"
+
 #~ msgid "IPv6 support."
 #~ msgstr "Підтримка IPv6."
 
 #~ msgid "Lava depth"
 #~ msgstr "Глибина лави"
 
+#~ msgid "Main"
+#~ msgstr "Головне Меню"
+
+#~ msgid "Main menu style"
+#~ msgstr "Стиль головного меню"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "Мінімапа в режимі радар. �аближенн� х2"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "Мінімапа в режимі радар. �аближенн� х4"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "Мінімапа в режимі поверхн�. �аближенн� х2"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "Мінімапа в режимі поверхн�. �аближенн� х4"
+
+#~ msgid "Name/Password"
+#~ msgstr "Ім'�/Пароль"
+
+#~ msgid "No"
+#~ msgstr "�і"
+
+#~ msgid "Ok"
+#~ msgstr "Добре"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "Паралак�ова оклюзі�"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "Паралак�ова оклюзі�"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "Ступінь паралак�ової оклюзії"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "Скинути �віт одиночної гри"
+
 #~ msgid "Select Package File:"
 #~ msgstr "Виберіть файл пакунку:"
 
-#~ msgid "Content Store"
-#~ msgstr "Додатки"
+#~ msgid "Start Singleplayer"
+#~ msgstr "Почати одиночну гру"
+
+#~ msgid "Toggle Cinematic"
+#~ msgstr "Кінематографічний режим"
+
+#~ msgid "View"
+#~ msgstr "Вид"
+
+#~ msgid "Yes"
+#~ msgstr "Так"
diff --git a/po/vi/minetest.po b/po/vi/minetest.po
index 9dbd4c586..1238015ec 100644
--- a/po/vi/minetest.po
+++ b/po/vi/minetest.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vietnamese (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
 "PO-Revision-Date: 2020-06-13 21:08+0000\n"
 "Last-Translator: darkcloudcat <leducthn@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/minetest/"
@@ -14,6 +14,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "Hồi sinh"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "Bạn đã chết"
+
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
 msgstr ""
@@ -38,10 +46,6 @@ msgstr "Kết nối lại"
 msgid "The server has requested a reconnect:"
 msgstr "Máy chủ đã yêu cầu kết nối lại:"
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "�ang tải..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "Phiên bản giao thức không khớp "
@@ -55,12 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "Máy chủ hỗ trợ các phiên bản giao thức trong khoảng từ $1 đến $2. "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr ""
-"Hãy thử kích hoạt lại danh sách máy chủ công cộng và kiểm tra kết nối "
-"internet của bạn."
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "Chúng tôi chỉ hỗ trợ phiên bản giao thức $1."
 
@@ -68,7 +66,8 @@ msgstr "Chúng tôi chỉ hỗ trợ phiên bản giao thức $1."
 msgid "We support protocol versions between version $1 and $2."
 msgstr "Chúng tôi hỗ trợ các phiên bản giao thức giữa phiên bản $1 đến $2."
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -78,7 +77,8 @@ msgstr "Chúng tôi hỗ trợ các phiên bản giao thức giữa phiên bản
 msgid "Cancel"
 msgstr "Hủy b�"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "Phụ thuộc:"
 
@@ -155,14 +155,53 @@ msgid "enabled"
 msgstr "kích hoạt"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "�ang tải..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "Tất cả các gói"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Already installed"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Base Game:"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
 msgstr ""
 
@@ -185,6 +224,15 @@ msgid "Install"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "Install $1"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "Phụ thuộc tùy ch�n:"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mod"
@@ -198,8 +246,23 @@ msgid "No results"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
+msgid "No updates"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
@@ -215,7 +278,11 @@ msgid "Update"
 msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -466,10 +533,6 @@ msgid "Browse"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-msgid "Clientmods"
-msgstr ""
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr ""
 
@@ -514,6 +577,10 @@ msgid "Scale"
 msgstr ""
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr ""
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr ""
 
@@ -628,6 +695,20 @@ msgstr ""
 msgid "Unable to install a modpack as a $1"
 msgstr ""
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "�ang tải..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Public server list is disabled"
+msgstr ""
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr ""
+"Hãy thử kích hoạt lại danh sách máy chủ công cộng và kiểm tra kết nối "
+"internet của bạn."
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr ""
@@ -681,7 +762,13 @@ msgid "Credits"
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+msgid "Open User Data Directory"
+msgstr ""
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -701,14 +788,10 @@ msgid "Bind Address"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr ""
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr ""
 
@@ -725,7 +808,7 @@ msgid "Install games from ContentDB"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
+msgid "Name"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
@@ -737,6 +820,10 @@ msgid "No world created or selected!"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Password"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr ""
 
@@ -745,6 +832,10 @@ msgid "Port"
 msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
+msgid "Select Mods"
+msgstr ""
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr ""
 
@@ -760,23 +851,23 @@ msgstr ""
 msgid "Address / Port"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr ""
 
@@ -784,16 +875,16 @@ msgstr ""
 msgid "Join Game"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr ""
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr ""
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr ""
 
@@ -822,10 +913,6 @@ msgid "Antialiasing:"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr ""
 
@@ -833,10 +920,6 @@ msgstr ""
 msgid "Bilinear Filter"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr ""
@@ -850,10 +933,6 @@ msgid "Fancy Leaves"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr ""
 
@@ -862,10 +941,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr ""
 
@@ -893,19 +968,11 @@ msgstr ""
 msgid "Opaque Water"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr ""
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr ""
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr ""
 
@@ -918,6 +985,10 @@ msgid "Shaders"
 msgstr ""
 
 #: builtin/mainmenu/tab_settings.lua
+msgid "Shaders (experimental)"
+msgstr ""
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr ""
 
@@ -961,22 +1032,6 @@ msgstr ""
 msgid "Waving Plants"
 msgstr ""
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr ""
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr ""
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr ""
@@ -1136,18 +1191,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 
 #: src/client/game.cpp
@@ -1235,15 +1287,6 @@ msgid "Fog enabled"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Freecam disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "kích hoạt"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr ""
 
@@ -1264,15 +1307,6 @@ msgid "KiB/s"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Killaura disabled"
-msgstr ""
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "kích hoạt"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr ""
 
@@ -1285,34 +1319,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr ""
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr ""
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr ""
 
@@ -1357,10 +1363,6 @@ msgid "Resolving address..."
 msgstr ""
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "Hồi sinh"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr ""
 
@@ -1413,10 +1415,6 @@ msgid "Wireframe shown"
 msgstr ""
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "Bạn đã chết"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr ""
 
@@ -1433,14 +1431,6 @@ msgid "Chat shown"
 msgstr ""
 
 #: src/client/gameui.cpp
-msgid "Cheat Menu hidden"
-msgstr ""
-
-#: src/client/gameui.cpp
-msgid "Cheat Menu shown"
-msgstr ""
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr ""
 
@@ -1720,6 +1710,24 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+#, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr ""
+
+#: src/client/minimap.cpp
+msgid "Minimap in texture mode"
+msgstr ""
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr ""
@@ -1759,26 +1767,6 @@ msgid "Backward"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr ""
 
@@ -1871,26 +1859,10 @@ msgid "Special"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Special Inv."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle C. Menu"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Freec."
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr ""
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "Toggle Killaura"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr ""
 
@@ -2000,12 +1972,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr ""
 
@@ -2112,6 +2078,10 @@ msgid "ABM interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
 msgstr ""
 
@@ -2345,10 +2315,6 @@ msgid "Builtin"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2419,16 +2385,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Chat font size"
 msgstr ""
 
@@ -2580,6 +2536,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr ""
 
@@ -2636,7 +2596,9 @@ msgid "Crosshair alpha"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2644,7 +2606,9 @@ msgid "Crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2744,12 +2708,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr ""
 
@@ -2820,6 +2778,10 @@ msgid "Desynchronize block animation"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Dig key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr ""
 
@@ -2880,7 +2842,7 @@ msgid "Enable console window"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+msgid "Enable creative mode for all players"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -2968,14 +2930,6 @@ msgid "Enables animation of inventory items."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr ""
 
@@ -2985,18 +2939,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3013,12 +2955,6 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3028,7 +2964,7 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
+msgid "FPS when unfocused or paused"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -3330,10 +3266,6 @@ msgid "GUI scaling filter txr2img"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr ""
 
@@ -3387,8 +3319,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 
@@ -3855,6 +3787,10 @@ msgid "Joystick button repetition interval"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Joystick deadzone"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr ""
 
@@ -3935,6 +3871,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4034,6 +3977,13 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
@@ -4590,10 +4540,6 @@ msgid "Main menu script"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr ""
@@ -4607,6 +4553,14 @@ msgid "Makes all liquids opaque"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr ""
 
@@ -4770,7 +4724,7 @@ msgid "Maximum FPS"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -4819,6 +4773,13 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr ""
 
@@ -5048,14 +5009,6 @@ msgid "Noises"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr ""
 
@@ -5081,10 +5034,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5110,34 +5059,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr ""
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5203,6 +5124,14 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "Place key"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Place repetition interval"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5358,10 +5287,6 @@ msgid "Right key"
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr ""
 
@@ -5613,6 +5538,16 @@ msgid "Show entity selection boxes"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr ""
 
@@ -5742,10 +5677,6 @@ msgid "Strength of 3D mode parallax."
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -5839,6 +5770,10 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -5897,8 +5832,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -5924,15 +5859,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6068,6 +6008,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6270,6 +6221,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -6392,6 +6349,24 @@ msgid "Y-level of seabed."
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr ""
 
diff --git a/po/zh_CN/minetest.po b/po/zh_CN/minetest.po
index 82e396593..aa816e11d 100644
--- a/po/zh_CN/minetest.po
+++ b/po/zh_CN/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Chinese (Simplified) (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-06-13 21:08+0000\n"
-"Last-Translator: ferrumcccp <wushuzhen1975@icloud.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2021-01-20 15:10+0000\n"
+"Last-Translator: ZhiZe-ZG <qi_wang_zz@outlook.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "minetest/minetest/zh_Hans/>\n"
 "Language: zh_CN\n"
@@ -12,11 +12,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.1-dev\n"
+"X-Generator: Weblate 4.5-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "�生"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "您已死亡"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -38,10 +46,6 @@ msgstr "�新连接"
 msgid "The server has requested a reconnect:"
 msgstr "�务器已请求�新连接："
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "载入中..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "�议版本�匹�。 "
@@ -55,10 +59,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "�务器支��议版本为 $1 至 $2。 "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "请�试�新�用公共�务器列表并检查您的网络连接。"
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "我们�支��议版本 $1。"
 
@@ -66,7 +66,8 @@ msgstr "我们�支��议版本 $1。"
 msgid "We support protocol versions between version $1 and $2."
 msgstr "我们支�的�议版本为 $1 至 $2。"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -76,7 +77,8 @@ msgstr "我们支�的�议版本为 $1 至 $2。"
 msgid "Cancel"
 msgstr "�消"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "�赖项："
 
@@ -104,7 +106,7 @@ msgstr "无法�用 mod \"$1\"：因为包�有�支�的字符。��许
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "寻找更多mod"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -148,21 +150,61 @@ msgid "enabled"
 msgstr "�用"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "下载中..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "所有包"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "按键已被�用"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "返回主��"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "主�游�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "在没有cURL的情况下编译Minetest时，ContentDB��用"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#, fuzzy
 msgid "Downloading..."
-msgstr "载入中..."
+msgstr "下载中..."
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Failed to download $1"
@@ -178,6 +220,16 @@ msgid "Install"
 msgstr "安装"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "安装"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "�选�赖项："
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mod"
@@ -191,9 +243,26 @@ msgid "No results"
 msgstr "无结果"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "�索"
+#, fuzzy
+msgid "No updates"
+msgstr "æ›´æ–°"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Not found"
+msgstr "�音"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -208,7 +277,11 @@ msgid "Update"
 msgstr "æ›´æ–°"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -217,45 +290,39 @@ msgstr "�为 \"$1\" 的世界已�存在"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Additional terrain"
-msgstr ""
+msgstr "�外地形"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
 msgstr "高地寒冷"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Altitude dry"
-msgstr "高地寒冷"
+msgstr "高地干燥"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biome blending"
-msgstr "生物群系噪声"
+msgstr "生物群系��"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Biomes"
-msgstr "生物群系噪声"
+msgstr "生物群系"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caverns"
-msgstr "大型洞穴噪声"
+msgstr "大型洞穴"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Caves"
-msgstr "八音"
+msgstr "æ´žç©´"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Create"
 msgstr "创建"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Decorations"
-msgstr "迭代"
+msgstr "装饰"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Download a game, such as Minetest Game, from minetest.net"
@@ -266,51 +333,48 @@ msgid "Download one from minetest.net"
 msgstr "从 minetest.net 下载一个"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Dungeons"
-msgstr "地窖噪声"
+msgstr "地窖"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Flat terrain"
-msgstr ""
+msgstr "平�地形"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Floating landmasses in the sky"
-msgstr ""
+msgstr "空中漂浮的陆地"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Floatlands (experimental)"
-msgstr "水级别"
+msgstr "悬空岛（实验性）"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Game"
-msgstr "游�"
+msgstr "�游�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Generate non-fractal terrain: Oceans and underground"
-msgstr ""
+msgstr "生��分形地形：海洋和地底"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "丘陵"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Humid rivers"
-msgstr "视频驱动程�"
+msgstr "潮湿河�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "增加河�周边湿度"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "æ¹–"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "低湿度和高温导致浅而干燥的河�"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -321,22 +385,20 @@ msgid "Mapgen flags"
 msgstr "地图生�器标志"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mapgen-specific flags"
-msgstr "地图生�器 v5 标签"
+msgstr "地图生�器专用标签"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Mountains"
-msgstr "山噪声"
+msgstr "å±±"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "泥�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "通�和洞穴网络"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -344,20 +406,19 @@ msgstr "未选择游�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces heat with altitude"
-msgstr ""
+msgstr "�海拔高度�低热�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Reduces humidity with altitude"
-msgstr ""
+msgstr "�海拔高度�低湿度"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Rivers"
-msgstr "河�大�"
+msgstr "河�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "海平�河�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -366,52 +427,49 @@ msgstr "��"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "生物群�之间的平滑过渡"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
-msgstr ""
+msgstr "出现在地形上的结构（对v6创建的树木和丛林�没有影�）"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "出现在地形上的结构，通常是树木和�物"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "温带，沙漠"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
-msgstr ""
+msgstr "温带，沙漠，丛林"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle, Tundra, Taiga"
-msgstr ""
+msgstr "温带，沙漠，丛林，苔原，泰加林带"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Terrain surface erosion"
-msgstr "地形高度"
+msgstr "地形表��烂"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Trees and jungle grass"
-msgstr ""
+msgstr "树木和丛林�"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Vary river depth"
-msgstr "河�深度"
+msgstr "�化河�深度"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "地下深处的大型洞穴"
 
 #: builtin/mainmenu/dlg_create_world.lua
-#, fuzzy
 msgid "Warning: The Development Test is meant for developers."
-msgstr "警告: 最�化开�测试是为开�者�供的。"
+msgstr "警告：开�测试是为开�者�供的。"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "World name"
@@ -475,11 +533,6 @@ msgid "Browse"
 msgstr "�览"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "客户端"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "�用"
 
@@ -524,6 +577,10 @@ msgid "Scale"
 msgstr "比例"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "�索"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "选择目录"
 
@@ -638,6 +695,19 @@ msgstr "无法将$1安装为mod"
 msgid "Unable to install a modpack as a $1"
 msgstr "无法将$1安装为mod包"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "载入中..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "客户端脚本已�用"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "请�试�新�用公共�务器列表并检查您的网络连接。"
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "�览在线内容"
@@ -691,7 +761,14 @@ msgid "Credits"
 msgstr "贡献者"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "选择目录"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -711,14 +788,10 @@ msgid "Bind Address"
 msgstr "绑定地�"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "�置"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "创造模�"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "开�伤害"
 
@@ -732,11 +805,11 @@ msgstr "建立�务器"
 
 #: builtin/mainmenu/tab_local.lua
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "从 ContentDB 安装游�"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "用户�/密�"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -747,6 +820,11 @@ msgid "No world created or selected!"
 msgstr "未创建或选择世界!"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "新密�"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "开始游�"
 
@@ -755,6 +833,11 @@ msgid "Port"
 msgstr "端�"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "选择世界："
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "选择世界："
 
@@ -770,23 +853,23 @@ msgstr "�动游�"
 msgid "Address / Port"
 msgstr "地�/端�"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "连接"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "创造模�"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "伤害已�用"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "删除收�项"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "收�项"
 
@@ -794,16 +877,16 @@ msgstr "收�项"
 msgid "Join Game"
 msgstr "加入游�"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "用户�/密�"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "应答速度"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "�用玩家对战"
 
@@ -832,10 +915,6 @@ msgid "Antialiasing:"
 msgstr "抗锯齿："
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "你确定��置你的�人世界�？"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "自动�存�幕尺寸"
 
@@ -843,10 +922,6 @@ msgstr "自动�存�幕尺寸"
 msgid "Bilinear Filter"
 msgstr "�线性过滤"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "凹凸贴图"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "更改键�设置"
@@ -860,10 +935,6 @@ msgid "Fancy Leaves"
 msgstr "�丽树�"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "生�法线贴图"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mip 贴图"
 
@@ -872,10 +943,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mip 贴图 + ��异性过滤"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "�"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "无过滤"
 
@@ -903,19 +970,11 @@ msgstr "��明树�"
 msgid "Opaque Water"
 msgstr "��明水"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "视差�蔽"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "粒�效果"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "�置�人世界"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "�幕："
 
@@ -928,6 +987,11 @@ msgid "Shaders"
 msgstr "�色器"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "悬空岛（实验性）"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "�色器 (��用)"
 
@@ -941,7 +1005,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."
@@ -971,22 +1035,6 @@ msgstr "摇动�体"
 msgid "Waving Plants"
 msgstr "摇摆�物"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "是"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "�置 mod"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "主��"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "�人游�"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "连接超时。"
@@ -1148,18 +1196,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "控制：\n"
 "- %s：��移动\n"
@@ -1186,7 +1231,7 @@ msgstr "建立�务器...."
 
 #: src/client/game.cpp
 msgid "Debug info and profiler graph hidden"
-msgstr "��的调试信�和性能分�图"
+msgstr "调试信�和性能分�图已��"
 
 #: src/client/game.cpp
 msgid "Debug info shown"
@@ -1194,7 +1239,7 @@ msgstr "调试信�已显示"
 
 #: src/client/game.cpp
 msgid "Debug info, profiler graph, and wireframe hidden"
-msgstr "��调试信�，性能分�图，和线框"
+msgstr "调试信��性能分�图和线框已��"
 
 #: src/client/game.cpp
 msgid ""
@@ -1246,7 +1291,7 @@ msgstr "快速模�已�用"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled"
-msgstr "快速移动模�已�用"
+msgstr "快速模�已�用"
 
 #: src/client/game.cpp
 msgid "Fast mode enabled (note: no 'fast' privilege)"
@@ -1273,16 +1318,6 @@ msgid "Fog enabled"
 msgstr "雾气已�用"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "雾气已�用"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "雾气已�用"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "游�信�:"
 
@@ -1303,16 +1338,6 @@ msgid "KiB/s"
 msgstr "KiB/s"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "雾气已�用"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "伤害已�用"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "媒体..."
 
@@ -1325,34 +1350,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "�地图被当��游�或者 mod �用"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "�地图已��"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "雷达�地图，放大至一�"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "雷达�地图，放大至两�"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "雷达�地图, 放大至四�"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "地表模��地图, 放大至一�"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "地表模��地图, 放大至两�"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "地表模��地图, 放大至四�"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "穿墙模�已�用"
 
@@ -1386,7 +1383,7 @@ msgstr "俯仰移动模�已�用"
 
 #: src/client/game.cpp
 msgid "Profiler graph shown"
-msgstr "显示性能分�图"
+msgstr "性能分�图已显示"
 
 #: src/client/game.cpp
 msgid "Remote server"
@@ -1397,10 +1394,6 @@ msgid "Resolving address..."
 msgstr "正在解�地�..."
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "�生"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "关闭中..."
 
@@ -1418,11 +1411,11 @@ msgstr "已�音"
 
 #: src/client/game.cpp
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "声音系统已�用"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "此编译版本�支�声音系统"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1453,10 +1446,6 @@ msgid "Wireframe shown"
 msgstr "线框已显示"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "您已死亡"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "缩放被当��游�或 mod �用"
 
@@ -1473,16 +1462,6 @@ msgid "Chat shown"
 msgstr "�天已显示"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "�天已��"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "�天已显示"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "HUD 已��"
 
@@ -1762,6 +1741,25 @@ msgstr "Xé”®2"
 msgid "Zoom"
 msgstr "缩放"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "�地图已��"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "雷达�地图，放大至一�"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "地表模��地图, 放大至一�"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "最��质大�"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "密��匹��"
@@ -1779,8 +1777,9 @@ msgid ""
 "Please retype your password and click 'Register and Join' to confirm account "
 "creation, or click 'Cancel' to abort."
 msgstr ""
-"这是你第一次用“%s�加入�务器。 如果�继续，一个新的用户将在�务器上创建。\n"
-"请�新输入你的密�然�点击“注册�或点击“�消�。"
+"这是你第一次用“%s�加入�务器。\n"
+"如果�继续，一个新的用户将在�务器上创建。\n"
+"请�新输入你的密�然�点击“注册��创建用户或点击“�消�退出。"
 
 #: src/gui/guiFormSpecMenu.cpp
 msgid "Proceed"
@@ -1803,26 +1802,6 @@ msgid "Backward"
 msgstr "��"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "改�相机"
 
@@ -1915,36 +1894,16 @@ msgid "Special"
 msgstr "特殊"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "特殊"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "切�电影模�"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "切�电影模�"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "�用/�用HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "�用/�用飞行模�"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "�用/�用�天记录"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fast"
-msgstr "�用/�用快速移动模�"
+msgstr "�用/�用快速模�"
 
 #: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle fly"
@@ -2067,14 +2026,6 @@ msgstr ""
 "孤岛的垂直压�形状，将所有3个数字设置为相等以呈现原始形状。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = 利用梯度信�进行视差�蔽 (较快).\n"
-"1 = 浮雕映射 (较慢, 但准确)."
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "控制山脊形状/大�的2D噪声。"
 
@@ -2111,9 +2062,8 @@ msgid "3D mode"
 msgstr "3D 模�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "3D mode parallax strength"
-msgstr "法线贴图强度"
+msgstr "3D模�视差强度"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining giant caverns."
@@ -2134,6 +2084,10 @@ msgid ""
 "to be adjusted, as floatland tapering functions best when this noise has\n"
 "a value range of approximately -2.0 to 2.0."
 msgstr ""
+"悬空岛的3D噪波定义结构。\n"
+"如果改�了默认值，噪波“scale�(默认为0.7)�能需�\n"
+"调整，因为当这个噪波的值范围大约为-2.0到2.0时，\n"
+"悬空岛���窄的函数最好。"
 
 #: src/settings_translation_file.cpp
 msgid "3D noise defining structure of river canyon walls."
@@ -2196,9 +2150,12 @@ msgid "ABM interval"
 msgstr "ABMé—´éš”"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Absolute limit of queued blocks to emerge"
-msgstr "生产队列�对�制"
+msgstr "待显示方�队列的�对�制"
 
 #: src/settings_translation_file.cpp
 msgid "Acceleration in air"
@@ -2253,6 +2210,11 @@ msgid ""
 "Value = 2.0 (can be higher depending on 'mgv7_np_floatland', always test\n"
 "to be sure) creates a solid floatland layer."
 msgstr ""
+"调整悬空岛层的密度。\n"
+"增加值以增加密度。�以是正值或负值。\n"
+"值等于0.0， 容积的50%是floatland。\n"
+"值等于2.0  ，（�以更高，�决于 'mgv7_np_floatland' ，始终测试以确定）\n"
+"创建一个�实的悬空岛层。"
 
 #: src/settings_translation_file.cpp
 msgid "Advanced"
@@ -2274,7 +2236,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Always fly and fast"
-msgstr "��高速飞行"
+msgstr "��飞行和快速模�"
 
 #: src/settings_translation_file.cpp
 msgid "Ambient occlusion gamma"
@@ -2441,17 +2403,13 @@ msgstr "粗体等宽字体路径"
 
 #: src/settings_translation_file.cpp
 msgid "Build inside player"
-msgstr "建立内部玩家"
+msgstr "在玩家内部�建"
 
 #: src/settings_translation_file.cpp
 msgid "Builtin"
 msgstr "内置"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "凹凸贴图"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2528,32 +2486,16 @@ msgstr ""
 "0.0为最�值时1.0为最大值。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-"主��UI的�化：\n"
-"-   完整  多个�人世界，�游�选择，�质包选择器等。\n"
-"-   简�：�个�人世界，无�游��质包选择器。�能\n"
-"需�用于��幕。"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat font size"
-msgstr "字体大�"
+msgstr "�天字体大�"
 
 #: src/settings_translation_file.cpp
 msgid "Chat key"
 msgstr "�天键"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Chat log level"
-msgstr "调试日志级别"
+msgstr "�天日志级别"
 
 #: src/settings_translation_file.cpp
 msgid "Chat message count limit"
@@ -2705,6 +2647,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr "ContentDB标签黑��"
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "ContentDB URL"
 msgstr "ContentDB网�"
 
@@ -2769,7 +2715,10 @@ msgid "Crosshair alpha"
 msgstr "准星�明"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "准星��明度（0-255）。"
 
 #: src/settings_translation_file.cpp
@@ -2777,8 +2726,10 @@ msgid "Crosshair color"
 msgstr "准星颜色"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "准星颜色（红,绿,�）。"
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2841,9 +2792,8 @@ msgid "Default report format"
 msgstr "默认报告格�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Default stack size"
-msgstr "默认游�"
+msgstr "默认栈大�"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -2882,14 +2832,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "定义所选的山和湖的�置与地形。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"定义�质采样步骤。\n"
-"数值越高常�贴图越平滑。"
-
-#: src/settings_translation_file.cpp
 msgid "Defines the base ground level."
 msgstr "定义基准地�高度."
 
@@ -2964,6 +2906,11 @@ msgid "Desynchronize block animation"
 msgstr "去�步�动画"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "�方�键"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "挖掘粒�效果"
 
@@ -3028,7 +2975,8 @@ msgid "Enable console window"
 msgstr "�用控制�窗�"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "为新建地图�用创造模�。"
 
 #: src/settings_translation_file.cpp
@@ -3137,17 +3085,6 @@ msgid "Enables animation of inventory items."
 msgstr "�用物�清�动画。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"�用�质的凹凸贴图效果。需��质包支�法线贴图，\n"
-"�则将自动生�法线。\n"
-"需��用�色器。"
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "�用翻转网状物facedir的缓存。"
 
@@ -3157,22 +3094,6 @@ msgstr "�用�地图。"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"�用�时法线贴图生�（浮雕效果）。\n"
-"需��用凹凸贴图。"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"�用视差�蔽贴图。\n"
-"需��用�色器。"
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3193,14 +3114,6 @@ msgstr "实体方法"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"实验性选项，设为大于 0 的数字时�能导致\n"
-"�之间出现��空间。"
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3208,10 +3121,16 @@ msgid ""
 "Values < 1.0 (for example 0.25) create a more defined surface level with\n"
 "flatter lowlands, suitable for a solid floatland layer."
 msgstr ""
+"悬空岛锥度的指数，更改锥度的行为。\n"
+"值等于1.0，创建一个统一的，线性锥度。\n"
+"值大于1.0，创建一个平滑的��适的锥度，默认分隔的悬空岛。\n"
+"值�于1.0，（例如0.25）创建一个带有平�低地的更加轮廓分明的表�级别，\n"
+"适用于固体悬空岛层。"
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "暂��� FPS"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "游�暂�时最高 FPS。"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3243,7 +3162,7 @@ msgstr "�备字体大�"
 
 #: src/settings_translation_file.cpp
 msgid "Fast key"
-msgstr "快速移动键"
+msgstr "快速键"
 
 #: src/settings_translation_file.cpp
 msgid "Fast mode acceleration"
@@ -3327,39 +3246,32 @@ msgid "Fixed virtual joystick"
 msgstr "固定虚拟摇�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland density"
-msgstr "水级别"
+msgstr "悬空岛密度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland maximum Y"
-msgstr "地窖最大Y�标"
+msgstr "悬空岛最大Y�标"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland minimum Y"
-msgstr "地窖最�Y�标"
+msgstr "悬空岛最�Y�标"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland noise"
-msgstr "水级别"
+msgstr "悬空岛噪声"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland taper exponent"
-msgstr "水级别"
+msgstr "悬空岛尖�指数"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland tapering distance"
-msgstr "玩家转移�离"
+msgstr "悬空岛尖��离"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Floatland water level"
-msgstr "水级别"
+msgstr "悬空岛水�"
 
 #: src/settings_translation_file.cpp
 msgid "Fly key"
@@ -3418,6 +3330,8 @@ msgid ""
 "Font size of the recent chat text and chat prompt in point (pt).\n"
 "Value 0 will use the default font size."
 msgstr ""
+"最近�天文本和�天�示的字体大�（pt）。\n"
+"值为0将使用默认字体大�。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -3534,10 +3448,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "GUI缩放过滤器 txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "生��现贴图"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "全局回调"
 
@@ -3596,10 +3506,11 @@ msgid "HUD toggle key"
 msgstr "HUD�用/�用键"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "处�已弃用的 Lua API 调用：\n"
@@ -4117,6 +4028,11 @@ msgid "Joystick button repetition interval"
 msgstr "摇�按钮��间隔"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "摇�类型"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "摇�头��度"
 
@@ -4219,6 +4135,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"跳跃键。\n"
+"�http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4361,6 +4288,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"跳跃键。\n"
+"�http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4749,7 +4687,7 @@ msgid ""
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 msgstr ""
-"开关电影模�键。\n"
+"�用/�用电影模�键。\n"
 "�http://irrlicht.sourceforge.net/docu/namespaceirr."
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
@@ -5097,19 +5035,14 @@ msgid "Lower Y limit of dungeons."
 msgstr "地窖的Y值下�。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Lower Y limit of floatlands."
-msgstr "地窖的Y值下�。"
+msgstr "悬空岛的Y值下�。"
 
 #: src/settings_translation_file.cpp
 msgid "Main menu script"
 msgstr "主��脚本"
 
 #: src/settings_translation_file.cpp
-msgid "Main menu style"
-msgstr "主��样�"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr "使雾和天空颜色�赖于一天中的时间（黎明/�晚）和视线方�。"
@@ -5123,6 +5056,14 @@ msgid "Makes all liquids opaque"
 msgstr "使所有液体��明"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "地图目录"
 
@@ -5181,7 +5122,6 @@ msgstr ""
 "忽略'jungles'标签。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Map generation attributes specific to Mapgen v7.\n"
 "'ridges': Rivers.\n"
@@ -5189,7 +5129,9 @@ msgid ""
 "'caverns': Giant caves deep underground."
 msgstr ""
 "针对v7地图生�器的属性。\n"
-"'ridges'�用河�。"
+"'ridges'：�用河�。\n"
+"'floatlands'：漂浮于大气中的陆�。\n"
+"'caverns'：地下深处的巨大洞穴。"
 
 #: src/settings_translation_file.cpp
 msgid "Map generation limit"
@@ -5304,7 +5246,8 @@ msgid "Maximum FPS"
 msgstr "最大 FPS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "游�暂�时最高 FPS。"
 
 #: src/settings_translation_file.cpp
@@ -5346,22 +5289,27 @@ msgid "Maximum number of blocks that can be queued for loading."
 msgstr "�在加载时加入队列的最大方�数。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be generated.\n"
 "This limit is enforced per player."
 msgstr ""
 "在生�时加入队列的最大方�数。\n"
-"设置为空白则自动选择�适的数值。"
+"此�制对��玩家强制执行。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Maximum number of blocks to be queued that are to be loaded from file.\n"
 "This limit is enforced per player."
 msgstr ""
 "在从文件中加载时加入队列的最大方�数。\n"
-"设置为空白则自动选择�适的数值。"
+"此�制对��玩家强制执行。"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
@@ -5455,7 +5403,7 @@ msgstr "用于高亮选定的对象的方法。"
 
 #: src/settings_translation_file.cpp
 msgid "Minimal level of logging to be written to chat."
-msgstr ""
+msgstr "写入�天的最�日志级别。"
 
 #: src/settings_translation_file.cpp
 msgid "Minimap"
@@ -5613,19 +5561,10 @@ msgid "Noises"
 msgstr "噪声"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "法线贴图采样"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "法线贴图强度"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "生产线程数"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid ""
 "Number of emerge threads to use.\n"
 "Value 0:\n"
@@ -5639,9 +5578,6 @@ msgid ""
 "'on_generated'. For many users the optimum setting may be '1'."
 msgstr ""
 "使用的生产线程数。\n"
-"警告：当'num_emerge_threads'大于1时，目�有很\n"
-"多bug会导致崩溃。\n"
-"强烈建议在此警告被移除之�将此值设为默认值'1'。\n"
 "值0：\n"
 "-    自动选择。生产线程数会是‘处�器数-2’，\n"
 "-    下�为1。\n"
@@ -5650,7 +5586,7 @@ msgstr ""
 "警告：增大此值会�高引擎地图生�器速度，但会由于\n"
 "干扰其他进程而影�游�体验，尤其是�人模�或�行\n"
 "‘on_generated’中的Lua代�。对于大部分用户�说，最\n"
-"佳值为1。"
+"佳值为'1'。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5663,10 +5599,6 @@ msgstr ""
 "（4096=100MB，按�验法则）。"
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "视差�蔽迭代数。"
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr "在线内容仓库（ContentDB）"
 
@@ -5694,34 +5626,6 @@ msgstr ""
 "则�暂�。"
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "视差�蔽效果的整体斜纹，通常为比例/2。"
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "视差�蔽效果的总体比例。"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "视差�蔽"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "视差�蔽�移"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "视差�蔽迭代"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "视差�蔽模�"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion scale"
-msgstr "视差�蔽比例"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5739,6 +5643,8 @@ msgid ""
 "Path to save screenshots at. Can be an absolute or relative path.\n"
 "The folder will be created if it doesn't already exist."
 msgstr ""
+"路径�存截图。�以是�对路径或相对路径。\n"
+"如果该文件夹�存在，将创建它。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5780,12 +5686,11 @@ msgstr "丢失窗�焦点时暂�"
 
 #: src/settings_translation_file.cpp
 msgid "Per-player limit of queued blocks load from disk"
-msgstr ""
+msgstr "�个玩家从�盘加载的队列�的�制"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Per-player limit of queued blocks to generate"
-msgstr "�生�的生产队列�制"
+msgstr "�个玩家�生�的生产队列�制"
 
 #: src/settings_translation_file.cpp
 msgid "Physics"
@@ -5800,6 +5705,16 @@ msgid "Pitch move mode"
 msgstr "俯仰移动模�"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "飞行键"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "�击��间隔"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5865,7 +5780,7 @@ msgstr "性能分�"
 
 #: src/settings_translation_file.cpp
 msgid "Prometheus listener address"
-msgstr ""
+msgstr "Prometheus 监�器地�"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -5874,6 +5789,10 @@ msgid ""
 "enable metrics listener for Prometheus on that address.\n"
 "Metrics can be fetch on http://127.0.0.1:30000/metrics"
 msgstr ""
+"Prometheus 监�器地�。\n"
+"如果minetest是在�用ENABLE_PROMETHEUS选项的情况下编译的，\n"
+"在该地�上为 Prometheus �用指标侦�器。\n"
+"�以从 http://127.0.0.1:30000/metrics 获�指标"
 
 #: src/settings_translation_file.cpp
 msgid "Proportion of large caves that contain liquid."
@@ -5977,10 +5896,6 @@ msgid "Right key"
 msgstr "�方�键"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "�击��间隔"
-
-#: src/settings_translation_file.cpp
 msgid "River channel depth"
 msgstr "河�深度"
 
@@ -6270,6 +6185,20 @@ msgid "Show entity selection boxes"
 msgstr "显示实体选择框"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"设定语言。留空以使用系统语言。\n"
+"�更�须�新�动。"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Show nametag backgrounds by default"
+msgstr "默认粗体"
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "关闭消�"
 
@@ -6305,7 +6234,7 @@ msgstr "切片 w"
 
 #: src/settings_translation_file.cpp
 msgid "Slope and fill work together to modify the heights."
-msgstr ""
+msgstr "斜率和填充共�工作�修改高度。"
 
 #: src/settings_translation_file.cpp
 msgid "Small cave maximum number"
@@ -6385,6 +6314,8 @@ msgid ""
 "Note that mods or games may explicitly set a stack for certain (or all) "
 "items."
 msgstr ""
+"指定节点�物�和工具的默认堆�数�。\n"
+"请注�，mod或游��能会为�些（或所有）项目明确设置堆栈。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6392,6 +6323,9 @@ msgid ""
 "Controls the width of the range to be boosted.\n"
 "Standard deviation of the light curve boost Gaussian."
 msgstr ""
+"光曲线��范围的分布。\n"
+"控制���的范围的宽度。\n"
+"光曲线的标准�差���高斯。"
 
 #: src/settings_translation_file.cpp
 msgid "Static spawnpoint"
@@ -6399,25 +6333,19 @@ msgstr "���生点"
 
 #: src/settings_translation_file.cpp
 msgid "Steepness noise"
-msgstr ""
+msgstr "陡度噪声"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Step mountain size noise"
-msgstr "地形高度"
+msgstr "�步山峰高度噪声"
 
 #: src/settings_translation_file.cpp
 msgid "Step mountain spread noise"
-msgstr ""
+msgstr "�步山峰广度噪声"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Strength of 3D mode parallax."
-msgstr "视差强度。"
-
-#: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "生�的一般地图强度。"
+msgstr "3D 模�视差的强度。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6425,6 +6353,9 @@ msgid ""
 "The 3 'boost' parameters define a range of the light\n"
 "curve that is boosted in brightness."
 msgstr ""
+"光照曲线��的强度。\n"
+"3 个'boost'�数定义了在亮度上��的\n"
+"光照曲线的范围。"
 
 #: src/settings_translation_file.cpp
 msgid "Strict protocol checking"
@@ -6432,7 +6363,7 @@ msgstr "严格�议检查"
 
 #: src/settings_translation_file.cpp
 msgid "Strip color codes"
-msgstr ""
+msgstr "�形颜色代�"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6447,6 +6378,16 @@ msgid ""
 "server-intensive extreme water flow and to avoid vast flooding of the\n"
 "world surface below."
 msgstr ""
+"放置在固体浮地层的�选水的表�水平。\n"
+"默认情况下，水处于�用状�，并且仅在设置此值时�放置\n"
+"在'mgv7_floatland_ymax' - 'mgv7_floatland_taper'上（\n"
+"上部���细的开始）。\n"
+"***警告，世界存档和�务器性能的潜在�险***：\n"
+"�用水放置时，必须�置和测试悬空岛\n"
+"通过将\"mgv7_floatland_density\"设置为 2.0（或其他\n"
+"所需的值，具体�决于mgv7_np_floatland\"），确�是固体层，\n"
+"以���务器密集的�端水�，\n"
+"并��地表的巨大的洪水。"
 
 #: src/settings_translation_file.cpp
 msgid "Synchronous SQLite"
@@ -6454,32 +6395,27 @@ msgstr "�步 SQLite"
 
 #: src/settings_translation_file.cpp
 msgid "Temperature variation for biomes."
-msgstr ""
+msgstr "生物群系的温度�化。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain alternative noise"
-msgstr "地形高度"
+msgstr "地形替代噪声"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain base noise"
-msgstr "地形高度"
+msgstr "地形基准高度噪声"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain height"
 msgstr "地形高度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain higher noise"
-msgstr "地形高度"
+msgstr "地形增高噪声"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Terrain noise"
-msgstr "地形高度"
+msgstr "地形噪声"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6487,6 +6423,9 @@ msgid ""
 "Controls proportion of world area covered by hills.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"丘陵的地形噪声阈值。\n"
+"控制山丘覆盖的世界区域的比例。\n"
+"�0.0调整较大的比例。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6494,14 +6433,17 @@ msgid ""
 "Controls proportion of world area covered by lakes.\n"
 "Adjust towards 0.0 for a larger proportion."
 msgstr ""
+"湖泊的地形噪声阈值。\n"
+"控制被湖泊覆盖的世界区域的比例。\n"
+"�0.0调整较大的比例。"
 
 #: src/settings_translation_file.cpp
 msgid "Terrain persistence noise"
-msgstr ""
+msgstr "地形�久性噪声"
 
 #: src/settings_translation_file.cpp
 msgid "Texture path"
-msgstr "纹�路径"
+msgstr "�质路径"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6514,7 +6456,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "The URL for the content repository"
+msgstr "内容存储库的 URL"
+
+#: src/settings_translation_file.cpp
+msgid "The deadzone of the joystick"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6578,8 +6525,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6605,15 +6552,20 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6626,6 +6578,9 @@ msgid ""
 "enabled. Also the vertical distance over which humidity drops by 10 if\n"
 "'altitude_dry' is enabled."
 msgstr ""
+"如果'altitude_chill'开�，则热�下�20的垂直�离\n"
+"已�用。如果湿度下�的垂直�离也是10\n"
+"已�用“ altitude_dry�。"
 
 #: src/settings_translation_file.cpp
 #, fuzzy
@@ -6637,10 +6592,12 @@ msgid ""
 "Time in seconds for item entity (dropped items) to live.\n"
 "Setting it to -1 disables the feature."
 msgstr ""
+"项目实体（删除的项目）生存的时间（以秒为��）。\n"
+"将其设置为 -1 将�用该功能。"
 
 #: src/settings_translation_file.cpp
 msgid "Time of day when a new world is started, in millihours (0-23999)."
-msgstr ""
+msgstr "一天中开始一个新世界的时间，以毫�时为��（0-23999）。"
 
 #: src/settings_translation_file.cpp
 msgid "Time send interval"
@@ -6671,13 +6628,12 @@ msgid "Tooltip delay"
 msgstr "工具�示延迟"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Touch screen threshold"
-msgstr "海滩噪音阈值"
+msgstr "触�阈值"
 
 #: src/settings_translation_file.cpp
 msgid "Trees noise"
-msgstr ""
+msgstr "树木噪声"
 
 #: src/settings_translation_file.cpp
 msgid "Trilinear filtering"
@@ -6689,6 +6645,9 @@ msgid ""
 "False = 128\n"
 "Usable to make minimap smoother on slower machines."
 msgstr ""
+"True = 256\n"
+"False = 128\n"
+"�用于在较慢的机器上使最�地图更平滑。"
 
 #: src/settings_translation_file.cpp
 msgid "Trusted mods"
@@ -6696,11 +6655,12 @@ msgstr "�信 mod"
 
 #: src/settings_translation_file.cpp
 msgid "URL to the server list displayed in the Multiplayer Tab."
-msgstr ""
+msgstr "显示在“多人游��选项�中的�务器列表的URL。"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Undersampling"
-msgstr ""
+msgstr "欠采样"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6724,17 +6684,17 @@ msgid "Upper Y limit of dungeons."
 msgstr "地窖的Y值上�。"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Upper Y limit of floatlands."
-msgstr "地窖的Y值上�。"
+msgstr "悬空岛的Y值上�。"
 
 #: src/settings_translation_file.cpp
 msgid "Use 3D cloud look instead of flat."
 msgstr "使用 3D 云彩，而�是看起�是平�的。"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Use a cloud animation for the main menu background."
-msgstr ""
+msgstr "主��背景使用云动画。"
 
 #: src/settings_translation_file.cpp
 msgid "Use anisotropic filtering when viewing at textures from an angle."
@@ -6752,6 +6712,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr ""
 
@@ -6760,12 +6731,10 @@ msgid "VBO"
 msgstr "VBO"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "VSync"
 msgstr "垂直�步"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley depth"
 msgstr "山谷深度"
 
@@ -6775,26 +6744,24 @@ msgid "Valley fill"
 msgstr "山谷弥漫"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley profile"
 msgstr "山谷轮廓"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Valley slope"
 msgstr "山谷�度"
 
 #: src/settings_translation_file.cpp
 msgid "Variation of biome filler depth."
-msgstr ""
+msgstr "生物群�填充物深度的�化。"
 
 #: src/settings_translation_file.cpp
 msgid "Variation of maximum mountain height (in nodes)."
-msgstr ""
+msgstr "最大山体高度的�化（以节点为��）。"
 
 #: src/settings_translation_file.cpp
 msgid "Variation of number of caves."
-msgstr ""
+msgstr "洞�数�的�化。"
 
 #: src/settings_translation_file.cpp
 msgid ""
@@ -6835,11 +6802,8 @@ msgid "View bobbing factor"
 msgstr "范围摇动"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "View distance in nodes."
-msgstr ""
-"节点间�视�离。\n"
-"最� = 20"
+msgstr "�视�离（以节点方�为��）。"
 
 #: src/settings_translation_file.cpp
 msgid "View range decrease key"
@@ -6885,7 +6849,7 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Walking and flying speed, in nodes per second."
-msgstr ""
+msgstr "步行和飞行速度，��为方��秒。"
 
 #: src/settings_translation_file.cpp
 msgid "Walking speed"
@@ -6893,13 +6857,14 @@ msgstr "步行速度"
 
 #: src/settings_translation_file.cpp
 msgid "Walking, flying and climbing speed in fast mode, in nodes per second."
-msgstr ""
+msgstr "快速模�下的步行�飞行和攀爬速度，��为方��秒。"
 
 #: src/settings_translation_file.cpp
 msgid "Water level"
-msgstr "水级别"
+msgstr "水�"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
 msgid "Water surface level of the world."
 msgstr "世界水平�级别。"
 
@@ -6912,24 +6877,20 @@ msgid "Waving leaves"
 msgstr "摇动树�"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids"
-msgstr "摇动�体"
+msgstr "波动�体"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave height"
-msgstr "摇动水高度"
+msgstr "波动液体波动高度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wave speed"
-msgstr "摇动水速度"
+msgstr "波动液体波动速度"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
 msgid "Waving liquids wavelength"
-msgstr "摇动水长度"
+msgstr "波动液体波动长度"
 
 #: src/settings_translation_file.cpp
 msgid "Waving plants"
@@ -6971,6 +6932,12 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr ""
 
@@ -7092,10 +7059,28 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of lower terrain and seabed."
-msgstr ""
+msgstr "较低地形与海底的Y�标。"
 
 #: src/settings_translation_file.cpp
 msgid "Y-level of seabed."
+msgstr "海底的Y�标。"
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -7110,23 +7095,12 @@ msgstr "cURL 并��制"
 msgid "cURL timeout"
 msgstr "cURL 超时"
 
-#~ msgid "Ok"
-#~ msgstr "确定"
-
-#~ msgid "Back"
-#~ msgstr "�退"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "正在下载和安装 $1，请�等..."
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "�盘上的生产队列�制"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "视差�蔽强度"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "�幕截图�存路径。"
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = 利用梯度信�进行视差�蔽 (较快).\n"
+#~ "1 = 浮雕映射 (较慢, 但准确)."
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7136,6 +7110,37 @@ msgstr "cURL 超时"
 #~ "调整亮度表的伽玛编�。较高的数值会较亮。\n"
 #~ "这个设定是给客户端使用的，会被�务器忽略。"
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "你确定��置你的�人世界�？"
+
+#~ msgid "Back"
+#~ msgstr "�退"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "凹凸贴图"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "凹凸贴图"
+
+#~ msgid ""
+#~ "Changes the main menu UI:\n"
+#~ "-   Full:  Multiple singleplayer worlds, game choice, texture pack "
+#~ "chooser, etc.\n"
+#~ "-   Simple: One singleplayer world, no game or texture pack choosers. May "
+#~ "be\n"
+#~ "necessary for smaller screens."
+#~ msgstr ""
+#~ "主��UI的�化：\n"
+#~ "-   完整  多个�人世界，�游�选择，�质包选择器等。\n"
+#~ "-   简�：�个�人世界，无�游��质包选择器。�能\n"
+#~ "需�用于��幕。"
+
+#~ msgid "Config mods"
+#~ msgstr "�置 mod"
+
+#~ msgid "Configure"
+#~ msgstr "�置"
+
 #, fuzzy
 #~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
@@ -7147,6 +7152,9 @@ msgstr "cURL 超时"
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "控制隧�宽度，较�的值创建更宽的隧�。"
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "准星颜色（红,绿,�）。"
+
 #, fuzzy
 #~ msgid "Darkness sharpness"
 #~ msgstr "地图生�器平�湖�度"
@@ -7158,18 +7166,68 @@ msgstr "cURL 超时"
 #~ "定义 floatland 平滑地形的区域。\n"
 #~ "当噪音0时, 平滑的 floatlands �生。"
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "定义�质采样步骤。\n"
+#~ "数值越高常�贴图越平滑。"
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "正在下载和安装 $1，请�等..."
+
 #~ msgid "Enable VBO"
 #~ msgstr "�用 VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "�用�质的凹凸贴图效果。需��质包支�法线贴图，\n"
+#~ "�则将自动生�法线。\n"
+#~ "需��用�色器。"
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "�用电影基调映射"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "�用�时法线贴图生�（浮雕效果）。\n"
+#~ "需��用凹凸贴图。"
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "�用视差�蔽贴图。\n"
+#~ "需��用�色器。"
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "实验性选项，设为大于 0 的数字时�能导致\n"
+#~ "�之间出现��空间。"
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "暂��� FPS"
+
 #~ msgid "Font shadow alpha (opaqueness, between 0 and 255)."
 #~ msgstr "字体阴影��明度（0-255）。"
 
 #~ msgid "Gamma"
 #~ msgstr "伽马"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "生�法线贴图"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "生��现贴图"
+
 #~ msgid "IPv6 support."
 #~ msgstr "IPv6 支�。"
 
@@ -7177,25 +7235,112 @@ msgstr "cURL 超时"
 #~ msgid "Lava depth"
 #~ msgstr "巨大洞穴深度"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "�盘上的生产队列�制"
+
+#~ msgid "Main"
+#~ msgstr "主��"
+
+#~ msgid "Main menu style"
+#~ msgstr "主��样�"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "雷达�地图，放大至两�"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "雷达�地图, 放大至四�"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "地表模��地图, 放大至两�"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "地表模��地图, 放大至四�"
+
+#~ msgid "Name/Password"
+#~ msgstr "用户�/密�"
+
+#~ msgid "No"
+#~ msgstr "�"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "法线贴图采样"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "法线贴图强度"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "视差�蔽迭代数。"
+
+#~ msgid "Ok"
+#~ msgstr "确定"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "视差�蔽效果的整体斜纹，通常为比例/2。"
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "视差�蔽效果的总体比例。"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "视差�蔽"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "视差�蔽"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "视差�蔽�移"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "视差�蔽迭代"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "视差�蔽模�"
+
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "视差�蔽比例"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "视差�蔽强度"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "TrueType 字体或�图的路径。"
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "�幕截图�存路径。"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "�置�人世界"
+
+#~ msgid "Select Package File:"
+#~ msgstr "选择包文件："
+
 #, fuzzy
 #~ msgid "Shadow limit"
 #~ msgstr "地图��制"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "�人游�"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "生�的一般地图强度。"
+
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "用于特定语言的字体。"
 
-#~ msgid "Waving water"
-#~ msgstr "摇动水"
+#~ msgid "Toggle Cinematic"
+#~ msgstr "切�电影模�"
+
+#~ msgid "View"
+#~ msgstr "视野"
 
 #~ msgid "Waving Water"
 #~ msgstr "�动的水�"
 
+#~ msgid "Waving water"
+#~ msgstr "摇动水"
+
 #, fuzzy
 #~ msgid "Y of upper limit of lava in large caves."
 #~ msgstr "大型�机洞穴的Y轴最大值。"
 
-#~ msgid "Select Package File:"
-#~ msgstr "选择包文件："
+#~ msgid "Yes"
+#~ msgstr "是"
diff --git a/po/zh_TW/minetest.po b/po/zh_TW/minetest.po
index bbe13a281..99332e226 100644
--- a/po/zh_TW/minetest.po
+++ b/po/zh_TW/minetest.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Chinese (Traditional) (Minetest)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-22 14:59+0200\n"
-"PO-Revision-Date: 2020-01-29 13:50+0000\n"
-"Last-Translator: pan93412 <pan93412@gmail.com>\n"
+"POT-Creation-Date: 2021-02-23 19:03+0100\n"
+"PO-Revision-Date: 2020-12-24 05:29+0000\n"
+"Last-Translator: Man Ho Yiu <yiufamily.hh@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
 "minetest/minetest/zh_Hant/>\n"
 "Language: zh_TW\n"
@@ -12,11 +12,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.11-dev\n"
+"X-Generator: Weblate 4.4.1-dev\n"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "Respawn"
+msgstr "�生"
+
+#: builtin/client/death_formspec.lua src/client/game.cpp
+msgid "You died"
+msgstr "您已死亡"
 
 #: builtin/fstk/dialog.lua builtin/fstk/ui.lua src/gui/modalMenu.cpp
+#, fuzzy
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: builtin/fstk/ui.lua
 msgid "An error occurred in a Lua script:"
@@ -38,10 +47,6 @@ msgstr "�新連線"
 msgid "The server has requested a reconnect:"
 msgstr "伺�器已�求�新連線："
 
-#: builtin/mainmenu/common.lua src/client/game.cpp
-msgid "Loading..."
-msgstr "正在載入..."
-
 #: builtin/mainmenu/common.lua
 msgid "Protocol version mismatch. "
 msgstr "�定版本�符�。 "
@@ -55,10 +60,6 @@ msgid "Server supports protocol versions between $1 and $2. "
 msgstr "伺�器支��定版本 $1 到 $2。 "
 
 #: builtin/mainmenu/common.lua
-msgid "Try reenabling public serverlist and check your internet connection."
-msgstr "請嘗試�新啟用公共伺�器清單並檢查您的網際網路連線。"
-
-#: builtin/mainmenu/common.lua
 msgid "We only support protocol version $1."
 msgstr "我們�支��定版本 $1。"
 
@@ -66,7 +67,8 @@ msgstr "我們�支��定版本 $1。"
 msgid "We support protocol versions between version $1 and $2."
 msgstr "我們支��定版本 $1 到 $2。"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_create_world.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_delete_content.lua
 #: builtin/mainmenu/dlg_delete_world.lua
 #: builtin/mainmenu/dlg_rename_modpack.lua
@@ -76,7 +78,8 @@ msgstr "我們支��定版本 $1 到 $2。"
 msgid "Cancel"
 msgstr "�消"
 
-#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/tab_content.lua
+#: builtin/mainmenu/dlg_config_world.lua builtin/mainmenu/dlg_contentstore.lua
+#: builtin/mainmenu/tab_content.lua
 msgid "Dependencies:"
 msgstr "相�元件："
 
@@ -104,7 +107,7 @@ msgstr "無法啟用 Mod「$1�，因為其包�了��許的字元。�能
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Find More Mods"
-msgstr ""
+msgstr "�尋更多 Mod"
 
 #: builtin/mainmenu/dlg_config_world.lua
 msgid "Mod:"
@@ -148,16 +151,58 @@ msgid "enabled"
 msgstr "已啟用"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+msgid "\"$1\" already exists. Would you like to overwrite it?"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 and $2 dependencies will be installed."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 by $2"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid ""
+"$1 downloading,\n"
+"$2 queued"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "$1 downloading..."
+msgstr "正在載入..."
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 required dependencies could not be found."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "$1 will be installed, and $2 dependencies will be skipped."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "All packages"
 msgstr "所有套件"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Already installed"
+msgstr "已使用此按�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
 msgid "Back to Main Menu"
 msgstr "返回主�單"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Base Game:"
+msgstr "主��戲"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
 msgid "ContentDB is not available when Minetest was compiled without cURL"
-msgstr ""
+msgstr "在沒有cURL的情�下編譯Minetest時，ContentDB��用"
 
 #: builtin/mainmenu/dlg_contentstore.lua
 #, fuzzy
@@ -178,6 +223,16 @@ msgid "Install"
 msgstr "安�"
 
 #: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install $1"
+msgstr "安�"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+#, fuzzy
+msgid "Install missing dependencies"
+msgstr "��相�元件："
+
+#: builtin/mainmenu/dlg_contentstore.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Mods"
 msgstr "Mod"
@@ -191,9 +246,25 @@ msgid "No results"
 msgstr "無�果"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-#: builtin/mainmenu/dlg_settings_advanced.lua builtin/mainmenu/tab_online.lua
-msgid "Search"
-msgstr "�尋"
+#, fuzzy
+msgid "No updates"
+msgstr "æ›´æ–°"
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Not found"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Overwrite"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Please check that the base game is correct."
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "Queued"
+msgstr ""
 
 #: builtin/mainmenu/dlg_contentstore.lua
 msgid "Texture packs"
@@ -208,7 +279,11 @@ msgid "Update"
 msgstr "æ›´æ–°"
 
 #: builtin/mainmenu/dlg_contentstore.lua
-msgid "View"
+msgid "Update All [$1]"
+msgstr ""
+
+#: builtin/mainmenu/dlg_contentstore.lua
+msgid "View more information in a web browser"
 msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
@@ -216,8 +291,9 @@ msgid "A world named \"$1\" already exists"
 msgstr "�為「$1�的世界已存在"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Additional terrain"
-msgstr ""
+msgstr "其他地形"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Altitude chill"
@@ -271,8 +347,9 @@ msgid "Dungeons"
 msgstr "地城雜訊"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Flat terrain"
-msgstr ""
+msgstr "平�世界"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -294,7 +371,7 @@ msgstr ""
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Hills"
-msgstr ""
+msgstr "å±±"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -302,16 +379,18 @@ msgid "Humid rivers"
 msgstr "顯示�驅動程�"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Increases humidity around rivers"
-msgstr ""
+msgstr "增加河�周�的濕度"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Lakes"
-msgstr ""
+msgstr "河�"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Low humidity and high heat causes shallow or dry rivers"
-msgstr ""
+msgstr "因低濕度和高熱�而導致河�淺或乾燥"
 
 #: builtin/mainmenu/dlg_create_world.lua src/settings_translation_file.cpp
 msgid "Mapgen"
@@ -333,11 +412,12 @@ msgstr "山雜訊"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Mud flow"
-msgstr ""
+msgstr "泥石�"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Network of tunnels and caves"
-msgstr ""
+msgstr "隧�和洞穴網絡"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "No game selected"
@@ -358,7 +438,7 @@ msgstr "河�大�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Sea level rivers"
-msgstr ""
+msgstr "生�在海平�的河�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #: builtin/mainmenu/dlg_settings_advanced.lua
@@ -367,21 +447,23 @@ msgstr "種�"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Smooth transition between biomes"
-msgstr ""
+msgstr "生態域之間的平穩�渡"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid ""
 "Structures appearing on the terrain (no effect on trees and jungle grass "
 "created by v6)"
-msgstr ""
+msgstr "出�在地形上的�構（�v6地圖生�器創建的樹木和�林�無影響）"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Structures appearing on the terrain, typically trees and plants"
-msgstr ""
+msgstr "出�在地形上的�構，通常是樹木和�物"
 
 #: builtin/mainmenu/dlg_create_world.lua
+#, fuzzy
 msgid "Temperate, Desert"
-msgstr ""
+msgstr "溫帶沙漠"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Temperate, Desert, Jungle"
@@ -407,7 +489,7 @@ msgstr "河�深度"
 
 #: builtin/mainmenu/dlg_create_world.lua
 msgid "Very large caverns deep in the underground"
-msgstr ""
+msgstr "地下深處的巨大洞穴"
 
 #: builtin/mainmenu/dlg_create_world.lua
 #, fuzzy
@@ -475,11 +557,6 @@ msgid "Browse"
 msgstr "�覽"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
-#, fuzzy
-msgid "Clientmods"
-msgstr "用戶端"
-
-#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Disabled"
 msgstr "已�用"
 
@@ -527,6 +604,10 @@ msgid "Scale"
 msgstr "�模"
 
 #: builtin/mainmenu/dlg_settings_advanced.lua
+msgid "Search"
+msgstr "�尋"
+
+#: builtin/mainmenu/dlg_settings_advanced.lua
 msgid "Select directory"
 msgstr "�擇目錄"
 
@@ -641,6 +722,19 @@ msgstr "無法將 Mod 安�為 $1"
 msgid "Unable to install a modpack as a $1"
 msgstr "無法將 Mod 包安�為 $1"
 
+#: builtin/mainmenu/serverlistmgr.lua src/client/game.cpp
+msgid "Loading..."
+msgstr "正在載入..."
+
+#: builtin/mainmenu/serverlistmgr.lua
+#, fuzzy
+msgid "Public server list is disabled"
+msgstr "已�用用戶端指令稿"
+
+#: builtin/mainmenu/serverlistmgr.lua
+msgid "Try reenabling public serverlist and check your internet connection."
+msgstr "請嘗試�新啟用公共伺�器清單並檢查您的網際網路連線。"
+
 #: builtin/mainmenu/tab_content.lua
 msgid "Browse online content"
 msgstr "�覽線上內容"
@@ -694,7 +788,14 @@ msgid "Credits"
 msgstr "感�"
 
 #: builtin/mainmenu/tab_credits.lua
-msgid "Hackers"
+#, fuzzy
+msgid "Open User Data Directory"
+msgstr "�擇目錄"
+
+#: builtin/mainmenu/tab_credits.lua
+msgid ""
+"Opens the directory that contains user-provided worlds, games, mods,\n"
+"and texture packs in a file manager / explorer."
 msgstr ""
 
 #: builtin/mainmenu/tab_credits.lua
@@ -714,14 +815,10 @@ msgid "Bind Address"
 msgstr "�定地�"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Configure"
-msgstr "設定"
-
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
 msgid "Creative Mode"
 msgstr "創造模�"
 
-#: builtin/mainmenu/tab_local.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_local.lua
 msgid "Enable Damage"
 msgstr "啟用傷害"
 
@@ -734,12 +831,13 @@ msgid "Host Server"
 msgstr "主機伺�器"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
 msgid "Install games from ContentDB"
-msgstr ""
+msgstr "從ContentDB安��戲"
 
 #: builtin/mainmenu/tab_local.lua
-msgid "Name/Password"
-msgstr "�稱�密碼"
+msgid "Name"
+msgstr ""
 
 #: builtin/mainmenu/tab_local.lua
 msgid "New"
@@ -750,6 +848,11 @@ msgid "No world created or selected!"
 msgstr "未建立或��世界�"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Password"
+msgstr "新密碼"
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Play Game"
 msgstr "�玩�戲"
 
@@ -758,6 +861,11 @@ msgid "Port"
 msgstr "連線埠"
 
 #: builtin/mainmenu/tab_local.lua
+#, fuzzy
+msgid "Select Mods"
+msgstr "��世界："
+
+#: builtin/mainmenu/tab_local.lua
 msgid "Select World:"
 msgstr "��世界："
 
@@ -773,23 +881,23 @@ msgstr "開始�戲"
 msgid "Address / Port"
 msgstr "地��連線埠"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Connect"
 msgstr "連線"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Creative mode"
 msgstr "創造模�"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Damage enabled"
 msgstr "已啟用傷害"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Del. Favorite"
 msgstr "刪除收�"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Favorite"
 msgstr "收�"
 
@@ -797,16 +905,16 @@ msgstr "收�"
 msgid "Join Game"
 msgstr "加入�戲"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Name / Password"
 msgstr "�稱�密碼"
 
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "Ping"
 msgstr "Ping"
 
 #. ~ PvP = Player versus Player
-#: builtin/mainmenu/tab_online.lua builtin/mainmenu/tab_simple_main.lua
+#: builtin/mainmenu/tab_online.lua
 msgid "PvP enabled"
 msgstr "已啟用 PvP"
 
@@ -835,10 +943,6 @@ msgid "Antialiasing:"
 msgstr "�鋸齒："
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Are you sure to reset your singleplayer world?"
-msgstr "您確定��設您的單人�戲世界嗎？"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Autosave Screen Size"
 msgstr "自動儲存螢幕大�"
 
@@ -846,10 +950,6 @@ msgstr "自動儲存螢幕大�"
 msgid "Bilinear Filter"
 msgstr "雙線性�濾器"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Bump Mapping"
-msgstr "映射貼圖"
-
 #: builtin/mainmenu/tab_settings.lua src/client/game.cpp
 msgid "Change Keys"
 msgstr "變更按�"
@@ -863,10 +963,6 @@ msgid "Fancy Leaves"
 msgstr "�麗葉�"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Generate Normal Maps"
-msgstr "產生一般地圖"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Mipmap"
 msgstr "Mip 貼圖"
 
@@ -875,10 +971,6 @@ msgid "Mipmap + Aniso. Filter"
 msgstr "Mip 貼圖 + Aniso. �濾器"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "No"
-msgstr "�"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "No Filter"
 msgstr "沒有�濾器"
 
@@ -906,19 +998,11 @@ msgstr "��明葉�"
 msgid "Opaque Water"
 msgstr "��明水"
 
-#: builtin/mainmenu/tab_settings.lua src/settings_translation_file.cpp
-msgid "Parallax Occlusion"
-msgstr "視差�蔽"
-
 #: builtin/mainmenu/tab_settings.lua
 msgid "Particles"
 msgstr "ç²’å­�"
 
 #: builtin/mainmenu/tab_settings.lua
-msgid "Reset singleplayer world"
-msgstr "�設單人�戲世界"
-
-#: builtin/mainmenu/tab_settings.lua
 msgid "Screen:"
 msgstr "螢幕："
 
@@ -931,6 +1015,11 @@ msgid "Shaders"
 msgstr "著色器"
 
 #: builtin/mainmenu/tab_settings.lua
+#, fuzzy
+msgid "Shaders (experimental)"
+msgstr "浮地高度"
+
+#: builtin/mainmenu/tab_settings.lua
 msgid "Shaders (unavailable)"
 msgstr "著色器（無法使用）"
 
@@ -974,22 +1063,6 @@ msgstr "擺動液體"
 msgid "Waving Plants"
 msgstr "�物擺動"
 
-#: builtin/mainmenu/tab_settings.lua
-msgid "Yes"
-msgstr "是"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Config mods"
-msgstr "設定 Mod"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Main"
-msgstr "主�"
-
-#: builtin/mainmenu/tab_simple_main.lua
-msgid "Start Singleplayer"
-msgstr "開始單人�戲"
-
 #: src/client/client.cpp
 msgid "Connection timed out."
 msgstr "連線逾時。"
@@ -1151,18 +1224,15 @@ msgid ""
 "- %s: move backwards\n"
 "- %s: move left\n"
 "- %s: move right\n"
-"- %s: jump/climb\n"
-"- %s: sneak/go down\n"
+"- %s: jump/climb up\n"
+"- %s: dig/punch\n"
+"- %s: place/use\n"
+"- %s: sneak/climb down\n"
 "- %s: drop item\n"
 "- %s: inventory\n"
-"- %s: special inventory\n"
 "- Mouse: turn/look\n"
-"- Mouse left: dig/punch\n"
-"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- %s: chat\n"
-"- %s: Killaura\n"
-"- %s: Freecam\n"
 msgstr ""
 "控制：\n"
 "- %s：��移動\n"
@@ -1276,16 +1346,6 @@ msgid "Fog enabled"
 msgstr "已啟用霧氣"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Freecam disabled"
-msgstr "已�用霧氣"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Freecam enabled"
-msgstr "已啟用霧氣"
-
-#: src/client/game.cpp
 msgid "Game info:"
 msgstr "�戲資訊："
 
@@ -1306,16 +1366,6 @@ msgid "KiB/s"
 msgstr "KiB/秒"
 
 #: src/client/game.cpp
-#, fuzzy
-msgid "Killaura disabled"
-msgstr "已�用霧氣"
-
-#: src/client/game.cpp
-#, fuzzy
-msgid "Killaura enabled"
-msgstr "已啟用傷害"
-
-#: src/client/game.cpp
 msgid "Media..."
 msgstr "媒體..."
 
@@ -1328,34 +1378,6 @@ msgid "Minimap currently disabled by game or mod"
 msgstr "迷你地圖目�已被�戲或 Mod �用"
 
 #: src/client/game.cpp
-msgid "Minimap hidden"
-msgstr "已隱�迷你地圖"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x1"
-msgstr "雷�模�的迷你地圖，放大 1 �"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x2"
-msgstr "雷�模�的迷你地圖，放大 2 �"
-
-#: src/client/game.cpp
-msgid "Minimap in radar mode, Zoom x4"
-msgstr "雷�模�的迷你地圖，放大 4 �"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x1"
-msgstr "表�模�的迷你地圖，放大 1 �"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x2"
-msgstr "表�模�的迷你地圖，放大 2 �"
-
-#: src/client/game.cpp
-msgid "Minimap in surface mode, Zoom x4"
-msgstr "表�模�的迷你地圖，放大 4 �"
-
-#: src/client/game.cpp
 msgid "Noclip mode disabled"
 msgstr "已�用穿牆模�"
 
@@ -1400,10 +1422,6 @@ msgid "Resolving address..."
 msgstr "正在解�地�……"
 
 #: src/client/game.cpp
-msgid "Respawn"
-msgstr "�生"
-
-#: src/client/game.cpp
 msgid "Shutting down..."
 msgstr "正在關閉..."
 
@@ -1420,12 +1438,13 @@ msgid "Sound muted"
 msgstr "已�音"
 
 #: src/client/game.cpp
+#, fuzzy
 msgid "Sound system is disabled"
-msgstr ""
+msgstr "�音系統已被�用"
 
 #: src/client/game.cpp
 msgid "Sound system is not supported on this build"
-msgstr ""
+msgstr "此編譯版本�支��音系統"
 
 #: src/client/game.cpp
 msgid "Sound unmuted"
@@ -1456,10 +1475,6 @@ msgid "Wireframe shown"
 msgstr "已顯示線框"
 
 #: src/client/game.cpp
-msgid "You died"
-msgstr "您已死亡"
-
-#: src/client/game.cpp
 msgid "Zoom currently disabled by game or mod"
 msgstr "�近調整目�已被�戲或模組�用"
 
@@ -1476,16 +1491,6 @@ msgid "Chat shown"
 msgstr "顯示�天室"
 
 #: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu hidden"
-msgstr "隱��天室"
-
-#: src/client/gameui.cpp
-#, fuzzy
-msgid "Cheat Menu shown"
-msgstr "顯示�天室"
-
-#: src/client/gameui.cpp
 msgid "HUD hidden"
 msgstr "已隱� HUD"
 
@@ -1765,6 +1770,25 @@ msgstr "X 按鈕 2"
 msgid "Zoom"
 msgstr "�近調整"
 
+#: src/client/minimap.cpp
+msgid "Minimap hidden"
+msgstr "已隱�迷你地圖"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in radar mode, Zoom x%d"
+msgstr "雷�模�的迷你地圖，放大 1 �"
+
+#: src/client/minimap.cpp
+#, fuzzy, c-format
+msgid "Minimap in surface mode, Zoom x%d"
+msgstr "表�模�的迷你地圖，放大 1 �"
+
+#: src/client/minimap.cpp
+#, fuzzy
+msgid "Minimap in texture mode"
+msgstr "�濾器的最大�質大�"
+
 #: src/gui/guiConfirmRegistration.cpp src/gui/guiPasswordChange.cpp
 msgid "Passwords do not match!"
 msgstr "密碼�符��"
@@ -1807,26 +1831,6 @@ msgid "Backward"
 msgstr "後退"
 
 #: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Down"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Enter"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Left"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Right"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
-msgid "C. Menu Up"
-msgstr ""
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Change camera"
 msgstr "變更相機"
 
@@ -1919,30 +1923,10 @@ msgid "Special"
 msgstr "特殊"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Special Inv."
-msgstr "特殊"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle C. Menu"
-msgstr "切��場動畫"
-
-#: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Freec."
-msgstr "切��場動畫"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle HUD"
 msgstr "切� HUD"
 
 #: src/gui/guiKeyChangeMenu.cpp
-#, fuzzy
-msgid "Toggle Killaura"
-msgstr "切�飛行模�"
-
-#: src/gui/guiKeyChangeMenu.cpp
 msgid "Toggle chat log"
 msgstr "切��天記錄"
 
@@ -2060,14 +2044,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"0 = parallax occlusion with slope information (faster).\n"
-"1 = relief mapping (slower, more accurate)."
-msgstr ""
-"0 = 包�斜率資訊的視差�蔽（較快）。\n"
-"1 = 替�貼圖（較慢，較準確）。"
-
-#: src/settings_translation_file.cpp
 msgid "2D noise that controls the shape/size of ridged mountains."
 msgstr "控制山脊之形狀或大�的 2D 雜訊值。"
 
@@ -2191,6 +2167,10 @@ msgid "ABM interval"
 msgstr "ABM é–“éš”"
 
 #: src/settings_translation_file.cpp
+msgid "ABM time budget"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Absolute limit of queued blocks to emerge"
 msgstr "發生佇列的絕��制"
@@ -2446,10 +2426,6 @@ msgid "Builtin"
 msgstr "內建"
 
 #: src/settings_translation_file.cpp
-msgid "Bumpmapping"
-msgstr "映射貼圖"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Camera 'near clipping plane' distance in nodes, between 0 and 0.25\n"
 "Only works on GLES platforms. Most users will not need to change this.\n"
@@ -2521,16 +2497,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Changes the main menu UI:\n"
-"-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, "
-"etc.\n"
-"-   Simple: One singleplayer world, no game or texture pack choosers. May "
-"be\n"
-"necessary for smaller screens."
-msgstr ""
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Chat font size"
 msgstr "字型大�"
@@ -2689,6 +2655,10 @@ msgid "ContentDB Flag Blacklist"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid "ContentDB Max Concurrent Downloads"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "ContentDB URL"
 msgstr "繼續"
@@ -2749,7 +2719,10 @@ msgid "Crosshair alpha"
 msgstr "�字 alpha 值"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair alpha (opaqueness, between 0 and 255)."
+#, fuzzy
+msgid ""
+"Crosshair alpha (opaqueness, between 0 and 255).\n"
+"Also controls the object crosshair color"
 msgstr "�字 alpha 值（��明，0 至 255間）。"
 
 #: src/settings_translation_file.cpp
@@ -2757,8 +2730,10 @@ msgid "Crosshair color"
 msgstr "�字色彩"
 
 #: src/settings_translation_file.cpp
-msgid "Crosshair color (R,G,B)."
-msgstr "�字色彩 (R,G,B)。"
+msgid ""
+"Crosshair color (R,G,B).\n"
+"Also controls the object crosshair color"
+msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid "DPI"
@@ -2865,14 +2840,6 @@ msgid "Defines location and terrain of optional hills and lakes."
 msgstr "定義��的山丘與湖泊的�置與地形。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Defines sampling step of texture.\n"
-"A higher value results in smoother normal maps."
-msgstr ""
-"定義�質的採樣步驟。\n"
-"較高的值會有較平滑的一般地圖。"
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "Defines the base ground level."
 msgstr "定義樹木�與樹木密度。"
@@ -2953,6 +2920,11 @@ msgid "Desynchronize block animation"
 msgstr "異步化方塊動畫"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Dig key"
+msgstr "��"
+
+#: src/settings_translation_file.cpp
 msgid "Digging particles"
 msgstr "挖掘粒�"
 
@@ -3016,7 +2988,8 @@ msgid "Enable console window"
 msgstr "啟用終端機視窗"
 
 #: src/settings_translation_file.cpp
-msgid "Enable creative mode for new created maps."
+#, fuzzy
+msgid "Enable creative mode for all players"
 msgstr "為新建立的地圖啟用創造模�。"
 
 #: src/settings_translation_file.cpp
@@ -3120,17 +3093,6 @@ msgid "Enables animation of inventory items."
 msgstr "啟用物�欄物�動畫。"
 
 #: src/settings_translation_file.cpp
-msgid ""
-"Enables bumpmapping for textures. Normalmaps need to be supplied by the "
-"texture pack\n"
-"or need to be auto-generated.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"為�質啟用貼圖轉儲。普通地圖需��質包的支�\n"
-"或是自動生�。\n"
-"必須啟用著色器。"
-
-#: src/settings_translation_file.cpp
 msgid "Enables caching of facedir rotated meshes."
 msgstr "啟用�旋轉方�的網格快�。"
 
@@ -3140,22 +3102,6 @@ msgstr "啟用�地圖。"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Enables on the fly normalmap generation (Emboss effect).\n"
-"Requires bumpmapping to be enabled."
-msgstr ""
-"啟用忙碌的一般地圖生�（浮雕效果）。\n"
-"必須啟用貼圖轉儲。"
-
-#: src/settings_translation_file.cpp
-msgid ""
-"Enables parallax occlusion mapping.\n"
-"Requires shaders to be enabled."
-msgstr ""
-"啟用視差�蔽貼圖。\n"
-"必須啟用著色器。"
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Enables the sound system.\n"
 "If disabled, this completely disables all sounds everywhere and the in-game\n"
 "sound controls will be non-functional.\n"
@@ -3172,14 +3118,6 @@ msgstr "主體方法"
 
 #: src/settings_translation_file.cpp
 msgid ""
-"Experimental option, might cause visible spaces between blocks\n"
-"when set to higher number than 0."
-msgstr ""
-"實驗性�項，當設定到大於零的值時\n"
-"也許會造�在方塊間有視覺空隙。"
-
-#: src/settings_translation_file.cpp
-msgid ""
 "Exponent of the floatland tapering. Alters the tapering behaviour.\n"
 "Value = 1.0 creates a uniform, linear tapering.\n"
 "Values > 1.0 create a smooth tapering suitable for the default separated\n"
@@ -3189,8 +3127,9 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "FPS in pause menu"
-msgstr "在暫��單中的 FPS"
+#, fuzzy
+msgid "FPS when unfocused or paused"
+msgstr "當�戲暫�時的最高 FPS。"
 
 #: src/settings_translation_file.cpp
 msgid "FSAA"
@@ -3517,10 +3456,6 @@ msgid "GUI scaling filter txr2img"
 msgstr "圖形使用者介�縮放比例�濾器 txr2img"
 
 #: src/settings_translation_file.cpp
-msgid "Generate normalmaps"
-msgstr "生�一般地圖"
-
-#: src/settings_translation_file.cpp
 msgid "Global callbacks"
 msgstr "全域回呼"
 
@@ -3582,8 +3517,8 @@ msgstr "HUD 切��"
 #, fuzzy
 msgid ""
 "Handling for deprecated Lua API calls:\n"
-"-    legacy: (try to) mimic old behaviour (default for release).\n"
-"-    log: mimic and log backtrace of deprecated call (default for debug).\n"
+"-    none: Do not log deprecated calls\n"
+"-    log: mimic and log backtrace of deprecated call (default).\n"
 "-    error: abort on usage of deprecated call (suggested for mod developers)."
 msgstr ""
 "處�已棄用的 Lua API 呼�：\n"
@@ -4084,6 +4019,11 @@ msgid "Joystick button repetition interval"
 msgstr "�桿按鈕�覆間隔"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Joystick deadzone"
+msgstr "�桿類型"
+
+#: src/settings_translation_file.cpp
 msgid "Joystick frustum sensitivity"
 msgstr "�桿��度"
 
@@ -4186,6 +4126,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for digging.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"跳�的按�。\n"
+"請見 http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for dropping the currently selected item.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -4328,6 +4279,17 @@ msgstr ""
 "html#a54da2a0e231901735e3da1b0edf72eb3"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Key for placing.\n"
+"See http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+msgstr ""
+"跳�的按�。\n"
+"請見 http://irrlicht.sourceforge.net/docu/namespaceirr."
+"html#a54da2a0e231901735e3da1b0edf72eb3"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Key for selecting the 11th hotbar slot.\n"
 "See http://irrlicht.sourceforge.net/docu/namespaceirr."
@@ -5077,11 +5039,6 @@ msgid "Main menu script"
 msgstr "主�單指令稿"
 
 #: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Main menu style"
-msgstr "主�單指令稿"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Make fog and sky colors depend on daytime (dawn/sunset) and view direction."
 msgstr "讓霧與天空的�色�決於時間（黎明�日�）與觀看方�。"
@@ -5095,6 +5052,14 @@ msgid "Makes all liquids opaque"
 msgstr "讓所有的液體��明"
 
 #: src/settings_translation_file.cpp
+msgid "Map Compression Level for Disk Storage"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid "Map Compression Level for Network Transfer"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Map directory"
 msgstr "地圖目錄"
 
@@ -5294,7 +5259,8 @@ msgid "Maximum FPS"
 msgstr "最高 FPS"
 
 #: src/settings_translation_file.cpp
-msgid "Maximum FPS when game is paused."
+#, fuzzy
+msgid "Maximum FPS when the window is not focused, or when the game is paused."
 msgstr "當�戲暫�時的最高 FPS。"
 
 #: src/settings_translation_file.cpp
@@ -5349,6 +5315,13 @@ msgstr ""
 "將其設定留空則會自動�擇�當的值。"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Maximum number of concurrent downloads. Downloads exceeding this limit will "
+"be queued.\n"
+"This should be lower than curl_parallel_limit."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Maximum number of forceloaded mapblocks."
 msgstr "強制載入地圖�塊的最大數�。"
 
@@ -5595,14 +5568,6 @@ msgid "Noises"
 msgstr "雜訊"
 
 #: src/settings_translation_file.cpp
-msgid "Normalmaps sampling"
-msgstr "法線貼圖採樣"
-
-#: src/settings_translation_file.cpp
-msgid "Normalmaps strength"
-msgstr "法線貼圖強度"
-
-#: src/settings_translation_file.cpp
 msgid "Number of emerge threads"
 msgstr "出�的執行緒數"
 
@@ -5631,10 +5596,6 @@ msgstr ""
 "記憶體耗費（根據經驗，4096=100MB）。"
 
 #: src/settings_translation_file.cpp
-msgid "Number of parallax occlusion iterations."
-msgstr "視差�蔽迭代次數。"
-
-#: src/settings_translation_file.cpp
 msgid "Online Content Repository"
 msgstr ""
 
@@ -5660,35 +5621,6 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
-msgid "Overall bias of parallax occlusion effect, usually scale/2."
-msgstr "視差�蔽效果的總�差，通常是�模/2。"
-
-#: src/settings_translation_file.cpp
-msgid "Overall scale of parallax occlusion effect."
-msgstr "視差�蔽效果的總�模。"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion"
-msgstr "視差�蔽"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion bias"
-msgstr "視差�蔽�差"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion iterations"
-msgstr "視差�蔽迭代"
-
-#: src/settings_translation_file.cpp
-msgid "Parallax occlusion mode"
-msgstr "視差�蔽模�"
-
-#: src/settings_translation_file.cpp
-#, fuzzy
-msgid "Parallax occlusion scale"
-msgstr "視差�蔽係數"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Path of the fallback font.\n"
 "If “freetype� setting is enabled: Must be a TrueType font.\n"
@@ -5756,6 +5688,16 @@ msgid "Pitch move mode"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place key"
+msgstr "飛行按�"
+
+#: src/settings_translation_file.cpp
+#, fuzzy
+msgid "Place repetition interval"
+msgstr "��點擊�覆間隔"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "Player is able to fly without being affected by gravity.\n"
 "This requires the \"fly\" privilege on the server."
@@ -5923,10 +5865,6 @@ msgid "Right key"
 msgstr "��"
 
 #: src/settings_translation_file.cpp
-msgid "Rightclick repetition interval"
-msgstr "��點擊�覆間隔"
-
-#: src/settings_translation_file.cpp
 #, fuzzy
 msgid "River channel depth"
 msgstr "河�深度"
@@ -6229,6 +6167,19 @@ msgid "Show entity selection boxes"
 msgstr "顯示物體��方塊"
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid ""
+"Show entity selection boxes\n"
+"A restart is required after changing this."
+msgstr ""
+"設定語言。留空以使用系統語言。\n"
+"變更後必須�新啟動以使其生效。"
+
+#: src/settings_translation_file.cpp
+msgid "Show nametag backgrounds by default"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Shutdown message"
 msgstr "關閉訊�"
 
@@ -6374,10 +6325,6 @@ msgid "Strength of 3D mode parallax."
 msgstr "視差強度。"
 
 #: src/settings_translation_file.cpp
-msgid "Strength of generated normalmaps."
-msgstr "生�之一般地圖的強度。"
-
-#: src/settings_translation_file.cpp
 msgid ""
 "Strength of light curve boost.\n"
 "The 3 'boost' parameters define a range of the light\n"
@@ -6478,6 +6425,11 @@ msgid "The URL for the content repository"
 msgstr ""
 
 #: src/settings_translation_file.cpp
+#, fuzzy
+msgid "The deadzone of the joystick"
+msgstr "�使用的�桿的識別碼"
+
+#: src/settings_translation_file.cpp
 msgid ""
 "The default format in which profiles are being saved,\n"
 "when calling `/profiler save [format]` without format."
@@ -6541,8 +6493,8 @@ msgid ""
 "A restart is required after changing this.\n"
 "Note: On Android, stick with OGLES1 if unsure! App may fail to start "
 "otherwise.\n"
-"On other platforms, OpenGL is recommended, and it’s the only driver with\n"
-"shader support currently."
+"On other platforms, OpenGL is recommended.\n"
+"Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)"
 msgstr ""
 
 #: src/settings_translation_file.cpp
@@ -6577,6 +6529,12 @@ msgstr ""
 
 #: src/settings_translation_file.cpp
 msgid ""
+"The time budget allowed for ABMs to execute on each step\n"
+"(as a fraction of the ABM Interval)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
 "The time in seconds it takes between repeated events\n"
 "when holding down a joystick button combination."
 msgstr ""
@@ -6586,9 +6544,8 @@ msgstr ""
 #: src/settings_translation_file.cpp
 #, fuzzy
 msgid ""
-"The time in seconds it takes between repeated right clicks when holding the "
-"right\n"
-"mouse button."
+"The time in seconds it takes between repeated node placements when holding\n"
+"the place button."
 msgstr "當按�滑鼠��時，�覆��點�的間隔以秒計。"
 
 #: src/settings_translation_file.cpp
@@ -6738,6 +6695,17 @@ msgid ""
 msgstr ""
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Use multi-sample antialiasing (MSAA) to smooth out block edges.\n"
+"This algorithm smooths out the 3D viewport while keeping the image sharp,\n"
+"but it doesn't affect the insides of textures\n"
+"(which is especially noticeable with transparent textures).\n"
+"Visible spaces appear between nodes when shaders are disabled.\n"
+"If set to 0, MSAA is disabled.\n"
+"A restart is required after changing this option."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Use trilinear filtering when scaling textures."
 msgstr "當縮放�質時使用三線性�濾。"
 
@@ -6977,6 +6945,12 @@ msgid ""
 msgstr "是�使用 freetype 字型，需�將 freetype 支�編譯進來。"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"Whether nametag backgrounds should be shown by default.\n"
+"Mods may still set a background."
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "Whether node texture animations should be desynchronized per mapblock."
 msgstr "是��個地圖�塊的節點�質動畫�以��步。"
 
@@ -7112,6 +7086,24 @@ msgid "Y-level of seabed."
 msgstr "海底的 Y 高度。"
 
 #: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when saving mapblocks to disk.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
+msgid ""
+"ZLib compression level to use when sending mapblocks to the client.\n"
+"-1 - Zlib's default compression level\n"
+"0 - no compresson, fastest\n"
+"9 - best compression, slowest\n"
+"(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)"
+msgstr ""
+
+#: src/settings_translation_file.cpp
 msgid "cURL file download timeout"
 msgstr "cURL 檔案下載逾時"
 
@@ -7123,23 +7115,12 @@ msgstr "cURL 並行�制"
 msgid "cURL timeout"
 msgstr "cURL 逾時"
 
-#~ msgid "Ok"
-#~ msgstr "確定"
-
-#~ msgid "Back"
-#~ msgstr "返回"
-
-#~ msgid "Downloading and installing $1, please wait..."
-#~ msgstr "正在下載並安� $1，請�候……"
-
-#~ msgid "Limit of emerge queues on disk"
-#~ msgstr "在�碟上出�佇列的�制"
-
-#~ msgid "Parallax occlusion strength"
-#~ msgstr "視差�蔽強度"
-
-#~ msgid "Path to save screenshots at."
-#~ msgstr "儲存螢幕截圖的路徑。"
+#~ msgid ""
+#~ "0 = parallax occlusion with slope information (faster).\n"
+#~ "1 = relief mapping (slower, more accurate)."
+#~ msgstr ""
+#~ "0 = 包�斜率資訊的視差�蔽（較快）。\n"
+#~ "1 = 替�貼圖（較慢，較準確）。"
 
 #~ msgid ""
 #~ "Adjust the gamma encoding for the light tables. Higher numbers are "
@@ -7149,6 +7130,24 @@ msgstr "cURL 逾時"
 #~ "調整亮度表的伽瑪編碼。較高的數值會較亮。\n"
 #~ "這個設定是給客戶端使用的，會被伺�器忽略。"
 
+#~ msgid "Are you sure to reset your singleplayer world?"
+#~ msgstr "您確定��設您的單人�戲世界嗎？"
+
+#~ msgid "Back"
+#~ msgstr "返回"
+
+#~ msgid "Bump Mapping"
+#~ msgstr "映射貼圖"
+
+#~ msgid "Bumpmapping"
+#~ msgstr "映射貼圖"
+
+#~ msgid "Config mods"
+#~ msgstr "設定 Mod"
+
+#~ msgid "Configure"
+#~ msgstr "設定"
+
 #, fuzzy
 #~ msgid ""
 #~ "Controls the density of mountain-type floatlands.\n"
@@ -7160,6 +7159,9 @@ msgstr "cURL 逾時"
 #~ msgid "Controls width of tunnels, a smaller value creates wider tunnels."
 #~ msgstr "控制隧�的寬度，較�的值會創造出較寬的隧�。"
 
+#~ msgid "Crosshair color (R,G,B)."
+#~ msgstr "�字色彩 (R,G,B)。"
+
 #, fuzzy
 #~ msgid "Darkness sharpness"
 #~ msgstr "湖泊�度"
@@ -7171,12 +7173,56 @@ msgstr "cURL 逾時"
 #~ "定義浮地的平整地形�。\n"
 #~ "平整的浮地會在噪音 > 0 時產生。"
 
+#~ msgid ""
+#~ "Defines sampling step of texture.\n"
+#~ "A higher value results in smoother normal maps."
+#~ msgstr ""
+#~ "定義�質的採樣步驟。\n"
+#~ "較高的值會有較平滑的一般地圖。"
+
+#~ msgid "Downloading and installing $1, please wait..."
+#~ msgstr "正在下載並安� $1，請�候……"
+
 #~ msgid "Enable VBO"
 #~ msgstr "啟用 VBO"
 
+#~ msgid ""
+#~ "Enables bumpmapping for textures. Normalmaps need to be supplied by the "
+#~ "texture pack\n"
+#~ "or need to be auto-generated.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "為�質啟用貼圖轉儲。普通地圖需��質包的支�\n"
+#~ "或是自動生�。\n"
+#~ "必須啟用著色器。"
+
 #~ msgid "Enables filmic tone mapping"
 #~ msgstr "啟用電影色調映射"
 
+#~ msgid ""
+#~ "Enables on the fly normalmap generation (Emboss effect).\n"
+#~ "Requires bumpmapping to be enabled."
+#~ msgstr ""
+#~ "啟用忙碌的一般地圖生�（浮雕效果）。\n"
+#~ "必須啟用貼圖轉儲。"
+
+#~ msgid ""
+#~ "Enables parallax occlusion mapping.\n"
+#~ "Requires shaders to be enabled."
+#~ msgstr ""
+#~ "啟用視差�蔽貼圖。\n"
+#~ "必須啟用著色器。"
+
+#~ msgid ""
+#~ "Experimental option, might cause visible spaces between blocks\n"
+#~ "when set to higher number than 0."
+#~ msgstr ""
+#~ "實驗性�項，當設定到大於零的值時\n"
+#~ "也許會造�在方塊間有視覺空隙。"
+
+#~ msgid "FPS in pause menu"
+#~ msgstr "在暫��單中的 FPS"
+
 #~ msgid "Floatland base height noise"
 #~ msgstr "浮地基礎高度噪音"
 
@@ -7186,6 +7232,12 @@ msgstr "cURL 逾時"
 #~ msgid "Gamma"
 #~ msgstr "Gamma"
 
+#~ msgid "Generate Normal Maps"
+#~ msgstr "產生一般地圖"
+
+#~ msgid "Generate normalmaps"
+#~ msgstr "生�一般地圖"
+
 #~ msgid "IPv6 support."
 #~ msgstr "IPv6 支�。"
 
@@ -7193,15 +7245,102 @@ msgstr "cURL 逾時"
 #~ msgid "Lava depth"
 #~ msgstr "大型洞穴深度"
 
+#~ msgid "Limit of emerge queues on disk"
+#~ msgstr "在�碟上出�佇列的�制"
+
+#~ msgid "Main"
+#~ msgstr "主�"
+
+#, fuzzy
+#~ msgid "Main menu style"
+#~ msgstr "主�單指令稿"
+
+#~ msgid "Minimap in radar mode, Zoom x2"
+#~ msgstr "雷�模�的迷你地圖，放大 2 �"
+
+#~ msgid "Minimap in radar mode, Zoom x4"
+#~ msgstr "雷�模�的迷你地圖，放大 4 �"
+
+#~ msgid "Minimap in surface mode, Zoom x2"
+#~ msgstr "表�模�的迷你地圖，放大 2 �"
+
+#~ msgid "Minimap in surface mode, Zoom x4"
+#~ msgstr "表�模�的迷你地圖，放大 4 �"
+
+#~ msgid "Name/Password"
+#~ msgstr "�稱�密碼"
+
+#~ msgid "No"
+#~ msgstr "�"
+
+#~ msgid "Normalmaps sampling"
+#~ msgstr "法線貼圖採樣"
+
+#~ msgid "Normalmaps strength"
+#~ msgstr "法線貼圖強度"
+
+#~ msgid "Number of parallax occlusion iterations."
+#~ msgstr "視差�蔽迭代次數。"
+
+#~ msgid "Ok"
+#~ msgstr "確定"
+
+#~ msgid "Overall bias of parallax occlusion effect, usually scale/2."
+#~ msgstr "視差�蔽效果的總�差，通常是�模/2。"
+
+#~ msgid "Overall scale of parallax occlusion effect."
+#~ msgstr "視差�蔽效果的總�模。"
+
+#~ msgid "Parallax Occlusion"
+#~ msgstr "視差�蔽"
+
+#~ msgid "Parallax occlusion"
+#~ msgstr "視差�蔽"
+
+#~ msgid "Parallax occlusion bias"
+#~ msgstr "視差�蔽�差"
+
+#~ msgid "Parallax occlusion iterations"
+#~ msgstr "視差�蔽迭代"
+
+#~ msgid "Parallax occlusion mode"
+#~ msgstr "視差�蔽模�"
+
+#, fuzzy
+#~ msgid "Parallax occlusion scale"
+#~ msgstr "視差�蔽係數"
+
+#~ msgid "Parallax occlusion strength"
+#~ msgstr "視差�蔽強度"
+
 #~ msgid "Path to TrueTypeFont or bitmap."
 #~ msgstr "TrueType 字型或點陣字的路徑。"
 
+#~ msgid "Path to save screenshots at."
+#~ msgstr "儲存螢幕截圖的路徑。"
+
+#~ msgid "Reset singleplayer world"
+#~ msgstr "�設單人�戲世界"
+
+#, fuzzy
+#~ msgid "Select Package File:"
+#~ msgstr "�� Mod 檔案："
+
 #~ msgid "Shadow limit"
 #~ msgstr "陰影�制"
 
+#~ msgid "Start Singleplayer"
+#~ msgstr "開始單人�戲"
+
+#~ msgid "Strength of generated normalmaps."
+#~ msgstr "生�之一般地圖的強度。"
+
 #~ msgid "This font will be used for certain languages."
 #~ msgstr "這個字型將會被用於特定的語言。"
 
+#~ msgid "Toggle Cinematic"
+#~ msgstr "切��場動畫"
+
 #, fuzzy
 #~ msgid ""
 #~ "Typical maximum height, above and below midpoint, of floatland mountains."
@@ -7210,22 +7349,24 @@ msgstr "cURL 逾時"
 #~ msgid "Variation of hill height and lake depth on floatland smooth terrain."
 #~ msgstr "在平整浮地地形的山丘高度與湖泊深度變化。"
 
+#~ msgid "View"
+#~ msgstr "查看"
+
+#~ msgid "Waving Water"
+#~ msgstr "波動的水"
+
 #~ msgid "Waving water"
 #~ msgstr "波動的水"
 
+#, fuzzy
+#~ msgid "Y of upper limit of lava in large caves."
+#~ msgstr "大型�隨機洞穴的 Y 上�。"
+
 #~ msgid "Y-level of floatland midpoint and lake surface."
 #~ msgstr "浮地中點與湖表�的 Y 高度。"
 
 #~ msgid "Y-level to which floatland shadows extend."
 #~ msgstr "浮地陰影擴展的 Y 高度。"
 
-#~ msgid "Waving Water"
-#~ msgstr "波動的水"
-
-#, fuzzy
-#~ msgid "Y of upper limit of lava in large caves."
-#~ msgstr "大型�隨機洞穴的 Y 上�。"
-
-#, fuzzy
-#~ msgid "Select Package File:"
-#~ msgstr "�� Mod 檔案："
+#~ msgid "Yes"
+#~ msgstr "是"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6bba6e8d..9526e88f9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,7 +55,7 @@ if(NOT USE_CURL)
 endif()
 
 
-option(ENABLE_GETTEXT "Use GetText for internationalization" TRUE)
+option(ENABLE_GETTEXT "Use GetText for internationalization" ${BUILD_CLIENT})
 set(USE_GETTEXT FALSE)
 
 if(ENABLE_GETTEXT)
@@ -63,14 +63,13 @@ if(ENABLE_GETTEXT)
 	if(GETTEXTLIB_FOUND)
 		if(WIN32)
 			message(STATUS "GetText library: ${GETTEXT_LIBRARY}")
-			message(STATUS "GetText DLL: ${GETTEXT_DLL}")
-			message(STATUS "GetText iconv DLL: ${GETTEXT_ICONV_DLL}")
+			message(STATUS "GetText DLL(s): ${GETTEXT_DLL}")
 		endif()
 		set(USE_GETTEXT TRUE)
 		message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
 	endif(GETTEXTLIB_FOUND)
 else()
-	mark_as_advanced(GETTEXT_ICONV_DLL GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
+	mark_as_advanced(GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
 	message(STATUS "GetText disabled.")
 endif()
 
@@ -103,11 +102,11 @@ endif()
 option(ENABLE_GLES "Use OpenGL ES instead of OpenGL" FALSE)
 mark_as_advanced(ENABLE_GLES)
 if(BUILD_CLIENT)
-	if(ENABLE_GLES)
-		find_package(OpenGLES2 REQUIRED)
-	else()
-		# transitive dependency from Irrlicht (see longer explanation below)
-		if(NOT WIN32)
+	# transitive dependency from Irrlicht (see longer explanation below)
+	if(NOT WIN32)
+		if(ENABLE_GLES)
+			find_package(OpenGLES2 REQUIRED)
+		else()
 			set(OPENGL_GL_PREFERENCE "LEGACY" CACHE STRING
 				"See CMake Policy CMP0072 for reference. GLVND is broken on some nvidia setups")
 			set(OpenGL_GL_PREFERENCE ${OPENGL_GL_PREFERENCE})
@@ -121,13 +120,13 @@ endif()
 option(ENABLE_FREETYPE "Enable FreeType2 (TrueType fonts and basic unicode support)" TRUE)
 set(USE_FREETYPE FALSE)
 
-if(ENABLE_FREETYPE)
+if(BUILD_CLIENT AND ENABLE_FREETYPE)
 	find_package(Freetype)
 	if(FREETYPE_FOUND)
 		message(STATUS "Freetype enabled.")
 		set(USE_FREETYPE TRUE)
 	endif()
-endif(ENABLE_FREETYPE)
+endif()
 
 option(ENABLE_CURSES "Enable ncurses console" TRUE)
 set(USE_CURSES FALSE)
@@ -147,7 +146,17 @@ option(ENABLE_POSTGRESQL "Enable PostgreSQL backend" TRUE)
 set(USE_POSTGRESQL FALSE)
 
 if(ENABLE_POSTGRESQL)
-	find_package("PostgreSQL")
+	if(CMAKE_VERSION VERSION_LESS "3.20")
+		find_package(PostgreSQL QUIET)
+		# Before CMake 3.20 FindPostgreSQL.cmake always looked for server includes
+		# but we don't need them, so continue anyway if only those are missing.
+		if(PostgreSQL_INCLUDE_DIR AND PostgreSQL_LIBRARY)
+			set(PostgreSQL_FOUND TRUE)
+			set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR})
+		endif()
+	else()
+		find_package(PostgreSQL)
+	endif()
 
 	if(PostgreSQL_FOUND)
 		set(USE_POSTGRESQL TRUE)
@@ -268,8 +277,10 @@ if(WIN32)
 		if(ENABLE_SOUND)
 			set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL32.dll for installation (optional)")
 			set(OGG_DLL "" CACHE FILEPATH "Path to libogg.dll for installation (optional)")
-			set(VORBIS_DLL "" CACHE FILEPATH "Path to libvorbis.dll for installation (optional)")
-			set(VORBISFILE_DLL "" CACHE FILEPATH "Path to libvorbisfile.dll for installation (optional)")
+			set(VORBIS_DLL "" CACHE FILEPATH "Path to Vorbis DLLs for installation (optional)")
+		endif()
+		if(USE_GETTEXT)
+			set(GETTEXT_DLL "" CACHE FILEPATH "Path to Intl/Iconv DLLs for installation (optional)")
 		endif()
 		if(USE_LUAJIT)
 			set(LUA_DLL "" CACHE FILEPATH "Path to luajit-5.1.dll for installation (optional)")
@@ -295,7 +306,6 @@ else()
 		endif(NOT HAIKU AND NOT APPLE)
 
 		find_package(JPEG REQUIRED)
-		find_package(BZip2 REQUIRED)
 		find_package(PNG REQUIRED)
 		if(APPLE)
 			find_library(CARBON_LIB Carbon REQUIRED)
@@ -526,13 +536,16 @@ if(USE_CURL)
 endif()
 
 
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
-
+# When cross-compiling assume the user doesn't want to run the executable anyway,
+# otherwise place it in <source dir>/bin/ since Minetest can only run from there.
+if(NOT CMAKE_CROSSCOMPILING)
+	set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
+endif()
 
 if(BUILD_CLIENT)
 	add_executable(${PROJECT_NAME} ${client_SRCS} ${extra_windows_SRCS})
 	add_dependencies(${PROJECT_NAME} GenerateVersion)
-	set(client_LIBS
+	target_link_libraries(
 		${PROJECT_NAME}
 		${ZLIB_LIBRARIES}
 		${IRRLICHT_LIBRARY}
@@ -548,9 +561,14 @@ if(BUILD_CLIENT)
 		${PLATFORM_LIBS}
 		${CLIENT_PLATFORM_LIBS}
 	)
-	target_link_libraries(
-		${client_LIBS}
-	)
+	if(NOT USE_LUAJIT)
+		set_target_properties(${PROJECT_NAME} PROPERTIES
+			# This is necessary for dynamic Lua modules
+			# to work when Lua is statically linked (issue #10806)
+			ENABLE_EXPORTS 1
+		)
+	endif()
+
 	if(ENABLE_GLES)
 		target_link_libraries(
 			${PROJECT_NAME}
@@ -621,7 +639,15 @@ if(BUILD_SERVER)
 		${PLATFORM_LIBS}
 	)
 	set_target_properties(${PROJECT_NAME}server PROPERTIES
-			COMPILE_DEFINITIONS "SERVER")
+		COMPILE_DEFINITIONS "SERVER")
+	if(NOT USE_LUAJIT)
+		set_target_properties(${PROJECT_NAME}server PROPERTIES
+			# This is necessary for dynamic Lua modules
+			# to work when Lua is statically linked (issue #10806)
+			ENABLE_EXPORTS 1
+		)
+	endif()
+
 	if (USE_GETTEXT)
 		target_link_libraries(${PROJECT_NAME}server ${GETTEXT_LIBRARY})
 	endif()
@@ -655,7 +681,10 @@ endif(BUILD_SERVER)
 # see issue #4638
 set(GETTEXT_BLACKLISTED_LOCALES
 	ar
+	dv
 	he
+	hi
+	kn
 	ky
 	ms_Arab
 	th
@@ -666,7 +695,7 @@ option(APPLY_LOCALE_BLACKLIST "Use a blacklist to avoid broken locales" TRUE)
 if (GETTEXTLIB_FOUND AND APPLY_LOCALE_BLACKLIST)
 	set(GETTEXT_USED_LOCALES "")
 	foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
-		if (NOT ";${GETTEXT_BLACKLISTED_LOCALES};" MATCHES ";${LOCALE};")
+		if (NOT "${LOCALE}" IN_LIST GETTEXT_BLACKLISTED_LOCALES)
 			list(APPEND GETTEXT_USED_LOCALES ${LOCALE})
 		endif()
 	endforeach()
@@ -700,7 +729,7 @@ if(MSVC)
 
 	# Flags that cannot be shared between cl and clang-cl
 	# https://clang.llvm.org/docs/UsersManual.html#clang-cl
-	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=lld")
 
 		# Disable pragma-pack warning
@@ -718,7 +747,7 @@ else()
 	else()
 		set(RELEASE_WARNING_FLAGS "")
 	endif()
-	if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	if(CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?Clang")
 		set(WARNING_FLAGS "${WARNING_FLAGS} -Wsign-compare")
 	endif()
 
@@ -755,7 +784,7 @@ else()
 		else()
 			set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${MATH_FLAGS}")
 		endif()
-	endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)")
+	endif()
 	set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}")
 	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}")
 
@@ -792,7 +821,7 @@ if(WIN32)
 				FILES_MATCHING PATTERN "*.dll")
 	else()
 		# Use the old-style way to install dll's
-		if(USE_SOUND)
+		if(BUILD_CLIENT AND USE_SOUND)
 			if(OPENAL_DLL)
 				install(FILES ${OPENAL_DLL} DESTINATION ${BINDIR})
 			endif()
@@ -802,9 +831,6 @@ if(WIN32)
 			if(VORBIS_DLL)
 				install(FILES ${VORBIS_DLL} DESTINATION ${BINDIR})
 			endif()
-			if(VORBISFILE_DLL)
-				install(FILES ${VORBISFILE_DLL} DESTINATION ${BINDIR})
-			endif()
 		endif()
 		if(CURL_DLL)
 			install(FILES ${CURL_DLL} DESTINATION ${BINDIR})
@@ -812,7 +838,7 @@ if(WIN32)
 		if(ZLIB_DLL)
 			install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
 		endif()
-		if(FREETYPE_DLL)
+		if(BUILD_CLIENT AND FREETYPE_DLL)
 			install(FILES ${FREETYPE_DLL} DESTINATION ${BINDIR})
 		endif()
 		if(SQLITE3_DLL)
@@ -824,6 +850,12 @@ if(WIN32)
 		if(LUA_DLL)
 			install(FILES ${LUA_DLL} DESTINATION ${BINDIR})
 		endif()
+		if(BUILD_CLIENT AND IRRLICHT_DLL)
+			install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
+		endif()
+		if(BUILD_CLIENT AND USE_GETTEXT AND GETTEXT_DLL)
+			install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
+		endif()
 	endif()
 endif()
 
@@ -851,6 +883,7 @@ if(BUILD_CLIENT)
 		endforeach()
 	endif()
 
+	# Install necessary fonts depending on configuration
 	if(USE_FREETYPE)
 		install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
 				FILES_MATCHING PATTERN "*.ttf" PATTERN "*.txt")
@@ -858,22 +891,6 @@ if(BUILD_CLIENT)
 		install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
 				FILES_MATCHING PATTERN "*.png" PATTERN "*.xml")
 	endif()
-
-	if(WIN32)
-		if(NOT VCPKG_APPLOCAL_DEPS)
-			if(DEFINED IRRLICHT_DLL)
-				install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
-			endif()
-			if(USE_GETTEXT)
-				if(DEFINED GETTEXT_DLL)
-					install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
-				endif()
-				if(DEFINED GETTEXT_ICONV_DLL)
-					install(FILES ${GETTEXT_ICONV_DLL} DESTINATION ${BINDIR})
-				endif()
-			endif()
-		endif()
-	endif()
 endif(BUILD_CLIENT)
 
 if(BUILD_SERVER)
diff --git a/src/activeobject.h b/src/activeobject.h
index 0829858ad..1d8a3712b 100644
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -28,11 +28,11 @@ enum ActiveObjectType {
 	ACTIVEOBJECT_TYPE_INVALID = 0,
 	ACTIVEOBJECT_TYPE_TEST = 1,
 // Obsolete stuff
-	ACTIVEOBJECT_TYPE_ITEM = 2,
-//	ACTIVEOBJECT_TYPE_RAT = 3,
-//	ACTIVEOBJECT_TYPE_OERKKI1 = 4,
-//	ACTIVEOBJECT_TYPE_FIREFLY = 5,
-	ACTIVEOBJECT_TYPE_MOBV2 = 6,
+// ACTIVEOBJECT_TYPE_ITEM = 2,
+// ACTIVEOBJECT_TYPE_RAT = 3,
+// ACTIVEOBJECT_TYPE_OERKKI1 = 4,
+// ACTIVEOBJECT_TYPE_FIREFLY = 5,
+// ACTIVEOBJECT_TYPE_MOBV2 = 6,
 // End obsolete stuff
 	ACTIVEOBJECT_TYPE_LUAENTITY = 7,
 // Special type, not stored as a static object
diff --git a/src/activeobjectmgr.h b/src/activeobjectmgr.h
index 5139d61dd..835f19dc2 100644
--- a/src/activeobjectmgr.h
+++ b/src/activeobjectmgr.h
@@ -25,7 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class TestClientActiveObjectMgr;
 class TestServerActiveObjectMgr;
 
-template <typename T> class ActiveObjectMgr
+template <typename T>
+class ActiveObjectMgr
 {
 	friend class ::TestClientActiveObjectMgr;
 	friend class ::TestServerActiveObjectMgr;
diff --git a/src/chat.cpp b/src/chat.cpp
index 2f65e68b3..c9317a079 100644
--- a/src/chat.cpp
+++ b/src/chat.cpp
@@ -485,8 +485,8 @@ void ChatPrompt::nickCompletion(const std::list<std::string>& names, bool backwa
 	// find all names that start with the selected prefix
 	std::vector<std::wstring> completions;
 	for (const std::string &name : names) {
-		if (str_starts_with(narrow_to_wide(name), prefix, true)) {
-			std::wstring completion = narrow_to_wide(name);
+		std::wstring completion = utf8_to_wide(name);
+		if (str_starts_with(completion, prefix, true)) {
 			if (prefix_start == 0)
 				completion += L": ";
 			completions.push_back(completion);
diff --git a/src/client/camera.cpp b/src/client/camera.cpp
index 91d319c90..52bedcba9 100644
--- a/src/client/camera.cpp
+++ b/src/client/camera.cpp
@@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "constants.h"
 #include "fontengine.h"
+#include "guiscalingfilter.h"
 #include "script/scripting_client.h"
 
 #define CAMERA_OFFSET_STEP 200
@@ -43,11 +44,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define WIELDMESH_AMPLITUDE_X 7.0f
 #define WIELDMESH_AMPLITUDE_Y 10.0f
 
-Camera::Camera(MapDrawControl &draw_control, Client *client):
+Camera::Camera(MapDrawControl &draw_control, Client *client, RenderingEngine *rendering_engine):
 	m_draw_control(draw_control),
 	m_client(client)
 {
-	scene::ISceneManager *smgr = RenderingEngine::get_scene_manager();
+	auto smgr = rendering_engine->get_scene_manager();
 	// note: making the camera node a child of the player node
 	// would lead to unexpected behaviour, so we don't do that.
 	m_playernode = smgr->addEmptySceneNode(smgr->getRootSceneNode());
@@ -79,6 +80,7 @@ Camera::Camera(MapDrawControl &draw_control, Client *client):
 	m_cache_fov                 = std::fmax(g_settings->getFloat("fov"), 45.0f);
 	m_arm_inertia               = g_settings->getBool("arm_inertia");
 	m_nametags.clear();
+	m_show_nametag_backgrounds  = g_settings->getBool("show_nametag_backgrounds");
 }
 
 Camera::~Camera()
@@ -540,7 +542,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, f32 tool_r
 	m_curr_fov_degrees = rangelim(m_curr_fov_degrees, 1.0f, 160.0f);
 
 	// FOV and aspect ratio
-	const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
+	const v2u32 &window_size = RenderingEngine::getWindowSize();
 	m_aspect = (f32) window_size.X / (f32) window_size.Y;
 	m_fov_y = m_curr_fov_degrees * M_PI / 180.0;
 	// Increase vertical FOV on lower aspect ratios (<16:10)
@@ -663,7 +665,7 @@ void Camera::wield(const ItemStack &item)
 void Camera::drawWieldedTool(irr::core::matrix4* translation)
 {
 	// Clear Z buffer so that the wielded tool stays in front of world geometry
-	m_wieldmgr->getVideoDriver()->clearZBuffer();
+	m_wieldmgr->getVideoDriver()->clearBuffers(video::ECBF_DEPTH);
 
 	// Draw the wielded node (in a separate scene manager)
 	scene::ICameraSceneNode* cam = m_wieldmgr->getActiveCamera();
@@ -696,18 +698,14 @@ void Camera::drawNametags()
 	v2u32 screensize = driver->getScreenSize();
 
 	for (const Nametag *nametag : m_nametags) {
-		if (nametag->nametag_color.getAlpha() == 0) {
-			// Enforce hiding nametag,
-			// because if freetype is enabled, a grey
-			// shadow can remain.
-			continue;
-		}
-		v3f pos = nametag->parent_node->getAbsolutePosition() + nametag->nametag_pos * BS;
+		// Nametags are hidden in GenericCAO::updateNametag()
+
+		v3f pos = nametag->parent_node->getAbsolutePosition() + nametag->pos * BS;
 		f32 transformed_pos[4] = { pos.X, pos.Y, pos.Z, 1.0f };
 		trans.multiplyWith1x4Matrix(transformed_pos);
 		if (transformed_pos[3] > 0) {
 			std::wstring nametag_colorless =
-				unescape_translate(utf8_to_wide(nametag->nametag_text));
+				unescape_translate(utf8_to_wide(nametag->text));
 			core::dimension2d<u32> textsize = font->getDimension(
 				nametag_colorless.c_str());
 			f32 zDiv = transformed_pos[3] == 0.0f ? 1.0f :
@@ -718,28 +716,38 @@ void Camera::drawNametags()
 			screen_pos.Y = screensize.Y *
 				(0.5 - transformed_pos[1] * zDiv * 0.5) - textsize.Height / 2;
 			core::rect<s32> size(0, 0, textsize.Width, textsize.Height);
-			core::rect<s32> bg_size(-2, 0, textsize.Width+2, textsize.Height);
-
-			video::SColor textColor = nametag->nametag_color;
+			core::rect<s32> bg_size(-2, 0, std::max(textsize.Width+2, (u32) nametag->images_dim.Width), textsize.Height + nametag->images_dim.Height);
 
-			bool darkBackground = textColor.getLuminance() > 186;
-			video::SColor backgroundColor = darkBackground
-					? video::SColor(50, 50, 50, 50)
-					: video::SColor(50, 255, 255, 255);
-			driver->draw2DRectangle(backgroundColor, bg_size + screen_pos);
+			auto bgcolor = nametag->getBgColor(m_show_nametag_backgrounds);
+			if (bgcolor.getAlpha() != 0)
+				driver->draw2DRectangle(bgcolor, bg_size + screen_pos);
 
 			font->draw(
-				translate_string(utf8_to_wide(nametag->nametag_text)).c_str(),
-				size + screen_pos, textColor);
+				translate_string(utf8_to_wide(nametag->text)).c_str(),
+				size + screen_pos, nametag->textcolor);
+
+			v2s32 image_pos(screen_pos);
+			image_pos.Y += textsize.Height;
+
+			const video::SColor color(255, 255, 255, 255);
+			const video::SColor colors[] = {color, color, color, color};
+
+			for (video::ITexture *texture : nametag->images) {
+				core::dimension2di imgsize(texture->getOriginalSize());
+				core::rect<s32> rect(core::position2d<s32>(0, 0), imgsize);
+				draw2DImageFilterScaled(driver, texture, rect + image_pos, rect, NULL, colors, true);
+				image_pos += core::dimension2di(imgsize.Width, 0);
+			}
+
 		}
 	}
 }
-
 Nametag *Camera::addNametag(scene::ISceneNode *parent_node,
-		const std::string &nametag_text, video::SColor nametag_color,
-		const v3f &pos)
+		const std::string &text, video::SColor textcolor,
+		Optional<video::SColor> bgcolor, const v3f &pos,
+		const std::vector<std::string> &images)
 {
-	Nametag *nametag = new Nametag(parent_node, nametag_text, nametag_color, pos);
+	Nametag *nametag = new Nametag(parent_node, text, textcolor, bgcolor, pos, m_client->tsrc(), images);
 	m_nametags.push_back(nametag);
 	return nametag;
 }
diff --git a/src/client/camera.h b/src/client/camera.h
index 16a1961be..30fac5289 100644
--- a/src/client/camera.h
+++ b/src/client/camera.h
@@ -25,27 +25,74 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <ICameraSceneNode.h>
 #include <ISceneNode.h>
 #include <list>
+#include "util/Optional.h"
 
 class LocalPlayer;
 struct MapDrawControl;
 class Client;
+class RenderingEngine;
 class WieldMeshSceneNode;
 
-struct Nametag {
+struct Nametag
+{
+	scene::ISceneNode *parent_node;
+	std::string text;
+	video::SColor textcolor;
+	Optional<video::SColor> bgcolor;
+	v3f pos;
+	ITextureSource *texture_source;
+	std::vector<video::ITexture *> images;
+	core::dimension2di images_dim;
+
 	Nametag(scene::ISceneNode *a_parent_node,
-			const std::string &a_nametag_text,
-			const video::SColor &a_nametag_color,
-			const v3f &a_nametag_pos):
+			const std::string &text,
+			const video::SColor &textcolor,
+			const Optional<video::SColor> &bgcolor,
+			const v3f &pos,
+			ITextureSource *tsrc,
+			const std::vector<std::string> &image_names):
 		parent_node(a_parent_node),
-		nametag_text(a_nametag_text),
-		nametag_color(a_nametag_color),
-		nametag_pos(a_nametag_pos)
+		text(text),
+		textcolor(textcolor),
+		bgcolor(bgcolor),
+		pos(pos),
+		texture_source(tsrc),
+		images(),
+		images_dim(0, 0)
 	{
+		setImages(image_names);
+	}
+
+	void setImages(const std::vector<std::string> &image_names)
+	{
+		images.clear();
+		images_dim = core::dimension2di(0, 0);
+
+		for (const std::string &image_name : image_names) {
+			video::ITexture *texture = texture_source->getTexture(image_name);
+			core::dimension2di imgsize(texture->getOriginalSize());
+
+			images_dim.Width += imgsize.Width;
+			if (images_dim.Height < imgsize.Height)
+				images_dim.Height = imgsize.Height;
+
+			images.push_back(texture);
+		}
+	}
+
+	video::SColor getBgColor(bool use_fallback) const
+	{
+		if (bgcolor)
+			return bgcolor.value();
+		else if (!use_fallback)
+			return video::SColor(0, 0, 0, 0);
+		else if (textcolor.getLuminance() > 186)
+			// Dark background for light text
+			return video::SColor(50, 50, 50, 50);
+		else
+			// Light background for dark text
+			return video::SColor(50, 255, 255, 255);
 	}
-	scene::ISceneNode *parent_node;
-	std::string nametag_text;
-	video::SColor nametag_color;
-	v3f nametag_pos;
 };
 
 enum CameraMode {CAMERA_MODE_FIRST, CAMERA_MODE_THIRD, CAMERA_MODE_THIRD_FRONT};
@@ -58,7 +105,7 @@ enum CameraMode {CAMERA_MODE_FIRST, CAMERA_MODE_THIRD, CAMERA_MODE_THIRD_FRONT};
 class Camera
 {
 public:
-	Camera(MapDrawControl &draw_control, Client *client);
+	Camera(MapDrawControl &draw_control, Client *client, RenderingEngine *rendering_engine);
 	~Camera();
 
 	// Get camera scene node.
@@ -164,8 +211,9 @@ public:
 	}
 
 	Nametag *addNametag(scene::ISceneNode *parent_node,
-		const std::string &nametag_text, video::SColor nametag_color,
-		const v3f &pos);
+		const std::string &text, video::SColor textcolor,
+		Optional<video::SColor> bgcolor, const v3f &pos,
+		const std::vector<std::string> &image_names);
 
 	void removeNametag(Nametag *nametag);
 
@@ -245,4 +293,5 @@ private:
 	bool m_arm_inertia;
 
 	std::list<Nametag *> m_nametags;
+	bool m_show_nametag_backgrounds;
 };
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 9bbb57668..57f8e6593 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -98,6 +98,7 @@ Client::Client(
 		NodeDefManager *nodedef,
 		ISoundManager *sound,
 		MtEventManager *event,
+		RenderingEngine *rendering_engine,
 		bool ipv6,
 		GameUI *game_ui
 ):
@@ -108,8 +109,9 @@ Client::Client(
 	m_nodedef(nodedef),
 	m_sound(sound),
 	m_event(event),
+	m_rendering_engine(rendering_engine),
 	m_env(
-		new ClientMap(this, control, 666),
+		new ClientMap(this, rendering_engine, control, 666),
 		tsrc, this
 	),
 	m_particle_manager(&m_env),
@@ -160,20 +162,6 @@ void Client::loadMods()
 	scanModIntoMemory(BUILTIN_MOD_NAME, getBuiltinLuaPath());
 	m_script->loadModFromMemory(BUILTIN_MOD_NAME);
 
-	// TODO Uncomment when server-sent CSM and verifying of builtin are complete
-	/*
-	// Don't load client-provided mods if disabled by server
-	if (checkCSMRestrictionFlag(CSMRestrictionFlags::CSM_RF_LOAD_CLIENT_MODS)) {
-		warningstream << "Client-provided mod loading is disabled by server." <<
-			std::endl;
-		// If builtin integrity is wrong, disconnect user
-		if (!checkBuiltinIntegrity()) {
-			// TODO disconnect user
-		}
-		return;
-	}
-	*/
-
 	ClientModConfiguration modconf(getClientModsLuaPath());
 	m_mods = modconf.getMods();
 	// complain about mods with unsatisfied dependencies
@@ -219,12 +207,6 @@ void Client::loadMods()
 		m_script->on_minimap_ready(m_minimap);
 }
 
-bool Client::checkBuiltinIntegrity()
-{
-	// TODO
-	return true;
-}
-
 void Client::scanModSubfolder(const std::string &mod_name, const std::string &mod_path,
 			std::string mod_subpath)
 {
@@ -321,12 +303,7 @@ Client::~Client()
 	}
 
 	// cleanup 3d model meshes on client shutdown
-	while (RenderingEngine::get_mesh_cache()->getMeshCount() != 0) {
-		scene::IAnimatedMesh *mesh = RenderingEngine::get_mesh_cache()->getMeshByIndex(0);
-
-		if (mesh)
-			RenderingEngine::get_mesh_cache()->removeMesh(mesh);
-	}
+	m_rendering_engine->cleanupMeshCache();
 
 	delete m_minimap;
 	m_minimap = nullptr;
@@ -683,15 +660,11 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
 		TRACESTREAM(<< "Client: Attempting to load image "
 			<< "file \"" << filename << "\"" << std::endl);
 
-		io::IFileSystem *irrfs = RenderingEngine::get_filesystem();
-		video::IVideoDriver *vdrv = RenderingEngine::get_video_driver();
+		io::IFileSystem *irrfs = m_rendering_engine->get_filesystem();
+		video::IVideoDriver *vdrv = m_rendering_engine->get_video_driver();
 
-		// Silly irrlicht's const-incorrectness
-		Buffer<char> data_rw(data.c_str(), data.size());
-
-		// Create an irrlicht memory file
 		io::IReadFile *rfile = irrfs->createMemoryReadFile(
-				*data_rw, data_rw.getSize(), "_tempreadfile");
+				data.c_str(), data.size(), "_tempreadfile");
 
 		FATAL_ERROR_IF(!rfile, "Could not create irrlicht memory file.");
 
@@ -930,9 +903,9 @@ void Client::Send(NetworkPacket* pkt)
 
 // Will fill up 12 + 12 + 4 + 4 + 4 bytes
 void writePlayerPos(LocalPlayer *myplayer, ClientMap *clientMap, NetworkPacket *pkt)
-{	
+{
 	v3f pf           = myplayer->getLegitPosition() * 100;
-	v3f sf           = myplayer->getLegitSpeed() * 100;
+	v3f sf           = myplayer->getSendSpeed() * 100;
 	s32 pitch        = myplayer->getPitch() * 100;
 	s32 yaw          = myplayer->getYaw() * 100;
 	u32 keyPressed   = myplayer->keyPressed;
@@ -1219,7 +1192,7 @@ void Client::sendChatMessage(const std::wstring &message)
 	if (canSendChatMessage()) {
 		u32 now = time(NULL);
 		float time_passed = now - m_last_chat_message_sent;
-		m_last_chat_message_sent = time(NULL);
+		m_last_chat_message_sent = now;
 
 		m_chat_message_allowance += time_passed * (CLIENT_CHAT_MESSAGE_LIMIT_PER_10S / 8.0f);
 		if (m_chat_message_allowance > CLIENT_CHAT_MESSAGE_LIMIT_PER_10S)
@@ -1298,13 +1271,12 @@ void Client::sendPlayerPos(v3f pos)
 	// Save bandwidth by only updating position when
 	// player is not dead and something changed
 
-	// FIXME: This part causes breakages in mods like 3d_armor, and has been commented for now
-	// if (m_activeobjects_received && player->isDead())
-	//	return;
+	if (m_activeobjects_received && player->isDead())
+		return;
 
 	if (
 			player->last_position     == pos &&
-			player->last_speed        == player->getLegitSpeed()    &&
+			player->last_speed        == player->getSendSpeed()    &&
 			player->last_pitch        == player->getPitch()    &&
 			player->last_yaw          == player->getYaw()      &&
 			player->last_keyPressed   == player->keyPressed    &&
@@ -1313,7 +1285,7 @@ void Client::sendPlayerPos(v3f pos)
 		return;
 
 	player->last_position     = pos;
-	player->last_speed        = player->getLegitSpeed();
+	player->last_speed        = player->getSendSpeed();
 	player->last_pitch        = player->getPitch();
 	player->last_yaw          = player->getYaw();
 	player->last_keyPressed   = player->keyPressed;
@@ -1448,6 +1420,11 @@ bool Client::updateWieldedItem()
 	return true;
 }
 
+scene::ISceneManager* Client::getSceneManager()
+{
+	return m_rendering_engine->get_scene_manager();
+}
+
 Inventory* Client::getInventory(const InventoryLocation &loc)
 {
 	switch(loc.type){
@@ -1663,17 +1640,17 @@ void Client::addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server, bool ur
 void Client::updateAllMapBlocks()
 {
 	v3s16 currentBlock = getNodeBlockPos(floatToInt(m_env.getLocalPlayer()->getPosition(), BS));
-	
+
 	for (s16 X = currentBlock.X - 2; X <= currentBlock.X + 2; X++)
 	for (s16 Y = currentBlock.Y - 2; Y <= currentBlock.Y + 2; Y++)
 	for (s16 Z = currentBlock.Z - 2; Z <= currentBlock.Z + 2; Z++)
 		addUpdateMeshTask(v3s16(X, Y, Z), false, true);
-	
+
 	Map &map = m_env.getMap();
-	
+
 	std::vector<v3s16> positions;
 	map.listAllLoadedBlocks(positions);
-	
+
 	for (v3s16 p : positions) {
 		addUpdateMeshTask(p, false, false);
 	}
@@ -1710,7 +1687,7 @@ typedef struct TextureUpdateArgs {
 	ITextureSource *tsrc;
 } TextureUpdateArgs;
 
-void texture_update_progress(void *args, u32 progress, u32 max_progress)
+void Client::showUpdateProgressTexture(void *args, u32 progress, u32 max_progress)
 {
 		TextureUpdateArgs* targs = (TextureUpdateArgs*) args;
 		u16 cur_percent = ceil(progress / (double) max_progress * 100.);
@@ -1729,7 +1706,7 @@ void texture_update_progress(void *args, u32 progress, u32 max_progress)
 			targs->last_time_ms = time_ms;
 			std::basic_stringstream<wchar_t> strm;
 			strm << targs->text_base << " " << targs->last_percent << "%...";
-			RenderingEngine::draw_load_screen(strm.str(), targs->guienv, targs->tsrc, 0,
+			m_rendering_engine->draw_load_screen(strm.str(), targs->guienv, targs->tsrc, 0,
 				72 + (u16) ((18. / 100.) * (double) targs->last_percent), true);
 		}
 }
@@ -1750,21 +1727,21 @@ void Client::afterContentReceived()
 
 	// Rebuild inherited images and recreate textures
 	infostream<<"- Rebuilding images and textures"<<std::endl;
-	RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 70);
+	m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, 0, 70);
 	m_tsrc->rebuildImagesAndTextures();
 	delete[] text;
 
 	// Rebuild shaders
 	infostream<<"- Rebuilding shaders"<<std::endl;
 	text = wgettext("Rebuilding shaders...");
-	RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 71);
+	m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, 0, 71);
 	m_shsrc->rebuildShaders();
 	delete[] text;
 
 	// Update node aliases
 	infostream<<"- Updating node aliases"<<std::endl;
 	text = wgettext("Initializing nodes...");
-	RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 72);
+	m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, 0, 72);
 	m_nodedef->updateAliases(m_itemdef);
 	for (const auto &path : getTextureDirs()) {
 		TextureOverrideSource override_source(path + DIR_DELIM + "override.txt");
@@ -1783,7 +1760,7 @@ void Client::afterContentReceived()
 	tu_args.last_percent = 0;
 	tu_args.text_base =  wgettext("Initializing nodes");
 	tu_args.tsrc = m_tsrc;
-	m_nodedef->updateTextures(this, texture_update_progress, &tu_args);
+	m_nodedef->updateTextures(this, &tu_args);
 	delete[] tu_args.text_base;
 
 	// Start mesh update thread after setting up content definitions
@@ -1797,7 +1774,7 @@ void Client::afterContentReceived()
 		m_script->on_client_ready(m_env.getLocalPlayer());
 
 	text = wgettext("Done!");
-	RenderingEngine::draw_load_screen(text, guienv, m_tsrc, 0, 100);
+	m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, 0, 100);
 	infostream<<"Client::afterContentReceived() done"<<std::endl;
 	delete[] text;
 }
@@ -1815,7 +1792,7 @@ float Client::getCurRate()
 
 void Client::makeScreenshot()
 {
-	irr::video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	irr::video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
 	irr::video::IImage* const raw_image = driver->createScreenShot();
 
 	if (!raw_image)
@@ -1875,7 +1852,7 @@ void Client::makeScreenshot()
 				sstr << "Failed to save screenshot '" << filename << "'";
 			}
 			pushToChatQueue(new ChatMessage(CHATMESSAGE_TYPE_SYSTEM,
-					narrow_to_wide(sstr.str())));
+					utf8_to_wide(sstr.str())));
 			infostream << sstr.str() << std::endl;
 			image->drop();
 		}
@@ -1965,16 +1942,17 @@ scene::IAnimatedMesh* Client::getMesh(const std::string &filename, bool cache)
 
 	// Create the mesh, remove it from cache and return it
 	// This allows unique vertex colors and other properties for each instance
-	Buffer<char> data_rw(data.c_str(), data.size()); // Const-incorrect Irrlicht
-	io::IReadFile *rfile   = RenderingEngine::get_filesystem()->createMemoryReadFile(
-			*data_rw, data_rw.getSize(), filename.c_str());
+	io::IReadFile *rfile = m_rendering_engine->get_filesystem()->createMemoryReadFile(
+			data.c_str(), data.size(), filename.c_str());
 	FATAL_ERROR_IF(!rfile, "Could not create/open RAM file");
 
-	scene::IAnimatedMesh *mesh = RenderingEngine::get_scene_manager()->getMesh(rfile);
+	scene::IAnimatedMesh *mesh = m_rendering_engine->get_scene_manager()->getMesh(rfile);
 	rfile->drop();
+	if (!mesh)
+		return nullptr;
 	mesh->grab();
 	if (!cache)
-		RenderingEngine::get_mesh_cache()->removeMesh(mesh);
+		m_rendering_engine->removeMesh(mesh);
 	return mesh;
 }
 
diff --git a/src/client/client.h b/src/client/client.h
index 979636eba..8d7f63c0c 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -45,6 +45,7 @@ struct ClientEvent;
 struct MeshMakeData;
 struct ChatMessage;
 class MapBlockMesh;
+class RenderingEngine;
 class IWritableTextureSource;
 class IWritableShaderSource;
 class ISoundManager;
@@ -122,6 +123,7 @@ public:
 			NodeDefManager *nodedef,
 			ISoundManager *sound,
 			MtEventManager *event,
+			RenderingEngine *rendering_engine,
 			bool ipv6,
 			GameUI *game_ui
 	);
@@ -346,6 +348,7 @@ public:
 	float mediaReceiveProgress();
 
 	void afterContentReceived();
+	void showUpdateProgressTexture(void *args, u32 progress, u32 max_progress);
 
 	float getRTT();
 	float getCurRate();
@@ -354,6 +357,7 @@ public:
 	void setCamera(Camera* camera) { m_camera = camera; }
 
 	Camera* getCamera () { return m_camera; }
+	scene::ISceneManager *getSceneManager();
 
 	bool shouldShowMinimap() const;
 
@@ -381,6 +385,7 @@ public:
 	// Insert a media file appropriately into the appropriate manager
 	bool loadMedia(const std::string &data, const std::string &filename,
 		bool from_media_push = false);
+
 	// Send a request for conventional media transfer
 	void request_media(const std::vector<std::string> &file_requests);
 
@@ -418,16 +423,6 @@ public:
 		return false;
 	}
 
-	u32 getCSMNodeRangeLimit() const
-	{
-		return m_csm_restriction_noderange;
-	}
-
-	inline std::unordered_map<u32, u32> &getHUDTranslationMap()
-	{
-		return m_hud_server_to_client;
-	}
-
 	bool joinModChannel(const std::string &channel) override;
 	bool leaveModChannel(const std::string &channel) override;
 	bool sendModChannelMessage(const std::string &channel,
@@ -445,7 +440,6 @@ public:
 	
 private:
 	void loadMods();
-	bool checkBuiltinIntegrity();
 
 	// Virtual methods from con::PeerHandler
 	void peerAdded(con::Peer *peer) override;
@@ -487,6 +481,7 @@ private:
 	NodeDefManager *m_nodedef;
 	ISoundManager *m_sound;
 	MtEventManager *m_event;
+	RenderingEngine *m_rendering_engine;
 
 
 	ClientEnvironment m_env;
@@ -568,9 +563,6 @@ private:
 	// Relation of client id to object id
 	std::unordered_map<int, u16> m_sounds_to_objects;
 
-	// Map server hud ids to client hud ids
-	std::unordered_map<u32, u32> m_hud_server_to_client;
-
 	// Privileges
 	std::unordered_set<std::string> m_privileges;
 
@@ -593,7 +585,6 @@ private:
 
 	// Client modding
 	ClientScripting *m_script = nullptr;
-	bool m_modding_enabled;
 	std::unordered_map<std::string, ModMetadata *> m_mod_storages;
 	float m_mod_storage_save_timer = 10.0f;
 	std::vector<ModSpec> m_mods;
diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp
index 5f44c30ac..f9c20b2df 100644
--- a/src/client/clientenvironment.cpp
+++ b/src/client/clientenvironment.cpp
@@ -235,7 +235,16 @@ void ClientEnvironment::step(float dtime)
 			&player_collisions);
 	}
 
-	bool player_immortal = lplayer->getCAO() && lplayer->getCAO()->isImmortal();
+	bool player_immortal = false;
+	f32 player_fall_factor = 1.0f;
+	GenericCAO *playercao = lplayer->getCAO();
+	if (playercao) {
+		player_immortal = playercao->isImmortal();
+		int addp_p = itemgroup_get(playercao->getGroups(),
+			"fall_damage_add_percent");
+		// convert armor group into an usable fall damage factor
+		player_fall_factor = 1.0f + (float)addp_p / 100.0f;
+	}
 
 	for (const CollisionInfo &info : player_collisions) {
 		v3f speed_diff = info.new_speed - info.old_speed;;
@@ -248,17 +257,20 @@ void ClientEnvironment::step(float dtime)
 		speed_diff.Z = 0;
 		f32 pre_factor = 1; // 1 hp per node/s
 		f32 tolerance = BS*14; // 5 without damage
-		f32 post_factor = 1; // 1 hp per node/s
 		if (info.type == COLLISION_NODE) {
 			const ContentFeatures &f = m_client->ndef()->
 				get(m_map->getNode(info.node_p));
-			// Determine fall damage multiplier
-			int addp = itemgroup_get(f.groups, "fall_damage_add_percent");
-			pre_factor = 1.0f + (float)addp / 100.0f;
+			// Determine fall damage modifier
+			int addp_n = itemgroup_get(f.groups, "fall_damage_add_percent");
+			// convert node group to an usable fall damage factor
+			f32 node_fall_factor = 1.0f + (float)addp_n / 100.0f;
+			// combine both player fall damage modifiers
+			pre_factor = node_fall_factor * player_fall_factor;
 		}
 		float speed = pre_factor * speed_diff.getLength();
-		if (speed > tolerance && !player_immortal) {
-			f32 damage_f = (speed - tolerance) / BS * post_factor;
+
+		if (speed > tolerance && !player_immortal && pre_factor > 0.0f) {
+			f32 damage_f = (speed - tolerance) / BS;
 			u16 damage = (u16)MYMIN(damage_f + 0.5, U16_MAX);
 			if (damage != 0) {
 				damageLocalPlayer(damage, true);
@@ -334,20 +346,13 @@ GenericCAO* ClientEnvironment::getGenericCAO(u16 id)
 	return NULL;
 }
 
-bool isFreeClientActiveObjectId(const u16 id,
-	ClientActiveObjectMap &objects)
-{
-	return id != 0 && objects.find(id) == objects.end();
-
-}
-
 u16 ClientEnvironment::addActiveObject(ClientActiveObject *object)
 {
 	// Register object. If failed return zero id
 	if (!m_ao_manager.registerObject(object))
 		return 0;
 
-	object->addToScene(m_texturesource);
+	object->addToScene(m_texturesource, m_client->getSceneManager());
 
 	// Update lighting immediately
 	object->updateLight(getDayNightRatio());
@@ -359,6 +364,7 @@ void ClientEnvironment::addActiveObject(u16 id, u8 type,
 {
 	ClientActiveObject* obj =
 		ClientActiveObject::create((ActiveObjectType) type, m_client, this);
+
 	if(obj == NULL)
 	{
 		infostream<<"ClientEnvironment::addActiveObject(): "
@@ -369,6 +375,9 @@ void ClientEnvironment::addActiveObject(u16 id, u8 type,
 
 	obj->setId(id);
 
+	if (m_client->modsLoaded())
+		m_client->getScript()->addObjectReference(dynamic_cast<ActiveObject*>(obj));
+
 	try
 	{
 		obj->initialize(init_data);
@@ -401,9 +410,14 @@ void ClientEnvironment::removeActiveObject(u16 id)
 {
 	// Get current attachment childs to detach them visually
 	std::unordered_set<int> attachment_childs;
-	if (auto *obj = getActiveObject(id))
+	auto *obj = getActiveObject(id);
+	if (obj) {
 		attachment_childs = obj->getAttachmentChildIds();
 
+		if (m_client->modsLoaded())
+			m_client->getScript()->removeObjectReference(dynamic_cast<ActiveObject*>(obj));
+	}
+
 	m_ao_manager.removeObject(id);
 
 	// Perform a proper detach in Irrlicht
diff --git a/src/client/clientevent.h b/src/client/clientevent.h
index 9bd31efce..2215aecbd 100644
--- a/src/client/clientevent.h
+++ b/src/client/clientevent.h
@@ -52,6 +52,31 @@ enum ClientEventType : u8
 	CLIENTEVENT_MAX,
 };
 
+struct ClientEventHudAdd
+{
+	u32 server_id;
+	u8 type;
+	v2f pos, scale;
+	std::string name;
+	std::string text, text2;
+	u32 number, item, dir;
+	v2f align, offset;
+	v3f world_pos;
+	v2s32 size;
+	s16 z_index;
+};
+
+struct ClientEventHudChange
+{
+	u32 id;
+	HudElementStat stat;
+	v2f v2fdata;
+	std::string sdata;
+	u32 data;
+	v3f v3fdata;
+	v2s32 v2s32data;
+};
+
 struct ClientEvent
 {
 	ClientEventType type;
@@ -93,38 +118,12 @@ struct ClientEvent
 		{
 			u32 id;
 		} delete_particlespawner;
-		struct
-		{
-			u32 server_id;
-			u8 type;
-			v2f *pos;
-			std::string *name;
-			v2f *scale;
-			std::string *text;
-			u32 number;
-			u32 item;
-			u32 dir;
-			v2f *align;
-			v2f *offset;
-			v3f *world_pos;
-			v2s32 *size;
-			s16 z_index;
-			std::string *text2;
-		} hudadd;
+		ClientEventHudAdd *hudadd;
 		struct
 		{
 			u32 id;
 		} hudrm;
-		struct
-		{
-			u32 id;
-			HudElementStat stat;
-			v2f *v2fdata;
-			std::string *sdata;
-			u32 data;
-			v3f *v3fdata;
-			v2s32 *v2s32data;
-		} hudchange;
+		ClientEventHudChange *hudchange;
 		SkyboxParams *set_sky;
 		struct
 		{
diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index 29427f609..6db5f2e70 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -80,7 +80,7 @@ ClientLauncher::~ClientLauncher()
 	delete g_fontengine;
 	delete g_gamecallback;
 
-	delete RenderingEngine::get_instance();
+	delete m_rendering_engine;
 
 #if USE_SOUND
 	g_sound_manager_singleton.reset();
@@ -101,7 +101,7 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 
 	// List video modes if requested
 	if (list_video_modes)
-		return RenderingEngine::print_video_modes();
+		return m_rendering_engine->print_video_modes();
 
 #if USE_SOUND
 	if (g_settings->getBool("enable_sound"))
@@ -120,12 +120,12 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 		return true;
 	}
 
-	if (RenderingEngine::get_video_driver() == NULL) {
+	if (m_rendering_engine->get_video_driver() == NULL) {
 		errorstream << "Could not initialize video driver." << std::endl;
 		return false;
 	}
 
-	RenderingEngine::get_instance()->setupTopLevelWindow(PROJECT_NAME_C);
+	m_rendering_engine->setupTopLevelWindow(PROJECT_NAME_C);
 
 	/*
 		This changes the minimum allowed number of vertices in a VBO.
@@ -136,15 +136,15 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 	// Create game callback for menus
 	g_gamecallback = new MainGameCallback();
 
-	RenderingEngine::get_instance()->setResizable(true);
+	m_rendering_engine->setResizable(true);
 
 	init_input();
 
-	RenderingEngine::get_scene_manager()->getParameters()->
+	m_rendering_engine->get_scene_manager()->getParameters()->
 		setAttribute(scene::ALLOW_ZWRITE_ON_TRANSPARENT, true);
 
-	guienv = RenderingEngine::get_gui_env();
-	skin = RenderingEngine::get_gui_env()->getSkin();
+	guienv = m_rendering_engine->get_gui_env();
+	skin = guienv->getSkin();
 	skin->setColor(gui::EGDC_BUTTON_TEXT, video::SColor(255, 255, 255, 255));
 	skin->setColor(gui::EGDC_3D_LIGHT, video::SColor(0, 0, 0, 0));
 	skin->setColor(gui::EGDC_3D_HIGH_LIGHT, video::SColor(255, 30, 30, 30));
@@ -166,7 +166,7 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 			sprite_path.append("checkbox_16.png");
 		// Texture dimensions should be a power of 2
 		gui::IGUISpriteBank *sprites = skin->getSpriteBank();
-		video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+		video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
 		video::ITexture *sprite_texture = driver->getTexture(sprite_path.c_str());
 		if (sprite_texture) {
 			s32 sprite_id = sprites->addTextureAsSprite(sprite_texture);
@@ -175,18 +175,16 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 		}
 	}
 #endif
-	g_fontengine = new FontEngine(g_settings, guienv);
+	g_fontengine = new FontEngine(guienv);
 	FATAL_ERROR_IF(g_fontengine == NULL, "Font engine creation failed.");
 
-#if (IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR >= 2
 	// Irrlicht 1.8 input colours
 	skin->setColor(gui::EGDC_EDITABLE, video::SColor(255, 128, 128, 128));
 	skin->setColor(gui::EGDC_FOCUSED_EDITABLE, video::SColor(255, 96, 134, 49));
-#endif
 
 	// Create the menu clouds
 	if (!g_menucloudsmgr)
-		g_menucloudsmgr = RenderingEngine::get_scene_manager()->createNewSceneManager();
+		g_menucloudsmgr = m_rendering_engine->get_scene_manager()->createNewSceneManager();
 	if (!g_menuclouds)
 		g_menuclouds = new Clouds(g_menucloudsmgr, -1, rand());
 	g_menuclouds->setHeight(100.0f);
@@ -214,11 +212,11 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 	bool retval = true;
 	bool *kill = porting::signal_handler_killstatus();
 
-	while (RenderingEngine::run() && !*kill &&
+	while (m_rendering_engine->run() && !*kill &&
 		!g_gamecallback->shutdown_requested) {
 		// Set the window caption
 		const wchar_t *text = wgettext("Main Menu");
-		RenderingEngine::get_raw_device()->
+		m_rendering_engine->get_raw_device()->
 			setWindowCaption((utf8_to_wide(PROJECT_NAME_C) +
 			L" " + utf8_to_wide(g_version_hash) +
 			L" [" + text + L"]").c_str());
@@ -226,14 +224,14 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 
 		try {	// This is used for catching disconnects
 
-			RenderingEngine::get_gui_env()->clear();
+			m_rendering_engine->get_gui_env()->clear();
 
 			/*
 				We need some kind of a root node to be able to add
 				custom gui elements directly on the screen.
 				Otherwise they won't be automatically drawn.
 			*/
-			guiroot = RenderingEngine::get_gui_env()->addStaticText(L"",
+			guiroot = m_rendering_engine->get_gui_env()->addStaticText(L"",
 				core::rect<s32>(0, 0, 10000, 10000));
 
 			bool game_has_run = launch_game(error_message, reconnect_requested,
@@ -256,29 +254,30 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 			}
 
 			// Break out of menu-game loop to shut down cleanly
-			if (!RenderingEngine::get_raw_device()->run() || *kill) {
+			if (!m_rendering_engine->run() || *kill) {
 				if (!g_settings_path.empty())
 					g_settings->updateConfigFile(g_settings_path.c_str());
 				break;
 			}
 
-			RenderingEngine::get_video_driver()->setTextureCreationFlag(
+			m_rendering_engine->get_video_driver()->setTextureCreationFlag(
 					video::ETCF_CREATE_MIP_MAPS, g_settings->getBool("mip_map"));
 
 #ifdef HAVE_TOUCHSCREENGUI
-			receiver->m_touchscreengui = new TouchScreenGUI(RenderingEngine::get_raw_device(), receiver);
+			receiver->m_touchscreengui = new TouchScreenGUI(m_rendering_engine->get_raw_device(), receiver);
 			g_touchscreengui = receiver->m_touchscreengui;
 #endif
 
 			the_game(
 				kill,
 				input,
+				m_rendering_engine,
 				start_data,
 				error_message,
 				chat_backend,
 				&reconnect_requested
 			);
-			RenderingEngine::get_scene_manager()->clear();
+			m_rendering_engine->get_scene_manager()->clear();
 
 #ifdef HAVE_TOUCHSCREENGUI
 			delete g_touchscreengui;
@@ -346,8 +345,8 @@ void ClientLauncher::init_args(GameStartData &start_data, const Settings &cmd_ar
 bool ClientLauncher::init_engine()
 {
 	receiver = new MyEventReceiver();
-	new RenderingEngine(receiver);
-	return RenderingEngine::get_raw_device() != nullptr;
+	m_rendering_engine = new RenderingEngine(receiver);
+	return m_rendering_engine->get_raw_device() != nullptr;
 }
 
 void ClientLauncher::init_input()
@@ -364,7 +363,7 @@ void ClientLauncher::init_input()
 		// Make sure this is called maximum once per
 		// irrlicht device, otherwise it will give you
 		// multiple events for the same joystick.
-		if (RenderingEngine::get_raw_device()->activateJoysticks(infos)) {
+		if (m_rendering_engine->get_raw_device()->activateJoysticks(infos)) {
 			infostream << "Joystick support enabled" << std::endl;
 			joystick_infos.reserve(infos.size());
 			for (u32 i = 0; i < infos.size(); i++) {
@@ -471,7 +470,7 @@ bool ClientLauncher::launch_game(std::string &error_message,
 			start_data.address.empty() && !start_data.name.empty();
 	}
 
-	if (!RenderingEngine::run())
+	if (!m_rendering_engine->run())
 		return false;
 
 	if (!start_data.isSinglePlayer() && start_data.name.empty()) {
@@ -487,14 +486,6 @@ bool ClientLauncher::launch_game(std::string &error_message,
 		start_data.socket_port = myrand_range(49152, 65535);
 	} else {
 		g_settings->set("name", start_data.name);
-		if (!start_data.address.empty()) {
-			ServerListSpec server;
-			server["name"]        = server_name;
-			server["address"]     = start_data.address;
-			server["port"]        = itos(start_data.socket_port);
-			server["description"] = server_description;
-			ServerList::insert(server);
-		}
 	}
 
 	if (start_data.name.length() > PLAYERNAME_SIZE - 1) {
@@ -551,14 +542,14 @@ bool ClientLauncher::launch_game(std::string &error_message,
 void ClientLauncher::main_menu(MainMenuData *menudata)
 {
 	bool *kill = porting::signal_handler_killstatus();
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
 
 	infostream << "Waiting for other menus" << std::endl;
-	while (RenderingEngine::get_raw_device()->run() && !*kill) {
+	while (m_rendering_engine->run() && !*kill) {
 		if (!isMenuActive())
 			break;
 		driver->beginScene(true, true, video::SColor(255, 128, 128, 128));
-		RenderingEngine::get_gui_env()->drawAll();
+		m_rendering_engine->get_gui_env()->drawAll();
 		driver->endScene();
 		// On some computers framerate doesn't seem to be automatically limited
 		sleep_ms(25);
@@ -567,14 +558,14 @@ void ClientLauncher::main_menu(MainMenuData *menudata)
 
 	// Cursor can be non-visible when coming from the game
 #ifndef ANDROID
-	RenderingEngine::get_raw_device()->getCursorControl()->setVisible(true);
+	m_rendering_engine->get_raw_device()->getCursorControl()->setVisible(true);
 #endif
 
 	/* show main menu */
-	GUIEngine mymenu(&input->joystick, guiroot, &g_menumgr, menudata, *kill);
+	GUIEngine mymenu(&input->joystick, guiroot, m_rendering_engine, &g_menumgr, menudata, *kill);
 
 	/* leave scene manager in a clean state */
-	RenderingEngine::get_scene_manager()->clear();
+	m_rendering_engine->get_scene_manager()->clear();
 }
 
 void ClientLauncher::speed_tests()
diff --git a/src/client/clientlauncher.h b/src/client/clientlauncher.h
index b280d8e6b..79727e1fe 100644
--- a/src/client/clientlauncher.h
+++ b/src/client/clientlauncher.h
@@ -49,6 +49,7 @@ private:
 	bool list_video_modes = false;
 	bool skip_main_menu = false;
 	bool random_input = false;
+	RenderingEngine *m_rendering_engine = nullptr;
 	InputHandler *input = nullptr;
 	MyEventReceiver *receiver = nullptr;
 	gui::IGUISkin *skin = nullptr;
diff --git a/src/client/clientmap.cpp b/src/client/clientmap.cpp
index 68fd41e39..29a7fd3ba 100644
--- a/src/client/clientmap.cpp
+++ b/src/client/clientmap.cpp
@@ -64,12 +64,13 @@ void MeshBufListList::add(scene::IMeshBuffer *buf, v3s16 position, u8 layer)
 
 ClientMap::ClientMap(
 		Client *client,
+		RenderingEngine *rendering_engine,
 		MapDrawControl &control,
 		s32 id
 ):
 	Map(client),
-	scene::ISceneNode(RenderingEngine::get_scene_manager()->getRootSceneNode(),
-		RenderingEngine::get_scene_manager(), id),
+	scene::ISceneNode(rendering_engine->get_scene_manager()->getRootSceneNode(),
+		rendering_engine->get_scene_manager(), id),
 	m_client(client),
 	m_control(control)
 {
@@ -165,6 +166,9 @@ void ClientMap::updateDrawList()
 	v3s16 p_blocks_max;
 	getBlocksInViewRange(cam_pos_nodes, &p_blocks_min, &p_blocks_max);
 
+	// Read the vision range, unless unlimited range is enabled.
+	float range = m_control.range_all ? 1e7 : m_control.wanted_range;
+
 	// Number of blocks currently loaded by the client
 	u32 blocks_loaded = 0;
 	// Number of blocks with mesh in rendering range
@@ -182,6 +186,7 @@ void ClientMap::updateDrawList()
 			occlusion_culling_enabled = false;
 	}
 
+
 	// Uncomment to debug occluded blocks in the wireframe mode
 	// TODO: Include this as a flag for an extended debugging setting
 	//if (occlusion_culling_enabled && m_control.show_wireframe)
@@ -218,32 +223,34 @@ void ClientMap::updateDrawList()
 				continue;
 			}
 
-			float range = 100000 * BS;
-			if (!m_control.range_all)
-				range = m_control.wanted_range * BS;
+			v3s16 block_coord = block->getPos();
+			v3s16 block_position = block->getPosRelative() + MAP_BLOCKSIZE / 2;
 
-			float d = 0.0;
-			if (!isBlockInSight(block->getPos(), camera_position,
-					camera_direction, camera_fov, range, &d))
-				continue;
+			// First, perform a simple distance check, with a padding of one extra block.
+			if (!m_control.range_all &&
+					block_position.getDistanceFrom(cam_pos_nodes) > range + MAP_BLOCKSIZE)
+				continue; // Out of range, skip.
 
+			// Keep the block alive as long as it is in range.
+			block->resetUsageTimer();
 			blocks_in_range_with_mesh++;
 
-			/*
-				Occlusion culling
-			*/
+			// Frustum culling
+			float d = 0.0;
+			if (!isBlockInSight(block_coord, camera_position,
+					camera_direction, camera_fov, range * BS, &d))
+				continue;
+
+			// Occlusion culling
 			if ((!m_control.range_all && d > m_control.wanted_range * BS) ||
 					(occlusion_culling_enabled && isBlockOccluded(block, cam_pos_nodes))) {
 				blocks_occlusion_culled++;
 				continue;
 			}
 
-			// This block is in range. Reset usage timer.
-			block->resetUsageTimer();
-
 			// Add to set
 			block->refGrab();
-			m_drawlist[block->getPos()] = block;
+			m_drawlist[block_coord] = block;
 
 			sector_blocks_drawn++;
 		} // foreach sectorblocks
@@ -282,8 +289,6 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 	const u32 daynight_ratio = m_client->getEnv().getDayNightRatio();
 
 	const v3f camera_position = m_camera_position;
-	const v3f camera_direction = m_camera_direction;
-	const f32 camera_fov = m_camera_fov;
 
 	/*
 		Get all blocks and draw all visible ones
@@ -310,10 +315,9 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 		if (!block->mesh)
 			continue;
 
-		float d = 0.0;
-		if (!isBlockInSight(block->getPos(), camera_position,
-				camera_direction, camera_fov, 100000 * BS, &d))
-			continue;
+		v3f block_pos_r = intToFloat(block->getPosRelative() + MAP_BLOCKSIZE / 2, BS);
+		float d = camera_position.getDistanceFrom(block_pos_r);
+		d = MYMAX(0,d - BLOCK_MAX_RADIUS);
 
 		// Mesh animation
 		if (pass == scene::ESNRP_SOLID) {
@@ -496,12 +500,12 @@ int ClientMap::getBackgroundBrightness(float max_d, u32 daylight_factor,
 	static v3f z_directions[50] = {
 		v3f(-100, 0, 0)
 	};
-	static f32 z_offsets[sizeof(z_directions)/sizeof(*z_directions)] = {
+	static f32 z_offsets[50] = {
 		-1000,
 	};
 
-	if(z_directions[0].X < -99){
-		for(u32 i=0; i<sizeof(z_directions)/sizeof(*z_directions); i++){
+	if (z_directions[0].X < -99) {
+		for (u32 i = 0; i < ARRLEN(z_directions); i++) {
 			// Assumes FOV of 72 and 16/9 aspect ratio
 			z_directions[i] = v3f(
 				0.02 * myrand_range(-100, 100),
@@ -517,7 +521,8 @@ int ClientMap::getBackgroundBrightness(float max_d, u32 daylight_factor,
 	if(sunlight_min_d > 35*BS)
 		sunlight_min_d = 35*BS;
 	std::vector<int> values;
-	for(u32 i=0; i<sizeof(z_directions)/sizeof(*z_directions); i++){
+	values.reserve(ARRLEN(z_directions));
+	for (u32 i = 0; i < ARRLEN(z_directions); i++) {
 		v3f z_dir = z_directions[i];
 		core::CMatrix4<f32> a;
 		a.buildRotateFromTo(v3f(0,1,0), z_dir);
diff --git a/src/client/clientmap.h b/src/client/clientmap.h
index 57cc4427e..80add4a44 100644
--- a/src/client/clientmap.h
+++ b/src/client/clientmap.h
@@ -68,6 +68,7 @@ class ClientMap : public Map, public scene::ISceneNode
 public:
 	ClientMap(
 			Client *client,
+			RenderingEngine *rendering_engine,
 			MapDrawControl &control,
 			s32 id
 	);
diff --git a/src/client/clientmedia.cpp b/src/client/clientmedia.cpp
index c4c08c05d..0f9ba5356 100644
--- a/src/client/clientmedia.cpp
+++ b/src/client/clientmedia.cpp
@@ -216,7 +216,6 @@ void ClientMediaDownloader::initialStep(Client *client)
 
 		// This is the first time we use httpfetch, so alloc a caller ID
 		m_httpfetch_caller = httpfetch_caller_alloc();
-		m_httpfetch_timeout = g_settings->getS32("curl_timeout");
 
 		// Set the active fetch limit to curl_parallel_limit or 84,
 		// whichever is greater. This gives us some leeway so that
@@ -258,8 +257,6 @@ void ClientMediaDownloader::initialStep(Client *client)
 				remote->baseurl + MTHASHSET_FILE_NAME;
 			fetch_request.caller = m_httpfetch_caller;
 			fetch_request.request_id = m_httpfetch_next_id; // == i
-			fetch_request.timeout = m_httpfetch_timeout;
-			fetch_request.connect_timeout = m_httpfetch_timeout;
 			fetch_request.method = HTTP_POST;
 			fetch_request.raw_data = required_hash_set;
 			fetch_request.extra_headers.emplace_back(
@@ -432,9 +429,8 @@ void ClientMediaDownloader::startRemoteMediaTransfers()
 				fetch_request.url = url;
 				fetch_request.caller = m_httpfetch_caller;
 				fetch_request.request_id = m_httpfetch_next_id;
-				fetch_request.timeout = 0; // no data timeout!
-				fetch_request.connect_timeout =
-					m_httpfetch_timeout;
+				fetch_request.timeout =
+					g_settings->getS32("curl_file_download_timeout");
 				httpfetch_async(fetch_request);
 
 				m_remote_file_transfers.insert(std::make_pair(
diff --git a/src/client/clientmedia.h b/src/client/clientmedia.h
index 5a918535b..e97a0f24b 100644
--- a/src/client/clientmedia.h
+++ b/src/client/clientmedia.h
@@ -137,7 +137,6 @@ private:
 	// Status of remote transfers
 	unsigned long m_httpfetch_caller;
 	unsigned long m_httpfetch_next_id = 0;
-	long m_httpfetch_timeout = 0;
 	s32 m_httpfetch_active = 0;
 	s32 m_httpfetch_active_limit = 0;
 	s32 m_outstanding_hash_sets = 0;
diff --git a/src/client/clientobject.h b/src/client/clientobject.h
index 4a1743d72..c0b14497c 100644
--- a/src/client/clientobject.h
+++ b/src/client/clientobject.h
@@ -44,7 +44,7 @@ public:
 	ClientActiveObject(u16 id, Client *client, ClientEnvironment *env);
 	virtual ~ClientActiveObject();
 
-	virtual void addToScene(ITextureSource *tsrc) {}
+	virtual void addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr) = 0;
 	virtual void removeFromScene(bool permanent) {}
 
 	virtual void updateLight(u32 day_night_ratio) {}
diff --git a/src/client/clouds.cpp b/src/client/clouds.cpp
index 253dee8b9..5008047af 100644
--- a/src/client/clouds.cpp
+++ b/src/client/clouds.cpp
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // Menu clouds are created later
 class Clouds;
 Clouds *g_menuclouds = NULL;
-irr::scene::ISceneManager *g_menucloudsmgr = NULL;
+scene::ISceneManager *g_menucloudsmgr = NULL;
 
 // Constant for now
 static constexpr const float cloud_size = BS * 64.0f;
@@ -170,7 +170,7 @@ void Clouds::render()
 
 	// Read noise
 
-	std::vector<char> grid(m_cloud_radius_i * 2 * m_cloud_radius_i * 2); // vector<bool> is broken
+	std::vector<bool> grid(m_cloud_radius_i * 2 * m_cloud_radius_i * 2);
 	std::vector<video::S3DVertex> vertices;
 	vertices.reserve(16 * m_cloud_radius_i * m_cloud_radius_i);
 
diff --git a/src/client/clouds.h b/src/client/clouds.h
index a4d810faa..c009a05b7 100644
--- a/src/client/clouds.h
+++ b/src/client/clouds.h
@@ -29,8 +29,7 @@ class Clouds;
 extern Clouds *g_menuclouds;
 
 // Scene manager used for menu clouds
-namespace irr{namespace scene{class ISceneManager;}}
-extern irr::scene::ISceneManager *g_menucloudsmgr;
+extern scene::ISceneManager *g_menucloudsmgr;
 
 class Clouds : public scene::ISceneNode
 {
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index c44c167b5..1259fcbd3 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IMeshManipulator.h>
 #include <IAnimatedMeshSceneNode.h>
 #include "client/client.h"
-#include "client/renderingengine.h"
 #include "client/sound.h"
 #include "client/tile.h"
 #include "util/basic_macros.h"
@@ -190,7 +189,7 @@ public:
 
 	static ClientActiveObject* create(Client *client, ClientEnvironment *env);
 
-	void addToScene(ITextureSource *tsrc);
+	void addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr);
 	void removeFromScene(bool permanent);
 	void updateLight(u32 day_night_ratio);
 	void updateNodePos();
@@ -221,7 +220,7 @@ ClientActiveObject* TestCAO::create(Client *client, ClientEnvironment *env)
 	return new TestCAO(client, env);
 }
 
-void TestCAO::addToScene(ITextureSource *tsrc)
+void TestCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 {
 	if(m_node != NULL)
 		return;
@@ -250,7 +249,7 @@ void TestCAO::addToScene(ITextureSource *tsrc)
 	// Add to mesh
 	mesh->addMeshBuffer(buf);
 	buf->drop();
-	m_node = RenderingEngine::get_scene_manager()->addMeshSceneNode(mesh, NULL);
+	m_node = smgr->addMeshSceneNode(mesh, NULL);
 	mesh->drop();
 	updateNodePos();
 }
@@ -595,9 +594,9 @@ void GenericCAO::removeFromScene(bool permanent)
 		m_client->getMinimap()->removeMarker(&m_marker);
 }
 
-void GenericCAO::addToScene(ITextureSource *tsrc)
+void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 {
-	m_smgr = RenderingEngine::get_scene_manager();
+	m_smgr = smgr;
 
 	if (getSceneNode() != NULL) {
 		return;
@@ -629,8 +628,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 	}
 
 	auto grabMatrixNode = [this] {
-		m_matrixnode = RenderingEngine::get_scene_manager()->
-				addDummyTransformationSceneNode();
+		m_matrixnode = m_smgr->addDummyTransformationSceneNode();
 		m_matrixnode->grab();
 	};
 
@@ -648,7 +646,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 
 	if (m_prop.visual == "sprite") {
 		grabMatrixNode();
-		m_spritenode = RenderingEngine::get_scene_manager()->addBillboardSceneNode(
+		m_spritenode = m_smgr->addBillboardSceneNode(
 				m_matrixnode, v2f(1, 1), v3f(0,0,0), -1);
 		m_spritenode->grab();
 		m_spritenode->setMaterialTexture(0,
@@ -733,8 +731,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 			mesh->addMeshBuffer(buf);
 			buf->drop();
 		}
-		m_meshnode = RenderingEngine::get_scene_manager()->
-			addMeshSceneNode(mesh, m_matrixnode);
+		m_meshnode = m_smgr->addMeshSceneNode(mesh, m_matrixnode);
 		m_meshnode->grab();
 		mesh->drop();
 		// Set it to use the materials of the meshbuffers directly.
@@ -743,8 +740,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 	} else if (m_prop.visual == "cube") {
 		grabMatrixNode();
 		scene::IMesh *mesh = createCubeMesh(v3f(BS,BS,BS));
-		m_meshnode = RenderingEngine::get_scene_manager()->
-			addMeshSceneNode(mesh, m_matrixnode);
+		m_meshnode = m_smgr->addMeshSceneNode(mesh, m_matrixnode);
 		m_meshnode->grab();
 		mesh->drop();
 
@@ -757,8 +753,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 		grabMatrixNode();
 		scene::IAnimatedMesh *mesh = m_client->getMesh(m_prop.mesh, true);
 		if (mesh) {
-			m_animated_meshnode = RenderingEngine::get_scene_manager()->
-				addAnimatedMeshSceneNode(mesh, m_matrixnode);
+			m_animated_meshnode = m_smgr->addAnimatedMeshSceneNode(mesh, m_matrixnode);
 			m_animated_meshnode->grab();
 			mesh->drop(); // The scene node took hold of it
 
@@ -799,8 +794,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 			infostream << "serialized form: " << m_prop.wield_item << std::endl;
 			item.deSerialize(m_prop.wield_item, m_client->idef());
 		}
-		m_wield_meshnode = new WieldMeshSceneNode(
-			RenderingEngine::get_scene_manager(), -1);
+		m_wield_meshnode = new WieldMeshSceneNode(m_smgr, -1);
 		m_wield_meshnode->setItem(item, m_client,
 			(m_prop.visual == "wielditem"));
 
@@ -828,16 +822,22 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 	updateAttachments();
 	setNodeLight(m_last_light);
 	updateMeshCulling();
+
+	if (m_client->modsLoaded())
+		m_client->getScript()->on_object_add(m_id);
+
+	if (m_client->modsLoaded())
+		m_client->getScript()->on_object_properties_change(m_id);
 }
 
 void GenericCAO::updateLight(u32 day_night_ratio)
-{		
+{
 	if (m_glow < 0)
 		return;
 
 	u8 light_at_pos = 0;
 	bool pos_ok = false;
-		
+
 	v3s16 pos[3];
 	u16 npos = getLightPosition(pos);
 	for (u16 i = 0; i < npos; i++) {
@@ -940,7 +940,7 @@ void GenericCAO::updateNametag()
 	//if (m_is_local_player && ! g_settings->getBool("freecam")) // No nametag for local player
 		//return;
 
-	if (m_prop.nametag.empty()) {
+	if (m_prop.nametag.empty() || m_prop.nametag_color.getAlpha() == 0) {
 		// Delete nametag
 		if (m_nametag) {
 			m_client->getCamera()->removeNametag(m_nametag);
@@ -958,12 +958,15 @@ void GenericCAO::updateNametag()
 	if (!m_nametag) {
 		// Add nametag
 		m_nametag = m_client->getCamera()->addNametag(node,
-			m_prop.nametag, m_prop.nametag_color, pos);
+			m_prop.nametag, m_prop.nametag_color,
+			m_prop.nametag_bgcolor, pos, nametag_images);
 	} else {
 		// Update nametag
-		m_nametag->nametag_text = m_prop.nametag;
-		m_nametag->nametag_color = m_prop.nametag_color;
-		m_nametag->nametag_pos = pos;
+		m_nametag->text = m_prop.nametag;
+		m_nametag->textcolor = m_prop.nametag_color;
+		m_nametag->bgcolor = m_prop.nametag_bgcolor;
+		m_nametag->pos = pos;
+		m_nametag->setImages(nametag_images);
 	}
 }
 
@@ -1080,7 +1083,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
 		}
 
 		removeFromScene(false);
-		addToScene(m_client->tsrc());
+		addToScene(m_client->tsrc(), m_smgr);
 
 		// Attachments, part 2: Now that the parent has been refreshed, put its attachments back
 		for (u16 cao_id : m_attachment_child_ids) {
@@ -1479,11 +1482,8 @@ void GenericCAO::updateAnimation()
 	if (m_animated_meshnode->getAnimationSpeed() != m_animation_speed)
 		m_animated_meshnode->setAnimationSpeed(m_animation_speed);
 	m_animated_meshnode->setTransitionTime(m_animation_blend);
-// Requires Irrlicht 1.8 or greater
-#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR > 1
 	if (m_animated_meshnode->getLoopMode() != m_animation_loop)
 		m_animated_meshnode->setLoopMode(m_animation_loop);
-#endif
 }
 
 void GenericCAO::updateAnimationSpeed()
@@ -1499,10 +1499,10 @@ void GenericCAO::updateBonePosition()
 	if (m_bone_position.empty() || !m_animated_meshnode)
 		return;
 
-	m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render
+	m_animated_meshnode->setJointMode(scene::EJUOR_CONTROL); // To write positions to the mesh on render
 	for (auto &it : m_bone_position) {
 		std::string bone_name = it.first;
-		irr::scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
+		scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
 		if (bone) {
 			bone->setPosition(it.second.X);
 			bone->setRotation(it.second.Y);
@@ -1511,7 +1511,7 @@ void GenericCAO::updateBonePosition()
 
 	// search through bones to find mistakenly rotated bones due to bug in Irrlicht
 	for (u32 i = 0; i < m_animated_meshnode->getJointCount(); ++i) {
-		irr::scene::IBoneSceneNode *bone = m_animated_meshnode->getJointNode(i);
+		scene::IBoneSceneNode *bone = m_animated_meshnode->getJointNode(i);
 		if (!bone)
 			continue;
 
@@ -1627,6 +1627,57 @@ bool GenericCAO::visualExpiryRequired(const ObjectProperties &new_) const
 		(uses_legacy_texture && old.textures != new_.textures);
 }
 
+void GenericCAO::setProperties(ObjectProperties newprops)
+{
+	// Check what exactly changed
+	bool expire_visuals = visualExpiryRequired(newprops);
+	bool textures_changed = m_prop.textures != newprops.textures;
+
+	// Apply changes
+	m_prop = std::move(newprops);
+
+	m_selection_box = m_prop.selectionbox;
+	m_selection_box.MinEdge *= BS;
+	m_selection_box.MaxEdge *= BS;
+
+	m_tx_size.X = 1.0f / m_prop.spritediv.X;
+	m_tx_size.Y = 1.0f / m_prop.spritediv.Y;
+
+	if(!m_initial_tx_basepos_set){
+		m_initial_tx_basepos_set = true;
+		m_tx_basepos = m_prop.initial_sprite_basepos;
+	}
+	if (m_is_local_player) {
+		LocalPlayer *player = m_env->getLocalPlayer();
+		player->makes_footstep_sound = m_prop.makes_footstep_sound;
+		aabb3f collision_box = m_prop.collisionbox;
+		collision_box.MinEdge *= BS;
+		collision_box.MaxEdge *= BS;
+		player->setCollisionbox(collision_box);
+		player->setEyeHeight(m_prop.eye_height);
+		player->setZoomFOV(m_prop.zoom_fov);
+	}
+
+	if ((m_is_player && !m_is_local_player) && m_prop.nametag.empty())
+		m_prop.nametag = m_name;
+	if (m_is_local_player)
+		m_prop.show_on_minimap = false;
+
+	if (expire_visuals) {
+		expireVisuals();
+	} else {
+		infostream << "GenericCAO: properties updated but expiring visuals"
+			<< " not necessary" << std::endl;
+		if (textures_changed) {
+			// don't update while punch texture modifier is active
+			if (m_reset_textures_timer < 0)
+				updateTextures(m_current_texture_modifier);
+		}
+		updateNametag();
+		updateMarker();
+	}
+}
+
 void GenericCAO::processMessage(const std::string &data)
 {
 	//infostream<<"GenericCAO: Got message"<<std::endl;
@@ -1638,54 +1689,12 @@ void GenericCAO::processMessage(const std::string &data)
 		newprops.show_on_minimap = m_is_player; // default
 
 		newprops.deSerialize(is);
+		setProperties(newprops);
 
-		// Check what exactly changed
-		bool expire_visuals = visualExpiryRequired(newprops);
-		bool textures_changed = m_prop.textures != newprops.textures;
-
-		// Apply changes
-		m_prop = std::move(newprops);
-
-		m_selection_box = m_prop.selectionbox;
-		m_selection_box.MinEdge *= BS;
-		m_selection_box.MaxEdge *= BS;
-
-		m_tx_size.X = 1.0f / m_prop.spritediv.X;
-		m_tx_size.Y = 1.0f / m_prop.spritediv.Y;
+		// notify CSM
+		if (m_client->modsLoaded())
+			m_client->getScript()->on_object_properties_change(m_id);
 
-		if(!m_initial_tx_basepos_set){
-			m_initial_tx_basepos_set = true;
-			m_tx_basepos = m_prop.initial_sprite_basepos;
-		}
-		if (m_is_local_player) {
-			LocalPlayer *player = m_env->getLocalPlayer();
-			player->makes_footstep_sound = m_prop.makes_footstep_sound;
-			aabb3f collision_box = m_prop.collisionbox;
-			collision_box.MinEdge *= BS;
-			collision_box.MaxEdge *= BS;
-			player->setCollisionbox(collision_box);
-			player->setEyeHeight(m_prop.eye_height);
-			player->setZoomFOV(m_prop.zoom_fov);
-		}
-
-		if ((m_is_player && !m_is_local_player) && m_prop.nametag.empty())
-			m_prop.nametag = m_name;
-		if (m_is_local_player)
-			m_prop.show_on_minimap = false;
-
-		if (expire_visuals) {
-			expireVisuals();
-		} else {
-			infostream << "GenericCAO: properties updated but expiring visuals"
-				<< " not necessary" << std::endl;
-			if (textures_changed) {
-				// don't update while punch texture modifier is active
-				if (m_reset_textures_timer < 0)
-					updateTextures(m_current_texture_modifier);
-			}
-			updateNametag();
-			updateMarker();
-		}
 	} else if (cmd == AO_CMD_UPDATE_POSITION) {
 		// Not sent by the server if this object is an attachment.
 		// We might however get here if the server notices the object being detached before the client.
@@ -1750,10 +1759,10 @@ void GenericCAO::processMessage(const std::string &data)
 		if(m_is_local_player)
 		{
 			Client *client = m_env->getGameDef();
-			
+
 			if (client->modsLoaded() && client->getScript()->on_recieve_physics_override(override_speed, override_jump, override_gravity, sneak, sneak_glitch, new_move))
 				return;
-			
+
 			LocalPlayer *player = m_env->getLocalPlayer();
 			player->physics_override_speed = override_speed;
 			player->physics_override_jump = override_jump;
@@ -1849,6 +1858,9 @@ void GenericCAO::processMessage(const std::string &data)
 			// Same as 'ObjectRef::l_remove'
 			if (!m_is_player)
 				clearChildAttachments();
+		} else {
+			if (m_client->modsLoaded())
+				m_client->getScript()->on_object_hp_change(m_id);
 		}
 	} else if (cmd == AO_CMD_UPDATE_ARMOR_GROUPS) {
 		m_armor_groups.clear();
@@ -1944,7 +1956,7 @@ void GenericCAO::updateMeshCulling()
 		return;
 	}
 
-	irr::scene::ISceneNode *node = getSceneNode();
+	scene::ISceneNode *node = getSceneNode();
 	if (!node)
 		return;
 
diff --git a/src/client/content_cao.h b/src/client/content_cao.h
index 09c26bd9c..7e9bb6671 100644
--- a/src/client/content_cao.h
+++ b/src/client/content_cao.h
@@ -181,7 +181,7 @@ public:
 	{
 		return m_velocity;
 	}
-	
+
 	inline const u16 getHp() const
 	{
 		return m_hp;
@@ -189,6 +189,8 @@ public:
 
 	const bool isImmortal();
 
+	inline const ObjectProperties &getProperties() const { return m_prop; }
+
 	scene::ISceneNode *getSceneNode() const;
 
 	scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode() const;
@@ -260,7 +262,7 @@ public:
 
 	void removeFromScene(bool permanent);
 
-	void addToScene(ITextureSource *tsrc);
+	void addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr);
 
 	inline void expireVisuals()
 	{
@@ -307,13 +309,17 @@ public:
 	{
 		return m_prop.infotext;
 	}
-	
+
 	float m_waiting_for_reattach;
-	
+
 	ObjectProperties *getProperties()
 	{
 		return &m_prop;
 	}
 
+	void setProperties(ObjectProperties newprops);
+
 	void updateMeshCulling();
+
+	std::vector<std::string> nametag_images = {};
 };
diff --git a/src/client/content_mapblock.cpp b/src/client/content_mapblock.cpp
index df2748212..810c57138 100644
--- a/src/client/content_mapblock.cpp
+++ b/src/client/content_mapblock.cpp
@@ -60,18 +60,16 @@ static constexpr u16 quad_indices[] = {0, 1, 2, 2, 3, 0};
 
 const std::string MapblockMeshGenerator::raillike_groupname = "connect_to_raillike";
 
-MapblockMeshGenerator::MapblockMeshGenerator(MeshMakeData *input, MeshCollector *output)
+MapblockMeshGenerator::MapblockMeshGenerator(MeshMakeData *input, MeshCollector *output,
+	scene::IMeshManipulator *mm):
+	data(input),
+	collector(output),
+	nodedef(data->m_client->ndef()),
+	meshmanip(mm),
+	blockpos_nodes(data->m_blockpos * MAP_BLOCKSIZE)
 {
-	data      = input;
-	collector = output;
-
-	nodedef   = data->m_client->ndef();
-	meshmanip = RenderingEngine::get_scene_manager()->getMeshManipulator();
-
 	enable_mesh_cache = g_settings->getBool("enable_mesh_cache") &&
 		!data->m_smooth_lighting; // Mesh cache is not supported with smooth lighting
-
-	blockpos_nodes = data->m_blockpos * MAP_BLOCKSIZE;
 }
 
 void MapblockMeshGenerator::useTile(int index, u8 set_flags, u8 reset_flags, bool special)
@@ -513,10 +511,10 @@ f32 MapblockMeshGenerator::getCornerLevel(int i, int k)
 			count++;
 		} else if (content == CONTENT_AIR) {
 			air_count++;
-			if (air_count >= 2)
-				return -0.5 * BS + 0.2;
 		}
 	}
+	if (air_count >= 2)
+		return -0.5 * BS + 0.2;
 	if (count > 0)
 		return sum / count;
 	return 0;
@@ -968,7 +966,7 @@ void MapblockMeshGenerator::drawPlantlike()
 	draw_style = PLANT_STYLE_CROSS;
 	scale = BS / 2 * f->visual_scale;
 	offset = v3f(0, 0, 0);
-	rotate_degree = 0;
+	rotate_degree = 0.0f;
 	random_offset_Y = false;
 	face_num = 0;
 	plant_height = 1.0;
@@ -988,7 +986,8 @@ void MapblockMeshGenerator::drawPlantlike()
 		break;
 
 	case CPT2_DEGROTATE:
-		rotate_degree = n.param2 * 2;
+	case CPT2_COLORED_DEGROTATE:
+		rotate_degree = 1.5f * n.getDegRotate(nodedef);
 		break;
 
 	case CPT2_LEVELED:
@@ -1343,6 +1342,7 @@ void MapblockMeshGenerator::drawMeshNode()
 	u8 facedir = 0;
 	scene::IMesh* mesh;
 	bool private_mesh; // as a grab/drop pair is not thread-safe
+	int degrotate = 0;
 
 	if (f->param_type_2 == CPT2_FACEDIR ||
 			f->param_type_2 == CPT2_COLORED_FACEDIR) {
@@ -1354,9 +1354,12 @@ void MapblockMeshGenerator::drawMeshNode()
 		facedir = n.getWallMounted(nodedef);
 		if (!enable_mesh_cache)
 			facedir = wallmounted_to_facedir[facedir];
+	} else if (f->param_type_2 == CPT2_DEGROTATE ||
+			f->param_type_2 == CPT2_COLORED_DEGROTATE) {
+		degrotate = n.getDegRotate(nodedef);
 	}
 
-	if (!data->m_smooth_lighting && f->mesh_ptr[facedir]) {
+	if (!data->m_smooth_lighting && f->mesh_ptr[facedir] && !degrotate) {
 		// use cached meshes
 		private_mesh = false;
 		mesh = f->mesh_ptr[facedir];
@@ -1364,7 +1367,10 @@ void MapblockMeshGenerator::drawMeshNode()
 		// no cache, clone and rotate mesh
 		private_mesh = true;
 		mesh = cloneMesh(f->mesh_ptr[0]);
-		rotateMeshBy6dFacedir(mesh, facedir);
+		if (facedir)
+			rotateMeshBy6dFacedir(mesh, facedir);
+		else if (degrotate)
+			rotateMeshXZby(mesh, 1.5f * degrotate);
 		recalculateBoundingBox(mesh);
 		meshmanip->recalculateNormals(mesh, true, false);
 	} else
diff --git a/src/client/content_mapblock.h b/src/client/content_mapblock.h
index 487d84a07..237cc7847 100644
--- a/src/client/content_mapblock.h
+++ b/src/client/content_mapblock.h
@@ -139,7 +139,7 @@ public:
 // plantlike-specific
 	PlantlikeStyle draw_style;
 	v3f offset;
-	int rotate_degree;
+	float rotate_degree;
 	bool random_offset_Y;
 	int face_num;
 	float plant_height;
@@ -172,7 +172,8 @@ public:
 	void drawNode();
 
 public:
-	MapblockMeshGenerator(MeshMakeData *input, MeshCollector *output);
+	MapblockMeshGenerator(MeshMakeData *input, MeshCollector *output,
+			scene::IMeshManipulator *mm);
 	void generate();
 	void renderSingle(content_t node, u8 param2 = 0x00);
 };
diff --git a/src/client/fontengine.cpp b/src/client/fontengine.cpp
index a55420846..0382c2f18 100644
--- a/src/client/fontengine.cpp
+++ b/src/client/fontengine.cpp
@@ -42,8 +42,7 @@ static void font_setting_changed(const std::string &name, void *userdata)
 }
 
 /******************************************************************************/
-FontEngine::FontEngine(Settings* main_settings, gui::IGUIEnvironment* env) :
-	m_settings(main_settings),
+FontEngine::FontEngine(gui::IGUIEnvironment* env) :
 	m_env(env)
 {
 
@@ -51,34 +50,29 @@ FontEngine::FontEngine(Settings* main_settings, gui::IGUIEnvironment* env) :
 		i = (FontMode) FONT_SIZE_UNSPECIFIED;
 	}
 
-	assert(m_settings != NULL); // pre-condition
+	assert(g_settings != NULL); // pre-condition
 	assert(m_env != NULL); // pre-condition
 	assert(m_env->getSkin() != NULL); // pre-condition
 
 	readSettings();
 
-	if (m_currentMode == FM_Standard) {
-		m_settings->registerChangedCallback("font_size", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("font_bold", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("font_italic", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("font_path", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("font_path_bold", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("font_path_italic", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("font_path_bolditalic", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("font_shadow", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("font_shadow_alpha", font_setting_changed, NULL);
-	}
-	else if (m_currentMode == FM_Fallback) {
-		m_settings->registerChangedCallback("fallback_font_size", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("fallback_font_path", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("fallback_font_shadow", font_setting_changed, NULL);
-		m_settings->registerChangedCallback("fallback_font_shadow_alpha", font_setting_changed, NULL);
+	if (m_currentMode != FM_Simple) {
+		g_settings->registerChangedCallback("font_size", font_setting_changed, NULL);
+		g_settings->registerChangedCallback("font_bold", font_setting_changed, NULL);
+		g_settings->registerChangedCallback("font_italic", font_setting_changed, NULL);
+		g_settings->registerChangedCallback("font_path", font_setting_changed, NULL);
+		g_settings->registerChangedCallback("font_path_bold", font_setting_changed, NULL);
+		g_settings->registerChangedCallback("font_path_italic", font_setting_changed, NULL);
+		g_settings->registerChangedCallback("font_path_bolditalic", font_setting_changed, NULL);
+		g_settings->registerChangedCallback("font_shadow", font_setting_changed, NULL);
+		g_settings->registerChangedCallback("font_shadow_alpha", font_setting_changed, NULL);
+		g_settings->registerChangedCallback("fallback_font_path", font_setting_changed, NULL);
 	}
 
-	m_settings->registerChangedCallback("mono_font_path", font_setting_changed, NULL);
-	m_settings->registerChangedCallback("mono_font_size", font_setting_changed, NULL);
-	m_settings->registerChangedCallback("screen_dpi", font_setting_changed, NULL);
-	m_settings->registerChangedCallback("gui_scaling", font_setting_changed, NULL);
+	g_settings->registerChangedCallback("mono_font_path", font_setting_changed, NULL);
+	g_settings->registerChangedCallback("mono_font_size", font_setting_changed, NULL);
+	g_settings->registerChangedCallback("screen_dpi", font_setting_changed, NULL);
+	g_settings->registerChangedCallback("gui_scaling", font_setting_changed, NULL);
 }
 
 /******************************************************************************/
@@ -103,6 +97,11 @@ void FontEngine::cleanCache()
 /******************************************************************************/
 irr::gui::IGUIFont *FontEngine::getFont(FontSpec spec)
 {
+	return getFont(spec, false);
+}
+
+irr::gui::IGUIFont *FontEngine::getFont(FontSpec spec, bool may_fail)
+{
 	if (spec.mode == FM_Unspecified) {
 		spec.mode = m_currentMode;
 	} else if (m_currentMode == FM_Simple) {
@@ -113,6 +112,10 @@ irr::gui::IGUIFont *FontEngine::getFont(FontSpec spec)
 		// Support for those could be added, but who cares?
 		spec.bold = false;
 		spec.italic = false;
+	} else if (spec.mode == _FM_Fallback) {
+		// Fallback font doesn't support these either
+		spec.bold = false;
+		spec.italic = false;
 	}
 
 	// Fallback to default size
@@ -131,6 +134,13 @@ irr::gui::IGUIFont *FontEngine::getFont(FontSpec spec)
 	else
 		font = initFont(spec);
 
+	if (!font && !may_fail) {
+		errorstream << "Minetest cannot continue without a valid font. "
+			"Please correct the 'font_path' setting or install the font "
+			"file in the proper location." << std::endl;
+		abort();
+	}
+
 	m_font_cache[spec.getHash()][spec.size] = font;
 
 	return font;
@@ -205,30 +215,19 @@ unsigned int FontEngine::getFontSize(FontMode mode)
 void FontEngine::readSettings()
 {
 	if (USE_FREETYPE && g_settings->getBool("freetype")) {
-		m_default_size[FM_Standard] = m_settings->getU16("font_size");
-		m_default_size[FM_Fallback] = m_settings->getU16("fallback_font_size");
-		m_default_size[FM_Mono]     = m_settings->getU16("mono_font_size");
-
-		/*~ DO NOT TRANSLATE THIS LITERALLY!
-		This is a special string. Put either "no" or "yes"
-		into the translation field (literally).
-		Choose "yes" if the language requires use of the fallback
-		font, "no" otherwise.
-		The fallback font is (normally) required for languages with
-		non-Latin script, like Chinese.
-		When in doubt, test your translation. */
-		m_currentMode = is_yes(gettext("needs_fallback_font")) ?
-				FM_Fallback : FM_Standard;
-
-		m_default_bold = m_settings->getBool("font_bold");
-		m_default_italic = m_settings->getBool("font_italic");
+		m_default_size[FM_Standard]  = g_settings->getU16("font_size");
+		m_default_size[_FM_Fallback] = g_settings->getU16("font_size");
+		m_default_size[FM_Mono]      = g_settings->getU16("mono_font_size");
+
+		m_default_bold = g_settings->getBool("font_bold");
+		m_default_italic = g_settings->getBool("font_italic");
 
 	} else {
 		m_currentMode = FM_Simple;
 	}
 
-	m_default_size[FM_Simple]       = m_settings->getU16("font_size");
-	m_default_size[FM_SimpleMono]   = m_settings->getU16("mono_font_size");
+	m_default_size[FM_Simple]       = g_settings->getU16("font_size");
+	m_default_size[FM_SimpleMono]   = g_settings->getU16("mono_font_size");
 
 	cleanCache();
 	updateFontCache();
@@ -244,7 +243,7 @@ void FontEngine::updateSkin()
 		m_env->getSkin()->setFont(font);
 	else
 		errorstream << "FontEngine: Default font file: " <<
-				"\n\t\"" << m_settings->get("font_path") << "\"" <<
+				"\n\t\"" << g_settings->get("font_path") << "\"" <<
 				"\n\trequired for current screen configuration was not found" <<
 				" or was invalid file format." <<
 				"\n\tUsing irrlicht default font." << std::endl;
@@ -272,18 +271,8 @@ gui::IGUIFont *FontEngine::initFont(const FontSpec &spec)
 	assert(spec.size != FONT_SIZE_UNSPECIFIED);
 
 	std::string setting_prefix = "";
-
-	switch (spec.mode) {
-		case FM_Fallback:
-			setting_prefix = "fallback_";
-			break;
-		case FM_Mono:
-		case FM_SimpleMono:
-			setting_prefix = "mono_";
-			break;
-		default:
-			break;
-	}
+	if (spec.mode == FM_Mono)
+		setting_prefix = "mono_";
 
 	std::string setting_suffix = "";
 	if (spec.bold)
@@ -292,7 +281,7 @@ gui::IGUIFont *FontEngine::initFont(const FontSpec &spec)
 		setting_suffix.append("_italic");
 
 	u32 size = std::floor(RenderingEngine::getDisplayDensity() *
-			m_settings->getFloat("gui_scaling") * spec.size);
+			g_settings->getFloat("gui_scaling") * spec.size);
 
 	if (size == 0) {
 		errorstream << "FontEngine: attempt to use font size 0" << std::endl;
@@ -306,38 +295,41 @@ gui::IGUIFont *FontEngine::initFont(const FontSpec &spec)
 	g_settings->getU16NoEx(setting_prefix + "font_shadow_alpha",
 			font_shadow_alpha);
 
-	std::string wanted_font_path;
-	wanted_font_path = g_settings->get(setting_prefix + "font_path" + setting_suffix);
+	std::string path_setting;
+	if (spec.mode == _FM_Fallback)
+		path_setting = "fallback_font_path";
+	else
+		path_setting = setting_prefix + "font_path" + setting_suffix;
 
 	std::string fallback_settings[] = {
-		wanted_font_path,
-		m_settings->get("fallback_font_path"),
-		m_settings->getDefault(setting_prefix + "font_path")
+		g_settings->get(path_setting),
+		Settings::getLayer(SL_DEFAULTS)->get(path_setting)
 	};
 
 #if USE_FREETYPE
 	for (const std::string &font_path : fallback_settings) {
-		irr::gui::IGUIFont *font = gui::CGUITTFont::createTTFont(m_env,
+		gui::CGUITTFont *font = gui::CGUITTFont::createTTFont(m_env,
 				font_path.c_str(), size, true, true, font_shadow,
 				font_shadow_alpha);
 
-		if (font)
-			return font;
-
-		errorstream << "FontEngine: Cannot load '" << font_path <<
+		if (!font) {
+			errorstream << "FontEngine: Cannot load '" << font_path <<
 				"'. Trying to fall back to another path." << std::endl;
-	}
-
+			continue;
+		}
 
-	// give up
-	errorstream << "minetest can not continue without a valid font. "
-			"Please correct the 'font_path' setting or install the font "
-			"file in the proper location" << std::endl;
+		if (spec.mode != _FM_Fallback) {
+			FontSpec spec2(spec);
+			spec2.mode = _FM_Fallback;
+			font->setFallback(getFont(spec2, true));
+		}
+		return font;
+	}
 #else
-	errorstream << "FontEngine: Tried to load freetype fonts but Minetest was"
-			" not compiled with that library." << std::endl;
+	errorstream << "FontEngine: Tried to load TTF font but Minetest was"
+			" compiled without Freetype." << std::endl;
 #endif
-	abort();
+	return nullptr;
 }
 
 /** initialize a font without freetype */
@@ -346,7 +338,7 @@ gui::IGUIFont *FontEngine::initSimpleFont(const FontSpec &spec)
 	assert(spec.mode == FM_Simple || spec.mode == FM_SimpleMono);
 	assert(spec.size != FONT_SIZE_UNSPECIFIED);
 
-	const std::string &font_path = m_settings->get(
+	const std::string &font_path = g_settings->get(
 			(spec.mode == FM_SimpleMono) ? "mono_font_path" : "font_path");
 
 	size_t pos_dot = font_path.find_last_of('.');
@@ -364,7 +356,7 @@ gui::IGUIFont *FontEngine::initSimpleFont(const FontSpec &spec)
 
 	u32 size = std::floor(
 			RenderingEngine::getDisplayDensity() *
-			m_settings->getFloat("gui_scaling") *
+			g_settings->getFloat("gui_scaling") *
 			spec.size);
 
 	irr::gui::IGUIFont *font = nullptr;
diff --git a/src/client/fontengine.h b/src/client/fontengine.h
index c6efa0df4..3d389ea48 100644
--- a/src/client/fontengine.h
+++ b/src/client/fontengine.h
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <map>
 #include <vector>
 #include "util/basic_macros.h"
+#include "irrlichttypes.h"
 #include <IGUIFont.h>
 #include <IGUISkin.h>
 #include <IGUIEnvironment.h>
@@ -32,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 enum FontMode : u8 {
 	FM_Standard = 0,
 	FM_Mono,
-	FM_Fallback,
+	_FM_Fallback, // do not use directly
 	FM_Simple,
 	FM_SimpleMono,
 	FM_MaxMode,
@@ -46,7 +47,7 @@ struct FontSpec {
 		bold(bold),
 		italic(italic) {}
 
-	u16 getHash()
+	u16 getHash() const
 	{
 		return (mode << 2) | (static_cast<u8>(bold) << 1) | static_cast<u8>(italic);
 	}
@@ -61,7 +62,7 @@ class FontEngine
 {
 public:
 
-	FontEngine(Settings* main_settings, gui::IGUIEnvironment* env);
+	FontEngine(gui::IGUIEnvironment* env);
 
 	~FontEngine();
 
@@ -127,17 +128,16 @@ public:
 	/** get font size for a specific mode */
 	unsigned int getFontSize(FontMode mode);
 
-	/** initialize font engine */
-	void initialize(Settings* main_settings, gui::IGUIEnvironment* env);
-
 	/** update internal parameters from settings */
 	void readSettings();
 
 private:
+	irr::gui::IGUIFont *getFont(FontSpec spec, bool may_fail);
+
 	/** update content of font cache in case of a setting change made it invalid */
 	void updateFontCache();
 
-	/** initialize a new font */
+	/** initialize a new TTF font */
 	gui::IGUIFont *initFont(const FontSpec &spec);
 
 	/** initialize a font without freetype */
@@ -149,9 +149,6 @@ private:
 	/** clean cache */
 	void cleanCache();
 
-	/** pointer to settings for registering callbacks or reading config */
-	Settings* m_settings = nullptr;
-
 	/** pointer to irrlicht gui environment */
 	gui::IGUIEnvironment* m_env = nullptr;
 
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 10c3a7ceb..5bfe55e66 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -68,6 +68,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/pointedthing.h"
 #include "util/quicktune_shortcutter.h"
 #include "irrlicht_changes/static_text.h"
+#include "irr_ptr.h"
 #include "version.h"
 #include "script/scripting_client.h"
 #include "hud.h"
@@ -152,7 +153,7 @@ Game::~Game()
 	delete itemdef_manager;
 	delete draw_control;
 
-	extendedResourceCleanup();
+	clearTextureNameCache();
 
 	g_settings->deregisterChangedCallback("doubletap_jump",
 		&settingChangedCallback, this);
@@ -190,6 +191,7 @@ Game::~Game()
 
 bool Game::startup(bool *kill,
 		InputHandler *input,
+		RenderingEngine *rendering_engine,
 		const GameStartData &start_data,
 		std::string &error_message,
 		bool *reconnect,
@@ -197,21 +199,21 @@ bool Game::startup(bool *kill,
 {
 
 	// "cache"
-	this->device              = RenderingEngine::get_raw_device();
+	m_rendering_engine        = rendering_engine;
+	device                    = m_rendering_engine->get_raw_device();
 	this->kill                = kill;
 	this->error_message       = &error_message;
-	this->reconnect_requested = reconnect;
+	reconnect_requested       = reconnect;
 	this->input               = input;
 	this->chat_backend        = chat_backend;
-	this->simple_singleplayer_mode = start_data.isSinglePlayer();
+	simple_singleplayer_mode  = start_data.isSinglePlayer();
 
 	input->keycache.populate();
 
 	driver = device->getVideoDriver();
-	smgr = RenderingEngine::get_scene_manager();
+	smgr = m_rendering_engine->get_scene_manager();
 
-	RenderingEngine::get_scene_manager()->getParameters()->
-		setAttribute(scene::OBJ_LOADER_IGNORE_MATERIAL_FILES, true);
+	smgr->getParameters()->setAttribute(scene::OBJ_LOADER_IGNORE_MATERIAL_FILES, true);
 
 	// Reinit runData
 	runData = GameRunData();
@@ -232,7 +234,7 @@ bool Game::startup(bool *kill,
 	if (!createClient(start_data))
 		return false;
 
-	RenderingEngine::initialize(client, hud);
+	m_rendering_engine->initialize(client, hud);
 
 	return true;
 }
@@ -249,7 +251,7 @@ void Game::run()
 	Profiler::GraphValues dummyvalues;
 	g_profiler->graphGet(dummyvalues);
 
-	draw_times.last_time = RenderingEngine::get_timer_time();
+	draw_times.last_time = m_rendering_engine->get_timer_time();
 
 	set_light_table(g_settings->getFloat("display_gamma"));
 
@@ -261,12 +263,12 @@ void Game::run()
 	irr::core::dimension2d<u32> previous_screen_size(g_settings->getU16("screen_w"),
 		g_settings->getU16("screen_h"));
 
-	while (RenderingEngine::run()
+	while (m_rendering_engine->run()
 			&& !(*kill || g_gamecallback->shutdown_requested
 			|| (server && server->isShutdownRequested()))) {
 
 		const irr::core::dimension2d<u32> &current_screen_size =
-			RenderingEngine::get_video_driver()->getScreenSize();
+			m_rendering_engine->get_video_driver()->getScreenSize();
 		// Verify if window size has changed and save it if it's the case
 		// Ensure evaluating settings->getBool after verifying screensize
 		// First condition is cheaper
@@ -279,7 +281,7 @@ void Game::run()
 		}
 
 		// Calculate dtime =
-		//    RenderingEngine::run() from this iteration
+		//    m_rendering_engine->run() from this iteration
 		//  + Sleep time until the wanted FPS are reached
 		limitFps(&draw_times, &dtime);
 
@@ -328,7 +330,7 @@ void Game::run()
 
 void Game::shutdown()
 {
-	RenderingEngine::finalize();
+	m_rendering_engine->finalize();
 #if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR <= 8
 	if (g_settings->get("3d_mode") == "pageflip") {
 		driver->setRenderTarget(irr::video::ERT_STEREO_BOTH_BUFFERS);
@@ -487,7 +489,7 @@ bool Game::createClient(const GameStartData &start_data)
 {
 	showOverlayMessage(N_("Creating client..."), 0, 10);
 
-	draw_control = new MapDrawControl;
+	draw_control = new MapDrawControl();
 	if (!draw_control)
 		return false;
 
@@ -528,7 +530,7 @@ bool Game::createClient(const GameStartData &start_data)
 
 	/* Camera
 	 */
-	camera = new Camera(*draw_control, client);
+	camera = new Camera(*draw_control, client, m_rendering_engine);
 	if (!camera->successfullyCreated(*error_message))
 		return false;
 	client->setCamera(camera);
@@ -540,7 +542,7 @@ bool Game::createClient(const GameStartData &start_data)
 
 	/* Skybox
 	 */
-	sky = new Sky(-1, texture_src, shader_src);
+	sky = new Sky(-1, m_rendering_engine, texture_src, shader_src);
 	scsf->setSky(sky);
 	skybox = NULL;	// This is used/set later on in the main run loop
 
@@ -562,16 +564,28 @@ bool Game::createClient(const GameStartData &start_data)
 	std::wstring str = utf8_to_wide(PROJECT_NAME_C);
 	str += L" ";
 	str += utf8_to_wide(g_version_hash);
+	{
+		const wchar_t *text = nullptr;
+		if (simple_singleplayer_mode)
+			text = wgettext("Singleplayer");
+		else
+			text = wgettext("Multiplayer");
+		str += L" [";
+		str += text;
+		str += L"]";
+		delete text;
+	}
 	str += L" [";
 	str += L"Minetest Hackclient";
 	str += L"]";
+
 	device->setWindowCaption(str.c_str());
 
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
 	player->hurt_tilt_timer = 0;
 	player->hurt_tilt_strength = 0;
 
-	hud = new Hud(guienv, client, player, &player->inventory);
+	hud = new Hud(client, player, &player->inventory);
 
 	mapper = client->getMinimap();
 
@@ -662,7 +676,7 @@ bool Game::connectToServer(const GameStartData &start_data,
 			start_data.password, start_data.address,
 			*draw_control, texture_src, shader_src,
 			itemdef_manager, nodedef_manager, sound, eventmgr,
-			connect_address.isIPv6(), m_game_ui.get());
+			m_rendering_engine, connect_address.isIPv6(), m_game_ui.get());
 
 	client->m_simple_singleplayer_mode = simple_singleplayer_mode;
 
@@ -684,9 +698,9 @@ bool Game::connectToServer(const GameStartData &start_data,
 		f32 dtime;
 		f32 wait_time = 0; // in seconds
 
-		fps_control.last_time = RenderingEngine::get_timer_time();
+		fps_control.last_time = m_rendering_engine->get_timer_time();
 
-		while (RenderingEngine::run()) {
+		while (m_rendering_engine->run()) {
 
 			limitFps(&fps_control, &dtime);
 
@@ -723,7 +737,7 @@ bool Game::connectToServer(const GameStartData &start_data,
 			if (client->m_is_registration_confirmation_state) {
 				if (registration_confirmation_shown) {
 					// Keep drawing the GUI
-					RenderingEngine::draw_menu_scene(guienv, dtime, true);
+					m_rendering_engine->draw_menu_scene(guienv, dtime, true);
 				} else {
 					registration_confirmation_shown = true;
 					(new GUIConfirmRegistration(guienv, guienv->getRootGUIElement(), -1,
@@ -733,7 +747,7 @@ bool Game::connectToServer(const GameStartData &start_data,
 			} else {
 				wait_time += dtime;
 				// Only time out if we aren't waiting for the server we started
-				if (!start_data.isSinglePlayer() && wait_time > 10) {
+				if (!start_data.address.empty() && wait_time > 10) {
 					*error_message = "Connection timed out.";
 					errorstream << *error_message << std::endl;
 					break;
@@ -759,9 +773,9 @@ bool Game::getServerContent(bool *aborted)
 	FpsControl fps_control = { 0 };
 	f32 dtime; // in seconds
 
-	fps_control.last_time = RenderingEngine::get_timer_time();
+	fps_control.last_time = m_rendering_engine->get_timer_time();
 
-	while (RenderingEngine::run()) {
+	while (m_rendering_engine->run()) {
 
 		limitFps(&fps_control, &dtime);
 
@@ -799,13 +813,13 @@ bool Game::getServerContent(bool *aborted)
 		if (!client->itemdefReceived()) {
 			const wchar_t *text = wgettext("Item definitions...");
 			progress = 25;
-			RenderingEngine::draw_load_screen(text, guienv, texture_src,
+			m_rendering_engine->draw_load_screen(text, guienv, texture_src,
 				dtime, progress);
 			delete[] text;
 		} else if (!client->nodedefReceived()) {
 			const wchar_t *text = wgettext("Node definitions...");
 			progress = 30;
-			RenderingEngine::draw_load_screen(text, guienv, texture_src,
+			m_rendering_engine->draw_load_screen(text, guienv, texture_src,
 				dtime, progress);
 			delete[] text;
 		} else {
@@ -832,7 +846,7 @@ bool Game::getServerContent(bool *aborted)
 			}
 
 			progress = 30 + client->mediaReceiveProgress() * 35 + 0.5;
-			RenderingEngine::draw_load_screen(utf8_to_wide(message.str()), guienv,
+			m_rendering_engine->draw_load_screen(utf8_to_wide(message.str()), guienv,
 				texture_src, dtime, progress);
 		}
 	}
@@ -1149,6 +1163,8 @@ void Game::processKeyInput()
 		toggleCinematic();
 	} else if (wasKeyDown(KeyType::SCREENSHOT)) {
 		client->makeScreenshot();
+	} else if (wasKeyDown(KeyType::TOGGLE_BLOCK_BOUNDS)) {
+		hud->toggleBlockBounds();
 	} else if (wasKeyDown(KeyType::TOGGLE_HUD)) {
 		m_game_ui->toggleHud();
 	} else if (wasKeyDown(KeyType::MINIMAP)) {
@@ -1263,8 +1279,8 @@ void Game::openInventory()
 			|| !client->getScript()->on_inventory_open(fs_src->m_client->getInventory(inventoryloc))) {
 		TextDest *txt_dst = new TextDestPlayerInventory(client);
 		auto *&formspec = m_game_ui->updateFormspec("");
-		GUIFormSpecMenu::create(formspec, client, &input->joystick, fs_src,
-			txt_dst, client->getFormspecPrepend(), sound);
+		GUIFormSpecMenu::create(formspec, client, m_rendering_engine->get_gui_env(),
+			&input->joystick, fs_src, txt_dst, client->getFormspecPrepend(), sound);
 
 		formspec->setFormSpec(fs_src->getForm(), inventoryloc);
 	}
@@ -1604,7 +1620,6 @@ void Game::checkZoomEnabled()
 		m_game_ui->showTranslatedStatusText("Zoom currently disabled by game or mod");
 }
 
-
 void Game::updateCameraDirection(CameraOrientation *cam, float dtime)
 {
 	if ((device->isWindowActive() && device->isWindowFocused()
@@ -1640,6 +1655,18 @@ void Game::updateCameraDirection(CameraOrientation *cam, float dtime)
 	}
 }
 
+// Get the factor to multiply with sensitivity to get the same mouse/joystick
+// responsiveness independently of FOV.
+f32 Game::getSensitivityScaleFactor() const
+{
+	f32 fov_y = client->getCamera()->getFovY();
+
+	// Multiply by a constant such that it becomes 1.0 at 72 degree FOV and
+	// 16:9 aspect ratio to minimize disruption of existing sensitivity
+	// settings.
+	return tan(fov_y / 2.0f) * 1.3763818698f;
+}
+
 void Game::updateCameraOrientation(CameraOrientation *cam, float dtime)
 {
 #ifdef HAVE_TOUCHSCREENGUI
@@ -1655,8 +1682,9 @@ void Game::updateCameraOrientation(CameraOrientation *cam, float dtime)
 			dist.Y = -dist.Y;
 		}
 
-		cam->camera_yaw   -= dist.X * m_cache_mouse_sensitivity;
-		cam->camera_pitch += dist.Y * m_cache_mouse_sensitivity;
+		f32 sens_scale = getSensitivityScaleFactor();
+		cam->camera_yaw   -= dist.X * m_cache_mouse_sensitivity * sens_scale;
+		cam->camera_pitch += dist.Y * m_cache_mouse_sensitivity * sens_scale;
 
 		if (dist.X != 0 || dist.Y != 0)
 			input->setMousePos(center.X, center.Y);
@@ -1665,7 +1693,8 @@ void Game::updateCameraOrientation(CameraOrientation *cam, float dtime)
 #endif
 
 	if (m_cache_enable_joysticks) {
-		f32 c = m_cache_joystick_frustum_sensitivity * (1.f / 32767.f) * dtime;
+		f32 sens_scale = getSensitivityScaleFactor();
+		f32 c = m_cache_joystick_frustum_sensitivity * (1.f / 32767.f) * dtime * sens_scale;
 		cam->camera_yaw -= input->joystick.getAxisWithoutDead(JA_FRUSTUM_HORIZONTAL) * c;
 		cam->camera_pitch += input->joystick.getAxisWithoutDead(JA_FRUSTUM_VERTICAL) * c;
 	}
@@ -1688,7 +1717,7 @@ void Game::updatePlayerControl(const CameraOrientation &cam)
 		input->isKeyDown(KeyType::LEFT),
 		input->isKeyDown(KeyType::RIGHT),
 		isKeyDown(KeyType::JUMP),
-		isKeyDown(KeyType::SPECIAL1),
+		isKeyDown(KeyType::AUX1),
 		isKeyDown(KeyType::SNEAK),
 		isKeyDown(KeyType::ZOOM),
 		isKeyDown(KeyType::DIG),
@@ -1705,7 +1734,7 @@ void Game::updatePlayerControl(const CameraOrientation &cam)
 			( (u32)(isKeyDown(KeyType::LEFT)                          & 0x1) << 2) |
 			( (u32)(isKeyDown(KeyType::RIGHT)                         & 0x1) << 3) |
 			( (u32)(isKeyDown(KeyType::JUMP)                          & 0x1) << 4) |
-			( (u32)(isKeyDown(KeyType::SPECIAL1)                      & 0x1) << 5) |
+			( (u32)(isKeyDown(KeyType::AUX1)                          & 0x1) << 5) |
 			( (u32)(isKeyDown(KeyType::SNEAK)                         & 0x1) << 6) |
 			( (u32)(isKeyDown(KeyType::DIG)                           & 0x1) << 7) |
 			( (u32)(isKeyDown(KeyType::PLACE)                         & 0x1) << 8) |
@@ -1754,6 +1783,9 @@ inline void Game::step(f32 *dtime)
 	if (can_be_and_is_paused) { // This is for a singleplayer server
 		*dtime = 0;             // No time passes
 	} else {
+		if (simple_singleplayer_mode && !paused_animated_nodes.empty())
+			resumeAnimation();
+
 		if (server)
 			server->step(*dtime);
 
@@ -1761,6 +1793,33 @@ inline void Game::step(f32 *dtime)
 	}
 }
 
+static void pauseNodeAnimation(PausedNodesList &paused, scene::ISceneNode *node) {
+	if (!node)
+		return;
+	for (auto &&child: node->getChildren())
+		pauseNodeAnimation(paused, child);
+	if (node->getType() != scene::ESNT_ANIMATED_MESH)
+		return;
+	auto animated_node = static_cast<scene::IAnimatedMeshSceneNode *>(node);
+	float speed = animated_node->getAnimationSpeed();
+	if (!speed)
+		return;
+	paused.push_back({grab(animated_node), speed});
+	animated_node->setAnimationSpeed(0.0f);
+}
+
+void Game::pauseAnimation()
+{
+	pauseNodeAnimation(paused_animated_nodes, smgr->getRootSceneNode());
+}
+
+void Game::resumeAnimation()
+{
+	for (auto &&pair: paused_animated_nodes)
+		pair.first->setAnimationSpeed(pair.second);
+	paused_animated_nodes.clear();
+}
+
 const ClientEventHandler Game::clientEventHandler[CLIENTEVENT_MAX] = {
 	{&Game::handleClientEvent_None},
 	{&Game::handleClientEvent_PlayerDamage},
@@ -1794,14 +1853,18 @@ void Game::handleClientEvent_PlayerDamage(ClientEvent *event, CameraOrientation
 
 	// Damage flash and hurt tilt are not used at death
 	if (client->getHP() > 0) {
-		runData.damage_flash += 95.0f + 3.2f * event->player_damage.amount;
-		runData.damage_flash = MYMIN(runData.damage_flash, 127.0f);
-
 		LocalPlayer *player = client->getEnv().getLocalPlayer();
 
+		f32 hp_max = player->getCAO() ?
+			player->getCAO()->getProperties()->hp_max : PLAYER_MAX_HP_DEFAULT;
+		f32 damage_ratio = event->player_damage.amount / hp_max;
+
+		runData.damage_flash += 95.0f + 64.f * damage_ratio;
+		runData.damage_flash = MYMIN(runData.damage_flash, 127.0f);
+
 		player->hurt_tilt_timer = 1.5f;
 		player->hurt_tilt_strength =
-			rangelim(event->player_damage.amount / 4.0f, 1.0f, 4.0f);
+			rangelim(damage_ratio * 5.0f, 1.0f, 4.0f);
 	}
 
 	// Play damage sound
@@ -1845,8 +1908,8 @@ void Game::handleClientEvent_ShowFormSpec(ClientEvent *event, CameraOrientation
 			new TextDestPlayerInventory(client, *(event->show_formspec.formname));
 
 		auto *&formspec = m_game_ui->updateFormspec(*(event->show_formspec.formname));
-		GUIFormSpecMenu::create(formspec, client, &input->joystick,
-			fs_src, txt_dst, client->getFormspecPrepend(), sound);
+		GUIFormSpecMenu::create(formspec, client, m_rendering_engine->get_gui_env(),
+			&input->joystick, fs_src, txt_dst, client->getFormspecPrepend(), sound);
 	}
 
 	delete event->show_formspec.formspec;
@@ -1865,7 +1928,7 @@ void Game::handleClientEvent_ShowLocalFormSpec(ClientEvent *event, CameraOrienta
 		FormspecFormSource *fs_src = new FormspecFormSource(*event->show_formspec.formspec);
 		LocalFormspecHandler *txt_dst =
 			new LocalFormspecHandler(*event->show_formspec.formname, client);
-		GUIFormSpecMenu::create(m_game_ui->getFormspecGUI(), client, &input->joystick,
+		GUIFormSpecMenu::create(m_game_ui->getFormspecGUI(), client, m_rendering_engine->get_gui_env(), &input->joystick,
 			fs_src, txt_dst, client->getFormspecPrepend(), sound);
 	}
 
@@ -1883,132 +1946,100 @@ void Game::handleClientEvent_HandleParticleEvent(ClientEvent *event,
 void Game::handleClientEvent_HudAdd(ClientEvent *event, CameraOrientation *cam)
 {
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
-	auto &hud_server_to_client = client->getHUDTranslationMap();
 
-	u32 server_id = event->hudadd.server_id;
+	u32 server_id = event->hudadd->server_id;
 	// ignore if we already have a HUD with that ID
-	auto i = hud_server_to_client.find(server_id);
-	if (i != hud_server_to_client.end()) {
-		delete event->hudadd.pos;
-		delete event->hudadd.name;
-		delete event->hudadd.scale;
-		delete event->hudadd.text;
-		delete event->hudadd.align;
-		delete event->hudadd.offset;
-		delete event->hudadd.world_pos;
-		delete event->hudadd.size;
-		delete event->hudadd.text2;
+	auto i = m_hud_server_to_client.find(server_id);
+	if (i != m_hud_server_to_client.end()) {
+		delete event->hudadd;
 		return;
 	}
 
 	HudElement *e = new HudElement;
-	e->type   = (HudElementType)event->hudadd.type;
-	e->pos    = *event->hudadd.pos;
-	e->name   = *event->hudadd.name;
-	e->scale  = *event->hudadd.scale;
-	e->text   = *event->hudadd.text;
-	e->number = event->hudadd.number;
-	e->item   = event->hudadd.item;
-	e->dir    = event->hudadd.dir;
-	e->align  = *event->hudadd.align;
-	e->offset = *event->hudadd.offset;
-	e->world_pos = *event->hudadd.world_pos;
-	e->size = *event->hudadd.size;
-	e->z_index = event->hudadd.z_index;
-	e->text2  = *event->hudadd.text2;
-	hud_server_to_client[server_id] = player->addHud(e);
-
-	delete event->hudadd.pos;
-	delete event->hudadd.name;
-	delete event->hudadd.scale;
-	delete event->hudadd.text;
-	delete event->hudadd.align;
-	delete event->hudadd.offset;
-	delete event->hudadd.world_pos;
-	delete event->hudadd.size;
-	delete event->hudadd.text2;
+	e->type   = static_cast<HudElementType>(event->hudadd->type);
+	e->pos    = event->hudadd->pos;
+	e->name   = event->hudadd->name;
+	e->scale  = event->hudadd->scale;
+	e->text   = event->hudadd->text;
+	e->number = event->hudadd->number;
+	e->item   = event->hudadd->item;
+	e->dir    = event->hudadd->dir;
+	e->align  = event->hudadd->align;
+	e->offset = event->hudadd->offset;
+	e->world_pos = event->hudadd->world_pos;
+	e->size      = event->hudadd->size;
+	e->z_index   = event->hudadd->z_index;
+	e->text2     = event->hudadd->text2;
+	m_hud_server_to_client[server_id] = player->addHud(e);
+
+	delete event->hudadd;
 }
 
 void Game::handleClientEvent_HudRemove(ClientEvent *event, CameraOrientation *cam)
 {
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
-	HudElement *e = player->removeHud(event->hudrm.id);
-	delete e;
+
+	auto i = m_hud_server_to_client.find(event->hudrm.id);
+	if (i != m_hud_server_to_client.end()) {
+		HudElement *e = player->removeHud(i->second);
+		delete e;
+		m_hud_server_to_client.erase(i);
+	}
+
 }
 
 void Game::handleClientEvent_HudChange(ClientEvent *event, CameraOrientation *cam)
 {
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
 
-	u32 id = event->hudchange.id;
-	HudElement *e = player->getHud(id);
+	HudElement *e = nullptr;
+
+	auto i = m_hud_server_to_client.find(event->hudchange->id);
+	if (i != m_hud_server_to_client.end()) {
+		e = player->getHud(i->second);
+	}
 
-	if (e == NULL) {
-		delete event->hudchange.v3fdata;
-		delete event->hudchange.v2fdata;
-		delete event->hudchange.sdata;
-		delete event->hudchange.v2s32data;
+	if (e == nullptr) {
+		delete event->hudchange;
 		return;
 	}
 
-	switch (event->hudchange.stat) {
-		case HUD_STAT_POS:
-			e->pos = *event->hudchange.v2fdata;
-			break;
+#define CASE_SET(statval, prop, dataprop) \
+	case statval: \
+		e->prop = event->hudchange->dataprop; \
+		break
 
-		case HUD_STAT_NAME:
-			e->name = *event->hudchange.sdata;
-			break;
+	switch (event->hudchange->stat) {
+		CASE_SET(HUD_STAT_POS, pos, v2fdata);
 
-		case HUD_STAT_SCALE:
-			e->scale = *event->hudchange.v2fdata;
-			break;
+		CASE_SET(HUD_STAT_NAME, name, sdata);
 
-		case HUD_STAT_TEXT:
-			e->text = *event->hudchange.sdata;
-			break;
+		CASE_SET(HUD_STAT_SCALE, scale, v2fdata);
 
-		case HUD_STAT_NUMBER:
-			e->number = event->hudchange.data;
-			break;
+		CASE_SET(HUD_STAT_TEXT, text, sdata);
 
-		case HUD_STAT_ITEM:
-			e->item = event->hudchange.data;
-			break;
+		CASE_SET(HUD_STAT_NUMBER, number, data);
 
-		case HUD_STAT_DIR:
-			e->dir = event->hudchange.data;
-			break;
+		CASE_SET(HUD_STAT_ITEM, item, data);
 
-		case HUD_STAT_ALIGN:
-			e->align = *event->hudchange.v2fdata;
-			break;
+		CASE_SET(HUD_STAT_DIR, dir, data);
 
-		case HUD_STAT_OFFSET:
-			e->offset = *event->hudchange.v2fdata;
-			break;
+		CASE_SET(HUD_STAT_ALIGN, align, v2fdata);
 
-		case HUD_STAT_WORLD_POS:
-			e->world_pos = *event->hudchange.v3fdata;
-			break;
+		CASE_SET(HUD_STAT_OFFSET, offset, v2fdata);
 
-		case HUD_STAT_SIZE:
-			e->size = *event->hudchange.v2s32data;
-			break;
+		CASE_SET(HUD_STAT_WORLD_POS, world_pos, v3fdata);
 
-		case HUD_STAT_Z_INDEX:
-			e->z_index = event->hudchange.data;
-			break;
+		CASE_SET(HUD_STAT_SIZE, size, v2s32data);
 
-		case HUD_STAT_TEXT2:
-			e->text2 = *event->hudchange.sdata;
-			break;
+		CASE_SET(HUD_STAT_Z_INDEX, z_index, data);
+
+		CASE_SET(HUD_STAT_TEXT2, text2, sdata);
 	}
 
-	delete event->hudchange.v3fdata;
-	delete event->hudchange.v2fdata;
-	delete event->hudchange.sdata;
-	delete event->hudchange.v2s32data;
+#undef CASE_SET
+
+	delete event->hudchange;
 }
 
 void Game::handleClientEvent_SetSky(ClientEvent *event, CameraOrientation *cam)
@@ -2063,6 +2094,7 @@ void Game::handleClientEvent_SetSky(ClientEvent *event, CameraOrientation *cam)
 			"custom"
 		);
 	}
+
 	delete event->set_sky;
 }
 
@@ -2563,9 +2595,10 @@ void Game::handlePointingAtNode(const PointedThing &pointed,
 
 bool Game::nodePlacement(const ItemDefinition &selected_def,
 	const ItemStack &selected_item, const v3s16 &nodepos, const v3s16 &neighbourpos,
-	const PointedThing &pointed, const NodeMetadata *meta)
+	const PointedThing &pointed, const NodeMetadata *meta, bool force)
 {
-	std::string prediction = selected_def.node_placement_prediction;
+	const auto &prediction = selected_def.node_placement_prediction;
+
 	const NodeDefManager *nodedef = client->ndef();
 	ClientMap &map = client->getEnv().getClientMap();
 	MapNode node;
@@ -2579,7 +2612,7 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
 
 	// formspec in meta
 	if (meta && !meta->getString("formspec").empty() && !input->isRandom()
-			&& !isKeyDown(KeyType::SNEAK)) {
+			&& !isKeyDown(KeyType::SNEAK) && !force) {
 		// on_rightclick callbacks are called anyway
 		if (nodedef_manager->get(map.getNode(nodepos)).rightclickable)
 			client->interact(INTERACT_PLACE, pointed);
@@ -2594,8 +2627,8 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
 		TextDest *txt_dst = new TextDestNodeMetadata(nodepos, client);
 
 		auto *&formspec = m_game_ui->updateFormspec("");
-		GUIFormSpecMenu::create(formspec, client, &input->joystick, fs_src,
-			txt_dst, client->getFormspecPrepend(), sound);
+		GUIFormSpecMenu::create(formspec, client, m_rendering_engine->get_gui_env(),
+			&input->joystick, fs_src, txt_dst, client->getFormspecPrepend(), sound);
 
 		formspec->setFormSpec(meta->getString("formspec"), inventoryloc);
 		return false;
@@ -2603,7 +2636,7 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
 
 	// on_rightclick callback
 	if (prediction.empty() || (nodedef->get(node).rightclickable &&
-			!isKeyDown(KeyType::SNEAK))) {
+			!isKeyDown(KeyType::SNEAK) && !force)) {
 		// Report to server
 		client->interact(INTERACT_PLACE, pointed);
 		return false;
@@ -2635,8 +2668,7 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
 
 	if (!found) {
 		errorstream << "Node placement prediction failed for "
-			<< selected_def.name << " (places "
-			<< prediction
+			<< selected_def.name << " (places " << prediction
 			<< ") - Name not known" << std::endl;
 		// Handle this as if prediction was empty
 		// Report to server
@@ -2647,9 +2679,14 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
 	const ContentFeatures &predicted_f = nodedef->get(id);
 
 	// Predict param2 for facedir and wallmounted nodes
+	// Compare core.item_place_node() for what the server does
 	u8 param2 = 0;
 
-	if (predicted_f.param_type_2 == CPT2_WALLMOUNTED ||
+	const u8 place_param2 = selected_def.place_param2;
+
+	if (place_param2) {
+		param2 = place_param2;
+	} else if (predicted_f.param_type_2 == CPT2_WALLMOUNTED ||
 			predicted_f.param_type_2 == CPT2_COLORED_WALLMOUNTED) {
 		v3s16 dir = nodepos - neighbourpos;
 
@@ -2660,9 +2697,7 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
 		} else {
 			param2 = dir.Z < 0 ? 5 : 4;
 		}
-	}
-
-	if (predicted_f.param_type_2 == CPT2_FACEDIR ||
+	} else if (predicted_f.param_type_2 == CPT2_FACEDIR ||
 			predicted_f.param_type_2 == CPT2_COLORED_FACEDIR) {
 		v3s16 dir = nodepos - floatToInt(client->getEnv().getLocalPlayer()->getPosition(), BS);
 
@@ -2673,11 +2708,9 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
 		}
 	}
 
-	assert(param2 <= 5);
-
-	//Check attachment if node is in group attached_node
-	if (((ItemGroupList) predicted_f.groups)["attached_node"] != 0) {
-		static v3s16 wallmounted_dirs[8] = {
+	// Check attachment if node is in group attached_node
+	if (itemgroup_get(predicted_f.groups, "attached_node") != 0) {
+		const static v3s16 wallmounted_dirs[8] = {
 			v3s16(0, 1, 0),
 			v3s16(0, -1, 0),
 			v3s16(1, 0, 0),
@@ -2702,11 +2735,11 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
 	}
 
 	// Apply color
-	if ((predicted_f.param_type_2 == CPT2_COLOR
+	if (!place_param2 && (predicted_f.param_type_2 == CPT2_COLOR
 			|| predicted_f.param_type_2 == CPT2_COLORED_FACEDIR
 			|| predicted_f.param_type_2 == CPT2_COLORED_WALLMOUNTED)) {
-		const std::string &indexstr = selected_item.metadata.getString(
-			"palette_index", 0);
+		const auto &indexstr = selected_item.metadata.
+			getString("palette_index", 0);
 		if (!indexstr.empty()) {
 			s32 index = mystoi(indexstr);
 			if (predicted_f.param_type_2 == CPT2_COLOR) {
@@ -2746,11 +2779,10 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
 			soundmaker->m_player_rightpunch_sound = selected_def.sound_place_failed;
 			return false;
 		}
-	} catch (InvalidPositionException &e) {
+	} catch (const InvalidPositionException &e) {
 		errorstream << "Node placement prediction failed for "
 			<< selected_def.name << " (places "
-			<< prediction
-			<< ") - Position not loaded" << std::endl;
+			<< prediction << ") - Position not loaded" << std::endl;
 		soundmaker->m_player_rightpunch_sound = selected_def.sound_place_failed;
 		return false;
 	}
@@ -3158,7 +3190,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
 	} catch (SettingNotFoundException) {
 	}
 #endif
-	RenderingEngine::draw_scene(skycolor, m_game_ui->m_flags.show_hud,
+	m_rendering_engine->draw_scene(skycolor, m_game_ui->m_flags.show_hud,
 			m_game_ui->m_flags.show_minimap, draw_wield_tool, draw_crosshair);
 
 	/*
@@ -3297,7 +3329,7 @@ inline void Game::limitFps(FpsControl *fps_timings, f32 *dtime)
 void Game::showOverlayMessage(const char *msg, float dtime, int percent, bool draw_clouds)
 {
 	const wchar_t *wmsg = wgettext(msg);
-	RenderingEngine::draw_load_screen(wmsg, guienv, texture_src, dtime, percent,
+	m_rendering_engine->draw_load_screen(wmsg, guienv, texture_src, dtime, percent,
 		draw_clouds);
 	delete[] wmsg;
 }
@@ -3380,27 +3412,6 @@ bool Game::wasKeyReleased(GameKeyType k)
  ****************************************************************************/
 /****************************************************************************/
 
-void Game::extendedResourceCleanup()
-{
-	// Extended resource accounting
-	infostream << "Irrlicht resources after cleanup:" << std::endl;
-	infostream << "\tRemaining meshes   : "
-	           << RenderingEngine::get_mesh_cache()->getMeshCount() << std::endl;
-	infostream << "\tRemaining textures : "
-	           << driver->getTextureCount() << std::endl;
-
-	for (unsigned int i = 0; i < driver->getTextureCount(); i++) {
-		irr::video::ITexture *texture = driver->getTextureByIndex(i);
-		infostream << "\t\t" << i << ":" << texture->getName().getPath().c_str()
-		           << std::endl;
-	}
-
-	clearTextureNameCache();
-	infostream << "\tRemaining materials: "
-               << driver-> getMaterialRendererCount()
-		       << " (note: irrlicht doesn't support removing renderers)" << std::endl;
-}
-
 void Game::showDeathFormspec()
 {
 	static std::string formspec_str =
@@ -3418,8 +3429,8 @@ void Game::showDeathFormspec()
 	LocalFormspecHandler *txt_dst = new LocalFormspecHandler("MT_DEATH_SCREEN", client);
 
 	auto *&formspec = m_game_ui->getFormspecGUI();
-	GUIFormSpecMenu::create(formspec, client, &input->joystick,
-		fs_src, txt_dst, client->getFormspecPrepend(), sound);
+	GUIFormSpecMenu::create(formspec, client, m_rendering_engine->get_gui_env(),
+		&input->joystick, fs_src, txt_dst, client->getFormspecPrepend(), sound);
 	formspec->setFocus("btn_respawn");
 }
 
@@ -3560,10 +3571,13 @@ void Game::showPauseMenu()
 	LocalFormspecHandler *txt_dst = new LocalFormspecHandler("MT_PAUSE_MENU");
 
 	auto *&formspec = m_game_ui->getFormspecGUI();
-	GUIFormSpecMenu::create(formspec, client, &input->joystick,
-			fs_src, txt_dst, client->getFormspecPrepend(), sound);
+	GUIFormSpecMenu::create(formspec, client, m_rendering_engine->get_gui_env(),
+			&input->joystick, fs_src, txt_dst, client->getFormspecPrepend(), sound);
 	formspec->setFocus("btn_continue");
 	formspec->doPause = true;
+
+	if (simple_singleplayer_mode)
+		pauseAnimation();
 }
 
 /****************************************************************************/
@@ -3576,6 +3590,7 @@ Game *g_game;
 
 void the_game(bool *kill,
 		InputHandler *input,
+		RenderingEngine *rendering_engine,
 		const GameStartData &start_data,
 		std::string &error_message,
 		ChatBackend &chat_backend,
@@ -3592,8 +3607,8 @@ void the_game(bool *kill,
 
 	try {
 
-		if (game.startup(kill, input, start_data, error_message,
-				reconnect_requested, &chat_backend)) {
+		if (game.startup(kill, input, rendering_engine, start_data,
+				error_message, reconnect_requested, &chat_backend)) {
 			game.run();
 		}
 
diff --git a/src/client/game.h b/src/client/game.h
index fd93ef82d..8197b9a9b 100644
--- a/src/client/game.h
+++ b/src/client/game.h
@@ -68,6 +68,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/pointedthing.h"
 #include "util/quicktune_shortcutter.h"
 #include "irrlicht_changes/static_text.h"
+#include "irr_ptr.h"
 #include "version.h"
 #include "script/scripting_client.h"
 #include "hud.h"
@@ -75,7 +76,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 
 class InputHandler;
-class ChatBackend;  /* to avoid having to include chat.h */
+class ChatBackend;
+class RenderingEngine;
 struct SubgameSpec;
 struct GameStartData;
 
@@ -188,13 +190,7 @@ struct LocalFormspecHandler : public TextDest
 				return;
 			}
 
-			if (fields.find("quit") != fields.end()) {
-				return;
-			}
-
-			if (fields.find("btn_continue") != fields.end()) {
-				return;
-			}
+			return;
 		}
 
 		if (m_formname == "MT_DEATH_SCREEN") {
@@ -422,12 +418,7 @@ public:
 };
 
 
-// before 1.8 there isn't a "integer interface", only float
-#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
-typedef f32 SamplerLayer_t;
-#else
 typedef s32 SamplerLayer_t;
-#endif
 
 
 class GameGlobalShaderConstantSetter : public IShaderConstantSetter
@@ -448,6 +439,7 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
 	CachedPixelShaderSetting<float, 3> m_camera_offset_pixel;
 	CachedPixelShaderSetting<float, 3> m_camera_offset_vertex;
 	CachedPixelShaderSetting<SamplerLayer_t> m_base_texture;
+	CachedPixelShaderSetting<SamplerLayer_t> m_normal_texture;
 	Client *m_client;
 
 public:
@@ -481,6 +473,7 @@ public:
 		m_camera_offset_pixel("cameraOffset"),
 		m_camera_offset_vertex("cameraOffset"),
 		m_base_texture("baseTexture"),
+		m_normal_texture("normalTexture"),
 		m_client(client)
 	{
 		g_settings->registerChangedCallback("enable_fog", settingsCallback, this);
@@ -533,43 +526,26 @@ public:
 
 		float eye_position_array[3];
 		v3f epos = m_client->getEnv().getLocalPlayer()->getEyePosition();
-#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
-		eye_position_array[0] = epos.X;
-		eye_position_array[1] = epos.Y;
-		eye_position_array[2] = epos.Z;
-#else
 		epos.getAs3Values(eye_position_array);
-#endif
 		m_eye_position_pixel.set(eye_position_array, services);
 		m_eye_position_vertex.set(eye_position_array, services);
 
 		if (m_client->getMinimap()) {
 			float minimap_yaw_array[3];
 			v3f minimap_yaw = m_client->getMinimap()->getYawVec();
-#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
-			minimap_yaw_array[0] = minimap_yaw.X;
-			minimap_yaw_array[1] = minimap_yaw.Y;
-			minimap_yaw_array[2] = minimap_yaw.Z;
-#else
 			minimap_yaw.getAs3Values(minimap_yaw_array);
-#endif
 			m_minimap_yaw.set(minimap_yaw_array, services);
 		}
 
 		float camera_offset_array[3];
 		v3f offset = intToFloat(m_client->getCamera()->getOffset(), BS);
-#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
-		camera_offset_array[0] = offset.X;
-		camera_offset_array[1] = offset.Y;
-		camera_offset_array[2] = offset.Z;
-#else
 		offset.getAs3Values(camera_offset_array);
-#endif
 		m_camera_offset_pixel.set(camera_offset_array, services);
 		m_camera_offset_vertex.set(camera_offset_array, services);
 
-		SamplerLayer_t base_tex = 0;
+		SamplerLayer_t base_tex = 0, normal_tex = 1;
 		m_base_texture.set(&base_tex, services);
+		m_normal_texture.set(&normal_tex, services);
 	}
 };
 
@@ -666,6 +642,8 @@ struct ClientEventHandler
 	void (Game::*handler)(ClientEvent *, CameraOrientation *);
 };
 
+using PausedNodesList = std::vector<std::pair<irr_ptr<scene::IAnimatedMeshSceneNode>, float>>;
+
 class Game {
 public:
 	Game();
@@ -673,6 +651,7 @@ public:
 
 	bool startup(bool *kill,
 			InputHandler *input,
+			RenderingEngine *rendering_engine,
 			const GameStartData &game_params,
 			std::string &error_message,
 			bool *reconnect,
@@ -682,8 +661,6 @@ public:
 	void run();
 	void shutdown();
 
-	void extendedResourceCleanup();
-
 	// Basic initialisation
 	bool init(const std::string &map_dir, const std::string &address,
 			u16 port, const SubgameSpec &gamespec);
@@ -804,6 +781,9 @@ public:
 	void showDeathFormspec();
 	void showPauseMenu();
 
+	void pauseAnimation();
+	void resumeAnimation();
+
 	// ClientEvent handlers
 	void handleClientEvent_None(ClientEvent *event, CameraOrientation *cam);
 	void handleClientEvent_PlayerDamage(ClientEvent *event, CameraOrientation *cam);
@@ -828,9 +808,11 @@ public:
 
 	bool nodePlacement(const ItemDefinition &selected_def, const ItemStack &selected_item,
 		const v3s16 &nodepos, const v3s16 &neighbourpos, const PointedThing &pointed,
-		const NodeMetadata *meta);
+		const NodeMetadata *meta, bool force = false);
 	static const ClientEventHandler clientEventHandler[CLIENTEVENT_MAX];
 
+	f32 getSensitivityScaleFactor() const;
+
 	InputHandler *input = nullptr;
 
 	Client *client = nullptr;
@@ -865,6 +847,9 @@ public:
 	Hud *hud = nullptr;
 	Minimap *mapper = nullptr;
 
+	// Map server hud ids to client hud ids
+	std::unordered_map<u32, u32> m_hud_server_to_client;
+
 	GameRunData runData;
 	Flags m_flags;
 
@@ -873,12 +858,14 @@ public:
 	   these items (e.g. device)
 	*/
 	IrrlichtDevice *device;
+	RenderingEngine *m_rendering_engine;
 	video::IVideoDriver *driver;
 	scene::ISceneManager *smgr;
 	bool *kill;
 	std::string *error_message;
 	bool *reconnect_requested;
 	scene::ISceneNode *skybox;
+	PausedNodesList paused_animated_nodes;
 
 	bool simple_singleplayer_mode;
 	/* End 'cache' */
@@ -927,6 +914,7 @@ extern Game *g_game;
 
 void the_game(bool *kill,
 		InputHandler *input,
+		RenderingEngine *rendering_engine,
 		const GameStartData &start_data,
 		std::string &error_message,
 		ChatBackend &chat_backend,
diff --git a/src/client/gameui.cpp b/src/client/gameui.cpp
index 0c1da3915..c97ae93b8 100644
--- a/src/client/gameui.cpp
+++ b/src/client/gameui.cpp
@@ -55,7 +55,7 @@ void GameUI::init()
 {
 	m_guitext_coords = gui::StaticText::add(guienv, L"", core::rect<s32>(0, 0, 0, 0), false,
 		false, guiroot);
-	
+
 	// First line of debug text
 	m_guitext = gui::StaticText::add(guienv, utf8_to_wide(PROJECT_NAME_C).c_str(),
 		core::rect<s32>(0, 0, 0, 0), false, false, guiroot);
@@ -102,7 +102,8 @@ void GameUI::update(const RunStats &stats, Client *client, MapDrawControl *draw_
 {
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
 	v3f player_position = player->getPosition();
-	v2u32 screensize = RenderingEngine::get_instance()->getWindowSize();
+
+	v2u32 screensize = RenderingEngine::getWindowSize();
 
 	bool show_coords = g_settings->getBool("coords");
 
@@ -115,7 +116,7 @@ void GameUI::update(const RunStats &stats, Client *client, MapDrawControl *draw_
 		setStaticText(m_guitext_coords, utf8_to_wide(os.str()).c_str());
 		m_guitext_coords->setRelativePosition(core::rect<s32>(5, screensize.Y - 5 - g_fontengine->getTextHeight(), screensize.X, screensize.Y));
 	}
-	
+
 	m_guitext_coords->setVisible(show_coords);
 
 	if (m_flags.show_debug) {
@@ -238,9 +239,9 @@ void GameUI::setChatText(const EnrichedString &chat_text, u32 recent_chat_count)
 {
 
 	// Update gui element size and position
-	
-	const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
-	
+
+	const v2u32 &window_size = RenderingEngine::getWindowSize();
+
 	s32 chat_y = window_size.Y - 150 - m_guitext_chat->getTextHeight();
 
 	if (m_flags.show_debug)
@@ -276,7 +277,7 @@ void GameUI::updateProfiler()
 		core::position2di upper_left(6, 50);
 		core::position2di lower_right = upper_left;
 		lower_right.X += size.Width + 10;
-		lower_right.Y += size.Height; 
+		lower_right.Y += size.Height;
 
 		m_guitext_profiler->setRelativePosition(core::rect<s32>(upper_left, lower_right));
 	}
diff --git a/src/client/gameui.h b/src/client/gameui.h
index 8a1b5650d..f04fd97b8 100644
--- a/src/client/gameui.h
+++ b/src/client/gameui.h
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
+#include "irrlichttypes.h"
 #include <IGUIEnvironment.h>
 #include "gui/guiFormSpecMenu.h"
 #include "util/enriched_string.h"
diff --git a/src/client/guiscalingfilter.cpp b/src/client/guiscalingfilter.cpp
index 406c096e6..232219237 100644
--- a/src/client/guiscalingfilter.cpp
+++ b/src/client/guiscalingfilter.cpp
@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include <cstdio>
 #include "client/renderingengine.h"
-#include "client/tile.h" // hasNPotSupport()
 
 /* Maintain a static cache to store the images that correspond to textures
  * in a format that's manipulable by code.  Some platforms exhibit issues
@@ -102,7 +101,7 @@ video::ITexture *guiScalingResizeCached(video::IVideoDriver *driver,
 		if (!g_settings->getBool("gui_scaling_filter_txr2img"))
 			return src;
 		srcimg = driver->createImageFromData(src->getColorFormat(),
-			src->getSize(), src->lock(), false);
+			src->getSize(), src->lock(video::ETLM_READ_ONLY), false);
 		src->unlock();
 		g_imgCache[origname] = srcimg;
 	}
@@ -117,7 +116,7 @@ video::ITexture *guiScalingResizeCached(video::IVideoDriver *driver,
 #if ENABLE_GLES
 	// Some platforms are picky about textures being powers of 2, so expand
 	// the image dimensions to the next power of 2, if necessary.
-	if (!hasNPotSupport()) {
+	if (!driver->queryFeature(video::EVDF_TEXTURE_NPOT)) {
 		video::IImage *po2img = driver->createImage(src->getColorFormat(),
 				core::dimension2d<u32>(npot2((u32)destrect.getWidth()),
 				npot2((u32)destrect.getHeight())));
@@ -129,7 +128,7 @@ video::ITexture *guiScalingResizeCached(video::IVideoDriver *driver,
 #endif
 
 	// Convert the scaled image back into a texture.
-	scaled = driver->addTexture(scalename, destimg, NULL);
+	scaled = driver->addTexture(scalename, destimg);
 	destimg->drop();
 	g_txrCache[scalename] = scaled;
 
diff --git a/src/client/hud.cpp b/src/client/hud.cpp
index e956c2738..391af0995 100644
--- a/src/client/hud.cpp
+++ b/src/client/hud.cpp
@@ -45,11 +45,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define OBJECT_CROSSHAIR_LINE_SIZE 8
 #define CROSSHAIR_LINE_SIZE 10
 
-Hud::Hud(gui::IGUIEnvironment *guienv, Client *client, LocalPlayer *player,
+Hud::Hud(Client *client, LocalPlayer *player,
 		Inventory *inventory)
 {
 	driver            = RenderingEngine::get_video_driver();
-	this->guienv      = guienv;
 	this->client      = client;
 	this->player      = player;
 	this->inventory   = inventory;
@@ -149,7 +148,7 @@ void Hud::drawItem(const ItemStack &item, const core::rect<s32>& rect,
 		bool selected)
 {
 	if (selected) {
-		/* draw hihlighting around selected item */
+		/* draw highlighting around selected item */
 		if (use_hotbar_selected_image) {
 			core::rect<s32> imgrect2 = rect;
 			imgrect2.UpperLeftCorner.X  -= (m_padding*2);
@@ -315,7 +314,7 @@ bool Hud::calculateScreenPos(const v3s16 &camera_offset, HudElement *e, v2s32 *p
 {
 	v3f w_pos = e->world_pos * BS;
 	scene::ICameraSceneNode* camera =
-		RenderingEngine::get_scene_manager()->getActiveCamera();
+		client->getSceneManager()->getActiveCamera();
 	w_pos -= intToFloat(camera_offset, BS);
 	core::matrix4 trans = camera->getProjectionMatrix();
 	trans *= camera->getViewMatrix();
@@ -336,22 +335,22 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
 	irr::gui::IGUIFont* font = g_fontengine->getFont();
 
 	// Reorder elements by z_index
-	std::vector<size_t> ids;
+	std::vector<HudElement*> elems;
+	elems.reserve(player->maxHudId());
 
 	for (size_t i = 0; i != player->maxHudId(); i++) {
 		HudElement *e = player->getHud(i);
 		if (!e)
 			continue;
 
-		auto it = ids.begin();
-		while (it != ids.end() && player->getHud(*it)->z_index <= e->z_index)
+		auto it = elems.begin();
+		while (it != elems.end() && (*it)->z_index <= e->z_index)
 			++it;
 
-		ids.insert(it, i);
+		elems.insert(it, e);
 	}
 
-	for (size_t i : ids) {
-		HudElement *e = player->getHud(i);
+	for (HudElement *e : elems) {
 
 		v2s32 pos(floor(e->pos.X * (float) m_screensize.X + 0.5),
 				floor(e->pos.Y * (float) m_screensize.Y + 0.5));
@@ -475,7 +474,7 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
 
 				// Angle according to camera view
 				v3f fore(0.f, 0.f, 1.f);
-				scene::ICameraSceneNode *cam = RenderingEngine::get_scene_manager()->getActiveCamera();
+				scene::ICameraSceneNode *cam = client->getSceneManager()->getActiveCamera();
 				cam->getAbsoluteTransformation().rotateVect(fore);
 				int angle = - fore.getHorizontalAngle().Y;
 
@@ -522,8 +521,8 @@ void Hud::drawLuaElements(const v3s16 &camera_offset)
 				client->getMinimap()->drawMinimap(rect);
 				break; }
 			default:
-				infostream << "Hud::drawLuaElements: ignoring drawform " << e->type <<
-					" of hud element ID " << i << " due to unrecognized type" << std::endl;
+				infostream << "Hud::drawLuaElements: ignoring drawform " << e->type
+					<< " due to unrecognized type" << std::endl;
 		}
 	}
 }
@@ -571,8 +570,6 @@ void Hud::drawCompassTranslate(HudElement *e, video::ITexture *texture,
 void Hud::drawCompassRotate(HudElement *e, video::ITexture *texture,
 		const core::rect<s32> &rect, int angle)
 {
-	core::dimension2di imgsize(texture->getOriginalSize());
-
 	core::rect<s32> oldViewPort = driver->getViewPort();
 	core::matrix4 oldProjMat = driver->getTransform(video::ETS_PROJECTION);
 	core::matrix4 oldViewMat = driver->getTransform(video::ETS_VIEW);
@@ -749,7 +746,7 @@ void Hud::drawHotbar(u16 playeritem) {
 	s32 width = hotbar_itemcount * (m_hotbar_imagesize + m_padding * 2);
 	v2s32 pos = centerlowerpos - v2s32(width / 2, m_hotbar_imagesize + m_padding * 3);
 
-	const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
+	const v2u32 &window_size = RenderingEngine::getWindowSize();
 	if ((float) width / (float) window_size.X <=
 			g_settings->getFloat("hud_hotbar_max_width")) {
 		if (player->hud_flags & HUD_FLAG_HOTBAR_VISIBLE) {
@@ -864,6 +861,54 @@ void Hud::drawSelectionMesh()
 	}
 }
 
+void Hud::toggleBlockBounds()
+{
+	m_block_bounds_mode = static_cast<BlockBoundsMode>(m_block_bounds_mode + 1);
+
+	if (m_block_bounds_mode >= BLOCK_BOUNDS_MAX) {
+		m_block_bounds_mode = BLOCK_BOUNDS_OFF;
+	}
+}
+
+void Hud::drawBlockBounds()
+{
+	if (m_block_bounds_mode == BLOCK_BOUNDS_OFF) {
+		return;
+	}
+
+	video::SMaterial old_material = driver->getMaterial2D();
+	driver->setMaterial(m_selection_material);
+
+	v3s16 pos = player->getStandingNodePos();
+
+	v3s16 blockPos(
+		floorf((float) pos.X / MAP_BLOCKSIZE),
+		floorf((float) pos.Y / MAP_BLOCKSIZE),
+		floorf((float) pos.Z / MAP_BLOCKSIZE)
+	);
+
+	v3f offset = intToFloat(client->getCamera()->getOffset(), BS);
+
+	s8 radius = m_block_bounds_mode == BLOCK_BOUNDS_ALL ? 2 : 0;
+
+	v3f halfNode = v3f(BS, BS, BS) / 2.0f;
+
+	for (s8 x = -radius; x <= radius; x++)
+	for (s8 y = -radius; y <= radius; y++)
+	for (s8 z = -radius; z <= radius; z++) {
+		v3s16 blockOffset(x, y, z);
+
+		aabb3f box(
+			intToFloat((blockPos + blockOffset) * MAP_BLOCKSIZE, BS) - offset - halfNode,
+			intToFloat(((blockPos + blockOffset) * MAP_BLOCKSIZE) + (MAP_BLOCKSIZE - 1), BS) - offset + halfNode
+		);
+
+		driver->draw3DBox(box, video::SColor(255, 255, 0, 0));
+	}
+
+	driver->setMaterial(old_material);
+}
+
 void Hud::updateSelectionMesh(const v3s16 &camera_offset)
 {
 	m_camera_offset = camera_offset;
@@ -910,7 +955,7 @@ void Hud::updateSelectionMesh(const v3s16 &camera_offset)
 }
 
 void Hud::resizeHotbar() {
-	const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
+	const v2u32 &window_size = RenderingEngine::getWindowSize();
 
 	if (m_screensize != window_size) {
 		m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE *
@@ -947,12 +992,20 @@ void drawItemStack(
 		return;
 	}
 
+	const static thread_local bool enable_animations =
+		g_settings->getBool("inventory_items_animations");
+
 	const ItemDefinition &def = item.getDefinition(client->idef());
-	ItemMesh *imesh = client->idef()->getWieldMesh(def.name, client);
 
-	if (imesh && imesh->mesh) {
+	bool draw_overlay = false;
+
+	// Render as mesh if animated or no inventory image
+	if ((enable_animations && rotation_kind < IT_ROT_NONE) || def.inventory_image.empty()) {
+		ItemMesh *imesh = client->idef()->getWieldMesh(def.name, client);
+		if (!imesh || !imesh->mesh)
+			return;
 		scene::IMesh *mesh = imesh->mesh;
-		driver->clearZBuffer();
+		driver->clearBuffers(video::ECBF_DEPTH);
 		s32 delta = 0;
 		if (rotation_kind < IT_ROT_NONE) {
 			MeshTimeInfo &ti = rotation_time_infos[rotation_kind];
@@ -994,9 +1047,6 @@ void drawItemStack(
 		core::matrix4 matrix;
 		matrix.makeIdentity();
 
-		static thread_local bool enable_animations =
-			g_settings->getBool("inventory_items_animations");
-
 		if (enable_animations) {
 			float timer_f = (float) delta / 5000.f;
 			matrix.setRotationDegrees(v3f(
@@ -1042,15 +1092,29 @@ void drawItemStack(
 		driver->setTransform(video::ETS_PROJECTION, oldProjMat);
 		driver->setViewPort(oldViewPort);
 
-		// draw the inventory_overlay
-		if (def.type == ITEM_NODE && def.inventory_image.empty() &&
-				!def.inventory_overlay.empty()) {
-			ITextureSource *tsrc = client->getTextureSource();
-			video::ITexture *overlay_texture = tsrc->getTexture(def.inventory_overlay);
-			core::dimension2d<u32> dimens = overlay_texture->getOriginalSize();
-			core::rect<s32> srcrect(0, 0, dimens.Width, dimens.Height);
-			draw2DImageFilterScaled(driver, overlay_texture, rect, srcrect, clip, 0, true);
-		}
+		draw_overlay = def.type == ITEM_NODE && def.inventory_image.empty();
+	} else { // Otherwise just draw as 2D
+		video::ITexture *texture = client->idef()->getInventoryTexture(def.name, client);
+		if (!texture)
+			return;
+		video::SColor color =
+			client->idef()->getItemstackColor(item, client);
+		const video::SColor colors[] = { color, color, color, color };
+
+		draw2DImageFilterScaled(driver, texture, rect,
+			core::rect<s32>({0, 0}, core::dimension2di(texture->getOriginalSize())),
+			clip, colors, true);
+
+		draw_overlay = true;
+	}
+
+	// draw the inventory_overlay
+	if (!def.inventory_overlay.empty() && draw_overlay) {
+		ITextureSource *tsrc = client->getTextureSource();
+		video::ITexture *overlay_texture = tsrc->getTexture(def.inventory_overlay);
+		core::dimension2d<u32> dimens = overlay_texture->getOriginalSize();
+		core::rect<s32> srcrect(0, 0, dimens.Width, dimens.Height);
+		draw2DImageFilterScaled(driver, overlay_texture, rect, srcrect, clip, 0, true);
 	}
 
 	if (def.type == ITEM_TOOL && item.wear != 0) {
diff --git a/src/client/hud.h b/src/client/hud.h
index d46545d71..d341105d2 100644
--- a/src/client/hud.h
+++ b/src/client/hud.h
@@ -35,14 +35,6 @@ struct ItemStack;
 class Hud
 {
 public:
-	video::IVideoDriver *driver;
-	scene::ISceneManager *smgr;
-	gui::IGUIEnvironment *guienv;
-	Client *client;
-	LocalPlayer *player;
-	Inventory *inventory;
-	ITextureSource *tsrc;
-
 	video::SColor crosshair_argb;
 	video::SColor selectionbox_argb;
 
@@ -55,10 +47,13 @@ public:
 
 	bool pointing_at_object = false;
 
-	Hud(gui::IGUIEnvironment *guienv, Client *client, LocalPlayer *player,
+	Hud(Client *client, LocalPlayer *player,
 			Inventory *inventory);
 	~Hud();
 
+	void toggleBlockBounds();
+	void drawBlockBounds();
+
 	void drawHotbar(u16 playeritem);
 	void resizeHotbar();
 	void drawCrosshair();
@@ -103,6 +98,12 @@ private:
 	void drawCompassRotate(HudElement *e, video::ITexture *texture,
 			const core::rect<s32> &rect, int way);
 
+	Client *client = nullptr;
+	video::IVideoDriver *driver = nullptr;
+	LocalPlayer *player = nullptr;
+	Inventory *inventory = nullptr;
+	ITextureSource *tsrc = nullptr;
+
 	float m_hud_scaling; // cached minetest setting
 	float m_scale_factor;
 	v3s16 m_camera_offset;
@@ -125,6 +126,14 @@ private:
 
 	scene::SMeshBuffer m_rotation_mesh_buffer;
 
+	enum BlockBoundsMode
+	{
+		BLOCK_BOUNDS_OFF,
+		BLOCK_BOUNDS_CURRENT,
+		BLOCK_BOUNDS_ALL,
+		BLOCK_BOUNDS_MAX
+	} m_block_bounds_mode = BLOCK_BOUNDS_OFF;
+
 	enum
 	{
 		HIGHLIGHT_BOX,
diff --git a/src/client/imagefilters.cpp b/src/client/imagefilters.cpp
index 0fa501410..7b2ef9822 100644
--- a/src/client/imagefilters.cpp
+++ b/src/client/imagefilters.cpp
@@ -19,63 +19,134 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "imagefilters.h"
 #include "util/numeric.h"
 #include <cmath>
+#include <cassert>
+#include <vector>
+
+// Simple 2D bitmap class with just the functionality needed here
+class Bitmap {
+	u32 linesize, lines;
+	std::vector<u8> data;
+
+	static inline u32 bytepos(u32 index) { return index >> 3; }
+	static inline u8 bitpos(u32 index) { return index & 7; }
+
+public:
+	Bitmap(u32 width, u32 height) :  linesize(width), lines(height),
+		data(bytepos(width * height) + 1) {}
+
+	inline bool get(u32 x, u32 y) const {
+		u32 index = y * linesize + x;
+		return data[bytepos(index)] & (1 << bitpos(index));
+	}
+
+	inline void set(u32 x, u32 y) {
+		u32 index = y * linesize + x;
+		data[bytepos(index)] |= 1 << bitpos(index);
+	}
+
+	inline bool all() const {
+		for (u32 i = 0; i < data.size() - 1; i++) {
+			if (data[i] != 0xff)
+				return false;
+		}
+		// last byte not entirely filled
+		for (u8 i = 0; i < bitpos(linesize * lines); i++) {
+			bool value_of_bit = data.back() & (1 << i);
+			if (!value_of_bit)
+				return false;
+		}
+		return true;
+	}
+
+	inline void copy(Bitmap &to) const {
+		assert(to.linesize == linesize && to.lines == lines);
+		to.data = data;
+	}
+};
 
 /* Fill in RGB values for transparent pixels, to correct for odd colors
  * appearing at borders when blending.  This is because many PNG optimizers
  * like to discard RGB values of transparent pixels, but when blending then
- * with non-transparent neighbors, their RGB values will shpw up nonetheless.
+ * with non-transparent neighbors, their RGB values will show up nonetheless.
  *
  * This function modifies the original image in-place.
  *
  * Parameter "threshold" is the alpha level below which pixels are considered
- * transparent.  Should be 127 for 3d where alpha is threshold, but 0 for
- * 2d where alpha is blended.
+ * transparent. Should be 127 when the texture is used with ALPHA_CHANNEL_REF,
+ * 0 when alpha blending is used.
  */
 void imageCleanTransparent(video::IImage *src, u32 threshold)
 {
 	core::dimension2d<u32> dim = src->getDimension();
 
-	// Walk each pixel looking for fully transparent ones.
+	Bitmap bitmap(dim.Width, dim.Height);
+
+	// First pass: Mark all opaque pixels
 	// Note: loop y around x for better cache locality.
 	for (u32 ctry = 0; ctry < dim.Height; ctry++)
 	for (u32 ctrx = 0; ctrx < dim.Width; ctrx++) {
+		if (src->getPixel(ctrx, ctry).getAlpha() > threshold)
+			bitmap.set(ctrx, ctry);
+	}
+
+	// Exit early if all pixels opaque
+	if (bitmap.all())
+		return;
+
+	Bitmap newmap = bitmap;
+
+	// Then repeatedly look for transparent pixels, filling them in until
+	// we're finished (capped at 50 iterations).
+	for (u32 iter = 0; iter < 50; iter++) {
 
-		// Ignore opaque pixels.
-		irr::video::SColor c = src->getPixel(ctrx, ctry);
-		if (c.getAlpha() > threshold)
+	for (u32 ctry = 0; ctry < dim.Height; ctry++)
+	for (u32 ctrx = 0; ctrx < dim.Width; ctrx++) {
+		// Skip pixels we have already processed
+		if (bitmap.get(ctrx, ctry))
 			continue;
 
-		// Sample size and total weighted r, g, b values.
+		video::SColor c = src->getPixel(ctrx, ctry);
+
+		// Sample size and total weighted r, g, b values
 		u32 ss = 0, sr = 0, sg = 0, sb = 0;
 
-		// Walk each neighbor pixel (clipped to image bounds).
+		// Walk each neighbor pixel (clipped to image bounds)
 		for (u32 sy = (ctry < 1) ? 0 : (ctry - 1);
 				sy <= (ctry + 1) && sy < dim.Height; sy++)
 		for (u32 sx = (ctrx < 1) ? 0 : (ctrx - 1);
 				sx <= (ctrx + 1) && sx < dim.Width; sx++) {
-
-			// Ignore transparent pixels.
-			irr::video::SColor d = src->getPixel(sx, sy);
-			if (d.getAlpha() <= threshold)
+			// Ignore pixels we haven't processed
+			if (!bitmap.get(sx, sy))
 				continue;
-
-			// Add RGB values weighted by alpha.
-			u32 a = d.getAlpha();
+	
+			// Add RGB values weighted by alpha IF the pixel is opaque, otherwise
+			// use full weight since we want to propagate colors.
+			video::SColor d = src->getPixel(sx, sy);
+			u32 a = d.getAlpha() <= threshold ? 255 : d.getAlpha();
 			ss += a;
 			sr += a * d.getRed();
 			sg += a * d.getGreen();
 			sb += a * d.getBlue();
 		}
 
-		// If we found any neighbor RGB data, set pixel to average
-		// weighted by alpha.
+		// Set pixel to average weighted by alpha
 		if (ss > 0) {
 			c.setRed(sr / ss);
 			c.setGreen(sg / ss);
 			c.setBlue(sb / ss);
 			src->setPixel(ctrx, ctry, c);
+			newmap.set(ctrx, ctry);
 		}
 	}
+
+	if (newmap.all())
+		return;
+
+	// Apply changes to bitmap for next run. This is done so we don't introduce
+	// a bias in color propagation in the direction pixels are processed.
+	newmap.copy(bitmap);
+
+	}
 }
 
 /* Scale a region of an image into another image, using nearest-neighbor with
diff --git a/src/client/imagefilters.h b/src/client/imagefilters.h
index 5676faf85..c9bdefbb6 100644
--- a/src/client/imagefilters.h
+++ b/src/client/imagefilters.h
@@ -23,13 +23,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /* Fill in RGB values for transparent pixels, to correct for odd colors
  * appearing at borders when blending.  This is because many PNG optimizers
  * like to discard RGB values of transparent pixels, but when blending then
- * with non-transparent neighbors, their RGB values will shpw up nonetheless.
+ * with non-transparent neighbors, their RGB values will show up nonetheless.
  *
  * This function modifies the original image in-place.
  *
  * Parameter "threshold" is the alpha level below which pixels are considered
- * transparent.  Should be 127 for 3d where alpha is threshold, but 0 for
- * 2d where alpha is blended.
+ * transparent. Should be 127 when the texture is used with ALPHA_CHANNEL_REF,
+ * 0 when alpha blending is used.
  */
 void imageCleanTransparent(video::IImage *src, u32 threshold);
 
diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
index 544c0e344..d833db2f1 100644
--- a/src/client/inputhandler.cpp
+++ b/src/client/inputhandler.cpp
@@ -35,7 +35,7 @@ void KeyCache::populate()
 	key[KeyType::LEFT] = getKeySetting("keymap_left");
 	key[KeyType::RIGHT] = getKeySetting("keymap_right");
 	key[KeyType::JUMP] = getKeySetting("keymap_jump");
-	key[KeyType::SPECIAL1] = getKeySetting("keymap_special1");
+	key[KeyType::AUX1] = getKeySetting("keymap_aux1");
 	key[KeyType::SNEAK] = getKeySetting("keymap_sneak");
 	key[KeyType::DIG] = getKeySetting("keymap_dig");
 	key[KeyType::PLACE] = getKeySetting("keymap_place");
@@ -61,6 +61,7 @@ void KeyCache::populate()
 	key[KeyType::DEC_VOLUME] = getKeySetting("keymap_decrease_volume");
 	key[KeyType::CINEMATIC] = getKeySetting("keymap_cinematic");
 	key[KeyType::SCREENSHOT] = getKeySetting("keymap_screenshot");
+	key[KeyType::TOGGLE_BLOCK_BOUNDS] = getKeySetting("keymap_toggle_block_bounds");
 	key[KeyType::TOGGLE_HUD] = getKeySetting("keymap_toggle_hud");
 	key[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat");
 	key[KeyType::TOGGLE_FOG] = getKeySetting("keymap_toggle_fog");
@@ -123,17 +124,12 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
 	if (event.EventType == irr::EET_KEY_INPUT_EVENT) {
 		const KeyPress &keyCode = event.KeyInput;
 		if (keysListenedFor[keyCode]) {
-				// If the key is being held down then the OS may
-				// send a continuous stream of keydown events.
-				// In this case, we don't want to let this
-				// stream reach the application as it will cause
-				// certain actions to repeat constantly.
 			if (event.KeyInput.PressedDown) {
-				if (!IsKeyDown(keyCode)) {
-					keyWasDown.set(keyCode);
+				if (!IsKeyDown(keyCode))
 					keyWasPressed.set(keyCode);
-				}
+
 				keyIsDown.set(keyCode);
+				keyWasDown.set(keyCode);
 			} else {
 				if (IsKeyDown(keyCode))
 					keyWasReleased.set(keyCode);
@@ -234,7 +230,7 @@ void RandomInputHandler::step(float dtime)
 {
 	static RandomInputHandlerSimData rnd_data[] = {
 		{ "keymap_jump", 0.0f, 40 },
-		{ "keymap_special1", 0.0f, 40 },
+		{ "keymap_aux1", 0.0f, 40 },
 		{ "keymap_forward", 0.0f, 40 },
 		{ "keymap_left", 0.0f, 40 },
 		{ "keymap_dig", 0.0f, 30 },
diff --git a/src/client/inputhandler.h b/src/client/inputhandler.h
index 766cd5266..efe9442d5 100644
--- a/src/client/inputhandler.h
+++ b/src/client/inputhandler.h
@@ -201,7 +201,7 @@ public:
 	// The current state of keys
 	KeyList keyIsDown;
 
-	// Whether a key was down
+	// Like keyIsDown but only reset when that key is read
 	KeyList keyWasDown;
 
 	// Whether a key has just been pressed
diff --git a/src/client/joystick_controller.cpp b/src/client/joystick_controller.cpp
index f61ae4ae6..919db5315 100644
--- a/src/client/joystick_controller.cpp
+++ b/src/client/joystick_controller.cpp
@@ -79,7 +79,7 @@ JoystickLayout create_default_layout()
 
 	// Accessible without any modifier pressed
 	JLO_B_PB(KeyType::JUMP,       bm | 1 << 0, 1 << 0);
-	JLO_B_PB(KeyType::SPECIAL1,   bm | 1 << 1, 1 << 1);
+	JLO_B_PB(KeyType::AUX1,       bm | 1 << 1, 1 << 1);
 
 	// Accessible with start button not pressed, but four pressed
 	// TODO find usage for button 0
@@ -126,11 +126,11 @@ JoystickLayout create_xbox_layout()
 	// 4 Buttons
 	JLO_B_PB(KeyType::JUMP,        1 << 0,  1 << 0); // A/green
 	JLO_B_PB(KeyType::ESC,         1 << 1,  1 << 1); // B/red
-	JLO_B_PB(KeyType::SPECIAL1,    1 << 2,  1 << 2); // X/blue
+	JLO_B_PB(KeyType::AUX1,        1 << 2,  1 << 2); // X/blue
 	JLO_B_PB(KeyType::INVENTORY,   1 << 3,  1 << 3); // Y/yellow
 
 	// Analog Sticks
-	JLO_B_PB(KeyType::SPECIAL1,    1 << 11, 1 << 11); // left
+	JLO_B_PB(KeyType::AUX1,        1 << 11, 1 << 11); // left
 	JLO_B_PB(KeyType::SNEAK,       1 << 12, 1 << 12); // right
 
 	// Triggers
diff --git a/src/client/keycode.cpp b/src/client/keycode.cpp
index 6a0e9f569..fac077f0f 100644
--- a/src/client/keycode.cpp
+++ b/src/client/keycode.cpp
@@ -197,7 +197,6 @@ static const struct table_key table[] = {
 	DEFINEKEY1(KEY_MODECHANGE, N_("IME Mode Change"))
 	DEFINEKEY1(KEY_APPS, N_("Apps"))
 	DEFINEKEY1(KEY_SLEEP, N_("Sleep"))
-#if !(IRRLICHT_VERSION_MAJOR <= 1 && IRRLICHT_VERSION_MINOR <= 7 && IRRLICHT_VERSION_REVISION < 3)
 	DEFINEKEY1(KEY_OEM_1, "OEM 1") // KEY_OEM_[0-9] and KEY_OEM_102 are assigned to multiple
 	DEFINEKEY1(KEY_OEM_2, "OEM 2") // different chars (on different platforms too) and thus w/o char
 	DEFINEKEY1(KEY_OEM_3, "OEM 3")
@@ -208,7 +207,6 @@ static const struct table_key table[] = {
 	DEFINEKEY1(KEY_OEM_8, "OEM 8")
 	DEFINEKEY1(KEY_OEM_AX, "OEM AX")
 	DEFINEKEY1(KEY_OEM_102, "OEM 102")
-#endif
 	DEFINEKEY1(KEY_ATTN, "Attn")
 	DEFINEKEY1(KEY_CRSEL, "CrSel")
 	DEFINEKEY1(KEY_EXSEL, "ExSel")
@@ -316,7 +314,8 @@ KeyPress::KeyPress(const char *name)
 	int chars_read = mbtowc(&Char, name, 1);
 	FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
 	m_name = "";
-	warningstream << "KeyPress: Unknown key '" << name << "', falling back to first char.";
+	warningstream << "KeyPress: Unknown key '" << name
+		<< "', falling back to first char." << std::endl;
 }
 
 KeyPress::KeyPress(const irr::SEvent::SKeyInput &in, bool prefer_character)
diff --git a/src/client/keys.h b/src/client/keys.h
index d4f3dd4c1..b81b571b2 100644
--- a/src/client/keys.h
+++ b/src/client/keys.h
@@ -32,7 +32,7 @@ public:
 		LEFT,
 		RIGHT,
 		JUMP,
-		SPECIAL1,
+		AUX1,
 		SNEAK,
 		AUTOFORWARD,
 		DIG,
@@ -60,6 +60,7 @@ public:
 		DEC_VOLUME,
 		CINEMATIC,
 		SCREENSHOT,
+		TOGGLE_BLOCK_BOUNDS,
 		TOGGLE_HUD,
 		TOGGLE_CHAT,
 		TOGGLE_FOG,
diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp
index ddec04cb5..24a12c35e 100644
--- a/src/client/localplayer.cpp
+++ b/src/client/localplayer.cpp
@@ -172,7 +172,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
 {
 	if (m_cao && m_cao->m_waiting_for_reattach > 0)
 		m_cao->m_waiting_for_reattach -= dtime;
-	
+
 	// Node at feet position, update each ClientEnvironment::step()
 	if (!collision_info || collision_info->empty())
 		m_standing_node = floatToInt(m_position, BS);
@@ -461,8 +461,6 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
 			m_speed.Y += jumpspeed;
 		}
 		setSpeed(m_speed);
-		if (! m_freecam)
-			m_legit_speed = m_speed;
 		m_can_jump = false;
 	}
 
@@ -711,6 +709,16 @@ v3s16 LocalPlayer::getLightPosition() const
 	return floatToInt(m_position + v3f(0.0f, BS * 1.5f, 0.0f), BS);
 }
 
+v3f LocalPlayer::getSendSpeed()
+{
+	v3f speed = getLegitSpeed();
+
+	if (m_client->modsLoaded())
+		speed = m_client->getScript()->get_send_speed(speed);
+
+	return speed;
+}
+
 v3f LocalPlayer::getEyeOffset() const
 {
 	float eye_height = camera_barely_in_ceiling ? m_eye_height - 0.125f : m_eye_height;
diff --git a/src/client/localplayer.h b/src/client/localplayer.h
index 0e071d2b4..eaac216d3 100644
--- a/src/client/localplayer.h
+++ b/src/client/localplayer.h
@@ -140,8 +140,10 @@ public:
 	v3f getPosition() const { return m_position; }
 
 	v3f getLegitPosition() const { return m_legit_position; }
-	
-	v3f getLegitSpeed() const { return m_legit_speed; }
+
+	v3f getLegitSpeed() const { return m_freecam ? m_legit_speed : m_speed; }
+
+	v3f getSendSpeed();
 
 	inline void setLegitPosition(const v3f &position)
 	{
@@ -151,18 +153,18 @@ public:
 			setPosition(position);
 	}
 
-	inline void freecamEnable() 
+	inline void freecamEnable()
 	{
 		m_freecam = true;
 	}
-	
-	inline void freecamDisable() 
+
+	inline void freecamDisable()
 	{
 		m_freecam = false;
 		setPosition(m_legit_position);
 		setSpeed(m_legit_speed);
 	}
-	
+
 	// Non-transformed eye offset getters
 	// For accurate positions, use the Camera functions
 	v3f getEyePosition() const { return m_position + getEyeOffset(); }
@@ -184,13 +186,13 @@ public:
 	{
 		added_velocity += vel;
 	}
-	
+
 	void tryReattach(int id);
-	
+
 	bool isWaitingForReattach() const;
-	
+
 	bool canWalkOn(const ContentFeatures &f);
-	
+
 private:
 	void accelerate(const v3f &target_speed, const f32 max_increase_H,
 		const f32 max_increase_V, const bool use_pitch);
diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp
index b7c5ea16a..8877e0549 100644
--- a/src/client/mapblock_mesh.cpp
+++ b/src/client/mapblock_mesh.cpp
@@ -407,7 +407,7 @@ static void getNodeVertexDirs(const v3s16 &dir, v3s16 *vertex_dirs)
 
 static void getNodeTextureCoords(v3f base, const v3f &scale, const v3s16 &dir, float *u, float *v)
 {
-	if (dir.X > 0 || dir.Y > 0 || dir.Z < 0)
+	if (dir.X > 0 || dir.Y != 0 || dir.Z < 0)
 		base -= scale;
 	if (dir == v3s16(0,0,1)) {
 		*u = -base.X - 1;
@@ -425,8 +425,8 @@ static void getNodeTextureCoords(v3f base, const v3f &scale, const v3s16 &dir, f
 		*u = base.X + 1;
 		*v = -base.Z - 2;
 	} else if (dir == v3s16(0,-1,0)) {
-		*u = base.X;
-		*v = base.Z;
+		*u = base.X + 1;
+		*v = base.Z + 1;
 	}
 }
 
@@ -1140,8 +1140,8 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 	*/
 
 	{
-		MapblockMeshGenerator generator(data, &collector);
-		generator.generate();
+		MapblockMeshGenerator(data, &collector,
+			data->m_client->getSceneManager()->getMeshManipulator()).generate();
 	}
 
 	/*
@@ -1244,13 +1244,6 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
 		}
 
 		if (m_mesh[layer]) {
-#if 0
-			// Usually 1-700 faces and 1-7 materials
-			std::cout << "Updated MapBlock has " << fastfaces_new.size()
-					<< " faces and uses " << m_mesh[layer]->getMeshBufferCount()
-					<< " materials (meshbuffers)" << std::endl;
-#endif
-
 			// Use VBO for mesh (this just would set this for ever buffer)
 			if (m_enable_vbo)
 				m_mesh[layer]->setHardwareMappingHint(scene::EHM_STATIC);
diff --git a/src/client/mapblock_mesh.h b/src/client/mapblock_mesh.h
index 6f454d348..80075fce2 100644
--- a/src/client/mapblock_mesh.h
+++ b/src/client/mapblock_mesh.h
@@ -125,8 +125,6 @@ public:
 			m_animation_force_timer--;
 	}
 
-	void updateCameraOffset(v3s16 camera_offset);
-
 	std::set<v3s16> esp_nodes;
 
 private:
diff --git a/src/client/mesh.cpp b/src/client/mesh.cpp
index 2400a374c..e43139218 100644
--- a/src/client/mesh.cpp
+++ b/src/client/mesh.cpp
@@ -27,14 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <SAnimatedMesh.h>
 #include <IAnimatedMeshSceneNode.h>
 
-// In Irrlicht 1.8 the signature of ITexture::lock was changed from
-// (bool, u32) to (E_TEXTURE_LOCK_MODE, u32).
-#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR <= 7
-#define MY_ETLM_READ_ONLY true
-#else
-#define MY_ETLM_READ_ONLY video::ETLM_READ_ONLY
-#endif
-
 inline static void applyShadeFactor(video::SColor& color, float factor)
 {
 	color.setRed(core::clamp(core::round32(color.getRed()*factor), 0, 255));
diff --git a/src/client/mesh_generator_thread.h b/src/client/mesh_generator_thread.h
index 8e13dec3e..f393e2368 100644
--- a/src/client/mesh_generator_thread.h
+++ b/src/client/mesh_generator_thread.h
@@ -40,7 +40,6 @@ struct QueuedMeshUpdate
 {
 	v3s16 p = v3s16(-1337, -1337, -1337);
 	bool ack_block_to_server = false;
-	bool urgent = false;
 	int crack_level = -1;
 	v3s16 crack_pos;
 	MeshMakeData *data = nullptr; // This is generated in MeshUpdateQueue::pop()
diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp
index 187428273..3013e1406 100644
--- a/src/client/minimap.cpp
+++ b/src/client/minimap.cpp
@@ -304,7 +304,7 @@ void Minimap::setModeIndex(size_t index)
 		data->mode = m_modes[index];
 		m_current_mode_index = index;
 	} else {
-		data->mode = MinimapModeDef{MINIMAP_TYPE_OFF, N_("Minimap hidden"), 0, 0, ""};
+		data->mode = MinimapModeDef{MINIMAP_TYPE_OFF, gettext("Minimap hidden"), 0, 0, ""};
 		m_current_mode_index = 0;
 	}
 
@@ -330,25 +330,26 @@ void Minimap::addMode(MinimapModeDef mode)
 	if (mode.label == "") {
 		switch (mode.type) {
 			case MINIMAP_TYPE_OFF:
-				mode.label = N_("Minimap hidden");
+				mode.label = gettext("Minimap hidden");
 				break;
 			case MINIMAP_TYPE_SURFACE:
-				mode.label = N_("Minimap in surface mode, Zoom x%d");
+				mode.label = gettext("Minimap in surface mode, Zoom x%d");
 				if (mode.map_size > 0)
 					zoom = 256 / mode.map_size;
 				break;
 			case MINIMAP_TYPE_RADAR:
-				mode.label = N_("Minimap in radar mode, Zoom x%d");
+				mode.label = gettext("Minimap in radar mode, Zoom x%d");
 				if (mode.map_size > 0)
 					zoom = 512 / mode.map_size;
 				break;
 			case MINIMAP_TYPE_TEXTURE:
-				mode.label = N_("Minimap in texture mode");
+				mode.label = gettext("Minimap in texture mode");
 				break;
 			default:
 				break;
 		}
 	}
+	// else: Custom labels need mod-provided client-side translation
 
 	if (zoom >= 0) {
 		char label_buf[1024];
@@ -490,7 +491,8 @@ video::ITexture *Minimap::getMinimapTexture()
 		// Want to use texture source, to : 1 find texture, 2 cache it
 		video::ITexture* texture = m_tsrc->getTexture(data->mode.texture);
 		video::IImage* image = driver->createImageFromData(
-			 texture->getColorFormat(), texture->getSize(), texture->lock(), true, false);
+			 texture->getColorFormat(), texture->getSize(),
+			 texture->lock(video::ETLM_READ_ONLY), true, false);
 		texture->unlock();
 
 		auto dim = image->getDimension();
@@ -575,7 +577,7 @@ scene::SMeshBuffer *Minimap::getMinimapMeshBuffer()
 void Minimap::drawMinimap()
 {
 	// Non hud managed minimap drawing (legacy minimap)
-	v2u32 screensize = RenderingEngine::get_instance()->getWindowSize();
+	v2u32 screensize = RenderingEngine::getWindowSize();
 	const u32 size = 0.25 * screensize.Y;
 
 	drawMinimap(core::rect<s32>(
diff --git a/src/client/minimap.h b/src/client/minimap.h
index 4a2c462f8..87c9668ee 100644
--- a/src/client/minimap.h
+++ b/src/client/minimap.h
@@ -138,7 +138,6 @@ public:
 	size_t getMaxModeIndex() const { return m_modes.size() - 1; };
 	void nextMode();
 
-	void setModesFromString(std::string modes_string);
 	MinimapModeDef getModeDef() const { return data->mode; }
 
 	video::ITexture *getMinimapTexture();
diff --git a/src/client/particles.cpp b/src/client/particles.cpp
index 7acd996dc..288826a5f 100644
--- a/src/client/particles.cpp
+++ b/src/client/particles.cpp
@@ -64,8 +64,8 @@ Particle::Particle(
 	v2f texsize,
 	video::SColor color
 ):
-	scene::ISceneNode(RenderingEngine::get_scene_manager()->getRootSceneNode(),
-		RenderingEngine::get_scene_manager())
+	scene::ISceneNode(((Client *)gamedef)->getSceneManager()->getRootSceneNode(),
+		((Client *)gamedef)->getSceneManager())
 {
 	// Misc
 	m_gamedef = gamedef;
diff --git a/src/client/render/anaglyph.cpp b/src/client/render/anaglyph.cpp
index 9ba4464a2..153e77400 100644
--- a/src/client/render/anaglyph.cpp
+++ b/src/client/render/anaglyph.cpp
@@ -40,7 +40,7 @@ void RenderingCoreAnaglyph::setupMaterial(int color_mask)
 void RenderingCoreAnaglyph::useEye(bool right)
 {
 	RenderingCoreStereo::useEye(right);
-	driver->clearZBuffer();
+	driver->clearBuffers(video::ECBF_DEPTH);
 	setupMaterial(right ? video::ECP_GREEN | video::ECP_BLUE : video::ECP_RED);
 }
 
diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
index 794ec0186..99af085f9 100644
--- a/src/client/render/core.cpp
+++ b/src/client/render/core.cpp
@@ -163,6 +163,7 @@ void RenderingCore::draw3D()
 	driver->setTransform(video::ETS_WORLD, core::IdentityMatrix);
 	if (!show_hud)
 		return;
+	hud->drawBlockBounds();
 	hud->drawSelectionMesh();
 	if (draw_entity_esp || draw_entity_tracers || draw_player_esp || draw_player_tracers || draw_node_esp || draw_node_tracers)
 		drawTracersAndESP();
diff --git a/src/client/render/factory.cpp b/src/client/render/factory.cpp
index 30f9480fc..7fcec40dd 100644
--- a/src/client/render/factory.cpp
+++ b/src/client/render/factory.cpp
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "factory.h"
-#include <stdexcept>
+#include "log.h"
 #include "plain.h"
 #include "anaglyph.h"
 #include "interlaced.h"
@@ -45,5 +45,8 @@ RenderingCore *createRenderingCore(const std::string &stereo_mode, IrrlichtDevic
 		return new RenderingCoreSideBySide(device, client, hud, true);
 	if (stereo_mode == "crossview")
 		return new RenderingCoreSideBySide(device, client, hud, false, true);
-	throw std::invalid_argument("Invalid rendering mode: " + stereo_mode);
+
+	// fallback to plain renderer
+	errorstream << "Invalid rendering mode: " << stereo_mode << std::endl;
+	return new RenderingCorePlain(device, client, hud);
 }
diff --git a/src/client/render/interlaced.cpp b/src/client/render/interlaced.cpp
index ce8e92f21..3f79a8eb5 100644
--- a/src/client/render/interlaced.cpp
+++ b/src/client/render/interlaced.cpp
@@ -35,7 +35,11 @@ void RenderingCoreInterlaced::initMaterial()
 	IShaderSource *s = client->getShaderSource();
 	mat.UseMipMaps = false;
 	mat.ZBuffer = false;
+#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8
+	mat.ZWriteEnable = video::EZW_OFF;
+#else
 	mat.ZWriteEnable = false;
+#endif
 	u32 shader = s->getShader("3d_interlaced_merge", TILE_MATERIAL_BASIC);
 	mat.MaterialType = s->getShaderInfo(shader).material;
 	for (int k = 0; k < 3; ++k) {
diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp
index 22c8a8102..138012414 100644
--- a/src/client/renderingengine.cpp
+++ b/src/client/renderingengine.cpp
@@ -118,6 +118,8 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
 	}
 
 	SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
+	if (g_logger.getTraceEnabled())
+		params.LoggingLevel = irr::ELL_DEBUG;
 	params.DriverType = driverType;
 	params.WindowSize = core::dimension2d<u32>(screen_w, screen_h);
 	params.Bits = bits;
@@ -153,11 +155,11 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
 RenderingEngine::~RenderingEngine()
 {
 	core.reset();
-	m_device->drop();
+	m_device->closeDevice();
 	s_singleton = nullptr;
 }
 
-v2u32 RenderingEngine::getWindowSize() const
+v2u32 RenderingEngine::_getWindowSize() const
 {
 	if (core)
 		return core->getVirtualSize();
@@ -223,6 +225,20 @@ bool RenderingEngine::print_video_modes()
 	return videomode_list != NULL;
 }
 
+void RenderingEngine::removeMesh(const scene::IMesh* mesh)
+{
+	m_device->getSceneManager()->getMeshCache()->removeMesh(mesh);
+}
+
+void RenderingEngine::cleanupMeshCache()
+{
+	auto mesh_cache = m_device->getSceneManager()->getMeshCache();
+	while (mesh_cache->getMeshCount() != 0) {
+		if (scene::IAnimatedMesh *mesh = mesh_cache->getMeshByIndex(0))
+			mesh_cache->removeMesh(mesh);
+	}
+}
+
 bool RenderingEngine::setupTopLevelWindow(const std::string &name)
 {
 	// FIXME: It would make more sense for there to be a switch of some
@@ -325,12 +341,18 @@ static bool getWindowHandle(irr::video::IVideoDriver *driver, HWND &hWnd)
 	const video::SExposedVideoData exposedData = driver->getExposedVideoData();
 
 	switch (driver->getDriverType()) {
+#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9
 	case video::EDT_DIRECT3D8:
 		hWnd = reinterpret_cast<HWND>(exposedData.D3D8.HWnd);
 		break;
+#endif
 	case video::EDT_DIRECT3D9:
 		hWnd = reinterpret_cast<HWND>(exposedData.D3D9.HWnd);
 		break;
+#if ENABLE_GLES
+	case video::EDT_OGLES1:
+	case video::EDT_OGLES2:
+#endif
 	case video::EDT_OPENGL:
 		hWnd = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd);
 		break;
@@ -470,11 +492,11 @@ bool RenderingEngine::setXorgWindowIconFromPath(const std::string &icon_file)
 	Text will be removed when the screen is drawn the next time.
 	Additionally, a progressbar can be drawn when percent is set between 0 and 100.
 */
-void RenderingEngine::_draw_load_screen(const std::wstring &text,
+void RenderingEngine::draw_load_screen(const std::wstring &text,
 		gui::IGUIEnvironment *guienv, ITextureSource *tsrc, float dtime,
 		int percent, bool clouds)
 {
-	v2u32 screensize = RenderingEngine::get_instance()->getWindowSize();
+	v2u32 screensize = getWindowSize();
 
 	v2s32 textsize(g_fontengine->getTextWidth(text), g_fontengine->getLineHeight());
 	v2s32 center(screensize.X / 2, screensize.Y / 2);
@@ -542,7 +564,7 @@ void RenderingEngine::_draw_load_screen(const std::wstring &text,
 /*
 	Draws the menu scene including (optional) cloud background.
 */
-void RenderingEngine::_draw_menu_scene(gui::IGUIEnvironment *guienv,
+void RenderingEngine::draw_menu_scene(gui::IGUIEnvironment *guienv,
 		float dtime, bool clouds)
 {
 	bool cloud_menu_background = clouds && g_settings->getBool("menu_clouds");
@@ -590,19 +612,19 @@ std::vector<irr::video::E_DRIVER_TYPE> RenderingEngine::getSupportedVideoDrivers
 	return drivers;
 }
 
-void RenderingEngine::_initialize(Client *client, Hud *hud)
+void RenderingEngine::initialize(Client *client, Hud *hud)
 {
 	const std::string &draw_mode = g_settings->get("3d_mode");
 	core.reset(createRenderingCore(draw_mode, m_device, client, hud));
 	core->initialize();
 }
 
-void RenderingEngine::_finalize()
+void RenderingEngine::finalize()
 {
 	core.reset();
 }
 
-void RenderingEngine::_draw_scene(video::SColor skycolor, bool show_hud,
+void RenderingEngine::draw_scene(video::SColor skycolor, bool show_hud,
 		bool show_minimap, bool draw_wield_tool, bool draw_crosshair)
 {
 	core->draw(skycolor, show_hud, show_minimap, draw_wield_tool, draw_crosshair);
diff --git a/src/client/renderingengine.h b/src/client/renderingengine.h
index 34cc60630..28ddc8652 100644
--- a/src/client/renderingengine.h
+++ b/src/client/renderingengine.h
@@ -41,7 +41,6 @@ public:
 	RenderingEngine(IEventReceiver *eventReceiver);
 	~RenderingEngine();
 
-	v2u32 getWindowSize() const;
 	void setResizable(bool resize);
 
 	video::IVideoDriver *getVideoDriver() { return driver; }
@@ -56,31 +55,30 @@ public:
 	bool setWindowIcon();
 	bool setXorgWindowIconFromPath(const std::string &icon_file);
 	static bool print_video_modes();
+	void cleanupMeshCache();
 
-	static RenderingEngine *get_instance() { return s_singleton; }
+	void removeMesh(const scene::IMesh* mesh);
 
-	static io::IFileSystem *get_filesystem()
+	static v2u32 getWindowSize()
 	{
-		sanity_check(s_singleton && s_singleton->m_device);
-		return s_singleton->m_device->getFileSystem();
+		sanity_check(s_singleton);
+		return s_singleton->_getWindowSize();
 	}
 
-	static video::IVideoDriver *get_video_driver()
+	io::IFileSystem *get_filesystem()
 	{
-		sanity_check(s_singleton && s_singleton->m_device);
-		return s_singleton->m_device->getVideoDriver();
+		return m_device->getFileSystem();
 	}
 
-	static scene::IMeshCache *get_mesh_cache()
+	static video::IVideoDriver *get_video_driver()
 	{
 		sanity_check(s_singleton && s_singleton->m_device);
-		return s_singleton->m_device->getSceneManager()->getMeshCache();
+		return s_singleton->m_device->getVideoDriver();
 	}
 
-	static scene::ISceneManager *get_scene_manager()
+	scene::ISceneManager *get_scene_manager()
 	{
-		sanity_check(s_singleton && s_singleton->m_device);
-		return s_singleton->m_device->getSceneManager();
+		return m_device->getSceneManager();
 	}
 
 	static irr::IrrlichtDevice *get_raw_device()
@@ -89,70 +87,37 @@ public:
 		return s_singleton->m_device;
 	}
 
-	static u32 get_timer_time()
+	u32 get_timer_time()
 	{
-		sanity_check(s_singleton && s_singleton->m_device &&
-				s_singleton->m_device->getTimer());
-		return s_singleton->m_device->getTimer()->getTime();
+		return m_device->getTimer()->getTime();
 	}
 
-	static gui::IGUIEnvironment *get_gui_env()
+	gui::IGUIEnvironment *get_gui_env()
 	{
-		sanity_check(s_singleton && s_singleton->m_device);
-		return s_singleton->m_device->getGUIEnvironment();
+		return m_device->getGUIEnvironment();
 	}
 
-	inline static void draw_load_screen(const std::wstring &text,
+	void draw_load_screen(const std::wstring &text,
 			gui::IGUIEnvironment *guienv, ITextureSource *tsrc,
-			float dtime = 0, int percent = 0, bool clouds = true)
-	{
-		s_singleton->_draw_load_screen(
-				text, guienv, tsrc, dtime, percent, clouds);
-	}
+			float dtime = 0, int percent = 0, bool clouds = true);
 
-	inline static void draw_menu_scene(
-			gui::IGUIEnvironment *guienv, float dtime, bool clouds)
-	{
-		s_singleton->_draw_menu_scene(guienv, dtime, clouds);
-	}
+	void draw_menu_scene(gui::IGUIEnvironment *guienv, float dtime, bool clouds);
+	void draw_scene(video::SColor skycolor, bool show_hud,
+			bool show_minimap, bool draw_wield_tool, bool draw_crosshair);
 
-	inline static void draw_scene(video::SColor skycolor, bool show_hud,
-			bool show_minimap, bool draw_wield_tool, bool draw_crosshair)
-	{
-		s_singleton->_draw_scene(skycolor, show_hud, show_minimap,
-				draw_wield_tool, draw_crosshair);
-	}
+	void initialize(Client *client, Hud *hud);
+	void finalize();
 
-	inline static void initialize(Client *client, Hud *hud)
+	bool run()
 	{
-		s_singleton->_initialize(client, hud);
-	}
-
-	inline static void finalize() { s_singleton->_finalize(); }
-
-	static bool run()
-	{
-		sanity_check(s_singleton && s_singleton->m_device);
-		return s_singleton->m_device->run();
+		return m_device->run();
 	}
 
 	static std::vector<core::vector3d<u32>> getSupportedVideoModes();
 	static std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers();
 
 private:
-	void _draw_load_screen(const std::wstring &text, gui::IGUIEnvironment *guienv,
-			ITextureSource *tsrc, float dtime = 0, int percent = 0,
-			bool clouds = true);
-
-	void _draw_menu_scene(gui::IGUIEnvironment *guienv, float dtime = 0,
-			bool clouds = true);
-
-	void _draw_scene(video::SColor skycolor, bool show_hud, bool show_minimap,
-			bool draw_wield_tool, bool draw_crosshair);
-
-	void _initialize(Client *client, Hud *hud);
-
-	void _finalize();
+	v2u32 _getWindowSize() const;
 
 	std::unique_ptr<RenderingCore> core;
 	irr::IrrlichtDevice *m_device = nullptr;
diff --git a/src/client/shader.cpp b/src/client/shader.cpp
index b3e4911f4..58946b90f 100644
--- a/src/client/shader.cpp
+++ b/src/client/shader.cpp
@@ -579,8 +579,10 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
 	if (use_gles) {
 		shaders_header << R"(
 			#version 100
-			)";
+		)";
 		vertex_header = R"(
+			precision mediump float;
+
 			uniform highp mat4 mWorldView;
 			uniform highp mat4 mWorldViewProj;
 			uniform mediump mat4 mTexture;
@@ -592,17 +594,17 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
 			attribute mediump vec3 inVertexNormal;
 			attribute mediump vec4 inVertexTangent;
 			attribute mediump vec4 inVertexBinormal;
-			)";
+		)";
 		fragment_header = R"(
 			precision mediump float;
-			)";
+		)";
 	} else {
 		shaders_header << R"(
 			#version 120
 			#define lowp
 			#define mediump
 			#define highp
-			)";
+		)";
 		vertex_header = R"(
 			#define mWorldView gl_ModelViewMatrix
 			#define mWorldViewProj gl_ModelViewProjectionMatrix
@@ -615,7 +617,7 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
 			#define inVertexNormal gl_Normal
 			#define inVertexTangent gl_MultiTexCoord1
 			#define inVertexBinormal gl_MultiTexCoord2
-			)";
+		)";
 	}
 
 	bool use_discard = use_gles;
diff --git a/src/client/shader.h b/src/client/shader.h
index d99182693..49a563115 100644
--- a/src/client/shader.h
+++ b/src/client/shader.h
@@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
-#include <IMaterialRendererServices.h>
 #include "irrlichttypes_bloated.h"
+#include <IMaterialRendererServices.h>
 #include <string>
 #include "tile.h"
 #include "nodedef.h"
@@ -96,9 +96,10 @@ public:
 		if (has_been_set && std::equal(m_sent, m_sent + count, value))
 			return;
 		if (is_pixel)
-			services->setPixelShaderConstant(m_name, value, count);
+			services->setPixelShaderConstant(services->getPixelShaderConstantID(m_name), value, count);
 		else
-			services->setVertexShaderConstant(m_name, value, count);
+			services->setVertexShaderConstant(services->getVertexShaderConstantID(m_name), value, count);
+
 		std::copy(value, value + count, m_sent);
 		has_been_set = true;
 	}
diff --git a/src/client/sky.cpp b/src/client/sky.cpp
index 3a40321dd..47296a7a5 100644
--- a/src/client/sky.cpp
+++ b/src/client/sky.cpp
@@ -39,12 +39,13 @@ static video::SMaterial baseMaterial()
 {
 	video::SMaterial mat;
 	mat.Lighting = false;
-#if ENABLE_GLES
+#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8
 	mat.ZBuffer = video::ECFN_DISABLED;
+	mat.ZWriteEnable = video::EZW_OFF;
 #else
+	mat.ZWriteEnable = false;
 	mat.ZBuffer = video::ECFN_NEVER;
 #endif
-	mat.ZWriteEnable = false;
 	mat.AntiAliasing = 0;
 	mat.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
 	mat.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
@@ -52,10 +53,12 @@ static video::SMaterial baseMaterial()
 	return mat;
 };
 
-Sky::Sky(s32 id, ITextureSource *tsrc, IShaderSource *ssrc) :
-		scene::ISceneNode(RenderingEngine::get_scene_manager()->getRootSceneNode(),
-			RenderingEngine::get_scene_manager(), id)
+Sky::Sky(s32 id, RenderingEngine *rendering_engine, ITextureSource *tsrc, IShaderSource *ssrc) :
+		scene::ISceneNode(rendering_engine->get_scene_manager()->getRootSceneNode(),
+			rendering_engine->get_scene_manager(), id)
 {
+	m_seed = (u64)myrand() << 32 | myrand();
+
 	setAutomaticCulling(scene::EAC_OFF);
 	m_box.MaxEdge.set(0, 0, 0);
 	m_box.MinEdge.set(0, 0, 0);
@@ -81,13 +84,13 @@ Sky::Sky(s32 id, ITextureSource *tsrc, IShaderSource *ssrc) :
 	// Ensures that sun and moon textures and tonemaps are correct.
 	setSkyDefaults();
 	m_sun_texture = tsrc->isKnownSourceImage(m_sun_params.texture) ?
-		tsrc->getTextureForMesh(m_sun_params.texture) : NULL;
+		tsrc->getTextureForMesh(m_sun_params.texture) : nullptr;
 	m_moon_texture = tsrc->isKnownSourceImage(m_moon_params.texture) ?
-		tsrc->getTextureForMesh(m_moon_params.texture) : NULL;
+		tsrc->getTextureForMesh(m_moon_params.texture) : nullptr;
 	m_sun_tonemap = tsrc->isKnownSourceImage(m_sun_params.tonemap) ?
-		tsrc->getTexture(m_sun_params.tonemap) : NULL;
+		tsrc->getTexture(m_sun_params.tonemap) : nullptr;
 	m_moon_tonemap = tsrc->isKnownSourceImage(m_moon_params.tonemap) ?
-		tsrc->getTexture(m_moon_params.tonemap) : NULL;
+		tsrc->getTexture(m_moon_params.tonemap) : nullptr;
 
 	if (m_sun_texture) {
 		m_materials[3] = baseMaterial();
@@ -743,14 +746,14 @@ void Sky::place_sky_body(
 	}
 }
 
-void Sky::setSunTexture(std::string sun_texture,
-		std::string sun_tonemap, ITextureSource *tsrc)
+void Sky::setSunTexture(const std::string &sun_texture,
+		const std::string &sun_tonemap, ITextureSource *tsrc)
 {
 	// Ignore matching textures (with modifiers) entirely,
 	// but lets at least update the tonemap before hand.
 	m_sun_params.tonemap = sun_tonemap;
 	m_sun_tonemap = tsrc->isKnownSourceImage(m_sun_params.tonemap) ?
-		tsrc->getTexture(m_sun_params.tonemap) : NULL;
+		tsrc->getTexture(m_sun_params.tonemap) : nullptr;
 	m_materials[3].Lighting = !!m_sun_tonemap;
 
 	if (m_sun_params.texture == sun_texture)
@@ -779,7 +782,7 @@ void Sky::setSunTexture(std::string sun_texture,
 	}
 }
 
-void Sky::setSunriseTexture(std::string sunglow_texture,
+void Sky::setSunriseTexture(const std::string &sunglow_texture,
 		ITextureSource* tsrc)
 {
 	// Ignore matching textures (with modifiers) entirely.
@@ -791,14 +794,14 @@ void Sky::setSunriseTexture(std::string sunglow_texture,
 	);
 }
 
-void Sky::setMoonTexture(std::string moon_texture,
-		std::string moon_tonemap, ITextureSource *tsrc)
+void Sky::setMoonTexture(const std::string &moon_texture,
+	const std::string &moon_tonemap, ITextureSource *tsrc)
 {
 	// Ignore matching textures (with modifiers) entirely,
 	// but lets at least update the tonemap before hand.
 	m_moon_params.tonemap = moon_tonemap;
 	m_moon_tonemap = tsrc->isKnownSourceImage(m_moon_params.tonemap) ?
-		tsrc->getTexture(m_moon_params.tonemap) : NULL;
+		tsrc->getTexture(m_moon_params.tonemap) : nullptr;
 	m_materials[4].Lighting = !!m_moon_tonemap;
 
 	if (m_moon_params.texture == moon_texture)
@@ -832,7 +835,6 @@ void Sky::setStarCount(u16 star_count, bool force_update)
 	// Allow force updating star count at game init.
 	if (m_star_params.count != star_count || force_update) {
 		m_star_params.count = star_count;
-		m_seed = (u64)myrand() << 32 | myrand();
 		updateStars();
 	}
 }
@@ -892,7 +894,7 @@ void Sky::setSkyColors(const SkyColor &sky_color)
 }
 
 void Sky::setHorizonTint(video::SColor sun_tint, video::SColor moon_tint,
-		std::string use_sun_tint)
+	const std::string &use_sun_tint)
 {
 	// Change sun and moon tinting:
 	m_sky_params.fog_sun_tint = sun_tint;
@@ -906,7 +908,7 @@ void Sky::setHorizonTint(video::SColor sun_tint, video::SColor moon_tint,
 		m_default_tint = true;
 }
 
-void Sky::addTextureToSkybox(std::string texture, int material_id,
+void Sky::addTextureToSkybox(const std::string &texture, int material_id,
 		ITextureSource *tsrc)
 {
 	// Sanity check for more than six textures.
diff --git a/src/client/sky.h b/src/client/sky.h
index 10e1cd976..121a16bb7 100644
--- a/src/client/sky.h
+++ b/src/client/sky.h
@@ -17,10 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "irrlichttypes_extrabloated.h"
 #include <ISceneNode.h>
 #include <array>
 #include "camera.h"
-#include "irrlichttypes_extrabloated.h"
 #include "irr_ptr.h"
 #include "shader.h"
 #include "skyparams.h"
@@ -36,7 +36,7 @@ class Sky : public scene::ISceneNode
 {
 public:
 	//! constructor
-	Sky(s32 id, ITextureSource *tsrc, IShaderSource *ssrc);
+	Sky(s32 id, RenderingEngine *rendering_engine, ITextureSource *tsrc, IShaderSource *ssrc);
 
 	virtual void OnRegisterSceneNode();
 
@@ -65,15 +65,15 @@ public:
 	}
 
 	void setSunVisible(bool sun_visible) { m_sun_params.visible = sun_visible; }
-	void setSunTexture(std::string sun_texture,
-		std::string sun_tonemap, ITextureSource *tsrc);
+	void setSunTexture(const std::string &sun_texture,
+		const std::string &sun_tonemap, ITextureSource *tsrc);
 	void setSunScale(f32 sun_scale) { m_sun_params.scale = sun_scale; }
 	void setSunriseVisible(bool glow_visible) { m_sun_params.sunrise_visible = glow_visible; }
-	void setSunriseTexture(std::string sunglow_texture, ITextureSource* tsrc);
+	void setSunriseTexture(const std::string &sunglow_texture, ITextureSource* tsrc);
 
 	void setMoonVisible(bool moon_visible) { m_moon_params.visible = moon_visible; }
-	void setMoonTexture(std::string moon_texture,
-		std::string moon_tonemap, ITextureSource *tsrc);
+	void setMoonTexture(const std::string &moon_texture,
+		const std::string &moon_tonemap, ITextureSource *tsrc);
 	void setMoonScale(f32 moon_scale) { m_moon_params.scale = moon_scale; }
 
 	void setStarsVisible(bool stars_visible) { m_star_params.visible = stars_visible; }
@@ -87,21 +87,21 @@ public:
 	void setVisible(bool visible) { m_visible = visible; }
 	// Set only from set_sky API
 	void setCloudsEnabled(bool clouds_enabled) { m_clouds_enabled = clouds_enabled; }
-	void setFallbackBgColor(const video::SColor &fallback_bg_color)
+	void setFallbackBgColor(video::SColor fallback_bg_color)
 	{
 		m_fallback_bg_color = fallback_bg_color;
 	}
-	void overrideColors(const video::SColor &bgcolor, const video::SColor &skycolor)
+	void overrideColors(video::SColor bgcolor, video::SColor skycolor)
 	{
 		m_bgcolor = bgcolor;
 		m_skycolor = skycolor;
 	}
 	void setSkyColors(const SkyColor &sky_color);
 	void setHorizonTint(video::SColor sun_tint, video::SColor moon_tint,
-		std::string use_sun_tint);
+		const std::string &use_sun_tint);
 	void setInClouds(bool clouds) { m_in_clouds = clouds; }
 	void clearSkyboxTextures() { m_sky_params.textures.clear(); }
-	void addTextureToSkybox(std::string texture, int material_id,
+	void addTextureToSkybox(const  std::string &texture, int material_id,
 		ITextureSource *tsrc);
 	const video::SColorf &getCurrentStarColor() const { return m_star_color; }
 
@@ -126,7 +126,7 @@ private:
 	}
 
 	// Mix two colors by a given amount
-	video::SColor m_mix_scolor(video::SColor col1, video::SColor col2, f32 factor)
+	static video::SColor m_mix_scolor(video::SColor col1, video::SColor col2, f32 factor)
 	{
 		video::SColor result = video::SColor(
 				col1.getAlpha() * (1 - factor) + col2.getAlpha() * factor,
@@ -135,7 +135,7 @@ private:
 				col1.getBlue() * (1 - factor) + col2.getBlue() * factor);
 		return result;
 	}
-	video::SColorf m_mix_scolorf(video::SColorf col1, video::SColorf col2, f32 factor)
+	static video::SColorf m_mix_scolorf(video::SColorf col1, video::SColorf col2, f32 factor)
 	{
 		video::SColorf result =
 				video::SColorf(col1.r * (1 - factor) + col2.r * factor,
diff --git a/src/client/sound_openal.cpp b/src/client/sound_openal.cpp
index f4e61f93e..8dceeede6 100644
--- a/src/client/sound_openal.cpp
+++ b/src/client/sound_openal.cpp
@@ -671,8 +671,8 @@ public:
 
 		alSourcei(sound->source_id, AL_SOURCE_RELATIVE, false);
 		alSource3f(sound->source_id, AL_POSITION, pos.X, pos.Y, pos.Z);
-		alSource3f(sound->source_id, AL_VELOCITY, 0, 0, 0);
-		alSourcef(sound->source_id, AL_REFERENCE_DISTANCE, 30.0);
+		alSource3f(sound->source_id, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
+		alSourcef(sound->source_id, AL_REFERENCE_DISTANCE, 10.0f);
 	}
 
 	bool updateSoundGain(int id, float gain)
diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index 37836d0df..96312ea27 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -34,15 +34,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "guiscalingfilter.h"
 #include "renderingengine.h"
 
-
-#if ENABLE_GLES
-#ifdef _IRR_COMPILE_WITH_OGLES1_
-#include <GLES/gl.h>
-#else
-#include <GLES2/gl2.h>
-#endif
-#endif
-
 /*
 	A cache from texture name to texture path
 */
@@ -427,9 +418,9 @@ private:
 	std::unordered_map<std::string, Palette> m_palettes;
 
 	// Cached settings needed for making textures from meshes
+	bool m_setting_mipmap;
 	bool m_setting_trilinear_filter;
 	bool m_setting_bilinear_filter;
-	bool m_setting_anisotropic_filter;
 };
 
 IWritableTextureSource *createTextureSource()
@@ -448,9 +439,9 @@ TextureSource::TextureSource()
 	// Cache some settings
 	// Note: Since this is only done once, the game must be restarted
 	// for these settings to take effect
+	m_setting_mipmap = g_settings->getBool("mip_map");
 	m_setting_trilinear_filter = g_settings->getBool("trilinear_filter");
 	m_setting_bilinear_filter = g_settings->getBool("bilinear_filter");
-	m_setting_anisotropic_filter = g_settings->getBool("anisotropic_filter");
 }
 
 TextureSource::~TextureSource()
@@ -669,7 +660,7 @@ video::ITexture* TextureSource::getTexture(const std::string &name, u32 *id)
 video::ITexture* TextureSource::getTextureForMesh(const std::string &name, u32 *id)
 {
 	static thread_local bool filter_needed =
-		g_settings->getBool("texture_clean_transparent") ||
+		g_settings->getBool("texture_clean_transparent") || m_setting_mipmap ||
 		((m_setting_trilinear_filter || m_setting_bilinear_filter) &&
 		g_settings->getS32("texture_min_size") > 1);
 	// Avoid duplicating texture if it won't actually change
@@ -839,17 +830,16 @@ static video::IImage *createInventoryCubeImage(
 			image = scaled;
 		}
 		sanity_check(image->getPitch() == 4 * size);
-		return reinterpret_cast<u32 *>(image->lock());
+		return reinterpret_cast<u32 *>(image->getData());
 	};
 	auto free_image = [] (video::IImage *image) -> void {
-		image->unlock();
 		image->drop();
 	};
 
 	video::IImage *result = driver->createImage(video::ECF_A8R8G8B8, {cube_size, cube_size});
 	sanity_check(result->getPitch() == 4 * cube_size);
 	result->fill(video::SColor(0x00000000u));
-	u32 *target = reinterpret_cast<u32 *>(result->lock());
+	u32 *target = reinterpret_cast<u32 *>(result->getData());
 
 	// Draws single cube face
 	// `shade_factor` is face brightness, in range [0.0, 1.0]
@@ -908,7 +898,6 @@ static video::IImage *createInventoryCubeImage(
 				{0, 5}, {1, 5},
 			});
 
-	result->unlock();
 	return result;
 }
 
@@ -1015,42 +1004,19 @@ video::IImage* TextureSource::generateImage(const std::string &name)
 
 #if ENABLE_GLES
 
-
-static inline u16 get_GL_major_version()
-{
-	const GLubyte *gl_version = glGetString(GL_VERSION);
-	return (u16) (gl_version[0] - '0');
-}
-
-/**
- * Check if hardware requires npot2 aligned textures
- * @return true if alignment NOT(!) requires, false otherwise
- */
-
-bool hasNPotSupport()
-{
-	// Only GLES2 is trusted to correctly report npot support
-	// Note: we cache the boolean result, the GL context will never change.
-	static const bool supported = get_GL_major_version() > 1 &&
-		glGetString(GL_EXTENSIONS) &&
-		strstr((char *)glGetString(GL_EXTENSIONS), "GL_OES_texture_npot");
-	return supported;
-}
-
 /**
  * Check and align image to npot2 if required by hardware
  * @param image image to check for npot2 alignment
  * @param driver driver to use for image operations
  * @return image or copy of image aligned to npot2
  */
-
-video::IImage * Align2Npot2(video::IImage * image,
-		video::IVideoDriver* driver)
+video::IImage *Align2Npot2(video::IImage *image,
+		video::IVideoDriver *driver)
 {
 	if (image == NULL)
 		return image;
 
-	if (hasNPotSupport())
+	if (driver->queryFeature(video::EVDF_TEXTURE_NPOT))
 		return image;
 
 	core::dimension2d<u32> dim = image->getDimension();
@@ -1640,8 +1606,8 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 				return false;
 			}
 
-			// Apply the "clean transparent" filter, if configured.
-			if (g_settings->getBool("texture_clean_transparent"))
+			// Apply the "clean transparent" filter, if needed
+			if (m_setting_mipmap || g_settings->getBool("texture_clean_transparent"))
 				imageCleanTransparent(baseimg, 127);
 
 			/* Upscale textures to user's requested minimum size.  This is a trick to make
@@ -2226,9 +2192,14 @@ video::SColor TextureSource::getTextureAverageColor(const std::string &name)
 	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
 	video::SColor c(0, 0, 0, 0);
 	video::ITexture *texture = getTexture(name);
+	if (!texture)
+		return c;
 	video::IImage *image = driver->createImage(texture,
 		core::position2d<s32>(0, 0),
 		texture->getOriginalSize());
+	if (!image)
+		return c;
+
 	u32 total = 0;
 	u32 tR = 0;
 	u32 tG = 0;
diff --git a/src/client/tile.h b/src/client/tile.h
index 49c46f749..fcdc46460 100644
--- a/src/client/tile.h
+++ b/src/client/tile.h
@@ -134,8 +134,7 @@ public:
 IWritableTextureSource *createTextureSource();
 
 #if ENABLE_GLES
-bool hasNPotSupport();
-video::IImage * Align2Npot2(video::IImage * image, irr::video::IVideoDriver* driver);
+video::IImage *Align2Npot2(video::IImage *image, video::IVideoDriver *driver);
 #endif
 
 enum MaterialType{
diff --git a/src/client/wieldmesh.cpp b/src/client/wieldmesh.cpp
index ad583210a..08fd49fc0 100644
--- a/src/client/wieldmesh.cpp
+++ b/src/client/wieldmesh.cpp
@@ -294,32 +294,36 @@ void WieldMeshSceneNode::setExtruded(const std::string &imagename,
 		}
 		material.setFlag(video::EMF_ANISOTROPIC_FILTER, m_anisotropic_filter);
 		// mipmaps cause "thin black line" artifacts
-#if (IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR >= 2
 		material.setFlag(video::EMF_USE_MIP_MAPS, false);
-#endif
 		if (m_enable_shaders) {
 			material.setTexture(2, tsrc->getShaderFlagsTexture(false));
 		}
 	}
 }
 
-scene::SMesh *createSpecialNodeMesh(Client *client, content_t id, std::vector<ItemPartColor> *colors, const ContentFeatures &f)
+static scene::SMesh *createSpecialNodeMesh(Client *client, MapNode n,
+	std::vector<ItemPartColor> *colors, const ContentFeatures &f)
 {
 	MeshMakeData mesh_make_data(client, false);
 	MeshCollector collector;
 	mesh_make_data.setSmoothLighting(false);
-	MapblockMeshGenerator gen(&mesh_make_data, &collector);
-	u8 param2 = 0;
-	if (f.param_type_2 == CPT2_WALLMOUNTED ||
+	MapblockMeshGenerator gen(&mesh_make_data, &collector,
+		client->getSceneManager()->getMeshManipulator());
+
+	if (n.getParam2()) {
+		// keep it
+	} else if (f.param_type_2 == CPT2_WALLMOUNTED ||
 			f.param_type_2 == CPT2_COLORED_WALLMOUNTED) {
-		if (f.drawtype == NDT_TORCHLIKE)
-			param2 = 1;
-		else if (f.drawtype == NDT_SIGNLIKE ||
+		if (f.drawtype == NDT_TORCHLIKE ||
+				f.drawtype == NDT_SIGNLIKE ||
 				f.drawtype == NDT_NODEBOX ||
-				f.drawtype == NDT_MESH)
-			param2 = 4;
+				f.drawtype == NDT_MESH) {
+			n.setParam2(4);
+		}
+	} else if (f.drawtype == NDT_SIGNLIKE || f.drawtype == NDT_TORCHLIKE) {
+		n.setParam2(1);
 	}
-	gen.renderSingle(id, param2);
+	gen.renderSingle(n.getContent(), n.getParam2());
 
 	colors->clear();
 	scene::SMesh *mesh = new scene::SMesh();
@@ -392,7 +396,6 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, Client *client, bool che
 		case NDT_TORCHLIKE:
 		case NDT_RAILLIKE:
 		case NDT_PLANTLIKE:
-		case NDT_PLANTLIKE_ROOTED:
 		case NDT_FLOWINGLIQUID: {
 			v3f wscale = def.wield_scale;
 			if (f.drawtype == NDT_FLOWINGLIQUID)
@@ -408,14 +411,26 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, Client *client, bool che
 			m_colors.emplace_back(l1.has_color, l1.color);
 			break;
 		}
+		case NDT_PLANTLIKE_ROOTED: {
+			setExtruded(tsrc->getTextureName(f.special_tiles[0].layers[0].texture_id),
+				"", def.wield_scale, tsrc,
+				f.special_tiles[0].layers[0].animation_frame_count);
+			// Add color
+			const TileLayer &l0 = f.special_tiles[0].layers[0];
+			m_colors.emplace_back(l0.has_color, l0.color);
+			break;
+		}
 		case NDT_NORMAL:
 		case NDT_ALLFACES:
 		case NDT_LIQUID:
 			setCube(f, def.wield_scale);
 			break;
-		default:
+		default: {
 			// Render non-trivial drawtypes like the actual node
-			mesh = createSpecialNodeMesh(client, id, &m_colors, f);
+			MapNode n(id);
+			n.setParam2(def.place_param2);
+
+			mesh = createSpecialNodeMesh(client, n, &m_colors, f);
 			changeToMesh(mesh);
 			mesh->drop();
 			m_meshnode->setScale(
@@ -423,6 +438,7 @@ void WieldMeshSceneNode::setItem(const ItemStack &item, Client *client, bool che
 				/ (BS * f.visual_scale));
 			break;
 		}
+		}
 
 		u32 material_count = m_meshnode->getMaterialCount();
 		for (u32 i = 0; i < material_count; ++i) {
@@ -523,7 +539,7 @@ void getItemMesh(Client *client, const ItemStack &item, ItemMesh *result)
 	content_t id = ndef->getId(def.name);
 
 	FATAL_ERROR_IF(!g_extrusion_mesh_cache, "Extrusion mesh cache is not yet initialized");
-	
+
 	scene::SMesh *mesh = nullptr;
 
 	// Shading is on by default
@@ -585,12 +601,16 @@ void getItemMesh(Client *client, const ItemStack &item, ItemMesh *result)
 			result->buffer_colors.emplace_back(l0.has_color, l0.color);
 			break;
 		}
-		default:
+		default: {
 			// Render non-trivial drawtypes like the actual node
-			mesh = createSpecialNodeMesh(client, id, &result->buffer_colors, f);
+			MapNode n(id);
+			n.setParam2(def.place_param2);
+
+			mesh = createSpecialNodeMesh(client, n, &result->buffer_colors, f);
 			scaleMesh(mesh, v3f(0.12, 0.12, 0.12));
 			break;
 		}
+		}
 
 		u32 mc = mesh->getMeshBufferCount();
 		for (u32 i = 0; i < mc; ++i) {
diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 01852c5d1..f35dcd0eb 100644
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -452,9 +452,6 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
 		case CSE_Hello:
 			m_state = CS_HelloSent;
 			break;
-		case CSE_InitLegacy:
-			m_state = CS_AwaitingInit2;
-			break;
 		case CSE_Disconnect:
 			m_state = CS_Disconnecting;
 			break;
@@ -674,7 +671,6 @@ void ClientInterface::UpdatePlayerList()
 		std::vector<session_t> clients = getClientIDs();
 		m_clients_names.clear();
 
-
 		if (!clients.empty())
 			infostream<<"Players:"<<std::endl;
 
diff --git a/src/clientiface.h b/src/clientiface.h
index eabffb0b6..dfd976741 100644
--- a/src/clientiface.h
+++ b/src/clientiface.h
@@ -25,11 +25,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"             // for SER_FMT_VER_INVALID
 #include "network/networkpacket.h"
 #include "network/networkprotocol.h"
+#include "network/address.h"
 #include "porting.h"
 
 #include <list>
 #include <vector>
 #include <set>
+#include <memory>
 #include <mutex>
 
 class MapBlock;
@@ -188,7 +190,6 @@ enum ClientStateEvent
 {
 	CSE_Hello,
 	CSE_AuthAccept,
-	CSE_InitLegacy,
 	CSE_GotInit2,
 	CSE_SetDenied,
 	CSE_SetDefinitionsSent,
@@ -338,17 +339,24 @@ public:
 	u8 getMajor() const { return m_version_major; }
 	u8 getMinor() const { return m_version_minor; }
 	u8 getPatch() const { return m_version_patch; }
-	const std::string &getFull() const { return m_full_version; }
+	const std::string &getFullVer() const { return m_full_version; }
 	
 	void setLangCode(const std::string &code) { m_lang_code = code; }
 	const std::string &getLangCode() const { return m_lang_code; }
+
+	void setCachedAddress(const Address &addr) { m_addr = addr; }
+	const Address &getAddress() const { return m_addr; }
+
 private:
 	// Version is stored in here after INIT before INIT2
 	u8 m_pending_serialization_version = SER_FMT_VER_INVALID;
 
 	/* current state of client */
 	ClientState m_state = CS_Created;
-	
+
+	// Cached here so retrieval doesn't have to go to connection API
+	Address m_addr;
+
 	// Client sent language code
 	std::string m_lang_code;
 
@@ -412,7 +420,7 @@ private:
 
 	/*
 		client information
-	 */
+	*/
 	u8 m_version_major = 0;
 	u8 m_version_minor = 0;
 	u8 m_version_patch = 0;
diff --git a/src/constants.h b/src/constants.h
index c17f3b6af..3cc3af094 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -89,7 +89,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // Size of player's main inventory
 #define PLAYER_INVENTORY_SIZE (8 * 4)
 
-// Default maximum hit points of a player
+// Default maximum health points of a player
 #define PLAYER_MAX_HP_DEFAULT 20
 
 // Default maximal breath of a player
diff --git a/src/content/mods.cpp b/src/content/mods.cpp
index 95ab0290a..f791fa797 100644
--- a/src/content/mods.cpp
+++ b/src/content/mods.cpp
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "porting.h"
 #include "convert_json.h"
+#include "script/common/c_internal.h"
 
 bool parseDependsString(std::string &dep, std::unordered_set<char> &symbols)
 {
@@ -44,20 +45,25 @@ bool parseDependsString(std::string &dep, std::unordered_set<char> &symbols)
 	return !dep.empty();
 }
 
+static void log_mod_deprecation(const ModSpec &spec, const std::string &warning)
+{
+	auto handling_mode = get_deprecated_handling_mode();
+	if (handling_mode != DeprecatedHandlingMode::Ignore) {
+		std::ostringstream os;
+		os << warning << " (" << spec.name << " at " << spec.path << ")"
+		   << std::endl;
+
+		if (handling_mode == DeprecatedHandlingMode::Error) {
+			throw ModError(os.str());
+		} else {
+			warningstream << os.str();
+		}
+	}
+}
+
 void parseModContents(ModSpec &spec)
 {
 	// NOTE: this function works in mutual recursion with getModsInPath
-	Settings info;
-	info.readConfigFile((spec.path + DIR_DELIM + "mod.conf").c_str());
-
-	if (info.exists("name"))
-		spec.name = info.get("name");
-
-	if (info.exists("author"))
-		spec.author = info.get("author");
-
-	if (info.exists("release"))
-		spec.release = info.getS32("release");
 
 	spec.depends.clear();
 	spec.optdepends.clear();
@@ -78,6 +84,21 @@ void parseModContents(ModSpec &spec)
 		spec.modpack_content = getModsInPath(spec.path, true);
 
 	} else {
+		Settings info;
+		info.readConfigFile((spec.path + DIR_DELIM + "mod.conf").c_str());
+
+		if (info.exists("name"))
+			spec.name = info.get("name");
+		else
+			log_mod_deprecation(spec, "Mods not having a mod.conf file with "
+						  "the name is deprecated.");
+
+		if (info.exists("author"))
+			spec.author = info.get("author");
+
+		if (info.exists("release"))
+			spec.release = info.getS32("release");
+
 		// Attempt to load dependencies from mod.conf
 		bool mod_conf_has_depends = false;
 		if (info.exists("depends")) {
@@ -109,6 +130,11 @@ void parseModContents(ModSpec &spec)
 			std::vector<std::string> dependencies;
 
 			std::ifstream is((spec.path + DIR_DELIM + "depends.txt").c_str());
+
+			if (is.good())
+				log_mod_deprecation(spec, "depends.txt is deprecated, "
+							  "please use mod.conf instead.");
+
 			while (is.good()) {
 				std::string dep;
 				std::getline(is, dep);
@@ -127,14 +153,12 @@ void parseModContents(ModSpec &spec)
 			}
 		}
 
-		if (info.exists("description")) {
+		if (info.exists("description"))
 			spec.desc = info.get("description");
-		} else {
-			std::ifstream is((spec.path + DIR_DELIM + "description.txt")
-							 .c_str());
-			spec.desc = std::string((std::istreambuf_iterator<char>(is)),
-					std::istreambuf_iterator<char>());
-		}
+		else if (fs::ReadFile(spec.path + DIR_DELIM + "description.txt",
+					 spec.desc))
+			log_mod_deprecation(spec, "description.txt is deprecated, please "
+						  "use mod.conf instead.");
 	}
 }
 
diff --git a/src/content/subgames.cpp b/src/content/subgames.cpp
index c6350f2dd..e9dc609b0 100644
--- a/src/content/subgames.cpp
+++ b/src/content/subgames.cpp
@@ -329,18 +329,16 @@ void loadGameConfAndInitWorld(const std::string &path, const std::string &name,
 		}
 	}
 
-	// Override defaults with those provided by the game.
-	// We clear and reload the defaults because the defaults
-	// might have been overridden by other subgame config
-	// files that were loaded before.
-	g_settings->clearDefaults();
-	set_default_settings(g_settings);
-
-	Settings game_defaults;
-	getGameMinetestConfig(gamespec.path, game_defaults);
-	game_defaults.removeSecureSettings();
+	Settings *game_settings = Settings::getLayer(SL_GAME);
+	const bool new_game_settings = (game_settings == nullptr);
+	if (new_game_settings) {
+		// Called by main-menu without a Server instance running
+		// -> create and free manually
+		game_settings = Settings::createLayer(SL_GAME);
+	}
 
-	g_settings->overrideDefaults(&game_defaults);
+	getGameMinetestConfig(gamespec.path, *game_settings);
+	game_settings->removeSecureSettings();
 
 	infostream << "Initializing world at " << final_path << std::endl;
 
@@ -381,4 +379,8 @@ void loadGameConfAndInitWorld(const std::string &path, const std::string &name,
 
 		fs::safeWriteToFile(map_meta_path, oss.str());
 	}
+
+	// The Settings object is no longer needed for created worlds
+	if (new_game_settings)
+		delete game_settings;
 }
diff --git a/src/convert_json.cpp b/src/convert_json.cpp
index c774aa002..686113fa8 100644
--- a/src/convert_json.cpp
+++ b/src/convert_json.cpp
@@ -17,63 +17,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <vector>
 #include <iostream>
 #include <sstream>
+#include <memory>
 
 #include "convert_json.h"
-#include "content/mods.h"
-#include "config.h"
-#include "log.h"
-#include "settings.h"
-#include "httpfetch.h"
-#include "porting.h"
 
-Json::Value fetchJsonValue(const std::string &url,
-		std::vector<std::string> *extra_headers)
+void fastWriteJson(const Json::Value &value, std::ostream &to)
 {
-	HTTPFetchRequest fetch_request;
-	HTTPFetchResult fetch_result;
-	fetch_request.url = url;
-	fetch_request.caller = HTTPFETCH_SYNC;
-
-	if (extra_headers != NULL)
-		fetch_request.extra_headers = *extra_headers;
-
-	httpfetch_sync(fetch_request, fetch_result);
-
-	if (!fetch_result.succeeded) {
-		return Json::Value();
-	}
-	Json::Value root;
-	std::istringstream stream(fetch_result.data);
-
-	Json::CharReaderBuilder builder;
-	builder.settings_["collectComments"] = false;
-	std::string errs;
-
-	if (!Json::parseFromStream(builder, stream, &root, &errs)) {
-		errorstream << "URL: " << url << std::endl;
-		errorstream << "Failed to parse json data " << errs << std::endl;
-		if (fetch_result.data.size() > 100) {
-			errorstream << "Data (" << fetch_result.data.size()
-				<< " bytes) printed to warningstream." << std::endl;
-			warningstream << "data: \"" << fetch_result.data << "\"" << std::endl;
-		} else {
-			errorstream << "data: \"" << fetch_result.data << "\"" << std::endl;
-		}
-		return Json::Value();
-	}
-
-	return root;
+	Json::StreamWriterBuilder builder;
+	builder["indentation"] = "";
+	std::unique_ptr<Json::StreamWriter> writer(builder.newStreamWriter());
+	writer->write(value, &to);
 }
 
 std::string fastWriteJson(const Json::Value &value)
 {
 	std::ostringstream oss;
-	Json::StreamWriterBuilder builder;
-	builder["indentation"] = "";
-	std::unique_ptr<Json::StreamWriter> writer(builder.newStreamWriter());
-	writer->write(value, &oss);
+	fastWriteJson(value, oss);
 	return oss.str();
 }
diff --git a/src/convert_json.h b/src/convert_json.h
index d8825acdc..d1d487e77 100644
--- a/src/convert_json.h
+++ b/src/convert_json.h
@@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 
 #include <json/json.h>
+#include <ostream>
 
-Json::Value fetchJsonValue(const std::string &url,
-		std::vector<std::string> *extra_headers);
+void fastWriteJson(const Json::Value &value, std::ostream &to);
 
 std::string fastWriteJson(const Json::Value &value);
diff --git a/src/database/database-files.cpp b/src/database/database-files.cpp
index d2b0b1543..d9d113b4e 100644
--- a/src/database/database-files.cpp
+++ b/src/database/database-files.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <cassert>
 #include <json/json.h>
+#include "convert_json.h"
 #include "database-files.h"
 #include "remoteplayer.h"
 #include "settings.h"
@@ -36,29 +37,116 @@ PlayerDatabaseFiles::PlayerDatabaseFiles(const std::string &savedir) : m_savedir
 	fs::CreateDir(m_savedir);
 }
 
-void PlayerDatabaseFiles::serialize(std::ostringstream &os, RemotePlayer *player)
+void PlayerDatabaseFiles::deSerialize(RemotePlayer *p, std::istream &is,
+	 const std::string &playername, PlayerSAO *sao)
+{
+	Settings args("PlayerArgsEnd");
+
+	if (!args.parseConfigLines(is)) {
+		throw SerializationError("PlayerArgsEnd of player " + playername + " not found!");
+	}
+
+	p->m_dirty = true;
+	//args.getS32("version"); // Version field value not used
+	const std::string &name = args.get("name");
+	strlcpy(p->m_name, name.c_str(), PLAYERNAME_SIZE);
+
+	if (sao) {
+		try {
+			sao->setHPRaw(args.getU16("hp"));
+		} catch(SettingNotFoundException &e) {
+			sao->setHPRaw(PLAYER_MAX_HP_DEFAULT);
+		}
+
+		try {
+			sao->setBasePosition(args.getV3F("position"));
+		} catch (SettingNotFoundException &e) {}
+
+		try {
+			sao->setLookPitch(args.getFloat("pitch"));
+		} catch (SettingNotFoundException &e) {}
+		try {
+			sao->setPlayerYaw(args.getFloat("yaw"));
+		} catch (SettingNotFoundException &e) {}
+
+		try {
+			sao->setBreath(args.getU16("breath"), false);
+		} catch (SettingNotFoundException &e) {}
+
+		try {
+			const std::string &extended_attributes = args.get("extended_attributes");
+			std::istringstream iss(extended_attributes);
+			Json::CharReaderBuilder builder;
+			builder.settings_["collectComments"] = false;
+			std::string errs;
+
+			Json::Value attr_root;
+			Json::parseFromStream(builder, iss, &attr_root, &errs);
+
+			const Json::Value::Members attr_list = attr_root.getMemberNames();
+			for (const auto &it : attr_list) {
+				Json::Value attr_value = attr_root[it];
+				sao->getMeta().setString(it, attr_value.asString());
+			}
+			sao->getMeta().setModified(false);
+		} catch (SettingNotFoundException &e) {}
+	}
+
+	try {
+		p->inventory.deSerialize(is);
+	} catch (SerializationError &e) {
+		errorstream << "Failed to deserialize player inventory. player_name="
+			<< name << " " << e.what() << std::endl;
+	}
+
+	if (!p->inventory.getList("craftpreview") && p->inventory.getList("craftresult")) {
+		// Convert players without craftpreview
+		p->inventory.addList("craftpreview", 1);
+
+		bool craftresult_is_preview = true;
+		if(args.exists("craftresult_is_preview"))
+			craftresult_is_preview = args.getBool("craftresult_is_preview");
+		if(craftresult_is_preview)
+		{
+			// Clear craftresult
+			p->inventory.getList("craftresult")->changeItem(0, ItemStack());
+		}
+	}
+}
+
+void PlayerDatabaseFiles::serialize(RemotePlayer *p, std::ostream &os)
 {
 	// Utilize a Settings object for storing values
-	Settings args;
+	Settings args("PlayerArgsEnd");
 	args.setS32("version", 1);
-	args.set("name", player->getName());
+	args.set("name", p->m_name);
 
-	sanity_check(player->getPlayerSAO());
-	args.setU16("hp", player->getPlayerSAO()->getHP());
-	args.setV3F("position", player->getPlayerSAO()->getBasePosition());
-	args.setFloat("pitch", player->getPlayerSAO()->getLookPitch());
-	args.setFloat("yaw", player->getPlayerSAO()->getRotation().Y);
-	args.setU16("breath", player->getPlayerSAO()->getBreath());
+	PlayerSAO *sao = p->getPlayerSAO();
+	// This should not happen
+	sanity_check(sao);
+	args.setU16("hp", sao->getHP());
+	args.setV3F("position", sao->getBasePosition());
+	args.setFloat("pitch", sao->getLookPitch());
+	args.setFloat("yaw", sao->getRotation().Y);
+	args.setU16("breath", sao->getBreath());
 
 	std::string extended_attrs;
-	player->serializeExtraAttributes(extended_attrs);
+	{
+		// serializeExtraAttributes
+		Json::Value json_root;
+
+		const StringMap &attrs = sao->getMeta().getStrings();
+		for (const auto &attr : attrs) {
+			json_root[attr.first] = attr.second;
+		}
+
+		extended_attrs = fastWriteJson(json_root);
+	}
 	args.set("extended_attributes", extended_attrs);
 
 	args.writeLines(os);
 
-	os << "PlayerArgsEnd\n";
-
-	player->inventory.serialize(os);
+	p->inventory.serialize(os);
 }
 
 void PlayerDatabaseFiles::savePlayer(RemotePlayer *player)
@@ -83,7 +171,7 @@ void PlayerDatabaseFiles::savePlayer(RemotePlayer *player)
 			return;
 		}
 
-		testplayer.deSerialize(is, path, NULL);
+		deSerialize(&testplayer, is, path, NULL);
 		is.close();
 		if (strcmp(testplayer.getName(), player->getName()) == 0) {
 			path_found = true;
@@ -101,7 +189,7 @@ void PlayerDatabaseFiles::savePlayer(RemotePlayer *player)
 
 	// Open and serialize file
 	std::ostringstream ss(std::ios_base::binary);
-	serialize(ss, player);
+	serialize(player, ss);
 	if (!fs::safeWriteToFile(path, ss.str())) {
 		infostream << "Failed to write " << path << std::endl;
 	}
@@ -121,7 +209,7 @@ bool PlayerDatabaseFiles::removePlayer(const std::string &name)
 		if (!is.good())
 			continue;
 
-		temp_player.deSerialize(is, path, NULL);
+		deSerialize(&temp_player, is, path, NULL);
 		is.close();
 
 		if (temp_player.getName() == name) {
@@ -147,7 +235,7 @@ bool PlayerDatabaseFiles::loadPlayer(RemotePlayer *player, PlayerSAO *sao)
 		if (!is.good())
 			continue;
 
-		player->deSerialize(is, path, sao);
+		deSerialize(player, is, path, sao);
 		is.close();
 
 		if (player->getName() == player_to_load)
@@ -180,7 +268,7 @@ void PlayerDatabaseFiles::listPlayers(std::vector<std::string> &res)
 		// Null env & dummy peer_id
 		PlayerSAO playerSAO(NULL, &player, 15789, false);
 
-		player.deSerialize(is, "", &playerSAO);
+		deSerialize(&player, is, "", &playerSAO);
 		is.close();
 
 		res.emplace_back(player.getName());
diff --git a/src/database/database-files.h b/src/database/database-files.h
index cb830a3ed..e647a2e24 100644
--- a/src/database/database-files.h
+++ b/src/database/database-files.h
@@ -38,7 +38,14 @@ public:
 	void listPlayers(std::vector<std::string> &res);
 
 private:
-	void serialize(std::ostringstream &os, RemotePlayer *player);
+	void deSerialize(RemotePlayer *p, std::istream &is, const std::string &playername,
+			PlayerSAO *sao);
+	/*
+		serialize() writes a bunch of text that can contain
+		any characters except a '\0', and such an ending that
+		deSerialize stops reading exactly at the right point.
+	*/
+	void serialize(RemotePlayer *p, std::ostream &os);
 
 	std::string m_savedir;
 };
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 23e06ab05..e16f15512 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -27,8 +27,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen/mapgen.h" // Mapgen::setDefaultSettings
 #include "util/string.h"
 
-void set_default_settings(Settings *settings)
+void set_default_settings()
 {
+	Settings *settings = Settings::createLayer(SL_DEFAULTS);
+
 	// Client and server
 	settings->setDefault("language", "");
 	settings->setDefault("name", "");
@@ -54,7 +56,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("client_unload_unused_data_timeout", "600");
 	settings->setDefault("client_mapblock_limit", "7500");
 	settings->setDefault("enable_build_where_you_stand", "true");
-	settings->setDefault("curl_timeout", "5000");
+	settings->setDefault("curl_timeout", "20000");
 	settings->setDefault("curl_parallel_limit", "8");
 	settings->setDefault("curl_file_download_timeout", "300000");
 	settings->setDefault("curl_verify_cert", "true");
@@ -75,7 +77,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("cheat_menu_selected_font_color", "(255, 255, 255)");
 	settings->setDefault("cheat_menu_selected_font_color_alpha", "235");
 	settings->setDefault("cheat_menu_head_height", "50");
-	settings->setDefault("cheat_menu_entry_height", "40");
+	settings->setDefault("cheat_menu_entry_height", "35");
 	settings->setDefault("cheat_menu_entry_width", "200");
 
 	// Cheats
@@ -137,7 +139,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("keymap_zoom", "KEY_KEY_Z");
 	settings->setDefault("keymap_inventory", "KEY_KEY_I");
 	settings->setDefault("keymap_enderchest", "KEY_KEY_O");
-	settings->setDefault("keymap_special1", "KEY_KEY_E");
+	settings->setDefault("keymap_aux1", "KEY_KEY_E");
 	settings->setDefault("keymap_chat", "KEY_KEY_T");
 	settings->setDefault("keymap_cmd", "/");
 	settings->setDefault("keymap_cmd_local", ".");
@@ -154,6 +156,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("keymap_increase_volume", "");
 	settings->setDefault("keymap_decrease_volume", "");
 	settings->setDefault("keymap_cinematic", "");
+	settings->setDefault("keymap_toggle_block_bounds", "");
 	settings->setDefault("keymap_toggle_hud", "KEY_F1");
 	settings->setDefault("keymap_toggle_chat", "KEY_F2");
 	settings->setDefault("keymap_toggle_fog", "KEY_F3");
@@ -306,6 +309,7 @@ void set_default_settings(Settings *settings)
 #endif
 	settings->setDefault("enable_particles", "true");
 	settings->setDefault("arm_inertia", "true");
+	settings->setDefault("show_nametag_backgrounds", "true");
 
 	settings->setDefault("enable_minimap", "true");
 	settings->setDefault("minimap_shape_round", "false");
@@ -351,7 +355,7 @@ void set_default_settings(Settings *settings)
 
 	// Main menu
 	settings->setDefault("main_menu_path", "");
-	settings->setDefault("serverlist_file", "favoriteservers.txt");
+	settings->setDefault("serverlist_file", "favoriteservers.json");
 
 #if USE_FREETYPE
 	settings->setDefault("freetype", "true");
@@ -369,12 +373,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("mono_font_path_bold_italic", porting::getDataPath("fonts" DIR_DELIM "Cousine-BoldItalic.ttf"));
 	settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf"));
 
-	settings->setDefault("fallback_font_shadow", "1");
-	settings->setDefault("fallback_font_shadow_alpha", "128");
-
 	std::string font_size_str = std::to_string(TTF_DEFAULT_FONT_SIZE);
-
-	settings->setDefault("fallback_font_size", font_size_str);
 #else
 	settings->setDefault("freetype", "false");
 	settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans"));
@@ -415,7 +414,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("max_simultaneous_block_sends_per_client", "40");
 	settings->setDefault("time_send_interval", "5");
 
-	settings->setDefault("default_game", "mineclone2");
+	settings->setDefault("default_game", "MineClone2");
 	settings->setDefault("motd", "");
 	settings->setDefault("max_users", "15");
 	settings->setDefault("creative_mode", "false");
@@ -527,10 +526,9 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("screen_h", "0");
 	settings->setDefault("fullscreen", "true");
 	settings->setDefault("touchtarget", "true");
-	settings->setDefault("TMPFolder", porting::path_cache);
 	settings->setDefault("touchscreen_threshold","20");
 	settings->setDefault("fixed_virtual_joystick", "false");
-	settings->setDefault("virtual_joystick_triggers_aux", "false");
+	settings->setDefault("virtual_joystick_triggers_aux1", "false");
 	settings->setDefault("smooth_lighting", "false");
 	settings->setDefault("max_simultaneous_block_sends_per_client", "10");
 	settings->setDefault("emergequeue_limit_diskonly", "16");
diff --git a/src/defaultsettings.h b/src/defaultsettings.h
index c81e88502..c239b3c12 100644
--- a/src/defaultsettings.h
+++ b/src/defaultsettings.h
@@ -25,11 +25,4 @@ class Settings;
  * initialize basic default settings
  * @param settings pointer to settings
  */
-void set_default_settings(Settings *settings);
-
-/**
- * override a default settings by settings from another settings element
- * @param settings target settings pointer
- * @param from source settings pointer
- */
-void override_default_settings(Settings *settings, Settings *from);
+void set_default_settings();
diff --git a/src/emerge.cpp b/src/emerge.cpp
index 12e407797..32e7d9f24 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -113,13 +113,15 @@ EmergeParams::~EmergeParams()
 {
 	infostream << "EmergeParams: destroying " << this << std::endl;
 	// Delete everything that was cloned on creation of EmergeParams
+	delete biomegen;
 	delete biomemgr;
 	delete oremgr;
 	delete decomgr;
 	delete schemmgr;
 }
 
-EmergeParams::EmergeParams(EmergeManager *parent, const BiomeManager *biomemgr,
+EmergeParams::EmergeParams(EmergeManager *parent, const BiomeGen *biomegen,
+	const BiomeManager *biomemgr,
 	const OreManager *oremgr, const DecorationManager *decomgr,
 	const SchematicManager *schemmgr) :
 	ndef(parent->ndef),
@@ -129,6 +131,7 @@ EmergeParams::EmergeParams(EmergeManager *parent, const BiomeManager *biomemgr,
 	biomemgr(biomemgr->clone()), oremgr(oremgr->clone()),
 	decomgr(decomgr->clone()), schemmgr(schemmgr->clone())
 {
+	this->biomegen = biomegen->clone(this->biomemgr);
 }
 
 ////
@@ -143,6 +146,10 @@ EmergeManager::EmergeManager(Server *server)
 	this->decomgr   = new DecorationManager(server);
 	this->schemmgr  = new SchematicManager(server);
 
+	// initialized later
+	this->mgparams = nullptr;
+	this->biomegen = nullptr;
+
 	// Note that accesses to this variable are not synchronized.
 	// This is because the *only* thread ever starting or stopping
 	// EmergeThreads should be the ServerThread.
@@ -240,9 +247,12 @@ void EmergeManager::initMapgens(MapgenParams *params)
 
 	mgparams = params;
 
+	v3s16 csize = v3s16(1, 1, 1) * (params->chunksize * MAP_BLOCKSIZE);
+	biomegen = biomemgr->createBiomeGen(BIOMEGEN_ORIGINAL, params->bparams, csize);
+
 	for (u32 i = 0; i != m_threads.size(); i++) {
-		EmergeParams *p = new EmergeParams(
-			this, biomemgr, oremgr, decomgr, schemmgr);
+		EmergeParams *p = new EmergeParams(this, biomegen,
+			biomemgr, oremgr, decomgr, schemmgr);
 		infostream << "EmergeManager: Created params " << p
 			<< " for thread " << i << std::endl;
 		m_mapgens.push_back(Mapgen::createMapgen(params->mgtype, params, p));
@@ -396,14 +406,7 @@ int EmergeManager::getGroundLevelAtPoint(v2s16 p)
 // TODO(hmmmm): Move this to ServerMap
 bool EmergeManager::isBlockUnderground(v3s16 blockpos)
 {
-#if 0
-	v2s16 p = v2s16((blockpos.X * MAP_BLOCKSIZE) + MAP_BLOCKSIZE / 2,
-					(blockpos.Y * MAP_BLOCKSIZE) + MAP_BLOCKSIZE / 2);
-	int ground_level = getGroundLevelAtPoint(p);
-	return blockpos.Y * (MAP_BLOCKSIZE + 1) <= min(water_level, ground_level);
-#endif
-
-	// Use a simple heuristic; the above method is wildly inaccurate anyway.
+	// Use a simple heuristic
 	return blockpos.Y * (MAP_BLOCKSIZE + 1) <= mgparams->water_level;
 }
 
diff --git a/src/emerge.h b/src/emerge.h
index da845e243..aac3e7dd3 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -99,13 +99,15 @@ public:
 	u32 gen_notify_on;
 	const std::set<u32> *gen_notify_on_deco_ids; // shared
 
+	BiomeGen *biomegen;
 	BiomeManager *biomemgr;
 	OreManager *oremgr;
 	DecorationManager *decomgr;
 	SchematicManager *schemmgr;
 
 private:
-	EmergeParams(EmergeManager *parent, const BiomeManager *biomemgr,
+	EmergeParams(EmergeManager *parent, const BiomeGen *biomegen,
+		const BiomeManager *biomemgr,
 		const OreManager *oremgr, const DecorationManager *decomgr,
 		const SchematicManager *schemmgr);
 };
@@ -140,6 +142,8 @@ public:
 	~EmergeManager();
 	DISABLE_CLASS_COPY(EmergeManager);
 
+	const BiomeGen *getBiomeGen() const { return biomegen; }
+
 	// no usage restrictions
 	const BiomeManager *getBiomeManager() const { return biomemgr; }
 	const OreManager *getOreManager() const { return oremgr; }
@@ -196,6 +200,7 @@ private:
 
 	// Managers of various map generation-related components
 	// Note that each Mapgen gets a copy(!) of these to work with
+	BiomeGen *biomegen;
 	BiomeManager *biomemgr;
 	OreManager *oremgr;
 	DecorationManager *decomgr;
diff --git a/src/exceptions.h b/src/exceptions.h
index c54307653..a558adc5d 100644
--- a/src/exceptions.h
+++ b/src/exceptions.h
@@ -72,11 +72,6 @@ public:
 	SettingNotFoundException(const std::string &s): BaseException(s) {}
 };
 
-class InvalidFilenameException : public BaseException {
-public:
-	InvalidFilenameException(const std::string &s): BaseException(s) {}
-};
-
 class ItemNotFoundException : public BaseException {
 public:
 	ItemNotFoundException(const std::string &s): BaseException(s) {}
diff --git a/src/filesys.cpp b/src/filesys.cpp
index 28a33f4d0..99b030624 100644
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
@@ -27,9 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "config.h"
 #include "porting.h"
-#ifdef __ANDROID__
-#include "settings.h" // For g_settings
-#endif
 
 namespace fs
 {
@@ -359,8 +356,9 @@ std::string TempPath()
 		compatible with lua's os.tmpname which under the default
 		configuration hardcodes mkstemp("/tmp/lua_XXXXXX").
 	*/
+
 #ifdef __ANDROID__
-	return g_settings->get("TMPFolder");
+	return porting::path_cache;
 #else
 	return DIR_DELIM "tmp";
 #endif
@@ -401,21 +399,6 @@ void GetRecursiveSubPaths(const std::string &path,
 	}
 }
 
-bool DeletePaths(const std::vector<std::string> &paths)
-{
-	bool success = true;
-	// Go backwards to succesfully delete the output of GetRecursiveSubPaths
-	for(int i=paths.size()-1; i>=0; i--){
-		const std::string &path = paths[i];
-		bool did = DeleteSingleFileOrEmptyDirectory(path);
-		if(!did){
-			errorstream<<"Failed to delete "<<path<<std::endl;
-			success = false;
-		}
-	}
-	return success;
-}
-
 bool RecursiveDeleteContent(const std::string &path)
 {
 	infostream<<"Removing content of \""<<path<<"\""<<std::endl;
@@ -744,6 +727,70 @@ bool safeWriteToFile(const std::string &path, const std::string &content)
 	return true;
 }
 
+bool extractZipFile(io::IFileSystem *fs, const char *filename, const std::string &destination)
+{
+	if (!fs->addFileArchive(filename, false, false, io::EFAT_ZIP)) {
+		return false;
+	}
+
+	sanity_check(fs->getFileArchiveCount() > 0);
+
+	/**********************************************************************/
+	/* WARNING this is not threadsafe!!                                   */
+	/**********************************************************************/
+	io::IFileArchive* opened_zip = fs->getFileArchive(fs->getFileArchiveCount() - 1);
+
+	const io::IFileList* files_in_zip = opened_zip->getFileList();
+
+	unsigned int number_of_files = files_in_zip->getFileCount();
+
+	for (unsigned int i=0; i < number_of_files; i++) {
+		std::string fullpath = destination;
+		fullpath += DIR_DELIM;
+		fullpath += files_in_zip->getFullFileName(i).c_str();
+		std::string fullpath_dir = fs::RemoveLastPathComponent(fullpath);
+
+		if (!files_in_zip->isDirectory(i)) {
+			if (!fs::PathExists(fullpath_dir) && !fs::CreateAllDirs(fullpath_dir)) {
+				fs->removeFileArchive(fs->getFileArchiveCount()-1);
+				return false;
+			}
+
+			io::IReadFile* toread = opened_zip->createAndOpenFile(i);
+
+			FILE *targetfile = fopen(fullpath.c_str(),"wb");
+
+			if (targetfile == NULL) {
+				fs->removeFileArchive(fs->getFileArchiveCount()-1);
+				return false;
+			}
+
+			char read_buffer[1024];
+			long total_read = 0;
+
+			while (total_read < toread->getSize()) {
+
+				unsigned int bytes_read =
+						toread->read(read_buffer,sizeof(read_buffer));
+				if ((bytes_read == 0 ) ||
+					(fwrite(read_buffer, 1, bytes_read, targetfile) != bytes_read))
+				{
+					fclose(targetfile);
+					fs->removeFileArchive(fs->getFileArchiveCount() - 1);
+					return false;
+				}
+				total_read += bytes_read;
+			}
+
+			fclose(targetfile);
+		}
+
+	}
+
+	fs->removeFileArchive(fs->getFileArchiveCount() - 1);
+	return true;
+}
+
 bool ReadFile(const std::string &path, std::string &out)
 {
 	std::ifstream is(path, std::ios::binary | std::ios::ate);
diff --git a/src/filesys.h b/src/filesys.h
index b2c800c55..a9584b036 100644
--- a/src/filesys.h
+++ b/src/filesys.h
@@ -36,6 +36,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define PATH_DELIM ":"
 #endif
 
+namespace irr { namespace io {
+class IFileSystem;
+}}
+
 namespace fs
 {
 
@@ -85,9 +89,6 @@ void GetRecursiveSubPaths(const std::string &path,
 		  bool list_files,
 		  const std::set<char> &ignore = {});
 
-// Tries to delete all, returns false if any failed
-bool DeletePaths(const std::vector<std::string> &paths);
-
 // Only pass full paths to this one. True on success.
 bool RecursiveDeleteContent(const std::string &path);
 
@@ -128,6 +129,8 @@ const char *GetFilenameFromPath(const char *path);
 
 bool safeWriteToFile(const std::string &path, const std::string &content);
 
+bool extractZipFile(irr::io::IFileSystem *fs, const char *filename, const std::string &destination);
+
 bool ReadFile(const std::string &path, std::string &out);
 
 bool Rename(const std::string &from, const std::string &to);
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index f93b85aff..ea6e44ab7 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -24,7 +24,6 @@ set(gui_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/guiTable.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/guiHyperText.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/guiVolumeChange.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/intlGUIEditBox.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/modalMenu.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/profilergraph.cpp
 	PARENT_SCOPE
diff --git a/src/gui/StyleSpec.h b/src/gui/StyleSpec.h
index f2844ce28..fc92a861b 100644
--- a/src/gui/StyleSpec.h
+++ b/src/gui/StyleSpec.h
@@ -55,6 +55,8 @@ public:
 		BORDERCOLORS,
 		BORDERWIDTHS,
 		SOUND,
+		SPACING,
+		SIZE,
 		NUM_PROPERTIES,
 		NONE
 	};
@@ -119,6 +121,10 @@ public:
 			return BORDERWIDTHS;
 		} else if (name == "sound") {
 			return SOUND;
+		} else if (name == "spacing") {
+			return SPACING;
+		} else if (name == "size") {
+			return SIZE;
 		} else {
 			return NONE;
 		}
@@ -259,27 +265,40 @@ public:
 		return rect;
 	}
 
-	irr::core::vector2d<s32> getVector2i(Property prop, irr::core::vector2d<s32> def) const
+	v2f32 getVector2f(Property prop, v2f32 def) const
 	{
 		const auto &val = properties[prop];
 		if (val.empty())
 			return def;
 
-		irr::core::vector2d<s32> vec;
-		if (!parseVector2i(val, &vec))
+		v2f32 vec;
+		if (!parseVector2f(val, &vec))
 			return def;
 
 		return vec;
 	}
 
-	irr::core::vector2d<s32> getVector2i(Property prop) const
+	v2s32 getVector2i(Property prop, v2s32 def) const
+	{
+		const auto &val = properties[prop];
+		if (val.empty())
+			return def;
+
+		v2f32 vec;
+		if (!parseVector2f(val, &vec))
+			return def;
+
+		return v2s32(vec.X, vec.Y);
+	}
+
+	v2s32 getVector2i(Property prop) const
 	{
 		const auto &val = properties[prop];
 		FATAL_ERROR_IF(val.empty(), "Unexpected missing property");
 
-		irr::core::vector2d<s32> vec;
-		parseVector2i(val, &vec);
-		return vec;
+		v2f32 vec;
+		parseVector2f(val, &vec);
+		return v2s32(vec.X, vec.Y);
 	}
 
 	gui::IGUIFont *getFont() const
@@ -432,22 +451,20 @@ private:
 		return true;
 	}
 
-	bool parseVector2i(const std::string &value, irr::core::vector2d<s32> *parsed_vec) const
+	bool parseVector2f(const std::string &value, v2f32 *parsed_vec) const
 	{
-		irr::core::vector2d<s32> vec;
+		v2f32 vec;
 		std::vector<std::string> v_vector = split(value, ',');
 
 		if (v_vector.size() == 1) {
-			s32 x = stoi(v_vector[0]);
+			f32 x = stof(v_vector[0]);
 			vec.X = x;
 			vec.Y = x;
 		} else if (v_vector.size() == 2) {
-			s32 x = stoi(v_vector[0]);
-			s32 y =	stoi(v_vector[1]);
-			vec.X = x;
-			vec.Y = y;
+			vec.X = stof(v_vector[0]);
+			vec.Y =	stof(v_vector[1]);
 		} else {
-			warningstream << "Invalid vector2d string format: \"" << value
+			warningstream << "Invalid 2d vector string format: \"" << value
 					<< "\"" << std::endl;
 			return false;
 		}
diff --git a/src/gui/cheatMenu.cpp b/src/gui/cheatMenu.cpp
index 7687f10d9..31acfb780 100644
--- a/src/gui/cheatMenu.cpp
+++ b/src/gui/cheatMenu.cpp
@@ -30,7 +30,7 @@ FontMode CheatMenu::fontStringToEnum(std::string str)
 	else if (str == "FM_Mono")
 		return FM_Mono;
 	else if (str == "FM_Fallback")
-		return FM_Fallback;
+		return _FM_Fallback;
 	else if (str == "FM_Simple")
 		return FM_Simple;
 	else if (str == "FM_SimpleMono")
diff --git a/src/gui/guiButton.cpp b/src/gui/guiButton.cpp
index b98e5de82..d6dbddf54 100644
--- a/src/gui/guiButton.cpp
+++ b/src/gui/guiButton.cpp
@@ -506,6 +506,13 @@ video::SColor GUIButton::getOverrideColor() const
 	return OverrideColor;

 }

 

+#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8

+video::SColor GUIButton::getActiveColor() const

+{

+	return video::SColor(0,0,0,0); // unused?

+}

+#endif

+

 void GUIButton::enableOverrideColor(bool enable)

 {

 	OverrideColorEnabled = enable;

diff --git a/src/gui/guiButton.h b/src/gui/guiButton.h
index 4e1b04aac..834405f51 100644
--- a/src/gui/guiButton.h
+++ b/src/gui/guiButton.h
@@ -69,6 +69,12 @@ using namespace irr;
 

 class ISimpleTextureSource;

 

+#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR <= 8)

+#define OVERRIDE_19

+#else

+#define OVERRIDE_19 override

+#endif

+

 class GUIButton : public gui::IGUIButton

 {

 public:

@@ -97,22 +103,27 @@ public:
 	virtual gui::IGUIFont* getActiveFont() const override;

 

 	//! Sets another color for the button text.

-	virtual void setOverrideColor(video::SColor color);

+	virtual void setOverrideColor(video::SColor color) OVERRIDE_19;

 

 	//! Gets the override color

-	virtual video::SColor getOverrideColor(void) const;

+	virtual video::SColor getOverrideColor(void) const OVERRIDE_19;

+

+	#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8

+	//! Gets the currently used text color

+	virtual video::SColor getActiveColor() const override;

+	#endif

 

 	//! Sets if the button text should use the override color or the color in the gui skin.

-	virtual void enableOverrideColor(bool enable);

+	virtual void enableOverrideColor(bool enable) OVERRIDE_19;

 

 	//! Checks if an override color is enabled

-	virtual bool isOverrideColorEnabled(void) const;

+	virtual bool isOverrideColorEnabled(void) const OVERRIDE_19;

 

 	// PATCH

 	//! Sets an image which should be displayed on the button when it is in the given state.

 	virtual void setImage(gui::EGUI_BUTTON_IMAGE_STATE state,

 			video::ITexture* image=nullptr,

-			const core::rect<s32>& sourceRect=core::rect<s32>(0,0,0,0));

+			const core::rect<s32>& sourceRect=core::rect<s32>(0,0,0,0)) OVERRIDE_19;

 

 	//! Sets an image which should be displayed on the button when it is in normal state.

 	virtual void setImage(video::ITexture* image=nullptr) override;

@@ -141,7 +152,7 @@ public:
 	*/

 	virtual void setSprite(gui::EGUI_BUTTON_STATE state, s32 index,

 						   video::SColor color=video::SColor(255,255,255,255),

-						   bool loop=false, bool scale=false);

+						   bool loop=false, bool scale=false) OVERRIDE_19;

 

 #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR <= 8)

 	void setSprite(gui::EGUI_BUTTON_STATE state, s32 index, video::SColor color, bool loop) override {

@@ -150,16 +161,16 @@ public:
 #endif

 

 	//! Get the sprite-index for the given state or -1 when no sprite is set

-	virtual s32 getSpriteIndex(gui::EGUI_BUTTON_STATE state) const;

+	virtual s32 getSpriteIndex(gui::EGUI_BUTTON_STATE state) const OVERRIDE_19;

 

 	//! Get the sprite color for the given state. Color is only used when a sprite is set.

-	virtual video::SColor getSpriteColor(gui::EGUI_BUTTON_STATE state) const;

+	virtual video::SColor getSpriteColor(gui::EGUI_BUTTON_STATE state) const OVERRIDE_19;

 

 	//! Returns if the sprite in the given state does loop

-	virtual bool getSpriteLoop(gui::EGUI_BUTTON_STATE state) const;

+	virtual bool getSpriteLoop(gui::EGUI_BUTTON_STATE state) const OVERRIDE_19;

 

 	//! Returns if the sprite in the given state is scaled

-	virtual bool getSpriteScale(gui::EGUI_BUTTON_STATE state) const;

+	virtual bool getSpriteScale(gui::EGUI_BUTTON_STATE state) const OVERRIDE_19;

 

 	//! Sets if the button should behave like a push button. Which means it

 	//! can be in two states: Normal or Pressed. With a click on the button,

@@ -199,13 +210,13 @@ public:
 	virtual bool isScalingImage() const override;

 

 	//! Get if the shift key was pressed in last EGET_BUTTON_CLICKED event

-	virtual bool getClickShiftState() const

+	virtual bool getClickShiftState() const OVERRIDE_19

 	{

 		return ClickShiftState;

 	}

 

 	//! Get if the control key was pressed in last EGET_BUTTON_CLICKED event

-	virtual bool getClickControlState() const

+	virtual bool getClickControlState() const OVERRIDE_19

 	{

 		return ClickControlState;

 	}

diff --git a/src/gui/guiButtonItemImage.cpp b/src/gui/guiButtonItemImage.cpp
index d8b9042ac..d9ab4b935 100644
--- a/src/gui/guiButtonItemImage.cpp
+++ b/src/gui/guiButtonItemImage.cpp
@@ -30,7 +30,7 @@ using namespace gui;
 
 GUIButtonItemImage::GUIButtonItemImage(gui::IGUIEnvironment *environment,
 		gui::IGUIElement *parent, s32 id, core::rect<s32> rectangle,
-		ISimpleTextureSource *tsrc, std::string item, Client *client,
+		ISimpleTextureSource *tsrc, const std::string &item, Client *client,
 		bool noclip)
 		: GUIButton (environment, parent, id, rectangle, tsrc, noclip)
 {
@@ -39,13 +39,12 @@ GUIButtonItemImage::GUIButtonItemImage(gui::IGUIEnvironment *environment,
 			item, getActiveFont(), client);
 	sendToBack(m_image);
 
-	m_item_name = item;
 	m_client = client;
 }
 
 GUIButtonItemImage *GUIButtonItemImage::addButton(IGUIEnvironment *environment,
 		const core::rect<s32> &rectangle, ISimpleTextureSource *tsrc,
-		IGUIElement *parent, s32 id, const wchar_t *text, std::string item,
+		IGUIElement *parent, s32 id, const wchar_t *text, const std::string &item,
 		Client *client)
 {
 	GUIButtonItemImage *button = new GUIButtonItemImage(environment,
diff --git a/src/gui/guiButtonItemImage.h b/src/gui/guiButtonItemImage.h
index aad923bda..205e957a7 100644
--- a/src/gui/guiButtonItemImage.h
+++ b/src/gui/guiButtonItemImage.h
@@ -33,16 +33,15 @@ public:
 	//! constructor
 	GUIButtonItemImage(gui::IGUIEnvironment *environment, gui::IGUIElement *parent,
 			s32 id, core::rect<s32> rectangle, ISimpleTextureSource *tsrc,
-			std::string item, Client *client, bool noclip = false);
+			const std::string &item, Client *client, bool noclip = false);
 
 	//! Do not drop returned handle
 	static GUIButtonItemImage *addButton(gui::IGUIEnvironment *environment,
 			const core::rect<s32> &rectangle, ISimpleTextureSource *tsrc,
-			IGUIElement *parent, s32 id, const wchar_t *text, std::string item,
-			Client *client);
+			IGUIElement *parent, s32 id, const wchar_t *text,
+			const std::string &item, Client *client);
 
 private:
-	std::string m_item_name;
 	Client *m_client;
 	GUIItemImage *m_image;
 };
diff --git a/src/gui/guiChatConsole.cpp b/src/gui/guiChatConsole.cpp
index ef471106d..baaaea5e8 100644
--- a/src/gui/guiChatConsole.cpp
+++ b/src/gui/guiChatConsole.cpp
@@ -17,6 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "IrrCompileConfig.h"
 #include "guiChatConsole.h"
 #include "chat.h"
 #include "client/client.h"
@@ -326,7 +327,6 @@ void GUIChatConsole::drawText()
 				tmp->draw(
 					fragment.text,
 					destrect,
-					video::SColor(255, 255, 255, 255),
 					false,
 					false,
 					&AbsoluteClippingRect);
@@ -607,13 +607,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event)
 			prompt.nickCompletion(names, backwards);
 			return true;
 		} else if (!iswcntrl(event.KeyInput.Char) && !event.KeyInput.Control) {
-			#if defined(__linux__) && (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9)
-				wchar_t wc = L'_';
-				mbtowc( &wc, (char *) &event.KeyInput.Char, sizeof(event.KeyInput.Char) );
-				prompt.input(wc);
-			#else
-				prompt.input(event.KeyInput.Char);
-			#endif
+			prompt.input(event.KeyInput.Char);
 			return true;
 		}
 	}
@@ -625,6 +619,13 @@ bool GUIChatConsole::OnEvent(const SEvent& event)
 			m_chat_backend->scroll(rows);
 		}
 	}
+#if (IRRLICHT_VERSION_MT_REVISION >= 2)
+	else if(event.EventType == EET_STRING_INPUT_EVENT)
+	{
+		prompt.input(std::wstring(event.StringInput.Str->c_str()));
+		return true;
+	}
+#endif
 
 	return Parent ? Parent->OnEvent(event) : false;
 }
diff --git a/src/gui/guiChatConsole.h b/src/gui/guiChatConsole.h
index 204f9f9cc..1152f2b2d 100644
--- a/src/gui/guiChatConsole.h
+++ b/src/gui/guiChatConsole.h
@@ -68,12 +68,12 @@ public:
 	// Irrlicht draw method
 	virtual void draw();
 
-	bool canTakeFocus(gui::IGUIElement* element) { return false; }
-
 	virtual bool OnEvent(const SEvent& event);
 
 	virtual void setVisible(bool visible);
 
+	virtual bool acceptsIME() { return true; }
+
 private:
 	void reformatConsole();
 	void recalculateConsolePosition();
diff --git a/src/gui/guiConfirmRegistration.cpp b/src/gui/guiConfirmRegistration.cpp
index 020a2796a..4ca9a64ed 100644
--- a/src/gui/guiConfirmRegistration.cpp
+++ b/src/gui/guiConfirmRegistration.cpp
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IGUIButton.h>
 #include <IGUIStaticText.h>
 #include <IGUIFont.h>
-#include "intlGUIEditBox.h"
+#include "guiEditBoxWithScrollbar.h"
 #include "porting.h"
 
 #include "gettext.h"
@@ -109,10 +109,9 @@ void GUIConfirmRegistration::regenerateGui(v2u32 screensize)
 		porting::mt_snprintf(info_text_buf, sizeof(info_text_buf),
 				info_text_template.c_str(), m_playername.c_str());
 
-		wchar_t *info_text_buf_wide = utf8_to_wide_c(info_text_buf);
-		gui::IGUIEditBox *e = new gui::intlGUIEditBox(info_text_buf_wide, true,
-				Environment, this, ID_intotext, rect2, false, true);
-		delete[] info_text_buf_wide;
+		std::wstring info_text_w = utf8_to_wide(info_text_buf);
+		gui::IGUIEditBox *e = new GUIEditBoxWithScrollBar(info_text_w.c_str(),
+				true, Environment, this, ID_intotext, rect2, false, true);
 		e->drop();
 		e->setMultiLine(true);
 		e->setWordWrap(true);
@@ -192,8 +191,7 @@ void GUIConfirmRegistration::acceptInput()
 
 bool GUIConfirmRegistration::processInput()
 {
-	std::wstring m_password_ws = narrow_to_wide(m_password);
-	if (m_password_ws != m_pass_confirm) {
+	if (utf8_to_wide(m_password) != m_pass_confirm) {
 		gui::IGUIElement *e = getElementFromId(ID_message);
 		if (e)
 			e->setVisible(true);
diff --git a/src/gui/guiEditBox.cpp b/src/gui/guiEditBox.cpp
index 11d080be9..ba548aa2d 100644
--- a/src/gui/guiEditBox.cpp
+++ b/src/gui/guiEditBox.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "guiEditBox.h"
 
+#include "IrrCompileConfig.h"
 #include "IGUISkin.h"
 #include "IGUIEnvironment.h"
 #include "IGUIFont.h"
@@ -208,35 +209,19 @@ bool GUIEditBox::OnEvent(const SEvent &event)
 				}
 			}
 			break;
-		case EET_KEY_INPUT_EVENT: {
-#if (defined(__linux__) || defined(__FreeBSD__)) || defined(__DragonFly__)
-			// ################################################################
-			// ValkaTR:
-			// This part is the difference from the original intlGUIEditBox
-			// It converts UTF-8 character into a UCS-2 (wchar_t)
-			wchar_t wc = L'_';
-			mbtowc(&wc, (char *)&event.KeyInput.Char,
-					sizeof(event.KeyInput.Char));
-
-			// printf( "char: %lc (%u)  \r\n", wc, wc );
-
-			SEvent irrevent(event);
-			irrevent.KeyInput.Char = wc;
-			// ################################################################
-
-			if (processKey(irrevent))
-				return true;
-#else
+		case EET_KEY_INPUT_EVENT:
 			if (processKey(event))
 				return true;
-#endif // defined(linux)
-
 			break;
-		}
 		case EET_MOUSE_INPUT_EVENT:
 			if (processMouse(event))
 				return true;
 			break;
+#if (IRRLICHT_VERSION_MT_REVISION >= 2)
+		case EET_STRING_INPUT_EVENT:
+			inputString(*event.StringInput.Str);
+			return true;
+#endif
 		default:
 			break;
 		}
@@ -689,6 +674,51 @@ bool GUIEditBox::onKeyDelete(const SEvent &event, s32 &mark_begin, s32 &mark_end
 	return true;
 }
 
+void GUIEditBox::inputChar(wchar_t c)
+{
+	if (c == 0)
+		return;
+	core::stringw s(&c, 1);
+	inputString(s);
+}
+
+void GUIEditBox::inputString(const core::stringw &str)
+{
+	if (!isEnabled() || !m_writable)
+		return;
+
+	u32 len = str.size();
+	if (Text.size()+len <= m_max || m_max == 0) {
+		core::stringw s;
+		if (m_mark_begin != m_mark_end) {
+			// replace marked text
+			s32 real_begin = m_mark_begin < m_mark_end ? m_mark_begin : m_mark_end;
+			s32 real_end = m_mark_begin < m_mark_end ? m_mark_end : m_mark_begin;
+
+			s = Text.subString(0, real_begin);
+			s.append(str);
+			s.append(Text.subString(real_end, Text.size() - real_end));
+			Text = s;
+			m_cursor_pos = real_begin + len;
+		} else {
+			// append string
+			s = Text.subString(0, m_cursor_pos);
+			s.append(str);
+			s.append(Text.subString(m_cursor_pos,
+					Text.size() - m_cursor_pos));
+			Text = s;
+			m_cursor_pos += len;
+		}
+
+		m_blink_start_time = porting::getTimeMs();
+		setTextMarkers(0, 0);
+	}
+
+	breakText();
+	sendGuiEvent(EGET_EDITBOX_CHANGED);
+	calculateScrollPos();
+}
+
 bool GUIEditBox::processMouse(const SEvent &event)
 {
 	switch (event.MouseInput.Event) {
@@ -747,6 +777,7 @@ bool GUIEditBox::processMouse(const SEvent &event)
 			s32 pos = m_vscrollbar->getPos();
 			s32 step = m_vscrollbar->getSmallStep();
 			m_vscrollbar->setPos(pos - event.MouseInput.Wheel * step);
+			return true;
 		}
 		break;
 	default:
@@ -817,3 +848,54 @@ void GUIEditBox::updateVScrollBar()
 		}
 	}
 }
+
+void GUIEditBox::deserializeAttributes(
+		io::IAttributes *in, io::SAttributeReadWriteOptions *options = 0)
+{
+	IGUIEditBox::deserializeAttributes(in, options);
+
+	setOverrideColor(in->getAttributeAsColor("OverrideColor"));
+	enableOverrideColor(in->getAttributeAsBool("OverrideColorEnabled"));
+	setMax(in->getAttributeAsInt("MaxChars"));
+	setWordWrap(in->getAttributeAsBool("WordWrap"));
+	setMultiLine(in->getAttributeAsBool("MultiLine"));
+	setAutoScroll(in->getAttributeAsBool("AutoScroll"));
+	core::stringw ch = in->getAttributeAsStringW("PasswordChar");
+
+	if (ch.empty())
+		setPasswordBox(in->getAttributeAsBool("PasswordBox"));
+	else
+		setPasswordBox(in->getAttributeAsBool("PasswordBox"), ch[0]);
+
+	setTextAlignment((EGUI_ALIGNMENT)in->getAttributeAsEnumeration(
+					 "HTextAlign", GUIAlignmentNames),
+			(EGUI_ALIGNMENT)in->getAttributeAsEnumeration(
+					"VTextAlign", GUIAlignmentNames));
+
+	setWritable(in->getAttributeAsBool("Writable"));
+	// setOverrideFont(in->getAttributeAsFont("OverrideFont"));
+}
+
+//! Writes attributes of the element.
+void GUIEditBox::serializeAttributes(
+		io::IAttributes *out, io::SAttributeReadWriteOptions *options = 0) const
+{
+	// IGUIEditBox::serializeAttributes(out,options);
+
+	out->addBool("OverrideColorEnabled", m_override_color_enabled);
+	out->addColor("OverrideColor", m_override_color);
+	// out->addFont("OverrideFont",m_override_font);
+	out->addInt("MaxChars", m_max);
+	out->addBool("WordWrap", m_word_wrap);
+	out->addBool("MultiLine", m_multiline);
+	out->addBool("AutoScroll", m_autoscroll);
+	out->addBool("PasswordBox", m_passwordbox);
+	core::stringw ch = L" ";
+	ch[0] = m_passwordchar;
+	out->addString("PasswordChar", ch.c_str());
+	out->addEnum("HTextAlign", m_halign, GUIAlignmentNames);
+	out->addEnum("VTextAlign", m_valign, GUIAlignmentNames);
+	out->addBool("Writable", m_writable);
+
+	IGUIEditBox::serializeAttributes(out, options);
+}
diff --git a/src/gui/guiEditBox.h b/src/gui/guiEditBox.h
index 3e41c7e51..2a5c911bc 100644
--- a/src/gui/guiEditBox.h
+++ b/src/gui/guiEditBox.h
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
+#include "irrlichttypes.h"
 #include "IGUIEditBox.h"
 #include "IOSOperator.h"
 #include "guiScrollBar.h"
@@ -129,6 +130,16 @@ public:
 	//! called if an event happened.
 	virtual bool OnEvent(const SEvent &event);
 
+	//! Writes attributes of the element.
+	virtual void serializeAttributes(io::IAttributes *out,
+			io::SAttributeReadWriteOptions *options) const;
+
+	//! Reads attributes of the element
+	virtual void deserializeAttributes(
+			io::IAttributes *in, io::SAttributeReadWriteOptions *options);
+
+	virtual bool acceptsIME() { return isEnabled() && m_writable; };
+
 protected:
 	virtual void breakText() = 0;
 
@@ -147,7 +158,8 @@ protected:
 	virtual s32 getCursorPos(s32 x, s32 y) = 0;
 
 	bool processKey(const SEvent &event);
-	virtual void inputChar(wchar_t c) = 0;
+	virtual void inputString(const core::stringw &str);
+	virtual void inputChar(wchar_t c);
 
 	//! returns the line number that the cursor is on
 	s32 getLineFromPos(s32 pos);
diff --git a/src/gui/guiEditBoxWithScrollbar.cpp b/src/gui/guiEditBoxWithScrollbar.cpp
index 707dbb7db..c72070787 100644
--- a/src/gui/guiEditBoxWithScrollbar.cpp
+++ b/src/gui/guiEditBoxWithScrollbar.cpp
@@ -481,44 +481,6 @@ void GUIEditBoxWithScrollBar::setTextRect(s32 line)
 	m_current_text_rect += m_frame_rect.UpperLeftCorner;
 }
 
-
-void GUIEditBoxWithScrollBar::inputChar(wchar_t c)
-{
-	if (!isEnabled())
-		return;
-
-	if (c != 0)	{
-		if (Text.size() < m_max || m_max == 0) {
-			core::stringw s;
-
-			if (m_mark_begin != m_mark_end) {
-				// replace marked text
-				const s32 realmbgn = m_mark_begin < m_mark_end ? m_mark_begin : m_mark_end;
-				const s32 realmend = m_mark_begin < m_mark_end ? m_mark_end : m_mark_begin;
-
-				s = Text.subString(0, realmbgn);
-				s.append(c);
-				s.append(Text.subString(realmend, Text.size() - realmend));
-				Text = s;
-				m_cursor_pos = realmbgn + 1;
-			} else {
-				// add new character
-				s = Text.subString(0, m_cursor_pos);
-				s.append(c);
-				s.append(Text.subString(m_cursor_pos, Text.size() - m_cursor_pos));
-				Text = s;
-				++m_cursor_pos;
-			}
-
-			m_blink_start_time = porting::getTimeMs();
-			setTextMarkers(0, 0);
-		}
-	}
-	breakText();
-	calculateScrollPos();
-	sendGuiEvent(EGET_EDITBOX_CHANGED);
-}
-
 // calculate autoscroll
 void GUIEditBoxWithScrollBar::calculateScrollPos()
 {
@@ -682,54 +644,21 @@ void GUIEditBoxWithScrollBar::setBackgroundColor(const video::SColor &bg_color)
 //! Writes attributes of the element.
 void GUIEditBoxWithScrollBar::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options = 0) const
 {
-	// IGUIEditBox::serializeAttributes(out,options);
-
 	out->addBool("Border", m_border);
 	out->addBool("Background", m_background);
-	out->addBool("OverrideColorEnabled", m_override_color_enabled);
-	out->addColor("OverrideColor", m_override_color);
 	// out->addFont("OverrideFont", OverrideFont);
-	out->addInt("MaxChars", m_max);
-	out->addBool("WordWrap", m_word_wrap);
-	out->addBool("MultiLine", m_multiline);
-	out->addBool("AutoScroll", m_autoscroll);
-	out->addBool("PasswordBox", m_passwordbox);
-	core::stringw ch = L" ";
-	ch[0] = m_passwordchar;
-	out->addString("PasswordChar", ch.c_str());
-	out->addEnum("HTextAlign", m_halign, GUIAlignmentNames);
-	out->addEnum("VTextAlign", m_valign, GUIAlignmentNames);
-	out->addBool("Writable", m_writable);
-
-	IGUIEditBox::serializeAttributes(out, options);
+
+	GUIEditBox::serializeAttributes(out, options);
 }
 
 
 //! Reads attributes of the element
 void GUIEditBoxWithScrollBar::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options = 0)
 {
-	IGUIEditBox::deserializeAttributes(in, options);
+	GUIEditBox::deserializeAttributes(in, options);
 
 	setDrawBorder(in->getAttributeAsBool("Border"));
 	setDrawBackground(in->getAttributeAsBool("Background"));
-	setOverrideColor(in->getAttributeAsColor("OverrideColor"));
-	enableOverrideColor(in->getAttributeAsBool("OverrideColorEnabled"));
-	setMax(in->getAttributeAsInt("MaxChars"));
-	setWordWrap(in->getAttributeAsBool("WordWrap"));
-	setMultiLine(in->getAttributeAsBool("MultiLine"));
-	setAutoScroll(in->getAttributeAsBool("AutoScroll"));
-	core::stringw ch = in->getAttributeAsStringW("PasswordChar");
-
-	if (!ch.size())
-		setPasswordBox(in->getAttributeAsBool("PasswordBox"));
-	else
-		setPasswordBox(in->getAttributeAsBool("PasswordBox"), ch[0]);
-
-	setTextAlignment((EGUI_ALIGNMENT)in->getAttributeAsEnumeration("HTextAlign", GUIAlignmentNames),
-		(EGUI_ALIGNMENT)in->getAttributeAsEnumeration("VTextAlign", GUIAlignmentNames));
-
-	// setOverrideFont(in->getAttributeAsFont("OverrideFont"));
-	setWritable(in->getAttributeAsBool("Writable"));
 }
 
 bool GUIEditBoxWithScrollBar::isDrawBackgroundEnabled() const { return false; }
diff --git a/src/gui/guiEditBoxWithScrollbar.h b/src/gui/guiEditBoxWithScrollbar.h
index b863ee614..3f7450dcb 100644
--- a/src/gui/guiEditBoxWithScrollbar.h
+++ b/src/gui/guiEditBoxWithScrollbar.h
@@ -49,8 +49,6 @@ protected:
 	virtual void breakText();
 	//! sets the area of the given line
 	virtual void setTextRect(s32 line);
-	//! adds a letter to the edit box
-	virtual void inputChar(wchar_t c);
 	//! calculates the current scroll position
 	void calculateScrollPos();
 	//! calculated the FrameRect
diff --git a/src/gui/guiEngine.cpp b/src/gui/guiEngine.cpp
index c5ad5c323..694baf482 100644
--- a/src/gui/guiEngine.cpp
+++ b/src/gui/guiEngine.cpp
@@ -75,8 +75,6 @@ video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id)
 	if (name.empty())
 		return NULL;
 
-	m_to_delete.insert(name);
-
 #if ENABLE_GLES
 	video::ITexture *retval = m_driver->findTexture(name.c_str());
 	if (retval)
@@ -88,6 +86,7 @@ video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id)
 
 	image = Align2Npot2(image, m_driver);
 	retval = m_driver->addTexture(name.c_str(), image);
+	m_to_delete.insert(name);
 	image->drop();
 	return retval;
 #else
@@ -122,12 +121,14 @@ void MenuMusicFetcher::fetchSounds(const std::string &name,
 /******************************************************************************/
 GUIEngine::GUIEngine(JoystickController *joystick,
 		gui::IGUIElement *parent,
+		RenderingEngine *rendering_engine,
 		IMenuManager *menumgr,
 		MainMenuData *data,
 		bool &kill) :
+	m_rendering_engine(rendering_engine),
 	m_parent(parent),
 	m_menumanager(menumgr),
-	m_smgr(RenderingEngine::get_scene_manager()),
+	m_smgr(rendering_engine->get_scene_manager()),
 	m_data(data),
 	m_kill(kill)
 {
@@ -139,7 +140,7 @@ GUIEngine::GUIEngine(JoystickController *joystick,
 	m_buttonhandler = new TextDestGuiEngine(this);
 
 	//create texture source
-	m_texture_source = new MenuTextureSource(RenderingEngine::get_video_driver());
+	m_texture_source = new MenuTextureSource(rendering_engine->get_video_driver());
 
 	//create soundmanager
 	MenuMusicFetcher soundfetcher;
@@ -157,7 +158,7 @@ GUIEngine::GUIEngine(JoystickController *joystick,
 		g_fontengine->getTextHeight());
 	rect += v2s32(4, 0);
 
-	m_irr_toplefttext = gui::StaticText::add(RenderingEngine::get_gui_env(),
+	m_irr_toplefttext = gui::StaticText::add(rendering_engine->get_gui_env(),
 			m_toplefttext, rect, false, true, 0, -1);
 
 	//create formspecsource
@@ -169,6 +170,7 @@ GUIEngine::GUIEngine(JoystickController *joystick,
 			-1,
 			m_menumanager,
 			NULL /* &client */,
+			m_rendering_engine->get_gui_env(),
 			m_texture_source,
 			m_sound_manager,
 			m_formspecgui,
@@ -233,7 +235,7 @@ void GUIEngine::run()
 {
 	// Always create clouds because they may or may not be
 	// needed based on the game selected
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
 
 	cloudInit();
 
@@ -260,10 +262,10 @@ void GUIEngine::run()
 				fog_pixelfog, fog_rangefog);
 	}
 
-	while (RenderingEngine::run() && (!m_startgame) && (!m_kill)) {
+	while (m_rendering_engine->run() && (!m_startgame) && (!m_kill)) {
 
 		const irr::core::dimension2d<u32> &current_screen_size =
-			RenderingEngine::get_video_driver()->getScreenSize();
+			m_rendering_engine->get_video_driver()->getScreenSize();
 		// Verify if window size has changed and save it if it's the case
 		// Ensure evaluating settings->getBool after verifying screensize
 		// First condition is cheaper
@@ -294,11 +296,11 @@ void GUIEngine::run()
 		drawHeader(driver);
 		drawFooter(driver);
 
-		RenderingEngine::get_gui_env()->drawAll();
+		m_rendering_engine->get_gui_env()->drawAll();
 
 		driver->endScene();
 
-		IrrlichtDevice *device = RenderingEngine::get_raw_device();
+		IrrlichtDevice *device = m_rendering_engine->get_raw_device();
 		u32 frametime_min = 1000 / (device->isWindowFocused()
 			? g_settings->getFloat("fps_max")
 			: g_settings->getFloat("fps_max_unfocused"));
@@ -331,7 +333,7 @@ GUIEngine::~GUIEngine()
 	//clean up texture pointers
 	for (image_definition &texture : m_textures) {
 		if (texture.texture)
-			RenderingEngine::get_video_driver()->removeTexture(texture.texture);
+			m_rendering_engine->get_video_driver()->removeTexture(texture.texture);
 	}
 
 	delete m_texture_source;
@@ -351,13 +353,13 @@ void GUIEngine::cloudInit()
 				v3f(0,0,0), v3f(0, 60, 100));
 	m_cloud.camera->setFarValue(10000);
 
-	m_cloud.lasttime = RenderingEngine::get_timer_time();
+	m_cloud.lasttime = m_rendering_engine->get_timer_time();
 }
 
 /******************************************************************************/
 void GUIEngine::cloudPreProcess()
 {
-	u32 time = RenderingEngine::get_timer_time();
+	u32 time = m_rendering_engine->get_timer_time();
 
 	if(time > m_cloud.lasttime)
 		m_cloud.dtime = (time - m_cloud.lasttime) / 1000.0;
@@ -378,7 +380,7 @@ void GUIEngine::cloudPostProcess(u32 frametime_min, IrrlichtDevice *device)
 	u32 busytime_u32;
 
 	// not using getRealTime is necessary for wine
-	u32 time = RenderingEngine::get_timer_time();
+	u32 time = m_rendering_engine->get_timer_time();
 	if(time > m_cloud.lasttime)
 		busytime_u32 = time - m_cloud.lasttime;
 	else
@@ -486,8 +488,6 @@ void GUIEngine::drawHeader(video::IVideoDriver *driver)
 		splashrect += v2s32((screensize.Width/2)-(splashsize.X/2),
 				((free_space/2)-splashsize.Y/2)+10);
 
-	video::SColor bgcolor(255,50,50,50);
-
 	draw2DImageFilterScaled(driver, texture, splashrect,
 		core::rect<s32>(core::position2d<s32>(0,0),
 		core::dimension2di(texture->getOriginalSize())),
@@ -531,7 +531,7 @@ void GUIEngine::drawFooter(video::IVideoDriver *driver)
 bool GUIEngine::setTexture(texture_layer layer, const std::string &texturepath,
 		bool tile_image, unsigned int minsize)
 {
-	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
+	video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
 
 	if (m_textures[layer].texture) {
 		driver->removeTexture(m_textures[layer].texture);
@@ -598,7 +598,7 @@ void GUIEngine::updateTopLeftTextSize()
 	rect += v2s32(4, 0);
 
 	m_irr_toplefttext->remove();
-	m_irr_toplefttext = gui::StaticText::add(RenderingEngine::get_gui_env(),
+	m_irr_toplefttext = gui::StaticText::add(m_rendering_engine->get_gui_env(),
 			m_toplefttext, rect, false, true, 0, -1);
 }
 
diff --git a/src/gui/guiEngine.h b/src/gui/guiEngine.h
index eef1ad8aa..70abce181 100644
--- a/src/gui/guiEngine.h
+++ b/src/gui/guiEngine.h
@@ -50,6 +50,7 @@ struct image_definition {
 /* forward declarations                                                       */
 /******************************************************************************/
 class GUIEngine;
+class RenderingEngine;
 class MainMenuScripting;
 class Clouds;
 struct MainMenuData;
@@ -150,6 +151,7 @@ public:
 	 */
 	GUIEngine(JoystickController *joystick,
 			gui::IGUIElement *parent,
+			RenderingEngine *rendering_engine,
 			IMenuManager *menumgr,
 			MainMenuData *data,
 			bool &kill);
@@ -188,6 +190,7 @@ private:
 	/** update size of topleftext element */
 	void updateTopLeftTextSize();
 
+	RenderingEngine         *m_rendering_engine = nullptr;
 	/** parent gui element */
 	gui::IGUIElement        *m_parent = nullptr;
 	/** manager to add menus to */
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp
index 973fc60a8..c6435804f 100644
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 #include <cstdlib>
+#include <cmath>
 #include <algorithm>
 #include <iterator>
 #include <limits>
@@ -64,7 +65,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "guiInventoryList.h"
 #include "guiItemImage.h"
 #include "guiScrollContainer.h"
-#include "intlGUIEditBox.h"
 #include "guiHyperText.h"
 #include "guiScene.h"
 
@@ -96,10 +96,10 @@ inline u32 clamp_u8(s32 value)
 
 GUIFormSpecMenu::GUIFormSpecMenu(JoystickController *joystick,
 		gui::IGUIElement *parent, s32 id, IMenuManager *menumgr,
-		Client *client, ISimpleTextureSource *tsrc, ISoundManager *sound_manager,
-		IFormSource *fsrc, TextDest *tdst,
+		Client *client, gui::IGUIEnvironment *guienv, ISimpleTextureSource *tsrc,
+		ISoundManager *sound_manager, IFormSource *fsrc, TextDest *tdst,
 		const std::string &formspecPrepend, bool remap_dbl_click):
-	GUIModalMenu(RenderingEngine::get_gui_env(), parent, id, menumgr, remap_dbl_click),
+	GUIModalMenu(guienv, parent, id, menumgr, remap_dbl_click),
 	m_invmgr(client),
 	m_tsrc(tsrc),
 	m_sound_manager(sound_manager),
@@ -145,12 +145,12 @@ GUIFormSpecMenu::~GUIFormSpecMenu()
 }
 
 void GUIFormSpecMenu::create(GUIFormSpecMenu *&cur_formspec, Client *client,
-	JoystickController *joystick, IFormSource *fs_src, TextDest *txt_dest,
-	const std::string &formspecPrepend, ISoundManager *sound_manager)
+	gui::IGUIEnvironment *guienv, JoystickController *joystick, IFormSource *fs_src,
+	TextDest *txt_dest, const std::string &formspecPrepend, ISoundManager *sound_manager)
 {
 	if (cur_formspec == nullptr) {
 		cur_formspec = new GUIFormSpecMenu(joystick, guiroot, -1, &g_menumgr,
-			client, client->getTextureSource(), sound_manager, fs_src,
+			client, guienv, client->getTextureSource(), sound_manager, fs_src,
 			txt_dest, formspecPrepend);
 		cur_formspec->doPause = false;
 
@@ -497,19 +497,39 @@ void GUIFormSpecMenu::parseList(parserData *data, const std::string &element)
 			3
 		);
 
-		v2f32 slot_spacing = data->real_coordinates ?
-				v2f32(imgsize.X * 1.25f, imgsize.Y * 1.25f) : spacing;
+		auto style = getDefaultStyleForElement("list", spec.fname);
 
-		v2s32 pos = data->real_coordinates ? getRealCoordinateBasePos(v_pos)
-				: getElementBasePos(&v_pos);
+		v2f32 slot_scale = style.getVector2f(StyleSpec::SIZE, v2f32(0, 0));
+		v2f32 slot_size(
+			slot_scale.X <= 0 ? imgsize.X : std::max<f32>(slot_scale.X * imgsize.X, 1),
+			slot_scale.Y <= 0 ? imgsize.Y : std::max<f32>(slot_scale.Y * imgsize.Y, 1)
+		);
+
+		v2f32 slot_spacing = style.getVector2f(StyleSpec::SPACING, v2f32(-1, -1));
+		v2f32 default_spacing = data->real_coordinates ?
+				v2f32(imgsize.X * 0.25f, imgsize.Y * 0.25f) :
+				v2f32(spacing.X - imgsize.X, spacing.Y - imgsize.Y);
+
+		slot_spacing.X = slot_spacing.X < 0 ? default_spacing.X :
+				imgsize.X * slot_spacing.X;
+		slot_spacing.Y = slot_spacing.Y < 0 ? default_spacing.Y :
+				imgsize.Y * slot_spacing.Y;
+
+		slot_spacing += slot_size;
+
+		v2s32 pos = data->real_coordinates ? getRealCoordinateBasePos(v_pos) :
+				getElementBasePos(&v_pos);
 
 		core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y,
-				pos.X + (geom.X - 1) * slot_spacing.X + imgsize.X,
-				pos.Y + (geom.Y - 1) * slot_spacing.Y + imgsize.Y);
+				pos.X + (geom.X - 1) * slot_spacing.X + slot_size.X,
+				pos.Y + (geom.Y - 1) * slot_spacing.Y + slot_size.Y);
 
 		GUIInventoryList *e = new GUIInventoryList(Environment, data->current_parent,
-				spec.fid, rect, m_invmgr, loc, listname, geom, start_i, imgsize,
-				slot_spacing, this, data->inventorylist_options, m_font);
+				spec.fid, rect, m_invmgr, loc, listname, geom, start_i,
+				v2s32(slot_size.X, slot_size.Y), slot_spacing, this,
+				data->inventorylist_options, m_font);
+
+		e->setNotClipped(style.getBool(StyleSpec::NOCLIP, false));
 
 		m_inventorylists.push_back(e);
 		m_fields.push_back(spec);
@@ -907,7 +927,7 @@ void GUIFormSpecMenu::parseAnimatedImage(parserData *data, const std::string &el
 
 	core::rect<s32> rect = core::rect<s32>(pos, pos + geom);
 
-	GUIAnimatedImage *e = new GUIAnimatedImage(Environment, this, spec.fid,
+	GUIAnimatedImage *e = new GUIAnimatedImage(Environment, data->current_parent, spec.fid,
 		rect, texture_name, frame_count, frame_duration, m_tsrc);
 
 	if (parts.size() >= 7)
@@ -1526,21 +1546,13 @@ void GUIFormSpecMenu::createTextField(parserData *data, FieldSpec &spec,
 	}
 
 	gui::IGUIEditBox *e = nullptr;
-	static constexpr bool use_intl_edit_box = USE_FREETYPE &&
-		IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9;
-
-	if (use_intl_edit_box && g_settings->getBool("freetype")) {
-		e = new gui::intlGUIEditBox(spec.fdefault.c_str(), true, Environment,
-				data->current_parent, spec.fid, rect, is_editable, is_multiline);
-	} else {
-		if (is_multiline) {
-			e = new GUIEditBoxWithScrollBar(spec.fdefault.c_str(), true, Environment,
-					data->current_parent, spec.fid, rect, is_editable, true);
-		} else if (is_editable) {
-			e = Environment->addEditBox(spec.fdefault.c_str(), rect, true,
-					data->current_parent, spec.fid);
-			e->grab();
-		}
+	if (is_multiline) {
+		e = new GUIEditBoxWithScrollBar(spec.fdefault.c_str(), true, Environment,
+				data->current_parent, spec.fid, rect, is_editable, true);
+	} else if (is_editable) {
+		e = Environment->addEditBox(spec.fdefault.c_str(), rect, true,
+				data->current_parent, spec.fid);
+		e->grab();
 	}
 
 	auto style = getDefaultStyleForElement(is_multiline ? "textarea" : "field", spec.fname);
@@ -2725,7 +2737,7 @@ void GUIFormSpecMenu::parseModel(parserData *data, const std::string &element)
 {
 	std::vector<std::string> parts = split(element, ';');
 
-	if (parts.size() < 5 || (parts.size() > 9 &&
+	if (parts.size() < 5 || (parts.size() > 10 &&
 			m_formspec_version <= FORMSPEC_API_VERSION)) {
 		errorstream << "Invalid model element (" << parts.size() << "): '" << element
 			<< "'" << std::endl;
@@ -2733,8 +2745,8 @@ void GUIFormSpecMenu::parseModel(parserData *data, const std::string &element)
 	}
 
 	// Avoid length checks by resizing
-	if (parts.size() < 9)
-		parts.resize(9);
+	if (parts.size() < 10)
+		parts.resize(10);
 
 	std::vector<std::string> v_pos = split(parts[0], ',');
 	std::vector<std::string> v_geom = split(parts[1], ',');
@@ -2745,6 +2757,7 @@ void GUIFormSpecMenu::parseModel(parserData *data, const std::string &element)
 	bool inf_rotation = is_yes(parts[6]);
 	bool mousectrl = is_yes(parts[7]) || parts[7].empty(); // default true
 	std::vector<std::string> frame_loop = split(parts[8], ',');
+	std::string speed = unescape_string(parts[9]);
 
 	MY_CHECKPOS("model", 0);
 	MY_CHECKGEOM("model", 1);
@@ -2781,7 +2794,7 @@ void GUIFormSpecMenu::parseModel(parserData *data, const std::string &element)
 
 	core::rect<s32> rect(pos, pos + geom);
 
-	GUIScene *e = new GUIScene(Environment, RenderingEngine::get_scene_manager(),
+	GUIScene *e = new GUIScene(Environment, m_client->getSceneManager(),
 			data->current_parent, rect, spec.fid);
 
 	auto meshnode = e->setMesh(mesh);
@@ -2804,6 +2817,7 @@ void GUIFormSpecMenu::parseModel(parserData *data, const std::string &element)
 	}
 
 	e->setFrameLoop(frame_loop_begin, frame_loop_end);
+	e->setAnimationSpeed(stof(speed));
 
 	auto style = getStyleForElement("model", spec.fname);
 	e->setStyles(style);
@@ -3505,8 +3519,6 @@ bool GUIFormSpecMenu::getAndroidUIInput()
 
 GUIInventoryList::ItemSpec GUIFormSpecMenu::getItemAtPos(v2s32 p) const
 {
-	core::rect<s32> imgrect(0, 0, imgsize.X, imgsize.Y);
-
 	for (const GUIInventoryList *e : m_inventorylists) {
 		s32 item_index = e->getItemIndexAtPos(p);
 		if (item_index != -1)
@@ -3837,7 +3849,7 @@ ItemStack GUIFormSpecMenu::verifySelectedItem()
 	return ItemStack();
 }
 
-void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode=quit_mode_no)
+void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode)
 {
 	if(m_text_dst)
 	{
diff --git a/src/gui/guiFormSpecMenu.h b/src/gui/guiFormSpecMenu.h
index 37106cb65..926de66d5 100644
--- a/src/gui/guiFormSpecMenu.h
+++ b/src/gui/guiFormSpecMenu.h
@@ -152,6 +152,7 @@ public:
 			gui::IGUIElement* parent, s32 id,
 			IMenuManager *menumgr,
 			Client *client,
+			gui::IGUIEnvironment *guienv,
 			ISimpleTextureSource *tsrc,
 			ISoundManager *sound_manager,
 			IFormSource* fs_src,
@@ -162,8 +163,9 @@ public:
 	~GUIFormSpecMenu();
 
 	static void create(GUIFormSpecMenu *&cur_formspec, Client *client,
-		JoystickController *joystick, IFormSource *fs_src, TextDest *txt_dest,
-		const std::string &formspecPrepend, ISoundManager *sound_manager);
+		gui::IGUIEnvironment *guienv, JoystickController *joystick, IFormSource *fs_src,
+		TextDest *txt_dest, const std::string &formspecPrepend,
+		ISoundManager *sound_manager);
 
 	void setFormSpec(const std::string &formspec_string,
 			const InventoryLocation &current_inventory_location)
@@ -253,7 +255,7 @@ public:
 	void updateSelectedItem();
 	ItemStack verifySelectedItem();
 
-	void acceptInput(FormspecQuitMode quitmode);
+	void acceptInput(FormspecQuitMode quitmode=quit_mode_no);
 	bool preprocessEvent(const SEvent& event);
 	bool OnEvent(const SEvent& event);
 	bool doPause;
diff --git a/src/gui/guiHyperText.cpp b/src/gui/guiHyperText.cpp
index 88931cdf9..ccfdcb81d 100644
--- a/src/gui/guiHyperText.cpp
+++ b/src/gui/guiHyperText.cpp
@@ -1088,7 +1088,7 @@ bool GUIHyperText::OnEvent(const SEvent &event)
 		if (event.MouseInput.Event == EMIE_MOUSE_MOVED)
 			checkHover(event.MouseInput.X, event.MouseInput.Y);
 
-		if (event.MouseInput.Event == EMIE_MOUSE_WHEEL) {
+		if (event.MouseInput.Event == EMIE_MOUSE_WHEEL && m_vscrollbar->isVisible()) {
 			m_vscrollbar->setPos(m_vscrollbar->getPos() -
 					event.MouseInput.Wheel * m_vscrollbar->getSmallStep());
 			m_text_scrollpos.Y = -m_vscrollbar->getPos();
diff --git a/src/gui/guiInventoryList.cpp b/src/gui/guiInventoryList.cpp
index 58d7ae771..290ae40e7 100644
--- a/src/gui/guiInventoryList.cpp
+++ b/src/gui/guiInventoryList.cpp
@@ -101,8 +101,6 @@ void GUIInventoryList::draw()
 			&& m_invmgr->getInventory(selected_item->inventoryloc) == inv
 			&& selected_item->listname == m_listname
 			&& selected_item->i == item_i;
-		core::rect<s32> clipped_rect(rect);
-		clipped_rect.clipAgainst(AbsoluteClippingRect);
 		bool hovering = m_hovered_i == item_i;
 		ItemRotationKind rotation_kind = selected ? IT_ROT_SELECTED :
 			(hovering ? IT_ROT_HOVERED : IT_ROT_NONE);
diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp
index a7270da06..719a4101a 100644
--- a/src/gui/guiKeyChangeMenu.cpp
+++ b/src/gui/guiKeyChangeMenu.cpp
@@ -46,7 +46,7 @@ enum
 	GUI_ID_KEY_BACKWARD_BUTTON,
 	GUI_ID_KEY_LEFT_BUTTON,
 	GUI_ID_KEY_RIGHT_BUTTON,
-	GUI_ID_KEY_USE_BUTTON,
+	GUI_ID_KEY_AUX1_BUTTON,
 	GUI_ID_KEY_FLY_BUTTON,
 	GUI_ID_KEY_FAST_BUTTON,
 	GUI_ID_KEY_JUMP_BUTTON,
@@ -71,6 +71,7 @@ enum
 	GUI_ID_KEY_MINIMAP_BUTTON,
 	GUI_ID_KEY_SCREENSHOT_BUTTON,
 	GUI_ID_KEY_CHATLOG_BUTTON,
+	GUI_ID_KEY_BLOCK_BOUNDS_BUTTON,
 	GUI_ID_KEY_HUD_BUTTON,
 	GUI_ID_KEY_FOG_BUTTON,
 	GUI_ID_KEY_CHEAT_MENU_BUTTON,
@@ -187,7 +188,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 		{
 			core::rect<s32> rect(0, 0, option_w, 30 * s);
 			rect += topleft + v2s32(option_x, option_y);
-			const wchar_t *text = wgettext("\"Special\" = climb down");
+			const wchar_t *text = wgettext("\"Aux1\" = climb down");
 			Environment->addCheckBox(g_settings->getBool("aux1_descends"), rect, this,
 					GUI_ID_CB_AUX1_DESCENDS, text);
 			delete[] text;
@@ -258,7 +259,7 @@ bool GUIKeyChangeMenu::acceptInput()
 {
 	for (key_setting *k : key_settings) {
 		std::string default_key;
-		g_settings->getDefaultNoEx(k->setting_name, default_key);
+		Settings::getLayer(SL_DEFAULTS)->getNoEx(k->setting_name, default_key);
 
 		if (k->key.sym() != default_key)
 			g_settings->set(k->setting_name, k->key.sym());
@@ -422,47 +423,48 @@ void GUIKeyChangeMenu::add_key(int id, const wchar_t *button_name, const std::st
 
 void GUIKeyChangeMenu::init_keys()
 {
-	this->add_key(GUI_ID_KEY_FORWARD_BUTTON,   wgettext("Forward"),          "keymap_forward");
-	this->add_key(GUI_ID_KEY_BACKWARD_BUTTON,  wgettext("Backward"),         "keymap_backward");
-	this->add_key(GUI_ID_KEY_LEFT_BUTTON,      wgettext("Left"),             "keymap_left");
-	this->add_key(GUI_ID_KEY_RIGHT_BUTTON,     wgettext("Right"),            "keymap_right");
-	this->add_key(GUI_ID_KEY_USE_BUTTON,       wgettext("Special"),          "keymap_special1");
-	this->add_key(GUI_ID_KEY_JUMP_BUTTON,      wgettext("Jump"),             "keymap_jump");
-	this->add_key(GUI_ID_KEY_SNEAK_BUTTON,     wgettext("Sneak"),            "keymap_sneak");
-	this->add_key(GUI_ID_KEY_DROP_BUTTON,      wgettext("Drop"),             "keymap_drop");
-	this->add_key(GUI_ID_KEY_INVENTORY_BUTTON, wgettext("Inventory"),        "keymap_inventory");
-	this->add_key(GUI_ID_KEY_ENDERCHEST_BUTTON,wgettext("Enderchest"),		 "keymap_enderchest");
-	this->add_key(GUI_ID_KEY_HOTBAR_PREV_BUTTON,wgettext("Prev. item"),      "keymap_hotbar_previous");
-	this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON,wgettext("Next item"),       "keymap_hotbar_next");
-	this->add_key(GUI_ID_KEY_ZOOM_BUTTON,      wgettext("Zoom"),             "keymap_zoom");
-	this->add_key(GUI_ID_KEY_CAMERA_BUTTON,    wgettext("Change camera"),    "keymap_camera_mode");
-	this->add_key(GUI_ID_KEY_MINIMAP_BUTTON,   wgettext("Toggle minimap"),   "keymap_minimap");
-	this->add_key(GUI_ID_KEY_FLY_BUTTON,       wgettext("Toggle fly"),       "keymap_freemove");
-	this->add_key(GUI_ID_KEY_PITCH_MOVE,       wgettext("Toggle pitchmove"), "keymap_pitchmove");
-	this->add_key(GUI_ID_KEY_FAST_BUTTON,      wgettext("Toggle fast"),      "keymap_fastmove");
-	this->add_key(GUI_ID_KEY_NOCLIP_BUTTON,    wgettext("Toggle noclip"),    "keymap_noclip");
-	this->add_key(GUI_ID_KEY_MUTE_BUTTON,      wgettext("Mute"),             "keymap_mute");
-	this->add_key(GUI_ID_KEY_DEC_VOLUME_BUTTON,wgettext("Dec. volume"),      "keymap_decrease_volume");
-	this->add_key(GUI_ID_KEY_INC_VOLUME_BUTTON,wgettext("Inc. volume"),      "keymap_increase_volume");
-	this->add_key(GUI_ID_KEY_AUTOFWD_BUTTON,   wgettext("Autoforward"),      "keymap_autoforward");
-	this->add_key(GUI_ID_KEY_CHAT_BUTTON,      wgettext("Chat"),             "keymap_chat");
-	this->add_key(GUI_ID_KEY_SCREENSHOT_BUTTON,wgettext("Screenshot"),       "keymap_screenshot");
-	this->add_key(GUI_ID_KEY_RANGE_BUTTON,     wgettext("Range select"),     "keymap_rangeselect");
-	this->add_key(GUI_ID_KEY_DEC_RANGE_BUTTON, wgettext("Dec. range"),       "keymap_decrease_viewing_range_min");
-	this->add_key(GUI_ID_KEY_INC_RANGE_BUTTON, wgettext("Inc. range"),       "keymap_increase_viewing_range_min");
-	this->add_key(GUI_ID_KEY_CONSOLE_BUTTON,   wgettext("Console"),          "keymap_console");
-	this->add_key(GUI_ID_KEY_CMD_BUTTON,       wgettext("Command"),          "keymap_cmd");
-	this->add_key(GUI_ID_KEY_CMD_LOCAL_BUTTON, wgettext("Local command"),    "keymap_cmd_local");
-	this->add_key(GUI_ID_KEY_HUD_BUTTON,       wgettext("Toggle HUD"),       "keymap_toggle_hud");
-	this->add_key(GUI_ID_KEY_CHATLOG_BUTTON,   wgettext("Toggle chat log"),  "keymap_toggle_chat");
-	this->add_key(GUI_ID_KEY_FOG_BUTTON,       wgettext("Toggle fog"),       "keymap_toggle_fog");
-	this->add_key(GUI_ID_KEY_CHEAT_MENU_BUTTON,wgettext("Toggle C. Menu"),"keymap_toggle_cheat_menu");
-	this->add_key(GUI_ID_KEY_KILLAURA_BUTTON,  wgettext("Killaura"),  "keymap_toggle_killaura");
-	this->add_key(GUI_ID_KEY_FREECAM_BUTTON,   wgettext("Freecam"),    "keymap_toggle_freecam");
-	this->add_key(GUI_ID_KEY_SCAFFOLD_BUTTON,  wgettext("Scaffold"),    "keymap_toggle_scaffold");
-	this->add_key(GUI_ID_KEY_SELECT_UP_BUTTON, wgettext("C. Menu Up"),    "keymap_select_up");
-	this->add_key(GUI_ID_KEY_SELECT_DOWN_BUTTON,wgettext("C. Menu Down"), "keymap_select_down");
-	this->add_key(GUI_ID_KEY_SELECT_LEFT_BUTTON,wgettext("C. Menu Left"), "keymap_select_left");
-	this->add_key(GUI_ID_KEY_SELECT_RIGHT_BUTTON,wgettext("C. Menu Right"),"keymap_select_right");
-	this->add_key(GUI_ID_KEY_SELECT_CONFIRM_BUTTON,wgettext("C. Menu Enter"),"keymap_select_confirm");
+	this->add_key(GUI_ID_KEY_FORWARD_BUTTON,        wgettext("Forward"),          "keymap_forward");
+	this->add_key(GUI_ID_KEY_BACKWARD_BUTTON,       wgettext("Backward"),         "keymap_backward");
+	this->add_key(GUI_ID_KEY_LEFT_BUTTON,           wgettext("Left"),             "keymap_left");
+	this->add_key(GUI_ID_KEY_RIGHT_BUTTON,          wgettext("Right"),            "keymap_right");
+	this->add_key(GUI_ID_KEY_AUX1_BUTTON,           wgettext("Aux1"),             "keymap_aux1");
+	this->add_key(GUI_ID_KEY_JUMP_BUTTON,           wgettext("Jump"),             "keymap_jump");
+	this->add_key(GUI_ID_KEY_SNEAK_BUTTON,          wgettext("Sneak"),            "keymap_sneak");
+	this->add_key(GUI_ID_KEY_DROP_BUTTON,           wgettext("Drop"),             "keymap_drop");
+	this->add_key(GUI_ID_KEY_INVENTORY_BUTTON,      wgettext("Inventory"),        "keymap_inventory");
+	this->add_key(GUI_ID_KEY_ENDERCHEST_BUTTON,     wgettext("Enderchest"),		  "keymap_enderchest");
+	this->add_key(GUI_ID_KEY_HOTBAR_PREV_BUTTON,    wgettext("Prev. item"),       "keymap_hotbar_previous");
+	this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON,    wgettext("Next item"),        "keymap_hotbar_next");
+	this->add_key(GUI_ID_KEY_ZOOM_BUTTON,           wgettext("Zoom"),             "keymap_zoom");
+	this->add_key(GUI_ID_KEY_CAMERA_BUTTON,         wgettext("Change camera"),    "keymap_camera_mode");
+	this->add_key(GUI_ID_KEY_MINIMAP_BUTTON,        wgettext("Toggle minimap"),   "keymap_minimap");
+	this->add_key(GUI_ID_KEY_FLY_BUTTON,            wgettext("Toggle fly"),       "keymap_freemove");
+	this->add_key(GUI_ID_KEY_PITCH_MOVE,            wgettext("Toggle pitchmove"), "keymap_pitchmove");
+	this->add_key(GUI_ID_KEY_FAST_BUTTON,           wgettext("Toggle fast"),      "keymap_fastmove");
+	this->add_key(GUI_ID_KEY_NOCLIP_BUTTON,         wgettext("Toggle noclip"),    "keymap_noclip");
+	this->add_key(GUI_ID_KEY_MUTE_BUTTON,           wgettext("Mute"),             "keymap_mute");
+	this->add_key(GUI_ID_KEY_DEC_VOLUME_BUTTON,     wgettext("Dec. volume"),      "keymap_decrease_volume");
+	this->add_key(GUI_ID_KEY_INC_VOLUME_BUTTON,     wgettext("Inc. volume"),      "keymap_increase_volume");
+	this->add_key(GUI_ID_KEY_AUTOFWD_BUTTON,        wgettext("Autoforward"),      "keymap_autoforward");
+	this->add_key(GUI_ID_KEY_CHAT_BUTTON,           wgettext("Chat"),             "keymap_chat");
+	this->add_key(GUI_ID_KEY_SCREENSHOT_BUTTON,     wgettext("Screenshot"),       "keymap_screenshot");
+	this->add_key(GUI_ID_KEY_RANGE_BUTTON,          wgettext("Range select"),     "keymap_rangeselect");
+	this->add_key(GUI_ID_KEY_DEC_RANGE_BUTTON,      wgettext("Dec. range"),       "keymap_decrease_viewing_range_min");
+	this->add_key(GUI_ID_KEY_INC_RANGE_BUTTON,      wgettext("Inc. range"),       "keymap_increase_viewing_range_min");
+	this->add_key(GUI_ID_KEY_CONSOLE_BUTTON,        wgettext("Console"),          "keymap_console");
+	this->add_key(GUI_ID_KEY_CMD_BUTTON,            wgettext("Command"),          "keymap_cmd");
+	this->add_key(GUI_ID_KEY_CMD_LOCAL_BUTTON,      wgettext("Local command"),    "keymap_cmd_local");
+	this->add_key(GUI_ID_KEY_BLOCK_BOUNDS_BUTTON,   wgettext("Block bounds"),     "keymap_toggle_block_bounds");
+	this->add_key(GUI_ID_KEY_HUD_BUTTON,            wgettext("Toggle HUD"),       "keymap_toggle_hud");
+	this->add_key(GUI_ID_KEY_CHATLOG_BUTTON,        wgettext("Toggle chat log"),  "keymap_toggle_chat");
+	this->add_key(GUI_ID_KEY_FOG_BUTTON,            wgettext("Toggle fog"),       "keymap_toggle_fog");
+	this->add_key(GUI_ID_KEY_CHEAT_MENU_BUTTON,     wgettext("Toggle C. Menu"),   "keymap_toggle_cheat_menu");
+	this->add_key(GUI_ID_KEY_KILLAURA_BUTTON,       wgettext("Killaura"),         "keymap_toggle_killaura");
+	this->add_key(GUI_ID_KEY_FREECAM_BUTTON,        wgettext("Freecam"),          "keymap_toggle_freecam");
+	this->add_key(GUI_ID_KEY_SCAFFOLD_BUTTON,       wgettext("Scaffold"),         "keymap_toggle_scaffold");
+	this->add_key(GUI_ID_KEY_SELECT_UP_BUTTON,      wgettext("C. Menu Up"),       "keymap_select_up");
+	this->add_key(GUI_ID_KEY_SELECT_DOWN_BUTTON,    wgettext("C. Menu Down"),     "keymap_select_down");
+	this->add_key(GUI_ID_KEY_SELECT_LEFT_BUTTON,    wgettext("C. Menu Left"),     "keymap_select_left");
+	this->add_key(GUI_ID_KEY_SELECT_RIGHT_BUTTON,   wgettext("C. Menu Right"),    "keymap_select_right");
+	this->add_key(GUI_ID_KEY_SELECT_CONFIRM_BUTTON, wgettext("C. Menu Enter"),    "keymap_select_confirm");
 }
diff --git a/src/gui/guiScene.cpp b/src/gui/guiScene.cpp
index 5f4c50b91..f0cfbec5e 100644
--- a/src/gui/guiScene.cpp
+++ b/src/gui/guiScene.cpp
@@ -34,9 +34,6 @@ GUIScene::GUIScene(gui::IGUIEnvironment *env, scene::ISceneManager *smgr,
 	m_cam = m_smgr->addCameraSceneNode(0, v3f(0.f, 0.f, -100.f), v3f(0.f));
 	m_cam->setFOV(30.f * core::DEGTORAD);
 
-	scene::ILightSceneNode *light = m_smgr->addLightSceneNode(m_cam);
-	light->setRadius(1000.f);
-
 	m_smgr->getParameters()->setAttribute(scene::ALLOW_ZWRITE_ON_TRANSPARENT, true);
 }
 
@@ -60,6 +57,7 @@ scene::IAnimatedMeshSceneNode *GUIScene::setMesh(scene::IAnimatedMesh *mesh)
 	m_mesh = m_smgr->addAnimatedMeshSceneNode(mesh);
 	m_mesh->setPosition(-m_mesh->getBoundingBox().getCenter());
 	m_mesh->animateJoints();
+
 	return m_mesh;
 }
 
@@ -73,10 +71,13 @@ void GUIScene::setTexture(u32 idx, video::ITexture *texture)
 	material.setFlag(video::EMF_FOG_ENABLE, true);
 	material.setFlag(video::EMF_BILINEAR_FILTER, false);
 	material.setFlag(video::EMF_BACK_FACE_CULLING, false);
+	material.setFlag(video::EMF_ZWRITE_ENABLE, true);
 }
 
 void GUIScene::draw()
 {
+	m_driver->clearBuffers(video::ECBF_DEPTH);
+
 	// Control rotation speed based on time
 	u64 new_time = porting::getTimeMs();
 	u64 dtime_ms = 0;
@@ -161,6 +162,14 @@ void GUIScene::setFrameLoop(s32 begin, s32 end)
 		m_mesh->setFrameLoop(begin, end);
 }
 
+/**
+ * Sets the animation speed (FPS) for the mesh
+ */
+void GUIScene::setAnimationSpeed(f32 speed)
+{
+	m_mesh->setAnimationSpeed(speed);
+}
+
 /* Camera control functions */
 
 inline void GUIScene::calcOptimalDistance()
diff --git a/src/gui/guiScene.h b/src/gui/guiScene.h
index 08eb7f350..0f5f3a891 100644
--- a/src/gui/guiScene.h
+++ b/src/gui/guiScene.h
@@ -37,6 +37,7 @@ public:
 	void setTexture(u32 idx, video::ITexture *texture);
 	void setBackgroundColor(const video::SColor &color) noexcept { m_bgcolor = color; };
 	void setFrameLoop(s32 begin, s32 end);
+	void setAnimationSpeed(f32 speed);
 	void enableMouseControl(bool enable) noexcept { m_mouse_ctrl = enable; };
 	void setRotation(v2f rot) noexcept { m_custom_rot = rot; };
 	void enableContinuousRotation(bool enable) noexcept { m_inf_rot = enable; };
diff --git a/src/gui/intlGUIEditBox.cpp b/src/gui/intlGUIEditBox.cpp
deleted file mode 100644
index a61619148..000000000
--- a/src/gui/intlGUIEditBox.cpp
+++ /dev/null
@@ -1,723 +0,0 @@
-// 11.11.2011 11:11 ValkaTR
-//
-// This is a copy of intlGUIEditBox from the irrlicht, but with a
-// fix in the OnEvent function, which doesn't allowed input of
-// other keyboard layouts than latin-1
-//
-// Characters like: ä ö ü õ ы й ю � ъ № € ° ...
-//
-// This fix is only needed for linux, because of a bug
-// in the CIrrDeviceLinux.cpp:1014-1015 of the irrlicht
-//
-// Also locale in the programm should not be changed to
-// a "C", "POSIX" or whatever, it should be set to "",
-// or XLookupString will return nothing for the international
-// characters.
-//
-// From the "man setlocale":
-//
-// On startup of the main program, the portable "C" locale
-// is selected as default.  A  program  may  be  made
-// portable to all locales by calling:
-//
-//           setlocale(LC_ALL, "");
-//
-//       after  program initialization....
-//
-
-// Copyright (C) 2002-2013 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include <util/numeric.h>
-#include "intlGUIEditBox.h"
-
-#include "IGUISkin.h"
-#include "IGUIEnvironment.h"
-#include "IGUIFont.h"
-#include "IVideoDriver.h"
-//#include "irrlicht/os.cpp"
-#include "porting.h"
-//#include "Keycodes.h"
-#include "log.h"
-
-/*
-	todo:
-	optional scrollbars
-	ctrl+left/right to select word
-	double click/ctrl click: word select + drag to select whole words, triple click to select line
-	optional? dragging selected text
-	numerical
-*/
-
-namespace irr
-{
-namespace gui
-{
-
-//! constructor
-intlGUIEditBox::intlGUIEditBox(const wchar_t* text, bool border,
-		IGUIEnvironment* environment, IGUIElement* parent, s32 id,
-		const core::rect<s32>& rectangle, bool writable, bool has_vscrollbar)
-	: GUIEditBox(environment, parent, id, rectangle, border, writable)
-{
-	#ifdef _DEBUG
-	setDebugName("intlintlGUIEditBox");
-	#endif
-
-	Text = text;
-
-	if (Environment)
-		m_operator = Environment->getOSOperator();
-
-	if (m_operator)
-		m_operator->grab();
-
-	// this element can be tabbed to
-	setTabStop(true);
-	setTabOrder(-1);
-
-	IGUISkin *skin = 0;
-	if (Environment)
-		skin = Environment->getSkin();
-	if (m_border && skin)
-	{
-		m_frame_rect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
-		m_frame_rect.UpperLeftCorner.Y += skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
-		m_frame_rect.LowerRightCorner.X -= skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
-		m_frame_rect.LowerRightCorner.Y -= skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
-	}
-
-	if (skin && has_vscrollbar) {
-		m_scrollbar_width = skin->getSize(gui::EGDS_SCROLLBAR_SIZE);
-
-		if (m_scrollbar_width > 0) {
-			createVScrollBar();
-		}
-	}
-
-	breakText();
-
-	calculateScrollPos();
-	setWritable(writable);
-}
-
-//! Sets whether to draw the background
-void intlGUIEditBox::setDrawBackground(bool draw)
-{
-}
-
-void intlGUIEditBox::updateAbsolutePosition()
-{
-    core::rect<s32> oldAbsoluteRect(AbsoluteRect);
-	IGUIElement::updateAbsolutePosition();
-	if ( oldAbsoluteRect != AbsoluteRect )
-	{
-        breakText();
-	}
-}
-
-
-//! draws the element and its children
-void intlGUIEditBox::draw()
-{
-	if (!IsVisible)
-		return;
-
-	const bool focus = Environment->hasFocus(this);
-
-	IGUISkin* skin = Environment->getSkin();
-	if (!skin)
-		return;
-
-	m_frame_rect = AbsoluteRect;
-
-	// draw the border
-
-	if (m_border)
-	{
-		if (m_writable) {
-			skin->draw3DSunkenPane(this, skin->getColor(EGDC_WINDOW),
-				false, true, m_frame_rect, &AbsoluteClippingRect);
-		}
-
-		m_frame_rect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
-		m_frame_rect.UpperLeftCorner.Y += skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
-		m_frame_rect.LowerRightCorner.X -= skin->getSize(EGDS_TEXT_DISTANCE_X)+1;
-		m_frame_rect.LowerRightCorner.Y -= skin->getSize(EGDS_TEXT_DISTANCE_Y)+1;
-	}
-
-	updateVScrollBar();
-	core::rect<s32> localClipRect = m_frame_rect;
-	localClipRect.clipAgainst(AbsoluteClippingRect);
-
-	// draw the text
-
-	IGUIFont* font = m_override_font;
-	if (!m_override_font)
-		font = skin->getFont();
-
-	s32 cursorLine = 0;
-	s32 charcursorpos = 0;
-
-	if (font)
-	{
-		if (m_last_break_font != font)
-		{
-			breakText();
-		}
-
-		// calculate cursor pos
-
-		core::stringw *txtLine = &Text;
-		s32 startPos = 0;
-
-		core::stringw s, s2;
-
-		// get mark position
-		const bool ml = (!m_passwordbox && (m_word_wrap || m_multiline));
-		const s32 realmbgn = m_mark_begin < m_mark_end ? m_mark_begin : m_mark_end;
-		const s32 realmend = m_mark_begin < m_mark_end ? m_mark_end : m_mark_begin;
-		const s32 hlineStart = ml ? getLineFromPos(realmbgn) : 0;
-		const s32 hlineCount = ml ? getLineFromPos(realmend) - hlineStart + 1 : 1;
-		const s32 lineCount = ml ? m_broken_text.size() : 1;
-
-		// Save the override color information.
-		// Then, alter it if the edit box is disabled.
-		const bool prevOver = m_override_color_enabled;
-		const video::SColor prevColor = m_override_color;
-
-		if (!Text.empty()) {
-			if (!IsEnabled && !m_override_color_enabled)
-			{
-				m_override_color_enabled = true;
-				m_override_color = skin->getColor(EGDC_GRAY_TEXT);
-			}
-
-			for (s32 i=0; i < lineCount; ++i)
-			{
-				setTextRect(i);
-
-				// clipping test - don't draw anything outside the visible area
-				core::rect<s32> c = localClipRect;
-				c.clipAgainst(m_current_text_rect);
-				if (!c.isValid())
-					continue;
-
-				// get current line
-				if (m_passwordbox)
-				{
-					if (m_broken_text.size() != 1)
-					{
-						m_broken_text.clear();
-						m_broken_text.emplace_back();
-					}
-					if (m_broken_text[0].size() != Text.size())
-					{
-						m_broken_text[0] = Text;
-						for (u32 q = 0; q < Text.size(); ++q)
-						{
-							m_broken_text[0] [q] = m_passwordchar;
-						}
-					}
-					txtLine = &m_broken_text[0];
-					startPos = 0;
-				}
-				else
-				{
-					txtLine = ml ? &m_broken_text[i] : &Text;
-					startPos = ml ? m_broken_text_positions[i] : 0;
-				}
-
-
-				// draw normal text
-				font->draw(txtLine->c_str(), m_current_text_rect,
-					m_override_color_enabled ? m_override_color : skin->getColor(EGDC_BUTTON_TEXT),
-					false, true, &localClipRect);
-
-				// draw mark and marked text
-				if (focus && m_mark_begin != m_mark_end && i >= hlineStart && i < hlineStart + hlineCount)
-				{
-
-					s32 mbegin = 0, mend = 0;
-					s32 lineStartPos = 0, lineEndPos = txtLine->size();
-
-					if (i == hlineStart)
-					{
-						// highlight start is on this line
-						s = txtLine->subString(0, realmbgn - startPos);
-						mbegin = font->getDimension(s.c_str()).Width;
-
-						// deal with kerning
-						mbegin += font->getKerningWidth(
-							&((*txtLine)[realmbgn - startPos]),
-							realmbgn - startPos > 0 ? &((*txtLine)[realmbgn - startPos - 1]) : 0);
-
-						lineStartPos = realmbgn - startPos;
-					}
-					if (i == hlineStart + hlineCount - 1)
-					{
-						// highlight end is on this line
-						s2 = txtLine->subString(0, realmend - startPos);
-						mend = font->getDimension(s2.c_str()).Width;
-						lineEndPos = (s32)s2.size();
-					}
-					else
-						mend = font->getDimension(txtLine->c_str()).Width;
-
-					m_current_text_rect.UpperLeftCorner.X += mbegin;
-					m_current_text_rect.LowerRightCorner.X = m_current_text_rect.UpperLeftCorner.X + mend - mbegin;
-
-					// draw mark
-					skin->draw2DRectangle(this, skin->getColor(EGDC_HIGH_LIGHT), m_current_text_rect, &localClipRect);
-
-					// draw marked text
-					s = txtLine->subString(lineStartPos, lineEndPos - lineStartPos);
-
-					if (!s.empty())
-						font->draw(s.c_str(), m_current_text_rect,
-							m_override_color_enabled ? m_override_color : skin->getColor(EGDC_HIGH_LIGHT_TEXT),
-							false, true, &localClipRect);
-
-				}
-			}
-
-			// Return the override color information to its previous settings.
-			m_override_color_enabled = prevOver;
-			m_override_color = prevColor;
-		}
-
-		// draw cursor
-
-		if (m_word_wrap || m_multiline)
-		{
-			cursorLine = getLineFromPos(m_cursor_pos);
-			txtLine = &m_broken_text[cursorLine];
-			startPos = m_broken_text_positions[cursorLine];
-		}
-		s = txtLine->subString(0,m_cursor_pos-startPos);
-		charcursorpos = font->getDimension(s.c_str()).Width +
-			font->getKerningWidth(L"_", m_cursor_pos-startPos > 0 ? &((*txtLine)[m_cursor_pos-startPos-1]) : 0);
-
-		if (m_writable)	{
-			if (focus && (porting::getTimeMs() - m_blink_start_time) % 700 < 350) {
-				setTextRect(cursorLine);
-				m_current_text_rect.UpperLeftCorner.X += charcursorpos;
-
-				font->draw(L"_", m_current_text_rect,
-					m_override_color_enabled ? m_override_color : skin->getColor(EGDC_BUTTON_TEXT),
-					false, true, &localClipRect);
-			}
-		}
-	}
-
-	// draw children
-	IGUIElement::draw();
-}
-
-
-s32 intlGUIEditBox::getCursorPos(s32 x, s32 y)
-{
-	IGUIFont* font = m_override_font;
-	IGUISkin* skin = Environment->getSkin();
-	if (!m_override_font)
-		font = skin->getFont();
-
-	const u32 lineCount = (m_word_wrap || m_multiline) ? m_broken_text.size() : 1;
-
-	core::stringw *txtLine = NULL;
-	s32 startPos = 0;
-	u32 curr_line_idx = 0;
-	x += 3;
-
-	for (; curr_line_idx < lineCount; ++curr_line_idx) {
-		setTextRect(curr_line_idx);
-		if (curr_line_idx == 0 && y < m_current_text_rect.UpperLeftCorner.Y)
-			y = m_current_text_rect.UpperLeftCorner.Y;
-		if (curr_line_idx == lineCount - 1 && y > m_current_text_rect.LowerRightCorner.Y)
-			y = m_current_text_rect.LowerRightCorner.Y;
-
-		// is it inside this region?
-		if (y >= m_current_text_rect.UpperLeftCorner.Y && y <= m_current_text_rect.LowerRightCorner.Y) {
-			// we've found the clicked line
-			txtLine = (m_word_wrap || m_multiline) ? &m_broken_text[curr_line_idx] : &Text;
-			startPos = (m_word_wrap || m_multiline) ? m_broken_text_positions[curr_line_idx] : 0;
-			break;
-		}
-	}
-
-	if (x < m_current_text_rect.UpperLeftCorner.X)
-		x = m_current_text_rect.UpperLeftCorner.X;
-	else if (x > m_current_text_rect.LowerRightCorner.X)
-		x = m_current_text_rect.LowerRightCorner.X;
-
-	s32 idx = font->getCharacterFromPos(txtLine->c_str(), x - m_current_text_rect.UpperLeftCorner.X);
-	// Special handling for last line, if we are on limits, add 1 extra shift because idx
-	// will be the last char, not null char of the wstring
-	if (curr_line_idx == lineCount - 1 && x == m_current_text_rect.LowerRightCorner.X)
-		idx++;
-
-	return rangelim(idx + startPos, 0, S32_MAX);
-}
-
-
-//! Breaks the single text line.
-void intlGUIEditBox::breakText()
-{
-	IGUISkin* skin = Environment->getSkin();
-
-	if ((!m_word_wrap && !m_multiline) || !skin)
-		return;
-
-	m_broken_text.clear(); // need to reallocate :/
-	m_broken_text_positions.clear();
-
-	IGUIFont* font = m_override_font;
-	if (!m_override_font)
-		font = skin->getFont();
-
-	if (!font)
-		return;
-
-	m_last_break_font = font;
-
-	core::stringw line;
-	core::stringw word;
-	core::stringw whitespace;
-	s32 lastLineStart = 0;
-	s32 size = Text.size();
-	s32 length = 0;
-	s32 elWidth = RelativeRect.getWidth() - m_scrollbar_width - 10;
-	wchar_t c;
-
-	for (s32 i=0; i<size; ++i)
-	{
-		c = Text[i];
-		bool lineBreak = false;
-
-		if (c == L'\r') // Mac or Windows breaks
-		{
-			lineBreak = true;
-			c = ' ';
-			if (Text[i+1] == L'\n') // Windows breaks
-			{
-				Text.erase(i+1);
-				--size;
-			}
-		}
-		else if (c == L'\n') // Unix breaks
-		{
-			lineBreak = true;
-			c = ' ';
-		}
-
-		// don't break if we're not a multi-line edit box
-		if (!m_multiline)
-			lineBreak = false;
-
-		if (c == L' ' || c == 0 || i == (size-1))
-		{
-			if (!word.empty()) {
-				// here comes the next whitespace, look if
-				// we can break the last word to the next line.
-				s32 whitelgth = font->getDimension(whitespace.c_str()).Width;
-				s32 worldlgth = font->getDimension(word.c_str()).Width;
-
-				if (m_word_wrap && length + worldlgth + whitelgth > elWidth)
-				{
-					// break to next line
-					length = worldlgth;
-					m_broken_text.push_back(line);
-					m_broken_text_positions.push_back(lastLineStart);
-					lastLineStart = i - (s32)word.size();
-					line = word;
-				}
-				else
-				{
-					// add word to line
-					line += whitespace;
-					line += word;
-					length += whitelgth + worldlgth;
-				}
-
-				word = L"";
-				whitespace = L"";
-			}
-
-			whitespace += c;
-
-			// compute line break
-			if (lineBreak)
-			{
-				line += whitespace;
-				line += word;
-				m_broken_text.push_back(line);
-				m_broken_text_positions.push_back(lastLineStart);
-				lastLineStart = i+1;
-				line = L"";
-				word = L"";
-				whitespace = L"";
-				length = 0;
-			}
-		}
-		else
-		{
-			// yippee this is a word..
-			word += c;
-		}
-	}
-
-	line += whitespace;
-	line += word;
-	m_broken_text.push_back(line);
-	m_broken_text_positions.push_back(lastLineStart);
-}
-
-
-void intlGUIEditBox::setTextRect(s32 line)
-{
-	core::dimension2du d;
-
-	IGUISkin* skin = Environment->getSkin();
-	if (!skin)
-		return;
-
-	IGUIFont* font = m_override_font ? m_override_font : skin->getFont();
-
-	if (!font)
-		return;
-
-	// get text dimension
-	const u32 lineCount = (m_word_wrap || m_multiline) ? m_broken_text.size() : 1;
-	if (m_word_wrap || m_multiline)
-	{
-		d = font->getDimension(m_broken_text[line].c_str());
-	}
-	else
-	{
-		d = font->getDimension(Text.c_str());
-		d.Height = AbsoluteRect.getHeight();
-	}
-	d.Height += font->getKerningHeight();
-
-	// justification
-	switch (m_halign)
-	{
-	case EGUIA_CENTER:
-		// align to h centre
-		m_current_text_rect.UpperLeftCorner.X = (m_frame_rect.getWidth()/2) - (d.Width/2);
-		m_current_text_rect.LowerRightCorner.X = (m_frame_rect.getWidth()/2) + (d.Width/2);
-		break;
-	case EGUIA_LOWERRIGHT:
-		// align to right edge
-		m_current_text_rect.UpperLeftCorner.X = m_frame_rect.getWidth() - d.Width;
-		m_current_text_rect.LowerRightCorner.X = m_frame_rect.getWidth();
-		break;
-	default:
-		// align to left edge
-		m_current_text_rect.UpperLeftCorner.X = 0;
-		m_current_text_rect.LowerRightCorner.X = d.Width;
-
-	}
-
-	switch (m_valign)
-	{
-	case EGUIA_CENTER:
-		// align to v centre
-		m_current_text_rect.UpperLeftCorner.Y =
-			(m_frame_rect.getHeight()/2) - (lineCount*d.Height)/2 + d.Height*line;
-		break;
-	case EGUIA_LOWERRIGHT:
-		// align to bottom edge
-		m_current_text_rect.UpperLeftCorner.Y =
-			m_frame_rect.getHeight() - lineCount*d.Height + d.Height*line;
-		break;
-	default:
-		// align to top edge
-		m_current_text_rect.UpperLeftCorner.Y = d.Height*line;
-		break;
-	}
-
-	m_current_text_rect.UpperLeftCorner.X  -= m_hscroll_pos;
-	m_current_text_rect.LowerRightCorner.X -= m_hscroll_pos;
-	m_current_text_rect.UpperLeftCorner.Y  -= m_vscroll_pos;
-	m_current_text_rect.LowerRightCorner.Y = m_current_text_rect.UpperLeftCorner.Y + d.Height;
-
-	m_current_text_rect += m_frame_rect.UpperLeftCorner;
-
-}
-
-void intlGUIEditBox::inputChar(wchar_t c)
-{
-	if (!isEnabled() || !m_writable)
-		return;
-
-	if (c != 0)
-	{
-		if (Text.size() < m_max || m_max == 0)
-		{
-			core::stringw s;
-
-			if (m_mark_begin != m_mark_end)
-			{
-				// replace marked text
-				const s32 realmbgn = m_mark_begin < m_mark_end ? m_mark_begin : m_mark_end;
-				const s32 realmend = m_mark_begin < m_mark_end ? m_mark_end : m_mark_begin;
-
-				s = Text.subString(0, realmbgn);
-				s.append(c);
-				s.append( Text.subString(realmend, Text.size()-realmend) );
-				Text = s;
-				m_cursor_pos = realmbgn+1;
-			}
-			else
-			{
-				// add new character
-				s = Text.subString(0, m_cursor_pos);
-				s.append(c);
-				s.append( Text.subString(m_cursor_pos, Text.size()-m_cursor_pos) );
-				Text = s;
-				++m_cursor_pos;
-			}
-
-			m_blink_start_time = porting::getTimeMs();
-			setTextMarkers(0, 0);
-		}
-	}
-	breakText();
-	sendGuiEvent(EGET_EDITBOX_CHANGED);
-	calculateScrollPos();
-}
-
-
-void intlGUIEditBox::calculateScrollPos()
-{
-	if (!m_autoscroll)
-		return;
-
-	// calculate horizontal scroll position
-	s32 cursLine = getLineFromPos(m_cursor_pos);
-	setTextRect(cursLine);
-
-	// don't do horizontal scrolling when wordwrap is enabled.
-	if (!m_word_wrap)
-	{
-		// get cursor position
-		IGUISkin* skin = Environment->getSkin();
-		if (!skin)
-			return;
-		IGUIFont* font = m_override_font ? m_override_font : skin->getFont();
-		if (!font)
-			return;
-
-		core::stringw *txtLine = m_multiline ? &m_broken_text[cursLine] : &Text;
-		s32 cPos = m_multiline ? m_cursor_pos - m_broken_text_positions[cursLine] : m_cursor_pos;
-
-		s32 cStart = m_current_text_rect.UpperLeftCorner.X + m_hscroll_pos +
-			font->getDimension(txtLine->subString(0, cPos).c_str()).Width;
-
-		s32 cEnd = cStart + font->getDimension(L"_ ").Width;
-
-		if (m_frame_rect.LowerRightCorner.X < cEnd)
-			m_hscroll_pos = cEnd - m_frame_rect.LowerRightCorner.X;
-		else if (m_frame_rect.UpperLeftCorner.X > cStart)
-			m_hscroll_pos = cStart - m_frame_rect.UpperLeftCorner.X;
-		else
-			m_hscroll_pos = 0;
-
-		// todo: adjust scrollbar
-	}
-
-	if (!m_word_wrap && !m_multiline)
-		return;
-
-	// vertical scroll position
-	if (m_frame_rect.LowerRightCorner.Y < m_current_text_rect.LowerRightCorner.Y)
-		m_vscroll_pos += m_current_text_rect.LowerRightCorner.Y - m_frame_rect.LowerRightCorner.Y; // scrolling downwards
-	else if (m_frame_rect.UpperLeftCorner.Y > m_current_text_rect.UpperLeftCorner.Y)
-		m_vscroll_pos += m_current_text_rect.UpperLeftCorner.Y - m_frame_rect.UpperLeftCorner.Y; // scrolling upwards
-
-	// todo: adjust scrollbar
-	if (m_vscrollbar)
-		m_vscrollbar->setPos(m_vscroll_pos);
-}
-
-
-//! Create a vertical scrollbar
-void intlGUIEditBox::createVScrollBar()
-{
-	s32 fontHeight = 1;
-
-	if (m_override_font) {
-		fontHeight = m_override_font->getDimension(L"").Height;
-	} else {
-		if (IGUISkin* skin = Environment->getSkin()) {
-			if (IGUIFont* font = skin->getFont()) {
-				fontHeight = font->getDimension(L"").Height;
-			}
-		}
-	}
-
-	irr::core::rect<s32> scrollbarrect = m_frame_rect;
-	scrollbarrect.UpperLeftCorner.X += m_frame_rect.getWidth() - m_scrollbar_width;
-	m_vscrollbar = new GUIScrollBar(Environment, getParent(), -1,
-			scrollbarrect, false, true);
-
-	m_vscrollbar->setVisible(false);
-	m_vscrollbar->setSmallStep(3 * fontHeight);
-	m_vscrollbar->setLargeStep(10 * fontHeight);
-}
-
-
-//! Writes attributes of the element.
-void intlGUIEditBox::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
-{
-	// IGUIEditBox::serializeAttributes(out,options);
-
-	out->addBool  ("OverrideColorEnabled", m_override_color_enabled );
-	out->addColor ("OverrideColor",        m_override_color);
-	// out->addFont("OverrideFont",m_override_font);
-	out->addInt   ("MaxChars",             m_max);
-	out->addBool  ("WordWrap",             m_word_wrap);
-	out->addBool  ("MultiLine",            m_multiline);
-	out->addBool  ("AutoScroll",           m_autoscroll);
-	out->addBool  ("PasswordBox",          m_passwordbox);
-	core::stringw ch = L" ";
-	ch[0] = m_passwordchar;
-	out->addString("PasswordChar",         ch.c_str());
-	out->addEnum  ("HTextAlign",           m_halign, GUIAlignmentNames);
-	out->addEnum  ("VTextAlign",           m_valign, GUIAlignmentNames);
-	out->addBool  ("Writable",             m_writable);
-
-	IGUIEditBox::serializeAttributes(out,options);
-}
-
-
-//! Reads attributes of the element
-void intlGUIEditBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
-{
-	IGUIEditBox::deserializeAttributes(in,options);
-
-	setOverrideColor(in->getAttributeAsColor("OverrideColor"));
-	enableOverrideColor(in->getAttributeAsBool("OverrideColorEnabled"));
-	setMax(in->getAttributeAsInt("MaxChars"));
-	setWordWrap(in->getAttributeAsBool("WordWrap"));
-	setMultiLine(in->getAttributeAsBool("MultiLine"));
-	setAutoScroll(in->getAttributeAsBool("AutoScroll"));
-	core::stringw ch = in->getAttributeAsStringW("PasswordChar");
-
-	if (ch.empty())
-		setPasswordBox(in->getAttributeAsBool("PasswordBox"));
-	else
-		setPasswordBox(in->getAttributeAsBool("PasswordBox"), ch[0]);
-
-	setTextAlignment( (EGUI_ALIGNMENT) in->getAttributeAsEnumeration("HTextAlign", GUIAlignmentNames),
-			(EGUI_ALIGNMENT) in->getAttributeAsEnumeration("VTextAlign", GUIAlignmentNames));
-
-	setWritable(in->getAttributeAsBool("Writable"));
-	// setOverrideFont(in->getAttributeAsFont("OverrideFont"));
-}
-
-
-} // end namespace gui
-} // end namespace irr
diff --git a/src/gui/intlGUIEditBox.h b/src/gui/intlGUIEditBox.h
deleted file mode 100644
index 2abc12d1a..000000000
--- a/src/gui/intlGUIEditBox.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (C) 2002-2013 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#pragma once
-
-#include "IrrCompileConfig.h"
-//#ifdef _IRR_COMPILE_WITH_GUI_
-
-#include "guiEditBox.h"
-#include "irrArray.h"
-#include "IOSOperator.h"
-
-namespace irr
-{
-namespace gui
-{
-	class intlGUIEditBox : public GUIEditBox
-	{
-	public:
-
-		//! constructor
-		intlGUIEditBox(const wchar_t* text, bool border, IGUIEnvironment* environment,
-			IGUIElement* parent, s32 id, const core::rect<s32>& rectangle,
-			bool writable = true, bool has_vscrollbar = false);
-
-		//! destructor
-		virtual ~intlGUIEditBox() {}
-
-		//! Sets whether to draw the background
-		virtual void setDrawBackground(bool draw);
-
-		virtual bool isDrawBackgroundEnabled() const { return true; }
-
-		//! draws the element and its children
-		virtual void draw();
-
-		//! Updates the absolute position, splits text if required
-		virtual void updateAbsolutePosition();
-
-		//! Writes attributes of the element.
-		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;
-
-		//! Reads attributes of the element
-		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
-
-		virtual void setCursorChar(const wchar_t cursorChar) {}
-
-		virtual wchar_t getCursorChar() const { return L'|'; }
-
-		virtual void setCursorBlinkTime(u32 timeMs) {}
-
-		virtual u32 getCursorBlinkTime() const { return 500; }
-
-	protected:
-		//! Breaks the single text line.
-		virtual void breakText();
-		//! sets the area of the given line
-		virtual void setTextRect(s32 line);
-		//! adds a letter to the edit box
-		virtual void inputChar(wchar_t c);
-		//! calculates the current scroll position
-		void calculateScrollPos();
-
-		s32 getCursorPos(s32 x, s32 y);
-
-		//! Create a vertical scrollbar
-		void createVScrollBar();
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-//#endif // _IRR_COMPILE_WITH_GUI_
diff --git a/src/gui/modalMenu.cpp b/src/gui/modalMenu.cpp
index 9b1e6dd9c..0d3fb55f0 100644
--- a/src/gui/modalMenu.cpp
+++ b/src/gui/modalMenu.cpp
@@ -183,6 +183,64 @@ static bool isChild(gui::IGUIElement *tocheck, gui::IGUIElement *parent)
 	return false;
 }
 
+#ifdef __ANDROID__
+
+bool GUIModalMenu::simulateMouseEvent(
+		gui::IGUIElement *target, ETOUCH_INPUT_EVENT touch_event)
+{
+	SEvent mouse_event{}; // value-initialized, not unitialized
+	mouse_event.EventType = EET_MOUSE_INPUT_EVENT;
+	mouse_event.MouseInput.X = m_pointer.X;
+	mouse_event.MouseInput.Y = m_pointer.Y;
+	switch (touch_event) {
+	case ETIE_PRESSED_DOWN:
+		mouse_event.MouseInput.Event = EMIE_LMOUSE_PRESSED_DOWN;
+		mouse_event.MouseInput.ButtonStates = EMBSM_LEFT;
+		break;
+	case ETIE_MOVED:
+		mouse_event.MouseInput.Event = EMIE_MOUSE_MOVED;
+		mouse_event.MouseInput.ButtonStates = EMBSM_LEFT;
+		break;
+	case ETIE_LEFT_UP:
+		mouse_event.MouseInput.Event = EMIE_LMOUSE_LEFT_UP;
+		mouse_event.MouseInput.ButtonStates = 0;
+		break;
+	default:
+		return false;
+	}
+	if (preprocessEvent(mouse_event))
+		return true;
+	if (!target)
+		return false;
+	return target->OnEvent(mouse_event);
+}
+
+void GUIModalMenu::enter(gui::IGUIElement *hovered)
+{
+	sanity_check(!m_hovered);
+	m_hovered.grab(hovered);
+	SEvent gui_event{};
+	gui_event.EventType = EET_GUI_EVENT;
+	gui_event.GUIEvent.Caller = m_hovered.get();
+	gui_event.GUIEvent.EventType = EGET_ELEMENT_HOVERED;
+	gui_event.GUIEvent.Element = gui_event.GUIEvent.Caller;
+	m_hovered->OnEvent(gui_event);
+}
+
+void GUIModalMenu::leave()
+{
+	if (!m_hovered)
+		return;
+	SEvent gui_event{};
+	gui_event.EventType = EET_GUI_EVENT;
+	gui_event.GUIEvent.Caller = m_hovered.get();
+	gui_event.GUIEvent.EventType = EGET_ELEMENT_LEFT;
+	m_hovered->OnEvent(gui_event);
+	m_hovered.reset();
+}
+
+#endif
+
 bool GUIModalMenu::preprocessEvent(const SEvent &event)
 {
 #ifdef __ANDROID__
@@ -230,89 +288,50 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
 	}
 
 	if (event.EventType == EET_TOUCH_INPUT_EVENT) {
-		SEvent translated;
-		memset(&translated, 0, sizeof(SEvent));
-		translated.EventType = EET_MOUSE_INPUT_EVENT;
-		gui::IGUIElement *root = Environment->getRootGUIElement();
-
-		if (!root) {
-			errorstream << "GUIModalMenu::preprocessEvent"
-				    << " unable to get root element" << std::endl;
-			return false;
-		}
-		gui::IGUIElement *hovered =
-				root->getElementFromPoint(core::position2d<s32>(
-						event.TouchInput.X, event.TouchInput.Y));
-
-		translated.MouseInput.X = event.TouchInput.X;
-		translated.MouseInput.Y = event.TouchInput.Y;
-		translated.MouseInput.Control = false;
+		irr_ptr<GUIModalMenu> holder;
+		holder.grab(this); // keep this alive until return (it might be dropped downstream [?])
 
-		if (event.TouchInput.touchedCount == 1) {
-			switch (event.TouchInput.Event) {
-			case ETIE_PRESSED_DOWN:
+		switch ((int)event.TouchInput.touchedCount) {
+		case 1: {
+			if (event.TouchInput.Event == ETIE_PRESSED_DOWN || event.TouchInput.Event == ETIE_MOVED)
 				m_pointer = v2s32(event.TouchInput.X, event.TouchInput.Y);
-				translated.MouseInput.Event = EMIE_LMOUSE_PRESSED_DOWN;
-				translated.MouseInput.ButtonStates = EMBSM_LEFT;
+			if (event.TouchInput.Event == ETIE_PRESSED_DOWN)
 				m_down_pos = m_pointer;
-				break;
-			case ETIE_MOVED:
-				m_pointer = v2s32(event.TouchInput.X, event.TouchInput.Y);
-				translated.MouseInput.Event = EMIE_MOUSE_MOVED;
-				translated.MouseInput.ButtonStates = EMBSM_LEFT;
-				break;
-			case ETIE_LEFT_UP:
-				translated.MouseInput.Event = EMIE_LMOUSE_LEFT_UP;
-				translated.MouseInput.ButtonStates = 0;
-				hovered = root->getElementFromPoint(m_down_pos);
-				// we don't have a valid pointer element use last
-				// known pointer pos
-				translated.MouseInput.X = m_pointer.X;
-				translated.MouseInput.Y = m_pointer.Y;
-
-				// reset down pos
-				m_down_pos = v2s32(0, 0);
-				break;
-			default:
-				break;
+			gui::IGUIElement *hovered = Environment->getRootGUIElement()->getElementFromPoint(core::position2d<s32>(m_pointer));
+			if (event.TouchInput.Event == ETIE_PRESSED_DOWN)
+				Environment->setFocus(hovered);
+			if (m_hovered != hovered) {
+				leave();
+				enter(hovered);
 			}
-		} else if ((event.TouchInput.touchedCount == 2) &&
-				(event.TouchInput.Event == ETIE_PRESSED_DOWN)) {
-			hovered = root->getElementFromPoint(m_down_pos);
-
-			translated.MouseInput.Event = EMIE_RMOUSE_PRESSED_DOWN;
-			translated.MouseInput.ButtonStates = EMBSM_LEFT | EMBSM_RIGHT;
-			translated.MouseInput.X = m_pointer.X;
-			translated.MouseInput.Y = m_pointer.Y;
-			if (hovered)
-				hovered->OnEvent(translated);
-
-			translated.MouseInput.Event = EMIE_RMOUSE_LEFT_UP;
-			translated.MouseInput.ButtonStates = EMBSM_LEFT;
-
-			if (hovered)
-				hovered->OnEvent(translated);
-
-			return true;
-		} else {
-			// ignore unhandled 2 touch events (accidental moving for example)
+			gui::IGUIElement *focused = Environment->getFocus();
+			bool ret = simulateMouseEvent(focused, event.TouchInput.Event);
+			if (!ret && m_hovered != focused)
+				ret = simulateMouseEvent(m_hovered.get(), event.TouchInput.Event);
+			if (event.TouchInput.Event == ETIE_LEFT_UP)
+				leave();
+			return ret;
+		}
+		case 2: {
+			if (event.TouchInput.Event != ETIE_PRESSED_DOWN)
+				return true; // ignore
+			auto focused = Environment->getFocus();
+			if (!focused)
+				return true;
+			SEvent rclick_event{};
+			rclick_event.EventType = EET_MOUSE_INPUT_EVENT;
+			rclick_event.MouseInput.Event = EMIE_RMOUSE_PRESSED_DOWN;
+			rclick_event.MouseInput.ButtonStates = EMBSM_LEFT | EMBSM_RIGHT;
+			rclick_event.MouseInput.X = m_pointer.X;
+			rclick_event.MouseInput.Y = m_pointer.Y;
+			focused->OnEvent(rclick_event);
+			rclick_event.MouseInput.Event = EMIE_RMOUSE_LEFT_UP;
+			rclick_event.MouseInput.ButtonStates = EMBSM_LEFT;
+			focused->OnEvent(rclick_event);
 			return true;
 		}
-
-		// check if translated event needs to be preprocessed again
-		if (preprocessEvent(translated))
+		default: // ignored
 			return true;
-
-		if (hovered) {
-			grab();
-			bool retval = hovered->OnEvent(translated);
-
-			if (event.TouchInput.Event == ETIE_LEFT_UP)
-				// reset pointer
-				m_pointer = v2s32(0, 0);
-
-			drop();
-			return retval;
 		}
 	}
 #endif
diff --git a/src/gui/modalMenu.h b/src/gui/modalMenu.h
index 1cb687f82..ed0da3205 100644
--- a/src/gui/modalMenu.h
+++ b/src/gui/modalMenu.h
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 
 #include "irrlichttypes_extrabloated.h"
+#include "irr_ptr.h"
 #include "util/string.h"
 
 class GUIModalMenu;
@@ -100,4 +101,12 @@ private:
 	// This might be necessary to expose to the implementation if it
 	// wants to launch other menus
 	bool m_allow_focus_removal = false;
+
+#ifdef __ANDROID__
+	irr_ptr<gui::IGUIElement> m_hovered;
+
+	bool simulateMouseEvent(gui::IGUIElement *target, ETOUCH_INPUT_EVENT touch_event);
+	void enter(gui::IGUIElement *element);
+	void leave();
+#endif
 };
diff --git a/src/gui/touchscreengui.cpp b/src/gui/touchscreengui.cpp
index e1a971462..78b18c2d9 100644
--- a/src/gui/touchscreengui.cpp
+++ b/src/gui/touchscreengui.cpp
@@ -40,7 +40,7 @@ const char **button_imagenames = (const char *[]) {
 	"jump_btn.png",
 	"down.png",
 	"zoom.png",
-	"aux_btn.png"
+	"aux1_btn.png"
 };
 
 const char **joystick_imagenames = (const char *[]) {
@@ -80,8 +80,8 @@ static irr::EKEY_CODE id2keycode(touch_gui_button_id id)
 		case zoom_id:
 			key = "zoom";
 			break;
-		case special1_id:
-			key = "special1";
+		case aux1_id:
+			key = "aux1";
 			break;
 		case fly_id:
 			key = "freemove";
@@ -425,7 +425,7 @@ TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver *receiver)
 
 	m_touchscreen_threshold = g_settings->getU16("touchscreen_threshold");
 	m_fixed_joystick = g_settings->getBool("fixed_virtual_joystick");
-	m_joystick_triggers_special1 = g_settings->getBool("virtual_joystick_triggers_aux");
+	m_joystick_triggers_aux1 = g_settings->getBool("virtual_joystick_triggers_aux1");
 	m_screensize = m_device->getVideoDriver()->getScreenSize();
 	button_size = MYMIN(m_screensize.Y / 4.5f,
 			porting::getDisplayDensity() *
@@ -521,9 +521,9 @@ void TouchScreenGUI::init(ISimpleTextureSource *tsrc)
 					m_screensize.Y - (3 * button_size)),
 			L"z", false);
 
-	// init special1/aux button
-	if (!m_joystick_triggers_special1)
-		initButton(special1_id,
+	// init aux1 button
+	if (!m_joystick_triggers_aux1)
+		initButton(aux1_id,
 				rect<s32>(m_screensize.X - (1.25 * button_size),
 						m_screensize.Y - (2.5 * button_size),
 						m_screensize.X - (0.25 * button_size),
@@ -923,7 +923,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
 				}
 
 				if (distance > button_size) {
-					m_joystick_status[j_special1] = true;
+					m_joystick_status[j_aux1] = true;
 					// move joystick "button"
 					s32 ndx = button_size * dx / distance - button_size / 2.0f;
 					s32 ndy = button_size * dy / distance - button_size / 2.0f;
@@ -1039,7 +1039,7 @@ bool TouchScreenGUI::doubleTapDetection()
 void TouchScreenGUI::applyJoystickStatus()
 {
 	for (unsigned int i = 0; i < 5; i++) {
-		if (i == 4 && !m_joystick_triggers_special1)
+		if (i == 4 && !m_joystick_triggers_aux1)
 			continue;
 
 		SEvent translated{};
diff --git a/src/gui/touchscreengui.h b/src/gui/touchscreengui.h
index 761d33207..ad5abae87 100644
--- a/src/gui/touchscreengui.h
+++ b/src/gui/touchscreengui.h
@@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
+#include "irrlichttypes.h"
 #include <IEventReceiver.h>
 #include <IGUIButton.h>
 #include <IGUIEnvironment.h>
@@ -38,7 +39,7 @@ typedef enum
 	jump_id = 0,
 	crunch_id,
 	zoom_id,
-	special1_id,
+	aux1_id,
 	after_last_element_id,
 	settings_starter_id,
 	rare_controls_starter_id,
@@ -68,7 +69,7 @@ typedef enum
 	j_backward,
 	j_left,
 	j_right,
-	j_special1
+	j_aux1
 } touch_gui_joystick_move_id;
 
 typedef enum
@@ -216,7 +217,7 @@ private:
 
 	// forward, backward, left, right
 	touch_gui_button_id m_joystick_names[5] = {
-			forward_id, backward_id, left_id, right_id, special1_id};
+			forward_id, backward_id, left_id, right_id, aux1_id};
 	bool m_joystick_status[5] = {false, false, false, false, false};
 
 	/*
@@ -236,7 +237,7 @@ private:
 	int m_joystick_id = -1;
 	bool m_joystick_has_really_moved = false;
 	bool m_fixed_joystick = false;
-	bool m_joystick_triggers_special1 = false;
+	bool m_joystick_triggers_aux1 = false;
 	button_info *m_joystick_btn_off = nullptr;
 	button_info *m_joystick_btn_bg = nullptr;
 	button_info *m_joystick_btn_center = nullptr;
diff --git a/src/httpfetch.cpp b/src/httpfetch.cpp
index 65202ce3e..6137782ff 100644
--- a/src/httpfetch.cpp
+++ b/src/httpfetch.cpp
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include <sstream>
 #include <list>
-#include <map>
+#include <unordered_map>
 #include <cerrno>
 #include <mutex>
 #include "network/socket.h" // for select()
@@ -37,13 +37,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "noise.h"
 
-std::mutex g_httpfetch_mutex;
-std::map<unsigned long, std::queue<HTTPFetchResult> > g_httpfetch_results;
-PcgRandom g_callerid_randomness;
+static std::mutex g_httpfetch_mutex;
+static std::unordered_map<unsigned long, std::queue<HTTPFetchResult>>
+	g_httpfetch_results;
+static PcgRandom g_callerid_randomness;
 
 HTTPFetchRequest::HTTPFetchRequest() :
 	timeout(g_settings->getS32("curl_timeout")),
-	connect_timeout(timeout),
+	connect_timeout(10 * 1000),
 	useragent(std::string(PROJECT_NAME_C "/") + g_version_hash + " (" + porting::get_sysinfo() + ")")
 {
 }
@@ -54,7 +55,7 @@ static void httpfetch_deliver_result(const HTTPFetchResult &fetch_result)
 	unsigned long caller = fetch_result.caller;
 	if (caller != HTTPFETCH_DISCARD) {
 		MutexAutoLock lock(g_httpfetch_mutex);
-		g_httpfetch_results[caller].push(fetch_result);
+		g_httpfetch_results[caller].emplace(fetch_result);
 	}
 }
 
@@ -67,8 +68,7 @@ unsigned long httpfetch_caller_alloc()
 	// Check each caller ID except HTTPFETCH_DISCARD
 	const unsigned long discard = HTTPFETCH_DISCARD;
 	for (unsigned long caller = discard + 1; caller != discard; ++caller) {
-		std::map<unsigned long, std::queue<HTTPFetchResult> >::iterator
-			it = g_httpfetch_results.find(caller);
+		auto it = g_httpfetch_results.find(caller);
 		if (it == g_httpfetch_results.end()) {
 			verbosestream << "httpfetch_caller_alloc: allocating "
 					<< caller << std::endl;
@@ -127,8 +127,7 @@ bool httpfetch_async_get(unsigned long caller, HTTPFetchResult &fetch_result)
 	MutexAutoLock lock(g_httpfetch_mutex);
 
 	// Check that caller exists
-	std::map<unsigned long, std::queue<HTTPFetchResult> >::iterator
-		it = g_httpfetch_results.find(caller);
+	auto it = g_httpfetch_results.find(caller);
 	if (it == g_httpfetch_results.end())
 		return false;
 
@@ -138,7 +137,7 @@ bool httpfetch_async_get(unsigned long caller, HTTPFetchResult &fetch_result)
 		return false;
 
 	// Pop first result
-	fetch_result = caller_results.front();
+	fetch_result = std::move(caller_results.front());
 	caller_results.pop();
 	return true;
 }
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 1ef9b13cd..fc1aaf371 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -965,13 +965,14 @@ InventoryList * Inventory::getList(const std::string &name)
 {
 	s32 i = getListIndex(name);
 	if(i == -1)
-		return NULL;
+		return nullptr;
 	return m_lists[i];
 }
 
 std::vector<const InventoryList*> Inventory::getLists()
 {
 	std::vector<const InventoryList*> lists;
+	lists.reserve(m_lists.size());
 	for (auto list : m_lists) {
 		lists.push_back(list);
 	}
@@ -990,11 +991,11 @@ bool Inventory::deleteList(const std::string &name)
 	return true;
 }
 
-const InventoryList * Inventory::getList(const std::string &name) const
+const InventoryList *Inventory::getList(const std::string &name) const
 {
 	s32 i = getListIndex(name);
 	if(i == -1)
-		return NULL;
+		return nullptr;
 	return m_lists[i];
 }
 
diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index 635bd2e4b..1e81c1dbc 100644
--- a/src/inventorymanager.cpp
+++ b/src/inventorymanager.cpp
@@ -301,6 +301,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 			if (!list_to->getItem(dest_i).empty()) {
 				to_i = dest_i;
 				apply(mgr, player, gamedef);
+				assert(move_count <= count);
 				count -= move_count;
 			}
 		}
@@ -339,7 +340,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 	*/
 
 	ItemStack src_item = list_from->getItem(from_i);
-	if (count > 0)
+	if (count > 0 && count < src_item.count)
 		src_item.count = count;
 	if (src_item.empty())
 		return;
@@ -352,10 +353,12 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 	bool allow_swap = !list_to->itemFits(to_i, src_item, &restitem)
 		&& restitem.count == src_item.count
 		&& !caused_by_move_somewhere;
+	move_count = src_item.count - restitem.count;
 
 	// Shift-click: Cannot fill this stack, proceed with next slot
-	if (caused_by_move_somewhere && restitem.count == src_item.count)
+	if (caused_by_move_somewhere && move_count == 0) {
 		return;
+	}
 
 	if (allow_swap) {
 		// Swap will affect the entire stack if it can performed.
@@ -384,9 +387,16 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 			src_can_take_count = dst_can_put_count = 0;
 	} else {
 		// Take from one inventory, put into another
+		int src_item_count = src_item.count;
+		if (caused_by_move_somewhere)
+			// When moving somewhere: temporarily use the actual movable stack
+			// size to ensure correct callback execution.
+			src_item.count = move_count;
 		dst_can_put_count = allowPut(src_item, player);
 		src_can_take_count = allowTake(src_item, player);
-		
+		if (caused_by_move_somewhere)
+			// Reset source item count
+			src_item.count = src_item_count;
 		bool swap_expected = allow_swap;
 		allow_swap = allow_swap
 			&& (src_can_take_count == -1 || src_can_take_count >= src_item.count)
@@ -416,12 +426,17 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 		count = src_can_take_count;
 	if (dst_can_put_count != -1 && count > dst_can_put_count)
 		count = dst_can_put_count;
+
 	/* Limit according to source item count */
 	if (count > list_from->getItem(from_i).count)
 		count = list_from->getItem(from_i).count;
 
 	/* If no items will be moved, don't go further */
 	if (count == 0) {
+		if (caused_by_move_somewhere)
+			// Set move count to zero, as no items have been moved
+			move_count = 0;
+
 		// Undo client prediction. See 'clientApply'
 		if (from_inv.type == InventoryLocation::PLAYER)
 			list_from->setModified();
@@ -438,6 +453,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 				<<" list=\""<<to_list<<"\""
 				<<" i="<<to_i
 				<<std::endl;
+
 		return;
 	}
 
@@ -455,6 +471,8 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 	bool did_swap = false;
 	move_count = list_from->moveItem(from_i,
 		list_to, to_i, count, allow_swap, &did_swap);
+	if (caused_by_move_somewhere)
+		count = old_count;
 	assert(allow_swap == did_swap);
 
 	// If source is infinite, reset it's stack
@@ -503,8 +521,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 			<< std::endl;
 
 	// If we are inside the move somewhere loop, we don't need to report
-	// anything if nothing happened (perhaps we don't need to report
-	// anything for caused_by_move_somewhere == true, but this way its safer)
+	// anything if nothing happened
 	if (caused_by_move_somewhere && move_count == 0)
 		return;
 
@@ -558,7 +575,15 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
 		}
 		mgr->setInventoryModified(from_inv);
 	} else {
+		int src_item_count = src_item.count;
+		if (caused_by_move_somewhere)
+			// When moving somewhere: temporarily use the actual movable stack
+			// size to ensure correct callback execution.
+			src_item.count = move_count;
 		onPutAndOnTake(src_item, player);
+		if (caused_by_move_somewhere)
+			// Reset source item count
+			src_item.count = src_item_count;
 		if (did_swap) {
 			// Item is now placed in source list
 			src_item = list_from->getItem(from_i);
diff --git a/src/irr_ptr.h b/src/irr_ptr.h
index 5022adb9d..42b409676 100644
--- a/src/irr_ptr.h
+++ b/src/irr_ptr.h
@@ -27,9 +27,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
  * It should only be used for user-managed objects, i.e. those created with
  * the @c new operator or @c create* functions, like:
  * `irr_ptr<scene::IMeshBuffer> buf{new scene::SMeshBuffer()};`
+ * The reference counting is *not* balanced as new objects have reference
+ * count set to one, and the @c irr_ptr constructor (and @c reset) assumes
+ * ownership of that reference.
  *
- * It should *never* be used for engine-managed objects, including
- * those created with @c addTexture and similar methods.
+ * It shouldn’t be used for engine-managed objects, including those created
+ * with @c addTexture and similar methods. Constructing @c irr_ptr directly
+ * from such object is a bug and may lead to a crash. Indirect construction
+ * is possible though; see the @c grab free function for details and use cases.
  */
 template <class ReferenceCounted,
 		class = typename std::enable_if<std::is_base_of<IReferenceCounted,
@@ -38,16 +43,6 @@ class irr_ptr
 {
 	ReferenceCounted *value = nullptr;
 
-	/** Drops stored pointer replacing it with the given one.
-	 * @note Copy semantics: reference counter *is* increased.
-	 */
-	void grab(ReferenceCounted *object)
-	{
-		if (object)
-			object->grab();
-		reset(object);
-	}
-
 public:
 	irr_ptr() {}
 
@@ -71,8 +66,10 @@ public:
 		reset(b.release());
 	}
 
-	/** Constructs a shared pointer out of a plain one
+	/** Constructs a shared pointer out of a plain one to control object lifetime.
+	 * @param object The object, usually returned by some @c create* function.
 	 * @note Move semantics: reference counter is *not* increased.
+	 * @warning Never wrap any @c add* function with this!
 	 */
 	explicit irr_ptr(ReferenceCounted *object) noexcept { reset(object); }
 
@@ -134,4 +131,70 @@ public:
 			value->drop();
 		value = object;
 	}
+
+	/** Drops stored pointer replacing it with the given one.
+	 * @note Copy semantics: reference counter *is* increased.
+	 */
+	void grab(ReferenceCounted *object) noexcept
+	{
+		if (object)
+			object->grab();
+		reset(object);
+	}
 };
+
+// clang-format off
+// ^ dislikes long lines
+
+/** Constructs a shared pointer as a *secondary* reference to an object
+ *
+ * This function is intended to make a temporary reference to an object which
+ * is owned elsewhere so that it is not destroyed too early. To acheive that
+ * it does balanced reference counting, i.e. reference count is increased
+ * in this function and decreased when the returned pointer is destroyed.
+ */
+template <class ReferenceCounted>
+irr_ptr<ReferenceCounted> grab(ReferenceCounted *object) noexcept
+{
+	irr_ptr<ReferenceCounted> ptr;
+	ptr.grab(object);
+	return ptr;
+}
+
+template <typename ReferenceCounted>
+bool operator==(const irr_ptr<ReferenceCounted> &a, const irr_ptr<ReferenceCounted> &b) noexcept
+{
+	return a.get() == b.get();
+}
+
+template <typename ReferenceCounted>
+bool operator==(const irr_ptr<ReferenceCounted> &a, const ReferenceCounted *b) noexcept
+{
+	return a.get() == b;
+}
+
+template <typename ReferenceCounted>
+bool operator==(const ReferenceCounted *a, const irr_ptr<ReferenceCounted> &b) noexcept
+{
+	return a == b.get();
+}
+
+template <typename ReferenceCounted>
+bool operator!=(const irr_ptr<ReferenceCounted> &a, const irr_ptr<ReferenceCounted> &b) noexcept
+{
+	return a.get() != b.get();
+}
+
+template <typename ReferenceCounted>
+bool operator!=(const irr_ptr<ReferenceCounted> &a, const ReferenceCounted *b) noexcept
+{
+	return a.get() != b;
+}
+
+template <typename ReferenceCounted>
+bool operator!=(const ReferenceCounted *a, const irr_ptr<ReferenceCounted> &b) noexcept
+{
+	return a != b.get();
+}
+
+// clang-format on
diff --git a/src/irrlicht_changes/CGUITTFont.cpp b/src/irrlicht_changes/CGUITTFont.cpp
index bd4e700de..e785ea837 100644
--- a/src/irrlicht_changes/CGUITTFont.cpp
+++ b/src/irrlicht_changes/CGUITTFont.cpp
@@ -103,7 +103,7 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide
 
 			// Load the monochrome data in.
 			const u32 image_pitch = image->getPitch() / sizeof(u16);
-			u16* image_data = (u16*)image->lock();
+			u16* image_data = (u16*)image->getData();
 			u8* glyph_data = bits.buffer;
 
 			for (s32 y = 0; y < (s32)bits.rows; ++y)
@@ -119,7 +119,6 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide
 				}
 				image_data += image_pitch;
 			}
-			image->unlock();
 			break;
 		}
 
@@ -133,7 +132,7 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide
 			// Load the grayscale data in.
 			const float gray_count = static_cast<float>(bits.num_grays);
 			const u32 image_pitch = image->getPitch() / sizeof(u32);
-			u32* image_data = (u32*)image->lock();
+			u32* image_data = (u32*)image->getData();
 			u8* glyph_data = bits.buffer;
 			for (s32 y = 0; y < (s32)bits.rows; ++y)
 			{
@@ -145,7 +144,6 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide
 				}
 				glyph_data += bits.pitch;
 			}
-			image->unlock();
 			break;
 		}
 		default:
@@ -277,7 +275,8 @@ CGUITTFont* CGUITTFont::create(IrrlichtDevice *device, const io::path& filename,
 //! Constructor.
 CGUITTFont::CGUITTFont(IGUIEnvironment *env)
 : use_monochrome(false), use_transparency(true), use_hinting(true), use_auto_hinting(true),
-batch_load_size(1), Device(0), Environment(env), Driver(0), GlobalKerningWidth(0), GlobalKerningHeight(0)
+batch_load_size(1), Device(0), Environment(env), Driver(0), GlobalKerningWidth(0), GlobalKerningHeight(0),
+shadow_offset(0), shadow_alpha(0), fallback(0)
 {
 	#ifdef _DEBUG
 	setDebugName("CGUITTFont");
@@ -548,12 +547,12 @@ void CGUITTFont::setFontHinting(const bool enable, const bool enable_auto_hintin
 
 void CGUITTFont::draw(const core::stringw& text, const core::rect<s32>& position, video::SColor color, bool hcenter, bool vcenter, const core::rect<s32>* clip)
 {
-	draw(EnrichedString(std::wstring(text.c_str()), color), position, color, hcenter, vcenter, clip);
+	draw(EnrichedString(std::wstring(text.c_str()), color), position, hcenter, vcenter, clip);
 }
 
-void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& position, video::SColor color, bool hcenter, bool vcenter, const core::rect<s32>* clip)
+void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& position, bool hcenter, bool vcenter, const core::rect<s32>* clip)
 {
-	std::vector<video::SColor> colors = text.getColors();
+	const std::vector<video::SColor> &colors = text.getColors();
 
 	if (!Driver)
 		return;
@@ -563,6 +562,7 @@ void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& positio
 	{
 		Glyph_Pages[i]->render_positions.clear();
 		Glyph_Pages[i]->render_source_rects.clear();
+		Glyph_Pages[i]->render_colors.clear();
 	}
 
 	// Set up some variables.
@@ -591,7 +591,6 @@ void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& positio
 	u32 n;
 	uchar32_t previousChar = 0;
 	core::ustring::const_iterator iter(utext);
-	std::vector<video::SColor> applied_colors;
 	while (!iter.atEnd())
 	{
 		uchar32_t currentChar = *iter;
@@ -637,12 +636,36 @@ void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& positio
 			CGUITTGlyphPage* const page = Glyph_Pages[glyph.glyph_page];
 			page->render_positions.push_back(core::position2di(offset.X + offx, offset.Y + offy));
 			page->render_source_rects.push_back(glyph.source_rect);
+			if (iter.getPos() < colors.size())
+				page->render_colors.push_back(colors[iter.getPos()]);
+			else
+				page->render_colors.push_back(video::SColor(255,255,255,255));
 			Render_Map.set(glyph.glyph_page, page);
-			u32 current_color = iter.getPos();
-			if (current_color < colors.size())
-				applied_colors.push_back(colors[current_color]);
 		}
-		offset.X += getWidthFromCharacter(currentChar);
+		if (n > 0)
+		{
+			offset.X += getWidthFromCharacter(currentChar);
+		}
+		else if (fallback != 0)
+		{
+			// Let the fallback font draw it, this isn't super efficient but hopefully that doesn't matter
+			wchar_t l1[] = { (wchar_t) currentChar, 0 }, l2 = (wchar_t) previousChar;
+
+			if (visible)
+			{
+				// Apply kerning.
+				offset.X += fallback->getKerningWidth(l1, &l2);
+				offset.Y += fallback->getKerningHeight();
+
+				u32 current_color = iter.getPos();
+				fallback->draw(core::stringw(l1),
+					core::rect<s32>({offset.X-1, offset.Y-1}, position.LowerRightCorner), // ???
+					current_color < colors.size() ? colors[current_color] : video::SColor(255, 255, 255, 255),
+					false, false, clip);
+			}
+
+			offset.X += fallback->getDimension(l1).Width;
+		}
 
 		previousChar = currentChar;
 		++iter;
@@ -666,16 +689,24 @@ void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& positio
 			for (size_t i = 0; i < page->render_positions.size(); ++i)
 				page->render_positions[i] -= core::vector2di(shadow_offset, shadow_offset);
 		}
+		// render runs of matching color in batch
+		size_t ibegin;
+		video::SColor colprev;
 		for (size_t i = 0; i < page->render_positions.size(); ++i) {
-			irr::video::SColor col;
-			if (!applied_colors.empty()) {
-				col = applied_colors[i < applied_colors.size() ? i : 0];
-			} else {
-				col = irr::video::SColor(255, 255, 255, 255);
-			}
+			ibegin = i;
+			colprev = page->render_colors[i];
+			do
+				++i;
+			while (i < page->render_positions.size() && page->render_colors[i] == colprev);
+			core::array<core::vector2di> tmp_positions;
+			core::array<core::recti> tmp_source_rects;
+			tmp_positions.set_pointer(&page->render_positions[ibegin], i - ibegin, false, false); // no copy
+			tmp_source_rects.set_pointer(&page->render_source_rects[ibegin], i - ibegin, false, false);
+			--i;
+
 			if (!use_transparency)
-				col.color |= 0xff000000;
-			Driver->draw2DImage(page->texture, page->render_positions[i], page->render_source_rects[i], clip, col, true);
+				colprev.color |= 0xff000000;
+			Driver->draw2DImageBatch(page->texture, tmp_positions, tmp_source_rects, clip, colprev, true);
 		}
 	}
 }
@@ -768,6 +799,12 @@ inline u32 CGUITTFont::getWidthFromCharacter(uchar32_t c) const
 		int w = Glyphs[n-1].advance.x / 64;
 		return w;
 	}
+	if (fallback != 0)
+	{
+		wchar_t s[] = { (wchar_t) c, 0 };
+		return fallback->getDimension(s).Width;
+	}
+
 	if (c >= 0x2000)
 		return (font_metrics.ascender / 64);
 	else return (font_metrics.ascender / 64) / 2;
@@ -791,6 +828,12 @@ inline u32 CGUITTFont::getHeightFromCharacter(uchar32_t c) const
 		s32 height = (font_metrics.ascender / 64) - Glyphs[n-1].offset.Y + Glyphs[n-1].source_rect.getHeight();
 		return height;
 	}
+	if (fallback != 0)
+	{
+		wchar_t s[] = { (wchar_t) c, 0 };
+		return fallback->getDimension(s).Height;
+	}
+
 	if (c >= 0x2000)
 		return (font_metrics.ascender / 64);
 	else return (font_metrics.ascender / 64) / 2;
@@ -806,9 +849,9 @@ u32 CGUITTFont::getGlyphIndexByChar(uchar32_t c) const
 	// Get the glyph.
 	u32 glyph = FT_Get_Char_Index(tt_face, c);
 
-	// Check for a valid glyph.  If it is invalid, attempt to use the replacement character.
+	// Check for a valid glyph.
 	if (glyph == 0)
-		glyph = FT_Get_Char_Index(tt_face, core::unicode::UTF_REPLACEMENT_CHARACTER);
+		return 0;
 
 	// If our glyph is already loaded, don't bother doing any batch loading code.
 	if (glyph != 0 && Glyphs[glyph - 1].isLoaded)
@@ -924,13 +967,26 @@ core::vector2di CGUITTFont::getKerning(const uchar32_t thisLetter, const uchar32
 
 	core::vector2di ret(GlobalKerningWidth, GlobalKerningHeight);
 
+	u32 n = getGlyphIndexByChar(thisLetter);
+
+	// If we don't have this glyph, ask fallback font
+	if (n == 0)
+	{
+		if (fallback != 0) {
+			wchar_t l1 = (wchar_t) thisLetter, l2 = (wchar_t) previousLetter;
+			ret.X = fallback->getKerningWidth(&l1, &l2);
+			ret.Y = fallback->getKerningHeight();
+		}
+		return ret;
+	}
+
 	// If we don't have kerning, no point in continuing.
 	if (!FT_HAS_KERNING(tt_face))
 		return ret;
 
 	// Get the kerning information.
 	FT_Vector v;
-	FT_Get_Kerning(tt_face, getGlyphIndexByChar(previousLetter), getGlyphIndexByChar(thisLetter), FT_KERNING_DEFAULT, &v);
+	FT_Get_Kerning(tt_face, getGlyphIndexByChar(previousLetter), n, FT_KERNING_DEFAULT, &v);
 
 	// If we have a scalable font, the return value will be in font points.
 	if (FT_IS_SCALABLE(tt_face))
@@ -962,6 +1018,9 @@ void CGUITTFont::setInvisibleCharacters(const core::ustring& s)
 video::IImage* CGUITTFont::createTextureFromChar(const uchar32_t& ch)
 {
 	u32 n = getGlyphIndexByChar(ch);
+	if (n == 0)
+		n = getGlyphIndexByChar((uchar32_t) core::unicode::UTF_REPLACEMENT_CHARACTER);
+
 	const SGUITTGlyph& glyph = Glyphs[n-1];
 	CGUITTGlyphPage* page = Glyph_Pages[glyph.glyph_page];
 
@@ -971,11 +1030,7 @@ video::IImage* CGUITTFont::createTextureFromChar(const uchar32_t& ch)
 	video::ITexture* tex = page->texture;
 
 	// Acquire a read-only lock of the corresponding page texture.
-	#if IRRLICHT_VERSION_MAJOR==1 && IRRLICHT_VERSION_MINOR>=8
 	void* ptr = tex->lock(video::ETLM_READ_ONLY);
-	#else
-	void* ptr = tex->lock(true);
-	#endif
 
 	video::ECOLOR_FORMAT format = tex->getColorFormat();
 	core::dimension2du tex_size = tex->getOriginalSize();
@@ -1132,11 +1187,7 @@ core::array<scene::ISceneNode*> CGUITTFont::addTextSceneNode(const wchar_t* text
 				// Now we copy planes corresponding to the letter size.
 				IMeshManipulator* mani = smgr->getMeshManipulator();
 				IMesh* meshcopy = mani->createMeshCopy(shared_plane_ptr_);
-				#if IRRLICHT_VERSION_MAJOR==1 && IRRLICHT_VERSION_MINOR>=8
 				mani->scale(meshcopy, vector3df((f32)letter_size.Width, (f32)letter_size.Height, 1));
-				#else
-				mani->scaleMesh(meshcopy, vector3df((f32)letter_size.Width, (f32)letter_size.Height, 1));
-				#endif
 
 				ISceneNode* current_node = smgr->addMeshSceneNode(meshcopy, parent, -1, current_pos);
 				meshcopy->drop();
@@ -1149,6 +1200,8 @@ core::array<scene::ISceneNode*> CGUITTFont::addTextSceneNode(const wchar_t* text
 				container.push_back(current_node);
 			}
 			offset.X += getWidthFromCharacter(current_char);
+			// Note that fallback font handling is missing here (Minetest never uses this)
+
 			previous_char = current_char;
 			++text;
 		}
diff --git a/src/irrlicht_changes/CGUITTFont.h b/src/irrlicht_changes/CGUITTFont.h
index 310f74f67..7b04ae828 100644
--- a/src/irrlicht_changes/CGUITTFont.h
+++ b/src/irrlicht_changes/CGUITTFont.h
@@ -34,7 +34,7 @@
 #include <irrlicht.h>
 #include <ft2build.h>
 #include <vector>
-#include "irrUString.h"
+#include <irrUString.h>
 #include "util/enriched_string.h"
 #include FT_FREETYPE_H
 
@@ -199,6 +199,7 @@ namespace gui
 
 			core::array<core::vector2di> render_positions;
 			core::array<core::recti> render_source_rects;
+			core::array<video::SColor> render_colors;
 
 		private:
 			core::array<const SGUITTGlyph*> glyph_to_be_paged;
@@ -269,8 +270,8 @@ namespace gui
 				video::SColor color, bool hcenter=false, bool vcenter=false,
 				const core::rect<s32>* clip=0);
 
-			virtual void draw(const EnrichedString& text, const core::rect<s32>& position,
-				video::SColor color, bool hcenter=false, bool vcenter=false,
+			void draw(const EnrichedString& text, const core::rect<s32>& position,
+				bool hcenter=false, bool vcenter=false,
 				const core::rect<s32>* clip=0);
 
 			//! Returns the dimension of a character produced by this font.
@@ -313,6 +314,9 @@ namespace gui
 			//! Get the last glyph page's index.
 			u32 getLastGlyphPageIndex() const { return Glyph_Pages.size() - 1; }
 
+			//! Set font that should be used for glyphs not present in ours
+			void setFallback(gui::IGUIFont* font) { fallback = font; }
+
 			//! Create corresponding character's software image copy from the font,
 			//! so you can use this data just like any ordinary video::IImage.
 			//! \param ch The character you need
@@ -387,6 +391,8 @@ namespace gui
 			core::ustring Invisible;
 			u32 shadow_offset;
 			u32 shadow_alpha;
+
+			gui::IGUIFont* fallback;
 	};
 
 } // end namespace gui
diff --git a/src/irrlicht_changes/CMakeLists.txt b/src/irrlicht_changes/CMakeLists.txt
index d2f66ab77..87c88f7e8 100644
--- a/src/irrlicht_changes/CMakeLists.txt
+++ b/src/irrlicht_changes/CMakeLists.txt
@@ -3,7 +3,7 @@ if (BUILD_CLIENT)
 		${CMAKE_CURRENT_SOURCE_DIR}/static_text.cpp
 	)
 
-	if (ENABLE_FREETYPE)
+	if (USE_FREETYPE)
 		set(client_irrlicht_changes_SRCS ${client_irrlicht_changes_SRCS}
 			${CMAKE_CURRENT_SOURCE_DIR}/CGUITTFont.cpp
 		)
diff --git a/src/irrlicht_changes/irrUString.h b/src/irrlicht_changes/irrUString.h
deleted file mode 100644
index 09172ee6d..000000000
--- a/src/irrlicht_changes/irrUString.h
+++ /dev/null
@@ -1,3891 +0,0 @@
-/*
-   Basic Unicode string class for Irrlicht.
-   Copyright (c) 2009-2011 John Norman
-
-   This software is provided 'as-is', without any express or implied
-   warranty. In no event will the authors be held liable for any
-   damages arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any
-   purpose, including commercial applications, and to alter it and
-   redistribute it freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you
-      must not claim that you wrote the original software. If you use
-      this software in a product, an acknowledgment in the product
-      documentation would be appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and
-      must not be misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-      distribution.
-
-   The original version of this class can be located at:
-   http://irrlicht.suckerfreegames.com/
-
-   John Norman
-   john@suckerfreegames.com
-*/
-
-#pragma once
-
-#if (__cplusplus > 199711L) || (_MSC_VER >= 1600) || defined(__GXX_EXPERIMENTAL_CXX0X__)
-#	define USTRING_CPP0X
-#	if defined(__GXX_EXPERIMENTAL_CXX0X__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))
-#		define USTRING_CPP0X_NEWLITERALS
-#	endif
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <cstddef>
-
-#ifdef _WIN32
-#define __BYTE_ORDER 0
-#define __LITTLE_ENDIAN 0
-#define __BIG_ENDIAN 1
-#elif defined(__MACH__) && defined(__APPLE__)
-#include <machine/endian.h>
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
-#include <sys/endian.h>
-#else
-#include <endian.h>
-#endif
-
-#ifdef USTRING_CPP0X
-#	include <utility>
-#endif
-
-#ifndef USTRING_NO_STL
-#	include <string>
-#	include <iterator>
-#	include <ostream>
-#endif
-
-#include "irrTypes.h"
-#include "irrAllocator.h"
-#include "irrArray.h"
-#include "irrMath.h"
-#include "irrString.h"
-#include "path.h"
-
-//! UTF-16 surrogate start values.
-static const irr::u16 UTF16_HI_SURROGATE = 0xD800;
-static const irr::u16 UTF16_LO_SURROGATE = 0xDC00;
-
-//! Is a UTF-16 code point a surrogate?
-#define UTF16_IS_SURROGATE(c)		(((c) & 0xF800) == 0xD800)
-#define UTF16_IS_SURROGATE_HI(c)	(((c) & 0xFC00) == 0xD800)
-#define UTF16_IS_SURROGATE_LO(c)	(((c) & 0xFC00) == 0xDC00)
-
-
-namespace irr
-{
-
-	// Define our character types.
-#ifdef USTRING_CPP0X_NEWLITERALS	// C++0x
-	typedef char32_t uchar32_t;
-	typedef char16_t uchar16_t;
-	typedef char uchar8_t;
-#else
-	typedef u32 uchar32_t;
-	typedef u16 uchar16_t;
-	typedef u8 uchar8_t;
-#endif
-
-namespace core
-{
-
-namespace unicode
-{
-
-//! The unicode replacement character.  Used to replace invalid characters.
-const irr::u16 UTF_REPLACEMENT_CHARACTER = 0xFFFD;
-
-//! Convert a UTF-16 surrogate pair into a UTF-32 character.
-//! \param high The high value of the pair.
-//! \param low The low value of the pair.
-//! \return The UTF-32 character expressed by the surrogate pair.
-inline uchar32_t toUTF32(uchar16_t high, uchar16_t low)
-{
-	// Convert the surrogate pair into a single UTF-32 character.
-	uchar32_t x = ((high & ((1 << 6) -1)) << 10) | (low & ((1 << 10) -1));
-	uchar32_t wu = ((high >> 6) & ((1 << 5) - 1)) + 1;
-	return (wu << 16) | x;
-}
-
-//! Swaps the endianness of a 16-bit value.
-//! \return The new value.
-inline uchar16_t swapEndian16(const uchar16_t& c)
-{
-	return ((c >> 8) & 0x00FF) | ((c << 8) & 0xFF00);
-}
-
-//! Swaps the endianness of a 32-bit value.
-//! \return The new value.
-inline uchar32_t swapEndian32(const uchar32_t& c)
-{
-	return  ((c >> 24) & 0x000000FF) |
-			((c >> 8)  & 0x0000FF00) |
-			((c << 8)  & 0x00FF0000) |
-			((c << 24) & 0xFF000000);
-}
-
-//! The Unicode byte order mark.
-const u16 BOM = 0xFEFF;
-
-//! The size of the Unicode byte order mark in terms of the Unicode character size.
-const u8 BOM_UTF8_LEN = 3;
-const u8 BOM_UTF16_LEN = 1;
-const u8 BOM_UTF32_LEN = 1;
-
-//! Unicode byte order marks for file operations.
-const u8 BOM_ENCODE_UTF8[3] = { 0xEF, 0xBB, 0xBF };
-const u8 BOM_ENCODE_UTF16_BE[2] = { 0xFE, 0xFF };
-const u8 BOM_ENCODE_UTF16_LE[2] = { 0xFF, 0xFE };
-const u8 BOM_ENCODE_UTF32_BE[4] = { 0x00, 0x00, 0xFE, 0xFF };
-const u8 BOM_ENCODE_UTF32_LE[4] = { 0xFF, 0xFE, 0x00, 0x00 };
-
-//! The size in bytes of the Unicode byte marks for file operations.
-const u8 BOM_ENCODE_UTF8_LEN = 3;
-const u8 BOM_ENCODE_UTF16_LEN = 2;
-const u8 BOM_ENCODE_UTF32_LEN = 4;
-
-//! Unicode encoding type.
-enum EUTF_ENCODE
-{
-	EUTFE_NONE		= 0,
-	EUTFE_UTF8,
-	EUTFE_UTF16,
-	EUTFE_UTF16_LE,
-	EUTFE_UTF16_BE,
-	EUTFE_UTF32,
-	EUTFE_UTF32_LE,
-	EUTFE_UTF32_BE
-};
-
-//! Unicode endianness.
-enum EUTF_ENDIAN
-{
-	EUTFEE_NATIVE	= 0,
-	EUTFEE_LITTLE,
-	EUTFEE_BIG
-};
-
-//! Returns the specified unicode byte order mark in a byte array.
-//! The byte order mark is the first few bytes in a text file that signifies its encoding.
-/** \param mode The Unicode encoding method that we want to get the byte order mark for.
-		If EUTFE_UTF16 or EUTFE_UTF32 is passed, it uses the native system endianness. **/
-//! \return An array that contains a byte order mark.
-inline core::array<u8> getUnicodeBOM(EUTF_ENCODE mode)
-{
-#define COPY_ARRAY(source, size) \
-	memcpy(ret.pointer(), source, size); \
-	ret.set_used(size)
-
-	core::array<u8> ret(4);
-	switch (mode)
-	{
-		case EUTFE_UTF8:
-			COPY_ARRAY(BOM_ENCODE_UTF8, BOM_ENCODE_UTF8_LEN);
-			break;
-		case EUTFE_UTF16:
-			#ifdef __BIG_ENDIAN__
-				COPY_ARRAY(BOM_ENCODE_UTF16_BE, BOM_ENCODE_UTF16_LEN);
-			#else
-				COPY_ARRAY(BOM_ENCODE_UTF16_LE, BOM_ENCODE_UTF16_LEN);
-			#endif
-			break;
-		case EUTFE_UTF16_BE:
-			COPY_ARRAY(BOM_ENCODE_UTF16_BE, BOM_ENCODE_UTF16_LEN);
-			break;
-		case EUTFE_UTF16_LE:
-			COPY_ARRAY(BOM_ENCODE_UTF16_LE, BOM_ENCODE_UTF16_LEN);
-			break;
-		case EUTFE_UTF32:
-			#ifdef __BIG_ENDIAN__
-				COPY_ARRAY(BOM_ENCODE_UTF32_BE, BOM_ENCODE_UTF32_LEN);
-			#else
-				COPY_ARRAY(BOM_ENCODE_UTF32_LE, BOM_ENCODE_UTF32_LEN);
-			#endif
-			break;
-		case EUTFE_UTF32_BE:
-			COPY_ARRAY(BOM_ENCODE_UTF32_BE, BOM_ENCODE_UTF32_LEN);
-			break;
-		case EUTFE_UTF32_LE:
-			COPY_ARRAY(BOM_ENCODE_UTF32_LE, BOM_ENCODE_UTF32_LEN);
-			break;
-		case EUTFE_NONE:
-			// TODO sapier: fixed warning only,
-			// don't know if something needs to be done here
-			break;
-	}
-	return ret;
-
-#undef COPY_ARRAY
-}
-
-//! Detects if the given data stream starts with a unicode BOM.
-//! \param data The data stream to check.
-//! \return The unicode BOM associated with the data stream, or EUTFE_NONE if none was found.
-inline EUTF_ENCODE determineUnicodeBOM(const char* data)
-{
-	if (memcmp(data, BOM_ENCODE_UTF8, 3) == 0) return EUTFE_UTF8;
-	if (memcmp(data, BOM_ENCODE_UTF16_BE, 2) == 0) return EUTFE_UTF16_BE;
-	if (memcmp(data, BOM_ENCODE_UTF16_LE, 2) == 0) return EUTFE_UTF16_LE;
-	if (memcmp(data, BOM_ENCODE_UTF32_BE, 4) == 0) return EUTFE_UTF32_BE;
-	if (memcmp(data, BOM_ENCODE_UTF32_LE, 4) == 0) return EUTFE_UTF32_LE;
-	return EUTFE_NONE;
-}
-
-} // end namespace unicode
-
-
-//! UTF-16 string class.
-template <typename TAlloc = irrAllocator<uchar16_t> >
-class ustring16
-{
-public:
-
-	///------------------///
-	/// iterator classes ///
-	///------------------///
-
-	//! Access an element in a unicode string, allowing one to change it.
-	class _ustring16_iterator_access
-	{
-		public:
-			_ustring16_iterator_access(const ustring16<TAlloc>* s, u32 p) : ref(s), pos(p) {}
-
-			//! Allow the class to be interpreted as a single UTF-32 character.
-			operator uchar32_t() const
-			{
-				return _get();
-			}
-
-			//! Allow one to change the character in the unicode string.
-			//! \param c The new character to use.
-			//! \return Myself.
-			_ustring16_iterator_access& operator=(const uchar32_t c)
-			{
-				_set(c);
-				return *this;
-			}
-
-			//! Increments the value by 1.
-			//! \return Myself.
-			_ustring16_iterator_access& operator++()
-			{
-				_set(_get() + 1);
-				return *this;
-			}
-
-			//! Increments the value by 1, returning the old value.
-			//! \return A unicode character.
-			uchar32_t operator++(int)
-			{
-				uchar32_t old = _get();
-				_set(old + 1);
-				return old;
-			}
-
-			//! Decrements the value by 1.
-			//! \return Myself.
-			_ustring16_iterator_access& operator--()
-			{
-				_set(_get() - 1);
-				return *this;
-			}
-
-			//! Decrements the value by 1, returning the old value.
-			//! \return A unicode character.
-			uchar32_t operator--(int)
-			{
-				uchar32_t old = _get();
-				_set(old - 1);
-				return old;
-			}
-
-			//! Adds to the value by a specified amount.
-			//! \param val The amount to add to this character.
-			//! \return Myself.
-			_ustring16_iterator_access& operator+=(int val)
-			{
-				_set(_get() + val);
-				return *this;
-			}
-
-			//! Subtracts from the value by a specified amount.
-			//! \param val The amount to subtract from this character.
-			//! \return Myself.
-			_ustring16_iterator_access& operator-=(int val)
-			{
-				_set(_get() - val);
-				return *this;
-			}
-
-			//! Multiples the value by a specified amount.
-			//! \param val The amount to multiply this character by.
-			//! \return Myself.
-			_ustring16_iterator_access& operator*=(int val)
-			{
-				_set(_get() * val);
-				return *this;
-			}
-
-			//! Divides the value by a specified amount.
-			//! \param val The amount to divide this character by.
-			//! \return Myself.
-			_ustring16_iterator_access& operator/=(int val)
-			{
-				_set(_get() / val);
-				return *this;
-			}
-
-			//! Modulos the value by a specified amount.
-			//! \param val The amount to modulo this character by.
-			//! \return Myself.
-			_ustring16_iterator_access& operator%=(int val)
-			{
-				_set(_get() % val);
-				return *this;
-			}
-
-			//! Adds to the value by a specified amount.
-			//! \param val The amount to add to this character.
-			//! \return A unicode character.
-			uchar32_t operator+(int val) const
-			{
-				return _get() + val;
-			}
-
-			//! Subtracts from the value by a specified amount.
-			//! \param val The amount to subtract from this character.
-			//! \return A unicode character.
-			uchar32_t operator-(int val) const
-			{
-				return _get() - val;
-			}
-
-			//! Multiplies the value by a specified amount.
-			//! \param val The amount to multiply this character by.
-			//! \return A unicode character.
-			uchar32_t operator*(int val) const
-			{
-				return _get() * val;
-			}
-
-			//! Divides the value by a specified amount.
-			//! \param val The amount to divide this character by.
-			//! \return A unicode character.
-			uchar32_t operator/(int val) const
-			{
-				return _get() / val;
-			}
-
-			//! Modulos the value by a specified amount.
-			//! \param val The amount to modulo this character by.
-			//! \return A unicode character.
-			uchar32_t operator%(int val) const
-			{
-				return _get() % val;
-			}
-
-		private:
-			//! Gets a uchar32_t from our current position.
-			uchar32_t _get() const
-			{
-				const uchar16_t* a = ref->c_str();
-				if (!UTF16_IS_SURROGATE(a[pos]))
-					return static_cast<uchar32_t>(a[pos]);
-				else
-				{
-					if (pos + 1 >= ref->size_raw())
-						return 0;
-
-					return unicode::toUTF32(a[pos], a[pos + 1]);
-				}
-			}
-
-			//! Sets a uchar32_t at our current position.
-			void _set(uchar32_t c)
-			{
-				ustring16<TAlloc>* ref2 = const_cast<ustring16<TAlloc>*>(ref);
-				const uchar16_t* a = ref2->c_str();
-				if (c > 0xFFFF)
-				{
-					// c will be multibyte, so split it up into the high and low surrogate pairs.
-					uchar16_t x = static_cast<uchar16_t>(c);
-					uchar16_t vh = UTF16_HI_SURROGATE | ((((c >> 16) & ((1 << 5) - 1)) - 1) << 6) | (x >> 10);
-					uchar16_t vl = UTF16_LO_SURROGATE | (x & ((1 << 10) - 1));
-
-					// If the previous position was a surrogate pair, just replace them.  Else, insert the low pair.
-					if (UTF16_IS_SURROGATE_HI(a[pos]) && pos + 1 != ref2->size_raw())
-						ref2->replace_raw(vl, static_cast<u32>(pos) + 1);
-					else ref2->insert_raw(vl, static_cast<u32>(pos) + 1);
-
-					ref2->replace_raw(vh, static_cast<u32>(pos));
-				}
-				else
-				{
-					// c will be a single byte.
-					uchar16_t vh = static_cast<uchar16_t>(c);
-
-					// If the previous position was a surrogate pair, remove the extra byte.
-					if (UTF16_IS_SURROGATE_HI(a[pos]))
-						ref2->erase_raw(static_cast<u32>(pos) + 1);
-
-					ref2->replace_raw(vh, static_cast<u32>(pos));
-				}
-			}
-
-			const ustring16<TAlloc>* ref;
-			u32 pos;
-	};
-	typedef typename ustring16<TAlloc>::_ustring16_iterator_access access;
-
-
-	//! Iterator to iterate through a UTF-16 string.
-#ifndef USTRING_NO_STL
-	class _ustring16_const_iterator : public std::iterator<
-		std::bidirectional_iterator_tag,	// iterator_category
-		access,								// value_type
-		ptrdiff_t,							// difference_type
-		const access,						// pointer
-		const access						// reference
-	>
-#else
-	class _ustring16_const_iterator
-#endif
-	{
-		public:
-			typedef _ustring16_const_iterator _Iter;
-			typedef std::iterator<std::bidirectional_iterator_tag, access, ptrdiff_t, const access, const access> _Base;
-			typedef const access const_pointer;
-			typedef const access const_reference;
-
-#ifndef USTRING_NO_STL
-			typedef typename _Base::value_type value_type;
-			typedef typename _Base::difference_type difference_type;
-			typedef typename _Base::difference_type distance_type;
-			typedef typename _Base::pointer pointer;
-			typedef const_reference reference;
-#else
-			typedef access value_type;
-			typedef u32 difference_type;
-			typedef u32 distance_type;
-			typedef const_pointer pointer;
-			typedef const_reference reference;
-#endif
-
-			//! Constructors.
-			_ustring16_const_iterator(const _Iter& i) : ref(i.ref), pos(i.pos) {}
-			_ustring16_const_iterator(const ustring16<TAlloc>& s) : ref(&s), pos(0) {}
-			_ustring16_const_iterator(const ustring16<TAlloc>& s, const u32 p) : ref(&s), pos(0)
-			{
-				if (ref->size_raw() == 0 || p == 0)
-					return;
-
-				// Go to the appropriate position.
-				u32 i = p;
-				u32 sr = ref->size_raw();
-				const uchar16_t* a = ref->c_str();
-				while (i != 0 && pos < sr)
-				{
-					if (UTF16_IS_SURROGATE_HI(a[pos]))
-						pos += 2;
-					else ++pos;
-					--i;
-				}
-			}
-
-			//! Test for equalness.
-			bool operator==(const _Iter& iter) const
-			{
-				if (ref == iter.ref && pos == iter.pos)
-					return true;
-				return false;
-			}
-
-			//! Test for unequalness.
-			bool operator!=(const _Iter& iter) const
-			{
-				if (ref != iter.ref || pos != iter.pos)
-					return true;
-				return false;
-			}
-
-			//! Switch to the next full character in the string.
-			_Iter& operator++()
-			{	// ++iterator
-				if (pos == ref->size_raw()) return *this;
-				const uchar16_t* a = ref->c_str();
-				if (UTF16_IS_SURROGATE_HI(a[pos]))
-					pos += 2;			// TODO: check for valid low surrogate?
-				else ++pos;
-				if (pos > ref->size_raw()) pos = ref->size_raw();
-				return *this;
-			}
-
-			//! Switch to the next full character in the string, returning the previous position.
-			_Iter operator++(int)
-			{	// iterator++
-				_Iter _tmp(*this);
-				++*this;
-				return _tmp;
-			}
-
-			//! Switch to the previous full character in the string.
-			_Iter& operator--()
-			{	// --iterator
-				if (pos == 0) return *this;
-				const uchar16_t* a = ref->c_str();
-				--pos;
-				if (UTF16_IS_SURROGATE_LO(a[pos]) && pos != 0)	// low surrogate, go back one more.
-					--pos;
-				return *this;
-			}
-
-			//! Switch to the previous full character in the string, returning the previous position.
-			_Iter operator--(int)
-			{	// iterator--
-				_Iter _tmp(*this);
-				--*this;
-				return _tmp;
-			}
-
-			//! Advance a specified number of full characters in the string.
-			//! \return Myself.
-			_Iter& operator+=(const difference_type v)
-			{
-				if (v == 0) return *this;
-				if (v < 0) return operator-=(v * -1);
-
-				if (pos >= ref->size_raw())
-					return *this;
-
-				// Go to the appropriate position.
-				// TODO: Don't force u32 on an x64 OS.  Make it agnostic.
-				u32 i = (u32)v;
-				u32 sr = ref->size_raw();
-				const uchar16_t* a = ref->c_str();
-				while (i != 0 && pos < sr)
-				{
-					if (UTF16_IS_SURROGATE_HI(a[pos]))
-						pos += 2;
-					else ++pos;
-					--i;
-				}
-				if (pos > sr)
-					pos = sr;
-
-				return *this;
-			}
-
-			//! Go back a specified number of full characters in the string.
-			//! \return Myself.
-			_Iter& operator-=(const difference_type v)
-			{
-				if (v == 0) return *this;
-				if (v > 0) return operator+=(v * -1);
-
-				if (pos == 0)
-					return *this;
-
-				// Go to the appropriate position.
-				// TODO: Don't force u32 on an x64 OS.  Make it agnostic.
-				u32 i = (u32)v;
-				const uchar16_t* a = ref->c_str();
-				while (i != 0 && pos != 0)
-				{
-					--pos;
-					if (UTF16_IS_SURROGATE_LO(a[pos]) != 0 && pos != 0)
-						--pos;
-					--i;
-				}
-
-				return *this;
-			}
-
-			//! Return a new iterator that is a variable number of full characters forward from the current position.
-			_Iter operator+(const difference_type v) const
-			{
-				_Iter ret(*this);
-				ret += v;
-				return ret;
-			}
-
-			//! Return a new iterator that is a variable number of full characters backward from the current position.
-			_Iter operator-(const difference_type v) const
-			{
-				_Iter ret(*this);
-				ret -= v;
-				return ret;
-			}
-
-			//! Returns the distance between two iterators.
-			difference_type operator-(const _Iter& iter) const
-			{
-				// Make sure we reference the same object!
-				if (ref != iter.ref)
-					return difference_type();
-
-				_Iter i = iter;
-				difference_type ret;
-
-				// Walk up.
-				if (pos > i.pos)
-				{
-					while (pos > i.pos)
-					{
-						++i;
-						++ret;
-					}
-					return ret;
-				}
-
-				// Walk down.
-				while (pos < i.pos)
-				{
-					--i;
-					--ret;
-				}
-				return ret;
-			}
-
-			//! Accesses the full character at the iterator's position.
-			const_reference operator*() const
-			{
-				if (pos >= ref->size_raw())
-				{
-					const uchar16_t* a = ref->c_str();
-					u32 p = ref->size_raw();
-					if (UTF16_IS_SURROGATE_LO(a[p]))
-						--p;
-					reference ret(ref, p);
-					return ret;
-				}
-				const_reference ret(ref, pos);
-				return ret;
-			}
-
-			//! Accesses the full character at the iterator's position.
-			reference operator*()
-			{
-				if (pos >= ref->size_raw())
-				{
-					const uchar16_t* a = ref->c_str();
-					u32 p = ref->size_raw();
-					if (UTF16_IS_SURROGATE_LO(a[p]))
-						--p;
-					reference ret(ref, p);
-					return ret;
-				}
-				reference ret(ref, pos);
-				return ret;
-			}
-
-			//! Accesses the full character at the iterator's position.
-			const_pointer operator->() const
-			{
-				return operator*();
-			}
-
-			//! Accesses the full character at the iterator's position.
-			pointer operator->()
-			{
-				return operator*();
-			}
-
-			//! Is the iterator at the start of the string?
-			bool atStart() const
-			{
-				return pos == 0;
-			}
-
-			//! Is the iterator at the end of the string?
-			bool atEnd() const
-			{
-				const uchar16_t* a = ref->c_str();
-				if (UTF16_IS_SURROGATE(a[pos]))
-					return (pos + 1) >= ref->size_raw();
-				else return pos >= ref->size_raw();
-			}
-
-			//! Moves the iterator to the start of the string.
-			void toStart()
-			{
-				pos = 0;
-			}
-
-			//! Moves the iterator to the end of the string.
-			void toEnd()
-			{
-				pos = ref->size_raw();
-			}
-
-			//! Returns the iterator's position.
-			//! \return The iterator's position.
-			u32 getPos() const
-			{
-				return pos;
-			}
-
-		protected:
-			const ustring16<TAlloc>* ref;
-			u32 pos;
-	};
-
-	//! Iterator to iterate through a UTF-16 string.
-	class _ustring16_iterator : public _ustring16_const_iterator
-	{
-		public:
-			typedef _ustring16_iterator _Iter;
-			typedef _ustring16_const_iterator _Base;
-			typedef typename _Base::const_pointer const_pointer;
-			typedef typename _Base::const_reference const_reference;
-
-
-			typedef typename _Base::value_type value_type;
-			typedef typename _Base::difference_type difference_type;
-			typedef typename _Base::distance_type distance_type;
-			typedef access pointer;
-			typedef access reference;
-
-			using _Base::pos;
-			using _Base::ref;
-
-			//! Constructors.
-			_ustring16_iterator(const _Iter& i) : _ustring16_const_iterator(i) {}
-			_ustring16_iterator(const ustring16<TAlloc>& s) : _ustring16_const_iterator(s) {}
-			_ustring16_iterator(const ustring16<TAlloc>& s, const u32 p) : _ustring16_const_iterator(s, p) {}
-
-			//! Accesses the full character at the iterator's position.
-			reference operator*() const
-			{
-				if (pos >= ref->size_raw())
-				{
-					const uchar16_t* a = ref->c_str();
-					u32 p = ref->size_raw();
-					if (UTF16_IS_SURROGATE_LO(a[p]))
-						--p;
-					reference ret(ref, p);
-					return ret;
-				}
-				reference ret(ref, pos);
-				return ret;
-			}
-
-			//! Accesses the full character at the iterator's position.
-			reference operator*()
-			{
-				if (pos >= ref->size_raw())
-				{
-					const uchar16_t* a = ref->c_str();
-					u32 p = ref->size_raw();
-					if (UTF16_IS_SURROGATE_LO(a[p]))
-						--p;
-					reference ret(ref, p);
-					return ret;
-				}
-				reference ret(ref, pos);
-				return ret;
-			}
-
-			//! Accesses the full character at the iterator's position.
-			pointer operator->() const
-			{
-				return operator*();
-			}
-
-			//! Accesses the full character at the iterator's position.
-			pointer operator->()
-			{
-				return operator*();
-			}
-	};
-
-	typedef typename ustring16<TAlloc>::_ustring16_iterator iterator;
-	typedef typename ustring16<TAlloc>::_ustring16_const_iterator const_iterator;
-
-	///----------------------///
-	/// end iterator classes ///
-	///----------------------///
-
-	//! Default constructor
-	ustring16()
-	: array(0), allocated(1), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-		array = allocator.allocate(1); // new u16[1];
-		array[0] = 0x0;
-	}
-
-
-	//! Constructor
-	ustring16(const ustring16<TAlloc>& other)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-		*this = other;
-	}
-
-
-	//! Constructor from other string types
-	template <class B, class A>
-	ustring16(const string<B, A>& other)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-		*this = other;
-	}
-
-
-#ifndef USTRING_NO_STL
-	//! Constructor from std::string
-	template <class B, class A, typename Alloc>
-	ustring16(const std::basic_string<B, A, Alloc>& other)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-		*this = other.c_str();
-	}
-
-
-	//! Constructor from iterator.
-	template <typename Itr>
-	ustring16(Itr first, Itr last)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-		reserve(std::distance(first, last));
-		array[used] = 0;
-
-		for (; first != last; ++first)
-			append((uchar32_t)*first);
-	}
-#endif
-
-
-#ifndef USTRING_CPP0X_NEWLITERALS
-	//! Constructor for copying a character string from a pointer.
-	ustring16(const char* const c)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		loadDataStream(c, strlen(c));
-		//append((uchar8_t*)c);
-	}
-
-
-	//! Constructor for copying a character string from a pointer with a given length.
-	ustring16(const char* const c, u32 length)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		loadDataStream(c, length);
-	}
-#endif
-
-
-	//! Constructor for copying a UTF-8 string from a pointer.
-	ustring16(const uchar8_t* const c)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		append(c);
-	}
-
-
-	//! Constructor for copying a UTF-8 string from a single char.
-	ustring16(const char c)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		append((uchar32_t)c);
-	}
-
-
-	//! Constructor for copying a UTF-8 string from a pointer with a given length.
-	ustring16(const uchar8_t* const c, u32 length)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		append(c, length);
-	}
-
-
-	//! Constructor for copying a UTF-16 string from a pointer.
-	ustring16(const uchar16_t* const c)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		append(c);
-	}
-
-
-	//! Constructor for copying a UTF-16 string from a pointer with a given length
-	ustring16(const uchar16_t* const c, u32 length)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		append(c, length);
-	}
-
-
-	//! Constructor for copying a UTF-32 string from a pointer.
-	ustring16(const uchar32_t* const c)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		append(c);
-	}
-
-
-	//! Constructor for copying a UTF-32 from a pointer with a given length.
-	ustring16(const uchar32_t* const c, u32 length)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		append(c, length);
-	}
-
-
-	//! Constructor for copying a wchar_t string from a pointer.
-	ustring16(const wchar_t* const c)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		if (sizeof(wchar_t) == 4)
-			append(reinterpret_cast<const uchar32_t* const>(c));
-		else if (sizeof(wchar_t) == 2)
-			append(reinterpret_cast<const uchar16_t* const>(c));
-		else if (sizeof(wchar_t) == 1)
-			append(reinterpret_cast<const uchar8_t* const>(c));
-	}
-
-
-	//! Constructor for copying a wchar_t string from a pointer with a given length.
-	ustring16(const wchar_t* const c, u32 length)
-	: array(0), allocated(0), used(0)
-	{
-#if __BYTE_ORDER == __BIG_ENDIAN
-		encoding = unicode::EUTFE_UTF16_BE;
-#else
-		encoding = unicode::EUTFE_UTF16_LE;
-#endif
-
-		if (sizeof(wchar_t) == 4)
-			append(reinterpret_cast<const uchar32_t* const>(c), length);
-		else if (sizeof(wchar_t) == 2)
-			append(reinterpret_cast<const uchar16_t* const>(c), length);
-		else if (sizeof(wchar_t) == 1)
-			append(reinterpret_cast<const uchar8_t* const>(c), length);
-	}
-
-
-#ifdef USTRING_CPP0X
-	//! Constructor for moving a ustring16
-	ustring16(ustring16<TAlloc>&& other)
-	: array(other.array), encoding(other.encoding), allocated(other.allocated), used(other.used)
-	{
-		//std::cout << "MOVE constructor" << std::endl;
-		other.array = 0;
-		other.allocated = 0;
-		other.used = 0;
-	}
-#endif
-
-
-	//! Destructor
-	~ustring16()
-	{
-		allocator.deallocate(array); // delete [] array;
-	}
-
-
-	//! Assignment operator
-	ustring16& operator=(const ustring16<TAlloc>& other)
-	{
-		if (this == &other)
-			return *this;
-
-		used = other.size_raw();
-		if (used >= allocated)
-		{
-			allocator.deallocate(array); // delete [] array;
-			allocated = used + 1;
-			array = allocator.allocate(used + 1); //new u16[used];
-		}
-
-		const uchar16_t* p = other.c_str();
-		for (u32 i=0; i<=used; ++i, ++p)
-			array[i] = *p;
-
-		array[used] = 0;
-
-		// Validate our new UTF-16 string.
-		validate();
-
-		return *this;
-	}
-
-
-#ifdef USTRING_CPP0X
-	//! Move assignment operator
-	ustring16& operator=(ustring16<TAlloc>&& other)
-	{
-		if (this != &other)
-		{
-			//std::cout << "MOVE operator=" << std::endl;
-			allocator.deallocate(array);
-
-			array = other.array;
-			allocated = other.allocated;
-			encoding = other.encoding;
-			used = other.used;
-			other.array = 0;
-			other.used = 0;
-		}
-		return *this;
-	}
-#endif
-
-
-	//! Assignment operator for other string types
-	template <class B, class A>
-	ustring16<TAlloc>& operator=(const string<B, A>& other)
-	{
-		*this = other.c_str();
-		return *this;
-	}
-
-
-	//! Assignment operator for UTF-8 strings
-	ustring16<TAlloc>& operator=(const uchar8_t* const c)
-	{
-		if (!array)
-		{
-			array = allocator.allocate(1); //new u16[1];
-			allocated = 1;
-		}
-		used = 0;
-		array[used] = 0x0;
-		if (!c) return *this;
-
-		//! Append our string now.
-		append(c);
-		return *this;
-	}
-
-
-	//! Assignment operator for UTF-16 strings
-	ustring16<TAlloc>& operator=(const uchar16_t* const c)
-	{
-		if (!array)
-		{
-			array = allocator.allocate(1); //new u16[1];
-			allocated = 1;
-		}
-		used = 0;
-		array[used] = 0x0;
-		if (!c) return *this;
-
-		//! Append our string now.
-		append(c);
-		return *this;
-	}
-
-
-	//! Assignment operator for UTF-32 strings
-	ustring16<TAlloc>& operator=(const uchar32_t* const c)
-	{
-		if (!array)
-		{
-			array = allocator.allocate(1); //new u16[1];
-			allocated = 1;
-		}
-		used = 0;
-		array[used] = 0x0;
-		if (!c) return *this;
-
-		//! Append our string now.
-		append(c);
-		return *this;
-	}
-
-
-	//! Assignment operator for wchar_t strings.
-	/** Note that this assumes that a correct unicode string is stored in the wchar_t string.
-		Since wchar_t changes depending on its platform, it could either be a UTF-8, -16, or -32 string.
-		This function assumes you are storing the correct unicode encoding inside the wchar_t string. **/
-	ustring16<TAlloc>& operator=(const wchar_t* const c)
-	{
-		if (sizeof(wchar_t) == 4)
-			*this = reinterpret_cast<const uchar32_t* const>(c);
-		else if (sizeof(wchar_t) == 2)
-			*this = reinterpret_cast<const uchar16_t* const>(c);
-		else if (sizeof(wchar_t) == 1)
-			*this = reinterpret_cast<const uchar8_t* const>(c);
-
-		return *this;
-	}
-
-
-	//! Assignment operator for other strings.
-	/** Note that this assumes that a correct unicode string is stored in the string. **/
-	template <class B>
-	ustring16<TAlloc>& operator=(const B* const c)
-	{
-		if (sizeof(B) == 4)
-			*this = reinterpret_cast<const uchar32_t* const>(c);
-		else if (sizeof(B) == 2)
-			*this = reinterpret_cast<const uchar16_t* const>(c);
-		else if (sizeof(B) == 1)
-			*this = reinterpret_cast<const uchar8_t* const>(c);
-
-		return *this;
-	}
-
-
-	//! Direct access operator
-	access operator [](const u32 index)
-	{
-		_IRR_DEBUG_BREAK_IF(index>=size()) // bad index
-		iterator iter(*this, index);
-		return iter.operator*();
-	}
-
-
-	//! Direct access operator
-	const access operator [](const u32 index) const
-	{
-		_IRR_DEBUG_BREAK_IF(index>=size()) // bad index
-		const_iterator iter(*this, index);
-		return iter.operator*();
-	}
-
-
-	//! Equality operator
-	bool operator ==(const uchar16_t* const str) const
-	{
-		if (!str)
-			return false;
-
-		u32 i;
-		for(i=0; array[i] && str[i]; ++i)
-			if (array[i] != str[i])
-				return false;
-
-		return !array[i] && !str[i];
-	}
-
-
-	//! Equality operator
-	bool operator ==(const ustring16<TAlloc>& other) const
-	{
-		for(u32 i=0; array[i] && other.array[i]; ++i)
-			if (array[i] != other.array[i])
-				return false;
-
-		return used == other.used;
-	}
-
-
-	//! Is smaller comparator
-	bool operator <(const ustring16<TAlloc>& other) const
-	{
-		for(u32 i=0; array[i] && other.array[i]; ++i)
-		{
-			s32 diff = array[i] - other.array[i];
-			if ( diff )
-				return diff < 0;
-		}
-
-		return used < other.used;
-	}
-
-
-	//! Inequality operator
-	bool operator !=(const uchar16_t* const str) const
-	{
-		return !(*this == str);
-	}
-
-
-	//! Inequality operator
-	bool operator !=(const ustring16<TAlloc>& other) const
-	{
-		return !(*this == other);
-	}
-
-
-	//! Returns the length of a ustring16 in full characters.
-	//! \return Length of a ustring16 in full characters.
-	u32 size() const
-	{
-		const_iterator i(*this, 0);
-		u32 pos = 0;
-		while (!i.atEnd())
-		{
-			++i;
-			++pos;
-		}
-		return pos;
-	}
-
-
-	//! Informs if the ustring is empty or not.
-	//! \return True if the ustring is empty, false if not.
-	bool empty() const
-	{
-		return (size_raw() == 0);
-	}
-
-
-	//! Returns a pointer to the raw UTF-16 string data.
-	//! \return pointer to C-style NUL terminated array of UTF-16 code points.
-	const uchar16_t* c_str() const
-	{
-		return array;
-	}
-
-
-	//! Compares the first n characters of this string with another.
-	//! \param other Other string to compare to.
-	//! \param n Number of characters to compare.
-	//! \return True if the n first characters of both strings are equal.
-	bool equalsn(const ustring16<TAlloc>& other, u32 n) const
-	{
-		u32 i;
-		const uchar16_t* oa = other.c_str();
-		for(i=0; i < n && array[i] && oa[i]; ++i)
-			if (array[i] != oa[i])
-				return false;
-
-		// if one (or both) of the strings was smaller then they
-		// are only equal if they have the same length
-		return (i == n) || (used == other.used);
-	}
-
-
-	//! Compares the first n characters of this string with another.
-	//! \param str Other string to compare to.
-	//! \param n Number of characters to compare.
-	//! \return True if the n first characters of both strings are equal.
-	bool equalsn(const uchar16_t* const str, u32 n) const
-	{
-		if (!str)
-			return false;
-		u32 i;
-		for(i=0; i < n && array[i] && str[i]; ++i)
-			if (array[i] != str[i])
-				return false;
-
-		// if one (or both) of the strings was smaller then they
-		// are only equal if they have the same length
-		return (i == n) || (array[i] == 0 && str[i] == 0);
-	}
-
-
-	//! Appends a character to this ustring16
-	//! \param character The character to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& append(uchar32_t character)
-	{
-		if (used + 2 >= allocated)
-			reallocate(used + 2);
-
-		if (character > 0xFFFF)
-		{
-			used += 2;
-
-			// character will be multibyte, so split it up into a surrogate pair.
-			uchar16_t x = static_cast<uchar16_t>(character);
-			uchar16_t vh = UTF16_HI_SURROGATE | ((((character >> 16) & ((1 << 5) - 1)) - 1) << 6) | (x >> 10);
-			uchar16_t vl = UTF16_LO_SURROGATE | (x & ((1 << 10) - 1));
-			array[used-2] = vh;
-			array[used-1] = vl;
-		}
-		else
-		{
-			++used;
-			array[used-1] = character;
-		}
-		array[used] = 0;
-
-		return *this;
-	}
-
-
-	//! Appends a UTF-8 string to this ustring16
-	//! \param other The UTF-8 string to append.
-	//! \param length The length of the string to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& append(const uchar8_t* const other, u32 length=0xffffffff)
-	{
-		if (!other)
-			return *this;
-
-		// Determine if the string is long enough for a BOM.
-		u32 len = 0;
-		const uchar8_t* p = other;
-		do
-		{
-			++len;
-		} while (*p++ && len < unicode::BOM_ENCODE_UTF8_LEN);
-
-		// Check for BOM.
-		unicode::EUTF_ENCODE c_bom = unicode::EUTFE_NONE;
-		if (len == unicode::BOM_ENCODE_UTF8_LEN)
-		{
-			if (memcmp(other, unicode::BOM_ENCODE_UTF8, unicode::BOM_ENCODE_UTF8_LEN) == 0)
-				c_bom = unicode::EUTFE_UTF8;
-		}
-
-		// If a BOM was found, don't include it in the string.
-		const uchar8_t* c2 = other;
-		if (c_bom != unicode::EUTFE_NONE)
-		{
-			c2 = other + unicode::BOM_UTF8_LEN;
-			length -= unicode::BOM_UTF8_LEN;
-		}
-
-		// Calculate the size of the string to read in.
-		len = 0;
-		p = c2;
-		do
-		{
-			++len;
-		} while(*p++ && len < length);
-		if (len > length)
-			len = length;
-
-		// If we need to grow the array, do it now.
-		if (used + len >= allocated)
-			reallocate(used + (len * 2));
-		u32 start = used;
-
-		// Convert UTF-8 to UTF-16.
-		u32 pos = start;
-		for (u32 l = 0; l<len;)
-		{
-			++used;
-			if (((c2[l] >> 6) & 0x03) == 0x02)
-			{	// Invalid continuation byte.
-				array[pos++] = unicode::UTF_REPLACEMENT_CHARACTER;
-				++l;
-			}
-			else if (c2[l] == 0xC0 || c2[l] == 0xC1)
-			{	// Invalid byte - overlong encoding.
-				array[pos++] = unicode::UTF_REPLACEMENT_CHARACTER;
-				++l;
-			}
-			else if ((c2[l] & 0xF8) == 0xF0)
-			{	// 4 bytes UTF-8, 2 bytes UTF-16.
-				// Check for a full string.
-				if ((l + 3) >= len)
-				{
-					array[pos++] = unicode::UTF_REPLACEMENT_CHARACTER;
-					l += 3;
-					break;
-				}
-
-				// Validate.
-				bool valid = true;
-				u8 l2 = 0;
-				if (valid && (((c2[l+1] >> 6) & 0x03) == 0x02)) ++l2; else valid = false;
-				if (valid && (((c2[l+2] >> 6) & 0x03) == 0x02)) ++l2; else valid = false;
-				if (valid && (((c2[l+3] >> 6) & 0x03) == 0x02)) ++l2; else valid = false;
-				if (!valid)
-				{
-					array[pos++] = unicode::UTF_REPLACEMENT_CHARACTER;
-					l += l2;
-					continue;
-				}
-
-				// Decode.
-				uchar8_t b1 = ((c2[l] & 0x7) << 2) | ((c2[l+1] >> 4) & 0x3);
-				uchar8_t b2 = ((c2[l+1] & 0xF) << 4) | ((c2[l+2] >> 2) & 0xF);
-				uchar8_t b3 = ((c2[l+2] & 0x3) << 6) | (c2[l+3] & 0x3F);
-				uchar32_t v = b3 | ((uchar32_t)b2 << 8) | ((uchar32_t)b1 << 16);
-
-				// Split v up into a surrogate pair.
-				uchar16_t x = static_cast<uchar16_t>(v);
-				uchar16_t vh = UTF16_HI_SURROGATE | ((((v >> 16) & ((1 << 5) - 1)) - 1) << 6) | (x >> 10);
-				uchar16_t vl = UTF16_LO_SURROGATE | (x & ((1 << 10) - 1));
-
-				array[pos++] = vh;
-				array[pos++] = vl;
-				l += 4;
-				++used;		// Using two shorts this time, so increase used by 1.
-			}
-			else if ((c2[l] & 0xF0) == 0xE0)
-			{	// 3 bytes UTF-8, 1 byte UTF-16.
-				// Check for a full string.
-				if ((l + 2) >= len)
-				{
-					array[pos++] = unicode::UTF_REPLACEMENT_CHARACTER;
-					l += 2;
-					break;
-				}
-
-				// Validate.
-				bool valid = true;
-				u8 l2 = 0;
-				if (valid && (((c2[l+1] >> 6) & 0x03) == 0x02)) ++l2; else valid = false;
-				if (valid && (((c2[l+2] >> 6) & 0x03) == 0x02)) ++l2; else valid = false;
-				if (!valid)
-				{
-					array[pos++] = unicode::UTF_REPLACEMENT_CHARACTER;
-					l += l2;
-					continue;
-				}
-
-				// Decode.
-				uchar8_t b1 = ((c2[l] & 0xF) << 4) | ((c2[l+1] >> 2) & 0xF);
-				uchar8_t b2 = ((c2[l+1] & 0x3) << 6) | (c2[l+2] & 0x3F);
-				uchar16_t ch = b2 | ((uchar16_t)b1 << 8);
-				array[pos++] = ch;
-				l += 3;
-			}
-			else if ((c2[l] & 0xE0) == 0xC0)
-			{	// 2 bytes UTF-8, 1 byte UTF-16.
-				// Check for a full string.
-				if ((l + 1) >= len)
-				{
-					array[pos++] = unicode::UTF_REPLACEMENT_CHARACTER;
-					l += 1;
-					break;
-				}
-
-				// Validate.
-				if (((c2[l+1] >> 6) & 0x03) != 0x02)
-				{
-					array[pos++] = unicode::UTF_REPLACEMENT_CHARACTER;
-					++l;
-					continue;
-				}
-
-				// Decode.
-				uchar8_t b1 = (c2[l] >> 2) & 0x7;
-				uchar8_t b2 = ((c2[l] & 0x3) << 6) | (c2[l+1] & 0x3F);
-				uchar16_t ch = b2 | ((uchar16_t)b1 << 8);
-				array[pos++] = ch;
-				l += 2;
-			}
-			else
-			{	// 1 byte UTF-8, 1 byte UTF-16.
-				// Validate.
-				if (c2[l] > 0x7F)
-				{	// Values above 0xF4 are restricted and aren't used.  By now, anything above 0x7F is invalid.
-					array[pos++] = unicode::UTF_REPLACEMENT_CHARACTER;
-				}
-				else array[pos++] = static_cast<uchar16_t>(c2[l]);
-				++l;
-			}
-		}
-		array[used] = 0;
-
-		// Validate our new UTF-16 string.
-		validate();
-
-		return *this;
-	}
-
-
-	//! Appends a UTF-16 string to this ustring16
-	//! \param other The UTF-16 string to append.
-	//! \param length The length of the string to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& append(const uchar16_t* const other, u32 length=0xffffffff)
-	{
-		if (!other)
-			return *this;
-
-		// Determine if the string is long enough for a BOM.
-		u32 len = 0;
-		const uchar16_t* p = other;
-		do
-		{
-			++len;
-		} while (*p++ && len < unicode::BOM_ENCODE_UTF16_LEN);
-
-		// Check for the BOM to determine the string's endianness.
-		unicode::EUTF_ENDIAN c_end = unicode::EUTFEE_NATIVE;
-		if (memcmp(other, unicode::BOM_ENCODE_UTF16_LE, unicode::BOM_ENCODE_UTF16_LEN) == 0)
-			c_end = unicode::EUTFEE_LITTLE;
-		else if (memcmp(other, unicode::BOM_ENCODE_UTF16_BE, unicode::BOM_ENCODE_UTF16_LEN) == 0)
-			c_end = unicode::EUTFEE_BIG;
-
-		// If a BOM was found, don't include it in the string.
-		const uchar16_t* c2 = other;
-		if (c_end != unicode::EUTFEE_NATIVE)
-		{
-			c2 = other + unicode::BOM_UTF16_LEN;
-			length -= unicode::BOM_UTF16_LEN;
-		}
-
-		// Calculate the size of the string to read in.
-		len = 0;
-		p = c2;
-		do
-		{
-			++len;
-		} while(*p++ && len < length);
-		if (len > length)
-			len = length;
-
-		// If we need to grow the size of the array, do it now.
-		if (used + len >= allocated)
-			reallocate(used + (len * 2));
-		u32 start = used;
-		used += len;
-
-		// Copy the string now.
-		unicode::EUTF_ENDIAN m_end = getEndianness();
-		for (u32 l = start; l < start + len; ++l)
-		{
-			array[l] = (uchar16_t)c2[l];
-			if (c_end != unicode::EUTFEE_NATIVE && c_end != m_end)
-				array[l] = unicode::swapEndian16(array[l]);
-		}
-
-		array[used] = 0;
-
-		// Validate our new UTF-16 string.
-		validate();
-		return *this;
-	}
-
-
-	//! Appends a UTF-32 string to this ustring16
-	//! \param other The UTF-32 string to append.
-	//! \param length The length of the string to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& append(const uchar32_t* const other, u32 length=0xffffffff)
-	{
-		if (!other)
-			return *this;
-
-		// Check for the BOM to determine the string's endianness.
-		unicode::EUTF_ENDIAN c_end = unicode::EUTFEE_NATIVE;
-		if (memcmp(other, unicode::BOM_ENCODE_UTF32_LE, unicode::BOM_ENCODE_UTF32_LEN) == 0)
-			c_end = unicode::EUTFEE_LITTLE;
-		else if (memcmp(other, unicode::BOM_ENCODE_UTF32_BE, unicode::BOM_ENCODE_UTF32_LEN) == 0)
-			c_end = unicode::EUTFEE_BIG;
-
-		// If a BOM was found, don't include it in the string.
-		const uchar32_t* c2 = other;
-		if (c_end != unicode::EUTFEE_NATIVE)
-		{
-			c2 = other + unicode::BOM_UTF32_LEN;
-			length -= unicode::BOM_UTF32_LEN;
-		}
-
-		// Calculate the size of the string to read in.
-		u32 len = 0;
-		const uchar32_t* p = c2;
-		do
-		{
-			++len;
-		} while(*p++ && len < length);
-		if (len > length)
-			len = length;
-
-		// If we need to grow the size of the array, do it now.
-		// In case all of the UTF-32 string is split into surrogate pairs, do len * 2.
-		if (used + (len * 2) >= allocated)
-			reallocate(used + ((len * 2) * 2));
-		u32 start = used;
-
-		// Convert UTF-32 to UTF-16.
-		unicode::EUTF_ENDIAN m_end = getEndianness();
-		u32 pos = start;
-		for (u32 l = 0; l<len; ++l)
-		{
-			++used;
-
-			uchar32_t ch = c2[l];
-			if (c_end != unicode::EUTFEE_NATIVE && c_end != m_end)
-				ch = unicode::swapEndian32(ch);
-
-			if (ch > 0xFFFF)
-			{
-				// Split ch up into a surrogate pair as it is over 16 bits long.
-				uchar16_t x = static_cast<uchar16_t>(ch);
-				uchar16_t vh = UTF16_HI_SURROGATE | ((((ch >> 16) & ((1 << 5) - 1)) - 1) << 6) | (x >> 10);
-				uchar16_t vl = UTF16_LO_SURROGATE | (x & ((1 << 10) - 1));
-				array[pos++] = vh;
-				array[pos++] = vl;
-				++used;		// Using two shorts, so increased used again.
-			}
-			else if (ch >= 0xD800 && ch <= 0xDFFF)
-			{
-				// Between possible UTF-16 surrogates (invalid!)
-				array[pos++] = unicode::UTF_REPLACEMENT_CHARACTER;
-			}
-			else array[pos++] = static_cast<uchar16_t>(ch);
-		}
-		array[used] = 0;
-
-		// Validate our new UTF-16 string.
-		validate();
-
-		return *this;
-	}
-
-
-	//! Appends a ustring16 to this ustring16
-	//! \param other The string to append to this one.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& append(const ustring16<TAlloc>& other)
-	{
-		const uchar16_t* oa = other.c_str();
-
-		u32 len = other.size_raw();
-
-		if (used + len >= allocated)
-			reallocate(used + len);
-
-		for (u32 l=0; l<len; ++l)
-			array[used+l] = oa[l];
-
-		used += len;
-		array[used] = 0;
-
-		return *this;
-	}
-
-
-	//! Appends a certain amount of characters of a ustring16 to this ustring16.
-	//! \param other The string to append to this one.
-	//! \param length How many characters of the other string to add to this one.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& append(const ustring16<TAlloc>& other, u32 length)
-	{
-		if (other.size() == 0)
-			return *this;
-
-		if (other.size() < length)
-		{
-			append(other);
-			return *this;
-		}
-
-		if (used + length * 2 >= allocated)
-			reallocate(used + length * 2);
-
-		const_iterator iter(other, 0);
-		u32 l = length;
-		while (!iter.atEnd() && l)
-		{
-			uchar32_t c = *iter;
-			append(c);
-			++iter;
-			--l;
-		}
-
-		return *this;
-	}
-
-
-	//! Reserves some memory.
-	//! \param count The amount of characters to reserve.
-	void reserve(u32 count)
-	{
-		if (count < allocated)
-			return;
-
-		reallocate(count);
-	}
-
-
-	//! Finds first occurrence of character.
-	//! \param c The character to search for.
-	//! \return Position where the character has been found, or -1 if not found.
-	s32 findFirst(uchar32_t c) const
-	{
-		const_iterator i(*this, 0);
-
-		s32 pos = 0;
-		while (!i.atEnd())
-		{
-			uchar32_t t = *i;
-			if (c == t)
-				return pos;
-			++pos;
-			++i;
-		}
-
-		return -1;
-	}
-
-	//! Finds first occurrence of a character of a list.
-	//! \param c A list of characters to find. For example if the method should find the first occurrence of 'a' or 'b', this parameter should be "ab".
-	//! \param count The amount of characters in the list. Usually, this should be strlen(c).
-	//! \return Position where one of the characters has been found, or -1 if not found.
-	s32 findFirstChar(const uchar32_t* const c, u32 count=1) const
-	{
-		if (!c || !count)
-			return -1;
-
-		const_iterator i(*this, 0);
-
-		s32 pos = 0;
-		while (!i.atEnd())
-		{
-			uchar32_t t = *i;
-			for (u32 j=0; j<count; ++j)
-				if (t == c[j])
-					return pos;
-			++pos;
-			++i;
-		}
-
-		return -1;
-	}
-
-
-	//! Finds first position of a character not in a given list.
-	//! \param c A list of characters to NOT find. For example if the method should find the first occurrence of a character not 'a' or 'b', this parameter should be "ab".
-	//! \param count The amount of characters in the list. Usually, this should be strlen(c).
-	//! \return Position where the character has been found, or -1 if not found.
-	s32 findFirstCharNotInList(const uchar32_t* const c, u32 count=1) const
-	{
-		if (!c || !count)
-			return -1;
-
-		const_iterator i(*this, 0);
-
-		s32 pos = 0;
-		while (!i.atEnd())
-		{
-			uchar32_t t = *i;
-			u32 j;
-			for (j=0; j<count; ++j)
-				if (t == c[j])
-					break;
-
-			if (j==count)
-				return pos;
-			++pos;
-			++i;
-		}
-
-		return -1;
-	}
-
-	//! Finds last position of a character not in a given list.
-	//! \param c A list of characters to NOT find. For example if the method should find the first occurrence of a character not 'a' or 'b', this parameter should be "ab".
-	//! \param count The amount of characters in the list. Usually, this should be strlen(c).
-	//! \return Position where the character has been found, or -1 if not found.
-	s32 findLastCharNotInList(const uchar32_t* const c, u32 count=1) const
-	{
-		if (!c || !count)
-			return -1;
-
-		const_iterator i(end());
-		--i;
-
-		s32 pos = size() - 1;
-		while (!i.atStart())
-		{
-			uchar32_t t = *i;
-			u32 j;
-			for (j=0; j<count; ++j)
-				if (t == c[j])
-					break;
-
-			if (j==count)
-				return pos;
-			--pos;
-			--i;
-		}
-
-		return -1;
-	}
-
-	//! Finds next occurrence of character.
-	//! \param c The character to search for.
-	//! \param startPos The position in the string to start searching.
-	//! \return Position where the character has been found, or -1 if not found.
-	s32 findNext(uchar32_t c, u32 startPos) const
-	{
-		const_iterator i(*this, startPos);
-
-		s32 pos = startPos;
-		while (!i.atEnd())
-		{
-			uchar32_t t = *i;
-			if (t == c)
-				return pos;
-			++pos;
-			++i;
-		}
-
-		return -1;
-	}
-
-
-	//! Finds last occurrence of character.
-	//! \param c The character to search for.
-	//! \param start The start position of the reverse search ( default = -1, on end ).
-	//! \return Position where the character has been found, or -1 if not found.
-	s32 findLast(uchar32_t c, s32 start = -1) const
-	{
-		u32 s = size();
-		start = core::clamp ( start < 0 ? (s32)s : start, 0, (s32)s ) - 1;
-
-		const_iterator i(*this, start);
-		u32 pos = start;
-		while (!i.atStart())
-		{
-			uchar32_t t = *i;
-			if (t == c)
-				return pos;
-			--pos;
-			--i;
-		}
-
-		return -1;
-	}
-
-	//! Finds last occurrence of a character in a list.
-	//! \param c A list of strings to find. For example if the method should find the last occurrence of 'a' or 'b', this parameter should be "ab".
-	//! \param count The amount of characters in the list. Usually, this should be strlen(c).
-	//! \return Position where one of the characters has been found, or -1 if not found.
-	s32 findLastChar(const uchar32_t* const c, u32 count=1) const
-	{
-		if (!c || !count)
-			return -1;
-
-		const_iterator i(end());
-		--i;
-
-		s32 pos = size();
-		while (!i.atStart())
-		{
-			uchar32_t t = *i;
-			for (u32 j=0; j<count; ++j)
-				if (t == c[j])
-					return pos;
-			--pos;
-			--i;
-		}
-
-		return -1;
-	}
-
-
-	//! Finds another ustring16 in this ustring16.
-	//! \param str The string to find.
-	//! \param start The start position of the search.
-	//! \return Positions where the ustring16 has been found, or -1 if not found.
-	s32 find(const ustring16<TAlloc>& str, const u32 start = 0) const
-	{
-		u32 my_size = size();
-		u32 their_size = str.size();
-
-		if (their_size == 0 || my_size - start < their_size)
-			return -1;
-
-		const_iterator i(*this, start);
-
-		s32 pos = start;
-		while (!i.atEnd())
-		{
-			const_iterator i2(i);
-			const_iterator j(str, 0);
-			uchar32_t t1 = (uchar32_t)*i2;
-			uchar32_t t2 = (uchar32_t)*j;
-			while (t1 == t2)
-			{
-				++i2;
-				++j;
-				if (j.atEnd())
-					return pos;
-				t1 = (uchar32_t)*i2;
-				t2 = (uchar32_t)*j;
-			}
-			++i;
-			++pos;
-		}
-
-		return -1;
-	}
-
-
-	//! Finds another ustring16 in this ustring16.
-	//! \param str The string to find.
-	//! \param start The start position of the search.
-	//! \return Positions where the string has been found, or -1 if not found.
-	s32 find_raw(const ustring16<TAlloc>& str, const u32 start = 0) const
-	{
-		const uchar16_t* data = str.c_str();
-		if (data && *data)
-		{
-			u32 len = 0;
-
-			while (data[len])
-				++len;
-
-			if (len > used)
-				return -1;
-
-			for (u32 i=start; i<=used-len; ++i)
-			{
-				u32 j=0;
-
-				while(data[j] && array[i+j] == data[j])
-					++j;
-
-				if (!data[j])
-					return i;
-			}
-		}
-
-		return -1;
-	}
-
-
-	//! Returns a substring.
-	//! \param begin: Start of substring.
-	//! \param length: Length of substring.
-	//! \return A reference to our current string.
-	ustring16<TAlloc> subString(u32 begin, s32 length) const
-	{
-		u32 len = size();
-		// if start after ustring16
-		// or no proper substring length
-		if ((length <= 0) || (begin>=len))
-			return ustring16<TAlloc>("");
-		// clamp length to maximal value
-		if ((length+begin) > len)
-			length = len-begin;
-
-		ustring16<TAlloc> o;
-		o.reserve((length+1) * 2);
-
-		const_iterator i(*this, begin);
-		while (!i.atEnd() && length)
-		{
-			o.append(*i);
-			++i;
-			--length;
-		}
-
-		return o;
-	}
-
-
-	//! Appends a character to this ustring16.
-	//! \param c Character to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (char c)
-	{
-		append((uchar32_t)c);
-		return *this;
-	}
-
-
-	//! Appends a character to this ustring16.
-	//! \param c Character to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (uchar32_t c)
-	{
-		append(c);
-		return *this;
-	}
-
-
-	//! Appends a number to this ustring16.
-	//! \param c Number to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (short c)
-	{
-		append(core::stringc(c));
-		return *this;
-	}
-
-
-	//! Appends a number to this ustring16.
-	//! \param c Number to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (unsigned short c)
-	{
-		append(core::stringc(c));
-		return *this;
-	}
-
-
-#ifdef USTRING_CPP0X_NEWLITERALS
-	//! Appends a number to this ustring16.
-	//! \param c Number to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (int c)
-	{
-		append(core::stringc(c));
-		return *this;
-	}
-
-
-	//! Appends a number to this ustring16.
-	//! \param c Number to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (unsigned int c)
-	{
-		append(core::stringc(c));
-		return *this;
-	}
-#endif
-
-
-	//! Appends a number to this ustring16.
-	//! \param c Number to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (long c)
-	{
-		append(core::stringc(c));
-		return *this;
-	}
-
-
-	//! Appends a number to this ustring16.
-	//! \param c Number to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (unsigned long c)
-	{
-		append(core::stringc(c));
-		return *this;
-	}
-
-
-	//! Appends a number to this ustring16.
-	//! \param c Number to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (double c)
-	{
-		append(core::stringc(c));
-		return *this;
-	}
-
-
-	//! Appends a char ustring16 to this ustring16.
-	//! \param c Char ustring16 to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (const uchar16_t* const c)
-	{
-		append(c);
-		return *this;
-	}
-
-
-	//! Appends a ustring16 to this ustring16.
-	//! \param other ustring16 to append.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& operator += (const ustring16<TAlloc>& other)
-	{
-		append(other);
-		return *this;
-	}
-
-
-	//! Replaces all characters of a given type with another one.
-	//! \param toReplace Character to replace.
-	//! \param replaceWith Character replacing the old one.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& replace(uchar32_t toReplace, uchar32_t replaceWith)
-	{
-		iterator i(*this, 0);
-		while (!i.atEnd())
-		{
-			typename ustring16<TAlloc>::access a = *i;
-			if ((uchar32_t)a == toReplace)
-				a = replaceWith;
-			++i;
-		}
-		return *this;
-	}
-
-
-	//! Replaces all instances of a string with another one.
-	//! \param toReplace The string to replace.
-	//! \param replaceWith The string replacing the old one.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& replace(const ustring16<TAlloc>& toReplace, const ustring16<TAlloc>& replaceWith)
-	{
-		if (toReplace.size() == 0)
-			return *this;
-
-		const uchar16_t* other = toReplace.c_str();
-		const uchar16_t* replace = replaceWith.c_str();
-		const u32 other_size = toReplace.size_raw();
-		const u32 replace_size = replaceWith.size_raw();
-
-		// Determine the delta.  The algorithm will change depending on the delta.
-		s32 delta = replace_size - other_size;
-
-		// A character for character replace.  The string will not shrink or grow.
-		if (delta == 0)
-		{
-			s32 pos = 0;
-			while ((pos = find_raw(other, pos)) != -1)
-			{
-				for (u32 i = 0; i < replace_size; ++i)
-					array[pos + i] = replace[i];
-				++pos;
-			}
-			return *this;
-		}
-
-		// We are going to be removing some characters.  The string will shrink.
-		if (delta < 0)
-		{
-			u32 i = 0;
-			for (u32 pos = 0; pos <= used; ++i, ++pos)
-			{
-				// Is this potentially a match?
-				if (array[pos] == *other)
-				{
-					// Check to see if we have a match.
-					u32 j;
-					for (j = 0; j < other_size; ++j)
-					{
-						if (array[pos + j] != other[j])
-							break;
-					}
-
-					// If we have a match, replace characters.
-					if (j == other_size)
-					{
-						for (j = 0; j < replace_size; ++j)
-							array[i + j] = replace[j];
-						i += replace_size - 1;
-						pos += other_size - 1;
-						continue;
-					}
-				}
-
-				// No match found, just copy characters.
-				array[i - 1] = array[pos];
-			}
-			array[i] = 0;
-			used = i;
-
-			return *this;
-		}
-
-		// We are going to be adding characters, so the string size will increase.
-		// Count the number of times toReplace exists in the string so we can allocate the new size.
-		u32 find_count = 0;
-		s32 pos = 0;
-		while ((pos = find_raw(other, pos)) != -1)
-		{
-			++find_count;
-			++pos;
-		}
-
-		// Re-allocate the string now, if needed.
-		u32 len = delta * find_count;
-		if (used + len >= allocated)
-			reallocate(used + len);
-
-		// Start replacing.
-		pos = 0;
-		while ((pos = find_raw(other, pos)) != -1)
-		{
-			uchar16_t* start = array + pos + other_size - 1;
-			uchar16_t* ptr   = array + used;
-			uchar16_t* end   = array + used + delta;
-
-			// Shift characters to make room for the string.
-			while (ptr != start)
-			{
-				*end = *ptr;
-				--ptr;
-				--end;
-			}
-
-			// Add the new string now.
-			for (u32 i = 0; i < replace_size; ++i)
-				array[pos + i] = replace[i];
-
-			pos += replace_size;
-			used += delta;
-		}
-
-		// Terminate the string and return ourself.
-		array[used] = 0;
-		return *this;
-	}
-
-
-	//! Removes characters from a ustring16..
-	//! \param c The character to remove.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& remove(uchar32_t c)
-	{
-		u32 pos = 0;
-		u32 found = 0;
-		u32 len = (c > 0xFFFF ? 2 : 1);		// Remove characters equal to the size of c as a UTF-16 character.
-		for (u32 i=0; i<=used; ++i)
-		{
-			uchar32_t uc32 = 0;
-			if (!UTF16_IS_SURROGATE_HI(array[i]))
-				uc32 |= array[i];
-			else if (i + 1 <= used)
-			{
-				// Convert the surrogate pair into a single UTF-32 character.
-				uc32 = unicode::toUTF32(array[i], array[i + 1]);
-			}
-			u32 len2 = (uc32 > 0xFFFF ? 2 : 1);
-
-			if (uc32 == c)
-			{
-				found += len;
-				continue;
-			}
-
-			array[pos++] = array[i];
-			if (len2 == 2)
-				array[pos++] = array[++i];
-		}
-		used -= found;
-		array[used] = 0;
-		return *this;
-	}
-
-
-	//! Removes a ustring16 from the ustring16.
-	//! \param toRemove The string to remove.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& remove(const ustring16<TAlloc>& toRemove)
-	{
-		u32 size = toRemove.size_raw();
-		if (size == 0) return *this;
-
-		const uchar16_t* tra = toRemove.c_str();
-		u32 pos = 0;
-		u32 found = 0;
-		for (u32 i=0; i<=used; ++i)
-		{
-			u32 j = 0;
-			while (j < size)
-			{
-				if (array[i + j] != tra[j])
-					break;
-				++j;
-			}
-			if (j == size)
-			{
-				found += size;
-				i += size - 1;
-				continue;
-			}
-
-			array[pos++] = array[i];
-		}
-		used -= found;
-		array[used] = 0;
-		return *this;
-	}
-
-
-	//! Removes characters from the ustring16.
-	//! \param characters The characters to remove.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& removeChars(const ustring16<TAlloc>& characters)
-	{
-		if (characters.size_raw() == 0)
-			return *this;
-
-		u32 pos = 0;
-		u32 found = 0;
-		const_iterator iter(characters);
-		for (u32 i=0; i<=used; ++i)
-		{
-			uchar32_t uc32 = 0;
-			if (!UTF16_IS_SURROGATE_HI(array[i]))
-				uc32 |= array[i];
-			else if (i + 1 <= used)
-			{
-				// Convert the surrogate pair into a single UTF-32 character.
-				uc32 = unicode::toUTF32(array[i], array[i+1]);
-			}
-			u32 len2 = (uc32 > 0xFFFF ? 2 : 1);
-
-			bool cont = false;
-			iter.toStart();
-			while (!iter.atEnd())
-			{
-				uchar32_t c = *iter;
-				if (uc32 == c)
-				{
-					found += (c > 0xFFFF ? 2 : 1);		// Remove characters equal to the size of c as a UTF-16 character.
-					++i;
-					cont = true;
-					break;
-				}
-				++iter;
-			}
-			if (cont) continue;
-
-			array[pos++] = array[i];
-			if (len2 == 2)
-				array[pos++] = array[++i];
-		}
-		used -= found;
-		array[used] = 0;
-		return *this;
-	}
-
-
-	//! Trims the ustring16.
-	//! Removes the specified characters (by default, Latin-1 whitespace) from the begining and the end of the ustring16.
-	//! \param whitespace The characters that are to be considered as whitespace.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& trim(const ustring16<TAlloc>& whitespace = " \t\n\r")
-	{
-		core::array<uchar32_t> utf32white = whitespace.toUTF32();
-
-		// find start and end of the substring without the specified characters
-		const s32 begin = findFirstCharNotInList(utf32white.const_pointer(), whitespace.used + 1);
-		if (begin == -1)
-			return (*this="");
-
-		const s32 end = findLastCharNotInList(utf32white.const_pointer(), whitespace.used + 1);
-
-		return (*this = subString(begin, (end +1) - begin));
-	}
-
-
-	//! Erases a character from the ustring16.
-	//! May be slow, because all elements following after the erased element have to be copied.
-	//! \param index Index of element to be erased.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& erase(u32 index)
-	{
-		_IRR_DEBUG_BREAK_IF(index>used) // access violation
-
-		iterator i(*this, index);
-
-		uchar32_t t = *i;
-		u32 len = (t > 0xFFFF ? 2 : 1);
-
-		for (u32 j = static_cast<u32>(i.getPos()) + len; j <= used; ++j)
-			array[j - len] = array[j];
-
-		used -= len;
-		array[used] = 0;
-
-		return *this;
-	}
-
-
-	//! Validate the existing ustring16, checking for valid surrogate pairs and checking for proper termination.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& validate()
-	{
-		// Validate all unicode characters.
-		for (u32 i=0; i<allocated; ++i)
-		{
-			// Terminate on existing null.
-			if (array[i] == 0)
-			{
-				used = i;
-				return *this;
-			}
-			if (UTF16_IS_SURROGATE(array[i]))
-			{
-				if (((i+1) >= allocated) || UTF16_IS_SURROGATE_LO(array[i]))
-					array[i] = unicode::UTF_REPLACEMENT_CHARACTER;
-				else if (UTF16_IS_SURROGATE_HI(array[i]) && !UTF16_IS_SURROGATE_LO(array[i+1]))
-					array[i] = unicode::UTF_REPLACEMENT_CHARACTER;
-				++i;
-			}
-			if (array[i] >= 0xFDD0 && array[i] <= 0xFDEF)
-				array[i] = unicode::UTF_REPLACEMENT_CHARACTER;
-		}
-
-		// terminate
-		used = 0;
-		if (allocated > 0)
-		{
-			used = allocated - 1;
-			array[used] = 0;
-		}
-		return *this;
-	}
-
-
-	//! Gets the last char of the ustring16, or 0.
-	//! \return The last char of the ustring16, or 0.
-	uchar32_t lastChar() const
-	{
-		if (used < 1)
-			return 0;
-
-		if (UTF16_IS_SURROGATE_LO(array[used-1]))
-		{
-			// Make sure we have a paired surrogate.
-			if (used < 2)
-				return 0;
-
-			// Check for an invalid surrogate.
-			if (!UTF16_IS_SURROGATE_HI(array[used-2]))
-				return 0;
-
-			// Convert the surrogate pair into a single UTF-32 character.
-			return unicode::toUTF32(array[used-2], array[used-1]);
-		}
-		else
-		{
-			return array[used-1];
-		}
-	}
-
-
-	//! Split the ustring16 into parts.
-	/** This method will split a ustring16 at certain delimiter characters
-	into the container passed in as reference. The type of the container
-	has to be given as template parameter. It must provide a push_back and
-	a size method.
-	\param ret The result container
-	\param c C-style ustring16 of delimiter characters
-	\param count Number of delimiter characters
-	\param ignoreEmptyTokens Flag to avoid empty substrings in the result
-	container. If two delimiters occur without a character in between, an
-	empty substring would be placed in the result. If this flag is set,
-	only non-empty strings are stored.
-	\param keepSeparators Flag which allows to add the separator to the
-	result ustring16. If this flag is true, the concatenation of the
-	substrings results in the original ustring16. Otherwise, only the
-	characters between the delimiters are returned.
-	\return The number of resulting substrings
-	*/
-	template<class container>
-	u32 split(container& ret, const uchar32_t* const c, u32 count=1, bool ignoreEmptyTokens=true, bool keepSeparators=false) const
-	{
-		if (!c)
-			return 0;
-
-		const_iterator i(*this);
-		const u32 oldSize=ret.size();
-		u32 pos = 0;
-		u32 lastpos = 0;
-		u32 lastpospos = 0;
-		bool lastWasSeparator = false;
-		while (!i.atEnd())
-		{
-			uchar32_t ch = *i;
-			bool foundSeparator = false;
-			for (u32 j=0; j<count; ++j)
-			{
-				if (ch == c[j])
-				{
-					if ((!ignoreEmptyTokens || pos - lastpos != 0) &&
-							!lastWasSeparator)
-					ret.push_back(ustring16<TAlloc>(&array[lastpospos], pos - lastpos));
-					foundSeparator = true;
-					lastpos = (keepSeparators ? pos : pos + 1);
-					lastpospos = (keepSeparators ? i.getPos() : i.getPos() + 1);
-					break;
-				}
-			}
-			lastWasSeparator = foundSeparator;
-			++pos;
-			++i;
-		}
-		u32 s = size() + 1;
-		if (s > lastpos)
-			ret.push_back(ustring16<TAlloc>(&array[lastpospos], s - lastpos));
-		return ret.size()-oldSize;
-	}
-
-
-	//! Split the ustring16 into parts.
-	/** This method will split a ustring16 at certain delimiter characters
-	into the container passed in as reference. The type of the container
-	has to be given as template parameter. It must provide a push_back and
-	a size method.
-	\param ret The result container
-	\param c A unicode string of delimiter characters
-	\param ignoreEmptyTokens Flag to avoid empty substrings in the result
-	container. If two delimiters occur without a character in between, an
-	empty substring would be placed in the result. If this flag is set,
-	only non-empty strings are stored.
-	\param keepSeparators Flag which allows to add the separator to the
-	result ustring16. If this flag is true, the concatenation of the
-	substrings results in the original ustring16. Otherwise, only the
-	characters between the delimiters are returned.
-	\return The number of resulting substrings
-	*/
-	template<class container>
-	u32 split(container& ret, const ustring16<TAlloc>& c, bool ignoreEmptyTokens=true, bool keepSeparators=false) const
-	{
-		core::array<uchar32_t> v = c.toUTF32();
-		return split(ret, v.pointer(), v.size(), ignoreEmptyTokens, keepSeparators);
-	}
-
-
-	//! Gets the size of the allocated memory buffer for the string.
-	//! \return The size of the allocated memory buffer.
-	u32 capacity() const
-	{
-		return allocated;
-	}
-
-
-	//! Returns the raw number of UTF-16 code points in the string which includes the individual surrogates.
-	//! \return The raw number of UTF-16 code points, excluding the trialing NUL.
-	u32 size_raw() const
-	{
-		return used;
-	}
-
-
-	//! Inserts a character into the string.
-	//! \param c The character to insert.
-	//! \param pos The position to insert the character.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& insert(uchar32_t c, u32 pos)
-	{
-		u8 len = (c > 0xFFFF ? 2 : 1);
-
-		if (used + len >= allocated)
-			reallocate(used + len);
-
-		used += len;
-
-		iterator iter(*this, pos);
-		for (u32 i = used - 2; i > iter.getPos(); --i)
-			array[i] = array[i - len];
-
-		if (c > 0xFFFF)
-		{
-			// c will be multibyte, so split it up into a surrogate pair.
-			uchar16_t x = static_cast<uchar16_t>(c);
-			uchar16_t vh = UTF16_HI_SURROGATE | ((((c >> 16) & ((1 << 5) - 1)) - 1) << 6) | (x >> 10);
-			uchar16_t vl = UTF16_LO_SURROGATE | (x & ((1 << 10) - 1));
-			array[iter.getPos()] = vh;
-			array[iter.getPos()+1] = vl;
-		}
-		else
-		{
-			array[iter.getPos()] = static_cast<uchar16_t>(c);
-		}
-		array[used] = 0;
-		return *this;
-	}
-
-
-	//! Inserts a string into the string.
-	//! \param c The string to insert.
-	//! \param pos The position to insert the string.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& insert(const ustring16<TAlloc>& c, u32 pos)
-	{
-		u32 len = c.size_raw();
-		if (len == 0) return *this;
-
-		if (used + len >= allocated)
-			reallocate(used + len);
-
-		used += len;
-
-		iterator iter(*this, pos);
-		for (u32 i = used - 2; i > iter.getPos() + len; --i)
-			array[i] = array[i - len];
-
-		const uchar16_t* s = c.c_str();
-		for (u32 i = 0; i < len; ++i)
-		{
-			array[pos++] = *s;
-			++s;
-		}
-
-		array[used] = 0;
-		return *this;
-	}
-
-
-	//! Inserts a character into the string.
-	//! \param c The character to insert.
-	//! \param pos The position to insert the character.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& insert_raw(uchar16_t c, u32 pos)
-	{
-		if (used + 1 >= allocated)
-			reallocate(used + 1);
-
-		++used;
-
-		for (u32 i = used - 1; i > pos; --i)
-			array[i] = array[i - 1];
-
-		array[pos] = c;
-		array[used] = 0;
-		return *this;
-	}
-
-
-	//! Removes a character from string.
-	//! \param pos Position of the character to remove.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& erase_raw(u32 pos)
-	{
-		for (u32 i=pos; i<=used; ++i)
-		{
-			array[i] = array[i + 1];
-		}
-		--used;
-		array[used] = 0;
-		return *this;
-	}
-
-
-	//! Replaces a character in the string.
-	//! \param c The new character.
-	//! \param pos The position of the character to replace.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& replace_raw(uchar16_t c, u32 pos)
-	{
-		array[pos] = c;
-		return *this;
-	}
-
-
-	//! Returns an iterator to the beginning of the string.
-	//! \return An iterator to the beginning of the string.
-	iterator begin()
-	{
-		iterator i(*this, 0);
-		return i;
-	}
-
-
-	//! Returns an iterator to the beginning of the string.
-	//! \return An iterator to the beginning of the string.
-	const_iterator begin() const
-	{
-		const_iterator i(*this, 0);
-		return i;
-	}
-
-
-	//! Returns an iterator to the beginning of the string.
-	//! \return An iterator to the beginning of the string.
-	const_iterator cbegin() const
-	{
-		const_iterator i(*this, 0);
-		return i;
-	}
-
-
-	//! Returns an iterator to the end of the string.
-	//! \return An iterator to the end of the string.
-	iterator end()
-	{
-		iterator i(*this, 0);
-		i.toEnd();
-		return i;
-	}
-
-
-	//! Returns an iterator to the end of the string.
-	//! \return An iterator to the end of the string.
-	const_iterator end() const
-	{
-		const_iterator i(*this, 0);
-		i.toEnd();
-		return i;
-	}
-
-
-	//! Returns an iterator to the end of the string.
-	//! \return An iterator to the end of the string.
-	const_iterator cend() const
-	{
-		const_iterator i(*this, 0);
-		i.toEnd();
-		return i;
-	}
-
-
-	//! Converts the string to a UTF-8 encoded string.
-	//! \param addBOM If true, the proper unicode byte-order mark will be prefixed to the string.
-	//! \return A string containing the UTF-8 encoded string.
-	core::string<uchar8_t> toUTF8_s(const bool addBOM = false) const
-	{
-		core::string<uchar8_t> ret;
-		ret.reserve(used * 4 + (addBOM ? unicode::BOM_UTF8_LEN : 0) + 1);
-		const_iterator iter(*this, 0);
-
-		// Add the byte order mark if the user wants it.
-		if (addBOM)
-		{
-			ret.append(unicode::BOM_ENCODE_UTF8[0]);
-			ret.append(unicode::BOM_ENCODE_UTF8[1]);
-			ret.append(unicode::BOM_ENCODE_UTF8[2]);
-		}
-
-		while (!iter.atEnd())
-		{
-			uchar32_t c = *iter;
-			if (c > 0xFFFF)
-			{	// 4 bytes
-				uchar8_t b1 = (0x1E << 3) | ((c >> 18) & 0x7);
-				uchar8_t b2 = (0x2 << 6) | ((c >> 12) & 0x3F);
-				uchar8_t b3 = (0x2 << 6) | ((c >> 6) & 0x3F);
-				uchar8_t b4 = (0x2 << 6) | (c & 0x3F);
-				ret.append(b1);
-				ret.append(b2);
-				ret.append(b3);
-				ret.append(b4);
-			}
-			else if (c > 0x7FF)
-			{	// 3 bytes
-				uchar8_t b1 = (0xE << 4) | ((c >> 12) & 0xF);
-				uchar8_t b2 = (0x2 << 6) | ((c >> 6) & 0x3F);
-				uchar8_t b3 = (0x2 << 6) | (c & 0x3F);
-				ret.append(b1);
-				ret.append(b2);
-				ret.append(b3);
-			}
-			else if (c > 0x7F)
-			{	// 2 bytes
-				uchar8_t b1 = (0x6 << 5) | ((c >> 6) & 0x1F);
-				uchar8_t b2 = (0x2 << 6) | (c & 0x3F);
-				ret.append(b1);
-				ret.append(b2);
-			}
-			else
-			{	// 1 byte
-				ret.append(static_cast<uchar8_t>(c));
-			}
-			++iter;
-		}
-		return ret;
-	}
-
-
-	//! Converts the string to a UTF-8 encoded string array.
-	//! \param addBOM If true, the proper unicode byte-order mark will be prefixed to the string.
-	//! \return An array containing the UTF-8 encoded string.
-	core::array<uchar8_t> toUTF8(const bool addBOM = false) const
-	{
-		core::array<uchar8_t> ret(used * 4 + (addBOM ? unicode::BOM_UTF8_LEN : 0) + 1);
-		const_iterator iter(*this, 0);
-
-		// Add the byte order mark if the user wants it.
-		if (addBOM)
-		{
-			ret.push_back(unicode::BOM_ENCODE_UTF8[0]);
-			ret.push_back(unicode::BOM_ENCODE_UTF8[1]);
-			ret.push_back(unicode::BOM_ENCODE_UTF8[2]);
-		}
-
-		while (!iter.atEnd())
-		{
-			uchar32_t c = *iter;
-			if (c > 0xFFFF)
-			{	// 4 bytes
-				uchar8_t b1 = (0x1E << 3) | ((c >> 18) & 0x7);
-				uchar8_t b2 = (0x2 << 6) | ((c >> 12) & 0x3F);
-				uchar8_t b3 = (0x2 << 6) | ((c >> 6) & 0x3F);
-				uchar8_t b4 = (0x2 << 6) | (c & 0x3F);
-				ret.push_back(b1);
-				ret.push_back(b2);
-				ret.push_back(b3);
-				ret.push_back(b4);
-			}
-			else if (c > 0x7FF)
-			{	// 3 bytes
-				uchar8_t b1 = (0xE << 4) | ((c >> 12) & 0xF);
-				uchar8_t b2 = (0x2 << 6) | ((c >> 6) & 0x3F);
-				uchar8_t b3 = (0x2 << 6) | (c & 0x3F);
-				ret.push_back(b1);
-				ret.push_back(b2);
-				ret.push_back(b3);
-			}
-			else if (c > 0x7F)
-			{	// 2 bytes
-				uchar8_t b1 = (0x6 << 5) | ((c >> 6) & 0x1F);
-				uchar8_t b2 = (0x2 << 6) | (c & 0x3F);
-				ret.push_back(b1);
-				ret.push_back(b2);
-			}
-			else
-			{	// 1 byte
-				ret.push_back(static_cast<uchar8_t>(c));
-			}
-			++iter;
-		}
-		ret.push_back(0);
-		return ret;
-	}
-
-
-#ifdef USTRING_CPP0X_NEWLITERALS	// C++0x
-	//! Converts the string to a UTF-16 encoded string.
-	//! \param endian The desired endianness of the string.
-	//! \param addBOM If true, the proper unicode byte-order mark will be prefixed to the string.
-	//! \return A string containing the UTF-16 encoded string.
-	core::string<char16_t> toUTF16_s(const unicode::EUTF_ENDIAN endian = unicode::EUTFEE_NATIVE, const bool addBOM = false) const
-	{
-		core::string<char16_t> ret;
-		ret.reserve(used + (addBOM ? unicode::BOM_UTF16_LEN : 0) + 1);
-
-		// Add the BOM if specified.
-		if (addBOM)
-		{
-			if (endian == unicode::EUTFEE_NATIVE)
-				ret[0] = unicode::BOM;
-			else if (endian == unicode::EUTFEE_LITTLE)
-			{
-				uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(&ret[0]);
-				*ptr8++ = unicode::BOM_ENCODE_UTF16_LE[0];
-				*ptr8 = unicode::BOM_ENCODE_UTF16_LE[1];
-			}
-			else
-			{
-				uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(&ret[0]);
-				*ptr8++ = unicode::BOM_ENCODE_UTF16_BE[0];
-				*ptr8 = unicode::BOM_ENCODE_UTF16_BE[1];
-			}
-		}
-
-		ret.append(array);
-		if (endian != unicode::EUTFEE_NATIVE && getEndianness() != endian)
-		{
-			char16_t* ptr = ret.c_str();
-			for (u32 i = 0; i < ret.size(); ++i)
-				*ptr++ = unicode::swapEndian16(*ptr);
-		}
-		return ret;
-	}
-#endif
-
-
-	//! Converts the string to a UTF-16 encoded string array.
-	//! Unfortunately, no toUTF16_s() version exists due to limitations with Irrlicht's string class.
-	//! \param endian The desired endianness of the string.
-	//! \param addBOM If true, the proper unicode byte-order mark will be prefixed to the string.
-	//! \return An array containing the UTF-16 encoded string.
-	core::array<uchar16_t> toUTF16(const unicode::EUTF_ENDIAN endian = unicode::EUTFEE_NATIVE, const bool addBOM = false) const
-	{
-		core::array<uchar16_t> ret(used + (addBOM ? unicode::BOM_UTF16_LEN : 0) + 1);
-		uchar16_t* ptr = ret.pointer();
-
-		// Add the BOM if specified.
-		if (addBOM)
-		{
-			if (endian == unicode::EUTFEE_NATIVE)
-				*ptr = unicode::BOM;
-			else if (endian == unicode::EUTFEE_LITTLE)
-			{
-				uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(ptr);
-				*ptr8++ = unicode::BOM_ENCODE_UTF16_LE[0];
-				*ptr8 = unicode::BOM_ENCODE_UTF16_LE[1];
-			}
-			else
-			{
-				uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(ptr);
-				*ptr8++ = unicode::BOM_ENCODE_UTF16_BE[0];
-				*ptr8 = unicode::BOM_ENCODE_UTF16_BE[1];
-			}
-			++ptr;
-		}
-
-		memcpy((void*)ptr, (void*)array, used * sizeof(uchar16_t));
-		if (endian != unicode::EUTFEE_NATIVE && getEndianness() != endian)
-		{
-			for (u32 i = 0; i <= used; ++i)
-				ptr[i] = unicode::swapEndian16(ptr[i]);
-		}
-		ret.set_used(used + (addBOM ? unicode::BOM_UTF16_LEN : 0));
-		ret.push_back(0);
-		return ret;
-	}
-
-
-#ifdef USTRING_CPP0X_NEWLITERALS	// C++0x
-	//! Converts the string to a UTF-32 encoded string.
-	//! \param endian The desired endianness of the string.
-	//! \param addBOM If true, the proper unicode byte-order mark will be prefixed to the string.
-	//! \return A string containing the UTF-32 encoded string.
-	core::string<char32_t> toUTF32_s(const unicode::EUTF_ENDIAN endian = unicode::EUTFEE_NATIVE, const bool addBOM = false) const
-	{
-		core::string<char32_t> ret;
-		ret.reserve(size() + 1 + (addBOM ? unicode::BOM_UTF32_LEN : 0));
-		const_iterator iter(*this, 0);
-
-		// Add the BOM if specified.
-		if (addBOM)
-		{
-			if (endian == unicode::EUTFEE_NATIVE)
-				ret.append(unicode::BOM);
-			else
-			{
-				union
-				{
-					uchar32_t full;
-					u8 chunk[4];
-				} t;
-
-				if (endian == unicode::EUTFEE_LITTLE)
-				{
-					t.chunk[0] = unicode::BOM_ENCODE_UTF32_LE[0];
-					t.chunk[1] = unicode::BOM_ENCODE_UTF32_LE[1];
-					t.chunk[2] = unicode::BOM_ENCODE_UTF32_LE[2];
-					t.chunk[3] = unicode::BOM_ENCODE_UTF32_LE[3];
-				}
-				else
-				{
-					t.chunk[0] = unicode::BOM_ENCODE_UTF32_BE[0];
-					t.chunk[1] = unicode::BOM_ENCODE_UTF32_BE[1];
-					t.chunk[2] = unicode::BOM_ENCODE_UTF32_BE[2];
-					t.chunk[3] = unicode::BOM_ENCODE_UTF32_BE[3];
-				}
-				ret.append(t.full);
-			}
-		}
-
-		while (!iter.atEnd())
-		{
-			uchar32_t c = *iter;
-			if (endian != unicode::EUTFEE_NATIVE && getEndianness() != endian)
-				c = unicode::swapEndian32(c);
-			ret.append(c);
-			++iter;
-		}
-		return ret;
-	}
-#endif
-
-
-	//! Converts the string to a UTF-32 encoded string array.
-	//! Unfortunately, no toUTF32_s() version exists due to limitations with Irrlicht's string class.
-	//! \param endian The desired endianness of the string.
-	//! \param addBOM If true, the proper unicode byte-order mark will be prefixed to the string.
-	//! \return An array containing the UTF-32 encoded string.
-	core::array<uchar32_t> toUTF32(const unicode::EUTF_ENDIAN endian = unicode::EUTFEE_NATIVE, const bool addBOM = false) const
-	{
-		core::array<uchar32_t> ret(size() + (addBOM ? unicode::BOM_UTF32_LEN : 0) + 1);
-		const_iterator iter(*this, 0);
-
-		// Add the BOM if specified.
-		if (addBOM)
-		{
-			if (endian == unicode::EUTFEE_NATIVE)
-				ret.push_back(unicode::BOM);
-			else
-			{
-				union
-				{
-					uchar32_t full;
-					u8 chunk[4];
-				} t;
-
-				if (endian == unicode::EUTFEE_LITTLE)
-				{
-					t.chunk[0] = unicode::BOM_ENCODE_UTF32_LE[0];
-					t.chunk[1] = unicode::BOM_ENCODE_UTF32_LE[1];
-					t.chunk[2] = unicode::BOM_ENCODE_UTF32_LE[2];
-					t.chunk[3] = unicode::BOM_ENCODE_UTF32_LE[3];
-				}
-				else
-				{
-					t.chunk[0] = unicode::BOM_ENCODE_UTF32_BE[0];
-					t.chunk[1] = unicode::BOM_ENCODE_UTF32_BE[1];
-					t.chunk[2] = unicode::BOM_ENCODE_UTF32_BE[2];
-					t.chunk[3] = unicode::BOM_ENCODE_UTF32_BE[3];
-				}
-				ret.push_back(t.full);
-			}
-		}
-		ret.push_back(0);
-
-		while (!iter.atEnd())
-		{
-			uchar32_t c = *iter;
-			if (endian != unicode::EUTFEE_NATIVE && getEndianness() != endian)
-				c = unicode::swapEndian32(c);
-			ret.push_back(c);
-			++iter;
-		}
-		return ret;
-	}
-
-
-	//! Converts the string to a wchar_t encoded string.
-	/** The size of a wchar_t changes depending on the platform.  This function will store a
-	correct UTF-8, -16, or -32 encoded string depending on the size of a wchar_t. **/
-	//! \param endian The desired endianness of the string.
-	//! \param addBOM If true, the proper unicode byte-order mark will be prefixed to the string.
-	//! \return A string containing the wchar_t encoded string.
-	core::string<wchar_t> toWCHAR_s(const unicode::EUTF_ENDIAN endian = unicode::EUTFEE_NATIVE, const bool addBOM = false) const
-	{
-		if (sizeof(wchar_t) == 4)
-		{
-			core::array<uchar32_t> a(toUTF32(endian, addBOM));
-			core::stringw ret(a.pointer());
-			return ret;
-		}
-		else if (sizeof(wchar_t) == 2)
-		{
-			if (endian == unicode::EUTFEE_NATIVE && addBOM == false)
-			{
-				core::stringw ret(array);
-				return ret;
-			}
-			else
-			{
-				core::array<uchar16_t> a(toUTF16(endian, addBOM));
-				core::stringw ret(a.pointer());
-				return ret;
-			}
-		}
-		else if (sizeof(wchar_t) == 1)
-		{
-			core::array<uchar8_t> a(toUTF8(addBOM));
-			core::stringw ret(a.pointer());
-			return ret;
-		}
-
-		// Shouldn't happen.
-		return core::stringw();
-	}
-
-
-	//! Converts the string to a wchar_t encoded string array.
-	/** The size of a wchar_t changes depending on the platform.  This function will store a
-	correct UTF-8, -16, or -32 encoded string depending on the size of a wchar_t. **/
-	//! \param endian The desired endianness of the string.
-	//! \param addBOM If true, the proper unicode byte-order mark will be prefixed to the string.
-	//! \return An array containing the wchar_t encoded string.
-	core::array<wchar_t> toWCHAR(const unicode::EUTF_ENDIAN endian = unicode::EUTFEE_NATIVE, const bool addBOM = false) const
-	{
-		if (sizeof(wchar_t) == 4)
-		{
-			core::array<uchar32_t> a(toUTF32(endian, addBOM));
-			core::array<wchar_t> ret(a.size());
-			ret.set_used(a.size());
-			memcpy((void*)ret.pointer(), (void*)a.pointer(), a.size() * sizeof(uchar32_t));
-			return ret;
-		}
-		if (sizeof(wchar_t) == 2)
-		{
-			if (endian == unicode::EUTFEE_NATIVE && addBOM == false)
-			{
-				core::array<wchar_t> ret(used);
-				ret.set_used(used);
-				memcpy((void*)ret.pointer(), (void*)array, used * sizeof(uchar16_t));
-				return ret;
-			}
-			else
-			{
-				core::array<uchar16_t> a(toUTF16(endian, addBOM));
-				core::array<wchar_t> ret(a.size());
-				ret.set_used(a.size());
-				memcpy((void*)ret.pointer(), (void*)a.pointer(), a.size() * sizeof(uchar16_t));
-				return ret;
-			}
-		}
-		if (sizeof(wchar_t) == 1)
-		{
-			core::array<uchar8_t> a(toUTF8(addBOM));
-			core::array<wchar_t> ret(a.size());
-			ret.set_used(a.size());
-			memcpy((void*)ret.pointer(), (void*)a.pointer(), a.size() * sizeof(uchar8_t));
-			return ret;
-		}
-
-		// Shouldn't happen.
-		return core::array<wchar_t>();
-	}
-
-	//! Converts the string to a properly encoded io::path string.
-	//! \param endian The desired endianness of the string.
-	//! \param addBOM If true, the proper unicode byte-order mark will be prefixed to the string.
-	//! \return An io::path string containing the properly encoded string.
-	io::path toPATH_s(const unicode::EUTF_ENDIAN endian = unicode::EUTFEE_NATIVE, const bool addBOM = false) const
-	{
-#if defined(_IRR_WCHAR_FILESYSTEM)
-		return toWCHAR_s(endian, addBOM);
-#else
-		return toUTF8_s(addBOM);
-#endif
-	}
-
-	//! Loads an unknown stream of data.
-	//! Will attempt to determine if the stream is unicode data.  Useful for loading from files.
-	//! \param data The data stream to load from.
-	//! \param data_size The length of the data string.
-	//! \return A reference to our current string.
-	ustring16<TAlloc>& loadDataStream(const char* data, size_t data_size)
-	{
-		// Clear our string.
-		*this = "";
-		if (!data)
-			return *this;
-
-		unicode::EUTF_ENCODE e = unicode::determineUnicodeBOM(data);
-		switch (e)
-		{
-			default:
-			case unicode::EUTFE_UTF8:
-				append((uchar8_t*)data, data_size);
-				break;
-
-			case unicode::EUTFE_UTF16:
-			case unicode::EUTFE_UTF16_BE:
-			case unicode::EUTFE_UTF16_LE:
-				append((uchar16_t*)data, data_size / 2);
-				break;
-
-			case unicode::EUTFE_UTF32:
-			case unicode::EUTFE_UTF32_BE:
-			case unicode::EUTFE_UTF32_LE:
-				append((uchar32_t*)data, data_size / 4);
-				break;
-		}
-
-		return *this;
-	}
-
-	//! Gets the encoding of the Unicode string this class contains.
-	//! \return An enum describing the current encoding of this string.
-	const unicode::EUTF_ENCODE getEncoding() const
-	{
-		return encoding;
-	}
-
-	//! Gets the endianness of the Unicode string this class contains.
-	//! \return An enum describing the endianness of this string.
-	const unicode::EUTF_ENDIAN getEndianness() const
-	{
-		if (encoding == unicode::EUTFE_UTF16_LE ||
-			encoding == unicode::EUTFE_UTF32_LE)
-			return unicode::EUTFEE_LITTLE;
-		else return unicode::EUTFEE_BIG;
-	}
-
-private:
-
-	//! Reallocate the string, making it bigger or smaller.
-	//! \param new_size The new size of the string.
-	void reallocate(u32 new_size)
-	{
-		uchar16_t* old_array = array;
-
-		array = allocator.allocate(new_size + 1); //new u16[new_size];
-		allocated = new_size + 1;
-		if (old_array == 0) return;
-
-		u32 amount = used < new_size ? used : new_size;
-		for (u32 i=0; i<=amount; ++i)
-			array[i] = old_array[i];
-
-		if (allocated <= used)
-			used = allocated - 1;
-
-		array[used] = 0;
-
-		allocator.deallocate(old_array); // delete [] old_array;
-	}
-
-	//--- member variables
-
-	uchar16_t* array;
-	unicode::EUTF_ENCODE encoding;
-	u32 allocated;
-	u32 used;
-	TAlloc allocator;
-	//irrAllocator<uchar16_t> allocator;
-};
-
-typedef ustring16<irrAllocator<uchar16_t> > ustring;
-
-
-//! Appends two ustring16s.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and a null-terminated unicode string.
-template <typename TAlloc, class B>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const B* const right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and a null-terminated unicode string.
-template <class B, typename TAlloc>
-inline ustring16<TAlloc> operator+(const B* const left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and an Irrlicht string.
-template <typename TAlloc, typename B, typename BAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const string<B, BAlloc>& right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and an Irrlicht string.
-template <typename TAlloc, typename B, typename BAlloc>
-inline ustring16<TAlloc> operator+(const string<B, BAlloc>& left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and a std::basic_string.
-template <typename TAlloc, typename B, typename A, typename BAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const std::basic_string<B, A, BAlloc>& right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and a std::basic_string.
-template <typename TAlloc, typename B, typename A, typename BAlloc>
-inline ustring16<TAlloc> operator+(const std::basic_string<B, A, BAlloc>& left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and a char.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const char right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and a char.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const char left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-
-
-#ifdef USTRING_CPP0X_NEWLITERALS
-//! Appends a ustring16 and a uchar32_t.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const uchar32_t right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and a uchar32_t.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const uchar32_t left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += right;
-	return ret;
-}
-#endif
-
-
-//! Appends a ustring16 and a short.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const short right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += core::stringc(right);
-	return ret;
-}
-
-
-//! Appends a ustring16 and a short.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const short left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret((core::stringc(left)));
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and an unsigned short.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const unsigned short right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += core::stringc(right);
-	return ret;
-}
-
-
-//! Appends a ustring16 and an unsigned short.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const unsigned short left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret((core::stringc(left)));
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and an int.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const int right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += core::stringc(right);
-	return ret;
-}
-
-
-//! Appends a ustring16 and an int.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const int left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret((core::stringc(left)));
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and an unsigned int.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const unsigned int right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += core::stringc(right);
-	return ret;
-}
-
-
-//! Appends a ustring16 and an unsigned int.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const unsigned int left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret((core::stringc(left)));
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and a long.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const long right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += core::stringc(right);
-	return ret;
-}
-
-
-//! Appends a ustring16 and a long.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const long left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret((core::stringc(left)));
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and an unsigned long.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const unsigned long right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += core::stringc(right);
-	return ret;
-}
-
-
-//! Appends a ustring16 and an unsigned long.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const unsigned long left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret((core::stringc(left)));
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and a float.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const float right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += core::stringc(right);
-	return ret;
-}
-
-
-//! Appends a ustring16 and a float.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const float left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret((core::stringc(left)));
-	ret += right;
-	return ret;
-}
-
-
-//! Appends a ustring16 and a double.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const ustring16<TAlloc>& left, const double right)
-{
-	ustring16<TAlloc> ret(left);
-	ret += core::stringc(right);
-	return ret;
-}
-
-
-//! Appends a ustring16 and a double.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const double left, const ustring16<TAlloc>& right)
-{
-	ustring16<TAlloc> ret((core::stringc(left)));
-	ret += right;
-	return ret;
-}
-
-
-#ifdef USTRING_CPP0X
-//! Appends two ustring16s.
-template <typename TAlloc>
-inline ustring16<TAlloc>&& operator+(const ustring16<TAlloc>& left, ustring16<TAlloc>&& right)
-{
-	//std::cout << "MOVE operator+(&, &&)" << std::endl;
-	right.insert(left, 0);
-	return std::move(right);
-}
-
-
-//! Appends two ustring16s.
-template <typename TAlloc>
-inline ustring16<TAlloc>&& operator+(ustring16<TAlloc>&& left, const ustring16<TAlloc>& right)
-{
-	//std::cout << "MOVE operator+(&&, &)" << std::endl;
-	left.append(right);
-	return std::move(left);
-}
-
-
-//! Appends two ustring16s.
-template <typename TAlloc>
-inline ustring16<TAlloc>&& operator+(ustring16<TAlloc>&& left, ustring16<TAlloc>&& right)
-{
-	//std::cout << "MOVE operator+(&&, &&)" << std::endl;
-	if ((right.size_raw() <= left.capacity() - left.size_raw()) ||
-		(right.capacity() - right.size_raw() < left.size_raw()))
-	{
-		left.append(right);
-		return std::move(left);
-	}
-	else
-	{
-		right.insert(left, 0);
-		return std::move(right);
-	}
-}
-
-
-//! Appends a ustring16 and a null-terminated unicode string.
-template <typename TAlloc, class B>
-inline ustring16<TAlloc>&& operator+(ustring16<TAlloc>&& left, const B* const right)
-{
-	//std::cout << "MOVE operator+(&&, B*)" << std::endl;
-	left.append(right);
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and a null-terminated unicode string.
-template <class B, typename TAlloc>
-inline ustring16<TAlloc>&& operator+(const B* const left, ustring16<TAlloc>&& right)
-{
-	//std::cout << "MOVE operator+(B*, &&)" << std::endl;
-	right.insert(left, 0);
-	return std::move(right);
-}
-
-
-//! Appends a ustring16 and an Irrlicht string.
-template <typename TAlloc, typename B, typename BAlloc>
-inline ustring16<TAlloc>&& operator+(const string<B, BAlloc>& left, ustring16<TAlloc>&& right)
-{
-	//std::cout << "MOVE operator+(&, &&)" << std::endl;
-	right.insert(left, 0);
-	return std::move(right);
-}
-
-
-//! Appends a ustring16 and an Irrlicht string.
-template <typename TAlloc, typename B, typename BAlloc>
-inline ustring16<TAlloc>&& operator+(ustring16<TAlloc>&& left, const string<B, BAlloc>& right)
-{
-	//std::cout << "MOVE operator+(&&, &)" << std::endl;
-	left.append(right);
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and a std::basic_string.
-template <typename TAlloc, typename B, typename A, typename BAlloc>
-inline ustring16<TAlloc>&& operator+(const std::basic_string<B, A, BAlloc>& left, ustring16<TAlloc>&& right)
-{
-	//std::cout << "MOVE operator+(&, &&)" << std::endl;
-	right.insert(core::ustring16<TAlloc>(left), 0);
-	return std::move(right);
-}
-
-
-//! Appends a ustring16 and a std::basic_string.
-template <typename TAlloc, typename B, typename A, typename BAlloc>
-inline ustring16<TAlloc>&& operator+(ustring16<TAlloc>&& left, const std::basic_string<B, A, BAlloc>& right)
-{
-	//std::cout << "MOVE operator+(&&, &)" << std::endl;
-	left.append(right);
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and a char.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(ustring16<TAlloc>&& left, const char right)
-{
-	left.append((uchar32_t)right);
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and a char.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const char left, ustring16<TAlloc>&& right)
-{
-	right.insert((uchar32_t)left, 0);
-	return std::move(right);
-}
-
-
-#ifdef USTRING_CPP0X_NEWLITERALS
-//! Appends a ustring16 and a uchar32_t.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(ustring16<TAlloc>&& left, const uchar32_t right)
-{
-	left.append(right);
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and a uchar32_t.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const uchar32_t left, ustring16<TAlloc>&& right)
-{
-	right.insert(left, 0);
-	return std::move(right);
-}
-#endif
-
-
-//! Appends a ustring16 and a short.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(ustring16<TAlloc>&& left, const short right)
-{
-	left.append(core::stringc(right));
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and a short.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const short left, ustring16<TAlloc>&& right)
-{
-	right.insert(core::stringc(left), 0);
-	return std::move(right);
-}
-
-
-//! Appends a ustring16 and an unsigned short.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(ustring16<TAlloc>&& left, const unsigned short right)
-{
-	left.append(core::stringc(right));
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and an unsigned short.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const unsigned short left, ustring16<TAlloc>&& right)
-{
-	right.insert(core::stringc(left), 0);
-	return std::move(right);
-}
-
-
-//! Appends a ustring16 and an int.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(ustring16<TAlloc>&& left, const int right)
-{
-	left.append(core::stringc(right));
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and an int.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const int left, ustring16<TAlloc>&& right)
-{
-	right.insert(core::stringc(left), 0);
-	return std::move(right);
-}
-
-
-//! Appends a ustring16 and an unsigned int.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(ustring16<TAlloc>&& left, const unsigned int right)
-{
-	left.append(core::stringc(right));
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and an unsigned int.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const unsigned int left, ustring16<TAlloc>&& right)
-{
-	right.insert(core::stringc(left), 0);
-	return std::move(right);
-}
-
-
-//! Appends a ustring16 and a long.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(ustring16<TAlloc>&& left, const long right)
-{
-	left.append(core::stringc(right));
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and a long.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const long left, ustring16<TAlloc>&& right)
-{
-	right.insert(core::stringc(left), 0);
-	return std::move(right);
-}
-
-
-//! Appends a ustring16 and an unsigned long.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(ustring16<TAlloc>&& left, const unsigned long right)
-{
-	left.append(core::stringc(right));
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and an unsigned long.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const unsigned long left, ustring16<TAlloc>&& right)
-{
-	right.insert(core::stringc(left), 0);
-	return std::move(right);
-}
-
-
-//! Appends a ustring16 and a float.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(ustring16<TAlloc>&& left, const float right)
-{
-	left.append(core::stringc(right));
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and a float.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const float left, ustring16<TAlloc>&& right)
-{
-	right.insert(core::stringc(left), 0);
-	return std::move(right);
-}
-
-
-//! Appends a ustring16 and a double.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(ustring16<TAlloc>&& left, const double right)
-{
-	left.append(core::stringc(right));
-	return std::move(left);
-}
-
-
-//! Appends a ustring16 and a double.
-template <typename TAlloc>
-inline ustring16<TAlloc> operator+(const double left, ustring16<TAlloc>&& right)
-{
-	right.insert(core::stringc(left), 0);
-	return std::move(right);
-}
-#endif
-
-
-#ifndef USTRING_NO_STL
-//! Writes a ustring16 to an ostream.
-template <typename TAlloc>
-inline std::ostream& operator<<(std::ostream& out, const ustring16<TAlloc>& in)
-{
-	out << in.toUTF8_s().c_str();
-	return out;
-}
-
-//! Writes a ustring16 to a wostream.
-template <typename TAlloc>
-inline std::wostream& operator<<(std::wostream& out, const ustring16<TAlloc>& in)
-{
-	out << in.toWCHAR_s().c_str();
-	return out;
-}
-#endif
-
-
-#ifndef USTRING_NO_STL
-
-namespace unicode
-{
-
-//! Hashing algorithm for hashing a ustring.  Used for things like unordered_maps.
-//! Algorithm taken from std::hash<std::string>.
-class hash : public std::unary_function<core::ustring, size_t>
-{
-	public:
-		size_t operator()(const core::ustring& s) const
-		{
-			size_t ret = 2166136261U;
-			size_t index = 0;
-			size_t stride = 1 + s.size_raw() / 10;
-
-			core::ustring::const_iterator i = s.begin();
-			while (i != s.end())
-			{
-				// TODO: Don't force u32 on an x64 OS.  Make it agnostic.
-				ret = 16777619U * ret ^ (size_t)s[(u32)index];
-				index += stride;
-				i += stride;
-			}
-			return (ret);
-		}
-};
-
-} // end namespace unicode
-
-#endif
-
-} // end namespace core
-} // end namespace irr
diff --git a/src/irrlicht_changes/static_text.cpp b/src/irrlicht_changes/static_text.cpp
index bf61cd64e..8908a91f7 100644
--- a/src/irrlicht_changes/static_text.cpp
+++ b/src/irrlicht_changes/static_text.cpp
@@ -108,16 +108,11 @@ void StaticText::draw()
 					font->getDimension(str.c_str()).Width;
 			}
 
-			//str = colorizeText(BrokenText[i].c_str(), colors, previous_color);
-			//if (!colors.empty())
-			//	previous_color = colors[colors.size() - 1];
-
 #if USE_FREETYPE
 			if (font->getType() == irr::gui::EGFT_CUSTOM) {
 				irr::gui::CGUITTFont *tmp = static_cast<irr::gui::CGUITTFont*>(font);
 				tmp->draw(str,
-					r, previous_color, // FIXME
-					HAlign == EGUIA_CENTER, VAlign == EGUIA_CENTER,
+					r, HAlign == EGUIA_CENTER, VAlign == EGUIA_CENTER,
 					(RestrainTextInside ? &AbsoluteClippingRect : NULL));
 			} else
 #endif
@@ -246,15 +241,17 @@ void StaticText::setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vert
 }
 
 
-#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR <= 7
-const video::SColor& StaticText::getOverrideColor() const
-#else
 video::SColor StaticText::getOverrideColor() const
-#endif
 {
 	return ColoredText.getDefaultColor();
 }
 
+#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8
+video::SColor StaticText::getActiveColor() const
+{
+	return getOverrideColor();
+}
+#endif
 
 //! Sets if the static text should use the overide color or the
 //! color in the gui skin.
diff --git a/src/irrlicht_changes/static_text.h b/src/irrlicht_changes/static_text.h
index 1f111ea56..83bbf4c3d 100644
--- a/src/irrlicht_changes/static_text.h
+++ b/src/irrlicht_changes/static_text.h
@@ -134,10 +134,11 @@ namespace gui
 		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical);
 
 		//! Gets the override color
-		#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR <= 7
-		virtual const video::SColor& getOverrideColor() const;
-		#else
 		virtual video::SColor getOverrideColor() const;
+
+		#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8
+		//! Gets the currently used text color
+		virtual video::SColor getActiveColor() const;
 		#endif
 
 		//! Sets if the static text should use the overide color or the
diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 794776b26..93c2d105b 100644
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -19,16 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
-/* Ensure that <stdint.h> is included before <irrTypes.h>, unless building on
- * MSVC, to address an irrlicht issue: https://sourceforge.net/p/irrlicht/bugs/433/
- *
- * TODO: Decide whether or not we support non-compliant C++ compilers like old
- *       versions of MSCV.  If we do not then <stdint.h> can always be included
- *       regardless of the compiler.
+/*
+ * IrrlichtMt already includes stdint.h in irrTypes.h. This works everywhere
+ * we need it to (including recent MSVC), so should be fine here too.
  */
-#ifndef _MSC_VER
-#	include <cstdint>
-#endif
+#include <cstdint>
 
 #include <irrTypes.h>
 
@@ -36,19 +31,6 @@ using namespace irr;
 
 namespace irr {
 
-// Irrlicht 1.8+ defines 64bit unsigned symbol in irrTypes.h
-#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
-#ifdef _MSC_VER
-	// Windows
-	typedef long long s64;
-	typedef unsigned long long u64;
-#else
-	// Posix
-	typedef int64_t s64;
-	typedef uint64_t u64;
-#endif
-#endif
-
 #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 9)
 namespace core {
 	template <typename T>
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index 5fb1e4c47..d79d6b263 100644
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -71,13 +71,11 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def)
 	stack_max = def.stack_max;
 	usable = def.usable;
 	liquids_pointable = def.liquids_pointable;
-	if(def.tool_capabilities)
-	{
-		tool_capabilities = new ToolCapabilities(
-				*def.tool_capabilities);
-	}
+	if (def.tool_capabilities)
+		tool_capabilities = new ToolCapabilities(*def.tool_capabilities);
 	groups = def.groups;
 	node_placement_prediction = def.node_placement_prediction;
+	place_param2 = def.place_param2;
 	sound_place = def.sound_place;
 	sound_place_failed = def.sound_place_failed;
 	range = def.range;
@@ -120,8 +118,8 @@ void ItemDefinition::reset()
 	sound_place = SimpleSoundSpec();
 	sound_place_failed = SimpleSoundSpec();
 	range = -1;
-
 	node_placement_prediction = "";
+	place_param2 = 0;
 }
 
 void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
@@ -166,6 +164,8 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
 	os << serializeString16(wield_overlay);
 
 	os << serializeString16(short_description);
+
+	os << place_param2;
 }
 
 void ItemDefinition::deSerialize(std::istream &is)
@@ -219,6 +219,8 @@ void ItemDefinition::deSerialize(std::istream &is)
 	// block to not need to increase the version.
 	try {
 		short_description = deSerializeString16(is);
+
+		place_param2 = readU8(is); // 0 if missing
 	} catch(SerializationError &e) {};
 }
 
diff --git a/src/itemdef.h b/src/itemdef.h
index ebf0d3527..3e302840f 100644
--- a/src/itemdef.h
+++ b/src/itemdef.h
@@ -86,6 +86,7 @@ struct ItemDefinition
 	// Server will update the precise end result a moment later.
 	// "" = no prediction
 	std::string node_placement_prediction;
+	u8 place_param2;
 
 	/*
 		Some helpful methods
diff --git a/src/itemstackmetadata.cpp b/src/itemstackmetadata.cpp
index 4aa1a0903..7a26fbb0e 100644
--- a/src/itemstackmetadata.cpp
+++ b/src/itemstackmetadata.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "itemstackmetadata.h"
 #include "util/serialize.h"
 #include "util/strfnd.h"
+#include <algorithm>
 
 #define DESERIALIZE_START '\x01'
 #define DESERIALIZE_KV_DELIM '\x02'
@@ -37,10 +38,22 @@ void ItemStackMetadata::clear()
 	updateToolCapabilities();
 }
 
+static void sanitize_string(std::string &str)
+{
+	str.erase(std::remove(str.begin(), str.end(), DESERIALIZE_START), str.end());
+	str.erase(std::remove(str.begin(), str.end(), DESERIALIZE_KV_DELIM), str.end());
+	str.erase(std::remove(str.begin(), str.end(), DESERIALIZE_PAIR_DELIM), str.end());
+}
+
 bool ItemStackMetadata::setString(const std::string &name, const std::string &var)
 {
-	bool result = Metadata::setString(name, var);
-	if (name == TOOLCAP_KEY)
+	std::string clean_name = name;
+	std::string clean_var = var;
+	sanitize_string(clean_name);
+	sanitize_string(clean_var);
+
+	bool result = Metadata::setString(clean_name, clean_var);
+	if (clean_name == TOOLCAP_KEY)
 		updateToolCapabilities();
 	return result;
 }
diff --git a/src/main.cpp b/src/main.cpp
index af6d307dc..7f96836b5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -47,11 +47,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gui/guiEngine.h"
 #include "gui/mainmenumanager.h"
 #endif
-
 #ifdef HAVE_TOUCHSCREENGUI
 	#include "gui/touchscreengui.h"
 #endif
 
+// for version information only
+extern "C" {
+#if USE_LUAJIT
+	#include <luajit.h>
+#else
+	#include <lua.h>
+#endif
+}
+
 #if !defined(SERVER) && \
 	(IRRLICHT_VERSION_MAJOR == 1) && \
 	(IRRLICHT_VERSION_MINOR == 8) && \
@@ -217,8 +225,7 @@ int main(int argc, char *argv[])
 		return run_dedicated_server(game_params, cmd_args) ? 0 : 1;
 
 #ifndef SERVER
-	ClientLauncher launcher;
-	retval = launcher.run(game_params, cmd_args) ? 0 : 1;
+	retval = ClientLauncher().run(game_params, cmd_args) ? 0 : 1;
 #else
 	retval = 0;
 #endif
@@ -351,6 +358,11 @@ static void print_version()
 #ifndef SERVER
 	std::cout << "Using Irrlicht " IRRLICHT_SDK_VERSION << std::endl;
 #endif
+#if USE_LUAJIT
+	std::cout << "Using " << LUAJIT_VERSION << std::endl;
+#else
+	std::cout << "Using " << LUA_RELEASE << std::endl;
+#endif
 	std::cout << g_build_info << std::endl;
 }
 
@@ -474,12 +486,15 @@ static bool create_userdata_path()
 static bool init_common(const Settings &cmd_args, int argc, char *argv[])
 {
 	startup_message();
-	set_default_settings(g_settings);
+	set_default_settings();
 
 	// Initialize sockets
 	sockets_init();
 	atexit(sockets_cleanup);
 
+	// Initialize g_settings
+	Settings::createLayer(SL_GLOBAL);
+
 	if (!read_config_file(cmd_args))
 		return false;
 
diff --git a/src/map.cpp b/src/map.cpp
index a80e7ff92..eeaf5c140 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -545,23 +545,6 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks,
 	u32 liquid_loop_max = g_settings->getS32("liquid_loop_max");
 	u32 loop_max = liquid_loop_max;
 
-#if 0
-
-	/* If liquid_loop_max is not keeping up with the queue size increase
-	 * loop_max up to a maximum of liquid_loop_max * dedicated_server_step.
-	 */
-	if (m_transforming_liquid.size() > loop_max * 2) {
-		// "Burst" mode
-		float server_step = g_settings->getFloat("dedicated_server_step");
-		if (m_transforming_liquid_loop_count_multiplier - 1.0 < server_step)
-			m_transforming_liquid_loop_count_multiplier *= 1.0 + server_step / 10;
-	} else {
-		m_transforming_liquid_loop_count_multiplier = 1.0;
-	}
-
-	loop_max *= m_transforming_liquid_loop_count_multiplier;
-#endif
-
 	while (m_transforming_liquid.size() != 0)
 	{
 		// This should be done here so that it is done when continue is used
@@ -1216,7 +1199,7 @@ bool Map::isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes)
 ServerMap::ServerMap(const std::string &savedir, IGameDef *gamedef,
 		EmergeManager *emerge, MetricsBackend *mb):
 	Map(gamedef),
-	settings_mgr(g_settings, savedir + DIR_DELIM + "map_meta.txt"),
+	settings_mgr(savedir + DIR_DELIM + "map_meta.txt"),
 	m_emerge(emerge)
 {
 	verbosestream<<FUNCTION_NAME<<std::endl;
@@ -1317,18 +1300,6 @@ ServerMap::~ServerMap()
 	*/
 	delete dbase;
 	delete dbase_ro;
-
-#if 0
-	/*
-		Free all MapChunks
-	*/
-	core::map<v2s16, MapChunk*>::Iterator i = m_chunks.getIterator();
-	for(; i.atEnd() == false; i++)
-	{
-		MapChunk *chunk = i.getNode()->getValue();
-		delete chunk;
-	}
-#endif
 }
 
 MapgenParams *ServerMap::getMapgenParams()
@@ -1417,25 +1388,6 @@ bool ServerMap::initBlockMake(v3s16 blockpos, BlockMakeData *data)
 	data->vmanip = new MMVManip(this);
 	data->vmanip->initialEmerge(full_bpmin, full_bpmax);
 
-	// Note: we may need this again at some point.
-#if 0
-	// Ensure none of the blocks to be generated were marked as
-	// containing CONTENT_IGNORE
-	for (s16 z = blockpos_min.Z; z <= blockpos_max.Z; z++) {
-		for (s16 y = blockpos_min.Y; y <= blockpos_max.Y; y++) {
-			for (s16 x = blockpos_min.X; x <= blockpos_max.X; x++) {
-				core::map<v3s16, u8>::Node *n;
-				n = data->vmanip->m_loaded_blocks.find(v3s16(x, y, z));
-				if (n == NULL)
-					continue;
-				u8 flags = n->getValue();
-				flags &= ~VMANIP_BLOCK_CONTAINS_CIGNORE;
-				n->setValue(flags);
-			}
-		}
-	}
-#endif
-
 	// Data is ready now.
 	return true;
 }
@@ -1446,8 +1398,6 @@ void ServerMap::finishBlockMake(BlockMakeData *data,
 	v3s16 bpmin = data->blockpos_min;
 	v3s16 bpmax = data->blockpos_max;
 
-	v3s16 extra_borders(1, 1, 1);
-
 	bool enable_mapgen_debug_info = m_emerge->enable_mapgen_debug_info;
 	EMERGE_DBG_OUT("finishBlockMake(): " PP(bpmin) " - " PP(bpmax));
 
@@ -1540,116 +1490,6 @@ MapSector *ServerMap::createSector(v2s16 p2d)
 	return sector;
 }
 
-#if 0
-/*
-	This is a quick-hand function for calling makeBlock().
-*/
-MapBlock * ServerMap::generateBlock(
-		v3s16 p,
-		std::map<v3s16, MapBlock*> &modified_blocks
-)
-{
-	bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
-
-	TimeTaker timer("generateBlock");
-
-	//MapBlock *block = original_dummy;
-
-	v2s16 p2d(p.X, p.Z);
-	v2s16 p2d_nodes = p2d * MAP_BLOCKSIZE;
-
-	/*
-		Do not generate over-limit
-	*/
-	if(blockpos_over_limit(p))
-	{
-		infostream<<FUNCTION_NAME<<": Block position over limit"<<std::endl;
-		throw InvalidPositionException("generateBlock(): pos. over limit");
-	}
-
-	/*
-		Create block make data
-	*/
-	BlockMakeData data;
-	initBlockMake(&data, p);
-
-	/*
-		Generate block
-	*/
-	{
-		TimeTaker t("mapgen::make_block()");
-		mapgen->makeChunk(&data);
-		//mapgen::make_block(&data);
-
-		if(enable_mapgen_debug_info == false)
-			t.stop(true); // Hide output
-	}
-
-	/*
-		Blit data back on map, update lighting, add mobs and whatever this does
-	*/
-	finishBlockMake(&data, modified_blocks);
-
-	/*
-		Get central block
-	*/
-	MapBlock *block = getBlockNoCreateNoEx(p);
-
-#if 0
-	/*
-		Check result
-	*/
-	if(block)
-	{
-		bool erroneus_content = false;
-		for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++)
-		for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++)
-		for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
-		{
-			v3s16 p(x0,y0,z0);
-			MapNode n = block->getNode(p);
-			if(n.getContent() == CONTENT_IGNORE)
-			{
-				infostream<<"CONTENT_IGNORE at "
-						<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
-						<<std::endl;
-				erroneus_content = true;
-				assert(0);
-			}
-		}
-		if(erroneus_content)
-		{
-			assert(0);
-		}
-	}
-#endif
-
-#if 0
-	/*
-		Generate a completely empty block
-	*/
-	if(block)
-	{
-		for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++)
-		for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
-		{
-			for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++)
-			{
-				MapNode n;
-				n.setContent(CONTENT_AIR);
-				block->setNode(v3s16(x0,y0,z0), n);
-			}
-		}
-	}
-#endif
-
-	if(enable_mapgen_debug_info == false)
-		timer.stop(true); // Hide output
-
-	return block;
-}
-#endif
-
 MapBlock * ServerMap::createBlock(v3s16 p)
 {
 	/*
diff --git a/src/map.h b/src/map.h
index 821e638c1..e0db2e262 100644
--- a/src/map.h
+++ b/src/map.h
@@ -418,13 +418,7 @@ private:
 	bool m_map_saving_enabled;
 
 	int m_map_compression_level;
-#if 0
-	// Chunk size in MapSectors
-	// If 0, chunks are disabled.
-	s16 m_chunksize;
-	// Chunks
-	core::map<v2s16, MapChunk*> m_chunks;
-#endif
+
 	std::set<v3s16> m_chunks_in_progress;
 
 	/*
diff --git a/src/map_settings_manager.cpp b/src/map_settings_manager.cpp
index 9c447b3d0..99e3cb0e6 100644
--- a/src/map_settings_manager.cpp
+++ b/src/map_settings_manager.cpp
@@ -25,17 +25,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "map_settings_manager.h"
 
-MapSettingsManager::MapSettingsManager(Settings *user_settings,
-		const std::string &map_meta_path):
-	m_map_meta_path(map_meta_path),
-	m_map_settings(new Settings()),
-	m_user_settings(user_settings)
+MapSettingsManager::MapSettingsManager(const std::string &map_meta_path):
+	m_map_meta_path(map_meta_path)
 {
-	assert(m_user_settings != NULL);
-
-	Mapgen::setDefaultSettings(m_map_settings);
-	// This inherits the combined defaults provided by loadGameConfAndInitWorld.
-	m_map_settings->overrideDefaults(user_settings);
+	m_map_settings = Settings::createLayer(SL_MAP, "[end_of_params]");
+	Mapgen::setDefaultSettings(Settings::getLayer(SL_DEFAULTS));
 }
 
 
@@ -49,22 +43,23 @@ MapSettingsManager::~MapSettingsManager()
 bool MapSettingsManager::getMapSetting(
 	const std::string &name, std::string *value_out)
 {
+	// Get from map_meta.txt, then try from all other sources
 	if (m_map_settings->getNoEx(name, *value_out))
 		return true;
 
 	// Compatibility kludge
-	if (m_user_settings == g_settings && name == "seed")
-		return m_user_settings->getNoEx("fixed_map_seed", *value_out);
+	if (name == "seed")
+		return Settings::getLayer(SL_GLOBAL)->getNoEx("fixed_map_seed", *value_out);
 
-	return m_user_settings->getNoEx(name, *value_out);
+	return false;
 }
 
 
 bool MapSettingsManager::getMapSettingNoiseParams(
 	const std::string &name, NoiseParams *value_out)
 {
-	return m_map_settings->getNoiseParams(name, *value_out) ||
-		m_user_settings->getNoiseParams(name, *value_out);
+	// TODO: Rename to "getNoiseParams"
+	return m_map_settings->getNoiseParams(name, *value_out);
 }
 
 
@@ -77,7 +72,7 @@ bool MapSettingsManager::setMapSetting(
 	if (override_meta)
 		m_map_settings->set(name, value);
 	else
-		m_map_settings->setDefault(name, value);
+		Settings::getLayer(SL_GLOBAL)->set(name, value);
 
 	return true;
 }
@@ -89,7 +84,11 @@ bool MapSettingsManager::setMapSettingNoiseParams(
 	if (mapgen_params)
 		return false;
 
-	m_map_settings->setNoiseParams(name, *value, !override_meta);
+	if (override_meta)
+		m_map_settings->setNoiseParams(name, *value);
+	else
+		Settings::getLayer(SL_GLOBAL)->setNoiseParams(name, *value);
+
 	return true;
 }
 
@@ -104,8 +103,8 @@ bool MapSettingsManager::loadMapMeta()
 		return false;
 	}
 
-	if (!m_map_settings->parseConfigLines(is, "[end_of_params]")) {
-		errorstream << "loadMapMeta: [end_of_params] not found!" << std::endl;
+	if (!m_map_settings->parseConfigLines(is)) {
+		errorstream << "loadMapMeta: Format error. '[end_of_params]' missing?" << std::endl;
 		return false;
 	}
 
@@ -116,28 +115,23 @@ bool MapSettingsManager::loadMapMeta()
 bool MapSettingsManager::saveMapMeta()
 {
 	// If mapgen params haven't been created yet; abort
-	if (!mapgen_params)
+	if (!mapgen_params) {
+		infostream << "saveMapMeta: mapgen_params not present! "
+			<< "Server startup was probably interrupted." << std::endl;
 		return false;
+	}
 
+	// Paths set up by subgames.cpp, but not in unittests
 	if (!fs::CreateAllDirs(fs::RemoveLastPathComponent(m_map_meta_path))) {
 		errorstream << "saveMapMeta: could not create dirs to "
 			<< m_map_meta_path;
 		return false;
 	}
 
-	std::ostringstream oss(std::ios_base::binary);
-	Settings conf;
+	mapgen_params->MapgenParams::writeParams(m_map_settings);
+	mapgen_params->writeParams(m_map_settings);
 
-	mapgen_params->MapgenParams::writeParams(&conf);
-	mapgen_params->writeParams(&conf);
-	conf.writeLines(oss);
-
-	// NOTE: If there are ever types of map settings other than
-	// those relating to map generation, save them here
-
-	oss << "[end_of_params]\n";
-
-	if (!fs::safeWriteToFile(m_map_meta_path, oss.str())) {
+	if (!m_map_settings->updateConfigFile(m_map_meta_path.c_str())) {
 		errorstream << "saveMapMeta: could not write "
 			<< m_map_meta_path << std::endl;
 		return false;
@@ -152,23 +146,21 @@ MapgenParams *MapSettingsManager::makeMapgenParams()
 	if (mapgen_params)
 		return mapgen_params;
 
-	assert(m_user_settings != NULL);
 	assert(m_map_settings != NULL);
 
 	// At this point, we have (in order of precedence):
-	// 1). m_mapgen_settings->m_settings containing map_meta.txt settings or
+	// 1). SL_MAP containing map_meta.txt settings or
 	//     explicit overrides from scripts
-	// 2). m_mapgen_settings->m_defaults containing script-set mgparams without
-	//     overrides
-	// 3). g_settings->m_settings containing all user-specified config file
+	// 2). SL_GLOBAL containing all user-specified config file
 	//     settings
-	// 4). g_settings->m_defaults containing any low-priority settings from
+	// 3). SL_DEFAULTS containing any low-priority settings from
 	//     scripts, e.g. mods using Lua as an enhanced config file)
 
 	// Now, get the mapgen type so we can create the appropriate MapgenParams
 	std::string mg_name;
 	MapgenType mgtype = getMapSetting("mg_name", &mg_name) ?
 		Mapgen::getMapgenType(mg_name) : MAPGEN_DEFAULT;
+
 	if (mgtype == MAPGEN_INVALID) {
 		errorstream << "EmergeManager: mapgen '" << mg_name <<
 			"' not valid; falling back to " <<
diff --git a/src/map_settings_manager.h b/src/map_settings_manager.h
index 5baa38455..9258d3032 100644
--- a/src/map_settings_manager.h
+++ b/src/map_settings_manager.h
@@ -44,8 +44,7 @@ struct MapgenParams;
 */
 class MapSettingsManager {
 public:
-	MapSettingsManager(Settings *user_settings,
-		const std::string &map_meta_path);
+	MapSettingsManager(const std::string &map_meta_path);
 	~MapSettingsManager();
 
 	// Finalized map generation parameters
@@ -71,6 +70,6 @@ public:
 
 private:
 	std::string m_map_meta_path;
+	// TODO: Rename to "m_settings"
 	Settings *m_map_settings;
-	Settings *m_user_settings;
 };
diff --git a/src/mapblock.h b/src/mapblock.h
index 641a1b69b..7b82301e9 100644
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -340,15 +340,6 @@ public:
 	// is not valid on this MapBlock.
 	bool isValidPositionParent(v3s16 p);
 	MapNode getNodeParent(v3s16 p, bool *is_valid_position = NULL);
-	void setNodeParent(v3s16 p, MapNode & n);
-
-	inline void drawbox(s16 x0, s16 y0, s16 z0, s16 w, s16 h, s16 d, MapNode node)
-	{
-		for (u16 z = 0; z < d; z++)
-		for (u16 y = 0; y < h; y++)
-		for (u16 x = 0; x < w; x++)
-			setNode(x0 + x, y0 + y, z0 + z, node);
-	}
 
 	// Copies data to VoxelManipulator to getPosRelative()
 	void copyTo(VoxelManipulator &dst);
diff --git a/src/mapgen/mapgen.cpp b/src/mapgen/mapgen.cpp
index e0dfd2d71..7984ff609 100644
--- a/src/mapgen/mapgen.cpp
+++ b/src/mapgen/mapgen.cpp
@@ -595,7 +595,8 @@ MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeParams *emerg
 	this->heightmap = new s16[csize.X * csize.Z];
 
 	//// Initialize biome generator
-	biomegen = m_bmgr->createBiomeGen(BIOMEGEN_ORIGINAL, params->bparams, csize);
+	biomegen = emerge->biomegen;
+	biomegen->assertChunkSize(csize);
 	biomemap = biomegen->biomemap;
 
 	//// Look up some commonly used content
@@ -621,7 +622,6 @@ MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeParams *emerg
 
 MapgenBasic::~MapgenBasic()
 {
-	delete biomegen;
 	delete []heightmap;
 
 	delete m_emerge; // destroying EmergeParams is our responsibility
diff --git a/src/mapgen/mapgen.h b/src/mapgen/mapgen.h
index 1487731e2..61db4f3b9 100644
--- a/src/mapgen/mapgen.h
+++ b/src/mapgen/mapgen.h
@@ -30,10 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MAPGEN_DEFAULT_NAME "v7"
 
 /////////////////// Mapgen flags
-#define MG_TREES       0x01  // Obsolete. Moved into mgv6 flags
 #define MG_CAVES       0x02
 #define MG_DUNGEONS    0x04
-#define MG_FLAT        0x08  // Obsolete. Moved into mgv6 flags
 #define MG_LIGHT       0x10
 #define MG_DECORATIONS 0x20
 #define MG_BIOMES      0x40
diff --git a/src/mapgen/mapgen_v6.cpp b/src/mapgen/mapgen_v6.cpp
index e04180f96..bce9cee81 100644
--- a/src/mapgen/mapgen_v6.cpp
+++ b/src/mapgen/mapgen_v6.cpp
@@ -792,7 +792,7 @@ void MapgenV6::flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos)
 		v3s16(0, 0, -1), // Front
 		v3s16(-1, 0, 0), // Left
 	};
-	
+
 	// Iterate twice
 	for (s16 k = 0; k < 2; k++) {
 		for (s16 z = mudflow_minpos; z <= mudflow_maxpos; z++)
@@ -1055,7 +1055,6 @@ void MapgenV6::growGrass() // Add surface nodes
 	MapNode n_dirt_with_grass(c_dirt_with_grass);
 	MapNode n_dirt_with_snow(c_dirt_with_snow);
 	MapNode n_snowblock(c_snowblock);
-	MapNode n_snow(c_snow);
 	const v3s16 &em = vm->m_area.getExtent();
 
 	u32 index = 0;
diff --git a/src/mapgen/mapgen_valleys.cpp b/src/mapgen/mapgen_valleys.cpp
index c4234857e..80a99b1f0 100644
--- a/src/mapgen/mapgen_valleys.cpp
+++ b/src/mapgen/mapgen_valleys.cpp
@@ -57,7 +57,8 @@ FlagDesc flagdesc_mapgen_valleys[] = {
 MapgenValleys::MapgenValleys(MapgenValleysParams *params, EmergeParams *emerge)
 	: MapgenBasic(MAPGEN_VALLEYS, params, emerge)
 {
-	// NOTE: MapgenValleys has a hard dependency on BiomeGenOriginal
+	FATAL_ERROR_IF(biomegen->getType() != BIOMEGEN_ORIGINAL,
+		"MapgenValleys has a hard dependency on BiomeGenOriginal");
 	m_bgen = (BiomeGenOriginal *)biomegen;
 
 	spflags            = params->spflags;
diff --git a/src/mapgen/mg_biome.cpp b/src/mapgen/mg_biome.cpp
index 610c38594..f08cc190f 100644
--- a/src/mapgen/mg_biome.cpp
+++ b/src/mapgen/mg_biome.cpp
@@ -101,71 +101,6 @@ BiomeManager *BiomeManager::clone() const
 	return mgr;
 }
 
-
-// For BiomeGen type 'BiomeGenOriginal'
-float BiomeManager::getHeatAtPosOriginal(v3s16 pos, NoiseParams &np_heat,
-	NoiseParams &np_heat_blend, u64 seed) const
-{
-	return
-		NoisePerlin2D(&np_heat,       pos.X, pos.Z, seed) +
-		NoisePerlin2D(&np_heat_blend, pos.X, pos.Z, seed);
-}
-
-
-// For BiomeGen type 'BiomeGenOriginal'
-float BiomeManager::getHumidityAtPosOriginal(v3s16 pos, NoiseParams &np_humidity,
-	NoiseParams &np_humidity_blend, u64 seed) const
-{
-	return
-		NoisePerlin2D(&np_humidity,       pos.X, pos.Z, seed) +
-		NoisePerlin2D(&np_humidity_blend, pos.X, pos.Z, seed);
-}
-
-
-// For BiomeGen type 'BiomeGenOriginal'
-const Biome *BiomeManager::getBiomeFromNoiseOriginal(float heat,
-	float humidity, v3s16 pos) const
-{
-	Biome *biome_closest = nullptr;
-	Biome *biome_closest_blend = nullptr;
-	float dist_min = FLT_MAX;
-	float dist_min_blend = FLT_MAX;
-
-	for (size_t i = 1; i < getNumObjects(); i++) {
-		Biome *b = (Biome *)getRaw(i);
-		if (!b ||
-				pos.Y < b->min_pos.Y || pos.Y > b->max_pos.Y + b->vertical_blend ||
-				pos.X < b->min_pos.X || pos.X > b->max_pos.X ||
-				pos.Z < b->min_pos.Z || pos.Z > b->max_pos.Z)
-			continue;
-
-		float d_heat = heat - b->heat_point;
-		float d_humidity = humidity - b->humidity_point;
-		float dist = (d_heat * d_heat) + (d_humidity * d_humidity);
-
-		if (pos.Y <= b->max_pos.Y) { // Within y limits of biome b
-			if (dist < dist_min) {
-				dist_min = dist;
-				biome_closest = b;
-			}
-		} else if (dist < dist_min_blend) { // Blend area above biome b
-			dist_min_blend = dist;
-			biome_closest_blend = b;
-		}
-	}
-
-	const u64 seed = pos.Y + (heat + humidity) * 0.9f;
-	PcgRandom rng(seed);
-
-	if (biome_closest_blend && dist_min_blend <= dist_min &&
-			rng.range(0, biome_closest_blend->vertical_blend) >=
-			pos.Y - biome_closest_blend->max_pos.Y)
-		return biome_closest_blend;
-
-	return (biome_closest) ? biome_closest : (Biome *)getRaw(BIOME_NONE);
-}
-
-
 ////////////////////////////////////////////////////////////////////////////////
 
 void BiomeParamsOriginal::readParams(const Settings *settings)
@@ -189,7 +124,7 @@ void BiomeParamsOriginal::writeParams(Settings *settings) const
 ////////////////////////////////////////////////////////////////////////////////
 
 BiomeGenOriginal::BiomeGenOriginal(BiomeManager *biomemgr,
-	BiomeParamsOriginal *params, v3s16 chunksize)
+	const BiomeParamsOriginal *params, v3s16 chunksize)
 {
 	m_bmgr   = biomemgr;
 	m_params = params;
@@ -224,17 +159,26 @@ BiomeGenOriginal::~BiomeGenOriginal()
 	delete noise_humidity_blend;
 }
 
-// Only usable in a mapgen thread
-Biome *BiomeGenOriginal::calcBiomeAtPoint(v3s16 pos) const
+BiomeGen *BiomeGenOriginal::clone(BiomeManager *biomemgr) const
+{
+	return new BiomeGenOriginal(biomemgr, m_params, m_csize);
+}
+
+float BiomeGenOriginal::calcHeatAtPoint(v3s16 pos) const
 {
-	float heat =
-		NoisePerlin2D(&m_params->np_heat,       pos.X, pos.Z, m_params->seed) +
+	return NoisePerlin2D(&m_params->np_heat, pos.X, pos.Z, m_params->seed) +
 		NoisePerlin2D(&m_params->np_heat_blend, pos.X, pos.Z, m_params->seed);
-	float humidity =
-		NoisePerlin2D(&m_params->np_humidity,       pos.X, pos.Z, m_params->seed) +
+}
+
+float BiomeGenOriginal::calcHumidityAtPoint(v3s16 pos) const
+{
+	return NoisePerlin2D(&m_params->np_humidity, pos.X, pos.Z, m_params->seed) +
 		NoisePerlin2D(&m_params->np_humidity_blend, pos.X, pos.Z, m_params->seed);
+}
 
-	return calcBiomeFromNoise(heat, humidity, pos);
+Biome *BiomeGenOriginal::calcBiomeAtPoint(v3s16 pos) const
+{
+	return calcBiomeFromNoise(calcHeatAtPoint(pos), calcHumidityAtPoint(pos), pos);
 }
 
 
diff --git a/src/mapgen/mg_biome.h b/src/mapgen/mg_biome.h
index be4cfea4d..c85afc3a0 100644
--- a/src/mapgen/mg_biome.h
+++ b/src/mapgen/mg_biome.h
@@ -97,6 +97,15 @@ public:
 
 	virtual BiomeGenType getType() const = 0;
 
+	// Clone this BiomeGen and set a the new BiomeManager to be used by the copy
+	virtual BiomeGen *clone(BiomeManager *biomemgr) const = 0;
+
+	// Check that the internal chunk size is what the mapgen expects, just to be sure.
+	inline void assertChunkSize(v3s16 expect) const
+	{
+		FATAL_ERROR_IF(m_csize != expect, "Chunk size mismatches");
+	}
+
 	// Calculates the biome at the exact position provided.  This function can
 	// be called at any time, but may be less efficient than the latter methods,
 	// depending on implementation.
@@ -158,12 +167,18 @@ struct BiomeParamsOriginal : public BiomeParams {
 class BiomeGenOriginal : public BiomeGen {
 public:
 	BiomeGenOriginal(BiomeManager *biomemgr,
-		BiomeParamsOriginal *params, v3s16 chunksize);
+		const BiomeParamsOriginal *params, v3s16 chunksize);
 	virtual ~BiomeGenOriginal();
 
 	BiomeGenType getType() const { return BIOMEGEN_ORIGINAL; }
 
+	BiomeGen *clone(BiomeManager *biomemgr) const;
+
+	// Slower, meant for Script API use
+	float calcHeatAtPoint(v3s16 pos) const;
+	float calcHumidityAtPoint(v3s16 pos) const;
 	Biome *calcBiomeAtPoint(v3s16 pos) const;
+
 	void calcBiomeNoise(v3s16 pmin);
 
 	biome_t *getBiomes(s16 *heightmap, v3s16 pmin);
@@ -176,7 +191,7 @@ public:
 	float *humidmap;
 
 private:
-	BiomeParamsOriginal *m_params;
+	const BiomeParamsOriginal *m_params;
 
 	Noise *noise_heat;
 	Noise *noise_humidity;
@@ -229,14 +244,6 @@ public:
 
 	virtual void clear();
 
-	// For BiomeGen type 'BiomeGenOriginal'
-	float getHeatAtPosOriginal(v3s16 pos, NoiseParams &np_heat,
-		NoiseParams &np_heat_blend, u64 seed) const;
-	float getHumidityAtPosOriginal(v3s16 pos, NoiseParams &np_humidity,
-		NoiseParams &np_humidity_blend, u64 seed) const;
-	const Biome *getBiomeFromNoiseOriginal(float heat, float humidity,
-		v3s16 pos) const;
-
 private:
 	BiomeManager() {};
 
diff --git a/src/mapgen/mg_ore.h b/src/mapgen/mg_ore.h
index 76420fab4..a757fa6d0 100644
--- a/src/mapgen/mg_ore.h
+++ b/src/mapgen/mg_ore.h
@@ -52,7 +52,7 @@ extern FlagDesc flagdesc_ore[];
 
 class Ore : public ObjDef, public NodeResolver {
 public:
-	static const bool NEEDS_NOISE = false;
+	const bool needs_noise;
 
 	content_t c_ore;                  // the node to place
 	std::vector<content_t> c_wherein; // the nodes to be placed in
@@ -68,7 +68,7 @@ public:
 	Noise *noise = nullptr;
 	std::unordered_set<biome_t> biomes;
 
-	Ore() = default;;
+	explicit Ore(bool needs_noise): needs_noise(needs_noise) {}
 	virtual ~Ore();
 
 	virtual void resolveNodeNames();
@@ -83,88 +83,81 @@ protected:
 
 class OreScatter : public Ore {
 public:
-	static const bool NEEDS_NOISE = false;
+	OreScatter() : Ore(false) {}
 
-	ObjDef *clone() const;
+	ObjDef *clone() const override;
 
-	virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-		v3s16 nmin, v3s16 nmax, biome_t *biomemap);
+	void generate(MMVManip *vm, int mapseed, u32 blockseed,
+			v3s16 nmin, v3s16 nmax, biome_t *biomemap) override;
 };
 
 class OreSheet : public Ore {
 public:
-	static const bool NEEDS_NOISE = true;
+	OreSheet() : Ore(true) {}
 
-	ObjDef *clone() const;
+	ObjDef *clone() const override;
 
 	u16 column_height_min;
 	u16 column_height_max;
 	float column_midpoint_factor;
 
-	virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-		v3s16 nmin, v3s16 nmax, biome_t *biomemap);
+	void generate(MMVManip *vm, int mapseed, u32 blockseed,
+			v3s16 nmin, v3s16 nmax, biome_t *biomemap) override;
 };
 
 class OrePuff : public Ore {
 public:
-	static const bool NEEDS_NOISE = true;
-
-	ObjDef *clone() const;
+	ObjDef *clone() const override;
 
 	NoiseParams np_puff_top;
 	NoiseParams np_puff_bottom;
 	Noise *noise_puff_top = nullptr;
 	Noise *noise_puff_bottom = nullptr;
 
-	OrePuff() = default;
+	OrePuff() : Ore(true) {}
 	virtual ~OrePuff();
 
-	virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-		v3s16 nmin, v3s16 nmax, biome_t *biomemap);
+	void generate(MMVManip *vm, int mapseed, u32 blockseed,
+			v3s16 nmin, v3s16 nmax, biome_t *biomemap) override;
 };
 
 class OreBlob : public Ore {
 public:
-	static const bool NEEDS_NOISE = true;
-
-	ObjDef *clone() const;
+	ObjDef *clone() const override;
 
-	virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-		v3s16 nmin, v3s16 nmax, biome_t *biomemap);
+	OreBlob() : Ore(true) {}
+	void generate(MMVManip *vm, int mapseed, u32 blockseed,
+			v3s16 nmin, v3s16 nmax, biome_t *biomemap) override;
 };
 
 class OreVein : public Ore {
 public:
-	static const bool NEEDS_NOISE = true;
-
-	ObjDef *clone() const;
+	ObjDef *clone() const override;
 
 	float random_factor;
 	Noise *noise2 = nullptr;
 	int sizey_prev = 0;
 
-	OreVein() = default;
+	OreVein() : Ore(true) {}
 	virtual ~OreVein();
 
-	virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-		v3s16 nmin, v3s16 nmax, biome_t *biomemap);
+	void generate(MMVManip *vm, int mapseed, u32 blockseed,
+			v3s16 nmin, v3s16 nmax, biome_t *biomemap) override;
 };
 
 class OreStratum : public Ore {
 public:
-	static const bool NEEDS_NOISE = false;
-
-	ObjDef *clone() const;
+	ObjDef *clone() const override;
 
 	NoiseParams np_stratum_thickness;
 	Noise *noise_stratum_thickness = nullptr;
 	u16 stratum_thickness;
 
-	OreStratum() = default;
+	OreStratum() : Ore(false) {}
 	virtual ~OreStratum();
 
-	virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
-		v3s16 nmin, v3s16 nmax, biome_t *biomemap);
+	void generate(MMVManip *vm, int mapseed, u32 blockseed,
+			v3s16 nmin, v3s16 nmax, biome_t *biomemap) override;
 };
 
 class OreManager : public ObjDefManager {
diff --git a/src/mapgen/mg_schematic.cpp b/src/mapgen/mg_schematic.cpp
index e70e97e48..653bad4fe 100644
--- a/src/mapgen/mg_schematic.cpp
+++ b/src/mapgen/mg_schematic.cpp
@@ -76,10 +76,6 @@ void SchematicManager::clear()
 ///////////////////////////////////////////////////////////////////////////////
 
 
-Schematic::Schematic()
-= default;
-
-
 Schematic::~Schematic()
 {
 	delete []schemdata;
@@ -108,13 +104,19 @@ ObjDef *Schematic::clone() const
 
 void Schematic::resolveNodeNames()
 {
+	c_nodes.clear();
 	getIdsFromNrBacklog(&c_nodes, true, CONTENT_AIR);
 
 	size_t bufsize = size.X * size.Y * size.Z;
 	for (size_t i = 0; i != bufsize; i++) {
 		content_t c_original = schemdata[i].getContent();
-		content_t c_new = c_nodes[c_original];
-		schemdata[i].setContent(c_new);
+		if (c_original >= c_nodes.size()) {
+			errorstream << "Corrupt schematic. name=\"" << name
+				<< "\" at index " << i << std::endl;
+			c_original = 0;
+		}
+		// Unfold condensed ID layout to content_t
+		schemdata[i].setContent(c_nodes[c_original]);
 	}
 }
 
@@ -279,8 +281,7 @@ void Schematic::placeOnMap(ServerMap *map, v3s16 p, u32 flags,
 }
 
 
-bool Schematic::deserializeFromMts(std::istream *is,
-	std::vector<std::string> *names)
+bool Schematic::deserializeFromMts(std::istream *is)
 {
 	std::istream &ss = *is;
 	content_t cignore = CONTENT_IGNORE;
@@ -312,6 +313,8 @@ bool Schematic::deserializeFromMts(std::istream *is,
 		slice_probs[y] = (version >= 3) ? readU8(ss) : MTSCHEM_PROB_ALWAYS_OLD;
 
 	//// Read node names
+	NodeResolver::reset();
+
 	u16 nidmapcount = readU16(ss);
 	for (int i = 0; i != nidmapcount; i++) {
 		std::string name = deSerializeString16(ss);
@@ -324,9 +327,12 @@ bool Schematic::deserializeFromMts(std::istream *is,
 			have_cignore = true;
 		}
 
-		names->push_back(name);
+		m_nodenames.push_back(name);
 	}
 
+	// Prepare for node resolver
+	m_nnlistsizes.push_back(m_nodenames.size());
+
 	//// Read node data
 	size_t nodecount = size.X * size.Y * size.Z;
 
@@ -358,9 +364,11 @@ bool Schematic::deserializeFromMts(std::istream *is,
 }
 
 
-bool Schematic::serializeToMts(std::ostream *os,
-	const std::vector<std::string> &names) const
+bool Schematic::serializeToMts(std::ostream *os) const
 {
+	// Nodes must not be resolved (-> condensed)
+	// checking here is not possible because "schemdata" might be temporary.
+
 	std::ostream &ss = *os;
 
 	writeU32(ss, MTSCHEM_FILE_SIGNATURE);         // signature
@@ -370,9 +378,10 @@ bool Schematic::serializeToMts(std::ostream *os,
 	for (int y = 0; y != size.Y; y++)             // Y slice probabilities
 		writeU8(ss, slice_probs[y]);
 
-	writeU16(ss, names.size()); // name count
-	for (size_t i = 0; i != names.size(); i++)
-		ss << serializeString16(names[i]); // node names
+	writeU16(ss, m_nodenames.size()); // name count
+	for (size_t i = 0; i != m_nodenames.size(); i++) {
+		ss << serializeString16(m_nodenames[i]); // node names
+	}
 
 	// compressed bulk node data
 	MapNode::serializeBulk(ss, SER_FMT_VER_HIGHEST_WRITE,
@@ -382,8 +391,7 @@ bool Schematic::serializeToMts(std::ostream *os,
 }
 
 
-bool Schematic::serializeToLua(std::ostream *os,
-	const std::vector<std::string> &names, bool use_comments,
+bool Schematic::serializeToLua(std::ostream *os, bool use_comments,
 	u32 indent_spaces) const
 {
 	std::ostream &ss = *os;
@@ -392,6 +400,9 @@ bool Schematic::serializeToLua(std::ostream *os,
 	if (indent_spaces > 0)
 		indent.assign(indent_spaces, ' ');
 
+	bool resolve_done = isResolveDone();
+	FATAL_ERROR_IF(resolve_done && !m_ndef, "serializeToLua: NodeDefManager is required");
+
 	//// Write header
 	{
 		ss << "schematic = {" << std::endl;
@@ -436,9 +447,22 @@ bool Schematic::serializeToLua(std::ostream *os,
 				u8 probability   = schemdata[i].param1 & MTSCHEM_PROB_MASK;
 				bool force_place = schemdata[i].param1 & MTSCHEM_FORCE_PLACE;
 
-				ss << indent << indent << "{"
-					<< "name=\"" << names[schemdata[i].getContent()]
-					<< "\", prob=" << (u16)probability * 2
+				// After node resolving: real content_t, lookup using NodeDefManager
+				// Prior node resolving: condensed ID, lookup using m_nodenames
+				content_t c = schemdata[i].getContent();
+
+				ss << indent << indent << "{" << "name=\"";
+
+				if (!resolve_done) {
+					// Prior node resolving (eg. direct schematic load)
+					FATAL_ERROR_IF(c >= m_nodenames.size(), "Invalid node list");
+					ss << m_nodenames[c];
+				} else  {
+					// After node resolving (eg. biome decoration)
+					ss << m_ndef->get(c).name;
+				}
+
+				ss << "\", prob=" << (u16)probability * 2
 					<< ", param2=" << (u16)schemdata[i].param2;
 
 				if (force_place)
@@ -467,25 +491,24 @@ bool Schematic::loadSchematicFromFile(const std::string &filename,
 		return false;
 	}
 
-	size_t origsize = m_nodenames.size();
-	if (!deserializeFromMts(&is, &m_nodenames))
-		return false;
+	if (!m_ndef)
+		m_ndef = ndef;
 
-	m_nnlistsizes.push_back(m_nodenames.size() - origsize);
+	if (!deserializeFromMts(&is))
+		return false;
 
 	name = filename;
 
 	if (replace_names) {
-		for (size_t i = origsize; i < m_nodenames.size(); i++) {
-			std::string &node_name = m_nodenames[i];
+		for (std::string &node_name : m_nodenames) {
 			StringMap::iterator it = replace_names->find(node_name);
 			if (it != replace_names->end())
 				node_name = it->second;
 		}
 	}
 
-	if (ndef)
-		ndef->pendNodeResolve(this);
+	if (m_ndef)
+		m_ndef->pendNodeResolve(this);
 
 	return true;
 }
@@ -494,33 +517,26 @@ bool Schematic::loadSchematicFromFile(const std::string &filename,
 bool Schematic::saveSchematicToFile(const std::string &filename,
 	const NodeDefManager *ndef)
 {
-	MapNode *orig_schemdata = schemdata;
-	std::vector<std::string> ndef_nodenames;
-	std::vector<std::string> *names;
+	Schematic *schem = this;
 
-	if (m_resolve_done && ndef == NULL)
-		ndef = m_ndef;
+	bool needs_condense = isResolveDone();
 
-	if (ndef) {
-		names = &ndef_nodenames;
+	if (!m_ndef)
+		m_ndef = ndef;
 
-		u32 volume = size.X * size.Y * size.Z;
-		schemdata = new MapNode[volume];
-		for (u32 i = 0; i != volume; i++)
-			schemdata[i] = orig_schemdata[i];
+	if (needs_condense) {
+		if (!m_ndef)
+			return false;
 
-		generate_nodelist_and_update_ids(schemdata, volume, names, ndef);
-	} else { // otherwise, use the names we have on hand in the list
-		names = &m_nodenames;
+		schem = (Schematic *)this->clone();
+		schem->condenseContentIds();
 	}
 
 	std::ostringstream os(std::ios_base::binary);
-	bool status = serializeToMts(&os, *names);
+	bool status = schem->serializeToMts(&os);
 
-	if (ndef) {
-		delete []schemdata;
-		schemdata = orig_schemdata;
-	}
+	if (needs_condense)
+		delete schem;
 
 	if (!status)
 		return false;
@@ -556,6 +572,10 @@ bool Schematic::getSchematicFromMap(Map *map, v3s16 p1, v3s16 p2)
 	}
 
 	delete vm;
+
+	// Reset and mark as complete
+	NodeResolver::reset(true);
+
 	return true;
 }
 
@@ -584,26 +604,29 @@ void Schematic::applyProbabilities(v3s16 p0,
 }
 
 
-void generate_nodelist_and_update_ids(MapNode *nodes, size_t nodecount,
-	std::vector<std::string> *usednodes, const NodeDefManager *ndef)
+void Schematic::condenseContentIds()
 {
 	std::unordered_map<content_t, content_t> nodeidmap;
 	content_t numids = 0;
 
+	// Reset node resolve fields
+	NodeResolver::reset();
+
+	size_t nodecount = size.X * size.Y * size.Z;
 	for (size_t i = 0; i != nodecount; i++) {
 		content_t id;
-		content_t c = nodes[i].getContent();
+		content_t c = schemdata[i].getContent();
 
-		std::unordered_map<content_t, content_t>::const_iterator it = nodeidmap.find(c);
+		auto it = nodeidmap.find(c);
 		if (it == nodeidmap.end()) {
 			id = numids;
 			numids++;
 
-			usednodes->push_back(ndef->get(c).name);
-			nodeidmap.insert(std::make_pair(c, id));
+			m_nodenames.push_back(m_ndef->get(c).name);
+			nodeidmap.emplace(std::make_pair(c, id));
 		} else {
 			id = it->second;
 		}
-		nodes[i].setContent(id);
+		schemdata[i].setContent(id);
 	}
 }
diff --git a/src/mapgen/mg_schematic.h b/src/mapgen/mg_schematic.h
index 6b31251b6..5f64ea280 100644
--- a/src/mapgen/mg_schematic.h
+++ b/src/mapgen/mg_schematic.h
@@ -92,7 +92,7 @@ enum SchematicFormatType {
 
 class Schematic : public ObjDef, public NodeResolver {
 public:
-	Schematic();
+	Schematic() = default;
 	virtual ~Schematic();
 
 	ObjDef *clone() const;
@@ -105,11 +105,9 @@ public:
 		const NodeDefManager *ndef);
 	bool getSchematicFromMap(Map *map, v3s16 p1, v3s16 p2);
 
-	bool deserializeFromMts(std::istream *is, std::vector<std::string> *names);
-	bool serializeToMts(std::ostream *os,
-		const std::vector<std::string> &names) const;
-	bool serializeToLua(std::ostream *os, const std::vector<std::string> &names,
-		bool use_comments, u32 indent_spaces) const;
+	bool deserializeFromMts(std::istream *is);
+	bool serializeToMts(std::ostream *os) const;
+	bool serializeToLua(std::ostream *os, bool use_comments, u32 indent_spaces) const;
 
 	void blitToVManip(MMVManip *vm, v3s16 p, Rotation rot, bool force_place);
 	bool placeOnVManip(MMVManip *vm, v3s16 p, u32 flags, Rotation rot, bool force_place);
@@ -124,6 +122,10 @@ public:
 	v3s16 size;
 	MapNode *schemdata = nullptr;
 	u8 *slice_probs = nullptr;
+
+private:
+	// Counterpart to the node resolver: Condense content_t to a sequential "m_nodenames" list
+	void condenseContentIds();
 };
 
 class SchematicManager : public ObjDefManager {
@@ -151,5 +153,3 @@ private:
 	Server *m_server;
 };
 
-void generate_nodelist_and_update_ids(MapNode *nodes, size_t nodecount,
-	std::vector<std::string> *usednodes, const NodeDefManager *ndef);
diff --git a/src/mapnode.cpp b/src/mapnode.cpp
index 0551f3b6f..c885bfe1d 100644
--- a/src/mapnode.cpp
+++ b/src/mapnode.cpp
@@ -159,8 +159,11 @@ u8 MapNode::getWallMounted(const NodeDefManager *nodemgr) const
 {
 	const ContentFeatures &f = nodemgr->get(*this);
 	if (f.param_type_2 == CPT2_WALLMOUNTED ||
-			f.param_type_2 == CPT2_COLORED_WALLMOUNTED)
+			f.param_type_2 == CPT2_COLORED_WALLMOUNTED) {
 		return getParam2() & 0x07;
+	} else if (f.drawtype == NDT_SIGNLIKE || f.drawtype == NDT_TORCHLIKE) {
+		return 1;
+	}
 	return 0;
 }
 
@@ -177,6 +180,16 @@ v3s16 MapNode::getWallMountedDir(const NodeDefManager *nodemgr) const
 	}
 }
 
+u8 MapNode::getDegRotate(const NodeDefManager *nodemgr) const
+{
+	const ContentFeatures &f = nodemgr->get(*this);
+	if (f.param_type_2 == CPT2_DEGROTATE)
+		return getParam2() % 240;
+	if (f.param_type_2 == CPT2_COLORED_DEGROTATE)
+		return 10 * ((getParam2() & 0x1F) % 24);
+	return 0;
+}
+
 void MapNode::rotateAlongYAxis(const NodeDefManager *nodemgr, Rotation rot)
 {
 	ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
@@ -230,6 +243,17 @@ void MapNode::rotateAlongYAxis(const NodeDefManager *nodemgr, Rotation rot)
 		Rotation oldrot = wallmounted_to_rot[wmountface - 2];
 		param2 &= ~7;
 		param2 |= rot_to_wallmounted[(oldrot - rot) & 3];
+	} else if (cpt2 == CPT2_DEGROTATE) {
+		int angle = param2; // in 1.5°
+		angle += 60 * rot; // don’t do that on u8
+		angle %= 240;
+		param2 = angle;
+	} else if (cpt2 == CPT2_COLORED_DEGROTATE) {
+		int angle = param2 & 0x1F; // in 15°
+		int color = param2 & 0xE0;
+		angle += 6 * rot;
+		angle %= 24;
+		param2 = color | angle;
 	}
 }
 
diff --git a/src/mapnode.h b/src/mapnode.h
index a9ae63ba3..28ff9e43d 100644
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -240,6 +240,9 @@ struct MapNode
 	u8 getWallMounted(const NodeDefManager *nodemgr) const;
 	v3s16 getWallMountedDir(const NodeDefManager *nodemgr) const;
 
+	/// @returns Rotation in range 0–239 (in 1.5° steps)
+	u8 getDegRotate(const NodeDefManager *nodemgr) const;
+
 	void rotateAlongYAxis(const NodeDefManager *nodemgr, Rotation rot);
 
 	/*!
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 55f85571d..2fea03fbf 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -450,10 +450,10 @@ void Client::handleCommand_ActiveObjectRemoveAdd(NetworkPacket* pkt)
 			string initialization data
 		}
 	*/
-	
+
 	LocalPlayer *player = m_env.getLocalPlayer();
-	bool try_reattach = player && player->isWaitingForReattach();	
-	
+	bool try_reattach = player && player->isWaitingForReattach();
+
 	try {
 		u8 type;
 		u16 removed_count, added_count, id;
@@ -596,13 +596,13 @@ void Client::handleCommand_Breath(NetworkPacket* pkt)
 }
 
 void Client::handleCommand_MovePlayer(NetworkPacket* pkt)
-{		
+{
 	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 
 	if ((player->getCAO() && player->getCAO()->getParentId()) || player->isWaitingForReattach())
 		return;
-	
+
 	v3f pos;
 	f32 pitch, yaw;
 
@@ -622,10 +622,10 @@ void Client::handleCommand_MovePlayer(NetworkPacket* pkt)
 		it would just force the pitch and yaw values to whatever
 		the camera points to.
 	*/
-	
+
 	if (g_settings->getBool("no_force_rotate"))
 		return;
-	
+
 	ClientEvent *event = new ClientEvent();
 	event->type = CE_PLAYER_FORCE_MOVE;
 	event->player_force_move.pitch = pitch;
@@ -833,12 +833,12 @@ void Client::handleCommand_PlaySound(NetworkPacket* pkt)
 		*pkt >> pitch;
 		*pkt >> ephemeral;
 	} catch (PacketError &e) {};
-	
+
 	SimpleSoundSpec sound_spec(name, gain, fade, pitch);
-	
+
 	if (m_mods_loaded && m_script->on_play_sound(sound_spec))
 		return;
-	
+
 	// Start playing
 	int client_id = -1;
 	switch(type) {
@@ -987,10 +987,10 @@ void Client::handleCommand_SpawnParticle(NetworkPacket* pkt)
 	ClientEvent *event = new ClientEvent();
 	event->type           = CE_SPAWN_PARTICLE;
 	event->spawn_particle = new ParticleParameters(p);
-	
+
 	if (m_mods_loaded && m_script->on_spawn_particle(*event->spawn_particle))
 		return;
-	
+
 	m_client_event_queue.push(event);
 }
 
@@ -1063,9 +1063,6 @@ void Client::handleCommand_DeleteParticleSpawner(NetworkPacket* pkt)
 
 void Client::handleCommand_HudAdd(NetworkPacket* pkt)
 {
-	std::string datastring(pkt->getString(0), pkt->getSize());
-	std::istringstream is(datastring, std::ios_base::binary);
-
 	u32 server_id;
 	u8 type;
 	v2f pos;
@@ -1092,22 +1089,23 @@ void Client::handleCommand_HudAdd(NetworkPacket* pkt)
 	} catch(PacketError &e) {};
 
 	ClientEvent *event = new ClientEvent();
-	event->type             = CE_HUDADD;
-	event->hudadd.server_id = server_id;
-	event->hudadd.type      = type;
-	event->hudadd.pos       = new v2f(pos);
-	event->hudadd.name      = new std::string(name);
-	event->hudadd.scale     = new v2f(scale);
-	event->hudadd.text      = new std::string(text);
-	event->hudadd.number    = number;
-	event->hudadd.item      = item;
-	event->hudadd.dir       = dir;
-	event->hudadd.align     = new v2f(align);
-	event->hudadd.offset    = new v2f(offset);
-	event->hudadd.world_pos = new v3f(world_pos);
-	event->hudadd.size      = new v2s32(size);
-	event->hudadd.z_index   = z_index;
-	event->hudadd.text2     = new std::string(text2);
+	event->type              = CE_HUDADD;
+	event->hudadd            = new ClientEventHudAdd();
+	event->hudadd->server_id = server_id;
+	event->hudadd->type      = type;
+	event->hudadd->pos       = pos;
+	event->hudadd->name      = name;
+	event->hudadd->scale     = scale;
+	event->hudadd->text      = text;
+	event->hudadd->number    = number;
+	event->hudadd->item      = item;
+	event->hudadd->dir       = dir;
+	event->hudadd->align     = align;
+	event->hudadd->offset    = offset;
+	event->hudadd->world_pos = world_pos;
+	event->hudadd->size      = size;
+	event->hudadd->z_index   = z_index;
+	event->hudadd->text2     = text2;
 	m_client_event_queue.push(event);
 }
 
@@ -1117,16 +1115,10 @@ void Client::handleCommand_HudRemove(NetworkPacket* pkt)
 
 	*pkt >> server_id;
 
-	auto i = m_hud_server_to_client.find(server_id);
-	if (i != m_hud_server_to_client.end()) {
-		int client_id = i->second;
-		m_hud_server_to_client.erase(i);
-
-		ClientEvent *event = new ClientEvent();
-		event->type     = CE_HUDRM;
-		event->hudrm.id = client_id;
-		m_client_event_queue.push(event);
-	}
+	ClientEvent *event = new ClientEvent();
+	event->type     = CE_HUDRM;
+	event->hudrm.id = server_id;
+	m_client_event_queue.push(event);
 }
 
 void Client::handleCommand_HudChange(NetworkPacket* pkt)
@@ -1153,19 +1145,17 @@ void Client::handleCommand_HudChange(NetworkPacket* pkt)
 	else
 		*pkt >> intdata;
 
-	std::unordered_map<u32, u32>::const_iterator i = m_hud_server_to_client.find(server_id);
-	if (i != m_hud_server_to_client.end()) {
-		ClientEvent *event = new ClientEvent();
-		event->type              = CE_HUDCHANGE;
-		event->hudchange.id      = i->second;
-		event->hudchange.stat    = (HudElementStat)stat;
-		event->hudchange.v2fdata = new v2f(v2fdata);
-		event->hudchange.v3fdata = new v3f(v3fdata);
-		event->hudchange.sdata   = new std::string(sdata);
-		event->hudchange.data    = intdata;
-		event->hudchange.v2s32data = new v2s32(v2s32data);
-		m_client_event_queue.push(event);
-	}
+	ClientEvent *event = new ClientEvent();
+	event->type                 = CE_HUDCHANGE;
+	event->hudchange            = new ClientEventHudChange();
+	event->hudchange->id        = server_id;
+	event->hudchange->stat      = static_cast<HudElementStat>(stat);
+	event->hudchange->v2fdata   = v2fdata;
+	event->hudchange->v3fdata   = v3fdata;
+	event->hudchange->sdata     = sdata;
+	event->hudchange->data      = intdata;
+	event->hudchange->v2s32data = v2s32data;
+	m_client_event_queue.push(event);
 }
 
 void Client::handleCommand_HudSetFlags(NetworkPacket* pkt)
diff --git a/src/network/networkexceptions.h b/src/network/networkexceptions.h
index f4913928c..58a3bb490 100644
--- a/src/network/networkexceptions.h
+++ b/src/network/networkexceptions.h
@@ -56,12 +56,6 @@ public:
 	InvalidIncomingDataException(const char *s) : BaseException(s) {}
 };
 
-class InvalidOutgoingDataException : public BaseException
-{
-public:
-	InvalidOutgoingDataException(const char *s) : BaseException(s) {}
-};
-
 class NoIncomingDataException : public BaseException
 {
 public:
@@ -103,4 +97,4 @@ class SendFailedException : public BaseException
 {
 public:
 	SendFailedException(const std::string &s) : BaseException(s) {}
-};
\ No newline at end of file
+};
diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp
index 6d0abb12c..a71e26572 100644
--- a/src/network/networkpacket.cpp
+++ b/src/network/networkpacket.cpp
@@ -50,7 +50,7 @@ void NetworkPacket::checkReadOffset(u32 from_offset, u32 field_size)
 	}
 }
 
-void NetworkPacket::putRawPacket(u8 *data, u32 datasize, session_t peer_id)
+void NetworkPacket::putRawPacket(const u8 *data, u32 datasize, session_t peer_id)
 {
 	// If a m_command is already set, we are rewriting on same packet
 	// This is not permitted
@@ -145,6 +145,8 @@ void NetworkPacket::putLongString(const std::string &src)
 	putRawString(src.c_str(), msgsize);
 }
 
+static constexpr bool NEED_SURROGATE_CODING = sizeof(wchar_t) > 2;
+
 NetworkPacket& NetworkPacket::operator>>(std::wstring& dst)
 {
 	checkReadOffset(m_read_offset, 2);
@@ -160,9 +162,16 @@ NetworkPacket& NetworkPacket::operator>>(std::wstring& dst)
 	checkReadOffset(m_read_offset, strLen * 2);
 
 	dst.reserve(strLen);
-	for(u16 i=0; i<strLen; i++) {
-		wchar_t c16 = readU16(&m_data[m_read_offset]);
-		dst.append(&c16, 1);
+	for (u16 i = 0; i < strLen; i++) {
+		wchar_t c = readU16(&m_data[m_read_offset]);
+		if (NEED_SURROGATE_CODING && c >= 0xD800 && c < 0xDC00 && i+1 < strLen) {
+			i++;
+			m_read_offset += sizeof(u16);
+
+			wchar_t c2 = readU16(&m_data[m_read_offset]);
+			c = 0x10000 + ( ((c & 0x3ff) << 10) | (c2 & 0x3ff) );
+		}
+		dst.push_back(c);
 		m_read_offset += sizeof(u16);
 	}
 
@@ -175,15 +184,37 @@ NetworkPacket& NetworkPacket::operator<<(const std::wstring &src)
 		throw PacketError("String too long");
 	}
 
-	u16 msgsize = src.size();
+	if (!NEED_SURROGATE_CODING || src.size() == 0) {
+		*this << static_cast<u16>(src.size());
+		for (u16 i = 0; i < src.size(); i++)
+			*this << static_cast<u16>(src[i]);
 
-	*this << msgsize;
+		return *this;
+	}
 
-	// Write string
-	for (u16 i=0; i<msgsize; i++) {
-		*this << (u16) src[i];
+	// write dummy value, to be overwritten later
+	const u32 len_offset = m_read_offset;
+	u32 written = 0;
+	*this << static_cast<u16>(0xfff0);
+
+	for (u16 i = 0; i < src.size(); i++) {
+		wchar_t c = src[i];
+		if (c > 0xffff) {
+			// Encode high code-points as surrogate pairs
+			u32 n = c - 0x10000;
+			*this << static_cast<u16>(0xD800 | (n >> 10))
+				<< static_cast<u16>(0xDC00 | (n & 0x3ff));
+			written += 2;
+		} else {
+			*this << static_cast<u16>(c);
+			written++;
+		}
 	}
 
+	if (written > WIDE_STRING_MAX_LEN)
+		throw PacketError("String too long");
+	writeU16(&m_data[len_offset], written);
+
 	return *this;
 }
 
diff --git a/src/network/networkpacket.h b/src/network/networkpacket.h
index e77bfb744..c7ff03b8e 100644
--- a/src/network/networkpacket.h
+++ b/src/network/networkpacket.h
@@ -34,7 +34,7 @@ public:
 
 	~NetworkPacket();
 
-	void putRawPacket(u8 *data, u32 datasize, session_t peer_id);
+	void putRawPacket(const u8 *data, u32 datasize, session_t peer_id);
 	void clear();
 
 	// Getters
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index c636d01e1..708ddbf20 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -56,12 +56,12 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
 	session_t peer_id = pkt->getPeerId();
 	RemoteClient *client = getClient(peer_id, CS_Created);
 
+	Address addr;
 	std::string addr_s;
 	try {
-		Address address = getPeerAddress(peer_id);
-		addr_s = address.serializeString();
-	}
-	catch (con::PeerNotFoundException &e) {
+		addr = m_con->GetPeerAddress(peer_id);
+		addr_s = addr.serializeString();
+	} catch (con::PeerNotFoundException &e) {
 		/*
 		 * no peer for this packet found
 		 * most common reason is peer timeout, e.g. peer didn't
@@ -73,13 +73,14 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
 		return;
 	}
 
-	// If net_proto_version is set, this client has already been handled
 	if (client->getState() > CS_Created) {
 		verbosestream << "Server: Ignoring multiple TOSERVER_INITs from " <<
 			addr_s << " (peer_id=" << peer_id << ")" << std::endl;
 		return;
 	}
 
+	client->setCachedAddress(addr);
+
 	verbosestream << "Server: Got TOSERVER_INIT from " << addr_s <<
 		" (peer_id=" << peer_id << ")" << std::endl;
 
@@ -173,6 +174,16 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
 		return;
 	}
 
+	RemotePlayer *player = m_env->getPlayer(playername);
+
+	// If player is already connected, cancel
+	if (player && player->getPeerId() != PEER_ID_INEXISTENT) {
+		actionstream << "Server: Player with name \"" << playername <<
+			"\" tried to connect, but player with same name is already connected" << std::endl;
+		DenyAccess(peer_id, SERVER_ACCESSDENIED_ALREADY_CONNECTED);
+		return;
+	}
+
 	m_clients.setPlayerName(peer_id, playername);
 	//TODO (later) case insensitivity
 
@@ -437,18 +448,20 @@ void Server::handleCommand_GotBlocks(NetworkPacket* pkt)
 	u8 count;
 	*pkt >> count;
 
-	RemoteClient *client = getClient(pkt->getPeerId());
-
 	if ((s16)pkt->getSize() < 1 + (int)count * 6) {
 		throw con::InvalidIncomingDataException
 				("GOTBLOCKS length is too short");
 	}
 
+	m_clients.lock();
+	RemoteClient *client = m_clients.lockedGetClientNoEx(pkt->getPeerId());
+
 	for (u16 i = 0; i < count; i++) {
 		v3s16 p;
 		*pkt >> p;
 		client->GotBlock(p);
 	}
+	m_clients.unlock();
 }
 
 void Server::process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
@@ -485,8 +498,12 @@ void Server::process_PlayerPos(RemotePlayer *player, PlayerSAO *playersao,
 	pitch = modulo360f(pitch);
 	yaw = wrapDegrees_0_360(yaw);
 
-	playersao->setBasePosition(position);
-	player->setSpeed(speed);
+	if (!playersao->isAttached()) {
+		// Only update player positions when moving freely
+		// to not interfere with attachment handling
+		playersao->setBasePosition(position);
+		player->setSpeed(speed);
+	}
 	playersao->setLookPitch(pitch);
 	playersao->setPlayerYaw(yaw);
 	playersao->setFov(fov);
@@ -619,21 +636,36 @@ void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
 
 	const bool player_has_interact = checkPriv(player->getName(), "interact");
 
-	auto check_inv_access = [player, player_has_interact] (
+	auto check_inv_access = [player, player_has_interact, this] (
 			const InventoryLocation &loc) -> bool {
-		if (loc.type == InventoryLocation::CURRENT_PLAYER)
-			return false; // Only used internally on the client, never sent
-		if (loc.type == InventoryLocation::PLAYER) {
-			// Allow access to own inventory in all cases
-			return loc.name == player->getName();
-		}
 
-		if (!player_has_interact) {
+		// Players without interact may modify their own inventory
+		if (!player_has_interact && loc.type != InventoryLocation::PLAYER) {
 			infostream << "Cannot modify foreign inventory: "
 					<< "No interact privilege" << std::endl;
 			return false;
 		}
-		return true;
+
+		switch (loc.type) {
+		case InventoryLocation::CURRENT_PLAYER:
+			// Only used internally on the client, never sent
+			return false;
+		case InventoryLocation::PLAYER:
+			// Allow access to own inventory in all cases
+			return loc.name == player->getName();
+		case InventoryLocation::NODEMETA:
+			{
+				// Check for out-of-range interaction
+				v3f node_pos   = intToFloat(loc.p, BS);
+				v3f player_pos = player->getPlayerSAO()->getEyePosition();
+				f32 d = player_pos.getDistanceFrom(node_pos);
+				return checkInteractDistance(player, d, "inventory");
+			}
+		case InventoryLocation::DETACHED:
+			return getInventoryMgr()->checkDetachedInventoryAccess(loc, player->getName());
+		default:
+			return false;
+		}
 	};
 
 	/*
@@ -653,18 +685,6 @@ void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
 				!check_inv_access(ma->to_inv))
 			return;
 
-		InventoryLocation *remote = ma->from_inv.type == InventoryLocation::PLAYER ?
-			&ma->to_inv : &ma->from_inv;
-
-		// Check for out-of-range interaction
-		if (remote->type == InventoryLocation::NODEMETA) {
-			v3f node_pos   = intToFloat(remote->p, BS);
-			v3f player_pos = player->getPlayerSAO()->getEyePosition();
-			f32 d = player_pos.getDistanceFrom(node_pos);
-			if (!checkInteractDistance(player, d, "inventory"))
-				return;
-		}
-
 		/*
 			Disable moving items out of craftpreview
 		*/
@@ -749,21 +769,8 @@ void Server::handleCommand_InventoryAction(NetworkPacket* pkt)
 
 void Server::handleCommand_ChatMessage(NetworkPacket* pkt)
 {
-	/*
-		u16 command
-		u16 length
-		wstring message
-	*/
-	u16 len;
-	*pkt >> len;
-
 	std::wstring message;
-	for (u16 i = 0; i < len; i++) {
-		u16 tmp_wchar;
-		*pkt >> tmp_wchar;
-
-		message += (wchar_t)tmp_wchar;
-	}
+	*pkt >> message;
 
 	session_t peer_id = pkt->getPeerId();
 	RemotePlayer *player = m_env->getPlayer(peer_id);
@@ -775,15 +782,13 @@ void Server::handleCommand_ChatMessage(NetworkPacket* pkt)
 		return;
 	}
 
-	// Get player name of this client
 	std::string name = player->getName();
-	std::wstring wname = narrow_to_wide(name);
 
-	std::wstring answer_to_sender = handleChat(name, wname, message, true, player);
+	std::wstring answer_to_sender = handleChat(name, message, true, player);
 	if (!answer_to_sender.empty()) {
 		// Send the answer to sender
-		SendChatMessage(peer_id, ChatMessage(CHATMESSAGE_TYPE_NORMAL,
-			answer_to_sender, wname));
+		SendChatMessage(peer_id, ChatMessage(CHATMESSAGE_TYPE_SYSTEM,
+			answer_to_sender));
 	}
 }
 
@@ -1046,6 +1051,12 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
 		if (pointed.type == POINTEDTHING_NODE) {
 			target_pos = intToFloat(pointed.node_undersurface, BS);
 		} else if (pointed.type == POINTEDTHING_OBJECT) {
+			if (playersao->getId() == pointed_object->getId()) {
+				actionstream << "Server: " << player->getName()
+					<< " attempted to interact with themselves" << std::endl;
+				m_script->on_cheat(playersao, "interacted_with_self");
+				return;
+			}
 			target_pos = pointed_object->getBasePosition();
 		}
 		float d = playersao->getEyePosition().getDistanceFrom(target_pos);
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index bc00d5637..f27a8154b 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -360,7 +360,7 @@ void ContentFeatures::reset()
 		i = TileDef();
 	for (auto &j : tiledef_special)
 		j = TileDef();
-	alpha = 255;
+	alpha = ALPHAMODE_OPAQUE;
 	post_effect_color = video::SColor(0, 0, 0, 0);
 	param_type = CPT_NONE;
 	param_type_2 = CPT2_NONE;
@@ -405,6 +405,31 @@ void ContentFeatures::reset()
 	node_dig_prediction = "air";
 }
 
+void ContentFeatures::setAlphaFromLegacy(u8 legacy_alpha)
+{
+	// No special handling for nodebox/mesh here as it doesn't make sense to
+	// throw warnings when the server is too old to support the "correct" way
+	switch (drawtype) {
+	case NDT_NORMAL:
+		alpha = legacy_alpha == 255 ? ALPHAMODE_OPAQUE : ALPHAMODE_CLIP;
+		break;
+	case NDT_LIQUID:
+	case NDT_FLOWINGLIQUID:
+		alpha = legacy_alpha == 255 ? ALPHAMODE_OPAQUE : ALPHAMODE_BLEND;
+		break;
+	default:
+		alpha = legacy_alpha == 255 ? ALPHAMODE_CLIP : ALPHAMODE_BLEND;
+		break;
+	}
+}
+
+u8 ContentFeatures::getAlphaForLegacy() const
+{
+	// This is so simple only because 255 and 0 mean wildly different things
+	// depending on drawtype...
+	return alpha == ALPHAMODE_OPAQUE ? 255 : 0;
+}
+
 void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
 {
 	const u8 version = CONTENTFEATURES_VERSION;
@@ -433,7 +458,7 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
 	for (const TileDef &td : tiledef_special) {
 		td.serialize(os, protocol_version);
 	}
-	writeU8(os, alpha);
+	writeU8(os, getAlphaForLegacy());
 	writeU8(os, color.getRed());
 	writeU8(os, color.getGreen());
 	writeU8(os, color.getBlue());
@@ -489,21 +514,7 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
 
 	os << serializeString16(node_dig_prediction);
 	writeU8(os, leveled_max);
-}
-
-void ContentFeatures::correctAlpha(TileDef *tiles, int length)
-{
-	// alpha == 0 means that the node is using texture alpha
-	if (alpha == 0 || alpha == 255)
-		return;
-
-	for (int i = 0; i < length; i++) {
-		if (tiles[i].name.empty())
-			continue;
-		std::stringstream s;
-		s << tiles[i].name << "^[noalpha^[opacity:" << ((int)alpha);
-		tiles[i].name = s.str();
-	}
+	writeU8(os, alpha);
 }
 
 void ContentFeatures::deSerialize(std::istream &is)
@@ -539,7 +550,7 @@ void ContentFeatures::deSerialize(std::istream &is)
 		throw SerializationError("unsupported CF_SPECIAL_COUNT");
 	for (TileDef &td : tiledef_special)
 		td.deSerialize(is, version, drawtype);
-	alpha = readU8(is);
+	setAlphaFromLegacy(readU8(is));
 	color.setRed(readU8(is));
 	color.setGreen(readU8(is));
 	color.setBlue(readU8(is));
@@ -597,10 +608,16 @@ void ContentFeatures::deSerialize(std::istream &is)
 
 	try {
 		node_dig_prediction = deSerializeString16(is);
-		u8 tmp_leveled_max = readU8(is);
+
+		u8 tmp = readU8(is);
 		if (is.eof()) /* readU8 doesn't throw exceptions so we have to do this */
 			throw SerializationError("");
-		leveled_max = tmp_leveled_max;
+		leveled_max = tmp;
+
+		tmp = readU8(is);
+		if (is.eof())
+			throw SerializationError("");
+		alpha = static_cast<enum AlphaMode>(tmp);
 	} catch(SerializationError &e) {};
 }
 
@@ -692,6 +709,7 @@ bool ContentFeatures::textureAlphaCheck(ITextureSource *tsrc, const TileDef *til
 	video::IVideoDriver *driver = RenderingEngine::get_video_driver();
 	static thread_local bool long_warning_printed = false;
 	std::set<std::string> seen;
+
 	for (int i = 0; i < length; i++) {
 		if (seen.find(tiles[i].name) != seen.end())
 			continue;
@@ -716,20 +734,21 @@ bool ContentFeatures::textureAlphaCheck(ITextureSource *tsrc, const TileDef *til
 
 break_loop:
 		image->drop();
-		if (!ok) {
-			warningstream << "Texture \"" << tiles[i].name << "\" of "
-				<< name << " has transparent pixels, assuming "
-				"use_texture_alpha = true." << std::endl;
-			if (!long_warning_printed) {
-				warningstream << "  This warning can be a false-positive if "
-					"unused pixels in the texture are transparent. However if "
-					"it is meant to be transparent, you *MUST* update the "
-					"nodedef and set use_texture_alpha = true! This compatibility "
-					"code will be removed in a few releases." << std::endl;
-				long_warning_printed = true;
-			}
-			return true;
+		if (ok)
+			continue;
+		warningstream << "Texture \"" << tiles[i].name << "\" of "
+			<< name << " has transparency, assuming "
+			"use_texture_alpha = \"clip\"." << std::endl;
+		if (!long_warning_printed) {
+			warningstream << "  This warning can be a false-positive if "
+				"unused pixels in the texture are transparent. However if "
+				"it is meant to be transparent, you *MUST* update the "
+				"nodedef and set use_texture_alpha = \"clip\"! This "
+				"compatibility code will be removed in a few releases."
+				<< std::endl;
+			long_warning_printed = true;
 		}
+		return true;
 	}
 	return false;
 }
@@ -774,31 +793,33 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 
 	bool is_liquid = false;
 
-	MaterialType material_type = (alpha == 255) ?
-		TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA;
+	if (alpha == ALPHAMODE_LEGACY_COMPAT) {
+		// Before working with the alpha mode, resolve any legacy kludges
+		alpha = textureAlphaCheck(tsrc, tdef, 6) ? ALPHAMODE_CLIP : ALPHAMODE_OPAQUE;
+	}
+
+	MaterialType material_type = alpha == ALPHAMODE_OPAQUE ?
+		TILE_MATERIAL_OPAQUE : (alpha == ALPHAMODE_CLIP ? TILE_MATERIAL_BASIC :
+		TILE_MATERIAL_ALPHA);
 
 	switch (drawtype) {
 	default:
 	case NDT_NORMAL:
-		material_type = (alpha == 255) ?
-			TILE_MATERIAL_OPAQUE : TILE_MATERIAL_ALPHA;
 		solidness = 2;
 		break;
 	case NDT_AIRLIKE:
 		solidness = 0;
 		break;
 	case NDT_LIQUID:
-		assert(liquid_type == LIQUID_SOURCE);
 		if (tsettings.opaque_water)
-			alpha = 255;
+			alpha = ALPHAMODE_OPAQUE;
 		solidness = 1;
 		is_liquid = true;
 		break;
 	case NDT_FLOWINGLIQUID:
-		assert(liquid_type == LIQUID_FLOWING);
 		solidness = 0;
 		if (tsettings.opaque_water)
-			alpha = 255;
+			alpha = ALPHAMODE_OPAQUE;
 		is_liquid = true;
 		break;
 	case NDT_GLASSLIKE:
@@ -850,19 +871,16 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 		break;
 	case NDT_MESH:
 	case NDT_NODEBOX:
-		if (alpha == 255 && textureAlphaCheck(tsrc, tdef, 6))
-			alpha = 0;
-
 		solidness = 0;
-		if (waving == 1)
+		if (waving == 1) {
 			material_type = TILE_MATERIAL_WAVING_PLANTS;
-		else if (waving == 2)
+		} else if (waving == 2) {
 			material_type = TILE_MATERIAL_WAVING_LEAVES;
-		else if (waving == 3)
-			material_type = (alpha == 255) ? TILE_MATERIAL_WAVING_LIQUID_OPAQUE :
-				TILE_MATERIAL_WAVING_LIQUID_BASIC;
-		else if (alpha == 255)
-			material_type = TILE_MATERIAL_OPAQUE;
+		} else if (waving == 3) {
+			material_type = alpha == ALPHAMODE_OPAQUE ?
+				TILE_MATERIAL_WAVING_LIQUID_OPAQUE : (alpha == ALPHAMODE_CLIP ?
+				TILE_MATERIAL_WAVING_LIQUID_BASIC : TILE_MATERIAL_WAVING_LIQUID_TRANSPARENT);
+		}
 		break;
 	case NDT_TORCHLIKE:
 	case NDT_SIGNLIKE:
@@ -876,16 +894,12 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 	}
 
 	if (is_liquid) {
-		// Vertex alpha is no longer supported, correct if necessary.
-		correctAlpha(tdef, 6);
-		correctAlpha(tdef_overlay, 6);
-		correctAlpha(tdef_spec, CF_SPECIAL_COUNT);
-
 		if (waving == 3) {
-			material_type = (alpha == 255) ? TILE_MATERIAL_WAVING_LIQUID_OPAQUE :
-				TILE_MATERIAL_WAVING_LIQUID_TRANSPARENT;
+			material_type = alpha == ALPHAMODE_OPAQUE ?
+				TILE_MATERIAL_WAVING_LIQUID_OPAQUE : (alpha == ALPHAMODE_CLIP ?
+				TILE_MATERIAL_WAVING_LIQUID_BASIC : TILE_MATERIAL_WAVING_LIQUID_TRANSPARENT);
 		} else {
-			material_type = (alpha == 255) ? TILE_MATERIAL_LIQUID_OPAQUE :
+			material_type = alpha == ALPHAMODE_OPAQUE ? TILE_MATERIAL_LIQUID_OPAQUE :
 				TILE_MATERIAL_LIQUID_TRANSPARENT;
 		}
 	}
@@ -930,7 +944,8 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
 
 	if (param_type_2 == CPT2_COLOR ||
 			param_type_2 == CPT2_COLORED_FACEDIR ||
-			param_type_2 == CPT2_COLORED_WALLMOUNTED)
+			param_type_2 == CPT2_COLORED_WALLMOUNTED ||
+			param_type_2 == CPT2_COLORED_DEGROTATE)
 		palette = tsrc->getPalette(palette_name);
 
 	if (drawtype == NDT_MESH && !mesh.empty()) {
@@ -1436,9 +1451,7 @@ void NodeDefManager::applyTextureOverrides(const std::vector<TextureOverride> &o
 	}
 }
 
-void NodeDefManager::updateTextures(IGameDef *gamedef,
-	void (*progress_callback)(void *progress_args, u32 progress, u32 max_progress),
-	void *progress_callback_args)
+void NodeDefManager::updateTextures(IGameDef *gamedef, void *progress_callback_args)
 {
 #ifndef SERVER
 	infostream << "NodeDefManager::updateTextures(): Updating "
@@ -1447,8 +1460,8 @@ void NodeDefManager::updateTextures(IGameDef *gamedef,
 	Client *client = (Client *)gamedef;
 	ITextureSource *tsrc = client->tsrc();
 	IShaderSource *shdsrc = client->getShaderSource();
-	scene::IMeshManipulator *meshmanip =
-		RenderingEngine::get_scene_manager()->getMeshManipulator();
+	auto smgr = client->getSceneManager();
+	scene::IMeshManipulator *meshmanip = smgr->getMeshManipulator();
 	TextureSettings tsettings;
 	tsettings.readSettings();
 
@@ -1457,7 +1470,7 @@ void NodeDefManager::updateTextures(IGameDef *gamedef,
 	for (u32 i = 0; i < size; i++) {
 		ContentFeatures *f = &(m_content_features[i]);
 		f->updateTextures(tsrc, shdsrc, meshmanip, client, tsettings);
-		progress_callback(progress_callback_args, i, size);
+		client->showUpdateProgressTexture(progress_callback_args, i, size);
 	}
 #endif
 }
@@ -1545,10 +1558,10 @@ void NodeDefManager::deSerialize(std::istream &is)
 }
 
 
-void NodeDefManager::addNameIdMapping(content_t i, std::string name)
+void NodeDefManager::addNameIdMapping(content_t i, const std::string &name)
 {
 	m_name_id_mapping.set(i, name);
-	m_name_id_mapping_with_aliases.insert(std::make_pair(name, i));
+	m_name_id_mapping_with_aliases.emplace(name, i);
 }
 
 
@@ -1612,7 +1625,7 @@ static void removeDupes(std::vector<content_t> &list)
 void NodeDefManager::resolveCrossrefs()
 {
 	for (ContentFeatures &f : m_content_features) {
-		if (f.liquid_type != LIQUID_NONE) {
+		if (f.liquid_type != LIQUID_NONE || f.drawtype == NDT_LIQUID || f.drawtype == NDT_FLOWINGLIQUID) {
 			f.liquid_alternative_flowing_id = getId(f.liquid_alternative_flowing);
 			f.liquid_alternative_source_id = getId(f.liquid_alternative_source);
 			continue;
@@ -1677,8 +1690,7 @@ bool NodeDefManager::nodeboxConnects(MapNode from, MapNode to,
 
 NodeResolver::NodeResolver()
 {
-	m_nodenames.reserve(16);
-	m_nnlistsizes.reserve(4);
+	reset();
 }
 
 
@@ -1781,3 +1793,16 @@ bool NodeResolver::getIdsFromNrBacklog(std::vector<content_t> *result_out,
 
 	return success;
 }
+
+void NodeResolver::reset(bool resolve_done)
+{
+	m_nodenames.clear();
+	m_nodenames_idx = 0;
+	m_nnlistsizes.clear();
+	m_nnlistsizes_idx = 0;
+
+	m_resolve_done = resolve_done;
+
+	m_nodenames.reserve(16);
+	m_nnlistsizes.reserve(4);
+}
diff --git a/src/nodedef.h b/src/nodedef.h
index 66c21cc07..8a6d88071 100644
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -44,6 +44,9 @@ class ITextureSource;
 class IShaderSource;
 class IGameDef;
 class NodeResolver;
+#if BUILD_UNITTESTS
+class TestSchematic;
+#endif
 
 enum ContentParamType
 {
@@ -64,7 +67,7 @@ enum ContentParamType2
 	CPT2_WALLMOUNTED,
 	// Block level like FLOWINGLIQUID
 	CPT2_LEVELED,
-	// 2D rotation for things like plants
+	// 2D rotation
 	CPT2_DEGROTATE,
 	// Mesh options for plants
 	CPT2_MESHOPTIONS,
@@ -76,6 +79,8 @@ enum ContentParamType2
 	CPT2_COLORED_WALLMOUNTED,
 	// Glasslike framed drawtype internal liquid level, param2 values 0 to 63
 	CPT2_GLASSLIKE_LIQUID_LEVEL,
+	// 3 bits of palette index, then degrotate
+	CPT2_COLORED_DEGROTATE,
 };
 
 enum LiquidType
@@ -231,6 +236,14 @@ enum AlignStyle : u8 {
 	ALIGN_STYLE_USER_DEFINED,
 };
 
+enum AlphaMode : u8 {
+	ALPHAMODE_BLEND,
+	ALPHAMODE_CLIP,
+	ALPHAMODE_OPAQUE,
+	ALPHAMODE_LEGACY_COMPAT, /* means either opaque or clip */
+};
+
+
 /*
 	Stand-alone definition of a TileSpec (basically a server-side TileSpec)
 */
@@ -315,9 +328,7 @@ struct ContentFeatures
 	// These will be drawn over the base tiles.
 	TileDef tiledef_overlay[6];
 	TileDef tiledef_special[CF_SPECIAL_COUNT]; // eg. flowing liquid
-	// If 255, the node is opaque.
-	// Otherwise it uses texture alpha.
-	u8 alpha;
+	AlphaMode alpha;
 	// The color of the node.
 	video::SColor color;
 	std::string palette_name;
@@ -418,29 +429,27 @@ struct ContentFeatures
 	void serialize(std::ostream &os, u16 protocol_version) const;
 	void deSerialize(std::istream &is);
 
-	/*!
-	 * Since vertex alpha is no longer supported, this method
-	 * adds opacity directly to the texture pixels.
-	 *
-	 * \param tiles array of the tile definitions.
-	 * \param length length of tiles
-	 */
-	void correctAlpha(TileDef *tiles, int length);
-
-#ifndef SERVER
-	/*
-	 * Checks if any tile texture has any transparent pixels.
-	 * Prints a warning and returns true if that is the case, false otherwise.
-	 * This is supposed to be used for use_texture_alpha backwards compatibility.
-	 */
-	bool textureAlphaCheck(ITextureSource *tsrc, const TileDef *tiles,
-		int length);
-#endif
-	
-
 	/*
 		Some handy methods
 	*/
+	void setDefaultAlphaMode()
+	{
+		switch (drawtype) {
+		case NDT_NORMAL:
+		case NDT_LIQUID:
+		case NDT_FLOWINGLIQUID:
+			alpha = ALPHAMODE_OPAQUE;
+			break;
+		case NDT_NODEBOX:
+		case NDT_MESH:
+			alpha = ALPHAMODE_LEGACY_COMPAT; // this should eventually be OPAQUE
+			break;
+		default:
+			alpha = ALPHAMODE_CLIP;
+			break;
+		}
+	}
+
 	bool needsBackfaceCulling() const
 	{
 		switch (drawtype) {
@@ -474,6 +483,21 @@ struct ContentFeatures
 	void updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc,
 		scene::IMeshManipulator *meshmanip, Client *client, const TextureSettings &tsettings);
 #endif
+
+private:
+#ifndef SERVER
+	/*
+	 * Checks if any tile texture has any transparent pixels.
+	 * Prints a warning and returns true if that is the case, false otherwise.
+	 * This is supposed to be used for use_texture_alpha backwards compatibility.
+	 */
+	bool textureAlphaCheck(ITextureSource *tsrc, const TileDef *tiles,
+		int length);
+#endif
+
+	void setAlphaFromLegacy(u8 legacy_alpha);
+
+	u8 getAlphaForLegacy() const;
 };
 
 /*!
@@ -636,9 +660,7 @@ public:
 	 * total ContentFeatures.
 	 * @param progress_cbk_args passed to the callback function
 	 */
-	void updateTextures(IGameDef *gamedef,
-		void (*progress_cbk)(void *progress_args, u32 progress, u32 max_progress),
-		void *progress_cbk_args);
+	void updateTextures(IGameDef *gamedef, void *progress_cbk_args);
 
 	/*!
 	 * Writes the content of this manager to the given output stream.
@@ -701,7 +723,7 @@ private:
 	 * @param i a content ID
 	 * @param name a node name
 	 */
-	void addNameIdMapping(content_t i, std::string name);
+	void addNameIdMapping(content_t i, const std::string &name);
 
 	/*!
 	 * Removes a content ID from all groups.
@@ -770,10 +792,13 @@ private:
 
 NodeDefManager *createNodeDefManager();
 
+// NodeResolver: Queue for node names which are then translated
+// to content_t after the NodeDefManager was initialized
 class NodeResolver {
 public:
 	NodeResolver();
 	virtual ~NodeResolver();
+	// Callback which is run as soon NodeDefManager is ready
 	virtual void resolveNodeNames() = 0;
 
 	// required because this class is used as mixin for ObjDef
@@ -785,12 +810,31 @@ public:
 	bool getIdsFromNrBacklog(std::vector<content_t> *result_out,
 		bool all_required = false, content_t c_fallback = CONTENT_IGNORE);
 
-	void nodeResolveInternal();
+	inline bool isResolveDone() const { return m_resolve_done; }
+	void reset(bool resolve_done = false);
 
-	u32 m_nodenames_idx = 0;
-	u32 m_nnlistsizes_idx = 0;
+	// Vector containing all node names in the resolve "queue"
 	std::vector<std::string> m_nodenames;
+	// Specifies the "set size" of node names which are to be processed
+	// this is used for getIdsFromNrBacklog
+	// TODO: replace or remove
 	std::vector<size_t> m_nnlistsizes;
+
+protected:
+	friend class NodeDefManager; // m_ndef
+
 	const NodeDefManager *m_ndef = nullptr;
+	// Index of the next "m_nodenames" entry to resolve
+	u32 m_nodenames_idx = 0;
+
+private:
+#if BUILD_UNITTESTS
+	// Unittest requires access to m_resolve_done
+	friend class TestSchematic;
+#endif
+	void nodeResolveInternal();
+
+	// Index of the next "m_nnlistsizes" entry to process
+	u32 m_nnlistsizes_idx = 0;
 	bool m_resolve_done = false;
 };
diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 6447c8785..f98732385 100644
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -206,10 +206,9 @@ NodeMetadataList::~NodeMetadataList()
 std::vector<v3s16> NodeMetadataList::getAllKeys()
 {
 	std::vector<v3s16> keys;
-
-	NodeMetadataMap::const_iterator it;
-	for (it = m_data.begin(); it != m_data.end(); ++it)
-		keys.push_back(it->first);
+	keys.reserve(m_data.size());
+	for (const auto &it : m_data)
+		keys.push_back(it.first);
 
 	return keys;
 }
@@ -218,7 +217,7 @@ NodeMetadata *NodeMetadataList::get(v3s16 p)
 {
 	NodeMetadataMap::const_iterator n = m_data.find(p);
 	if (n == m_data.end())
-		return NULL;
+		return nullptr;
 	return n->second;
 }
 
@@ -235,7 +234,7 @@ void NodeMetadataList::remove(v3s16 p)
 void NodeMetadataList::set(v3s16 p, NodeMetadata *d)
 {
 	remove(p);
-	m_data.insert(std::make_pair(p, d));
+	m_data.emplace(p, d);
 }
 
 void NodeMetadataList::clear()
@@ -251,9 +250,8 @@ void NodeMetadataList::clear()
 int NodeMetadataList::countNonEmpty() const
 {
 	int n = 0;
-	NodeMetadataMap::const_iterator it;
-	for (it = m_data.begin(); it != m_data.end(); ++it) {
-		if (!it->second->empty())
+	for (const auto &it : m_data) {
+		if (!it.second->empty())
 			n++;
 	}
 	return n;
diff --git a/src/noise.cpp b/src/noise.cpp
index e16564b05..a10efa3c4 100644
--- a/src/noise.cpp
+++ b/src/noise.cpp
@@ -369,7 +369,7 @@ float contour(float v)
 ///////////////////////// [ New noise ] ////////////////////////////
 
 
-float NoisePerlin2D(NoiseParams *np, float x, float y, s32 seed)
+float NoisePerlin2D(const NoiseParams *np, float x, float y, s32 seed)
 {
 	float a = 0;
 	float f = 1.0;
@@ -395,7 +395,7 @@ float NoisePerlin2D(NoiseParams *np, float x, float y, s32 seed)
 }
 
 
-float NoisePerlin3D(NoiseParams *np, float x, float y, float z, s32 seed)
+float NoisePerlin3D(const NoiseParams *np, float x, float y, float z, s32 seed)
 {
 	float a = 0;
 	float f = 1.0;
@@ -422,7 +422,7 @@ float NoisePerlin3D(NoiseParams *np, float x, float y, float z, s32 seed)
 }
 
 
-Noise::Noise(NoiseParams *np_, s32 seed, u32 sx, u32 sy, u32 sz)
+Noise::Noise(const NoiseParams *np_, s32 seed, u32 sx, u32 sy, u32 sz)
 {
 	np = *np_;
 	this->seed = seed;
diff --git a/src/noise.h b/src/noise.h
index 613879890..854781731 100644
--- a/src/noise.h
+++ b/src/noise.h
@@ -146,7 +146,7 @@ public:
 	float *persist_buf = nullptr;
 	float *result = nullptr;
 
-	Noise(NoiseParams *np, s32 seed, u32 sx, u32 sy, u32 sz=1);
+	Noise(const NoiseParams *np, s32 seed, u32 sx, u32 sy, u32 sz=1);
 	~Noise();
 
 	void setSize(u32 sx, u32 sy, u32 sz=1);
@@ -192,8 +192,8 @@ private:
 
 };
 
-float NoisePerlin2D(NoiseParams *np, float x, float y, s32 seed);
-float NoisePerlin3D(NoiseParams *np, float x, float y, float z, s32 seed);
+float NoisePerlin2D(const NoiseParams *np, float x, float y, s32 seed);
+float NoisePerlin3D(const NoiseParams *np, float x, float y, float z, s32 seed);
 
 inline float NoisePerlin2D_PO(NoiseParams *np, float x, float xoff,
 	float y, float yoff, s32 seed)
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index f31773060..2eebc27d6 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -24,6 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/basic_macros.h"
 #include <sstream>
 
+static const video::SColor NULL_BGCOLOR{0, 1, 1, 1};
+
 ObjectProperties::ObjectProperties()
 {
 	textures.emplace_back("unknown_object.png");
@@ -62,6 +64,13 @@ std::string ObjectProperties::dump()
 	os << ", nametag=" << nametag;
 	os << ", nametag_color=" << "\"" << nametag_color.getAlpha() << "," << nametag_color.getRed()
 			<< "," << nametag_color.getGreen() << "," << nametag_color.getBlue() << "\" ";
+
+	if (nametag_bgcolor)
+		os << ", nametag_bgcolor=" << "\"" << nametag_color.getAlpha() << "," << nametag_color.getRed()
+		   << "," << nametag_color.getGreen() << "," << nametag_color.getBlue() << "\" ";
+	else
+		os << ", nametag_bgcolor=null ";
+
 	os << ", selectionbox=" << PP(selectionbox.MinEdge) << "," << PP(selectionbox.MaxEdge);
 	os << ", pointable=" << pointable;
 	os << ", static_save=" << static_save;
@@ -121,6 +130,13 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeU8(os, shaded);
 	writeU8(os, show_on_minimap);
 
+	if (!nametag_bgcolor)
+		writeARGB8(os, NULL_BGCOLOR);
+	else if (nametag_bgcolor.value().getAlpha() == 0)
+		writeARGB8(os, video::SColor(0, 0, 0, 0));
+	else
+		writeARGB8(os, nametag_bgcolor.value());
+
 	// Add stuff only at the bottom.
 	// Never remove anything, because we don't want new versions of this
 }
@@ -182,5 +198,11 @@ void ObjectProperties::deSerialize(std::istream &is)
 		if (is.eof())
 			return;
 		show_on_minimap = tmp;
+
+		auto bgcolor = readARGB8(is);
+		if (bgcolor != NULL_BGCOLOR)
+			nametag_bgcolor = bgcolor;
+		else
+			nametag_bgcolor = nullopt;
 	} catch (SerializationError &e) {}
 }
diff --git a/src/object_properties.h b/src/object_properties.h
index adb483527..db28eebfd 100644
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include <map>
 #include <vector>
+#include "util/Optional.h"
 
 struct ObjectProperties
 {
@@ -53,6 +54,7 @@ struct ObjectProperties
 	s8 glow = 0;
 	std::string nametag = "";
 	video::SColor nametag_color = video::SColor(255, 255, 255, 255);
+	Optional<video::SColor> nametag_bgcolor = nullopt;
 	f32 automatic_face_movement_max_rotation_per_sec = -1.0f;
 	std::string infotext;
 	//! For dropped items, this contains item information.
diff --git a/src/pathfinder.cpp b/src/pathfinder.cpp
index 3f0b98c10..c45ce9158 100644
--- a/src/pathfinder.cpp
+++ b/src/pathfinder.cpp
@@ -157,9 +157,8 @@ public:
 
 	ArrayGridNodeContainer(Pathfinder *pathf, v3s16 dimensions);
 	virtual PathGridnode &access(v3s16 p);
-private:
-	v3s16 m_dimensions;
 
+private:
 	int m_x_stride;
 	int m_y_stride;
 	std::vector<PathGridnode> m_nodes_array;
@@ -306,8 +305,6 @@ private:
 	int m_max_index_y = 0;            /**< max index of search area in y direction  */
 	int m_max_index_z = 0;            /**< max index of search area in z direction  */
 
-
-	int m_searchdistance = 0;         /**< max distance to search in each direction */
 	int m_maxdrop = 0;                /**< maximum number of blocks a path may drop */
 	int m_maxjump = 0;                /**< maximum number of blocks a path may jump */
 	int m_min_target_distance = 0;    /**< current smalest path to target           */
@@ -619,7 +616,6 @@ std::vector<v3s16> Pathfinder::getPath(v3s16 source,
 	std::vector<v3s16> retval;
 
 	//initialization
-	m_searchdistance = searchdistance;
 	m_maxjump = max_jump;
 	m_maxdrop = max_drop;
 	m_start       = source;
@@ -1432,7 +1428,7 @@ std::string Pathfinder::dirToName(PathDirections dir)
 }
 
 /******************************************************************************/
-void Pathfinder::printPath(std::vector<v3s16> path)
+void Pathfinder::printPath(const std::vector<v3s16> &path)
 {
 	unsigned int current = 0;
 	for (std::vector<v3s16>::iterator i = path.begin();
diff --git a/src/porting.h b/src/porting.h
index e4ebe36fd..93932e1d9 100644
--- a/src/porting.h
+++ b/src/porting.h
@@ -234,21 +234,21 @@ inline u64 getTimeMs()
 {
 	struct timespec ts;
 	os_get_clock(&ts);
-	return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+	return ((u64) ts.tv_sec) * 1000LL + ((u64) ts.tv_nsec) / 1000000LL;
 }
 
 inline u64 getTimeUs()
 {
 	struct timespec ts;
 	os_get_clock(&ts);
-	return ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+	return ((u64) ts.tv_sec) * 1000000LL + ((u64) ts.tv_nsec) / 1000LL;
 }
 
 inline u64 getTimeNs()
 {
 	struct timespec ts;
 	os_get_clock(&ts);
-	return ts.tv_sec * 1000000000 + ts.tv_nsec;
+	return ((u64) ts.tv_sec) * 1000000000LL + ((u64) ts.tv_nsec);
 }
 
 #endif
diff --git a/src/remoteplayer.cpp b/src/remoteplayer.cpp
index bef60c792..925ad001b 100644
--- a/src/remoteplayer.cpp
+++ b/src/remoteplayer.cpp
@@ -83,122 +83,6 @@ RemotePlayer::RemotePlayer(const char *name, IItemDefManager *idef):
 	m_star_params = sky_defaults.getStarDefaults();
 }
 
-void RemotePlayer::serializeExtraAttributes(std::string &output)
-{
-	assert(m_sao);
-	Json::Value json_root;
-
-	const StringMap &attrs = m_sao->getMeta().getStrings();
-	for (const auto &attr : attrs) {
-		json_root[attr.first] = attr.second;
-	}
-
-	output = fastWriteJson(json_root);
-}
-
-
-void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
-		PlayerSAO *sao)
-{
-	Settings args;
-
-	if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
-		throw SerializationError("PlayerArgsEnd of player " + playername + " not found!");
-	}
-
-	m_dirty = true;
-	//args.getS32("version"); // Version field value not used
-	const std::string &name = args.get("name");
-	strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
-
-	if (sao) {
-		try {
-			sao->setHPRaw(args.getU16("hp"));
-		} catch(SettingNotFoundException &e) {
-			sao->setHPRaw(PLAYER_MAX_HP_DEFAULT);
-		}
-
-		try {
-			sao->setBasePosition(args.getV3F("position"));
-		} catch (SettingNotFoundException &e) {}
-
-		try {
-			sao->setLookPitch(args.getFloat("pitch"));
-		} catch (SettingNotFoundException &e) {}
-		try {
-			sao->setPlayerYaw(args.getFloat("yaw"));
-		} catch (SettingNotFoundException &e) {}
-
-		try {
-			sao->setBreath(args.getU16("breath"), false);
-		} catch (SettingNotFoundException &e) {}
-
-		try {
-			const std::string &extended_attributes = args.get("extended_attributes");
-			std::istringstream iss(extended_attributes);
-			Json::CharReaderBuilder builder;
-			builder.settings_["collectComments"] = false;
-			std::string errs;
-
-			Json::Value attr_root;
-			Json::parseFromStream(builder, iss, &attr_root, &errs);
-
-			const Json::Value::Members attr_list = attr_root.getMemberNames();
-			for (const auto &it : attr_list) {
-				Json::Value attr_value = attr_root[it];
-				sao->getMeta().setString(it, attr_value.asString());
-			}
-			sao->getMeta().setModified(false);
-		} catch (SettingNotFoundException &e) {}
-	}
-
-	try {
-		inventory.deSerialize(is);
-	} catch (SerializationError &e) {
-		errorstream << "Failed to deserialize player inventory. player_name="
-			<< name << " " << e.what() << std::endl;
-	}
-
-	if (!inventory.getList("craftpreview") && inventory.getList("craftresult")) {
-		// Convert players without craftpreview
-		inventory.addList("craftpreview", 1);
-
-		bool craftresult_is_preview = true;
-		if(args.exists("craftresult_is_preview"))
-			craftresult_is_preview = args.getBool("craftresult_is_preview");
-		if(craftresult_is_preview)
-		{
-			// Clear craftresult
-			inventory.getList("craftresult")->changeItem(0, ItemStack());
-		}
-	}
-}
-
-void RemotePlayer::serialize(std::ostream &os)
-{
-	// Utilize a Settings object for storing values
-	Settings args;
-	args.setS32("version", 1);
-	args.set("name", m_name);
-
-	// This should not happen
-	assert(m_sao);
-	args.setU16("hp", m_sao->getHP());
-	args.setV3F("position", m_sao->getBasePosition());
-	args.setFloat("pitch", m_sao->getLookPitch());
-	args.setFloat("yaw", m_sao->getRotation().Y);
-	args.setU16("breath", m_sao->getBreath());
-
-	std::string extended_attrs;
-	serializeExtraAttributes(extended_attrs);
-	args.set("extended_attributes", extended_attrs);
-
-	args.writeLines(os);
-
-	os<<"PlayerArgsEnd\n";
-
-	inventory.serialize(os);
-}
 
 const RemotePlayerChatResult RemotePlayer::canSendChatMessage()
 {
diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index e4209c54f..8d086fc5a 100644
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -44,8 +44,6 @@ public:
 	RemotePlayer(const char *name, IItemDefManager *idef);
 	virtual ~RemotePlayer() = default;
 
-	void deSerialize(std::istream &is, const std::string &playername, PlayerSAO *sao);
-
 	PlayerSAO *getPlayerSAO() { return m_sao; }
 	void setPlayerSAO(PlayerSAO *sao) { m_sao = sao; }
 
@@ -142,14 +140,6 @@ public:
 	void onSuccessfulSave();
 
 private:
-	/*
-		serialize() writes a bunch of text that can contain
-		any characters except a '\0', and such an ending that
-		deSerialize stops reading exactly at the right point.
-	*/
-	void serialize(std::ostream &os);
-	void serializeExtraAttributes(std::string &output);
-
 	PlayerSAO *m_sao = nullptr;
 	bool m_dirty = false;
 
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 72361bdb5..897ca2862 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -84,9 +84,6 @@ void read_item_definition(lua_State* L, int index,
 
 	getboolfield(L, index, "liquids_pointable", def.liquids_pointable);
 
-	warn_if_field_exists(L, index, "tool_digging_properties",
-			"Obsolete; use tool_capabilities");
-
 	lua_getfield(L, index, "tool_capabilities");
 	if(lua_istable(L, -1)){
 		def.tool_capabilities = new ToolCapabilities(
@@ -123,6 +120,8 @@ void read_item_definition(lua_State* L, int index,
 	// "" = no prediction
 	getstringfield(L, index, "node_placement_prediction",
 			def.node_placement_prediction);
+
+	getintfield(L, index, "place_param2", def.place_param2);
 }
 
 /******************************************************************************/
@@ -144,8 +143,10 @@ void push_item_definition_full(lua_State *L, const ItemDefinition &i)
 	lua_setfield(L, -2, "name");
 	lua_pushstring(L, i.description.c_str());
 	lua_setfield(L, -2, "description");
-	lua_pushstring(L, i.short_description.c_str());
-	lua_setfield(L, -2, "short_description");
+	if (!i.short_description.empty()) {
+		lua_pushstring(L, i.short_description.c_str());
+		lua_setfield(L, -2, "short_description");
+	}
 	lua_pushstring(L, type.c_str());
 	lua_setfield(L, -2, "type");
 	lua_pushstring(L, i.inventory_image.c_str());
@@ -199,7 +200,7 @@ void read_object_properties(lua_State *L, int index,
 	if (getintfield(L, -1, "hp_max", hp_max)) {
 		prop->hp_max = (u16)rangelim(hp_max, 0, U16_MAX);
 
-		if (prop->hp_max < sao->getHP()) {
+		if (sao && prop->hp_max < sao->getHP()) {
 			PlayerHPChangeReason reason(PlayerHPChangeReason::SET_HP);
 			sao->setHP(prop->hp_max, reason);
 			if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER)
@@ -208,7 +209,7 @@ void read_object_properties(lua_State *L, int index,
 	}
 
 	if (getintfield(L, -1, "breath_max", prop->breath_max)) {
-		if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+		if (sao && sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
 			PlayerSAO *player = (PlayerSAO *)sao;
 			if (prop->breath_max < player->getBreath())
 				player->setBreath(prop->breath_max);
@@ -316,6 +317,17 @@ void read_object_properties(lua_State *L, int index,
 			prop->nametag_color = color;
 	}
 	lua_pop(L, 1);
+	lua_getfield(L, -1, "nametag_bgcolor");
+	if (!lua_isnil(L, -1)) {
+		if (lua_toboolean(L, -1)) {
+			video::SColor color;
+			if (read_color(L, -1, &color))
+				prop->nametag_bgcolor = color;
+		} else {
+			prop->nametag_bgcolor = nullopt;
+		}
+	}
+	lua_pop(L, 1);
 
 	lua_getfield(L, -1, "automatic_face_movement_max_rotation_per_sec");
 	if (lua_isnumber(L, -1)) {
@@ -407,6 +419,13 @@ void push_object_properties(lua_State *L, ObjectProperties *prop)
 	lua_setfield(L, -2, "nametag");
 	push_ARGB8(L, prop->nametag_color);
 	lua_setfield(L, -2, "nametag_color");
+	if (prop->nametag_bgcolor) {
+		push_ARGB8(L, prop->nametag_bgcolor.value());
+		lua_setfield(L, -2, "nametag_bgcolor");
+	} else {
+		lua_pushboolean(L, false);
+		lua_setfield(L, -2, "nametag_bgcolor");
+	}
 	lua_pushnumber(L, prop->automatic_face_movement_max_rotation_per_sec);
 	lua_setfield(L, -2, "automatic_face_movement_max_rotation_per_sec");
 	lua_pushlstring(L, prop->infotext.c_str(), prop->infotext.size());
@@ -497,6 +516,35 @@ TileDef read_tiledef(lua_State *L, int index, u8 drawtype)
 }
 
 /******************************************************************************/
+void push_tiledef(lua_State *L, TileDef tiledef)
+{
+	lua_newtable(L);
+	setstringfield(L, -1, "name", tiledef.name);
+	setboolfield(L, -1, "backface_culling", tiledef.backface_culling);
+	setboolfield(L, -1, "tileable_horizontal", tiledef.tileable_horizontal);
+	setboolfield(L, -1, "tileable_vertical", tiledef.tileable_vertical);
+	std::string align_style;
+	switch (tiledef.align_style) {
+	case ALIGN_STYLE_USER_DEFINED:
+			align_style = "user";
+			break;
+	case ALIGN_STYLE_WORLD:
+			align_style = "world";
+			break;
+	default:
+			align_style = "node";
+	}
+	setstringfield(L, -1, "align_style", align_style);
+	setintfield(L, -1, "scale", tiledef.scale);
+	if (tiledef.has_color) {
+		push_ARGB8(L, tiledef.color);
+		lua_setfield(L, -2, "color");
+	}
+	push_animation_definition(L, tiledef.animation);
+	lua_setfield(L, -2, "animation");
+}
+
+/******************************************************************************/
 void read_content_features(lua_State *L, ContentFeatures &f, int index)
 {
 	if(index < 0)
@@ -624,22 +672,39 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index)
 	}
 	lua_pop(L, 1);
 
-	f.alpha = getintfield_default(L, index, "alpha", 255);
+	/* alpha & use_texture_alpha */
+	// This is a bit complicated due to compatibility
+
+	f.setDefaultAlphaMode();
+
+	warn_if_field_exists(L, index, "alpha",
+		"Obsolete, only limited compatibility provided; "
+		"replaced by \"use_texture_alpha\"");
+	if (getintfield_default(L, index, "alpha", 255) != 255)
+		f.alpha = ALPHAMODE_BLEND;
+
+	lua_getfield(L, index, "use_texture_alpha");
+	if (lua_isboolean(L, -1)) {
+		warn_if_field_exists(L, index, "use_texture_alpha",
+			"Boolean values are deprecated; use the new choices");
+		if (lua_toboolean(L, -1))
+			f.alpha = (f.drawtype == NDT_NORMAL) ? ALPHAMODE_CLIP : ALPHAMODE_BLEND;
+	} else if (check_field_or_nil(L, -1, LUA_TSTRING, "use_texture_alpha")) {
+		int result = f.alpha;
+		string_to_enum(ScriptApiNode::es_TextureAlphaMode, result,
+				std::string(lua_tostring(L, -1)));
+		f.alpha = static_cast<enum AlphaMode>(result);
+	}
+	lua_pop(L, 1);
 
-	bool usealpha = getboolfield_default(L, index,
-			"use_texture_alpha", false);
-	if (usealpha)
-		f.alpha = 0;
+	/* Other stuff */
 
-	// Read node color.
 	lua_getfield(L, index, "color");
 	read_color(L, -1, &f.color);
 	lua_pop(L, 1);
 
 	getstringfield(L, index, "palette", f.palette_name);
 
-	/* Other stuff */
-
 	lua_getfield(L, index, "post_effect_color");
 	read_color(L, -1, &f.post_effect_color);
 	lua_pop(L, 1);
@@ -652,24 +717,11 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index)
 	if (!f.palette_name.empty() &&
 			!(f.param_type_2 == CPT2_COLOR ||
 			f.param_type_2 == CPT2_COLORED_FACEDIR ||
-			f.param_type_2 == CPT2_COLORED_WALLMOUNTED))
+			f.param_type_2 == CPT2_COLORED_WALLMOUNTED ||
+			f.param_type_2 == CPT2_COLORED_DEGROTATE))
 		warningstream << "Node " << f.name.c_str()
 			<< " has a palette, but not a suitable paramtype2." << std::endl;
 
-	// Warn about some obsolete fields
-	warn_if_field_exists(L, index, "wall_mounted",
-			"Obsolete; use paramtype2 = 'wallmounted'");
-	warn_if_field_exists(L, index, "light_propagates",
-			"Obsolete; determined from paramtype");
-	warn_if_field_exists(L, index, "dug_item",
-			"Obsolete; use 'drop' field");
-	warn_if_field_exists(L, index, "extra_dug_item",
-			"Obsolete; use 'drop' field");
-	warn_if_field_exists(L, index, "extra_dug_item_rarity",
-			"Obsolete; use 'drop' field");
-	warn_if_field_exists(L, index, "metadata_name",
-			"Obsolete; use on_add and metadata callbacks");
-
 	// True for all ground-like things like stone and mud, false for eg. trees
 	getboolfield(L, index, "is_ground_content", f.is_ground_content);
 	f.light_propagates = (f.param_type == CPT_LIGHT);
@@ -813,9 +865,32 @@ void push_content_features(lua_State *L, const ContentFeatures &c)
 	std::string drawtype(ScriptApiNode::es_DrawType[(int)c.drawtype].str);
 	std::string liquid_type(ScriptApiNode::es_LiquidType[(int)c.liquid_type].str);
 
-	/* Missing "tiles" because I don't see a usecase (at least not yet). */
+	lua_newtable(L);
+
+	// tiles
+	lua_newtable(L);
+	for (int i = 0; i < 6; i++) {
+		push_tiledef(L, c.tiledef[i]);
+		lua_rawseti(L, -2, i + 1);
+	}
+	lua_setfield(L, -2, "tiles");
+
+	// overlay_tiles
+	lua_newtable(L);
+	for (int i = 0; i < 6; i++) {
+		push_tiledef(L, c.tiledef_overlay[i]);
+		lua_rawseti(L, -2, i + 1);
+	}
+	lua_setfield(L, -2, "overlay_tiles");
 
+	// special_tiles
 	lua_newtable(L);
+	for (int i = 0; i < CF_SPECIAL_COUNT; i++) {
+		push_tiledef(L, c.tiledef_special[i]);
+		lua_rawseti(L, -2, i + 1);
+	}
+	lua_setfield(L, -2, "special_tiles");
+
 	lua_pushboolean(L, c.has_on_construct);
 	lua_setfield(L, -2, "has_on_construct");
 	lua_pushboolean(L, c.has_on_destruct);
@@ -1313,6 +1388,8 @@ void push_tool_capabilities(lua_State *L,
 /******************************************************************************/
 void push_inventory(lua_State *L, Inventory *inventory)
 {
+	if (! inventory)
+		throw SerializationError("Attempt to push nonexistant inventory");
 	std::vector<const InventoryList*> lists = inventory->getLists();
 	std::vector<const InventoryList*>::iterator iter = lists.begin();
 	lua_createtable(L, 0, lists.size());
@@ -1862,14 +1939,7 @@ void push_pointed_thing(lua_State *L, const PointedThing &pointed, bool csm,
 	} else if (pointed.type == POINTEDTHING_OBJECT) {
 		lua_pushstring(L, "object");
 		lua_setfield(L, -2, "type");
-		if (csm) {
-#ifndef SERVER
-			ClientObjectRef::create(L, pointed.object_id);
-#endif
-		} else {
-			push_objectRef(L, pointed.object_id);
-		}
-		
+		push_objectRef(L, pointed.object_id);
 		lua_setfield(L, -2, "ref");
 	} else {
 		lua_pushstring(L, "nothing");
@@ -2129,7 +2199,7 @@ void push_collision_move_result(lua_State *L, const collisionMoveResult &res)
 void push_physics_override(lua_State *L, float speed, float jump, float gravity, bool sneak, bool sneak_glitch, bool new_move)
 {
 	lua_createtable(L, 0, 6);
-	
+
 	lua_pushnumber(L, speed);
 	lua_setfield(L, -2, "speed");
 
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index 10b77a116..dc8f19ef3 100644
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -39,7 +39,9 @@ extern "C" {
 #include "itemgroup.h"
 #include "itemdef.h"
 #include "c_types.h"
-#include "hud.h"
+// We do a explicit path include because by default c_content.h include src/client/hud.h
+// prior to the src/hud.h, which is not good on server only build
+#include "../../hud.h"
 
 namespace Json { class Value; }
 
diff --git a/src/script/common/helper.cpp b/src/script/common/helper.cpp
index 488144790..fbf24e1b7 100644
--- a/src/script/common/helper.cpp
+++ b/src/script/common/helper.cpp
@@ -50,22 +50,26 @@ bool LuaHelper::isNaN(lua_State *L, int idx)
 /*
  * Read template functions
  */
-template <> bool LuaHelper::readParam(lua_State *L, int index)
+template <>
+bool LuaHelper::readParam(lua_State *L, int index)
 {
 	return lua_toboolean(L, index) != 0;
 }
 
-template <> s16 LuaHelper::readParam(lua_State *L, int index)
+template <>
+s16 LuaHelper::readParam(lua_State *L, int index)
 {
 	return lua_tonumber(L, index);
 }
 
-template <> int LuaHelper::readParam(lua_State *L, int index)
+template <>
+int LuaHelper::readParam(lua_State *L, int index)
 {
 	return luaL_checkint(L, index);
 }
 
-template <> float LuaHelper::readParam(lua_State *L, int index)
+template <>
+float LuaHelper::readParam(lua_State *L, int index)
 {
 	if (isNaN(L, index))
 		throw LuaError("NaN value is not allowed.");
@@ -73,7 +77,8 @@ template <> float LuaHelper::readParam(lua_State *L, int index)
 	return (float)luaL_checknumber(L, index);
 }
 
-template <> v2s16 LuaHelper::readParam(lua_State *L, int index)
+template <>
+v2s16 LuaHelper::readParam(lua_State *L, int index)
 {
 	v2s16 p;
 	CHECK_POS_TAB(index);
@@ -88,7 +93,8 @@ template <> v2s16 LuaHelper::readParam(lua_State *L, int index)
 	return p;
 }
 
-template <> v2f LuaHelper::readParam(lua_State *L, int index)
+template <>
+v2f LuaHelper::readParam(lua_State *L, int index)
 {
 	v2f p;
 	CHECK_POS_TAB(index);
@@ -103,7 +109,8 @@ template <> v2f LuaHelper::readParam(lua_State *L, int index)
 	return p;
 }
 
-template <> v3f LuaHelper::readParam(lua_State *L, int index)
+template <>
+v3f LuaHelper::readParam(lua_State *L, int index)
 {
 	v3f p;
 	CHECK_POS_TAB(index);
@@ -122,7 +129,8 @@ template <> v3f LuaHelper::readParam(lua_State *L, int index)
 	return p;
 }
 
-template <> std::string LuaHelper::readParam(lua_State *L, int index)
+template <>
+std::string LuaHelper::readParam(lua_State *L, int index)
 {
 	size_t length;
 	std::string result;
diff --git a/src/script/common/helper.h b/src/script/common/helper.h
index 7a794dc9b..6491e73cf 100644
--- a/src/script/common/helper.h
+++ b/src/script/common/helper.h
@@ -38,7 +38,8 @@ protected:
 	 * @param index Lua Index to read
 	 * @return read value from Lua
 	 */
-	template <typename T> static T readParam(lua_State *L, int index);
+	template <typename T>
+	static T readParam(lua_State *L, int index);
 
 	/**
 	 * Read a value using a template type T from Lua State L and index
diff --git a/src/script/cpp_api/s_async.cpp b/src/script/cpp_api/s_async.cpp
index 5f1f9297e..0619b32c0 100644
--- a/src/script/cpp_api/s_async.cpp
+++ b/src/script/cpp_api/s_async.cpp
@@ -158,35 +158,6 @@ void AsyncEngine::step(lua_State *L)
 }
 
 /******************************************************************************/
-void AsyncEngine::pushFinishedJobs(lua_State* L) {
-	// Result Table
-	MutexAutoLock l(resultQueueMutex);
-
-	unsigned int index = 1;
-	lua_createtable(L, resultQueue.size(), 0);
-	int top = lua_gettop(L);
-
-	while (!resultQueue.empty()) {
-		LuaJobInfo jobDone = resultQueue.front();
-		resultQueue.pop_front();
-
-		lua_createtable(L, 0, 2);  // Pre-allocate space for two map fields
-		int top_lvl2 = lua_gettop(L);
-
-		lua_pushstring(L, "jobid");
-		lua_pushnumber(L, jobDone.id);
-		lua_settable(L, top_lvl2);
-
-		lua_pushstring(L, "retval");
-		lua_pushlstring(L, jobDone.serializedResult.data(),
-			jobDone.serializedResult.size());
-		lua_settable(L, top_lvl2);
-
-		lua_rawseti(L, top, index++);
-	}
-}
-
-/******************************************************************************/
 void AsyncEngine::prepareEnvironment(lua_State* L, int top)
 {
 	for (StateInitializer &stateInitializer : stateInitializers) {
diff --git a/src/script/cpp_api/s_async.h b/src/script/cpp_api/s_async.h
index b1f4bf45f..99a4f891c 100644
--- a/src/script/cpp_api/s_async.h
+++ b/src/script/cpp_api/s_async.h
@@ -98,12 +98,6 @@ public:
 	 */
 	void step(lua_State *L);
 
-	/**
-	 * Push a list of finished jobs onto the stack
-	 * @param L The Lua stack
-	 */
-	void pushFinishedJobs(lua_State *L);
-
 protected:
 	/**
 	 * Get a Job from queue to be processed
diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp
index 1d62d8b65..5711ccbfd 100644
--- a/src/script/cpp_api/s_base.cpp
+++ b/src/script/cpp_api/s_base.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "cpp_api/s_internal.h"
 #include "cpp_api/s_security.h"
 #include "lua_api/l_object.h"
+#include "lua_api/l_clientobject.h"
 #include "common/c_converter.h"
 #include "server/player_sao.h"
 #include "filesys.h"
@@ -354,13 +355,18 @@ void ScriptApiBase::setOriginFromTableRaw(int index, const char *fxn)
  *     since we lose control over the ref and the contained pointer.
  */
 
-void ScriptApiBase::addObjectReference(ServerActiveObject *cobj)
+void ScriptApiBase::addObjectReference(ActiveObject *cobj)
 {
 	SCRIPTAPI_PRECHECKHEADER
 	//infostream<<"scriptapi_add_object_reference: id="<<cobj->getId()<<std::endl;
 
 	// Create object on stack
-	ObjectRef::create(L, cobj); // Puts ObjectRef (as userdata) on stack
+#ifndef SERVER
+	if (m_type == ScriptingType::Client)
+		ClientObjectRef::create(L, dynamic_cast<ClientActiveObject *>(cobj));
+	else
+#endif
+		ObjectRef::create(L, dynamic_cast<ServerActiveObject *>(cobj)); // Puts ObjectRef (as userdata) on stack
 	int object = lua_gettop(L);
 
 	// Get core.object_refs table
@@ -375,7 +381,7 @@ void ScriptApiBase::addObjectReference(ServerActiveObject *cobj)
 	lua_settable(L, objectstable);
 }
 
-void ScriptApiBase::removeObjectReference(ServerActiveObject *cobj)
+void ScriptApiBase::removeObjectReference(ActiveObject *cobj)
 {
 	SCRIPTAPI_PRECHECKHEADER
 	//infostream<<"scriptapi_rm_object_reference: id="<<cobj->getId()<<std::endl;
@@ -390,7 +396,12 @@ void ScriptApiBase::removeObjectReference(ServerActiveObject *cobj)
 	lua_pushnumber(L, cobj->getId()); // Push id
 	lua_gettable(L, objectstable);
 	// Set object reference to NULL
-	ObjectRef::set_null(L);
+#ifndef SERVER
+	if (m_type == ScriptingType::Client)
+		ClientObjectRef::set_null(L);
+	else
+#endif
+		ObjectRef::set_null(L);
 	lua_pop(L, 1); // pop object
 
 	// Set object_refs[id] = nil
@@ -413,7 +424,6 @@ void ScriptApiBase::objectrefGetOrCreate(lua_State *L,
 					<< ", this is probably a bug." << std::endl;
 	}
 }
-
 void ScriptApiBase::pushPlayerHPChangeReason(lua_State *L, const PlayerHPChangeReason &reason)
 {
 	if (reason.hasLuaReference())
diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index 36331ad37..a7a2c7203 100644
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -73,6 +73,7 @@ class Game;
 class IGameDef;
 class Environment;
 class GUIEngine;
+class ActiveObject;
 class ServerActiveObject;
 struct PlayerHPChangeReason;
 
@@ -99,8 +100,8 @@ public:
 		RunCallbacksMode mode, const char *fxn);
 
 	/* object */
-	void addObjectReference(ServerActiveObject *cobj);
-	void removeObjectReference(ServerActiveObject *cobj);
+	void addObjectReference(ActiveObject *cobj);
+	void removeObjectReference(ActiveObject *cobj);
 
 	IGameDef *getGameDef() { return m_gamedef; }
 	Server* getServer();
diff --git a/src/script/cpp_api/s_client.cpp b/src/script/cpp_api/s_client.cpp
index b90decfb5..b0e7a073e 100644
--- a/src/script/cpp_api/s_client.cpp
+++ b/src/script/cpp_api/s_client.cpp
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client/client.h"
 #include "common/c_converter.h"
 #include "common/c_content.h"
+#include "lua_api/l_clientobject.h"
 #include "s_item.h"
 
 void ScriptApiClient::on_mods_loaded()
@@ -176,7 +177,7 @@ bool ScriptApiClient::on_punchnode(v3s16 p, MapNode node)
 
 	const NodeDefManager *ndef = getClient()->ndef();
 
-	// Get core.registered_on_punchgnode
+	// Get core.registered_on_punchnode
 	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "registered_on_punchnode");
 
@@ -260,7 +261,7 @@ bool ScriptApiClient::on_spawn_particle(struct ParticleParameters param)
 	SCRIPTAPI_PRECHECKHEADER
 
 	// Get core.registered_on_play_sound
-	
+
 	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "registered_on_spawn_particle");
 
@@ -285,13 +286,58 @@ bool ScriptApiClient::on_spawn_particle(struct ParticleParameters param)
 		pushnode(L, param.node, getGameDef()->ndef());
 		lua_setfield(L, -2, "node");
 	}
-	setintfield(L, -1, "node_tile", param.node_tile);	
-	
+	setintfield(L, -1, "node_tile", param.node_tile);
+
 	// Call functions
 	runCallbacks(1, RUN_CALLBACKS_MODE_OR);
 	return readParam<bool>(L, -1);
 }
 
+void ScriptApiClient::on_object_properties_change(s16 id)
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	// Get core.registered_on_object_properties_change
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "registered_on_object_properties_change");
+
+	// Push data
+	push_objectRef(L, id);
+
+	// Call functions
+	runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void ScriptApiClient::on_object_hp_change(s16 id)
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	// Get core.registered_on_object_hp_change
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "registered_on_object_hp_change");
+
+	// Push data
+	push_objectRef(L, id);
+
+	// Call functions
+	runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void ScriptApiClient::on_object_add(s16 id)
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	// Get core.registered_on_object_add
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "registered_on_object_add");
+
+	// Push data
+	push_objectRef(L, id);
+
+	// Call functions
+	runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
+}
+
 bool ScriptApiClient::on_inventory_open(Inventory *inventory)
 {
 	SCRIPTAPI_PRECHECKHEADER
@@ -308,24 +354,45 @@ bool ScriptApiClient::on_inventory_open(Inventory *inventory)
 void ScriptApiClient::open_enderchest()
 {
 	SCRIPTAPI_PRECHECKHEADER
-	
+
 	PUSH_ERROR_HANDLER(L);
 	int error_handler = lua_gettop(L) - 1;
 	lua_insert(L, error_handler);
-	
+
 	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "open_enderchest");
 	if (lua_isfunction(L, -1))
 		lua_pcall(L, 0, 0, error_handler);
 }
 
+v3f ScriptApiClient::get_send_speed(v3f speed)
+{
+	SCRIPTAPI_PRECHECKHEADER
+
+	PUSH_ERROR_HANDLER(L);
+	int error_handler = lua_gettop(L) - 1;
+	lua_insert(L, error_handler);
+
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "get_send_speed");
+	if (lua_isfunction(L, -1)) {
+		speed /= BS;
+		push_v3f(L, speed);
+		lua_pcall(L, 1, 1, error_handler);
+		speed = read_v3f(L, -1);
+		speed *= BS;
+	}
+
+	return speed;
+}
+
 void ScriptApiClient::set_node_def(const ContentFeatures &f)
 {
 	SCRIPTAPI_PRECHECKHEADER
-	
+
 	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "registered_nodes");
-	
+
 	push_content_features(L, f);
 	lua_setfield(L, -2, f.name.c_str());
 }
@@ -333,10 +400,10 @@ void ScriptApiClient::set_node_def(const ContentFeatures &f)
 void ScriptApiClient::set_item_def(const ItemDefinition &i)
 {
 	SCRIPTAPI_PRECHECKHEADER
-	
+
 	lua_getglobal(L, "core");
 	lua_getfield(L, -1, "registered_items");
-	
+
 	push_item_definition(L, i);
 	lua_setfield(L, -2, i.name.c_str());
 }
diff --git a/src/script/cpp_api/s_client.h b/src/script/cpp_api/s_client.h
index 9f68a14fc..2f9ce7aa3 100644
--- a/src/script/cpp_api/s_client.h
+++ b/src/script/cpp_api/s_client.h
@@ -63,10 +63,15 @@ public:
 			bool new_move);
 	bool on_play_sound(SimpleSoundSpec spec);
 	bool on_spawn_particle(struct ParticleParameters param);
+	void on_object_properties_change(s16 id);
+	void on_object_hp_change(s16 id);
+	void on_object_add(s16 id);
 
 	bool on_inventory_open(Inventory *inventory);
 	void open_enderchest();
 
+	v3f get_send_speed(v3f speed);
+
 	void set_node_def(const ContentFeatures &f);
 	void set_item_def(const ItemDefinition &i);
 
diff --git a/src/script/cpp_api/s_node.cpp b/src/script/cpp_api/s_node.cpp
index e0f9bcd78..029cb6308 100644
--- a/src/script/cpp_api/s_node.cpp
+++ b/src/script/cpp_api/s_node.cpp
@@ -65,6 +65,7 @@ struct EnumString ScriptApiNode::es_ContentParamType2[] =
 		{CPT2_COLORED_FACEDIR, "colorfacedir"},
 		{CPT2_COLORED_WALLMOUNTED, "colorwallmounted"},
 		{CPT2_GLASSLIKE_LIQUID_LEVEL, "glasslikeliquidlevel"},
+		{CPT2_COLORED_DEGROTATE, "colordegrotate"},
 		{0, NULL},
 	};
 
@@ -93,6 +94,14 @@ struct EnumString ScriptApiNode::es_NodeBoxType[] =
 		{0, NULL},
 	};
 
+struct EnumString ScriptApiNode::es_TextureAlphaMode[] =
+	{
+		{ALPHAMODE_OPAQUE, "opaque"},
+		{ALPHAMODE_CLIP, "clip"},
+		{ALPHAMODE_BLEND, "blend"},
+		{0, NULL},
+	};
+
 bool ScriptApiNode::node_on_punch(v3s16 p, MapNode node,
 		ServerActiveObject *puncher, const PointedThing &pointed)
 {
@@ -133,9 +142,14 @@ bool ScriptApiNode::node_on_dig(v3s16 p, MapNode node,
 	push_v3s16(L, p);
 	pushnode(L, node, ndef);
 	objectrefGetOrCreate(L, digger);
-	PCALL_RES(lua_pcall(L, 3, 0, error_handler));
-	lua_pop(L, 1);  // Pop error handler
-	return true;
+	PCALL_RES(lua_pcall(L, 3, 1, error_handler));
+
+	// nil is treated as true for backwards compat
+	bool result = lua_isnil(L, -1) || lua_toboolean(L, -1);
+
+	lua_pop(L, 2);  // Pop error handler and result
+
+	return result;
 }
 
 void ScriptApiNode::node_on_construct(v3s16 p, MapNode node)
diff --git a/src/script/cpp_api/s_node.h b/src/script/cpp_api/s_node.h
index 81b44f0f0..3f771c838 100644
--- a/src/script/cpp_api/s_node.h
+++ b/src/script/cpp_api/s_node.h
@@ -54,4 +54,5 @@ public:
 	static struct EnumString es_ContentParamType2[];
 	static struct EnumString es_LiquidType[];
 	static struct EnumString es_NodeBoxType[];
+	static struct EnumString es_TextureAlphaMode[];
 };
diff --git a/src/script/cpp_api/s_player.cpp b/src/script/cpp_api/s_player.cpp
index 712120c61..d3e6138dc 100644
--- a/src/script/cpp_api/s_player.cpp
+++ b/src/script/cpp_api/s_player.cpp
@@ -77,6 +77,19 @@ bool ScriptApiPlayer::on_punchplayer(ServerActiveObject *player,
 	return readParam<bool>(L, -1);
 }
 
+void ScriptApiPlayer::on_rightclickplayer(ServerActiveObject *player,
+                ServerActiveObject *clicker)
+{
+	SCRIPTAPI_PRECHECKHEADER
+	// Get core.registered_on_rightclickplayers
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "registered_on_rightclickplayers");
+	// Call callbacks
+	objectrefGetOrCreate(L, player);
+	objectrefGetOrCreate(L, clicker);
+	runCallbacks(2, RUN_CALLBACKS_MODE_FIRST);
+}
+
 s32 ScriptApiPlayer::on_player_hpchange(ServerActiveObject *player,
 	s32 hp_change, const PlayerHPChangeReason &reason)
 {
diff --git a/src/script/cpp_api/s_player.h b/src/script/cpp_api/s_player.h
index a337f975b..c0f141862 100644
--- a/src/script/cpp_api/s_player.h
+++ b/src/script/cpp_api/s_player.h
@@ -47,6 +47,7 @@ public:
 	bool on_punchplayer(ServerActiveObject *player, ServerActiveObject *hitter,
 			float time_from_last_punch, const ToolCapabilities *toolcap,
 			v3f dir, s16 damage);
+	void on_rightclickplayer(ServerActiveObject *player, ServerActiveObject *clicker);
 	s32 on_player_hpchange(ServerActiveObject *player, s32 hp_change,
 			const PlayerHPChangeReason &reason);
 	void on_playerReceiveFields(ServerActiveObject *player,
diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index 37c5b61dc..8fe5d2c5a 100644
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -45,6 +45,21 @@ static inline void copy_safe(lua_State *L, const char *list[], unsigned len, int
 	}
 }
 
+static void shallow_copy_table(lua_State *L, int from=-2, int to=-1)
+{
+	if (from < 0) from = lua_gettop(L) + from + 1;
+	if (to   < 0) to   = lua_gettop(L) + to   + 1;
+	lua_pushnil(L);
+	while (lua_next(L, from) != 0) {
+		assert(lua_type(L, -1) != LUA_TTABLE);
+		// duplicate key and value for lua_rawset
+		lua_pushvalue(L, -2);
+		lua_pushvalue(L, -2);
+		lua_rawset(L, to);
+		lua_pop(L, 1);
+	}
+}
+
 // Pushes the original version of a library function on the stack, from the old version
 static inline void push_original(lua_State *L, const char *lib, const char *func)
 {
@@ -83,7 +98,10 @@ void ScriptApiSecurity::initializeSecurity()
 		"unpack",
 		"_VERSION",
 		"xpcall",
-		// Completely safe libraries
+	};
+	static const char *whitelist_tables[] = {
+		// These libraries are completely safe BUT we need to duplicate their table
+		// to ensure the sandbox can't affect the insecure env
 		"coroutine",
 		"string",
 		"table",
@@ -168,6 +186,17 @@ void ScriptApiSecurity::initializeSecurity()
 	lua_pop(L, 1);
 
 
+	// Copy safe libraries
+	for (const char *libname : whitelist_tables) {
+		lua_getfield(L, old_globals, libname);
+		lua_newtable(L);
+		shallow_copy_table(L);
+
+		lua_setglobal(L, libname);
+		lua_pop(L, 1);
+	}
+
+
 	// Copy safe IO functions
 	lua_getfield(L, old_globals, "io");
 	lua_newtable(L);
@@ -223,6 +252,19 @@ void ScriptApiSecurity::initializeSecurity()
 #endif
 
 	lua_pop(L, 1); // Pop globals_backup
+
+
+	/*
+	 * In addition to copying the tables in whitelist_tables, we also need to
+	 * replace the string metatable. Otherwise old_globals.string would
+	 * be accessible via getmetatable("").__index from inside the sandbox.
+	 */
+	lua_pushliteral(L, "");
+	lua_newtable(L);
+	lua_getglobal(L, "string");
+	lua_setfield(L, -2, "__index");
+	lua_setmetatable(L, -2);
+	lua_pop(L, 1); // Pop empty string
 }
 
 void ScriptApiSecurity::initializeSecurityClient()
diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp
index dac2febae..916983982 100644
--- a/src/script/lua_api/l_client.cpp
+++ b/src/script/lua_api/l_client.cpp
@@ -440,7 +440,7 @@ int ModApiClient::l_place_node(lua_State *L)
 	pointed.node_abovesurface = pos;
 	pointed.node_undersurface = pos;
 	NodeMetadata *meta = map.getNodeMetadata(pos);
-	g_game->nodePlacement(selected_def, selected_item, pos, pos, pointed, meta);
+	g_game->nodePlacement(selected_def, selected_item, pos, pos, pointed, meta, true);
 	return 0;
 }
 
@@ -520,7 +520,7 @@ int ModApiClient::l_get_objects_inside_radius(lua_State *L)
 	int i = 0;
 	lua_createtable(L, objs.size(), 0);
 	for (const auto obj : objs) {
-		ClientObjectRef::create(L, obj.obj);							// TODO: getObjectRefOrCreate
+		push_objectRef(L, obj.obj->getId());
 		lua_rawseti(L, -2, ++i);
 	}
 	return 1;
@@ -621,6 +621,48 @@ int ModApiClient::l_interact(lua_State *L)
 	return 1;
 }
 
+StringMap *table_to_stringmap(lua_State *L, int index)
+{
+	StringMap *m = new StringMap;
+
+	lua_pushvalue(L, index);
+	lua_pushnil(L);
+
+	while (lua_next(L, -2)) {
+		lua_pushvalue(L, -2);
+		std::basic_string<char> key = lua_tostring(L, -1);
+		std::basic_string<char> value = lua_tostring(L, -2);
+		(*m)[key] = value;
+		lua_pop(L, 2);
+	}
+
+	lua_pop(L, 1);
+
+	return m;
+}
+
+// send_inventory_fields(formname, fields)
+// Only works if the inventory form was opened beforehand.
+int ModApiClient::l_send_inventory_fields(lua_State *L)
+{
+	std::string formname = luaL_checkstring(L, 1);
+	StringMap *fields = table_to_stringmap(L, 2);
+
+	getClient(L)->sendInventoryFields(formname, *fields);
+	return 0;
+}
+
+// send_nodemeta_fields(position, formname, fields)
+int ModApiClient::l_send_nodemeta_fields(lua_State *L)
+{
+	v3s16 pos = check_v3s16(L, 1);
+	std::string formname = luaL_checkstring(L, 2);
+	StringMap *m = table_to_stringmap(L, 3);
+
+	getClient(L)->sendNodemetaFields(pos, formname, *m);
+	return 0;
+}
+
 void ModApiClient::Initialize(lua_State *L, int top)
 {
 	API_FCT(get_current_modname);
@@ -657,4 +699,6 @@ void ModApiClient::Initialize(lua_State *L, int top)
 	API_FCT(get_objects_inside_radius);
 	API_FCT(make_screenshot);
 	API_FCT(interact);
+	API_FCT(send_inventory_fields);
+	API_FCT(send_nodemeta_fields);
 }
diff --git a/src/script/lua_api/l_client.h b/src/script/lua_api/l_client.h
index 03a42e022..caf21f78e 100644
--- a/src/script/lua_api/l_client.h
+++ b/src/script/lua_api/l_client.h
@@ -132,6 +132,12 @@ private:
 	// interact(action, pointed_thing)
 	static int l_interact(lua_State *L);
 
+	// send_inventory_fields(formname, fields)
+	static int l_send_inventory_fields(lua_State *L);
+
+	// send_nodemeta_fields(position, formname, fields)
+	static int l_send_nodemeta_fields(lua_State *L);
+
 public:
 	static void Initialize(lua_State *L, int top);
 };
diff --git a/src/script/lua_api/l_clientobject.cpp b/src/script/lua_api/l_clientobject.cpp
index 521aba023..c093e754e 100644
--- a/src/script/lua_api/l_clientobject.cpp
+++ b/src/script/lua_api/l_clientobject.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_clientobject.h"
 #include "l_internal.h"
 #include "common/c_converter.h"
+#include "common/c_content.h"
 #include "client/client.h"
 #include "object_properties.h"
 #include "util/pointedthing.h"
@@ -47,6 +48,8 @@ ClientActiveObject *ClientObjectRef::get_cao(ClientObjectRef *ref)
 GenericCAO *ClientObjectRef::get_generic_cao(ClientObjectRef *ref, lua_State *L)
 {
 	ClientActiveObject *obj = get_cao(ref);
+	if (!obj)
+		return nullptr;
 	ClientEnvironment &env = getClient(L)->getEnv();
 	GenericCAO *gcao = env.getGenericCAO(obj->getId());
 	return gcao;
@@ -56,6 +59,8 @@ int ClientObjectRef::l_get_pos(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	ClientActiveObject *cao = get_cao(ref);
+	if (!cao)
+		return 0;
 	push_v3f(L, cao->getPosition() / BS);
 	return 1;
 }
@@ -64,6 +69,8 @@ int ClientObjectRef::l_get_velocity(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	push_v3f(L, gcao->getVelocity() / BS);
 	return 1;
 }
@@ -72,6 +79,8 @@ int ClientObjectRef::l_get_acceleration(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	push_v3f(L, gcao->getAcceleration() / BS);
 	return 1;
 }
@@ -80,6 +89,8 @@ int ClientObjectRef::l_get_rotation(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	push_v3f(L, gcao->getRotation());
 	return 1;
 }
@@ -88,6 +99,8 @@ int ClientObjectRef::l_is_player(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	lua_pushboolean(L, gcao->isPlayer());
 	return 1;
 }
@@ -96,6 +109,8 @@ int ClientObjectRef::l_is_local_player(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	lua_pushboolean(L, gcao->isLocalPlayer());
 	return 1;
 }
@@ -104,6 +119,8 @@ int ClientObjectRef::l_get_name(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	lua_pushstring(L, gcao->getName().c_str());
 	return 1;
 }
@@ -112,14 +129,23 @@ int ClientObjectRef::l_get_attach(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
-	create(L, gcao->getParent());
+	if (!gcao)
+		return 0;
+	ClientActiveObject *parent = gcao->getParent();
+	if (!parent)
+		return 0;
+	push_objectRef(L, parent->getId());
 	return 1;
 }
 
 int ClientObjectRef::l_get_nametag(lua_State *L)
 {
+	log_deprecated(L, "Deprecated call to get_nametag, use get_properties().nametag "
+			  "instead");
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	ObjectProperties *props = gcao->getProperties();
 	lua_pushstring(L, props->nametag.c_str());
 	return 1;
@@ -127,8 +153,12 @@ int ClientObjectRef::l_get_nametag(lua_State *L)
 
 int ClientObjectRef::l_get_item_textures(lua_State *L)
 {
+	log_deprecated(L, "Deprecated call to get_item_textures, use "
+			  "get_properties().textures instead");
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	ObjectProperties *props = gcao->getProperties();
 	lua_newtable(L);
 
@@ -138,20 +168,49 @@ int ClientObjectRef::l_get_item_textures(lua_State *L)
 	return 1;
 }
 
-int ClientObjectRef::l_get_hp(lua_State *L)
+int ClientObjectRef::l_get_max_hp(lua_State *L)
 {
+	log_deprecated(L, "Deprecated call to get_max_hp, use get_properties().hp_max "
+			  "instead");
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
-	lua_pushnumber(L, gcao->getHp());
+	if (!gcao)
+		return 0;
+	ObjectProperties *props = gcao->getProperties();
+	lua_pushnumber(L, props->hp_max);
 	return 1;
 }
 
-int ClientObjectRef::l_get_max_hp(lua_State *L)
+int ClientObjectRef::l_get_properties(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
-	ObjectProperties *props = gcao->getProperties();
-	lua_pushnumber(L, props->hp_max);
+	if (!gcao)
+		return 0;
+	ObjectProperties *prop = gcao->getProperties();
+	push_object_properties(L, prop);
+	return 1;
+}
+
+int ClientObjectRef::l_set_properties(lua_State *L)
+{
+	ClientObjectRef *ref = checkobject(L, 1);
+	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
+	ObjectProperties prop = *gcao->getProperties();
+	read_object_properties(L, 2, nullptr, &prop, getClient(L)->idef());
+	gcao->setProperties(prop);
+	return 1;
+}
+
+int ClientObjectRef::l_get_hp(lua_State *L)
+{
+	ClientObjectRef *ref = checkobject(L, 1);
+	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
+	lua_pushnumber(L, gcao->getHp());
 	return 1;
 }
 
@@ -159,6 +218,8 @@ int ClientObjectRef::l_punch(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	PointedThing pointed(gcao->getId(), v3f(0, 0, 0), v3s16(0, 0, 0), 0);
 	getClient(L)->interact(INTERACT_START_DIGGING, pointed);
 	return 0;
@@ -168,23 +229,53 @@ int ClientObjectRef::l_rightclick(lua_State *L)
 {
 	ClientObjectRef *ref = checkobject(L, 1);
 	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
 	PointedThing pointed(gcao->getId(), v3f(0, 0, 0), v3s16(0, 0, 0), 0);
 	getClient(L)->interact(INTERACT_PLACE, pointed);
 	return 0;
 }
 
+int ClientObjectRef::l_remove(lua_State *L)
+{
+	ClientObjectRef *ref = checkobject(L, 1);
+	ClientActiveObject *cao = get_cao(ref);
+	if (!cao)
+		return 0;
+	getClient(L)->getEnv().removeActiveObject(cao->getId());
+
+	return 0;
+}
+
+int ClientObjectRef::l_set_nametag_images(lua_State *L)
+{
+	ClientObjectRef *ref = checkobject(L, 1);
+	GenericCAO *gcao = get_generic_cao(ref, L);
+	if (!gcao)
+		return 0;
+	gcao->nametag_images.clear();
+	if (lua_istable(L, 2)) {
+		lua_pushnil(L);
+		while (lua_next(L, 2) != 0) {
+			gcao->nametag_images.push_back(lua_tostring(L, -1));
+			lua_pop(L, 1);
+		}
+	}
+	gcao->updateNametag();
+
+	return 0;
+}
+
 ClientObjectRef::ClientObjectRef(ClientActiveObject *object) : m_object(object)
 {
 }
 
 void ClientObjectRef::create(lua_State *L, ClientActiveObject *object)
 {
-	if (object) {
-		ClientObjectRef *o = new ClientObjectRef(object);
-		*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
-		luaL_getmetatable(L, className);
-		lua_setmetatable(L, -2);
-	}
+	ClientObjectRef *o = new ClientObjectRef(object);
+	*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
+	luaL_getmetatable(L, className);
+	lua_setmetatable(L, -2);
 }
 
 void ClientObjectRef::create(lua_State *L, s16 id)
@@ -192,6 +283,12 @@ void ClientObjectRef::create(lua_State *L, s16 id)
 	create(L, ((ClientEnvironment *)getEnv(L))->getActiveObject(id));
 }
 
+void ClientObjectRef::set_null(lua_State *L)
+{
+	ClientObjectRef *obj = checkobject(L, -1);
+	obj->m_object = nullptr;
+}
+
 int ClientObjectRef::gc_object(lua_State *L)
 {
 	ClientObjectRef *obj = *(ClientObjectRef **)(lua_touserdata(L, 1));
@@ -236,6 +333,9 @@ luaL_Reg ClientObjectRef::methods[] = {luamethod(ClientObjectRef, get_pos),
 		luamethod(ClientObjectRef, get_attach),
 		luamethod(ClientObjectRef, get_nametag),
 		luamethod(ClientObjectRef, get_item_textures),
+		luamethod(ClientObjectRef, get_properties),
+		luamethod(ClientObjectRef, set_properties),
 		luamethod(ClientObjectRef, get_hp),
 		luamethod(ClientObjectRef, get_max_hp), luamethod(ClientObjectRef, punch),
-		luamethod(ClientObjectRef, rightclick), {0, 0}};
+		luamethod(ClientObjectRef, rightclick),
+		luamethod(ClientObjectRef, set_nametag_images), {0, 0}};
diff --git a/src/script/lua_api/l_clientobject.h b/src/script/lua_api/l_clientobject.h
index 1ff22407f..c4c95cb41 100644
--- a/src/script/lua_api/l_clientobject.h
+++ b/src/script/lua_api/l_clientobject.h
@@ -35,6 +35,8 @@ public:
 	static void create(lua_State *L, ClientActiveObject *object);
 	static void create(lua_State *L, s16 id);
 
+	static void set_null(lua_State *L);
+
 	static ClientObjectRef *checkobject(lua_State *L, int narg);
 
 private:
@@ -75,9 +77,15 @@ private:
 	// get_nametag(self)
 	static int l_get_nametag(lua_State *L);
 
-	// get_textures(self)
+	// get_item_textures(self)
 	static int l_get_item_textures(lua_State *L);
 
+	// get_properties(self)
+	static int l_get_properties(lua_State *L);
+
+	// set_properties(self, properties)
+	static int l_set_properties(lua_State *L);
+
 	// get_hp(self)
 	static int l_get_hp(lua_State *L);
 
@@ -89,4 +97,10 @@ private:
 
 	// rightclick(self)
 	static int l_rightclick(lua_State *L);
+
+	// remove(self)
+	static int l_remove(lua_State *L);
+
+	// set_nametag_images(self, images)
+	static int l_set_nametag_images(lua_State *L);
 };
diff --git a/src/script/lua_api/l_http.cpp b/src/script/lua_api/l_http.cpp
index 0bf9cfbad..5ea3b3f99 100644
--- a/src/script/lua_api/l_http.cpp
+++ b/src/script/lua_api/l_http.cpp
@@ -239,8 +239,18 @@ int ModApiHttp::l_get_http_api(lua_State *L)
 void ModApiHttp::Initialize(lua_State *L, int top)
 {
 #if USE_CURL
-	API_FCT(get_http_api);
-	API_FCT(request_http_api);
+
+	bool isMainmenu = false;
+#ifndef SERVER
+	isMainmenu = ModApiBase::getGuiEngine(L) != nullptr;
+#endif
+
+	if (isMainmenu) {
+		API_FCT(get_http_api);
+	} else {
+		API_FCT(request_http_api);
+	}
+
 #endif
 }
 
diff --git a/src/script/lua_api/l_localplayer.cpp b/src/script/lua_api/l_localplayer.cpp
index 3f4147227..4f57ee00f 100644
--- a/src/script/lua_api/l_localplayer.cpp
+++ b/src/script/lua_api/l_localplayer.cpp
@@ -66,10 +66,10 @@ int LuaLocalPlayer::l_get_velocity(lua_State *L)
 int LuaLocalPlayer::l_set_velocity(lua_State *L)
 {
 	LocalPlayer *player = getobject(L, 1);
-	
+
 	v3f pos = checkFloatPos(L, 2);
 	player->setSpeed(pos);
-	
+
 	return 0;
 }
 
@@ -84,12 +84,12 @@ int LuaLocalPlayer::l_set_yaw(lua_State *L)
 	LocalPlayer *player = getobject(L, 1);
 
 	if (lua_isnumber(L, 2)) {
-		int yaw = lua_tonumber(L, 2);
+		double yaw = lua_tonumber(L, 2);
 		player->setYaw(yaw);
 		g_game->cam_view.camera_yaw = yaw;
 		g_game->cam_view_target.camera_yaw = yaw;
 	}
-	
+
 	return 0;
 }
 
@@ -104,12 +104,12 @@ int LuaLocalPlayer::l_set_pitch(lua_State *L)
 	LocalPlayer *player = getobject(L, 1);
 
 	if (lua_isnumber(L, 2)) {
-		int pitch = lua_tonumber(L, 2);
+		double pitch = lua_tonumber(L, 2);
 		player->setPitch(pitch);
 		g_game->cam_view.camera_pitch = pitch;
 		g_game->cam_view_target.camera_pitch = pitch;
 	}
-	
+
 	return 0;
 }
 
@@ -144,7 +144,7 @@ int LuaLocalPlayer::l_set_wield_index(lua_State *L)
 {
 	LocalPlayer *player = getobject(L, 1);
 	u32 index = luaL_checkinteger(L, 2) - 1;
-	
+
 	player->setWieldIndex(index);
 	g_game->processItemSelection(&g_game->runData.new_playeritem);
 	ItemStack selected_item, hand_item;
@@ -226,7 +226,7 @@ int LuaLocalPlayer::l_get_physics_override(lua_State *L)
 	LocalPlayer *player = getobject(L, 1);
 
 	push_physics_override(L, player->physics_override_speed, player->physics_override_jump, player->physics_override_gravity, player->physics_override_sneak, player->physics_override_sneak_glitch, player->physics_override_new_move);
-	
+
 	return 1;
 }
 
@@ -234,7 +234,7 @@ int LuaLocalPlayer::l_get_physics_override(lua_State *L)
 int LuaLocalPlayer::l_set_physics_override(lua_State *L)
 {
 	LocalPlayer *player = getobject(L, 1);
-	
+
 	player->physics_override_speed = getfloatfield_default(
 			L, 2, "speed", player->physics_override_speed);
 	player->physics_override_jump = getfloatfield_default(
@@ -331,7 +331,7 @@ int LuaLocalPlayer::l_get_pos(lua_State *L)
 int LuaLocalPlayer::l_set_pos(lua_State *L)
 {
 	LocalPlayer *player = getobject(L, 1);
-	
+
 	v3f pos = checkFloatPos(L, 2);
 	player->setPosition(pos);
 	getClient(L)->sendPlayerPos();
@@ -476,13 +476,23 @@ int LuaLocalPlayer::l_hud_get(lua_State *L)
 	return 1;
 }
 
+// get_object(self)
 int LuaLocalPlayer::l_get_object(lua_State *L)
 {
 	LocalPlayer *player = getobject(L, 1);
 	ClientEnvironment &env = getClient(L)->getEnv();
 	ClientActiveObject *obj = env.getGenericCAO(player->getCAO()->getId());
 
-	ClientObjectRef::create(L, obj);
+	push_objectRef(L, obj->getId());
+
+	return 1;
+}
+
+// get_hotbar_size(self)
+int LuaLocalPlayer::l_get_hotbar_size(lua_State *L)
+{
+	LocalPlayer *player = getobject(L, 1);
+	lua_pushnumber(L, player->hud_hotbar_itemcount);
 
 	return 1;
 }
@@ -585,6 +595,7 @@ const luaL_Reg LuaLocalPlayer::methods[] = {
 		luamethod(LuaLocalPlayer, hud_change),
 		luamethod(LuaLocalPlayer, hud_get),
 		luamethod(LuaLocalPlayer, get_object),
+		luamethod(LuaLocalPlayer, get_hotbar_size),
 
 		{0, 0}
 };
diff --git a/src/script/lua_api/l_localplayer.h b/src/script/lua_api/l_localplayer.h
index 33e23d178..bb5a294ca 100644
--- a/src/script/lua_api/l_localplayer.h
+++ b/src/script/lua_api/l_localplayer.h
@@ -65,6 +65,9 @@ private:
 	// get_wielded_item(self)
 	static int l_get_wielded_item(lua_State *L);
 
+	// get_hotbar_size(self)
+	static int l_get_hotbar_size(lua_State *L);
+
 	static int l_is_attached(lua_State *L);
 	static int l_is_touching_ground(lua_State *L);
 	static int l_is_in_liquid(lua_State *L);
diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp
index 3ea5eb4ba..d88bf31c1 100644
--- a/src/script/lua_api/l_mainmenu.cpp
+++ b/src/script/lua_api/l_mainmenu.cpp
@@ -34,9 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serverlist.h"
 #include "mapgen/mapgen.h"
 #include "settings.h"
-
-#include <IFileArchive.h>
-#include <IFileSystem.h>
+#include "client/client.h"
 #include "client/renderingengine.h"
 #include "network/networkprotocol.h"
 
@@ -275,207 +273,6 @@ int ModApiMainMenu::l_get_worlds(lua_State *L)
 }
 
 /******************************************************************************/
-int ModApiMainMenu::l_get_favorites(lua_State *L)
-{
-	std::string listtype = "local";
-
-	if (!lua_isnone(L, 1)) {
-		listtype = luaL_checkstring(L, 1);
-	}
-
-	std::vector<ServerListSpec> servers;
-
-	if(listtype == "online") {
-		servers = ServerList::getOnline();
-	} else {
-		servers = ServerList::getLocal();
-	}
-
-	lua_newtable(L);
-	int top = lua_gettop(L);
-	unsigned int index = 1;
-
-	for (const Json::Value &server : servers) {
-
-		lua_pushnumber(L, index);
-
-		lua_newtable(L);
-		int top_lvl2 = lua_gettop(L);
-
-		if (!server["clients"].asString().empty()) {
-			std::string clients_raw = server["clients"].asString();
-			char* endptr = 0;
-			int numbervalue = strtol(clients_raw.c_str(), &endptr,10);
-
-			if ((!clients_raw.empty()) && (*endptr == 0)) {
-				lua_pushstring(L, "clients");
-				lua_pushnumber(L, numbervalue);
-				lua_settable(L, top_lvl2);
-			}
-		}
-
-		if (!server["clients_max"].asString().empty()) {
-
-			std::string clients_max_raw = server["clients_max"].asString();
-			char* endptr = 0;
-			int numbervalue = strtol(clients_max_raw.c_str(), &endptr,10);
-
-			if ((!clients_max_raw.empty()) && (*endptr == 0)) {
-				lua_pushstring(L, "clients_max");
-				lua_pushnumber(L, numbervalue);
-				lua_settable(L, top_lvl2);
-			}
-		}
-
-		if (!server["version"].asString().empty()) {
-			lua_pushstring(L, "version");
-			std::string topush = server["version"].asString();
-			lua_pushstring(L, topush.c_str());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (!server["proto_min"].asString().empty()) {
-			lua_pushstring(L, "proto_min");
-			lua_pushinteger(L, server["proto_min"].asInt());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (!server["proto_max"].asString().empty()) {
-			lua_pushstring(L, "proto_max");
-			lua_pushinteger(L, server["proto_max"].asInt());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (!server["password"].asString().empty()) {
-			lua_pushstring(L, "password");
-			lua_pushboolean(L, server["password"].asBool());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (!server["creative"].asString().empty()) {
-			lua_pushstring(L, "creative");
-			lua_pushboolean(L, server["creative"].asBool());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (!server["damage"].asString().empty()) {
-			lua_pushstring(L, "damage");
-			lua_pushboolean(L, server["damage"].asBool());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (!server["pvp"].asString().empty()) {
-			lua_pushstring(L, "pvp");
-			lua_pushboolean(L, server["pvp"].asBool());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (!server["description"].asString().empty()) {
-			lua_pushstring(L, "description");
-			std::string topush = server["description"].asString();
-			lua_pushstring(L, topush.c_str());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (!server["name"].asString().empty()) {
-			lua_pushstring(L, "name");
-			std::string topush = server["name"].asString();
-			lua_pushstring(L, topush.c_str());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (!server["address"].asString().empty()) {
-			lua_pushstring(L, "address");
-			std::string topush = server["address"].asString();
-			lua_pushstring(L, topush.c_str());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (!server["port"].asString().empty()) {
-			lua_pushstring(L, "port");
-			std::string topush = server["port"].asString();
-			lua_pushstring(L, topush.c_str());
-			lua_settable(L, top_lvl2);
-		}
-
-		if (server.isMember("ping")) {
-			float ping = server["ping"].asFloat();
-			lua_pushstring(L, "ping");
-			lua_pushnumber(L, ping);
-			lua_settable(L, top_lvl2);
-		}
-
-		if (server["clients_list"].isArray()) {
-			unsigned int index_lvl2 = 1;
-			lua_pushstring(L, "clients_list");
-			lua_newtable(L);
-			int top_lvl3 = lua_gettop(L);
-			for (const Json::Value &client : server["clients_list"]) {
-				lua_pushnumber(L, index_lvl2);
-				std::string topush = client.asString();
-				lua_pushstring(L, topush.c_str());
-				lua_settable(L, top_lvl3);
-				index_lvl2++;
-			}
-			lua_settable(L, top_lvl2);
-		}
-
-		if (server["mods"].isArray()) {
-			unsigned int index_lvl2 = 1;
-			lua_pushstring(L, "mods");
-			lua_newtable(L);
-			int top_lvl3 = lua_gettop(L);
-			for (const Json::Value &mod : server["mods"]) {
-
-				lua_pushnumber(L, index_lvl2);
-				std::string topush = mod.asString();
-				lua_pushstring(L, topush.c_str());
-				lua_settable(L, top_lvl3);
-				index_lvl2++;
-			}
-			lua_settable(L, top_lvl2);
-		}
-
-		lua_settable(L, top);
-		index++;
-	}
-	return 1;
-}
-
-/******************************************************************************/
-int ModApiMainMenu::l_delete_favorite(lua_State *L)
-{
-	std::vector<ServerListSpec> servers;
-
-	std::string listtype = "local";
-
-	if (!lua_isnone(L,2)) {
-		listtype = luaL_checkstring(L,2);
-	}
-
-	if ((listtype != "local") &&
-		(listtype != "online"))
-		return 0;
-
-
-	if(listtype == "online") {
-		servers = ServerList::getOnline();
-	} else {
-		servers = ServerList::getLocal();
-	}
-
-	int fav_idx	= luaL_checkinteger(L,1) -1;
-
-	if ((fav_idx >= 0) &&
-			(fav_idx < (int) servers.size())) {
-
-		ServerList::deleteEntry(servers[fav_idx]);
-	}
-
-	return 0;
-}
-
-/******************************************************************************/
 int ModApiMainMenu::l_get_games(lua_State *L)
 {
 	std::vector<SubgameSpec> games = getAvailableGames();
@@ -600,7 +397,8 @@ int ModApiMainMenu::l_show_keys_menu(lua_State *L)
 	GUIEngine* engine = getGuiEngine(L);
 	sanity_check(engine != NULL);
 
-	GUIKeyChangeMenu *kmenu = new GUIKeyChangeMenu(RenderingEngine::get_gui_env(),
+	GUIKeyChangeMenu *kmenu = new GUIKeyChangeMenu(
+			engine->m_rendering_engine->get_gui_env(),
 			engine->m_parent,
 			-1,
 			engine->m_menumanager,
@@ -730,6 +528,7 @@ int ModApiMainMenu::l_get_texturepath(lua_State *L)
 	return 1;
 }
 
+/******************************************************************************/
 int ModApiMainMenu::l_get_texturepath_share(lua_State *L)
 {
 	std::string gamepath = fs::RemoveRelativePathComponents(
@@ -738,6 +537,7 @@ int ModApiMainMenu::l_get_texturepath_share(lua_State *L)
 	return 1;
 }
 
+/******************************************************************************/
 int ModApiMainMenu::l_get_cache_path(lua_State *L)
 {
 	lua_pushstring(L, fs::RemoveRelativePathComponents(porting::path_cache).c_str());
@@ -745,6 +545,13 @@ int ModApiMainMenu::l_get_cache_path(lua_State *L)
 }
 
 /******************************************************************************/
+int ModApiMainMenu::l_get_temp_path(lua_State *L)
+{
+	lua_pushstring(L, fs::TempPath().c_str());
+	return 1;
+}
+
+/******************************************************************************/
 int ModApiMainMenu::l_create_dir(lua_State *L) {
 	const char *path = luaL_checkstring(L, 1);
 
@@ -821,75 +628,9 @@ int ModApiMainMenu::l_extract_zip(lua_State *L)
 	std::string absolute_destination = fs::RemoveRelativePathComponents(destination);
 
 	if (ModApiMainMenu::mayModifyPath(absolute_destination)) {
+		auto rendering_engine = getGuiEngine(L)->m_rendering_engine;
 		fs::CreateAllDirs(absolute_destination);
-
-		io::IFileSystem *fs = RenderingEngine::get_filesystem();
-
-		if (!fs->addFileArchive(zipfile, false, false, io::EFAT_ZIP)) {
-			lua_pushboolean(L,false);
-			return 1;
-		}
-
-		sanity_check(fs->getFileArchiveCount() > 0);
-
-		/**********************************************************************/
-		/* WARNING this is not threadsafe!!                                   */
-		/**********************************************************************/
-		io::IFileArchive* opened_zip =
-			fs->getFileArchive(fs->getFileArchiveCount()-1);
-
-		const io::IFileList* files_in_zip = opened_zip->getFileList();
-
-		unsigned int number_of_files = files_in_zip->getFileCount();
-
-		for (unsigned int i=0; i < number_of_files; i++) {
-			std::string fullpath = destination;
-			fullpath += DIR_DELIM;
-			fullpath += files_in_zip->getFullFileName(i).c_str();
-			std::string fullpath_dir = fs::RemoveLastPathComponent(fullpath);
-
-			if (!files_in_zip->isDirectory(i)) {
-				if (!fs::PathExists(fullpath_dir) && !fs::CreateAllDirs(fullpath_dir)) {
-					fs->removeFileArchive(fs->getFileArchiveCount()-1);
-					lua_pushboolean(L,false);
-					return 1;
-				}
-
-				io::IReadFile* toread = opened_zip->createAndOpenFile(i);
-
-				FILE *targetfile = fopen(fullpath.c_str(),"wb");
-
-				if (targetfile == NULL) {
-					fs->removeFileArchive(fs->getFileArchiveCount()-1);
-					lua_pushboolean(L,false);
-					return 1;
-				}
-
-				char read_buffer[1024];
-				long total_read = 0;
-
-				while (total_read < toread->getSize()) {
-
-					unsigned int bytes_read =
-							toread->read(read_buffer,sizeof(read_buffer));
-					if ((bytes_read == 0 ) ||
-						(fwrite(read_buffer, 1, bytes_read, targetfile) != bytes_read))
-					{
-						fclose(targetfile);
-						fs->removeFileArchive(fs->getFileArchiveCount()-1);
-						lua_pushboolean(L,false);
-						return 1;
-					}
-					total_read += bytes_read;
-				}
-
-				fclose(targetfile);
-			}
-
-		}
-
-		fs->removeFileArchive(fs->getFileArchiveCount()-1);
-		lua_pushboolean(L,true);
+		lua_pushboolean(L, fs::extractZipFile(rendering_engine->get_filesystem(), zipfile, destination));
 		return 1;
 	}
 
@@ -908,24 +649,28 @@ int ModApiMainMenu::l_get_mainmenu_path(lua_State *L)
 }
 
 /******************************************************************************/
-bool ModApiMainMenu::mayModifyPath(const std::string &path)
+bool ModApiMainMenu::mayModifyPath(std::string path)
 {
+	path = fs::RemoveRelativePathComponents(path);
+
 	if (fs::PathStartsWith(path, fs::TempPath()))
 		return true;
 
-	if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "games")))
-		return true;
+	std::string path_user = fs::RemoveRelativePathComponents(porting::path_user);
 
-	if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "mods")))
+	if (fs::PathStartsWith(path, path_user + DIR_DELIM "client"))
 		return true;
-
-	if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "clientmods")))
+	if (fs::PathStartsWith(path, path_user + DIR_DELIM "clientmods"))
 		return true;
-
-	if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "textures")))
+	if (fs::PathStartsWith(path, path_user + DIR_DELIM "textures"))
 		return true;
-
-	if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM "worlds")))
+	if (fs::PathStartsWith(path, path_user + DIR_DELIM "games"))
+		return true;
+	if (fs::PathStartsWith(path, path_user + DIR_DELIM "mods"))
+		return true;
+	if (fs::PathStartsWith(path, path_user + DIR_DELIM "textures"))
+		return true;
+	if (fs::PathStartsWith(path, path_user + DIR_DELIM "worlds"))
 		return true;
 
 	if (fs::PathStartsWith(path, fs::RemoveRelativePathComponents(porting::path_cache)))
@@ -955,7 +700,7 @@ int ModApiMainMenu::l_show_path_select_dialog(lua_State *L)
 	bool is_file_select = readParam<bool>(L, 3);
 
 	GUIFileSelectMenu* fileOpenMenu =
-		new GUIFileSelectMenu(RenderingEngine::get_gui_env(),
+		new GUIFileSelectMenu(engine->m_rendering_engine->get_gui_env(),
 				engine->m_parent,
 				-1,
 				engine->m_menumanager,
@@ -1051,15 +796,7 @@ int ModApiMainMenu::l_get_screen_info(lua_State *L)
 	lua_pushnumber(L,RenderingEngine::getDisplayDensity());
 	lua_settable(L, top);
 
-	lua_pushstring(L,"display_width");
-	lua_pushnumber(L,RenderingEngine::getDisplaySize().X);
-	lua_settable(L, top);
-
-	lua_pushstring(L,"display_height");
-	lua_pushnumber(L,RenderingEngine::getDisplaySize().Y);
-	lua_settable(L, top);
-
-	const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
+	const v2u32 &window_size = RenderingEngine::getWindowSize();
 	lua_pushstring(L,"window_width");
 	lua_pushnumber(L, window_size.X);
 	lua_settable(L, top);
@@ -1067,6 +804,10 @@ int ModApiMainMenu::l_get_screen_info(lua_State *L)
 	lua_pushstring(L,"window_height");
 	lua_pushnumber(L, window_size.Y);
 	lua_settable(L, top);
+
+	lua_pushstring(L, "render_info");
+	lua_pushstring(L, wide_to_utf8(RenderingEngine::get_video_driver()->getName()).c_str());
+	lua_settable(L, top);
 	return 1;
 }
 
@@ -1133,11 +874,9 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
 	API_FCT(get_content_info);
 	API_FCT(start);
 	API_FCT(close);
-	API_FCT(get_favorites);
 	API_FCT(show_keys_menu);
 	API_FCT(create_world);
 	API_FCT(delete_world);
-	API_FCT(delete_favorite);
 	API_FCT(set_background);
 	API_FCT(set_topleft_text);
 	API_FCT(get_mapgen_names);
@@ -1148,6 +887,7 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
 	API_FCT(get_texturepath);
 	API_FCT(get_texturepath_share);
 	API_FCT(get_cache_path);
+	API_FCT(get_temp_path);
 	API_FCT(create_dir);
 	API_FCT(delete_dir);
 	API_FCT(copy_dir);
@@ -1173,7 +913,6 @@ void ModApiMainMenu::InitializeAsync(lua_State *L, int top)
 {
 	API_FCT(get_worlds);
 	API_FCT(get_games);
-	API_FCT(get_favorites);
 	API_FCT(get_mapgen_names);
 	API_FCT(get_user_path);
 	API_FCT(get_modpath);
@@ -1182,6 +921,7 @@ void ModApiMainMenu::InitializeAsync(lua_State *L, int top)
 	API_FCT(get_texturepath);
 	API_FCT(get_texturepath_share);
 	API_FCT(get_cache_path);
+	API_FCT(get_temp_path);
 	API_FCT(create_dir);
 	API_FCT(delete_dir);
 	API_FCT(copy_dir);
@@ -1189,5 +929,7 @@ void ModApiMainMenu::InitializeAsync(lua_State *L, int top)
 	//API_FCT(extract_zip); //TODO remove dependency to GuiEngine
 	API_FCT(may_modify_path);
 	API_FCT(download_file);
+	API_FCT(get_min_supp_proto);
+	API_FCT(get_max_supp_proto);
 	//API_FCT(gettext); (gettext lib isn't threadsafe)
 }
diff --git a/src/script/lua_api/l_mainmenu.h b/src/script/lua_api/l_mainmenu.h
index 0b02ed892..33ac9e721 100644
--- a/src/script/lua_api/l_mainmenu.h
+++ b/src/script/lua_api/l_mainmenu.h
@@ -58,7 +58,7 @@ private:
 	 * @param path path to check
 	 * @return true if the path may be modified
 	 */
-	static bool mayModifyPath(const std::string &path);
+	static bool mayModifyPath(std::string path);
 
 	//api calls
 
@@ -74,10 +74,6 @@ private:
 
 	static int l_get_mapgen_names(lua_State *L);
 
-	static int l_get_favorites(lua_State *L);
-
-	static int l_delete_favorite(lua_State *L);
-
 	static int l_gettext(lua_State *L);
 
 	//packages
@@ -126,6 +122,8 @@ private:
 
 	static int l_get_cache_path(lua_State *L);
 
+	static int l_get_temp_path(lua_State *L);
+
 	static int l_create_dir(lua_State *L);
 
 	static int l_delete_dir(lua_State *L);
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index 834938e56..eb3d49a5e 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -482,9 +482,7 @@ int ModApiMapgen::l_get_biome_id(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	const char *biome_str = lua_tostring(L, 1);
-	if (!biome_str)
-		return 0;
+	const char *biome_str = luaL_checkstring(L, 1);
 
 	const BiomeManager *bmgr = getServer(L)->getEmergeManager()->getBiomeManager();
 	if (!bmgr)
@@ -527,30 +525,12 @@ int ModApiMapgen::l_get_heat(lua_State *L)
 
 	v3s16 pos = read_v3s16(L, 1);
 
-	NoiseParams np_heat;
-	NoiseParams np_heat_blend;
-
-	MapSettingsManager *settingsmgr =
-		getServer(L)->getEmergeManager()->map_settings_mgr;
-
-	if (!settingsmgr->getMapSettingNoiseParams("mg_biome_np_heat",
-			&np_heat) ||
-			!settingsmgr->getMapSettingNoiseParams("mg_biome_np_heat_blend",
-			&np_heat_blend))
-		return 0;
-
-	std::string value;
-	if (!settingsmgr->getMapSetting("seed", &value))
-		return 0;
-	std::istringstream ss(value);
-	u64 seed;
-	ss >> seed;
+	const BiomeGen *biomegen = getServer(L)->getEmergeManager()->getBiomeGen();
 
-	const BiomeManager *bmgr = getServer(L)->getEmergeManager()->getBiomeManager();
-	if (!bmgr)
+	if (!biomegen || biomegen->getType() != BIOMEGEN_ORIGINAL)
 		return 0;
 
-	float heat = bmgr->getHeatAtPosOriginal(pos, np_heat, np_heat_blend, seed);
+	float heat = ((BiomeGenOriginal*) biomegen)->calcHeatAtPoint(pos);
 
 	lua_pushnumber(L, heat);
 
@@ -566,31 +546,12 @@ int ModApiMapgen::l_get_humidity(lua_State *L)
 
 	v3s16 pos = read_v3s16(L, 1);
 
-	NoiseParams np_humidity;
-	NoiseParams np_humidity_blend;
+	const BiomeGen *biomegen = getServer(L)->getEmergeManager()->getBiomeGen();
 
-	MapSettingsManager *settingsmgr =
-		getServer(L)->getEmergeManager()->map_settings_mgr;
-
-	if (!settingsmgr->getMapSettingNoiseParams("mg_biome_np_humidity",
-			&np_humidity) ||
-			!settingsmgr->getMapSettingNoiseParams("mg_biome_np_humidity_blend",
-			&np_humidity_blend))
-		return 0;
-
-	std::string value;
-	if (!settingsmgr->getMapSetting("seed", &value))
-		return 0;
-	std::istringstream ss(value);
-	u64 seed;
-	ss >> seed;
-
-	const BiomeManager *bmgr = getServer(L)->getEmergeManager()->getBiomeManager();
-	if (!bmgr)
+	if (!biomegen || biomegen->getType() != BIOMEGEN_ORIGINAL)
 		return 0;
 
-	float humidity = bmgr->getHumidityAtPosOriginal(pos, np_humidity,
-		np_humidity_blend, seed);
+	float humidity = ((BiomeGenOriginal*) biomegen)->calcHumidityAtPoint(pos);
 
 	lua_pushnumber(L, humidity);
 
@@ -606,45 +567,11 @@ int ModApiMapgen::l_get_biome_data(lua_State *L)
 
 	v3s16 pos = read_v3s16(L, 1);
 
-	NoiseParams np_heat;
-	NoiseParams np_heat_blend;
-	NoiseParams np_humidity;
-	NoiseParams np_humidity_blend;
-
-	MapSettingsManager *settingsmgr =
-		getServer(L)->getEmergeManager()->map_settings_mgr;
-
-	if (!settingsmgr->getMapSettingNoiseParams("mg_biome_np_heat",
-			&np_heat) ||
-			!settingsmgr->getMapSettingNoiseParams("mg_biome_np_heat_blend",
-			&np_heat_blend) ||
-			!settingsmgr->getMapSettingNoiseParams("mg_biome_np_humidity",
-			&np_humidity) ||
-			!settingsmgr->getMapSettingNoiseParams("mg_biome_np_humidity_blend",
-			&np_humidity_blend))
-		return 0;
-
-	std::string value;
-	if (!settingsmgr->getMapSetting("seed", &value))
-		return 0;
-	std::istringstream ss(value);
-	u64 seed;
-	ss >> seed;
-
-	const BiomeManager *bmgr = getServer(L)->getEmergeManager()->getBiomeManager();
-	if (!bmgr)
+	const BiomeGen *biomegen = getServer(L)->getEmergeManager()->getBiomeGen();
+	if (!biomegen)
 		return 0;
 
-	float heat = bmgr->getHeatAtPosOriginal(pos, np_heat, np_heat_blend, seed);
-	if (!heat)
-		return 0;
-
-	float humidity = bmgr->getHumidityAtPosOriginal(pos, np_humidity,
-		np_humidity_blend, seed);
-	if (!humidity)
-		return 0;
-
-	const Biome *biome = bmgr->getBiomeFromNoiseOriginal(heat, humidity, pos);
+	const Biome *biome = biomegen->calcBiomeAtPoint(pos);
 	if (!biome || biome->index == OBJDEF_INVALID_INDEX)
 		return 0;
 
@@ -653,11 +580,16 @@ int ModApiMapgen::l_get_biome_data(lua_State *L)
 	lua_pushinteger(L, biome->index);
 	lua_setfield(L, -2, "biome");
 
-	lua_pushnumber(L, heat);
-	lua_setfield(L, -2, "heat");
+	if (biomegen->getType() == BIOMEGEN_ORIGINAL) {
+		float heat = ((BiomeGenOriginal*) biomegen)->calcHeatAtPoint(pos);
+		float humidity = ((BiomeGenOriginal*) biomegen)->calcHumidityAtPoint(pos);
 
-	lua_pushnumber(L, humidity);
-	lua_setfield(L, -2, "humidity");
+		lua_pushnumber(L, heat);
+		lua_setfield(L, -2, "heat");
+
+		lua_pushnumber(L, humidity);
+		lua_setfield(L, -2, "humidity");
+	}
 
 	return 1;
 }
@@ -873,9 +805,6 @@ int ModApiMapgen::l_set_mapgen_params(lua_State *L)
 	if (lua_isnumber(L, -1))
 		settingsmgr->setMapSetting("chunksize", readParam<std::string>(L, -1), true);
 
-	warn_if_field_exists(L, 1, "flagmask",
-		"Obsolete: flags field now includes unset flags.");
-
 	lua_getfield(L, 1, "flags");
 	if (lua_isstring(L, -1))
 		settingsmgr->setMapSetting("mg_flags", readParam<std::string>(L, -1), true);
@@ -985,7 +914,7 @@ int ModApiMapgen::l_set_noiseparams(lua_State *L)
 
 	bool set_default = !lua_isboolean(L, 3) || readParam<bool>(L, 3);
 
-	g_settings->setNoiseParams(name, np, set_default);
+	Settings::getLayer(set_default ? SL_DEFAULTS : SL_GLOBAL)->setNoiseParams(name, np);
 
 	return 0;
 }
@@ -1338,11 +1267,9 @@ int ModApiMapgen::l_register_ore(lua_State *L)
 	lua_getfield(L, index, "noise_params");
 	if (read_noiseparams(L, -1, &ore->np)) {
 		ore->flags |= OREFLAG_USE_NOISE;
-	} else if (ore->NEEDS_NOISE) {
-		errorstream << "register_ore: specified ore type requires valid "
-			"'noise_params' parameter" << std::endl;
-		delete ore;
-		return 0;
+	} else if (ore->needs_noise) {
+		log_deprecated(L,
+			"register_ore: ore type requires 'noise_params' but it is not specified, falling back to defaults");
 	}
 	lua_pop(L, 1);
 
@@ -1498,9 +1425,12 @@ int ModApiMapgen::l_generate_ores(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 
 	EmergeManager *emerge = getServer(L)->getEmergeManager();
+	if (!emerge || !emerge->mgparams)
+		return 0;
 
 	Mapgen mg;
-	mg.seed = emerge->mgparams->seed;
+	// Intentionally truncates to s32, see Mapgen::Mapgen()
+	mg.seed = (s32)emerge->mgparams->seed;
 	mg.vm   = LuaVoxelManip::checkobject(L, 1)->vm;
 	mg.ndef = getServer(L)->getNodeDefManager();
 
@@ -1524,9 +1454,12 @@ int ModApiMapgen::l_generate_decorations(lua_State *L)
 	NO_MAP_LOCK_REQUIRED;
 
 	EmergeManager *emerge = getServer(L)->getEmergeManager();
+	if (!emerge || !emerge->mgparams)
+		return 0;
 
 	Mapgen mg;
-	mg.seed = emerge->mgparams->seed;
+	// Intentionally truncates to s32, see Mapgen::Mapgen()
+	mg.seed = (s32)emerge->mgparams->seed;
 	mg.vm   = LuaVoxelManip::checkobject(L, 1)->vm;
 	mg.ndef = getServer(L)->getNodeDefManager();
 
@@ -1739,11 +1672,10 @@ int ModApiMapgen::l_serialize_schematic(lua_State *L)
 	std::ostringstream os(std::ios_base::binary);
 	switch (schem_format) {
 	case SCHEM_FMT_MTS:
-		schem->serializeToMts(&os, schem->m_nodenames);
+		schem->serializeToMts(&os);
 		break;
 	case SCHEM_FMT_LUA:
-		schem->serializeToLua(&os, schem->m_nodenames,
-			use_comments, indent_spaces);
+		schem->serializeToLua(&os, use_comments, indent_spaces);
 		break;
 	default:
 		return 0;
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index f52e4892e..8ae99b929 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -355,6 +355,15 @@ int ObjectRef::l_set_armor_groups(lua_State *L)
 	ItemGroupList groups;
 
 	read_groups(L, 2, groups);
+	if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+		if (!g_settings->getBool("enable_damage") && !itemgroup_get(groups, "immortal")) {
+			warningstream << "Mod tried to enable damage for a player, but it's "
+				"disabled globally. Ignoring." << std::endl;
+			infostream << script_get_backtrace(L) << std::endl;
+			groups["immortal"] = 1;
+		}
+	}
+
 	sao->setArmorGroups(groups);
 	return 0;
 }
@@ -399,7 +408,7 @@ int ObjectRef::l_get_animation(lua_State *L)
 	if (sao == nullptr)
 		return 0;
 
-	v2f frames = v2f(1,1);
+	v2f frames = v2f(1, 1);
 	float frame_speed = 15;
 	float frame_blend = 0;
 	bool frame_loop = true;
@@ -463,8 +472,8 @@ int ObjectRef::l_set_eye_offset(lua_State *L)
 	if (player == nullptr)
 		return 0;
 
-	v3f offset_first = read_v3f(L, 2);
-	v3f offset_third = read_v3f(L, 3);
+	v3f offset_first = readParam<v3f>(L, 2, v3f(0, 0, 0));
+	v3f offset_third = readParam<v3f>(L, 3, v3f(0, 0, 0));
 
 	// Prevent abuse of offset values (keep player always visible)
 	offset_third.X = rangelim(offset_third.X,-10,10);
@@ -537,9 +546,9 @@ int ObjectRef::l_set_bone_position(lua_State *L)
 	if (sao == nullptr)
 		return 0;
 
-	std::string bone = readParam<std::string>(L, 2);
-	v3f position = check_v3f(L, 3);
-	v3f rotation = check_v3f(L, 4);
+	std::string bone = readParam<std::string>(L, 2, "");
+	v3f position = readParam<v3f>(L, 3, v3f(0, 0, 0));
+	v3f rotation = readParam<v3f>(L, 4, v3f(0, 0, 0));
 
 	sao->setBonePosition(bone, position, rotation);
 	return 0;
@@ -554,7 +563,7 @@ int ObjectRef::l_get_bone_position(lua_State *L)
 	if (sao == nullptr)
 		return 0;
 
-	std::string bone = readParam<std::string>(L, 2);
+	std::string bone = readParam<std::string>(L, 2, "");
 
 	v3f position = v3f(0, 0, 0);
 	v3f rotation = v3f(0, 0, 0);
@@ -578,10 +587,10 @@ int ObjectRef::l_set_attach(lua_State *L)
 	if (sao == parent)
 		throw LuaError("ObjectRef::set_attach: attaching object to itself is not allowed.");
 
-	int parent_id = 0;
+	int parent_id;
 	std::string bone;
-	v3f position = v3f(0, 0, 0);
-	v3f rotation = v3f(0, 0, 0);
+	v3f position;
+	v3f rotation;
 	bool force_visible;
 
 	sao->getAttachment(&parent_id, &bone, &position, &rotation, &force_visible);
@@ -590,9 +599,9 @@ int ObjectRef::l_set_attach(lua_State *L)
 		old_parent->removeAttachmentChild(sao->getId());
 	}
 
-	bone      = readParam<std::string>(L, 3, "");
-	position  = read_v3f(L, 4);
-	rotation  = read_v3f(L, 5);
+	bone          = readParam<std::string>(L, 3, "");
+	position      = readParam<v3f>(L, 4, v3f(0, 0, 0));
+	rotation      = readParam<v3f>(L, 5, v3f(0, 0, 0));
 	force_visible = readParam<bool>(L, 6, false);
 
 	sao->setAttachment(parent->getId(), bone, position, rotation, force_visible);
@@ -609,10 +618,10 @@ int ObjectRef::l_get_attach(lua_State *L)
 	if (sao == nullptr)
 		return 0;
 
-	int parent_id = 0;
+	int parent_id;
 	std::string bone;
-	v3f position = v3f(0, 0, 0);
-	v3f rotation = v3f(0, 0, 0);
+	v3f position;
+	v3f rotation;
 	bool force_visible;
 
 	sao->getAttachment(&parent_id, &bone, &position, &rotation, &force_visible);
@@ -728,6 +737,18 @@ int ObjectRef::l_set_nametag_attributes(lua_State *L)
 	}
 	lua_pop(L, 1);
 
+	lua_getfield(L, -1, "bgcolor");
+	if (!lua_isnil(L, -1)) {
+		if (lua_toboolean(L, -1)) {
+			video::SColor color;
+			if (read_color(L, -1, &color))
+				prop->nametag_bgcolor = color;
+		} else {
+			prop->nametag_bgcolor = nullopt;
+		}
+	}
+	lua_pop(L, 1);
+
 	std::string nametag = getstringfield_default(L, 2, "text", "");
 	prop->nametag = nametag;
 
@@ -749,13 +770,24 @@ int ObjectRef::l_get_nametag_attributes(lua_State *L)
 	if (!prop)
 		return 0;
 
-	video::SColor color = prop->nametag_color;
-
 	lua_newtable(L);
-	push_ARGB8(L, color);
+
+	push_ARGB8(L, prop->nametag_color);
 	lua_setfield(L, -2, "color");
+
+	if (prop->nametag_bgcolor) {
+		push_ARGB8(L, prop->nametag_bgcolor.value());
+		lua_setfield(L, -2, "bgcolor");
+	} else {
+		lua_pushboolean(L, false);
+		lua_setfield(L, -2, "bgcolor");
+	}
+
 	lua_pushstring(L, prop->nametag.c_str());
 	lua_setfield(L, -2, "text");
+
+
+
 	return 1;
 }
 
@@ -892,9 +924,6 @@ int ObjectRef::l_set_yaw(lua_State *L)
 	if (entitysao == nullptr)
 		return 0;
 
-	if (isNaN(L, 2))
-		throw LuaError("ObjectRef::set_yaw: NaN value is not allowed.");
-
 	float yaw = readParam<float>(L, 2) * core::RADTODEG;
 
 	entitysao->setRotation(v3f(0, yaw, 0));
@@ -2199,7 +2228,7 @@ int ObjectRef::l_set_minimap_modes(lua_State *L)
 
 	luaL_checktype(L, 2, LUA_TTABLE);
 	std::vector<MinimapMode> modes;
-	s16 selected_mode = luaL_checkint(L, 3);
+	s16 selected_mode = readParam<s16>(L, 3);
 
 	lua_pushnil(L);
 	while (lua_next(L, 2) != 0) {
diff --git a/src/script/lua_api/l_server.cpp b/src/script/lua_api/l_server.cpp
index 64ae924d2..026f5282c 100644
--- a/src/script/lua_api/l_server.cpp
+++ b/src/script/lua_api/l_server.cpp
@@ -44,7 +44,7 @@ int ModApiServer::l_request_shutdown(lua_State *L)
 int ModApiServer::l_get_server_status(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	lua_pushstring(L, wide_to_narrow(getServer(L)->getStatusString()).c_str());
+	lua_pushstring(L, getServer(L)->getStatusString().c_str());
 	return 1;
 }
 
@@ -116,24 +116,18 @@ int ModApiServer::l_get_player_privs(lua_State *L)
 int ModApiServer::l_get_player_ip(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	const char * name = luaL_checkstring(L, 1);
-	RemotePlayer *player = dynamic_cast<ServerEnvironment *>(getEnv(L))->getPlayer(name);
-	if(player == NULL)
-	{
+
+	Server *server = getServer(L);
+
+	const char *name = luaL_checkstring(L, 1);
+	RemotePlayer *player = server->getEnv().getPlayer(name);
+	if (!player) {
 		lua_pushnil(L); // no such player
 		return 1;
 	}
-	try
-	{
-		Address addr = getServer(L)->getPeerAddress(player->getPeerId());
-		std::string ip_str = addr.serializeString();
-		lua_pushstring(L, ip_str.c_str());
-		return 1;
-	} catch (const con::PeerNotFoundException &) {
-		dstream << FUNCTION_NAME << ": peer was not found" << std::endl;
-		lua_pushnil(L); // error
-		return 1;
-	}
+
+	lua_pushstring(L, server->getPeerAddress(player->getPeerId()).serializeString().c_str());
+	return 1;
 }
 
 // get_player_information(name)
@@ -150,26 +144,18 @@ int ModApiServer::l_get_player_information(lua_State *L)
 		return 1;
 	}
 
-	Address addr;
-	try {
-		addr = server->getPeerAddress(player->getPeerId());
-	} catch (const con::PeerNotFoundException &) {
-		dstream << FUNCTION_NAME << ": peer was not found" << std::endl;
-		lua_pushnil(L); // error
-		return 1;
-	}
-
-	float min_rtt, max_rtt, avg_rtt, min_jitter, max_jitter, avg_jitter;
-	ClientState state;
-	u32 uptime;
-	u16 prot_vers;
-	u8 ser_vers, major, minor, patch;
-	std::string vers_string, lang_code;
+	/*
+		Be careful not to introduce a depdendency on the connection to
+		the peer here. This function is >>REQUIRED<< to still be able to return
+		values even when the peer unexpectedly disappears.
+		Hence all the ConInfo values here are optional.
+	*/
 
 	auto getConInfo = [&] (con::rtt_stat_type type, float *value) -> bool {
 		return server->getClientConInfo(player->getPeerId(), type, value);
 	};
 
+	float min_rtt, max_rtt, avg_rtt, min_jitter, max_jitter, avg_jitter;
 	bool have_con_info =
 		getConInfo(con::MIN_RTT, &min_rtt) &&
 		getConInfo(con::MAX_RTT, &max_rtt) &&
@@ -178,11 +164,9 @@ int ModApiServer::l_get_player_information(lua_State *L)
 		getConInfo(con::MAX_JITTER, &max_jitter) &&
 		getConInfo(con::AVG_JITTER, &avg_jitter);
 
-	bool r = server->getClientInfo(player->getPeerId(), &state, &uptime,
-		&ser_vers, &prot_vers, &major, &minor, &patch, &vers_string,
-		&lang_code);
-	if (!r) {
-		dstream << FUNCTION_NAME << ": peer was not found" << std::endl;
+	ClientInfo info;
+	if (!server->getClientInfo(player->getPeerId(), info)) {
+		warningstream << FUNCTION_NAME << ": no client info?!" << std::endl;
 		lua_pushnil(L); // error
 		return 1;
 	}
@@ -191,13 +175,13 @@ int ModApiServer::l_get_player_information(lua_State *L)
 	int table = lua_gettop(L);
 
 	lua_pushstring(L,"address");
-	lua_pushstring(L, addr.serializeString().c_str());
+	lua_pushstring(L, info.addr.serializeString().c_str());
 	lua_settable(L, table);
 
 	lua_pushstring(L,"ip_version");
-	if (addr.getFamily() == AF_INET) {
+	if (info.addr.getFamily() == AF_INET) {
 		lua_pushnumber(L, 4);
-	} else if (addr.getFamily() == AF_INET6) {
+	} else if (info.addr.getFamily() == AF_INET6) {
 		lua_pushnumber(L, 6);
 	} else {
 		lua_pushnumber(L, 0);
@@ -231,11 +215,11 @@ int ModApiServer::l_get_player_information(lua_State *L)
 	}
 
 	lua_pushstring(L,"connection_uptime");
-	lua_pushnumber(L, uptime);
+	lua_pushnumber(L, info.uptime);
 	lua_settable(L, table);
 
 	lua_pushstring(L,"protocol_version");
-	lua_pushnumber(L, prot_vers);
+	lua_pushnumber(L, info.prot_vers);
 	lua_settable(L, table);
 
 	lua_pushstring(L, "formspec_version");
@@ -243,32 +227,32 @@ int ModApiServer::l_get_player_information(lua_State *L)
 	lua_settable(L, table);
 
 	lua_pushstring(L, "lang_code");
-	lua_pushstring(L, lang_code.c_str());
+	lua_pushstring(L, info.lang_code.c_str());
 	lua_settable(L, table);
 
 #ifndef NDEBUG
 	lua_pushstring(L,"serialization_version");
-	lua_pushnumber(L, ser_vers);
+	lua_pushnumber(L, info.ser_vers);
 	lua_settable(L, table);
 
 	lua_pushstring(L,"major");
-	lua_pushnumber(L, major);
+	lua_pushnumber(L, info.major);
 	lua_settable(L, table);
 
 	lua_pushstring(L,"minor");
-	lua_pushnumber(L, minor);
+	lua_pushnumber(L, info.minor);
 	lua_settable(L, table);
 
 	lua_pushstring(L,"patch");
-	lua_pushnumber(L, patch);
+	lua_pushnumber(L, info.patch);
 	lua_settable(L, table);
 
 	lua_pushstring(L,"version_string");
-	lua_pushstring(L, vers_string.c_str());
+	lua_pushstring(L, info.vers_string.c_str());
 	lua_settable(L, table);
 
 	lua_pushstring(L,"state");
-	lua_pushstring(L,ClientInterface::state2Name(state).c_str());
+	lua_pushstring(L, ClientInterface::state2Name(info.state).c_str());
 	lua_settable(L, table);
 #endif
 
@@ -296,23 +280,18 @@ int ModApiServer::l_get_ban_description(lua_State *L)
 int ModApiServer::l_ban_player(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
-	const char * name = luaL_checkstring(L, 1);
-	RemotePlayer *player = dynamic_cast<ServerEnvironment *>(getEnv(L))->getPlayer(name);
-	if (player == NULL) {
+
+	Server *server = getServer(L);
+
+	const char *name = luaL_checkstring(L, 1);
+	RemotePlayer *player = server->getEnv().getPlayer(name);
+	if (!player) {
 		lua_pushboolean(L, false); // no such player
 		return 1;
 	}
-	try
-	{
-		Address addr = getServer(L)->getPeerAddress(
-			dynamic_cast<ServerEnvironment *>(getEnv(L))->getPlayer(name)->getPeerId());
-		std::string ip_str = addr.serializeString();
-		getServer(L)->setIpBanned(ip_str, name);
-	} catch(const con::PeerNotFoundException &) {
-		dstream << FUNCTION_NAME << ": peer was not found" << std::endl;
-		lua_pushboolean(L, false); // error
-		return 1;
-	}
+
+	std::string ip_str = server->getPeerAddress(player->getPeerId()).serializeString();
+	server->setIpBanned(ip_str, name);
 	lua_pushboolean(L, true);
 	return 1;
 }
@@ -474,19 +453,30 @@ int ModApiServer::l_sound_fade(lua_State *L)
 }
 
 // dynamic_add_media(filepath)
-int ModApiServer::l_dynamic_add_media(lua_State *L)
+int ModApiServer::l_dynamic_add_media_raw(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 
-	// Reject adding media before the server has started up
 	if (!getEnv(L))
 		throw LuaError("Dynamic media cannot be added before server has started up");
 
 	std::string filepath = readParam<std::string>(L, 1);
 	CHECK_SECURE_PATH(L, filepath.c_str(), false);
 
-	bool ok = getServer(L)->dynamicAddMedia(filepath);
-	lua_pushboolean(L, ok);
+	std::vector<RemotePlayer*> sent_to;
+	bool ok = getServer(L)->dynamicAddMedia(filepath, sent_to);
+	if (ok) {
+		// (see wrapper code in builtin)
+		lua_createtable(L, sent_to.size(), 0);
+		int i = 0;
+		for (RemotePlayer *player : sent_to) {
+			lua_pushstring(L, player->getName());
+			lua_rawseti(L, -2, ++i);
+		}
+	} else {
+		lua_pushboolean(L, false);
+	}
+
 	return 1;
 }
 
@@ -554,7 +544,7 @@ void ModApiServer::Initialize(lua_State *L, int top)
 	API_FCT(sound_play);
 	API_FCT(sound_stop);
 	API_FCT(sound_fade);
-	API_FCT(dynamic_add_media);
+	API_FCT(dynamic_add_media_raw);
 
 	API_FCT(get_player_information);
 	API_FCT(get_player_privs);
diff --git a/src/script/lua_api/l_server.h b/src/script/lua_api/l_server.h
index 938bfa8ef..2df180b17 100644
--- a/src/script/lua_api/l_server.h
+++ b/src/script/lua_api/l_server.h
@@ -71,7 +71,7 @@ private:
 	static int l_sound_fade(lua_State *L);
 
 	// dynamic_add_media(filepath)
-	static int l_dynamic_add_media(lua_State *L);
+	static int l_dynamic_add_media_raw(lua_State *L);
 
 	// get_player_privs(name, text)
 	static int l_get_player_privs(lua_State *L);
diff --git a/src/script/lua_api/l_settings.cpp b/src/script/lua_api/l_settings.cpp
index 33eb02392..a82073ed4 100644
--- a/src/script/lua_api/l_settings.cpp
+++ b/src/script/lua_api/l_settings.cpp
@@ -20,18 +20,43 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_settings.h"
 #include "lua_api/l_internal.h"
 #include "cpp_api/s_security.h"
+#include "threading/mutex_auto_lock.h"
 #include "util/string.h" // FlagDesc
 #include "settings.h"
 #include "noise.h"
 #include "log.h"
 
 
-#define SET_SECURITY_CHECK(L, name) \
-	if (o->m_settings == g_settings && ScriptApiSecurity::isSecure(L) && \
-			name.compare(0, 7, "secure.") == 0) { \
-		throw LuaError("Attempt to set secure setting."); \
+/* This protects:
+ * 'secure.*' settings from being set
+ * some mapgen settings from being set
+ *   (not security-criticial, just to avoid messing up user configs)
+ */
+#define CHECK_SETTING_SECURITY(L, name) \
+	if (o->m_settings == g_settings) { \
+		if (checkSettingSecurity(L, name) == -1) \
+			return 0; \
 	}
 
+static inline int checkSettingSecurity(lua_State* L, const std::string &name)
+{
+	if (ScriptApiSecurity::isSecure(L) && name.compare(0, 7, "secure.") == 0)
+		throw LuaError("Attempt to set secure setting.");
+
+	bool is_mainmenu = false;
+#ifndef SERVER
+	is_mainmenu = ModApiBase::getGuiEngine(L) != nullptr;
+#endif
+	if (!is_mainmenu && (name == "mg_name" || name == "mg_flags")) {
+		errorstream << "Tried to set global setting " << name << ", ignoring. "
+			"minetest.set_mapgen_setting() should be used instead." << std::endl;
+		infostream << script_get_backtrace(L) << std::endl;
+		return -1;
+	}
+
+	return 0;
+}
+
 LuaSettings::LuaSettings(Settings *settings, const std::string &filename) :
 	m_settings(settings),
 	m_filename(filename)
@@ -129,6 +154,7 @@ int LuaSettings::l_get_np_group(lua_State *L)
 	return 1;
 }
 
+// get_flags(self, key) -> table or nil
 int LuaSettings::l_get_flags(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
@@ -161,7 +187,7 @@ int LuaSettings::l_set(lua_State* L)
 	std::string key = std::string(luaL_checkstring(L, 2));
 	const char* value = luaL_checkstring(L, 3);
 
-	SET_SECURITY_CHECK(L, key);
+	CHECK_SETTING_SECURITY(L, key);
 
 	if (!o->m_settings->set(key, value))
 		throw LuaError("Invalid sequence found in setting parameters");
@@ -178,14 +204,14 @@ int LuaSettings::l_set_bool(lua_State* L)
 	std::string key = std::string(luaL_checkstring(L, 2));
 	bool value = readParam<bool>(L, 3);
 
-	SET_SECURITY_CHECK(L, key);
+	CHECK_SETTING_SECURITY(L, key);
 
 	o->m_settings->setBool(key, value);
 
-	return 1;
+	return 0;
 }
 
-// set(self, key, value)
+// set_np_group(self, key, value)
 int LuaSettings::l_set_np_group(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
@@ -195,9 +221,9 @@ int LuaSettings::l_set_np_group(lua_State *L)
 	NoiseParams value;
 	read_noiseparams(L, 3, &value);
 
-	SET_SECURITY_CHECK(L, key);
+	CHECK_SETTING_SECURITY(L, key);
 
-	o->m_settings->setNoiseParams(key, value, false);
+	o->m_settings->setNoiseParams(key, value);
 
 	return 0;
 }
@@ -210,7 +236,7 @@ int LuaSettings::l_remove(lua_State* L)
 
 	std::string key = std::string(luaL_checkstring(L, 2));
 
-	SET_SECURITY_CHECK(L, key);
+	CHECK_SETTING_SECURITY(L, key);
 
 	bool success = o->m_settings->remove(key);
 	lua_pushboolean(L, success);
@@ -253,20 +279,36 @@ int LuaSettings::l_write(lua_State* L)
 	return 1;
 }
 
-// to_table(self) -> {[key1]=value1,...}
-int LuaSettings::l_to_table(lua_State* L)
+static void push_settings_table(lua_State *L, const Settings *settings)
 {
-	NO_MAP_LOCK_REQUIRED;
-	LuaSettings* o = checkobject(L, 1);
-
-	std::vector<std::string> keys = o->m_settings->getNames();
-
+	std::vector<std::string> keys = settings->getNames();
 	lua_newtable(L);
 	for (const std::string &key : keys) {
-		lua_pushstring(L, o->m_settings->get(key).c_str());
+		std::string value;
+		Settings *group = nullptr;
+
+		if (settings->getNoEx(key, value)) {
+			lua_pushstring(L, value.c_str());
+		} else if (settings->getGroupNoEx(key, group)) {
+			// Recursively push tables
+			push_settings_table(L, group);
+		} else {
+			// Impossible case (multithreading) due to MutexAutoLock
+			continue;
+		}
+
 		lua_setfield(L, -2, key.c_str());
 	}
+}
+
+// to_table(self) -> {[key1]=value1,...}
+int LuaSettings::l_to_table(lua_State* L)
+{
+	NO_MAP_LOCK_REQUIRED;
+	LuaSettings* o = checkobject(L, 1);
 
+	MutexAutoLock(o->m_settings->m_mutex);
+	push_settings_table(L, o->m_settings);
 	return 1;
 }
 
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index e2730c6d9..624828956 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -17,6 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "irrlichttypes_extrabloated.h"
 #include "lua_api/l_util.h"
 #include "lua_api/l_internal.h"
 #include "lua_api/l_settings.h"
@@ -40,7 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/hex.h"
 #include "util/sha1.h"
 #include <algorithm>
-
+#include <cstdio>
 
 // log([level,] text)
 // Writes a line to the logger.
@@ -250,6 +251,17 @@ int ModApiUtil::l_get_builtin_path(lua_State *L)
 	return 1;
 }
 
+// get_user_path()
+int ModApiUtil::l_get_user_path(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	std::string path = porting::path_user;
+	lua_pushstring(L, path.c_str());
+
+	return 1;
+}
+
 // compress(data, method, level)
 int ModApiUtil::l_compress(lua_State *L)
 {
@@ -468,6 +480,23 @@ int ModApiUtil::l_sha1(lua_State *L)
 	return 1;
 }
 
+// colorspec_to_colorstring(colorspec)
+int ModApiUtil::l_colorspec_to_colorstring(lua_State *L)
+{
+	NO_MAP_LOCK_REQUIRED;
+
+	video::SColor color(0);
+	if (read_color(L, 1, &color)) {
+		char colorstring[10];
+		snprintf(colorstring, 10, "#%02X%02X%02X%02X",
+			color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha());
+		lua_pushstring(L, colorstring);
+		return 1;
+	}
+
+	return 0;
+}
+
 void ModApiUtil::Initialize(lua_State *L, int top)
 {
 	API_FCT(log);
@@ -486,6 +515,7 @@ void ModApiUtil::Initialize(lua_State *L, int top)
 	API_FCT(is_yes);
 
 	API_FCT(get_builtin_path);
+	API_FCT(get_user_path);
 
 	API_FCT(compress);
 	API_FCT(decompress);
@@ -501,6 +531,7 @@ void ModApiUtil::Initialize(lua_State *L, int top)
 
 	API_FCT(get_version);
 	API_FCT(sha1);
+	API_FCT(colorspec_to_colorstring);
 
 	LuaSettings::create(L, g_settings, g_settings_path);
 	lua_setfield(L, top, "settings");
@@ -527,6 +558,7 @@ void ModApiUtil::InitializeClient(lua_State *L, int top)
 
 	API_FCT(get_version);
 	API_FCT(sha1);
+	API_FCT(colorspec_to_colorstring);
 
 	LuaSettings::create(L, g_settings, g_settings_path);
 	lua_setfield(L, top, "settings");
@@ -544,6 +576,7 @@ void ModApiUtil::InitializeAsync(lua_State *L, int top)
 	API_FCT(is_yes);
 
 	API_FCT(get_builtin_path);
+	API_FCT(get_user_path);
 
 	API_FCT(compress);
 	API_FCT(decompress);
@@ -556,8 +589,8 @@ void ModApiUtil::InitializeAsync(lua_State *L, int top)
 
 	API_FCT(get_version);
 	API_FCT(sha1);
+	API_FCT(colorspec_to_colorstring);
 
 	LuaSettings::create(L, g_settings, g_settings_path);
 	lua_setfield(L, top, "settings");
 }
-
diff --git a/src/script/lua_api/l_util.h b/src/script/lua_api/l_util.h
index b6c1b58af..6943a6afb 100644
--- a/src/script/lua_api/l_util.h
+++ b/src/script/lua_api/l_util.h
@@ -68,6 +68,9 @@ private:
 	// get_builtin_path()
 	static int l_get_builtin_path(lua_State *L);
 
+	// get_user_path()
+	static int l_get_user_path(lua_State *L);
+
 	// compress(data, method, ...)
 	static int l_compress(lua_State *L);
 
@@ -98,6 +101,9 @@ private:
 	// sha1(string, raw)
 	static int l_sha1(lua_State *L);
 
+	// colorspec_to_colorstring(colorspec)
+	static int l_colorspec_to_colorstring(lua_State *L);
+
 public:
 	static void Initialize(lua_State *L, int top);
 	static void InitializeAsync(lua_State *L, int top);
diff --git a/src/script/scripting_client.cpp b/src/script/scripting_client.cpp
index 729645678..7e92eb576 100644
--- a/src/script/scripting_client.cpp
+++ b/src/script/scripting_client.cpp
@@ -36,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_util.h"
 #include "lua_api/l_item.h"
 #include "lua_api/l_nodemeta.h"
+#include "lua_api/l_noise.h"
 #include "lua_api/l_localplayer.h"
 #include "lua_api/l_camera.h"
 #include "lua_api/l_settings.h"
@@ -71,6 +72,11 @@ ClientScripting::ClientScripting(Client *client):
 void ClientScripting::InitializeModApi(lua_State *L, int top)
 {
 	LuaItemStack::Register(L);
+	LuaPerlinNoise::Register(L);
+	LuaPerlinNoiseMap::Register(L);
+	LuaPseudoRandom::Register(L);
+	LuaPcgRandom::Register(L);
+	LuaSecureRandom::Register(L);
 	ItemStackMetaRef::Register(L);
 	LuaRaycast::Register(L);
 	StorageRef::Register(L);
diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp
index 0f672f917..b102a66a1 100644
--- a/src/script/scripting_mainmenu.cpp
+++ b/src/script/scripting_mainmenu.cpp
@@ -31,7 +31,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 extern "C" {
 #include "lualib.h"
 }
-
 #define MAINMENU_NUM_ASYNC_THREADS 4
 
 
diff --git a/src/server.cpp b/src/server.cpp
index b5352749c..a8d452783 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -351,6 +351,8 @@ Server::~Server()
 	// Deinitialize scripting
 	infostream << "Server: Deinitializing scripting" << std::endl;
 	delete m_script;
+	delete m_startup_server_map; // if available
+	delete m_game_settings;
 
 	while (!m_unsent_map_edit_queue.empty()) {
 		delete m_unsent_map_edit_queue.front();
@@ -368,6 +370,8 @@ void Server::init()
 	infostream << "- world:  " << m_path_world << std::endl;
 	infostream << "- game:   " << m_gamespec.path << std::endl;
 
+	m_game_settings = Settings::createLayer(SL_GAME);
+
 	// Create world if it doesn't exist
 	try {
 		loadGameConfAndInitWorld(m_path_world,
@@ -396,6 +400,7 @@ void Server::init()
 
 	// Create the Map (loads map_meta.txt, overriding configured mapgen params)
 	ServerMap *servermap = new ServerMap(m_path_world, this, m_emerge, m_metrics_backend.get());
+	m_startup_server_map = servermap;
 
 	// Initialize scripting
 	infostream << "Server: Initializing Lua" << std::endl;
@@ -437,6 +442,7 @@ void Server::init()
 	m_craftdef->initHashes(this);
 
 	// Initialize Environment
+	m_startup_server_map = nullptr; // Ownership moved to ServerEnvironment
 	m_env = new ServerEnvironment(servermap, m_script, this, m_path_world);
 
 	m_inventory_mgr->setEnv(m_env);
@@ -1239,20 +1245,8 @@ bool Server::getClientConInfo(session_t peer_id, con::rtt_stat_type type, float*
 	return *retval != -1;
 }
 
-bool Server::getClientInfo(
-		session_t    peer_id,
-		ClientState* state,
-		u32*         uptime,
-		u8*          ser_vers,
-		u16*         prot_vers,
-		u8*          major,
-		u8*          minor,
-		u8*          patch,
-		std::string* vers_string,
-		std::string* lang_code
-	)
-{
-	*state = m_clients.getClientState(peer_id);
+bool Server::getClientInfo(session_t peer_id, ClientInfo &ret)
+{
 	m_clients.lock();
 	RemoteClient* client = m_clients.lockedGetClientNoEx(peer_id, CS_Invalid);
 
@@ -1261,15 +1255,18 @@ bool Server::getClientInfo(
 		return false;
 	}
 
-	*uptime = client->uptime();
-	*ser_vers = client->serialization_version;
-	*prot_vers = client->net_proto_version;
+	ret.state = client->getState();
+	ret.addr = client->getAddress();
+	ret.uptime = client->uptime();
+	ret.ser_vers = client->serialization_version;
+	ret.prot_vers = client->net_proto_version;
+
+	ret.major = client->getMajor();
+	ret.minor = client->getMinor();
+	ret.patch = client->getPatch();
+	ret.vers_string = client->getFullVer();
 
-	*major = client->getMajor();
-	*minor = client->getMinor();
-	*patch = client->getPatch();
-	*vers_string = client->getFull();
-	*lang_code = client->getLangCode();
+	ret.lang_code = client->getLangCode();
 
 	m_clients.unlock();
 
@@ -1355,7 +1352,7 @@ void Server::SendPlayerHPOrDie(PlayerSAO *playersao, const PlayerHPChangeReason
 		return;
 
 	session_t peer_id = playersao->getPeerID();
-	bool is_alive = playersao->getHP() > 0;
+	bool is_alive = !playersao->isDead();
 
 	if (is_alive)
 		SendPlayerHP(peer_id);
@@ -1488,7 +1485,8 @@ void Server::SendChatMessage(session_t peer_id, const ChatMessage &message)
 	NetworkPacket pkt(TOCLIENT_CHAT_MESSAGE, 0, peer_id);
 	u8 version = 1;
 	u8 type = message.type;
-	pkt << version << type << std::wstring(L"") << message.message << (u64)message.timestamp;
+	pkt << version << type << message.sender << message.message
+		<< static_cast<u64>(message.timestamp);
 
 	if (peer_id != PEER_ID_INEXISTENT) {
 		RemotePlayer *player = m_env->getPlayer(peer_id);
@@ -1823,6 +1821,9 @@ void Server::SendMovePlayer(session_t peer_id)
 	PlayerSAO *sao = player->getPlayerSAO();
 	assert(sao);
 
+	// Send attachment updates instantly to the client prior updating position
+	sao->sendOutdatedData();
+
 	NetworkPacket pkt(TOCLIENT_MOVE_PLAYER, sizeof(v3f) + sizeof(f32) * 2, peer_id);
 	pkt << sao->getBasePosition() << sao->getLookPitch() << sao->getRotation().Y;
 
@@ -2495,7 +2496,9 @@ void Server::fillMediaCache()
 
 	// Collect all media file paths
 	std::vector<std::string> paths;
-	// The paths are ordered in descending priority
+
+	// ordered in descending priority
+	paths.push_back(getBuiltinLuaPath() + DIR_DELIM + "locale");
 	fs::GetRecursiveDirs(paths, porting::path_user + DIR_DELIM + "textures" + DIR_DELIM + "server");
 	fs::GetRecursiveDirs(paths, m_gamespec.path + DIR_DELIM + "textures");
 	m_modmgr->getModsMediaPaths(paths);
@@ -2961,7 +2964,7 @@ void Server::handleChatInterfaceEvent(ChatEvent *evt)
 	}
 }
 
-std::wstring Server::handleChat(const std::string &name, const std::wstring &wname,
+std::wstring Server::handleChat(const std::string &name,
 	std::wstring wmessage, bool check_shout_priv, RemotePlayer *player)
 {
 	// If something goes wrong, this player is to blame
@@ -2999,7 +3002,7 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
 
 	auto message = trim(wide_to_utf8(wmessage));
 	if (message.find_first_of("\n\r") != std::wstring::npos) {
-		return L"New lines are not permitted in chat messages";
+		return L"Newlines are not permitted in chat messages";
 	}
 
 	// Run script hook, exit if script ate the chat message
@@ -3020,10 +3023,10 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
 			the Cyrillic alphabet and some characters on older Android devices
 		*/
 #ifdef __ANDROID__
-		line += L"<" + wname + L"> " + wmessage;
+		line += L"<" + utf8_to_wide(name) + L"> " + wmessage;
 #else
-		line += narrow_to_wide(m_script->formatChatMessage(name,
-				wide_to_narrow(wmessage)));
+		line += utf8_to_wide(m_script->formatChatMessage(name,
+				wide_to_utf8(wmessage)));
 #endif
 	}
 
@@ -3036,35 +3039,23 @@ std::wstring Server::handleChat(const std::string &name, const std::wstring &wna
 	/*
 		Send the message to others
 	*/
-	actionstream << "CHAT: " << wide_to_narrow(unescape_enriched(line)) << std::endl;
-
-	std::vector<session_t> clients = m_clients.getClientIDs();
-
-	/*
-		Send the message back to the inital sender
-		if they are using protocol version >= 29
-	*/
+	actionstream << "CHAT: " << wide_to_utf8(unescape_enriched(line)) << std::endl;
 
-	session_t peer_id_to_avoid_sending =
-		(player ? player->getPeerId() : PEER_ID_INEXISTENT);
+	ChatMessage chatmsg(line);
 
-	if (player && player->protocol_version >= 29)
-		peer_id_to_avoid_sending = PEER_ID_INEXISTENT;
+	std::vector<session_t> clients = m_clients.getClientIDs();
+	for (u16 cid : clients)
+		SendChatMessage(cid, chatmsg);
 
-	for (u16 cid : clients) {
-		if (cid != peer_id_to_avoid_sending)
-			SendChatMessage(cid, ChatMessage(line));
-	}
 	return L"";
 }
 
 void Server::handleAdminChat(const ChatEventChat *evt)
 {
 	std::string name = evt->nick;
-	std::wstring wname = utf8_to_wide(name);
 	std::wstring wmessage = evt->evt_msg;
 
-	std::wstring answer = handleChat(name, wname, wmessage);
+	std::wstring answer = handleChat(name, wmessage);
 
 	// If asked to send answer to sender
 	if (!answer.empty()) {
@@ -3101,46 +3092,43 @@ PlayerSAO *Server::getPlayerSAO(session_t peer_id)
 	return player->getPlayerSAO();
 }
 
-std::wstring Server::getStatusString()
+std::string Server::getStatusString()
 {
-	std::wostringstream os(std::ios_base::binary);
-	os << L"# Server: ";
+	std::ostringstream os(std::ios_base::binary);
+	os << "# Server: ";
 	// Version
-	os << L"version=" << narrow_to_wide(g_version_string);
+	os << "version=" << g_version_string;
 	// Uptime
-	os << L", uptime=" << m_uptime_counter->get();
+	os << ", uptime=" << m_uptime_counter->get();
 	// Max lag estimate
-	os << L", max_lag=" << (m_env ? m_env->getMaxLagEstimate() : 0);
+	os << ", max_lag=" << (m_env ? m_env->getMaxLagEstimate() : 0);
 
 	// Information about clients
 	bool first = true;
-	os << L", clients={";
+	os << ", clients={";
 	if (m_env) {
 		std::vector<session_t> clients = m_clients.getClientIDs();
 		for (session_t client_id : clients) {
 			RemotePlayer *player = m_env->getPlayer(client_id);
 
 			// Get name of player
-			std::wstring name = L"unknown";
-			if (player)
-				name = narrow_to_wide(player->getName());
+			const char *name = player ? player->getName() : "<unknown>";
 
 			// Add name to information string
 			if (!first)
-				os << L", ";
+				os << ", ";
 			else
 				first = false;
-
 			os << name;
 		}
 	}
-	os << L"}";
+	os << "}";
 
 	if (m_env && !((ServerMap*)(&m_env->getMap()))->isSavingEnabled())
-		os << std::endl << L"# Server: " << " WARNING: Map saving is disabled.";
+		os << std::endl << "# Server: " << " WARNING: Map saving is disabled.";
 
 	if (!g_settings->get("motd").empty())
-		os << std::endl << L"# Server: " << narrow_to_wide(g_settings->get("motd"));
+		os << std::endl << "# Server: " << g_settings->get("motd");
 
 	return os.str();
 }
@@ -3336,7 +3324,8 @@ void Server::hudSetHotbarSelectedImage(RemotePlayer *player, const std::string &
 
 Address Server::getPeerAddress(session_t peer_id)
 {
-	return m_con->GetPeerAddress(peer_id);
+	// Note that this is only set after Init was received in Server::handleCommand_Init
+	return getClient(peer_id, CS_Invalid)->getAddress();
 }
 
 void Server::setLocalPlayerAnimations(RemotePlayer *player,
@@ -3470,7 +3459,8 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id)
 	SendDeleteParticleSpawner(peer_id, id);
 }
 
-bool Server::dynamicAddMedia(const std::string &filepath)
+bool Server::dynamicAddMedia(const std::string &filepath,
+	std::vector<RemotePlayer*> &sent_to)
 {
 	std::string filename = fs::GetFilenameFromPath(filepath.c_str());
 	if (m_media.find(filename) != m_media.end()) {
@@ -3490,9 +3480,17 @@ bool Server::dynamicAddMedia(const std::string &filepath)
 	pkt << raw_hash << filename << (bool) true;
 	pkt.putLongString(filedata);
 
-	auto client_ids = m_clients.getClientIDs(CS_DefinitionsSent);
-	for (session_t client_id : client_ids) {
+	m_clients.lock();
+	for (auto &pair : m_clients.getClientList()) {
+		if (pair.second->getState() < CS_DefinitionsSent)
+			continue;
+		if (pair.second->net_proto_version < 39)
+			continue;
+
+		if (auto player = m_env->getPlayer(pair.second->peer_id))
+			sent_to.emplace_back(player);
 		/*
+			FIXME: this is a very awful hack
 			The network layer only guarantees ordered delivery inside a channel.
 			Since the very next packet could be one that uses the media, we have
 			to push the media over ALL channels to ensure it is processed before
@@ -3501,9 +3499,10 @@ bool Server::dynamicAddMedia(const std::string &filepath)
 			- channel 1 (HUD)
 			- channel 0 (everything else: e.g. play_sound, object messages)
 		*/
-		m_clients.send(client_id, 1, &pkt, true);
-		m_clients.send(client_id, 0, &pkt, true);
+		m_clients.send(pair.second->peer_id, 1, &pkt, true);
+		m_clients.send(pair.second->peer_id, 0, &pkt, true);
 	}
+	m_clients.unlock();
 
 	return true;
 }
diff --git a/src/server.h b/src/server.h
index 4b3ac5cf7..9857215d0 100644
--- a/src/server.h
+++ b/src/server.h
@@ -126,6 +126,17 @@ struct MinimapMode {
 	u16 scale = 1;
 };
 
+// structure for everything getClientInfo returns, for convenience
+struct ClientInfo {
+	ClientState state;
+	Address addr;
+	u32 uptime;
+	u8 ser_vers;
+	u16 prot_vers;
+	u8 major, minor, patch;
+	std::string vers_string, lang_code;
+};
+
 class Server : public con::PeerHandler, public MapEventReceiver,
 		public IGameDef
 {
@@ -208,7 +219,7 @@ public:
 	void onMapEditEvent(const MapEditEvent &event);
 
 	// Connection must be locked when called
-	std::wstring getStatusString();
+	std::string getStatusString();
 	inline double getUptime() const { return m_uptime_counter->get(); }
 
 	// read shutdown state
@@ -246,7 +257,7 @@ public:
 
 	void deleteParticleSpawner(const std::string &playername, u32 id);
 
-	bool dynamicAddMedia(const std::string &filepath);
+	bool dynamicAddMedia(const std::string &filepath, std::vector<RemotePlayer*> &sent_to);
 
 	ServerInventoryManager *getInventoryMgr() const { return m_inventory_mgr.get(); }
 	void sendDetachedInventory(Inventory *inventory, const std::string &name, session_t peer_id);
@@ -326,9 +337,7 @@ public:
 	void DenyAccess_Legacy(session_t peer_id, const std::wstring &reason);
 	void DisconnectPeer(session_t peer_id);
 	bool getClientConInfo(session_t peer_id, con::rtt_stat_type type, float *retval);
-	bool getClientInfo(session_t peer_id, ClientState *state, u32 *uptime,
-			u8* ser_vers, u16* prot_vers, u8* major, u8* minor, u8* patch,
-			std::string* vers_string, std::string* lang_code);
+	bool getClientInfo(session_t peer_id, ClientInfo &ret);
 
 	void printToConsoleOnly(const std::string &text);
 
@@ -486,10 +495,8 @@ private:
 	void handleChatInterfaceEvent(ChatEvent *evt);
 
 	// This returns the answer to the sender of wmessage, or "" if there is none
-	std::wstring handleChat(const std::string &name, const std::wstring &wname,
-		std::wstring wmessage_input,
-		bool check_shout_priv = false,
-		RemotePlayer *player = NULL);
+	std::wstring handleChat(const std::string &name, std::wstring wmessage_input,
+		bool check_shout_priv = false, RemotePlayer *player = nullptr);
 	void handleAdminChat(const ChatEventChat *evt);
 
 	// When called, connection mutex should be locked
@@ -524,6 +531,7 @@ private:
 	u16 m_max_chatmessage_length;
 	// For "dedicated" server list flag
 	bool m_dedicated;
+	Settings *m_game_settings = nullptr;
 
 	// Thread can set; step() will throw as ServerError
 	MutexedVariable<std::string> m_async_fatal_error;
@@ -539,6 +547,10 @@ private:
 	// Environment
 	ServerEnvironment *m_env = nullptr;
 
+	// Reference to the server map until ServerEnvironment is initialized
+	// after that this variable must be a nullptr
+	ServerMap *m_startup_server_map = nullptr;
+
 	// server connection
 	std::shared_ptr<con::Connection> m_con;
 
@@ -564,9 +576,6 @@ private:
 	// Craft definition manager
 	IWritableCraftDefManager *m_craftdef;
 
-	// Event manager
-	EventManager *m_event;
-
 	// Mods
 	std::unique_ptr<ServerModManager> m_modmgr;
 
diff --git a/src/server/luaentity_sao.cpp b/src/server/luaentity_sao.cpp
index c7277491a..3bcbe107b 100644
--- a/src/server/luaentity_sao.cpp
+++ b/src/server/luaentity_sao.cpp
@@ -146,15 +146,11 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 
 	// Each frame, parent position is copied if the object is attached, otherwise it's calculated normally
 	// If the object gets detached this comes into effect automatically from the last known origin
-	if(isAttached())
-	{
-		v3f pos = m_env->getActiveObject(m_attachment_parent_id)->getBasePosition();
-		m_base_position = pos;
+	if (auto *parent = getParent()) {
+		m_base_position = parent->getBasePosition();
 		m_velocity = v3f(0,0,0);
 		m_acceleration = v3f(0,0,0);
-	}
-	else
-	{
+	} else {
 		if(m_prop.physical){
 			aabb3f box = m_prop.collisionbox;
 			box.MinEdge *= BS;
@@ -492,6 +488,9 @@ void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
 	if(isAttached())
 		return;
 
+	// Send attachment updates instantly to the client prior updating position
+	sendOutdatedData();
+
 	m_last_sent_move_precision = m_base_position.getDistanceFrom(
 			m_last_sent_position);
 	m_last_sent_position_timer = 0;
diff --git a/src/server/mods.cpp b/src/server/mods.cpp
index cf1467648..83fa12da9 100644
--- a/src/server/mods.cpp
+++ b/src/server/mods.cpp
@@ -98,7 +98,8 @@ void ServerModManager::getModNames(std::vector<std::string> &modlist) const
 
 void ServerModManager::getModsMediaPaths(std::vector<std::string> &paths) const
 {
-	for (const ModSpec &spec : m_sorted_mods) {
+	for (auto it = m_sorted_mods.crbegin(); it != m_sorted_mods.crend(); it++) {
+		const ModSpec &spec = *it;
 		fs::GetRecursiveDirs(paths, spec.path + DIR_DELIM + "textures");
 		fs::GetRecursiveDirs(paths, spec.path + DIR_DELIM + "sounds");
 		fs::GetRecursiveDirs(paths, spec.path + DIR_DELIM + "media");
diff --git a/src/server/mods.h b/src/server/mods.h
index 54774bd86..8954bbf72 100644
--- a/src/server/mods.h
+++ b/src/server/mods.h
@@ -42,5 +42,13 @@ public:
 	void loadMods(ServerScripting *script);
 	const ModSpec *getModSpec(const std::string &modname) const;
 	void getModNames(std::vector<std::string> &modlist) const;
+	/**
+	 * Recursively gets all paths of mod folders that can contain media files.
+	 *
+	 * Result is ordered in descending priority, ie. files from an earlier path
+	 * should not be replaced by files from a latter one.
+	 *
+	 * @param paths result vector
+	 */
 	void getModsMediaPaths(std::vector<std::string> &paths) const;
 };
diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp
index 232c6a01d..0d31f2e0b 100644
--- a/src/server/player_sao.cpp
+++ b/src/server/player_sao.cpp
@@ -148,7 +148,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 
 void PlayerSAO::getStaticData(std::string * result) const
 {
-	FATAL_ERROR("Obsolete function");
+	FATAL_ERROR("This function shall not be called for PlayerSAO");
 }
 
 void PlayerSAO::step(float dtime, bool send_recommended)
@@ -260,10 +260,13 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 	// otherwise it's calculated normally.
 	// If the object gets detached this comes into effect automatically from
 	// the last known origin.
-	if (isAttached()) {
-		v3f pos = m_env->getActiveObject(m_attachment_parent_id)->getBasePosition();
+	if (auto *parent = getParent()) {
+		v3f pos = parent->getBasePosition();
 		m_last_good_position = pos;
 		setBasePosition(pos);
+
+		if (m_player)
+			m_player->setSpeed(v3f());
 	}
 
 	if (!send_recommended)
@@ -456,6 +459,11 @@ u16 PlayerSAO::punch(v3f dir,
 	return hitparams.wear;
 }
 
+void PlayerSAO::rightClick(ServerActiveObject *clicker)
+{
+	m_env->getScriptIface()->on_rightclickplayer(this, clicker);
+}
+
 void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason)
 {
 	if (hp == (s32)m_hp)
@@ -565,34 +573,11 @@ void PlayerSAO::setMaxSpeedOverride(const v3f &vel)
 bool PlayerSAO::checkMovementCheat()
 {
 	if (m_is_singleplayer ||
+			isAttached() ||
 			g_settings->getBool("disable_anticheat")) {
 		m_last_good_position = m_base_position;
 		return false;
 	}
-	if (UnitSAO *parent = dynamic_cast<UnitSAO *>(getParent())) {
-		v3f attachment_pos;
-		{
-			int parent_id;
-			std::string bone;
-			v3f attachment_rot;
-			bool force_visible;
-			getAttachment(&parent_id, &bone, &attachment_pos, &attachment_rot, &force_visible);
-		}
-
-		v3f parent_pos = parent->getBasePosition();
-		f32 diff = m_base_position.getDistanceFromSQ(parent_pos) - attachment_pos.getLengthSQ();
-		const f32 maxdiff = 4.0f * BS; // fair trade-off value for various latencies
-
-		if (diff > maxdiff * maxdiff) {
-			setBasePosition(parent_pos);
-			actionstream << "Server: " << m_player->getName()
-					<< " moved away from parent; diff=" << sqrtf(diff) / BS
-					<< " resetting position." << std::endl;
-			return true;
-		}
-		// Player movement is locked to the entity. Skip further checks
-		return false;
-	}
 
 	bool cheated = false;
 	/*
diff --git a/src/server/player_sao.h b/src/server/player_sao.h
index 3e178d4fc..8e2d8803f 100644
--- a/src/server/player_sao.h
+++ b/src/server/player_sao.h
@@ -111,10 +111,9 @@ public:
 
 	u16 punch(v3f dir, const ToolCapabilities *toolcap, ServerActiveObject *puncher,
 			float time_from_last_punch);
-	void rightClick(ServerActiveObject *clicker) {}
+	void rightClick(ServerActiveObject *clicker);
 	void setHP(s32 hp, const PlayerHPChangeReason &reason);
 	void setHPRaw(u16 hp) { m_hp = hp; }
-	s16 readDamage();
 	u16 getBreath() const { return m_breath; }
 	void setBreath(const u16 breath, bool send = true);
 
diff --git a/src/server/serveractiveobject.h b/src/server/serveractiveobject.h
index 25653a1ad..51f445914 100644
--- a/src/server/serveractiveobject.h
+++ b/src/server/serveractiveobject.h
@@ -162,8 +162,6 @@ public:
 	{}
 	virtual const ItemGroupList &getArmorGroups() const
 	{ static ItemGroupList rv; return rv; }
-	virtual void setPhysicsOverride(float physics_override_speed, float physics_override_jump, float physics_override_gravity)
-	{}
 	virtual void setAnimation(v2f frames, float frame_speed, float frame_blend, bool frame_loop)
 	{}
 	virtual void getAnimation(v2f *frames, float *frame_speed, float *frame_blend, bool *frame_loop)
@@ -206,7 +204,6 @@ public:
 	}
 
 	std::string generateUpdateInfantCommand(u16 infant_id, u16 protocol_version);
-	std::string generateUpdateNametagAttributesCommand(const video::SColor &color) const;
 
 	void dumpAOMessagesToQueue(std::queue<ActiveObjectMessage> &queue);
 
diff --git a/src/server/serverinventorymgr.cpp b/src/server/serverinventorymgr.cpp
index 555e01ec6..2a80c9bbe 100644
--- a/src/server/serverinventorymgr.cpp
+++ b/src/server/serverinventorymgr.cpp
@@ -168,6 +168,18 @@ bool ServerInventoryManager::removeDetachedInventory(const std::string &name)
 	return true;
 }
 
+bool ServerInventoryManager::checkDetachedInventoryAccess(
+		const InventoryLocation &loc, const std::string &player) const
+{
+	SANITY_CHECK(loc.type == InventoryLocation::DETACHED);
+
+	const auto &inv_it = m_detached_inventories.find(loc.name);
+	if (inv_it == m_detached_inventories.end())
+		return false;
+
+	return inv_it->second.owner.empty() || inv_it->second.owner == player;
+}
+
 void ServerInventoryManager::sendDetachedInventories(const std::string &peer_name,
 		bool incremental,
 		std::function<void(const std::string &, Inventory *)> apply_cb)
diff --git a/src/server/serverinventorymgr.h b/src/server/serverinventorymgr.h
index ccf6d3b2e..b6541bd3c 100644
--- a/src/server/serverinventorymgr.h
+++ b/src/server/serverinventorymgr.h
@@ -43,6 +43,8 @@ public:
 	Inventory *createDetachedInventory(const std::string &name, IItemDefManager *idef,
 			const std::string &player = "");
 	bool removeDetachedInventory(const std::string &name);
+	bool checkDetachedInventoryAccess(
+			const InventoryLocation &loc, const std::string &player) const;
 
 	void sendDetachedInventories(const std::string &peer_name, bool incremental,
 			std::function<void(const std::string &, Inventory *)> apply_cb);
diff --git a/src/server/unit_sao.cpp b/src/server/unit_sao.cpp
index 2371640ca..fa6c8f0f4 100644
--- a/src/server/unit_sao.cpp
+++ b/src/server/unit_sao.cpp
@@ -134,16 +134,21 @@ void UnitSAO::setAttachment(int parent_id, const std::string &bone, v3f position
 
 	int old_parent = m_attachment_parent_id;
 	m_attachment_parent_id = parent_id;
+
+	// The detach callbacks might call to setAttachment() again.
+	// Ensure the attachment params are applied after this callback is run.
+	if (parent_id != old_parent)
+		onDetach(old_parent);
+
+	m_attachment_parent_id = parent_id;
 	m_attachment_bone = bone;
 	m_attachment_position = position;
 	m_attachment_rotation = rotation;
 	m_force_visible = force_visible;
 	m_attachment_sent = false;
 
-	if (parent_id != old_parent) {
-		onDetach(old_parent);
+	if (parent_id != old_parent)
 		onAttach(parent_id);
-	}
 }
 
 void UnitSAO::getAttachment(int *parent_id, std::string *bone, v3f *position,
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index 56dbb0632..cd5ac0753 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -632,7 +632,7 @@ void ServerEnvironment::saveMeta()
 	// Open file and serialize
 	std::ostringstream ss(std::ios_base::binary);
 
-	Settings args;
+	Settings args("EnvArgsEnd");
 	args.setU64("game_time", m_game_time);
 	args.setU64("time_of_day", getTimeOfDay());
 	args.setU64("last_clear_objects_time", m_last_clear_objects_time);
@@ -641,7 +641,6 @@ void ServerEnvironment::saveMeta()
 		m_lbm_mgr.createIntroductionTimesString());
 	args.setU64("day_count", m_day_count);
 	args.writeLines(ss);
-	ss<<"EnvArgsEnd\n";
 
 	if(!fs::safeWriteToFile(path, ss.str()))
 	{
@@ -676,9 +675,9 @@ void ServerEnvironment::loadMeta()
 		throw SerializationError("Couldn't load env meta");
 	}
 
-	Settings args;
+	Settings args("EnvArgsEnd");
 
-	if (!args.parseConfigLines(is, "EnvArgsEnd")) {
+	if (!args.parseConfigLines(is)) {
 		throw SerializationError("ServerEnvironment::loadMeta(): "
 			"EnvArgsEnd not found!");
 	}
@@ -1171,7 +1170,7 @@ void ServerEnvironment::clearObjects(ClearObjectsMode mode)
 		// Tell the object about removal
 		obj->removingFromEnvironment();
 		// Deregister in scripting api
-		m_script->removeObjectReference(obj);
+		m_script->removeObjectReference(dynamic_cast<ActiveObject *>(obj));
 
 		// Delete active object
 		if (obj->environmentDeletes())
@@ -1737,7 +1736,7 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
 	}
 
 	// Register reference in scripting api (must be done before post-init)
-	m_script->addObjectReference(object);
+	m_script->addObjectReference(dynamic_cast<ActiveObject *>(object));
 	// Post-initialize object
 	object->addedToEnvironment(dtime_s);
 
@@ -1827,7 +1826,7 @@ void ServerEnvironment::removeRemovedObjects()
 		// Tell the object about removal
 		obj->removingFromEnvironment();
 		// Deregister in scripting api
-		m_script->removeObjectReference(obj);
+		m_script->removeObjectReference(dynamic_cast<ActiveObject *>(obj));
 
 		// Delete
 		if (obj->environmentDeletes())
@@ -2092,7 +2091,7 @@ void ServerEnvironment::deactivateFarObjects(bool _force_delete)
 		// Tell the object about removal
 		obj->removingFromEnvironment();
 		// Deregister in scripting api
-		m_script->removeObjectReference(obj);
+		m_script->removeObjectReference(dynamic_cast<ActiveObject *>(obj));
 
 		// Delete active object
 		if (obj->environmentDeletes())
diff --git a/src/serverenvironment.h b/src/serverenvironment.h
index c76d34a37..a11c814ed 100644
--- a/src/serverenvironment.h
+++ b/src/serverenvironment.h
@@ -190,14 +190,6 @@ enum ClearObjectsMode {
 		CLEAR_OBJECTS_MODE_QUICK,
 };
 
-/*
-	The server-side environment.
-
-	This is not thread-safe. Server uses an environment mutex.
-*/
-
-typedef std::unordered_map<u16, ServerActiveObject *> ServerActiveObjectMap;
-
 class ServerEnvironment : public Environment
 {
 public:
@@ -331,7 +323,7 @@ public:
 	{
 		return m_ao_manager.getObjectsInsideRadius(pos, radius, objects, include_obj_cb);
 	}
-	
+
 	// Find all active objects inside a box
 	void getObjectsInArea(std::vector<ServerActiveObject *> &objects, const aabb3f &box,
 			std::function<bool(ServerActiveObject *obj)> include_obj_cb)
diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 80a8c2f1a..3bcab3d58 100644
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -17,181 +17,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <fstream>
 #include <iostream>
-#include <sstream>
-#include <algorithm>
-
 #include "version.h"
 #include "settings.h"
 #include "serverlist.h"
 #include "filesys.h"
-#include "porting.h"
 #include "log.h"
 #include "network/networkprotocol.h"
 #include <json/json.h>
 #include "convert_json.h"
 #include "httpfetch.h"
-#include "util/string.h"
 
 namespace ServerList
 {
-
-std::string getFilePath()
-{
-	std::string serverlist_file = g_settings->get("serverlist_file");
-
-	std::string dir_path = "client" DIR_DELIM "serverlist" DIR_DELIM;
-	fs::CreateDir(porting::path_user + DIR_DELIM  "client");
-	fs::CreateDir(porting::path_user + DIR_DELIM + dir_path);
-	return porting::path_user + DIR_DELIM + dir_path + serverlist_file;
-}
-
-
-std::vector<ServerListSpec> getLocal()
-{
-	std::string path = ServerList::getFilePath();
-	std::string liststring;
-	fs::ReadFile(path, liststring);
-
-	return deSerialize(liststring);
-}
-
-
-std::vector<ServerListSpec> getOnline()
-{
-	std::ostringstream geturl;
-
-	u16 proto_version_min = CLIENT_PROTOCOL_VERSION_MIN;
-
-	geturl << g_settings->get("serverlist_url") <<
-		"/list?proto_version_min=" << proto_version_min <<
-		"&proto_version_max=" << CLIENT_PROTOCOL_VERSION_MAX;
-	Json::Value root = fetchJsonValue(geturl.str(), NULL);
-
-	std::vector<ServerListSpec> server_list;
-
-	if (!root.isObject()) {
-		return server_list;
-	}
-
-	root = root["list"];
-	if (!root.isArray()) {
-		return server_list;
-	}
-
-	for (const Json::Value &i : root) {
-		if (i.isObject()) {
-			server_list.push_back(i);
-		}
-	}
-
-	return server_list;
-}
-
-
-// Delete a server from the local favorites list
-bool deleteEntry(const ServerListSpec &server)
-{
-	std::vector<ServerListSpec> serverlist = ServerList::getLocal();
-	for (std::vector<ServerListSpec>::iterator it = serverlist.begin();
-			it != serverlist.end();) {
-		if ((*it)["address"] == server["address"] &&
-				(*it)["port"] == server["port"]) {
-			it = serverlist.erase(it);
-		} else {
-			++it;
-		}
-	}
-
-	std::string path = ServerList::getFilePath();
-	std::ostringstream ss(std::ios_base::binary);
-	ss << ServerList::serialize(serverlist);
-	if (!fs::safeWriteToFile(path, ss.str()))
-		return false;
-	return true;
-}
-
-// Insert a server to the local favorites list
-bool insert(const ServerListSpec &server)
-{
-	// Remove duplicates
-	ServerList::deleteEntry(server);
-
-	std::vector<ServerListSpec> serverlist = ServerList::getLocal();
-
-	// Insert new server at the top of the list
-	serverlist.insert(serverlist.begin(), server);
-
-	std::string path = ServerList::getFilePath();
-	std::ostringstream ss(std::ios_base::binary);
-	ss << ServerList::serialize(serverlist);
-	if (!fs::safeWriteToFile(path, ss.str()))
-		return false;
-
-	return true;
-}
-
-std::vector<ServerListSpec> deSerialize(const std::string &liststring)
-{
-	std::vector<ServerListSpec> serverlist;
-	std::istringstream stream(liststring);
-	std::string line, tmp;
-	while (std::getline(stream, line)) {
-		std::transform(line.begin(), line.end(), line.begin(), ::toupper);
-		if (line == "[SERVER]") {
-			ServerListSpec server;
-			std::getline(stream, tmp);
-			server["name"] = tmp;
-			std::getline(stream, tmp);
-			server["address"] = tmp;
-			std::getline(stream, tmp);
-			server["port"] = tmp;
-			bool unique = true;
-			for (const ServerListSpec &added : serverlist) {
-				if (server["name"] == added["name"]
-						&& server["port"] == added["port"]) {
-					unique = false;
-					break;
-				}
-			}
-			if (!unique)
-				continue;
-			std::getline(stream, tmp);
-			server["description"] = tmp;
-			serverlist.push_back(server);
-		}
-	}
-	return serverlist;
-}
-
-const std::string serialize(const std::vector<ServerListSpec> &serverlist)
-{
-	std::string liststring;
-	for (const ServerListSpec &it : serverlist) {
-		liststring += "[server]\n";
-		liststring += it["name"].asString() + '\n';
-		liststring += it["address"].asString() + '\n';
-		liststring += it["port"].asString() + '\n';
-		liststring += it["description"].asString() + '\n';
-		liststring += '\n';
-	}
-	return liststring;
-}
-
-const std::string serializeJson(const std::vector<ServerListSpec> &serverlist)
-{
-	Json::Value root;
-	Json::Value list(Json::arrayValue);
-	for (const ServerListSpec &it : serverlist) {
-		list.append(it);
-	}
-	root["list"] = list;
-
-	return fastWriteJson(root);
-}
-
-
 #if USE_CURL
 void sendAnnounce(AnnounceAction action,
 		const u16 port,
diff --git a/src/serverlist.h b/src/serverlist.h
index 2b82b7431..4a0bd5efa 100644
--- a/src/serverlist.h
+++ b/src/serverlist.h
@@ -24,21 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
-typedef Json::Value ServerListSpec;
-
 namespace ServerList
 {
-std::vector<ServerListSpec> getLocal();
-std::vector<ServerListSpec> getOnline();
-
-bool deleteEntry(const ServerListSpec &server);
-bool insert(const ServerListSpec &server);
-
-std::vector<ServerListSpec> deSerialize(const std::string &liststring);
-const std::string serialize(const std::vector<ServerListSpec> &serverlist);
-std::vector<ServerListSpec> deSerializeJson(const std::string &liststring);
-const std::string serializeJson(const std::vector<ServerListSpec> &serverlist);
-
 #if USE_CURL
 enum AnnounceAction {AA_START, AA_UPDATE, AA_DELETE};
 void sendAnnounce(AnnounceAction, u16 port,
diff --git a/src/settings.cpp b/src/settings.cpp
index f30ef34e9..cff393e5f 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -33,27 +33,50 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <cctype>
 #include <algorithm>
 
-static Settings main_settings;
-Settings *g_settings = &main_settings;
+Settings *g_settings = nullptr; // Populated in main()
 std::string g_settings_path;
 
-Settings::~Settings()
+Settings *Settings::s_layers[SL_TOTAL_COUNT] = {0}; // Zeroed by compiler
+std::unordered_map<std::string, const FlagDesc *> Settings::s_flags;
+
+
+Settings *Settings::createLayer(SettingsLayer sl, const std::string &end_tag)
 {
-	clear();
+	if ((int)sl < 0 || sl >= SL_TOTAL_COUNT)
+		throw BaseException("Invalid settings layer");
+
+	Settings *&pos = s_layers[(size_t)sl];
+	if (pos)
+		throw BaseException("Setting layer " + std::to_string(sl) + " already exists");
+
+	pos = new Settings(end_tag);
+	pos->m_settingslayer = sl;
+
+	if (sl == SL_GLOBAL)
+		g_settings = pos;
+	return pos;
 }
 
 
-Settings & Settings::operator += (const Settings &other)
+Settings *Settings::getLayer(SettingsLayer sl)
 {
-	if (&other == this)
-		return *this;
+	sanity_check((int)sl >= 0 && sl < SL_TOTAL_COUNT);
+	return s_layers[(size_t)sl];
+}
+
 
+Settings::~Settings()
+{
 	MutexAutoLock lock(m_mutex);
-	MutexAutoLock lock2(other.m_mutex);
 
-	updateNoLock(other);
+	if (m_settingslayer < SL_TOTAL_COUNT)
+		s_layers[(size_t)m_settingslayer] = nullptr;
 
-	return *this;
+	// Compatibility
+	if (m_settingslayer == SL_GLOBAL)
+		g_settings = nullptr;
+
+	clearNoLock();
 }
 
 
@@ -62,11 +85,16 @@ Settings & Settings::operator = (const Settings &other)
 	if (&other == this)
 		return *this;
 
+	// TODO: Avoid copying Settings objects. Make this private.
+	FATAL_ERROR_IF(m_settingslayer != SL_TOTAL_COUNT && other.m_settingslayer != SL_TOTAL_COUNT,
+		("Tried to copy unique Setting layer " + std::to_string(m_settingslayer)).c_str());
+
 	MutexAutoLock lock(m_mutex);
 	MutexAutoLock lock2(other.m_mutex);
 
 	clearNoLock();
-	updateNoLock(other);
+	m_settings = other.m_settings;
+	m_callbacks = other.m_callbacks;
 
 	return *this;
 }
@@ -130,11 +158,11 @@ bool Settings::readConfigFile(const char *filename)
 	if (!is.good())
 		return false;
 
-	return parseConfigLines(is, "");
+	return parseConfigLines(is);
 }
 
 
-bool Settings::parseConfigLines(std::istream &is, const std::string &end)
+bool Settings::parseConfigLines(std::istream &is)
 {
 	MutexAutoLock lock(m_mutex);
 
@@ -142,7 +170,7 @@ bool Settings::parseConfigLines(std::istream &is, const std::string &end)
 
 	while (is.good()) {
 		std::getline(is, line);
-		SettingsParseEvent event = parseConfigObject(line, end, name, value);
+		SettingsParseEvent event = parseConfigObject(line, name, value);
 
 		switch (event) {
 		case SPE_NONE:
@@ -155,8 +183,8 @@ bool Settings::parseConfigLines(std::istream &is, const std::string &end)
 		case SPE_END:
 			return true;
 		case SPE_GROUP: {
-			Settings *group = new Settings;
-			if (!group->parseConfigLines(is, "}")) {
+			Settings *group = new Settings("}");
+			if (!group->parseConfigLines(is)) {
 				delete group;
 				return false;
 			}
@@ -169,7 +197,8 @@ bool Settings::parseConfigLines(std::istream &is, const std::string &end)
 		}
 	}
 
-	return end.empty();
+	// false (failure) if end tag not found
+	return m_end_tag.empty();
 }
 
 
@@ -179,6 +208,14 @@ void Settings::writeLines(std::ostream &os, u32 tab_depth) const
 
 	for (const auto &setting_it : m_settings)
 		printEntry(os, setting_it.first, setting_it.second, tab_depth);
+
+	// For groups this must be "}" !
+	if (!m_end_tag.empty()) {
+		for (u32 i = 0; i < tab_depth; i++)
+			os << "\t";
+
+		os << m_end_tag << "\n";
+	}
 }
 
 
@@ -193,9 +230,7 @@ void Settings::printEntry(std::ostream &os, const std::string &name,
 
 		entry.group->writeLines(os, tab_depth + 1);
 
-		for (u32 i = 0; i != tab_depth; i++)
-			os << "\t";
-		os << "}\n";
+		// Closing bracket handled by writeLines
 	} else {
 		os << name << " = ";
 
@@ -207,8 +242,7 @@ void Settings::printEntry(std::ostream &os, const std::string &name,
 }
 
 
-bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
-	const std::string &end, u32 tab_depth)
+bool Settings::updateConfigObject(std::istream &is, std::ostream &os, u32 tab_depth)
 {
 	SettingEntries::const_iterator it;
 	std::set<std::string> present_entries;
@@ -220,11 +254,11 @@ bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
 	// in the object if existing
 	while (is.good() && !end_found) {
 		std::getline(is, line);
-		SettingsParseEvent event = parseConfigObject(line, end, name, value);
+		SettingsParseEvent event = parseConfigObject(line, name, value);
 
 		switch (event) {
 		case SPE_END:
-			os << line << (is.eof() ? "" : "\n");
+			// Skip end tag. Append later.
 			end_found = true;
 			break;
 		case SPE_MULTILINE:
@@ -252,14 +286,13 @@ bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
 			if (it != m_settings.end() && it->second.is_group) {
 				os << line << "\n";
 				sanity_check(it->second.group != NULL);
-				was_modified |= it->second.group->updateConfigObject(is, os,
-					"}", tab_depth + 1);
+				was_modified |= it->second.group->updateConfigObject(is, os, tab_depth + 1);
 			} else if (it == m_settings.end()) {
 				// Remove by skipping
 				was_modified = true;
-				Settings removed_group; // Move 'is' to group end
+				Settings removed_group("}"); // Move 'is' to group end
 				std::stringstream ss;
-				removed_group.updateConfigObject(is, ss, "}", tab_depth + 1);
+				removed_group.updateConfigObject(is, ss, tab_depth + 1);
 				break;
 			} else {
 				printEntry(os, name, it->second, tab_depth);
@@ -273,6 +306,9 @@ bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
 		}
 	}
 
+	if (!line.empty() && is.eof())
+		os << "\n";
+
 	// Add any settings in the object that don't exist in the config file yet
 	for (it = m_settings.begin(); it != m_settings.end(); ++it) {
 		if (present_entries.find(it->first) != present_entries.end())
@@ -282,6 +318,12 @@ bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
 		was_modified = true;
 	}
 
+	// Append ending tag
+	if (!m_end_tag.empty()) {
+		os << m_end_tag << "\n";
+		was_modified |= !end_found;
+	}
+
 	return was_modified;
 }
 
@@ -293,7 +335,7 @@ bool Settings::updateConfigFile(const char *filename)
 	std::ifstream is(filename);
 	std::ostringstream os(std::ios_base::binary);
 
-	bool was_modified = updateConfigObject(is, os, "");
+	bool was_modified = updateConfigObject(is, os);
 	is.close();
 
 	if (!was_modified)
@@ -366,29 +408,37 @@ bool Settings::parseCommandLine(int argc, char *argv[],
  * Getters *
  ***********/
 
-
-const SettingsEntry &Settings::getEntry(const std::string &name) const
+Settings *Settings::getParent() const
 {
-	MutexAutoLock lock(m_mutex);
+	// If the Settings object is within the hierarchy structure,
+	// iterate towards the origin (0) to find the next fallback layer
+	if (m_settingslayer >= SL_TOTAL_COUNT)
+		return nullptr;
 
-	SettingEntries::const_iterator n;
-	if ((n = m_settings.find(name)) == m_settings.end()) {
-		if ((n = m_defaults.find(name)) == m_defaults.end())
-			throw SettingNotFoundException("Setting [" + name + "] not found.");
+	for (int i = (int)m_settingslayer - 1; i >= 0; --i) {
+		if (s_layers[i])
+			return s_layers[i];
 	}
-	return n->second;
+
+	// No parent
+	return nullptr;
 }
 
 
-const SettingsEntry &Settings::getEntryDefault(const std::string &name) const
+const SettingsEntry &Settings::getEntry(const std::string &name) const
 {
-	MutexAutoLock lock(m_mutex);
+	{
+		MutexAutoLock lock(m_mutex);
 
-	SettingEntries::const_iterator n;
-	if ((n = m_defaults.find(name)) == m_defaults.end()) {
-		throw SettingNotFoundException("Setting [" + name + "] not found.");
+		SettingEntries::const_iterator n;
+		if ((n = m_settings.find(name)) != m_settings.end())
+			return n->second;
 	}
-	return n->second;
+
+	if (auto parent = getParent())
+		return parent->getEntry(name);
+
+	throw SettingNotFoundException("Setting [" + name + "] not found.");
 }
 
 
@@ -410,15 +460,6 @@ const std::string &Settings::get(const std::string &name) const
 }
 
 
-const std::string &Settings::getDefault(const std::string &name) const
-{
-	const SettingsEntry &entry = getEntryDefault(name);
-	if (entry.is_group)
-		throw SettingNotFoundException("Setting [" + name + "] is a group.");
-	return entry.value;
-}
-
-
 bool Settings::getBool(const std::string &name) const
 {
 	return is_yes(get(name));
@@ -491,29 +532,25 @@ u32 Settings::getFlagStr(const std::string &name, const FlagDesc *flagdesc,
 	u32 *flagmask) const
 {
 	u32 flags = 0;
-	u32 mask_default = 0;
 
-	std::string value;
 	// Read default value (if there is any)
-	if (getDefaultNoEx(name, value)) {
-		flags = std::isdigit(value[0])
-			? stoi(value)
-			: readFlagString(value, flagdesc, &mask_default);
-	}
+	if (auto parent = getParent())
+		flags = parent->getFlagStr(name, flagdesc, flagmask);
 
 	// Apply custom flags "on top"
-	value = get(name);
-	u32 flags_user;
-	u32 mask_user = U32_MAX;
-	flags_user = std::isdigit(value[0])
-		? stoi(value) // Override default
-		: readFlagString(value, flagdesc, &mask_user);
-
-	flags &= ~mask_user;
-	flags |=  flags_user;
-
-	if (flagmask)
-		*flagmask = mask_default | mask_user;
+	if (m_settings.find(name) != m_settings.end()) {
+		std::string value = get(name);
+		u32 flags_user;
+		u32 mask_user = U32_MAX;
+		flags_user = std::isdigit(value[0])
+			? stoi(value) // Override default
+			: readFlagString(value, flagdesc, &mask_user);
+
+		flags &= ~mask_user;
+		flags |=  flags_user;
+		if (flagmask)
+			*flagmask |= mask_user;
+	}
 
 	return flags;
 }
@@ -521,7 +558,12 @@ u32 Settings::getFlagStr(const std::string &name, const FlagDesc *flagdesc,
 
 bool Settings::getNoiseParams(const std::string &name, NoiseParams &np) const
 {
-	return getNoiseParamsFromGroup(name, np) || getNoiseParamsFromValue(name, np);
+	if (getNoiseParamsFromGroup(name, np) || getNoiseParamsFromValue(name, np))
+		return true;
+	if (auto parent = getParent())
+		return parent->getNoiseParams(name, np);
+
+	return false;
 }
 
 
@@ -583,14 +625,20 @@ bool Settings::exists(const std::string &name) const
 {
 	MutexAutoLock lock(m_mutex);
 
-	return (m_settings.find(name) != m_settings.end() ||
-		m_defaults.find(name) != m_defaults.end());
+	if (m_settings.find(name) != m_settings.end())
+		return true;
+	if (auto parent = getParent())
+		return parent->exists(name);
+	return false;
 }
 
 
 std::vector<std::string> Settings::getNames() const
 {
+	MutexAutoLock lock(m_mutex);
+
 	std::vector<std::string> names;
+	names.reserve(m_settings.size());
 	for (const auto &settings_it : m_settings) {
 		names.push_back(settings_it.first);
 	}
@@ -625,17 +673,6 @@ bool Settings::getNoEx(const std::string &name, std::string &val) const
 }
 
 
-bool Settings::getDefaultNoEx(const std::string &name, std::string &val) const
-{
-	try {
-		val = getDefault(name);
-		return true;
-	} catch (SettingNotFoundException &e) {
-		return false;
-	}
-}
-
-
 bool Settings::getFlag(const std::string &name) const
 {
 	try {
@@ -746,24 +783,25 @@ bool Settings::getFlagStrNoEx(const std::string &name, u32 &val,
  ***********/
 
 bool Settings::setEntry(const std::string &name, const void *data,
-	bool set_group, bool set_default)
+	bool set_group)
 {
-	Settings *old_group = NULL;
-
 	if (!checkNameValid(name))
 		return false;
 	if (!set_group && !checkValueValid(*(const std::string *)data))
 		return false;
 
+	Settings *old_group = NULL;
 	{
 		MutexAutoLock lock(m_mutex);
 
-		SettingsEntry &entry = set_default ? m_defaults[name] : m_settings[name];
+		SettingsEntry &entry = m_settings[name];
 		old_group = entry.group;
 
 		entry.value    = set_group ? "" : *(const std::string *)data;
 		entry.group    = set_group ? *(Settings **)data : NULL;
 		entry.is_group = set_group;
+		if (set_group)
+			entry.group->m_end_tag = "}";
 	}
 
 	delete old_group;
@@ -774,7 +812,7 @@ bool Settings::setEntry(const std::string &name, const void *data,
 
 bool Settings::set(const std::string &name, const std::string &value)
 {
-	if (!setEntry(name, &value, false, false))
+	if (!setEntry(name, &value, false))
 		return false;
 
 	doCallbacks(name);
@@ -782,9 +820,10 @@ bool Settings::set(const std::string &name, const std::string &value)
 }
 
 
+// TODO: Remove this function
 bool Settings::setDefault(const std::string &name, const std::string &value)
 {
-	return setEntry(name, &value, false, true);
+	return getLayer(SL_DEFAULTS)->set(name, value);
 }
 
 
@@ -794,17 +833,7 @@ bool Settings::setGroup(const std::string &name, const Settings &group)
 	// avoid double-free by copying the source
 	Settings *copy = new Settings();
 	*copy = group;
-	return setEntry(name, &copy, true, false);
-}
-
-
-bool Settings::setGroupDefault(const std::string &name, const Settings &group)
-{
-	// Settings must own the group pointer
-	// avoid double-free by copying the source
-	Settings *copy = new Settings();
-	*copy = group;
-	return setEntry(name, &copy, true, true);
+	return setEntry(name, &copy, true);
 }
 
 
@@ -874,8 +903,7 @@ bool Settings::setFlagStr(const std::string &name, u32 flags,
 }
 
 
-bool Settings::setNoiseParams(const std::string &name,
-	const NoiseParams &np, bool set_default)
+bool Settings::setNoiseParams(const std::string &name, const NoiseParams &np)
 {
 	Settings *group = new Settings;
 
@@ -888,7 +916,7 @@ bool Settings::setNoiseParams(const std::string &name,
 	group->setFloat("lacunarity",  np.lacunarity);
 	group->setFlagStr("flags",     np.flags, flagdesc_noiseparams, np.flags);
 
-	return setEntry(name, &group, true, set_default);
+	return setEntry(name, &group, true);
 }
 
 
@@ -912,20 +940,8 @@ bool Settings::remove(const std::string &name)
 }
 
 
-void Settings::clear()
-{
-	MutexAutoLock lock(m_mutex);
-	clearNoLock();
-}
-
-void Settings::clearDefaults()
-{
-	MutexAutoLock lock(m_mutex);
-	clearDefaultsNoLock();
-}
-
 SettingsParseEvent Settings::parseConfigObject(const std::string &line,
-	const std::string &end, std::string &name, std::string &value)
+	std::string &name, std::string &value)
 {
 	std::string trimmed_line = trim(line);
 
@@ -933,7 +949,7 @@ SettingsParseEvent Settings::parseConfigObject(const std::string &line,
 		return SPE_NONE;
 	if (trimmed_line[0] == '#')
 		return SPE_COMMENT;
-	if (trimmed_line == end)
+	if (trimmed_line == m_end_tag)
 		return SPE_END;
 
 	size_t pos = trimmed_line.find('=');
@@ -952,67 +968,26 @@ SettingsParseEvent Settings::parseConfigObject(const std::string &line,
 }
 
 
-void Settings::updateNoLock(const Settings &other)
-{
-	m_settings.insert(other.m_settings.begin(), other.m_settings.end());
-	m_defaults.insert(other.m_defaults.begin(), other.m_defaults.end());
-}
-
-
 void Settings::clearNoLock()
 {
-
 	for (SettingEntries::const_iterator it = m_settings.begin();
 			it != m_settings.end(); ++it)
 		delete it->second.group;
 	m_settings.clear();
-
-	clearDefaultsNoLock();
 }
 
-void Settings::clearDefaultsNoLock()
-{
-	for (SettingEntries::const_iterator it = m_defaults.begin();
-			it != m_defaults.end(); ++it)
-		delete it->second.group;
-	m_defaults.clear();
-}
 
 void Settings::setDefault(const std::string &name, const FlagDesc *flagdesc,
 	u32 flags)
 {
-	m_flags[name] = flagdesc;
+	s_flags[name] = flagdesc;
 	setDefault(name, writeFlagString(flags, flagdesc, U32_MAX));
 }
 
-void Settings::overrideDefaults(Settings *other)
-{
-	for (const auto &setting : other->m_settings) {
-		if (setting.second.is_group) {
-			setGroupDefault(setting.first, *setting.second.group);
-			continue;
-		}
-		const FlagDesc *flagdesc = getFlagDescFallback(setting.first);
-		if (flagdesc) {
-			// Flags cannot be copied directly.
-			// 1) Get the current set flags
-			u32 flags = getFlagStr(setting.first, flagdesc, nullptr);
-			// 2) Set the flags as defaults
-			other->setDefault(setting.first, flagdesc, flags);
-			// 3) Get the newly set flags and override the default setting value
-			setDefault(setting.first, flagdesc,
-				other->getFlagStr(setting.first, flagdesc, nullptr));
-			continue;
-		}
-		// Also covers FlagDesc settings
-		setDefault(setting.first, setting.second.value);
-	}
-}
-
 const FlagDesc *Settings::getFlagDescFallback(const std::string &name) const
 {
-	auto it = m_flags.find(name);
-	return it == m_flags.end() ? nullptr : it->second;
+	auto it = s_flags.find(name);
+	return it == s_flags.end() ? nullptr : it->second;
 }
 
 void Settings::registerChangedCallback(const std::string &name,
diff --git a/src/settings.h b/src/settings.h
index 6db2f9481..e22d949d3 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -30,7 +30,7 @@ class Settings;
 struct NoiseParams;
 
 // Global objects
-extern Settings *g_settings;
+extern Settings *g_settings; // Same as Settings::getLayer(SL_GLOBAL);
 extern std::string g_settings_path;
 
 // Type for a settings changed callback function
@@ -60,6 +60,14 @@ enum SettingsParseEvent {
 	SPE_MULTILINE,
 };
 
+enum SettingsLayer {
+	SL_DEFAULTS,
+	SL_GAME,
+	SL_GLOBAL,
+	SL_MAP,
+	SL_TOTAL_COUNT
+};
+
 struct ValueSpec {
 	ValueSpec(ValueType a_type, const char *a_help=NULL)
 	{
@@ -92,8 +100,13 @@ typedef std::unordered_map<std::string, SettingsEntry> SettingEntries;
 
 class Settings {
 public:
-	Settings() = default;
+	static Settings *createLayer(SettingsLayer sl, const std::string &end_tag = "");
+	static Settings *getLayer(SettingsLayer sl);
+	SettingsLayer getLayerType() const { return m_settingslayer; }
 
+	Settings(const std::string &end_tag = "") :
+		m_end_tag(end_tag)
+	{}
 	~Settings();
 
 	Settings & operator += (const Settings &other);
@@ -110,7 +123,7 @@ public:
 	// NOTE: Types of allowed_options are ignored.  Returns success.
 	bool parseCommandLine(int argc, char *argv[],
 			std::map<std::string, ValueSpec> &allowed_options);
-	bool parseConfigLines(std::istream &is, const std::string &end = "");
+	bool parseConfigLines(std::istream &is);
 	void writeLines(std::ostream &os, u32 tab_depth=0) const;
 
 	/***********
@@ -119,7 +132,6 @@ public:
 
 	Settings *getGroup(const std::string &name) const;
 	const std::string &get(const std::string &name) const;
-	const std::string &getDefault(const std::string &name) const;
 	bool getBool(const std::string &name) const;
 	u16 getU16(const std::string &name) const;
 	s16 getS16(const std::string &name) const;
@@ -146,7 +158,6 @@ public:
 
 	bool getGroupNoEx(const std::string &name, Settings *&val) const;
 	bool getNoEx(const std::string &name, std::string &val) const;
-	bool getDefaultNoEx(const std::string &name, std::string &val) const;
 	bool getFlag(const std::string &name) const;
 	bool getU16NoEx(const std::string &name, u16 &val) const;
 	bool getS16NoEx(const std::string &name, s16 &val) const;
@@ -170,11 +181,10 @@ public:
 	// N.B. Groups not allocated with new must be set to NULL in the settings
 	// tree before object destruction.
 	bool setEntry(const std::string &name, const void *entry,
-		bool set_group, bool set_default);
+		bool set_group);
 	bool set(const std::string &name, const std::string &value);
 	bool setDefault(const std::string &name, const std::string &value);
 	bool setGroup(const std::string &name, const Settings &group);
-	bool setGroupDefault(const std::string &name, const Settings &group);
 	bool setBool(const std::string &name, bool value);
 	bool setS16(const std::string &name, s16 value);
 	bool setU16(const std::string &name, u16 value);
@@ -185,21 +195,16 @@ public:
 	bool setV3F(const std::string &name, v3f value);
 	bool setFlagStr(const std::string &name, u32 flags,
 		const FlagDesc *flagdesc = nullptr, u32 flagmask = U32_MAX);
-	bool setNoiseParams(const std::string &name, const NoiseParams &np,
-		bool set_default=false);
+	bool setNoiseParams(const std::string &name, const NoiseParams &np);
 
 	// remove a setting
 	bool remove(const std::string &name);
-	void clear();
-	void clearDefaults();
 
 	/**************
 	 * Miscellany *
 	 **************/
 
 	void setDefault(const std::string &name, const FlagDesc *flagdesc, u32 flags);
-	// Takes the provided setting values and uses them as new defaults
-	void overrideDefaults(Settings *other);
 	const FlagDesc *getFlagDescFallback(const std::string &name) const;
 
 	void registerChangedCallback(const std::string &name,
@@ -215,9 +220,9 @@ private:
 	 ***********************/
 
 	SettingsParseEvent parseConfigObject(const std::string &line,
-		const std::string &end, std::string &name, std::string &value);
+		std::string &name, std::string &value);
 	bool updateConfigObject(std::istream &is, std::ostream &os,
-		const std::string &end, u32 tab_depth=0);
+		u32 tab_depth=0);
 
 	static bool checkNameValid(const std::string &name);
 	static bool checkValueValid(const std::string &value);
@@ -228,12 +233,14 @@ private:
 	/***********
 	 * Getters *
 	 ***********/
+	Settings *getParent() const;
 
 	const SettingsEntry &getEntry(const std::string &name) const;
-	const SettingsEntry &getEntryDefault(const std::string &name) const;
 
 	// Allow TestSettings to run sanity checks using private functions.
 	friend class TestSettings;
+	// For sane mutex locking when iterating
+	friend class LuaSettings;
 
 	void updateNoLock(const Settings &other);
 	void clearNoLock();
@@ -242,14 +249,15 @@ private:
 	void doCallbacks(const std::string &name) const;
 
 	SettingEntries m_settings;
-	SettingEntries m_defaults;
-	std::unordered_map<std::string, const FlagDesc *> m_flags;
-
 	SettingsCallbackMap m_callbacks;
+	std::string m_end_tag;
 
 	mutable std::mutex m_callback_mutex;
 
 	// All methods that access m_settings/m_defaults directly should lock this.
 	mutable std::mutex m_mutex;
 
+	static Settings *s_layers[SL_TOTAL_COUNT];
+	SettingsLayer m_settingslayer = SL_TOTAL_COUNT;
+	static std::unordered_map<std::string, const FlagDesc *> s_flags;
 };
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index 0cd772337..317186e94 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -30,8 +30,8 @@ fake_function() {
 	gettext("Double-tapping the jump key toggles fly mode.");
 	gettext("Always fly and fast");
 	gettext("If disabled, \"special\" key is used to fly fast if both fly and fast mode are\nenabled.");
-	gettext("Rightclick repetition interval");
-	gettext("The time in seconds it takes between repeated right clicks when holding the right\nmouse button.");
+	gettext("Place repetition interval");
+	gettext("The time in seconds it takes between repeated node placements when holding\nthe place button.");
 	gettext("Automatic jumping");
 	gettext("Automatically jump up single-node obstacles.");
 	gettext("Safe digging and placing");
@@ -54,6 +54,8 @@ fake_function() {
 	gettext("The type of joystick");
 	gettext("Joystick button repetition interval");
 	gettext("The time in seconds it takes between repeated events\nwhen holding down a joystick button combination.");
+	gettext("Joystick deadzone");
+	gettext("The deadzone of the joystick");
 	gettext("Joystick frustum sensitivity");
 	gettext("The sensitivity of the joystick axes for moving the\ningame view frustum around.");
 	gettext("Forward key");
@@ -68,6 +70,10 @@ fake_function() {
 	gettext("Key for jumping.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Sneak key");
 	gettext("Key for sneaking.\nAlso used for climbing down and descending in water if aux1_descends is disabled.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Dig key");
+	gettext("Key for digging.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
+	gettext("Place key");
+	gettext("Key for placing.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Inventory key");
 	gettext("Key for opening the inventory.\nSee http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3");
 	gettext("Special key");
@@ -197,6 +203,8 @@ fake_function() {
 	gettext("Graphics");
 	gettext("In-Game");
 	gettext("Basic");
+	gettext("Show nametag backgrounds by default");
+	gettext("Whether nametag backgrounds should be shown by default.\nMods may still set a background.");
 	gettext("VBO");
 	gettext("Enable vertex buffer objects.\nThis should greatly improve graphics performance.");
 	gettext("Fog");
@@ -229,7 +237,7 @@ fake_function() {
 	gettext("Minimum texture size");
 	gettext("When using bilinear/trilinear/anisotropic filters, low-resolution textures\ncan be blurred, so automatically upscale them with nearest-neighbor\ninterpolation to preserve crisp pixels. This sets the minimum texture size\nfor the upscaled textures; higher values look sharper, but require more\nmemory.  Powers of 2 are recommended. Setting this higher than 1 may not\nhave a visible effect unless bilinear/trilinear/anisotropic filtering is\nenabled.\nThis is also used as the base node texture size for world-aligned\ntexture autoscaling.");
 	gettext("FSAA");
-	gettext("Experimental option, might cause visible spaces between blocks\nwhen set to higher number than 0.");
+	gettext("Use multi-sample antialiasing (MSAA) to smooth out block edges.\nThis algorithm smooths out the 3D viewport while keeping the image sharp,\nbut it doesn't affect the insides of textures\n(which is especially noticeable with transparent textures).\nVisible spaces appear between nodes when shaders are disabled.\nIf set to 0, MSAA is disabled.\nA restart is required after changing this option.");
 	gettext("Undersampling");
 	gettext("Undersampling is similar to using a lower screen resolution, but it applies\nto the game world only, keeping the GUI intact.\nIt should give a significant performance boost at the cost of less detailed image.\nHigher values result in a less detailed image.");
 	gettext("Shaders");
@@ -240,20 +248,6 @@ fake_function() {
 	gettext("Tone Mapping");
 	gettext("Filmic tone mapping");
 	gettext("Enables Hable's 'Uncharted 2' filmic tone mapping.\nSimulates the tone curve of photographic film and how this approximates the\nappearance of high dynamic range images. Mid-range contrast is slightly\nenhanced, highlights and shadows are gradually compressed.");
-	gettext("Bumpmapping");
-	gettext("Bumpmapping");
-	gettext("Enables bumpmapping for textures. Normalmaps need to be supplied by the texture pack.\nRequires shaders to be enabled.");
-	gettext("Parallax Occlusion");
-	gettext("Parallax occlusion");
-	gettext("Enables parallax occlusion mapping.\nRequires shaders to be enabled.");
-	gettext("Parallax occlusion mode");
-	gettext("0 = parallax occlusion with slope information (faster).\n1 = relief mapping (slower, more accurate).");
-	gettext("Parallax occlusion iterations");
-	gettext("Number of parallax occlusion iterations.");
-	gettext("Parallax occlusion scale");
-	gettext("Overall scale of parallax occlusion effect.");
-	gettext("Parallax occlusion bias");
-	gettext("Overall bias of parallax occlusion effect, usually scale/2.");
 	gettext("Waving Nodes");
 	gettext("Waving liquids");
 	gettext("Set to true to enable waving liquids (like water).\nRequires shaders to be enabled.");
@@ -272,8 +266,8 @@ fake_function() {
 	gettext("Arm inertia, gives a more realistic movement of\nthe arm when the camera moves.");
 	gettext("Maximum FPS");
 	gettext("If FPS would go higher than this, limit it by sleeping\nto not waste CPU power for no benefit.");
-	gettext("FPS in pause menu");
-	gettext("Maximum FPS when game is paused.");
+	gettext("FPS when unfocused or paused");
+	gettext("Maximum FPS when the window is not focused, or when the game is paused.");
 	gettext("Pause on lost window focus");
 	gettext("Open the pause menu when the window's focus is lost. Does not pause if a formspec is\nopen.");
 	gettext("Viewing range");
@@ -309,7 +303,7 @@ fake_function() {
 	gettext("Texture path");
 	gettext("Path to texture directory. All textures are first searched from here.");
 	gettext("Video driver");
-	gettext("The rendering back-end for Irrlicht.\nA restart is required after changing this.\nNote: On Android, stick with OGLES1 if unsure! App may fail to start otherwise.\nOn other platforms, OpenGL is recommended, and it’s the only driver with\nshader support currently.");
+	gettext("The rendering back-end for Irrlicht.\nA restart is required after changing this.\nNote: On Android, stick with OGLES1 if unsure! App may fail to start otherwise.\nOn other platforms, OpenGL is recommended.\nShaders are supported by OpenGL (desktop only) and OGLES2 (experimental)");
 	gettext("Cloud radius");
 	gettext("Radius of cloud area stated in number of 64 node cloud squares.\nValues larger than 26 will start to produce sharp cutoffs at cloud area corners.");
 	gettext("View bobbing factor");
@@ -339,9 +333,9 @@ fake_function() {
 	gettext("Selection box width");
 	gettext("Width of the selection box lines around nodes.");
 	gettext("Crosshair color");
-	gettext("Crosshair color (R,G,B).");
+	gettext("Crosshair color (R,G,B).\nAlso controls the object crosshair color");
 	gettext("Crosshair alpha");
-	gettext("Crosshair alpha (opaqueness, between 0 and 255).");
+	gettext("Crosshair alpha (opaqueness, between 0 and 255).\nAlso controls the object crosshair color");
 	gettext("Recent Chat Messages");
 	gettext("Maximum number of recent chat messages to show");
 	gettext("Desynchronize block animation");
@@ -377,7 +371,7 @@ fake_function() {
 	gettext("Autoscaling mode");
 	gettext("World-aligned textures may be scaled to span several nodes. However,\nthe server may not send the scale you want, especially if you use\na specially-designed texture pack; with this option, the client tries\nto determine the scale automatically basing on the texture size.\nSee also texture_min_size.\nWarning: This option is EXPERIMENTAL!");
 	gettext("Show entity selection boxes");
-	gettext("Show entity selection boxes");
+	gettext("Show entity selection boxes\nA restart is required after changing this.");
 	gettext("Menus");
 	gettext("Clouds in menu");
 	gettext("Use a cloud animation for the main menu background.");
@@ -503,6 +497,8 @@ fake_function() {
 	gettext("To reduce lag, block transfers are slowed down when a player is building something.\nThis determines how long they are slowed down after placing or removing a node.");
 	gettext("Max. packets per iteration");
 	gettext("Maximum number of packets sent per send step, if you have a slow connection\ntry reducing it, but don't reduce it to a number below double of targeted\nclient number.");
+	gettext("Map Compression Level for Network Transfer");
+	gettext("ZLib compression level to use when sending mapblocks to the client.\n-1 - Zlib's default compression level\n0 - no compresson, fastest\n9 - best compression, slowest\n(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)");
 	gettext("Game");
 	gettext("Default game");
 	gettext("Default game when creating a new world.\nThis will be overridden when creating a world from the main menu.");
@@ -519,7 +515,7 @@ fake_function() {
 	gettext("Damage");
 	gettext("Enable players getting damage and dying.");
 	gettext("Creative");
-	gettext("Enable creative mode for new created maps.");
+	gettext("Enable creative mode for all players");
 	gettext("Fixed map seed");
 	gettext("A chosen map seed for a new map, leave empty for random.\nWill be overridden when creating a new world in the main menu.");
 	gettext("Default password");
@@ -601,7 +597,7 @@ fake_function() {
 	gettext("Acceleration of gravity, in nodes per second per second.");
 	gettext("Advanced");
 	gettext("Deprecated Lua API handling");
-	gettext("Handling for deprecated Lua API calls:\n-    legacy: (try to) mimic old behaviour (default for release).\n-    log: mimic and log backtrace of deprecated call (default for debug).\n-    error: abort on usage of deprecated call (suggested for mod developers).");
+	gettext("Handling for deprecated Lua API calls:\n-    none: Do not log deprecated calls\n-    log: mimic and log backtrace of deprecated call (default).\n-    error: abort on usage of deprecated call (suggested for mod developers).");
 	gettext("Max. clearobjects extra blocks");
 	gettext("Number of extra blocks that can be loaded by /clearobjects at once.\nThis is a trade-off between sqlite transaction overhead and\nmemory consumption (4096=100MB, as a rule of thumb).");
 	gettext("Unload unused server data");
@@ -610,12 +606,16 @@ fake_function() {
 	gettext("Maximum number of statically stored objects in a block.");
 	gettext("Synchronous SQLite");
 	gettext("See https://www.sqlite.org/pragma.html#pragma_synchronous");
+	gettext("Map Compression Level for Disk Storage");
+	gettext("ZLib compression level to use when saving mapblocks to disk.\n-1 - Zlib's default compression level\n0 - no compresson, fastest\n9 - best compression, slowest\n(levels 1-3 use Zlib's \"fast\" method, 4-9 use the normal method)");
 	gettext("Dedicated server step");
 	gettext("Length of a server tick and the interval at which objects are generally updated over\nnetwork.");
 	gettext("Active block management interval");
 	gettext("Length of time between active block management cycles");
 	gettext("ABM interval");
 	gettext("Length of time between Active Block Modifier (ABM) execution cycles");
+	gettext("ABM time budget");
+	gettext("The time budget allowed for ABMs to execute on each step\n(as a fraction of the ABM Interval)");
 	gettext("NodeTimer interval");
 	gettext("Length of time between NodeTimer execution cycles");
 	gettext("Ignore world errors");
@@ -687,8 +687,6 @@ fake_function() {
 	gettext("Maximum time in ms a file download (e.g. a mod download) may take.");
 	gettext("High-precision FPU");
 	gettext("Makes DirectX work with LuaJIT. Disable if it causes troubles.");
-	gettext("Main menu style");
-	gettext("Changes the main menu UI:\n-   Full:  Multiple singleplayer worlds, game choice, texture pack chooser, etc.\n-   Simple: One singleplayer world, no game or texture pack choosers. May be\nnecessary for smaller screens.");
 	gettext("Main menu script");
 	gettext("Replaces the default main menu with a custom one.");
 	gettext("Engine profiling data print interval");
@@ -958,6 +956,12 @@ fake_function() {
 	gettext("Terrain noise threshold for hills.\nControls proportion of world area covered by hills.\nAdjust towards 0.0 for a larger proportion.");
 	gettext("Hill steepness");
 	gettext("Controls steepness/height of hills.");
+	gettext("Cavern limit");
+	gettext("Y-level of cavern upper limit.");
+	gettext("Cavern taper");
+	gettext("Y-distance over which caverns expand to full size.");
+	gettext("Cavern threshold");
+	gettext("Defines full size of caverns, smaller values create larger caverns.");
 	gettext("Dungeon minimum Y");
 	gettext("Lower Y limit of dungeons.");
 	gettext("Dungeon maximum Y");
@@ -971,6 +975,8 @@ fake_function() {
 	gettext("First of two 3D noises that together define tunnels.");
 	gettext("Cave2 noise");
 	gettext("Second of two 3D noises that together define tunnels.");
+	gettext("Cavern noise");
+	gettext("3D noise defining giant caverns.");
 	gettext("Dungeon noise");
 	gettext("3D noise that determines number of dungeons per mapchunk.");
 	gettext("Mapgen Fractal");
@@ -1097,4 +1103,6 @@ fake_function() {
 	gettext("The URL for the content repository");
 	gettext("ContentDB Flag Blacklist");
 	gettext("Comma-separated list of flags to hide in the content repository.\n\"nonfree\" can be used to hide packages which do not qualify as 'free software',\nas defined by the Free Software Foundation.\nYou can also specify content ratings.\nThese flags are independent from Minetest versions,\nso see a full list at https://content.minetest.net/help/content_flags/");
+	gettext("ContentDB Max Concurrent Downloads");
+	gettext("Maximum number of concurrent downloads. Downloads exceeding this limit will be queued.\nThis should be lower than curl_parallel_limit.");
 }
diff --git a/src/tool.cpp b/src/tool.cpp
index 90f4f9c12..3f639a69e 100644
--- a/src/tool.cpp
+++ b/src/tool.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "inventory.h"
 #include "exceptions.h"
+#include "convert_json.h"
 #include "util/serialize.h"
 #include "util/numeric.h"
 
@@ -142,7 +143,7 @@ void ToolCapabilities::serializeJson(std::ostream &os) const
 	}
 	root["damage_groups"] = damage_groups_object;
 
-	os << root;
+	fastWriteJson(root, os);
 }
 
 void ToolCapabilities::deserializeJson(std::istream &is)
diff --git a/src/translation.cpp b/src/translation.cpp
index 82e813a5d..55c958fa2 100644
--- a/src/translation.cpp
+++ b/src/translation.cpp
@@ -144,14 +144,13 @@ void Translations::loadTranslation(const std::string &data)
 		}
 
 		std::wstring oword1 = word1.str(), oword2 = word2.str();
-		if (oword2.empty()) {
-			oword2 = oword1;
-			errorstream << "Ignoring empty translation for \""
-			            << wide_to_utf8(oword1) << "\"" << std::endl;
+		if (!oword2.empty()) {
+			std::wstring translation_index = textdomain + L"|";
+			translation_index.append(oword1);
+			m_translations[translation_index] = oword2;
+		} else {
+			infostream << "Ignoring empty translation for \""
+				<< wide_to_utf8(oword1) << "\"" << std::endl;
 		}
-
-		std::wstring translation_index = textdomain + L"|";
-		translation_index.append(oword1);
-		m_translations[translation_index] = oword2;
 	}
 }
diff --git a/src/unittest/test.cpp b/src/unittest/test.cpp
index 0f6b36649..d4841d559 100644
--- a/src/unittest/test.cpp
+++ b/src/unittest/test.cpp
@@ -182,7 +182,7 @@ void TestGameDef::defineSomeNodes()
 		"{default_water.png";
 	f = ContentFeatures();
 	f.name = itemdef.name;
-	f.alpha = 128;
+	f.alpha = ALPHAMODE_BLEND;
 	f.liquid_type = LIQUID_SOURCE;
 	f.liquid_viscosity = 4;
 	f.is_ground_content = true;
@@ -203,7 +203,7 @@ void TestGameDef::defineSomeNodes()
 		"{default_lava.png";
 	f = ContentFeatures();
 	f.name = itemdef.name;
-	f.alpha = 128;
+	f.alpha = ALPHAMODE_OPAQUE;
 	f.liquid_type = LIQUID_SOURCE;
 	f.liquid_viscosity = 7;
 	f.light_source = LIGHT_MAX-1;
diff --git a/src/unittest/test_clientactiveobjectmgr.cpp b/src/unittest/test_clientactiveobjectmgr.cpp
index 4d2846c8d..2d508cf32 100644
--- a/src/unittest/test_clientactiveobjectmgr.cpp
+++ b/src/unittest/test_clientactiveobjectmgr.cpp
@@ -29,6 +29,7 @@ public:
 	TestClientActiveObject() : ClientActiveObject(0, nullptr, nullptr) {}
 	~TestClientActiveObject() = default;
 	ActiveObjectType getType() const { return ACTIVEOBJECT_TYPE_TEST; }
+	virtual void addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr) {}
 };
 
 class TestClientActiveObjectMgr : public TestBase
diff --git a/src/unittest/test_connection.cpp b/src/unittest/test_connection.cpp
index c5e4085e1..c3aacc536 100644
--- a/src/unittest/test_connection.cpp
+++ b/src/unittest/test_connection.cpp
@@ -39,6 +39,7 @@ public:
 
 	void runTests(IGameDef *gamedef);
 
+	void testNetworkPacketSerialize();
 	void testHelpers();
 	void testConnectSendReceive();
 };
@@ -47,6 +48,7 @@ static TestConnection g_test_instance;
 
 void TestConnection::runTests(IGameDef *gamedef)
 {
+	TEST(testNetworkPacketSerialize);
 	TEST(testHelpers);
 	TEST(testConnectSendReceive);
 }
@@ -78,6 +80,39 @@ struct Handler : public con::PeerHandler
 	const char *name;
 };
 
+void TestConnection::testNetworkPacketSerialize()
+{
+	const static u8 expected[] = {
+		0x00, 0x7b,
+		0x00, 0x02, 0xd8, 0x42, 0xdf, 0x9a
+	};
+
+	if (sizeof(wchar_t) == 2)
+		warningstream << __func__ << " may fail on this platform." << std::endl;
+
+	{
+		NetworkPacket pkt(123, 0);
+
+		// serializing wide strings should do surrogate encoding, we test that here
+		pkt << std::wstring(L"\U00020b9a");
+
+		SharedBuffer<u8> buf = pkt.oldForgePacket();
+		UASSERTEQ(int, buf.getSize(), sizeof(expected));
+		UASSERT(!memcmp(expected, &buf[0], buf.getSize()));
+	}
+
+	{
+		NetworkPacket pkt;
+		pkt.putRawPacket(expected, sizeof(expected), 0);
+
+		// same for decoding
+		std::wstring pkt_s;
+		pkt >> pkt_s;
+
+		UASSERT(pkt_s == L"\U00020b9a");
+	}
+}
+
 void TestConnection::testHelpers()
 {
 	// Some constants for testing
diff --git a/src/unittest/test_map_settings_manager.cpp b/src/unittest/test_map_settings_manager.cpp
index 3d642a9b4..81ca68705 100644
--- a/src/unittest/test_map_settings_manager.cpp
+++ b/src/unittest/test_map_settings_manager.cpp
@@ -30,7 +30,7 @@ public:
 	TestMapSettingsManager() { TestManager::registerTestModule(this); }
 	const char *getName() { return "TestMapSettingsManager"; }
 
-	void makeUserConfig(Settings *conf);
+	void makeUserConfig();
 	std::string makeMetaFile(bool make_corrupt);
 
 	void runTests(IGameDef *gamedef);
@@ -65,8 +65,11 @@ void check_noise_params(const NoiseParams *np1, const NoiseParams *np2)
 }
 
 
-void TestMapSettingsManager::makeUserConfig(Settings *conf)
+void TestMapSettingsManager::makeUserConfig()
 {
+	delete Settings::getLayer(SL_GLOBAL);
+	Settings *conf = Settings::createLayer(SL_GLOBAL);
+
 	conf->set("mg_name", "v7");
 	conf->set("seed", "5678");
 	conf->set("water_level", "20");
@@ -103,12 +106,11 @@ std::string TestMapSettingsManager::makeMetaFile(bool make_corrupt)
 
 void TestMapSettingsManager::testMapSettingsManager()
 {
-	Settings user_settings;
-	makeUserConfig(&user_settings);
+	makeUserConfig();
 
 	std::string test_mapmeta_path = makeMetaFile(false);
 
-	MapSettingsManager mgr(&user_settings, test_mapmeta_path);
+	MapSettingsManager mgr(test_mapmeta_path);
 	std::string value;
 
 	UASSERT(mgr.getMapSetting("mg_name", &value));
@@ -140,6 +142,12 @@ void TestMapSettingsManager::testMapSettingsManager()
 	mgr.setMapSettingNoiseParams("mgv5_np_height", &script_np_height);
 	mgr.setMapSettingNoiseParams("mgv5_np_factor", &script_np_factor);
 
+	{
+		NoiseParams dummy;
+		mgr.getMapSettingNoiseParams("mgv5_np_factor", &dummy);
+		check_noise_params(&dummy, &script_np_factor);
+	}
+
 	// Now make our Params and see if the values are correctly sourced
 	MapgenParams *params = mgr.makeMapgenParams();
 	UASSERT(params->mgtype == MAPGEN_V5);
@@ -188,50 +196,66 @@ void TestMapSettingsManager::testMapSettingsManager()
 
 void TestMapSettingsManager::testMapMetaSaveLoad()
 {
-	Settings conf;
 	std::string path = getTestTempDirectory()
 		+ DIR_DELIM + "foobar" + DIR_DELIM + "map_meta.txt";
 
+	makeUserConfig();
+	Settings &conf = *Settings::getLayer(SL_GLOBAL);
+
+	// There cannot be two MapSettingsManager
+	// copy the mapgen params to compare them
+	MapgenParams params1, params2;
 	// Create a set of mapgen params and save them to map meta
-	conf.set("seed", "12345");
-	conf.set("water_level", "5");
-	MapSettingsManager mgr1(&conf, path);
-	MapgenParams *params1 = mgr1.makeMapgenParams();
-	UASSERT(params1);
-	UASSERT(mgr1.saveMapMeta());
+	{
+		conf.set("seed", "12345");
+		conf.set("water_level", "5");
+		MapSettingsManager mgr(path);
+		MapgenParams *params = mgr.makeMapgenParams();
+		UASSERT(params);
+		params1 = *params;
+		params1.bparams = nullptr; // No double-free
+		UASSERT(mgr.saveMapMeta());
+	}
 
 	// Now try loading the map meta to mapgen params
-	conf.set("seed", "67890");
-	conf.set("water_level", "32");
-	MapSettingsManager mgr2(&conf, path);
-	UASSERT(mgr2.loadMapMeta());
-	MapgenParams *params2 = mgr2.makeMapgenParams();
-	UASSERT(params2);
+	{
+		conf.set("seed", "67890");
+		conf.set("water_level", "32");
+		MapSettingsManager mgr(path);
+		UASSERT(mgr.loadMapMeta());
+		MapgenParams *params = mgr.makeMapgenParams();
+		UASSERT(params);
+		params2 = *params;
+		params2.bparams = nullptr; // No double-free
+	}
 
 	// Check that both results are correct
-	UASSERTEQ(u64, params1->seed, 12345);
-	UASSERTEQ(s16, params1->water_level, 5);
-	UASSERTEQ(u64, params2->seed, 12345);
-	UASSERTEQ(s16, params2->water_level, 5);
+	UASSERTEQ(u64, params1.seed, 12345);
+	UASSERTEQ(s16, params1.water_level, 5);
+	UASSERTEQ(u64, params2.seed, 12345);
+	UASSERTEQ(s16, params2.water_level, 5);
 }
 
 
 void TestMapSettingsManager::testMapMetaFailures()
 {
 	std::string test_mapmeta_path;
-	Settings conf;
 
 	// Check to see if it'll fail on a non-existent map meta file
-	test_mapmeta_path = "woobawooba/fgdfg/map_meta.txt";
-	UASSERT(!fs::PathExists(test_mapmeta_path));
+	{
+		test_mapmeta_path = "woobawooba/fgdfg/map_meta.txt";
+		UASSERT(!fs::PathExists(test_mapmeta_path));
 
-	MapSettingsManager mgr1(&conf, test_mapmeta_path);
-	UASSERT(!mgr1.loadMapMeta());
+		MapSettingsManager mgr1(test_mapmeta_path);
+		UASSERT(!mgr1.loadMapMeta());
+	}
 
 	// Check to see if it'll fail on a corrupt map meta file
-	test_mapmeta_path = makeMetaFile(true);
-	UASSERT(fs::PathExists(test_mapmeta_path));
+	{
+		test_mapmeta_path = makeMetaFile(true);
+		UASSERT(fs::PathExists(test_mapmeta_path));
 
-	MapSettingsManager mgr2(&conf, test_mapmeta_path);
-	UASSERT(!mgr2.loadMapMeta());
+		MapSettingsManager mgr2(test_mapmeta_path);
+		UASSERT(!mgr2.loadMapMeta());
+	}
 }
diff --git a/src/unittest/test_noderesolver.cpp b/src/unittest/test_noderesolver.cpp
index 28da43620..ed66093a9 100644
--- a/src/unittest/test_noderesolver.cpp
+++ b/src/unittest/test_noderesolver.cpp
@@ -56,6 +56,8 @@ void TestNodeResolver::runTests(IGameDef *gamedef)
 
 class Foobar : public NodeResolver {
 public:
+	friend class TestNodeResolver; // m_ndef
+
 	void resolveNodeNames();
 
 	content_t test_nr_node1;
diff --git a/src/unittest/test_schematic.cpp b/src/unittest/test_schematic.cpp
index da4ce50d2..d2f027eb4 100644
--- a/src/unittest/test_schematic.cpp
+++ b/src/unittest/test_schematic.cpp
@@ -66,13 +66,14 @@ void TestSchematic::testMtsSerializeDeserialize(const NodeDefManager *ndef)
 	std::stringstream ss(std::ios_base::binary |
 		std::ios_base::in | std::ios_base::out);
 
-	std::vector<std::string> names;
-	names.emplace_back("foo");
-	names.emplace_back("bar");
-	names.emplace_back("baz");
-	names.emplace_back("qux");
-
-	Schematic schem, schem2;
+	Schematic schem;
+	{
+		std::vector<std::string> &names = schem.m_nodenames;
+		names.emplace_back("foo");
+		names.emplace_back("bar");
+		names.emplace_back("baz");
+		names.emplace_back("qux");
+	}
 
 	schem.flags       = 0;
 	schem.size        = size;
@@ -83,18 +84,21 @@ void TestSchematic::testMtsSerializeDeserialize(const NodeDefManager *ndef)
 	for (s16 y = 0; y != size.Y; y++)
 		schem.slice_probs[y] = MTSCHEM_PROB_ALWAYS;
 
-	UASSERT(schem.serializeToMts(&ss, names));
+	UASSERT(schem.serializeToMts(&ss));
 
 	ss.seekg(0);
-	names.clear();
 
-	UASSERT(schem2.deserializeFromMts(&ss, &names));
+	Schematic schem2;
+	UASSERT(schem2.deserializeFromMts(&ss));
 
-	UASSERTEQ(size_t, names.size(), 4);
-	UASSERTEQ(std::string, names[0], "foo");
-	UASSERTEQ(std::string, names[1], "bar");
-	UASSERTEQ(std::string, names[2], "baz");
-	UASSERTEQ(std::string, names[3], "qux");
+	{
+		std::vector<std::string> &names = schem2.m_nodenames;
+		UASSERTEQ(size_t, names.size(), 4);
+		UASSERTEQ(std::string, names[0], "foo");
+		UASSERTEQ(std::string, names[1], "bar");
+		UASSERTEQ(std::string, names[2], "baz");
+		UASSERTEQ(std::string, names[3], "qux");
+	}
 
 	UASSERT(schem2.size == size);
 	for (size_t i = 0; i != volume; i++)
@@ -120,14 +124,14 @@ void TestSchematic::testLuaTableSerialize(const NodeDefManager *ndef)
 	for (s16 y = 0; y != size.Y; y++)
 		schem.slice_probs[y] = MTSCHEM_PROB_ALWAYS;
 
-	std::vector<std::string> names;
+	std::vector<std::string> &names = schem.m_nodenames;
 	names.emplace_back("air");
 	names.emplace_back("default:lava_source");
 	names.emplace_back("default:glass");
 
 	std::ostringstream ss(std::ios_base::binary);
 
-	UASSERT(schem.serializeToLua(&ss, names, false, 0));
+	UASSERT(schem.serializeToLua(&ss, false, 0));
 	UASSERTEQ(std::string, ss.str(), expected_lua_output);
 }
 
@@ -159,6 +163,8 @@ void TestSchematic::testFileSerializeDeserialize(const NodeDefManager *ndef)
 	schem1.slice_probs[0] = 80;
 	schem1.slice_probs[1] = 160;
 	schem1.slice_probs[2] = 240;
+	// Node resolving happened manually.
+	schem1.m_resolve_done = true;
 
 	for (size_t i = 0; i != volume; i++) {
 		content_t c = content_map[test_schem2_data[i]];
diff --git a/src/unittest/test_settings.cpp b/src/unittest/test_settings.cpp
index f91ba5b67..6b493c9e4 100644
--- a/src/unittest/test_settings.cpp
+++ b/src/unittest/test_settings.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <cmath>
 #include "settings.h"
+#include "defaultsettings.h"
 #include "noise.h"
 
 class TestSettings : public TestBase {
@@ -31,6 +32,7 @@ public:
 	void runTests(IGameDef *gamedef);
 
 	void testAllSettings();
+	void testDefaults();
 	void testFlagDesc();
 
 	static const char *config_text_before;
@@ -42,6 +44,7 @@ static TestSettings g_test_instance;
 void TestSettings::runTests(IGameDef *gamedef)
 {
 	TEST(testAllSettings);
+	TEST(testDefaults);
 	TEST(testFlagDesc);
 }
 
@@ -70,7 +73,8 @@ const char *TestSettings::config_text_before =
 	"     with leading whitespace!\n"
 	"\"\"\"\n"
 	"np_terrain = 5, 40, (250, 250, 250), 12341, 5, 0.7, 2.4\n"
-	"zoop = true";
+	"zoop = true\n"
+	"[dummy_eof_end_tag]\n";
 
 const std::string TestSettings::config_text_after =
 	"leet = 1337\n"
@@ -111,12 +115,34 @@ const std::string TestSettings::config_text_after =
 	"	animals = cute\n"
 	"	num_apples = 4\n"
 	"	num_oranges = 53\n"
-	"}\n";
+	"}\n"
+	"[dummy_eof_end_tag]";
+
+void compare_settings(const std::string &name, Settings *a, Settings *b)
+{
+	auto keys = a->getNames();
+	Settings *group1, *group2;
+	std::string value1, value2;
+	for (auto &key : keys) {
+		if (a->getGroupNoEx(key, group1)) {
+			UASSERT(b->getGroupNoEx(key, group2));
+
+			compare_settings(name + "->" + key, group1, group2);
+			continue;
+		}
+
+		UASSERT(b->getNoEx(key, value1));
+		// For identification
+		value1 = name + "->" + key + "=" + value1;
+		value2 = name + "->" + key + "=" + a->get(key);
+		UASSERTCMP(std::string, ==, value2, value1);
+	}
+}
 
 void TestSettings::testAllSettings()
 {
 	try {
-	Settings s;
+	Settings s("[dummy_eof_end_tag]");
 
 	// Test reading of settings
 	std::istringstream is(config_text_before);
@@ -197,21 +223,44 @@ void TestSettings::testAllSettings()
 	is.clear();
 	is.seekg(0);
 
-	UASSERT(s.updateConfigObject(is, os, "", 0) == true);
-	//printf(">>>> expected config:\n%s\n", TEST_CONFIG_TEXT_AFTER);
-	//printf(">>>> actual config:\n%s\n", os.str().c_str());
-#if __cplusplus < 201103L
-	// This test only works in older C++ versions than C++11 because we use unordered_map
-	UASSERT(os.str() == config_text_after);
-#endif
+	UASSERT(s.updateConfigObject(is, os, 0) == true);
+
+	{
+		// Confirm settings
+		Settings s2("[dummy_eof_end_tag]");
+		std::istringstream is(config_text_after, std::ios_base::binary);
+		UASSERT(s2.parseConfigLines(is) == true);
+
+		compare_settings("(main)", &s, &s2);
+	}
+
 	} catch (SettingNotFoundException &e) {
 		UASSERT(!"Setting not found!");
 	}
 }
 
+void TestSettings::testDefaults()
+{
+	Settings *game = Settings::createLayer(SL_GAME);
+	Settings *def = Settings::getLayer(SL_DEFAULTS);
+
+	def->set("name", "FooBar");
+	UASSERT(def->get("name") == "FooBar");
+	UASSERT(game->get("name") == "FooBar");
+
+	game->set("name", "Baz");
+	UASSERT(game->get("name") == "Baz");
+
+	delete game;
+
+	// Restore default settings
+	delete Settings::getLayer(SL_DEFAULTS);
+	set_default_settings();
+}
+
 void TestSettings::testFlagDesc()
 {
-	Settings s;
+	Settings &s = *Settings::createLayer(SL_GAME);
 	FlagDesc flagdesc[] = {
 		{ "biomes",  0x01 },
 		{ "trees",   0x02 },
@@ -242,4 +291,6 @@ void TestSettings::testFlagDesc()
 	// Enabled: tables
 	s.set("test_flags", "16");
 	UASSERT(s.getFlagStr("test_flags", flagdesc, nullptr) == 0x10);
+
+	delete &s;
 }
diff --git a/src/unittest/test_utilities.cpp b/src/unittest/test_utilities.cpp
index 447b591e1..93ba3f844 100644
--- a/src/unittest/test_utilities.cpp
+++ b/src/unittest/test_utilities.cpp
@@ -247,8 +247,8 @@ void TestUtilities::testStartsWith()
 
 void TestUtilities::testStrEqual()
 {
-	UASSERT(str_equal(narrow_to_wide("abc"), narrow_to_wide("abc")));
-	UASSERT(str_equal(narrow_to_wide("ABC"), narrow_to_wide("abc"), true));
+	UASSERT(str_equal(utf8_to_wide("abc"), utf8_to_wide("abc")));
+	UASSERT(str_equal(utf8_to_wide("ABC"), utf8_to_wide("abc"), true));
 }
 
 
@@ -302,9 +302,18 @@ void TestUtilities::testAsciiPrintableHelper()
 
 void TestUtilities::testUTF8()
 {
-	UASSERT(wide_to_utf8(utf8_to_wide("")) == "");
-	UASSERT(wide_to_utf8(utf8_to_wide("the shovel dug a crumbly node!"))
-		== "the shovel dug a crumbly node!");
+	UASSERT(utf8_to_wide("¤") == L"¤");
+
+	UASSERT(wide_to_utf8(L"¤") == "¤");
+
+	UASSERTEQ(std::string, wide_to_utf8(utf8_to_wide("")), "");
+	UASSERTEQ(std::string, wide_to_utf8(utf8_to_wide("the shovel dug a crumbly node!")),
+		"the shovel dug a crumbly node!");
+	UASSERTEQ(std::string, wide_to_utf8(utf8_to_wide("-ä-")),
+		"-ä-");
+	UASSERTEQ(std::string, wide_to_utf8(utf8_to_wide("-\xF0\xA0\x80\x8B-")),
+		"-\xF0\xA0\x80\x8B-");
+
 }
 
 void TestUtilities::testRemoveEscapes()
diff --git a/src/util/Optional.h b/src/util/Optional.h
new file mode 100644
index 000000000..9c2842b43
--- /dev/null
+++ b/src/util/Optional.h
@@ -0,0 +1,77 @@
+/*
+Minetest
+Copyright (C) 2021  rubenwardy
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+#include "debug.h"
+
+struct nullopt_t
+{
+};
+constexpr nullopt_t nullopt{};
+
+/**
+ * An implementation of optional for C++11, which aims to be
+ * compatible with a subset of std::optional features.
+ *
+ * Unfortunately, Minetest doesn't use C++17 yet.
+ *
+ * @tparam T The type to be stored
+ */
+template <typename T>
+class Optional
+{
+	bool m_has_value = false;
+	T m_value;
+
+public:
+	Optional() noexcept {}
+	Optional(nullopt_t) noexcept {}
+	Optional(const T &value) noexcept : m_has_value(true), m_value(value) {}
+	Optional(const Optional<T> &other) noexcept :
+			m_has_value(other.m_has_value), m_value(other.m_value)
+	{
+	}
+
+	void operator=(nullopt_t) noexcept { m_has_value = false; }
+
+	void operator=(const Optional<T> &other) noexcept
+	{
+		m_has_value = other.m_has_value;
+		m_value = other.m_value;
+	}
+
+	T &value()
+	{
+		FATAL_ERROR_IF(!m_has_value, "optional doesn't have value");
+		return m_value;
+	}
+
+	const T &value() const
+	{
+		FATAL_ERROR_IF(!m_has_value, "optional doesn't have value");
+		return m_value;
+	}
+
+	const T &value_or(const T &def) const { return m_has_value ? m_value : def; }
+
+	bool has_value() const noexcept { return m_has_value; }
+
+	explicit operator bool() const { return m_has_value; }
+};
diff --git a/src/util/areastore.cpp b/src/util/areastore.cpp
index cea526336..67bfef0c0 100644
--- a/src/util/areastore.cpp
+++ b/src/util/areastore.cpp
@@ -96,16 +96,15 @@ void AreaStore::deserialize(std::istream &is)
 
 	u16 num_areas = readU16(is);
 	std::vector<Area> areas;
+	areas.reserve(num_areas);
 	for (u32 i = 0; i < num_areas; ++i) {
 		Area a(U32_MAX);
 		a.minedge = readV3S16(is);
 		a.maxedge = readV3S16(is);
 		u16 data_len = readU16(is);
-		char *data = new char[data_len];
-		is.read(data, data_len);
-		a.data = std::string(data, data_len);
-		areas.emplace_back(a);
-		delete [] data;
+		a.data = std::string(data_len, '\0');
+		is.read(&a.data[0], data_len);
+		areas.emplace_back(std::move(a));
 	}
 
 	bool read_ids = is.good(); // EOF for old formats
diff --git a/src/util/container.h b/src/util/container.h
index 2ad2bbfc7..1c4a219f0 100644
--- a/src/util/container.h
+++ b/src/util/container.h
@@ -90,8 +90,7 @@ public:
 	bool get(const Key &name, Value *result) const
 	{
 		MutexAutoLock lock(m_mutex);
-		typename std::map<Key, Value>::const_iterator n =
-			m_values.find(name);
+		auto n = m_values.find(name);
 		if (n == m_values.end())
 			return false;
 		if (result)
@@ -103,11 +102,9 @@ public:
 	{
 		MutexAutoLock lock(m_mutex);
 		std::vector<Value> result;
-		for (typename std::map<Key, Value>::const_iterator
-				it = m_values.begin();
-				it != m_values.end(); ++it){
+		result.reserve(m_values.size());
+		for (auto it = m_values.begin(); it != m_values.end(); ++it)
 			result.push_back(it->second);
-		}
 		return result;
 	}
 
@@ -136,7 +133,7 @@ public:
 		return m_queue.empty();
 	}
 
-	void push_back(T t)
+	void push_back(const T &t)
 	{
 		MutexAutoLock lock(m_mutex);
 		m_queue.push_back(t);
@@ -151,7 +148,7 @@ public:
 		if (m_signal.wait(wait_time_max_ms)) {
 			MutexAutoLock lock(m_mutex);
 
-			T t = m_queue.front();
+			T t = std::move(m_queue.front());
 			m_queue.pop_front();
 			return t;
 		}
@@ -164,7 +161,7 @@ public:
 		if (m_signal.wait(wait_time_max_ms)) {
 			MutexAutoLock lock(m_mutex);
 
-			T t = m_queue.front();
+			T t = std::move(m_queue.front());
 			m_queue.pop_front();
 			return t;
 		}
@@ -178,7 +175,7 @@ public:
 
 		MutexAutoLock lock(m_mutex);
 
-		T t = m_queue.front();
+		T t = std::move(m_queue.front());
 		m_queue.pop_front();
 		return t;
 	}
@@ -188,7 +185,7 @@ public:
 		if (m_signal.wait(wait_time_max_ms)) {
 			MutexAutoLock lock(m_mutex);
 
-			T t = m_queue.back();
+			T t = std::move(m_queue.back());
 			m_queue.pop_back();
 			return t;
 		}
@@ -204,7 +201,7 @@ public:
 		if (m_signal.wait(wait_time_max_ms)) {
 			MutexAutoLock lock(m_mutex);
 
-			T t = m_queue.back();
+			T t = std::move(m_queue.back());
 			m_queue.pop_back();
 			return t;
 		}
@@ -218,7 +215,7 @@ public:
 
 		MutexAutoLock lock(m_mutex);
 
-		T t = m_queue.back();
+		T t = std::move(m_queue.back());
 		m_queue.pop_back();
 		return t;
 	}
diff --git a/src/util/enriched_string.cpp b/src/util/enriched_string.cpp
index 762d094eb..b1f95215e 100644
--- a/src/util/enriched_string.cpp
+++ b/src/util/enriched_string.cpp
@@ -65,12 +65,14 @@ void EnrichedString::operator=(const wchar_t *str)
 	addAtEnd(translate_string(std::wstring(str)), m_default_color);
 }
 
-void EnrichedString::addAtEnd(const std::wstring &s, const SColor &initial_color)
+void EnrichedString::addAtEnd(const std::wstring &s, SColor initial_color)
 {
 	SColor color(initial_color);
 	bool use_default = (m_default_length == m_string.size() &&
 		color == m_default_color);
 
+	m_colors.reserve(m_colors.size() + s.size());
+
 	size_t i = 0;
 	while (i < s.length()) {
 		if (s[i] != L'\x1b') {
@@ -200,12 +202,6 @@ const std::wstring &EnrichedString::getString() const
 	return m_string;
 }
 
-void EnrichedString::setDefaultColor(const irr::video::SColor &color)
-{
-	m_default_color = color;
-	updateDefaultColor();
-}
-
 void EnrichedString::updateDefaultColor()
 {
 	sanity_check(m_default_length <= m_colors.size());
diff --git a/src/util/enriched_string.h b/src/util/enriched_string.h
index c8a095887..16a0eef74 100644
--- a/src/util/enriched_string.h
+++ b/src/util/enriched_string.h
@@ -23,18 +23,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <vector>
 #include <SColor.h>
 
+using namespace irr;
+
 class EnrichedString {
 public:
 	EnrichedString();
 	EnrichedString(const std::wstring &s,
-		const irr::video::SColor &color = irr::video::SColor(255, 255, 255, 255));
+		const video::SColor &color = video::SColor(255, 255, 255, 255));
 	EnrichedString(const wchar_t *str,
-		const irr::video::SColor &color = irr::video::SColor(255, 255, 255, 255));
+		const video::SColor &color = video::SColor(255, 255, 255, 255));
 	EnrichedString(const std::wstring &string,
-		const std::vector<irr::video::SColor> &colors);
-	void clear();
+		const std::vector<video::SColor> &colors);
 	void operator=(const wchar_t *str);
-	void addAtEnd(const std::wstring &s, const irr::video::SColor &color);
+
+	void clear();
+
+	void addAtEnd(const std::wstring &s, video::SColor color);
 
 	// Adds the character source[i] at the end.
 	// An EnrichedString should always be able to be copied
@@ -49,12 +53,16 @@ public:
 	EnrichedString operator+(const EnrichedString &other) const;
 	void operator+=(const EnrichedString &other);
 	const wchar_t *c_str() const;
-	const std::vector<irr::video::SColor> &getColors() const;
+	const std::vector<video::SColor> &getColors() const;
 	const std::wstring &getString() const;
 
-	void setDefaultColor(const irr::video::SColor &color);
+	inline void setDefaultColor(video::SColor color)
+	{
+		m_default_color = color;
+		updateDefaultColor();
+	}
 	void updateDefaultColor();
-	inline const irr::video::SColor &getDefaultColor() const
+	inline const video::SColor &getDefaultColor() const
 	{
 		return m_default_color;
 	}
@@ -80,11 +88,11 @@ public:
 	{
 		return m_has_background;
 	}
-	inline irr::video::SColor getBackground() const
+	inline video::SColor getBackground() const
 	{
 		return m_background;
 	}
-	inline void setBackground(const irr::video::SColor &color)
+	inline void setBackground(video::SColor color)
 	{
 		m_background = color;
 		m_has_background = true;
@@ -92,10 +100,10 @@ public:
 
 private:
 	std::wstring m_string;
-	std::vector<irr::video::SColor> m_colors;
+	std::vector<video::SColor> m_colors;
 	bool m_has_background;
-	irr::video::SColor m_default_color;
-	irr::video::SColor m_background;
+	video::SColor m_default_color;
+	video::SColor m_background;
 	// This variable defines the length of the default-colored text.
 	// Change this to a std::vector if an "end coloring" tag is wanted.
 	size_t m_default_length = 0;
diff --git a/src/util/numeric.cpp b/src/util/numeric.cpp
index 1af3f66be..99e4cfb5c 100644
--- a/src/util/numeric.cpp
+++ b/src/util/numeric.cpp
@@ -106,10 +106,6 @@ u64 murmur_hash_64_ua(const void *key, int len, unsigned int seed)
 bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
 		f32 camera_fov, f32 range, f32 *distance_ptr)
 {
-	// Maximum radius of a block.  The magic number is
-	// sqrt(3.0) / 2.0 in literal form.
-	static constexpr const f32 block_max_radius = 0.866025403784f * MAP_BLOCKSIZE * BS;
-
 	v3s16 blockpos_nodes = blockpos_b * MAP_BLOCKSIZE;
 
 	// Block center position
@@ -123,7 +119,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
 	v3f blockpos_relative = blockpos - camera_pos;
 
 	// Total distance
-	f32 d = MYMAX(0, blockpos_relative.getLength() - block_max_radius);
+	f32 d = MYMAX(0, blockpos_relative.getLength() - BLOCK_MAX_RADIUS);
 
 	if (distance_ptr)
 		*distance_ptr = d;
@@ -141,7 +137,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
 	// such that a block that has any portion visible with the
 	// current camera position will have the center visible at the
 	// adjusted postion
-	f32 adjdist = block_max_radius / cos((M_PI - camera_fov) / 2);
+	f32 adjdist = BLOCK_MAX_RADIUS / cos((M_PI - camera_fov) / 2);
 
 	// Block position relative to adjusted camera
 	v3f blockpos_adj = blockpos - (camera_pos - camera_dir * adjdist);
diff --git a/src/util/numeric.h b/src/util/numeric.h
index 864ab7543..32a6f4312 100644
--- a/src/util/numeric.h
+++ b/src/util/numeric.h
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 
 #include "basic_macros.h"
+#include "constants.h"
 #include "irrlichttypes.h"
 #include "irr_v2d.h"
 #include "irr_v3d.h"
@@ -36,6 +37,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	y = temp; \
 } while (0)
 
+// Maximum radius of a block.  The magic number is
+// sqrt(3.0) / 2.0 in literal form.
+static constexpr const f32 BLOCK_MAX_RADIUS = 0.866025403784f * MAP_BLOCKSIZE * BS;
 
 inline s16 getContainerPos(s16 p, s16 d)
 {
diff --git a/src/util/serialize.h b/src/util/serialize.h
index b3ec28eab..15bdd050d 100644
--- a/src/util/serialize.h
+++ b/src/util/serialize.h
@@ -290,7 +290,7 @@ inline void writeS8(u8 *data, s8 i)
 
 inline void writeS16(u8 *data, s16 i)
 {
-	writeU16(data, (u16)i); 
+	writeU16(data, (u16)i);
 }
 
 inline void writeS32(u8 *data, s32 i)
diff --git a/src/util/string.cpp b/src/util/string.cpp
index 3ac3b8cf0..eec5ab4cd 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <array>
 #include <sstream>
 #include <iomanip>
-#include <map>
+#include <unordered_map>
 
 #ifndef _WIN32
 	#include <iconv.h>
@@ -44,14 +44,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#define BSD_ICONV_USED
 #endif
 
-static bool parseHexColorString(const std::string &value, video::SColor &color,
-		unsigned char default_alpha = 0xff);
-static bool parseNamedColorString(const std::string &value, video::SColor &color);
-
 #ifndef _WIN32
 
-bool convert(const char *to, const char *from, char *outbuf,
-		size_t outbuf_size, char *inbuf, size_t inbuf_size)
+static bool convert(const char *to, const char *from, char *outbuf,
+		size_t *outbuf_size, char *inbuf, size_t inbuf_size)
 {
 	iconv_t cd = iconv_open(to, from);
 
@@ -60,15 +56,14 @@ bool convert(const char *to, const char *from, char *outbuf,
 #else
 	char *inbuf_ptr = inbuf;
 #endif
-
 	char *outbuf_ptr = outbuf;
 
 	size_t *inbuf_left_ptr = &inbuf_size;
-	size_t *outbuf_left_ptr = &outbuf_size;
 
+	const size_t old_outbuf_size = *outbuf_size;
 	size_t old_size = inbuf_size;
 	while (inbuf_size > 0) {
-		iconv(cd, &inbuf_ptr, inbuf_left_ptr, &outbuf_ptr, outbuf_left_ptr);
+		iconv(cd, &inbuf_ptr, inbuf_left_ptr, &outbuf_ptr, outbuf_size);
 		if (inbuf_size == old_size) {
 			iconv_close(cd);
 			return false;
@@ -77,11 +72,12 @@ bool convert(const char *to, const char *from, char *outbuf,
 	}
 
 	iconv_close(cd);
+	*outbuf_size = old_outbuf_size - *outbuf_size;
 	return true;
 }
 
 #ifdef __ANDROID__
-// Android need manual caring to support the full character set possible with wchar_t
+// On Android iconv disagrees how big a wchar_t is for whatever reason
 const char *DEFAULT_ENCODING = "UTF-32LE";
 #else
 const char *DEFAULT_ENCODING = "WCHAR_T";
@@ -89,58 +85,52 @@ const char *DEFAULT_ENCODING = "WCHAR_T";
 
 std::wstring utf8_to_wide(const std::string &input)
 {
-	size_t inbuf_size = input.length() + 1;
+	const size_t inbuf_size = input.length();
 	// maximum possible size, every character is sizeof(wchar_t) bytes
-	size_t outbuf_size = (input.length() + 1) * sizeof(wchar_t);
+	size_t outbuf_size = input.length() * sizeof(wchar_t);
 
-	char *inbuf = new char[inbuf_size];
+	char *inbuf = new char[inbuf_size]; // intentionally NOT null-terminated
 	memcpy(inbuf, input.c_str(), inbuf_size);
-	char *outbuf = new char[outbuf_size];
-	memset(outbuf, 0, outbuf_size);
+	std::wstring out;
+	out.resize(outbuf_size / sizeof(wchar_t));
 
 #ifdef __ANDROID__
-	// Android need manual caring to support the full character set possible with wchar_t
 	SANITY_CHECK(sizeof(wchar_t) == 4);
 #endif
 
-	if (!convert(DEFAULT_ENCODING, "UTF-8", outbuf, outbuf_size, inbuf, inbuf_size)) {
+	char *outbuf = reinterpret_cast<char*>(&out[0]);
+	if (!convert(DEFAULT_ENCODING, "UTF-8", outbuf, &outbuf_size, inbuf, inbuf_size)) {
 		infostream << "Couldn't convert UTF-8 string 0x" << hex_encode(input)
 			<< " into wstring" << std::endl;
 		delete[] inbuf;
-		delete[] outbuf;
 		return L"<invalid UTF-8 string>";
 	}
-	std::wstring out((wchar_t *)outbuf);
-
 	delete[] inbuf;
-	delete[] outbuf;
 
+	out.resize(outbuf_size / sizeof(wchar_t));
 	return out;
 }
 
 std::string wide_to_utf8(const std::wstring &input)
 {
-	size_t inbuf_size = (input.length() + 1) * sizeof(wchar_t);
-	// maximum possible size: utf-8 encodes codepoints using 1 up to 6 bytes
-	size_t outbuf_size = (input.length() + 1) * 6;
+	const size_t inbuf_size = input.length() * sizeof(wchar_t);
+	// maximum possible size: utf-8 encodes codepoints using 1 up to 4 bytes
+	size_t outbuf_size = input.length() * 4;
 
-	char *inbuf = new char[inbuf_size];
+	char *inbuf = new char[inbuf_size]; // intentionally NOT null-terminated
 	memcpy(inbuf, input.c_str(), inbuf_size);
-	char *outbuf = new char[outbuf_size];
-	memset(outbuf, 0, outbuf_size);
+	std::string out;
+	out.resize(outbuf_size);
 
-	if (!convert("UTF-8", DEFAULT_ENCODING, outbuf, outbuf_size, inbuf, inbuf_size)) {
+	if (!convert("UTF-8", DEFAULT_ENCODING, &out[0], &outbuf_size, inbuf, inbuf_size)) {
 		infostream << "Couldn't convert wstring 0x" << hex_encode(inbuf, inbuf_size)
 			<< " into UTF-8 string" << std::endl;
 		delete[] inbuf;
-		delete[] outbuf;
-		return "<invalid wstring>";
+		return "<invalid wide string>";
 	}
-	std::string out(outbuf);
-
 	delete[] inbuf;
-	delete[] outbuf;
 
+	out.resize(outbuf_size);
 	return out;
 }
 
@@ -172,74 +162,15 @@ std::string wide_to_utf8(const std::wstring &input)
 
 #endif // _WIN32
 
-// You must free the returned string!
-// The returned string is allocated using new
 wchar_t *utf8_to_wide_c(const char *str)
 {
 	std::wstring ret = utf8_to_wide(std::string(str));
 	size_t len = ret.length();
 	wchar_t *ret_c = new wchar_t[len + 1];
-	memset(ret_c, 0, (len + 1) * sizeof(wchar_t));
-	memcpy(ret_c, ret.c_str(), len * sizeof(wchar_t));
+	memcpy(ret_c, ret.c_str(), (len + 1) * sizeof(wchar_t));
 	return ret_c;
 }
 
-// You must free the returned string!
-// The returned string is allocated using new
-wchar_t *narrow_to_wide_c(const char *str)
-{
-	wchar_t *nstr = nullptr;
-#if defined(_WIN32)
-	int nResult = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR) str, -1, 0, 0);
-	if (nResult == 0) {
-		errorstream<<"gettext: MultiByteToWideChar returned null"<<std::endl;
-	} else {
-		nstr = new wchar_t[nResult];
-		MultiByteToWideChar(CP_UTF8, 0, (LPCSTR) str, -1, (WCHAR *) nstr, nResult);
-	}
-#else
-	size_t len = strlen(str);
-	nstr = new wchar_t[len + 1];
-
-	std::wstring intermediate = narrow_to_wide(str);
-	memset(nstr, 0, (len + 1) * sizeof(wchar_t));
-	memcpy(nstr, intermediate.c_str(), len * sizeof(wchar_t));
-#endif
-
-	return nstr;
-}
-
-std::wstring narrow_to_wide(const std::string &mbs) {
-#ifdef __ANDROID__
-	return utf8_to_wide(mbs);
-#else
-	size_t wcl = mbs.size();
-	Buffer<wchar_t> wcs(wcl + 1);
-	size_t len = mbstowcs(*wcs, mbs.c_str(), wcl);
-	if (len == (size_t)(-1))
-		return L"<invalid multibyte string>";
-	wcs[len] = 0;
-	return *wcs;
-#endif
-}
-
-
-std::string wide_to_narrow(const std::wstring &wcs)
-{
-#ifdef __ANDROID__
-	return wide_to_utf8(wcs);
-#else
-	size_t mbl = wcs.size() * 4;
-	SharedBuffer<char> mbs(mbl+1);
-	size_t len = wcstombs(*mbs, wcs.c_str(), mbl);
-	if (len == (size_t)(-1))
-		return "Character conversion failed!";
-
-	mbs[len] = 0;
-	return *mbs;
-#endif
-}
-
 
 std::string urlencode(const std::string &str)
 {
@@ -389,29 +320,10 @@ u64 read_seed(const char *str)
 	return num;
 }
 
-bool parseColorString(const std::string &value, video::SColor &color, bool quiet,
-		unsigned char default_alpha)
-{
-	bool success;
-
-	if (value[0] == '#')
-		success = parseHexColorString(value, color, default_alpha);
-	else
-		success = parseNamedColorString(value, color);
-
-	if (!success && !quiet)
-		errorstream << "Invalid color: \"" << value << "\"" << std::endl;
-
-	return success;
-}
-
 static bool parseHexColorString(const std::string &value, video::SColor &color,
 		unsigned char default_alpha)
 {
-	unsigned char components[] = { 0x00, 0x00, 0x00, default_alpha }; // R,G,B,A
-
-	if (value[0] != '#')
-		return false;
+	u8 components[] = {0x00, 0x00, 0x00, default_alpha}; // R,G,B,A
 
 	size_t len = value.size();
 	bool short_form;
@@ -423,198 +335,182 @@ static bool parseHexColorString(const std::string &value, video::SColor &color,
 	else
 		return false;
 
-	bool success = true;
-
 	for (size_t pos = 1, cc = 0; pos < len; pos++, cc++) {
-		assert(cc < sizeof components / sizeof components[0]);
 		if (short_form) {
-			unsigned char d;
-			if (!hex_digit_decode(value[pos], d)) {
-				success = false;
-				break;
-			}
+			u8 d;
+			if (!hex_digit_decode(value[pos], d))
+				return false;
+
 			components[cc] = (d & 0xf) << 4 | (d & 0xf);
 		} else {
-			unsigned char d1, d2;
+			u8 d1, d2;
 			if (!hex_digit_decode(value[pos], d1) ||
-					!hex_digit_decode(value[pos+1], d2)) {
-				success = false;
-				break;
-			}
+					!hex_digit_decode(value[pos+1], d2))
+				return false;
+
 			components[cc] = (d1 & 0xf) << 4 | (d2 & 0xf);
-			pos++;	// skip the second digit -- it's already used
+			pos++; // skip the second digit -- it's already used
 		}
 	}
 
-	if (success) {
-		color.setRed(components[0]);
-		color.setGreen(components[1]);
-		color.setBlue(components[2]);
-		color.setAlpha(components[3]);
-	}
+	color.setRed(components[0]);
+	color.setGreen(components[1]);
+	color.setBlue(components[2]);
+	color.setAlpha(components[3]);
 
-	return success;
+	return true;
 }
 
-struct ColorContainer {
-	ColorContainer();
-	std::map<const std::string, u32> colors;
+const static std::unordered_map<std::string, u32> s_named_colors = {
+	{"aliceblue",            0xf0f8ff},
+	{"antiquewhite",         0xfaebd7},
+	{"aqua",                 0x00ffff},
+	{"aquamarine",           0x7fffd4},
+	{"azure",                0xf0ffff},
+	{"beige",                0xf5f5dc},
+	{"bisque",               0xffe4c4},
+	{"black",                00000000},
+	{"blanchedalmond",       0xffebcd},
+	{"blue",                 0x0000ff},
+	{"blueviolet",           0x8a2be2},
+	{"brown",                0xa52a2a},
+	{"burlywood",            0xdeb887},
+	{"cadetblue",            0x5f9ea0},
+	{"chartreuse",           0x7fff00},
+	{"chocolate",            0xd2691e},
+	{"coral",                0xff7f50},
+	{"cornflowerblue",       0x6495ed},
+	{"cornsilk",             0xfff8dc},
+	{"crimson",              0xdc143c},
+	{"cyan",                 0x00ffff},
+	{"darkblue",             0x00008b},
+	{"darkcyan",             0x008b8b},
+	{"darkgoldenrod",        0xb8860b},
+	{"darkgray",             0xa9a9a9},
+	{"darkgreen",            0x006400},
+	{"darkgrey",             0xa9a9a9},
+	{"darkkhaki",            0xbdb76b},
+	{"darkmagenta",          0x8b008b},
+	{"darkolivegreen",       0x556b2f},
+	{"darkorange",           0xff8c00},
+	{"darkorchid",           0x9932cc},
+	{"darkred",              0x8b0000},
+	{"darksalmon",           0xe9967a},
+	{"darkseagreen",         0x8fbc8f},
+	{"darkslateblue",        0x483d8b},
+	{"darkslategray",        0x2f4f4f},
+	{"darkslategrey",        0x2f4f4f},
+	{"darkturquoise",        0x00ced1},
+	{"darkviolet",           0x9400d3},
+	{"deeppink",             0xff1493},
+	{"deepskyblue",          0x00bfff},
+	{"dimgray",              0x696969},
+	{"dimgrey",              0x696969},
+	{"dodgerblue",           0x1e90ff},
+	{"firebrick",            0xb22222},
+	{"floralwhite",          0xfffaf0},
+	{"forestgreen",          0x228b22},
+	{"fuchsia",              0xff00ff},
+	{"gainsboro",            0xdcdcdc},
+	{"ghostwhite",           0xf8f8ff},
+	{"gold",                 0xffd700},
+	{"goldenrod",            0xdaa520},
+	{"gray",                 0x808080},
+	{"green",                0x008000},
+	{"greenyellow",          0xadff2f},
+	{"grey",                 0x808080},
+	{"honeydew",             0xf0fff0},
+	{"hotpink",              0xff69b4},
+	{"indianred",            0xcd5c5c},
+	{"indigo",               0x4b0082},
+	{"ivory",                0xfffff0},
+	{"khaki",                0xf0e68c},
+	{"lavender",             0xe6e6fa},
+	{"lavenderblush",        0xfff0f5},
+	{"lawngreen",            0x7cfc00},
+	{"lemonchiffon",         0xfffacd},
+	{"lightblue",            0xadd8e6},
+	{"lightcoral",           0xf08080},
+	{"lightcyan",            0xe0ffff},
+	{"lightgoldenrodyellow", 0xfafad2},
+	{"lightgray",            0xd3d3d3},
+	{"lightgreen",           0x90ee90},
+	{"lightgrey",            0xd3d3d3},
+	{"lightpink",            0xffb6c1},
+	{"lightsalmon",          0xffa07a},
+	{"lightseagreen",        0x20b2aa},
+	{"lightskyblue",         0x87cefa},
+	{"lightslategray",       0x778899},
+	{"lightslategrey",       0x778899},
+	{"lightsteelblue",       0xb0c4de},
+	{"lightyellow",          0xffffe0},
+	{"lime",                 0x00ff00},
+	{"limegreen",            0x32cd32},
+	{"linen",                0xfaf0e6},
+	{"magenta",              0xff00ff},
+	{"maroon",               0x800000},
+	{"mediumaquamarine",     0x66cdaa},
+	{"mediumblue",           0x0000cd},
+	{"mediumorchid",         0xba55d3},
+	{"mediumpurple",         0x9370db},
+	{"mediumseagreen",       0x3cb371},
+	{"mediumslateblue",      0x7b68ee},
+	{"mediumspringgreen",    0x00fa9a},
+	{"mediumturquoise",      0x48d1cc},
+	{"mediumvioletred",      0xc71585},
+	{"midnightblue",         0x191970},
+	{"mintcream",            0xf5fffa},
+	{"mistyrose",            0xffe4e1},
+	{"moccasin",             0xffe4b5},
+	{"navajowhite",          0xffdead},
+	{"navy",                 0x000080},
+	{"oldlace",              0xfdf5e6},
+	{"olive",                0x808000},
+	{"olivedrab",            0x6b8e23},
+	{"orange",               0xffa500},
+	{"orangered",            0xff4500},
+	{"orchid",               0xda70d6},
+	{"palegoldenrod",        0xeee8aa},
+	{"palegreen",            0x98fb98},
+	{"paleturquoise",        0xafeeee},
+	{"palevioletred",        0xdb7093},
+	{"papayawhip",           0xffefd5},
+	{"peachpuff",            0xffdab9},
+	{"peru",                 0xcd853f},
+	{"pink",                 0xffc0cb},
+	{"plum",                 0xdda0dd},
+	{"powderblue",           0xb0e0e6},
+	{"purple",               0x800080},
+	{"red",                  0xff0000},
+	{"rosybrown",            0xbc8f8f},
+	{"royalblue",            0x4169e1},
+	{"saddlebrown",          0x8b4513},
+	{"salmon",               0xfa8072},
+	{"sandybrown",           0xf4a460},
+	{"seagreen",             0x2e8b57},
+	{"seashell",             0xfff5ee},
+	{"sienna",               0xa0522d},
+	{"silver",               0xc0c0c0},
+	{"skyblue",              0x87ceeb},
+	{"slateblue",            0x6a5acd},
+	{"slategray",            0x708090},
+	{"slategrey",            0x708090},
+	{"snow",                 0xfffafa},
+	{"springgreen",          0x00ff7f},
+	{"steelblue",            0x4682b4},
+	{"tan",                  0xd2b48c},
+	{"teal",                 0x008080},
+	{"thistle",              0xd8bfd8},
+	{"tomato",               0xff6347},
+	{"turquoise",            0x40e0d0},
+	{"violet",               0xee82ee},
+	{"wheat",                0xf5deb3},
+	{"white",                0xffffff},
+	{"whitesmoke",           0xf5f5f5},
+	{"yellow",               0xffff00},
+	{"yellowgreen",          0x9acd32}
 };
 
-ColorContainer::ColorContainer()
-{
-	colors["aliceblue"]              = 0xf0f8ff;
-	colors["antiquewhite"]           = 0xfaebd7;
-	colors["aqua"]                   = 0x00ffff;
-	colors["aquamarine"]             = 0x7fffd4;
-	colors["azure"]                  = 0xf0ffff;
-	colors["beige"]                  = 0xf5f5dc;
-	colors["bisque"]                 = 0xffe4c4;
-	colors["black"]                  = 00000000;
-	colors["blanchedalmond"]         = 0xffebcd;
-	colors["blue"]                   = 0x0000ff;
-	colors["blueviolet"]             = 0x8a2be2;
-	colors["brown"]                  = 0xa52a2a;
-	colors["burlywood"]              = 0xdeb887;
-	colors["cadetblue"]              = 0x5f9ea0;
-	colors["chartreuse"]             = 0x7fff00;
-	colors["chocolate"]              = 0xd2691e;
-	colors["coral"]                  = 0xff7f50;
-	colors["cornflowerblue"]         = 0x6495ed;
-	colors["cornsilk"]               = 0xfff8dc;
-	colors["crimson"]                = 0xdc143c;
-	colors["cyan"]                   = 0x00ffff;
-	colors["darkblue"]               = 0x00008b;
-	colors["darkcyan"]               = 0x008b8b;
-	colors["darkgoldenrod"]          = 0xb8860b;
-	colors["darkgray"]               = 0xa9a9a9;
-	colors["darkgreen"]              = 0x006400;
-	colors["darkgrey"]               = 0xa9a9a9;
-	colors["darkkhaki"]              = 0xbdb76b;
-	colors["darkmagenta"]            = 0x8b008b;
-	colors["darkolivegreen"]         = 0x556b2f;
-	colors["darkorange"]             = 0xff8c00;
-	colors["darkorchid"]             = 0x9932cc;
-	colors["darkred"]                = 0x8b0000;
-	colors["darksalmon"]             = 0xe9967a;
-	colors["darkseagreen"]           = 0x8fbc8f;
-	colors["darkslateblue"]          = 0x483d8b;
-	colors["darkslategray"]          = 0x2f4f4f;
-	colors["darkslategrey"]          = 0x2f4f4f;
-	colors["darkturquoise"]          = 0x00ced1;
-	colors["darkviolet"]             = 0x9400d3;
-	colors["deeppink"]               = 0xff1493;
-	colors["deepskyblue"]            = 0x00bfff;
-	colors["dimgray"]                = 0x696969;
-	colors["dimgrey"]                = 0x696969;
-	colors["dodgerblue"]             = 0x1e90ff;
-	colors["firebrick"]              = 0xb22222;
-	colors["floralwhite"]            = 0xfffaf0;
-	colors["forestgreen"]            = 0x228b22;
-	colors["fuchsia"]                = 0xff00ff;
-	colors["gainsboro"]              = 0xdcdcdc;
-	colors["ghostwhite"]             = 0xf8f8ff;
-	colors["gold"]                   = 0xffd700;
-	colors["goldenrod"]              = 0xdaa520;
-	colors["gray"]                   = 0x808080;
-	colors["green"]                  = 0x008000;
-	colors["greenyellow"]            = 0xadff2f;
-	colors["grey"]                   = 0x808080;
-	colors["honeydew"]               = 0xf0fff0;
-	colors["hotpink"]                = 0xff69b4;
-	colors["indianred"]              = 0xcd5c5c;
-	colors["indigo"]                 = 0x4b0082;
-	colors["ivory"]                  = 0xfffff0;
-	colors["khaki"]                  = 0xf0e68c;
-	colors["lavender"]               = 0xe6e6fa;
-	colors["lavenderblush"]          = 0xfff0f5;
-	colors["lawngreen"]              = 0x7cfc00;
-	colors["lemonchiffon"]           = 0xfffacd;
-	colors["lightblue"]              = 0xadd8e6;
-	colors["lightcoral"]             = 0xf08080;
-	colors["lightcyan"]              = 0xe0ffff;
-	colors["lightgoldenrodyellow"]   = 0xfafad2;
-	colors["lightgray"]              = 0xd3d3d3;
-	colors["lightgreen"]             = 0x90ee90;
-	colors["lightgrey"]              = 0xd3d3d3;
-	colors["lightpink"]              = 0xffb6c1;
-	colors["lightsalmon"]            = 0xffa07a;
-	colors["lightseagreen"]          = 0x20b2aa;
-	colors["lightskyblue"]           = 0x87cefa;
-	colors["lightslategray"]         = 0x778899;
-	colors["lightslategrey"]         = 0x778899;
-	colors["lightsteelblue"]         = 0xb0c4de;
-	colors["lightyellow"]            = 0xffffe0;
-	colors["lime"]                   = 0x00ff00;
-	colors["limegreen"]              = 0x32cd32;
-	colors["linen"]                  = 0xfaf0e6;
-	colors["magenta"]                = 0xff00ff;
-	colors["maroon"]                 = 0x800000;
-	colors["mediumaquamarine"]       = 0x66cdaa;
-	colors["mediumblue"]             = 0x0000cd;
-	colors["mediumorchid"]           = 0xba55d3;
-	colors["mediumpurple"]           = 0x9370db;
-	colors["mediumseagreen"]         = 0x3cb371;
-	colors["mediumslateblue"]        = 0x7b68ee;
-	colors["mediumspringgreen"]      = 0x00fa9a;
-	colors["mediumturquoise"]        = 0x48d1cc;
-	colors["mediumvioletred"]        = 0xc71585;
-	colors["midnightblue"]           = 0x191970;
-	colors["mintcream"]              = 0xf5fffa;
-	colors["mistyrose"]              = 0xffe4e1;
-	colors["moccasin"]               = 0xffe4b5;
-	colors["navajowhite"]            = 0xffdead;
-	colors["navy"]                   = 0x000080;
-	colors["oldlace"]                = 0xfdf5e6;
-	colors["olive"]                  = 0x808000;
-	colors["olivedrab"]              = 0x6b8e23;
-	colors["orange"]                 = 0xffa500;
-	colors["orangered"]              = 0xff4500;
-	colors["orchid"]                 = 0xda70d6;
-	colors["palegoldenrod"]          = 0xeee8aa;
-	colors["palegreen"]              = 0x98fb98;
-	colors["paleturquoise"]          = 0xafeeee;
-	colors["palevioletred"]          = 0xdb7093;
-	colors["papayawhip"]             = 0xffefd5;
-	colors["peachpuff"]              = 0xffdab9;
-	colors["peru"]                   = 0xcd853f;
-	colors["pink"]                   = 0xffc0cb;
-	colors["plum"]                   = 0xdda0dd;
-	colors["powderblue"]             = 0xb0e0e6;
-	colors["purple"]                 = 0x800080;
-	colors["red"]                    = 0xff0000;
-	colors["rosybrown"]              = 0xbc8f8f;
-	colors["royalblue"]              = 0x4169e1;
-	colors["saddlebrown"]            = 0x8b4513;
-	colors["salmon"]                 = 0xfa8072;
-	colors["sandybrown"]             = 0xf4a460;
-	colors["seagreen"]               = 0x2e8b57;
-	colors["seashell"]               = 0xfff5ee;
-	colors["sienna"]                 = 0xa0522d;
-	colors["silver"]                 = 0xc0c0c0;
-	colors["skyblue"]                = 0x87ceeb;
-	colors["slateblue"]              = 0x6a5acd;
-	colors["slategray"]              = 0x708090;
-	colors["slategrey"]              = 0x708090;
-	colors["snow"]                   = 0xfffafa;
-	colors["springgreen"]            = 0x00ff7f;
-	colors["steelblue"]              = 0x4682b4;
-	colors["tan"]                    = 0xd2b48c;
-	colors["teal"]                   = 0x008080;
-	colors["thistle"]                = 0xd8bfd8;
-	colors["tomato"]                 = 0xff6347;
-	colors["turquoise"]              = 0x40e0d0;
-	colors["violet"]                 = 0xee82ee;
-	colors["wheat"]                  = 0xf5deb3;
-	colors["white"]                  = 0xffffff;
-	colors["whitesmoke"]             = 0xf5f5f5;
-	colors["yellow"]                 = 0xffff00;
-	colors["yellowgreen"]            = 0x9acd32;
-
-}
-
-static const ColorContainer named_colors;
-
 static bool parseNamedColorString(const std::string &value, video::SColor &color)
 {
 	std::string color_name;
@@ -635,9 +531,8 @@ static bool parseNamedColorString(const std::string &value, video::SColor &color
 
 	color_name = lowercase(color_name);
 
-	std::map<const std::string, unsigned>::const_iterator it;
-	it = named_colors.colors.find(color_name);
-	if (it == named_colors.colors.end())
+	auto it = s_named_colors.find(color_name);
+	if (it == s_named_colors.end())
 		return false;
 
 	u32 color_temp = it->second;
@@ -645,21 +540,26 @@ static bool parseNamedColorString(const std::string &value, video::SColor &color
 	/* An empty string for alpha is ok (none of the color table entries
 	 * have an alpha value either). Color strings without an alpha specified
 	 * are interpreted as fully opaque
-	 *
-	 * For named colors the supplied alpha string (representing a hex value)
-	 * must be exactly two digits. For example:  colorname#08
 	 */
 	if (!alpha_string.empty()) {
-		if (alpha_string.length() != 2)
-			return false;
-
-		unsigned char d1, d2;
-		if (!hex_digit_decode(alpha_string.at(0), d1)
-				|| !hex_digit_decode(alpha_string.at(1), d2))
+		if (alpha_string.size() == 1) {
+			u8 d;
+			if (!hex_digit_decode(alpha_string[0], d))
+				return false;
+
+			color_temp |= ((d & 0xf) << 4 | (d & 0xf)) << 24;
+		} else if (alpha_string.size() == 2) {
+			u8 d1, d2;
+			if (!hex_digit_decode(alpha_string[0], d1)
+					|| !hex_digit_decode(alpha_string[1], d2))
+				return false;
+
+			color_temp |= ((d1 & 0xf) << 4 | (d2 & 0xf)) << 24;
+		} else {
 			return false;
-		color_temp |= ((d1 & 0xf) << 4 | (d2 & 0xf)) << 24;
+		}
 	} else {
-		color_temp |= 0xff << 24;  // Fully opaque
+		color_temp |= 0xff << 24; // Fully opaque
 	}
 
 	color = video::SColor(color_temp);
@@ -667,6 +567,22 @@ static bool parseNamedColorString(const std::string &value, video::SColor &color
 	return true;
 }
 
+bool parseColorString(const std::string &value, video::SColor &color, bool quiet,
+		unsigned char default_alpha)
+{
+	bool success;
+
+	if (value[0] == '#')
+		success = parseHexColorString(value, color, default_alpha);
+	else
+		success = parseNamedColorString(value, color);
+
+	if (!success && !quiet)
+		errorstream << "Invalid color: \"" << value << "\"" << std::endl;
+
+	return success;
+}
+
 void str_replace(std::string &str, char from, char to)
 {
 	std::replace(str.begin(), str.end(), from, to);
@@ -766,7 +682,8 @@ void translate_string(const std::wstring &s, Translations *translations,
 		} else {
 			// This is an escape sequence *inside* the template string to translate itself.
 			// This should not happen, show an error message.
-			errorstream << "Ignoring escape sequence '" << wide_to_narrow(escape_sequence) << "' in translation" << std::endl;
+			errorstream << "Ignoring escape sequence '"
+				<< wide_to_utf8(escape_sequence) << "' in translation" << std::endl;
 		}
 	}
 
diff --git a/src/util/string.h b/src/util/string.h
index 6fd11fadc..21f1d6877 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -64,22 +64,14 @@ struct FlagDesc {
 	u32 flag;
 };
 
-// try not to convert between wide/utf8 encodings; this can result in data loss
-// try to only convert between them when you need to input/output stuff via Irrlicht
+// Try to avoid converting between wide and UTF-8 unless you need to
+// input/output stuff via Irrlicht
 std::wstring utf8_to_wide(const std::string &input);
 std::string wide_to_utf8(const std::wstring &input);
 
-wchar_t *utf8_to_wide_c(const char *str);
-
-// NEVER use those two functions unless you have a VERY GOOD reason to
-// they just convert between wide and multibyte encoding
-// multibyte encoding depends on current locale, this is no good, especially on Windows
-
 // You must free the returned string!
-// The returned string is allocated using new
-wchar_t *narrow_to_wide_c(const char *str);
-std::wstring narrow_to_wide(const std::string &mbs);
-std::string wide_to_narrow(const std::wstring &wcs);
+// The returned string is allocated using new[]
+wchar_t *utf8_to_wide_c(const char *str);
 
 std::string urlencode(const std::string &str);
 std::string urldecode(const std::string &str);
@@ -353,11 +345,6 @@ inline s32 mystoi(const std::string &str, s32 min, s32 max)
 	return i;
 }
 
-
-// MSVC2010 includes it's own versions of these
-//#if !defined(_MSC_VER) || _MSC_VER < 1600
-
-
 /**
  * Returns a 32-bit value reprensented by the string \p str (decimal).
  * @see atoi(3) for further limitations
@@ -367,17 +354,6 @@ inline s32 mystoi(const std::string &str)
 	return atoi(str.c_str());
 }
 
-
-/**
- * Returns s 32-bit value represented by the wide string \p str (decimal).
- * @see atoi(3) for further limitations
- */
-inline s32 mystoi(const std::wstring &str)
-{
-	return mystoi(wide_to_narrow(str));
-}
-
-
 /**
  * Returns a float reprensented by the string \p str (decimal).
  * @see atof(3)
@@ -387,8 +363,6 @@ inline float mystof(const std::string &str)
 	return atof(str.c_str());
 }
 
-//#endif
-
 #define stoi mystoi
 #define stof mystof
 
@@ -696,15 +670,19 @@ inline const std::string duration_to_string(int sec)
 
 	std::stringstream ss;
 	if (hour > 0) {
-		ss << hour << "h ";
+		ss << hour << "h";
+		if (min > 0 || sec > 0)
+			ss << " ";
 	}
 
 	if (min > 0) {
-		ss << min << "m ";
+		ss << min << "min";
+		if (sec > 0)
+			ss << " ";
 	}
 
 	if (sec > 0) {
-		ss << sec << "s ";
+		ss << sec << "s";
 	}
 
 	return ss.str();
diff --git a/src/version.cpp b/src/version.cpp
index 241228a6a..c555f30af 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -33,11 +33,12 @@ const char *g_version_hash = VERSION_GITHASH;
 const char *g_build_info =
 	"BUILD_TYPE=" BUILD_TYPE "\n"
 	"RUN_IN_PLACE=" STR(RUN_IN_PLACE) "\n"
+	"USE_CURL=" STR(USE_CURL) "\n"
+#ifndef SERVER
 	"USE_GETTEXT=" STR(USE_GETTEXT) "\n"
 	"USE_SOUND=" STR(USE_SOUND) "\n"
-	"USE_CURL=" STR(USE_CURL) "\n"
 	"USE_FREETYPE=" STR(USE_FREETYPE) "\n"
-	"USE_LUAJIT=" STR(USE_LUAJIT) "\n"
+#endif
 	"STATIC_SHAREDIR=" STR(STATIC_SHAREDIR)
 #if USE_GETTEXT && defined(STATIC_LOCALEDIR)
 	"\n" "STATIC_LOCALEDIR=" STR(STATIC_LOCALEDIR)
diff --git a/src/voxelalgorithms.cpp b/src/voxelalgorithms.cpp
index 62fd68890..ffb70aa71 100644
--- a/src/voxelalgorithms.cpp
+++ b/src/voxelalgorithms.cpp
@@ -65,7 +65,7 @@ struct ChangingLight {
 
 	ChangingLight() = default;
 
-	ChangingLight(const relative_v3 &rel_pos, const mapblock_v3 &block_pos,
+	ChangingLight(relative_v3 rel_pos, mapblock_v3 block_pos,
 		MapBlock *b, direction source_dir) :
 		rel_position(rel_pos),
 		block_position(block_pos),
@@ -125,8 +125,8 @@ struct LightQueue {
 	 * The parameters are the same as in ChangingLight's constructor.
 	 * \param light light level of the ChangingLight
 	 */
-	inline void push(u8 light, const relative_v3 &rel_pos,
-		const mapblock_v3 &block_pos, MapBlock *block,
+	inline void push(u8 light, relative_v3 rel_pos,
+		mapblock_v3 block_pos, MapBlock *block,
 		direction source_dir)
 	{
 		assert(light <= LIGHT_SUN);
@@ -467,7 +467,7 @@ bool is_sunlight_above(Map *map, v3s16 pos, const NodeDefManager *ndef)
 static const LightBank banks[] = { LIGHTBANK_DAY, LIGHTBANK_NIGHT };
 
 void update_lighting_nodes(Map *map,
-	std::vector<std::pair<v3s16, MapNode> > &oldnodes,
+	const std::vector<std::pair<v3s16, MapNode>> &oldnodes,
 	std::map<v3s16, MapBlock*> &modified_blocks)
 {
 	const NodeDefManager *ndef = map->getNodeDefManager();
@@ -482,8 +482,7 @@ void update_lighting_nodes(Map *map,
 		// won't change, since they didn't get their light from a
 		// modified node.
 		u8 min_safe_light = 0;
-		for (std::vector<std::pair<v3s16, MapNode> >::iterator it =
-				oldnodes.begin(); it < oldnodes.end(); ++it) {
+		for (auto it = oldnodes.cbegin(); it < oldnodes.cend(); ++it) {
 			u8 old_light = it->second.getLight(bank, ndef);
 			if (old_light > min_safe_light) {
 				min_safe_light = old_light;
@@ -495,8 +494,7 @@ void update_lighting_nodes(Map *map,
 			min_safe_light++;
 		}
 		// For each changed node process sunlight and initialize
-		for (std::vector<std::pair<v3s16, MapNode> >::iterator it =
-				oldnodes.begin(); it < oldnodes.end(); ++it) {
+		for (auto it = oldnodes.cbegin(); it < oldnodes.cend(); ++it) {
 			// Get position and block of the changed node
 			v3s16 p = it->first;
 			relative_v3 rel_pos;
diff --git a/src/voxelalgorithms.h b/src/voxelalgorithms.h
index 1452f30f4..bcbd3b586 100644
--- a/src/voxelalgorithms.h
+++ b/src/voxelalgorithms.h
@@ -45,7 +45,7 @@ namespace voxalgo
  */
 void update_lighting_nodes(
 	Map *map,
-	std::vector<std::pair<v3s16, MapNode> > &oldnodes,
+	const std::vector<std::pair<v3s16, MapNode>> &oldnodes,
 	std::map<v3s16, MapBlock*> &modified_blocks);
 
 /*!
diff --git a/textures/base/pack/aux1_btn.png b/textures/base/pack/aux1_btn.png
new file mode 100644
index 000000000..8ceb09542
--- /dev/null
+++ b/textures/base/pack/aux1_btn.png
diff --git a/textures/base/pack/aux_btn.png b/textures/base/pack/aux_btn.png
deleted file mode 100644
index f589910e8..000000000
--- a/textures/base/pack/aux_btn.png
+++ /dev/null
diff --git a/textures/base/pack/server_flags_favorite.png b/textures/base/pack/server_favorite.png
index 6a3fc5efe..6a3fc5efe 100644
--- a/textures/base/pack/server_flags_favorite.png
+++ b/textures/base/pack/server_favorite.png
diff --git a/textures/base/pack/server_incompatible.png b/textures/base/pack/server_incompatible.png
new file mode 100644
index 000000000..9076ab58f
--- /dev/null
+++ b/textures/base/pack/server_incompatible.png
diff --git a/textures/base/pack/server_public.png b/textures/base/pack/server_public.png
new file mode 100644
index 000000000..46a48fac8
--- /dev/null
+++ b/textures/base/pack/server_public.png
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index a4238fbd8..1b0a997a8 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -4,9 +4,9 @@ set -e
 CORE_GIT=https://github.com/EliasFleckenstein03/dragonfireclient
 CORE_BRANCH=master
 CORE_NAME=dragonfireclient
-GAME_GIT=https://git.minetest.land/Wuzzy/MineClone2
+GAME_GIT=https://git.minetest.land/MineClone2/MineClone2
 GAME_BRANCH=master
-GAME_NAME=mineclone2
+GAME_NAME=MineClone2
 
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ $# -ne 1 ]; then
@@ -16,12 +16,13 @@ fi
 builddir=$1
 mkdir -p $builddir
 builddir="$( cd "$builddir" && pwd )"
-packagedir=$builddir/packages
 libdir=$builddir/libs
 
 # Test which win32 compiler is present
-which i586-mingw32msvc-windres &>/dev/null && toolchain_file=$dir/toolchain_i586-mingw32msvc.cmake
-which i686-w64-mingw32-windres &>/dev/null && toolchain_file=$dir/toolchain_i646-w64-mingw32.cmake
+which i686-w64-mingw32-gcc &>/dev/null &&
+	toolchain_file=$dir/toolchain_i686-w64-mingw32.cmake
+which i686-w64-mingw32-gcc-posix &>/dev/null &&
+	toolchain_file=$dir/toolchain_i686-w64-mingw32-posix.cmake
 
 if [ -z "$toolchain_file" ]; then
 	echo "Unable to determine which mingw32 compiler to use"
@@ -29,86 +30,82 @@ if [ -z "$toolchain_file" ]; then
 fi
 echo "Using $toolchain_file"
 
-irrlicht_version=1.8.4
-ogg_version=1.3.2
-vorbis_version=1.3.5
-curl_version=7.65.3
+irrlicht_version=1.9.0mt1
+ogg_version=1.3.4
+vorbis_version=1.3.7
+curl_version=7.76.1
 gettext_version=0.20.1
-freetype_version=2.10.1
-sqlite3_version=3.27.2
+freetype_version=2.10.4
+sqlite3_version=3.35.5
 luajit_version=2.1.0-beta3
-leveldb_version=1.22
+leveldb_version=1.23
 zlib_version=1.2.11
 
-mkdir -p $packagedir
 mkdir -p $libdir
 
-cd $builddir
+download () {
+	local url=$1
+	local filename=$2
+	[ -z "$filename" ] && filename=${url##*/}
+	local foldername=${filename%%[.-]*}
+	local extract=$3
+	[ -z "$extract" ] && extract=unzip
+
+	[ -d "./$foldername" ] && return 0
+	wget "$url" -c -O "./$filename"
+	if [ "$extract" = "unzip" ]; then
+		unzip -o "$filename" -d "$foldername"
+	elif [ "$extract" = "unzip_nofolder" ]; then
+		unzip -o "$filename"
+	else
+		return 1
+	fi
+}
 
 # Get stuff
-[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://minetest.kitsunemimi.pw/irrlicht-$irrlicht_version-win32.zip \
-	-c -O $packagedir/irrlicht-$irrlicht_version.zip
-[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip \
-	-c -O $packagedir/zlib-$zlib_version.zip
-[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip \
-	-c -O $packagedir/libogg-$ogg_version.zip
-[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip \
-	-c -O $packagedir/libvorbis-$vorbis_version.zip
-[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip \
-	-c -O $packagedir/curl-$curl_version.zip
-[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip \
-	-c -O $packagedir/gettext-$gettext_version.zip
-[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip \
-	-c -O $packagedir/freetype2-$freetype_version.zip
-[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip \
-	-c -O $packagedir/sqlite3-$sqlite3_version.zip
-[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip \
-	-c -O $packagedir/luajit-$luajit_version.zip
-[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip \
-	-c -O $packagedir/libleveldb-$leveldb_version.zip
-[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped.zip \
-	-c -O $packagedir/openal_stripped.zip
-
-# Extract stuff
 cd $libdir
-[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht
-[ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib
-[ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg
-[ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis
-[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl
-[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
-[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype
-[ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3
-[ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
-[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
-[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
-
-# Get minetest
-cd $builddir
-if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then
-	cd /$EXISTING_MINETEST_DIR # must be absolute path
+download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip" irrlicht-$irrlicht_version.zip
+download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip"
+download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip"
+download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip"
+download "http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip"
+download "http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip"
+download "http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip" freetype-$freetype_version.zip
+download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip"
+download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip"
+download "http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip" leveldb-$leveldb_version.zip
+download "http://minetest.kitsunemimi.pw/openal_stripped.zip" '' unzip_nofolder
+
+# Set source dir, downloading Minetest as needed
+if [ -n "$EXISTING_MINETEST_DIR" ]; then
+	sourcedir="$( cd "$EXISTING_MINETEST_DIR" && pwd )"
 else
-	[ -d $CORE_NAME ] && (cd $CORE_NAME && git pull) || (git clone -b $CORE_BRANCH $CORE_GIT)
-	cd $CORE_NAME
+	sourcedir=$PWD/$CORE_NAME
+	[ -d $CORE_NAME ] && { pushd $CORE_NAME; git pull; popd; } || \
+		git clone -b $CORE_BRANCH $CORE_GIT $CORE_NAME
+	if [ -z "$NO_MINETEST_GAME" ]; then
+		[ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull; popd; } || \
+			git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME
+	fi
 fi
-git_hash=$(git rev-parse --short HEAD)
 
-# Get minetest_game
-if [ "x$NO_MINETEST_GAME" = "x" ]; then
-	cd games
-	[ -d $GAME_NAME ] && (cd $GAME_NAME && git pull) || (git clone -b $GAME_BRANCH $GAME_GIT)
-	cd ..
-fi
+git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
 
 # Build the thing
-[ -d _build ] && rm -Rf _build/
-mkdir _build
-cd _build
-cmake .. \
+cd $builddir
+[ -d build ] && rm -rf build
+mkdir build
+cd build
+
+irr_dlls=$(echo $libdir/irrlicht/bin/*.dll | tr ' ' ';')
+vorbis_dlls=$(echo $libdir/libvorbis/bin/libvorbis{,file}-*.dll | tr ' ' ';')
+gettext_dlls=$(echo $libdir/gettext/bin/lib{intl,iconv}-*.dll | tr ' ' ';')
+
+cmake -S $sourcedir -B . \
+	-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
 	-DCMAKE_INSTALL_PREFIX=/tmp \
 	-DVERSION_EXTRA=$git_hash \
 	-DBUILD_CLIENT=1 -DBUILD_SERVER=0 \
-	-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
 	\
 	-DENABLE_SOUND=1 \
 	-DENABLE_CURL=1 \
@@ -116,9 +113,9 @@ cmake .. \
 	-DENABLE_FREETYPE=1 \
 	-DENABLE_LEVELDB=1 \
 	\
-	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include \
-	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/Win32-gcc/libIrrlicht.dll.a \
-	-DIRRLICHT_DLL=$libdir/irrlicht/bin/Win32-gcc/Irrlicht.dll \
+	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlichtmt \
+	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlichtMt.dll.a \
+	-DIRRLICHT_DLL="$irr_dlls" \
 	\
 	-DZLIB_INCLUDE_DIR=$libdir/zlib/include \
 	-DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \
@@ -133,21 +130,19 @@ cmake .. \
 	\
 	-DVORBIS_INCLUDE_DIR=$libdir/libvorbis/include \
 	-DVORBIS_LIBRARY=$libdir/libvorbis/lib/libvorbis.dll.a \
-	-DVORBIS_DLL=$libdir/libvorbis/bin/libvorbis-0.dll \
+	-DVORBIS_DLL="$vorbis_dlls" \
 	-DVORBISFILE_LIBRARY=$libdir/libvorbis/lib/libvorbisfile.dll.a \
-	-DVORBISFILE_DLL=$libdir/libvorbis/bin/libvorbisfile-3.dll \
 	\
 	-DOPENAL_INCLUDE_DIR=$libdir/openal_stripped/include/AL \
 	-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
 	-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
 	\
-	-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \
-	-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
-	-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
+	-DCURL_DLL=$libdir/curl/bin/libcurl-4.dll \
+	-DCURL_INCLUDE_DIR=$libdir/curl/include \
+	-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
 	\
 	-DGETTEXT_MSGFMT=`which msgfmt` \
-	-DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \
-	-DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv-2.dll \
+	-DGETTEXT_DLL="$gettext_dlls" \
 	-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
 	-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \
 	\
@@ -166,7 +161,7 @@ cmake .. \
 
 make -j$(nproc)
 
-[ "x$NO_PACKAGE" = "x" ] && make package
+[ -z "$NO_PACKAGE" ] && make package
 
 exit 0
 # EOF
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index 1b680cf5b..a352cc8db 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -4,9 +4,9 @@ set -e
 CORE_GIT=https://github.com/EliasFleckenstein03/dragonfireclient
 CORE_BRANCH=master
 CORE_NAME=dragonfireclient
-GAME_GIT=https://git.minetest.land/Wuzzy/MineClone2
+GAME_GIT=https://git.minetest.land/MineClone2/MineClone2
 GAME_BRANCH=master
-GAME_NAME=mineclone2
+GAME_NAME=MineClone2
 
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ $# -ne 1 ]; then
@@ -16,87 +16,81 @@ fi
 builddir=$1
 mkdir -p $builddir
 builddir="$( cd "$builddir" && pwd )"
-packagedir=$builddir/packages
 libdir=$builddir/libs
 
 toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
-irrlicht_version=1.8.4
-ogg_version=1.3.2
-vorbis_version=1.3.5
-curl_version=7.65.3
+irrlicht_version=1.9.0mt1
+ogg_version=1.3.4
+vorbis_version=1.3.7
+curl_version=7.76.1
 gettext_version=0.20.1
-freetype_version=2.10.1
-sqlite3_version=3.27.2
+freetype_version=2.10.4
+sqlite3_version=3.35.5
 luajit_version=2.1.0-beta3
-leveldb_version=1.22
+leveldb_version=1.23
 zlib_version=1.2.11
 
-mkdir -p $packagedir
 mkdir -p $libdir
 
-cd $builddir
-
-# Get stuff
-[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://minetest.kitsunemimi.pw/irrlicht-$irrlicht_version-win64.zip \
-	-c -O $packagedir/irrlicht-$irrlicht_version.zip
-[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip \
-	-c -O $packagedir/zlib-$zlib_version.zip
-[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip \
-	-c -O $packagedir/libogg-$ogg_version.zip
-[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip \
-	-c -O $packagedir/libvorbis-$vorbis_version.zip
-[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip \
-	-c -O $packagedir/curl-$curl_version.zip
-[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip \
-	-c -O $packagedir/gettext-$gettext_version.zip
-[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip \
-	-c -O $packagedir/freetype2-$freetype_version.zip
-[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip \
-	-c -O $packagedir/sqlite3-$sqlite3_version.zip
-[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip \
-	-c -O $packagedir/luajit-$luajit_version.zip
-[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip \
-	-c -O $packagedir/libleveldb-$leveldb_version.zip
-[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped64.zip \
-	-c -O $packagedir/openal_stripped.zip
+download () {
+	local url=$1
+	local filename=$2
+	[ -z "$filename" ] && filename=${url##*/}
+	local foldername=${filename%%[.-]*}
+	local extract=$3
+	[ -z "$extract" ] && extract=unzip
 
+	[ -d "./$foldername" ] && return 0
+	wget "$url" -c -O "./$filename"
+	if [ "$extract" = "unzip" ]; then
+		unzip -o "$filename" -d "$foldername"
+	elif [ "$extract" = "unzip_nofolder" ]; then
+		unzip -o "$filename"
+	else
+		return 1
+	fi
+}
 
-# Extract stuff
+# Get stuff
 cd $libdir
-[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht
-[ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib
-[ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg
-[ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis
-[ -d libcurl ] || unzip -o $packagedir/curl-$curl_version.zip -d libcurl
-[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
-[ -d freetype ] || unzip -o $packagedir/freetype2-$freetype_version.zip -d freetype
-[ -d sqlite3 ] || unzip -o $packagedir/sqlite3-$sqlite3_version.zip -d sqlite3
-[ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
-[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
-[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
+download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip" irrlicht-$irrlicht_version.zip
+download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip"
+download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip"
+download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip"
+download "http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip"
+download "http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip"
+download "http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip" freetype-$freetype_version.zip
+download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip"
+download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip"
+download "http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip" leveldb-$leveldb_version.zip
+download "http://minetest.kitsunemimi.pw/openal_stripped64.zip" 'openal_stripped.zip' unzip_nofolder
 
-# Get minetest
-cd $builddir
-if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then
-	cd /$EXISTING_MINETEST_DIR # must be absolute path
+# Set source dir, downloading Minetest as needed
+if [ -n "$EXISTING_MINETEST_DIR" ]; then
+	sourcedir="$( cd "$EXISTING_MINETEST_DIR" && pwd )"
 else
-	[ -d $CORE_NAME ] && (cd $CORE_NAME && git pull) || (git clone -b $CORE_BRANCH $CORE_GIT)
-	cd $CORE_NAME
+	sourcedir=$PWD/$CORE_NAME
+	[ -d $CORE_NAME ] && { pushd $CORE_NAME; git pull; popd; } || \
+		git clone -b $CORE_BRANCH $CORE_GIT $CORE_NAME
+	if [ -z "$NO_MINETEST_GAME" ]; then
+		[ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull; popd; } || \
+			git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME
+	fi
 fi
-git_hash=$(git rev-parse --short HEAD)
 
-# Get minetest_game
-if [ "x$NO_MINETEST_GAME" = "x" ]; then
-	cd games
-	[ -d $GAME_NAME ] && (cd $GAME_NAME && git pull) || (git clone -b $GAME_BRANCH $GAME_GIT)
-	cd ..
-fi
+git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
 
 # Build the thing
-[ -d _build ] && rm -Rf _build/
-mkdir _build
-cd _build
-cmake .. \
+cd $builddir
+[ -d build ] && rm -rf build
+mkdir build
+cd build
+
+irr_dlls=$(echo $libdir/irrlicht/bin/*.dll | tr ' ' ';')
+vorbis_dlls=$(echo $libdir/libvorbis/bin/libvorbis{,file}-*.dll | tr ' ' ';')
+gettext_dlls=$(echo $libdir/gettext/bin/lib{intl,iconv}-*.dll | tr ' ' ';')
+
+cmake -S $sourcedir -B . \
 	-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
 	-DCMAKE_INSTALL_PREFIX=/tmp \
 	-DVERSION_EXTRA=$git_hash \
@@ -108,9 +102,9 @@ cmake .. \
 	-DENABLE_FREETYPE=1 \
 	-DENABLE_LEVELDB=1 \
 	\
-	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include \
-	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/Win64-gcc/libIrrlicht.dll.a \
-	-DIRRLICHT_DLL=$libdir/irrlicht/bin/Win64-gcc/Irrlicht.dll \
+	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlichtmt \
+	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlichtMt.dll.a \
+	-DIRRLICHT_DLL="$irr_dlls" \
 	\
 	-DZLIB_INCLUDE_DIR=$libdir/zlib/include \
 	-DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \
@@ -125,21 +119,19 @@ cmake .. \
 	\
 	-DVORBIS_INCLUDE_DIR=$libdir/libvorbis/include \
 	-DVORBIS_LIBRARY=$libdir/libvorbis/lib/libvorbis.dll.a \
-	-DVORBIS_DLL=$libdir/libvorbis/bin/libvorbis-0.dll \
+	-DVORBIS_DLL="$vorbis_dlls" \
 	-DVORBISFILE_LIBRARY=$libdir/libvorbis/lib/libvorbisfile.dll.a \
-	-DVORBISFILE_DLL=$libdir/libvorbis/bin/libvorbisfile-3.dll \
 	\
 	-DOPENAL_INCLUDE_DIR=$libdir/openal_stripped/include/AL \
 	-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
 	-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
 	\
-	-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \
-	-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
-	-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
+	-DCURL_DLL=$libdir/curl/bin/libcurl-4.dll \
+	-DCURL_INCLUDE_DIR=$libdir/curl/include \
+	-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
 	\
 	-DGETTEXT_MSGFMT=`which msgfmt` \
-	-DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \
-	-DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv-2.dll \
+	-DGETTEXT_DLL="$gettext_dlls" \
 	-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
 	-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \
 	\
@@ -158,7 +150,7 @@ cmake .. \
 
 make -j$(nproc)
 
-[ "x$NO_PACKAGE" = "x" ] && make package
+[ -z "$NO_PACKAGE" ] && make package
 
 exit 0
 # EOF
diff --git a/util/buildbot/toolchain_i586-mingw32msvc.cmake b/util/buildbot/toolchain_i686-w64-mingw32-posix.cmake
index 0eeefb84d..b5d9ba5c4 100644
--- a/util/buildbot/toolchain_i586-mingw32msvc.cmake
+++ b/util/buildbot/toolchain_i686-w64-mingw32-posix.cmake
@@ -2,12 +2,14 @@
 SET(CMAKE_SYSTEM_NAME Windows)
 
 # which compilers to use for C and C++
-SET(CMAKE_C_COMPILER i586-mingw32msvc-gcc)
-SET(CMAKE_CXX_COMPILER i586-mingw32msvc-g++)
-SET(CMAKE_RC_COMPILER i586-mingw32msvc-windres)
+# *-posix is Ubuntu's naming for the MinGW variant that comes with support
+# for pthreads / std::thread (required by MT)
+SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc-posix)
+SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++-posix)
+SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
 
 # here is the target environment located
-SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc)
+SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
 
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search
diff --git a/util/buildbot/toolchain_i646-w64-mingw32.cmake b/util/buildbot/toolchain_i686-w64-mingw32.cmake
index 015baa210..015baa210 100644
--- a/util/buildbot/toolchain_i646-w64-mingw32.cmake
+++ b/util/buildbot/toolchain_i686-w64-mingw32.cmake
diff --git a/util/bump_version.sh b/util/bump_version.sh
index 996962199..4b12935bd 100755
--- a/util/bump_version.sh
+++ b/util/bump_version.sh
@@ -21,14 +21,14 @@ prompt_for_number() {
 # * Commit the changes
 # * Tag with current version
 perform_release() {
+	RELEASE_DATE=$(date +%Y-%m-%d)
+
 	sed -i -re "s/^set\(DEVELOPMENT_BUILD TRUE\)$/set(DEVELOPMENT_BUILD FALSE)/" CMakeLists.txt
 
+	sed -i 's/project.ext.set("versionExtra", "-dev")/project.ext.set("versionExtra", "")/' build/android/build.gradle
 	sed -i -re "s/\"versionCode\", [0-9]+/\"versionCode\", $NEW_ANDROID_VERSION_CODE/" build/android/build.gradle
 
 	sed -i '/\<release/s/\(version\)="[^"]*"/\1="'"$RELEASE_VERSION"'"/' misc/net.minetest.minetest.appdata.xml
-
-	RELEASE_DATE=`date +%Y-%m-%d`
-
 	sed -i 's/\(<release date\)="[^"]*"/\1="'"$RELEASE_DATE"'"/' misc/net.minetest.minetest.appdata.xml
 
 	git add -f CMakeLists.txt build/android/build.gradle misc/net.minetest.minetest.appdata.xml
@@ -47,20 +47,24 @@ perform_release() {
 back_to_devel() {
 	echo 'Creating "return back to development" commit'
 
+	# Update CMakeList.txt versions
 	sed -i -re 's/^set\(DEVELOPMENT_BUILD FALSE\)$/set(DEVELOPMENT_BUILD TRUE)/' CMakeLists.txt
-
 	sed -i -re "s/^set\(VERSION_MAJOR [0-9]+\)$/set(VERSION_MAJOR $NEXT_VERSION_MAJOR)/" CMakeLists.txt
-
 	sed -i -re "s/^set\(VERSION_MINOR [0-9]+\)$/set(VERSION_MINOR $NEXT_VERSION_MINOR)/" CMakeLists.txt
-
 	sed -i -re "s/^set\(VERSION_PATCH [0-9]+\)$/set(VERSION_PATCH $NEXT_VERSION_PATCH)/" CMakeLists.txt
 
-	sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEXT_VERSION/g" doc/menu_lua_api.txt
+	# Update Android versions
+	sed -i 's/set("versionExtra", "")/set("versionExtra", "-dev")/' build/android/build.gradle
+	sed -i -re "s/set\(\"versionMajor\", [0-9]+\)/set(\"versionMajor\", $NEXT_VERSION_MAJOR)/" build/android/build.gradle
+	sed -i -re "s/set\(\"versionMinor\", [0-9]+\)/set(\"versionMinor\", $NEXT_VERSION_MINOR)/" build/android/build.gradle
+	sed -i -re "s/set\(\"versionPatch\", [0-9]+\)/set(\"versionPatch\", $NEXT_VERSION_PATCH)/" build/android/build.gradle
 
+	# Update doc versions
+	sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEXT_VERSION/g" doc/menu_lua_api.txt
 	sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEXT_VERSION/g" doc/client_lua_api.txt
 
-	git add -f CMakeLists.txt doc/menu_lua_api.txt doc/client_lua_api.txt
-
+	# Commit
+	git add -f CMakeLists.txt build/android/build.gradle doc/menu_lua_api.txt doc/client_lua_api.txt
 	git commit -m "Continue with $NEXT_VERSION-dev"
 }
 ##################################
diff --git a/util/ci/lint.sh b/util/ci/clang-format.sh
index 395445ca7..89576c656 100755
--- a/util/ci/lint.sh
+++ b/util/ci/clang-format.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
-function perform_lint() {
-	echo "Performing LINT..."
+
+function setup_for_format() {
 	if [ -z "${CLANG_FORMAT}" ]; then
 		CLANG_FORMAT=clang-format
 	fi
@@ -8,6 +8,12 @@ function perform_lint() {
 	CLANG_FORMAT_WHITELIST="util/ci/clang-format-whitelist.txt"
 
 	files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
+}
+
+function check_format() {
+	echo "Checking format..."
+
+	setup_for_format
 
 	local errorcount=0
 	local fail=0
@@ -41,3 +47,18 @@ function perform_lint() {
 	echo "LINT OK"
 }
 
+
+
+function fix_format() {
+	echo "Fixing format..."
+
+	setup_for_format
+
+	for f in ${files_to_lint}; do
+		whitelisted=$(awk '$1 == "'$f'" { print 1 }' "$CLANG_FORMAT_WHITELIST")
+		if [ -z "${whitelisted}" ]; then
+			echo "$f"
+			$CLANG_FORMAT -i "$f"
+		fi
+	done
+}
diff --git a/util/ci/common.sh b/util/ci/common.sh
index 7523fa7ff..eb282c823 100644
--- a/util/ci/common.sh
+++ b/util/ci/common.sh
@@ -2,11 +2,20 @@
 
 # Linux build only
 install_linux_deps() {
-	local pkgs=(libirrlicht-dev cmake libbz2-dev libpng-dev \
+	local pkgs=(cmake libpng-dev \
 		libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
 		libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
-		gettext libpq-dev postgresql-server-dev-all libleveldb-dev \
-		libcurl4-openssl-dev)
+		gettext libpq-dev libleveldb-dev libcurl4-openssl-dev)
+
+	if [[ "$1" == "--old-irr" ]]; then
+		shift
+		pkgs+=(libirrlicht-dev)
+	else
+		# TODO: return old URL when IrrlichtMt 1.9.0mt2 is tagged
+		#wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt1/ubuntu-bionic.tar.gz"
+		wget "http://minetest.kitsunemimi.pw/irrlichtmt-patched-temporary.tgz" -O ubuntu-bionic.tar.gz
+		sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local
+	fi
 
 	sudo apt-get update
 	sudo apt-get install -y --no-install-recommends ${pkgs[@]} "$@"
diff --git a/util/ci/lint_autocorrect.sh b/util/ci/lint_autocorrect.sh
deleted file mode 100644
index 6a8881231..000000000
--- a/util/ci/lint_autocorrect.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/bash
-function perform_lint() {
-	echo "Performing LINT..."
-	if [ -z "${CLANG_FORMAT}" ]; then
-		CLANG_FORMAT=clang-format
-	fi
-	echo "LINT: Using binary $CLANG_FORMAT"
-	CLANG_FORMAT_WHITELIST="util/ci/clang-format-whitelist.txt"
-
-	files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')"
-
-	local errorcount=0
-	local fail=0
-	for f in ${files_to_lint}; do
-		d=$(diff -u "$f" <(${CLANG_FORMAT} "$f") || true)
-
-		if ! [ -z "$d" ]; then
-			whitelisted=$(awk '$1 == "'$f'" { print 1 }' "$CLANG_FORMAT_WHITELIST")
-
-			# If file is not whitelisted, mark a failure
-			if [ -z "${whitelisted}" ]; then
-				errorcount=$((errorcount+1))
-
-				printf "The file %s is not compliant with the coding style" "$f"
-				if [ ${errorcount} -gt 50 ]; then
-					printf "\nToo many errors encountered previously, this diff is hidden.\n"
-				else
-					printf ":\n%s\n" "$d"
-				fi
-				
-				${CLANG_FORMAT} -i "$f"
-
-				fail=1
-			fi
-		fi
-	done
-
-	if [ "$fail" = 1 ]; then
-		echo "LINT reports failure."
-		exit 1
-	fi
-
-	echo "LINT OK"
-}
-
diff --git a/util/fix_format.sh b/util/fix_format.sh
new file mode 100755
index 000000000..3cef6f58d
--- /dev/null
+++ b/util/fix_format.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+. ./util/ci/clang-format.sh
+
+fix_format
diff --git a/util/gather_git_credits.py b/util/gather_git_credits.py
new file mode 100755
index 000000000..1b2865182
--- /dev/null
+++ b/util/gather_git_credits.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+import subprocess
+import re
+from collections import defaultdict
+
+codefiles = r"(\.[ch](pp)?|\.lua|\.md|\.cmake|\.java|\.gradle|Makefile|CMakeLists\.txt)$"
+
+# two minor versions back, for "Active Contributors"
+REVS_ACTIVE = "5.2.0..HEAD"
+# all time, for "Previous Contributors"
+REVS_PREVIOUS = "HEAD"
+
+CUTOFF_ACTIVE = 3
+CUTOFF_PREVIOUS = 21
+
+# For a description of the points system see:
+# https://github.com/minetest/minetest/pull/9593#issue-398677198
+
+def load(revs):
+	points = defaultdict(int)
+	p = subprocess.Popen(["git", "log", "--mailmap", "--pretty=format:%h %aN <%aE>", revs],
+		stdout=subprocess.PIPE, universal_newlines=True)
+	for line in p.stdout:
+		hash, author = line.strip().split(" ", 1)
+		n = 0
+
+		p2 = subprocess.Popen(["git", "show", "--numstat", "--pretty=format:", hash],
+			stdout=subprocess.PIPE, universal_newlines=True)
+		for line in p2.stdout:
+			added, deleted, filename = re.split(r"\s+", line.strip(), 2)
+			if re.search(codefiles, filename) and added != "-":
+				n += int(added)
+		p2.wait()
+
+		if n == 0:
+			continue
+		if n > 1200:
+			n = 8
+		elif n > 700:
+			n = 4
+		elif n > 100:
+			n = 2
+		else:
+			n = 1
+		points[author] += n
+	p.wait()
+
+	# Some authors duplicate? Don't add manual workarounds here, edit the .mailmap!
+	for author in ("updatepo.sh <script@mt>", "Weblate <42@minetest.ru>"):
+		points.pop(author, None)
+	return points
+
+points_active = load(REVS_ACTIVE)
+points_prev = load(REVS_PREVIOUS)
+
+with open("results.txt", "w") as f:
+	for author, points in sorted(points_active.items(), key=(lambda e: e[1]), reverse=True):
+		if points < CUTOFF_ACTIVE: break
+		points_prev.pop(author, None) # active authors don't appear in previous
+		f.write("%d\t%s\n" % (points, author))
+	f.write('\n---------\n\n')
+	once = True
+	for author, points in sorted(points_prev.items(), key=(lambda e: e[1]), reverse=True):
+		if points < CUTOFF_PREVIOUS and once:
+			f.write('\n---------\n\n')
+			once = False
+		f.write("%d\t%s\n" % (points, author))
diff --git a/util/test_multiplayer.sh b/util/test_multiplayer.sh
index 176cf11d9..9fb894a30 100755
--- a/util/test_multiplayer.sh
+++ b/util/test_multiplayer.sh
@@ -3,41 +3,58 @@ dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 gameid=devtest
 minetest=$dir/../bin/minetest
 testspath=$dir/../tests
-worldpath=$testspath/testworld_$gameid
-configpath=$testspath/configs
-logpath=$testspath/log
-conf_server=$configpath/minetest.conf.multi.server
-conf_client1=$configpath/minetest.conf.multi.client1
-conf_client2=$configpath/minetest.conf.multi.client2
-log_server=$logpath/server.log
-log_client1=$logpath/client1.log
-log_client2=$logpath/client2.log
-
-mkdir -p $worldpath
-mkdir -p $configpath
-mkdir -p $logpath
-
-echo -ne 'client1::shout,interact,settime,teleport,give
-client2::shout,interact,settime,teleport,give
-' > $worldpath/auth.txt
-
-echo -ne '' > $conf_server
-
-echo -ne '# client 1 config
-screenW=500
-screenH=380
-name=client1
-viewing_range_nodes_min=10
-' > $conf_client1
-
-echo -ne '# client 2 config
-screenW=500
-screenH=380
-name=client2
-viewing_range_nodes_min=10
-' > $conf_client2
-
-echo $(sleep 1; $minetest --disable-unittests --logfile $log_client1 --config $conf_client1 --go --address localhost) &
-echo $(sleep 2; $minetest --disable-unittests --logfile $log_client2 --config $conf_client2 --go --address localhost) &
-$minetest --disable-unittests --server --logfile $log_server --config $conf_server --world $worldpath --gameid $gameid
+conf_client1=$testspath/client1.conf
+conf_server=$testspath/server.conf
+worldpath=$testspath/world
 
+waitfor () {
+	n=30
+	while [ $n -gt 0 ]; do
+		[ -f "$1" ] && return 0
+		sleep 0.5
+		((n-=1))
+	done
+	echo "Waiting for ${1##*/} timed out"
+	pkill -P $$
+	exit 1
+}
+
+gdbrun () {
+	gdb -q -ex 'set confirm off' -ex 'r' -ex 'bt' -ex 'quit' --args "$@"
+}
+
+[ -e $minetest ] || { echo "executable $minetest missing"; exit 1; }
+
+rm -rf $worldpath
+mkdir -p $worldpath/worldmods/test
+
+printf '%s\n' >$testspath/client1.conf \
+	video_driver=null name=client1 viewing_range=10 \
+	enable_{sound,minimap,shaders}=false
+
+printf '%s\n' >$testspath/server.conf \
+	max_block_send_distance=1
+
+cat >$worldpath/worldmods/test/init.lua <<"LUA"
+core.after(0, function()
+	io.close(io.open(core.get_worldpath() .. "/startup", "w"))
+end)
+core.register_on_joinplayer(function(player)
+	io.close(io.open(core.get_worldpath() .. "/player_joined", "w"))
+	core.request_shutdown("", false, 2)
+end)
+LUA
+
+echo "Starting server"
+gdbrun $minetest --server --config $conf_server --world $worldpath --gameid $gameid 2>&1 | sed -u 's/^/(server) /' &
+waitfor $worldpath/startup
+
+echo "Starting client"
+gdbrun $minetest --config $conf_client1 --go --address 127.0.0.1 2>&1 | sed -u 's/^/(client) /' &
+waitfor $worldpath/player_joined
+
+echo "Waiting for client and server to exit"
+wait
+
+echo "Success"
+exit 0
diff --git a/util/updatepo.sh b/util/updatepo.sh
index 168483bd4..95acb01ea 100755
--- a/util/updatepo.sh
+++ b/util/updatepo.sh
@@ -58,6 +58,7 @@ xgettext --package-name=minetest \
 	--keyword=fgettext_ne \
 	--keyword=strgettext \
 	--keyword=wstrgettext \
+	--keyword=core.gettext \
 	--keyword=showTranslatedStatusText \
 	--output $potfile \
 	--from-code=utf-8 \
diff --git a/util/wireshark/minetest.lua b/util/wireshark/minetest.lua
index 13cd6d482..d954c7597 100644
--- a/util/wireshark/minetest.lua
+++ b/util/wireshark/minetest.lua
@@ -299,7 +299,7 @@ do
 			t:add(f_length, buffer(2,2))
 			local textlen = buffer(2,2):uint()
 			if minetest_check_length(buffer, 4 + textlen*2, t) then
-				t:add(f_message, minetest_convert_utf16(buffer(4, textlen*2), "Converted chat message"))
+				t:add(f_message, buffer(4, textlen*2), buffer(4, textlen*2):ustring())
 			end
 		end
 	}
@@ -873,7 +873,7 @@ end
 -- TOCLIENT_HP
 
 do
-	local f_hp = ProtoField.uint16("minetest.server.hp", "Hitpoints", base.DEC)
+	local f_hp = ProtoField.uint16("minetest.server.hp", "Health points", base.DEC)
 
 	minetest_server_commands[0x33] = {
 		"HP", 4,
@@ -1379,35 +1379,6 @@ function minetest_check_length(tvb, min_len, t)
 	end
 end
 
--- Takes a Tvb or TvbRange (i.e. part of a packet) that
--- contains a UTF-16 string and returns a TvbRange containing
--- string converted to ASCII. Any characters outside the range
--- 0x20 to 0x7e are replaced by a question mark.
--- Parameter: tvb: Tvb or TvbRange that contains the UTF-16 data
--- Parameter: name: will be the name of the newly created Tvb.
--- Returns: New TvbRange containing the ASCII string.
--- TODO: Handle surrogates (should only produce one question mark)
--- TODO: Remove this when Wireshark supports UTF-16 strings natively.
-function minetest_convert_utf16(tvb, name)
-	local hex, pos, char
-	hex = ""
-	for pos = 0, tvb:len() - 2, 2 do
-		char = tvb(pos, 2):uint()
-		if (char >= 0x20 and char <= 0x7e) or char == 0x0a then
-			hex = hex .. string.format(" %02x", char)
-		else
-			hex = hex .. " 3F"
-		end
-	end
-	if hex == "" then
-		-- This is a hack to avoid a failed assertion in tvbuff.c
-		-- (function: ensure_contiguous_no_exception)
-		return ByteArray.new("00"):tvb(name):range(0,0)
-	else
-		return ByteArray.new(hex):tvb(name):range()
-	end
-end
-
 -- Decodes a variable-length string as ASCII text
 -- t_textlen, t_text should be the ProtoFields created by minetest_field_helper
 --   alternatively t_text can be a ProtoField.string and t_textlen can be nil
@@ -1438,7 +1409,7 @@ function minetest_decode_helper_utf16(tvb, t, lentype, offset, f_textlen, f_text
 	end
 	local textlen = tvb(offset, n):uint() * 2
 	if minetest_check_length(tvb, offset + n + textlen, t) then
-		t:add(f_text, minetest_convert_utf16(tvb(offset + n, textlen), "UTF-16 text"))
+		t:add(f_text, tvb(offset + n, textlen), tvb(offset + n, textlen):ustring())
 		return offset + n + textlen
 	end
 end