Add some terms to hunspell dictionary.

Prep for 06.02.01 release.
Add some tests; make tess pass on MUSL.
2026-04-16 14:28:40 +02:00 · 2025-11-10 12:15:34 -05:00 · 2025-11-10 12:14:28 -05:00 · 2025-11-10 12:08:58 -05:00 · 2025-11-10 12:02:47 -05:00 · 2025-11-06 21:42:57 -05:00
647 changed files with 21431 additions and 10025 deletions
--- 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,6 +18,7 @@ pm_to_blib
 rem2html/Makefile
 rem2html/rem2html
 rem2html/rem2html.1
+rem2pdf/Makefile
 rem2pdf/Makefile.PL
 rem2pdf/Makefile.old
 rem2pdf/Makefile.top
@@ -30,8 +31,9 @@ src/rem2ps
 src/remind
 src/test-*.out
 src/version.h
-tests/test.out
-www/Makefile
-gmon.out
-tests/once.timestamp
 src/xlat.c
+tests/once.timestamp
+tests/test.out
+tests/tz.out
+www/Makefile
+_cppcheck
--- a/16
+++ b/16
@@ -39,11 +39,21 @@ 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/version.h 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

--- a/README.md
+++ b/README.md
@@ -2,14 +2,25 @@

 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.
+the GNU General Public License, Version 2.

 ## Prerequisites:

-remind and rem2ps have no prerequisites beyond the standard C library and
-the standard math library.
+### Remind and Rem2PS

-rem2html requires the JSON::MaybeXS Perl module and rem2pdf
+**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:
@@ -24,7 +35,9 @@ requires the JSON::MaybeXS, Pango and Cairo Perl modules.

 - On Arch linux, you need `pango-perl`, `cairo-perl` and `perl-json-maybexs`

-TkRemind requires Tcl/Tk and the tcllib library.
+### TkRemind
+
+**tkremind** requires Tcl/Tk and the tcllib library.

 - On Debian-like systems, install with:

@@ -45,7 +58,8 @@ all of your distribution's Noto Font-related packages.

 ## Installation

-Remind can be installed with the usual:
+Assuming you have a normal C development environment installed, Remind
+can be installed with the usual:

 `./configure && make && make test && sudo make install`

@@ -55,6 +69,39 @@ 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
--- a/899
+++ b/899
--- 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.04.00, , , https://dianne.skoll.ca/projects/remind/)
+AC_INIT(remind, 06.02.01, , , https://dianne.skoll.ca/projects/remind/)
 AC_CONFIG_SRCDIR([src/queue.c])

 cat <<'EOF'
@@ -13,6 +13,7 @@ cat <<'EOF'

 EOF

+AC_LANG([C])
 AC_CONFIG_HEADERS([src/config.h])

 AC_ARG_ENABLE(perl-build-artifacts,
@@ -30,7 +31,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 sys/termios.h stdint.h readline/readline.h readline/history.h])

 dnl Integer sizes
 AC_CHECK_SIZEOF(unsigned int)
