Fix some translations strings in the source file

10 files changed, 143 insertions, 58 deletions

diff --git a/advtrains/atc.lua b/advtrains/atc.lua
index c1ff218..155c005 100644
--- a/advtrains/atc.lua
+++ b/advtrains/atc.lua
@@ -106,7 +106,7 @@ local apn_func=function(pos)
 	-- FIX for long-persisting ndb bug: there's no node in parameter 2 of this function!
 	local meta=minetest.get_meta(pos)
 	if meta then
-		meta:set_string("infotext", attrans("ATC controller, unconfigured."))
+		meta:set_string("infotext", attrans("Unconfigured ATC controller"))
 		meta:set_string("formspec", atc.get_atc_controller_formspec(pos, meta))
 	end
 end
diff --git a/advtrains/couple.lua b/advtrains/couple.lua
index e242536..4851663 100644
--- a/advtrains/couple.lua
+++ b/advtrains/couple.lua
@@ -326,11 +326,11 @@ function advtrains.check_matching_coupler_types(t1, t1_front, t2, t2_front)
 	for typ,_ in pairs(t1_cplt) do
 		table.insert(t1_cplhr, advtrains.coupler_types[typ] or typ)
 	end
-	if #t1_cplhr==0 then t1_cplhr[1]=attrans("<none>") end
+	if #t1_cplhr==0 then t1_cplhr[1]=attrans("<No coupler>") end
 	for typ,_ in pairs(t2_cplt) do
 		table.insert(t2_cplhr, advtrains.coupler_types[typ] or typ)
 	end
-	if #t2_cplhr==0 then t2_cplhr[1]=attrans("<none>") end
+	if #t2_cplhr==0 then t2_cplhr[1]=attrans("<No coupler>") end
 	return false, attrans("Can not couple: The couplers of the trains do not match (@1 and @2).", table.concat(t1_cplhr, ","), table.concat(t2_cplhr, ","))
 end
 
diff --git a/advtrains/po/template.pot b/advtrains/po/advtrains.pot
index 23aaa6a..70bbf6d 100644
--- a/advtrains/po/template.pot
+++ b/advtrains/po/advtrains.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: advtrains\n"
 "Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n"
-"POT-Creation-Date: 2023-10-04 15:40+0200\n"
+"POT-Creation-Date: 2023-10-04 22:10+0200\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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: advtrains/atc.lua:109
-msgid "ATC controller, unconfigured."
+msgid "Unconfigured ATC controller"
 msgstr ""
 
 #: advtrains/atc.lua:150
@@ -161,8 +161,20 @@ msgstr ""
 msgid "(Doors closed)"
 msgstr ""
 
+#: advtrains/wagons.lua:692
+msgid "This wagon has no seats!"
+msgstr ""
+
+#: advtrains/wagons.lua:703
+msgid "This wagon is full."
+msgstr ""
+
+#: advtrains/wagons.lua:706
+msgid "Doors are closed! (Try holding sneak key!)"
+msgstr ""
+
 #: advtrains/wagons.lua:712
-msgid "Can't get on: "
+msgid "You can't get on this wagon!"
 msgstr ""
 
 #: advtrains/wagons.lua:838
@@ -195,6 +207,10 @@ msgid ""
 "off!"
 msgstr ""
 
+#: advtrains/wagons.lua:1250
+msgid "You are not allowed to access the driver stand!"
+msgstr ""
+
 #: advtrains/trainhud.lua:305
 msgid "OVERRUN RED SIGNAL! Examine situation and reverse train to move again."
 msgstr ""
@@ -248,15 +264,15 @@ msgid "Signal"
 msgstr ""
 
 #: advtrains/signals.lua:191
-msgid "Wallmounted Signal (l)"
+msgid "Wallmounted Signal (left)"
 msgstr ""
 
 #: advtrains/signals.lua:192
