Update docs/WHATSNEW.

Nicer readline prompts.
Silence unused variable warning.
2026-04-16 14:28:40 +02:00 · 2025-10-08 09:42:42 -04:00 · 2025-10-07 23:38:12 -04:00 · 2025-10-07 23:23:10 -04:00 · 2025-10-07 23:21:37 -04:00 · 2025-10-07 23:14:15 -04:00
702 changed files with 636285 additions and 12301 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +0,0 @@
-
-liberapay: dskoll
--- a/.github/README.md
+++ b/.github/README.md
@@ -1,7 +0,0 @@
-# Remind has moved
-
-For various reasons, I have decided to move Remind off GitHub.  This repo
-will be archived.  To create merge requests or issues, please visit
-Remind's new home at https://salsa.debian.org/dskoll/remind
-
-- Dianne Skoll
--- a/.github/workflows/github-action.yml
+++ b/.github/workflows/github-action.yml
@@ -1,29 +0,0 @@
-# language: bash
---
-
-name: Remind unit tests
-
-on:
-  push
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Remind
-        uses: actions/checkout@v2
-      - name: Add test user
-        run: |
-          sudo adduser --home /home/testuser --gecos 'Test User' --disabled-password testuser
-      - name: Fix ownership
-        run: |
-          sudo chown -R testuser .
-      - name: Build
-        run: |
-          sudo su -c './configure && make' testuser
-      - name: Run Tests
-        run: |
-          sudo su -c 'make test' testuser
-      - name: Fix up permissions so GitHub does not complain
-        run: |
-          sudo chmod -R a+rwX .
--- a/.gitignore
+++ b/.gitignore
@@ -4,12 +4,12 @@
 .gitignore
 MYMETA.json
 MYMETA.yml
-Makefile
 TAGS
 autom4te.cache
 blib/
 config.log
 config.status
+gmon.out
 man/rem.1
 man/rem2ps.1
 man/remind.1
@@ -18,12 +18,12 @@ pm_to_blib
 rem2html/Makefile
 rem2html/rem2html
 rem2html/rem2html.1
+rem2pdf/Makefile
 rem2pdf/Makefile.PL
 rem2pdf/Makefile.old
 rem2pdf/Makefile.top
 rem2pdf/bin/rem2pdf
 scripts/tkremind
