Switch to Luanti-style string placeholders

mods/tutorial/init.lua

@@ -75,7 +75,7 @@ end
 function tutorial.register_infosign(itemstringpart, caption, fulltext)
 	tutorial.captions[itemstringpart] = caption
 	minetest.register_node("tutorial:sign_"..itemstringpart, {
-		description = string.format(S("tutorial sign '%s'"), S(caption)),
+		description = S("tutorial sign '@1'", S(caption)),
 		drawtype = "signlike",
 		tiles = {"default_sign_wall.png"},
 		inventory_image = "default_sign_wall.png",
@@ -101,7 +101,7 @@ function tutorial.register_infosign(itemstringpart, caption, fulltext)
 			"]"..
 			"button_exit[4.5,5.5;3,1;close;"..minetest.formspec_escape(S("Close")).."]"
 			meta:set_string("formspec", formspec)
-			meta:set_string("infotext", string.format(S("%s (Right-click to read)"), S(caption)))
+			meta:set_string("infotext", S("@1 (Right-click to read)", S(caption)))
 			meta:set_string("id", itemstringpart)
 			meta:set_string("caption", caption)
 		end
@@ -129,7 +129,7 @@ minetest.register_abm( {
 			"]"..
 			"button_exit[4.5,5.5;3,1;close;"..minetest.formspec_escape(S("Close")).."]"
 			meta:set_string("formspec", formspec)
-			meta:set_string("infotext", string.format(S("%s (Right-click to read)"), S(caption)))
+			meta:set_string("infotext", S("@1 (Right-click to read)", S(caption)))
 
 	end }
 )

mods/tutorial/locale/tutorial.de.po

@@ -195,8 +195,8 @@ msgstr "Sie haben einen versteckten Diamanten gefunden!"
 msgid "You have collected all hidden diamonds!"
 msgstr "Sie haben alle versteckten Diamanten gefunden!"
 
-msgid "%s (Right-click to read)"
+msgid "@1 (Right-click to read)"
-msgstr "%s (Rechtsklick zum Lesen)"
+msgstr "@1 (Rechtsklick zum Lesen)"
 
 msgid "This is a crafting example."
 msgstr "Dies ist ein Fertigungsbeispiel."
@@ -264,8 +264,8 @@ msgstr "Wasserfallschalter (an)"
 msgid "waterfall switch (off)"
 msgstr "Wasserfallschalter (aus)"
 
-msgid "tutorial sign '%s'"
+msgid "tutorial sign '@1'"
-msgstr "Einführungsschild »%s«"
+msgstr "Einführungsschild »@1«"
 
 msgid "ruler"
 msgstr "Lineal"

mods/tutorial/locale/tutorial.el.po

@@ -186,8 +186,8 @@ msgstr "Βρήκες ένα κρυμμένο διαμάντι"
 msgid "You have collected all hidden diamonds!"
 msgstr "Συγκέντρωσες όλα τα κρυμμένα διαμάντια!"
 
-msgid "%s (Right-click to read)"
+msgid "@1 (Right-click to read)"
-msgstr "%s (δεξί κλικ για να το διαβάσεις)"
+msgstr "@1 (δεξί κλικ για να το διαβάσεις)"
 
 msgid "golden cup"
 msgstr "χρυσό κύπελο"
@@ -243,8 +243,8 @@ msgstr "διακόπτης καταρράκτη (ανοιχτός)"
 msgid "waterfall switch (off)"
 msgstr "διακόπτης καταρράκτη (σβηστός)"
 
-msgid "tutorial sign '%s'"
+msgid "tutorial sign '@1'"
-msgstr "πινακίδα εκπαίδευσης '%s'"
+msgstr "πινακίδα εκπαίδευσης '@1'"
 
 msgid "ruler"
 msgstr "χάρακας"

mods/tutorial/locale/tutorial.es.po

@@ -186,8 +186,8 @@ msgstr "¡Has encontrado un diamante oculto!"
 msgid "You have collected all hidden diamonds!"
 msgstr "Has recogido todos los diamantes ocultos!"
 
-msgid "%s (Right-click to read)"
+msgid "@1 (Right-click to read)"
-msgstr "%s (click derecho para leerlo)"
+msgstr "@1 (click derecho para leerlo)"
 
 msgid "golden cup"
 msgstr "copa de oro"
@@ -243,8 +243,8 @@ msgstr "interruptor de la catarata (encendido)"
 msgid "waterfall switch (off)"
 msgstr "interruptor de la catarata (apagado)"
 
-msgid "tutorial sign '%s'"
+msgid "tutorial sign '@1'"
-msgstr "cartel de tutorial »%s«"
+msgstr "cartel de tutorial »@1«"
 
 msgid "ruler"
 msgstr "regla"

mods/tutorial/locale/tutorial.fr.po

@@ -177,8 +177,8 @@ msgstr "Vous avez trouvé un diamant caché !"
 msgid "You have collected all hidden diamonds!"
 msgstr "Vous avez trouvé tous les diamants cachés !"
 
-msgid "%s (Right-click to read)"
+msgid "@1 (Right-click to read)"
-msgstr "%s (clic droit pour lire)"
+msgstr "@1 (clic droit pour lire)"
 
 msgid "golden cup"
 msgstr "Coupe en or"
@@ -234,8 +234,8 @@ msgstr "Commutateur de chute d'eau (activé)"
 msgid "waterfall switch (off)"
 msgstr "Commutateur de chute d'eau (désactivé)"
 
-msgid "tutorial sign '%s'"
+msgid "tutorial sign '@1'"
-msgstr "Pancarte de tutoriel \"%s\""
+msgstr "Pancarte de tutoriel \"@1\""
 
 msgid "ruler"
 msgstr "règle"

mods/tutorial/locale/tutorial.id.po

@@ -186,8 +186,8 @@ msgstr "Kamu menemukan berlian tersembunyi!"
 msgid "You have collected all hidden diamonds!"
 msgstr "Kamu telah mengumpulkan semua berlian tersembunyi!"
 
-msgid "%s (Right-click to read)"
+msgid "@1 (Right-click to read)"
-msgstr "%s (Klik kanan untuk membaca)"
+msgstr "@1 (Klik kanan untuk membaca)"
 
 msgid "golden cup"
 msgstr "cangkir emas"
@@ -237,8 +237,8 @@ msgstr "saklar air terjun (nyala)"
 msgid "waterfall switch (off)"
 msgstr "saklar air terjun (mati)"
 
-msgid "tutorial sign '%s'"
+msgid "tutorial sign '@1'"
-msgstr "papan tanda tutorial '%s'"
+msgstr "papan tanda tutorial '@1'"
 
 msgid "ruler"
 msgstr "mistar"

mods/tutorial/locale/tutorial.nl.po

@@ -195,8 +195,8 @@ msgstr "Je hebt een verborgen diamant gevonden!"
 msgid "You have collected all hidden diamonds!"
 msgstr "Je hebt alle verborgen diamanten verzameld!"
 
-msgid "%s (Right-click to read)"
+msgid "@1 (Right-click to read)"
-msgstr "%s (Rechtsklik om te lezen)"
+msgstr "@1 (Rechtsklik om te lezen)"
 
 msgid "This is a crafting example."
 msgstr "Dit is een crafting voorbeeld."
@@ -264,8 +264,8 @@ msgstr "schakel waterval (aan)"
 msgid "waterfall switch (off)"
 msgstr "schakel waterval (uit)"
 
-msgid "tutorial sign '%s'"
+msgid "tutorial sign '@1'"
-msgstr "tutorial teken '%s'"
+msgstr "tutorial teken '@1'"
 
 msgid "ruler"
 msgstr "meetlat"

mods/tutorial_areas/hud.lua

@@ -19,7 +19,7 @@ minetest.register_globalstep(function(dtime)
 		local areaStrings = {}
 		for id, area in pairs(areas:getAreasAtPos(pos)) do
 			if not area.hidden then
-				table.insert(areaStrings, (S("You are here: %s")):format(S(area.name)))
+				table.insert(areaStrings, S("You are here: @1", S(area.name)))
 			end
 		end
 		local areaString = table.concat(areaStrings, "\n")

mods/tutorial_areas/locale/tutorial_areas.de.po

@@ -12,8 +12,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-msgid "You are here: %s"
+msgid "You are here: @1"
-msgstr "Sie befinden sich hier: %s"
+msgstr "Sie befinden sich hier: @1"
 
 msgid "Start room"
 msgstr "Startraum"

mods/tutorial_areas/locale/tutorial_areas.el.po

@@ -12,8 +12,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-msgid "You are here: %s"
+msgid "You are here: @1"
-msgstr "Είσαι εδώ: %s"
+msgstr "Είσαι εδώ: @1"
 
 msgid "Start room"
 msgstr "Αρχικό δωμάτιο "

mods/tutorial_areas/locale/tutorial_areas.es.po

@@ -12,8 +12,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-msgid "You are here: %s"
+msgid "You are here: @1"
-msgstr "Estás aquí: %s"
+msgstr "Estás aquí: @1"
 
 msgid "Start room"
 msgstr "Sala de entrada"

mods/tutorial_areas/locale/tutorial_areas.it.po

@@ -12,8 +12,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-msgid "You are here: %s"
+msgid "You are here: @1"
-msgstr "Ti trovi qui: %s"
+msgstr "Ti trovi qui: @1"
 
 msgid "Start room"
 msgstr "Inizio"

mods/tutorial_areas/locale/tutorial_areas.nl.po

@@ -12,8 +12,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-msgid "You are here: %s"
+msgid "You are here: @1"
-msgstr "Je bent hier: %s"
+msgstr "Je bent hier: @1"
 
 msgid "Start room"
 msgstr "Startkamer"

mods/tutorial_default/locale/tutorial_default.de.po

@@ -117,8 +117,8 @@ msgstr "Inaktiver Ofen (Rechtsklicken zum Untersuchen)"
 msgid "Empty furnace (Rightclick to examine)"
 msgstr "Leerer Ofen (Rechtsklicken zum Untersuchen)"
 
-msgid "Active furnace (Flame used: %d%%) (Rightclick to examine)"
+msgid "Active furnace (Flame used: @1%) (Rightclick to examine)"
-msgstr "Aktiver Ofen (Flamme: %d%%) (Rechtklicken zum Untersuchen)"
+msgstr "Aktiver Ofen (Flamme: @1%) (Rechtklicken zum Untersuchen)"
 
 msgid "Furnace without fuel (Rightclick to examine)"
 msgstr "Ofen ohne Brennstoff (Rechtsklicken zum Untersuchen)"

mods/tutorial_default/locale/tutorial_default.el.po

@@ -117,8 +117,8 @@ msgstr "Σβηστός φούρνος (εξέτασε τον με δεξί κλ
 msgid "Empty furnace (Rightclick to examine)"
 msgstr "Άδειος φούρνος (εξέτασε τον με δεξί κλικ)"
 
-msgid "Active furnace (Flame used: %d%%) (Rightclick to examine)"
+msgid "Active furnace (Flame used: @1%) (Rightclick to examine)"
-msgstr "Ανοιχτός φούρνος (Φωτιά που χρησιμοποιείται: %d%%) (εξέτασε τον με δεξί κλικ)"
+msgstr "Ανοιχτός φούρνος (Φωτιά που χρησιμοποιείται: @1%) (εξέτασε τον με δεξί κλικ)"
 
 msgid "Furnace without fuel (Rightclick to examine)"
 msgstr "Φούρνος χωρίς καύσιμο (εξέτασε τον με δεξί κλικ)"

mods/tutorial_default/locale/tutorial_default.es.po

@@ -117,8 +117,8 @@ msgstr "horno apagado (click derecho para examinarlo)"
 msgid "Empty furnace (Rightclick to examine)"
 msgstr "horno vacío (click derecho para examinarlo)"
 
-msgid "Active furnace (Flame used: %d%%) (Rightclick to examine)"
+msgid "Active furnace (Flame used: @1%) (Rightclick to examine)"
-msgstr "horno encendido (llama usada: %d%%)  (click derecho para examinarlo)"
+msgstr "horno encendido (llama usada: @1%)  (click derecho para examinarlo)"
 
 msgid "Furnace without fuel (Rightclick to examine)"
 msgstr "horno sin combustible  (click derecho para examinarlo)"

mods/tutorial_default/locale/tutorial_default.fr.po

@@ -117,8 +117,8 @@ msgstr "Four inactif (clic droit pour ouvrir)"
 msgid "Empty furnace (Rightclick to examine)"
 msgstr "Four vide (clic droit pour ouvrir)"
 
-msgid "Active furnace (Flame used: %d%%) (Rightclick to examine)"
+msgid "Active furnace (Flame used: @1%) (Rightclick to examine)"
-msgstr "Four actif (flamme utilisée : %d%%) (clic droit pour ouvrir)"
+msgstr "Four actif (flamme utilisée : @1%) (clic droit pour ouvrir)"
 
 msgid "Furnace without fuel (Rightclick to examine)"
 msgstr "Four sans carburant (clic droit pour ouvrir)"

mods/tutorial_default/locale/tutorial_default.id.po

@@ -117,8 +117,8 @@ msgstr "Tungku mati (Klik kanan untuk memeriksa)"
 msgid "Empty furnace (Rightclick to examine)"
 msgstr "Tungku kosong (Klik kanan untuk memeriksa)"
 
-msgid "Active furnace (Flame used: %d%%) (Rightclick to examine)"
+msgid "Active furnace (Flame used: @1%) (Rightclick to examine)"
-msgstr "Tungku nyala (Api terpakai: %d%%) (Klik kanan untuk memeriksa)"
+msgstr "Tungku nyala (Api terpakai: @1%) (Klik kanan untuk memeriksa)"
 
 msgid "Furnace without fuel (Rightclick to examine)"
 msgstr "Tungku tanpa bahan bakar (Klik kanan untuk memeriksa)"

mods/tutorial_default/locale/tutorial_default.nl.po

@@ -117,8 +117,8 @@ msgstr "Niet actieve oven (Rechtsklikken om te onderzoeken)"
 msgid "Empty furnace (Rightclick to examine)"
 msgstr "Lege oven (Rechtsklikken om te onderzoeken)"
 
-msgid "Active furnace (Flame used: %d%%) (Rightclick to examine)"
+msgid "Active furnace (Flame used: @1%) (Rightclick to examine)"
-msgstr "Actieve oven (Gebruike vlam: %d%%) (Rechtsklikken om te onderzoeken)"
+msgstr "Actieve oven (Gebruike vlam: @1%) (Rechtsklikken om te onderzoeken)"
 
 msgid "Furnace without fuel (Rightclick to examine)"
 msgstr "Oven zonder brandstof (Rechtsklikken om te onderzoeken)"

mods/tutorial_default/nodes.lua

@@ -605,7 +605,7 @@ minetest.register_abm({
 		if meta:get_float("fuel_time") < meta:get_float("fuel_totaltime") then
 			local percent = math.floor(meta:get_float("fuel_time") /
 					meta:get_float("fuel_totaltime") * 100)
-			meta:set_string("infotext",string.format(S("Active furnace (Flame used: %d%%) (Rightclick to examine)"), percent))
+			meta:set_string("infotext", S("Active furnace (Flame used: @1%) (Rightclick to examine)"), percent)
 			swap_node(pos,"tutorial_default:furnace_active")
 			meta:set_string("formspec",default.get_furnace_active_formspec(pos, percent))
 			return

mods/tutorial_supplemental/init.lua

@@ -171,7 +171,7 @@ minetest.register_craft({
 -- 8 viscosity example liquids
 for v=0,7 do
 	minetest.register_node("tutorial_supplemental:liquid"..v, {
-		description = string.format(S("flowing test liquid %i"), v),
+		description = S("flowing test liquid @1", v),
 		inventory_image = minetest.inventorycube("supplemental_testliquid"..v..".png"),
 		drawtype = "flowingliquid",
 		tiles = {"supplemental_testliquid"..v..".png"},
@@ -204,7 +204,7 @@ for v=0,7 do
 	})
 
 	minetest.register_node("tutorial_supplemental:liquidsource"..v, {
-		description = string.format(S("test liquid source %i"), v),
+		description = S("test liquid source @1", v),
 		inventory_image = minetest.inventorycube("supplemental_testliquid"..v..".png"),
 		drawtype = "liquid",
 		special_tiles = {

mods/tutorial_supplemental/locale/tutorial_supplemental.de.po

@@ -54,9 +54,9 @@ msgstr "Lautsprecher"
 msgid "loudspeaker (rightclick to toggle music)"
 msgstr "Lautsprecher (Rechtsklick, um Musik umzuschalten)"
 
-msgid "flowing test liquid %i"
+msgid "flowing test liquid @1"
-msgstr "fließende Testflüssigkeit %i"
+msgstr "fließende Testflüssigkeit @1"
 
-msgid "test liquid source %i"
+msgid "test liquid source @1"
-msgstr "Testflüssigkeitsquelle %i"
+msgstr "Testflüssigkeitsquelle @1"
 

mods/tutorial_supplemental/locale/tutorial_supplemental.el.po

@@ -48,9 +48,9 @@ msgstr "στάρι"
 msgid "piece of rock"
 msgstr "κομμάτι πέτρας"
 
-msgid "flowing test liquid %i"
+msgid "flowing test liquid @1"
-msgstr "πειραματικό ρευστό υγρό %i"
+msgstr "πειραματικό ρευστό υγρό @1"
 
-msgid "test liquid source %i"
+msgid "test liquid source @1"
-msgstr "πηγή πειραματικού ρευστού %i"
+msgstr "πηγή πειραματικού ρευστού @1"
 

mods/tutorial_supplemental/locale/tutorial_supplemental.es.po

@@ -48,9 +48,9 @@ msgstr "trigo"
 msgid "piece of rock"
 msgstr "trozo de roca"
 
-msgid "flowing test liquid %i"
+msgid "flowing test liquid @1"
-msgstr "líquido de pruebas de flujo %i"
+msgstr "líquido de pruebas de flujo @1"
 
-msgid "test liquid source %i"
+msgid "test liquid source @1"
-msgstr "fuente de líquido de pruebas %i"
+msgstr "fuente de líquido de pruebas @1"
 

mods/tutorial_supplemental/locale/tutorial_supplemental.fr.po

@@ -48,9 +48,9 @@ msgstr "Blé"
 msgid "piece of rock"
 msgstr "Bout de pierre"
 
-msgid "flowing test liquid %i"
+msgid "flowing test liquid @1"
-msgstr "Liquide visqueux courant %i"
+msgstr "Liquide visqueux courant @1"
 
-msgid "test liquid source %i"
+msgid "test liquid source @1"
-msgstr "Source de liquide visqueux %i"
+msgstr "Source de liquide visqueux @1"
 

mods/tutorial_supplemental/locale/tutorial_supplemental.id.po

@@ -48,9 +48,9 @@ msgstr "gandum"
 msgid "piece of rock"
 msgstr "sepotong batu"
 
-msgid "flowing test liquid %i"
+msgid "flowing test liquid @1"
-msgstr "pengujian cairan mengalir %i"
+msgstr "pengujian cairan mengalir @1"
 
-msgid "test liquid source %i"
+msgid "test liquid source @1"
-msgstr "pengujian sumber cairan %i"
+msgstr "pengujian sumber cairan @1"
 

mods/tutorial_supplemental/locale/tutorial_supplemental.it.po

@@ -48,9 +48,9 @@ msgstr "grano"
 msgid "piece of rock"
 msgstr "pezzo di roccia"
 
-msgid "flowing test liquid %i"
+msgid "flowing test liquid @1"
-msgstr "fonte liquida di prova %i"
+msgstr "fonte liquida di prova @1"
 
-msgid "test liquid source %i"
+msgid "test liquid source @1"
-msgstr "liquido corrente di prova %i"
+msgstr "liquido corrente di prova @1"
 

mods/tutorial_supplemental/locale/tutorial_supplemental.nl.po

@@ -48,9 +48,9 @@ msgstr "tarwe"
 msgid "piece of rock"
 msgstr "stuk rots"
 
-msgid "flowing test liquid %i"
+msgid "flowing test liquid @1"
-msgstr "test stromende vloeistof %i"
+msgstr "test stromende vloeistof @1"
 
-msgid "test liquid source %i"
+msgid "test liquid source @1"
-msgstr "test vloeistof bron %i"
+msgstr "test vloeistof bron @1"