-msgid "Wallmounted Signal (r)"
+msgid "Wallmounted Signal (right)"
 msgstr ""
 
 #: advtrains/signals.lua:193
-msgid "Wallmounted Signal (t)"
+msgid "Wallmounted Signal (top)"
 msgstr ""
 
 #: advtrains/signals.lua:281 advtrains/signals.lua:322
@@ -277,7 +293,7 @@ msgid ""
 msgstr ""
 
 #: advtrains/couple.lua:329 advtrains/couple.lua:333
-msgid "<none>"
+msgid "<No coupler>"
 msgstr ""
 
 #: advtrains/couple.lua:334
diff --git a/advtrains/po/de.po b/advtrains/po/de.po
index ebd6339..86b733b 100644
--- a/advtrains/po/de.po
+++ b/advtrains/po/de.po
@@ -2,18 +2,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: advtrains\n"
 "Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n"
-"POT-Creation-Date: 2023-10-04 15:40+0200\n"
-"PO-Revision-Date: 2022-11-02 15:08+0100\n"
+"POT-Creation-Date: 2023-10-04 22:09+0200\n"
+"PO-Revision-Date: 2023-10-04 22:12+0200\n"
 "Last-Translator: Y. Wang <yw05@forksworld.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.3.2\n"
 
 #: advtrains/atc.lua:109
-msgid "ATC controller, unconfigured."
-msgstr "Nicht konfiguierte Zugbeeinflussungsgleis"
+msgid "Unconfigured ATC controller"
+msgstr "Nicht konfiguiertes Zugbeeinflussungsgleis"
 
 #: advtrains/atc.lua:150
 msgid ""
@@ -42,7 +43,8 @@ msgstr "Speichern"
 #: advtrains/atc.lua:236
 msgid "ATC Reverse command warning: didn't reverse train, train moving!"
 msgstr ""
-"Zugbeeinflussung: der Befehl „R“ wurde nicht ausgeführt, Zug in Bewegung!"
+"Zugbeeinflussung: der Zug befindet sich in Bewegung und kann nicht umgekehrt "
+"werden!"
 
 #: advtrains/atc.lua:248
 msgid "ATC Kick command warning: Doors closed"
@@ -129,7 +131,7 @@ msgstr "Das Inventar dieses Waggons ist nicht leer!"
 
 #: advtrains/wagons.lua:210
 msgid "Wagon needs to be decoupled from other wagons in order to destroy it."
-msgstr ""
+msgstr "Der Waggon muss abgekoppelt sein, damit Sie ihn abbauen können."
 
 #: advtrains/wagons.lua:216
 msgid ""
@@ -163,9 +165,23 @@ msgstr "Ausstieg zwingen"
 msgid "(Doors closed)"
 msgstr "(Türen geschlossen)"
 
-#: advtrains/wagons.lua:712
-msgid "Can't get on: "
+#: advtrains/wagons.lua:692
+msgid "This wagon has no seats!"
+msgstr "In diesem Waggon ist kein Sitzplatz vorhanden!"
+
+#: advtrains/wagons.lua:703
+msgid "This wagon is full."
+msgstr "Der Waggon ist voll."
+
+#: advtrains/wagons.lua:706
+msgid "Doors are closed! (Try holding sneak key!)"
 msgstr ""
+"Die Türen sind geschlossen! (Versuchen Sie, beim Einstieg die Schleichen-"
+"Taste zu halten!)"
+
+#: advtrains/wagons.lua:712
+msgid "You can't get on this wagon!"
+msgstr "Sie können nicht in diesen Waggon einsteigen!"
 
 #: advtrains/wagons.lua:838
 msgid "Select seat:"
@@ -199,6 +215,10 @@ msgstr ""
 "Die Türen sind geschlossen. Nutzen Sie Schleichen+Rechtsklick, um trotz "
 "geschlossener Türen auszusteigen."
 