-set-irc-topic
 src/*.tar.gz*
 src/Makefile
 src/config.h
@@ -31,7 +31,9 @@ src/rem2ps
 src/remind
 src/test-*.out
 src/version.h
-tests/test.out
-www/Makefile
-gmon.out
+src/xlat.c
 tests/once.timestamp
+tests/test.out
+tests/tz.out
+www/Makefile
+_cppcheck
--- a/2
+++ b/2
@@ -3,7 +3,7 @@ THE REMIND COPYRIGHT
 1. REMIND refers to the entire set of files and documentation in the
 REMIND package.

-2. REMIND is Copyright 1992-2024 Dianne Skoll, except where noted in
+2. REMIND is Copyright (C) 1992-2025 Dianne Skoll, except where noted in
 individual files.

 3. DISTRIBUTION AND USE
--- a/21
+++ b/21
@@ -23,8 +23,7 @@ install:
 	@$(MAKE) -C rem2html install
 	@$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE)
 clean:
-	find . -name '*~' -exec rm {} \;
-	-rm man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind
+	-find . -name '*~' -exec rm {} \;
 	-$(MAKE) -C src clean
 	-$(MAKE) -C rem2pdf clean

@@ -40,11 +39,23 @@ install-stripped:
 	@$(MAKE) -C rem2html install
 	@$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE)

-test:
-	@$(MAKE) -C src -s test
+test: test-basic test-tz
+
+test-tz:
+	@$(MAKE) -C src -s all
+	@$(MAKE) -C src -s test-tz
+
+test-basic:
+	@$(MAKE) -C src -s all
+	@$(MAKE) -C src -s test-basic
+
+cppcheck:
+	@$(MAKE) -C src cppcheck

 distclean: clean
-	rm -f config.cache config.log config.status src/Makefile src/config.h tests/test.out www/Makefile rem2pdf/Makefile.top rem2pdf/Makefile.old rem2pdf/Makefile rem2pdf/Makefile.PL rem2pdf/bin/rem2pdf rem2html/rem2html
+	-rm -f config.cache config.log config.status src/Makefile src/version.h src/config.h tests/test.out tests/tz.out www/Makefile rem2pdf/Makefile.top rem2pdf/Makefile.old rem2pdf/Makefile rem2pdf/Makefile.PL rem2pdf/bin/rem2pdf rem2html/rem2html
+	-rm -f man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind
+	-rm -rf autom4te.cache rem2html/Makefile rem2html/rem2html.1

 src/Makefile: src/Makefile.in
 	./configure
--- a/78
+++ b/78
@@ -1,78 +0,0 @@
-				REMIND
-
-Remind is a full-featured calendar/alarm program.  Copying policy is
-in the file "COPYRIGHT" in this directory.
-
-Installation notes for various operating systems are in "docs".  See
-the appropriate README file for installation on your system.
-
-Manual pages are in "man".
-
-----------------------------------------------------------------------------
-
-Quick UNIX installation instructions for the very impatient:
-
-If you have Tcl/Tk (wish 4.1 or higher) installed and are running X Windows:
--------------------------------------------------------------
-
-1) Type: wish ./build.tk from this directory.  Fill in the various
-   options and hit "Build Remind"
-
-2) Type: "make install" -- you may need to be root to do this.
-
-If you do NOT have Tcl/Tk or are NOT running X Windows:
-------------------------------------------------------
-
-1) Edit the file "src/custom.h" according to your preferences.
-
-2) Edit the file "src/lang.h" to choose a language.
-
-3) Type: "./configure"  (You can supply options; type "./configure --help"
-   for details.)
-
-4) Type: "make"
-
-5) Type: "make install" -- you may need to be root to do this.
-
-PREREQUISITES:
--------------
-
-Remind and rem2ps have no prerequisites beyond the standard C library and
-the standard math library.
-
-Rem2HTML requires the JSON::MaybeXS Perl module.
-Rem2PDF requires the JSON::MaybeXS, Pango and Cairo Perl modules.
-
- On Debian-like systems, these prerequisites may be installed with:
-
-    apt install libjson-maybexs-perl libpango-perl libcairo-perl
-
- On RPM-based systems, you need perl-Pango, perl-Cairo and perl-JSON-MaybeXS
-
- On Gentoo, you need dev-perl/Pango, dev-perl/Cairo and dev-perl/JSON-MaybeXS.
-
- On Arch linux, you need pango-perl, cairo-perl and perl-json-maybexs
-
-TkRemind requires Tcl/Tk and the tcllib library.
-
- On Debian-like systems, install with:
-
-    apt install tcl tk tcllib
-
- On RPM-based systems, you need tcl, tk and tcllib
-
- On Arch Linux, you need tk and tcllib.  The latter is available at
-  https://aur.archlinux.org/packages/tcllib
-
-If the little arrows for "Previous Month" and "Next Month" do not display
-correctly in TkRemind, you may need to install the Noto Fonts.  Install
-all of your distribution's Nonto Font-related packages.
-
- On Debian-like systems, install with:
-
-    apt install fonts-noto-core fonts-noto-color-emoji \
-        fonts-noto-extra fonts-noto-ui-core fonts-noto-ui-extra
-
-==========================================================================
-Contact info: mailto:dianne@skoll.ca
-Home page:    https://dianne.skoll.ca/projects/remind/
--- a/README.md
+++ b/README.md
@@ -0,0 +1,110 @@
+# REMIND
+
+Remind is a full-featured calendar/alarm program.  Copying policy is
+in the file "COPYRIGHT" included with the source; Remind is licensed under
+the GNU General Public License, Vesion 2.
+
+## Prerequisites:
+
+### Remind and Rem2PS
+
+**remind** and **rem2ps** have no prerequisites beyond the standard C
+library and the standard math library.  **remind** will make use of
+GNU Readline if you have it installed.
+
+- On Debian-like systems, install GNU Readline as follows:
+
+    `apt install libreadline-dev`
+
+- On RPM-based systems, you need `readline-devel`
+
+### Rem2HTML and Rem2PDF
+
+**rem2html** requires the JSON::MaybeXS Perl module and **rem2pdf**
+requires the JSON::MaybeXS, Pango and Cairo Perl modules.
+
+- On Debian-like systems, these prerequisites may be installed with:
+
+    `apt install libjson-maybexs-perl libpango-perl libcairo-perl`
+
+- On RPM-based systems, you need `perl-Pango`, `perl-Cairo` and
+  `perl-JSON-MaybeXS`
+
+- On Gentoo, you need `dev-perl/Pango`, `dev-perl/Cairo` and
+  `dev-perl/JSON-MaybeXS`.
+
+- On Arch linux, you need `pango-perl`, `cairo-perl` and `perl-json-maybexs`
+
+### TkRemind
+
+**tkremind** requires Tcl/Tk and the tcllib library.
+
+- On Debian-like systems, install with:
+
+    `apt install tcl tk tcllib`
+
+- On RPM-based systems, you need `tcl`, `tk` and `tcllib`
+
+- On Arch Linux, you need `tk` and `tcllib`.  The latter is available at
+  https://aur.archlinux.org/packages/tcllib
+
+If the little arrows for "Previous Month" and "Next Month" do not display
+correctly in TkRemind, you may need to install the Noto Fonts.  Install
+all of your distribution's Noto Font-related packages.
+
+- On Debian-like systems, install with:
+
+    `apt install fonts-noto-core fonts-noto-color-emoji fonts-noto-extra fonts-noto-ui-core fonts-noto-ui-extra`
+
+## Installation
+
+Assuming you have a normal C development environment installed, Remind
+can be installed with the usual:
+
+`./configure && make && make test && sudo make install`
+
+You can edit custom.h to configure some aspects of Remind.  Or, if
+you have Tcl/Tk installed, you can use the graphical build tool to
+edit custom.h on your behalf:
+
+`wish ./build.tk`
+
+## Usage
+
+Remind is a large and complex program.  You can read the full manual page
+with:
+
+`man remind`
+
+after installation.  However, the man page is long and detailed and is
+more of a reference than an introduction.  You can get an overview
+with a [slide deck](https://dianne.skoll.ca/projects/remind/download/remind-oclug.pdf)
+I made a while back.  There's also a (long) [YouTube video](https://www.youtube.com/watch?v=0SNgvsDvx7M) that serves as an
+introduction to Remind.
+
+## A Note about AI
+
+1. No part of Remind was written using AI of any type.<br><br>
+I certify that all of the C, Perl and Tcl code in Remind was written
+by a human being.  I certify that all code in `.rem` files other than
+ones under `include/holidays` was written by a human being.  The code
+under `include/holidays` was derived from the Python "holidays" library
+and I have no direct knowledge of the provenance of that library,
+though I suspect it's entirely or almost entirely human-written.
+
+2. No AI-generated patches or other sorts of contributions to Remind
+will be accepted.
+
+3. Remind's source code may not be used to train an AI model,
+including an LLM model, unless all of the output of said model is
+released under the GNU General Public License, version 2.  If you use
+any of Remind's source code to train your model, then anything that
+the model produces is a derived product of Remind and must be licensed
+under the same terms as Remind.
+
+---
+
+Contact info: dianne@skoll.ca
+
+Home page:    [https://dianne.skoll.ca/projects/remind/](https://dianne.skoll.ca/projects/remind/)
+
--- a/build.tk
+++ b/build.tk
@@ -8,7 +8,7 @@
 #   A cheesy graphical front-end for building and installing REMIND.
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-2018 Dianne Skoll
+#   Copyright (C) 1992-2025 Dianne Skoll
 #
 #--------------------------------------------------------------

@@ -40,7 +40,6 @@ proc SetConfigDefaults {} {
    set Config(TIMESEP) ":"
    set Config(NORTHERN_HEMISPHERE) 1
    set Config(WESTERN_HEMISPHERE) 1
-    set Config(LANGUAGE) "English"
    set Config(INST_DIR) "/usr/local/bin"
    set Config(MAN_DIR) "/usr/local/share/man"
 }
@@ -242,32 +241,6 @@ proc CreateOptionsDialog { w } {

    grid configure $w.timelabel -row 2 -column 0 -sticky e
    grid configure $w.time -row 2 -column 1 -sticky nsew
-
-    label $w.langlabel -text "Language: "
-    menubutton $w.lang -text $Config(LANGUAGE) -indicatoron 1 -relief raised \
-	    -menu $w.lang.menu
-    menu $w.lang.menu -tearoff 0
-    foreach lang {
-	"Brazilian Portuguese"
-	"Danish"
-	"Dutch"
-	"English"
-	"Finnish"
-	"French"
-	"German"
-	"Italian"
-	"Norwegian"
-	"Polish"
-	"Romanian"
-        "Spanish"
-	"Icelandic"
-    } {
-	$w.lang.menu add command -label $lang -command [list $w.lang configure -text $lang]
-    }
-
-    grid configure $w.langlabel -row 3 -column 0 -sticky e
-    grid configure $w.lang -row 3 -column 1 -sticky nsew
-
 }

 #***********************************************************************
@@ -491,32 +464,16 @@ proc CreateCustomH {} {
 # %RETURNS:
 #  Nothing
 # %DESCRIPTION:
-#  Runs "make" with appropriate language definitions
+#  Runs "make"
 #***********************************************************************
 proc CallMake {} {
    global Options
-    set lang [$Options.lang cget -text]
-    switch -- $lang {
-	"German"               { set lang GERMAN }
-	"Dutch"                { set lang DUTCH }
-	"Finnish"              { set lang FINNISH }
-	"French"               { set lang FRENCH }
-	"Norwegian"            { set lang NORWEGIAN }
-	"Danish"               { set lang DANISH }
-	"Polish"               { set lang POLISH }
-	"Brazilian Portuguese" { set lang BRAZPORT }
-	"Italian"              { set lang ITALIAN }
-	"Romanian"             { set lang ROMANIAN }
-        "Spanish"              { set lang SPANISH }
-	"Icelandic"            { set lang ICELANDIC }
-	default                { set lang ENGLISH }
-    }
    set nproc 0
    catch { set nproc [exec nproc] }
    if { $nproc != 0 } {
-        RunCommand "make -j $nproc \"LANGDEF=-DLANG=$lang\""
+        RunCommand "make -j $nproc"
    } else {
-        RunCommand "make \"LANGDEF=-DLANG=$lang\""
+        RunCommand "make"
    }
 }

@@ -530,7 +487,7 @@ proc CallMake {} {
 #    Michael McLennan, Bell Labs Innovations for Lucent Technologies
 #    Addison-Wesley Professional Computing Series
 # ======================================================================
-#  Copyright (c) 1996-1997  Lucent Technologies Inc. and Mark Harrison
+#  Copyright (C) 1996-1997  Lucent Technologies Inc. and Mark Harrison
 # ======================================================================

 option add *Tabnotebook.tabs.background #666666 widgetDefault
@@ -644,7 +601,7 @@ proc tabnotebook_display {win name} {
 #    Michael McLennan, Bell Labs Innovations for Lucent Technologies
 #    Addison-Wesley Professional Computing Series
 # ======================================================================
-#  Copyright (c) 1996-1997  Lucent Technologies Inc. and Mark Harrison
+#  Copyright (C) 1996-1997  Lucent Technologies Inc. and Mark Harrison
 # ======================================================================

 option add *Notebook.borderWidth 2 widgetDefault
@@ -786,7 +743,6 @@ proc SetConfigFromRemind {} {
    QueryRemind $rem LOCATION {$Location}
    QueryRemind $rem DATESEP {$DateSep}
    QueryRemind $rem TIMESEP {$TimeSep}
-    QueryRemind $rem LANGUAGE {language()}

    set $Config(LAT_MIN) [expr abs($Config(LAT_MIN))]
    set $Config(LAT_SEC) [expr abs($Config(LAT_SEC))]
--- a/804
+++ b/804
--- 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, 06.01.04, , , https://dianne.skoll.ca/projects/remind/)
 AC_CONFIG_SRCDIR([src/queue.c])

 cat <<'EOF'
@@ -30,7 +30,8 @@ AC_PATH_PROG([PERL], [perl])

 dnl Checks for libraries.
 AC_CHECK_LIB(m, sqrt)
-AC_CHECK_HEADERS_ONCE([sys/time.h stdint.h])
+AC_CHECK_LIB(readline, readline)
+AC_CHECK_HEADERS_ONCE([sys/time.h stdint.h readline/readline.h readline/history.h])

 dnl Integer sizes
 AC_CHECK_SIZEOF(unsigned int)
@@ -84,7 +85,7 @@ if test "$?" != 0 ; then
    echo "*** COULD NOT DETERMINE RELEASE DATE: docs/WHATSNEW is incorrect!"
    exit 1
 fi
-AC_CHECK_FUNCS(strdup strcasecmp strncasecmp setenv unsetenv glob mbstowcs setlocale initgroups inotify_init1)
+AC_CHECK_FUNCS(strdup strcasecmp strncasecmp setenv unsetenv glob mbstowcs setlocale initgroups inotify_init1 readline)

 VERSION=$PACKAGE_VERSION
 CONFIG_CMD="$0$ac_configure_args_raw"
--- a/contrib/remind-conf-mode/remind-conf-mode.el
+++ b/contrib/remind-conf-mode/remind-conf-mode.el
@@ -110,14 +110,17 @@
 (defconst remind-keywords
  (sort
   (list "ADDOMIT" "AFTER" "AT" "BAN" "BANNER" "BEFORE" "CAL" "CLEAR"
-         "CLEAR-OMIT-CONTEXT" "DEBUG" "DO" "DUMP" "DUMPVARS" "DURATION" "ELSE"
-         "ENDIF" "ERRMSG" "EXIT" "EXPR" "FIRST" "FLUSH" "FOURTH" "FRENAME" "FROM" "FSET"
-         "FUNSET" "IF" "IFTRIG" "IN" "INC" "INCLUDE" "INCLUDECMD" "LAST"
-         "LASTDAY" "LASTWORKDAY" "MAYBE" "MAYBE-UNCOMPUTABLE" "MSF" "MSG"
-         "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")
+         "CLEAR-OMIT-CONTEXT" "COMPLETE-THROUGH" "DEBUG" "DO" "DUMP" "DUMPVARS"
+         "DURATION" "ELSE" "ENDIF" "ERRMSG" "EXIT" "EXPR" "FIRST"
+         "FLUSH" "FOURTH" "FRENAME" "FROM" "FSET" "FUNSET" "IF"
+         "IFTRIG" "IN" "INC" "INCLUDE" "INCLUDECMD" "INFO" "LAST"
+         "LASTDAY" "LASTWORKDAY" "MAX-OVERDUE" "MAYBE" "MAYBE-UNCOMPUTABLE" "MSF"
+         "MSG" "NOQUEUE" "OMIT" "OMITFUNC" "ONCE" "POP"
+         "POP-OMIT-CONTEXT" "POP-FUNCS" "POP-VARS" "PRESERVE" "PRIORITY" "PS"
+         "PSFILE" "PUSH" "PUSH-FUNCS" "PUSH-VARS" "PUSH-OMIT-CONTEXT" "REM" "RETURN"
+         "RUN" "SATISFY" "SCAN" "SCANFROM" "SCHED" "SECOND" "SET"
+         "SKIP" "SPECIAL" "SYSINCLUDE" "TAG" "THIRD" "THROUGH" "TODO"
+         "TRANSLATE" "TRANS" "TZ" "UNSET" "UNTIL" "WARN")
   #'(lambda (a b) (> (length a) (length b)))))


@@ -129,13 +132,13 @@
 (defconst remind-builtin-variables
  (sort
   (list " $AddBlankLines" "$Ago" "$Am" "$And" "$April" "$At" "$August"
-         "$CalcUTC" "$CalMode" "$Daemon" "$DateSep" "$DateTimeSep" "$December"
-         "$DedupeReminders" "$DefaultColor" "$DefaultDelta"
+         "$CalcUTC" "$CalMode" "$CalType" "$Daemon" "$DateSep" "$DateTimeSep"
+         "$December" "$DedupeReminders" "$DefaultColor" "$DefaultDelta"
         "$DefaultPrio" "$DefaultTDelta" "$DeltaOverride"
         "$DontFork" "$DontQueue" "$DontTrigAts" "$EndSent" "$EndSentIg"
         "$ExpressionTimeLimit" "$February" "$FirstIndent" "$FoldYear"
-         "$FormWidth" "$Friday" "$Fromnow" "$Hour" "$Hplu" "$HushMode"
-         "$IgnoreOnce" "$InfDelta" "$IntMax" "$IntMin" "$Is" "$January" "$July"
+         "$FormWidth" "$Friday" "$Fromnow" "$HideCompletedTodos" "$Hour" "$Hplu" "$HushMode"
+         "$IgnoreOnce" "$InfDelta" "$IntMax" "$IntMin" "$Is" "$January" "$JSONMode" "$July"
         "$June" "$LatDeg" "$Latitude" "$LatMin" "$LatSec" "$Location"
         "$LongDeg" "$Longitude" "$LongMin" "$LongSec" "$March" "$MaxFullOmits"
         "$MaxLateMinutes" "$MaxPartialOmits" "$MaxSatIter" "$MaxStringLen"
@@ -144,11 +147,11 @@
         "$NumTrig" "$October" "$On" "$OnceFile" "$ParseUntriggered" "$Pm"
         "$PrefixLineNo" "$PSCal" "$RunOff" "$Saturday" "$September"
         "$SimpleCal" "$SortByDate" "$SortByPrio" "$SortByTime" "$SubsIndent"
-         "$Sunday" "$SuppressImplicitWarnings" "$SuppressLRM" "$SysInclude" "$T" "$Td"
-         "$TerminalBackground" "$Thursday" "$TimeSep" "$Tm" "$Today"
+         "$Sunday" "$SuppressImplicitWarnings" "$SuppressLRM" "$SysInclude" "$T" "$Tb" "$Td"
+         "$TerminalBackground" "$Thursday" "$TimeSep" "$TimetIs64bit" "$Tm" "$Today" "$TodoFilter"
         "$Tomorrow" "$Tt" "$Tuesday" "$Tw" "$Ty" "$U" "$Ud" "$Um"
         "$UntimedFirst" "$Use256Colors" "$UseBGVTColors" "$UseTrueColors"
-         "$UseVTColors" "$Uw" "$Uy" "$Was" "$Wednesday")
+         "$UseVTColors" "$Uw" "$Uy" "$WarningLevel" "$Was" "$Wednesday")
   #'(lambda (a b) (> (length a) (length b)))))

 (defconst remind-time-words
@@ -163,23 +166,26 @@
 (defconst remind-builtin-functions
  (sort
   (list "_" "abs" "access" "adawn" "adusk" "ampm" "ansicolor" "args" "asc"
-         "baseyr" "char" "choose" "coerce" "columns" "current" "date"
+         "baseyr" "catch" "catcherr" "char" "choose" "codepoint" "coerce" "columns" "const" "current" "date"
         "datepart" "datetime" "dawn" "day" "daysinmon" "defined" "dosubst"
-         "dusk" "easterdate" "evaltrig" "filedate" "filedatetime" "filedir"
-         "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear" "hour"
-         "htmlescape" "htmlstriptags" "iif" "index" "isany" "isdst" "isleap"
-         "isomitted" "language" "localtoutc" "lower" "max" "min" "minsfromutc"
-         "minute" "mon" "monnum" "moondate" "moondatetime" "moonphase"
-         "moontime" "multitrig" "ndawn" "ndusk" "nonomitted" "now" "ord"
-         "orthodoxeaster" "ostype" "pad" "plural" "psmoon" "psshade"
-         "realcurrent" "realnow" "realtoday" "rows" "sgn" "shell" "shellescape"
-         "slide" "soleq" "stdout" "strlen" "substr" "sunrise" "sunset" "time"
-         "timepart" "timezone" "today" "trig" "trigback" "trigdate"
-         "trigdatetime" "trigdelta" "trigduration" "trigeventduration"
-         "trigeventstart" "trigfrom" "trigger" "trigpriority" "trigrep"
-         "trigscanfrom" "trigtags" "trigtime" "trigtimedelta" "trigtimerep"
+         "dusk" "easterdate" "escape" "eval" "evaltrig" "filedate" "filedatetime"
+         "filedir" "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear" "hex"
+         "hour" "htmlescape" "htmlstriptags" "iif" "index" "isany" "isconst" "isdst"
+         "isleap" "isomitted" "language" "localtoutc" "lower" "max"
+         "mbasc" "mbindex" "mbstrlen" "mbsubstr" "min"
+         "minsfromutc" "minute" "mon" "monnum" "moondate" "moondatetime"
+         "moonphase" "moonrise" "moonrisedir" "moonset" "moonsetdir" "moontime"
+         "multitrig" "ndawn" "ndusk" "nonconst" "nonomitted" "now" "ord" "orthodoxeaster"
+         "ostype" "pad" "plural" "psmoon" "psshade" "realcurrent" "realnow"
+         "realtoday" "rows" "sgn" "shell" "shellescape" "slide" "soleq"
+         "stdout" "strlen" "substr" "sunrise" "sunset" "time" "timepart"
+         "timezone" "today" "trig" "trigback" "trigbase" "trigcompletethrough" "trigdate" "trigdatetime"
+         "trigdelta" "trigduration" "trigeventduration" "trigeventstart" "trigeventstarttz"
+         "trigfrom" "trigger" "triginfo" "trigistodo" "trigmaxoverdue" "trigpriority" "trigrep"
+         "trigscanfrom" "trigtags" "trigtime" "trigtimedelta" "trigtimerep" "trigtimetz" "trigtz"
         "triguntil" "trigvalid" "typeof" "tzconvert" "upper" "utctolocal"
-         "value" "version" "weekno" "wkday" "wkdaynum" "year")
+         "value" "version" "weekno" "wkday" "wkdaynum" "year"
+         )
   #'(lambda (a b) (> (length a) (length b)))))

 ;;; faces
@@ -188,21 +194,21 @@
 (defvar remind-conf-command-face 'remind-conf-command-face
  "Remind commands.")
 (defface remind-conf-command-face
-  '((t :foreground "SeaGreen4" :bold t))
+  '((t :foreground "#FF8080"))
  "Font Lock mode face used to highlight commands."
  :group 'remind-conf)

 (defvar remind-conf-keyword-face 'remind-conf-keyword-face
  "Remind keywords.")
 (defface remind-conf-keyword-face
-  '((t :foreground "blue violet"))
+  '((t :foreground "#FFFF80"))
  "Font Lock mode face used to highlight keywords."
  :group 'remind-conf)

 (defvar remind-conf-substitutes-face 'remind-conf-substitutes-face
  "Remind substitutes.")
 (defface remind-conf-substitutes-face
-  '((t :foreground "blue2"))
+  '((t :foreground "#8080FF"))
  "Font Lock mode face used to highlight substitutes."
  :group 'remind-conf)

@@ -216,7 +222,7 @@
 (defvar remind-conf-variable-face 'remind-conf-variable-face
  "Remind variable.")
 (defface remind-conf-variable-face
-  '((t :foreground "DeepPink2" :bold t))
+  '((t :foreground "#FF8080" :bold t))
  "Font Lock mode face used to highlight commands."
  :group 'remind-conf)

@@ -237,14 +243,14 @@
 (defvar remind-comment-face 'remind-comment-face
  "Remind comments.")
 (defface remind-comment-face
-  '((t :foreground "brown"))
+  '((t :foreground "#FF7F24"))
  "Font-lock face for highlighting comments."
  :group 'remind-conf)

 (defvar remind-string-face 'remind-string-face
  "Remind strings.")
 (defface remind-string-face
-  '((t :foreground "tomato"))
+  '((t :foreground "#FF7FE0"))
  "Font lock mode face used to highlight strings."
  :group 'remind-conf)

@@ -296,11 +302,11 @@
 (defconst remind-conf-font-lock-keywords-1
  (list
   '("^\s*[\;\#].*$" . remind-comment-face)
+   '("\"[^\"]*\"" . remind-string-face)
   '(remind-keywords-matcher . remind-conf-keyword-face)
   '("%[\"_]" . font-lock-warning-face)
-   '("\\(%[a-mops-w]\\)" . remind-conf-substitutes-face)
-   '("\"[^\"]*\"" . remind-string-face))
-  "Minimal font-locking for `remind-conf-mode'.")
+   '("\\(%[a-z]\\)" . remind-conf-substitutes-face)
+  "Minimal font-locking for `remind-conf-mode'."))

 (defconst remind-conf-font-lock-keywords-2
  (append remind-conf-font-lock-keywords-1
--- a/docs/README.UNIX
+++ b/docs/README.UNIX
@@ -1,6 +1,6 @@
-REMIND version 3.2 for UNIX
+Remind for UNIX and Linux

-REMIND is a sophisticated alarm/calendar program.  Details are given
+Remind is a sophisticated alarm/calendar program.  Details are given
 in the man page, "remind.1".

 INSTALLING REMIND:
@@ -19,88 +19,13 @@ If you do NOT have Tcl/Tk or are NOT running X11:

 1) Edit the file "src/custom.h" according to your preferences.

-2) Edit the file "src/lang.h" to choose a language.
+2) Type: "make"

-3) Type: "make"
-
-4) Type: "make install" -- you may need to be root to do this.
+3) Type: "make install" -- you may need to be root to do this.

 The subdirectory "www" contains scripts for making a nice calendar
 web server.  See the files README and Makefile in that directory.

-The file "examples/defs.rem" has some sample Remind definitions and
-commands, as well as U.S. and Jewish holidays.
-
-OTHER LANGUAGE SUPPORT
-
-Remind has support for languages other than English.  See the file
-"src/lang.h" for details.  The language support may vary - you can change
-only the substitution filter, or you can translate all of the usage
-instructions and error messages as well.  See "src/langs/french.h" for an
-example of the latter.
-
-To compile Remind for a non-english language, look at the constants
-defined in "src/lang.h".  Then, to compile Remind for Italian (as an
-example), type:
-
-	make "LANGDEF=-DLANG=ITALIAN"
-
-If you add support for a non-English language, Remind will accept both the
-English and non-English names of months and weekdays in an input script.
-However, you should not rely on this feature if you want to write portable
-Remind scripts.
-
-At a minimum, you should support month and day names in the foreign
-language, and should modify the substitution filter appropriately.
-If you are truly diligent, you can translate usage and error messages
-too.
-
-Take a look at the files "src/langs/english.h" and
-"src/langs/german.h" if you want to add support for your favourite
-language.  If you do add another language to Remind, please let me
-know!  Here are the basic guidelines:
-
- Your language file should be called "src/langs/lxxx.h", where lxxx
-  is the first 8 characters of the ENGLISH name of your language.
-
- Your language file should define L_LANGNAME to be the full English
-  name of your language, with the first letter capitalized and the rest
-  lower-case.
-
- You can test your language file with the script "tests/tstlang.rem"
-
- Your localized strings must be encoded using UTF-8.
-
-RELEASE NOTES -- miscellaneous info that couldn't go anywhere else!
-
-1. POPUP REMINDERS
-
-If you're running under X11 and you have the Tcl tools, you can create
-simple pop-up reminders by creating the following Tcl script called
-'popup'.  It pops a message on to the screen and waits for you to
-press the 'OK' button.  If you don't press the OK button within 15
-seconds, it exits anyway.  To use it, you can use the '-k' option for
-Remind as follows:
-
-	remind "-kpopup '%s'&" .reminders
-
-Or use the following in your Remind script:
-
-	REM AT 17:00 RUN popup 'Time to go home.' &
-
-This Tcl script is a slightly modified version of one submitted by
-Norman Walsh.
-
-------------- Cut Here ---------- Cut Here ---------- Cut Here -------------
-#!/usr/local/bin/wish
-wm withdraw .
-after 15000 { destroy . ; exit }
-tk_messageBox -message Message -detail $argv -icon info -type ok
-destroy .
-exit
-------------- Cut Here ---------- Cut Here ---------- Cut Here -------------
-
-
 --
 Dianne Skoll <dianne@skoll.ca>
 https://dianne.skoll.ca/projects/remind/
--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
@@ -1,26 +1,585 @@
 CHANGES TO REMIND

-* VERSION 5.2 Patch 0 - ????-??=??
+* VERSION 6.1 Patch 4 - 2025-10-08

- 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: In calendar mode, reminders that specify a TZ zone
+  that is *behind* the system time zone could sometimes not show up.
+  The bug has been fixed; thanks to Jin Chen for reporting it.
+
+- CHANGE: remind: Any time Remind runs another program (for example,
+  in response to REM ... RUN, the shell() command, the -k option, or
+  INCLUDECMD) it connects that command's standard input to /dev/null
+  so that it cannot interfere with the main Remind process's standard
+  input.
+
+- BUG FIX: remind: Don't set up an inotify file descriptor if we are
+  not running in Daemon Mode.
+
+- MINOR IMPROVEMENT: remind: When using readline to read from a
+  terminal, include the line number in the Remind> prompt.
+
+- IMPROVEMENT: lang/*.rem: Suppress redefined function warnings if you
+  include one language file and then later on a different one.
+
+- IMPROVEMENT: remind: Make the output of "make test" slightly more
+  verbose; color-code the PASS and FAIL results if standard output
+  refers to a terminal.
+
+- CHANGE: include/holidays/*.rem: Add %"..%" markers and %! %b
+  suffixes to all reminders.  This prevents you from having to use the
+  msgsuffix() hack if you want advance warning of holidays.
+
+  If you *are* using the msgsuffix() hack, you should stop using it!
+  Just set $DefaultDelta.  See include/holidays/README for details.
+
+* VERSION 6.1 Patch 3 - 2025-09-30
+
+- IMPROVEMENT: remind: Issue a warning that SCANFROM should be used
+  with ADDOMIT in cases where Remind detects a movable OMIT.
+
+- NEW FEATURE: remind: Add $WarningLevel system variable.  This lets
+  you suppress warnings added by new versions of Remind until you have
+  a chance to update your remind scripts.
+
+- BUG FIX / IMPROVEMENT: include/holidays/*.rem: Simplify the logic
+  used for moving holidays before/after weekends.  Also fixes bugs
+  found in the logic used to move New Year's Day.  Thanks to Nimrod
+  Levy for pointing out the New Year's Day bug.
+
+- IMPROVEMENT: include/holidays/jewish.rem: This file was reworked by
+  Nimrod Levy to simplify logic and optionally add the counting of the
+  Omer.
+
+- BUG FIX: remind: "remind -c" would add an unnecessary blank line for
+  completely-empty calendar rows if you used the "-w,0,0" option.
+  This is now fixed.  Bug pointed out by Tim Chase.
+
+* VERSION 6.1 Patch 2 - 2025-09-19
+
+- BUG FIX: remind: A reminder on a specific fixed date and time that
+  uses the TZ feature could erroneously issue a "Can't compute trigger"
+  error.  This has been fixed.
+
+- CHANGE: remind: The default for --max-expr-complexity is 10,000,000
+  (ten million) instead of unlimited.  This should not affect any
+  real-world Remind scripts.
+
+* VERSION 6.1 Patch 1 - 2025-09-12
+
+- NEW FEATURE: remind: Add the new --max-expr-complexity=n
+  command-line argument.  It is possible to write expressions that use
+  enormous amounts of CPU time, such as the following:
+
+          FSET fib(n) iif(n <= 2, 1, fib(n-1)+fib(n-2))
+          SET a fib(100)
+
+  That will take essentially forever to execute, but will not hit the
+  built-in recursion limit.  Using a command-line argument of
+  --max-expr-complexity=1000000 will terminate evaluation in a few
+  dozen milliseconds on modern hardware, and should not affect
+  realistic reminder scripts.  See the man page for details.
+
+- IMPROVEMENT: remind: Add UTF-8-aware functions to complement the
+  byte-aware functions that could give incorrect results by splitting
+  a UTF-8 character sequence.  The correspondence between old and new
+  functions is:
+
+     NON-UTF-8-AWARE   UTF-8-AWARE
+     ===============   ===========
+     strlen            mbstrlen
+     substr            mbsubstr
+     index             mbindex
+     char              mbchar
+     asc               codepoint
+
+  See the remind(1) man page for details.
+
+- MINOR NEW FEATURE: remind: You can use hexadecimal integer constants
+  like 0xFE12 in expressions.  This is mostly useful for using
+  codepoint() since Unicode code points are often expressed in
+  hexadecimal.
+
+- BUG FIX: remind: When truncating a string when executing DUMPVARS or
+  during debugging of expression evaluation, Remind could sometimes
+  cut the string in the middle of a UTF-8 sequence.  This has been
+  fixed.
+
+* VERSION 6.1 Patch 0 - 2025-09-08
+
+- MAJOR NEW FEATURE: remind: The TZ keyword lets you specify a time
+  zone for a REM command.  All trigger calculations are performed in
+  the named time zone.
+
+- DOCUMENTATION: Update README.md to document prerequisites for readline
+  support.
+
+- DOCUMENTATION: remind.1: Document system variables such as $T that can
+  have multiple types.
+
+- BUG FIX: remind: If Remind was run interactively ("remind -c -" with
+  readline support enabled) it would not properly cache the input
+  file, but would keep asking for interactive input.  This has been
+  fixed.
+
+* VERSION 6.0 Patch 2 - 2025-09-01
+
+- CHANGE: Default $ParseUntriggered to 0 instead of 1.  The default
+  could cause spurious warnings such as "type mismatch" warnings for
+  untriggered reminders.
+
+- TEST FIX: Explicitly set latitude and longitude in test files.
+
+- BUG FIX: remind: Don't add lines to "readline" history unless they
+  are actually being read from standard input.
+
+- BUG FIX: remind: On the command-line, make '-i$foo' behave the same
+  way as '-i$foo=0' as was documented in the man page.
+
+- BUG FIX: remind: Clamp the output of trigger() to "1 January 1990 AT
+  00:00" if the UTC flag is used, even if it would actually produce a
+  result in 1989.
+
+- MINOR FIX: remind: Avoid "unused result" compiler warning.
+
+* VERSION 6.0 Patch 1 - 2025-08-19
+
+- NEW FEATURE: remind: Add readline support if input is taken from stdin
+  (ie, "remind -").  This gives you full editing support if you run
+  Remind interactively.
+
+- BUG FIX: remind: Fix buffer overflow in DUMPVARS command.
+  Thanks to Jochen Sprickerhof for helping me find this bug.
+
+* VERSION 6.0 Patch 0 - 2025-08-18
+
+- MAJOR NEW FEATURE: remind: Introduction of TODOs.  These are similar
+  to normal reminders, but (in Agenda Mode) you keep getting reminded
+  of them even once they are in the past, unless you specifically mark
+  them as completed.
+
+- MAJOR NEW FEATURE: remind: The --json long option causes Remind to
+  output JSON in Agenda Mode instead of the normal text output.  See
+  tkremind for an example of how a front-end can use this output.
+
+- MINOR NEW FEATURE: remind: The RETURN statement can be used to skip
+  the rest of the current file.  Useful for early exit from an
+  INCLUDEd file.
+
+- MINOR NEW FEATURE: remind: Allow the %:, %!, %?, %@ and %#
+  substitution sequences to be overridden by defining the functions
+  subst_colon, subst_bang, subst_question, subst_at and subst_hash,
+  respectively.
+
+- SAFETY IMPROVEMENT: remind: If a function is defined in a context
+  where RUN is disabled, disable RUN during the evaluation of the
+  function.  Also disable RUN for all subst_XXX callbacks and the
+  ordx(n) callback.
+
+- MAJOR IMPROVEMENTS: tkremind: TkRemind has been given an overhaul.
+  The "Show Queue" and "Show Today's Reminders" windows now respect
+  the color scheme.  TkRemind lets you create TODO reminders and
+  easily mark them completed.  You can right-click on a day number
+  to get a window with Agenda Mode reminders for that day.
+
+- MINOR IMPROVEMENT: remind: Language packs can define an ordx(n)
+  function that localizes ord(n).  If this function is defined, then
+  ord(n) automatically calls it rather than using its built-in English
+  localization.  Appropriate ordx(n) definitions have been added to
+  all language packs.
+
+- MINOR IMPROVEMENT: remind: The %b substitution sequence handles
+  dates in the past (because of TODOs).  The %! sequence considers
+  both date and time, and can be used with non-timed reminders.  The
+  new %? sequence is similar to %!, but outputs "are" and "were"
+  instead of "is" and "was".  The new %*! and %*? sequences are
+  similar to %! and %?, but compare the trigger date to realtoday()
+  instead of to today().
+
+- MINOR IMPROVEMENT: remind: Downgrade a SPECIAL COLOR... with
+  out-of-range color values to a normal MSG-type reminder.
+
+- MINOR IMPROVEMENT: include/lang/nl.rem: Use "eergisteren" for "2
+  days ago" and "overmorgen" for "in 2 days' time."
+
+- MINOR IMPROVEMENT: tkremind: TkRemind now passes all command-line
+  options back to Remind.
+
+- TEST IMPROVEMENT: remind: Add --flush option and use it in tests to
+  have more predictable interleaving of stdout/stderr output.
+
+- BUG FIX: tkremind: In a couple of places, the "eval" command was used
+  where the intention was to use "catch".  I blame Perl...
+
+- BUG FIX: remind: SCANFROM and FROM are separated out internally, and
+  in the JSON output, the original FROM or SCANFROM value is
+  preserved, including relative SCANFROMs.
+
+- BUG FIX: tkremind: Remove some extraneous semicolons.
+
+- DOCUMENTATION FIX: Fix some man-page format directive errors;
+  tweak wording in several pages.
+
+* VERSION 5.5 Patch 0 - 2025-07-28
+
+- NEW FEATURE: remind:  Add the PUSH-VARS / POP-VARS commands and the
+  analogous PUSH-FUNCS / POP-FUNCS commands.  These let you localize
+  changes to variables and functions and help with writing more modular
+  reminder files.
+
+- INTERNAL CHANGES: Clean up the code following recommendations from
+  an updated "cppcheck" executable.
+
+* VERSION 5.4 Patch 2 - 2025-07-16
+
+- MINOR CHANGE: remind: Allow daysinmon() to take a DATE or DATETIME
+  argument.
+
+- MINOR CHANGE: remind: All functions that want an integer month number
+  will now also accept a string naming the month.
+
+- UPDATE: include/holidays/chinese-new-year.rem: Add dates for Chinese
+  New Year for 2051 through 2100.
+
+- BUG FIX: remind: Set trigdate() correctly for a fully-specified
+  date, even if it's in the past, as the manual documented.  Bug
+  found by Tim Chase.
+
+- DOCUMENTATION FIX: rem2html: Document the correct Perl module
+  prerequisites.
+
+- CODE FIXES: remind: Various minor improvements to the code with
+  no user-visible changes.
+
+* VERSION 5.4 Patch 1 - 2025-06-15
+
+- MAJOR BUG FIX: remind: In some circumstances, a REM command could
+  yield a trigger date after its UNTIL date, rather than recognizing it
+  as having expired.  This has been fixed.  Bug found by Ian! D. Allen.
+
+- BUG FIX: rem2pdf: Support the COLOUR special (as well as COLOR).
+
+- MINOR IMPROVEMENT: Add include/utils/add-html-anchors.rem.  You can
+  INCLUDE this file to get HTML anchors added to every calendar day
+  by rem2html.
+
+- DOCUMENTATION: Add NOTE-ABOUT-AI.txt
+
+* VERSION 5.4 Patch 0 - 2025-06-03
+
+- MAJOR IMPROVEMENT: remind: Track which expressions and variables
+  Remind can prove to its satisfaction are "constant" - that is, that
+  will always have the same value on any Remind run as long as the
+  files are not edited.  This allows "Purge Mode" to purge more
+  reminders than before.
+
+  See the new remind(1) man page section "NON-CONSTANT EXPRESSIONS"
+
+- MINOR NEW FEATURE: remind: add the "nonconst" built-in function (to
+  force an expression to be interpreted as non-constant), the "const"
+  function to force an expression to be interpreted as constant, and
+  the "isconst" function to test if an expression is constant.
+
+- MINOR NEW FEATURE: remind: Add eval() built-in function that takes a
+  string argument and evaluates it as an expression.  For safety, the
+  "shell" function is disabled inside an eval().
+
+- MINOR NEW FEATURE: remind: add the "u" debugging flag to warn you if
+  you set a variable that is not subsequently used.
+
+- MINOR NEW FEATURE: remind: Add the trigbase() function and
+  corresponding $Tb system variable.  See the remind(1) man page for
+  details.
+
+- MINOR IMPROVEMENT: remind: make value("var", default) evaluate the
+  second argument lazily: If "var" is defined, then the second
+  argument is never evaluated.
+
+- MINOR IMPROVEMENT: remind: Add syntax for redefining a function without
+  issuing a warning.  The syntax:
+
+      FSET - func(x) expr
+
+  is equivalent to:
+
+      FUNSET func
+      FSET func(x) expr
+
+- MINOR IMPROVEMENT: include/holidays: Update a bunch of files to use
+  isany(n, a, b, c) rather than (n == a || n == b || n == c)
+
+- MINOR IMPROVEMENT: remind: Make $Tu a synonym for triguntil().
+
+- MINOR IMPROVEMENT: remind: If coerce() fails, issue a more detailed
+  error message.
+
+- MINOR IMPROVEMENT: remind: Using Hush mode "-h" with purge mode "-j"
+  suppresses the normal purge-mode diagnostics about reminders that
+  might not be purged.  Instead, only the "#!P: Expired" purge-mode
+  lines are emitted.
+
+- NEW FEATURE: remind: Add the catch() built-in function.  This lets
+  you catch errors in expression evaluation.  For example:
+  catch(2/0, "oops") returns "oops".  The catcherr() function returns
+  the error message from the last catch() expression that failed, in
+  this case "Division by zero".
+
+- IMPROVEMENT: remind: Remind can handle dates that require UTC to
+  Local conversion (and vice-versa) for years greater than 2038, even
+  on systems with a 32-bit time_t.
+
+- MINOR IMPROVEMENT: remind: Allow the argument to monnum() to be a
+  string, in which case it's parsed as a month name and the
+  corresponding month number returned.
+
+- MINOR IMPROVEMENT: remind: Allow the argument to wkdaynum() to be a
+  string, in which case it's parsed as a weekday name and the
+  corresponding weekday number returned.
+
+- MINOR IMPROVEMENT: remind: Make the expression parser optimize away
+  the unary "-" and "!" operators when followed by an integer constant.
+
+- BUG FIX: tests: Don't use the obsolete "tail +2" syntax in test-rem.
+  Fix courtesy of Dick Marinus.
+
+* VERSION 5.3 Patch 7 - 2025-05-06
+
+- IMPROVEMENT: examples/astro: Make moonrise/moonset appear after
+  sunrise/sunset
+
+- NEW FILES: Add include/solar-eclipses.rem and
+  include/lunar-eclipses.rem for solar and lunar eclipses
+  (respectively) in the 21st century.
+
+- NEW SYSTEM VARIABLE: remind: Add $TimetIs64bit system variable,
+  which is 1 if the built in time_t type is at least 64 bits, and 0
+  otherwise.
+
+- TEST FIX: "make test" now passes on systems with a 32-bit time_t
+  type.
+
+- BUG FIX: include/holidays/nl.rem: Use the correct rules for
+  Koningsdag and Bevrijdingsdag, courtesy of Adrian P. van Bloois.
+
+* VERSION 5.3 Patch 6 - 2025-04-25
+
+- BUG FIX: remind: Make "remind -s" respect $DefaultColor.  Bug found by
+  Tim Chase.
+
+- DOCUMENTATION IMPROVEMENT: Make documentation of $SuppressLRM a bit more
+  prominent
+
+- UPDATE: contrib/remind-conf-mode: Add new functions moonrise, moonset, etc.
+  to Emacs highlighting file
+
+- MINOR IMPROVEMENT: examples/astro: Align output better
+
+- MINOR FIX: src/moon.c: Change C++-style comments to C-style comments
+
+* VERSION 5.3 Patch 5 - 2025-03-23
+
+- NEW FEATURE: remind: Add moonrise, moonset, moonrisedir and moonsetdir
+  functions.  The first two functions calculate the time of the next
+  moonrise and moonset, and the second two calculate in which direction
+  the moon will rise or set.  See the examples/astro script for examples
+  of how to use the moonrise/moonset functions.
+
+- CODE CLEANUPS: remind: Some minor code cleanups with no user-visible effects.
+
+- IMPROVEMENT: Add tests for the astronomical calculation functions.
+
+- UPDATE: Update the included json.c and json.h files to the latest versions
+  from https://github.com/udp/json-parser
+
+- BUG FIX: remind: The %2 and %@ sequences would print "0:34am" for the
+  time 00:34, instead of the correct "12:34am".  This has been fixed.
+
+- BUG FIX: TkRemind: Fix bug that broke the ability to open a text editor
+  on a reminder from the "Queue..." listing.
+
+* VERSION 5.3 Patch 4 - 2025-03-09
+
+- BUG FIX: remind: "make test" could fail if Remind was built in a locale
+  other than "C".  This has been fixed.
+
+- BUG FIX: Fix a typo in the remind man page.
+
+* VERSION 5.3 Patch 3 - 2025-03-03
+
+- NEW FEATURE: remind: If a command spans more than one line (because of
+  backslash line continuation) output both the starting and ending line
+  number in error messages.
+
+- NEW FEATURE: remind: In the JSON -pp and -ppp output, include a new key
+  lineno_start to specify the starting line of a multi-line reminder.
+  The existing lineno key specifies the ending line; this is maintained
+  for backward-compatibility.
+
+- MINOR IMPROVEMENT: include/holidays/misc.rem: Add a few new holidays and
+  URL INFO strings.
+
+- CHANGE: remind: Issue a warning if a time-related substitution sequence
+  is used with a non-timed REM command.
+
+- BUG FIX: remind: Fix a memory leak.
+
+* VERSION 5.3 Patch 2 - 2025-02-09
+
+- CHANGE: remind: Revert a change to the way "-y" tags are generated that
+  was introduced in 05.03.01.  The change broke a library that depended
+  on it being generated in the old way.
+
+* VERSION 5.3 Patch 1 - 2025-02-07
+
+- IMPROVEMENT: TkRemind: When we pop up a timed reminder, make any "Url:"
+  info string into a clickable link.
+
+- IMPROVEMENT: rem2pdf: Improve the layout of the small monthly calendars.
+
+- BUG FIX: rem2pdf: Add checks for all Perl dependencies.
+
+* VERSION 5.3 Patch 0 - 2025-02-04
+
+- NEW FEATURE: remind: Add the "INFO" clause to the REM command.  This
+  is intended for storing additional metadata about an event, such as
+  the location and a longer description.  The intention is to make
+  Remind <-> iCal conversions preserve as much information as possible.
+
+- NEW FEATURE: rem2html, rem2pdf, tkremind: Add support for the "Url:"
+  info string that turns reminders into hyper-links.  For example,
+  consider this reminder:
+
+      REM 15 INFO "Url: https://foo.example" MSG Foo
+
+  The text "Foo" will be made into a link to "https://foo.example"
+  by rem2html and rem2pdf.  If you middle-click it in tkremind, it
+  will open the URL.
+
+- NEW FEATURE: remind: Add the triginfo() built-in function so a reminder
+  body can refer to INFO data.  Add the %<...> substitution filter as a
+  shorthand for [triginfo("...")]
+
+- NEW FEATURE: TkRemind: Add "Location" and "Description" fields when
+  creating a reminder; these are converted to INFO clauses.  Also support
+  a popup window with the extra information when hovering over a reminder
+  in the calendar display.
+
+- IMPROVEMENT: Update the reminder files included with Remind to add
+  INFO strings with Wikipedia URLs for various holidays and
+  astronomical events.
+
+- IMPROVEMENT: remind: Add the "\xAB" escape sequence for parsing quoted
+  strings, where "AB" is a pair of hex digits.
+
+- NEW FUNCTION: remind: Add the escape() built-in function that converts
+  problematic characters within a string to the \-escaped versions.
+  It's essentially the inverse of how Remind parses a quoted string.
+
+* VERSION 5.2 Patch 3 - 2025-01-22
+
+- NEW FEATURE: remind: Add "TRANSLATE GENERATE" command for generating
+  a skeleton set of TRANSLATE commands to make it easier to localize
+  Remind.
+
+- NEW FEATURE: remind: Add "q" debug flag for tracing calls to _()
+  or %(...) in the substitution filter; this will help with localizing
+  reminder files.
+
+- NEW FILES: remind: Add holidays/lgbtq.rem for LGBTQ holidays.  Add
+  country-specific files in holidays/lgbtq/*.rem
+
+- IMPROVEMENT: TkRemind: use "info patchlevel" to display full Tcl/Tk
+  version.
+
+- IMPROVEMENT: remind: The DEBUG command issues a warning if given an
+  unknown debug flag.
+
+- BUG FIX: remind: "make test" will now succeed even if run between
+  23:55 and 00:00 UTC.  This is done with a new --test flag for remind.
+
+- BUG FIX: remind: Avoid potential buffer overflow if someone supplies
+  ridiculously-long translations for "am" or "pm".
+
+* VERSION 5.2 Patch 2 - 2025-01-06
+
+- NEW FEATURE: remind: The "-p+" option lets you produce weekly calendars;
+  so far, the rem2pdf and rem2html back-ends support rendering of weekly
+  calendars.
+
+- NEW FEATURE: remind: The $CalType system variable indicates the type of
+  calendar being produced; its value is one of "monthly", "weekly",
+  or "none".  "none" signifies agenda mode rather than calendar mode.
+
+- IMPROVEMENT: remind: Warn if a POP-OMIT-CONTEXT matches a
+  PUSH-OMIT-CONTEXT that is in a different file.
+
+- CHANGE: remind: Split the "-ds" debug option into two separate options:
+  "-ds" for debugging expression-parsing and "-dh" for printing hash
+  table statistics on exit.
+
+* VERSION 5.2 Patch 1 - 2024-12-16
+
+- 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
+  support has been removed and all localization is now done at run-time.
+
+- NEW FEATURE: remind: In JSON daemon mode (-zj), the front-end can
+  request translation table entries from the Remind daemon, allowing the
+  front-end to localize messages.

 - UPDATE: Update national holidays following update to upstream Python
  library.

+- 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.

+- IMPROVEMENT: contrib/remind-conf-mode: Fix a few bugs and choose colors
+  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

@@ -1219,10 +1778,10 @@ CHANGES TO REMIND
 - NEW FEATURE: Add "-u+username" variant to tell Remind to switch users to
  "username" without disabling RUN directives.  Idea courtesy of Ian! D. Allen

- CHANGE: rem2html: rem2html has been moved out of the www/ directory into
-  its own rem2html/ directory.  If your system has the prerequisites
-  (namely Perl, Getopt::Long and JSON::Any) then rem2html will be installed
-  by "make install".
+- CHANGE: rem2html: rem2html has been moved out of the www/ directory
+  into its own rem2html/ directory.  If your system has the
+  prerequisites (namely Perl, Getopt::Long and JSON::MaybeXS) then
+  rem2html will be installed by "make install".

 - CHANGE: Remove "cm2rem".  It was about 20 years obsolete.

--- a/examples/alignment.rem
+++ b/examples/alignment.rem
@@ -1,3 +1,4 @@
+#!/usr/bin/env -S remind -@2
 # Demo the columns() function
 #
 # Run as:  remind -@2 alignment.rem
--- a/examples/astro
+++ b/examples/astro
@@ -32,6 +32,64 @@ EOF

 remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
 SET $AddBlankLines 0
+FSET angle_to_direction(x) \
+IIF(x > 348 && x <= 11, "North", \
+    x > 11 && x <= 34, "North North-East", \
+    x > 34 && x <= 56, "North-East", \
+    x > 56 && x <= 79, "East North-East", \
+    x > 79 && x <= 101, "East", \
+    x > 101 && x <= 124, "East South-East", \
+    x > 124 && x <= 146, "South-East", \
+    x > 146 && x <= 169, "South South-East", \
+    x > 169 && x <= 191, "South", \
+    x > 191 && x <= 214, "South South-West", \
+    x > 214 && x <= 236, "South-West", \
+    x > 236 && x <= 259, "West South-West", \
+    x > 259 && x <= 281, "West", \
+    x > 281 && x <= 304, "West North-West", \
+    x > 304 && x <= 326, "North-West", \
+    "North North-West")
+
+BANNER %
+set mr moonrise()
+set ms moonset()
+set mr_a moonrisedir()
+set ms_a moonsetdir()
+
+REM NOQUEUE [mr] MSG Moonrise:              %*3 in the [angle_to_direction(mr_a)] ([mr_a] degrees)
+REM NOQUEUE [ms] MSG Moonset:               %*3 in the [angle_to_direction(ms_a)] ([ms_a] degrees)
+
+IF (datepart(mr) != today())
+    REM MSG Moonrise:              No moonrise today
+ENDIF
+IF (datepart(ms) != today())
+    REM MSG Moonset:               No moonset today
+ENDIF
+EOF
+
+echo ""
+
+
+remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
+SET $AddBlankLines 0
+FSET angle_to_direction(x) \
+IIF(x > 348 || x <= 11, "North", \
+    x > 11 && x <= 34, "North North-East", \
+    x > 34 && x <= 56, "North-East", \
+    x > 56 && x <= 79, "East North-East", \
+    x > 79 && x <= 101, "East", \
+    x > 101 && x <= 124, "East South-East", \
+    x > 124 && x <= 146, "South-East", \
+    x > 146 && x <= 169, "South South-East", \
+    x > 169 && x <= 191, "South", \
+    x > 191 && x <= 214, "South South-West", \
+    x > 214 && x <= 236, "South-West", \
+    x > 236 && x <= 259, "West South-West", \
+    x > 259 && x <= 281, "West", \
+    x > 281 && x <= 304, "West North-West", \
+    x > 304 && x <= 326, "North-West", \
+    "North North-West")
+
 BANNER %
 IF $TerminalBackground == 0
   REM [moondatetime(0)] +60 SPECIAL COLOR 255 255 0 New moon:              🌑 [$T] %3 (%b)
--- a/examples/defs.rem
+++ b/examples/defs.rem
@@ -21,7 +21,7 @@
 #  "#PSSTUFF" for nifty PostScript examples				    #
 # 									    #
 # This file is part of REMIND.						    #
-# Copyright (C) 1992-2024 Dianne Skoll                                      #
+# Copyright (C) 1992-2025 Dianne Skoll                                      #
 # SPDX-License-Identifier: GPL-2.0-only
 # 									    #
 #############################################################################
--- a/examples/tflag.rem
+++ b/examples/tflag.rem
@@ -0,0 +1,24 @@
+#!/usr/bin/env -S remind -@2
+# This is a little Easter Egg that simply draws
+# the Transgender Pride Flag.  It's included in
+# Remind because (1) the author is trans and (2)
+# trans people are under attack in the USA and many
+# other places.  So this is a little show of support
+# and resistance for trans people.
+SET $AddBlankLines 0
+BANNER %
+set c max(columns()-1, 10)
+set r max(rows(), 5)
+
+set bar "█" * c
+set dups r/5
+set bars (bar + "%_") * dups
+
+set bars mbsubstr(bars, 0, mbstrlen(bars)-2)
+
+REM SPECIAL COLOR  91 206 250 [bars]
+REM SPECIAL COLOR 245 169 184 [bars]
+REM SPECIAL COLOR 255 255 255 [bars]
+REM SPECIAL COLOR 245 169 184 [bars]
+REM SPECIAL COLOR  91 206 250 [bars]
+
--- a/include/ansitext.rem
+++ b/include/ansitext.rem
@@ -2,12 +2,12 @@
 # Not all sequences are supported by all terminals.

 # This file is part of REMIND
-# REMIND is Copyright (C) 1992-2024 by Dianne Skoll
+# REMIND is Copyright (C) 1992-2025 by Dianne Skoll
 # SPDX-License-Identifier: GPL-2.0-only

 if !defined("ansi_bold")
-    # Disable ANSI attributes in calandar mode
-    if $CalMode
+    # Disable ANSI attributes in calendar mode or JSON mode
+    if $CalMode || $PSCal || $JSONMode
        set ansi_normal     ""
        set ansi_bold       ""
        set ansi_faint      ""
@@ -28,7 +28,7 @@ if !defined("ansi_bold")
        set ansi_underline2 char(27) + "[21m"
        set ansi_overline   char(27) + "[53m"
    endif
-    preserve ansi_normal ansi_bold ansi_faint ansi_italic ansi_underline2 ansi_reverse ansi_strikeout ansi_underline2 ansi_overline
+    preserve ansi_normal ansi_bold ansi_faint ansi_italic ansi_underline ansi_reverse ansi_strikeout ansi_underline2 ansi_overline
 endif

 # Example: REM MSG I must [ansi_bold]emphasize[ansi_normal] \
--- a/include/holidays/README
+++ b/include/holidays/README
@@ -33,30 +33,19 @@ pagan.rem            - Pagan holidays
 ADVANCE WARNING:
 ================

-None of the included holiday files have deltas or substitution sequences.
-You can use the following trick if you would like (for example) 7 days'
-advance warning of holidays:
-
-    # Save old definition (if any) of msgsuffix
-    FRENAME msgsuffix saved_msgsuffix
+None of the included holiday files have deltas.  You can use the
+following trick if you would like (for example) 7 days' advance
+warning of holidays:

    # Save old value of $DefaultDelta
-    SET old_delta $DefaultDelta
+    PUSH-VARS $DefaultDelta

    # We want 7 days' advance warning
    SET $DefaultDelta 7

-    # Add a suffix to print " is in xxx days", etc.
-    # Note the char(8) at the start to put the suffix
-    # on the same line as the reminder, and the final %
-    # in the argument of dosubst() to avoid an *extra*
-    # newline from being added
-    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
-    SET $DefaultDelta old_delta
+    # Restore old value $DefaultDelta
+    POP-VARS
--- a/include/holidays/ad.rem
+++ b/include/holidays/ad.rem
@@ -12,17 +12,17 @@
 # one of the regional *.rem files in the directory
 # [$SysInclude]/holidays/ad/

-OMIT 1 January MSG New Year's Day
-OMIT 6 January MSG Epiphany
-OMIT [easterdate($Uy)-47] MSG Carnival
-OMIT 14 March MSG Constitution Day
-OMIT [easterdate($Uy)-2] MSG Good Friday
-OMIT [easterdate($Uy)+1] MSG Easter Monday
-OMIT 1 May MSG Labor Day
-OMIT [easterdate($Uy)+50] MSG Whit Monday
-OMIT 15 August MSG Assumption Day
-OMIT 8 September MSG National Day
-OMIT 1 November MSG All Saints' Day
-OMIT 8 December MSG Immaculate Conception Day
-OMIT 25 December MSG Christmas Day
-OMIT 26 December MSG Saint Stephen's Day
+OMIT 1 January MSG %"New Year's Day%" %! %b.
+OMIT 6 January MSG %"Epiphany%" %! %b.
+OMIT [easterdate($Uy)-47] MSG %"Carnival%" %! %b.
+OMIT 14 March MSG %"Constitution Day%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Good Friday%" %! %b.
+OMIT [easterdate($Uy)+1] MSG %"Easter Monday%" %! %b.
+OMIT 1 May MSG %"Labor Day%" %! %b.
+OMIT [easterdate($Uy)+50] MSG %"Whit Monday%" %! %b.
+OMIT 15 August MSG %"Assumption Day%" %! %b.
+OMIT 8 September MSG %"National Day%" %! %b.
+OMIT 1 November MSG %"All Saints' Day%" %! %b.
+OMIT 8 December MSG %"Immaculate Conception Day%" %! %b.
+OMIT 25 December MSG %"Christmas Day%" %! %b.
+OMIT 26 December MSG %"Saint Stephen's Day%" %! %b.
--- a/include/holidays/ad/02.rem
+++ b/include/holidays/ad/02.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem

-REM Third Saturday in July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
-REM Sunday 16 July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
-REM Monday 17 July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
+REM Third Saturday in July ADDOMIT SCANFROM -28 MSG %"Canillo Annual Festival%" %! %b.
+REM Sunday 16 July ADDOMIT SCANFROM -28 MSG %"Canillo Annual Festival%" %! %b.
+REM Monday 17 July ADDOMIT SCANFROM -28 MSG %"Canillo Annual Festival%" %! %b.
--- a/include/holidays/ad/03.rem
+++ b/include/holidays/ad/03.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem

-OMIT 15 August MSG Encamp Annual Festival
-OMIT 16 August MSG Encamp Annual Festival
+OMIT 15 August MSG %"Encamp Annual Festival%" %! %b.
+OMIT 16 August MSG %"Encamp Annual Festival%" %! %b.
--- a/include/holidays/ad/04.rem
+++ b/include/holidays/ad/04.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem

-OMIT 15 August MSG La Massana Annual Festival
-OMIT 16 August MSG La Massana Annual Festival
+OMIT 15 August MSG %"La Massana Annual Festival%" %! %b.
+OMIT 16 August MSG %"La Massana Annual Festival%" %! %b.
--- a/include/holidays/ad/05.rem
+++ b/include/holidays/ad/05.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem

-OMIT 15 August MSG Ordino Annual Festival
-OMIT 16 August MSG Ordino Annual Festival
+OMIT 15 August MSG %"Ordino Annual Festival%" %! %b.
+OMIT 16 August MSG %"Ordino Annual Festival%" %! %b.
--- a/include/holidays/ad/06.rem
+++ b/include/holidays/ad/06.rem
@@ -8,9 +8,9 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem

-REM Friday 23 July ADDOMIT SCANFROM -28 MSG Sant Julià de Lòria Annual Festival
-REM Saturday 24 July ADDOMIT SCANFROM -28 MSG Sant Julià de Lòria Annual Festival
-REM Sunday 25 July ADDOMIT SCANFROM -28 MSG Sant Julià de Lòria Annual Festival
-REM Monday 26 July ADDOMIT SCANFROM -28 MSG Sant Julià de Lòria Annual Festival
+REM Friday 23 July ADDOMIT SCANFROM -28 MSG %"Sant Julià de Lòria Annual Festival%" %! %b.
+REM Saturday 24 July ADDOMIT SCANFROM -28 MSG %"Sant Julià de Lòria Annual Festival%" %! %b.
+REM Sunday 25 July ADDOMIT SCANFROM -28 MSG %"Sant Julià de Lòria Annual Festival%" %! %b.
+REM Monday 26 July ADDOMIT SCANFROM -28 MSG %"Sant Julià de Lòria Annual Festival%" %! %b.
--- a/include/holidays/ad/07.rem
+++ b/include/holidays/ad/07.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem

-REM First Saturday in August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
-REM Sunday 2 August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
-REM Monday 3 August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
+REM First Saturday in August ADDOMIT SCANFROM -28 MSG %"Andorra la Vella Annual Festival%" %! %b.
+REM Sunday 2 August ADDOMIT SCANFROM -28 MSG %"Andorra la Vella Annual Festival%" %! %b.
+REM Monday 3 August ADDOMIT SCANFROM -28 MSG %"Andorra la Vella Annual Festival%" %! %b.
--- a/include/holidays/ad/08.rem
+++ b/include/holidays/ad/08.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem

-OMIT 25 July MSG Escaldes-Engordany Annual Festival
-OMIT 26 July MSG Escaldes-Engordany Annual Festival
+OMIT 25 July MSG %"Escaldes-Engordany Annual Festival%" %! %b.
+OMIT 26 July MSG %"Escaldes-Engordany Annual Festival%" %! %b.
--- a/include/holidays/ae.rem
+++ b/include/holidays/ae.rem
@@ -5,6 +5,6 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG رأس السنة الميلادية
-OMIT 2 December MSG اليوم الوطني
-OMIT 3 December MSG اليوم الوطني
+OMIT 1 January MSG %"رأس السنة الميلادية%" %! %b.
+OMIT 2 December MSG %"اليوم الوطني%" %! %b.
+OMIT 3 December MSG %"اليوم الوطني%" %! %b.
--- a/include/holidays/al.rem
+++ b/include/holidays/al.rem
@@ -5,29 +5,29 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG Festat e Vitit të Ri
-REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG Festat e Vitit të Ri (ditë pushimi e shtyrë)
-OMIT 2 January MSG Festat e Vitit të Ri
-REM 2 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2))==0 || wkdaynum(date($Ty, 1, 2))==6] MSG Festat e Vitit të Ri (ditë pushimi e shtyrë)
-OMIT 14 March MSG Dita e Verës
-REM 14 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 14))==0 || wkdaynum(date($Ty, 3, 14))==6] MSG Dita e Verës (ditë pushimi e shtyrë)
-OMIT 22 March MSG Dita e Nevruzit
-REM 22 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 22))==0 || wkdaynum(date($Ty, 3, 22))==6] MSG Dita e Nevruzit (ditë pushimi e shtyrë)
-REM 31 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 31))==0 || wkdaynum(date($Ty, 3, 31))==6] MSG E diela e Pashkëve Katolike (ditë pushimi e shtyrë)
-OMIT [easterdate($Uy)] MSG E diela e Pashkëve Katolike
-OMIT [easterdate($Uy)] MSG E diela e Pashkëve Ortodokse
-OMIT 1 May MSG Dita Ndërkombëtare e Punëtorëve
-REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1))==0 || wkdaynum(date($Ty, 5, 1))==6] MSG Dita Ndërkombëtare e Punëtorëve (ditë pushimi e shtyrë)
-REM 5 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 5))==0 || wkdaynum(date($Ty, 5, 5))==6] MSG E diela e Pashkëve Ortodokse (ditë pushimi e shtyrë)
-OMIT 5 September MSG Dita e Shenjtërimit të Shenjt Terezës
-REM 5 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 5))==0 || wkdaynum(date($Ty, 9, 5))==6] MSG Dita e Shenjtërimit të Shenjt Terezës (ditë pushimi e shtyrë)
-OMIT 22 November MSG Dita e Alfabetit
-REM 22 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 22))==0 || wkdaynum(date($Ty, 11, 22))==6] MSG Dita e Alfabetit (ditë pushimi e shtyrë)
-OMIT 28 November MSG Dita Flamurit dhe e Pavarësisë
-REM 28 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 28))==0 || wkdaynum(date($Ty, 11, 28))==6] MSG Dita Flamurit dhe e Pavarësisë (ditë pushimi e shtyrë)
-OMIT 29 November MSG Dita e Çlirimit
-REM 29 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 29))==0 || wkdaynum(date($Ty, 11, 29))==6] MSG Dita e Çlirimit (ditë pushimi e shtyrë)
-OMIT 8 December MSG Dita Kombëtare e Rinisë
-REM 8 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8))==0 || wkdaynum(date($Ty, 12, 8))==6] MSG Dita Kombëtare e Rinisë (ditë pushimi e shtyrë)
-OMIT 25 December MSG Krishtlindjet
-REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25))==0 || wkdaynum(date($Ty, 12, 25))==6] MSG Krishtlindjet (ditë pushimi e shtyrë)
+OMIT 1 January MSG %"Festat e Vitit të Ri%" %! %b.
+REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 1, 1)), 0, 6)] MSG %"Festat e Vitit të Ri (ditë pushimi e shtyrë)%" %! %b.
+OMIT 2 January MSG %"Festat e Vitit të Ri%" %! %b.
+REM 2 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 1, 2)), 0, 6)] MSG %"Festat e Vitit të Ri (ditë pushimi e shtyrë)%" %! %b.
+OMIT 14 March MSG %"Dita e Verës%" %! %b.
+REM 14 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 14)), 0, 6)] MSG %"Dita e Verës (ditë pushimi e shtyrë)%" %! %b.
+OMIT 22 March MSG %"Dita e Nevruzit%" %! %b.
+REM 22 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 22)), 0, 6)] MSG %"Dita e Nevruzit (ditë pushimi e shtyrë)%" %! %b.
+REM 31 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 31)), 0, 6)] MSG %"E diela e Pashkëve Katolike (ditë pushimi e shtyrë)%" %! %b.
+OMIT [easterdate($Uy)] MSG %"E diela e Pashkëve Katolike%" %! %b.
+OMIT [easterdate($Uy)] MSG %"E diela e Pashkëve Ortodokse%" %! %b.
+OMIT 1 May MSG %"Dita Ndërkombëtare e Punëtorëve%" %! %b.
+REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 1)), 0, 6)] MSG %"Dita Ndërkombëtare e Punëtorëve (ditë pushimi e shtyrë)%" %! %b.
+REM 5 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 5)), 0, 6)] MSG %"E diela e Pashkëve Ortodokse (ditë pushimi e shtyrë)%" %! %b.
+OMIT 5 September MSG %"Dita e Shenjtërimit të Shenjt Terezës%" %! %b.
+REM 5 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 9, 5)), 0, 6)] MSG %"Dita e Shenjtërimit të Shenjt Terezës (ditë pushimi e shtyrë)%" %! %b.
+OMIT 22 November MSG %"Dita e Alfabetit%" %! %b.
+REM 22 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 11, 22)), 0, 6)] MSG %"Dita e Alfabetit (ditë pushimi e shtyrë)%" %! %b.
+OMIT 28 November MSG %"Dita Flamurit dhe e Pavarësisë%" %! %b.
+REM 28 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 11, 28)), 0, 6)] MSG %"Dita Flamurit dhe e Pavarësisë (ditë pushimi e shtyrë)%" %! %b.
+OMIT 29 November MSG %"Dita e Çlirimit%" %! %b.
+REM 29 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 11, 29)), 0, 6)] MSG %"Dita e Çlirimit (ditë pushimi e shtyrë)%" %! %b.
+OMIT 8 December MSG %"Dita Kombëtare e Rinisë%" %! %b.
+REM 8 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 8)), 0, 6)] MSG %"Dita Kombëtare e Rinisë (ditë pushimi e shtyrë)%" %! %b.
+OMIT 25 December MSG %"Krishtlindjet%" %! %b.
+REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 25)), 0, 6)] MSG %"Krishtlindjet (ditë pushimi e shtyrë)%" %! %b.
--- a/include/holidays/am.rem
+++ b/include/holidays/am.rem
@@ -5,15 +5,15 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG Նոր տարվա օր
-OMIT 2 January MSG Նոր տարվա օր
-OMIT 6 January MSG Սուրբ Ծնունդ եւ Հայտնություն
-OMIT 28 January MSG Բանակի օր
-OMIT 8 March MSG Կանանց տոն
-OMIT 24 April MSG Եղեռնի զոհերի հիշատակի օր
-OMIT 1 May MSG Աշխատանքի օր
-OMIT 9 May MSG Հաղթանակի և Խաղաղության տոն
-OMIT 28 May MSG Հանրապետության օր
-OMIT 5 July MSG Սահմանադրության օր
-OMIT 21 September MSG Անկախության օր
-OMIT 31 December MSG Նոր տարվա գիշեր
+OMIT 1 January MSG %"Նոր տարվա օր%" %! %b.
+OMIT 2 January MSG %"Նոր տարվա օր%" %! %b.
+OMIT 6 January MSG %"Սուրբ Ծնունդ եւ Հայտնություն%" %! %b.
+OMIT 28 January MSG %"Բանակի օր%" %! %b.
+OMIT 8 March MSG %"Կանանց տոն%" %! %b.
+OMIT 24 April MSG %"Եղեռնի զոհերի հիշատակի օր%" %! %b.
+OMIT 1 May MSG %"Աշխատանքի օր%" %! %b.
+OMIT 9 May MSG %"Հաղթանակի և Խաղաղության տոն%" %! %b.
+OMIT 28 May MSG %"Հանրապետության օր%" %! %b.
+OMIT 5 July MSG %"Սահմանադրության օր%" %! %b.
+OMIT 21 September MSG %"Անկախության օր%" %! %b.
+OMIT 31 December MSG %"Նոր տարվա գիշեր%" %! %b.
--- a/include/holidays/ao.rem
+++ b/include/holidays/ao.rem
@@ -5,37 +5,37 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG Dia do Ano Novo
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 4] MSG Dia do Ano Novo (ponte)
-REM 3 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 4)) == 2] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
-OMIT 4 February MSG Dia do Início da Luta Armada de Libertação Nacional
-REM 5 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 4)) == 4] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
-REM 12 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 13)) == 2] MSG Dia do Carnaval (ponte)
-REM 14 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 13)) == 4] MSG Dia do Carnaval (ponte)
-OMIT [easterdate($Uy)-47] MSG Dia do Carnaval
-REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 2] MSG Dia Internacional da Mulher (ponte)
-OMIT 8 March MSG Dia Internacional da Mulher
-REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 4] MSG Dia Internacional da Mulher (ponte)
-REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 23)) == 2] MSG Dia da Libertação da África Austral (ponte)
-OMIT 23 March MSG Dia da Libertação da África Austral
-REM 24 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 23)) == 4] MSG Dia da Libertação da África Austral (ponte)
-REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 2] MSG Dia da Paz e Reconciliação Nacional (ponte)
-OMIT 4 April MSG Dia da Paz e Reconciliação Nacional
-REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG Dia da Paz e Reconciliação Nacional (ponte)
-OMIT [easterdate($Uy)-2] MSG Sexta-Feira Santa
-REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Dia Internacional do Trabalhador (ponte)
-OMIT 1 May MSG Dia Internacional do Trabalhador
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Dia Internacional do Trabalhador (ponte)
-REM 16 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 17)) == 2] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
-OMIT 17 September MSG Dia do Fundador da Nação e do Herói Nacional
-REM 18 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 17)) == 4] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
-REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Dia dos Finados (ponte)
-OMIT 2 November MSG Dia dos Finados
-REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 4] MSG Dia dos Finados (ponte)
-REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Dia da Independência Nacional (ponte)
-OMIT 11 November MSG Dia da Independência Nacional
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Dia da Independência Nacional (ponte)
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 2] MSG Dia de Natal e da Família (ponte)
-OMIT 25 December MSG Dia de Natal e da Família
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 4] MSG Dia de Natal e da Família (ponte)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 2] MSG Dia do Ano Novo (ponte)
+OMIT 1 January MSG %"Dia do Ano Novo%" %! %b.
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia do Ano Novo (ponte)%" %! %b.
+REM 3 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia do Início da Luta Armada de Libertação Nacional (ponte)%" %! %b.
+OMIT 4 February MSG %"Dia do Início da Luta Armada de Libertação Nacional%" %! %b.
+REM 5 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia do Início da Luta Armada de Libertação Nacional (ponte)%" %! %b.
+REM 12 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia do Carnaval (ponte)%" %! %b.
+REM 14 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia do Carnaval (ponte)%" %! %b.
+OMIT [easterdate($Uy)-47] MSG %"Dia do Carnaval%" %! %b.
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia Internacional da Mulher (ponte)%" %! %b.
+OMIT 8 March MSG %"Dia Internacional da Mulher%" %! %b.
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia Internacional da Mulher (ponte)%" %! %b.
+REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia da Libertação da África Austral (ponte)%" %! %b.
+OMIT 23 March MSG %"Dia da Libertação da África Austral%" %! %b.
+REM 24 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia da Libertação da África Austral (ponte)%" %! %b.
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia da Paz e Reconciliação Nacional (ponte)%" %! %b.
+OMIT 4 April MSG %"Dia da Paz e Reconciliação Nacional%" %! %b.
+REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia da Paz e Reconciliação Nacional (ponte)%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Sexta-Feira Santa%" %! %b.
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia Internacional do Trabalhador (ponte)%" %! %b.
+OMIT 1 May MSG %"Dia Internacional do Trabalhador%" %! %b.
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia Internacional do Trabalhador (ponte)%" %! %b.
+REM 16 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia do Fundador da Nação e do Herói Nacional (ponte)%" %! %b.
+OMIT 17 September MSG %"Dia do Fundador da Nação e do Herói Nacional%" %! %b.
+REM 18 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia do Fundador da Nação e do Herói Nacional (ponte)%" %! %b.
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia dos Finados (ponte)%" %! %b.
+OMIT 2 November MSG %"Dia dos Finados%" %! %b.
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia dos Finados (ponte)%" %! %b.
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia da Independência Nacional (ponte)%" %! %b.
+OMIT 11 November MSG %"Dia da Independência Nacional%" %! %b.
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia da Independência Nacional (ponte)%" %! %b.
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia de Natal e da Família (ponte)%" %! %b.
+OMIT 25 December MSG %"Dia de Natal e da Família%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG %"Dia de Natal e da Família (ponte)%" %! %b.
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Dia do Ano Novo (ponte)%" %! %b.
--- a/include/holidays/ar.rem
+++ b/include/holidays/ar.rem
@@ -5,34 +5,34 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG Año Nuevo
-OMIT [easterdate($Uy)-48] MSG Día de Carnaval
-OMIT [easterdate($Uy)-47] MSG Día de Carnaval
-OMIT 24 March MSG Día Nacional de la Memoria por la Verdad y la Justicia
-OMIT 2 April MSG Día del Veterano y de los Caidos en la Guerra de Malvinas
-OMIT [easterdate($Uy)-2] MSG Viernes Santo
-OMIT 1 May MSG Día del Trabajo
-OMIT 25 May MSG Día de la Revolución de Mayo
-REM 15 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 3] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
-REM 16 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 2] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
-REM 17 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
-OMIT 20 June MSG Paso a la Inmortalidad del General Don Manuel Belgrano
-REM 21 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
-OMIT 9 July MSG Día de la Independencia
-REM 15 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 3] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 2] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 17 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 20 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 21 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 4] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 18 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 3] MSG Día de la Soberanía Nacional (observado)
-REM 19 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 2] MSG Día de la Soberanía Nacional (observado)
-REM 20 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de la Soberanía Nacional (observado)
-REM 23 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 5] MSG Día de la Soberanía Nacional (observado)
-REM 24 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 4] MSG Día de la Soberanía Nacional (observado)
-OMIT 8 December MSG Inmaculada Concepción de María
-OMIT 25 December MSG Navidad
+OMIT 1 January MSG %"Año Nuevo%" %! %b.
+OMIT [easterdate($Uy)-48] MSG %"Día de Carnaval%" %! %b.
+OMIT [easterdate($Uy)-47] MSG %"Día de Carnaval%" %! %b.
+OMIT 24 March MSG %"Día Nacional de la Memoria por la Verdad y la Justicia%" %! %b.
+OMIT 2 April MSG %"Día del Veterano y de los Caidos en la Guerra de Malvinas%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Viernes Santo%" %! %b.
+OMIT 1 May MSG %"Día del Trabajo%" %! %b.
+OMIT 25 May MSG %"Día de la Revolución de Mayo%" %! %b.
+REM 15 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG %"Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)%" %! %b.
+REM 16 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)%" %! %b.
+REM 17 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4] MSG %"Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)%" %! %b.
+OMIT 20 June MSG %"Paso a la Inmortalidad del General Don Manuel Belgrano%" %! %b.
+REM 21 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG %"Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)%" %! %b.
+OMIT 9 July MSG %"Día de la Independencia%" %! %b.
+REM 15 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG %"Paso a la Inmortalidad del General Don José de San Martin (observado)%" %! %b.
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Paso a la Inmortalidad del General Don José de San Martin (observado)%" %! %b.
+REM 17 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG %"Paso a la Inmortalidad del General Don José de San Martin (observado)%" %! %b.
+REM 20 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG %"Paso a la Inmortalidad del General Don José de San Martin (observado)%" %! %b.
+REM 21 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG %"Paso a la Inmortalidad del General Don José de San Martin (observado)%" %! %b.
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG %"Día del Respeto a la Diversidad Cultural (observado)%" %! %b.
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Día del Respeto a la Diversidad Cultural (observado)%" %! %b.
+REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG %"Día del Respeto a la Diversidad Cultural (observado)%" %! %b.
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG %"Día del Respeto a la Diversidad Cultural (observado)%" %! %b.
+REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG %"Día del Respeto a la Diversidad Cultural (observado)%" %! %b.
+REM 18 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG %"Día de la Soberanía Nacional (observado)%" %! %b.
+REM 19 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Día de la Soberanía Nacional (observado)%" %! %b.
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG %"Día de la Soberanía Nacional (observado)%" %! %b.
+REM 23 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG %"Día de la Soberanía Nacional (observado)%" %! %b.
+REM 24 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG %"Día de la Soberanía Nacional (observado)%" %! %b.
+OMIT 8 December MSG %"Inmaculada Concepción de María%" %! %b.
+OMIT 25 December MSG %"Navidad%" %! %b.
--- a/include/holidays/as.rem
+++ b/include/holidays/as.rem
@@ -5,36 +5,36 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
-REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
-REM 16 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 6] MSG American Samoa Flag Day (observed)
-OMIT 17 April MSG American Samoa Flag Day
-REM 18 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 0] MSG American Samoa Flag Day (observed)
-REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
-REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
-OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
-OMIT 4 July MSG Independence Day
-REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
-REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 6] MSG Manu'a Islands Cession Day (observed)
-OMIT 16 July MSG Manu'a Islands Cession Day
-REM 17 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 0] MSG Manu'a Islands Cession Day (observed)
-REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
-REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
-REM Second Sunday in October ADDOMIT SCANFROM -28 MSG White Sunday
-REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
-OMIT 11 November MSG Veterans Day
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
-REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+OMIT 1 January MSG %"New Year's Day%" %! %b.
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG %"Martin Luther King Jr. Day%" %! %b.
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG %"Washington's Birthday%" %! %b.
+REM 16 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG %"American Samoa Flag Day (observed)%" %! %b.
+OMIT 17 April MSG %"American Samoa Flag Day%" %! %b.
+REM 18 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"American Samoa Flag Day (observed)%" %! %b.
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG %"Memorial Day%" %! %b.
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG %"Juneteenth National Independence Day (observed)%" %! %b.
+OMIT 19 June MSG %"Juneteenth National Independence Day%" %! %b.
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Juneteenth National Independence Day (observed)%" %! %b.
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG %"Independence Day (observed)%" %! %b.
+OMIT 4 July MSG %"Independence Day%" %! %b.
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Independence Day (observed)%" %! %b.
+REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG %"Manu'a Islands Cession Day (observed)%" %! %b.
+OMIT 16 July MSG %"Manu'a Islands Cession Day%" %! %b.
+REM 17 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Manu'a Islands Cession Day (observed)%" %! %b.
+REM First Monday in September ADDOMIT SCANFROM -28 MSG %"Labor Day%" %! %b.
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG %"Columbus Day%" %! %b.
+REM Second Sunday in October ADDOMIT SCANFROM -28 MSG %"White Sunday%" %! %b.
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG %"Veterans Day (observed)%" %! %b.
+OMIT 11 November MSG %"Veterans Day%" %! %b.
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Veterans Day (observed)%" %! %b.
+REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG %"Thanksgiving%" %! %b.
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG %"Christmas Day (observed)%" %! %b.
+OMIT 25 December MSG %"Christmas Day%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Christmas Day (observed)%" %! %b.
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG %"New Year's Day (observed)%" %! %b.

 # Optional holidays
-REM 14 February MSG Valentine's Day
-REM 17 March MSG Saint Patrick's Day
-REM 31 October MSG Halloween
+REM 14 February MSG %"Valentine's Day%" %! %b.
+REM 17 March MSG %"Saint Patrick's Day%" %! %b.
+REM 31 October MSG %"Halloween%" %! %b.
--- a/include/holidays/at.rem
+++ b/include/holidays/at.rem
@@ -12,21 +12,21 @@
 # one of the regional *.rem files in the directory
 # [$SysInclude]/holidays/at/

-OMIT 1 January MSG Neujahr
-OMIT 6 January MSG Heilige Drei Könige
-OMIT [easterdate($Uy)+1] MSG Ostermontag
-OMIT 1 May MSG Staatsfeiertag
-OMIT [easterdate($Uy)+39] MSG Christi Himmelfahrt
-OMIT [easterdate($Uy)+50] MSG Pfingstmontag
-OMIT [easterdate($Uy)+60] MSG Fronleichnam
-OMIT 15 August MSG Mariä Himmelfahrt
-OMIT 26 October MSG Nationalfeiertag
-OMIT 1 November MSG Allerheiligen
-OMIT 8 December MSG Mariä Empfängnis
-OMIT 25 December MSG Christtag
-OMIT 26 December MSG Stefanitag
+OMIT 1 January MSG %"Neujahr%" %! %b.
+OMIT 6 January MSG %"Heilige Drei Könige%" %! %b.
+OMIT [easterdate($Uy)+1] MSG %"Ostermontag%" %! %b.
+OMIT 1 May MSG %"Staatsfeiertag%" %! %b.
+OMIT [easterdate($Uy)+39] MSG %"Christi Himmelfahrt%" %! %b.
+OMIT [easterdate($Uy)+50] MSG %"Pfingstmontag%" %! %b.
+OMIT [easterdate($Uy)+60] MSG %"Fronleichnam%" %! %b.
+OMIT 15 August MSG %"Mariä Himmelfahrt%" %! %b.
+OMIT 26 October MSG %"Nationalfeiertag%" %! %b.
+OMIT 1 November MSG %"Allerheiligen%" %! %b.
+OMIT 8 December MSG %"Mariä Empfängnis%" %! %b.
+OMIT 25 December MSG %"Christtag%" %! %b.
+OMIT 26 December MSG %"Stefanitag%" %! %b.

 # Optional holidays
-REM [easterdate($Uy)-2] MSG Karfreitag
-REM 24 December MSG Heiliger Abend
-REM 31 December MSG Silvester
+REM [easterdate($Uy)-2] MSG %"Karfreitag%" %! %b.
+REM 24 December MSG %"Heiliger Abend%" %! %b.
+REM 31 December MSG %"Silvester%" %! %b.
--- a/include/holidays/at/1.rem
+++ b/include/holidays/at/1.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem


 # Optional holidays
-REM 11 November MSG Hl. Martin
+REM 11 November MSG %"Hl. Martin%" %! %b.
--- a/include/holidays/at/2.rem
+++ b/include/holidays/at/2.rem
@@ -8,9 +8,9 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem


 # Optional holidays
-REM 19 March MSG Hl. Josef
-REM 10 October MSG Tag der Volksabstimmung
+REM 19 March MSG %"Hl. Josef%" %! %b.
+REM 10 October MSG %"Tag der Volksabstimmung%" %! %b.
--- a/include/holidays/at/3.rem
+++ b/include/holidays/at/3.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem


 # Optional holidays
-REM 15 November MSG Hl. Leopold
+REM 15 November MSG %"Hl. Leopold%" %! %b.
--- a/include/holidays/at/4.rem
+++ b/include/holidays/at/4.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem


 # Optional holidays
-REM 4 May MSG Hl. Florian
+REM 4 May MSG %"Hl. Florian%" %! %b.
--- a/include/holidays/at/5.rem
+++ b/include/holidays/at/5.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem


 # Optional holidays
-REM 24 September MSG Hl. Rupert
+REM 24 September MSG %"Hl. Rupert%" %! %b.
--- a/include/holidays/at/6.rem
+++ b/include/holidays/at/6.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem


 # Optional holidays
-REM 19 March MSG Hl. Josef
+REM 19 March MSG %"Hl. Josef%" %! %b.
--- a/include/holidays/at/7.rem
+++ b/include/holidays/at/7.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem


 # Optional holidays
-REM 19 March MSG Hl. Josef
+REM 19 March MSG %"Hl. Josef%" %! %b.
--- a/include/holidays/at/8.rem
+++ b/include/holidays/at/8.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem


 # Optional holidays
-REM 19 March MSG Hl. Josef
+REM 19 March MSG %"Hl. Josef%" %! %b.
--- a/include/holidays/at/9.rem
+++ b/include/holidays/at/9.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem


 # Optional holidays
-REM 15 November MSG Hl. Leopold
+REM 15 November MSG %"Hl. Leopold%" %! %b.
--- a/include/holidays/au.rem
+++ b/include/holidays/au.rem
@@ -12,10 +12,10 @@
 # one of the regional *.rem files in the directory
 # [$SysInclude]/holidays/au/

-OMIT 1 January MSG New Year's Day
-OMIT 26 January MSG Australia Day
-OMIT [easterdate($Uy)-2] MSG Good Friday
-OMIT [easterdate($Uy)+1] MSG Easter Monday
-OMIT 25 April MSG ANZAC Day
-OMIT 25 December MSG Christmas Day
-OMIT 26 December MSG Boxing Day
+OMIT 1 January MSG %"New Year's Day%" %! %b.
+OMIT 26 January MSG %"Australia Day%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Good Friday%" %! %b.
+OMIT [easterdate($Uy)+1] MSG %"Easter Monday%" %! %b.
+OMIT 25 April MSG %"ANZAC Day%" %! %b.
+OMIT 25 December MSG %"Christmas Day%" %! %b.
+OMIT 26 December MSG %"Boxing Day%" %! %b.
--- a/include/holidays/au/act.rem
+++ b/include/holidays/au/act.rem
@@ -8,20 +8,20 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March ADDOMIT SCANFROM -28 MSG Canberra Day
-OMIT [easterdate($Uy)-1] MSG Easter Saturday
-OMIT [easterdate($Uy)] MSG Easter Sunday
-REM Monday 27 May ADDOMIT SCANFROM -28 MSG Reconciliation Day
-REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
-REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"New Year's Day (observed)%" %! %b.
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG %"Canberra Day%" %! %b.
+OMIT [easterdate($Uy)-1] MSG %"Easter Saturday%" %! %b.
+OMIT [easterdate($Uy)] MSG %"Easter Sunday%" %! %b.
+REM Monday 27 May ADDOMIT SCANFROM -28 MSG %"Reconciliation Day%" %! %b.
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG %"King's Birthday%" %! %b.
+REM First Monday in October ADDOMIT SCANFROM -28 MSG %"Labour Day%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Christmas Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Christmas Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Boxing Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Boxing Day (observed)%" %! %b.

 # Optional holidays
-REM First Monday in August SCANFROM -28 MSG Bank Holiday
+REM First Monday in August SCANFROM -28 MSG %"Bank Holiday%" %! %b.
--- a/include/holidays/au/nsw.rem
+++ b/include/holidays/au/nsw.rem
@@ -8,18 +8,18 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-OMIT [easterdate($Uy)-1] MSG Easter Saturday
-OMIT [easterdate($Uy)] MSG Easter Sunday
-REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
-REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"New Year's Day (observed)%" %! %b.
+OMIT [easterdate($Uy)-1] MSG %"Easter Saturday%" %! %b.
+OMIT [easterdate($Uy)] MSG %"Easter Sunday%" %! %b.
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG %"King's Birthday%" %! %b.
+REM First Monday in October ADDOMIT SCANFROM -28 MSG %"Labour Day%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Christmas Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Christmas Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Boxing Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Boxing Day (observed)%" %! %b.

 # Optional holidays
-REM First Monday in August SCANFROM -28 MSG Bank Holiday
+REM First Monday in August SCANFROM -28 MSG %"Bank Holiday%" %! %b.
--- a/include/holidays/au/nt.rem
+++ b/include/holidays/au/nt.rem
@@ -8,21 +8,21 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-OMIT [easterdate($Uy)-1] MSG Easter Saturday
-OMIT [easterdate($Uy)] MSG Easter Sunday
-REM First Monday in May ADDOMIT SCANFROM -28 MSG May Day
-REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
-REM First Monday in August ADDOMIT SCANFROM -28 MSG Picnic Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"New Year's Day (observed)%" %! %b.
+OMIT [easterdate($Uy)-1] MSG %"Easter Saturday%" %! %b.
+OMIT [easterdate($Uy)] MSG %"Easter Sunday%" %! %b.
+REM First Monday in May ADDOMIT SCANFROM -28 MSG %"May Day%" %! %b.
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG %"King's Birthday%" %! %b.
+REM First Monday in August ADDOMIT SCANFROM -28 MSG %"Picnic Day%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Christmas Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG %"Boxing Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Christmas Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Boxing Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Boxing Day (observed)%" %! %b.

 # Optional holidays
-REM 24 December MSG Christmas Eve (from 7pm)
-REM 31 December MSG New Year's Eve (from 7pm)
+REM 24 December MSG %"Christmas Eve (from 7pm)%" %! %b.
+REM 31 December MSG %"New Year's Eve (from 7pm)%" %! %b.
--- a/include/holidays/au/qld.rem
+++ b/include/holidays/au/qld.rem
@@ -8,16 +8,16 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-OMIT [easterdate($Uy)-1] MSG Easter Saturday
-OMIT [easterdate($Uy)] MSG Easter Sunday
-REM First Monday in May ADDOMIT SCANFROM -28 MSG Labour Day
-REM Wednesday 10 August ADDOMIT SCANFROM -28 MSG The Royal Queensland Show
-REM First Monday in October ADDOMIT SCANFROM -28 MSG King's Birthday
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"New Year's Day (observed)%" %! %b.
+OMIT [easterdate($Uy)-1] MSG %"Easter Saturday%" %! %b.
+OMIT [easterdate($Uy)] MSG %"Easter Sunday%" %! %b.
+REM First Monday in May ADDOMIT SCANFROM -28 MSG %"Labour Day%" %! %b.
+REM Wednesday 10 August ADDOMIT SCANFROM -28 MSG %"The Royal Queensland Show%" %! %b.
+REM First Monday in October ADDOMIT SCANFROM -28 MSG %"King's Birthday%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Christmas Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Christmas Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Boxing Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Boxing Day (observed)%" %! %b.
--- a/include/holidays/au/sa.rem
+++ b/include/holidays/au/sa.rem
@@ -8,22 +8,22 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March ADDOMIT SCANFROM -28 MSG Adelaide Cup Day
-OMIT [easterdate($Uy)-1] MSG Easter Saturday
-OMIT [easterdate($Uy)] MSG Easter Sunday
-REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
-REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
-OMIT 26 December MSG Proclamation Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Proclamation Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Proclamation Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Proclamation Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"New Year's Day (observed)%" %! %b.
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG %"Adelaide Cup Day%" %! %b.
+OMIT [easterdate($Uy)-1] MSG %"Easter Saturday%" %! %b.
+OMIT [easterdate($Uy)] MSG %"Easter Sunday%" %! %b.
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG %"King's Birthday%" %! %b.
+REM First Monday in October ADDOMIT SCANFROM -28 MSG %"Labour Day%" %! %b.
+OMIT 26 December MSG %"Proclamation Day%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Christmas Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG %"Proclamation Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Christmas Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Proclamation Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Proclamation Day (observed)%" %! %b.

 # Optional holidays
-REM 24 December MSG Christmas Eve (from 7pm)
-REM 31 December MSG New Year's Eve (from 7pm)
+REM 24 December MSG %"Christmas Eve (from 7pm)%" %! %b.
+REM 31 December MSG %"New Year's Eve (from 7pm)%" %! %b.
--- a/include/holidays/au/tas.rem
+++ b/include/holidays/au/tas.rem
@@ -8,9 +8,9 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem

-REM Second Monday in March ADDOMIT SCANFROM -28 MSG Eight Hours Day
-REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG %"Eight Hours Day%" %! %b.
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG %"King's Birthday%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Christmas Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Christmas Day (observed)%" %! %b.
--- a/include/holidays/au/vic.rem
+++ b/include/holidays/au/vic.rem
@@ -8,17 +8,17 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
-OMIT [easterdate($Uy)-1] MSG Easter Saturday
-OMIT [easterdate($Uy)] MSG Easter Sunday
-REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
-REM Saturday 1 October --8 ADDOMIT SCANFROM -28 MSG Grand Final Day
-REM First Tuesday in November ADDOMIT SCANFROM -28 MSG Melbourne Cup Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"New Year's Day (observed)%" %! %b.
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG %"Labour Day%" %! %b.
+OMIT [easterdate($Uy)-1] MSG %"Easter Saturday%" %! %b.
+OMIT [easterdate($Uy)] MSG %"Easter Sunday%" %! %b.
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG %"King's Birthday%" %! %b.
+REM Saturday 1 October --8 ADDOMIT SCANFROM -28 MSG %"Grand Final Day%" %! %b.
+REM First Tuesday in November ADDOMIT SCANFROM -28 MSG %"Melbourne Cup Day%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Christmas Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Christmas Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Boxing Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Boxing Day (observed)%" %! %b.
--- a/include/holidays/au/wa.rem
+++ b/include/holidays/au/wa.rem
@@ -8,17 +8,17 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM First Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
-OMIT [easterdate($Uy)] MSG Easter Sunday
-REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG ANZAC Day (observed)
-REM 27 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG ANZAC Day (observed)
-REM First Monday in June ADDOMIT SCANFROM -28 MSG Western Australia Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"New Year's Day (observed)%" %! %b.
+REM First Monday in March ADDOMIT SCANFROM -28 MSG %"Labour Day%" %! %b.
+OMIT [easterdate($Uy)] MSG %"Easter Sunday%" %! %b.
+REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"ANZAC Day (observed)%" %! %b.
+REM 27 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"ANZAC Day (observed)%" %! %b.
+REM First Monday in June ADDOMIT SCANFROM -28 MSG %"Western Australia Day%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Christmas Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG %"Boxing Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Christmas Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Boxing Day (observed)%" %! %b.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Boxing Day (observed)%" %! %b.
--- a/include/holidays/aw.rem
+++ b/include/holidays/aw.rem
@@ -5,15 +5,15 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG Aña Nobo
-OMIT 25 January MSG Dia di Betico
-OMIT [easterdate($Uy)-48] MSG Dialuna prome cu diaranson di shinish
-OMIT 18 March MSG Dia di Himno y Bandera
-OMIT [easterdate($Uy)-2] MSG Bierna Santo
-OMIT [easterdate($Uy)+1] MSG Di dos dia di Pasco di Resureccion
-OMIT 1 May MSG Dia di Obrero
-OMIT [easterdate($Uy)+39] MSG Dia di Asuncion
-REM 31 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Dia di Rey
-REM 1 September ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Dia di Rey
-OMIT 25 December MSG Pasco di Nacemento
-OMIT 26 December MSG Di dos dia di Pasco di Nacemento
+OMIT 1 January MSG %"Aña Nobo%" %! %b.
+OMIT 25 January MSG %"Dia di Betico%" %! %b.
+OMIT [easterdate($Uy)-48] MSG %"Dialuna prome cu diaranson di shinish%" %! %b.
+OMIT 18 March MSG %"Dia di Himno y Bandera%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Bierna Santo%" %! %b.
+OMIT [easterdate($Uy)+1] MSG %"Di dos dia di Pasco di Resureccion%" %! %b.
+OMIT 1 May MSG %"Dia di Obrero%" %! %b.
+OMIT [easterdate($Uy)+39] MSG %"Dia di Asuncion%" %! %b.
+REM 31 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG %"Dia di Rey%" %! %b.
+REM 1 September ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG %"Dia di Rey%" %! %b.
+OMIT 25 December MSG %"Pasco di Nacemento%" %! %b.
+OMIT 26 December MSG %"Di dos dia di Pasco di Nacemento%" %! %b.
--- a/include/holidays/az.rem
+++ b/include/holidays/az.rem
@@ -5,40 +5,40 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG Yeni il bayramı
-REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG Yeni il bayramı (müşahidə olunur)
-OMIT 2 January MSG Yeni il bayramı
-REM 2 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2))==0 || wkdaynum(date($Ty, 1, 2))==6] MSG Yeni il bayramı (müşahidə olunur)
-OMIT 20 January MSG Ümumxalq hüzn günü
-OMIT 8 March MSG Qadınlar günü
-REM 8 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8))==0 || wkdaynum(date($Ty, 3, 8))==6] MSG Qadınlar günü (müşahidə olunur)
-OMIT 20 March MSG Novruz bayramı
-REM 20 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 20))==0 || wkdaynum(date($Ty, 3, 20))==6] MSG Novruz bayramı (müşahidə olunur)
-OMIT 21 March MSG Novruz bayramı
-REM 21 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 21))==0 || wkdaynum(date($Ty, 3, 21))==6] MSG Novruz bayramı (müşahidə olunur)
-OMIT 22 March MSG Novruz bayramı
-REM 22 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 22))==0 || wkdaynum(date($Ty, 3, 22))==6] MSG Novruz bayramı (müşahidə olunur)
-OMIT 23 March MSG Novruz bayramı
-REM 23 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 23))==0 || wkdaynum(date($Ty, 3, 23))==6] MSG Novruz bayramı (müşahidə olunur)
-OMIT 24 March MSG Novruz bayramı
-REM 24 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 24))==0 || wkdaynum(date($Ty, 3, 24))==6] MSG Novruz bayramı (müşahidə olunur)
-OMIT 9 May MSG Faşizm üzərində qələbə günü
-REM 9 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9))==0 || wkdaynum(date($Ty, 5, 9))==6] MSG Faşizm üzərində qələbə günü (müşahidə olunur)
-OMIT 28 May MSG Müstəqillik Günü
-REM 28 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 28))==0 || wkdaynum(date($Ty, 5, 28))==6] MSG Müstəqillik Günü (müşahidə olunur)
-OMIT 15 June MSG Azərbaycan xalqının milli qurtuluş günü
-REM 15 June OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 15))==0 || wkdaynum(date($Ty, 6, 15))==6] MSG Azərbaycan xalqının milli qurtuluş günü (müşahidə olunur)
-OMIT 26 June MSG Azərbaycan Respublikasının Silahlı Qüvvələri günü
-REM 26 June OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 26))==0 || wkdaynum(date($Ty, 6, 26))==6] MSG Azərbaycan Respublikasının Silahlı Qüvvələri günü (müşahidə olunur)
-OMIT 8 November MSG Zəfər Günü
-REM 8 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 8))==0 || wkdaynum(date($Ty, 11, 8))==6] MSG Zəfər Günü (müşahidə olunur)
-OMIT 9 November MSG Azərbaycan Respublikasının Dövlət bayrağı günü
-REM 9 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 9))==0 || wkdaynum(date($Ty, 11, 9))==6] MSG Azərbaycan Respublikasının Dövlət bayrağı günü (müşahidə olunur)
-OMIT 31 December MSG Dünya azərbaycanlılarının həmrəyliyi günü
-REM 31 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31))==0 || wkdaynum(date($Ty, 12, 31))==6] MSG Dünya azərbaycanlılarının həmrəyliyi günü (müşahidə olunur)
+OMIT 1 January MSG %"Yeni il bayramı%" %! %b.
+REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 1, 1)), 0, 6)] MSG %"Yeni il bayramı (müşahidə olunur)%" %! %b.
+OMIT 2 January MSG %"Yeni il bayramı%" %! %b.
+REM 2 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 1, 2)), 0, 6)] MSG %"Yeni il bayramı (müşahidə olunur)%" %! %b.
+OMIT 20 January MSG %"Ümumxalq hüzn günü%" %! %b.
+OMIT 8 March MSG %"Qadınlar günü%" %! %b.
+REM 8 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 8)), 0, 6)] MSG %"Qadınlar günü (müşahidə olunur)%" %! %b.
+OMIT 20 March MSG %"Novruz bayramı%" %! %b.
+REM 20 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 20)), 0, 6)] MSG %"Novruz bayramı (müşahidə olunur)%" %! %b.
+OMIT 21 March MSG %"Novruz bayramı%" %! %b.
+REM 21 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 21)), 0, 6)] MSG %"Novruz bayramı (müşahidə olunur)%" %! %b.
+OMIT 22 March MSG %"Novruz bayramı%" %! %b.
+REM 22 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 22)), 0, 6)] MSG %"Novruz bayramı (müşahidə olunur)%" %! %b.
+OMIT 23 March MSG %"Novruz bayramı%" %! %b.
+REM 23 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 23)), 0, 6)] MSG %"Novruz bayramı (müşahidə olunur)%" %! %b.
+OMIT 24 March MSG %"Novruz bayramı%" %! %b.
+REM 24 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 24)), 0, 6)] MSG %"Novruz bayramı (müşahidə olunur)%" %! %b.
+OMIT 9 May MSG %"Faşizm üzərində qələbə günü%" %! %b.
+REM 9 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 9)), 0, 6)] MSG %"Faşizm üzərində qələbə günü (müşahidə olunur)%" %! %b.
+OMIT 28 May MSG %"Müstəqillik Günü%" %! %b.
+REM 28 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 28)), 0, 6)] MSG %"Müstəqillik Günü (müşahidə olunur)%" %! %b.
+OMIT 15 June MSG %"Azərbaycan xalqının milli qurtuluş günü%" %! %b.
+REM 15 June OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 6, 15)), 0, 6)] MSG %"Azərbaycan xalqının milli qurtuluş günü (müşahidə olunur)%" %! %b.
+OMIT 26 June MSG %"Azərbaycan Respublikasının Silahlı Qüvvələri günü%" %! %b.
+REM 26 June OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 6, 26)), 0, 6)] MSG %"Azərbaycan Respublikasının Silahlı Qüvvələri günü (müşahidə olunur)%" %! %b.
+OMIT 8 November MSG %"Zəfər Günü%" %! %b.
+REM 8 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 11, 8)), 0, 6)] MSG %"Zəfər Günü (müşahidə olunur)%" %! %b.
+OMIT 9 November MSG %"Azərbaycan Respublikasının Dövlət bayrağı günü%" %! %b.
+REM 9 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 11, 9)), 0, 6)] MSG %"Azərbaycan Respublikasının Dövlət bayrağı günü (müşahidə olunur)%" %! %b.
+OMIT 31 December MSG %"Dünya azərbaycanlılarının həmrəyliyi günü%" %! %b.
+REM 31 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 31)), 0, 6)] MSG %"Dünya azərbaycanlılarının həmrəyliyi günü (müşahidə olunur)%" %! %b.

 # Optional holidays
-REM 27 September MSG Anım Günü
-REM 18 October MSG Müstəqilliyin Bərpası Günü
-REM 12 November MSG Konstitusiya Günü
-REM 17 November MSG Milli Dirçəliş Günü
+REM 27 September MSG %"Anım Günü%" %! %b.
+REM 18 October MSG %"Müstəqilliyin Bərpası Günü%" %! %b.
+REM 12 November MSG %"Konstitusiya Günü%" %! %b.
+REM 17 November MSG %"Milli Dirçəliş Günü%" %! %b.
--- a/include/holidays/ba.rem
+++ b/include/holidays/ba.rem
@@ -12,11 +12,11 @@
 # one of the regional *.rem files in the directory
 # [$SysInclude]/holidays/ba/

-OMIT 1 January MSG Nova godina
-OMIT 2 January MSG Nova godina
-OMIT 7 January MSG Božić (Pravoslavni)
-OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Pravoslavni)
-OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Katolički)
-OMIT 1 May MSG Međunarodni praznik rada
-OMIT 2 May MSG Međunarodni praznik rada
-OMIT 25 December MSG Božić (Katolički)
+OMIT 1 January MSG %"Nova godina%" %! %b.
+OMIT 2 January MSG %"Nova godina%" %! %b.
+OMIT 7 January MSG %"Božić (Pravoslavni)%" %! %b.
+OMIT [orthodoxeaster($Uy)-2] MSG %"Veliki petak (Pravoslavni)%" %! %b.
+OMIT [orthodoxeaster($Uy)+1] MSG %"Uskrsni ponedjeljak (Katolički)%" %! %b.
+OMIT 1 May MSG %"Međunarodni praznik rada%" %! %b.
+OMIT 2 May MSG %"Međunarodni praznik rada%" %! %b.
+OMIT 25 December MSG %"Božić (Katolički)%" %! %b.
--- a/include/holidays/ba/bih.rem
+++ b/include/holidays/ba/bih.rem
@@ -8,16 +8,16 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ba.rem
+# also SYSINCLUDE holidays/ba.rem

-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
-OMIT 6 January MSG Badnji dan (Pravoslavni)
-OMIT 1 March MSG Dan nezavisnosti
-OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Katolički)
-OMIT [orthodoxeaster($Uy)] MSG Uskrs (Katolički)
-OMIT [orthodoxeaster($Uy)] MSG Vaskrs (Pravoslavni)
-OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
-OMIT 9 May MSG Dan pobjede nad fašizmom
-OMIT 25 November MSG Dan državnosti
-OMIT 24 December MSG Badnji dan (Katolički)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Nova godina (preneseno)%" %! %b.
+OMIT 6 January MSG %"Badnji dan (Pravoslavni)%" %! %b.
+OMIT 1 March MSG %"Dan nezavisnosti%" %! %b.
+OMIT [orthodoxeaster($Uy)-2] MSG %"Veliki petak (Katolički)%" %! %b.
+OMIT [orthodoxeaster($Uy)] MSG %"Uskrs (Katolički)%" %! %b.
+OMIT [orthodoxeaster($Uy)] MSG %"Vaskrs (Pravoslavni)%" %! %b.
+OMIT [orthodoxeaster($Uy)+1] MSG %"Uskrsni ponedjeljak (Pravoslavni)%" %! %b.
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Međunarodni praznik rada (preneseno)%" %! %b.
+OMIT 9 May MSG %"Dan pobjede nad fašizmom%" %! %b.
+OMIT 25 November MSG %"Dan državnosti%" %! %b.
+OMIT 24 December MSG %"Badnji dan (Katolički)%" %! %b.
--- a/include/holidays/ba/brc.rem
+++ b/include/holidays/ba/brc.rem
@@ -8,13 +8,13 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ba.rem
+# also SYSINCLUDE holidays/ba.rem

-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
-REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Božić (Pravoslavni) (preneseno)
-OMIT 8 March MSG Dan uspostavljanja Brčko distrikta
-REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG Dan uspostavljanja Brčko distrikta (preneseno)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Božić (Katolički) (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Nova godina (preneseno)%" %! %b.
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Nova godina (preneseno)%" %! %b.
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Božić (Pravoslavni) (preneseno)%" %! %b.
+OMIT 8 March MSG %"Dan uspostavljanja Brčko distrikta%" %! %b.
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Dan uspostavljanja Brčko distrikta (preneseno)%" %! %b.
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Međunarodni praznik rada (preneseno)%" %! %b.
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Međunarodni praznik rada (preneseno)%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Božić (Katolički) (preneseno)%" %! %b.
--- a/include/holidays/ba/srp.rem
+++ b/include/holidays/ba/srp.rem
@@ -8,16 +8,16 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ba.rem
+# also SYSINCLUDE holidays/ba.rem

-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
-OMIT 6 January MSG Badnji dan (Pravoslavni)
-OMIT 14 January MSG Pravoslavna Nova godina
-OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Katolički)
-OMIT [orthodoxeaster($Uy)] MSG Uskrs (Katolički)
-OMIT [orthodoxeaster($Uy)] MSG Vaskrs (Pravoslavni)
-OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
-OMIT 9 May MSG Dan pobjede nad fašizmom
-OMIT 21 November MSG Dan uspostave Opšteg okvirnog sporazuma za mir u Bosni i Hercegovini
-OMIT 24 December MSG Badnji dan (Katolički)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Nova godina (preneseno)%" %! %b.
+OMIT 6 January MSG %"Badnji dan (Pravoslavni)%" %! %b.
+OMIT 14 January MSG %"Pravoslavna Nova godina%" %! %b.
+OMIT [orthodoxeaster($Uy)-2] MSG %"Veliki petak (Katolički)%" %! %b.
+OMIT [orthodoxeaster($Uy)] MSG %"Uskrs (Katolički)%" %! %b.
+OMIT [orthodoxeaster($Uy)] MSG %"Vaskrs (Pravoslavni)%" %! %b.
+OMIT [orthodoxeaster($Uy)+1] MSG %"Uskrsni ponedjeljak (Pravoslavni)%" %! %b.
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Međunarodni praznik rada (preneseno)%" %! %b.
+OMIT 9 May MSG %"Dan pobjede nad fašizmom%" %! %b.
+OMIT 21 November MSG %"Dan uspostave Opšteg okvirnog sporazuma za mir u Bosni i Hercegovini%" %! %b.
+OMIT 24 December MSG %"Badnji dan (Katolički)%" %! %b.
--- a/include/holidays/bb.rem
+++ b/include/holidays/bb.rem
@@ -5,24 +5,24 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-OMIT 21 January MSG Errol Barrow Day
-REM 22 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 21)) == 0] MSG Errol Barrow Day (observed)
-OMIT [easterdate($Uy)-2] MSG Good Friday
-OMIT [easterdate($Uy)+1] MSG Easter Monday
-OMIT 28 April MSG National Heroes Day
-REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG National Heroes Day (observed)
-OMIT 1 May MSG May Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
-OMIT [easterdate($Uy)+50] MSG Whit Monday
-OMIT 1 August MSG Emancipation Day
-REM First Monday in August ADDOMIT SCANFROM -28 MSG Kadooment Day
-REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 1] MSG Emancipation Day (observed)
-REM 3 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
-OMIT 30 November MSG Independence Day
-REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Independence Day (observed)
-OMIT 25 December MSG Christmas Day
-OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+OMIT 1 January MSG %"New Year's Day%" %! %b.
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+OMIT 21 January MSG %"Errol Barrow Day%" %! %b.
+REM 22 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Errol Barrow Day (observed)%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Good Friday%" %! %b.
+OMIT [easterdate($Uy)+1] MSG %"Easter Monday%" %! %b.
+OMIT 28 April MSG %"National Heroes Day%" %! %b.
+REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"National Heroes Day (observed)%" %! %b.
+OMIT 1 May MSG %"May Day%" %! %b.
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"May Day (observed)%" %! %b.
+OMIT [easterdate($Uy)+50] MSG %"Whit Monday%" %! %b.
+OMIT 1 August MSG %"Emancipation Day%" %! %b.
+REM First Monday in August ADDOMIT SCANFROM -28 MSG %"Kadooment Day%" %! %b.
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG %"Emancipation Day (observed)%" %! %b.
+REM 3 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Emancipation Day (observed)%" %! %b.
+OMIT 30 November MSG %"Independence Day%" %! %b.
+REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Independence Day (observed)%" %! %b.
+OMIT 25 December MSG %"Christmas Day%" %! %b.
+OMIT 26 December MSG %"Boxing Day%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Boxing Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Christmas Day (observed)%" %! %b.
--- a/include/holidays/bd.rem
+++ b/include/holidays/bd.rem
@@ -5,10 +5,10 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 21 February MSG International Mother's language Day
-OMIT 17 March MSG Sheikh Mujibur Rahman's Birthday and Children's Day
-OMIT 26 March MSG Independence Day
-OMIT 14 April MSG Bengali New Year's Day
-OMIT 1 May MSG May Day
-OMIT 15 August MSG National Mourning Day
-OMIT 16 December MSG Victory Day
+OMIT 21 February MSG %"International Mother's language Day%" %! %b.
+OMIT 17 March MSG %"Sheikh Mujibur Rahman's Birthday and Children's Day%" %! %b.
+OMIT 26 March MSG %"Independence Day%" %! %b.
+OMIT 14 April MSG %"Bengali New Year's Day%" %! %b.
+OMIT 1 May MSG %"May Day%" %! %b.
+OMIT 15 August MSG %"National Mourning Day%" %! %b.
+OMIT 16 December MSG %"Victory Day%" %! %b.
--- a/include/holidays/be.rem
+++ b/include/holidays/be.rem
@@ -5,20 +5,20 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG Nieuwjaar
-OMIT [easterdate($Uy)] MSG Pasen
-OMIT [easterdate($Uy)+1] MSG Paasmaandag
-OMIT 1 May MSG Dag van de Arbeid
-OMIT [easterdate($Uy)+39] MSG O. L. H. Hemelvaart
-OMIT [easterdate($Uy)+49] MSG Pinksteren
-OMIT [easterdate($Uy)+50] MSG Pinkstermaandag
-OMIT 21 July MSG Nationale feestdag
-OMIT 15 August MSG O. L. V. Hemelvaart
-OMIT 1 November MSG Allerheiligen
-OMIT 11 November MSG Wapenstilstand
-OMIT 25 December MSG Kerstmis
+OMIT 1 January MSG %"Nieuwjaar%" %! %b.
+OMIT [easterdate($Uy)] MSG %"Pasen%" %! %b.
+OMIT [easterdate($Uy)+1] MSG %"Paasmaandag%" %! %b.
+OMIT 1 May MSG %"Dag van de Arbeid%" %! %b.
+OMIT [easterdate($Uy)+39] MSG %"O. L. H. Hemelvaart%" %! %b.
+OMIT [easterdate($Uy)+49] MSG %"Pinksteren%" %! %b.
+OMIT [easterdate($Uy)+50] MSG %"Pinkstermaandag%" %! %b.
+OMIT 21 July MSG %"Nationale feestdag%" %! %b.
+OMIT 15 August MSG %"O. L. V. Hemelvaart%" %! %b.
+OMIT 1 November MSG %"Allerheiligen%" %! %b.
+OMIT 11 November MSG %"Wapenstilstand%" %! %b.
+OMIT 25 December MSG %"Kerstmis%" %! %b.

 # Optional holidays
-REM [easterdate($Uy)-2] MSG Goede Vrijdag
-REM [easterdate($Uy)+40] MSG Vrijdag na O. L. H. Hemelvaart
-REM 26 December MSG Banksluitingsdag
+REM [easterdate($Uy)-2] MSG %"Goede Vrijdag%" %! %b.
+REM [easterdate($Uy)+40] MSG %"Vrijdag na O. L. H. Hemelvaart%" %! %b.
+REM 26 December MSG %"Banksluitingsdag%" %! %b.
--- a/include/holidays/bf.rem
+++ b/include/holidays/bf.rem
@@ -5,25 +5,25 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-OMIT 3 January MSG Revolution Day
-REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 3)) == 0] MSG Revolution Day (observed)
-OMIT 8 March MSG International Women's Day
-REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
-OMIT [easterdate($Uy)+1] MSG Easter Monday
-OMIT 1 May MSG Labour Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-OMIT [easterdate($Uy)+39] MSG Ascension Day
-OMIT 5 August MSG Independence Day
-REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 5)) == 0] MSG Independence Day (observed)
-OMIT 15 August MSG Assumption Day
-REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
-OMIT 31 October MSG Martyrs' Day
-OMIT 1 November MSG All Saints' Day
-REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 31)) == 0] MSG Martyrs' Day (observed)
-REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
-OMIT 11 December MSG Proclamation of Independence Day
-REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 11)) == 0] MSG Proclamation of Independence Day (observed)
-OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+OMIT 1 January MSG %"New Year's Day%" %! %b.
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+OMIT 3 January MSG %"Revolution Day%" %! %b.
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Revolution Day (observed)%" %! %b.
+OMIT 8 March MSG %"International Women's Day%" %! %b.
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"International Women's Day (observed)%" %! %b.
+OMIT [easterdate($Uy)+1] MSG %"Easter Monday%" %! %b.
+OMIT 1 May MSG %"Labour Day%" %! %b.
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Labour Day (observed)%" %! %b.
+OMIT [easterdate($Uy)+39] MSG %"Ascension Day%" %! %b.
+OMIT 5 August MSG %"Independence Day%" %! %b.
+REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Independence Day (observed)%" %! %b.
+OMIT 15 August MSG %"Assumption Day%" %! %b.
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Assumption Day (observed)%" %! %b.
+OMIT 31 October MSG %"Martyrs' Day%" %! %b.
+OMIT 1 November MSG %"All Saints' Day%" %! %b.
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Martyrs' Day (observed)%" %! %b.
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"All Saints' Day (observed)%" %! %b.
+OMIT 11 December MSG %"Proclamation of Independence Day%" %! %b.
+REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Proclamation of Independence Day (observed)%" %! %b.
+OMIT 25 December MSG %"Christmas Day%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Christmas Day (observed)%" %! %b.
--- a/include/holidays/bg.rem
+++ b/include/holidays/bg.rem
@@ -5,30 +5,30 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG Нова година
-REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG Нова година (почивен ден)
-OMIT 3 March MSG Ден на Освобождението на България от османско иго
-REM 3 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 3))==0 || wkdaynum(date($Ty, 3, 3))==6] MSG Ден на Освобождението на България от османско иго (почивен ден)
-OMIT [orthodoxeaster($Uy)-2] MSG Велики петък
-OMIT [orthodoxeaster($Uy)-1] MSG Велика събота
-OMIT [orthodoxeaster($Uy)] MSG Великден
-OMIT [orthodoxeaster($Uy)+1] MSG Великден
-OMIT 1 May MSG Ден на труда и на международната работническа солидарност
-REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1))==0 || wkdaynum(date($Ty, 5, 1))==6] MSG Ден на труда и на международната работническа солидарност (почивен ден)
-OMIT 6 May MSG Гергьовден, Ден на храбростта и Българската армия
-REM 6 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 6))==0 || wkdaynum(date($Ty, 5, 6))==6] MSG Гергьовден, Ден на храбростта и Българската армия (почивен ден)
-OMIT 24 May MSG Ден на светите братя Кирил и Методий, на българската азбука, просвета и култура и на славянската книжовност
-REM 24 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24))==0 || wkdaynum(date($Ty, 5, 24))==6] MSG Ден на светите братя Кирил и Методий, на българската азбука, просвета и култура и на славянската книжовност (почивен ден)
-OMIT 6 September MSG Ден на Съединението
-REM 6 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 6))==0 || wkdaynum(date($Ty, 9, 6))==6] MSG Ден на Съединението (почивен ден)
-OMIT 22 September MSG Ден на Независимостта на България
-REM 22 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 22))==0 || wkdaynum(date($Ty, 9, 22))==6] MSG Ден на Независимостта на България (почивен ден)
-OMIT 24 December MSG Бъдни вечер
-REM 24 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24))==0 || wkdaynum(date($Ty, 12, 24))==6] MSG Бъдни вечер (почивен ден)
-OMIT 25 December MSG Рождество Христово
-REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25))==0 || wkdaynum(date($Ty, 12, 25))==6] MSG Рождество Христово (почивен ден)
-OMIT 26 December MSG Рождество Христово
-REM 26 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26))==0 || wkdaynum(date($Ty, 12, 26))==6] MSG Рождество Христово (почивен ден)
+OMIT 1 January MSG %"Нова година%" %! %b.
+REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 1, 1)), 0, 6)] MSG %"Нова година (почивен ден)%" %! %b.
+OMIT 3 March MSG %"Ден на Освобождението на България от османско иго%" %! %b.
+REM 3 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 3)), 0, 6)] MSG %"Ден на Освобождението на България от османско иго (почивен ден)%" %! %b.
+OMIT [orthodoxeaster($Uy)-2] MSG %"Велики петък%" %! %b.
+OMIT [orthodoxeaster($Uy)-1] MSG %"Велика събота%" %! %b.
+OMIT [orthodoxeaster($Uy)] MSG %"Великден%" %! %b.
+OMIT [orthodoxeaster($Uy)+1] MSG %"Великден%" %! %b.
+OMIT 1 May MSG %"Ден на труда и на международната работническа солидарност%" %! %b.
+REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 1)), 0, 6)] MSG %"Ден на труда и на международната работническа солидарност (почивен ден)%" %! %b.
+OMIT 6 May MSG %"Гергьовден, Ден на храбростта и Българската армия%" %! %b.
+REM 6 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 6)), 0, 6)] MSG %"Гергьовден, Ден на храбростта и Българската армия (почивен ден)%" %! %b.
+OMIT 24 May MSG %"Ден на светите братя Кирил и Методий, на българската азбука, просвета и култура и на славянската книжовност%" %! %b.
+REM 24 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 24)), 0, 6)] MSG %"Ден на светите братя Кирил и Методий, на българската азбука, просвета и култура и на славянската книжовност (почивен ден)%" %! %b.
+OMIT 6 September MSG %"Ден на Съединението%" %! %b.
+REM 6 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 9, 6)), 0, 6)] MSG %"Ден на Съединението (почивен ден)%" %! %b.
+OMIT 22 September MSG %"Ден на Независимостта на България%" %! %b.
+REM 22 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 9, 22)), 0, 6)] MSG %"Ден на Независимостта на България (почивен ден)%" %! %b.
+OMIT 24 December MSG %"Бъдни вечер%" %! %b.
+REM 24 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 24)), 0, 6)] MSG %"Бъдни вечер (почивен ден)%" %! %b.
+OMIT 25 December MSG %"Рождество Христово%" %! %b.
+REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 25)), 0, 6)] MSG %"Рождество Христово (почивен ден)%" %! %b.
+OMIT 26 December MSG %"Рождество Христово%" %! %b.
+REM 26 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 26)), 0, 6)] MSG %"Рождество Христово (почивен ден)%" %! %b.

 # Optional holidays
-REM 1 November MSG Ден на народните будители
+REM 1 November MSG %"Ден на народните будители%" %! %b.
--- a/include/holidays/bh.rem
+++ b/include/holidays/bh.rem
@@ -5,7 +5,7 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG رأس السنة الميلادية
-OMIT 1 May MSG عيد العمال
-OMIT 16 December MSG اليوم الوطني
-OMIT 17 December MSG اليوم الوطني
+OMIT 1 January MSG %"رأس السنة الميلادية%" %! %b.
+OMIT 1 May MSG %"عيد العمال%" %! %b.
+OMIT 16 December MSG %"اليوم الوطني%" %! %b.
+OMIT 17 December MSG %"اليوم الوطني%" %! %b.
--- a/include/holidays/bi.rem
+++ b/include/holidays/bi.rem
@@ -5,26 +5,26 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-OMIT 5 February MSG Unity Day
-REM 6 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 5)) == 0] MSG Unity Day (observed)
-OMIT 6 April MSG President Ntaryamira Day
-REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG President Ntaryamira Day (observed)
-OMIT 1 May MSG Labour Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-OMIT [easterdate($Uy)+39] MSG Ascension Day
-OMIT 8 June MSG President Nkurunziza Day
-REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 8)) == 0] MSG President Nkurunziza Day (observed)
-OMIT 1 July MSG Independence Day
-REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Independence Day (observed)
-OMIT 15 August MSG Assumption Day
-REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
-OMIT 13 October MSG Prince Louis Rwagasore Day
-REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG Prince Louis Rwagasore Day (observed)
-OMIT 21 October MSG President Ndadaye's Day
-REM 22 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 21)) == 0] MSG President Ndadaye's Day (observed)
-OMIT 1 November MSG All Saints' Day
-REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
-OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+OMIT 1 January MSG %"New Year's Day%" %! %b.
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+OMIT 5 February MSG %"Unity Day%" %! %b.
+REM 6 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Unity Day (observed)%" %! %b.
+OMIT 6 April MSG %"President Ntaryamira Day%" %! %b.
+REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"President Ntaryamira Day (observed)%" %! %b.
+OMIT 1 May MSG %"Labour Day%" %! %b.
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Labour Day (observed)%" %! %b.
+OMIT [easterdate($Uy)+39] MSG %"Ascension Day%" %! %b.
+OMIT 8 June MSG %"President Nkurunziza Day%" %! %b.
+REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"President Nkurunziza Day (observed)%" %! %b.
+OMIT 1 July MSG %"Independence Day%" %! %b.
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Independence Day (observed)%" %! %b.
+OMIT 15 August MSG %"Assumption Day%" %! %b.
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Assumption Day (observed)%" %! %b.
+OMIT 13 October MSG %"Prince Louis Rwagasore Day%" %! %b.
+REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Prince Louis Rwagasore Day (observed)%" %! %b.
+OMIT 21 October MSG %"President Ndadaye's Day%" %! %b.
+REM 22 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"President Ndadaye's Day (observed)%" %! %b.
+OMIT 1 November MSG %"All Saints' Day%" %! %b.
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"All Saints' Day (observed)%" %! %b.
+OMIT 25 December MSG %"Christmas Day%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Christmas Day (observed)%" %! %b.
--- a/include/holidays/bn.rem
+++ b/include/holidays/bn.rem
@@ -5,18 +5,18 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG Awal Tahun Masihi
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Awal Tahun Masihi (diperhatikan)
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 5] MSG Awal Tahun Masihi (diperhatikan)
-OMIT 23 February MSG Hari Kebangsaan
-REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 23)) == 0] MSG Hari Kebangsaan (diperhatikan)
-REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 23)) == 5] MSG Hari Kebangsaan (diperhatikan)
-OMIT 31 May MSG Hari Angkatan Bersenjata Diraja Brunei
-REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 31)) == 0] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
-REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 31)) == 5] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
-OMIT 15 July MSG Hari Keputeraan KDYMM Sultan Brunei
-REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 15)) == 0] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
-REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 15)) == 5] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
-OMIT 25 December MSG Hari Natal
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Hari Natal (diperhatikan)
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 5] MSG Hari Natal (diperhatikan)
+OMIT 1 January MSG %"Awal Tahun Masihi%" %! %b.
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Awal Tahun Masihi (diperhatikan)%" %! %b.
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 5] MSG %"Awal Tahun Masihi (diperhatikan)%" %! %b.
+OMIT 23 February MSG %"Hari Kebangsaan%" %! %b.
+REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Hari Kebangsaan (diperhatikan)%" %! %b.
+REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 5] MSG %"Hari Kebangsaan (diperhatikan)%" %! %b.
+OMIT 31 May MSG %"Hari Angkatan Bersenjata Diraja Brunei%" %! %b.
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)%" %! %b.
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 5] MSG %"Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)%" %! %b.
+OMIT 15 July MSG %"Hari Keputeraan KDYMM Sultan Brunei%" %! %b.
+REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)%" %! %b.
+REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 5] MSG %"Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)%" %! %b.
+OMIT 25 December MSG %"Hari Natal%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Hari Natal (diperhatikan)%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 5] MSG %"Hari Natal (diperhatikan)%" %! %b.
--- a/include/holidays/bo.rem
+++ b/include/holidays/bo.rem
@@ -12,21 +12,21 @@
 # one of the regional *.rem files in the directory
 # [$SysInclude]/holidays/bo/

-OMIT 1 January MSG Año Nuevo
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
-OMIT 22 January MSG Día de la Creación del Estado Plurinacional de Bolivia
-REM 23 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 22)) == 0] MSG Día de la Creación del Estado Plurinacional de Bolivia (observado)
-OMIT [easterdate($Uy)-48] MSG Carnaval
-OMIT [easterdate($Uy)-47] MSG Carnaval
-OMIT [easterdate($Uy)-2] MSG Viernes Santo
-OMIT 1 May MSG Día del Trabajo
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
-OMIT [easterdate($Uy)+60] MSG Corpus Christi
-OMIT 21 June MSG Año Nuevo Aymara Amazónico
-REM 22 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 21)) == 0] MSG Año Nuevo Aymara Amazónico (observado)
-OMIT 6 August MSG Día de la Independencia de Bolivia
-REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Día de la Independencia de Bolivia (observado)
-OMIT 17 October MSG Día de la Dignidad Nacional
-OMIT 2 November MSG Día de Todos los Difuntos
-OMIT 25 December MSG Navidad
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Navidad (observado)
+OMIT 1 January MSG %"Año Nuevo%" %! %b.
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Año Nuevo (observado)%" %! %b.
+OMIT 22 January MSG %"Día de la Creación del Estado Plurinacional de Bolivia%" %! %b.
+REM 23 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Día de la Creación del Estado Plurinacional de Bolivia (observado)%" %! %b.
+OMIT [easterdate($Uy)-48] MSG %"Carnaval%" %! %b.
+OMIT [easterdate($Uy)-47] MSG %"Carnaval%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Viernes Santo%" %! %b.
+OMIT 1 May MSG %"Día del Trabajo%" %! %b.
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Día del Trabajo (observado)%" %! %b.
+OMIT [easterdate($Uy)+60] MSG %"Corpus Christi%" %! %b.
+OMIT 21 June MSG %"Año Nuevo Aymara Amazónico%" %! %b.
+REM 22 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Año Nuevo Aymara Amazónico (observado)%" %! %b.
+OMIT 6 August MSG %"Día de la Independencia de Bolivia%" %! %b.
+REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Día de la Independencia de Bolivia (observado)%" %! %b.
+OMIT 17 October MSG %"Día de la Dignidad Nacional%" %! %b.
+OMIT 2 November MSG %"Día de Todos los Difuntos%" %! %b.
+OMIT 25 December MSG %"Navidad%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Navidad (observado)%" %! %b.
--- a/include/holidays/bo/b.rem
+++ b/include/holidays/bo/b.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem

-OMIT 18 November MSG Día del departamento de Beni
+OMIT 18 November MSG %"Día del departamento de Beni%" %! %b.
--- a/include/holidays/bo/c.rem
+++ b/include/holidays/bo/c.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem

-OMIT 14 September MSG Día del departamento de Cochabamba
+OMIT 14 September MSG %"Día del departamento de Cochabamba%" %! %b.
--- a/include/holidays/bo/h.rem
+++ b/include/holidays/bo/h.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem

-OMIT 25 May MSG Día del departamento de Chuquisaca
+OMIT 25 May MSG %"Día del departamento de Chuquisaca%" %! %b.
--- a/include/holidays/bo/l.rem
+++ b/include/holidays/bo/l.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem

-OMIT 16 July MSG Día del departamento de La Paz
+OMIT 16 July MSG %"Día del departamento de La Paz%" %! %b.
--- a/include/holidays/bo/n.rem
+++ b/include/holidays/bo/n.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem

-OMIT 11 October MSG Día del departamento de Pando
+OMIT 11 October MSG %"Día del departamento de Pando%" %! %b.
--- a/include/holidays/bo/o.rem
+++ b/include/holidays/bo/o.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem

-OMIT [easterdate($Uy)-51] MSG Carnaval de Oruro
+OMIT [easterdate($Uy)-51] MSG %"Carnaval de Oruro%" %! %b.
--- a/include/holidays/bo/p.rem
+++ b/include/holidays/bo/p.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem

-OMIT 10 November MSG Día del departamento de Potosí
+OMIT 10 November MSG %"Día del departamento de Potosí%" %! %b.
--- a/include/holidays/bo/s.rem
+++ b/include/holidays/bo/s.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem

-OMIT 24 September MSG Día del departamento de Santa Cruz
+OMIT 24 September MSG %"Día del departamento de Santa Cruz%" %! %b.
--- a/include/holidays/bo/t.rem
+++ b/include/holidays/bo/t.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem

-OMIT 15 April MSG La Tablada
+OMIT 15 April MSG %"La Tablada%" %! %b.
--- a/include/holidays/br.rem
+++ b/include/holidays/br.rem
@@ -12,22 +12,22 @@
 # one of the regional *.rem files in the directory
 # [$SysInclude]/holidays/br/

-OMIT 1 January MSG Confraternização Universal
-OMIT [easterdate($Uy)-2] MSG Sexta-feira Santa
-OMIT 21 April MSG Tiradentes
-OMIT 1 May MSG Dia do Trabalhador
-OMIT 7 September MSG Independência do Brasil
-OMIT 12 October MSG Nossa Senhora Aparecida
-OMIT 2 November MSG Finados
-OMIT 15 November MSG Proclamação da República
-OMIT 20 November MSG Dia Nacional de Zumbi e da Consciência Negra
-OMIT 25 December MSG Natal
+OMIT 1 January MSG %"Confraternização Universal%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Sexta-feira Santa%" %! %b.
+OMIT 21 April MSG %"Tiradentes%" %! %b.
+OMIT 1 May MSG %"Dia do Trabalhador%" %! %b.
+OMIT 7 September MSG %"Independência do Brasil%" %! %b.
+OMIT 12 October MSG %"Nossa Senhora Aparecida%" %! %b.
+OMIT 2 November MSG %"Finados%" %! %b.
+OMIT 15 November MSG %"Proclamação da República%" %! %b.
+OMIT 20 November MSG %"Dia Nacional de Zumbi e da Consciência Negra%" %! %b.
+OMIT 25 December MSG %"Natal%" %! %b.

 # Optional holidays
-REM [easterdate($Uy)-48] MSG Carnaval
-REM [easterdate($Uy)-47] MSG Carnaval
-REM [easterdate($Uy)-46] MSG Início da Quaresma
-REM [easterdate($Uy)+60] MSG Corpus Christi
-REM 28 October MSG Dia do Servidor Público
-REM 24 December MSG Véspera de Natal
-REM 31 December MSG Véspera de Ano-Novo
+REM [easterdate($Uy)-48] MSG %"Carnaval%" %! %b.
+REM [easterdate($Uy)-47] MSG %"Carnaval%" %! %b.
+REM [easterdate($Uy)-46] MSG %"Início da Quaresma%" %! %b.
+REM [easterdate($Uy)+60] MSG %"Corpus Christi%" %! %b.
+REM 28 October MSG %"Dia do Servidor Público%" %! %b.
+REM 24 December MSG %"Véspera de Natal%" %! %b.
+REM 31 December MSG %"Véspera de Ano-Novo%" %! %b.
--- a/include/holidays/br/ac.rem
+++ b/include/holidays/br/ac.rem
@@ -8,14 +8,14 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-REM 23 January ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG Dia do Evangélico
-REM Friday 23 January ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 1, 23)) >= 2 && wkdaynum(date($Ty, 1, 23)) <= 4] MSG Dia do Evangélico
-REM 8 March ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG Dia Internacional da Mulher
-REM Friday 8 March ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 3, 8)) >= 2 && wkdaynum(date($Ty, 3, 8)) <= 4] MSG Dia Internacional da Mulher
-OMIT 15 June MSG Aniversário do Acre
-REM 23 September ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG Dia da Amazônia
-REM Friday 23 September ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 9, 23)) >= 2 && wkdaynum(date($Ty, 9, 23)) <= 4] MSG Dia da Amazônia
-REM 17 November ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG Assinatura do Tratado de Petrópolis
-REM Friday 17 November ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 11, 17)) >= 2 && wkdaynum(date($Ty, 11, 17)) <= 4] MSG Assinatura do Tratado de Petrópolis
+REM 23 January ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG %"Dia do Evangélico%" %! %b.
+REM Friday 23 January ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 1, 23)) >= 2 && wkdaynum(date($Ty, 1, 23)) <= 4] MSG %"Dia do Evangélico%" %! %b.
+REM 8 March ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG %"Dia Internacional da Mulher%" %! %b.
+REM Friday 8 March ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 3, 8)) >= 2 && wkdaynum(date($Ty, 3, 8)) <= 4] MSG %"Dia Internacional da Mulher%" %! %b.
+OMIT 15 June MSG %"Aniversário do Acre%" %! %b.
+REM 23 September ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG %"Dia da Amazônia%" %! %b.
+REM Friday 23 September ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 9, 23)) >= 2 && wkdaynum(date($Ty, 9, 23)) <= 4] MSG %"Dia da Amazônia%" %! %b.
+REM 17 November ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG %"Assinatura do Tratado de Petrópolis%" %! %b.
+REM Friday 17 November ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 11, 17)) >= 2 && wkdaynum(date($Ty, 11, 17)) <= 4] MSG %"Assinatura do Tratado de Petrópolis%" %! %b.
--- a/include/holidays/br/al.rem
+++ b/include/holidays/br/al.rem
@@ -8,9 +8,9 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 24 June MSG São João
-OMIT 29 June MSG São Pedro
-OMIT 16 September MSG Emancipação Política de Alagoas
-OMIT 30 November MSG Dia do Evangélico
+OMIT 24 June MSG %"São João%" %! %b.
+OMIT 29 June MSG %"São Pedro%" %! %b.
+OMIT 16 September MSG %"Emancipação Política de Alagoas%" %! %b.
+OMIT 30 November MSG %"Dia do Evangélico%" %! %b.
--- a/include/holidays/br/am.rem
+++ b/include/holidays/br/am.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 5 September MSG Elevação do Amazonas à categoria de província
+OMIT 5 September MSG %"Elevação do Amazonas à categoria de província%" %! %b.
--- a/include/holidays/br/ap.rem
+++ b/include/holidays/br/ap.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 19 March MSG São José
-OMIT 25 July MSG São Tiago
-OMIT 13 September MSG Criação do Território Federal
+OMIT 19 March MSG %"São José%" %! %b.
+OMIT 25 July MSG %"São Tiago%" %! %b.
+OMIT 13 September MSG %"Criação do Território Federal%" %! %b.
--- a/include/holidays/br/ba.rem
+++ b/include/holidays/br/ba.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 2 July MSG Independência da Bahia
+OMIT 2 July MSG %"Independência da Bahia%" %! %b.
--- a/include/holidays/br/ce.rem
+++ b/include/holidays/br/ce.rem
@@ -8,8 +8,8 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 19 March MSG São José
-OMIT 25 March MSG Abolição da escravidão no Ceará
-OMIT 15 August MSG Nossa Senhora da Assunção
+OMIT 19 March MSG %"São José%" %! %b.
+OMIT 25 March MSG %"Abolição da escravidão no Ceará%" %! %b.
+OMIT 15 August MSG %"Nossa Senhora da Assunção%" %! %b.
--- a/include/holidays/br/df.rem
+++ b/include/holidays/br/df.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 21 April MSG Fundação de Brasília
-OMIT 30 November MSG Dia do Evangélico
+OMIT 21 April MSG %"Fundação de Brasília%" %! %b.
+OMIT 30 November MSG %"Dia do Evangélico%" %! %b.
--- a/include/holidays/br/es.rem
+++ b/include/holidays/br/es.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT [easterdate($Uy)+8] MSG Nossa Senhora da Penha
+OMIT [easterdate($Uy)+8] MSG %"Nossa Senhora da Penha%" %! %b.
--- a/include/holidays/br/go.rem
+++ b/include/holidays/br/go.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 26 July MSG Fundação da cidade de Goiás
-OMIT 24 October MSG Pedra fundamental de Goiânia
+OMIT 26 July MSG %"Fundação da cidade de Goiás%" %! %b.
+OMIT 24 October MSG %"Pedra fundamental de Goiânia%" %! %b.
--- a/include/holidays/br/ma.rem
+++ b/include/holidays/br/ma.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 28 July MSG Adesão do Maranhão à independência do Brasil
+OMIT 28 July MSG %"Adesão do Maranhão à independência do Brasil%" %! %b.
--- a/include/holidays/br/mg.rem
+++ b/include/holidays/br/mg.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 21 April MSG Execução de Tiradentes
+OMIT 21 April MSG %"Execução de Tiradentes%" %! %b.
--- a/include/holidays/br/ms.rem
+++ b/include/holidays/br/ms.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 11 October MSG Criação do Estado
+OMIT 11 October MSG %"Criação do Estado%" %! %b.
--- a/include/holidays/br/pa.rem
+++ b/include/holidays/br/pa.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 15 August MSG Adesão do Grão-Pará à independência do Brasil
+OMIT 15 August MSG %"Adesão do Grão-Pará à independência do Brasil%" %! %b.
--- a/include/holidays/br/pb.rem
+++ b/include/holidays/br/pb.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 5 August MSG Fundação do Estado
+OMIT 5 August MSG %"Fundação do Estado%" %! %b.
--- a/include/holidays/br/pe.rem
+++ b/include/holidays/br/pe.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-REM First Sunday in March ADDOMIT SCANFROM -28 MSG Revolução Pernambucana
+REM First Sunday in March ADDOMIT SCANFROM -28 MSG %"Revolução Pernambucana%" %! %b.
--- a/include/holidays/br/pi.rem
+++ b/include/holidays/br/pi.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 19 October MSG Dia do Piauí
+OMIT 19 October MSG %"Dia do Piauí%" %! %b.
--- a/include/holidays/br/pr.rem
+++ b/include/holidays/br/pr.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 19 December MSG Emancipação do Paraná
+OMIT 19 December MSG %"Emancipação do Paraná%" %! %b.
--- a/include/holidays/br/rj.rem
+++ b/include/holidays/br/rj.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 23 April MSG São Jorge
+OMIT 23 April MSG %"São Jorge%" %! %b.
--- a/include/holidays/br/rn.rem
+++ b/include/holidays/br/rn.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 7 August MSG Dia do Rio Grande do Norte
-OMIT 3 October MSG Mártires de Cunhaú e Uruaçuu
+OMIT 7 August MSG %"Dia do Rio Grande do Norte%" %! %b.
+OMIT 3 October MSG %"Mártires de Cunhaú e Uruaçuu%" %! %b.
--- a/include/holidays/br/ro.rem
+++ b/include/holidays/br/ro.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 4 January MSG Criação do Estado
-OMIT 18 June MSG Dia do Evangélico
+OMIT 4 January MSG %"Criação do Estado%" %! %b.
+OMIT 18 June MSG %"Dia do Evangélico%" %! %b.
--- a/include/holidays/br/rr.rem
+++ b/include/holidays/br/rr.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 5 October MSG Criação do Estado
+OMIT 5 October MSG %"Criação do Estado%" %! %b.
--- a/include/holidays/br/rs.rem
+++ b/include/holidays/br/rs.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem

-OMIT 20 September MSG Dia do Gaúcho
+OMIT 20 September MSG %"Dia do Gaúcho%" %! %b.
--- a/Show More
+++ b/Show More