l10n: add low 45° platform; remove "on"/"off"; adjust signal names

6 files changed, 22 insertions, 29 deletions

diff --git a/advtrains/locale/advtrains.de.tr b/advtrains/locale/advtrains.de.tr
index ada459f..cc610f1 100644
--- a/advtrains/locale/advtrains.de.tr
+++ b/advtrains/locale/advtrains.de.tr
@@ -84,8 +84,6 @@ Get off (forced)=Ausstieg zwingen
 
 # General
 Save=Speichern
-off=aus
-on=ein
 
 # Line automation
 Station Code=Code der Haltestelle
@@ -108,9 +106,10 @@ Detector Rail=Detektorschiene
 @1 Slope=@1 Steigung
 @1 Platform (low)=Niedriger @1-Bahnsteig
 @1 Platform (high)=Hoher @1-Bahnsteig
-@1 Platform (45 degree)=@1-Bahnsteig (45°)
-Lampless Signal (@1)=Mechanisches Signal (@1)
-Signal (@1)=Lichtsignal (@1)
+@1 Platform (low, 45 degree)=Niedriger @1-Bahnsteig (45°)
+@1 Platform (45 degree)=Hoher @1-Bahnsteig (45°)
+Lampless Signal=Mechanisches Signal
+Signal=Lichtsignal
 Wallmounted Signal (l)=An der linken Seite montiertes Signal
 Wallmounted Signal (r)=An der rechten Seite montiertes Signal
 Wallmounted Signal (t)=An der Decke montiertes Signal
diff --git a/advtrains/locale/advtrains.fr.tr b/advtrains/locale/advtrains.fr.tr
index cf5ea6e..7e384c5 100644
--- a/advtrains/locale/advtrains.fr.tr
+++ b/advtrains/locale/advtrains.fr.tr
@@ -83,8 +83,6 @@ Get off (forced)=Débarquer (de force)
 
 # General
 Save=Sauvegarder
-off=marche
-on=arrêt
 
 # Line automation
 Station Code=Code de Station
@@ -107,9 +105,10 @@ Detector Rail=Rail détecteur
 @1 Slope=Pente @1
 @1 Platform (low)=Quai @1 (bas)
 @1 Platform (high)=Quai @1 (haut)
-@1 Platform (45 degree)=Quai @1 (45°)
-Lampless Signal (@1)=Sémaphore
-Signal (@1)=Signal (@1)
+@1 Platform (low, 45 degree)=Quai @1 (bas, 45°)
+@1 Platform (45 degree)=Quai @1 (haut, 45°)
+Lampless Signal=Sémaphore
+Signal=Signal
 Wallmounted Signal (l)=Signal mural (gauche)
 Wallmounted Signal (r)=Signal mural (droit)
 Wallmounted Signal (t)=Signal mural (plafond)
diff --git a/advtrains/locale/advtrains.zh_CN.tr b/advtrains/locale/advtrains.zh_CN.tr
index ae6d8ee..720d147 100644
--- a/advtrains/locale/advtrains.zh_CN.tr
+++ b/advtrains/locale/advtrains.zh_CN.tr
@@ -83,9 +83,6 @@ Get off (forced)=强制下车
 
 # General
 Save=保存
-# "off" and "on" can be translated differently depending on the context and are therefore not translated.
-off=off
-on=on
 
 # Line automation
 Station Code=车站代码
@@ -108,9 +105,10 @@ Detector Rail=探测铁轨
 @1 Slope=@1斜坡
 @1 Platform (low)=50cm 高的@1站台
 @1 Platform (high)=1m 高的@1站台
-@1 Platform (45 degree)=1m 高的@1站台 (45度)
-Lampless Signal (@1)=臂板信号机 (@1)
-Signal (@1)=信号灯 (@1)
+@1 Platform (low, 45 degree)=50cm 高的@1站台 (45°)
+@1 Platform (45 degree)=1m 高的@1站台 (45°)
+Lampless Signal=臂板信号机
+Signal=信号灯
 Wallmounted Signal (l)=壁挂式信号灯 (左侧)
 Wallmounted Signal (r)=壁挂式信号灯 (右侧)
 Wallmounted Signal (t)=悬挂式信号灯
