Merge remote-tracking branch 'upstream/master'

3d_armor_ui/description.txt

@@ -1 +1 @@
-Adds 3d_armor page to the unified inventory
+Adds 3d_armor page to the unified inventory.

3d_armor_ui/init.lua

@@ -1,5 +1,5 @@
 -- support for i18n
-local S = armor_i18n.gettext
+local S = minetest.get_translator(minetest.get_current_modname())
 local F = minetest.formspec_escape
 local has_technic = minetest.get_modpath("technic") ~= nil
 

3d_armor_ui/locale/3d_armor_ui.fr.tr

@@ -0,0 +1,13 @@
+# textdomain: 3d_armor_ui
+
+
+### init.lua ###
+
+3d Armor=Armure 3d
+3d_armor_ui: Mod loaded but unused.=3d_armor_ui : Mod chargé mais inutilisé.
+Armor=Armure
+Armor not initialized!=Armure non initialisée !
+Fire=Feu
+Heal=Soins
+Level=Niveau
+Radiation=Radiation

3d_armor_ui/locale/template.txt

@@ -0,0 +1,13 @@
+# textdomain: 3d_armor_ui
+
+
+### init.lua ###
+
+3d Armor=
+3d_armor_ui: Mod loaded but unused.=
+Armor=
+Armor not initialized!=
+Fire=
+Heal=
+Level=
+Radiation=

3d_armor_ui/mod.conf

@@ -0,0 +1,4 @@
+name = 3d_armor_ui
+depends = 3d_armor
+optional_depends = unified_inventory
+description = Adds 3d_armor page to the unified inventory.