From 7729d61adcec97e50e31bf213c668d73b72d3c85 Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Thu, 2 Oct 2025 12:48:24 -0400
Subject: [PATCH] Suppress redefined function warning.

---
 include/lang/ca.rem |  8 +++---
 include/lang/da.rem | 32 +++++++++++------------
 include/lang/de.rem | 22 ++++++++--------
 include/lang/es.rem |  2 +-
 include/lang/fi.rem | 62 ++++++++++++++++++++++-----------------------
 include/lang/fr.rem | 18 ++++++-------
 include/lang/gr.rem | 18 ++++++-------
 include/lang/is.rem |  4 +--
 include/lang/it.rem | 30 +++++++++++-----------
 include/lang/nl.rem | 16 ++++++------
 include/lang/no.rem | 20 +++++++--------
 include/lang/pl.rem | 36 +++++++++++++-------------
 include/lang/pt.rem | 36 +++++++++++++-------------
 include/lang/ro.rem | 32 +++++++++++------------
 14 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/include/lang/ca.rem b/include/lang/ca.rem
index 261c4cc0..666581bc 100644
--- a/include/lang/ca.rem
+++ b/include/lang/ca.rem
@@ -33,11 +33,11 @@ TRANSLATE "are" "són"
 TRANSLATE "were" "eren"
 TRANSLATE "done" "completada"
 
-FSET subst_bx(a,d,t) iif(d==today()+2, "demà passat", d >= today(), "d'aquí " + (d-today()) + " dies", "fa " + (today()-d) + " dies")
+FSET - subst_bx(a,d,t) iif(d==today()+2, "demà passat", d >= today(), "d'aquí " + (d-today()) + " dies", "fa " + (today()-d) + " dies")
 
 # 1 d'abril vs 1 de maig.
-FSET subst_sx(a,d,t) iif(isany(substr(mon(d), 1, 1), "a", "o") , "d'", "de")
-FSET subst_ordinal(d) ""
+FSET - subst_sx(a,d,t) iif(isany(substr(mon(d), 1, 1), "a", "o") , "d'", "de")
+FSET - subst_ordinal(d) ""
 
 BANNER Agenda pel %w, %d %s %m de %y%o:
 
@@ -53,7 +53,7 @@ SET $At "a les"
 SET $Minute "minut"
 SET $Mplu "s"
 SET $Hour "hora"
-FSET subst_hours(h) iif(h==1, "1 hora", h + " hores")
+FSET - subst_hours(h) iif(h==1, "1 hora", h + " hores")
 
 SET $Is "és"
 SET $Was "va ser"
diff --git a/include/lang/da.rem b/include/lang/da.rem
index 5bd467fa..818d3afb 100644
--- a/include/lang/da.rem
+++ b/include/lang/da.rem
@@ -54,24 +54,24 @@ SET $And "og"
 SET $Hplu "r"
 SET $Mplu "ter"
 
-FSET subst_ampm(h) iif(h<5, " om natten", h < 12, " om formiddagen", h < 18, " om eftermiddagen", " om aftenen")
-FSET subst_ordinal(d) "."
-FSET ordx(n) n + "."
+FSET - subst_ampm(h) iif(h<5, " om natten", h < 12, " om formiddagen", h < 18, " om eftermiddagen", " om aftenen")
+FSET - subst_ordinal(d) "."
+FSET - ordx(n) n + "."
 
-FSET subst_p(alt, d, t) iif(d==today()+1, "", "e")
-FSET zeropad(s, len) pad(s, "0", len)
-FSET subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
-FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
+FSET - subst_p(alt, d, t) iif(d==today()+1, "", "e")
+FSET - zeropad(s, len) pad(s, "0", len)
+FSET - subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
+FSET - subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
 
-FSET subst_bx(a, d, t)  iif(d >= today(), "om " + (d-today()) + " dage", "for " + (today()-d) + " dage siden")
+FSET - subst_bx(a, d, t)  iif(d >= today(), "om " + (d-today()) + " dage", "for " + (today()-d) + " dage siden")
 
-FSET subst_ex(alt, d, t) "den " + zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(year(d), 4)
-FSET subst_fx(alt, d, t) "den " + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2) + $DateSep + zeropad(year(d), 4)
+FSET - subst_ex(alt, d, t) "den " + zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(year(d), 4)
+FSET - subst_fx(alt, d, t) "den " + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2) + $DateSep + zeropad(year(d), 4)
 