+#: advtrains/wagons.lua:1250
+msgid "You are not allowed to access the driver stand!"
+msgstr ""
+
 #: advtrains/trainhud.lua:305
 msgid "OVERRUN RED SIGNAL! Examine situation and reverse train to move again."
 msgstr ""
@@ -258,20 +278,20 @@ msgid "Signal"
 msgstr "Lichtsignal"
 
 #: advtrains/signals.lua:191
-msgid "Wallmounted Signal (l)"
+msgid "Wallmounted Signal (left)"
 msgstr "An der linken Seite montiertes Signal"
 
 #: advtrains/signals.lua:192
-msgid "Wallmounted Signal (r)"
+msgid "Wallmounted Signal (right)"
 msgstr "An der rechten Seite montiertes Signal"
 
 #: advtrains/signals.lua:193
-msgid "Wallmounted Signal (t)"
+msgid "Wallmounted Signal (top)"
 msgstr "An der Decke montiertes Signal"
 
 #: advtrains/signals.lua:281 advtrains/signals.lua:322
 msgid "Andrew's Cross"
-msgstr ""
+msgstr "Andreaskreuz"
 
 #: advtrains/couple.lua:28
 msgid "Buffer and Chain Coupler"
@@ -284,11 +304,11 @@ msgstr "Scharfenbergkupplung"
 #: advtrains/couple.lua:185
 msgid ""
 "You are not allowed to couple trains without the train_operator privilege."
-msgstr "Sie dürfen ohne das „train_builder“-Privileg keine Züge ankuppeln."
+msgstr "Sie dürfen ohne das „train_operator“-Privileg keine Züge ankuppeln."
 
 #: advtrains/couple.lua:329 advtrains/couple.lua:333
-msgid "<none>"
-msgstr ""
+msgid "<No coupler>"
+msgstr "<Keine Kupplung vorhanden>"
 
 #: advtrains/couple.lua:334
 msgid "Can not couple: The couplers of the trains do not match (@1 and @2)."
@@ -350,7 +370,7 @@ msgstr ""
 
 #: advtrains/copytool.lua:180
 msgid "Train copied!"
-msgstr "Der Zug wurde Kopiert."
+msgstr "Der Zug wurde Kopiert!"
 
 #: advtrains/protection.lua:148
 msgid ""
@@ -516,7 +536,7 @@ msgstr "Dampflokomotive"
 
 #: advtrains_train_steam/init.lua:159
 msgid "Detailed Steam Engine"
-msgstr "detaillierte Dampflokomotive"
+msgstr "Detaillierte Dampflokomotive"
 
 #: advtrains_train_steam/init.lua:206
 msgid "Passenger Wagon"
diff --git a/advtrains/po/fr.po b/advtrains/po/fr.po
index 9a16799..8c16581 100644
--- a/advtrains/po/fr.po
+++ b/advtrains/po/fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: advtrains\n"
 "Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n"
-"POT-Creation-Date: 2023-10-04 15:40+0200\n"
+"POT-Creation-Date: 2023-10-04 22:09+0200\n"
 "PO-Revision-Date: 2022-07-05 10:11+0200\n"
 "Last-Translator: Tanavit <tanavit@posto.ovh>\n"
 "Language-Team: French\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: advtrains/atc.lua:109
-msgid "ATC controller, unconfigured."
+msgid "Unconfigured ATC controller"
 msgstr "Controlleur ATC, non-configuré "
 
 #: advtrains/atc.lua:150
@@ -166,8 +166,20 @@ msgstr "Débarquer (de force)"
 msgid "(Doors closed)"
 msgstr "(Portes closes)"
 
+#: advtrains/wagons.lua:692
+msgid "This wagon has no seats!"
+msgstr ""
+
+#: advtrains/wagons.lua:703
+msgid "This wagon is full."
+msgstr ""
+
+#: advtrains/wagons.lua:706
+msgid "Doors are closed! (Try holding sneak key!)"
+msgstr ""
+
 #: advtrains/wagons.lua:712