diff --git a/advtrains/locale/advtrains.zh_TW.tr b/advtrains/locale/advtrains.zh_TW.tr
index 598600f..d70a55a 100644
--- a/advtrains/locale/advtrains.zh_TW.tr
+++ b/advtrains/locale/advtrains.zh_TW.tr
@@ -83,9 +83,6 @@ Get off (forced)=強制下車
 
 # General
 Save=儲存
-# "off" and "on" can be translated differently depending on the context and are therefore not translated.
-off=off
-on=on
 
 # Line automation
 Station Code=車站碼
@@ -108,9 +105,10 @@ Detector Rail=探測鐵軌
 @1 Slope=@1斜坡
 @1 Platform (low)=50cm 高的@1月臺
 @1 Platform (high)=1m 高的@1月臺
-@1 Platform (45 degree)=1m 高的@1月臺 (45度)
-Lampless Signal (@1)=臂木式號誌機 (@1)
-Signal (@1)=色燈號誌機 (@1)
+@1 Platform (low, 45 degree)=50cm 高的@1月臺 (45°)
+@1 Platform (45 degree)=1m 高的@1月臺 (45°)
+Lampless Signal=臂木式號誌機
+Signal=色燈號誌機
 Wallmounted Signal (l)=壁掛式色燈號誌機 (左側)
 Wallmounted Signal (r)=壁掛式色燈號誌機 (右側)
 Wallmounted Signal (t)=懸掛式色燈號誌機
diff --git a/advtrains/locale/template.txt b/advtrains/locale/template.txt
index e3efe93..5d10c15 100644
--- a/advtrains/locale/template.txt
+++ b/advtrains/locale/template.txt
@@ -83,8 +83,6 @@ Get off (forced)=Get off (forced)
 
 # General
 Save=Save
-off=off
-on=on
 
 # Line automation
 Station Code=Station Code
@@ -107,9 +105,10 @@ Detector Rail=Detector Rail
 @1 Slope=@1 Slope
 @1 Platform (low)=@1 Platform (low)
 @1 Platform (high)=@1 Platform (high)
+@1 Platform (low, 45 degree)=@1 Platform (low, 45 degree)
 @1 Platform (45 degree)=@1 Platform (45 degree)
-Lampless Signal (@1)=Lampless Signal (@1)
-Signal (@1)=Signal (@1)
+Lampless Signal=Lampless Signal
+Signal=Signal
 Wallmounted Signal (l)=Wallmounted Signal (l)
 Wallmounted Signal (r)=Wallmounted Signal (r)
 Wallmounted Signal (t)=Wallmounted Signal (t)
diff --git a/advtrains/signals.lua b/advtrains/signals.lua
index b26c950..ea3269f 100644
--- a/advtrains/signals.lua
+++ b/advtrains/signals.lua
@@ -60,7 +60,7 @@ for r,f in pairs({on={as="off", ls="green", als="red"}, off={as="on", ls="red",
 			tiles = {"advtrains_retrosignal.png"},
 			inventory_image="advtrains_retrosignal_inv.png",
 			drop="advtrains:retrosignal_off",
-			description=attrans("Lampless Signal (@1)", attrans(r..rotation)),
+			description=attrans("Lampless Signal"),
 			sunlight_propagates=true,
 			groups = {
 				cracky=3,
@@ -124,7 +124,7 @@ for r,f in pairs({on={as="off", ls="green", als="red"}, off={as="on", ls="red",
 			tiles = {"advtrains_signal_"..r..".png"},
 			inventory_image="advtrains_signal_inv.png",
 			drop="advtrains:signal_off",
-			description=attrans("Signal (@1)", attrans(r..rotation)),
+			description=attrans("Signal"),
 			groups = {
 				cracky=3,
 				not_blocking_trains=1,
@@ -314,7 +314,7 @@ minetest.register_node("advtrains:across_on", {
 	mesh = "advtrains_across.obj",
 	tiles = {{name="advtrains_across_anim.png", animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=1.0}}},
 	drop="advtrains:across_off",
-	description=attrans("Andrew's Cross (on) (you hacker you)"),
+	description=attrans("Andrew's Cross"),
 	groups = {
 		cracky=3,
 		not_blocking_trains=1,