-FSET subst_g_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d)
-FSET subst_gx(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))
+FSET - subst_g_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d)
+FSET - subst_gx(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))
 
-FSET subst_hx(alt, d, t) "den " + zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2)
-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)
+FSET - subst_hx(alt, d, t) "den " + zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2)
+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)
diff --git a/include/lang/de.rem b/include/lang/de.rem
index e4863931..d8fe4433 100644
--- a/include/lang/de.rem
+++ b/include/lang/de.rem
@@ -54,21 +54,21 @@ SET $And "und"
 SET $Ago "vorher"
 SET $Fromnow "von heute"
 
-FSET subst_ampm(h)      iif(h<5, " nachts", h<12, " vormittags", h<=17, " nachmittags", " abends")
-FSET subst_ordinal(d)   "."
-FSET ordx(n) n + "."
+FSET - subst_ampm(h)      iif(h<5, " nachts", h<12, " vormittags", h<=17, " nachmittags", " abends")
+FSET - subst_ordinal(d)   "."
+FSET - ordx(n) n + "."
 
-FSET subst_a_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
-FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
+FSET - subst_a_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
+FSET - subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
 
-FSET subst_bx(a, d, t)   iif(d >= today(), "in " + (d-today()) + " Tagen", "vor " + (today()-d) + " Tagen")
+FSET - subst_bx(a, d, t)   iif(d >= today(), "in " + (d-today()) + " Tagen", "vor " + (today()-d) + " Tagen")
 
-FSET subst_g_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d)
-FSET subst_gx(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))
+FSET - subst_g_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d)
+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)
-FSET subst_p(alt, d, t) iif(d == today()+1, "", "en")
+FSET - subst_ux(alt, d, t) subst_ax(alt, d, t)
+FSET - subst_vx(alt, d, t) subst_gx(alt, d, t)
+FSET - subst_p(alt, d, t) iif(d == today()+1, "", "en")
 
 # Localization of various astronomical events
 
diff --git a/include/lang/es.rem b/include/lang/es.rem
index 8406a4a0..3ff21159 100644
--- a/include/lang/es.rem
+++ b/include/lang/es.rem
@@ -52,4 +52,4 @@ SET $And "y"
 SET $Hplu "s"
 SET $Mplu "s"
 
-FSET subst_bx(a, d, t) iif(d >= today(), "dentro de " + (d-today()) + " días", "hace " + (today()-d) + " dias")
+FSET - subst_bx(a, d, t) iif(d >= today(), "dentro de " + (d-today()) + " días", "hace " + (today()-d) + " dias")
diff --git a/include/lang/fi.rem b/include/lang/fi.rem
index 4234a8da..a0f72331 100644
--- a/include/lang/fi.rem
+++ b/include/lang/fi.rem
@@ -54,52 +54,52 @@ SET $And "ja"
 SET $Hplu "a"
 SET $Mplu "a"
 
-FSET zeropad(s, len) pad(s, "0", len)
+FSET - zeropad(s, len) pad(s, "0", len)
 
-FSET subst_ordinal(d) iif(d==1, ":senä", d==2, ":sena", (d%10)==2||(d%10)==3||(d%10)==6||(d%10)==8, ":ntena", ":ntenä")
-FSET ordx(d) d + subst_ordinal(d)
+FSET - subst_ordinal(d) iif(d==1, ":senä", d==2, ":sena", (d%10)==2||(d%10)==3||(d%10)==6||(d%10)==8, ":ntena", ":ntenä")
+FSET - ordx(d) d + subst_ordinal(d)
 
-FSET subst_a_alt(d, o, p) wkday(d) + o + " " + day(d) + ". " + mon(d) + p + " " + year(d)
-FSET subst_ax(a, d, t) iif(a, subst_a_alt(d, "", ""), subst_a_alt(d, $On, "ta"))
+FSET - subst_a_alt(d, o, p) wkday(d) + o + " " + day(d) + ". " + mon(d) + p + " " + year(d)
+FSET - subst_ax(a, d, t) iif(a, subst_a_alt(d, "", ""), subst_a_alt(d, $On, "ta"))
 
-FSET subst_bx(a, d, t) iif(d >= today(), (d-today()) + " päivän kuluttua", (today()-d) + " päivää sitten")
-FSET subst_cx(a, d, t) iif(a, wkday(d), wkday(d) + $On)
+FSET - subst_bx(a, d, t) iif(d >= today(), (d-today()) + " päivän kuluttua", (today()-d) + " päivää sitten")
+FSET - subst_cx(a, d, t) iif(a, wkday(d), wkday(d) + $On)
 