-msgid "Can't get on: "
+msgid "You can't get on this wagon!"
 msgstr ""
 
 #: advtrains/wagons.lua:838
@@ -202,6 +214,10 @@ msgstr ""
 "Portes closes ! Utilisez \"Marcher lentement (Sneak)\" et Clic-Droit pour "
 "franchir les portes et débarquer !"
 
+#: advtrains/wagons.lua:1250
+msgid "You are not allowed to access the driver stand!"
+msgstr ""
+
 #: advtrains/trainhud.lua:305
 msgid "OVERRUN RED SIGNAL! Examine situation and reverse train to move again."
 msgstr ""
@@ -256,15 +272,15 @@ msgid "Signal"
 msgstr ""
 
 #: advtrains/signals.lua:191
-msgid "Wallmounted Signal (l)"
+msgid "Wallmounted Signal (left)"
 msgstr "Signal mural (gauche)"
 
 #: advtrains/signals.lua:192
-msgid "Wallmounted Signal (r)"
+msgid "Wallmounted Signal (right)"
 msgstr "Signal mural (droit)"
 
 #: advtrains/signals.lua:193
-msgid "Wallmounted Signal (t)"
+msgid "Wallmounted Signal (top)"
 msgstr "Signal mural (plafond)"
 
 #: advtrains/signals.lua:281 advtrains/signals.lua:322
@@ -285,7 +301,7 @@ msgid ""
 msgstr ""
 
 #: advtrains/couple.lua:329 advtrains/couple.lua:333
-msgid "<none>"
+msgid "<No coupler>"
 msgstr ""
 
 #: advtrains/couple.lua:334
diff --git a/advtrains/po/update-translations.sh b/advtrains/po/update-translations.sh
index d86c568..b37d019 100755
--- a/advtrains/po/update-translations.sh
+++ b/advtrains/po/update-translations.sh
@@ -17,8 +17,9 @@ xgettext \
 	--msgid-bugs-address='advtrains-discuss@lists.sr.ht' \
 	`find $ATDIR $BTDIR -name '*.lua' -printf '%P\n'` \
 	&&
-mv advtrains.po template.pot &&
+mv advtrains.po advtrains.pot &&
 for i in *.po; do
 	msgmerge -U \
-		$i template.pot
+		--no-fuzzy-matching \
+		$i advtrains.pot
 done
diff --git a/advtrains/po/zh_CN.po b/advtrains/po/zh_CN.po
index c81cf6c..ba64e7e 100644
--- a/advtrains/po/zh_CN.po
+++ b/advtrains/po/zh_CN.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: advtrains\n"
 "Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n"
-"POT-Creation-Date: 2023-10-04 15:40+0200\n"
+"POT-Creation-Date: 2023-10-04 22:09+0200\n"
 "PO-Revision-Date: 2022-11-02 15:08+0100\n"
 "Last-Translator: Y. Wang <yw05@forksworld.de>\n"
 "Language-Team: Chinese (Simplified)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: advtrains/atc.lua:109
-msgid "ATC controller, unconfigured."
+msgid "Unconfigured ATC controller"
 msgstr "ATC 控制器 (未配置)"
 
 #: advtrains/atc.lua:150
@@ -164,8 +164,20 @@ msgstr "强制下车"
 msgid "(Doors closed)"
 msgstr "(车门已关闭)"
 
+#: advtrains/wagons.lua:692
+msgid "This wagon has no seats!"
+msgstr ""
+
+#: advtrains/wagons.lua:703
+msgid "This wagon is full."
+msgstr ""
+
+#: advtrains/wagons.lua:706
+msgid "Doors are closed! (Try holding sneak key!)"
+msgstr ""
+
 #: advtrains/wagons.lua:712
-msgid "Can't get on: "
+msgid "You can't get on this wagon!"
 msgstr ""
 
 #: advtrains/wagons.lua:838
