From: est31 <MTest31@outlook.com>
Date: Thu, 5 May 2016 14:12:58 +0000 (+0200)
Subject: Update settings translation file and minetest.conf.example
X-Git-Tag: 0.4.14~39
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=063be8a126b5f5131f190f318921d707db981322;p=oweals%2Fminetest.git

Update settings translation file and minetest.conf.example
---

diff --git a/minetest.conf.example b/minetest.conf.example
index e72c7e357..5090a620b 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -253,9 +253,9 @@
 #    type: bool
 # enable_local_map_saving = false
 
-#    Show entity selection boxes.
+#    Show entity selection boxes
 #    type: bool
-# show_entity_selectionbox true
+# show_entity_selectionbox = true
 
 #    Enable usage of remote media server (if provided by server).
 #    Remote servers offer a significantly faster way to download media (e.g. textures)
@@ -988,7 +988,7 @@
 #    type: float
 # dedicated_server_step = 0.1
 
-#    Length of time between Active Block Management execution cycles
+#    Time in between active block management cycles
 #    type: float
 # active_block_mgmt_interval = 2.0
 
@@ -1372,7 +1372,7 @@
 #    Flags that are not specified in the flag string are not modified from the default.
 #    Flags starting with 'no' are used to explicitly disable them.
 #    type: flags possible values: altitude_chill, noaltitude_chill, humid_rivers, nohumid_rivers
-# mgvalleys_spflags = altitude_chill,humid_rivers
+# mg_valleys_spflags = altitude_chill,humid_rivers
 
 #    The altitude at which temperature drops by 20C
 #    type: int
@@ -1537,3 +1537,4 @@
 
 #    type: string
 # modstore_details_url = https://forum.minetest.net/mmdb/mod/*/
+
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index 23b46625d..f7e14dd65 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -103,6 +103,7 @@ fake_function() {
 	gettext("Saving map received from server");
 	gettext("Save the map received by the client on disk.");
 	gettext("Show entity selection boxes");
+	gettext("Show entity selection boxes");
 	gettext("Connect to external media server");
 	gettext("Enable usage of remote media server (if provided by server).\nRemote servers offer a significantly faster way to download media (e.g. textures)\nwhen connecting to the server.");
 	gettext("Serverlist URL");
@@ -343,6 +344,8 @@ fake_function() {
 	gettext("New users need to input this password.");
 	gettext("Default privileges");
 	gettext("The privileges that new users automatically get.\nSee /privs in game for a full list on your server and mod configuration.");
+	gettext("Basic Privileges");
+	gettext("Privileges that players with basic_privs can grant");
 	gettext("Unlimited player transfer distance");
 	gettext("Whether players are shown to clients without any range limit.\nDeprecated, use the setting player_transfer_distance instead.");
 	gettext("Player transfer distance");
@@ -412,7 +415,7 @@ fake_function() {
 	gettext("Length of a server tick and the interval at which objects are generally updated over network.");
 	gettext("Active Block Management interval");
 	gettext("Time in between active block management cycles");
-	gettext("ABM modifier interval");
+	gettext("Active Block Modifier interval");
 	gettext("Length of time between ABM execution cycles");
 	gettext("NodeTimer interval");
 	gettext("Length of time between NodeTimer execution cycles");