diff --git a/include/lang/ca.rem b/include/lang/ca.rem
index b9afd6d3..31d2e8df 100644
--- a/include/lang/ca.rem
+++ b/include/lang/ca.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file was created  by Eloi Torrents <eloitor@disroot.org>
 
+TRANSLATE "LANGID" "ca"
+
 SET $Monday "dilluns"
 SET $Tuesday "dimarts"
 SET $Wednesday "dimecres"
@@ -51,5 +53,3 @@ FSET subst_hours(h) iif(h==1, "1 hora", h + " hores")
 SET $Is "és"
 SET $Was "va ser"
 SET $And "i"
-
-TRANSLATE "LANGID" "ca"
diff --git a/include/lang/da.rem b/include/lang/da.rem
index f198dcbf..4ec189ea 100644
--- a/include/lang/da.rem
+++ b/include/lang/da.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Mogens Lynnerup.
 
+TRANSLATE "LANGID" "da"
+
 SET $Sunday "Søndag"
 SET $Monday "Mandag"
 SET $Tuesday "Tirsdag"
@@ -67,5 +69,3 @@ FSET subst_hx(alt, d, t) "den " + zeropad(day(d), 2) + $DateSep + zeropad(monnum
 FSET subst_ix(alt, d, t) "den " + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2)
 FSET subst_ux(alt, d, t) subst_ax(alt, d, t)
 FSET subst_vx(alt, d, t) subst_gx(alt, d, t)
-
-TRANSLATE "LANGID" "da"
diff --git a/include/lang/de.rem b/include/lang/de.rem
index f5fd527b..ba771116 100644
--- a/include/lang/de.rem
+++ b/include/lang/de.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Wolfgang Thronicke
 
+TRANSLATE "LANGID" "de"
+
 # Day names
 SET $Sunday "Sonntag"
 SET $Monday "Montag"
@@ -72,5 +74,3 @@ TRANSLATE "Autumnal Equinox" "Herbstanfang"
 TRANSLATE "Winter Solstice" "Winteranfang"
 TRANSLATE "Daylight Saving Time Starts" "Beginn Sommerzeit"
 TRANSLATE "Daylight Saving Time Ends" "Ende Sommerzeit"
-
-TRANSLATE "LANGID" "de"
diff --git a/include/lang/es.rem b/include/lang/es.rem
index 897c7f13..24d4aea4 100644
--- a/include/lang/es.rem
+++ b/include/lang/es.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Rafa Couto <rafacouto@biogate.com>
 
+TRANSLATE "LANGID" "es"
+
 SET $Sunday "Domingo"
 SET $Monday "Lunes"
 SET $Tuesday "Martes"
@@ -46,5 +48,3 @@ SET $Hplu "s"
 SET $Mplu "s"
 
 FSET subst_bx(a, d, t) "dentro de " + (d-today()) + " días"
-
-TRANSLATE "LANGID" "es"
diff --git a/include/lang/fi.rem b/include/lang/fi.rem
index 1bdde4d5..9d40a8c6 100644
--- a/include/lang/fi.rem
+++ b/include/lang/fi.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Mikko Silvonen
 
+TRANSLATE "LANGID" "fi"
+
 SET $Sunday "sunnuntai"
 SET $Monday "maanantai"
 SET $Tuesday "tiistai"