-FSET subst_ex(a, d, t) zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(year(d), 4)
-FSET subst_fx(a, d, t) zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2) + $DateSep + zeropad(year(d), 4)
+FSET - subst_ex(a, d, t) zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(year(d), 4)
+FSET - subst_fx(a, d, t) zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2) + $DateSep + zeropad(year(d), 4)
 
-FSET subst_g_alt(d, o, p) wkday(d) + o + " " + day(d) + ". " + mon(d) + p
-FSET subst_gx(a, d, t) iif(a, subst_g_alt(d, "", ""), subst_g_alt(d, $On, "ta"))
+FSET - subst_g_alt(d, o, p) wkday(d) + o + " " + day(d) + ". " + mon(d) + p
+FSET - subst_gx(a, d, t) iif(a, subst_g_alt(d, "", ""), subst_g_alt(d, $On, "ta"))
 
-FSET subst_hx(a, d, t) zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2)
-FSET subst_ix(a, d, t) zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2)
+FSET - subst_hx(a, d, t) zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2)
+FSET - subst_ix(a, d, t) zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2)
 
-FSET subst_j_alt(d, o) wkday(d) + o + " " + mon(d) + "n " + day(d) + subst_ordinal(day(d)) + " " + year(d)
-FSET subst_jx(a, d, t) iif(a, subst_j_alt(d, ""), subst_j_alt(d, $On))
+FSET - subst_j_alt(d, o) wkday(d) + o + " " + mon(d) + "n " + day(d) + subst_ordinal(day(d)) + " " + year(d)
+FSET - subst_jx(a, d, t) iif(a, subst_j_alt(d, ""), subst_j_alt(d, $On))
 
-FSET subst_k_alt(d, o) wkday(d) + o + " " + mon(d) + "n " + day(d) + subst_ordinal(day(d))
-FSET subst_kx(a, d, t) iif(a, subst_k_alt(d, ""), subst_k_alt(d, $On))
+FSET - subst_k_alt(d, o) wkday(d) + o + " " + mon(d) + "n " + day(d) + subst_ordinal(day(d))
+FSET - subst_kx(a, d, t) iif(a, subst_k_alt(d, ""), subst_k_alt(d, $On))
 
-FSET subst_lx(a, d, t) zeropad(year(d), 4) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2)
-FSET subst_p(a, d, t) iif(d==today()+1, "", "ä")
-FSET subst_qx(a, d, t) "n"
+FSET - subst_lx(a, d, t) zeropad(year(d), 4) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2)
+FSET - subst_p(a, d, t) iif(d==today()+1, "", "ä")
+FSET - subst_qx(a, d, t) "n"
 
-FSET subst_u_alt(d, o, p) wkday(d) + o + " " + day(d) + subst_ordinal(day(d)) + " " + mon(d) + p + " " + year(d)
-FSET subst_ux(a, d, t) iif(a, subst_u_alt(d, "", ""), subst_u_alt(d, $On, "ta"))
+FSET - subst_u_alt(d, o, p) wkday(d) + o + " " + day(d) + subst_ordinal(day(d)) + " " + mon(d) + p + " " + year(d)
+FSET - subst_ux(a, d, t) iif(a, subst_u_alt(d, "", ""), subst_u_alt(d, $On, "ta"))
 
-FSET subst_v_alt(d, o, p) wkday(d) + o + " " + day(d) + subst_ordinal(day(d)) + " " + mon(d) + p
-FSET subst_vx(a, d, t) iif(a, subst_v_alt(d, "", ""), subst_v_alt(d, $On, "ta"))
+FSET - subst_v_alt(d, o, p) wkday(d) + o + " " + day(d) + subst_ordinal(day(d)) + " " + mon(d) + p
+FSET - subst_vx(a, d, t) iif(a, subst_v_alt(d, "", ""), subst_v_alt(d, $On, "ta"))
 
 
-FSET subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst1_past(now()-t), subst1_future(t-now()))
+FSET - subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst1_past(now()-t), subst1_future(t-now()))
 