@@ -198,6 +210,10 @@ msgid ""
 "off!"
 msgstr "车门已关闭，请使用潜行+右键单击下车。"
 
+#: advtrains/wagons.lua:1250
+msgid "You are not allowed to access the driver stand!"
+msgstr ""
+
 #: advtrains/trainhud.lua:305
 msgid "OVERRUN RED SIGNAL! Examine situation and reverse train to move again."
 msgstr ""
@@ -251,15 +267,15 @@ msgid "Signal"
 msgstr "信号灯"
 
 #: advtrains/signals.lua:191
-msgid "Wallmounted Signal (l)"
+msgid "Wallmounted Signal (left)"
 msgstr "壁挂式信号灯 (左侧)"
 
 #: advtrains/signals.lua:192
-msgid "Wallmounted Signal (r)"
+msgid "Wallmounted Signal (right)"
 msgstr "壁挂式信号灯 (右侧)"
 
 #: advtrains/signals.lua:193
-msgid "Wallmounted Signal (t)"
+msgid "Wallmounted Signal (top)"
 msgstr "悬挂式信号灯"
 
 #: advtrains/signals.lua:281 advtrains/signals.lua:322
@@ -280,7 +296,7 @@ msgid ""
 msgstr "您没有“train_operator”权限，不能连接这两节车厢。"
 
 #: advtrains/couple.lua:329 advtrains/couple.lua:333
-msgid "<none>"
+msgid "<No coupler>"
 msgstr ""
 
 #: advtrains/couple.lua:334
diff --git a/advtrains/po/zh_TW.po b/advtrains/po/zh_TW.po
index 91a205f..358044e 100644
--- a/advtrains/po/zh_TW.po
+++ b/advtrains/po/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: advtrains\n"
 "Report-Msgid-Bugs-To: advtrains-discuss@lists.sr.ht\n"
-"POT-Creation-Date: 2023-10-04 15:40+0200\n"
+"POT-Creation-Date: 2023-10-04 22:09+0200\n"
 "PO-Revision-Date: 2022-11-02 15:08+0100\n"
 "Last-Translator: Y. Wang <yw05@forksworld.de>\n"
 "Language-Team: Chinese (Traditional)\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: advtrains/atc.lua:109
-msgid "ATC controller, unconfigured."
+msgid "Unconfigured ATC controller"
 msgstr "ATC 控制器 (未配置)"
 
 #: advtrains/atc.lua:150
@@ -164,8 +164,20 @@ msgstr "強制下車"
 msgid "(Doors closed)"
 msgstr "(車門已關閉)"
 
+#: advtrains/wagons.lua:692
+msgid "This wagon has no seats!"
+msgstr ""
+
+#: advtrains/wagons.lua:703
+msgid "This wagon is full."
+msgstr ""
+
+#: advtrains/wagons.lua:706
+msgid "Doors are closed! (Try holding sneak key!)"
+msgstr ""
+
 #: advtrains/wagons.lua:712
-msgid "Can't get on: "
+msgid "You can't get on this wagon!"
 msgstr ""
 
 #: advtrains/wagons.lua:838
@@ -198,6 +210,10 @@ msgid ""
 "off!"
 msgstr "車門已關閉，請使用潛行+右鍵單擊下車。"
 
+#: advtrains/wagons.lua:1250
+msgid "You are not allowed to access the driver stand!"
+msgstr ""
+
 #: advtrains/trainhud.lua:305
 msgid "OVERRUN RED SIGNAL! Examine situation and reverse train to move again."
 msgstr ""
@@ -251,15 +267,15 @@ msgid "Signal"
 msgstr "色燈號誌機"
 
 #: advtrains/signals.lua:191
-msgid "Wallmounted Signal (l)"
+msgid "Wallmounted Signal (left)"
 msgstr "壁掛式色燈號誌機 (左側)"
 
 #: advtrains/signals.lua:192