@@ -93,8 +95,6 @@ FSET subst_min_past(m) iif(m==0, "", m + " " + $Minute + iif(m==1, " ", $Mplu +
 FSET subst_hour_future(h) iif(h==0, "", h + " tunnin ")
 FSET subst_min_future(m) iif(m==0, "", m + " minuutin ")
 
-TRANSLATE "LANGID" "fi"
-
 TRANSLATE "Missing ']'" "Puuttuva ']'"
 TRANSLATE "Missing quote" "Puuttuva lainausmerkki"
 TRANSLATE "Expression too complex" "Liian monimutkainen lauseke"
diff --git a/include/lang/fr.rem b/include/lang/fr.rem
index e00185d7..a302135f 100644
--- a/include/lang/fr.rem
+++ b/include/lang/fr.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Laurent Duperval
 
+TRANSLATE "LANGID" "fr"
+
 SET $Sunday "dimanche"
 SET $Monday "lundi"
 SET $Tuesday "mardi"
@@ -61,8 +63,6 @@ FSET subst_jx(alt, date, time) iif(alt, subst_j_alt(date), $On + " " + subst_j_a
 FSET subst_k_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date)
 FSET subst_kx(alt, date, time) iif(alt, subst_k_alt(date), $On + " " + subst_k_alt(date))
 
-TRANSLATE "LANGID" "fr"
-
 TRANSLATE "Missing ']'" "']' manquant"
 TRANSLATE "Missing quote" "Apostrophe manquant"
 TRANSLATE "Expression too complex" "Expression trop complexe"
diff --git a/include/lang/gr.rem b/include/lang/gr.rem
index 434529b8..1efcdc66 100644
--- a/include/lang/gr.rem
+++ b/include/lang/gr.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by jarlaxl lamat (jarlaxl@freemail.gr)
 
+TRANSLATE "LANGID" "gr"
+
 SET $Sunday "Κυριακή"
 SET $Monday "Δευτέρα"
 SET $Tuesday "Τρίτη"
@@ -56,8 +58,6 @@ FSET subst_gx(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))
 FSET subst_ux(alt, d, t) subst_ax(alt, d, t)
 FSET subst_vx(alt, d, t) subst_gx(alt, d, t)
 
-TRANSLATE "LANGID" "gr"
-
 TRANSLATE "Perihelion" "Περιήλιον"
 TRANSLATE "Vernal Equinox" "Εαρινή ισημερία"
 TRANSLATE "Summer Solstice" "Θερινό ηλιοστάσιο"
diff --git a/include/lang/is.rem b/include/lang/is.rem
index 420a290b..1ce17d98 100644
--- a/include/lang/is.rem
+++ b/include/lang/is.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Björn Davíðsson (bjossi@snerpa.is)
 
+TRANSLATE "LANGID" "is"
+
 SET $Sunday "sunnudagur"
 SET $Monday "mánudagur"
 SET $Tuesday "þriðjudagur"
@@ -49,5 +51,3 @@ SET $Mplu "r"
 
 FSET subst_bx(a, d, t) "eftir " + (d - today()) + " daga"
 fset subst_p(a, d, t) iif(d == today()+1, "", "a")
-
-TRANSLATE "LANGID" "is"
diff --git a/include/lang/it.rem b/include/lang/it.rem
index 901f3089..121d5817 100644
--- a/include/lang/it.rem
+++ b/include/lang/it.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Valerio Aimale
 
+TRANSLATE "LANGID" "it"
+
 SET $Sunday "Domenica"
 SET $Monday "Lunedì"
 SET $Tuesday "Martedì"
@@ -65,5 +67,3 @@ FSET subst_hours(h) iif(h==1, "1 ora", h + " ore")
 
 FSET subst_0(a, d, t) iif(abs(now()-t)/60==1, "a", "e")
 FSET subst_9(a, d, t) iif(abs(now()-t)%60==1, "o", "i")
-
-TRANSLATE "LANGID" "it"
diff --git a/include/lang/nl.rem b/include/lang/nl.rem
index 486b0f97..43f6bd16 100644
--- a/include/lang/nl.rem
+++ b/include/lang/nl.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Willem Kasdorp and Erik-Jan Vens
 
+TRANSLATE "LANGID" "nl"
+
 SET $Sunday "zondag"
 SET $Monday "maandag"
 SET $Tuesday "dinsdag"
@@ -55,8 +57,6 @@ FSET subst_hours(h) iif(h==1, "1 uur", h + " uren")
 
 FSET subst_bx(a, d, t) "over " + (d-today()) + " dagen"
 
-TRANSLATE "LANGID" "nl"
-
 TRANSLATE "New Moon" "Nieuwe maan"
 TRANSLATE "First Quarter" "Eerste kwartier"
 TRANSLATE "Full Moon" "Volle maan"
diff --git a/include/lang/no.rem b/include/lang/no.rem
index cdae168d..35339955 100644
--- a/include/lang/no.rem
+++ b/include/lang/no.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Trygve Randen
 
+TRANSLATE "LANGID" "no"
+
 SET $Sunday "Søndag"
 SET $Monday "Mandag"
 SET $Tuesday "Tirsdag"
@@ -56,6 +58,3 @@ FSET subst_g_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d)
 FSET subst_ux(a, d, t) subst_ax(a, d, t)
 FSET subst_vx(a, d, t) subst_gx(a, d, t)
 FSET subst_p(a, d, t) iif(d==today()+1, "", "er")
