resolve mergeconflicts

mods/screwdriver/init.lua

@@ -1,5 +1,11 @@
+-- screwdriver/init.lua
+
 screwdriver = {}
 
+-- Load support for MT game translation.
+local S = minetest.get_translator("screwdriver")
+
+
 screwdriver.ROTATE_FACE = 1
 screwdriver.ROTATE_AXIS = 2
 screwdriver.disallow = function(pos, node, user, mode, new_param2)
@@ -144,8 +150,9 @@ end
 
 -- Screwdriver Steel
 minetest.register_tool("screwdriver:screwdriver", {
-	description = "Screwdriver (left-click rotates face, right-click rotates axis)",
+	description = S("Screwdriver") .. "\n" .. S("(left-click rotates face, right-click rotates axis)"),
 	inventory_image = "screwdriver.png",
+	groups = {tool = 1},
 	on_use = function(itemstack, user, pointed_thing)
 		screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_FACE, 200)
 		return itemstack

mods/screwdriver/locale/screwdriver.de.tr

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=Schraubendreher
+(left-click rotates face, right-click rotates axis)=(Linksklick dreht Seite, Rechtsklick dreht Achse)

mods/screwdriver/locale/screwdriver.es.tr

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=Destornillador
+(left-click rotates face, right-click rotates axis)=(clic-izquierdo gira la cara, clic-derecho rota el eje)

mods/screwdriver/locale/screwdriver.fr.tr

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=Tournevis
+(left-click rotates face, right-click rotates axis)=(clic gauche pour changer de face, clic droit pour changer d'axe)

mods/screwdriver/locale/screwdriver.id.tr

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=Obeng
+(left-click rotates face, right-click rotates axis)=(klik kiri putar sisi, klik kanan putar sumbu)

mods/screwdriver/locale/screwdriver.it.tr

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=Cacciavite
+(left-click rotates face, right-click rotates axis)=(click sinistro ruota la faccia, click destro ruota l'asse)

mods/screwdriver/locale/screwdriver.ms.tr

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=Pemutar Skru
+(left-click rotates face, right-click rotates axis)=(klik-kiri putar muka, klik-kanan putar paksi)

mods/screwdriver/locale/screwdriver.ru.tr

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=Отвёртка
+(left-click rotates face, right-click rotates axis)=(клик левой кнопкой мыши вращает грань, клик правой кнопкой мыши вращает ось)

mods/screwdriver/locale/screwdriver.se.tr

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=Skruvmejsel
+(left-click rotates face, right-click rotates axis)=(vänster-klick roterar ansikte, höger-klick roterar axeln)

mods/screwdriver/locale/screwdriver.zh_CN.tr

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=螺丝刀
+(left-click rotates face, right-click rotates axis)=（左键单击旋转面，右键单击旋转轴）

mods/screwdriver/locale/screwdriver.zh_TW.tr

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=螺絲刀
+(left-click rotates face, right-click rotates axis)=（左鍵單擊旋轉面，右鍵單擊旋轉軸）

mods/screwdriver/locale/template.txt

@@ -0,0 +1,3 @@
+# textdomain: screwdriver
+Screwdriver=
+(left-click rotates face, right-click rotates axis)=

mods/screwdriver/mod.conf

@@ -0,0 +1,2 @@
+name = screwdriver
+description = Minetest Game mod: screwdriver