-FSET subst1_past(mins) subst_hour_past(mins/60) + subst_min_past(mins%60) + $Ago
-FSET subst1_future(mins) subst_hour_future(mins/60) + subst_min_future(mins%60) + $Fromnow
+FSET - subst1_past(mins) subst_hour_past(mins/60) + subst_min_past(mins%60) + $Ago
+FSET - subst1_future(mins) subst_hour_future(mins/60) + subst_min_future(mins%60) + $Fromnow
 
-FSET subst_hour_past(h) iif(h==0, "", h + " " + $Hour + iif(h==1, " ", $Hplu + " "))
-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 ")
+FSET - subst_hour_past(h) iif(h==0, "", h + " " + $Hour + iif(h==1, " ", $Hplu + " "))
+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 "Missing ']'" "Puuttuva ']'"
 TRANSLATE "Missing quote" "Puuttuva lainausmerkki"
diff --git a/include/lang/fr.rem b/include/lang/fr.rem
index 37831724..90e4db71 100644
--- a/include/lang/fr.rem
+++ b/include/lang/fr.rem
@@ -51,24 +51,24 @@ SET $Fromnow "dans"
 BANNER Rappels pour %w, %d%s %m, %y%o:
 
 # Ordinal for a day (English would be "st", "nd", "rd", "th")
-FSET subst_ordinal(d) iif(d == 1, "er", "")
-FSET ordx(n) n + iif(n == 1, "er", "e")
+FSET - subst_ordinal(d) iif(d == 1, "er", "")
+FSET - ordx(n) n + iif(n == 1, "er", "e")
 
 # "%d hours", "%d minutes", or "%d hours and %d minutes"
-FSET subst_tdiff(hdiff, mdiff) iif(hdiff==0&&mdiff==0, $Now, \
+FSET - subst_tdiff(hdiff, mdiff) iif(hdiff==0&&mdiff==0, $Now, \
                                       hdiff==0,            mdiff + plural(mdiff, " minute"), \
                                       mdiff==0,            hdiff + plural(hdiff, " heure"), \
                                       hdiff + plural(hdiff, " heure") + " et " + mdiff + plural(mdiff, " minute"))
-FSET subst_1(alt, date, time) iif(time == now(), "maintenant", \
+FSET - subst_1(alt, date, time) iif(time == now(), "maintenant", \
                                   time > now(), "dans " + subst_tdiff((time-now())/60, (time-now())%60), \
                                   "il y a " + subst_tdiff ((now()-time)/60, (now()-time)%60))
 
-FSET subst_bx(alt, date, time) iif(date >= today(), "dans " + (date-today()) + " jours", "il y a " + (today()-date) + " jours")
-FSET subst_j_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date) + ", " + year(date)
-FSET subst_jx(alt, date, time) iif(alt, subst_j_alt(date), $On + " " + subst_j_alt(date))
+FSET - subst_bx(alt, date, time) iif(date >= today(), "dans " + (date-today()) + " jours", "il y a " + (today()-date) + " jours")
+FSET - subst_j_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date) + ", " + year(date)
+FSET - subst_jx(alt, date, time) iif(alt, subst_j_alt(date), $On + " " + subst_j_alt(date))
 
-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))
+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 "Missing ']'" "']' manquant"
diff --git a/include/lang/gr.rem b/include/lang/gr.rem
index 0fb03b4b..665ff886 100644
--- a/include/lang/gr.rem
+++ b/include/lang/gr.rem
@@ -54,15 +54,15 @@ SET $And "και"
 SET $Hplu ""
 SET $Mplu ""
 
-FSET subst_bx(a, d, t) iif(d >= today(), "σε " + (d - today()) + " ημέρες", "πριν από " + (today()-d) + " ημέρες")
-FSET subst_ordinal(d)   "."
-FSET ordx(d) d + "."
-FSET subst_a_alt(d)     wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d)
-FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
-FSET subst_g_alt(d)     wkday(d) + ", " + day(d) + ". " + mon(d)
-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)
+FSET - subst_bx(a, d, t) iif(d >= today(), "σε " + (d - today()) + " ημέρες", "πριν από " + (today()-d) + " ημέρες")
+FSET - subst_ordinal(d)   "."
+FSET - ordx(d) d + "."
+FSET - subst_a_alt(d)     wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d)
+FSET - subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
+FSET - subst_g_alt(d)     wkday(d) + ", " + day(d) + ". " + mon(d)
+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 "Perihelion" "Περιήλιον"
 TRANSLATE "Vernal Equinox" "Εαρινή ισημερία"