@@ -42,25 +44,42 @@ AC_CHECK_HEADERS(strings.h sys/types.h glob.h wctype.h locale.h langinfo.h sys/i

 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_STRUCT_TM
+U="`uname -s`"

-if test "$GCC" = yes; then
-	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
+# LTO fails on Solaris for some reason
+if test "$U" != "SunOS" -a "$GCC" = yes; then
+   	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
        # Check for link-time optimization support
-        f=-flto=auto
-        AC_MSG_CHECKING([whether $CC supports $f])
-        if $CC -Werror -E $f - < /dev/null > /dev/null 2>&1 ; then
-            AC_MSG_RESULT([yes])
-            CFLAGS="$CFLAGS $f"
-            f=-ffat-lto-objects
-            AC_MSG_CHECKING([whether $CC supports $f])
-            if $CC -Werror -E $f - < /dev/null > /dev/null 2>&1 ; then
-                AC_MSG_RESULT([yes])
-                CFLAGS="$CFLAGS $f"
-            else
-                AC_MSG_RESULT([no])
-            fi
+        OLDCFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS -flto=auto"
+        AC_MSG_CHECKING([whether $CC supports -flto=auto])
+        AC_LINK_IFELSE(
+            [AC_LANG_PROGRAM(
+               [[int x = 1;]],
+               [[]])],
+               [lto=yes],
+               [lto=no]
+               )
+        AC_MSG_RESULT([$lto])
+        if test "x$lto" != "xyes" ; then
+	    CFLAGS="$OLDCFLAGS"
        else
-            AC_MSG_RESULT([no])
+            AC_MSG_CHECKING([whether $CC supports -ffat-lto-object])
+            OLDCFLAGS="$CFLAGS"
+            CFLAGS="$CFLAGS -Werror -ffat-lto-objects"
+            AC_LINK_IFELSE(
+                [AC_LANG_PROGRAM(
+                    [[int x = 1;]],
+                    [[]])],
+                [lto=yes],
+                [lto=no]
+                )
+            AC_MSG_RESULT([$lto])
+            if test "x$lto" != "xyes" ; then
+                CFLAGS="$OLDCFLAGS"
+            else
+                CFLAGS="$OLDCFLAGS -ffat-lto-objects"
+            fi
        fi
 fi

@@ -84,7 +103,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,15 +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" "INFO" "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"
-         "SYSINCLUDE" "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)))))


@@ -135,8 +137,8 @@
         "$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"
@@ -146,10 +148,10 @@
         "$PrefixLineNo" "$PSCal" "$RunOff" "$Saturday" "$September"
         "$SimpleCal" "$SortByDate" "$SortByPrio" "$SortByTime" "$SubsIndent"
         "$Sunday" "$SuppressImplicitWarnings" "$SuppressLRM" "$SysInclude" "$T" "$Tb" "$Td"
-         "$TerminalBackground" "$Thursday" "$TimeSep" "$TimetIs64bit" "$Tm" "$Today"
+         "$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
@@ -164,22 +166,23 @@
 (defconst remind-builtin-functions
  (sort
   (list "_" "abs" "access" "adawn" "adusk" "ampm" "ansicolor" "args" "asc"
-         "baseyr" "catch" "catcherr" "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" "escape" "eval" "evaltrig" "filedate" "filedatetime"
-         "filedir" "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear"
+         "filedir" "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear" "hex"
         "hour" "htmlescape" "htmlstriptags" "iif" "index" "isany" "isconst" "isdst"
-         "isleap" "isomitted" "language" "localtoutc" "lower" "max" "min"
+         "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" "trigdate" "trigdatetime"
-         "trigdelta" "trigduration" "trigeventduration" "trigeventstart"
-         "trigfrom" "trigger" "triginfo" "trigpriority" "trigrep"
-         "trigscanfrom" "trigtags" "trigtime" "trigtimedelta" "trigtimerep"
+         "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"
         )
--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
--- 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/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
@@ -6,8 +6,8 @@
 # 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...
    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
@@ -10,6 +10,6 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,5 +10,5 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,5 +10,5 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,5 +10,5 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,7 +10,7 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,6 +10,6 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,5 +10,5 @@
 # If you want the national holidays as well, you must
 # 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
@@ -12,4 +12,4 @@


 # 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
@@ -12,5 +12,5 @@


 # 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
@@ -12,4 +12,4 @@


 # 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
@@ -12,4 +12,4 @@


 # 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
@@ -12,4 +12,4 @@


 # 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
@@ -12,4 +12,4 @@


 # 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
@@ -12,4 +12,4 @@


 # 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
@@ -12,4 +12,4 @@


 # 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
@@ -12,4 +12,4 @@


 # 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
@@ -10,18 +10,18 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,16 +10,16 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,19 +10,19 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,14 +10,14 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,20 +10,20 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,7 +10,7 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,15 +10,15 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,15 +10,15 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,14 +10,14 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,11 +10,11 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,14 +10,14 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,12 +10,12 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,7 +10,7 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,6 +10,6 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,6 +10,6 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,5 +10,5 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,5 +10,5 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,5 +10,5 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,5 +10,5 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # 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
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/br.rem

-OMIT 20 September MSG Dia do Gaúcho
+OMIT 20 September MSG %"Dia do Gaúcho%" %! %b.
--- a/include/holidays/br/sc.rem
+++ b/include/holidays/br/sc.rem
@@ -10,5 +10,5 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/br.rem

-REM Sunday 11 August ADDOMIT SCANFROM -28 MSG Dia do Estado de Santa Catarina
-REM Sunday 25 November ADDOMIT SCANFROM -28 MSG Dia de Santa Catarina de Alexandria
+REM Sunday 11 August ADDOMIT SCANFROM -28 MSG %"Dia do Estado de Santa Catarina%" %! %b.
+REM Sunday 25 November ADDOMIT SCANFROM -28 MSG %"Dia de Santa Catarina de Alexandria%" %! %b.
--- a/include/holidays/br/se.rem
+++ b/include/holidays/br/se.rem
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/br.rem

-OMIT 8 July MSG Emancipação política de Sergipe
+OMIT 8 July MSG %"Emancipação política de Sergipe%" %! %b.
--- a/include/holidays/br/sp.rem
+++ b/include/holidays/br/sp.rem
@@ -10,4 +10,4 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/br.rem

-OMIT 9 July MSG Revolução Constitucionalista
+OMIT 9 July MSG %"Revolução Constitucionalista%" %! %b.
--- a/include/holidays/br/to.rem
+++ b/include/holidays/br/to.rem
@@ -10,6 +10,6 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/br.rem

-OMIT 18 March MSG Dia da Autonomia
-OMIT 8 September MSG Nossa Senhora da Natividade
-OMIT 5 October MSG Criação do Estado
+OMIT 18 March MSG %"Dia da Autonomia%" %! %b.
+OMIT 8 September MSG %"Nossa Senhora da Natividade%" %! %b.
+OMIT 5 October MSG %"Criação do Estado%" %! %b.
--- a/include/holidays/bs.rem
+++ b/include/holidays/bs.rem
@@ -5,22 +5,22 @@
 #
 # 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 10 January MSG Majority Rule Day
-REM 11 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 10)) == 0] MSG Majority Rule Day (observed)
-REM 12 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 10)) == 6] MSG Majority Rule Day (observed)
-OMIT [easterdate($Uy)-2] MSG Good Friday
-OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM First Friday in June ADDOMIT SCANFROM -28 MSG Randol Fawkes Labour Day
-OMIT [easterdate($Uy)+50] MSG Whit Monday
-OMIT 10 July MSG Independence Day
-REM 11 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 10)) == 0] MSG Independence Day (observed)
-REM 12 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 10)) == 6] MSG Independence Day (observed)
-REM First Monday in August ADDOMIT SCANFROM -28 MSG Emancipation Day
-REM Second Monday in October ADDOMIT SCANFROM -28 MSG National Heroes Day
-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)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] 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 10 January MSG %"Majority Rule Day%" %! %b.
+REM 11 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Majority Rule Day (observed)%" %! %b.
+REM 12 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Majority Rule Day (observed)%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Good Friday%" %! %b.
+OMIT [easterdate($Uy)+1] MSG %"Easter Monday%" %! %b.
+REM First Friday in June ADDOMIT SCANFROM -28 MSG %"Randol Fawkes Labour Day%" %! %b.
+OMIT [easterdate($Uy)+50] MSG %"Whit Monday%" %! %b.
+OMIT 10 July MSG %"Independence Day%" %! %b.
+REM 11 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Independence Day (observed)%" %! %b.
+REM 12 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Independence Day (observed)%" %! %b.
+REM First Monday in August ADDOMIT SCANFROM -28 MSG %"Emancipation Day%" %! %b.
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG %"National Heroes Day%" %! %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.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Boxing Day (observed)%" %! %b.
--- a/include/holidays/bw.rem
+++ b/include/holidays/bw.rem
@@ -5,27 +5,27 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG New Year's Day
-OMIT 2 January MSG New Year's Day Holiday
-REM 3 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, 2)) == 0] MSG New Year's Day Holiday (observed)
-OMIT [easterdate($Uy)-2] MSG Good Friday
-OMIT [easterdate($Uy)-1] MSG Holy Saturday
-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)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Labour Day Holiday
-OMIT [easterdate($Uy)+39] MSG Ascension Day
-OMIT 1 July MSG Sir Seretse Khama Day
-REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Sir Seretse Khama Day (observed)
-REM Third Monday in July ADDOMIT SCANFROM -28 MSG President's Day
-REM Tuesday 16 July ADDOMIT SCANFROM -28 MSG President's Day Holiday
-OMIT 30 September MSG Botswana Day
-OMIT 1 October MSG Botswana Day Holiday
-REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 1)) == 0] MSG Botswana Day Holiday (observed)
-REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG Botswana 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)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day Holiday
+OMIT 1 January MSG %"New Year's Day%" %! %b.
+OMIT 2 January MSG %"New Year's Day Holiday%" %! %b.
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day Holiday (observed)%" %! %b.
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"New Year's Day (observed)%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Good Friday%" %! %b.
+OMIT [easterdate($Uy)-1] MSG %"Holy Saturday%" %! %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.
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Labour Day Holiday%" %! %b.
+OMIT [easterdate($Uy)+39] MSG %"Ascension Day%" %! %b.
+OMIT 1 July MSG %"Sir Seretse Khama Day%" %! %b.
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Sir Seretse Khama Day (observed)%" %! %b.
+REM Third Monday in July ADDOMIT SCANFROM -28 MSG %"President's Day%" %! %b.
+REM Tuesday 16 July ADDOMIT SCANFROM -28 MSG %"President's Day Holiday%" %! %b.
+OMIT 30 September MSG %"Botswana Day%" %! %b.
+OMIT 1 October MSG %"Botswana Day Holiday%" %! %b.
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Botswana Day Holiday (observed)%" %! %b.
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG %"Botswana 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.
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Boxing Day Holiday%" %! %b.
--- a/include/holidays/by.rem
+++ b/include/holidays/by.rem
@@ -5,13 +5,13 @@
 #
 # See important caveats in the README file in this directory.