-msgid "Wallmounted Signal (r)"
+msgid "Wallmounted Signal (right)"
 msgstr "壁掛式色燈號誌機 (右側)"
 
 #: advtrains/signals.lua:193
-msgid "Wallmounted Signal (t)"
+msgid "Wallmounted Signal (top)"
 msgstr "懸掛式色燈號誌機"
 
 #: advtrains/signals.lua:281 advtrains/signals.lua:322
@@ -280,7 +296,7 @@ msgid ""
 msgstr "您沒有「train_operator」許可權，不能連結這兩節車廂。"
 
 #: advtrains/couple.lua:329 advtrains/couple.lua:333
-msgid "<none>"
+msgid "<No coupler>"
 msgstr ""
 
 #: advtrains/couple.lua:334
diff --git a/advtrains/signals.lua b/advtrains/signals.lua
index 74841d3..c03afbf 100644
--- a/advtrains/signals.lua
+++ b/advtrains/signals.lua
@@ -188,9 +188,9 @@ for r,f in pairs({on={as="off", ls="green", als="red"}, off={as="on", ls="red",
 	
 	--tunnel signals. no rotations.
 	local swdesc = { -- needed for xgettext
-		l = attrans("Wallmounted Signal (l)"),
-		r = attrans("Wallmounted Signal (r)"),
-		t = attrans("Wallmounted Signal (t)"),
+		l = attrans("Wallmounted Signal (left)"),
+		r = attrans("Wallmounted Signal (right)"),
+		t = attrans("Wallmounted Signal (top)"),
 	}
 	for loc, sbox in pairs({l={-1/2, -1/2, -1/4, 0, 1/2, 1/4}, r={0, -1/2, -1/4, 1/2, 1/2, 1/4}, t={-1/2, 0, -1/4, 1/2, 1/2, 1/4}}) do
 		minetest.register_node("advtrains:signal_wall_"..loc.."_"..r, {
diff --git a/advtrains/wagons.lua b/advtrains/wagons.lua
index fe1a0f8..e942bce 100644
--- a/advtrains/wagons.lua
+++ b/advtrains/wagons.lua
@@ -689,7 +689,7 @@ function wagon:on_rightclick(clicker)
 				end
 				
 				local doors_open = self:train().door_open~=0 or clicker:get_player_control().sneak
-				local allow, rsn=false, "Wagon has no seats!"
+				local allow, rsn=false, attrans("This wagon has no seats!")
 				for _,sgr in ipairs(self.assign_to_seat_group) do
 					allow, rsn = self:check_seat_group_access(pname, sgr)
 					if allow then
@@ -700,16 +700,16 @@ function wagon:on_rightclick(clicker)
 										self:get_on(clicker, seatid)
 										return
 									else
-										rsn="Wagon is full."
+										rsn=attrans("This wagon is full.")
 									end
 								else
-									rsn="Doors are closed! (try holding sneak key!)"
+									rsn=attrans("Doors are closed! (Try holding sneak key!)")
 								end
 							end
 						end
 					end
 				end
-				minetest.chat_send_player(pname, attrans("Can't get on: "..rsn))
+				minetest.chat_send_player(pname, rsn or attrans("You can't get on this wagon!"))
 			else
 				self:show_get_on_form(pname)
 			end
@@ -1247,7 +1247,7 @@ end
 function wagon:check_seat_group_access(pname, sgr)
 	local data = advtrains.wagons[self.id]
 	if self.seat_groups[sgr].driving_ctrl_access and not (advtrains.check_driving_couple_protection(pname, data.owner, data.whitelist)) then
-		return false, "Not allowed to access a driver stand!"
+		return false, attrans("You are not allowed to access the driver stand!")
 	end
 	if self.seat_groups[sgr].driving_ctrl_access then
 		advtrains.log("Drive", pname, self.object:getpos(), self:train().text_outside)