diff --git a/include/lang/is.rem b/include/lang/is.rem
index 29ddb46f..c1fe8eed 100644
--- a/include/lang/is.rem
+++ b/include/lang/is.rem
@@ -54,5 +54,5 @@ SET $And "og"
 SET $Hplu "ir"
 SET $Mplu "r"
 
-FSET subst_bx(a, d, t) iif(d >= today(), "eftir " + (d - today()) + " daga", "fyrir " + (today()-d) + " dögum")
-fset subst_p(a, d, t) iif(d == today()+1, "", "a")
+FSET - subst_bx(a, d, t) iif(d >= today(), "eftir " + (d - today()) + " daga", "fyrir " + (today()-d) + " dögum")
+FSET - subst_p(a, d, t) iif(d == today()+1, "", "a")
diff --git a/include/lang/it.rem b/include/lang/it.rem
index a84b0f61..c2c97bd5 100644
--- a/include/lang/it.rem
+++ b/include/lang/it.rem
@@ -53,22 +53,22 @@ SET $And "e"
 SET $Hplu "a"
 SET $Mplu "i"
 
-FSET subst_bx(a, d, t) iif(d >= today(), "fra " + (d-today()) + " giorni", (today()-d) + " giorni fa")
-FSET subst_p(a, d, t) iif(d==today()+1, "o", "i")
-FSET subst_q(a, d, t) iif(d==today()+1, "a", "e")
+FSET - subst_bx(a, d, t) iif(d >= today(), "fra " + (d-today()) + " giorni", (today()-d) + " giorni fa")
+FSET - subst_p(a, d, t) iif(d==today()+1, "o", "i")
+FSET - subst_q(a, d, t) iif(d==today()+1, "a", "e")
 
-FSET subst_ax(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d) + " " + year(d)
-FSET subst_jx(a, d, t) subst_ax(a, d, t)
-FSET subst_kx(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d)
-FSET subst_ux(a, d, t) subst_ax(a, d, t)
-FSET subst_vx(a, d, t) subst_kx(a, d, t)
+FSET - subst_ax(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d) + " " + year(d)
+FSET - subst_jx(a, d, t) subst_ax(a, d, t)
+FSET - subst_kx(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d)
+FSET - subst_ux(a, d, t) subst_ax(a, d, t)
+FSET - subst_vx(a, d, t) subst_kx(a, d, t)
 
-FSET subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1a(now()-t, $Ago), subst_1a(t-now(), $Fromnow))
-FSET subst_1a(diff, when) subst_1b(diff/60, diff%60) + " " + when
+FSET - subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1a(now()-t, $Ago), subst_1a(t-now(), $Fromnow))
+FSET - subst_1a(diff, when) subst_1b(diff/60, diff%60) + " " + when
 
-FSET subst_1b(hdiff, mdiff) iif(hdiff==0, subst_minutes(mdiff), mdiff==0, subst_hours(hdiff), subst_hours(hdiff) + " " + $And + " " + subst_minutes(mdiff))
-FSET subst_minutes(m) iif(m==1, "1 minuto", m + " minuti")
-FSET subst_hours(h) iif(h==1, "1 ora", h + " ore")
+FSET - subst_1b(hdiff, mdiff) iif(hdiff==0, subst_minutes(mdiff), mdiff==0, subst_hours(hdiff), subst_hours(hdiff) + " " + $And + " " + subst_minutes(mdiff))
+FSET - subst_minutes(m) iif(m==1, "1 minuto", m + " minuti")
+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")
+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")
diff --git a/include/lang/nl.rem b/include/lang/nl.rem
index d2830b9d..2db67ec0 100644
--- a/include/lang/nl.rem
+++ b/include/lang/nl.rem
@@ -52,18 +52,18 @@ SET $And "en"
 SET $Hplu "en"
 SET $Mplu "en"
 
-FSET subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1a(now()-t, $Ago), subst_1a(t-now(), $Fromnow))
-FSET subst_1a(diff, when) subst_1b(diff/60, diff%60) + " " + when
+FSET - subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1a(now()-t, $Ago), subst_1a(t-now(), $Fromnow))
+FSET - subst_1a(diff, when) subst_1b(diff/60, diff%60) + " " + when
 
