Prepare for 05.02.01 release.

Fix incorrect comparison code.
Remove const qualifier.
2026-04-16 14:28:40 +02:00 · 2024-12-16 19:37:31 -05:00 · 2024-12-16 19:33:41 -05:00 · 2024-12-16 17:10:45 -05:00 · 2024-12-16 09:31:02 -05:00 · 2024-12-14 11:52:16 -05:00
42 changed files with 14479 additions and 407 deletions
--- a/18
+++ b/18
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for remind 05.02.00.
+# Generated by GNU Autoconf 2.71 for remind 05.02.01.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -608,8 +608,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='remind'
 PACKAGE_TARNAME='remind'
-PACKAGE_VERSION='05.02.00'
-PACKAGE_STRING='remind 05.02.00'
+PACKAGE_VERSION='05.02.01'
+PACKAGE_STRING='remind 05.02.01'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL='https://dianne.skoll.ca/projects/remind/'

@@ -1265,7 +1265,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures remind 05.02.00 to adapt to many kinds of systems.
+\`configure' configures remind 05.02.01 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1327,7 +1327,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of remind 05.02.00:";;
+     short | recursive ) echo "Configuration of remind 05.02.01:";;
   esac
  cat <<\_ACEOF

@@ -1415,7 +1415,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-remind configure 05.02.00
+remind configure 05.02.01
 generated by GNU Autoconf 2.71

 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1865,7 +1865,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by remind $as_me 05.02.00, which was
+It was created by remind $as_me 05.02.01, which was
 generated by GNU Autoconf 2.71.  Invocation command line was

  $ $0$ac_configure_args_raw
@@ -4710,7 +4710,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by remind $as_me 05.02.00, which was
+This file was extended by remind $as_me 05.02.01, which was
 generated by GNU Autoconf 2.71.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -4775,7 +4775,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-remind config.status 05.02.00
+remind config.status 05.02.01
 configured by $0, generated by GNU Autoconf 2.71,
  with options \\"\$ac_cs_config\\"

--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.

-AC_INIT(remind, 05.02.00, , , https://dianne.skoll.ca/projects/remind/)
+AC_INIT(remind, 05.02.01, , , https://dianne.skoll.ca/projects/remind/)
 AC_CONFIG_SRCDIR([src/queue.c])

 cat <<'EOF'
--- a/contrib/remind-conf-mode/remind-conf-mode.el
+++ b/contrib/remind-conf-mode/remind-conf-mode.el
@@ -117,7 +117,8 @@
         "NOQUEUE" "OMIT" "OMITFUNC" "ONCE" "POP" "POP-OMIT-CONTEXT" "PRESERVE"
         "PRIORITY" "PS" "PSFILE" "PUSH" "PUSH-OMIT-CONTEXT" "REM" "RUN"
         "SATISFY" "SCAN" "SCANFROM" "SCHED" "SECOND" "SET" "SKIP" "SPECIAL"
-         "TAG" "THIRD" "THROUGH" "TRANSLATE" "TRANS" "UNSET" "UNTIL" "WARN")
+         "SYSINCLUDE" "TAG" "THIRD" "THROUGH" "TRANSLATE" "TRANS" "UNSET"
+         "UNTIL" "WARN")
   #'(lambda (a b) (> (length a) (length b)))))


--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
@@ -1,10 +1,21 @@
 CHANGES TO REMIND

-* VERSION 5.2 Patch 0 - ????-??=??
+* VERSION 5.2 Patch 1 - 2024-12-16

- MAJOR NEW FEATURE: remind: Add the TRANSLATE command and the _()
-  built-in function.  This allows you to localize your reminder files
-  more easily.
+- BUG FIX: remind: Fix a logic error that only showed itself on big-endian
+  architectures.  Found thanks to Debian testing and a notification from
+  Jochen Sprickerhof.
+
+* VERSION 5.2 Patch 0 - 2024-12-16
+
+- MAJOR NEW FEATURE: remind: Add the TRANSLATE command, the _()
+  built-in function and the %(...) substitution sequence.  These allow
+  you to localize your reminder files more easily.  The translation table
+  is also made available to back-ends like rem2pdf and tkremind,
+  which they can use as they see fit.
+
+- MINOR FEATURE: tkremind, rem2html: Localize the names of the moon
+  phases.

 - MAJOR CHANGE: remind: Remind used to support compile-time localization
  into different languages (French, English, etc.)  That compile-time
@@ -19,6 +30,18 @@ CHANGES TO REMIND

 - MINOR FEATURE: Add standard include/sun.rem file for sunrise/sunset.

+- MINOR FEATURE:  The SYSINCLUDE command has been added.  The command:
+
+      SYSINCLUDE foo/bar.rem
+
+  is equivalent to:
+
+      INCLUDE [$SysInclude]/foo/bar.rem
+
+- MINOR IMPROVEMENT: Allow INCLUDE, DO and SYSINCLUDE to include files with
+  spaces in their names; in this case, you have to put the filename inside
+  double-quotes.
+
 - IMPROVEMENT: remind: Refuse to open subdirectories named "*.rem"
  under a top-level directory rather than trying and failing with a
  confusing error.
@@ -27,13 +50,20 @@ CHANGES TO REMIND
  that are easier on the eyes.

 - IMPROVEMENT: remind: Remind used to have three completely separate
-  hash table implementations.  Replace them all with one piece of code.
+  hash table implementations.  They have all been replaced with a single
+  implementation; this new implementation adapts the hash table size based
+  on the number of entries and is dramatically faster than the old code
+  when there are a large number of entries.

 - MINOR FIXES: remind: Fix typos in comments; use memcpy to copy OMIT
  contexts internally.

- BUG FIX: Actually allow the documented 9 levels of INCLUDE rather than
-  8.
+- BUG FIX: remind: Actually allow the documented 9 levels of INCLUDE
+  rather than 8.
+
+- BUG FIX: remind: If an INCLUDE statement failed inside an IF statement,
+  Remind would print spurious errors about unmatched IF/ENDIF.  This has
+  been fixed.

 * VERSION 5.1 Patch 1 - 2024-11-18

--- a/include/holidays/README
+++ b/include/holidays/README
@@ -54,8 +54,8 @@ advance warning of holidays:
    FSET msgsuffix(x) char(8) + dosubst(" is %b.%", $T)

    # Include your holiday files here...
-    INCLUDE [$SysInclude]/holidays/us.rem
-    INCLUDE [$SysInclude]/holidays/us/ny.rem
+    SYSINCLUDE holidays/us.rem
+    SYSINCLUDE holidays/us/ny.rem

    # Restore old version of msgsuffix and $DefaultDelta
    FRENAME saved_msgsuffix msgsuffix
--- a/include/holidays/chinese-new-year.rem
+++ b/include/holidays/chinese-new-year.rem
@@ -1,29 +1,29 @@
-REM  1 Feb 2022 MSG [_("Chinese New Year")] ([_("Tiger")])
-REM 22 Jan 2023 MSG [_("Chinese New Year")] ([_("Rabbit")])
-REM 10 Feb 2024 MSG [_("Chinese New Year")] ([_("Dragon")])
-REM 29 Jan 2025 MSG [_("Chinese New Year")] ([_("Snake")])
-REM 17 Feb 2026 MSG [_("Chinese New Year")] ([_("Horse")])
-REM  6 Feb 2027 MSG [_("Chinese New Year")] ([_("Goat")])
-REM 26 Jan 2028 MSG [_("Chinese New Year")] ([_("Monkey")])
-REM 13 Feb 2029 MSG [_("Chinese New Year")] ([_("Rooster")])
-REM  3 Feb 2030 MSG [_("Chinese New Year")] ([_("Dog")])
-REM 23 Jan 2031 MSG [_("Chinese New Year")] ([_("Pig")])
-REM 11 Feb 2032 MSG [_("Chinese New Year")] ([_("Rat")])
-REM 31 Jan 2033 MSG [_("Chinese New Year")] ([_("Ox")])
-REM 19 Feb 2034 MSG [_("Chinese New Year")] ([_("Tiger")])
-REM  8 Feb 2035 MSG [_("Chinese New Year")] ([_("Rabbit")])
-REM 28 Jan 2036 MSG [_("Chinese New Year")] ([_("Dragon")])
-REM 15 Feb 2037 MSG [_("Chinese New Year")] ([_("Snake")])
-REM  4 Feb 2038 MSG [_("Chinese New Year")] ([_("Horse")])
-REM 24 Jan 2039 MSG [_("Chinese New Year")] ([_("Goat")])
-REM 12 Feb 2040 MSG [_("Chinese New Year")] ([_("Monkey")])
-REM  1 Feb 2041 MSG [_("Chinese New Year")] ([_("Rooster")])
-REM 22 Jan 2042 MSG [_("Chinese New Year")] ([_("Dog")])
-REM 10 Feb 2043 MSG [_("Chinese New Year")] ([_("Pig")])
-REM 30 Jan 2044 MSG [_("Chinese New Year")] ([_("Rat")])
-REM 17 Feb 2045 MSG [_("Chinese New Year")] ([_("Ox")])
-REM  6 Feb 2046 MSG [_("Chinese New Year")] ([_("Tiger")])
-REM 26 Jan 2047 MSG [_("Chinese New Year")] ([_("Rabbit")])
-REM 14 Feb 2048 MSG [_("Chinese New Year")] ([_("Dragon")])
-REM  2 Feb 2049 MSG [_("Chinese New Year")] ([_("Snake")])
-REM 23 Jan 2050 MSG [_("Chinese New Year")] ([_("Horse")])
+REM  1 Feb 2022 MSG %(Chinese New Year) (%(Tiger))
+REM 22 Jan 2023 MSG %(Chinese New Year) (%(Rabbit))
+REM 10 Feb 2024 MSG %(Chinese New Year) (%(Dragon))
+REM 29 Jan 2025 MSG %(Chinese New Year) (%(Snake))
+REM 17 Feb 2026 MSG %(Chinese New Year) (%(Horse))
+REM  6 Feb 2027 MSG %(Chinese New Year) (%(Goat))
+REM 26 Jan 2028 MSG %(Chinese New Year) (%(Monkey))
+REM 13 Feb 2029 MSG %(Chinese New Year) (%(Rooster))
+REM  3 Feb 2030 MSG %(Chinese New Year) (%(Dog))
+REM 23 Jan 2031 MSG %(Chinese New Year) (%(Pig))
+REM 11 Feb 2032 MSG %(Chinese New Year) (%(Rat))
+REM 31 Jan 2033 MSG %(Chinese New Year) (%(Ox))
+REM 19 Feb 2034 MSG %(Chinese New Year) (%(Tiger))
+REM  8 Feb 2035 MSG %(Chinese New Year) (%(Rabbit))
+REM 28 Jan 2036 MSG %(Chinese New Year) (%(Dragon))
+REM 15 Feb 2037 MSG %(Chinese New Year) (%(Snake))
+REM  4 Feb 2038 MSG %(Chinese New Year) (%(Horse))
+REM 24 Jan 2039 MSG %(Chinese New Year) (%(Goat))
+REM 12 Feb 2040 MSG %(Chinese New Year) (%(Monkey))
+REM  1 Feb 2041 MSG %(Chinese New Year) (%(Rooster))
+REM 22 Jan 2042 MSG %(Chinese New Year) (%(Dog))
+REM 10 Feb 2043 MSG %(Chinese New Year) (%(Pig))
+REM 30 Jan 2044 MSG %(Chinese New Year) (%(Rat))
+REM 17 Feb 2045 MSG %(Chinese New Year) (%(Ox))
+REM  6 Feb 2046 MSG %(Chinese New Year) (%(Tiger))
+REM 26 Jan 2047 MSG %(Chinese New Year) (%(Rabbit))
+REM 14 Feb 2048 MSG %(Chinese New Year) (%(Dragon))
+REM  2 Feb 2049 MSG %(Chinese New Year) (%(Snake))
+REM 23 Jan 2050 MSG %(Chinese New Year) (%(Horse))
--- a/include/lang/auto.rem
+++ b/include/lang/auto.rem
@@ -16,10 +16,10 @@ if !defined("__autolang__")

    IF autolang != ""
        IF access($SysInclude + "/lang/" + lower(substr(autolang, 1, 5)) + ".rem", "r") == 0
-            INCLUDE [$SysInclude]/lang/[lower(substr(autolang, 1, 5))].rem
+            SYSINCLUDE lang/[lower(substr(autolang, 1, 5))].rem
        ELSE
            IF access($SysInclude + "/lang/" + lower(substr(autolang, 1, 2)) + ".rem", "r") == 0
-                INCLUDE [$SysInclude]/lang/[lower(substr(autolang, 1, 2))].rem
+                SYSINCLUDE lang/[lower(substr(autolang, 1, 2))].rem
            ENDIF
        ENDIF
    ENDIF
--- a/include/lang/de.rem
+++ b/include/lang/de.rem
@@ -74,3 +74,27 @@ TRANSLATE "Autumnal Equinox" "Herbstanfang"
 TRANSLATE "Winter Solstice" "Winteranfang"
 TRANSLATE "Daylight Saving Time Starts" "Beginn Sommerzeit"
 TRANSLATE "Daylight Saving Time Ends" "Ende Sommerzeit"
+
+TRANSLATE "New Moon" "Neumond"
+TRANSLATE "First Quarter" "zunehmender Halbmond"
+TRANSLATE "Full Moon" "Vollmond"
+TRANSLATE "Last Quarter" "abnehmender Halbmond"
+
+TRANSLATE "Chinese New Year" "Chinesisches Neujahr"
+TRANSLATE "Snake" "Schlange"
+TRANSLATE "Horse" "Pferd"
+TRANSLATE "Goat" "Ziege"
+TRANSLATE "Monkey" "Affe"
+TRANSLATE "Rooster" "Hahn"
+TRANSLATE "Dog" "Hund"
+TRANSLATE "Pig" "Schwein"
+TRANSLATE "Rat" "Ratte"
+TRANSLATE "Ox" "Ochse"
+TRANSLATE "Tiger" "Tiger"
+TRANSLATE "Rabbit" "Kaninchen"
+TRANSLATE "Dragon" "Drachen"
+
+TRANSLATE "Sunrise" "Sonnenaufgang"
+TRANSLATE "Sunset" "Sonnenuntergang"
+
+TRANSLATE "No reminders." "Keine Termine."
--- a/include/lang/nl.rem
+++ b/include/lang/nl.rem
@@ -63,7 +63,7 @@ TRANSLATE "First Quarter" "Eerste kwartier"
 TRANSLATE "Full Moon" "Volle maan"
 TRANSLATE "Last Quarter" "Laatste kwartier"

-TRANSLATE "Vernal Equiniox" "Lente-equinox"
+TRANSLATE "Vernal Equinox" "Lente-equinox"
 TRANSLATE "Summer Solstice" "Zomerzonnewende"
 TRANSLATE "Autumnal Equinox" "Herfst-equinox"
 TRANSLATE "Winter Solstice" "Winterzonnewende"
--- a/include/moonphases.rem
+++ b/include/moonphases.rem
@@ -7,8 +7,8 @@ IF $CalMode || $PsCal
    REM [moondate(2)] SPECIAL MOON 2 -1 -1 [moontime(2)]
    REM [moondate(3)] SPECIAL MOON 3 -1 -1 [moontime(3)]
 ELSE
-    REM NOQUEUE [moondatetime(0)] MSG [_("New Moon")] (%2)
-    REM NOQUEUE [moondatetime(1)] MSG [_("First Quarter")] (%2)
-    REM NOQUEUE [moondatetime(2)] MSG [_("Full Moon")] (%2)
-    REM NOQUEUE [moondatetime(3)] MSG [_("Last Quarter")] (%2)
+    REM NOQUEUE [moondatetime(0)] MSG %(New Moon) (%2)
+    REM NOQUEUE [moondatetime(1)] MSG %(First Quarter) (%2)
+    REM NOQUEUE [moondatetime(2)] MSG %(Full Moon) (%2)
+    REM NOQUEUE [moondatetime(3)] MSG %(Last Quarter) (%2)
 ENDIF
--- a/include/seasons.rem
+++ b/include/seasons.rem
@@ -3,14 +3,14 @@

 IF $LatDeg >= 0
    # Northern Hemisphere
-    REM NOQUEUE [soleq(0)] MSG %"[_("Vernal Equinox")]%" [$Is] %3.
-    REM NOQUEUE [soleq(1)] MSG %"[_("Summer Solstice")]%" [$Is] %3.
-    REM NOQUEUE [soleq(2)] MSG %"[_("Autumnal Equinox")]%" [$Is] %3.
-    REM NOQUEUE [soleq(3)] MSG %"[_("Winter Solstice")]%" [$Is] %3.
+    REM NOQUEUE [soleq(0)] MSG %"%(Vernal Equinox)%" [$Is] %3.
+    REM NOQUEUE [soleq(1)] MSG %"%(Summer Solstice)%" [$Is] %3.
+    REM NOQUEUE [soleq(2)] MSG %"%(Autumnal Equinox)%" [$Is] %3.
+    REM NOQUEUE [soleq(3)] MSG %"%(Winter Solstice)%" [$Is] %3.
 ELSE
    # Southern Hemisphere
-    REM NOQUEUE [soleq(0)] MSG %"[_("Autumnal Equinox")]%" [$Is] %3.
-    REM NOQUEUE [soleq(1)] MSG %"[_("Winter Solstice")]%" [$Is] %3.
-    REM NOQUEUE [soleq(2)] MSG %"[_("Vernal Equinox")]%" [$Is] %3.
-    REM NOQUEUE [soleq(3)] MSG %"[_("Summer Solstice")]%" [$Is] %3.
+    REM NOQUEUE [soleq(0)] MSG %"%(Autumnal Equinox)%" [$Is] %3.
+    REM NOQUEUE [soleq(1)] MSG %"%(Winter Solstice)%" [$Is] %3.
+    REM NOQUEUE [soleq(2)] MSG %"%(Vernal Equinox)%" [$Is] %3.
+    REM NOQUEUE [soleq(3)] MSG %"%(Summer Solstice)%" [$Is] %3.
 ENDIF
--- a/include/sun.rem
+++ b/include/sun.rem
@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: GPL-2.0-only

 IF !$CalMode && !$PsCal
-    REM NOQUEUE AT [sunrise()] MSG %"%"[_("Sunrise")] %! %2.
-    REM NOQUEUE AT [sunset()] MSG %"%"[_("Sunset")] %! %2.
+    REM NOQUEUE AT [sunrise()] MSG %"%"%(Sunrise) %! %2.
+    REM NOQUEUE AT [sunset()] MSG %"%"%(Sunset) %! %2.
 ENDIF
--- a/man/rem2ps.1.in
+++ b/man/rem2ps.1.in
@@ -336,6 +336,18 @@ older format contains enough information for them to work properly.
 .PP
 \fBRemind \-p\fR sends the following lines to standard output.
 The information is designed to be easily parsed by back-end programs:
+.TP
+.B # translations
+This line signifies that the next line will be the translation table.
+The line following \fB# translations\fR is a JSON object (on a single
+line) containing all of the entries of the translation table.  Back-ends that
+are not interested in the translation table can simply read and discard
+the next line.
+.RS
+If \fBRemind\fR sends data for multiple months, then only the first month
+will include the translation table.
+.RE
+
 .TP
 .B # rem2ps begin
 This line signifies the start of calendar data.  Back-ends can search
@@ -435,6 +447,16 @@ each reminder as a one-off event.
 .PP
 The lines emitted by \fBremind \-pp\fR are as follows:
 .TP
+.B # translations
+This line signifies that the next line will be the translation table.
+The line following \fB# translations\fR is a JSON object (on a single
+line) containing all of the entries of the translation table.  Back-ends that
+are not interested in the translation table can simply read and discard
+.RS
+If \fBRemind\fR sends data for multiple months, then only the first month
+will include the translation table.
+.RE
+.TP
 .B # rem2ps2 begin
 This line signifies the start of calendar data.  Back-ends can search
 for it to verify they are being fed correct information.  Note the
@@ -664,6 +686,10 @@ The number of days in the following month.
 The year of the following month.  (The same as \fByear\fR unless the
 current month is December.)
 .TP
+.B translations \fR{\fIobject\fR}
+A complete dump of the Remind translation table.  In output for multiple
+months, the translation table is included only with the first month.
+.TP
 .B entries \fR[\fIarray\fR]
 The \fBentries\fR key consists of an array of calendar entries; each
 entry is a JSON object that has the same format as described in the
--- a/man/remind.1.in
+++ b/man/remind.1.in
@@ -1612,6 +1612,10 @@ is replaced with "\fIyear\fR", the year of the trigger date.
 .B %z
 is replaced with "\fIyy\fR", the last two digits of the year.
 .TP
+.B %(\fIany_text\fR\fB)
+is replaced with the lookup of \fIany_text\fR in the translation table.
+It is the equivalent of [_("any_text")] but is more convenient to type.
+.TP
 .B %_
 (percent-underscore) is replaced with a newline.  You can use this to
 achieve multi-line reminders.  Note that calendar back-ends vary in
@@ -1920,22 +1924,21 @@ the first day of the month.  The local \fBOMIT\fR keyword causes the
 Finally, the \fBAFTER\fR keyword will keep moving the reminder forward
 until it has passed any holidays specified with global \fBOMIT\fR
 commands.
-.SH THE DO AND INCLUDE COMMANDS
+.SH THE DO, INCLUDE AND SYSINCLUDE COMMANDS
 .PP
 \fBRemind\fR allows you to include other files in your reminder script,
-similar to the C preprocessor #include directive.  For example, your
-system administrator may maintain a file of holidays or system-wide
-reminders.  You can include these in your reminder script as follows:
+similar to the C preprocessor #include directive.  For example, you
+might organize different reminders into different files like this:
 .PP
 .nf
-	INCLUDE /usr/share/remind/holidays
-	INCLUDE /usr/share/remind/reminders
+        INCLUDE holidays.rem
+        INCLUDE birthdays.rem
+        INCLUDE "quote files with spaces.rem"
 .fi
 .PP
-(The actual pathnames vary from system to system - ask your system
-administrator.)
-.PP
-\fBINCLUDE\fR files can be nested up to a depth of 8.
+\fBINCLUDE\fR files can be nested up to a depth of 8.  As shown above, if a
+filename has spaces in it (not recommended!) you can use double-quotes
+around the filename.
 .PP
 If you specify a filename of "-" in the \fBINCLUDE\fR command, \fBRemind\fR
 will begin reading from standard input.
@@ -1977,6 +1980,11 @@ symbolic link itself, \fBDO\fR will fail.  \fBRemind\fR does \fInot\fR
 resolve the real path of symbolic links, so you should avoid using
 symbolic links to files.
 .PP
+The \fBSYSINCLUDE\fR command is similar to \fBDO\fR, but it looks for
+relative pathnames under the system directory containing standard reminder
+scripts.  For this version of \fBRemind\fR, the system directory is
+"@prefix@/share/remind".
+.PP
 .SH THE RUN COMMAND
 .PP
 If you include other files in your reminder script, you may not always
@@ -3046,6 +3054,25 @@ For example, consider this sequence:
 After those two lines have been executed, the variable \fBa\fR will be
 set to "Tot ziens".  See the section THE TRANSLATION TABLE for more
 information.
+.PP
+In the body of a reminder, the substitution sequence
+\fB%(\fItext\fR\fB)\fR is (almost) the equivalent of
+\fB[_("\fItext\fR\fB")]\fR.  Therefore, the following reminders are
+almost equivalent:
+.PP
+.nf
+
+        REM MSG %(Goodbye)
+        REM MSG [_("Goodbye")]
+.fi
+.PP
+The only difference is that if _("Goodbye") contains a \fB%\fR sign,
+then that result will be run through the substitution filter, whereas
+in the first reminder, it will not.  That is because the second
+\fBREM\fR command performs expression pasting followed by a
+substitution filter pass, while the first one performs the translation
+as part of the substitution filter (and does not make a second
+substitution filter pass.)
 .RE
 .TP
 .B abs(i_num)
@@ -5727,8 +5754,10 @@ then \fBRemind\fR \fIalso\fR makes a corresponding translation
 table entry automatically.  This is done for all of the translation-related
 system variables \fIexcept for\fR \fB$Hplu\fR and \fB$Mplu\fR.
 .PP
-The converse does not apply; creating a translation table entry for
-"December" does not automatically set \fB$December\fR.
+The converse applies too; creating a translation table for
+"December" automatically sets \fB$December\fR.  And if you invoke
+\fBTRANSLATE CLEAR\fR, then all translation-related system variables
+are set to their default values as well.
 .PP
 The translation table always contains a special entry \fBLANGID\fR whose
 default value is \fBen\fR.  Translators are encouraged to add a \fBLANGID\fR
@@ -5779,14 +5808,14 @@ To use a language pack (in this example, de.rem), simply place this at
 the top of your reminders file:
 .PP
 .nf
-    INCLUDE [$SysInclude]/lang/de.rem
+    SYSINCLUDE lang/de.rem
 .fi
 .PP
 If you want \fBRemind\fR to try to find the language pack appropriate
 for your locale settings, use:
 .PP
 .nf
-    INCLUDE [$SysInclude]/lang/auto.rem
+    SYSINCLUDE lang/auto.rem
 .fi
 .PP
 You are encouraged to study the language packs to see how to translate
--- a/rem2html/rem2html.in
+++ b/rem2html/rem2html.in
@@ -10,6 +10,8 @@ use Encode;

 my %Options;

+my $Translations = {};
+
 my $rem2html_version = '@VERSION@';

 my($days, $shades, $moons, $classes, $Month, $Year, $Numdays, $Firstwkday, $Mondayfirst, $weeks,
@@ -265,6 +267,31 @@ sub end_output
    print("</body>\n</html>\n");
 }

+sub slurp_translations
+{
+    my $line;
+
+    $line = <STDIN>;
+    chomp $line;
+    eval {
+        if ($Options{utf8}) {
+            $Translations = decode_json(encode('UTF-8', $line, Encode::FB_DEFAULT));
+        } else {
+            $Translations = decode_json($line);
+        }
+    };
+    if ($@) {
+        $Translations = {};
+    }
+}
+
+sub t
+{
+    my ($str) = @_;
+    return $Translations->{$str} if exists($Translations->{$str});
+    return $str;
+}
+
 sub parse_input
 {
    undef $days;
@@ -275,8 +302,12 @@ sub parse_input

    my $found_data = 0;
    while(<STDIN>) {
-	chomp;
-	last if /^\# rem2ps2? begin$/;
+        chomp;
+        if (/# translations/) {
+            slurp_translations();
+            next;
+        }
+        last if /^\# rem2ps2? begin$/;
    }

    my $line;
@@ -659,7 +690,7 @@ sub draw_day_cell
                    } else {
                            $img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAGQAAABkABchkaRQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAC6SURBVDiNpdNNbsIwFATgL0HKolchHKBX6yFaBOEyoPYUabvOIVKJRaCL2JX5TRNGGvnJ8ozGz89cYoElPvET+BX2yivn/1Bggw5HHMKa1h2qcPZC/JEIhvh+brIZIY6sorhMYo9hh3KGFzzfa84NZNjDt9OG/ZcH1BlaPE1IAG0+URhxzNGESKPFaHJs9Q0Ziww7HnvGeXSrJhis0jiFfjwnj3I0WRv+TKtr4hQl3lDrZ6QN9Wt654hfWfGDmBpUwDkAAAAASUVORK5CYII=';
                    }
-		    $title = 'New Moon';
+		    $title = escape_html(t('New Moon'));
 		    $alt = 'new';
 	    } elsif ($phase == 1) {
                    if ($Options{pngs}) {
@@ -667,7 +698,7 @@ sub draw_day_cell
                    } else {
                            $img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAGQAAABkABchkaRQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAADfSURBVDiNndM9TsNAFATgzy5yjZSAE85JBygETgENUPF3iBCitHAFQkcIhZ/Ryn9gRlrZmp2Z3ef3TBOHOMULPrDBMrhpi/4HI5xjix2+4nmJRbx/Yh7ahvkpRPVV4QDXwT3UQy46zGkAZDgK/iytefvHgCrkJsqZUH6cLnNbABSxd5Jhhf1IbkMXv8Qux7hH1Ic1xvk/jBWy6gavumvtwx7ectwZXkKh7MA95XgObeOtpI2U4zl0kGbpxgiPvwQUcXLrKFchc82f6Ur0PK49azOnmOI4TBu84zm4SV38DeIVYkrYJyNbAAAAAElFTkSuQmCC';
                    }
-		    $title = 'First Quarter';
+		    $title = escape_html(t('First Quarter'));
 		    $alt = '1st';
 	    } elsif ($phase == 2) {
                    if ($Options{pngs}) {
@@ -676,7 +707,7 @@ sub draw_day_cell
                            $img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAGQAAABkABchkaRQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAADlSURBVDiNrdNBUsJAEAXQlyw4hq4hwWPqTixET6ELkZ16CcAq7oFLqXExjaYgQVNlV/Viev7/6XT/4TjGuME7PiLXUatb8N8xwB12SFjiIXIZtU/MAntEfgvQE4YtHxhiHpjXQ5H7uLhEcaLLAleBvd0Xx9Ha/BdyU+Q5OBV5OKmj7a4YBWdSyNPe4aKHAHkzqcQZNj3JgnNexqE8heyIAulffuFF3kTfIVbBVeu/xoXGGsn2TLJJ/mqkafNiINszySYZdbS90GHlvcgsWktY4TFy7ecxTdvIzahxHQLbyFXUqkPwF2ASRNYgB/PXAAAAAElFTkSuQmCC';
                    }
 		    $alt = 'full';
-		    $title = 'Full Moon';
+		    $title = escape_html(t('Full Moon'));
 	    } else {
                    if ($Options{pngs}) {
                            $img = smoosh($Options{imgbase}, 'lastquarter.png');
@@ -684,7 +715,7 @@ sub draw_day_cell
                            $img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAGQAAABkABchkaRQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAADmSURBVDiNndMxTsNAEIXhzy5yCyQ6FAgcE7oQheQWUAAl5BIkREoZrgB0GFNkHBl7bURGsryaee/3jHeXdpxjghU+8InXyI0S+n0MMEeBEi+4jfV3vAvMQtsyL0J0j2GtViaeRRMyj8IlsgY8BSijE2Kur/hy09wHKMJrEolhwtwHKDHOsI4OLnoAXfl1jiNsOkR9keE4P8D4q4scbzg5xIxtjie709f1E7siC+9+Gx/8fxvPKtEsklcJSBdgWhcN8ByFR5z+AWgd5QpyE+OUWOJO+zJNU+Z6jHAdgHe7K73CuD5zFT9nCmRDIssCaAAAAABJRU5ErkJggg==';
                    }
 		    $alt = 'last';
-		    $title = 'Last Quarter';
+		    $title = escape_html(t('Last Quarter'));
 	    }
 	    if ($Options{nostyle}) {
 		print("<div style=\"float: left\"><img border=\"0\" width=\"16\" height=\"16\" alt=\"$alt\" title=\"$title\" src=\"$img\">$msg</div>");
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -965,6 +965,18 @@ static void DoCalendarOneWeek(int nleft)
    }
 }

+static void
+SendTranslationTable(int pslevel)
+{
+    if (pslevel < PSCAL_LEVEL3) {
+        printf("# translations\n");
+    }
+    DumpTranslationTable(stdout, 1);
+    if (pslevel < PSCAL_LEVEL3) {
+        printf("\n");
+    }
+}
+
 /***************************************************************/
 /*                                                             */
 /*  DoSimpleCalendarOneMonth                                   */
@@ -984,14 +996,25 @@ static void DoSimpleCalendarOneMonth(void)
    if (PsCal) {
        FromDSE(DSEToday, &y, &m, &d);
        if (PsCal == PSCAL_LEVEL1) {
+            if (!DidAMonth) {
+                SendTranslationTable(PsCal);
+            }
            printf("%s\n", PSBEGIN);
        } else if (PsCal == PSCAL_LEVEL2) {
+            if (!DidAMonth) {
+                SendTranslationTable(PsCal);
+            }
            printf("%s\n", PSBEGIN2);
        } else {
            if (DidAMonth) {
                printf(",\n");
            }
            printf("{\n");
+            if (!DidAMonth) {
+                printf("\"translations\":");
+                SendTranslationTable(PsCal);
+                printf(",");
+            }
        }
        if (PsCal < PSCAL_LEVEL3) {
            printf("%s %d %d %d %d\n",
@@ -1249,7 +1272,7 @@ static void PrintLeft(char const *s, int width, char pad)
        buf = calloc(len+1, sizeof(wchar_t));
        if (!buf) {
            /* Uh-oh... cannot recover */
-            fprintf(stderr, "%s\n", GetErr(E_NO_MEM));
+            fprintf(ErrFp, "%s\n", GetErr(E_NO_MEM));
            exit(EXIT_FAILURE);
        }
    }
@@ -1334,7 +1357,7 @@ static void PrintCentered(char const *s, int width, char *pad)
        buf = calloc(len+1, sizeof(wchar_t));
        if (!buf) {
            /* Uh-oh... cannot recover */
-            fprintf(stderr, "%s\n", GetErr(E_NO_MEM));
+            fprintf(ErrFp, "%s\n", GetErr(E_NO_MEM));
            exit(EXIT_FAILURE);
        }
    }
@@ -1685,6 +1708,7 @@ static void GenerateCalEntries(int col)
            case T_EndIf:   r=DoEndif(&p);   break;

            case T_Include:
+            case T_IncludeSys:
            case T_IncludeR: r=DoInclude(&p, tok.type); break;

            case T_IncludeCmd: r=DoIncludeCmd(&p); break;
@@ -2297,7 +2321,7 @@ void WriteJSONTrigger(Trigger const *t, int include_tags, int today)
                    printf(",");
                }
                done = 1;
-                printf("\"%s\"", EnglishDayName[i]);
+                printf("\"%s\"", DayName[i]);
            }
        }
        printf("],");
@@ -2332,7 +2356,7 @@ void WriteJSONTrigger(Trigger const *t, int include_tags, int today)
                    printf(",");
                }
                done = 1;
-                printf("\"%s\"", EnglishDayName[i]);
+                printf("\"%s\"", DayName[i]);
            }
        }
        printf("],");
@@ -2683,14 +2707,14 @@ CalendarTime(int tim, int duration)
    }

    if (h >= 12) {
-        ampm1 = DynamicPm;
+        ampm1 = tr("pm");
    } else {
-        ampm1 = DynamicAm;
+        ampm1 = tr("am");
    }
    if (h2 >= 12) {
-        ampm2 = DynamicPm;
+        ampm2 = tr("pm");
    } else {
-        ampm2 = DynamicAm;
+        ampm2 = tr("am");
    }
    if (!days) {
        if (!strcmp(ampm1, ampm2)) {
@@ -2737,7 +2761,7 @@ char const *SimpleTime(int tim)
            if (h == 0) hh=12;
            else if (h > 12) hh=h-12;
            else hh=h;
-            sprintf(buf, "%d%c%02d%s ", hh, TimeSep, min, (h>=12) ? DynamicPm : DynamicAm);
+            sprintf(buf, "%d%c%02d%s ", hh, TimeSep, min, (h>=12) ? tr("pm") : tr("am"));
        }
        break;

--- a/src/dedupe.c
+++ b/src/dedupe.c
@@ -167,17 +167,13 @@ InitDedupeTable(void)
    if (hash_table_init(&DedupeTable,
                        offsetof(DedupeEntry, link),
                        DedupeHashFunc, CompareDedupes) < 0) {
-        fprintf(stderr, "Unable to initialize function hash table: Out of memory.  Exiting.\n");
+        fprintf(ErrFp, "Unable to initialize function hash table: Out of memory.  Exiting.\n");
        exit(1);
    }
 }

 void
-get_dedupe_hash_stats(int *total, int *maxlen, double *avglen)
+dump_dedupe_hash_stats(void)
 {
-    struct hash_table_stats s;
-    hash_table_get_stats(&DedupeTable, &s);
-    *total = s.num_entries;
-    *maxlen = s.max_len;
-    *avglen = s.avg_len;
+    hash_table_dump_stats(&DedupeTable, ErrFp);
 }
--- a/src/dosubst.c
+++ b/src/dosubst.c
@@ -96,7 +96,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
    mplu = (mdiff == 1 ? "" : DynamicMplu);
    hplu = (hdiff == 1 ? "" : DynamicHplu);

-    when = (tdiff < 0) ? DynamicAgo : DynamicFromnow;
+    when = (tdiff < 0) ? tr("ago") : tr("from now");

    h = tim / 60;
    min = tim % 60;
@@ -120,7 +120,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
        }
    }
    if (r != OK) {
-        pm = (h < 12) ? DynamicAm : DynamicPm;
+        pm = (h < 12) ? tr("am") : tr("pm");
    }

    hh = (h == 12) ? 12 : h % 12;
@@ -147,7 +147,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
        }
    }
    if (r != OK) {
-        cpm = (h < 12) ? DynamicAm : DynamicPm;
+        cpm = (h < 12) ? tr("am") : tr("pm");
    }
    chh = (ch == 12) ? 12 : ch % 12;

@@ -215,6 +215,36 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
        if (!c) {
            break;
        }
+        if (c == '(') {
+            DynamicBuffer orig;
+            DynamicBuffer translated;
+            DBufInit(&orig);
+            DBufInit(&translated);
+            while(1) {
+                c = ParseChar(p, &err, 0);
+                if (err) {
+                    DBufFree(&orig);
+                    return err;
+                }
+                if (!c || c == ')') {
+                    break;
+                }
+                DBufPutc(&orig, c);
+            }
+            if (!c) {
+                Wprint("Warning: Unterminated %%(...) substitution sequence");
+            }
+            err = OK;
+            if (GetTranslatedStringTryingVariants(DBufValue(&orig), &translated)) {
+                err = DBufPuts(dbuf, DBufValue(&translated));
+            } else {
+                err = DBufPuts(dbuf, DBufValue(&orig));
+            }
+            DBufFree(&orig);
+            DBufFree(&translated);
+            if (err) return err;
+            continue;
+        }
        if (c == '*') {
            altmode = c;
            c = ParseChar(p, &err, 0);
@@ -311,7 +341,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
            case 'L':
            case 'U':
            case 'V':
-                snprintf(s, sizeof(s), "%s", (diff ? DynamicTomorrow: DynamicToday));
+                snprintf(s, sizeof(s), "%s", (diff ? tr("tomorrow") : tr("today")));
                SHIP_OUT(s);
                done = 1;
                break;
@@ -347,11 +377,11 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
            }
            switch(UPPER(c)) {
            case 'A':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%s, %d %s, %d", get_day_name(dse%7), d,
                             get_month_name(m), y);
                } else {
-                    snprintf(s, sizeof(s), "%s %s, %d %s, %d", DynamicOn, get_day_name(dse%7), d,
+                    snprintf(s, sizeof(s), "%s %s, %d %s, %d", tr("on"), get_day_name(dse%7), d,
                             get_month_name(m), y);
                }
                SHIP_OUT(s);
@@ -363,10 +393,10 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                break;

            case 'C':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%s", get_day_name(dse%7));
                } else {
-                    snprintf(s, sizeof(s), "%s %s", DynamicOn, get_day_name(dse%7));
+                    snprintf(s, sizeof(s), "%s %s", tr("on"), get_day_name(dse%7));
                }
                SHIP_OUT(s);
                break;
@@ -377,79 +407,79 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                break;

            case 'E':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%02d%c%02d%c%04d", d, DateSep,
                             m+1, DateSep, y);
                } else {
-                    snprintf(s, sizeof(s), "%s %02d%c%02d%c%04d", DynamicOn, d, DateSep,
+                    snprintf(s, sizeof(s), "%s %02d%c%02d%c%04d", tr("on"), d, DateSep,
                             m+1, DateSep, y);
                }
                SHIP_OUT(s);
                break;

            case 'F':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);
                } else {
-                    snprintf(s, sizeof(s), "%s %02d%c%02d%c%04d", DynamicOn, m+1, DateSep, d, DateSep, y);
+                    snprintf(s, sizeof(s), "%s %02d%c%02d%c%04d", tr("on"), m+1, DateSep, d, DateSep, y);
                }
                SHIP_OUT(s);
                break;

            case 'G':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%s, %d %s", get_day_name(dse%7), d, get_month_name(m));
                } else {
-                    snprintf(s, sizeof(s), "%s %s, %d %s", DynamicOn, get_day_name(dse%7), d, get_month_name(m));
+                    snprintf(s, sizeof(s), "%s %s, %d %s", tr("on"), get_day_name(dse%7), d, get_month_name(m));
                }
                SHIP_OUT(s);
                break;

            case 'H':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%02d%c%02d", d, DateSep, m+1);
                } else {
-                    snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicOn, d, DateSep, m+1);
+                    snprintf(s, sizeof(s), "%s %02d%c%02d", tr("on"), d, DateSep, m+1);
                }
                SHIP_OUT(s);
                break;

            case 'I':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%02d%c%02d", m+1, DateSep, d);
                } else {
-                    snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicOn, m+1, DateSep, d);
+                    snprintf(s, sizeof(s), "%s %02d%c%02d", tr("on"), m+1, DateSep, d);
                }
                SHIP_OUT(s);
                break;

            case 'J':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%s, %s %d%s, %d", get_day_name(dse%7),
                             get_month_name(m), d, plu, y);
                } else {
-                    snprintf(s, sizeof(s), "%s %s, %s %d%s, %d", DynamicOn, get_day_name(dse%7),
+                    snprintf(s, sizeof(s), "%s %s, %s %d%s, %d", tr("on"), get_day_name(dse%7),
                             get_month_name(m), d, plu, y);
                }
                SHIP_OUT(s);
                break;

            case 'K':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%s, %s %d%s", get_day_name(dse%7),
                             get_month_name(m), d, plu);
                } else {
-                    snprintf(s, sizeof(s), "%s %s, %s %d%s", DynamicOn, get_day_name(dse%7),
+                    snprintf(s, sizeof(s), "%s %s, %s %d%s", tr("on"), get_day_name(dse%7),
                             get_month_name(m), d, plu);
                }
                SHIP_OUT(s);
                break;

            case 'L':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);
                } else {
-                    snprintf(s, sizeof(s), "%s %04d%c%02d%c%02d", DynamicOn, y, DateSep, m+1, DateSep, d);
+                    snprintf(s, sizeof(s), "%s %04d%c%02d%c%02d", tr("on"), y, DateSep, m+1, DateSep, d);
                }
                SHIP_OUT(s);
                break;
@@ -465,7 +495,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                break;

            case 'O':
-                if (RealToday == DSEToday) snprintf(s, sizeof(s), " (%s)", DynamicToday);
+                if (RealToday == DSEToday) snprintf(s, sizeof(s), " (%s)", tr("today"));
                else *s = 0;
                SHIP_OUT(s);
                break;
@@ -496,22 +526,22 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                break;

            case 'U':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%s, %d%s %s, %d", get_day_name(dse%7), d,
                             plu, get_month_name(m), y);
                } else {
-                    snprintf(s, sizeof(s), "%s %s, %d%s %s, %d", DynamicOn, get_day_name(dse%7), d,
+                    snprintf(s, sizeof(s), "%s %s, %d%s %s, %d", tr("on"), get_day_name(dse%7), d,
                             plu, get_month_name(m), y);
                }
                SHIP_OUT(s);
                break;

            case 'V':
-                if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                if (altmode == '*' || !strcmp(tr("on"), "")) {
                    snprintf(s, sizeof(s), "%s, %d%s %s", get_day_name(dse%7), d, plu,
                             get_month_name(m));
                } else {
-                    snprintf(s, sizeof(s), "%s %s, %d%s %s", DynamicOn, get_day_name(dse%7), d, plu,
+                    snprintf(s, sizeof(s), "%s %s, %d%s %s", tr("on"), get_day_name(dse%7), d, plu,
                             get_month_name(m));
                }
                SHIP_OUT(s);
@@ -539,14 +569,14 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,

            case '1':
                if (tdiff == 0)
-                    snprintf(s, sizeof(s), "%s", DynamicNow);
+                    snprintf(s, sizeof(s), "%s", tr("now"));
                else if (hdiff == 0)
-                    snprintf(s, sizeof(s), "%d %s%s %s", mdiff, DynamicMinute, mplu, when);
+                    snprintf(s, sizeof(s), "%d %s%s %s", mdiff, tr("minute"), mplu, when);
                else if (mdiff == 0)
-                    snprintf(s, sizeof(s), "%d %s%s %s", hdiff, DynamicHour, hplu, when);
+                    snprintf(s, sizeof(s), "%d %s%s %s", hdiff, tr("hour"), hplu, when);
                else
-                    snprintf(s, sizeof(s), "%d %s%s %s %d %s%s %s", hdiff, DynamicHour, hplu,
-                             DynamicAnd, mdiff, DynamicMinute, mplu, when);
+                    snprintf(s, sizeof(s), "%d %s%s %s %d %s%s %s", hdiff, tr("hour"), hplu,
+                             tr("and"), mdiff, tr("minute"), mplu, when);
                SHIP_OUT(s);
                break;

@@ -554,7 +584,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                if (altmode == '*') {
                    snprintf(s, sizeof(s), "%d%c%02d%s", hh, TimeSep, min, pm);
                } else {
-                    snprintf(s, sizeof(s), "%s %d%c%02d%s", DynamicAt, hh, TimeSep, min, pm);
+                    snprintf(s, sizeof(s), "%s %d%c%02d%s", tr("at"), hh, TimeSep, min, pm);
                }
                SHIP_OUT(s);
                break;
@@ -563,7 +593,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                if (altmode == '*') {
                    snprintf(s, sizeof(s), "%02d%c%02d", h, TimeSep, min);
                } else {
-                    snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicAt, h, TimeSep, min);
+                    snprintf(s, sizeof(s), "%s %02d%c%02d", tr("at"), h, TimeSep, min);
                }
                SHIP_OUT(s);
                break;
@@ -604,7 +634,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                break;

            case '!':
-                snprintf(s, sizeof(s), "%s", (tdiff >= 0 ? DynamicIs : DynamicWas));
+                snprintf(s, sizeof(s), "%s", (tdiff >= 0 ? tr("is") : tr("was")));
                SHIP_OUT(s);
                break;

--- a/src/expr.c
+++ b/src/expr.c
@@ -3088,10 +3088,10 @@ int DoCoerce(char type, Value *v)
 /***************************************************************/
 void print_expr_nodes_stats(void)
 {
-    fprintf(stderr, " Expression nodes allocated: %d\n", ExprNodesAllocated);
-    fprintf(stderr, "Expression nodes high-water: %d\n", ExprNodesHighWater);
-    fprintf(stderr, "    Expression nodes leaked: %d\n", ExprNodesUsed);
-    fprintf(stderr, "     Parse level high-water: %d\n", parse_level_high_water);
+    fprintf(ErrFp, " Expression nodes allocated: %d\n", ExprNodesAllocated);
+    fprintf(ErrFp, "Expression nodes high-water: %d\n", ExprNodesHighWater);
+    fprintf(ErrFp, "    Expression nodes leaked: %d\n", ExprNodesUsed);
+    fprintf(ErrFp, "     Parse level high-water: %d\n", parse_level_high_water);
 }

 /* Return 1 if a value is "true" for its type, 0 if "false" */
--- a/src/files.c
+++ b/src/files.c
@@ -608,16 +608,25 @@ int DoInclude(ParsePtr p, enum TokTypes tok)
    DBufInit(&buf);
    DBufInit(&fullname);
    DBufInit(&path);
-    if ( (r=ParseToken(p, &buf)) ) return r;
+    if ( (r=ParseTokenOrQuotedString(p, &buf)) ) return r;
    e = VerifyEoln(p);
    if (e) Eprint("%s", GetErr(e));

-    if (tok == T_IncludeR && *(DBufValue(&buf)) != '/') {
+    if ((tok == T_IncludeR || tok == T_IncludeSys) &&
+        *(DBufValue(&buf)) != '/') {
        /* Relative include: Include relative to dir
           containing current file */
-        if (DBufPuts(&path, FileName) != OK) {
-            r = E_NO_MEM;
-            goto bailout;
+        if (tok == T_IncludeR) {
+            if (DBufPuts(&path, FileName) != OK) {
+                r = E_NO_MEM;
+                goto bailout;
+            }
+        } else {
+            if (DBufPuts(&path, SysDir) != OK ||
+                DBufPutc(&path, '/') != OK) {
+                r = E_NO_MEM;
+                goto bailout;
+            }
        }
        if (DBufLen(&path) == 0) {
            s = DBufValue(&buf);
@@ -650,9 +659,6 @@ int DoInclude(ParsePtr p, enum TokTypes tok)
        goto bailout;
    }

-    NumIfs = 0;
-    IfFlags = 0;
-
  bailout:
    DBufFree(&buf);
    DBufFree(&path);
@@ -713,8 +719,6 @@ int DoIncludeCmd(ParsePtr p)
        return r;
    }
    DBufFree(&buf);
-    NumIfs = 0;
-    IfFlags = 0;
    return OK;
 }

@@ -905,6 +909,8 @@ static int IncludeCmd(char const *cmd)
        FCLOSE(fp);
    }
    IStackPtr++;
+    NumIfs = 0;
+    IfFlags = 0;

    /* If the file is cached, use it */
    h = CachedFiles;
@@ -941,6 +947,7 @@ static int IncludeCmd(char const *cmd)
        fp2 = popen(cmd, "r");
    }
    if (!fp2) {
+        PopFile();
        DBufFree(&buf);
        return E_CANT_OPEN;
    }
@@ -1014,6 +1021,8 @@ int IncludeFile(char const *fname)
    }

    IStackPtr++;
+    NumIfs = 0;
+    IfFlags = 0;

 #ifdef HAVE_GLOB
    /* If it's a directory, set up the glob chain here. */
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -1825,10 +1825,10 @@ static int FTrigger(func_info *info)

    FromDSE(date, &y, &m, &d);
    if (tim != NO_TIME) {
-        sprintf(buf, "%d %s %d AT %02d:%02d", d, EnglishMonthName[m], y,
+        sprintf(buf, "%d %s %d AT %02d:%02d", d, MonthName[m], y,
                tim/60, tim%60);
    } else {
-        sprintf(buf, "%d %s %d", d, EnglishMonthName[m], y);
+        sprintf(buf, "%d %s %d", d, MonthName[m], y);
    }
    return RetStrVal(buf, info);
 }
@@ -3265,11 +3265,11 @@ static int setenv(char const *varname, char const *val, int overwrite)
 {
    static char tzbuf[256];
    if (strcmp(varname, "TZ")) {
-        fprintf(stderr, "built-in setenv can only be used with TZ\n");
+        fprintf(ErrFp, "built-in setenv can only be used with TZ\n");
        abort();
    }
    if (!overwrite) {
-        fprintf(stderr, "built-in setenv must have overwrite=1\n");
+        fprintf(ErrFp, "built-in setenv must have overwrite=1\n");
        abort();
    }

@@ -3287,7 +3287,7 @@ static void unsetenv(char const *varname)
 {
    static char tzbuf[8];
    if (strcmp(varname, "TZ")) {
-        fprintf(stderr, "built-in unsetenv can only be used with TZ\n");
+        fprintf(ErrFp, "built-in unsetenv can only be used with TZ\n");
        abort();
    }
    sprintf(tzbuf, "%s", varname);
--- a/src/globals.h
+++ b/src/globals.h
@@ -178,31 +178,14 @@ EXTERN  INIT(   int SuppressImplicitRemWarnings, 0);
 extern int NumFullOmits, NumPartialOmits;

 /* List of months */
-EXTERN  char    *EnglishMonthName[]
+EXTERN  char    *MonthName[]
 #ifdef MK_GLOBALS
 = {"January", "February", "March", "April", "May", "June",
   "July", "August", "September", "October", "November", "December"}
 #endif
 ;

-#define MonthName EnglishMonthName
-
-EXTERN char *DynamicMonthName[]
-#ifdef MK_GLOBALS
-= {"January", "February", "March", "April", "May", "June",
-   "July", "August", "September", "October", "November", "December"}
-#endif
-;
-EXTERN  char    *EnglishDayName[]
-#ifdef MK_GLOBALS
-= {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
-   "Saturday", "Sunday"}
-#endif
-;
-
-#define DayName EnglishDayName
-
-EXTERN char *DynamicDayName []
+EXTERN  char    *DayName[]
 #ifdef MK_GLOBALS
 = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
   "Saturday", "Sunday"}
@@ -227,86 +210,17 @@ EXTERN  int     MonthIndex[2][12]
 #endif
 ;

-EXTERN char *DynamicAgo
-#ifdef MK_GLOBALS
-= "ago"
-#endif
-;
-EXTERN char *DynamicAm
-#ifdef MK_GLOBALS
-= "am"
-#endif
-;
-EXTERN char *DynamicAnd
-#ifdef MK_GLOBALS
-= "and"
-#endif
-;
-EXTERN char *DynamicAt
-#ifdef MK_GLOBALS
-= "at"
-#endif
-;
-EXTERN char *DynamicFromnow
-#ifdef MK_GLOBALS
-= "from now"
-#endif
-;
-EXTERN char *DynamicHour
-#ifdef MK_GLOBALS
-= "hour"
-#endif
-;
 EXTERN char *DynamicHplu
 #ifdef MK_GLOBALS
 = "s"
 #endif
 ;
-EXTERN char *DynamicIs
-#ifdef MK_GLOBALS
-= "is"
-#endif
-;
-EXTERN char *DynamicMinute
-#ifdef MK_GLOBALS
-= "minute"
-#endif
-;
+
 EXTERN char *DynamicMplu
 #ifdef MK_GLOBALS
 = "s"
 #endif
 ;
-EXTERN char *DynamicNow
-#ifdef MK_GLOBALS
-= "now"
-#endif
-;
-EXTERN char *DynamicOn
-#ifdef MK_GLOBALS
-= "on"
-#endif
-;
-EXTERN char *DynamicPm
-#ifdef MK_GLOBALS
-= "pm"
-#endif
-;
-EXTERN char *DynamicToday
-#ifdef MK_GLOBALS
-= "today"
-#endif
-;
-EXTERN char *DynamicTomorrow
-#ifdef MK_GLOBALS
-= "tomorrow"
-#endif
-;
-EXTERN char *DynamicWas
-#ifdef MK_GLOBALS
-= "was"
-#endif
-;

 #define XSTR(x) #x
 #define STRSYSDIR(x) XSTR(x)
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -63,7 +63,7 @@
 * These are used as choices for the number of hash buckets in the table
 */
 static size_t bucket_choices[] = {
-    17, 37, 79, 163, 331, 673, 1361, 2729, 5471, 10949, 21911, 43853, 87719,
+    7, 17, 37, 79, 163, 331, 673, 1361, 2729, 5471, 10949, 21911, 43853, 87719,
    175447, 350899, 701819, 1403641, 2807303, 5614657, 11229331, 22458671,
    44917381, 89834777, 179669557, 359339171, 718678369, 1437356741 };

@@ -108,6 +108,8 @@ hash_table_init(hash_table *t,
    t->hashfunc            = hashfunc;
    t->compare             = compare;
    t->buckets             = malloc(sizeof(void *) * bucket_choices[0]);
+    t->num_growths         = 0;
+    t->num_shrinks         = 0;
    if (!t->buckets) {
        return -1;
    }
@@ -216,15 +218,17 @@ hash_table_resize(hash_table *t, int dir)
        /* Out of memory... just don't resize? */
        return 0;
    }
+    if (dir == 1) {
+        t->num_growths++;
+    } else {
+        t->num_shrinks++;
+    }
    for (size_t j=0; j<num_new_buckets; j++) {
        new_buckets[j] = NULL;
    }

    /* Move everything from the old buckets into the new */
    for (size_t i=0; i<num_old_buckets; i++) {
-        if (!t->buckets[i]) {
-            continue;
-        }
        void *p = t->buckets[i];
        while(p) {
            struct hash_link *l = LINK(t, p);
--- a/src/hashtab.h
+++ b/src/hashtab.h
@@ -29,6 +29,8 @@ struct hash_link {
 */
 typedef struct {
    unsigned int bucket_choice_index;  /**< Index into array of possible bucket counts */
+    size_t num_growths;       /**< How many times have we grown the hash table? */
+    size_t num_shrinks;       /**< How many times have we grown the hash table? */
    size_t num_entries;       /**< Number of entries in the hash table */
    size_t hash_link_offset;  /**< Offset of the struct hash_link in the container */
    void **buckets;           /**< Array of buckets */
@@ -45,6 +47,8 @@ struct hash_table_stats {
    size_t num_nonempty_buckets; /**< Number of non-emptry buckets */
    size_t max_len;      /**< Length of longest chain in the hash table */
    size_t min_len;      /**< Length of the shortest chain in the hash table */
+    size_t num_growths;       /**< How many times have we grown the hash table? */
+    size_t num_shrinks;       /**< How many times have we grown the hash table? */
    double avg_len;      /**< Average chain length */
    double avg_nonempty_len; /**< Average chain length of non-empty bucket */
    double stddev;       /**< Standard deviation of chain lengths */
--- a/src/hashtab_stats.c
+++ b/src/hashtab_stats.c
@@ -33,14 +33,15 @@ hash_table_dump_stats(hash_table *t, FILE *fp)
 {
    struct hash_table_stats stat;
    hash_table_get_stats(t, &stat);
-    fprintf(fp, "#Entries: %lu\n#Buckets: %lu\n#Non-empty Buckets: %lu\n",
+    fprintf(fp, "  Entries: %lu; Buckets: %lu; Non-empty Buckets: %lu\n",
            (unsigned long) stat.num_entries,
            (unsigned long) stat.num_buckets,
            (unsigned long) stat.num_nonempty_buckets);
-    fprintf(fp, "Max len: %lu\nMin len: %lu\nAvg len: %.4f\nStd dev: %.4f\nAvg nonempty len: %.4f\n",
+    fprintf(fp, "  Maxlen: %lu; Minlen: %lu; Avglen: %.3f; Stddev: %.3f; Avg nonempty len: %.3f\n",
            (unsigned long) stat.max_len,
            (unsigned long) stat.min_len,
            stat.avg_len, stat.stddev, stat.avg_nonempty_len);
+    fprintf(fp, "  Growths: %lu; Shrinks: %lu\n", (unsigned long) stat.num_growths, (unsigned long) stat.num_shrinks);
 }

 /**
@@ -67,6 +68,8 @@ hash_table_get_stats(hash_table *t, struct hash_table_stats *stat)
    stat->stddev  = 0.0;
    stat->num_nonempty_buckets = 0;
    stat->avg_nonempty_len = 0.0;
+    stat->num_growths = t->num_growths;
+    stat->num_shrinks = t->num_shrinks;
    double sum = 0.0;
    double sumsq = 0.0;

--- a/src/init.c
+++ b/src/init.c
@@ -149,7 +149,7 @@ static char const *DefaultFilename(void)

    s = getenv("HOME");
    if (!s) {
-        fprintf(stderr, "HOME environment variable not set.  Unable to determine reminder file.\n");
+        fprintf(ErrFp, "HOME environment variable not set.  Unable to determine reminder file.\n");
        exit(EXIT_FAILURE);
    }
    DBufPuts(&default_filename_buf, s);
@@ -237,7 +237,7 @@ void InitRemind(int argc, char const *argv[])
            InvokedAsRem = 1;
        }
    } else {
-        fprintf(stderr, "Invoked with a NULL argv[0]; bailing because that's just plain bizarre.\n");
+        fprintf(ErrFp, "Invoked with a NULL argv[0]; bailing because that's just plain bizarre.\n");
        exit(EXIT_FAILURE);
    }

@@ -577,7 +577,7 @@ void InitRemind(int argc, char const *argv[])
                        /* -wt means get width from /dev/tty */
                        ttyfd = open("/dev/tty", O_RDONLY);
                        if (ttyfd < 0) {
-                            fprintf(stderr, "%s: `-wt': Cannot open /dev/tty: %s\n",
+                            fprintf(ErrFp, "%s: `-wt': Cannot open /dev/tty: %s\n",
                                    argv[0], strerror(errno));
                        } else {
                            InitCalWidthAndFormWidth(ttyfd);
@@ -728,7 +728,7 @@ void InitRemind(int argc, char const *argv[])

            default:
                if (tok.type == T_Illegal && tok.val < 0) {
-                    fprintf(stderr, "%s: `%s'\n", GetErr(-tok.val), arg);
+                    fprintf(ErrFp, "%s: `%s'\n", GetErr(-tok.val), arg);
                    Usage();
                }
                Usage();
@@ -1018,7 +1018,7 @@ AddTrustedUser(char const *username)
 {
    struct passwd *pwent;
    if (NumTrustedUsers >= MAX_TRUSTED_USERS) {
-        fprintf(stderr, "Too many trusted users (%d max)\n",
+        fprintf(ErrFp, "Too many trusted users (%d max)\n",
                MAX_TRUSTED_USERS);
        exit(EXIT_FAILURE);
    }
--- a/src/main.c
+++ b/src/main.c
@@ -60,19 +60,21 @@ exitfunc(void)
    /* Kill any execution-time-limiter process */
    unlimit_execution_time();

-    int maxlen, total;
-    double avglen;
    if (DebugFlag & DB_PARSE_EXPR) {
        fflush(stdout);
-        fflush(stderr);
-        get_var_hash_stats(&total, &maxlen, &avglen);
-        fprintf(stderr, "  Var hash: total = %d; maxlen = %d; avglen = %.3f\n", total, maxlen, avglen);
-        get_userfunc_hash_stats(&total, &maxlen, &avglen);
-        fprintf(stderr, " Func hash: total = %d; maxlen = %d; avglen = %.3f\n", total, maxlen, avglen);
-        get_dedupe_hash_stats(&total, &maxlen, &avglen);
-        fprintf(stderr, "Dedup hash: total = %d; maxlen = %d; avglen = %.3f\n", total, maxlen, avglen);
-        get_translation_hash_stats(&total, &maxlen, &avglen);
-        fprintf(stderr, "Trans hash: total = %d; maxlen = %d; avglen = %.3f\n", total, maxlen, avglen);
+        fflush(ErrFp);
+        fprintf(ErrFp, "Variable hash table statistics:\n");
+        dump_var_hash_stats();
+
+        fprintf(ErrFp, "Function hash table statistics:\n");
+        dump_userfunc_hash_stats();
+
+        fprintf(ErrFp, "Dedupe hash table statistics:\n");
+        dump_dedupe_hash_stats();
+
+        fprintf(ErrFp, "Translation hash table statistics:\n");
+        dump_translation_hash_stats();
+
        UnsetAllUserFuncs();
        print_expr_nodes_stats();
    }
@@ -128,7 +130,7 @@ int main(int argc, char *argv[])
    sigemptyset(&act.sa_mask);
    act.sa_flags = SA_RESTART;
    if (sigaction(SIGALRM, &act, NULL) < 0) {
-        fprintf(stderr, "%s: sigaction() failed: %s\n",
+        fprintf(ErrFp, "%s: sigaction() failed: %s\n",
                argv[0], strerror(errno));
        exit(1);
    }
@@ -137,7 +139,7 @@ int main(int argc, char *argv[])
    act.sa_flags = SA_RESTART;
    sigemptyset(&act.sa_mask);
    if (sigaction(SIGXCPU, &act, NULL) < 0) {
-        fprintf(stderr, "%s: sigaction() failed: %s\n",
+        fprintf(ErrFp, "%s: sigaction() failed: %s\n",
                argv[0], strerror(errno));
        exit(1);
    }
@@ -314,6 +316,7 @@ static void DoReminders(void)
            case T_EndIf:   r=DoEndif(&p);   break;
            case T_Include:
            case T_IncludeR:
+            case T_IncludeSys:
                /* In purge mode, include closes file, so we
                   need to echo it here! */
                if (PurgeMode) {
@@ -599,6 +602,24 @@ int ParseNonSpaceChar(ParsePtr p, int *err, int peek)
    return ch;
 }

+/***************************************************************/
+/*                                                             */
+/*  ParseTokenOrQuotedString                                   */
+/*                                                             */
+/*  Parse either a token or a double-quote-delimited string.   */
+/*                                                             */
+/***************************************************************/
+int ParseTokenOrQuotedString(ParsePtr p, DynamicBuffer *dbuf)
+{
+    int c, err;
+    c = ParseNonSpaceChar(p, &err, 1);
+    if (err) return err;
+    if (c != '"') {
+        return ParseToken(p, dbuf);
+    }
+    return ParseQuotedString(p, dbuf);
+}
+
 /***************************************************************/
 /*                                                             */
 /*  ParseQuotedString                                          */
@@ -1979,8 +2000,7 @@ get_day_name(int wkday)
    if (wkday < 0 || wkday > 6) {
        return "INVALID_WKDAY";
    }
-    if (DynamicDayName[wkday]) return DynamicDayName[wkday];
-    return DayName[wkday];
+    return tr(DayName[wkday]);
 }

 char const *
@@ -1989,8 +2009,7 @@ get_month_name(int mon)
    if (mon < 0 || mon > 11) {
        return "INVALID_MON";
    }
-    if (DynamicMonthName[mon]) return DynamicMonthName[mon];
-    return MonthName[mon];
+    return tr(MonthName[mon]);
 }

 static int GetOnceDateFromFile(void)
--- a/src/omit.c
+++ b/src/omit.c
@@ -544,7 +544,7 @@ DumpOmits(void)
    } else {
        for (i=0; i<7; i++) {
            if (WeekdayOmits & (1<<i)) {
-                printf("\t%s\n", EnglishDayName[i]);
+                printf("\t%s\n", DayName[i]);
            }
        }
    }
--- a/src/protos.h
+++ b/src/protos.h
@@ -88,6 +88,7 @@ int JulianToGregorianOffset(int y, int m);
 int ParseChar (ParsePtr p, int *err, int peek);
 int ParseToken (ParsePtr p, DynamicBuffer *dbuf);
 int ParseQuotedString (ParsePtr p, DynamicBuffer *dbuf);
+int ParseTokenOrQuotedString (ParsePtr p, DynamicBuffer *dbuf);
 int ParseIdentifier (ParsePtr p, DynamicBuffer *dbuf);
 expr_node * ParseExpr(ParsePtr p, int *r);
 void print_expr_nodes_stats(void);
@@ -255,10 +256,10 @@ void print_builtinfunc_tokens(void);
 void print_remind_tokens(void);

 /* Stats for -ds output */
-void get_var_hash_stats(int *total, int *maxlen, double *avglen);
-void get_userfunc_hash_stats(int *total, int *maxlen, double *avglen);
-void get_dedupe_hash_stats(int *total, int *maxlen, double *avglen);
-void get_translation_hash_stats(int *total, int *maxlen, double *avglen);
+void dump_var_hash_stats(void);
+void dump_userfunc_hash_stats(void);
+void dump_dedupe_hash_stats(void);
+void dump_translation_hash_stats(void);

 /* Dedupe code */
 int ShouldDedupe(int trigger_date, int trigger_time, char const *body);
@@ -271,5 +272,5 @@ void InitTranslationTable(void);
 char const *GetTranslatedString(char const *orig);
 int GetTranslatedStringTryingVariants(char const *orig, DynamicBuffer *out);
 char const *GetErr(int r);
-char const *t(char const *s);
+char const *tr(char const *s);
 void print_escaped_string(FILE *fp, char const *s);
--- a/src/rem2ps.c
+++ b/src/rem2ps.c
@@ -357,6 +357,7 @@ int main(int argc, char *argv[])
            validfile++;
            DoPsCal();
        }
+        DBufFree(&buf);
    }
    if (!validfile) {
        fprintf(stderr, "Rem2PS: Couldn't find any calendar data - are you\n");
--- a/src/token.c
+++ b/src/token.c
@@ -107,6 +107,7 @@ Token TokArray[] = {
    { "skip",           4,      T_Skip, SKIP_SKIP },
    { "special",        7,      T_RemType,      PASSTHRU_TYPE },
    { "sunday",         3,      T_WkDay,        6 },
+    { "sysinclude",     10,     T_IncludeSys,   0 },
    { "tag",            3,      T_Tag,          0 },
    { "third",          5,      T_Ordinal,      2 },
    { "through",        7,      T_Through,      0 },
--- a/src/trans.c
+++ b/src/trans.c
@@ -202,7 +202,7 @@ InitTranslationTable(void)
 {
    if (hash_table_init(&TranslationTable, offsetof(XlateItem, link),
                        HashXlateItem, CompareXlateItems) < 0) {
-        fprintf(stderr, "Unable to initialize translation hash table: Out of memory.  Exiting.\n");
+        fprintf(ErrFp, "Unable to initialize translation hash table: Out of memory.  Exiting.\n");
        exit(1);
    }
    InsertTranslation("LANGID", "en");
@@ -229,6 +229,11 @@ InsertTranslation(char const *orig, char const *translated)
        }
        RemoveTranslation(item);
    }
+
+    /* TRANSLATE "foo" "foo" means to remove the translation */
+    if (strcmp(orig, "LANGID") && (!strcmp(orig, translated))) {
+        return OK;
+    }
    item = AllocateXlateItem(orig, translated);
    if (!item) {
        return E_NO_MEM;
@@ -308,7 +313,7 @@ GetTranslatedStringTryingVariants(char const *orig, DynamicBuffer *out)
    return 0;
 }

-char const *t(char const *orig)
+char const *tr(char const *orig)
 {
    char const *n = GetTranslatedString(orig);
    if (n) {
@@ -381,12 +386,8 @@ DoTranslate(ParsePtr p)
 }

 void
-get_translation_hash_stats(int *total, int *maxlen, double *avglen)
+dump_translation_hash_stats(void)
 {
-    struct hash_table_stats s;
-    hash_table_get_stats(&TranslationTable, &s);
-    *total = s.num_entries;
-    *maxlen = s.max_len;
-    *avglen = s.avg_len;
+    hash_table_dump_stats(&TranslationTable, ErrFp);
 }

--- a/src/types.h
+++ b/src/types.h
@@ -28,6 +28,7 @@ typedef struct udf_struct UserFunc;
 #define STR_TYPE       0x8
 #define SPECIAL_TYPE   0x10 /* Only for system variables */
 #define CONST_INT_TYPE 0x20 /* Only for system variables */
+#define TRANS_TYPE     0x40 /* Only for system variables */

 #define BEG_OF_EXPR '['
 #define END_OF_EXPR ']'
@@ -214,7 +215,7 @@ enum TokTypes
  T_Date, T_DateTime, T_Day, T_Debug, T_Delta, T_Dumpvars, T_Duration,
  T_Else, T_Empty, T_EndIf, T_ErrMsg, T_Exit, T_Expr,
  T_Flush, T_Frename, T_Fset, T_Funset, T_If, T_IfTrig, T_In,
-  T_Include, T_IncludeCmd, T_IncludeR, T_LastBack, T_LongTime,
+  T_Include, T_IncludeCmd, T_IncludeR, T_IncludeSys, T_LastBack, T_LongTime,
  T_MaybeUncomputable, T_Month, T_NoQueue, T_Number, T_Omit, T_OmitFunc,
  T_Once, T_Ordinal, T_Pop, T_Preserve, T_Priority, T_Push,T_Rem,
  T_RemType, T_Rep, T_Scanfrom, T_Sched, T_Set, T_Skip, T_Tag, T_Through,
--- a/src/userfns.c
+++ b/src/userfns.c
@@ -56,7 +56,7 @@ InitUserFunctions(void)
                        offsetof(UserFunc, link),
                        HashUserFunc,
                        CompareUserFuncs) < 0) {
-        fprintf(stderr, "Unable to initialize function hash table: Out of memory.  Exiting.\n");
+        fprintf(ErrFp, "Unable to initialize function hash table: Out of memory.  Exiting.\n");
        exit(1);
    }
 }