-OMIT 1 January MSG Новы год
-OMIT 2 January MSG Новы год
-OMIT 7 January MSG Нараджэнне Хрыстова (праваслаўнае Раство)
-OMIT 8 March MSG Дзень жанчын
-OMIT [orthodoxeaster($Uy)+9] MSG Радаўніца
-OMIT 1 May MSG Свята працы
-OMIT 9 May MSG Дзень Перамогі
-OMIT 3 July MSG Дзень Незалежнасці Рэспублікі Беларусь (Дзень Рэспублікі)
-OMIT 7 November MSG Дзень Кастрычніцкай рэвалюцыі
-OMIT 25 December MSG Нараджэнне Хрыстова (каталіцкае Раство)
+OMIT 1 January MSG %"Новы год%" %! %b.
+OMIT 2 January MSG %"Новы год%" %! %b.
+OMIT 7 January MSG %"Нараджэнне Хрыстова (праваслаўнае Раство)%" %! %b.
+OMIT 8 March MSG %"Дзень жанчын%" %! %b.
+OMIT [orthodoxeaster($Uy)+9] MSG %"Радаўніца%" %! %b.
+OMIT 1 May MSG %"Свята працы%" %! %b.
+OMIT 9 May MSG %"Дзень Перамогі%" %! %b.
+OMIT 3 July MSG %"Дзень Незалежнасці Рэспублікі Беларусь (Дзень Рэспублікі)%" %! %b.
+OMIT 7 November MSG %"Дзень Кастрычніцкай рэвалюцыі%" %! %b.
+OMIT 25 December MSG %"Нараджэнне Хрыстова (каталіцкае Раство)%" %! %b.
--- a/include/holidays/bz.rem
+++ b/include/holidays/bz.rem
@@ -5,39 +5,39 @@
 #
 # See important caveats in the README file in this directory.