-FSET subst_1b(hdiff, mdiff) iif(hdiff==0, subst_minutes(mdiff), mdiff==0, subst_hours(hdiff), subst_hours(hdiff) + " " + $And + " " + subst_minutes(mdiff))
-FSET subst_minutes(m) iif(m==1, "1 minuut", m + " minuten")
-FSET subst_hours(h) iif(h==1, "1 uur", h + " uren")
+FSET - subst_1b(hdiff, mdiff) iif(hdiff==0, subst_minutes(mdiff), mdiff==0, subst_hours(hdiff), subst_hours(hdiff) + " " + $And + " " + subst_minutes(mdiff))
+FSET - subst_minutes(m) iif(m==1, "1 minuut", m + " minuten")
+FSET - subst_hours(h) iif(h==1, "1 uur", h + " uren")
 
-FSET subst_bx(a, d, t) iif (d == today()+2, "overmorgen", d+2 == today(), "eergisteren", d >= today(), "over " + (d-today()) + " dagen", (today()-d) + " dagen geleden")
+FSET - subst_bx(a, d, t) iif (d == today()+2, "overmorgen", d+2 == today(), "eergisteren", d >= today(), "over " + (d-today()) + " dagen", (today()-d) + " dagen geleden")
 
-FSET subst_s(a, d, t) iif(day(d) == 1 || day(d) == 8, "e", day(d) < 20, "de", "te")
+FSET - subst_s(a, d, t) iif(day(d) == 1 || day(d) == 8, "e", day(d) < 20, "de", "te")
 
-FSET ordx(n) n + "e"
+FSET - ordx(n) n + "e"
 
 TRANSLATE "New Moon" "Nieuwe maan"
 TRANSLATE "First Quarter" "Eerste kwartier"
diff --git a/include/lang/no.rem b/include/lang/no.rem
index 1d112cb1..02c47ce5 100644
--- a/include/lang/no.rem
+++ b/include/lang/no.rem
@@ -53,14 +53,14 @@ SET $And "og"
 SET $Hplu "r"
 SET $Mplu "er"
 
-FSET subst_bx(a, d, t) iif(d >= today(), "om " + (d-today()) + " dager", "for " + (today()-d) + " dager siden")
-FSET subst_ordinal(d) "."
-FSET ordx(n) n + "."
+FSET - subst_bx(a, d, t) iif(d >= today(), "om " + (d-today()) + " dager", "for " + (today()-d) + " dager siden")
+FSET - subst_ordinal(d) "."
+FSET - ordx(n) n + "."
 
-FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d))
-FSET subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
-FSET subst_gx(a, d, t) iif(a, subst_g_alt(d), $On + " " + subst_g_alt(d))
-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")
+FSET - subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d))
+FSET - subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
+FSET - subst_gx(a, d, t) iif(a, subst_g_alt(d), $On + " " + subst_g_alt(d))
+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")
diff --git a/include/lang/pl.rem b/include/lang/pl.rem
index 3fe71638..0fd438fc 100644
--- a/include/lang/pl.rem
+++ b/include/lang/pl.rem
@@ -52,28 +52,28 @@ SET $And "i"
 SET $Hplu ""
 SET $Mplu ""
 
-FSET subst_pl_plu(n) iif(n==1, "ę", (n==12||n==13||n==14), "", (n%10==2||n%10==3||n%10==4), "y", "")
-FSET subst_ampm(h) iif(h<5, " w nocy", h<10, " rano", h<12, " przed południem", h<18, " po południu", h<22, " wieczorem", " w nocy")
-FSET subst_ordinal(d) ""
+FSET - subst_pl_plu(n) iif(n==1, "ę", (n==12||n==13||n==14), "", (n%10==2||n%10==3||n%10==4), "y", "")
+FSET - subst_ampm(h) iif(h<5, " w nocy", h<10, " rano", h<12, " przed południem", h<18, " po południu", h<22, " wieczorem", " w nocy")
+FSET - subst_ordinal(d) ""
 
-FSET subst_a_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d)
-FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d))
-FSET subst_bx(a, d, t) iif(d >= today(), "za " + (d-today()) + " dni", (today()-d) + " dni temu")
-FSET subst_g_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d)
-FSET subst_gx(a, d, t) iif(a, subst_g_alt(d), $On + " " + subst_g_alt(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) ""
-FSET subst_0(a, d, t) subst_pl_plu(abs(t-now())/60)
-FSET subst_9(a, d, t) subst_pl_plu(abs(t-now())%60)
+FSET - subst_a_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d)
+FSET - subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d))
+FSET - subst_bx(a, d, t) iif(d >= today(), "za " + (d-today()) + " dni", (today()-d) + " dni temu")
+FSET - subst_g_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d)
+FSET - subst_gx(a, d, t) iif(a, subst_g_alt(d), $On + " " + subst_g_alt(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) ""
+FSET - subst_0(a, d, t) subst_pl_plu(abs(t-now())/60)
+FSET - subst_9(a, d, t) subst_pl_plu(abs(t-now())%60)
 
-FSET subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1past(now()-t), subst_1future(t-now()))
+FSET - subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1past(now()-t), subst_1future(t-now()))
 