@@ -506,12 +506,8 @@ RenameUserFunc(char const *oldname, char const *newname)
 }

 void
-get_userfunc_hash_stats(int *total, int *maxlen, double *avglen)
+dump_userfunc_hash_stats(void)
 {
-    struct hash_table_stats s;
-    hash_table_get_stats(&FuncHash, &s);
-    *total = s.num_entries;
-    *maxlen = s.max_len;
-    *avglen = s.avg_len;
+    hash_table_dump_stats(&FuncHash, ErrFp);
 }

--- a/src/var.c
+++ b/src/var.c
@@ -36,6 +36,7 @@ static int IntMin = INT_MIN;
 static int IntMax = INT_MAX;

 static hash_table VHashTbl;
+static int SetSysVarHelper(SysVar *v, Value *value);

 static unsigned int VarHashFunc(void *x)
 {
@@ -55,7 +56,7 @@ InitVars(void)
 {
    if (hash_table_init(&VHashTbl, offsetof(Var, link),
                        VarHashFunc, VarCompareFunc) < 0) {
-        fprintf(stderr, "Unable to initialize variable hash table: Out of memory.  Exiting.\n");
+        fprintf(ErrFp, "Unable to initialize variable hash table: Out of memory.  Exiting.\n");
        exit(1);
    }
 }
@@ -722,7 +723,7 @@ int DoDump(ParsePtr p)
 /*                                                             */
 /*  DumpVarTable                                               */
 /*                                                             */
-/*  Dump the variable table to stderr.                         */
+/*  Dump the variable table to ErrFp.                         */
 /*                                                             */
 /***************************************************************/
 void DumpVarTable(void)
@@ -844,47 +845,47 @@ int DoPreserve (Parser *p)
 static SysVar SysVarArr[] = {
    /*  name          mod  type              value          min/mal   max */
    {"AddBlankLines",  1,  INT_TYPE,     &AddBlankLines,       0,      1 },
-    {"Ago",            1,  STR_TYPE,     &DynamicAgo,          0,      0 },
-    {"Am",             1,  STR_TYPE,     &DynamicAm,           0,      0 },
-    {"And",            1,  STR_TYPE,     &DynamicAnd,          0,      0 },
-    {"April",          1,  STR_TYPE,     &DynamicMonthName[3], 0,      0 },
-    {"At",             1,  STR_TYPE,     &DynamicAt,           0,      0 },
-    {"August",         1,  STR_TYPE,     &DynamicMonthName[7], 0,      0 },
+    {"Ago",            1,  TRANS_TYPE,   "ago",                0,      0 },
+    {"Am",             1,  TRANS_TYPE,   "am",                 0,      0 },
+    {"And",            1,  TRANS_TYPE,   "and",                0,      0 },
+    {"April",          1,  TRANS_TYPE,   "April",              0,      0 },
+    {"At",             1,  TRANS_TYPE,   "at",                 0,      0 },
+    {"August",         1,  TRANS_TYPE,   "August",             0,      0 },
    {"CalcUTC",        1,  INT_TYPE,     &CalculateUTC,        0,      1 },
    {"CalMode",        0,  INT_TYPE,     &DoCalendar,          0,      0 },
    {"Daemon",         0,  INT_TYPE,     &Daemon,              0,      0 },
    {"DateSep",        1,  SPECIAL_TYPE, date_sep_func,        0,      0 },
    {"DateTimeSep",    1,  SPECIAL_TYPE, datetime_sep_func,    0,      0 },
-    {"December",       1,  STR_TYPE,     &DynamicMonthName[11],0,      0 },
+    {"December",       1,  TRANS_TYPE,   "December",           0,      0 },
    {"DedupeReminders",1,  INT_TYPE,     &DedupeReminders,     0,      1 },
    {"DefaultColor",   1,  SPECIAL_TYPE, default_color_func,   0,      0 },
    {"DefaultDelta",   1,  INT_TYPE,     &DefaultDelta,        0,      10000 },
    {"DefaultPrio",    1,  INT_TYPE,     &DefaultPrio,         0,      9999 },
    {"DefaultTDelta",  1,  INT_TYPE,     &DefaultTDelta,       0,      1440 },
-    {"DeltaOverride",  0,  INT_TYPE,     &DeltaOverride,         0,      0 },
+    {"DeltaOverride",  0,  INT_TYPE,     &DeltaOverride,       0,      0 },
    {"DontFork",       0,  INT_TYPE,     &DontFork,            0,      0 },
    {"DontQueue",      0,  INT_TYPE,     &DontQueue,           0,      0 },
    {"DontTrigAts",    0,  INT_TYPE,     &DontIssueAts,        0,      0 },
    {"EndSent",        1,  STR_TYPE,     &EndSent,             0,      0 },
    {"EndSentIg",      1,  STR_TYPE,     &EndSentIg,           0,      0 },
    {"ExpressionTimeLimit", 1, SPECIAL_TYPE, expr_time_limit_func, 0,  0 },
-    {"February",       1,  STR_TYPE,     &DynamicMonthName[1], 0,      0 },
+    {"February",       1,  TRANS_TYPE,   "February",           0,      0 },
    {"FirstIndent",    1,  INT_TYPE,     &FirstIndent,         0,      132 },
    {"FoldYear",       1,  INT_TYPE,     &FoldYear,            0,      1 },
    {"FormWidth",      1,  INT_TYPE,     &FormWidth,           20,     500 },
-    {"Friday",         1,  STR_TYPE,     &DynamicDayName[4],   0,      0 },
-    {"Fromnow",        1,  STR_TYPE,     &DynamicFromnow,      0,      0 },
-    {"Hour",           1,  STR_TYPE,     &DynamicHour,         0,      0 },
+    {"Friday",         1,  TRANS_TYPE,   "Friday",             0,      0 },
+    {"Fromnow",        1,  TRANS_TYPE,   "from now",           0,      0 },
+    {"Hour",           1,  TRANS_TYPE,   "hour",               0,      0 },
    {"Hplu",           1,  STR_TYPE,     &DynamicHplu,         0,      0 },
    {"HushMode",       0,  INT_TYPE,     &Hush,                0,      0 },
    {"IgnoreOnce",     0,  INT_TYPE,     &IgnoreOnce,          0,      0 },
    {"InfDelta",       0,  INT_TYPE,     &InfiniteDelta,       0,      0 },
    {"IntMax",         0,  INT_TYPE,     &IntMax,              0,      0 },
    {"IntMin",         0,  INT_TYPE,     &IntMin,              0,      0 },
-    {"Is",             1,  STR_TYPE,     &DynamicIs,           0,      0 },
-    {"January",        1,  STR_TYPE,     &DynamicMonthName[0], 0,      0 },
-    {"July",           1,  STR_TYPE,     &DynamicMonthName[6], 0,      0 },
-    {"June",           1,  STR_TYPE,     &DynamicMonthName[5], 0,      0 },
+    {"Is",             1,  TRANS_TYPE,   "is",                 0,      0 },
+    {"January",        1,  TRANS_TYPE,   "January",            0,      0 },
+    {"July",           1,  TRANS_TYPE,   "July",               0,      0 },
+    {"June",           1,  TRANS_TYPE,   "June",               0,      0 },
    {"LatDeg",         1,  SPECIAL_TYPE, latdeg_func,          0,      0 },
    {"Latitude",       1,  SPECIAL_TYPE, latitude_func,        0,      0 },
    {"LatMin",         1,  SPECIAL_TYPE, latmin_func,          0,      0 },
@@ -894,53 +895,53 @@ static SysVar SysVarArr[] = {
    {"Longitude",      1,  SPECIAL_TYPE, longitude_func,       0,      0 },
    {"LongMin",        1,  SPECIAL_TYPE, longmin_func,         0,      0 },
    {"LongSec",        1,  SPECIAL_TYPE, longsec_func,         0,      0 },
-    {"March",          1,  STR_TYPE,     &DynamicMonthName[2], 0,      0 },
+    {"March",          1,  TRANS_TYPE,   "March",              0,      0 },
    {"MaxFullOmits",   0,  CONST_INT_TYPE, NULL,        MAX_FULL_OMITS, 0},
    {"MaxLateMinutes", 1,  INT_TYPE,     &MaxLateMinutes,      0,      1440 },
    {"MaxPartialOmits",0,  CONST_INT_TYPE, NULL,    MAX_PARTIAL_OMITS, 0},
    {"MaxSatIter",     1,  INT_TYPE,     &MaxSatIter,          10,     ANY },
    {"MaxStringLen",   1,  INT_TYPE,     &MaxStringLen,        -1,     ANY },
-    {"May",            1,  STR_TYPE,     &DynamicMonthName[4], 0,      0 },
+    {"May",            1,  TRANS_TYPE,   "May",                0,      0 },
    {"MinsFromUTC",    1,  INT_TYPE,     &MinsFromUTC,         -780,   780 },
-    {"Minute",         1,  STR_TYPE,     &DynamicMinute,       0,      0 },
-    {"Monday",         1,  STR_TYPE,     &DynamicDayName[0],   0,      0 },
+    {"Minute",         1,  TRANS_TYPE,   "minute",             0,      0 },
+    {"Monday",         1,  TRANS_TYPE,   "Monday",             0,      0 },
    {"Mplu",           1,  STR_TYPE,     &DynamicMplu,         0,      0 },
    {"NextMode",       0,  INT_TYPE,     &NextMode,            0,      0 },
-    {"November",       1,  STR_TYPE,     &DynamicMonthName[10],0,      0 },
-    {"Now",            1,  STR_TYPE,     &DynamicNow,          0,      0 },
+    {"November",       1,  TRANS_TYPE,   "November",           0,      0 },
+    {"Now",            1,  TRANS_TYPE,   "now",                0,      0 },
    {"NumFullOmits",   0,  INT_TYPE,     &NumFullOmits,        0,      0 },
    {"NumPartialOmits",0,  INT_TYPE,     &NumPartialOmits,     0,      0 },
    {"NumQueued",      0,  INT_TYPE,     &NumQueued,           0,      0 },
    {"NumTrig",        0,  INT_TYPE,     &NumTriggered,        0,      0 },
-    {"October",        1,  STR_TYPE,     &DynamicMonthName[9], 0,      0 },
-    {"On",             1,  STR_TYPE,     &DynamicOn,           0,      0 },
+    {"October",        1,  TRANS_TYPE,   "October",            0,      0 },
+    {"On",             1,  TRANS_TYPE,   "on",                 0,      0 },
    {"OnceFile",       1,  SPECIAL_TYPE, oncefile_func,        0,      0 },
    {"ParseUntriggered", 1, INT_TYPE,    &ParseUntriggered,    0,      1 },
-    {"Pm",             1,  STR_TYPE,     &DynamicPm,           0,      0 },
+    {"Pm",             1,  TRANS_TYPE,   "pm",                 0,      0 },
    {"PrefixLineNo",   0,  INT_TYPE,     &DoPrefixLineNo,      0,      0 },
    {"PSCal",          0,  INT_TYPE,     &PsCal,               0,      0 },
    {"RunOff",         0,  INT_TYPE,     &RunDisabled,         0,      0 },
-    {"Saturday",       1,  STR_TYPE,     &DynamicDayName[5],   0,      0 },
-    {"September",      1,  STR_TYPE,     &DynamicMonthName[8], 0,      0 },
+    {"Saturday",       1,  TRANS_TYPE,   "Saturday",           0,      0 },
+    {"September",      1,  TRANS_TYPE,   "September",          0,      0 },
    {"SimpleCal",      0,  INT_TYPE,     &DoSimpleCalendar,    0,      0 },
    {"SortByDate",     0,  INT_TYPE,     &SortByDate,          0,      0 },
    {"SortByPrio",     0,  INT_TYPE,     &SortByPrio,          0,      0 },
    {"SortByTime",     0,  INT_TYPE,     &SortByTime,          0,      0 },
    {"SubsIndent",     1,  INT_TYPE,     &SubsIndent,          0,      132 },
-    {"Sunday",         1,  STR_TYPE,     &DynamicDayName[6],   0,      0 },
+    {"Sunday",         1,  TRANS_TYPE,   "Sunday",             0,      0 },
    {"SuppressImplicitWarnings", 1, INT_TYPE, &SuppressImplicitRemWarnings, 0, 1},
    {"SuppressLRM",    1,  INT_TYPE,     &SuppressLRM,         0,      1 },
    {"SysInclude",     0,  STR_TYPE,     &SysDir,              0,      0 },
    {"T",              0,  SPECIAL_TYPE, trig_date_func,       0,      0 },
    {"Td",             0,  SPECIAL_TYPE, trig_day_func,        0,      0 },
    {"TerminalBackground", 0, SPECIAL_TYPE,  terminal_bg_func, 0,      0 },
-    {"Thursday",       1,  STR_TYPE,     &DynamicDayName[3],   0,      0 },
+    {"Thursday",       1,  TRANS_TYPE,   "Thursday",           0,      0 },
    {"TimeSep",        1,  SPECIAL_TYPE, time_sep_func,        0,      0 },
    {"Tm",             0,  SPECIAL_TYPE, trig_mon_func,        0,      0 },
-    {"Today",          1,  STR_TYPE,     &DynamicToday,        0,      0 },
-    {"Tomorrow",       1,  STR_TYPE,     &DynamicTomorrow,     0,      0 },
+    {"Today",          1,  TRANS_TYPE,   "today",              0,      0 },
+    {"Tomorrow",       1,  TRANS_TYPE,   "tomorrow",           0,      0 },
    {"Tt",             0,  SPECIAL_TYPE, trig_time_func,       0,      0 },
-    {"Tuesday",        1,  STR_TYPE,     &DynamicDayName[1],   0,      0 },
+    {"Tuesday",        1,  TRANS_TYPE,   "Tuesday",            0,      0 },
    {"Tw",             0,  SPECIAL_TYPE, trig_wday_func,       0,      0 },
    {"Ty",             0,  SPECIAL_TYPE, trig_year_func,       0,      0 },
    {"U",              0,  SPECIAL_TYPE, today_date_func,      0,      0 },
@@ -948,72 +949,51 @@ static SysVar SysVarArr[] = {
    {"Um",             0,  SPECIAL_TYPE, today_mon_func,       0,      0 },
    {"UntimedFirst",   0,  INT_TYPE,     &UntimedBeforeTimed,  0,      0 },
    {"Use256Colors",   0,  INT_TYPE,     &Use256Colors,        0,      0 },
-    {"UseBGVTColors",  0,  INT_TYPE,     &UseBGVTColors,        0,      0 },
+    {"UseBGVTColors",  0,  INT_TYPE,     &UseBGVTColors,       0,      0 },
    {"UseTrueColors",  0,  INT_TYPE,     &UseTrueColors,       0,      0 },
    {"UseVTColors",    0,  INT_TYPE,     &UseVTColors,         0,      0 },
    {"Uw",             0,  SPECIAL_TYPE, today_wday_func,      0,      0 },
    {"Uy",             0,  SPECIAL_TYPE, today_year_func,      0,      0 },
-    {"Was",            1,  STR_TYPE,     &DynamicWas,          0,      0 },
-    {"Wednesday",      1,  STR_TYPE,     &DynamicDayName[2],   0,      0 }
+    {"Was",            1,  TRANS_TYPE,   "was",                0,      0 },
+    {"Wednesday",      1,  TRANS_TYPE,   "Wednesday",          0,      0 }
 };

 #define NUMSYSVARS ( sizeof(SysVarArr) / sizeof(SysVar) )
 static void DumpSysVar (char const *name, const SysVar *v);

-static void HandleTranslatableVariable(char **var)
+static int SetTranslatableVariable(SysVar *v, Value *value)
 {
-    if (var == (char **) &DynamicAgo) InsertTranslation("ago", *var);
-    else if (var == (char **) &DynamicAm) InsertTranslation("am", *var);
-    else if (var == (char **) &DynamicAnd) InsertTranslation("and", *var);
-    else if (var == (char **) &DynamicAt) InsertTranslation("at", *var);
-    else if (var == (char **) &DynamicFromnow) InsertTranslation("from now", *var);
-    else if (var == (char **) &DynamicHour) InsertTranslation("hour", *var);
-    else if (var == (char **) &DynamicIs) InsertTranslation("is", *var);
-    else if (var == (char **) &DynamicMinute) InsertTranslation("minute", *var);
-    else if (var == (char **) &DynamicNow) InsertTranslation("now", *var);
-    else if (var == (char **) &DynamicOn) InsertTranslation("on", *var);
-    else if (var == (char **) &DynamicPm) InsertTranslation("pm", *var);
-    else if (var == (char **) &DynamicToday) InsertTranslation("today", *var);
-    else if (var == (char **) &DynamicTomorrow) InsertTranslation("tomorrow", *var);
-    else if (var == (char **) &DynamicWas) InsertTranslation("was", *var);
-    else if (var == (char **) &DynamicMonthName[0]) InsertTranslation("January", *var);
-    else if (var == (char **) &DynamicMonthName[1]) InsertTranslation("February", *var);
-    else if (var == (char **) &DynamicMonthName[2]) InsertTranslation("March", *var);
-    else if (var == (char **) &DynamicMonthName[3]) InsertTranslation("April", *var);
-    else if (var == (char **) &DynamicMonthName[4]) InsertTranslation("May", *var);
-    else if (var == (char **) &DynamicMonthName[5]) InsertTranslation("June", *var);
-    else if (var == (char **) &DynamicMonthName[6]) InsertTranslation("July", *var);
-    else if (var == (char **) &DynamicMonthName[7]) InsertTranslation("August", *var);
-    else if (var == (char **) &DynamicMonthName[8]) InsertTranslation("September", *var);
-    else if (var == (char **) &DynamicMonthName[9]) InsertTranslation("October", *var);
-    else if (var == (char **) &DynamicMonthName[10]) InsertTranslation("November", *var);
-    else if (var == (char **) &DynamicMonthName[11]) InsertTranslation("December", *var);
-    else if (var == (char **) &DynamicDayName[0]) InsertTranslation("Monday", *var);
-    else if (var == (char **) &DynamicDayName[1]) InsertTranslation("Tuesday", *var);
-    else if (var == (char **) &DynamicDayName[2]) InsertTranslation("Wednesday", *var);
-    else if (var == (char **) &DynamicDayName[3]) InsertTranslation("Thursday", *var);
-    else if (var == (char **) &DynamicDayName[4]) InsertTranslation("Friday", *var);
-    else if (var == (char **) &DynamicDayName[5]) InsertTranslation("Saturday", *var);
-    else if (var == (char **) &DynamicDayName[6]) InsertTranslation("Sunday", *var);
-
+    return InsertTranslation((char const *) v->value, value->v.str);
 }
-/***************************************************************/
-/*                                                             */
-/*  SetSysVar                                                  */
-/*                                                             */
-/*  Set a system variable to the indicated value.              */
-/*                                                             */
-/***************************************************************/
-int SetSysVar(char const *name, Value *value)
+
+static int GetTranslatableVariable(SysVar *v, Value *value)
+{
+    char const *translated = tr((char const *) v->value);
+    if (translated) {
+        value->v.str = StrDup(translated);
+    } else {
+        value->v.str = StrDup("");
+    }
+    if (!value->v.str) return E_NO_MEM;
+    value->type = STR_TYPE;
+    return OK;
+}
+
+static int SetSysVarHelper(SysVar *v, Value *value)
 {
    int r;
-    SysVar *v = FindSysVar(name);
-    if (!v) return E_NOSUCH_VAR;
    if (!v->modifiable) {
-        Eprint("%s: `$%s'", GetErr(E_CANT_MODIFY), name);
+        Eprint("%s: `$%s'", GetErr(E_CANT_MODIFY), v->name);
        return E_CANT_MODIFY;
    }

+    if (v->type == TRANS_TYPE) {
+        if (value->type != STR_TYPE) return E_BAD_TYPE;
+        r =  SetTranslatableVariable(v, value);
+        DestroyValue(*value);
+        return r;
+    }
+
    if (v->type != SPECIAL_TYPE &&
        v->type != value->type) return E_BAD_TYPE;
    if (v->type == SPECIAL_TYPE) {
@@ -1025,7 +1005,7 @@ int SetSysVar(char const *name, Value *value)

    if (v->type == STR_TYPE) {
        /* If it's already the same, don't bother doing anything */
-        if (!strcmp(value->v.str, (char const *) v->value)) {
+        if (!strcmp(value->v.str, * (char const **) v->value)) {
            DestroyValue(*value);
            return OK;
        }
@@ -1035,7 +1015,6 @@ int SetSysVar(char const *name, Value *value)
        v->been_malloced = 1;
        *((char **) v->value) = value->v.str;
        value->type = ERR_TYPE;  /* So that it's not accidentally freed */
-        HandleTranslatableVariable((char **) v->value);
    } else {
        if (v->max != ANY && value->v.val > v->max) return E_2HIGH;
        if (v->min != ANY && value->v.val < v->min) return E_2LOW;
@@ -1044,6 +1023,20 @@ int SetSysVar(char const *name, Value *value)
    return OK;
 }

+/***************************************************************/
+/*                                                             */
+/*  SetSysVar                                                  */
+/*                                                             */
+/*  Set a system variable to the indicated value.              */
+/*                                                             */
+/***************************************************************/
+int SetSysVar(char const *name, Value *value)
+{
+    SysVar *v = FindSysVar(name);
+    if (!v) return E_NOSUCH_VAR;
+    return SetSysVarHelper(v, value);
+}
+
 /***************************************************************/
 /*                                                             */
 /*  GetSysVar                                                  */
@@ -1057,6 +1050,10 @@ int GetSysVar(char const *name, Value *val)

    val->type = ERR_TYPE;
    if (!v) return E_NOSUCH_VAR;
+    if (v->type == TRANS_TYPE) {
+        return GetTranslatableVariable(v, val);
+    }
+
    if (v->type == CONST_INT_TYPE) {
        val->v.val = v->constval;
        val->type = INT_TYPE;
@@ -1163,6 +1160,15 @@ static void DumpSysVar(char const *name, const SysVar *v)
            PrintValue(&vtmp, ErrFp);
            putc('\n', ErrFp);
            DestroyValue(vtmp);
+        } else if (v->type == TRANS_TYPE) {
+            int r = GetSysVar(v->name, &vtmp);
+            if (r == OK) {
+                PrintValue(&vtmp, ErrFp);
+                putc('\n', ErrFp);
+                DestroyValue(vtmp);
+            } else {
+                fprintf(ErrFp, "Error: %s\n", GetErr(r));
+            }
        } else if (v->type == STR_TYPE) {
            vtmp.type = STR_TYPE;
            vtmp.v.str = * ((char **)v->value);
@@ -1243,11 +1249,7 @@ print_sysvar_tokens(void)
 }

 void
-get_var_hash_stats(int *total, int *maxlen, double *avglen)
+dump_var_hash_stats(void)
 {
-    struct hash_table_stats s;
-    hash_table_get_stats(&VHashTbl, &s);
-    *total = s.num_entries;
-    *maxlen = s.max_len;
-    *avglen = s.avg_len;
+    hash_table_dump_stats(&VHashTbl, ErrFp);
 }
--- a/tests/test-all-langs.sh
+++ b/tests/test-all-langs.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for i in ../include/lang/??.rem ; do
+    echo "Testing lang file: $i"
+    ../src/remind -r -q "-ii=\"$i\"" ../tests/tstlang.rem
+done
--- a/tests/test-rem
+++ b/tests/test-rem
@@ -622,6 +622,11 @@ fi
 # Torture test #2
 ../src/remind ../tests/torture2.rem >> ../tests/test.out 2>&1

+# Languages
+for i in ../include/lang/??.rem ; do
+    ../src/remind -r -q "-ii=\"$i\"" ../tests/tstlang.rem 1 Feb 2024 13:34 >> ../tests/test.out 2>&1
+done
+
 # Make sure all the include files are ok
 find ../include -type f -name '*.rem' | while read x; do ../src/remind -n $x 1 Jan 2024 2>>../tests/test.out 1>/dev/null; done
 cmp -s ../tests/test.out ../tests/test.cmp
--- a/tests/test.cmp
+++ b/tests/test.cmp
--- a/tests/test.rem
+++ b/tests/test.rem
@@ -1274,6 +1274,171 @@ set a _("meow")
 set a _("Meow")
 set a _("MEOW")

+# Check bidirectional connection between system variables and translation
+# tables
+DEBUG -x
+TRANSLATE CLEAR
+
+SET $Ago "translated-Ago"
+SET $Am "translated-Am"
+SET $And "translated-And"
+SET $At "translated-At"
+SET $Fromnow "translated-Fromnow"
+SET $Hour "translated-Hour"
+SET $Is "translated-Is"
+SET $Minute "translated-Minute"
+SET $Now "translated-Now"
+SET $On "translated-On"
+SET $Pm "translated-Pm"
+SET $Today "translated-Today"
+SET $Tomorrow "translated-Tomorrow"
+SET $Was "translated-Was"
+SET $January "translated-January"
+SET $February "translated-February"
+SET $March "translated-March"
+SET $April "translated-April"
+SET $May "translated-May"
+SET $June "translated-June"
+SET $July "translated-July"
+SET $August "translated-August"
+SET $September "translated-September"
+SET $October "translated-October"
+SET $November "translated-November"
+SET $December "translated-December"
+SET $Monday "translated-Monday"
+SET $Tuesday "translated-Tuesday"
+SET $Wednesday "translated-Wednesday"
+SET $Thursday "translated-Thursday"
+SET $Friday "translated-Friday"
+SET $Saturday "translated-Saturday"
+SET $Sunday "translated-Sunday"
+
+TRANSLATE DUMP
+
+TRANSLATE CLEAR
+TRANSLATE "ago" "otherway-Ago"
+TRANSLATE "am" "otherway-Am"
+TRANSLATE "and" "otherway-And"
+TRANSLATE "at" "otherway-At"
+TRANSLATE "from now" "otherway-Fromnow"
+TRANSLATE "hour" "otherway-Hour"
+TRANSLATE "is" "otherway-Is"
+TRANSLATE "minute" "otherway-Minute"
+TRANSLATE "now" "otherway-Now"
+TRANSLATE "on" "otherway-On"
+TRANSLATE "pm" "otherway-Pm"
+TRANSLATE "today" "otherway-Today"
+TRANSLATE "tomorrow" "otherway-Tomorrow"
+TRANSLATE "was" "otherway-Was"
+TRANSLATE "January" "otherway-January"
+TRANSLATE "February" "otherway-February"
+TRANSLATE "March" "otherway-March"
+TRANSLATE "April" "otherway-April"
+TRANSLATE "May" "otherway-May"
+TRANSLATE "June" "otherway-June"
+TRANSLATE "July" "otherway-July"
+TRANSLATE "August" "otherway-August"
+TRANSLATE "September" "otherway-September"
+TRANSLATE "October" "otherway-October"
+TRANSLATE "November" "otherway-November"
+TRANSLATE "December" "otherway-December"
+TRANSLATE "Monday" "otherway-Monday"
+TRANSLATE "Tuesday" "otherway-Tuesday"
+TRANSLATE "Wednesday" "otherway-Wednesday"
+TRANSLATE "Thursday" "otherway-Thursday"
+TRANSLATE "Friday" "otherway-Friday"
+TRANSLATE "Saturday" "otherway-Saturday"
+TRANSLATE "Sunday" "otherway-Sunday"
+
+MSG $Ago is [$Ago]%
+MSG $Am is [$Am]%
+MSG $And is [$And]%
+MSG $At is [$At]%
+MSG $Fromnow is [$Fromnow]%
+MSG $Hour is [$Hour]%
+MSG $Is is [$Is]%
+MSG $Minute is [$Minute]%
+MSG $Now is [$Now]%
+MSG $On is [$On]%
+MSG $Pm is [$Pm]%
+MSG $Today is [$Today]%
+MSG $Tomorrow is [$Tomorrow]%
+MSG $Was is [$Was]%
+MSG $January is [$January]%
+MSG $February is [$February]%
+MSG $March is [$March]%
+MSG $April is [$April]%
+MSG $May is [$May]%
+MSG $June is [$June]%
+MSG $July is [$July]%
+MSG $August is [$August]%
+MSG $September is [$September]%
+MSG $October is [$October]%
+MSG $November is [$November]%
+MSG $December is [$December]%
+MSG $Monday is [$Monday]%
+MSG $Tuesday is [$Tuesday]%
+MSG $Wednesday is [$Wednesday]%
+MSG $Thursday is [$Thursday]%
+MSG $Friday is [$Friday]%
+MSG $Saturday is [$Saturday]%
+MSG $Sunday is [$Sunday]%
+
+TRANSLATE CLEAR
+TRANSLATE DUMP
+MSG $Ago is [$Ago]%
+MSG $Am is [$Am]%
+MSG $And is [$And]%
+MSG $At is [$At]%
+MSG $Fromnow is [$Fromnow]%
+MSG $Hour is [$Hour]%
+MSG $Is is [$Is]%
+MSG $Minute is [$Minute]%
+MSG $Now is [$Now]%
+MSG $On is [$On]%
+MSG $Pm is [$Pm]%
+MSG $Today is [$Today]%
+MSG $Tomorrow is [$Tomorrow]%
+MSG $Was is [$Was]%
+MSG $January is [$January]%
+MSG $February is [$February]%
+MSG $March is [$March]%
+MSG $April is [$April]%
+MSG $May is [$May]%
+MSG $June is [$June]%
+MSG $July is [$July]%
+MSG $August is [$August]%
+MSG $September is [$September]%
+MSG $October is [$October]%
+MSG $November is [$November]%
+MSG $December is [$December]%
+MSG $Monday is [$Monday]%
+MSG $Tuesday is [$Tuesday]%
+MSG $Wednesday is [$Wednesday]%
+MSG $Thursday is [$Thursday]%
+MSG $Friday is [$Friday]%
+MSG $Saturday is [$Saturday]%
+MSG $Sunday is [$Sunday]%
+
+DEBUG +e
+set $Is "foo"
+set $Was "bar"
+TRANSLATE DUMP
+TRANSLATE "is" "is"
+TRANSLATE "was"
+TRANSLATE DUMP
+MSG $Is is [$Is]%
+MSG $Was is [$Was]%
+
+# Catch an error fixed in commit 356b562d75852dafb2ffc6b1122500a98fa7d9d0
+IF 1
+    INCLUDE /non/existent/file/should/not/work/wookie
+ENDIF
+
+do "with space.rem"
+
+DEBUG -e
+
 # Output expression-node stats
 DEBUG +s

--- a/tests/torture-test.rem
+++ b/tests/torture-test.rem
@@ -310009,3 +310009,4 @@ REM MSG Dedup-9996
 REM MSG Dedup-9997
 REM MSG Dedup-9998
 REM MSG Dedup-9999
+set $DedupeReminders 0
--- a/tests/tstlang.rem
+++ b/tests/tstlang.rem
@@ -33,9 +33,9 @@ endif

 if defined("i")
    do [i]
-#    msg INCLUDING [i]
 endif

+REM MSG Language: %(LANGID)
 # Set up a few useful definitions
 fset show(x) "%%" + x + " yields: " + char(34) + "%" + x + char(34) + "% and %%*" + x + " yields: " + char(34) + "%*" + x + char(34) + "%"
 set a trigger(today()+2) + " ++2"
@@ -856,3 +856,37 @@ msg [showmon(9)]
 msg [showmon(10)]
 msg [showmon(11)]
 msg [showmon(12)]
+
+MSG $Ago is [$Ago]%
+MSG $Am is [$Am]%
+MSG $And is [$And]%
+MSG $At is [$At]%
+MSG $Fromnow is [$Fromnow]%
+MSG $Hour is [$Hour]%
+MSG $Is is [$Is]%
+MSG $Minute is [$Minute]%
+MSG $Now is [$Now]%
+MSG $On is [$On]%
+MSG $Pm is [$Pm]%
+MSG $Today is [$Today]%
+MSG $Tomorrow is [$Tomorrow]%
+MSG $Was is [$Was]%
+MSG $January is [$January]%
+MSG $February is [$February]%
+MSG $March is [$March]%
+MSG $April is [$April]%
+MSG $May is [$May]%
+MSG $June is [$June]%
+MSG $July is [$July]%
+MSG $August is [$August]%
+MSG $September is [$September]%
+MSG $October is [$October]%
+MSG $November is [$November]%
+MSG $December is [$December]%
+MSG $Monday is [$Monday]%
+MSG $Tuesday is [$Tuesday]%
+MSG $Wednesday is [$Wednesday]%
+MSG $Thursday is [$Thursday]%
+MSG $Friday is [$Friday]%
+MSG $Saturday is [$Saturday]%
+MSG $Sunday is [$Sunday]%
--- a/tests/with
+++ b/tests/with
@@ -0,0 +1 @@
+REM MSG D'oh, a file whose name has spaces! [filename()]
Author	SHA1	Message	Date
Dianne Skoll	078dba1e98	Prepare for 05.02.01 release. All checks were successful Remind unit tests / tests (push) Successful in 28s Details	2024-12-16 19:37:31 -05:00
Dianne Skoll	8ebec9584c	Fix incorrect comparison code.	2024-12-16 19:33:41 -05:00
Dianne Skoll	2504b39be2	Remove const qualifier. All checks were successful Remind unit tests / tests (push) Successful in 32s Details	2024-12-16 17:10:45 -05:00
Dianne Skoll	e394f402f8	Set release date. All checks were successful Remind unit tests / tests (push) Successful in 32s Details	2024-12-16 09:31:02 -05:00
Dianne Skoll	5a2914f6c7	Start hash tables with 7 buckets instead of 17; print more detailed hash stats with -ds; consistently use ErrFp instead of stderr All checks were successful Remind unit tests / tests (push) Successful in 32s Details	2024-12-14 11:52:16 -05:00
Dianne Skoll	a19b009f7c	Fix man page typo and cppcheck warnings. All checks were successful Remind unit tests / tests (push) Successful in 32s Details	2024-12-13 15:22:46 -05:00
Dianne Skoll	6373ae8ca5	Update release notes.	2024-12-13 15:08:54 -05:00
Dianne Skoll	b8c4786b33	Allow INCLUDE/DO/SYSINCLUDE to take a QuotedString argument. This allows for filenames with spaces in them.	2024-12-13 10:38:34 -05:00
Dianne Skoll	4e7cfc20ce	Make use of SYSINCLUDE. All checks were successful Remind unit tests / tests (push) Successful in 32s Details	2024-12-13 08:28:14 -05:00
Dianne Skoll	0c9a35a584	Add SYSINCLUDE to release notes.	2024-12-13 08:22:43 -05:00
Dianne Skoll	5e333f6162	Add the SYSINCLUDE directive.	2024-12-13 08:18:22 -05:00
Dianne Skoll	af8b4e6df1	Add const qualifier on Sysvar.value. All checks were successful Remind unit tests / tests (push) Successful in 44s Details	2024-12-12 20:27:54 -05:00
Dianne Skoll	3fa798523a	Document the difference between %(foo) and [_("foo")]	2024-12-12 16:56:38 -05:00
Dianne Skoll	53001f9fbc	Update WHATSNEW	2024-12-12 16:48:53 -05:00
Dianne Skoll	9cd76eae84	Fix typo	2024-12-12 16:47:34 -05:00
Dianne Skoll	c8295b6251	Convert files we ship to use %(foo) in place of [_("foo")]	2024-12-12 16:43:30 -05:00
Dianne Skoll	3c95245407	In the substitution filter, make %(foo) equivalent to [_("foo")]	2024-12-12 16:35:31 -05:00
Dianne Skoll	3362c7226c	Add regression test for commit `356b562d75` All checks were successful Remind unit tests / tests (push) Successful in 31s Details	2024-12-12 12:17:15 -05:00
Dianne Skoll	356b562d75	Fix logic error in resetting IF flags and Popfile interaction.	2024-12-12 12:14:29 -05:00
Dianne Skoll	6eebcdc39d	Handle error return from GetSysVar.	2024-12-12 11:58:27 -05:00
Dianne Skoll	5a80d63060	Add localization tests.	2024-12-12 11:55:07 -05:00
Dianne Skoll	c7ca1b4baa	Get rid of the DyamicFoo hacks and make most translatable variables live in the translation table.	2024-12-12 11:43:03 -05:00
Dianne Skoll	dc89a6fba9	Eliminate unnecessary test.	2024-12-12 10:12:50 -05:00
Dianne Skoll	f83fec5563	Add missing three Chinese New Year animals.	2024-12-12 09:55:30 -05:00
Dianne Skoll	9c38161430	Merge branch 'translation_de' into 'master' Add German translations See merge request dskoll/remind!8	2024-12-12 14:53:21 +00:00
Jochen Sprickerhof	68f5fe1d10	Add German translations Based on nl.rem	2024-12-12 12:51:38 +01:00
Dianne Skoll	bc7c57e53b	Add another translation-propagation test. All checks were successful Remind unit tests / tests (push) Successful in 27s Details	2024-12-11 20:10:11 -05:00
Dianne Skoll	88aacb3905	Get two-way propagation working properly.	2024-12-11 20:08:09 -05:00
Dianne Skoll	a894076bfc	Verify two-way correspondence between translation table and system variables.	2024-12-11 19:48:19 -05:00
Dianne Skoll	82e068fcca	Refactor SetSysVar.	2024-12-11 19:22:30 -05:00
Dianne Skoll	a119d97539	Make mapping between translatable system variables and TRANSLATE table table-driven.	2024-12-11 19:15:44 -05:00
Dianne Skoll	01afb63a3d	Sent translations with only the first month, in a multi-month (-pN) output.	2024-12-11 18:07:48 -05:00
Dianne Skoll	54fccabdfe	Escape the result of translation, in case a bad translation file includes HTML special characters.	2024-12-11 17:15:01 -05:00
Dianne Skoll	ba4d44664f	Clarify docs. All checks were successful Remind unit tests / tests (push) Successful in 34s Details	2024-12-11 15:36:17 -05:00
Dianne Skoll	d76c5499b5	Document how translation table is passed to back-ends.	2024-12-11 15:35:31 -05:00
Dianne Skoll	84e8244e48	Use localized names for "Full Moon", etc.	2024-12-11 15:35:23 -05:00
Dianne Skoll	92a6115a5c	Send the translation table to back-ends.	2024-12-11 15:24:37 -05:00
Dianne Skoll	b98e336e9e	Tweak release notes.	2024-12-11 14:02:30 -05:00
				`@@ -0,0 +1 @@`
				`REM MSG D'oh, a file whose name has spaces! [filename()]`