-REM 1 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG New Year's Day (observed)
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 15 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG George Price Day (observed)
-REM 16 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 15)) == 0] MSG George Price Day (observed)
-REM 6 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 4] MSG National Heroes and Benefactors Day (observed)
-REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 3] MSG National Heroes and Benefactors Day (observed)
-REM 8 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 2] MSG National Heroes and Benefactors Day (observed)
-REM 9 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG National Heroes and Benefactors Day (observed)
-REM 10 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 0] MSG National Heroes and Benefactors Day (observed)
-REM 12 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 5] MSG National Heroes and Benefactors Day (observed)
-OMIT [easterdate($Uy)-2] MSG Good Friday
-OMIT [easterdate($Uy)-1] MSG Holy Saturday
-OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM 1 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Labour Day (observed)
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 4] MSG Emancipation Day (observed)
-REM 30 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 3] MSG Emancipation Day (observed)
-REM 31 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 2] MSG Emancipation Day (observed)
-REM 1 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Emancipation Day (observed)
-REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
-REM 4 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 5] MSG Emancipation Day (observed)
-REM 10 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Saint George's Caye Day (observed)
-REM 11 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 10)) == 0] MSG Saint George's Caye Day (observed)
-REM 21 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Independence Day (observed)
-REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Independence Day (observed)
-REM 9 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Indigenous Peoples' Resistance Day (observed)
-REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Indigenous Peoples' Resistance Day (observed)
-REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Indigenous Peoples' Resistance Day (observed)
-REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Indigenous Peoples' Resistance Day (observed)
-REM 13 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Indigenous Peoples' Resistance Day (observed)
-REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Indigenous Peoples' Resistance Day (observed)
-REM 19 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Garifuna Settlement Day (observed)
-REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Garifuna Settlement Day (observed)
-OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Boxing Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 1 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG %"New Year's Day (observed)%" %! %b.
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"New Year's Day (observed)%" %! %b.
+REM 15 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG %"George Price Day (observed)%" %! %b.
+REM 16 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"George Price Day (observed)%" %! %b.
+REM 6 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+3) == 4] MSG %"National Heroes and Benefactors Day (observed)%" %! %b.
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG %"National Heroes and Benefactors Day (observed)%" %! %b.
+REM 8 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"National Heroes and Benefactors Day (observed)%" %! %b.
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG %"National Heroes and Benefactors Day (observed)%" %! %b.
+REM 10 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"National Heroes and Benefactors Day (observed)%" %! %b.
+REM 12 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG %"National Heroes and Benefactors Day (observed)%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Good Friday%" %! %b.
+OMIT [easterdate($Uy)-1] MSG %"Holy Saturday%" %! %b.
+OMIT [easterdate($Uy)+1] MSG %"Easter Monday%" %! %b.
+REM 1 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG %"Labour Day (observed)%" %! %b.
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Labour Day (observed)%" %! %b.
+REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+3) == 4] MSG %"Emancipation Day (observed)%" %! %b.
+REM 30 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG %"Emancipation Day (observed)%" %! %b.
+REM 31 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Emancipation Day (observed)%" %! %b.
+REM 1 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG %"Emancipation Day (observed)%" %! %b.
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Emancipation Day (observed)%" %! %b.
+REM 4 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG %"Emancipation Day (observed)%" %! %b.
+REM 10 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG %"Saint George's Caye Day (observed)%" %! %b.
+REM 11 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Saint George's Caye Day (observed)%" %! %b.
+REM 21 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG %"Independence Day (observed)%" %! %b.
+REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Independence Day (observed)%" %! %b.
+REM 9 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+3) == 4] MSG %"Indigenous Peoples' Resistance Day (observed)%" %! %b.
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG %"Indigenous Peoples' Resistance Day (observed)%" %! %b.
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG %"Indigenous Peoples' Resistance Day (observed)%" %! %b.
+REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG %"Indigenous Peoples' Resistance Day (observed)%" %! %b.
+REM 13 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Indigenous Peoples' Resistance Day (observed)%" %! %b.
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG %"Indigenous Peoples' Resistance Day (observed)%" %! %b.
+REM 19 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG %"Garifuna Settlement Day (observed)%" %! %b.
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Garifuna Settlement Day (observed)%" %! %b.
+OMIT 25 December MSG %"Christmas Day%" %! %b.
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG %"Boxing Day (observed)%" %! %b.
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Boxing Day (observed)%" %! %b.
--- a/include/holidays/ca.rem
+++ b/include/holidays/ca.rem
@@ -12,26 +12,26 @@
 # one of the regional *.rem files in the directory
 # [$SysInclude]/holidays/ca/