-FSET subst_1future(diff) "za " + iif(diff/60==0, subst_1min(diff%60), diff%60==0, subst_1h(diff/60), subst_1h(diff/60) + " " + $And + " " + subst_1min(diff%60))
-FSET subst_1past(diff) iif(diff/60==0, subst_1min(diff%60), diff%60==0, subst_1h(diff/60), subst_1h(diff/60) + " " + $And + " " + subst_1min(diff%60)) + " temu"
+FSET - subst_1future(diff) "za " + iif(diff/60==0, subst_1min(diff%60), diff%60==0, subst_1h(diff/60), subst_1h(diff/60) + " " + $And + " " + subst_1min(diff%60))
+FSET - subst_1past(diff) iif(diff/60==0, subst_1min(diff%60), diff%60==0, subst_1h(diff/60), subst_1h(diff/60) + " " + $And + " " + subst_1min(diff%60)) + " temu"
 
-FSET subst_1min(m) m + " " + $Minute + subst_pl_plu(m)
-FSET subst_1h(h) h + " " + $Hour + subst_pl_plu(h)
+FSET - subst_1min(m) m + " " + $Minute + subst_pl_plu(m)
+FSET - subst_1h(h) h + " " + $Hour + subst_pl_plu(h)
 
 TRANSLATE "Ok" "OK"
 TRANSLATE "Missing ']'" "Brakujący ']'"
diff --git a/include/lang/pt.rem b/include/lang/pt.rem
index 30f3e8f4..ecb54ffb 100644
--- a/include/lang/pt.rem
+++ b/include/lang/pt.rem
@@ -54,26 +54,26 @@ SET $And "e"
 SET $Hplu "s"
 SET $Mplu "s"
 
-FSET subst_ordinal(d) ""
-FSET subst_on_wd(d) iif(wkdaynum(d) == 1 || wkdaynum(d) == 2, "no", "na")
+FSET - subst_ordinal(d) ""
+FSET - subst_on_wd(d) iif(wkdaynum(d) == 1 || wkdaynum(d) == 2, "no", "na")
 
-FSET subst_a_alt(d) wkday(d) + ", " + day(d) + " de " + mon(d) + " de " + year(d)
-FSET subst_bx(a, d, t) iif(d >= today(), "em " + (d-today()) + " dias", "há " + (today()-d) + " dias")
-FSET subst_c_alt(d) wkday(d)
-FSET subst_g_alt(d) wkday(d) + ", " + day(d) + " " + mon(d)
-FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), subst_on_wd(d) + " " + subst_a_alt(d))
-FSET subst_cx(a, d, t) iif(a, subst_c_alt(d), subst_on_wd(d) + " " + subst_c_alt(d))
-FSET subst_gx(a, d, t) iif(a, subst_g_alt(d), subst_on_wd(d) + " " + subst_g_alt(d))
-FSET subst_jx(a, d, t) subst_ax(a, d, t)
-FSET subst_k_alt(d) wkday(d) + ", " + day(d) + " de " + mon(d)
-FSET subst_kx(a, d, t) iif(a, subst_k_alt(d), subst_on_wd(d) + " " + subst_k_alt(d))
-FSET subst_ux(a, d, t) subst_ax(a, d, t)
-FSET subst_vx(a, d, t) subst_kx(a, d, t)
+FSET - subst_a_alt(d) wkday(d) + ", " + day(d) + " de " + mon(d) + " de " + year(d)
+FSET - subst_bx(a, d, t) iif(d >= today(), "em " + (d-today()) + " dias", "há " + (today()-d) + " dias")
+FSET - subst_c_alt(d) wkday(d)
+FSET - subst_g_alt(d) wkday(d) + ", " + day(d) + " " + mon(d)
+FSET - subst_ax(a, d, t) iif(a, subst_a_alt(d), subst_on_wd(d) + " " + subst_a_alt(d))
+FSET - subst_cx(a, d, t) iif(a, subst_c_alt(d), subst_on_wd(d) + " " + subst_c_alt(d))
+FSET - subst_gx(a, d, t) iif(a, subst_g_alt(d), subst_on_wd(d) + " " + subst_g_alt(d))
+FSET - subst_jx(a, d, t) subst_ax(a, d, t)
+FSET - subst_k_alt(d) wkday(d) + ", " + day(d) + " de " + mon(d)
+FSET - subst_kx(a, d, t) iif(a, subst_k_alt(d), subst_on_wd(d) + " " + subst_k_alt(d))
+FSET - subst_ux(a, d, t) subst_ax(a, d, t)
+FSET - subst_vx(a, d, t) subst_kx(a, d, t)
 