-
-TRANSLATE "LANGID" "no"
-
diff --git a/include/lang/pl.rem b/include/lang/pl.rem
index d9295d59..d9340c28 100644
--- a/include/lang/pl.rem
+++ b/include/lang/pl.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Jerzy Sobczyk
 
+TRANSLATE "LANGID" "pl"
+
 SET $Sunday "Niedziela"
 SET $Monday "Poniedziałek"
 SET $Tuesday "Wtorek"
@@ -68,8 +70,6 @@ FSET subst_1past(diff) iif(diff/60==0, subst_1min(diff%60), diff%60==0, subst_1h
 FSET subst_1min(m) m + " " + $Minute + subst_pl_plu(m)
 FSET subst_1h(h) h + " " + $Hour + subst_pl_plu(h)
 
-TRANSLATE "LANGID" "pl"
-
 TRANSLATE "Ok" "OK"
 TRANSLATE "Missing ']'" "Brakujący ']'"
 TRANSLATE "Missing quote" "Brakujący nawias"
diff --git a/include/lang/pt.rem b/include/lang/pt.rem
index 0f377f3c..664fb9ae 100644
--- a/include/lang/pt.rem
+++ b/include/lang/pt.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Marco Paganini
 
+TRANSLATE "LANGID" "pt"
+
 SET $Sunday "domingo"
 SET $Monday "segunda"
 SET $Tuesday "terça"
@@ -68,8 +70,6 @@ FSET subst_1help(diff) iif(diff/60==0, subst_mplu(diff%60), diff%60==0, subst_hp
 FSET subst_mplu(m) iif(m==1, "1 " + $Minute, m + " " + $Minute + $Mplu)
 FSET subst_hplu(h) iif(h==1, "1 " + $Hour, h + " " + $Hour + $Hplu)
 
-TRANSLATE "LANGID" "pt"
-
 TRANSLATE "Missing ']'" "Falta um ']'"
 TRANSLATE "Missing quote" "Falta uma aspa"
 TRANSLATE "Expression too complex" "Expressao muito complexa"
diff --git a/include/lang/ro.rem b/include/lang/ro.rem
index bcbfce7f..44f29231 100644
--- a/include/lang/ro.rem
+++ b/include/lang/ro.rem
@@ -3,6 +3,8 @@
 # REMIND is Copyright (C) 1992-2024 by Dianne Skoll
 # This file is derived from a translation by Liviu Daia
 
+TRANSLATE "LANGID" "ro"
+
 SET $Sunday "Duminică"
 SET $Monday "Luni"
 SET $Tuesday "Marți"
@@ -66,5 +68,3 @@ FSET subst_1helper(diff, when) when + iif(diff%60==0, subst_1h(diff/60), diff/60
 FSET subst_1h(h) iif(h==1, "1 oră", h + " ore")
 FSET subst_1m(m) iif(m==1, "1 minut", m + " minute")
 FSET subst_0(a, d, t) iif(abs(t-now())/60==1, "ă", "e")
-
-TRANSLATE "LANGID" "ro"