-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 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-OMIT [easterdate($Uy)-2] MSG Good Friday
-REM Monday 18 May ADDOMIT SCANFROM -28 MSG Victoria Day
-OMIT 1 July MSG Canada Day
-REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Canada Day (observed)
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 6] MSG Canada Day (observed)
-REM First Monday in September ADDOMIT SCANFROM -28 MSG Labour Day
-OMIT 30 September MSG National Day for Truth and Reconciliation
-REM 1 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG National Day for Truth and Reconciliation (observed)
-REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 6] MSG National Day for Truth and Reconciliation (observed)
-REM Second Monday in October ADDOMIT SCANFROM -28 MSG Thanksgiving Day
-OMIT 11 November MSG Remembrance Day
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Remembrance Day (observed)
-REM 13 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Remembrance Day (observed)
-OMIT 25 December MSG Christmas Day
-OMIT 26 December MSG Boxing 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)
+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 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"New Year's Day (observed)%" %! %b.
+OMIT [easterdate($Uy)-2] MSG %"Good Friday%" %! %b.
+REM Monday 18 May ADDOMIT SCANFROM -28 MSG %"Victoria Day%" %! %b.
+OMIT 1 July MSG %"Canada Day%" %! %b.
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Canada Day (observed)%" %! %b.
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Canada Day (observed)%" %! %b.
+REM First Monday in September ADDOMIT SCANFROM -28 MSG %"Labour Day%" %! %b.
+OMIT 30 September MSG %"National Day for Truth and Reconciliation%" %! %b.
+REM 1 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"National Day for Truth and Reconciliation (observed)%" %! %b.
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"National Day for Truth and Reconciliation (observed)%" %! %b.
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG %"Thanksgiving Day%" %! %b.
+OMIT 11 November MSG %"Remembrance Day%" %! %b.
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG %"Remembrance Day (observed)%" %! %b.
+REM 13 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG %"Remembrance Day (observed)%" %! %b.
+OMIT 25 December MSG %"Christmas Day%" %! %b.
+OMIT 26 December MSG %"Boxing 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/Show More
+++ b/Show More