-FSET subst_1(a, d, t) iif(t==now(), $Now, t>now(), "em " + subst_1help(t-now()), subst_1help(now()-t) + " " + $Ago)
-FSET subst_1help(diff) iif(diff/60==0, subst_mplu(diff%60), diff%60==0, subst_hplu(diff/60), subst_hplu(diff/60) + " " + $And + " " + subst_mplu(diff%60))
-FSET subst_mplu(m) iif(m==1, "1 " + $Minute, m + " " + $Minute + $Mplu)
-FSET subst_hplu(h) iif(h==1, "1 " + $Hour, h + " " + $Hour + $Hplu)
+FSET - subst_1(a, d, t) iif(t==now(), $Now, t>now(), "em " + subst_1help(t-now()), subst_1help(now()-t) + " " + $Ago)
+FSET - subst_1help(diff) iif(diff/60==0, subst_mplu(diff%60), diff%60==0, subst_hplu(diff/60), subst_hplu(diff/60) + " " + $And + " " + subst_mplu(diff%60))
+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 "Missing ']'" "Falta um ']'"
 TRANSLATE "Missing quote" "Falta uma aspa"
diff --git a/include/lang/ro.rem b/include/lang/ro.rem
index ebf6c62d..824563dc 100644
--- a/include/lang/ro.rem
+++ b/include/lang/ro.rem
@@ -53,22 +53,22 @@ SET $Mplu "e"
 SET $Hplu "e"
 SET $And "şi"
 
-FSET subst_bx(a, d, t) iif(d >= today(), "peste " + (d-today()) + " zile", "acume " + (today()-d) + " zile")
+FSET - subst_bx(a, d, t) iif(d >= today(), "peste " + (d-today()) + " zile", "acume " + (today()-d) + " zile")
 
-FSET subst_ampm(h) iif(h<4, " noaptea", h<12, " dimineaţa", h<18, " după-amiaza", " seara")
-FSET subst_ordinal(d) ""
+FSET - subst_ampm(h) iif(h<4, " noaptea", h<12, " dimineaţa", h<18, " după-amiaza", " seara")
+FSET - subst_ordinal(d) ""
 
-FSET subst_ax(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d) + " " + year(d)
-FSET subst_cx(a, d, t) wkday(d)
-FSET subst_gx(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d)
-FSET subst_jx(a, d, t) wkday(d) + ", " + mon(d) + " " + day(d) + ", " + year(d)
-FSET subst_kx(a, d, t) wkday(d) + ", " + mon(d) + " " + day(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, "", "le")
+FSET - subst_ax(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d) + " " + year(d)
+FSET - subst_cx(a, d, t) wkday(d)
+FSET - subst_gx(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d)
+FSET - subst_jx(a, d, t) wkday(d) + ", " + mon(d) + " " + day(d) + ", " + year(d)
+FSET - subst_kx(a, d, t) wkday(d) + ", " + mon(d) + " " + day(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, "", "le")
 
-FSET subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1helper(now()-t, "acum "), subst_1helper(t-now(), "peste "))
-FSET subst_1helper(diff, when) when + iif(diff%60==0, subst_1h(diff/60), diff/60==0, subst_1m(diff%60), subst_1h(diff/60) + " " + $And + " " + subst_1m(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")
+FSET - subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1helper(now()-t, "acum "), subst_1helper(t-now(), "peste "))
+FSET - subst_1helper(diff, when) when + iif(diff%60==0, subst_1h(diff/60), diff/60==0, subst_1m(diff%60), subst_1h(diff/60) + " " + $And + " " + subst_1m(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")